geekwright / XoopsCore

extras/modules/system/admin/filemanager/jquery.php

Spacing +61 added lines, -61 removed lines

@@ -21,7 +21,7 @@ 
  */
 
 // Require mainfile
-require dirname(dirname(dirname(dirname(dirname(__FILE__))))) . '/mainfile.php' ;
+require dirname(dirname(dirname(dirname(dirname(__FILE__))))).'/mainfile.php';
 
 $xoops = Xoops::getInstance();
 $xoops->disableErrorReporting();
@@ -41,26 +41,26 @@ 
     case 'filemanager_display_folder':
 
         $_REQUEST['dir'] = urldecode($_REQUEST['dir']);
-        $root = XOOPS_ROOT_PATH . '/';
+        $root = XOOPS_ROOT_PATH.'/';
 
-        if (file_exists($root . $_REQUEST['dir'])) {
-            $files = scandir($root . $_REQUEST['dir']);
+        if (file_exists($root.$_REQUEST['dir'])) {
+            $files = scandir($root.$_REQUEST['dir']);
             natcasesort($files);
 
             if (count($files) > 2) { /* The 2 accounts for . and .. */
                 echo "<ul class=\"jqueryFileTree\" style=\"display: none;\">";
                 if ('/' == $_REQUEST['dir']) {
                     $url = $xoops->url('modules/system/admin.php?fct=filemanager');
-                    echo "<a href=\"" . $url . "\"><strong>/</strong></a>";
+                    echo "<a href=\"".$url."\"><strong>/</strong></a>";
                 }
                 // All dirs
                 foreach ($files as $file) {
-                    if (file_exists($root . $_REQUEST['dir'] . $file) && $file != '.' && $file != '..' && is_dir($root . $_REQUEST['dir'] . $file)) {
+                    if (file_exists($root.$_REQUEST['dir'].$file) && $file != '.' && $file != '..' && is_dir($root.$_REQUEST['dir'].$file)) {
                         //retirer .svn
                         $file_no_valid = array('.svn', 'conf', 'db', 'locks', 'hooks', 'cache', 'templates_c');
 
                         if (!in_array($file, $file_no_valid)) {
-                            echo "<li class=\"directory collapsed\"><a href='" . $_REQUEST['dir'] . $file . "' rel=\"" . htmlentities($_REQUEST['dir'] . $file) . "/\">" . htmlentities($file) . "</a></li>";
+                            echo "<li class=\"directory collapsed\"><a href='".$_REQUEST['dir'].$file."' rel=\"".htmlentities($_REQUEST['dir'].$file)."/\">".htmlentities($file)."</a></li>";
                         }
                     }
                 }
@@ -79,12 +79,12 @@ 
             $path_file = $_REQUEST['file'];
         } else {
             $file_arr = explode("/", $_REQUEST['file']);
-            $path_file = XOOPS_ROOT_PATH . '/';
-            $url_file = XOOPS_URL . '/';
+            $path_file = XOOPS_ROOT_PATH.'/';
+            $url_file = XOOPS_URL.'/';
 
             for ($i = 3; $i < count($file_arr); $i++) {
-                $path_file .= $file_arr[$i] . '/';
-                $url_file .= $file_arr[$i] . '/';
+                $path_file .= $file_arr[$i].'/';
+                $url_file .= $file_arr[$i].'/';
             }
         }
 
@@ -96,11 +96,11 @@ 
                 echo '
                <div class="xo-btn-actions">
                     <div class="xo-buttons">
-                        <button class="ui-corner-all tooltip" type="button" onclick="filemanager_load_tree();filemanager_display_file(\'\', 0)" title="' . _AM_SYSTEM_FILEMANAGER_HOME . '">
-                            <img src="' . system_AdminIcons('home.png') . '" alt="' . _AM_SYSTEM_FILEMANAGER_HOME . '" />
+                        <button class="ui-corner-all tooltip" type="button" onclick="filemanager_load_tree();filemanager_display_file(\'\', 0)" title="' . _AM_SYSTEM_FILEMANAGER_HOME.'">
+                            <img src="' . system_AdminIcons('home.png').'" alt="'._AM_SYSTEM_FILEMANAGER_HOME.'" />
                         </button>
-                        <button class="ui-corner-all tooltip" onclick="filemanager_add_directory(\'' . $path_file . '\')" title="' . _AM_SYSTEM_FILEMANAGER_ADDDIR . '">
-                            <img src="' . system_AdminIcons('folder_add.png') . '" alt="' . _AM_SYSTEM_FILEMANAGER_ADDDIR . '" />
+                        <button class="ui-corner-all tooltip" onclick="filemanager_add_directory(\'' . $path_file.'\')" title="'._AM_SYSTEM_FILEMANAGER_ADDDIR.'">
+                            <img src="' . system_AdminIcons('folder_add.png').'" alt="'._AM_SYSTEM_FILEMANAGER_ADDDIR.'" />
                         </button>';
                 $verif = true;
                 $protected = array(
@@ -108,26 +108,26 @@ 
                     'uploads', 'xoops_lib', 'xoops_data'
                 );
                 foreach ($protected as $folder) {
-                    $root_path = XOOPS_ROOT_PATH . '/' . $folder . '/';
+                    $root_path = XOOPS_ROOT_PATH.'/'.$folder.'/';
                     if (eregi($root_path, $path_file)) {
                         if (($root_path == $path_file)) {
                             $verif = false;
                         }
                     }
-                    if (XOOPS_ROOT_PATH . '/' == $path_file) {
+                    if (XOOPS_ROOT_PATH.'/' == $path_file) {
                         $verif = false;
                     }
                 }
                 if ($verif) {
-                    echo '<button class="ui-corner-all tooltip" onclick="filemanager_confirm_delete_directory(\'' . $path_file . '\')" title="' . _AM_SYSTEM_FILEMANAGER_DELDIR . '">
-                                    <img src="' . system_AdminIcons('folder_delete.png') . '" alt="' . _AM_SYSTEM_FILEMANAGER_DELDIR . '" />
+                    echo '<button class="ui-corner-all tooltip" onclick="filemanager_confirm_delete_directory(\''.$path_file.'\')" title="'._AM_SYSTEM_FILEMANAGER_DELDIR.'">
+                                    <img src="' . system_AdminIcons('folder_delete.png').'" alt="'._AM_SYSTEM_FILEMANAGER_DELDIR.'" />
                                   </button>';
                 }
-                echo '<button class="ui-corner-all tooltip" onclick="filemanager_add_file(\'' . $path_file . '\')" title="' . _AM_SYSTEM_FILEMANAGER_ADDFILE . '">
-                            <img src="' . system_AdminIcons('add.png') . '" alt="' . _AM_SYSTEM_FILEMANAGER_ADDFILE . '" />
+                echo '<button class="ui-corner-all tooltip" onclick="filemanager_add_file(\''.$path_file.'\')" title="'._AM_SYSTEM_FILEMANAGER_ADDFILE.'">
+                            <img src="' . system_AdminIcons('add.png').'" alt="'._AM_SYSTEM_FILEMANAGER_ADDFILE.'" />
                         </button>
-                        <button class="ui-corner-all tooltip" onclick="filemanager_upload(\'' . $path_file . '\')" title="' . _AM_SYSTEM_FILEMANAGER_UPLOAD . '">
-                            <img src="' . system_AdminIcons('upload.png') . '" alt="' . _AM_SYSTEM_FILEMANAGER_UPLOAD . '" />
+                        <button class="ui-corner-all tooltip" onclick="filemanager_upload(\'' . $path_file.'\')" title="'._AM_SYSTEM_FILEMANAGER_UPLOAD.'">
+                            <img src="' . system_AdminIcons('upload.png').'" alt="'._AM_SYSTEM_FILEMANAGER_UPLOAD.'" />
                         </button>
                     </div>
                 <div class="clear">&nbsp;</div>
@@ -136,14 +136,14 @@ 
                 // All files
                 echo '<table cellpadding="0" cellspacing="0"  border="0" align="center">
                         <tr>
-                            <td align="center" width="' . $width . '%" style="padding-bottom:12px">';
+                            <td align="center" width="' . $width.'%" style="padding-bottom:12px">';
                 foreach ($files as $file) {
                     if (!preg_match('#.back#', $file)) {
-                        if (file_exists($path_file . $file) && $file != '.' && $file != '..' && !is_dir($path_file . $file)) {
+                        if (file_exists($path_file.$file) && $file != '.' && $file != '..' && !is_dir($path_file.$file)) {
                             //echo $path_file . $file.'<br />';
                             $unzip = '';
                             $edit = false;
-                            $file1 = XoopsFile::getHandler('file', $path_file . $file);
+                            $file1 = XoopsFile::getHandler('file', $path_file.$file);
                             $extension_verif = $file1->ext();
 
                             switch ($extension_verif) {
@@ -165,7 +165,7 @@ 
                                 case 'gz':
                                     $extension_verif = 'rar';
                                     $edit = true;
-                                    $unzip = '<img class="cursorpointer" src="./images/icons/untar.png" onclick=\'filemanager_unzip_file("' . $path_file . $file . '", "' . $path_file . '", "' . $file . '");\' width="16" alt="edit" />&nbsp;';
+                                    $unzip = '<img class="cursorpointer" src="./images/icons/untar.png" onclick=\'filemanager_unzip_file("'.$path_file.$file.'", "'.$path_file.'", "'.$file.'");\' width="16" alt="edit" />&nbsp;';
                                     break;
                                 case 'css':
                                     $extension_verif = 'css';
@@ -200,37 +200,37 @@ 
                                     break;
                             }
                             if ($edit == true) {
-                                $edit = '<img class="cursorpointer" src="' . system_AdminIcons('edit.png') . '" onclick=\'filemanager_edit_file("' . $path_file . $file . '", "' . $path_file . '", "' . $file . '", "' . $extension_verif . '");\' width="16" alt="edit" />';
+                                $edit = '<img class="cursorpointer" src="'.system_AdminIcons('edit.png').'" onclick=\'filemanager_edit_file("'.$path_file.$file.'", "'.$path_file.'", "'.$file.'", "'.$extension_verif.'");\' width="16" alt="edit" />';
                             } else {
                                 $edit = '';
                             }
                             //Chmod
                             $chmod = substr($file1->perms(), 1);
 
-                            $chmod = modify_chmod($chmod, $path_file . $file, $count_file);
+                            $chmod = modify_chmod($chmod, $path_file.$file, $count_file);
 
                             //Img
                             if ($extension_verif == 'picture') {
-                                list($width, $height) = getimagesize($path_file . $file);
+                                list($width, $height) = getimagesize($path_file.$file);
                                 if ($height > 60) {
-                                    $img = '<img src="' . $url_file . $file . '" height="47" title="" alt="" />';
+                                    $img = '<img src="'.$url_file.$file.'" height="47" title="" alt="" />';
                                 } else {
-                                    $img = '<img src="' . $url_file . $file . '" title="" alt="" />';
+                                    $img = '<img src="'.$url_file.$file.'" title="" alt="" />';
                                 }
                             } else {
-                                $img = '<img src="./images/mimetypes/' . $extension_verif . '_48.png" title="" alt="" />';
+                                $img = '<img src="./images/mimetypes/'.$extension_verif.'_48.png" title="" alt="" />';
                             }
                             echo '<div style="border: 1px solid #cccccc;">
                                             <table cellpadding="0" cellspacing="0">
                                                 <tr class="odd">
-                                                    <td align="left">' . $chmod . '</td>
-                                                    <td align="right">' . $unzip . $edit . '&nbsp;<img class="cursorpointer" src="' . system_AdminIcons('delete.png') . '" onclick=\'filemanager_confirm_delete_file("' . $path_file . $file . '", "' . $path_file . '");\' width="16" alt="delete" /></td>
+                                                    <td align="left">' . $chmod.'</td>
+                                                    <td align="right">' . $unzip.$edit.'&nbsp;<img class="cursorpointer" src="'.system_AdminIcons('delete.png').'" onclick=\'filemanager_confirm_delete_file("'.$path_file.$file.'", "'.$path_file.'");\' width="16" alt="delete" /></td>
                                                 </tr>
                                                 <tr>
-                                                    <td colspan="2" align="center" height="60px"><br />' . $img . '</td>
+                                                    <td colspan="2" align="center" height="60px"><br />' . $img.'</td>
                                                 </tr>
                                                 <tr>
-                                                    <td colspan="2" align="center">' . $file . '<br /><br /></td>
+                                                    <td colspan="2" align="center">' . $file.'<br /><br /></td>
                                                 </tr>
                                             </table>
                                         </div>
@@ -259,13 +259,13 @@ 
         if ($_REQUEST['path'] != '') {
             $path = trim($_REQUEST['path']);
         } else {
-            $path = XOOPS_ROOT_PATH . '/';
+            $path = XOOPS_ROOT_PATH.'/';
         }
 
         //Button restore
-        if (file_exists($path_file . '.back')) {
-            $restore = '<button class="ui-corner-all tooltip" type="button" onclick="filemanager_restore(\'' . $path_file . '\')" value="' . _AM_SYSTEM_FILEMANAGER_RESTORE . '" title="' . _AM_SYSTEM_FILEMANAGER_RESTORE . '">
-                            <img src="' . system_AdminIcons('revert.png') . '" alt="' . _AM_SYSTEM_FILEMANAGER_RESTORE . '" />
+        if (file_exists($path_file.'.back')) {
+            $restore = '<button class="ui-corner-all tooltip" type="button" onclick="filemanager_restore(\''.$path_file.'\')" value="'._AM_SYSTEM_FILEMANAGER_RESTORE.'" title="'._AM_SYSTEM_FILEMANAGER_RESTORE.'">
+                            <img src="' . system_AdminIcons('revert.png').'" alt="'._AM_SYSTEM_FILEMANAGER_RESTORE.'" />
                         </button>';
         } else {
             $restore = '';
@@ -285,12 +285,12 @@ 
                       <td>
                           <div class="xo-btn-actions">
                               <div class="xo-buttons">
-                                  <button class="ui-corner-all tooltip" type="submit" value="' . _AM_SYSTEM_FILEMANAGER_SAVE . '" title="' . _AM_SYSTEM_FILEMANAGER_SAVE . '">
-                                      <img src="' . system_AdminIcons('save.png') . '" alt="' . _AM_SYSTEM_FILEMANAGER_SAVE . '" />
+                                  <button class="ui-corner-all tooltip" type="submit" value="' . _AM_SYSTEM_FILEMANAGER_SAVE.'" title="'._AM_SYSTEM_FILEMANAGER_SAVE.'">
+                                      <img src="' . system_AdminIcons('save.png').'" alt="'._AM_SYSTEM_FILEMANAGER_SAVE.'" />
                                   </button>
-                                  ' . $restore . '
-                                  <button class="ui-corner-all tooltip" type="button" onclick="$(\'#edit_file\').fadeOut(\'fast\');$(\'#display_file\').fadeIn(\'fast\');" title="' . _AM_SYSTEM_FILEMANAGER_CANCEL . '">
-                                      <img src="' . system_AdminIcons('cancel.png') . '" alt="' . _AM_SYSTEM_FILEMANAGER_CANCEL . '" />
+                                  ' . $restore.'
+                                  <button class="ui-corner-all tooltip" type="button" onclick="$(\'#edit_file\').fadeOut(\'fast\');$(\'#display_file\').fadeIn(\'fast\');" title="' . _AM_SYSTEM_FILEMANAGER_CANCEL.'">
+                                      <img src="' . system_AdminIcons('cancel.png').'" alt="'._AM_SYSTEM_FILEMANAGER_CANCEL.'" />
                                   </button>
                                   <div class="clear"></div>
                              </div>
@@ -298,10 +298,10 @@ 
                     </td>
                 </tr>
                 <tr><td>
-                <textarea id="code_mirror" name="filemanager" rows=24 cols=110>' . $content . '</textarea>
+                <textarea id="code_mirror" name="filemanager" rows=24 cols=110>' . $content.'</textarea>
                 </td></tr>
               </table>';
-        echo '<input type="hidden" name="path_file" value="' . $path_file . '"><input type="hidden" name="path" value="' . $path . '"><input type="hidden" name="file" value="' . trim($_REQUEST['file']) . '"><input type="hidden" name="ext" value="' . $ext . '"></form>';
+        echo '<input type="hidden" name="path_file" value="'.$path_file.'"><input type="hidden" name="path" value="'.$path.'"><input type="hidden" name="file" value="'.trim($_REQUEST['file']).'"><input type="hidden" name="ext" value="'.$ext.'"></form>';
         break;
 
     case 'filemanager_unzip_file':
@@ -310,7 +310,7 @@ 
         if ($_REQUEST['path'] != '') {
             $path = trim($_REQUEST['path']);
         } else {
-            $path = XOOPS_ROOT_PATH . '/';
+            $path = XOOPS_ROOT_PATH.'/';
         }
         $file = $_REQUEST['file'];
 
@@ -337,14 +337,14 @@ 
 
     //Confirm delete file
     case 'filemanager_confirm_delete_file':
-        echo '<div class="confirmMsg">' . sprintf(_AM_SYSTEM_FILEMANAGER_SUREDEL, $_REQUEST['file']) . '<br /><br /><div class="buttons"><a href="#" class="ui-corner-all" onclick="filemanager_delete_file(\'' . $_REQUEST['path_file'] . '\', \'' . $_REQUEST['path'] . '\');">' . _AM_SYSTEM_FILEMANAGER_DELETE . '</a>&nbsp;&nbsp;<a href="#" class="ui-corner-all" onclick="$(\'#confirm_delete\').hide();filemanager_load_tree(); filemanager_display_file(\'\', 0)">' . _AM_SYSTEM_FILEMANAGER_CANCEL . '</a></div></div>';
+        echo '<div class="confirmMsg">'.sprintf(_AM_SYSTEM_FILEMANAGER_SUREDEL, $_REQUEST['file']).'<br /><br /><div class="buttons"><a href="#" class="ui-corner-all" onclick="filemanager_delete_file(\''.$_REQUEST['path_file'].'\', \''.$_REQUEST['path'].'\');">'._AM_SYSTEM_FILEMANAGER_DELETE.'</a>&nbsp;&nbsp;<a href="#" class="ui-corner-all" onclick="$(\'#confirm_delete\').hide();filemanager_load_tree(); filemanager_display_file(\'\', 0)">'._AM_SYSTEM_FILEMANAGER_CANCEL.'</a></div></div>';
         break;
 
     //Delete one file
     case 'filemanager_delete_file':
         $file = XoopsFile::getHandler('file', $_REQUEST['path_file']);
         if (!$file->delete()) {
-            echo $xoops->alert('error',_AM_SYSTEM_FILEMANAGER_ERROR);
+            echo $xoops->alert('error', _AM_SYSTEM_FILEMANAGER_ERROR);
         } else {
             echo $xoops->alert('info', _AM_SYSTEM_FILEMANAGER_DELETE_FILE);
         }
@@ -355,7 +355,7 @@ 
         if ($_REQUEST['path'] != '') {
             $path = trim($_REQUEST['path']);
         } else {
-            $path = XOOPS_ROOT_PATH . '/';
+            $path = XOOPS_ROOT_PATH.'/';
         }
 
         $form = new Xoops\Form\ThemeForm('', 'upload_form', 'admin.php?fct=filemanager', "post", true);
@@ -371,7 +371,7 @@ 
         if ($_REQUEST['path'] != '') {
             $path = trim($_REQUEST['path']);
         } else {
-            $path = XOOPS_ROOT_PATH . '/';
+            $path = XOOPS_ROOT_PATH.'/';
         }
 
         $form = new Xoops\Form\Theme\Form('', 'newdir_form', 'admin.php?fct=filemanager', "post", true);
@@ -386,7 +386,7 @@ 
     //Confirm delete directory
     case 'filemanager_confirm_delete_directory':
         $path = $system->cleanVars($_REQUEST, 'path', '', 'string');
-        echo '<div class="confirmMsg">' . sprintf(_AM_SYSTEM_FILEMANAGER_DIR_SUREDEL, $path) . '<br /><br /><div class="buttons"><a href="#" class="ui-corner-all" onclick="filemanager_delete_directory(\'' . $path . '\');">' . _AM_SYSTEM_FILEMANAGER_DELETE . '</a>&nbsp;&nbsp;<a href="#" class="ui-corner-all" onclick="$(\'#confirm_delete\').hide();filemanager_load_tree(); filemanager_display_file(\'\', 0)">' . _AM_SYSTEM_FILEMANAGER_CANCEL . '</a></div></div>';
+        echo '<div class="confirmMsg">'.sprintf(_AM_SYSTEM_FILEMANAGER_DIR_SUREDEL, $path).'<br /><br /><div class="buttons"><a href="#" class="ui-corner-all" onclick="filemanager_delete_directory(\''.$path.'\');">'._AM_SYSTEM_FILEMANAGER_DELETE.'</a>&nbsp;&nbsp;<a href="#" class="ui-corner-all" onclick="$(\'#confirm_delete\').hide();filemanager_load_tree(); filemanager_display_file(\'\', 0)">'._AM_SYSTEM_FILEMANAGER_CANCEL.'</a></div></div>';
         break;
 
     // Delete one directory
@@ -403,7 +403,7 @@ 
                 if ($name === '.' || $name === '..') {
                     continue;
                 }
-                $full_name = $dossier . '/' . $name;
+                $full_name = $dossier.'/'.$name;
 
                 if (is_dir($full_name)) {
                     deltree($full_name);
@@ -417,9 +417,9 @@ 
         }
 
         if (deltree($_REQUEST['path'])) {
-            echo $xoops->alert('info',_AM_SYSTEM_FILEMANAGER_DELDIR_OK);
+            echo $xoops->alert('info', _AM_SYSTEM_FILEMANAGER_DELDIR_OK);
         } else {
-            echo $xoops->alert('error',_AM_SYSTEM_FILEMANAGER_DELDIR_NOTOK);
+            echo $xoops->alert('error', _AM_SYSTEM_FILEMANAGER_DELDIR_NOTOK);
         }
         break;
 
@@ -427,7 +427,7 @@ 
         if ($_REQUEST['path'] != '') {
             $path = trim($_REQUEST['path']);
         } else {
-            $path = XOOPS_ROOT_PATH . '/';
+            $path = XOOPS_ROOT_PATH.'/';
         }
 
         $form = new Xoops\Form\ThemeForm('', 'newdir_form', 'admin.php?fct=filemanager', "post", true);
@@ -445,10 +445,10 @@ 
         if ($_REQUEST['path_file'] != '') {
             $path = trim($_REQUEST['path_file']);
         } else {
-            $path = XOOPS_ROOT_PATH . '/';
+            $path = XOOPS_ROOT_PATH.'/';
         }
 
-        if (chmod($path, '0' . $_REQUEST['chmod'])) {
+        if (chmod($path, '0'.$_REQUEST['chmod'])) {
             $new_chmod = modify_chmod($_REQUEST['chmod'], $path, $_REQUEST['id']);
             echo $new_chmod;
         }
@@ -457,7 +457,7 @@ 
 
     //Restore
     case 'filemanager_restore':
-        $old_file = $_REQUEST['path_file'] . '.back';
+        $old_file = $_REQUEST['path_file'].'.back';
         $new_file = $_REQUEST['path_file'];
         if (file_exists($old_file)) {
             if (unlink($new_file)) {

extras/modules/system/language/english/admin/filemanager.php

Indentation +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
  * _CHARSET     UTF-8
  */
 
- //Nav
+    //Nav
 define('_AM_SYSTEM_FILEMANAGER_NAV_MANAGER','File Manager');
 define('_AM_SYSTEM_FILEMANAGER_NAV_MAIN','File Manager');
 

Spacing +39 added lines, -39 removed lines

@@ -7,56 +7,56 @@
  */
 
  //Nav
-define('_AM_SYSTEM_FILEMANAGER_NAV_MANAGER','File Manager');
-define('_AM_SYSTEM_FILEMANAGER_NAV_MAIN','File Manager');
+define('_AM_SYSTEM_FILEMANAGER_NAV_MANAGER', 'File Manager');
+define('_AM_SYSTEM_FILEMANAGER_NAV_MAIN', 'File Manager');
 
 //Tips
-define('_AM_SYSTEM_FILEMANAGER_NAV_TIPS','
+define('_AM_SYSTEM_FILEMANAGER_NAV_TIPS', '
 <ul>
 <li>Change file permission, content or just delete an unused file from your XOOPS site.</li>
 </ul>
 ');
 
 // Main
-define('_AM_SYSTEM_FILEMANAGER_DIRECTORY','Directory');
-define('_AM_SYSTEM_FILEMANAGER_FILES','Files');
-define('_AM_SYSTEM_FILEMANAGER_GENERATE','Force generation');
-define('_AM_SYSTEM_FILEMANAGER_SELECT_THEME','Select theme');
-define('_AM_SYSTEM_FILEMANAGER_FORCE_GENERATED','Force generated');
-define('_AM_SYSTEM_FILEMANAGER_NAV_FILE_GENERATED','Files generated');
-define('_AM_SYSTEM_FILEMANAGER_NOT_CREATED','No files created');
-define('_AM_SYSTEM_FILEMANAGER_HOME','Home');
-define('_AM_SYSTEM_FILEMANAGER_SAVE','Save');
-define('_AM_SYSTEM_FILEMANAGER_CANCEL','Cancel');
-define('_AM_SYSTEM_FILEMANAGER_RESTORE','Restore');
-define('_AM_SYSTEM_FILEMANAGER_REFRESH','Refresh');
-define('_AM_SYSTEM_FILEMANAGER_UPLOAD','Upload file');
-define('_AM_SYSTEM_FILEMANAGER_UPLOAD_CHOOSE','Select file to upload');
-define('_AM_SYSTEM_FILEMANAGER_ADDDIR','Add Directory');
-define('_AM_SYSTEM_FILEMANAGER_ADDDIR_NAME','Choose name of directory');
-define('_AM_SYSTEM_FILEMANAGER_ADDFILE','Add New File');
-define('_AM_SYSTEM_FILEMANAGER_DELDIR','Delete Directory');
+define('_AM_SYSTEM_FILEMANAGER_DIRECTORY', 'Directory');
+define('_AM_SYSTEM_FILEMANAGER_FILES', 'Files');
+define('_AM_SYSTEM_FILEMANAGER_GENERATE', 'Force generation');
+define('_AM_SYSTEM_FILEMANAGER_SELECT_THEME', 'Select theme');
+define('_AM_SYSTEM_FILEMANAGER_FORCE_GENERATED', 'Force generated');
+define('_AM_SYSTEM_FILEMANAGER_NAV_FILE_GENERATED', 'Files generated');
+define('_AM_SYSTEM_FILEMANAGER_NOT_CREATED', 'No files created');
+define('_AM_SYSTEM_FILEMANAGER_HOME', 'Home');
+define('_AM_SYSTEM_FILEMANAGER_SAVE', 'Save');
+define('_AM_SYSTEM_FILEMANAGER_CANCEL', 'Cancel');
+define('_AM_SYSTEM_FILEMANAGER_RESTORE', 'Restore');
+define('_AM_SYSTEM_FILEMANAGER_REFRESH', 'Refresh');
+define('_AM_SYSTEM_FILEMANAGER_UPLOAD', 'Upload file');
+define('_AM_SYSTEM_FILEMANAGER_UPLOAD_CHOOSE', 'Select file to upload');
+define('_AM_SYSTEM_FILEMANAGER_ADDDIR', 'Add Directory');
+define('_AM_SYSTEM_FILEMANAGER_ADDDIR_NAME', 'Choose name of directory');
+define('_AM_SYSTEM_FILEMANAGER_ADDFILE', 'Add New File');
+define('_AM_SYSTEM_FILEMANAGER_DELDIR', 'Delete Directory');
 
-define('_AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_EXISTS','Error: File not exist');
-define('_AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_DELETE','Error: File not delete');
-define('_AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_RENAME','Error: File not rename');
-define('_AM_SYSTEM_FILEMANAGER_BACK','Back');
-define('_AM_SYSTEM_FILEMANAGER_DELETE','Delete');
-define('_AM_SYSTEM_FILEMANAGER_ERROR','Error');
-define('_AM_SYSTEM_FILEMANAGER_EDIT','Edit of:');
-define('_AM_SYSTEM_FILEMANAGER_EMPTY_FILE','File empty');
-define('_AM_SYSTEM_FILEMANAGER_DELDIR_NOTOK','Error: delete this directory');
-define('_AM_SYSTEM_FILEMANAGER_DELDIR_OK','Directory successfully deleted');
+define('_AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_EXISTS', 'Error: File not exist');
+define('_AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_DELETE', 'Error: File not delete');
+define('_AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_RENAME', 'Error: File not rename');
+define('_AM_SYSTEM_FILEMANAGER_BACK', 'Back');
+define('_AM_SYSTEM_FILEMANAGER_DELETE', 'Delete');
+define('_AM_SYSTEM_FILEMANAGER_ERROR', 'Error');
+define('_AM_SYSTEM_FILEMANAGER_EDIT', 'Edit of:');
+define('_AM_SYSTEM_FILEMANAGER_EMPTY_FILE', 'File empty');
+define('_AM_SYSTEM_FILEMANAGER_DELDIR_NOTOK', 'Error: delete this directory');
+define('_AM_SYSTEM_FILEMANAGER_DELDIR_OK', 'Directory successfully deleted');
 
 // Message
-define('_AM_SYSTEM_FILEMANAGER_UPLOAD_FILE','Files successfully uploaded');
-define('_AM_SYSTEM_FILEMANAGER_EXTRACT_FILE','Files successfully extracted');
-define('_AM_SYSTEM_FILEMANAGER_EXTRACT_ERROR','Files could not be extracted');
-define('_AM_SYSTEM_FILEMANAGER_DELETE_FILE','Files successfully deleted');
-define('_AM_SYSTEM_FILEMANAGER_DIR_SUCCESS','Directory successfully created');
-define('_AM_SYSTEM_FILEMANAGER_DIR_ERROR','Directory could not be created');
-define('_AM_SYSTEM_FILEMANAGER_DIR_RYSDEL','Are you sure to delete this folder?');
-define('_AM_SYSTEM_FILEMANAGER_FILE_SUCCESS','File successfully created');
+define('_AM_SYSTEM_FILEMANAGER_UPLOAD_FILE', 'Files successfully uploaded');
+define('_AM_SYSTEM_FILEMANAGER_EXTRACT_FILE', 'Files successfully extracted');
+define('_AM_SYSTEM_FILEMANAGER_EXTRACT_ERROR', 'Files could not be extracted');
+define('_AM_SYSTEM_FILEMANAGER_DELETE_FILE', 'Files successfully deleted');
+define('_AM_SYSTEM_FILEMANAGER_DIR_SUCCESS', 'Directory successfully created');
+define('_AM_SYSTEM_FILEMANAGER_DIR_ERROR', 'Directory could not be created');
+define('_AM_SYSTEM_FILEMANAGER_DIR_RYSDEL', 'Are you sure to delete this folder?');
+define('_AM_SYSTEM_FILEMANAGER_FILE_SUCCESS', 'File successfully created');
 define('_AM_SYSTEM_FILEMANAGER_SUREDEL', 'Are you sure to delete this file %s?');
 define('_AM_SYSTEM_FILEMANAGER_DIR_SUREDEL', 'Are you sure you want to delete this directory %s?<br />Warning: all subdirectories and files file will be deleted');
 ?>

extras/mainfile.php

Spacing +1 added lines, -1 removed lines

@@ -14,6 +14,6 @@
  * Typical writable permission would be 665 (user read/write, group read/write, other read)
  * If problems persist, escalate permission to 777 (world read/write/execute) as a last resort.
  */
-if (! defined('XOOPS_INSTALL')) {
+if (!defined('XOOPS_INSTALL')) {
     header('Location: install/index.php');
 }

upgrade/upd-2.0.16-to-2.0.17/index.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
     {
         $xoops = Xoops::getInstance();
         $db = $xoops->db();
-        $value = getDbValue($db, 'config', 'conf_id', "`conf_name` = 'ldap_use_TLS' AND `conf_catid` = " . XOOPS_CONF_AUTH);
+        $value = getDbValue($db, 'config', 'conf_id', "`conf_name` = 'ldap_use_TLS' AND `conf_catid` = ".XOOPS_CONF_AUTH);
         return (bool)($value);
     }
 
@@ -55,7 +55,7 @@ 
         );
         foreach ($data as $name => $values) {
             if (!getDbValue($db, 'config', 'conf_id', "`conf_modid`=0 AND `conf_catid`=7 AND `conf_name`='$name'")) {
-                $this->query("INSERT INTO `$table` (conf_modid,conf_catid,conf_name,conf_title,conf_value,conf_desc,conf_formtype,conf_valuetype,conf_order) " . "VALUES ( 0,7,'$name',$values)");
+                $this->query("INSERT INTO `$table` (conf_modid,conf_catid,conf_name,conf_title,conf_value,conf_desc,conf_formtype,conf_valuetype,conf_order) "."VALUES ( 0,7,'$name',$values)");
             }
         }
         return true;

htdocs/themes/default/locale/en_US/_main.php

Spacing +13 added lines, -13 removed lines

@@ -20,22 +20,22 @@
  * @version         $Id$
  */
 
-define("_THEME_LOGIN","Login");
-define("_THEME_REGISTER","Register");
+define("_THEME_LOGIN", "Login");
+define("_THEME_REGISTER", "Register");
 
-define("_THEME_HOME","Home");
+define("_THEME_HOME", "Home");
 
-define("_THEME_WELCOME","Welcome");
+define("_THEME_WELCOME", "Welcome");
 
 
-define("_THEME_QUICK","Quick links");
-define("_THEME_ADMIN","Administration");
-define("_THEME_MYACCOUNT","View account");
-define("_THEME_EDITPROFILE","Edit account");
-define("_THEME_NOTIFICATION","Notifications");
-define("_THEME_PM","Inbox");
-define("_THEME_LOGOUT","Logout");
+define("_THEME_QUICK", "Quick links");
+define("_THEME_ADMIN", "Administration");
+define("_THEME_MYACCOUNT", "View account");
+define("_THEME_EDITPROFILE", "Edit account");
+define("_THEME_NOTIFICATION", "Notifications");
+define("_THEME_PM", "Inbox");
+define("_THEME_LOGOUT", "Logout");
 
-define("_THEME_BACKTOP","Back to top");
+define("_THEME_BACKTOP", "Back to top");
 
-define("_THEME_LANGUAGE","Choose your language");
+define("_THEME_LANGUAGE", "Choose your language");

htdocs/modules/gravatars/admin/about.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
  * @author          Mage Grégory (AKA Mage)
  * @version         $Id$
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $xoops = Xoops::getInstance();
 $xoops->header();
 $aboutAdmin = new \Xoops\Module\Admin();

htdocs/modules/gravatars/admin/header.php

Spacing +1 added lines, -1 removed lines

@@ -19,4 +19,4 @@
  * @author          Mage Grégory (AKA Mage)
  * @version         $Id$
  */
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';

htdocs/modules/pdf/admin/about.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
  * @author          Mage Grégory (AKA Mage)
  * @version         $Id$
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $xoops = Xoops::getInstance();
 $xoops->header();
 $aboutAdmin = new \Xoops\Module\Admin();

htdocs/modules/pdf/admin/header.php

Spacing +1 added lines, -1 removed lines

@@ -19,4 +19,4 @@
  * @author          Mage Grégory (AKA Mage)
  * @version         $Id$
  */
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';