evolution-cms / evolution

manager/includes/messageCount.inc.php

Spacing +3 added lines, -3 removed lines

@@ -4,15 +4,15 @@
 }
 
 $rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('user_messages'),
-    "recipient=" . $modx->getLoginUserID() . " AND messageread=0");
+    "recipient=".$modx->getLoginUserID()." AND messageread=0");
 $nrnewmessages = $modx->getDatabase()->getValue($rs);
-$rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID());
+$rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID());
 $nrtotalmessages = $modx->getDatabase()->getValue($rs);
 $messagesallowed = $modx->hasPermission('messages');
 
 // ajax response
 if (isset($_POST['updateMsgCount'])) {
     header("Content-Type: application/json; charset=utf-8");
-    print $nrnewmessages . ',' . $nrtotalmessages;
+    print $nrnewmessages.','.$nrtotalmessages;
     exit;
 }

manager/includes/src/Legacy/mgrResources.php

Spacing +36 added lines, -36 removed lines

@@ -1,6 +1,6 @@ 
 <?php namespace EvolutionCMS\Legacy;
 
-class mgrResources {
+class mgrResources{
     /**
      * @var array
      */
@@ -21,7 +21,7 @@ 
     /**
      * mgrResources constructor.
      */
-    public function __construct() {
+    public function __construct(){
         $this->setTypes();
         $this->queryItemsFromDB();
         $this->prepareCategoryArrays();
@@ -30,47 +30,47 @@ 
     /**
      * @return void
      */
-    public function setTypes() {
+    public function setTypes(){
         global $_lang;
-        $this->types['site_templates']    = array(
+        $this->types['site_templates'] = array(
             'title'=>$_lang["manage_templates"],
-            'actions'=>array( 'edit'=>array(16,'edit_template'), 'duplicate'=>array(96,'new_template'), 'remove'=>array(21,'delete_template') ),
-            'permissions'=>array('new_template','edit_template'),
+            'actions'=>array('edit'=>array(16, 'edit_template'), 'duplicate'=>array(96, 'new_template'), 'remove'=>array(21, 'delete_template')),
+            'permissions'=>array('new_template', 'edit_template'),
             'name'=>'templatename'
         );
-        $this->types['site_tmplvars']     = array(
+        $this->types['site_tmplvars'] = array(
             'title'=>$_lang["tmplvars"],
-            'actions'=>array('edit'=>array(301,'edit_template'), 'duplicate'=>array(304,'edit_template'), 'remove'=>array(303,'edit_template')),
-            'permissions'=>array('new_template','edit_template'),
+            'actions'=>array('edit'=>array(301, 'edit_template'), 'duplicate'=>array(304, 'edit_template'), 'remove'=>array(303, 'edit_template')),
+            'permissions'=>array('new_template', 'edit_template'),
         );
         $this->types['site_htmlsnippets'] = array(
             'title'=>$_lang["manage_htmlsnippets"],
-            'actions'=>array('edit'=>array(78,'edit_chunk'), 'duplicate'=>array(97,'new_chunk'), 'remove'=>array(80,'delete_chunk')),
-            'permissions'=>array('new_chunk','edit_chunk'),
+            'actions'=>array('edit'=>array(78, 'edit_chunk'), 'duplicate'=>array(97, 'new_chunk'), 'remove'=>array(80, 'delete_chunk')),
+            'permissions'=>array('new_chunk', 'edit_chunk'),
         );
-        $this->types['site_snippets']     = array(
+        $this->types['site_snippets'] = array(
             'title'=>$_lang["manage_snippets"],
-            'actions'=>array('edit'=>array(22,'edit_snippet'), 'duplicate'=>array(98,'new_snippet'), 'remove'=>array(25,'delete_snippet')),
-            'permissions'=>array('new_snippet','edit_snippet'),
+            'actions'=>array('edit'=>array(22, 'edit_snippet'), 'duplicate'=>array(98, 'new_snippet'), 'remove'=>array(25, 'delete_snippet')),
+            'permissions'=>array('new_snippet', 'edit_snippet'),
         );
-        $this->types['site_plugins']      = array(
+        $this->types['site_plugins'] = array(
             'title'=>$_lang["manage_plugins"],
-            'actions'=>array('edit'=>array(102,'edit_plugin'), 'duplicate'=>array(105,'new_plugin'), 'remove'=>array(104,'delete_plugin')),
-            'permissions'=>array('new_plugin','edit_plugin'),
+            'actions'=>array('edit'=>array(102, 'edit_plugin'), 'duplicate'=>array(105, 'new_plugin'), 'remove'=>array(104, 'delete_plugin')),
+            'permissions'=>array('new_plugin', 'edit_plugin'),
         );
-        $this->types['site_modules']      = array(
+        $this->types['site_modules'] = array(
             'title'=>$_lang["manage_modules"],
-            'actions'=>array('edit'=>array(108,'edit_module'), 'duplicate'=>array(111,'new_module'), 'remove'=>array(110,'delete_module')),
-            'permissions'=>array('new_module','edit_module'),
+            'actions'=>array('edit'=>array(108, 'edit_module'), 'duplicate'=>array(111, 'new_module'), 'remove'=>array(110, 'delete_module')),
+            'permissions'=>array('new_module', 'edit_module'),
         );
     }
 
     /**
      * @return void
      */
-    public function queryItemsFromDB() {
-        foreach($this->types as $resourceTable=>$type) {
-            if($this->hasAnyPermissions($type['permissions'])) {
+    public function queryItemsFromDB(){
+        foreach ($this->types as $resourceTable=>$type) {
+            if ($this->hasAnyPermissions($type['permissions'])) {
                 $nameField = isset($type['name']) ? $type['name'] : 'name';
                 $this->items[$resourceTable] = $this->queryResources($resourceTable, $nameField);
             }
@@ -81,11 +81,11 @@ 
      * @param array $permissions
      * @return bool
      */
-    public function hasAnyPermissions($permissions) {
+    public function hasAnyPermissions($permissions){
         $modx = evolutionCMS();
 
-        foreach($permissions as $p)
-            if($modx->hasPermission($p)) return true;
+        foreach ($permissions as $p)
+            if ($modx->hasPermission($p)) return true;
 
         return false;
     }
@@ -95,7 +95,7 @@ 
      * @param string $nameField
      * @return array|bool
      */
-    public function queryResources($resourceTable, $nameField = 'name') {
+    public function queryResources($resourceTable, $nameField = 'name'){
         $modx = evolutionCMS(); global $_lang;
 
         $allowed = array(
@@ -104,7 +104,7 @@ 
             'site_plugins',
             'site_modules'
         );
-        $pluginsql = !empty($resourceTable) && in_array($resourceTable, $allowed) ? $resourceTable . '.disabled, ' : '';
+        $pluginsql = !empty($resourceTable) && in_array($resourceTable, $allowed) ? $resourceTable.'.disabled, ' : '';
 
         $tvsql  = '';
         $tvjoin = '';
@@ -119,14 +119,14 @@ 
 
         $rs = $modx->getDatabase()->select(
             "{$sttfield} {$pluginsql} {$tvsql} {$resourceTable}.{$nameField} as name, {$resourceTable}.id, {$resourceTable}.description, {$resourceTable}.locked, {$selectableTemplates}IF(isnull(categories.category),'{$_lang['no_category']}',categories.category) as category, categories.id as catid",
-            $modx->getDatabase()->getFullTableName($resourceTable) . " AS {$resourceTable}
-	            LEFT JOIN " . $modx->getDatabase()->getFullTableName('categories') . " AS categories ON {$resourceTable}.category = categories.id {$tvjoin}",
+            $modx->getDatabase()->getFullTableName($resourceTable)." AS {$resourceTable}
+	            LEFT JOIN ".$modx->getDatabase()->getFullTableName('categories')." AS categories ON {$resourceTable}.category = categories.id {$tvjoin}",
             "",
             "category,name"
         );
         $limit = $modx->getDatabase()->getRecordCount($rs);
 
-        if($limit < 1) return false;
+        if ($limit < 1) return false;
 
         $result = array();
         while ($row = $modx->getDatabase()->getRow($rs)) {
@@ -138,9 +138,9 @@ 
     /**
      * @return void
      */
-    public function prepareCategoryArrays() {
-        foreach($this->items as $type=>$items) {
-            foreach((array)$items as $item) {
+    public function prepareCategoryArrays(){
+        foreach ($this->items as $type=>$items) {
+            foreach ((array) $items as $item) {
                 $catid = $item['catid'] ? $item['catid'] : 0;
                 $this->categories[$catid] = $item['category'];
 
@@ -153,8 +153,8 @@ 
         natcasesort($this->categories);
 
         // Now sort by name
-        foreach($this->itemsPerCategory as $catid=>$items) {
-            usort($this->itemsPerCategory[$catid], function ($a, $b) {
+        foreach ($this->itemsPerCategory as $catid=>$items) {
+            usort($this->itemsPerCategory[$catid], function($a, $b){
                 return strcasecmp($a['name'], $b['name']);
             });
         }

Braces +23 added lines, -12 removed lines

@@ -1,6 +1,7 @@ 
 <?php namespace EvolutionCMS\Legacy;
 
-class mgrResources {
+class mgrResources
+{
     /**
      * @var array
      */
@@ -21,7 +22,8 @@ 
     /**
      * mgrResources constructor.
      */
-    public function __construct() {
+    public function __construct()
+    {
         $this->setTypes();
         $this->queryItemsFromDB();
         $this->prepareCategoryArrays();
@@ -30,7 +32,8 @@ 
     /**
      * @return void
      */
-    public function setTypes() {
+    public function setTypes()
+    {
         global $_lang;
         $this->types['site_templates']    = array(
             'title'=>$_lang["manage_templates"],
@@ -68,7 +71,8 @@ 
     /**
      * @return void
      */
-    public function queryItemsFromDB() {
+    public function queryItemsFromDB()
+    {
         foreach($this->types as $resourceTable=>$type) {
             if($this->hasAnyPermissions($type['permissions'])) {
                 $nameField = isset($type['name']) ? $type['name'] : 'name';
@@ -81,11 +85,13 @@ 
      * @param array $permissions
      * @return bool
      */
-    public function hasAnyPermissions($permissions) {
+    public function hasAnyPermissions($permissions)
+    {
         $modx = evolutionCMS();
 
-        foreach($permissions as $p)
-            if($modx->hasPermission($p)) return true;
+        foreach($permissions as $p) {
+                    if($modx->hasPermission($p)) return true;
+        }
 
         return false;
     }
@@ -95,7 +101,8 @@ 
      * @param string $nameField
      * @return array|bool
      */
-    public function queryResources($resourceTable, $nameField = 'name') {
+    public function queryResources($resourceTable, $nameField = 'name')
+    {
         $modx = evolutionCMS(); global $_lang;
 
         $allowed = array(
@@ -112,8 +119,9 @@ 
             $tvsql    = 'site_tmplvars.caption, ';
             $tvjoin   = sprintf('LEFT JOIN %s AS stt ON site_tmplvars.id=stt.tmplvarid GROUP BY site_tmplvars.id,reltpl', $modx->getDatabase()->getFullTableName('site_tmplvar_templates'));
             $sttfield = 'IF(stt.templateid,1,0) AS reltpl,';
+        } else {
+            $sttfield = '';
         }
-        else $sttfield = '';
 
         $selectableTemplates = $resourceTable === 'site_templates' ? "{$resourceTable}.selectable, " : "";
 
@@ -126,7 +134,9 @@ 
         );
         $limit = $modx->getDatabase()->getRecordCount($rs);
 
-        if($limit < 1) return false;
+        if($limit < 1) {
+            return false;
+        }
 
         $result = array();
         while ($row = $modx->getDatabase()->getRow($rs)) {
@@ -138,7 +148,8 @@ 
     /**
      * @return void
      */
-    public function prepareCategoryArrays() {
+    public function prepareCategoryArrays()
+    {
         foreach($this->items as $type=>$items) {
             foreach((array)$items as $item) {
                 $catid = $item['catid'] ? $item['catid'] : 0;
@@ -154,7 +165,7 @@ 
 
         // Now sort by name
         foreach($this->itemsPerCategory as $catid=>$items) {
-            usort($this->itemsPerCategory[$catid], function ($a, $b) {
+            usort($this->itemsPerCategory[$catid], function ($a, $b){
                 return strcasecmp($a['name'], $b['name']);
             });
         }

manager/includes/src/Legacy/Categories.php

Spacing +11 added lines, -11 removed lines

@@ -17,7 +17,7 @@ 
         $this->db_tbl['categories'] = $modx->getDatabase()->getFullTableName('categories');
 
         foreach ($this->elements as $element) {
-            $this->db_tbl[$element] = $modx->getDatabase()->getFullTableName('site_' . $element);
+            $this->db_tbl[$element] = $modx->getDatabase()->getFullTableName('site_'.$element);
         }
     }
 
@@ -51,7 +51,7 @@ 
             $this->db->select(
                 '*',
                 $this->db_tbl['categories'],
-                "`" . $where . "` = '" . $this->db->escape($search) . "'"
+                "`".$where."` = '".$this->db->escape($search)."'"
             )
         );
 
@@ -68,9 +68,9 @@ 
     {
         $_value = $this->db->getValue(
             $this->db->select(
-                '`' . $value . '`',
+                '`'.$value.'`',
                 $this->db_tbl['categories'],
-                "`" . $where . "` = '" . $this->db->escape($search) . "'"
+                "`".$where."` = '".$this->db->escape($search)."'"
             )
         );
 
@@ -89,7 +89,7 @@ 
                 $this->db->select(
                     '*',
                     $this->db_tbl[$element],
-                    "`category` = '" . (int)$category_id . "'"
+                    "`category` = '".(int) $category_id."'"
                 )
             );
 
@@ -132,13 +132,13 @@ 
             $this->db->update(
                 $_update,
                 $this->db_tbl[$element],
-                "`category` = '" . (int)$category_id . "'"
+                "`category` = '".(int) $category_id."'"
             );
         }
 
         $this->db->delete(
             $this->db_tbl['categories'],
-            "`id` = '" . (int)$category_id . "'"
+            "`id` = '".(int) $category_id."'"
         );
 
         return $this->db->getAffectedRows() === 1;
@@ -157,13 +157,13 @@ 
 
         $_update = array(
             'category' => $this->db->escape($data['category']),
-            'rank'     => (int)$data['rank']
+            'rank'     => (int) $data['rank']
         );
 
         $this->db->update(
             $_update,
             $this->db_tbl['categories'],
-            "`id` = '" . (int)$category_id . "'"
+            "`id` = '".(int) $category_id."'"
         );
 
         if ($this->db->getAffectedRows() === 1) {
@@ -186,7 +186,7 @@ 
 
         $_insert = array(
             'category' => $this->db->escape($category_name),
-            'rank'     => (int)$category_rank
+            'rank'     => (int) $category_rank
         );
 
         $this->db->insert(
@@ -213,7 +213,7 @@ 
             $this->db->select(
                 '`id`',
                 $this->db_tbl['categories'],
-                "`category` = '" . $category . "'"
+                "`category` = '".$category."'"
             )
         );
 

manager/includes/functions/processors.php

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->getDatabase()->getRecordCount($modx->getDatabase()->select('pagetitle', $modx->getDatabase()->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->getDatabase()->getFullTableName('site_tmplvar_contentvalues');
 
-        $newid = (int)$newid;
-        $oldid = (int)$oldid;
+        $newid = (int) $newid;
+        $oldid = (int) $oldid;
 
         $modx->getDatabase()->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->getDatabase()->getFullTableName('document_groups');
 
-        $newid = (int)$newid;
-        $oldid = (int)$oldid;
+        $newid = (int) $newid;
+        $oldid = (int) $oldid;
 
         $modx->getDatabase()->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->getDatabase()->escape($msg)) . "')\",10);history.go(-1)</script>";
+            echo "<script>window.setTimeout(\"alert('".addslashes($modx->getDatabase()->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
@@ -370,7 +370,7 @@ 
     }
 }
 
-if(!function_exists('incrementFailedLoginCount')) {
+if (!function_exists('incrementFailedLoginCount')) {
     /**
      * @param int $internalKey
      * @param int $failedlogins
@@ -397,7 +397,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;
             }
@@ -410,7 +410,7 @@ 
     }
 }
 
-if(!function_exists('saveUserGroupAccessPermissons')) {
+if (!function_exists('saveUserGroupAccessPermissons')) {
     /**
      * saves module user group access
      */
@@ -441,7 +441,7 @@ 
     }
 }
 
-if(!function_exists('saveEventListeners')) {
+if (!function_exists('saveEventListeners')) {
 # Save Plugin Event Listeners
     function saveEventListeners($id, $sysevents, $mode)
     {
@@ -511,7 +511,7 @@ 
     }
 }
 
-if(!function_exists('getEventIdByName')) {
+if (!function_exists('getEventIdByName')) {
     /**
      * @param string $name
      * @return string|int
@@ -537,7 +537,7 @@ 
     }
 }
 
-if(!function_exists('saveTemplateAccess')) {
+if (!function_exists('saveTemplateAccess')) {
     /**
      * @param int $id
      */
@@ -576,7 +576,7 @@ 
     }
 }
 
-if(!function_exists('saveTemplateVarAccess')) {
+if (!function_exists('saveTemplateVarAccess')) {
     /**
      * @return void
      */
@@ -615,7 +615,7 @@ 
     }
 }
 
-if(!function_exists('saveDocumentAccessPermissons')) {
+if (!function_exists('saveDocumentAccessPermissons')) {
     function saveDocumentAccessPermissons()
     {
         global $id, $newid;
@@ -784,10 +784,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->getDatabase()->delete($tbl_user_settings, "user='{$id}'");
@@ -819,7 +819,7 @@ 
         global $id, $modx;
         $mode = $_POST['mode'];
         $modx->getManagerApi()->saveFormValues($mode);
-        $modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode === $action ? "&id={$id}" : ''));
+        $modx->webAlertAndQuit($msg, "index.php?a={$mode}".($mode === $action ? "&id={$id}" : ''));
     }
 }
 
@@ -835,7 +835,7 @@ 
         global $deltime;
 
         $rs = $modx->getDatabase()->select('id', $modx->getDatabase()->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->getDatabase()->getRow($rs)) {
             $children[] = $row['id'];

Braces +3 added lines, -1 removed lines

@@ -384,10 +384,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->getDatabase()->update(
             $fields,

manager/includes/functions/nodes.php

Spacing +41 added lines, -41 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!function_exists('makeHTML')) {
+if (!function_exists('makeHTML')) {
     /**
      * @param int $indent
      * @param int $parent
@@ -37,14 +37,14 @@ 
             case 'publishedon':
             case 'pub_date':
             case 'unpub_date':
-                $sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.' . $_SESSION['tree_sortby'],
-                    'sc.' . $_SESSION['tree_sortby']);
+                $sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.'.$_SESSION['tree_sortby'],
+                    'sc.'.$_SESSION['tree_sortby']);
                 break;
             default:
-                $sortby = 'sc.' . $_SESSION['tree_sortby'];
+                $sortby = 'sc.'.$_SESSION['tree_sortby'];
         };
 
-        $orderby = $modx->getDatabase()->escape($sortby . ' ' . $_SESSION['tree_sortdir']);
+        $orderby = $modx->getDatabase()->escape($sortby.' '.$_SESSION['tree_sortdir']);
 
         // Folder sorting gets special setup ;) Add menuindex and pagetitle
         if ($_SESSION['tree_sortby'] == 'isfolder') {
@@ -59,11 +59,11 @@ 
             $_SESSION['mgrDocgroups']) : '';
         $showProtected = false;
         if (isset ($modx->config['tree_show_protected'])) {
-            $showProtected = (boolean)$modx->config['tree_show_protected'];
+            $showProtected = (boolean) $modx->config['tree_show_protected'];
         }
-        $mgrRole = (isset ($_SESSION['mgrRole']) && (string)$_SESSION['mgrRole'] === '1') ? '1' : '0';
+        $mgrRole = (isset ($_SESSION['mgrRole']) && (string) $_SESSION['mgrRole'] === '1') ? '1' : '0';
         if ($showProtected == false) {
-            $access = "AND (1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
+            $access = "AND (1={$mgrRole} OR sc.privatemgr=0".(!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
         } else {
             $access = '';
         }
@@ -100,7 +100,7 @@ 
             }
 
             $weblinkDisplay = $row['type'] == 'reference' ? sprintf('&nbsp;%s', $_style['tree_linkgo']) : '';
-            $pageIdDisplay = '<small>(' . ($modx_textdir ? '&rlm;' : '') . $row['id'] . ')</small>';
+            $pageIdDisplay = '<small>('.($modx_textdir ? '&rlm;' : '').$row['id'].')</small>';
 
             // Prepare displaying user-locks
             $lockedByUser = '';
@@ -111,7 +111,7 @@ 
                         'element_type' => $_lang["lock_element_type_7"],
                         'lasthit_df'   => $rowLock['lasthit_df']
                     ));
-                    $lockedByUser = '<span title="' . $title . '" class="editResource">' . $_style['tree_preview_resource'] . '</span>';
+                    $lockedByUser = '<span title="'.$title.'" class="editResource">'.$_style['tree_preview_resource'].'</span>';
                 } else {
                     $title = $modx->parseText($_lang["lock_element_locked_by"], array(
                         'element_type' => $_lang["lock_element_type_7"],
@@ -119,9 +119,9 @@ 
                         'lasthit_df'   => $rowLock['lasthit_df']
                     ));
                     if ($modx->hasPermission('remove_locks')) {
-                        $lockedByUser = '<span onclick="modx.tree.unlockElement(7, ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
+                        $lockedByUser = '<span onclick="modx.tree.unlockElement(7, '.$row['id'].', this);return false;" title="'.$title.'" class="lockedResource">'.$_style['icons_secured'].'</span>';
                     } else {
-                        $lockedByUser = '<span title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
+                        $lockedByUser = '<span title="'.$title.'" class="lockedResource">'.$_style['icons_secured'].'</span>';
                     }
                 }
             }
@@ -130,22 +130,22 @@ 
 
             $title = '';
             if (isDateNode($nodeNameSource)) {
-                $title = $_lang['pagetitle'] . ': ' . $row['pagetitle'] . '[+lf+]';
+                $title = $_lang['pagetitle'].': '.$row['pagetitle'].'[+lf+]';
             }
-            $title .= $_lang['id'] . ': ' . $row['id'];
-            $title .= '[+lf+]' . $_lang['resource_opt_menu_title'] . ': ' . $row['menutitle'];
-            $title .= '[+lf+]' . $_lang['resource_opt_menu_index'] . ': ' . $row['menuindex'];
-            $title .= '[+lf+]' . $_lang['alias'] . ': ' . (!empty($row['alias']) ? $row['alias'] : '-');
-            $title .= '[+lf+]' . $_lang['template'] . ': ' . $row['templatename'];
-            $title .= '[+lf+]' . $_lang['publish_date'] . ': ' . $modx->toDateFormat($row['pub_date']);
-            $title .= '[+lf+]' . $_lang['unpublish_date'] . ': ' . $modx->toDateFormat($row['unpub_date']);
-            $title .= '[+lf+]' . $_lang['page_data_web_access'] . ': ' . ($row['privateweb'] ? $_lang['private'] : $_lang['public']);
-            $title .= '[+lf+]' . $_lang['page_data_mgr_access'] . ': ' . ($row['privatemgr'] ? $_lang['private'] : $_lang['public']);
-            $title .= '[+lf+]' . $_lang['resource_opt_richtext'] . ': ' . ($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']);
-            $title .= '[+lf+]' . $_lang['page_data_searchable'] . ': ' . ($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']);
-            $title .= '[+lf+]' . $_lang['page_data_cacheable'] . ': ' . ($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']);
+            $title .= $_lang['id'].': '.$row['id'];
+            $title .= '[+lf+]'.$_lang['resource_opt_menu_title'].': '.$row['menutitle'];
+            $title .= '[+lf+]'.$_lang['resource_opt_menu_index'].': '.$row['menuindex'];
+            $title .= '[+lf+]'.$_lang['alias'].': '.(!empty($row['alias']) ? $row['alias'] : '-');
+            $title .= '[+lf+]'.$_lang['template'].': '.$row['templatename'];
+            $title .= '[+lf+]'.$_lang['publish_date'].': '.$modx->toDateFormat($row['pub_date']);
+            $title .= '[+lf+]'.$_lang['unpublish_date'].': '.$modx->toDateFormat($row['unpub_date']);
+            $title .= '[+lf+]'.$_lang['page_data_web_access'].': '.($row['privateweb'] ? $_lang['private'] : $_lang['public']);
+            $title .= '[+lf+]'.$_lang['page_data_mgr_access'].': '.($row['privatemgr'] ? $_lang['private'] : $_lang['public']);
+            $title .= '[+lf+]'.$_lang['resource_opt_richtext'].': '.($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']);
+            $title .= '[+lf+]'.$_lang['page_data_searchable'].': '.($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']);
+            $title .= '[+lf+]'.$_lang['page_data_cacheable'].': '.($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']);
             $title = $modx->getPhpCompat()->htmlspecialchars($title);
-            $title = str_replace('[+lf+]', ' &#13;', $title);   // replace line-breaks with empty space as fall-back
+            $title = str_replace('[+lf+]', ' &#13;', $title); // replace line-breaks with empty space as fall-back
 
             $data = array(
                 'id'               => $row['id'],
@@ -229,7 +229,7 @@ 
                 }
 
                 if ($ph['contextmenu']) {
-                    $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                    $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                 }
 
                 if ($_SESSION['tree_show_only_folders']) {
@@ -287,7 +287,7 @@ 
                         }
 
                         if ($ph['contextmenu']) {
-                            $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                            $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                         }
 
                         $node .= $modx->parseText($tpl, $ph);
@@ -325,7 +325,7 @@ 
                         }
 
                         if ($ph['contextmenu']) {
-                            $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                            $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                         }
 
                         $node .= $modx->parseText($tpl, $ph);
@@ -376,7 +376,7 @@ 
                         }
 
                         if ($ph['contextmenu']) {
-                            $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                            $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                         }
 
                         $node .= $modx->parseText($tpl, $ph);
@@ -418,7 +418,7 @@ 
                         }
 
                         if ($ph['contextmenu']) {
-                            $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                            $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                         }
 
                         $node .= $modx->parseText($tpl, $ph);
@@ -444,7 +444,7 @@ 
     }
 }
 
-if(!function_exists('getIconInfo')) {
+if (!function_exists('getIconInfo')) {
     /**
      * @param array $_style
      * @return array
@@ -478,7 +478,7 @@ 
     }
 }
 
-if(!function_exists('getNodeTitle')) {
+if (!function_exists('getNodeTitle')) {
     /**
      * @param string $nodeNameSource
      * @param array $row
@@ -499,7 +499,7 @@ 
                         $nodetitle .= $modx->config['friendly_url_suffix'];
                     }
                 }
-                $nodetitle = $modx->config['friendly_url_prefix'] . $nodetitle;
+                $nodetitle = $modx->config['friendly_url_prefix'].$nodetitle;
                 break;
             case 'pagetitle':
                 $nodetitle = $row['pagetitle'];
@@ -533,7 +533,7 @@ 
     }
 }
 
-if(!function_exists('isDateNode')) {
+if (!function_exists('isDateNode')) {
     /**
      * @param string $nodeNameSource
      * @return bool
@@ -553,7 +553,7 @@ 
     }
 }
 
-if(!function_exists('checkIsFolder')) {
+if (!function_exists('checkIsFolder')) {
     /**
      * @param int $parent
      * @param int $isfolder
@@ -563,11 +563,11 @@ 
     {
         $modx = evolutionCMS();
 
-        return (int)$modx->getDatabase()->getValue($modx->getDatabase()->query('SELECT count(*) FROM ' . $modx->getDatabase()->getFullTableName('site_content') . ' WHERE parent=' . $parent . ' AND isfolder=' . $isfolder . ' '));
+        return (int) $modx->getDatabase()->getValue($modx->getDatabase()->query('SELECT count(*) FROM '.$modx->getDatabase()->getFullTableName('site_content').' WHERE parent='.$parent.' AND isfolder='.$isfolder.' '));
     }
 }
 
-if(!function_exists('_htmlentities')) {
+if (!function_exists('_htmlentities')) {
     /**
      * @param mixed $array
      * @return string
@@ -583,7 +583,7 @@ 
     }
 }
 
-if(!function_exists('getTplSingleNode')) {
+if (!function_exists('getTplSingleNode')) {
     /**
      * @return string
      */
@@ -613,7 +613,7 @@ 
     }
 }
 
-if(!function_exists('getTplFolderNode')) {
+if (!function_exists('getTplFolderNode')) {
     /**
      * @return string
      */
@@ -654,7 +654,7 @@ 
         title="[+title+]">[+nodetitleDisplay+][+weblinkDisplay+]</span>[+pageIdDisplay+]</a><div>';
     }
 }
-if(!function_exists('getTplFolderNodeNotChildren')) {
+if (!function_exists('getTplFolderNodeNotChildren')) {
     /**
      * @return string
      */

manager/includes/secure_web_documents.inc.php

Spacing +5 added lines, -5 removed lines

@@ -20,14 +20,14 @@
         ($docid > 0 ? "id='$docid'" : "privateweb = 1"));
     $rs = $modx->getDatabase()->select(
         'DISTINCT sc.id',
-        $modx->getDatabase()->getFullTableName("site_content") . " sc
-			LEFT JOIN " . $modx->getDatabase()->getFullTableName("document_groups") . " dg ON dg.document = sc.id
-			LEFT JOIN " . $modx->getDatabase()->getFullTableName("webgroup_access") . " wga ON wga.documentgroup = dg.document_group",
-        ($docid > 0 ? " sc.id='{$docid}' AND " : "") . "wga.id>0"
+        $modx->getDatabase()->getFullTableName("site_content")." sc
+			LEFT JOIN " . $modx->getDatabase()->getFullTableName("document_groups")." dg ON dg.document = sc.id
+			LEFT JOIN " . $modx->getDatabase()->getFullTableName("webgroup_access")." wga ON wga.documentgroup = dg.document_group",
+        ($docid > 0 ? " sc.id='{$docid}' AND " : "")."wga.id>0"
     );
     $ids = $modx->getDatabase()->getColumn("id", $rs);
     if (count($ids) > 0) {
         $modx->getDatabase()->update('privateweb = 1', $modx->getDatabase()->getFullTableName("site_content"),
-            "id IN (" . implode(", ", $ids) . ")");
+            "id IN (".implode(", ", $ids).")");
     }
 }

manager/includes/mutate_settings.ajax.php

Spacing +4 added lines, -4 removed lines

@@ -6,7 +6,7 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-require_once(dirname(__FILE__) . '/protect.inc.php');
+require_once(dirname(__FILE__).'/protect.inc.php');
 
 $action = preg_replace('/[^A-Za-z0-9_\-\.\/]/', '', $_POST['action']);
 $lang = preg_replace('/[^A-Za-z0-9_\s\+\-\.\/]/', '', $_POST['lang']);
@@ -23,13 +23,13 @@ 
 
 switch (true) {
     case ($action == 'get' && preg_match('/^[A-z0-9_-]+$/',
-            $lang) && file_exists(dirname(__FILE__) . '/lang/' . $lang . '.inc.php')): {
-        include(dirname(__FILE__) . '/lang/' . $lang . '.inc.php');
+            $lang) && file_exists(dirname(__FILE__).'/lang/'.$lang.'.inc.php')): {
+        include(dirname(__FILE__).'/lang/'.$lang.'.inc.php');
         $str = isset($key, $_lang, $_lang[$key]) ? $_lang[$key] : "";
         break;
     }
     case ($action == 'setsetting' && !empty($key) && !empty($value)): {
-        $sql = "REPLACE INTO " . $modx->getDatabase()->getFullTableName("system_settings") . " (setting_name, setting_value) VALUES('{$key}', '{$value}');";
+        $sql = "REPLACE INTO ".$modx->getDatabase()->getFullTableName("system_settings")." (setting_name, setting_value) VALUES('{$key}', '{$value}');";
         $str = "true";
         $modx->getDatabase()->query($sql);
         $emptyCache = true;

manager/includes/extenders/modifiers/mdf_memberof.inc.php

Spacing +9 added lines, -9 removed lines

@@ -2,29 +2,29 @@
 $userID = abs($modx->getLoginUserID('web'));
 $modx->qs_hash = md5($modx->qs_hash."^{$userID}^");
 
-$groupNames = ($this->strlen($opt) > 0 ) ? explode(',',$opt) : array();
+$groupNames = ($this->strlen($opt) > 0) ? explode(',', $opt) : array();
 
 // if $groupNames is not an array return false
-if(!is_array($groupNames)) return 0;
+if (!is_array($groupNames)) return 0;
 
 // Creates an array with all webgroups the user id is in
 if (isset($modx->getModifiers()->cache['mo'][$userID])) $grpNames = $modx->getModifiers()->cache['mo'][$userID];
 else {
     $from = sprintf(
-        $modx->getDatabase()->getFullTableName('webgroup_names') .
-        " wgn INNER JOIN " .
-        $modx->getDatabase()->getFullTableName('web_groups') .
+        $modx->getDatabase()->getFullTableName('webgroup_names').
+        " wgn INNER JOIN ".
+        $modx->getDatabase()->getFullTableName('web_groups').
         " wg ON wg.webgroup=wgn.id AND wg.webuser='%s'",
 
         $userID
     );
-    $rs = $modx->getDatabase()->select('wgn.name',$from);
-    $modx->getModifiers()->cache['mo'][$userID] = $grpNames = $modx->getDatabase()->getColumn('name',$rs);
+    $rs = $modx->getDatabase()->select('wgn.name', $from);
+    $modx->getModifiers()->cache['mo'][$userID] = $grpNames = $modx->getDatabase()->getColumn('name', $rs);
 }
 
 // Check if a supplied group matches a webgroup from the array we just created
-foreach($groupNames as $k=>$v) {
-    if(in_array(trim($v),$grpNames)) return 1;
+foreach ($groupNames as $k=>$v) {
+    if (in_array(trim($v), $grpNames)) return 1;
 }
 
 // If we get here the above logic did not find a match, so return false

Braces +10 added lines, -5 removed lines

@@ -5,11 +5,14 @@ 
 $groupNames = ($this->strlen($opt) > 0 ) ? explode(',',$opt) : array();
 
 // if $groupNames is not an array return false
-if(!is_array($groupNames)) return 0;
+if(!is_array($groupNames)) {
+    return 0;
+}
 
 // Creates an array with all webgroups the user id is in
-if (isset($modx->getModifiers()->cache['mo'][$userID])) $grpNames = $modx->getModifiers()->cache['mo'][$userID];
-else {
+if (isset($modx->getModifiers()->cache['mo'][$userID])) {
+    $grpNames = $modx->getModifiers()->cache['mo'][$userID];
+} else {
     $from = sprintf(
         $modx->getDatabase()->getFullTableName('webgroup_names') .
         " wgn INNER JOIN " .
@@ -24,8 +27,10 @@ 
 
 // Check if a supplied group matches a webgroup from the array we just created
 foreach($groupNames as $k=>$v) {
-    if(in_array(trim($v),$grpNames)) return 1;
-}
+    if(in_array(trim($v),$grpNames)) {
+        return 1;
+    }
+    }
 
 // If we get here the above logic did not find a match, so return false
 return 0;

manager/includes/categories.inc.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     $newCat = $modx->getDatabase()->escape($newCat);
     $cats = $modx->getDatabase()->select('id', $modx->getDatabase()->getFullTableName('categories'), "category='{$newCat}'");
     if ($cat = $modx->getDatabase()->getValue($cats)) {
-        return (int)$cat;
+        return (int) $cat;
     }
 
     return 0;