[wolfcms] r354 committed - Fixing some filemanager issues

[wol...@googlecode.com]

Revision: 354
Author: martij...@gmail.com
Date: Fri Dec 24 16:05:58 2010
Log: Fixing some filemanager issues
http://code.google.com/p/wolfcms/source/detail?r=354

Modified:
/trunk/wolf/plugins/file_manager/FileManagerController.php

=======================================
--- /trunk/wolf/plugins/file_manager/FileManagerController.php Thu Dec 16
16:13:02 2010
+++ /trunk/wolf/plugins/file_manager/FileManagerController.php Fri Dec 24
16:05:58 2010
@@ -271,7 +271,7 @@
$filename = preg_replace('/[^a-z0-9_\-\.]/i', '', $filename);

if (isset($_FILES)) {
- $file = _upload_file($filename, FILES_DIR.'/'.$path.'/',
$_FILES['upload_file']['tmp_name'], $overwrite);
+ $file = $this->_upload_file($filename,
FILES_DIR.'/'.$path.'/', $_FILES['upload_file']['tmp_name'], $overwrite);

if ($file === false)
Flash::set('error', __('File has not been uploaded!'));
@@ -291,7 +291,7 @@
$file = FILES_DIR.'/'.$data['name'];

if (file_exists($file)) {
- if (!chmod($file, octdec($data['mode'])))
+ if (@!chmod($file, octdec($data['mode'])))
Flash::set('error', __('Permission denied!'));
}
else {
@@ -368,11 +368,10 @@

// make the link depending on if it's a file or a dir
if ($cur->isDir()) {
- $object->link = '<a
href="'.get_url('plugin/file_manager/browse/'.$object->name).'">'.$object->name.'</a>';
- $file = '/'.$file;
+ $object->link = '<a
href="'.get_url('plugin/file_manager/browse/'.$this->path.$object->name).'">'.$object->name.'</a>';
}
else {
- $object->link = '<a
href="'.get_url('plugin/file_manager/view/'.$object->name).'">'.$object->name.'</a>';
+ $object->link = '<a
href="'.get_url('plugin/file_manager/view/'.$this->path.$object->name).'">'.$object->name.'</a>';
}

$files[$object->name] = $object;