evolution-cms / evolution

manager/includes/functions/actions/files.php

Spacing +66 added lines, -66 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!function_exists('add_dot')) {
+if (!function_exists('add_dot')) {
     /**
      * @param array $array
      * @return array
@@ -8,14 +8,14 @@ 
     {
         $count = count($array);
         for ($i = 0; $i < $count; $i++) {
-            $array[$i] = '.' . strtolower(trim($array[$i])); // add a dot :)
+            $array[$i] = '.'.strtolower(trim($array[$i])); // add a dot :)
         }
 
         return $array;
     }
 }
 
-if(!function_exists('determineIcon')) {
+if (!function_exists('determineIcon')) {
     /**
      * @param string $file
      * @param string $selFile
@@ -34,11 +34,11 @@ 
             $icon = isset($icons[$mode]) ? $icons[$mode] : $icons['default'];
         }
 
-        return '<i class="' . $icon . ' FilesPage"></i>';
+        return '<i class="'.$icon.' FilesPage"></i>';
     }
 }
 
-if(!function_exists('markRow')) {
+if (!function_exists('markRow')) {
     /**
      * @param string $file
      * @param string $selFile
@@ -55,14 +55,14 @@ 
         if ($file == $selFile) {
             $class = isset($classNames[$mode]) ? $classNames[$mode] : $classNames['default'];
 
-            return ' class="' . $class . '"';
+            return ' class="'.$class.'"';
         }
 
         return '';
     }
 }
 
-if(!function_exists('ls')) {
+if (!function_exists('ls')) {
     /**
      * @param string $curpath
      */
@@ -72,7 +72,7 @@ 
         global $excludes, $protected_path, $editablefiles, $inlineviewablefiles, $viewablefiles, $enablefileunzip, $enablefiledownload, $uploadablefiles, $folders, $files, $filesizes, $len, $dirs_array, $files_array, $webstart_path, $modx;
         $dircounter = 0;
         $filecounter = 0;
-        $curpath = str_replace('//', '/', $curpath . '/');
+        $curpath = str_replace('//', '/', $curpath.'/');
 
         if (!is_dir($curpath)) {
             echo 'Invalid path "', $curpath, '"<br />';
@@ -83,7 +83,7 @@ 
 
         // first, get info
         foreach ($dir as $file) {
-            $newpath = $curpath . $file;
+            $newpath = $curpath.$file;
             if ($file === '..' || $file === '.') {
                 continue;
             }
@@ -93,7 +93,7 @@ 
                 if ($file === '..' || $file === '.') {
                     continue;
                 } elseif (!in_array($file, $excludes) && !in_array($newpath, $protected_path)) {
-                    $dirs_array[$dircounter]['text'] = '<i class="' . $_style['files_folder'] . ' FilesFolder"></i> <a href="index.php?a=31&mode=drill&path=' . urlencode($newpath) . '"><b>' . $file . '</b></a>';
+                    $dirs_array[$dircounter]['text'] = '<i class="'.$_style['files_folder'].' FilesFolder"></i> <a href="index.php?a=31&mode=drill&path='.urlencode($newpath).'"><b>'.$file.'</b></a>';
 
                     $dfiles = scandir($newpath);
                     foreach ($dfiles as $i => $infile) {
@@ -106,13 +106,13 @@ 
                     }
                     $file_exists = (0 < count($dfiles)) ? 'file_exists' : '';
 
-                    $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<a href="javascript: deleteFolder(\'' . urlencode($file) . '\',\'' . $file_exists . '\');"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_folder'] . '"></i></a>' : '';
+                    $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<a href="javascript: deleteFolder(\''.urlencode($file).'\',\''.$file_exists.'\');"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_folder'].'"></i></a>' : '';
                 } else {
-                    $dirs_array[$dircounter]['text'] = '<span><i class="' . $_style['files_deleted_folder'] . ' FilesDeletedFolder"></i> ' . $file . '</span>';
-                    $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<span class="disabled"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_folder'] . '"></i></span>' : '';
+                    $dirs_array[$dircounter]['text'] = '<span><i class="'.$_style['files_deleted_folder'].' FilesDeletedFolder"></i> '.$file.'</span>';
+                    $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<span class="disabled"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_folder'].'"></i></span>' : '';
                 }
 
-                $dirs_array[$dircounter]['rename'] = is_writable($curpath) ? '<a href="javascript:renameFolder(\'' . urlencode($file) . '\');"><i class="' . $_style['files_rename'] . '" title="' . $_lang['rename'] . '"></i></a> ' : '';
+                $dirs_array[$dircounter]['rename'] = is_writable($curpath) ? '<a href="javascript:renameFolder(\''.urlencode($file).'\');"><i class="'.$_style['files_rename'].'" title="'.$_lang['rename'].'"></i></a> ' : '';
 
                 // increment the counter
                 $dircounter++;
@@ -121,24 +121,24 @@ 
                 $files_array[$filecounter]['file'] = $newpath;
                 $files_array[$filecounter]['stats'] = lstat($newpath);
                 $files_array[$filecounter]['text'] = determineIcon($newpath, $_REQUEST['path'],
-                        $_REQUEST['mode']) . ' ' . $file;
+                        $_REQUEST['mode']).' '.$file;
                 $files_array[$filecounter]['view'] = (in_array($type,
-                    $viewablefiles)) ? '<a href="javascript:;" onclick="viewfile(\'' . $webstart_path . substr($newpath,
+                    $viewablefiles)) ? '<a href="javascript:;" onclick="viewfile(\''.$webstart_path.substr($newpath,
                         $len,
-                        strlen($newpath)) . '\');"><i class="' . $_style['files_view'] . '" title="' . $_lang['files_viewfile'] . '"></i></a>' : (($enablefiledownload && in_array($type,
-                        $uploadablefiles)) ? '<a href="' . $webstart_path . implode('/', array_map('rawurlencode',
+                        strlen($newpath)).'\');"><i class="'.$_style['files_view'].'" title="'.$_lang['files_viewfile'].'"></i></a>' : (($enablefiledownload && in_array($type,
+                        $uploadablefiles)) ? '<a href="'.$webstart_path.implode('/', array_map('rawurlencode',
                         explode('/', substr($newpath, $len,
-                            strlen($newpath))))) . '" style="cursor:pointer;"><i class="' . $_style['files_download'] . '" title="' . $_lang['file_download_file'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_view'] . '" title="' . $_lang['files_viewfile'] . '"></i></span>');
+                            strlen($newpath))))).'" style="cursor:pointer;"><i class="'.$_style['files_download'].'" title="'.$_lang['file_download_file'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_view'].'" title="'.$_lang['files_viewfile'].'"></i></span>');
                 $files_array[$filecounter]['view'] = (in_array($type,
-                    $inlineviewablefiles)) ? '<a href="index.php?a=31&mode=view&path=' . urlencode($newpath) . '"><i class="' . $_style['files_view'] . '" title="' . $_lang['files_viewfile'] . '"></i></a>' : $files_array[$filecounter]['view'];
-                $files_array[$filecounter]['unzip'] = ($enablefileunzip && $type == '.zip') ? '<a href="javascript:unzipFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_unzip'] . '" title="' . $_lang['file_download_unzip'] . '"></i></a>' : '';
+                    $inlineviewablefiles)) ? '<a href="index.php?a=31&mode=view&path='.urlencode($newpath).'"><i class="'.$_style['files_view'].'" title="'.$_lang['files_viewfile'].'"></i></a>' : $files_array[$filecounter]['view'];
+                $files_array[$filecounter]['unzip'] = ($enablefileunzip && $type == '.zip') ? '<a href="javascript:unzipFile(\''.urlencode($file).'\');"><i class="'.$_style['files_unzip'].'" title="'.$_lang['file_download_unzip'].'"></i></a>' : '';
                 $files_array[$filecounter]['edit'] = (in_array($type,
-                        $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="index.php?a=31&mode=edit&path=' . urlencode($newpath) . '#file_editfile"><i class="' . $_style['files_edit'] . '" title="' . $_lang['files_editfile'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_edit'] . '" title="' . $_lang['files_editfile'] . '"></i></span>';
+                        $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="index.php?a=31&mode=edit&path='.urlencode($newpath).'#file_editfile"><i class="'.$_style['files_edit'].'" title="'.$_lang['files_editfile'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_edit'].'" title="'.$_lang['files_editfile'].'"></i></span>';
                 $files_array[$filecounter]['duplicate'] = (in_array($type,
-                        $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:duplicateFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_duplicate'] . '" title="' . $_lang['duplicate'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_duplicate'] . '" align="absmiddle" title="' . $_lang['duplicate'] . '"></i></span>';
+                        $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:duplicateFile(\''.urlencode($file).'\');"><i class="'.$_style['files_duplicate'].'" title="'.$_lang['duplicate'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_duplicate'].'" align="absmiddle" title="'.$_lang['duplicate'].'"></i></span>';
                 $files_array[$filecounter]['rename'] = (in_array($type,
-                        $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:renameFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_rename'] . '" align="absmiddle" title="' . $_lang['rename'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_rename'] . '" align="absmiddle" title="' . $_lang['rename'] . '"></i></span>';
-                $files_array[$filecounter]['delete'] = is_writable($curpath) && is_writable($newpath) ? '<a href="javascript:deleteFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_file'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_file'] . '"></i></span>';
+                        $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:renameFile(\''.urlencode($file).'\');"><i class="'.$_style['files_rename'].'" align="absmiddle" title="'.$_lang['rename'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_rename'].'" align="absmiddle" title="'.$_lang['rename'].'"></i></span>';
+                $files_array[$filecounter]['delete'] = is_writable($curpath) && is_writable($newpath) ? '<a href="javascript:deleteFile(\''.urlencode($file).'\');"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_file'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_file'].'"></i></span>';
 
                 // increment the counter
                 $filecounter++;
@@ -151,9 +151,9 @@ 
         for ($i = 0; $i < $folders; $i++) {
             $filesizes += $dirs_array[$i]['stats']['7'];
             echo '<tr>';
-            echo '<td>' . $dirs_array[$i]['text'] . '</td>';
-            echo '<td class="text-nowrap">' . $modx->toDateFormat($dirs_array[$i]['stats']['9']) . '</td>';
-            echo '<td class="text-right">' . $modx->nicesize($dirs_array[$i]['stats']['7']) . '</td>';
+            echo '<td>'.$dirs_array[$i]['text'].'</td>';
+            echo '<td class="text-nowrap">'.$modx->toDateFormat($dirs_array[$i]['stats']['9']).'</td>';
+            echo '<td class="text-right">'.$modx->nicesize($dirs_array[$i]['stats']['7']).'</td>';
             echo '<td class="actions text-right">';
             echo $dirs_array[$i]['rename'];
             echo $dirs_array[$i]['delete'];
@@ -166,10 +166,10 @@ 
         sort($files_array); // sorting the array alphabetically (Thanks pxl8r!)
         for ($i = 0; $i < $files; $i++) {
             $filesizes += $files_array[$i]['stats']['7'];
-            echo '<tr ' . markRow($files_array[$i]['file'], $_REQUEST['path'], $_REQUEST['mode']) . '>';
-            echo '<td>' . $files_array[$i]['text'] . '</td>';
-            echo '<td class="text-nowrap">' . $modx->toDateFormat($files_array[$i]['stats']['9']) . '</td>';
-            echo '<td class="text-right">' . $modx->nicesize($files_array[$i]['stats']['7']) . '</td>';
+            echo '<tr '.markRow($files_array[$i]['file'], $_REQUEST['path'], $_REQUEST['mode']).'>';
+            echo '<td>'.$files_array[$i]['text'].'</td>';
+            echo '<td class="text-nowrap">'.$modx->toDateFormat($files_array[$i]['stats']['9']).'</td>';
+            echo '<td class="text-right">'.$modx->nicesize($files_array[$i]['stats']['7']).'</td>';
             echo '<td class="actions text-right">';
             echo $files_array[$i]['unzip'];
             echo $files_array[$i]['view'];
@@ -185,7 +185,7 @@ 
     }
 }
 
-if(!function_exists('removeLastPath')) {
+if (!function_exists('removeLastPath')) {
     /**
      * @param string $string
      * @return bool|string
@@ -203,7 +203,7 @@ 
     }
 }
 
-if(!function_exists('getExtension')) {
+if (!function_exists('getExtension')) {
     /**
      * @param string $string
      * @return bool|string
@@ -222,7 +222,7 @@ 
     }
 }
 
-if(!function_exists('checkExtension')) {
+if (!function_exists('checkExtension')) {
     /**
      * @param string $path
      * @return bool
@@ -239,7 +239,7 @@ 
     }
 }
 
-if(!function_exists('mkdirs')) {
+if (!function_exists('mkdirs')) {
     /**
      * recursive mkdir function
      *
@@ -261,7 +261,7 @@ 
     }
 }
 
-if(!function_exists('logFileChange')) {
+if (!function_exists('logFileChange')) {
     /**
      * @param string $type
      * @param string $filename
@@ -297,7 +297,7 @@ 
     }
 }
 
-if(!function_exists('unzip')) {
+if (!function_exists('unzip')) {
     /**
      * by patrick_allaert - php user notes
      *
@@ -321,17 +321,17 @@ 
         $zip = zip_open($file);
         if ($zip) {
             $old_umask = umask(0);
-            $path = rtrim($path, '/') . '/';
+            $path = rtrim($path, '/').'/';
             while ($zip_entry = zip_read($zip)) {
                 if (zip_entry_filesize($zip_entry) > 0) {
                     // str_replace must be used under windows to convert "/" into "\"
                     $zip_entry_name = zip_entry_name($zip_entry);
-                    $complete_path = $path . str_replace('\\', '/', dirname($zip_entry_name));
-                    $complete_name = $path . str_replace('\\', '/', $zip_entry_name);
+                    $complete_path = $path.str_replace('\\', '/', dirname($zip_entry_name));
+                    $complete_name = $path.str_replace('\\', '/', $zip_entry_name);
                     if (!file_exists($complete_path)) {
                         $tmp = '';
                         foreach (explode('/', $complete_path) AS $k) {
-                            $tmp .= $k . '/';
+                            $tmp .= $k.'/';
                             if (!is_dir($tmp)) {
                                 mkdir($tmp, 0777);
                             }
@@ -352,14 +352,14 @@ 
     }
 }
 
-if(!function_exists('rrmdir')) {
+if (!function_exists('rrmdir')) {
     /**
      * @param string $dir
      * @return bool
      */
     function rrmdir($dir)
     {
-        foreach (glob($dir . '/*') as $file) {
+        foreach (glob($dir.'/*') as $file) {
             if (is_dir($file)) {
                 rrmdir($file);
             } else {
@@ -371,7 +371,7 @@ 
     }
 }
 
-if(!function_exists('fileupload')) {
+if (!function_exists('fileupload')) {
     /**
      * @return string
      */
@@ -401,13 +401,13 @@ 
             $userfile['type'] = $_FILES['userfile']['type'][$i];
 
             // this seems to be an upload action.
-            $path = $modx->config['site_url'] . substr($startpath, strlen($filemanager_path), strlen($startpath));
-            $path = rtrim($path, '/') . '/' . $userfile['name'];
+            $path = $modx->config['site_url'].substr($startpath, strlen($filemanager_path), strlen($startpath));
+            $path = rtrim($path, '/').'/'.$userfile['name'];
             $msg .= $path;
             if ($userfile['error'] == 0) {
                 $img = (strpos($userfile['type'],
-                        'image') !== false) ? '<br /><img src="' . $path . '" height="75" />' : '';
-                $msg .= "<p>" . $_lang['files_file_type'] . $userfile['type'] . ", " . $modx->nicesize(filesize($userfile['tmp_name'])) . $img . '</p>';
+                        'image') !== false) ? '<br /><img src="'.$path.'" height="75" />' : '';
+                $msg .= "<p>".$_lang['files_file_type'].$userfile['type'].", ".$modx->nicesize(filesize($userfile['tmp_name'])).$img.'</p>';
             }
 
             $userfilename = $userfile['tmp_name'];
@@ -415,15 +415,15 @@ 
             if (is_uploaded_file($userfilename)) {
                 // file is uploaded file, process it!
                 if (!checkExtension($userfile['name'])) {
-                    $msg .= '<p><span class="warning">' . $_lang['files_filetype_notok'] . '</span></p>';
+                    $msg .= '<p><span class="warning">'.$_lang['files_filetype_notok'].'</span></p>';
                 } else {
-                    if (@move_uploaded_file($userfile['tmp_name'], $_POST['path'] . '/' . $userfile['name'])) {
+                    if (@move_uploaded_file($userfile['tmp_name'], $_POST['path'].'/'.$userfile['name'])) {
                         // Ryan: Repair broken permissions issue with file manager
                         if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
-                            @chmod($_POST['path'] . "/" . $userfile['name'], $new_file_permissions);
+                            @chmod($_POST['path']."/".$userfile['name'], $new_file_permissions);
                         }
                         // Ryan: End
-                        $msg .= '<p><span class="success">' . $_lang['files_upload_ok'] . '</span></p><hr/>';
+                        $msg .= '<p><span class="success">'.$_lang['files_upload_ok'].'</span></p><hr/>';
 
                         // invoke OnFileManagerUpload event
                         $modx->invokeEvent('OnFileManagerUpload', array(
@@ -431,13 +431,13 @@ 
                             'filename' => $userfile['name']
                         ));
                         // Log the change
-                        logFileChange('upload', $_POST['path'] . '/' . $userfile['name']);
+                        logFileChange('upload', $_POST['path'].'/'.$userfile['name']);
                     } else {
-                        $msg .= '<p><span class="warning">' . $_lang['files_upload_copyfailed'] . '</span> ' . $_lang["files_upload_permissions_error"] . '</p>';
+                        $msg .= '<p><span class="warning">'.$_lang['files_upload_copyfailed'].'</span> '.$_lang["files_upload_permissions_error"].'</p>';
                     }
                 }
             } else {
-                $msg .= '<br /><span class="warning"><b>' . $_lang['files_upload_error'] . ':</b>';
+                $msg .= '<br /><span class="warning"><b>'.$_lang['files_upload_error'].':</b>';
                 switch ($userfile['error']) {
                     case 0: //no error; possible file attack!
                         $msg .= $_lang['files_upload_error0'];
@@ -462,11 +462,11 @@ 
             }
         }
 
-        return $msg . '<br/>';
+        return $msg.'<br/>';
     }
 }
 
-if(!function_exists('textsave')) {
+if (!function_exists('textsave')) {
     /**
      * @return string
      */
@@ -480,9 +480,9 @@ 
 
         // Write $content to our opened file.
         if (file_put_contents($filename, $content) === false) {
-            $msg .= '<span class="warning"><b>' . $_lang['file_not_saved'] . '</b></span><br /><br />';
+            $msg .= '<span class="warning"><b>'.$_lang['file_not_saved'].'</b></span><br /><br />';
         } else {
-            $msg .= '<span class="success"><b>' . $_lang['file_saved'] . '</b></span><br /><br />';
+            $msg .= '<span class="success"><b>'.$_lang['file_saved'].'</b></span><br /><br />';
             $_REQUEST['mode'] = 'edit';
         }
         // Log the change
@@ -492,7 +492,7 @@ 
     }
 }
 
-if(!function_exists('delete_file')) {
+if (!function_exists('delete_file')) {
     /**
      * @return string
      */
@@ -504,9 +504,9 @@ 
 
         $file = $_REQUEST['path'];
         if (!$token_check || !@unlink($file)) {
-            $msg .= '<span class="warning"><b>' . $_lang['file_not_deleted'] . '</b></span><br /><br />';
+            $msg .= '<span class="warning"><b>'.$_lang['file_not_deleted'].'</b></span><br /><br />';
         } else {
-            $msg .= '<span class="success"><b>' . $_lang['file_deleted'] . '</b></span><br /><br />';
+            $msg .= '<span class="success"><b>'.$_lang['file_deleted'].'</b></span><br /><br />';
         }
 
         // Log the change
@@ -516,7 +516,7 @@ 
     }
 }
 
-if(!function_exists('parsePlaceholder')) {
+if (!function_exists('parsePlaceholder')) {
     /**
      * @param string $tpl
      * @param array $ph
@@ -533,7 +533,7 @@ 
     }
 }
 
-if(!function_exists('checkToken')) {
+if (!function_exists('checkToken')) {
     /**
      * @return bool
      */
@@ -558,7 +558,7 @@ 
     }
 }
 
-if(!function_exists('makeToken')) {
+if (!function_exists('makeToken')) {
     /**
      * @return string
      */

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -887,7 +887,7 @@
                     $complete_name = $path . str_replace('\\', '/', $zip_entry_name);
                     if (!file_exists($complete_path)) {
                         $tmp = '';
-                        foreach (explode('/', $complete_path) AS $k) {
+                        foreach (explode('/', $complete_path) as $k) {
                             $tmp .= $k . '/';
                             if (!is_dir($tmp)) {
                                 mkdir($tmp, 0777);

Doc Comments +2 added lines, -2 removed lines

@@ -188,7 +188,7 @@ 
 if(!function_exists('removeLastPath')) {
     /**
      * @param string $string
-     * @return bool|string
+     * @return string|false
      */
     function removeLastPath($string)
     {
@@ -206,7 +206,7 @@ 
 if(!function_exists('getExtension')) {
     /**
      * @param string $string
-     * @return bool|string
+     * @return string|false
      *
      * @TODO: not work if $string contains folder name with dot
      */

manager/includes/functions/actions/bkmanager.php

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!function_exists('import_sql')) {
+if (!function_exists('import_sql')) {
     /**
      * @param string $source
      * @param string $result_code
@@ -40,7 +40,7 @@ 
     }
 }
 
-if(!function_exists('dumpSql')) {
+if (!function_exists('dumpSql')) {
     /**
      * @param string $dumpstring
      * @return bool
@@ -66,7 +66,7 @@ 
     }
 }
 
-if(!function_exists('snapshot')) {
+if (!function_exists('snapshot')) {
     /**
      * @param string $dumpstring
      * @return bool
@@ -80,7 +80,7 @@ 
     }
 }
 
-if(!function_exists('getSettings')) {
+if (!function_exists('getSettings')) {
     /**
      * @return array
      */
@@ -107,7 +107,7 @@ 
     }
 }
 
-if(!function_exists('restoreSettings')) {
+if (!function_exists('restoreSettings')) {
     /**
      * @param array $settings
      */
@@ -122,7 +122,7 @@ 
     }
 }
 
-if(!function_exists('parsePlaceholder')) {
+if (!function_exists('parsePlaceholder')) {
     /**
      * @param string $tpl
      * @param array $ph

manager/includes/functions/actions/mutate_role.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-if(!function_exists('render_form')) {
+if (!function_exists('render_form')) {
     /**
      * @param string $name
      * @param string $label

manager/includes/functions/processors.php

Braces +3 added lines, -1 removed lines

@@ -403,10 +403,12 @@
         $failedlogins += 1;
 
         $fields = array('failedlogincount' => $failedlogins);
-        if ($failedlogins >= $failed_allowed) //block user for too many fail attempts
+        if ($failedlogins >= $failed_allowed) {
+            //block user for too many fail attempts
         {
             $fields['blockeduntil'] = time() + ($blocked_minutes * 60);
         }
+        }
 
         $modx->db->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
 

Spacing +32 added lines, -32 removed lines

@@ -36,7 +36,7 @@ 
     }
 }
 
-if(!function_exists('duplicateDocument')) {
+if (!function_exists('duplicateDocument')) {
     /**
      * @param int $docid
      * @param null|int $parent
@@ -90,12 +90,12 @@ 
             $count = $modx->db->getRecordCount($modx->db->select('pagetitle', $modx->getFullTableName('site_content'),
                 "pagetitle LIKE '{$pagetitle} Duplicate%'"));
             if ($count >= 1) {
-                $count = ' ' . ($count + 1);
+                $count = ' '.($count + 1);
             } else {
                 $count = '';
             }
 
-            $content['pagetitle'] = $_lang['duplicated_el_suffix'] . $count . ' ' . $content['pagetitle'];
+            $content['pagetitle'] = $_lang['duplicated_el_suffix'].$count.' '.$content['pagetitle'];
             $content['alias'] = null;
         } elseif ($modx->config['friendly_urls'] == 0 || $modx->config['allow_duplicate_alias'] == 0) {
             $content['alias'] = null;
@@ -153,7 +153,7 @@ 
     }
 }
 
-if(!function_exists('duplicateTVs')) {
+if (!function_exists('duplicateTVs')) {
     /**
      * Duplicate Document TVs
      *
@@ -166,8 +166,8 @@ 
 
         $tbltvc = $modx->getFullTableName('site_tmplvar_contentvalues');
 
-        $newid = (int)$newid;
-        $oldid = (int)$oldid;
+        $newid = (int) $newid;
+        $oldid = (int) $oldid;
 
         $modx->db->insert(
             array('contentid' => '', 'tmplvarid' => '', 'value' => ''), $tbltvc, // Insert into
@@ -176,7 +176,7 @@ 
     }
 }
 
-if(!function_exists('duplicateAccess')) {
+if (!function_exists('duplicateAccess')) {
     /**
      * Duplicate Document Access Permissions
      *
@@ -189,8 +189,8 @@ 
 
         $tbldg = $modx->getFullTableName('document_groups');
 
-        $newid = (int)$newid;
-        $oldid = (int)$oldid;
+        $newid = (int) $newid;
+        $oldid = (int) $oldid;
 
         $modx->db->insert(
             array('document' => '', 'document_group' => ''), $tbldg, // Insert into
@@ -199,7 +199,7 @@ 
     }
 }
 
-if(!function_exists('evalModule')) {
+if (!function_exists('evalModule')) {
     /**
      * evalModule
      *
@@ -235,17 +235,17 @@ 
             }
             if ($modx->config['error_reporting'] === '99' || 2 < $error_level) {
                 $modx->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'],
-                    $_SESSION['itemname'] . ' - Module', $error_info['message'], $error_info['line'], $msg);
+                    $_SESSION['itemname'].' - Module', $error_info['message'], $error_info['line'], $msg);
                 $modx->event->alert("An error occurred while loading. Please see the event log for more information<p>{$msg}</p>");
             }
         }
         unset($modx->event->params);
 
-        return $mod . $msg;
+        return $mod.$msg;
     }
 }
 
-if(!function_exists('allChildren')) {
+if (!function_exists('allChildren')) {
     /**
      * @param int $currDocID
      * @return array
@@ -265,7 +265,7 @@ 
     }
 }
 
-if(!function_exists('jsAlert')) {
+if (!function_exists('jsAlert')) {
     /**
      * show javascript alert
      *
@@ -275,14 +275,14 @@ 
     {
         $modx = evolutionCMS();
         if ($_POST['ajax'] != 1) {
-            echo "<script>window.setTimeout(\"alert('" . addslashes($modx->db->escape($msg)) . "')\",10);history.go(-1)</script>";
+            echo "<script>window.setTimeout(\"alert('".addslashes($modx->db->escape($msg))."')\",10);history.go(-1)</script>";
         } else {
-            echo $msg . "\n";
+            echo $msg."\n";
         }
     }
 }
 
-if(!function_exists('login')) {
+if (!function_exists('login')) {
     /**
      * @param string $username
      * @param string $givenPassword
@@ -297,7 +297,7 @@ 
     }
 }
 
-if(!function_exists('loginV1')) {
+if (!function_exists('loginV1')) {
     /**
      * @param int $internalKey
      * @param string $givenPassword
@@ -330,7 +330,7 @@ 
     }
 }
 
-if(!function_exists('loginMD5')) {
+if (!function_exists('loginMD5')) {
     /**
      * @param int $internalKey
      * @param string $givenPassword
@@ -351,7 +351,7 @@ 
     }
 }
 
-if(!function_exists('updateNewHash')) {
+if (!function_exists('updateNewHash')) {
     /**
      * @param string $username
      * @param string $password
@@ -366,7 +366,7 @@ 
     }
 }
 
-if(!function_exists('incrementFailedLoginCount')) {
+if (!function_exists('incrementFailedLoginCount')) {
     /**
      * @param int $internalKey
      * @param int $failedlogins
@@ -389,7 +389,7 @@ 
 
         if ($failedlogins < $failed_allowed) {
             //sleep to help prevent brute force attacks
-            $sleep = (int)$failedlogins / 2;
+            $sleep = (int) $failedlogins / 2;
             if ($sleep > 5) {
                 $sleep = 5;
             }
@@ -402,7 +402,7 @@ 
     }
 }
 
-if(!function_exists('saveUserGroupAccessPermissons')) {
+if (!function_exists('saveUserGroupAccessPermissons')) {
     /**
      * saves module user group access
      */
@@ -433,7 +433,7 @@ 
     }
 }
 
-if(!function_exists('saveEventListeners')) {
+if (!function_exists('saveEventListeners')) {
 # Save Plugin Event Listeners
     function saveEventListeners($id, $sysevents, $mode)
     {
@@ -486,7 +486,7 @@ 
     }
 }
 
-if(!function_exists('getEventIdByName')) {
+if (!function_exists('getEventIdByName')) {
     /**
      * @param string $name
      * @return string|int
@@ -509,7 +509,7 @@ 
     }
 }
 
-if(!function_exists('saveTemplateAccess')) {
+if (!function_exists('saveTemplateAccess')) {
     /**
      * @param int $id
      */
@@ -548,7 +548,7 @@ 
     }
 }
 
-if(!function_exists('saveTemplateVarAccess')) {
+if (!function_exists('saveTemplateVarAccess')) {
     /**
      * @return void
      */
@@ -587,7 +587,7 @@ 
     }
 }
 
-if(!function_exists('saveDocumentAccessPermissons')) {
+if (!function_exists('saveDocumentAccessPermissons')) {
     function saveDocumentAccessPermissons()
     {
         global $id, $newid;
@@ -756,10 +756,10 @@ 
         }
 
         foreach ($defaults as $k) {
-            if (isset($settings['default_' . $k]) && $settings['default_' . $k] == '1') {
+            if (isset($settings['default_'.$k]) && $settings['default_'.$k] == '1') {
                 unset($settings[$k]);
             }
-            unset($settings['default_' . $k]);
+            unset($settings['default_'.$k]);
         }
 
         $modx->db->delete($tbl_user_settings, "user='{$id}'");
@@ -791,7 +791,7 @@ 
         global $id, $modx;
         $mode = $_POST['mode'];
         $modx->manager->saveFormValues($mode);
-        $modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode === $action ? "&id={$id}" : ''));
+        $modx->webAlertAndQuit($msg, "index.php?a={$mode}".($mode === $action ? "&id={$id}" : ''));
     }
 }
 
@@ -807,7 +807,7 @@ 
         global $deltime;
 
         $rs = $modx->db->select('id', $modx->getFullTableName('site_content'),
-            "parent='" . (int)$parent . "' AND deleted=1 AND deletedon='" . (int)$deltime . "'");
+            "parent='".(int) $parent."' AND deleted=1 AND deletedon='".(int) $deltime."'");
         // the document has children documents, we'll need to delete those too
         while ($row = $modx->db->getRow($rs)) {
             $children[] = $row['id'];

manager/includes/functions/helper.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!function_exists('createGUID')) {
+if (!function_exists('createGUID')) {
     /**
      * create globally unique identifiers (guid)
      *
@@ -8,22 +8,22 @@ 
      */
     function createGUID()
     {
-        srand((double)microtime() * 1000000);
+        srand((double) microtime() * 1000000);
         $r = rand();
-        $u = uniqid(getmypid() . $r . (double)microtime() * 1000000, 1);
+        $u = uniqid(getmypid().$r.(double) microtime() * 1000000, 1);
         $m = md5($u);
 
         return $m;
     }
 }
 
-if(!function_exists('generate_password')) {
+if (!function_exists('generate_password')) {
 // Generate password
     function generate_password($length = 10)
     {
         $allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
         $ps_len = strlen($allowable_characters);
-        mt_srand((double)microtime() * 1000000);
+        mt_srand((double) microtime() * 1000000);
         $pass = "";
         for ($i = 0; $i < $length; $i++) {
             $pass .= $allowable_characters[mt_rand(0, $ps_len - 1)];

manager/includes/tmplvars.inc.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
 <?php
 
-include_once MODX_MANAGER_PATH . 'includes/functions/tv.php';
+include_once MODX_MANAGER_PATH.'includes/functions/tv.php';

manager/includes/tmplvars.commands.inc.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
 <?php
 
-include_once MODX_MANAGER_PATH . 'includes/functions/tv.php';
+include_once MODX_MANAGER_PATH.'includes/functions/tv.php';

manager/includes/tmplvars.format.inc.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
 <?php
 
-include_once MODX_MANAGER_PATH . 'includes/functions/tv.php';
+include_once MODX_MANAGER_PATH.'includes/functions/tv.php';

manager/processors/remove_installer.processor.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
 }
 
 $msg = '';
-$pth = dirname(dirname(__DIR__)) . '/install/';
+$pth = dirname(dirname(__DIR__)).'/install/';
 $pth = str_replace('\\', '/', $pth);
 
 if (isset($_GET['rminstall'])) {
@@ -47,7 +47,7 @@ 
     }
 }
 if ($msg) {
-    echo "<script>alert('" . addslashes($msg) . "');</script>";
+    echo "<script>alert('".addslashes($msg)."');</script>";
 }
 
 echo "<script>window.location='../index.php?a=2';</script>";