evolution-cms / evolution

manager/actions/mutate_role.dynamic.php

Switch Indentation +11 added lines, -11 removed lines

@@ -4,18 +4,18 @@
 }
 
 switch ((int)$modx->manager->action) {
-    case 35:
-        if (!$modx->hasPermission('edit_role')) {
-            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
-        }
-        break;
-    case 38:
-        if (!$modx->hasPermission('new_role')) {
+        case 35:
+            if (!$modx->hasPermission('edit_role')) {
+                $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+            }
+            break;
+        case 38:
+            if (!$modx->hasPermission('new_role')) {
+                $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+            }
+            break;
+        default:
             $modx->webAlertAndQuit($_lang["error_no_privileges"]);
-        }
-        break;
-    default:
-        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $role = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;

Spacing +4 added lines, -4 removed lines

@@ -3,7 +3,7 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-switch ((int)$modx->manager->action) {
+switch ((int) $modx->manager->action) {
     case 35:
         if (!$modx->hasPermission('edit_role')) {
             $modx->webAlertAndQuit($_lang["error_no_privileges"]);
@@ -18,7 +18,7 @@ 
         $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$role = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$role = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 $tbl_user_roles = $modx->getFullTableName('user_roles');
 
@@ -46,7 +46,7 @@ 
 // Add lock-element JS-Script
 $lockElementId = $role;
 $lockElementType = 8;
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
 ?>
 <script type="text/javascript">
     function changestate(element) {
@@ -82,7 +82,7 @@ 
     <input type="hidden" name="id" value="<?= $_GET['id'] ?>">
 
     <h1>
-        <i class="fa fa-legal"></i><?= ($roledata['name'] ? $roledata['name'] . '<small>(' . $roledata['id'] . ')</small>' : $_lang['role_title']) ?>
+        <i class="fa fa-legal"></i><?= ($roledata['name'] ? $roledata['name'].'<small>('.$roledata['id'].')</small>' : $_lang['role_title']) ?>
     </h1>
 
     <?= $_style['actionbuttons']['dynamic']['savedelete'] ?>

manager/actions/resources/functions.inc.php

Spacing +49 added lines, -49 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
@@ -9,11 +9,11 @@ 
  */
 
 $tpl = array(
-    'viewForm' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_viewForm.tpl'),
-    'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),
-    'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),
-    'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),
-    'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl')
+    'viewForm' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_viewForm.tpl'),
+    'panelGroup' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelGroup.tpl'),
+    'panelHeading' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelHeading.tpl'),
+    'panelCollapse' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelCollapse.tpl'),
+    'elementsRow' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_elementsRow.tpl')
 );
 
 /**
@@ -21,7 +21,7 @@ 
  * @param array $ph
  * @return string
  */
-function parsePh($tpl, $ph) {
+function parsePh($tpl, $ph){
     $modx = evolutionCMS(); global $_lang;
     $tpl = $modx->parseText($tpl, $_lang, '[%', '%]');
     return $modx->parseText($tpl, $ph);
@@ -31,7 +31,7 @@ 
  * @param string|int $cssId
  * @return string
  */
-function renderViewSwitchButtons($cssId) {
+function renderViewSwitchButtons($cssId){
     $modx = evolutionCMS(); global $_lang, $tpl;
 
     return parsePh($tpl['viewForm'], array(
@@ -44,19 +44,19 @@ 
  * @param mgrResources $resources
  * @return string
  */
-function createResourceList($resourceTable, $resources) {
+function createResourceList($resourceTable, $resources){
     $modx = evolutionCMS(); global $_lang, $_style, $modx_textdir, $tpl;
 
     $items = isset($resources->items[$resourceTable]) ? $resources->items[$resourceTable] : false;
 
-    if( ! is_array($items) || empty($items)) {
+    if (!is_array($items) || empty($items)) {
         return $_lang['no_results'];
     }
 
     // Prepare elements- and categories-list
     $elements = array();
     $categories = array();
-    foreach($items as $row) {
+    foreach ($items as $row) {
         $catid = $row['catid'] ? $row['catid'] : 0;
         $categories[$catid] = array('name' => stripslashes($row['category']));
         $elements[$catid][] = prepareElementRowPh($row, $resourceTable, $resources);
@@ -64,18 +64,18 @@ 
 
     // Now render categories / panel-collapse
     $panelGroup = '';
-    foreach($elements as $catid => $elList) {
+    foreach ($elements as $catid => $elList) {
         // Add panel-heading / category-collapse to output
         $panelGroup .= parsePh($tpl['panelHeading'], array(
             'tab' => $resourceTable,
             'category' => $categories[$catid]['name'],
-            'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',
+            'categoryid' => $catid != '' ? ' <small>('.$catid.')</small>' : '',
             'catid' => $catid,
         ));
 
         // Prepare content for panel-collapse
         $panelCollapse = '';
-        foreach($elList as $el) {
+        foreach ($elList as $el) {
             $panelCollapse .= parsePh($tpl['elementsRow'], $el);
         }
 
@@ -97,30 +97,30 @@ 
  * @param mgrResources $resources
  * @return string
  */
-function createCombinedView($resources) {
+function createCombinedView($resources){
     $modx = evolutionCMS(); global $_lang, $_style, $modx_textdir;
 
     $itemsPerCategory = isset($resources->itemsPerCategory) ? $resources->itemsPerCategory : false;
     $types = isset($resources->types) ? $resources->types : false;
     $categories = isset($resources->categories) ? $resources->categories : false;
 
-    if(!$itemsPerCategory) {
+    if (!$itemsPerCategory) {
         return $_lang['no_results'];
     }
 
     $tpl = array(
-        'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),
-        'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),
-        'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),
-        'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl'),
+        'panelGroup' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelGroup.tpl'),
+        'panelHeading' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelHeading.tpl'),
+        'panelCollapse' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelCollapse.tpl'),
+        'elementsRow' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_elementsRow.tpl'),
     );
 
     // Easily loop through $itemsPerCategory-Array
     $panelGroup = '';
-    foreach($categories as $catid => $category) {
+    foreach ($categories as $catid => $category) {
         // Prepare collapse content / elements-list
         $panelCollapse = '';
-        foreach($itemsPerCategory[$catid] as $el) {
+        foreach ($itemsPerCategory[$catid] as $el) {
             $resourceTable = $el['type'];
             $ph = prepareElementRowPh($el, $resourceTable, $resources);
             $panelCollapse .= parsePh($tpl['elementsRow'], $ph);
@@ -130,7 +130,7 @@ 
         $panelGroup .= parsePh($tpl['panelHeading'], array(
             'tab' => 'categories_list',
             'category' => $categories[$catid],
-            'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',
+            'categoryid' => $catid != '' ? ' <small>('.$catid.')</small>' : '',
             'catid' => $catid,
         ));
 
@@ -154,14 +154,14 @@ 
  * @param mgrResources $resources
  * @return array
  */
-function prepareElementRowPh($row, $resourceTable, $resources) {
+function prepareElementRowPh($row, $resourceTable, $resources){
     $modx = evolutionCMS(); global $modx_textdir, $_style, $_lang;
 
     $types = isset($resources->types[$resourceTable]) ? $resources->types[$resourceTable] : false;
 
     $_lang["confirm_delete"] = $_lang["delete"];
 
-    switch($resourceTable){
+    switch ($resourceTable) {
         case 'site_templates':
             $class = $row['selectable'] ? '' : 'disabledPlugin';
             $lockElementType = 1;
@@ -198,65 +198,65 @@ 
     // Prepare displaying user-locks
     $lockedByUser = '';
     $rowLock = $modx->elementIsLocked($lockElementType, $row['id'], true);
-    if($rowLock && $modx->hasPermission('display_locks')) {
-        if($rowLock['sid'] == $modx->sid) {
+    if ($rowLock && $modx->hasPermission('display_locks')) {
+        if ($rowLock['sid'] == $modx->sid) {
             $title = $modx->parseText($_lang["lock_element_editing"], array(
-                'element_type' => $_lang["lock_element_type_" . $lockElementType],
+                'element_type' => $_lang["lock_element_type_".$lockElementType],
                 'lasthit_df' => $rowLock['lasthit_df']
             ));
-            $lockedByUser = '<span title="' . $title . '" class="editResource" style="cursor:context-menu;">' . $_style['tree_preview_resource'] . '</span>&nbsp;';
+            $lockedByUser = '<span title="'.$title.'" class="editResource" style="cursor:context-menu;">'.$_style['tree_preview_resource'].'</span>&nbsp;';
         } else {
             $title = $modx->parseText($_lang["lock_element_locked_by"], array(
-                'element_type' => $_lang["lock_element_type_" . $lockElementType],
+                'element_type' => $_lang["lock_element_type_".$lockElementType],
                 'username' => $rowLock['username'],
                 'lasthit_df' => $rowLock['lasthit_df']
             ));
-            if($modx->hasPermission('remove_locks')) {
-                $lockedByUser = '<a href="javascript:;" onclick="unlockElement(' . $lockElementType . ', ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource"><i class="' . $_style['icons_secured'] . '"></i></a>';
+            if ($modx->hasPermission('remove_locks')) {
+                $lockedByUser = '<a href="javascript:;" onclick="unlockElement('.$lockElementType.', '.$row['id'].', this);return false;" title="'.$title.'" class="lockedResource"><i class="'.$_style['icons_secured'].'"></i></a>';
             } else {
-                $lockedByUser = '<span title="' . $title . '" class="lockedResource" style="cursor:context-menu;"><i class="' . $_style['icons_secured'] . '"></i></span>';
+                $lockedByUser = '<span title="'.$title.'" class="lockedResource" style="cursor:context-menu;"><i class="'.$_style['icons_secured'].'"></i></span>';
             }
         }
     }
-    if($lockedByUser) {
-        $lockedByUser = '<div class="lockCell">' . $lockedByUser . '</div>';
+    if ($lockedByUser) {
+        $lockedByUser = '<div class="lockCell">'.$lockedByUser.'</div>';
     }
 
     // Caption
-    if($resourceTable == 'site_tmplvars') {
-        $caption = !empty($row['description']) ? ' ' . $row['caption'] . ' &nbsp; <small>(' . $row['description'] . ')</small>' : ' ' . $row['caption'];
+    if ($resourceTable == 'site_tmplvars') {
+        $caption = !empty($row['description']) ? ' '.$row['caption'].' &nbsp; <small>('.$row['description'].')</small>' : ' '.$row['caption'];
     } else {
-        $caption = !empty($row['description']) ? ' ' . $row['description'] : '';
+        $caption = !empty($row['description']) ? ' '.$row['description'] : '';
     }
 
     // Special marks
     $tplInfo = array();
-    if($row['locked']) {
+    if ($row['locked']) {
         $tplInfo[] = $_lang['locked'];
     }
-    if($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {
+    if ($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {
         $tplInfo[] = $_lang['defaulttemplate_title'];
     }
-    $marks = !empty($tplInfo) ? ' <em>(' . implode(', ', $tplInfo) . ')</em>' : '';
+    $marks = !empty($tplInfo) ? ' <em>('.implode(', ', $tplInfo).')</em>' : '';
 
     /* row buttons */
     $buttons = '';
-    if($modx->hasPermission($types['actions']['edit'][1])) {
-        $buttons .= '<li><a title="' . $_lang["edit_resource"] . '" href="index.php?a=' . $types['actions']['edit'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-edit fa-fw"></i></a></li>';
+    if ($modx->hasPermission($types['actions']['edit'][1])) {
+        $buttons .= '<li><a title="'.$_lang["edit_resource"].'" href="index.php?a='.$types['actions']['edit'][0].'&amp;id='.$row['id'].'"><i class="fa fa-edit fa-fw"></i></a></li>';
     }
-    if($modx->hasPermission($types['actions']['duplicate'][1])) {
-        $buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_duplicate_record"] . '\')" title="' . $_lang["resource_duplicate"] . '" href="index.php?a=' . $types['actions']['duplicate'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-clone fa-fw"></i></a></li>';
+    if ($modx->hasPermission($types['actions']['duplicate'][1])) {
+        $buttons .= '<li><a onclick="return confirm(\''.$_lang["confirm_duplicate_record"].'\')" title="'.$_lang["resource_duplicate"].'" href="index.php?a='.$types['actions']['duplicate'][0].'&amp;id='.$row['id'].'"><i class="fa fa-clone fa-fw"></i></a></li>';
     }
-    if($modx->hasPermission($types['actions']['remove'][1])) {
-        $buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_delete"] . '\')" title="' . $_lang["delete"] . '" href="index.php?a=' . $types['actions']['remove'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-trash fa-fw"></i></a></li>';
+    if ($modx->hasPermission($types['actions']['remove'][1])) {
+        $buttons .= '<li><a onclick="return confirm(\''.$_lang["confirm_delete"].'\')" title="'.$_lang["delete"].'" href="index.php?a='.$types['actions']['remove'][0].'&amp;id='.$row['id'].'"><i class="fa fa-trash fa-fw"></i></a></li>';
     }
-    $buttons = $buttons ? '<div class="btnCell"><ul class="elements_buttonbar">' . $buttons . '</ul></div>' : '';
+    $buttons = $buttons ? '<div class="btnCell"><ul class="elements_buttonbar">'.$buttons.'</ul></div>' : '';
 
     $catid = $row['catid'] ? $row['catid'] : 0;
 
     // Placeholders for elements-row
     return array(
-        'class' => $class ? ' class="' . $class . '"' : '',
+        'class' => $class ? ' class="'.$class.'"' : '',
         'lockedByUser' => $lockedByUser,
         'name' => $row['name'],
         'caption' => $caption,

Braces +11 added lines, -6 removed lines

@@ -21,7 +21,8 @@ 
  * @param array $ph
  * @return string
  */
-function parsePh($tpl, $ph) {
+function parsePh($tpl, $ph)
+{
     $modx = evolutionCMS(); global $_lang;
     $tpl = $modx->parseText($tpl, $_lang, '[%', '%]');
     return $modx->parseText($tpl, $ph);
@@ -31,7 +32,8 @@ 
  * @param string|int $cssId
  * @return string
  */
-function renderViewSwitchButtons($cssId) {
+function renderViewSwitchButtons($cssId)
+{
     $modx = evolutionCMS(); global $_lang, $tpl;
 
     return parsePh($tpl['viewForm'], array(
@@ -44,7 +46,8 @@ 
  * @param mgrResources $resources
  * @return string
  */
-function createResourceList($resourceTable, $resources) {
+function createResourceList($resourceTable, $resources)
+{
     $modx = evolutionCMS(); global $_lang, $_style, $modx_textdir, $tpl;
 
     $items = isset($resources->items[$resourceTable]) ? $resources->items[$resourceTable] : false;
@@ -97,7 +100,8 @@ 
  * @param mgrResources $resources
  * @return string
  */
-function createCombinedView($resources) {
+function createCombinedView($resources)
+{
     $modx = evolutionCMS(); global $_lang, $_style, $modx_textdir;
 
     $itemsPerCategory = isset($resources->itemsPerCategory) ? $resources->itemsPerCategory : false;
@@ -154,14 +158,15 @@ 
  * @param mgrResources $resources
  * @return array
  */
-function prepareElementRowPh($row, $resourceTable, $resources) {
+function prepareElementRowPh($row, $resourceTable, $resources)
+{
     $modx = evolutionCMS(); global $modx_textdir, $_style, $_lang;
 
     $types = isset($resources->types[$resourceTable]) ? $resources->types[$resourceTable] : false;
 
     $_lang["confirm_delete"] = $_lang["delete"];
 
-    switch($resourceTable){
+    switch($resourceTable) {
         case 'site_templates':
             $class = $row['selectable'] ? '' : 'disabledPlugin';
             $lockElementType = 1;

manager/actions/files.dynamic.php

Spacing +59 added lines, -59 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('file_manager')) {
@@ -9,15 +9,15 @@ 
 $newToken = makeToken();
 
 // settings
-$theme_image_path = $modx->config['site_manager_url'] . 'media/style/' . $modx->config['manager_theme'] . '/images/';
+$theme_image_path = $modx->config['site_manager_url'].'media/style/'.$modx->config['manager_theme'].'/images/';
 $excludes = array(
     '.',
     '..',
     '.svn'
 );
-$alias_suffix = (!empty($friendly_url_suffix)) ? ',' . ltrim($friendly_url_suffix, '.') : '';
-$editablefiles = explode(',', 'txt,php,tpl,less,sass,shtml,html,htm,xml,js,css,pageCache,htaccess,json,ini' . $alias_suffix);
-$inlineviewablefiles = explode(',', 'txt,php,tpl,less,sass,html,htm,xml,js,css,pageCache,htaccess,json,ini' . $alias_suffix);
+$alias_suffix = (!empty($friendly_url_suffix)) ? ','.ltrim($friendly_url_suffix, '.') : '';
+$editablefiles = explode(',', 'txt,php,tpl,less,sass,shtml,html,htm,xml,js,css,pageCache,htaccess,json,ini'.$alias_suffix);
+$inlineviewablefiles = explode(',', 'txt,php,tpl,less,sass,html,htm,xml,js,css,pageCache,htaccess,json,ini'.$alias_suffix);
 $viewablefiles = explode(',', 'jpg,gif,png,ico');
 
 $editablefiles = add_dot($editablefiles);
@@ -30,31 +30,31 @@ 
 {
 */
 $protected_path[] = $modx->config['site_manager_path'];
-$protected_path[] = $modx->config['base_path'] . 'temp/backup';
-$protected_path[] = $modx->config['base_path'] . 'assets/backup';
+$protected_path[] = $modx->config['base_path'].'temp/backup';
+$protected_path[] = $modx->config['base_path'].'assets/backup';
 
 if (!$modx->hasPermission('save_plugin')) {
-    $protected_path[] = $modx->config['base_path'] . 'assets/plugins';
+    $protected_path[] = $modx->config['base_path'].'assets/plugins';
 }
 if (!$modx->hasPermission('save_snippet')) {
-    $protected_path[] = $modx->config['base_path'] . 'assets/snippets';
+    $protected_path[] = $modx->config['base_path'].'assets/snippets';
 }
 if (!$modx->hasPermission('save_template')) {
-    $protected_path[] = $modx->config['base_path'] . 'assets/templates';
+    $protected_path[] = $modx->config['base_path'].'assets/templates';
 }
 if (!$modx->hasPermission('save_module')) {
-    $protected_path[] = $modx->config['base_path'] . 'assets/modules';
+    $protected_path[] = $modx->config['base_path'].'assets/modules';
 }
 if (!$modx->hasPermission('empty_cache')) {
-    $protected_path[] = $modx->config['base_path'] . 'assets/cache';
+    $protected_path[] = $modx->config['base_path'].'assets/cache';
 }
 if (!$modx->hasPermission('import_static')) {
-    $protected_path[] = $modx->config['base_path'] . 'temp/import';
-    $protected_path[] = $modx->config['base_path'] . 'assets/import';
+    $protected_path[] = $modx->config['base_path'].'temp/import';
+    $protected_path[] = $modx->config['base_path'].'assets/import';
 }
 if (!$modx->hasPermission('export_static')) {
-    $protected_path[] = $modx->config['base_path'] . 'temp/export';
-    $protected_path[] = $modx->config['base_path'] . 'assets/export';
+    $protected_path[] = $modx->config['base_path'].'temp/export';
+    $protected_path[] = $modx->config['base_path'].'assets/export';
 }
 /*
 }
@@ -96,15 +96,15 @@ 
 $rw = realpath('../');
 $webstart_path = str_replace('\\', '/', str_replace($rw, '', $rf));
 if (substr($webstart_path, 0, 1) == '/') {
-    $webstart_path = '..' . $webstart_path;
+    $webstart_path = '..'.$webstart_path;
 } else {
-    $webstart_path = '../' . $webstart_path;
+    $webstart_path = '../'.$webstart_path;
 }
 
 ?>
     <script type="text/javascript">
 
-        var current_path = '<?= $startpath;?>';
+        var current_path = '<?= $startpath; ?>';
 
         function viewfile (url)
         {
@@ -140,7 +140,7 @@ 
         function unzipFile (file)
         {
             if (confirmUnzip()) {
-                window.location.href = "index.php?a=31&mode=unzip&path=" + current_path + '/&file=' + file + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=unzip&path=" + current_path + '/&file=' + file + "&token=<?= $newToken; ?>";
                 return false;
             }
         }
@@ -162,7 +162,7 @@ 
         function deleteFolder (folder, status)
         {
             if (confirmDeleteFolder(status)) {
-                window.location.href = "index.php?a=31&mode=deletefolder&path=" + current_path + "&folderpath=" + current_path + '/' + folder + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=deletefolder&path=" + current_path + "&folderpath=" + current_path + '/' + folder + "&token=<?= $newToken; ?>";
                 return false;
             }
         }
@@ -170,7 +170,7 @@ 
         function deleteFile (file)
         {
             if (confirmDelete()) {
-                window.location.href = "index.php?a=31&mode=delete&path=" + current_path + '/' + file + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=delete&path=" + current_path + '/' + file + "&token=<?= $newToken; ?>";
                 return false;
             }
         }
@@ -179,7 +179,7 @@ 
         {
             var newFilename = prompt("<?= $_lang["files_dynamic_new_file_name"] ?>", file);
             if (newFilename !== null && newFilename !== file) {
-                window.location.href = "index.php?a=31&mode=duplicate&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=duplicate&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken; ?>";
             }
         }
 
@@ -187,7 +187,7 @@ 
         {
             var newDirname = prompt("<?= $_lang["files_dynamic_new_folder_name"] ?>", dir);
             if (newDirname !== null && newDirname !== dir) {
-                window.location.href = "index.php?a=31&mode=renameFolder&path=" + current_path + '&dirname=' + dir + "&newDirname=" + newDirname + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=renameFolder&path=" + current_path + '&dirname=' + dir + "&newDirname=" + newDirname + "&token=<?= $newToken; ?>";
             }
         }
 
@@ -195,7 +195,7 @@ 
         {
             var newFilename = prompt("<?= $_lang["files_dynamic_new_file_name"] ?>", file);
             if (newFilename !== null && newFilename !== file) {
-                window.location.href = "index.php?a=31&mode=renameFile&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=renameFile&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken; ?>";
             }
         }
 
@@ -214,7 +214,7 @@ 
             <?php endif ?>
             <?php
             if (isset($_GET['mode']) && $_GET['mode'] !== 'drill') {
-                $href = 'a=31&path=' . urlencode($_REQUEST['path']);
+                $href = 'a=31&path='.urlencode($_REQUEST['path']);
             } else {
                 $href = 'a=2';
             }
@@ -224,12 +224,12 @@ 
                 $tpl = '<a class="btn btn-secondary" href="[+href+]" onclick="return getFolderName(this);"><i class="[+image+]"></i><span>[+subject+]</span></a>';
                 $ph['image'] = $_style['files_folder-open'];
                 $ph['subject'] = $_lang['add_folder'];
-                $ph['href'] = 'index.php?a=31&mode=newfolder&path=' . urlencode($startpath) . '&name=';
+                $ph['href'] = 'index.php?a=31&mode=newfolder&path='.urlencode($startpath).'&name=';
                 $_ = parsePlaceholder($tpl, $ph);
 
-                $tpl = '<a class="btn btn-secondary" href="[+href+]" onclick="return getFileName(this);"><i class="[+image+]"></i><span>' . $_lang['files.dynamic.php1'] . '</span></a>';
+                $tpl = '<a class="btn btn-secondary" href="[+href+]" onclick="return getFileName(this);"><i class="[+image+]"></i><span>'.$_lang['files.dynamic.php1'].'</span></a>';
                 $ph['image'] = $_style['files_page_html'];
-                $ph['href'] = 'index.php?a=31&mode=newfile&path=' . urlencode($startpath) . '&name=';
+                $ph['href'] = 'index.php?a=31&mode=newfile&path='.urlencode($startpath).'&name=';
                 $_ .= parsePlaceholder($tpl, $ph);
                 echo $_;
             }
@@ -259,12 +259,12 @@ 
             $ph = array();
             $ph['style_path'] = $theme_image_path;
             // To Top Level with folder icon to the left
-            if ($startpath == $filemanager_path || $startpath . '/' == $filemanager_path) {
-                $ph['image'] = '' . $_style['files_top'] . '';
+            if ($startpath == $filemanager_path || $startpath.'/' == $filemanager_path) {
+                $ph['image'] = ''.$_style['files_top'].'';
                 $ph['subject'] = '<span>Top</span>';
             } else {
-                $ph['image'] = '' . $_style['files_top'] . '';
-                $ph['subject'] = '<a href="index.php?a=31&mode=drill&path=' . $filemanager_path . '">Top</a>/';
+                $ph['image'] = ''.$_style['files_top'].'';
+                $ph['subject'] = '<a href="index.php?a=31&mode=drill&path='.$filemanager_path.'">Top</a>/';
             }
 
             echo parsePlaceholder($tpl, $ph);
@@ -281,12 +281,12 @@ 
                     if (empty($v)) {
                         continue;
                     }
-                    $path .= rtrim($v, '/') . '/';
+                    $path .= rtrim($v, '/').'/';
                     if (1 < $count) {
-                        $href = 'index.php?a=31&mode=drill&path=' . urlencode($filemanager_path . $path);
-                        $pieces[$i] = '<a href="' . $href . '">' . trim($v, '/') . '</a>';
+                        $href = 'index.php?a=31&mode=drill&path='.urlencode($filemanager_path.$path);
+                        $pieces[$i] = '<a href="'.$href.'">'.trim($v, '/').'</a>';
                     } else {
-                        $pieces[$i] = '<span>' . trim($v, '/') . '</span>';
+                        $pieces[$i] = '<span>'.trim($v, '/').'</span>';
                     }
                     $count--;
                 }
@@ -299,16 +299,16 @@ 
         </div>
         <?php
         // check to see user isn't trying to move below the document_root
-        if (substr(strtolower(str_replace('//', '/', $startpath . "/")), 0, $len) != strtolower(str_replace('//', '/', $filemanager_path . '/'))) {
+        if (substr(strtolower(str_replace('//', '/', $startpath."/")), 0, $len) != strtolower(str_replace('//', '/', $filemanager_path.'/'))) {
             $modx->webAlertAndQuit($_lang["files_access_denied"]);
         }
 
         // Unzip .zip files - by Raymond
         if ($enablefileunzip && $_REQUEST['mode'] == 'unzip' && is_writable($startpath)) {
-            if (!$err = unzip(realpath("{$startpath}/" . $_REQUEST['file']), realpath($startpath))) {
-                echo '<span class="warning"><b>' . $_lang['file_unzip_fail'] . ($err === 0 ? 'Missing zip library (php_zip.dll / zip.so)' : '') . '</b></span><br /><br />';
+            if (!$err = unzip(realpath("{$startpath}/".$_REQUEST['file']), realpath($startpath))) {
+                echo '<span class="warning"><b>'.$_lang['file_unzip_fail'].($err === 0 ? 'Missing zip library (php_zip.dll / zip.so)' : '').'</b></span><br /><br />';
             } else {
-                echo '<span class="success"><b>' . $_lang['file_unzip'] . '</b></span><br /><br />';
+                echo '<span class="success"><b>'.$_lang['file_unzip'].'</b></span><br /><br />';
             }
         }
         // End Unzip - Raymond
@@ -320,9 +320,9 @@ 
             if ($_REQUEST['mode'] == 'deletefolder') {
                 $folder = $_REQUEST['folderpath'];
                 if (!$token_check || !@rrmdir($folder)) {
-                    echo '<span class="warning"><b>' . $_lang['file_folder_not_deleted'] . '</b></span><br /><br />';
+                    echo '<span class="warning"><b>'.$_lang['file_folder_not_deleted'].'</b></span><br /><br />';
                 } else {
-                    echo '<span class="success"><b>' . $_lang['file_folder_deleted'] . '</b></span><br /><br />';
+                    echo '<span class="success"><b>'.$_lang['file_folder_deleted'].'</b></span><br /><br />';
                 }
             }
 
@@ -333,10 +333,10 @@ 
                 if (!mkdirs("{$startpath}/{$foldername}", 0777)) {
                     echo '<span class="warning"><b>', $_lang['file_folder_not_created'], '</b></span><br /><br />';
                 } else {
-                    if (!@chmod($startpath . '/' . $foldername, $newfolderaccessmode)) {
-                        echo '<span class="warning"><b>' . $_lang['file_folder_chmod_error'] . '</b></span><br /><br />';
+                    if (!@chmod($startpath.'/'.$foldername, $newfolderaccessmode)) {
+                        echo '<span class="warning"><b>'.$_lang['file_folder_chmod_error'].'</b></span><br /><br />';
                     } else {
-                        echo '<span class="success"><b>' . $_lang['file_folder_created'] . '</b></span><br /><br />';
+                        echo '<span class="success"><b>'.$_lang['file_folder_created'].'</b></span><br /><br />';
                     }
                 }
                 umask($old_umask);
@@ -348,7 +348,7 @@ 
                 $filename = $modx->db->escape($filename);
 
                 if (!checkExtension($filename)) {
-                    echo '<span class="warning"><b>' . $_lang['files_filetype_notok'] . '</b></span><br /><br />';
+                    echo '<span class="warning"><b>'.$_lang['files_filetype_notok'].'</b></span><br /><br />';
                 } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $filename) !== 0) {
                     echo $_lang['files.dynamic.php3'];
                 } else {
@@ -370,11 +370,11 @@ 
                 $newFilename = $modx->db->escape($newFilename);
 
                 if (!checkExtension($newFilename)) {
-                    echo '<span class="warning"><b>' . $_lang['files_filetype_notok'] . '</b></span><br /><br />';
+                    echo '<span class="warning"><b>'.$_lang['files_filetype_notok'].'</b></span><br /><br />';
                 } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newFilename) !== 0) {
                     echo $_lang['files.dynamic.php3'];
                 } else {
-                    if (!copy($filename, MODX_BASE_PATH . $newFilename)) {
+                    if (!copy($filename, MODX_BASE_PATH.$newFilename)) {
                         echo $_lang['files.dynamic.php5'];
                     }
                     umask($old_umask);
@@ -383,7 +383,7 @@ 
             // Rename folder here
             if ($_REQUEST['mode'] == 'renameFolder') {
                 $old_umask = umask(0);
-                $dirname = $_REQUEST['path'] . '/' . $_REQUEST['dirname'];
+                $dirname = $_REQUEST['path'].'/'.$_REQUEST['dirname'];
                 $dirname = $modx->db->escape($dirname);
                 $newDirname = str_replace(array(
                     '..\\',
@@ -395,7 +395,7 @@ 
 
                 if (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newDirname) !== 0) {
                     echo $_lang['files.dynamic.php3'];
-                } else if (!rename($dirname, $_REQUEST['path'] . '/' . $newDirname)) {
+                } else if (!rename($dirname, $_REQUEST['path'].'/'.$newDirname)) {
                     echo '<span class="warning"><b>', $_lang['file_folder_not_created'], '</b></span><br /><br />';
                 }
                 umask($old_umask);
@@ -415,11 +415,11 @@ 
                 $newFilename = $modx->db->escape($newFilename);
 
                 if (!checkExtension($newFilename)) {
-                    echo '<span class="warning"><b>' . $_lang['files_filetype_notok'] . '</b></span><br /><br />';
+                    echo '<span class="warning"><b>'.$_lang['files_filetype_notok'].'</b></span><br /><br />';
                 } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newFilename) !== 0) {
                     echo $_lang['files.dynamic.php3'];
                 } else {
-                    if (!rename($filename, $path . '/' . $newFilename)) {
+                    if (!rename($filename, $path.'/'.$newFilename)) {
                         echo $_lang['files.dynamic.php5'];
                     }
                     umask($old_umask);
@@ -452,7 +452,7 @@ 
                 ls($startpath);
                 echo "\n\n\n";
                 if ($folders == 0 && $files == 0) {
-                    echo '<tr><td colspan="4"><i class="' . $_style['files_deleted_folder'] . ' FilesDeletedFolder"></i> <span style="color:#888;cursor:default;"> ' . $_lang['files_directory_is_empty'] . ' </span></td></tr>';
+                    echo '<tr><td colspan="4"><i class="'.$_style['files_deleted_folder'].' FilesDeletedFolder"></i> <span style="color:#888;cursor:default;"> '.$_lang['files_directory_is_empty'].' </span></td></tr>';
                 }
                 ?>
             </table>
@@ -461,10 +461,10 @@ 
         <div class="container">
             <p>
                 <?php
-                echo $_lang['files_directories'] . ': <b>' . $folders . '</b> ';
-                echo $_lang['files_files'] . ': <b>' . $files . '</b> ';
-                echo $_lang['files_data'] . ': <b><span dir="ltr">' . $modx->nicesize($filesizes) . '</span></b> ';
-                echo $_lang['files_dirwritable'] . ' <b>' . (is_writable($startpath) == 1 ? $_lang['yes'] . '.' : $_lang['no']) . '.</b>'
+                echo $_lang['files_directories'].': <b>'.$folders.'</b> ';
+                echo $_lang['files_files'].': <b>'.$files.'</b> ';
+                echo $_lang['files_data'].': <b><span dir="ltr">'.$modx->nicesize($filesizes).'</span></b> ';
+                echo $_lang['files_dirwritable'].' <b>'.(is_writable($startpath) == 1 ? $_lang['yes'].'.' : $_lang['no']).'.</b>'
                 ?>
             </p>
 
@@ -489,7 +489,7 @@ 
                 </form>
                 <?php
             } else {
-                echo "<p>" . $_lang['files_upload_inhibited_msg'] . "</p>";
+                echo "<p>".$_lang['files_upload_inhibited_msg']."</p>";
             }
             ?>
             <div id="imageviewer"></div>

manager/includes/src/Interfaces/ManagerThemeInterface.php

Braces +3 added lines, -1 removed lines

@@ -1,3 +1,5 @@
 <?php namespace EvolutionCMS\Interfaces;
 
-interface ManagerThemeInterface{}
+interface ManagerThemeInterface
+{
+}

manager/includes/functions/actions/help.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!function_exists('createList')) {
+if (!function_exists('createList')) {
     /**
      * @param string $sectionHeader
      * @param array $linkArr
@@ -7,8 +7,8 @@ 
      */
     function createList($sectionHeader, $linkArr)
     {
-        $output = '<div class="sectionHeader">' . $sectionHeader . '</div><div class="sectionBody">' . "\n";
-        $output .= '<table width="500"  border="0" cellspacing="0" cellpadding="0">' . "\n";
+        $output = '<div class="sectionHeader">'.$sectionHeader.'</div><div class="sectionBody">'."\n";
+        $output .= '<table width="500"  border="0" cellspacing="0" cellpadding="0">'."\n";
         $links = '';
         foreach ($linkArr as $row) {
             if (!is_array($row['link'])) {
@@ -16,16 +16,16 @@ 
             }
             foreach ($row['link'] as $link) {
                 $links .= $links != '' ? '<br/>' : '';
-                $links .= '<a href="' . $link . '" target="_blank">' . $link . '</a>';
+                $links .= '<a href="'.$link.'" target="_blank">'.$link.'</a>';
             }
             $output .= '
 		<tr>
-			<td align="left"><strong>' . $row["title"] . '</strong></td>
-			<td align="left">' . $links . '</td>
+			<td align="left"><strong>' . $row["title"].'</strong></td>
+			<td align="left">' . $links.'</td>
 		</tr>';
             $links = '';
         }
-        $output .= '</table></div>' . "\n";
+        $output .= '</table></div>'."\n";
 
         return $output;
     }

manager/includes/functions/actions/mutate_plugin.php

Spacing +2 added lines, -2 removed lines

@@ -16,8 +16,8 @@
     {
         echo '<div class="row form-row">
                 <div class="col-sm-6 col-md-4 col-lg-3">' .
-                    implode('</div><div class="col-sm-6 col-md-4 col-lg-3">', $evtnames) .
-                '</div>' .
+                    implode('</div><div class="col-sm-6 col-md-4 col-lg-3">', $evtnames).
+                '</div>'.
         '</div>';
 
         $evtnames = array();

manager/includes/functions/actions/mutate_content.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-if(!function_exists('getDefaultTemplate')) {
+if (!function_exists('getDefaultTemplate')) {
     /**
      * @return string
      */

manager/includes/functions/actions/settings.php

Spacing +12 added lines, -12 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!function_exists('get_lang_keys')) {
+if (!function_exists('get_lang_keys')) {
     /**
      * get_lang_keys
      *
@@ -8,7 +8,7 @@ 
      */
     function get_lang_keys($filename)
     {
-        $file = MODX_MANAGER_PATH . 'includes/lang' . DIRECTORY_SEPARATOR . $filename;
+        $file = MODX_MANAGER_PATH.'includes/lang'.DIRECTORY_SEPARATOR.$filename;
         if (is_file($file) && is_readable($file)) {
             include($file);
             $out = isset($_lang) ? array_keys($_lang) : array();
@@ -20,7 +20,7 @@ 
     }
 }
 
-if(!function_exists('get_langs_by_key')) {
+if (!function_exists('get_langs_by_key')) {
     /**
      * get_langs_by_key
      *
@@ -41,7 +41,7 @@ 
     }
 }
 
-if(!function_exists('get_lang_options')) {
+if (!function_exists('get_lang_options')) {
     /**
      * get_lang_options
      *
@@ -58,11 +58,11 @@ 
         if (!empty($key)) {
             $languages = get_langs_by_key($key);
             sort($languages);
-            $lang_options .= '<option value="">' . $_lang['language_title'] . '</option>';
+            $lang_options .= '<option value="">'.$_lang['language_title'].'</option>';
 
             foreach ($languages as $language_name) {
                 $uclanguage_name = ucwords(str_replace("_", " ", $language_name));
-                $lang_options .= '<option value="' . $language_name . '">' . $uclanguage_name . '</option>';
+                $lang_options .= '<option value="'.$language_name.'">'.$uclanguage_name.'</option>';
             }
 
             return $lang_options;
@@ -72,7 +72,7 @@ 
             foreach ($languages as $language_name) {
                 $uclanguage_name = ucwords(str_replace("_", " ", $language_name));
                 $sel = $language_name === $selected_lang ? ' selected="selected"' : '';
-                $lang_options .= '<option value="' . $language_name . '" ' . $sel . '>' . $uclanguage_name . '</option>';
+                $lang_options .= '<option value="'.$language_name.'" '.$sel.'>'.$uclanguage_name.'</option>';
             }
 
             return $lang_options;
@@ -80,7 +80,7 @@ 
     }
 }
 
-if(!function_exists('form_radio')) {
+if (!function_exists('form_radio')) {
     /**
      * @param string $name
      * @param string $value
@@ -99,7 +99,7 @@ 
             $disabled = '';
         }
         if ($add) {
-            $add = ' ' . $add;
+            $add = ' '.$add;
         }
 
         return sprintf('<input onchange="documentDirty=true;" type="radio" name="%s" value="%s" %s %s %s />', $name,
@@ -108,7 +108,7 @@ 
     }
 }
 
-if(!function_exists('wrap_label')) {
+if (!function_exists('wrap_label')) {
     /**
      * @param string $str
      * @param string $object
@@ -121,7 +121,7 @@ 
 
 }
 
-if(!function_exists('parseText')) {
+if (!function_exists('parseText')) {
     /**
      * @param string $tpl
      * @param array $ph
@@ -142,7 +142,7 @@ 
     }
 }
 
-if(!function_exists('showHide')) {
+if (!function_exists('showHide')) {
     /**
      * @param bool $cond
      * @return string

manager/includes/functions/actions/search.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!function_exists('highlightingCoincidence')) {
+if (!function_exists('highlightingCoincidence')) {
     /**
      * @param string $text
      * @param string $search
@@ -8,19 +8,19 @@ 
      */
     function highlightingCoincidence($text, $search)
     {
-        $regexp = '!(' . str_replace(array(
+        $regexp = '!('.str_replace(array(
                 '(',
                 ')'
             ), array(
                 '\(',
                 '\)'
-            ), trim($search)) . ')!isu';
+            ), trim($search)).')!isu';
 
         return preg_replace($regexp, '<span class="text-danger">$1</span>', $text);
     }
 }
 
-if(!function_exists('addClassForItemList')) {
+if (!function_exists('addClassForItemList')) {
     /**
      * @param string $locked
      * @param string $disabled
@@ -40,7 +40,7 @@ 
             $class .= ' deleted';
         }
         if ($class) {
-            $class = ' class="' . trim($class) . '"';
+            $class = ' class="'.trim($class).'"';
         }
 
         return $class;