evolution-cms / evolution

manager/includes/extenders/dbapi.mysqli.class.inc.php

Spacing +23 added lines, -23 removed lines

@@ -19,7 +19,7 @@ 
         $pre = null,
         $charset = '',
         $connection_method = 'SET CHARACTER SET'
-    ) {
+    ){
         $this->config['host'] = $host ? $host : $GLOBALS['database_server'];
         $this->config['dbase'] = $dbase ? $dbase : $GLOBALS['dbase'];
         $this->config['user'] = $uid ? $uid : $GLOBALS['database_user'];
@@ -52,7 +52,7 @@ 
                         $ua = $modx->htmlspecialchars($_SERVER['HTTP_USER_AGENT']);
                         $referer = $modx->htmlspecialchars($_SERVER['HTTP_REFERER']);
                         $modx->sendmail(array(
-                            'subject' => 'Missing to create the database connection! from ' . $modx->config['site_name'],
+                            'subject' => 'Missing to create the database connection! from '.$modx->config['site_name'],
                             'body'    => "{$logtitle}\n{$request_uri}\n{$ua}\n{$referer}",
                             'type'    => 'text'
                         ));
@@ -70,8 +70,8 @@ 
             $tend = $modx->getMicroTime();
             $totaltime = $tend - $tstart;
             if ($modx->dumpSQL) {
-                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Database connection</legend>" . sprintf("Database connection was created in %2.4f s",
-                        $totaltime) . "</fieldset><br />";
+                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Database connection</legend>".sprintf("Database connection was created in %2.4f s",
+                        $totaltime)."</fieldset><br />";
             }
             $this->conn->set_charset($this->config['charset']);
             $this->isConnected = true;
@@ -138,7 +138,7 @@ 
                 case 1091:
                     break;
                 default:
-                    $modx->messageQuit('Execution of a query to the database failed - ' . $this->getLastError(), $sql);
+                    $modx->messageQuit('Execution of a query to the database failed - '.$this->getLastError(), $sql);
             }
         } else {
             $tend = $modx->getMicroTime();
@@ -152,24 +152,24 @@ 
                     $debug_path[] = $line['function'];
                 }
                 $debug_path = implode(' > ', array_reverse($debug_path));
-                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Query " . ($modx->executedQueries + 1) . " - " . sprintf("%2.2f ms",
-                        $totaltime * 1000) . "</legend>";
-                $modx->queryCode .= $sql . '<br><br>';
+                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Query ".($modx->executedQueries + 1)." - ".sprintf("%2.2f ms",
+                        $totaltime * 1000)."</legend>";
+                $modx->queryCode .= $sql.'<br><br>';
                 if ($modx->event->name) {
-                    $modx->queryCode .= 'Current Event  => ' . $modx->event->name . '<br>';
+                    $modx->queryCode .= 'Current Event  => '.$modx->event->name.'<br>';
                 }
                 if ($modx->event->activePlugin) {
-                    $modx->queryCode .= 'Current Plugin => ' . $modx->event->activePlugin . '<br>';
+                    $modx->queryCode .= 'Current Plugin => '.$modx->event->activePlugin.'<br>';
                 }
                 if ($modx->currentSnippet) {
-                    $modx->queryCode .= 'Current Snippet => ' . $modx->currentSnippet . '<br>';
+                    $modx->queryCode .= 'Current Snippet => '.$modx->currentSnippet.'<br>';
                 }
                 if (stripos($sql, 'select') === 0) {
-                    $modx->queryCode .= 'Record Count => ' . $this->getRecordCount($result) . '<br>';
+                    $modx->queryCode .= 'Record Count => '.$this->getRecordCount($result).'<br>';
                 } else {
-                    $modx->queryCode .= 'Affected Rows => ' . $this->getAffectedRows() . '<br>';
+                    $modx->queryCode .= 'Affected Rows => '.$this->getAffectedRows().'<br>';
                 }
-                $modx->queryCode .= 'Functions Path => ' . $debug_path . '<br>';
+                $modx->queryCode .= 'Functions Path => '.$debug_path.'<br>';
                 $modx->queryCode .= "</fieldset><br />";
             }
             $modx->executedQueries = $modx->executedQueries + 1;
@@ -252,9 +252,9 @@ 
                     if (is_null($value) || strtolower($value) === 'null') {
                         $flds = 'NULL';
                     } else {
-                        $flds = "'" . $value . "'";
+                        $flds = "'".$value."'";
                     }
-                    $fields[$key] = "`{$key}` = " . $flds;
+                    $fields[$key] = "`{$key}` = ".$flds;
                 }
                 $fields = implode(",", $fields);
             }
@@ -278,12 +278,12 @@ 
                 $this->query("INSERT INTO {$intotable} {$fields}");
             } else {
                 if (empty($fromtable)) {
-                    $fields = "(`" . implode("`, `", array_keys($fields)) . "`) VALUES('" . implode("', '",
-                            array_values($fields)) . "')";
+                    $fields = "(`".implode("`, `", array_keys($fields))."`) VALUES('".implode("', '",
+                            array_values($fields))."')";
                     $rt = $this->query("INSERT INTO {$intotable} {$fields}");
                 } else {
                     $fromtable = $this->replaceFullTableName($fromtable);
-                    $fields = "(" . implode(",", array_keys($fields)) . ")";
+                    $fields = "(".implode(",", array_keys($fields)).")";
                     $where = trim($where);
                     $limit = trim($limit);
                     if ($where !== '' && stripos($where, 'WHERE') !== 0) {
@@ -348,7 +348,7 @@ 
     public function getInsertId($conn = null)
     {
         if (!is_object($conn)) {
-            $conn =& $this->conn;
+            $conn = & $this->conn;
         }
 
         return $conn->insert_id;
@@ -357,7 +357,7 @@ 
     public function getAffectedRows($conn = null)
     {
         if (!is_object($conn)) {
-            $conn =& $this->conn;
+            $conn = & $this->conn;
         }
 
         return $conn->affected_rows;
@@ -366,7 +366,7 @@ 
     public function getLastError($conn = null)
     {
         if (!is_object($conn)) {
-            $conn =& $this->conn;
+            $conn = & $this->conn;
         }
 
         return $conn->error;
@@ -386,7 +386,7 @@ 
     {
         $out = false;
         if (is_object($ds)) {
-            switch($mode){
+            switch ($mode) {
                 case 'assoc':
                     $out = $ds->fetch_assoc();
                     break;

Braces +3 added lines, -2 removed lines

@@ -304,7 +304,8 @@ 
     }
 
     public function save($fields, $table, $where = '')
-    { // This is similar to "replace into table".
+    {
+// This is similar to "replace into table".
 
         if ($where === '') {
             $mode = 'insert';
@@ -386,7 +387,7 @@ 
     {
         $out = false;
         if (is_object($ds)) {
-            switch($mode){
+            switch($mode) {
                 case 'assoc':
                     $out = $ds->fetch_assoc();
                     break;

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

@@ -190,13 +190,13 @@ 
             $orderby = trim($orderby);
             $limit = trim($limit);
             if ($where !== '' && stripos($where, 'WHERE') !== 0) {
-                $where = "WHERE {$where}";
+                $where = "where {$where}";
             }
             if ($orderby !== '' && stripos($orderby, 'ORDER BY') !== 0) {
                 $orderby = "ORDER BY {$orderby}";
             }
             if ($limit !== '' && stripos($limit, 'LIMIT') !== 0) {
-                $limit = "LIMIT {$limit}";
+                $limit = "limit {$limit}";
             }
 
             return $this->query("DELETE FROM {$from} {$where} {$orderby} {$limit}");
@@ -228,16 +228,16 @@ 
         $orderby = trim($orderby);
         $limit = trim($limit);
         if ($where !== '' && stripos($where, 'WHERE') !== 0) {
-            $where = "WHERE {$where}";
+            $where = "where {$where}";
         }
         if ($orderby !== '' && stripos($orderby, 'ORDER') !== 0) {
             $orderby = "ORDER BY {$orderby}";
         }
         if ($limit !== '' && stripos($limit, 'LIMIT') !== 0) {
-            $limit = "LIMIT {$limit}";
+            $limit = "limit {$limit}";
         }
 
-        return $this->query("SELECT {$fields} FROM {$from} {$where} {$orderby} {$limit}");
+        return $this->query("select {$fields} FROM {$from} {$where} {$orderby} {$limit}");
     }
 
     public function update($fields, $table, $where = "")
@@ -260,10 +260,10 @@ 
             }
             $where = trim($where);
             if ($where !== '' && stripos($where, 'WHERE') !== 0) {
-                $where = "WHERE {$where}";
+                $where = "where {$where}";
             }
 
-            return $this->query("UPDATE {$table} SET {$fields} {$where}");
+            return $this->query("update {$table} SET {$fields} {$where}");
         }
     }
 
@@ -287,10 +287,10 @@ 
                     $where = trim($where);
                     $limit = trim($limit);
                     if ($where !== '' && stripos($where, 'WHERE') !== 0) {
-                        $where = "WHERE {$where}";
+                        $where = "where {$where}";
                     }
                     if ($limit !== '' && stripos($limit, 'LIMIT') !== 0) {
-                        $limit = "LIMIT {$limit}";
+                        $limit = "limit {$limit}";
                     }
                     $rt = $this->query("INSERT INTO {$intotable} {$fields} SELECT {$fromfields} FROM {$fromtable} {$where} {$limit}");
                 }
@@ -539,7 +539,7 @@ 
 
     public function truncate($table_name)
     {
-        $rs = $this->query("TRUNCATE {$table_name}");
+        $rs = $this->query("truncate {$table_name}");
 
         return $rs;
     }

Doc Comments +9 added lines

@@ -408,6 +408,9 @@ 
         return $out;
     }
 
+    /**
+     * @param string $name
+     */
     public function getColumn($name, $dsq)
     {
         if (!is_object($dsq)) {
@@ -506,6 +509,9 @@ 
         return $rsArray;
     }
 
+    /**
+     * @return string
+     */
     public function getVersion()
     {
         return $this->conn->server_info;
@@ -527,6 +533,9 @@ 
         return $result;
     }
 
+    /**
+     * @param string $table_name
+     */
     public function optimize($table_name)
     {
         $rs = $this->query("OPTIMIZE TABLE {$table_name}");

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

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-$userid = (int)$value;
+$userid = (int) $value;
 if (!isset($modx->filter->cache['ui'][$userid])) {
     if ($userid < 0) $user = $modx->getWebUserInfo(abs($userid));
     else             $user = $modx->getUserInfo($userid);

Braces +5 added lines, -2 removed lines

@@ -1,8 +1,11 @@
 <?php
 $userid = (int)$value;
 if (!isset($modx->filter->cache['ui'][$userid])) {
-    if ($userid < 0) $user = $modx->getWebUserInfo(abs($userid));
-    else             $user = $modx->getUserInfo($userid);
+    if ($userid < 0) {
+        $user = $modx->getWebUserInfo(abs($userid));
+    } else {
+        $user = $modx->getUserInfo($userid);
+    }
     $modx->filter->cache['ui'][$userid] = $user;
 } else {
     $user = $modx->filter->cache['ui'][$userid];

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

Spacing +19 added lines, -19 removed lines

@@ -1,43 +1,43 @@
 <?php
-if(strpos($opt,',')) list($limit,$delim) = explode(',', $opt);
-elseif(preg_match('/^[1-9][0-9]*$/',$opt)) {$limit=$opt;$delim='';}
-else {$limit=124;$delim='';}
+if (strpos($opt, ',')) list($limit, $delim) = explode(',', $opt);
+elseif (preg_match('/^[1-9][0-9]*$/', $opt)) {$limit = $opt; $delim = ''; }
+else {$limit = 124; $delim = ''; }
 
-if($delim==='') $delim = $modx->config['manager_language']==='japanese-utf8' ? '。' : '.';
-$limit = (int)$limit;
+if ($delim === '') $delim = $modx->config['manager_language'] === 'japanese-utf8' ? '。' : '.';
+$limit = (int) $limit;
 
 $content = $modx->filter->parseDocumentSource($value);
 
 $content = strip_tags($content);
 
-$content = str_replace(array("\r\n","\r","\n","\t",'&nbsp;'),' ',$content);
-if(preg_match('/\s+/',$content))
-    $content = preg_replace('/\s+/',' ',$content);
+$content = str_replace(array("\r\n", "\r", "\n", "\t", '&nbsp;'), ' ', $content);
+if (preg_match('/\s+/', $content))
+    $content = preg_replace('/\s+/', ' ', $content);
 $content = trim($content);
 
 $pos = $modx->filter->strpos($content, $delim);
 
-if($pos!==false && $pos<$limit) {
+if ($pos !== false && $pos < $limit) {
     $_ = explode($delim, $content);
     $text = '';
-    foreach($_ as $v) {
-        if($limit <= $modx->filter->strlen($text.$v.$delim)) break;
+    foreach ($_ as $v) {
+        if ($limit <= $modx->filter->strlen($text.$v.$delim)) break;
         $text .= $v.$delim;
     }
-    if($text) $content = $text;
+    if ($text) $content = $text;
 }
 
-if($limit<$modx->filter->strlen($content) && strpos($content,' ')!==false) {
+if ($limit < $modx->filter->strlen($content) && strpos($content, ' ') !== false) {
     $_ = explode(' ', $content);
     $text = '';
-    foreach($_ as $v) {
-        if($limit <= $modx->filter->strlen($text.$v.' ')) break;
-        $text .= $v . ' ';
+    foreach ($_ as $v) {
+        if ($limit <= $modx->filter->strlen($text.$v.' ')) break;
+        $text .= $v.' ';
     }
-    if($text!=='') $content = $text;
+    if ($text !== '') $content = $text;
 }
 
-if($limit < $modx->filter->strlen($content)) $content = $modx->filter->substr($content, 0, $limit);
-if($modx->filter->substr($content,-1)==$delim) $content = rtrim($content,$delim) . $delim;
+if ($limit < $modx->filter->strlen($content)) $content = $modx->filter->substr($content, 0, $limit);
+if ($modx->filter->substr($content, -1) == $delim) $content = rtrim($content, $delim).$delim;
 
 return $content;

Braces +28 added lines, -13 removed lines

@@ -1,9 +1,11 @@ 
 <?php
-if(strpos($opt,',')) list($limit,$delim) = explode(',', $opt);
-elseif(preg_match('/^[1-9][0-9]*$/',$opt)) {$limit=$opt;$delim='';}
-else {$limit=124;$delim='';}
+if(strpos($opt,',')) {
+    list($limit,$delim) = explode(',', $opt);
+} elseif(preg_match('/^[1-9][0-9]*$/',$opt)) {$limit=$opt;$delim='';} else {$limit=124;$delim='';}
 
-if($delim==='') $delim = $modx->config['manager_language']==='japanese-utf8' ? '。' : '.';
+if($delim==='') {
+    $delim = $modx->config['manager_language']==='japanese-utf8' ? '。' : '.';
+}
 $limit = (int)$limit;
 
 $content = $modx->filter->parseDocumentSource($value);
@@ -11,8 +13,9 @@ 
 $content = strip_tags($content);
 
 $content = str_replace(array("\r\n","\r","\n","\t",'&nbsp;'),' ',$content);
-if(preg_match('/\s+/',$content))
+if(preg_match('/\s+/',$content)) {
     $content = preg_replace('/\s+/',' ',$content);
+}
 $content = trim($content);
 
 $pos = $modx->filter->strpos($content, $delim);
@@ -21,23 +24,35 @@ 
     $_ = explode($delim, $content);
     $text = '';
     foreach($_ as $v) {
-        if($limit <= $modx->filter->strlen($text.$v.$delim)) break;
+        if($limit <= $modx->filter->strlen($text.$v.$delim)) {
+            break;
+        }
         $text .= $v.$delim;
     }
-    if($text) $content = $text;
-}
+    if($text) {
+        $content = $text;
+    }
+    }
 
 if($limit<$modx->filter->strlen($content) && strpos($content,' ')!==false) {
     $_ = explode(' ', $content);
     $text = '';
     foreach($_ as $v) {
-        if($limit <= $modx->filter->strlen($text.$v.' ')) break;
+        if($limit <= $modx->filter->strlen($text.$v.' ')) {
+            break;
+        }
         $text .= $v . ' ';
     }
-    if($text!=='') $content = $text;
-}
+    if($text!=='') {
+        $content = $text;
+    }
+    }
 
-if($limit < $modx->filter->strlen($content)) $content = $modx->filter->substr($content, 0, $limit);
-if($modx->filter->substr($content,-1)==$delim) $content = rtrim($content,$delim) . $delim;
+if($limit < $modx->filter->strlen($content)) {
+    $content = $modx->filter->substr($content, 0, $limit);
+}
+if($modx->filter->substr($content,-1)==$delim) {
+    $content = rtrim($content,$delim) . $delim;
+}
 
 return $content;

manager/includes/extenders/dbapi.mysql.class.inc.php

Spacing +25 added lines, -25 removed lines

@@ -30,7 +30,7 @@ 
         $pre = null,
         $charset = '',
         $connection_method = 'SET CHARACTER SET'
-    ) {
+    ){
         $this->config['host'] = $host ? $host : $GLOBALS['database_server'];
         $this->config['dbase'] = $dbase ? $dbase : $GLOBALS['dbase'];
         $this->config['user'] = $uid ? $uid : $GLOBALS['database_user'];
@@ -120,7 +120,7 @@ 
                         $referer = $modx->htmlspecialchars($_SERVER['HTTP_REFERER']);
 
                         $modx->sendmail(array(
-                                'subject' => 'Missing to create the database connection! from ' . $modx->config['site_name'],
+                                'subject' => 'Missing to create the database connection! from '.$modx->config['site_name'],
                                 'body'    => "{$logtitle}\n{$request_uri}\n{$ua}\n{$referer}",
                                 'type'    => 'text'
                             )
@@ -137,15 +137,15 @@ 
         } else {
             $dbase = trim($dbase, '`'); // remove the `` chars
             if (!@ mysql_select_db($dbase, $this->conn)) {
-                $modx->messageQuit("Failed to select the database '" . $dbase . "'!");
+                $modx->messageQuit("Failed to select the database '".$dbase."'!");
                 exit;
             }
             @mysql_query("{$connection_method} {$charset}", $this->conn);
             $tend = $modx->getMicroTime();
             $totaltime = $tend - $tstart;
             if ($modx->dumpSQL) {
-                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Database connection</legend>" . sprintf("Database connection was created in %2.4f s",
-                        $totaltime) . "</fieldset><br />";
+                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Database connection</legend>".sprintf("Database connection was created in %2.4f s",
+                        $totaltime)."</fieldset><br />";
             }
             if (function_exists('mysql_set_charset')) {
                 mysql_set_charset($this->config['charset']);
@@ -225,7 +225,7 @@ 
                 case 1091:
                     break;
                 default:
-                    $modx->messageQuit('Execution of a query to the database failed - ' . $this->getLastError(), $sql);
+                    $modx->messageQuit('Execution of a query to the database failed - '.$this->getLastError(), $sql);
             }
         } else {
             $tend = $modx->getMicroTime();
@@ -239,24 +239,24 @@ 
                     $debug_path[] = $line['function'];
                 }
                 $debug_path = implode(' > ', array_reverse($debug_path));
-                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Query " . ($modx->executedQueries + 1) . " - " . sprintf("%2.2f ms",
-                        $totaltime * 1000) . "</legend>";
-                $modx->queryCode .= $sql . '<br><br>';
+                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Query ".($modx->executedQueries + 1)." - ".sprintf("%2.2f ms",
+                        $totaltime * 1000)."</legend>";
+                $modx->queryCode .= $sql.'<br><br>';
                 if ($modx->event->name) {
-                    $modx->queryCode .= 'Current Event  => ' . $modx->event->name . '<br>';
+                    $modx->queryCode .= 'Current Event  => '.$modx->event->name.'<br>';
                 }
                 if ($modx->event->activePlugin) {
-                    $modx->queryCode .= 'Current Plugin => ' . $modx->event->activePlugin . '<br>';
+                    $modx->queryCode .= 'Current Plugin => '.$modx->event->activePlugin.'<br>';
                 }
                 if ($modx->currentSnippet) {
-                    $modx->queryCode .= 'Current Snippet => ' . $modx->currentSnippet . '<br>';
+                    $modx->queryCode .= 'Current Snippet => '.$modx->currentSnippet.'<br>';
                 }
                 if (stripos($sql, 'select') === 0) {
-                    $modx->queryCode .= 'Record Count => ' . $this->getRecordCount($result) . '<br>';
+                    $modx->queryCode .= 'Record Count => '.$this->getRecordCount($result).'<br>';
                 } else {
-                    $modx->queryCode .= 'Affected Rows => ' . $this->getAffectedRows() . '<br>';
+                    $modx->queryCode .= 'Affected Rows => '.$this->getAffectedRows().'<br>';
                 }
-                $modx->queryCode .= 'Functions Path => ' . $debug_path . '<br>';
+                $modx->queryCode .= 'Functions Path => '.$debug_path.'<br>';
                 $modx->queryCode .= "</fieldset><br />";
             }
             $modx->executedQueries = $modx->executedQueries + 1;
@@ -350,9 +350,9 @@ 
                     if (is_null($value) || strtolower($value) === 'null') {
                         $flds = 'NULL';
                     } else {
-                        $flds = "'" . $value . "'";
+                        $flds = "'".$value."'";
                     }
-                    $fields[$key] = "`{$key}` = " . $flds;
+                    $fields[$key] = "`{$key}` = ".$flds;
                 }
                 $fields = implode(",", $fields);
             }
@@ -380,13 +380,13 @@ 
                 $this->query("INSERT INTO {$intotable} {$fields}");
             } else {
                 if (empty($fromtable)) {
-                    $fields = "(`" . implode("`, `", array_keys($fields)) . "`) VALUES('" . implode("', '",
-                            array_values($fields)) . "')";
+                    $fields = "(`".implode("`, `", array_keys($fields))."`) VALUES('".implode("', '",
+                            array_values($fields))."')";
                     $rt = $this->query("INSERT INTO {$intotable} {$fields}");
                 } else {
                     if (version_compare($this->getVersion(), "4.0.14") >= 0) {
                         $fromtable = $this->replaceFullTableName($fromtable);
-                        $fields = "(" . implode(",", array_keys($fields)) . ")";
+                        $fields = "(".implode(",", array_keys($fields)).")";
                         $where = trim($where);
                         $limit = trim($limit);
                         if ($where !== '' && stripos($where, 'WHERE') !== 0) {
@@ -399,8 +399,8 @@ 
                     } else {
                         $ds = $this->select($fromfields, $fromtable, $where, '', $limit);
                         while ($row = $this->getRow($ds)) {
-                            $fields = "(" . implode(",", array_keys($fields)) . ") VALUES('" . implode("', '",
-                                    $row) . "')";
+                            $fields = "(".implode(",", array_keys($fields)).") VALUES('".implode("', '",
+                                    $row)."')";
                             $rt = $this->query("INSERT INTO {$intotable} {$fields}");
                         }
                     }
@@ -485,7 +485,7 @@ 
     public function getInsertId($conn = null)
     {
         if (!is_resource($conn)) {
-            $conn =& $this->conn;
+            $conn = & $this->conn;
         }
 
         return mysql_insert_id($conn);
@@ -498,7 +498,7 @@ 
     public function getAffectedRows($conn = null)
     {
         if (!is_resource($conn)) {
-            $conn =& $this->conn;
+            $conn = & $this->conn;
         }
 
         return mysql_affected_rows($conn);
@@ -511,7 +511,7 @@ 
     public function getLastError($conn = null)
     {
         if (!is_resource($conn)) {
-            $conn =& $this->conn;
+            $conn = & $this->conn;
         }
 
         return mysql_error($conn);

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

@@ -280,13 +280,13 @@ 
             $orderby = trim($orderby);
             $limit = trim($limit);
             if ($where !== '' && stripos($where, 'WHERE') !== 0) {
-                $where = "WHERE {$where}";
+                $where = "where {$where}";
             }
             if ($orderby !== '' && stripos($orderby, 'ORDER BY') !== 0) {
                 $orderby = "ORDER BY {$orderby}";
             }
             if ($limit !== '' && stripos($limit, 'LIMIT') !== 0) {
-                $limit = "LIMIT {$limit}";
+                $limit = "limit {$limit}";
             }
 
             return $this->query("DELETE FROM {$from} {$where} {$orderby} {$limit}");
@@ -322,16 +322,16 @@ 
         $orderby = trim($orderby);
         $limit = trim($limit);
         if ($where !== '' && stripos($where, 'WHERE') !== 0) {
-            $where = "WHERE {$where}";
+            $where = "where {$where}";
         }
         if ($orderby !== '' && stripos($orderby, 'ORDER') !== 0) {
             $orderby = "ORDER BY {$orderby}";
         }
         if ($limit !== '' && stripos($limit, 'LIMIT') !== 0) {
-            $limit = "LIMIT {$limit}";
+            $limit = "limit {$limit}";
         }
 
-        return $this->query("SELECT {$fields} FROM {$from} {$where} {$orderby} {$limit}");
+        return $this->query("select {$fields} FROM {$from} {$where} {$orderby} {$limit}");
     }
 
     /**
@@ -358,10 +358,10 @@ 
             }
             $where = trim($where);
             if ($where !== '' && stripos($where, 'WHERE') !== 0) {
-                $where = "WHERE {$where}";
+                $where = "where {$where}";
             }
 
-            return $this->query("UPDATE {$table} SET {$fields} {$where}");
+            return $this->query("update {$table} SET {$fields} {$where}");
         }
     }
 
@@ -390,10 +390,10 @@ 
                         $where = trim($where);
                         $limit = trim($limit);
                         if ($where !== '' && stripos($where, 'WHERE') !== 0) {
-                            $where = "WHERE {$where}";
+                            $where = "where {$where}";
                         }
                         if ($limit !== '' && stripos($limit, 'LIMIT') !== 0) {
-                            $limit = "LIMIT {$limit}";
+                            $limit = "limit {$limit}";
                         }
                         $rt = $this->query("INSERT INTO {$intotable} {$fields} SELECT {$fromfields} FROM {$fromtable} {$where} {$limit}");
                     } else {
@@ -732,7 +732,7 @@ 
 
     public function truncate($table_name)
     {
-        $rs = $this->query("TRUNCATE {$table_name}");
+        $rs = $this->query("truncate {$table_name}");
 
         return $rs;
     }

Doc Comments +4 added lines

@@ -554,6 +554,7 @@ 
      * @name:  getColumn
      * @desc:  returns an array of the values found on colun $name
      * @param: $dsq - dataset or query string
+     * @param string $name
      */
     public function getColumn($name, $dsq)
     {
@@ -720,6 +721,9 @@ 
         return $result;
     }
 
+    /**
+     * @param string $table_name
+     */
     public function optimize($table_name)
     {
         $rs = $this->query("OPTIMIZE TABLE {$table_name}");

manager/includes/extenders/deprecated.functions.inc.php

Indentation +6 added lines, -6 removed lines

@@ -40,7 +40,7 @@ 
     public function getUserData() {
         $client['ip'] = $_SERVER['REMOTE_ADDR'];
         $client['ua'] = $_SERVER['HTTP_USER_AGENT'];
-    	return $client;
+        return $client;
     }
 
     # Returns true, install or interact when inside manager
@@ -60,12 +60,12 @@ 
 
     // deprecated
     public function putChunk($chunkName) { // alias name >.<
-    	global $modx;
+        global $modx;
         return $modx->getChunk($chunkName);
     }
 
     public function getDocGroups() {
-    	global $modx;
+        global $modx;
         return $modx->getUserDocGroups();
     } // deprecated
 
@@ -74,7 +74,7 @@ 
     } // deprecated
 
     public function userLoggedIn() {
-    	global $modx;
+        global $modx;
         $userdetails= array ();
         if ($modx->isFrontend() && isset ($_SESSION['webValidated'])) {
             // web user
@@ -98,7 +98,7 @@ 
 
     public function getFormVars($method= "", $prefix= "", $trim= "", $REQUEST_METHOD) {
         //  function to retrieve form results into an associative array
-    	global $modx;
+        global $modx;
         $results= array ();
         $method= strtoupper($method);
         if ($method == "")
@@ -130,7 +130,7 @@ 
      * @param string $url URL to redirect to
      */
     public function webAlert($msg, $url= "") {
-    	global $modx;
+        global $modx;
         $msg= addslashes($modx->db->escape($msg));
         if (substr(strtolower($url), 0, 11) == "javascript:") {
             $act= "__WebAlert();";

Spacing +54 added lines, -54 removed lines

@@ -1,43 +1,43 @@ 
 <?php
 $this->old = new OldFunctions();
-class OldFunctions {
+class OldFunctions{
 
-    public function dbConnect()                 {global $modx;       $modx->db->connect();$modx->rs = $modx->db->conn;}
-    public function dbQuery($sql)               {global $modx;return $modx->db->query($sql);}
-    public function recordCount($rs)            {global $modx;return $modx->db->getRecordCount($rs);}
-    public function fetchRow($rs,$mode='assoc') {global $modx;return $modx->db->getRow($rs, $mode);}
-    public function affectedRows($rs)           {global $modx;return $modx->db->getAffectedRows($rs);}
-    public function insertId($rs)               {global $modx;return $modx->db->getInsertId($rs);}
-    public function dbClose()                   {global $modx;       $modx->db->disconnect();}
+    public function dbConnect(){global $modx; $modx->db->connect(); $modx->rs = $modx->db->conn; }
+    public function dbQuery($sql){global $modx; return $modx->db->query($sql); }
+    public function recordCount($rs){global $modx; return $modx->db->getRecordCount($rs); }
+    public function fetchRow($rs, $mode = 'assoc'){global $modx; return $modx->db->getRow($rs, $mode); }
+    public function affectedRows($rs){global $modx; return $modx->db->getAffectedRows($rs); }
+    public function insertId($rs){global $modx; return $modx->db->getInsertId($rs); }
+    public function dbClose(){global $modx; $modx->db->disconnect(); }
 
-    public function makeList($array, $ulroot= 'root', $ulprefix= 'sub_', $type= '', $ordered= false, $tablevel= 0) {
+    public function makeList($array, $ulroot = 'root', $ulprefix = 'sub_', $type = '', $ordered = false, $tablevel = 0){
         // first find out whether the value passed is an array
         if (!is_array($array)) {
             return "<ul><li>Bad list</li></ul>";
         }
         if (!empty ($type)) {
-            $typestr= " style='list-style-type: $type'";
+            $typestr = " style='list-style-type: $type'";
         } else {
-            $typestr= "";
+            $typestr = "";
         }
-        $tabs= "";
-        for ($i= 0; $i < $tablevel; $i++) {
+        $tabs = "";
+        for ($i = 0; $i < $tablevel; $i++) {
             $tabs .= "\t";
         }
-        $listhtml= $ordered == true ? $tabs . "<ol class='$ulroot'$typestr>\n" : $tabs . "<ul class='$ulroot'$typestr>\n";
+        $listhtml = $ordered == true ? $tabs."<ol class='$ulroot'$typestr>\n" : $tabs."<ul class='$ulroot'$typestr>\n";
         foreach ($array as $key => $value) {
             if (is_array($value)) {
-                $listhtml .= $tabs . "\t<li>" . $key . "\n" . $this->makeList($value, $ulprefix . $ulroot, $ulprefix, $type, $ordered, $tablevel +2) . $tabs . "\t</li>\n";
+                $listhtml .= $tabs."\t<li>".$key."\n".$this->makeList($value, $ulprefix.$ulroot, $ulprefix, $type, $ordered, $tablevel + 2).$tabs."\t</li>\n";
             } else {
-                $listhtml .= $tabs . "\t<li>" . $value . "</li>\n";
+                $listhtml .= $tabs."\t<li>".$value."</li>\n";
             }
         }
-        $listhtml .= $ordered == true ? $tabs . "</ol>\n" : $tabs . "</ul>\n";
+        $listhtml .= $ordered == true ? $tabs."</ol>\n" : $tabs."</ul>\n";
         return $listhtml;
     }
 
 
-    public function getUserData() {
+    public function getUserData(){
         $client['ip'] = $_SERVER['REMOTE_ADDR'];
         $client['ua'] = $_SERVER['HTTP_USER_AGENT'];
     	return $client;
@@ -45,80 +45,80 @@ 
 
     # Returns true, install or interact when inside manager
     // deprecated
-    public function insideManager() {
-        $m= false;
-        if( defined('IN_MANAGER_MODE') && IN_MANAGER_MODE === true) {
-            $m= true;
+    public function insideManager(){
+        $m = false;
+        if (defined('IN_MANAGER_MODE') && IN_MANAGER_MODE === true) {
+            $m = true;
             if (defined('SNIPPET_INTERACTIVE_MODE') && SNIPPET_INTERACTIVE_MODE == 'true')
-                $m= "interact";
+                $m = "interact";
             else
                 if (defined('SNIPPET_INSTALL_MODE') && SNIPPET_INSTALL_MODE == 'true')
-                    $m= "install";
+                    $m = "install";
         }
         return $m;
     }
 
     // deprecated
-    public function putChunk($chunkName) { // alias name >.<
+    public function putChunk($chunkName){ // alias name >.<
     	global $modx;
         return $modx->getChunk($chunkName);
     }
 
-    public function getDocGroups() {
+    public function getDocGroups(){
     	global $modx;
         return $modx->getUserDocGroups();
     } // deprecated
 
-    public function changePassword($o, $n) {
+    public function changePassword($o, $n){
         return changeWebUserPassword($o, $n);
     } // deprecated
 
-    public function userLoggedIn() {
+    public function userLoggedIn(){
     	global $modx;
-        $userdetails= array ();
+        $userdetails = array();
         if ($modx->isFrontend() && isset ($_SESSION['webValidated'])) {
             // web user
-            $userdetails['loggedIn']= true;
-            $userdetails['id']= $_SESSION['webInternalKey'];
-            $userdetails['username']= $_SESSION['webShortname'];
-            $userdetails['usertype']= 'web'; // added by Raymond
+            $userdetails['loggedIn'] = true;
+            $userdetails['id'] = $_SESSION['webInternalKey'];
+            $userdetails['username'] = $_SESSION['webShortname'];
+            $userdetails['usertype'] = 'web'; // added by Raymond
             return $userdetails;
         } else
             if ($modx->isBackend() && isset ($_SESSION['mgrValidated'])) {
                 // manager user
-                $userdetails['loggedIn']= true;
-                $userdetails['id']= $_SESSION['mgrInternalKey'];
-                $userdetails['username']= $_SESSION['mgrShortname'];
-                $userdetails['usertype']= 'manager'; // added by Raymond
+                $userdetails['loggedIn'] = true;
+                $userdetails['id'] = $_SESSION['mgrInternalKey'];
+                $userdetails['username'] = $_SESSION['mgrShortname'];
+                $userdetails['usertype'] = 'manager'; // added by Raymond
                 return $userdetails;
             } else {
                 return false;
             }
     }
 
-    public function getFormVars($method= "", $prefix= "", $trim= "", $REQUEST_METHOD) {
+    public function getFormVars($method = "", $prefix = "", $trim = "", $REQUEST_METHOD){
         //  function to retrieve form results into an associative array
     	global $modx;
-        $results= array ();
-        $method= strtoupper($method);
+        $results = array();
+        $method = strtoupper($method);
         if ($method == "")
-            $method= $REQUEST_METHOD;
+            $method = $REQUEST_METHOD;
         if ($method == "POST")
-            $method= & $_POST;
-        elseif ($method == "GET") $method= & $_GET;
+            $method = & $_POST;
+        elseif ($method == "GET") $method = & $_GET;
         else
             return false;
         reset($method);
         foreach ($method as $key => $value) {
             if (($prefix != "") && (substr($key, 0, strlen($prefix)) == $prefix)) {
                 if ($trim) {
-                    $pieces= explode($prefix, $key, 2);
-                    $key= $pieces[1];
-                    $results[$key]= $value;
+                    $pieces = explode($prefix, $key, 2);
+                    $key = $pieces[1];
+                    $results[$key] = $value;
                 } else
-                    $results[$key]= $value;
+                    $results[$key] = $value;
             }
-            elseif ($prefix == "") $results[$key]= $value;
+            elseif ($prefix == "") $results[$key] = $value;
         }
         return $results;
     }
@@ -129,16 +129,16 @@ 
      * @param string $msg Message to show
      * @param string $url URL to redirect to
      */
-    public function webAlert($msg, $url= "") {
+    public function webAlert($msg, $url = ""){
     	global $modx;
-        $msg= addslashes($modx->db->escape($msg));
+        $msg = addslashes($modx->db->escape($msg));
         if (substr(strtolower($url), 0, 11) == "javascript:") {
-            $act= "__WebAlert();";
-            $fnc= "function __WebAlert(){" . substr($url, 11) . "};";
+            $act = "__WebAlert();";
+            $fnc = "function __WebAlert(){".substr($url, 11)."};";
         } else {
-            $act= ($url ? "window.location.href='" . addslashes($url) . "';" : "");
+            $act = ($url ? "window.location.href='".addslashes($url)."';" : "");
         }
-        $html= "<script>$fnc window.setTimeout(\"alert('$msg');$act\",100);</script>";
+        $html = "<script>$fnc window.setTimeout(\"alert('$msg');$act\",100);</script>";
         if ($modx->isFrontend())
             $modx->regClientScript($html);
         else {

Braces +66 added lines, -35 removed lines

@@ -1,16 +1,32 @@ 
 <?php
 $this->old = new OldFunctions();
-class OldFunctions {
+class OldFunctions
+{
 
-    public function dbConnect()                 {global $modx;       $modx->db->connect();$modx->rs = $modx->db->conn;}
-    public function dbQuery($sql)               {global $modx;return $modx->db->query($sql);}
-    public function recordCount($rs)            {global $modx;return $modx->db->getRecordCount($rs);}
-    public function fetchRow($rs,$mode='assoc') {global $modx;return $modx->db->getRow($rs, $mode);}
-    public function affectedRows($rs)           {global $modx;return $modx->db->getAffectedRows($rs);}
-    public function insertId($rs)               {global $modx;return $modx->db->getInsertId($rs);}
-    public function dbClose()                   {global $modx;       $modx->db->disconnect();}
+    public function dbConnect()
+    {
+global $modx;       $modx->db->connect();$modx->rs = $modx->db->conn;}
+    public function dbQuery($sql)
+    {
+global $modx;return $modx->db->query($sql);}
+    public function recordCount($rs)
+    {
+global $modx;return $modx->db->getRecordCount($rs);}
+    public function fetchRow($rs,$mode='assoc')
+    {
+global $modx;return $modx->db->getRow($rs, $mode);}
+    public function affectedRows($rs)
+    {
+global $modx;return $modx->db->getAffectedRows($rs);}
+    public function insertId($rs)
+    {
+global $modx;return $modx->db->getInsertId($rs);}
+    public function dbClose()
+    {
+global $modx;       $modx->db->disconnect();}
 
-    public function makeList($array, $ulroot= 'root', $ulprefix= 'sub_', $type= '', $ordered= false, $tablevel= 0) {
+    public function makeList($array, $ulroot= 'root', $ulprefix= 'sub_', $type= '', $ordered= false, $tablevel= 0)
+    {
         // first find out whether the value passed is an array
         if (!is_array($array)) {
             return "<ul><li>Bad list</li></ul>";
@@ -37,7 +53,8 @@ 
     }
 
 
-    public function getUserData() {
+    public function getUserData()
+    {
         $client['ip'] = $_SERVER['REMOTE_ADDR'];
         $client['ua'] = $_SERVER['HTTP_USER_AGENT'];
     	return $client;
@@ -45,35 +62,42 @@ 
 
     # Returns true, install or interact when inside manager
     // deprecated
-    public function insideManager() {
+    public function insideManager()
+    {
         $m= false;
         if( defined('IN_MANAGER_MODE') && IN_MANAGER_MODE === true) {
             $m= true;
-            if (defined('SNIPPET_INTERACTIVE_MODE') && SNIPPET_INTERACTIVE_MODE == 'true')
-                $m= "interact";
-            else
-                if (defined('SNIPPET_INSTALL_MODE') && SNIPPET_INSTALL_MODE == 'true')
-                    $m= "install";
+            if (defined('SNIPPET_INTERACTIVE_MODE') && SNIPPET_INTERACTIVE_MODE == 'true') {
+                            $m= "interact";
+            } else
+                if (defined('SNIPPET_INSTALL_MODE') && SNIPPET_INSTALL_MODE == 'true') {
+                                    $m= "install";
+                }
         }
         return $m;
     }
 
     // deprecated
-    public function putChunk($chunkName) { // alias name >.<
+    public function putChunk($chunkName)
+    {
+// alias name >.<
     	global $modx;
         return $modx->getChunk($chunkName);
     }
 
-    public function getDocGroups() {
+    public function getDocGroups()
+    {
     	global $modx;
         return $modx->getUserDocGroups();
     } // deprecated
 
-    public function changePassword($o, $n) {
+    public function changePassword($o, $n)
+    {
         return changeWebUserPassword($o, $n);
     } // deprecated
 
-    public function userLoggedIn() {
+    public function userLoggedIn()
+    {
     	global $modx;
         $userdetails= array ();
         if ($modx->isFrontend() && isset ($_SESSION['webValidated'])) {
@@ -96,18 +120,22 @@ 
             }
     }
 
-    public function getFormVars($method= "", $prefix= "", $trim= "", $REQUEST_METHOD) {
+    public function getFormVars($method= "", $prefix= "", $trim= "", $REQUEST_METHOD)
+    {
         //  function to retrieve form results into an associative array
     	global $modx;
         $results= array ();
         $method= strtoupper($method);
-        if ($method == "")
-            $method= $REQUEST_METHOD;
-        if ($method == "POST")
-            $method= & $_POST;
-        elseif ($method == "GET") $method= & $_GET;
-        else
-            return false;
+        if ($method == "") {
+                    $method= $REQUEST_METHOD;
+        }
+        if ($method == "POST") {
+                    $method= & $_POST;
+        } elseif ($method == "GET") {
+            $method= & $_GET;
+        } else {
+                    return false;
+        }
         reset($method);
         foreach ($method as $key => $value) {
             if (($prefix != "") && (substr($key, 0, strlen($prefix)) == $prefix)) {
@@ -115,10 +143,12 @@ 
                     $pieces= explode($prefix, $key, 2);
                     $key= $pieces[1];
                     $results[$key]= $value;
-                } else
-                    $results[$key]= $value;
+                } else {
+                                    $results[$key]= $value;
+                }
+            } elseif ($prefix == "") {
+                $results[$key]= $value;
             }
-            elseif ($prefix == "") $results[$key]= $value;
         }
         return $results;
     }
@@ -129,7 +159,8 @@ 
      * @param string $msg Message to show
      * @param string $url URL to redirect to
      */
-    public function webAlert($msg, $url= "") {
+    public function webAlert($msg, $url= "")
+    {
     	global $modx;
         $msg= addslashes($modx->db->escape($msg));
         if (substr(strtolower($url), 0, 11) == "javascript:") {
@@ -139,9 +170,9 @@ 
             $act= ($url ? "window.location.href='" . addslashes($url) . "';" : "");
         }
         $html= "<script>$fnc window.setTimeout(\"alert('$msg');$act\",100);</script>";
-        if ($modx->isFrontend())
-            $modx->regClientScript($html);
-        else {
+        if ($modx->isFrontend()) {
+                    $modx->regClientScript($html);
+        } else {
             echo $html;
         }
     }

manager/includes/controls/contextmenu.php

Indentation +35 added lines, -35 removed lines

@@ -4,71 +4,71 @@
 $ContextMenuCnt = 0;
 
 class ContextMenu {
-	public $id;
+    public $id;
     /**
      * @var string
      */
-	public $html = '';
+    public $html = '';
     /**
      * @var bool
      */
-	public $visible = false;
+    public $visible = false;
     /**
      * @var int
      */
-	public $width = 120;
+    public $width = 120;
 
     public function __construct($id = '', $width = 120, $visible = false) {
-		global $ContextMenuCnt;
-		$ContextMenuCnt++;
-		$this->html = "";
-		$this->visible = $visible ? $visible : false;
-		$this->width = is_numeric($width) ? (int)$width : 120;
-		$this->id = $id ? $id : "cntxMnu" . $ContextMenuCnt;    // set id
-	}
+        global $ContextMenuCnt;
+        $ContextMenuCnt++;
+        $this->html = "";
+        $this->visible = $visible ? $visible : false;
+        $this->width = is_numeric($width) ? (int)$width : 120;
+        $this->id = $id ? $id : "cntxMnu" . $ContextMenuCnt;    // set id
+    }
 
     public function addItem($text, $action = "", $img = "", $disabled = 0) {
-		global $base_url, $_style;
+        global $base_url, $_style;
         if($disabled) {
             return;
         }
-		if(!$img) {
-			$img = $base_url . $_style['tx'];
-		}
-		if(substr($action, 0, 3) == "js:") {
-			$action = substr($action, 3);
-		} else if(substr($action, 0, 3) == "hl:") {
-			$action = "window.location.href='" . substr($action, 3) . "'";
-		} else {
-			$action = "window.location.href='" . $action . "'";
-		}
-		$action = " onmouseover=\"this.className='cntxMnuItemOver';\" onmouseout=\"this.className='cntxMnuItem';\" onclick=\"$action; hideCntxMenu('" . $this->id . "');\"";
-		$this->html .= "<div class='" . ($disabled ? "cntxMnuItemDisabled" : "cntxMnuItem") . "' $action>";
+        if(!$img) {
+            $img = $base_url . $_style['tx'];
+        }
+        if(substr($action, 0, 3) == "js:") {
+            $action = substr($action, 3);
+        } else if(substr($action, 0, 3) == "hl:") {
+            $action = "window.location.href='" . substr($action, 3) . "'";
+        } else {
+            $action = "window.location.href='" . $action . "'";
+        }
+        $action = " onmouseover=\"this.className='cntxMnuItemOver';\" onmouseout=\"this.className='cntxMnuItem';\" onclick=\"$action; hideCntxMenu('" . $this->id . "');\"";
+        $this->html .= "<div class='" . ($disabled ? "cntxMnuItemDisabled" : "cntxMnuItem") . "' $action>";
         if(substr($img, 0, 5) == 'fa fa') {
             $img = '<i class="' . $img . '"></i>';
         } else if(substr($img, 0, 1) != '<') {
             $img = '<img src="' . $img . '" />';
         }
-		$this->html .= $img . '&nbsp;' . $text . '</div>';
-	}
+        $this->html .= $img . '&nbsp;' . $text . '</div>';
+    }
 
     public function addSeparator() {
-		$this->html .= "
+        $this->html .= "
 			<div class='cntxMnuSeparator'></div>
 		";
-	}
+    }
 
     public function render() {
-		global $ContextMenuScript;
+        global $ContextMenuScript;
 
-		$html = $ContextMenuScript . "<div id='" . $this->id . "' class='contextMenu' style='width:" . $this->width . "px; visibility:" . ($this->visible ? 'visible' : 'hidden') . "'>" . $this->html . "</div>";
-		$ContextMenuScript = ""; // reset css
-		return $html;
-	}
+        $html = $ContextMenuScript . "<div id='" . $this->id . "' class='contextMenu' style='width:" . $this->width . "px; visibility:" . ($this->visible ? 'visible' : 'hidden') . "'>" . $this->html . "</div>";
+        $ContextMenuScript = ""; // reset css
+        return $html;
+    }
 
     public function getClientScriptObject() {
-		return "getCntxMenu('" . $this->id . "')";
-	}
+        return "getCntxMenu('" . $this->id . "')";
+    }
 }
 
 $ContextMenuScript = <<<BLOCK

Spacing +24 added lines, -24 removed lines

@@ -3,7 +3,7 @@ 
 global $ContextMenuCnt;
 $ContextMenuCnt = 0;
 
-class ContextMenu {
+class ContextMenu{
 	public $id;
     /**
      * @var string
@@ -18,56 +18,56 @@ 
      */
 	public $width = 120;
 
-    public function __construct($id = '', $width = 120, $visible = false) {
+    public function __construct($id = '', $width = 120, $visible = false){
 		global $ContextMenuCnt;
 		$ContextMenuCnt++;
 		$this->html = "";
 		$this->visible = $visible ? $visible : false;
-		$this->width = is_numeric($width) ? (int)$width : 120;
-		$this->id = $id ? $id : "cntxMnu" . $ContextMenuCnt;    // set id
+		$this->width = is_numeric($width) ? (int) $width : 120;
+		$this->id = $id ? $id : "cntxMnu".$ContextMenuCnt; // set id
 	}
 
-    public function addItem($text, $action = "", $img = "", $disabled = 0) {
+    public function addItem($text, $action = "", $img = "", $disabled = 0){
 		global $base_url, $_style;
-        if($disabled) {
+        if ($disabled) {
             return;
         }
-		if(!$img) {
-			$img = $base_url . $_style['tx'];
+		if (!$img) {
+			$img = $base_url.$_style['tx'];
 		}
-		if(substr($action, 0, 3) == "js:") {
+		if (substr($action, 0, 3) == "js:") {
 			$action = substr($action, 3);
-		} else if(substr($action, 0, 3) == "hl:") {
-			$action = "window.location.href='" . substr($action, 3) . "'";
+		} else if (substr($action, 0, 3) == "hl:") {
+			$action = "window.location.href='".substr($action, 3)."'";
 		} else {
-			$action = "window.location.href='" . $action . "'";
+			$action = "window.location.href='".$action."'";
 		}
-		$action = " onmouseover=\"this.className='cntxMnuItemOver';\" onmouseout=\"this.className='cntxMnuItem';\" onclick=\"$action; hideCntxMenu('" . $this->id . "');\"";
-		$this->html .= "<div class='" . ($disabled ? "cntxMnuItemDisabled" : "cntxMnuItem") . "' $action>";
-        if(substr($img, 0, 5) == 'fa fa') {
-            $img = '<i class="' . $img . '"></i>';
-        } else if(substr($img, 0, 1) != '<') {
-            $img = '<img src="' . $img . '" />';
+		$action = " onmouseover=\"this.className='cntxMnuItemOver';\" onmouseout=\"this.className='cntxMnuItem';\" onclick=\"$action; hideCntxMenu('".$this->id."');\"";
+		$this->html .= "<div class='".($disabled ? "cntxMnuItemDisabled" : "cntxMnuItem")."' $action>";
+        if (substr($img, 0, 5) == 'fa fa') {
+            $img = '<i class="'.$img.'"></i>';
+        } else if (substr($img, 0, 1) != '<') {
+            $img = '<img src="'.$img.'" />';
         }
-		$this->html .= $img . '&nbsp;' . $text . '</div>';
+		$this->html .= $img.'&nbsp;'.$text.'</div>';
 	}
 
-    public function addSeparator() {
+    public function addSeparator(){
 		$this->html .= "
 			<div class='cntxMnuSeparator'></div>
 		";
 	}
 
-    public function render() {
+    public function render(){
 		global $ContextMenuScript;
 
-		$html = $ContextMenuScript . "<div id='" . $this->id . "' class='contextMenu' style='width:" . $this->width . "px; visibility:" . ($this->visible ? 'visible' : 'hidden') . "'>" . $this->html . "</div>";
+		$html = $ContextMenuScript."<div id='".$this->id."' class='contextMenu' style='width:".$this->width."px; visibility:".($this->visible ? 'visible' : 'hidden')."'>".$this->html."</div>";
 		$ContextMenuScript = ""; // reset css
 		return $html;
 	}
 
-    public function getClientScriptObject() {
-		return "getCntxMenu('" . $this->id . "')";
+    public function getClientScriptObject(){
+		return "getCntxMenu('".$this->id."')";
 	}
 }
 

Braces +12 added lines, -6 removed lines

@@ -3,7 +3,8 @@ 
 global $ContextMenuCnt;
 $ContextMenuCnt = 0;
 
-class ContextMenu {
+class ContextMenu
+{
 	public $id;
     /**
      * @var string
@@ -18,7 +19,8 @@ 
      */
 	public $width = 120;
 
-    public function __construct($id = '', $width = 120, $visible = false) {
+    public function __construct($id = '', $width = 120, $visible = false)
+    {
 		global $ContextMenuCnt;
 		$ContextMenuCnt++;
 		$this->html = "";
@@ -27,7 +29,8 @@ 
 		$this->id = $id ? $id : "cntxMnu" . $ContextMenuCnt;    // set id
 	}
 
-    public function addItem($text, $action = "", $img = "", $disabled = 0) {
+    public function addItem($text, $action = "", $img = "", $disabled = 0)
+    {
 		global $base_url, $_style;
         if($disabled) {
             return;
@@ -52,13 +55,15 @@ 
 		$this->html .= $img . '&nbsp;' . $text . '</div>';
 	}
 
-    public function addSeparator() {
+    public function addSeparator()
+    {
 		$this->html .= "
 			<div class='cntxMnuSeparator'></div>
 		";
 	}
 
-    public function render() {
+    public function render()
+    {
 		global $ContextMenuScript;
 
 		$html = $ContextMenuScript . "<div id='" . $this->id . "' class='contextMenu' style='width:" . $this->width . "px; visibility:" . ($this->visible ? 'visible' : 'hidden') . "'>" . $this->html . "</div>";
@@ -66,7 +71,8 @@ 
 		return $html;
 	}
 
-    public function getClientScriptObject() {
+    public function getClientScriptObject()
+    {
 		return "getCntxMenu('" . $this->id . "')";
 	}
 }

manager/includes/active_user_locks.inc.php

Spacing +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@ 
 <?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.");
 }
 
-$lockElementId = (int)$lockElementId;
+$lockElementId = (int) $lockElementId;
 
 if ($lockElementId > 0) {
     ?>
@@ -18,7 +18,7 @@ 
         var stay = document.getElementById('stay');
         // Trigger unlock
         if ((stay && stay.value !== '2') || !form_save) {
-          var url = '<?php echo MODX_MANAGER_URL; ?>?a=67&type=<?php echo $lockElementType;?>&id=<?php echo $lockElementId;?>&o=' + Math.random();
+          var url = '<?php echo MODX_MANAGER_URL; ?>?a=67&type=<?php echo $lockElementType; ?>&id=<?php echo $lockElementId; ?>&o=' + Math.random();
           if (navigator.sendBeacon) {
             navigator.sendBeacon(url)
           } else {

manager/includes/error.class.inc.php

Indentation +58 added lines, -58 removed lines

@@ -17,70 +17,70 @@ 
 
     public function __construct() {
 
-		$_lang = $this->include_lang('errormsg');
+        $_lang = $this->include_lang('errormsg');
 
-		$this->errors = array(
-		0	=>	$_lang["No errors occured."],
-		1	=>	$_lang["An error occured!"],
-		2	=>	$_lang["Document's ID not passed in request!"],
-		3	=>	$_lang["You don't have enough privileges for this action!"],
-		4	=>	$_lang["ID passed in request is NaN!"],
-		5	=>	$_lang["The document is locked!"],
-		6	=>	$_lang["Too many results returned from database!"],
-		7	=>	$_lang["Not enough/ no results returned from database!"],
-		8	=>	$_lang["Couldn't find parent document's name!"],
-		9	=>	$_lang["Logging error!"],
-		10	=>	$_lang["Table to optimise not found in request!"],
-		11	=>	$_lang["No settings found in request!"],
-		12	=>	$_lang["The document must have a title!"],
-		13	=>	$_lang["No user selected as recipient of this message!"],
-		14	=>	$_lang["No group selected as recipient of this message!"],
-		15	=>	$_lang["The document was not found!"],
+        $this->errors = array(
+        0	=>	$_lang["No errors occured."],
+        1	=>	$_lang["An error occured!"],
+        2	=>	$_lang["Document's ID not passed in request!"],
+        3	=>	$_lang["You don't have enough privileges for this action!"],
+        4	=>	$_lang["ID passed in request is NaN!"],
+        5	=>	$_lang["The document is locked!"],
+        6	=>	$_lang["Too many results returned from database!"],
+        7	=>	$_lang["Not enough/ no results returned from database!"],
+        8	=>	$_lang["Couldn't find parent document's name!"],
+        9	=>	$_lang["Logging error!"],
+        10	=>	$_lang["Table to optimise not found in request!"],
+        11	=>	$_lang["No settings found in request!"],
+        12	=>	$_lang["The document must have a title!"],
+        13	=>	$_lang["No user selected as recipient of this message!"],
+        14	=>	$_lang["No group selected as recipient of this message!"],
+        15	=>	$_lang["The document was not found!"],
 
-		100 =>	$_lang["Double action (GET & POST) posted!"],
-		600 =>	$_lang["Document cannot be it's own parent!"],
-		601 =>	$_lang["Document's ID not passed in request!"],
-		602 =>	$_lang["New parent not set in request!"],
-		900 =>	$_lang["don't know the user!"], // don't know the user!
-		901 =>	$_lang["wrong password!"], // wrong password!
-		902 =>	$_lang["Due to too many failed logins, you have been blocked!"],
-		903 =>	$_lang["You are blocked and cannot log in!"],
-		904 =>	$_lang["You are blocked and cannot log in! Please try again later."],
-		905 =>	$_lang["The security code you entered didn't validate! Please try to login again!"]
-	);
-	}
+        100 =>	$_lang["Double action (GET & POST) posted!"],
+        600 =>	$_lang["Document cannot be it's own parent!"],
+        601 =>	$_lang["Document's ID not passed in request!"],
+        602 =>	$_lang["New parent not set in request!"],
+        900 =>	$_lang["don't know the user!"], // don't know the user!
+        901 =>	$_lang["wrong password!"], // wrong password!
+        902 =>	$_lang["Due to too many failed logins, you have been blocked!"],
+        903 =>	$_lang["You are blocked and cannot log in!"],
+        904 =>	$_lang["You are blocked and cannot log in! Please try again later."],
+        905 =>	$_lang["The security code you entered didn't validate! Please try to login again!"]
+    );
+    }
 
-	function include_lang($context='common') {
-		global $modx;
-		$_lang = array();
+    function include_lang($context='common') {
+        global $modx;
+        $_lang = array();
 
-		$context = trim($context,'/');
-		if(strpos($context,'..')!==false) return;
+        $context = trim($context,'/');
+        if(strpos($context,'..')!==false) return;
 
-		if($context === 'common')
-			$lang_path = MODX_MANAGER_PATH . 'includes/lang/';
-		else
-			$lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
-		include_once($lang_path . 'english.inc.php');
-		$manager_language = $modx->config['manager_language'];
-		if(is_file("{$lang_path}{$manager_language}.inc.php"))
-			include_once("{$lang_path}{$manager_language}.inc.php");
-		return $_lang;
-	}
+        if($context === 'common')
+            $lang_path = MODX_MANAGER_PATH . 'includes/lang/';
+        else
+            $lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
+        include_once($lang_path . 'english.inc.php');
+        $manager_language = $modx->config['manager_language'];
+        if(is_file("{$lang_path}{$manager_language}.inc.php"))
+            include_once("{$lang_path}{$manager_language}.inc.php");
+        return $_lang;
+    }
 
-	function setError($errorcode, $custommessage=""){
-		$this->errorcode=$errorcode;
-		$this->errormessage=$this->errors[$errorcode];
-		if($custommessage!="") {
-			$this->errormessage=$custommessage;
-		}
-	}
+    function setError($errorcode, $custommessage=""){
+        $this->errorcode=$errorcode;
+        $this->errormessage=$this->errors[$errorcode];
+        if($custommessage!="") {
+            $this->errormessage=$custommessage;
+        }
+    }
 
-	function getError() {
-		return $this->errorcode;
-	}
+    function getError() {
+        return $this->errorcode;
+    }
 
-	function dumpError(){
+    function dumpError(){
 ?>
 	<html>
 	<head>
@@ -98,7 +98,7 @@ 
 	</body>
 	</html>
 <?php
-		exit;
-	}
+        exit;
+    }
 }
 ?>

Spacing +15 added lines, -15 removed lines

@@ -15,7 +15,7 @@ 
      */
     public $errormessage;
 
-    public function __construct() {
+    public function __construct(){
 
 		$_lang = $this->include_lang('errormsg');
 
@@ -50,33 +50,33 @@ 
 	);
 	}
 
-	function include_lang($context='common') {
+	function include_lang($context = 'common'){
 		global $modx;
 		$_lang = array();
 
-		$context = trim($context,'/');
-		if(strpos($context,'..')!==false) return;
+		$context = trim($context, '/');
+		if (strpos($context, '..') !== false) return;
 
-		if($context === 'common')
-			$lang_path = MODX_MANAGER_PATH . 'includes/lang/';
+		if ($context === 'common')
+			$lang_path = MODX_MANAGER_PATH.'includes/lang/';
 		else
-			$lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
-		include_once($lang_path . 'english.inc.php');
+			$lang_path = MODX_MANAGER_PATH."includes/lang/{$context}/";
+		include_once($lang_path.'english.inc.php');
 		$manager_language = $modx->config['manager_language'];
-		if(is_file("{$lang_path}{$manager_language}.inc.php"))
+		if (is_file("{$lang_path}{$manager_language}.inc.php"))
 			include_once("{$lang_path}{$manager_language}.inc.php");
 		return $_lang;
 	}
 
-	function setError($errorcode, $custommessage=""){
-		$this->errorcode=$errorcode;
-		$this->errormessage=$this->errors[$errorcode];
-		if($custommessage!="") {
-			$this->errormessage=$custommessage;
+	function setError($errorcode, $custommessage = ""){
+		$this->errorcode = $errorcode;
+		$this->errormessage = $this->errors[$errorcode];
+		if ($custommessage != "") {
+			$this->errormessage = $custommessage;
 		}
 	}
 
-	function getError() {
+	function getError(){
 		return $this->errorcode;
 	}
 

Braces +23 added lines, -13 removed lines

@@ -1,6 +1,7 @@ 
 <?php
 // this is the old error handler. Here for legacy, until i replace all the old errors.
-class errorHandler{
+class errorHandler
+{
 
     /**
      * @var int
@@ -15,7 +16,8 @@ 
      */
     public $errormessage;
 
-    public function __construct() {
+    public function __construct()
+    {
 
 		$_lang = $this->include_lang('errormsg');
 
@@ -50,25 +52,31 @@ 
 	);
 	}
 
-	function include_lang($context='common') {
+	function include_lang($context='common')
+	{
 		global $modx;
 		$_lang = array();
 
 		$context = trim($context,'/');
-		if(strpos($context,'..')!==false) return;
+		if(strpos($context,'..')!==false) {
+		    return;
+		}
 
-		if($context === 'common')
-			$lang_path = MODX_MANAGER_PATH . 'includes/lang/';
-		else
-			$lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
+		if($context === 'common') {
+					$lang_path = MODX_MANAGER_PATH . 'includes/lang/';
+		} else {
+					$lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
+		}
 		include_once($lang_path . 'english.inc.php');
 		$manager_language = $modx->config['manager_language'];
-		if(is_file("{$lang_path}{$manager_language}.inc.php"))
-			include_once("{$lang_path}{$manager_language}.inc.php");
+		if(is_file("{$lang_path}{$manager_language}.inc.php")) {
+					include_once("{$lang_path}{$manager_language}.inc.php");
+		}
 		return $_lang;
 	}
 
-	function setError($errorcode, $custommessage=""){
+	function setError($errorcode, $custommessage="")
+	{
 		$this->errorcode=$errorcode;
 		$this->errormessage=$this->errors[$errorcode];
 		if($custommessage!="") {
@@ -76,11 +84,13 @@ 
 		}
 	}
 
-	function getError() {
+	function getError()
+	{
 		return $this->errorcode;
 	}
 
-	function dumpError(){
+	function dumpError()
+	{
 ?>
 	<html>
 	<head>

manager/includes/log.class.inc.php

Spacing +18 added lines, -18 removed lines

@@ -12,24 +12,24 @@ 
 
 */
 
-class logHandler {
+class logHandler{
     // Single variable for a log entry
     var $entry = array();
 
-    function initAndWriteLog($msg="", $internalKey="", $username="", $action="", $itemid="", $itemname="") {
+    function initAndWriteLog($msg = "", $internalKey = "", $username = "", $action = "", $itemid = "", $itemname = ""){
         global $modx;
         $this->entry['msg'] = $msg; // writes testmessage to the object
-        $this->entry['action'] = empty($action)? $modx->manager->action : $action;    // writes the action to the object
+        $this->entry['action'] = empty($action) ? $modx->manager->action : $action; // writes the action to the object
 
         // User Credentials
         $this->entry['internalKey'] = $internalKey == "" ? $modx->getLoginUserID() : $internalKey;
         $this->entry['username'] = $username == "" ? $modx->getLoginUserName() : $username;
 
-        $this->entry['itemId'] = (empty($itemid) && isset($_REQUEST['id'])) ? (int)$_REQUEST['id'] : $itemid;  // writes the id to the object
-        if($this->entry['itemId'] == 0) $this->entry['itemId'] = "-"; // to stop items having id 0
+        $this->entry['itemId'] = (empty($itemid) && isset($_REQUEST['id'])) ? (int) $_REQUEST['id'] : $itemid; // writes the id to the object
+        if ($this->entry['itemId'] == 0) $this->entry['itemId'] = "-"; // to stop items having id 0
 
-        $this->entry['itemName'] = ($itemname == "" && isset($_SESSION['itemname']))? $_SESSION['itemname'] : $itemname; // writes the id to the object
-        if($this->entry['itemName'] == "") $this->entry['itemName'] = "-"; // to stop item name being empty
+        $this->entry['itemName'] = ($itemname == "" && isset($_SESSION['itemname'])) ? $_SESSION['itemname'] : $itemname; // writes the id to the object
+        if ($this->entry['itemName'] == "") $this->entry['itemName'] = "-"; // to stop item name being empty
 
         $this->writeToLog();
         return;
@@ -38,20 +38,20 @@ 
     // function to write to the log
     // collects all required info, and
     // writes it to the logging table
-    function writeToLog() {
+    function writeToLog(){
         global $modx;
         $tbl_manager_log = $modx->getFullTableName('manager_log');
 
-        if($this->entry['internalKey'] == "") {
+        if ($this->entry['internalKey'] == "") {
             $modx->webAlertAndQuit("Logging error: internalKey not set.");
         }
-        if(empty($this->entry['action'])) {
+        if (empty($this->entry['action'])) {
             $modx->webAlertAndQuit("Logging error: action not set.");
         }
-        if($this->entry['msg'] == "") {
+        if ($this->entry['msg'] == "") {
             include_once "actionlist.inc.php";
             $this->entry['msg'] = getAction($this->entry['action'], $this->entry['itemId']);
-            if($this->entry['msg'] == "") {
+            if ($this->entry['msg'] == "") {
                 $modx->webAlertAndQuit("Logging error: couldn't find message to write to log.");
             }
         }
@@ -63,14 +63,14 @@ 
         $fields['itemid']      = $this->entry['itemId'];
         $fields['itemname']    = $modx->db->escape($this->entry['itemName']);
         $fields['message']     = $modx->db->escape($this->entry['msg']);
-        $insert_id = $modx->db->insert($fields,$tbl_manager_log);
-        if(!$insert_id) {
+        $insert_id = $modx->db->insert($fields, $tbl_manager_log);
+        if (!$insert_id) {
             $modx->messageQuit("Logging error: couldn't save log to table! Error code: ".$modx->db->getLastError());
         } else {
-            $limit = (isset($modx->config['manager_log_limit'])) ? (int)$modx->config['manager_log_limit'] : 3000;
-            $trim  = (isset($modx->config['manager_log_trim']))  ? (int)$modx->config['manager_log_trim'] : 100;
-            if(($insert_id % $trim) === 0) {
-                $modx->rotate_log('manager_log',$limit,$trim);
+            $limit = (isset($modx->config['manager_log_limit'])) ? (int) $modx->config['manager_log_limit'] : 3000;
+            $trim  = (isset($modx->config['manager_log_trim'])) ? (int) $modx->config['manager_log_trim'] : 100;
+            if (($insert_id % $trim) === 0) {
+                $modx->rotate_log('manager_log', $limit, $trim);
             }
         }
     }