diff options
| -rw-r--r-- | data/templates/edit-file.htm | 6 | ||||
| -rw-r--r-- | src/phorkie/File.php | 16 | ||||
| -rw-r--r-- | src/phorkie/Repository/Post.php | 2 |
3 files changed, 23 insertions, 1 deletions
diff --git a/data/templates/edit-file.htm b/data/templates/edit-file.htm index 53c2c01..a1993c5 100644 --- a/data/templates/edit-file.htm +++ b/data/templates/edit-file.htm @@ -14,7 +14,13 @@ <p class="muted">Type determined from filename</p> </div> </div> + {% if not file or file.isText %} <textarea name="files[{{fileid}}][content]" id="content_{{fileid}}" cols="80" rows="15" class="content">{{file.getContent}}</textarea> + {% else %} + <p style="text-align: center"> + Binary files cannot be edited. + </p> + {% endif %} <div class="row-fluid"> <div class="span9"> <label for="upload_{{fileid}}" class="inline">Replace with upload:</label> diff --git a/src/phorkie/File.php b/src/phorkie/File.php index 519413d..53925ee 100644 --- a/src/phorkie/File.php +++ b/src/phorkie/File.php @@ -115,6 +115,22 @@ class File $tm = new Tool_Manager(); return $tm->getSuitable($this); } + + /** + * Tells if the file contains textual content and is editable. + * + * @return boolean + */ + public function isText() + { + $ext = $this->getExt(); + if (!isset($GLOBALS['phorkie']['languages'][$ext]['mime'])) { + return false; + } + + $type = $GLOBALS['phorkie']['languages'][$ext]['mime']; + return substr($type, 0, 5) === 'text/'; + } } ?>
\ No newline at end of file diff --git a/src/phorkie/Repository/Post.php b/src/phorkie/Repository/Post.php index 471cbd8..045bba1 100644 --- a/src/phorkie/Repository/Post.php +++ b/src/phorkie/Repository/Post.php @@ -94,7 +94,7 @@ class Repository_Post ->addArgument($file->getFilename()) ->execute(); $bChanged = true; - } else if ($bNew || $file->getContent() != $arFile['content']) { + } else if ($bNew || (isset($arFile['content']) && $file->getContent() != $arFile['content'])) { file_put_contents($file->getPath(), $arFile['content']); $command = $vc->getCommand('add') ->addArgument($file->getFilename()) |