Changeset 7681 for trunk/filemanager

Timestamp:

12/19/12 16:44:18 (11 years ago)

Author:

douglasz

Message:

Ticket #3236 - Correcoes para Best Practice: Short Open Tag e Best Practice: Always Quote Array Keys.

File:

• trunk/filemanager/inc/class.uifilemanager.inc.php (modified) (12 diffs)

trunk/filemanager/inc/class.uifilemanager.inc.php

@@ -155 +155 @@
                 // check if basedir exist 
                 $test = $this->bo->vfs->get_real_info(array('string' => $this->bo->basedir, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
-                if ($test[mime_type] != 'Directory') {
+                if ($test['mime_type'] != 'Directory') {
                         die('Base directory does not exist, Ask adminstrator to check the global configuration.');
                 }
 
                 $test = $this->bo->vfs->get_real_info(array('string' => $this->bo->basedir . $this->bo->fakebase, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
-                if ($test[mime_type] != 'Directory') {
+                if ($test['mime_type'] != 'Directory') {
                         $this->bo->vfs->override_acl = 1;
 
@@ -173 +173 @@
                         $test = $this->bo->vfs->get_real_info(array('string' => $this->bo->basedir . $this->bo->fakebase, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
 
-                        if ($test[mime_type] != 'Directory') {
+                        if ($test['mime_type'] != 'Directory') {
                                 die('Fake Base directory does not exist and could not be created, please ask the administrator to check the global configuration.');
                         } else {
@@ -181 +181 @@
 
                 $test = $this->bo->vfs->get_real_info(array('string' => $this->bo->basedir . $this->bo->homedir, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
-                if ($test[mime_type] != 'Directory') {
+                if ($test['mime_type'] != 'Directory') {
                         
                         $c_admin = CreateObject('phpgwapi.config', 'expressoAdmin1_2');
@@ -205 +205 @@
                         $test = $this->bo->vfs->get_real_info(array('string' => $this->bo->basedir . $this->bo->homedir, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
 
-                        if ($test[mime_type] != 'Directory') {
+                        if ($test['mime_type'] != 'Directory') {
                                 die('Your Home Dir does not exist and could not be created, please ask the adminstrator to check the global configuration.');
                         } else {
@@ -622 +622 @@
 
                 if ($this->numoffiles || $this->cwd) {
-                        $vars[path] = '<input type="hidden" id="currentPath" value="' . $this->path . '">';
-                        $vars[css] = '<link rel="stylesheet" type="text/css" href="filemanager/templates/default/main.css">';
-                        $vars[css].='<link rel="stylesheet" type="text/css" href="phpgwapi/js/dftree/dftree.css">';
+                        $vars['path'] = '<input type="hidden" id="currentPath" value="' . $this->path . '">';
+                        $vars['css'] = '<link rel="stylesheet" type="text/css" href="filemanager/templates/default/main.css">';
+                        $vars['css'].='<link rel="stylesheet" type="text/css" href="phpgwapi/js/dftree/dftree.css">';
                         $_SESSION['phpgw_info']['user']['preferences']['filemanager']['lid'] = $GLOBALS['phpgw_info']['user']['account_lid'];
-                        $vars[preferences] = '<input type="hidden" id="userPreferences" value=\'' . serialize($_SESSION['phpgw_info']['user']['preferences']['filemanager']) . '\'>';
+                        $vars['preferences'] = '<input type="hidden" id="userPreferences" value=\'' . serialize($_SESSION['phpgw_info']['user']['preferences']['filemanager']) . '\'>';
                         // Used for important operations that needs security
                         for ($key = ""; strlen($key) < 150; $key .= chr(rand(48, 95)))
                                 ;
                         $_SESSION['phpgw_info']['filemanager']['user']['sec_key'] = $key;
-                        $vars[sec_key] = '<input type="hidden" id="userKey" value=\'' . $key . '\'>';
-                        $vars[script] = '<script>initDrawApi();</script>';
-
-                        $vars[new_button] = $this->toolButton('new', 'createfile', lang('New...'));
-                        $vars[new_button].='<input type="hidden" id="newfile_or_dir" name="newfile_or_dir" value="" />';
+                        $vars['sec_key'] = '<input type="hidden" id="userKey" value=\'' . $key . '\'>';
+                        $vars['script'] = '<script>initDrawApi();</script>';
+
+                        $vars['new_button'] = $this->toolButton('new', 'createfile', lang('New...'));
+                        $vars['new_button'].='<input type="hidden" id="newfile_or_dir" name="newfile_or_dir" value="" />';
 
                         // reload button with this url
-                        $vars[refresh_button] = $this->toolButton('reload', 'reload', lang('reload'));
+                        $vars['refresh_button'] = $this->toolButton('reload', 'reload', lang('reload'));
 
                         // go up icon when we're not at the top, dont allow to go outside /home = fakebase
                         if ($this->path != '/' && $this->path != $this->bo->fakebase) {
-                                $vars[tools_button] = $this->toolButton('tools', 'tools', lang('tools'));
+                                $vars['tools_button'] = $this->toolButton('tools', 'tools', lang('tools'));
                         }
                         else
-                                $vars[tools_button] = "";
-
-                        $vars[toolbar1] = $toolbar;
+                                $vars['tools_button'] = "";
+
+                        $vars['toolbar1'] = $toolbar;
 
                         if (count($this->messages) > 0) {
@@ -656 +656 @@
                         $this->messages = NULL;
 
-                        $vars[messages] = $messages;
+                        $vars['messages'] = $messages;
 
                         $this->t->set_var($vars);
@@ -815 +815 @@
                 $var = array(
                          'change_upload_boxes'  => lang('Show'),
-                         'form_action'                  => $GLOBALS[phpgw]->link('/filemanager/inc/upload.php'),
+                         'form_action'                  => $GLOBALS['phpgw']->link('/filemanager/inc/upload.php'),
                          'emails_to'                            => $notify->EmailsToSend($GLOBALS['phpgw']->preferences->values['email']),
                          'lang_file'                            => lang('File(s)'),
@@ -906 +906 @@
 
 
-                $vars[refresh_script] = "<script src='filemanager/js/refresh.js'></script>";
-
-                $vars[preview_content] = '';
+                $vars['refresh_script'] = "<script src='filemanager/js/refresh.js'></script>";
+
+                $vars['preview_content'] = '';
                 if ($this->edit_file) {
                         $this->edit_file_content = stripslashes($this->edit_file_content);
@@ -916 +916 @@
                         $content = $this->edit_file_content;
 
-                        $vars[lang_preview_of] = lang('Preview of %1', $this->path . '/' . $edit_file);
-
-                        $vars[preview_content] = nl2br($content);
+                        $vars['lang_preview_of'] = lang('Preview of %1', $this->path . '/' . $edit_file);
+
+                        $vars['preview_content'] = nl2br($content);
                 } elseif ($this->edit_save_x || $this->edit_save_done_x) {
                         $content = $this->edit_file_content;
@@ -954 +954 @@
                                 $content = $this->bo->vfs->read(array('string' => $this->filename));
                         }
-                        $vars[form_action] = $GLOBALS['phpgw']->link('/index.php', 'menuaction=filemanager.uifilemanager.index', 'path=' . $this->path);
-                        $vars[edit_file] = $this->filename;
+                        $vars['form_action'] = $GLOBALS['phpgw']->link('/index.php', 'menuaction=filemanager.uifilemanager.index', 'path=' . $this->path);
+                        $vars['edit_file'] = $this->filename;
                         # We need to include all of the fileman entries for each file's form,
                         # so we loop through again
@@ -961 +961 @@
                                 if ($this->filename)
                                         $value = 'value="' . $this->filename . '"';
-                                $vars[filemans_hidden] = '<input type="hidden" name="filename" ' . $value . ' />';
-                        }
-                        $vars[file_content] = $content;
-
-                        $vars[buttonPreview] = $this->inputButton('edit_preview', 'edit_preview', lang('Preview %1', $this->bo->html_encode($this->fileman[0], 1)));
-                        $vars[buttonSave] = $this->inputButton('edit_save', 'save', lang('Save %1', $this->bo->html_encode($this->filename, 1)));
-                        $vars[buttonDone] = $this->inputButton('edit_save_done', 'ok', lang('Save %1, and go back to file listing ', $this->bo->html_encode($this->filename, 1)));
-                        $vars[buttonCancel] = $this->inputButton('edit_cancel', 'cancel', lang('Cancel editing %1 without saving', $this->bo->html_encode($this->filename, 1)));
+                                $vars['filemans_hidden'] = '<input type="hidden" name="filename" ' . $value . ' />';
+                        }
+                        $vars['file_content'] = $content;
+
+                        $vars['buttonPreview'] = $this->inputButton('edit_preview', 'edit_preview', lang('Preview %1', $this->bo->html_encode($this->fileman[0], 1)));
+                        $vars['buttonSave'] = $this->inputButton('edit_save', 'save', lang('Save %1', $this->bo->html_encode($this->filename, 1)));
+                        $vars['buttonDone'] = $this->inputButton('edit_save_done', 'ok', lang('Save %1, and go back to file listing ', $this->bo->html_encode($this->filename, 1)));
+                        $vars['buttonCancel'] = $this->inputButton('edit_cancel', 'cancel', lang('Cancel editing %1 without saving', $this->bo->html_encode($this->filename, 1)));
 
                         if ($mime_type == 'text/html') {
-                                $vars[fck_edit] = '<script type="text/javascript" src="./library/ckeditor/ckeditor.js"></script>
+                                $vars['fck_edit'] = '<script type="text/javascript" src="./library/ckeditor/ckeditor.js"></script>
                                         <textarea cols="80" id="edit_file_content" name="edit_file_content" rows="10">' . $content . '</textarea>
                                                 <script type="text/javascript"> CKEDITOR.replace( \'edit_file_content\',{
@@ -1144 +1144 @@
                         $test = $this->bo->vfs->get_real_info(array('string' => $this->bo->fakebase . '/' . $group_array['account_name'],
                                                         'relatives' => array(RELATIVE_NONE), 'relative' => False));
-                        if ($test[mime_type] != 'Directory') {
+                        if ($test['mime_type'] != 'Directory') {
                                 continue;
                         }