evolution-cms / evolution

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

Spacing +39 added lines, -39 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'];
@@ -70,7 +70,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'
                         ));
@@ -85,8 +85,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;
@@ -119,7 +119,7 @@ 
         if (1000 < $safeCount) {
             exit("Too many loops '{$safeCount}'");
         }
-        if (! ($this->conn instanceof mysqli)) {
+        if (!($this->conn instanceof mysqli)) {
             $this->connect();
         }
         if (is_array($s)) {
@@ -145,7 +145,7 @@ 
     public function query($sql, $watchError = true)
     {
         $modx = evolutionCMS();
-        if (! ($this->conn instanceof mysqli)) {
+        if (!($this->conn instanceof mysqli)) {
             $this->connect();
         }
         $tStart = $modx->getMicroTime();
@@ -165,7 +165,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();
@@ -179,24 +179,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++;
@@ -295,7 +295,7 @@ 
         $modx = evolutionCMS();
         $out = false;
         if (!$table) {
-            $modx->messageQuit('Empty ' . $table . ' parameter in DBAPI::update().');
+            $modx->messageQuit('Empty '.$table.' parameter in DBAPI::update().');
         } else {
             $table = $this->replaceFullTableName($table);
             if (is_array($fields)) {
@@ -303,18 +303,18 @@ 
                     if ($value === null || strtolower($value) === 'null') {
                         $f = 'NULL';
                     } else {
-                        $f = "'" . $value . "'";
+                        $f = "'".$value."'";
                     }
-                    $fields[$key] = "`{$key}` = " . $f;
+                    $fields[$key] = "`{$key}` = ".$f;
                 }
                 $fields = implode(',', $fields);
             }
             $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);
         }
         return $out;
     }
@@ -340,12 +340,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))."')";
                     $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) {
@@ -439,8 +439,8 @@ 
      */
     public function getInsertId($conn = null)
     {
-        if (! ($conn instanceof mysqli)) {
-            $conn =& $this->conn;
+        if (!($conn instanceof mysqli)) {
+            $conn = & $this->conn;
         }
 
         return $conn->insert_id;
@@ -452,8 +452,8 @@ 
      */
     public function getAffectedRows($conn = null)
     {
-        if (! ($conn instanceof mysqli)) {
-            $conn =& $this->conn;
+        if (!($conn instanceof mysqli)) {
+            $conn = & $this->conn;
         }
 
         return $conn->affected_rows;
@@ -465,8 +465,8 @@ 
      */
     public function getLastError($conn = null)
     {
-        if (! ($conn instanceof mysqli)) {
-            $conn =& $this->conn;
+        if (!($conn instanceof mysqli)) {
+            $conn = & $this->conn;
         }
 
         return $conn->error;
@@ -520,7 +520,7 @@ 
     public function getColumn($name, $dsq)
     {
         $col = array();
-        if (! ($dsq instanceof mysqli_result)) {
+        if (!($dsq instanceof mysqli_result)) {
             $dsq = $this->query($dsq);
         }
         if ($dsq) {
@@ -539,7 +539,7 @@ 
     public function getColumnNames($dsq)
     {
         $names = array();
-        if (! ($dsq instanceof mysqli_result)) {
+        if (!($dsq instanceof mysqli_result)) {
             $dsq = $this->query($dsq);
         }
         if ($dsq) {
@@ -559,7 +559,7 @@ 
     public function getValue($dsq)
     {
         $out = false;
-        if (! ($dsq instanceof mysqli_result)) {
+        if (!($dsq instanceof mysqli_result)) {
             $dsq = $this->query($dsq);
         }
         if ($dsq) {
@@ -578,7 +578,7 @@ 
     {
         $metadata = array();
         if (!empty($table) && is_scalar($table)) {
-            $sql = 'SHOW FIELDS FROM ' . $table;
+            $sql = 'SHOW FIELDS FROM '.$table;
             if ($ds = $this->query($sql)) {
                 while ($row = $this->getRow($ds)) {
                     $fieldName = $row['Field'];
@@ -657,7 +657,7 @@ 
         $tableName = trim($tableName);
         $dbase = trim($this->config['dbase'], '`');
         $prefix = $this->config['table_prefix'];
-        if ((bool)$force === true) {
+        if ((bool) $force === true) {
             $result = "`{$dbase}`.`{$prefix}{$tableName}`";
         } elseif (strpos($tableName, '[+prefix+]') !== false) {
             $result = preg_replace('@\[\+prefix\+\]([0-9a-zA-Z_]+)@', "`{$dbase}`.`{$prefix}$1`", $tableName);
@@ -674,9 +674,9 @@ 
      */
     public function optimize($table_name)
     {
-        $rs = $this->query('OPTIMIZE TABLE ' . $table_name);
+        $rs = $this->query('OPTIMIZE TABLE '.$table_name);
         if ($rs) {
-            $rs = $this->query('ALTER TABLE ' . $table_name);
+            $rs = $this->query('ALTER TABLE '.$table_name);
         }
 
         return $rs;
@@ -688,7 +688,7 @@ 
      */
     public function truncate($table_name)
     {
-        return $this->query('TRUNCATE ' . $table_name);
+        return $this->query('TRUNCATE '.$table_name);
     }
 
     /**
@@ -714,7 +714,7 @@ 
         $_ = array();
         foreach ($fields as $k => $v) {
             if ($k !== $v) {
-                $_[] = $v . ' as ' . $k;
+                $_[] = $v.' as '.$k;
             } else {
                 $_[] = $v;
             }

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

Spacing +17 added lines, -17 removed lines

@@ -2,23 +2,23 @@ 
 if (strpos($opt, ',')) {
     list($limit, $delim) = explode(',', $opt);
 } elseif (preg_match('/^[1-9][0-9]*$/', $opt)) {
-    $limit=$opt;
-    $delim='';
+    $limit = $opt;
+    $delim = '';
 } else {
-    $limit=124;
-    $delim='';
+    $limit = 124;
+    $delim = '';
 }
 
-if ($delim==='') {
-    $delim = $modx->config['manager_language']==='japanese-utf8' ? '。' : '.';
+if ($delim === '') {
+    $delim = $modx->config['manager_language'] === 'japanese-utf8' ? '。' : '.';
 }
-$limit = (int)$limit;
+$limit = (int) $limit;
 
 $content = $modx->filter->parseDocumentSource($value);
 
 $content = strip_tags($content);
 
-$content = str_replace(array("\r\n","\r","\n","\t",' '), ' ', $content);
+$content = str_replace(array("\r\n", "\r", "\n", "\t", ' '), ' ', $content);
 if (preg_match('/\s+/', $content)) {
     $content = preg_replace('/\s+/', ' ', $content);
 }
@@ -26,30 +26,30 @@ 
 
 $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)) {
+        if ($limit <= $modx->filter->strlen($text.$v.$delim)) {
             break;
         }
-        $text .= $v . $delim;
+        $text .= $v.$delim;
     }
     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 . ' ')) {
+        if ($limit <= $modx->filter->strlen($text.$v.' ')) {
             break;
         }
-        $text .= $v . ' ';
+        $text .= $v.' ';
     }
-    if ($text!=='') {
+    if ($text !== '') {
         $content = $text;
     }
 }
@@ -57,8 +57,8 @@ 
 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 ($modx->filter->substr($content, -1) == $delim) {
+    $content = rtrim($content, $delim).$delim;
 }
 
 return $content;

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

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 $pattern = '/<img[\s\n]+.*src=[\s\n]*"([^"]+\.(jpg|jpeg|png|gif))"[^>]+>/i';
 preg_match_all($pattern, $value, $images);
-if ($opt==='') {
+if ($opt === '') {
     if ($images[1][0]) {
         return $images[1][0];
     } else {
@@ -9,7 +9,7 @@ 
     }
 } else {
     foreach ($images[0] as $i=>$image) {
-        if (strpos($image, $opt)!==false) {
+        if (strpos($image, $opt) !== false) {
             return $images[1][$i];
         }
     }

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

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 $text = $modx->filter->parseDocumentSource($value);
-$text = str_replace(array("\r\n","\r"), "\n", $text);
+$text = str_replace(array("\r\n", "\r"), "\n", $text);
 
 $blockElms  = 'br,table,tbody,tr,td,th,thead,tfoot,caption,colgroup,div';
 $blockElms .= ',dl,dd,dt,ul,ol,li,pre,select,option,form,map,area,blockquote';
@@ -11,11 +11,11 @@ 
 $c = count($lines);
 foreach ($lines as $i=>$line) {
     $line = rtrim($line);
-    if ($i===$c-1) {
+    if ($i === $c - 1) {
         break;
     }
     foreach ($blockElms as $block) {
-        if (preg_match("@</?{$block}" . '[^>]*>$@', $line)) {
+        if (preg_match("@</?{$block}".'[^>]*>$@', $line)) {
             continue 2;
         }
     }

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

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 $userID = abs($modx->getLoginUserID('web'));
-$modx->qs_hash = md5($modx->qs_hash . "^{$userID}^");
+$modx->qs_hash = md5($modx->qs_hash."^{$userID}^");
 
 $groupNames = ($this->strlen($opt) > 0) ? explode(',', $opt) : array();
 

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

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
 <?php
-return preg_replace_callback("~(\b\w+\b)~", function ($m) use ($wrapat) {
+return preg_replace_callback("~(\b\w+\b)~", function($m) use ($wrapat) {
     return wordwrap($m[1], $wrapat, ' ', 1);
 }, $value);

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));

manager/includes/extenders/ex_dbapi.inc.php

Spacing +3 added lines, -3 removed lines

@@ -13,12 +13,12 @@
 
 $out = false;
 $class = 'DBAPI';
-if (! class_exists($class)) {
-    include_once MODX_MANAGER_PATH . 'includes/extenders/dbapi.' . $database_type . '.class.inc.php';
+if (!class_exists($class)) {
+    include_once MODX_MANAGER_PATH.'includes/extenders/dbapi.'.$database_type.'.class.inc.php';
 }
 
 if (class_exists($class)) {
-    $this->db= new $class;
+    $this->db = new $class;
     $out = true;
 }
 

manager/includes/extenders/message.quit.inc.php

Spacing +4 added lines, -4 removed lines

@@ -3,7 +3,7 @@ 
  * Message Quit Template
  *
  */
-if ((! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) && IN_PARSER_MODE!="true") {
+if ((!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) && IN_PARSER_MODE != "true") {
     die("<b>INCLUDE ACCESS ERROR</b><br /><br />Direct access to this file prohibited.");
 }
 
@@ -37,7 +37,7 @@ 
 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='javascript:copyToClip();' style='color:#821517;font-size: 9px; text-decoration: none'>[Copy SQL to ClipBoard]</a><textarea id='holdtext' style='display:none;'></textarea></td></tr>";
 }
 
-if ($text!='') {
+if ($text != '') {
     $errortype = array(
         E_ERROR          => "Error",
         E_WARNING        => "Warning",
@@ -59,7 +59,7 @@ 
     $parsedMessageString .= "</tr>";
 
     $parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Error type/ Nr.: </td>";
-    $parsedMessageString .= "<td colspan='2'>" . $errortype[$nr] . " - $nr</b></td><td>&nbsp;</td>";
+    $parsedMessageString .= "<td colspan='2'>".$errortype[$nr]." - $nr</b></td><td>&nbsp;</td>";
     $parsedMessageString .= "</tr>";
 
     $parsedMessageString .= "<tr><td>&nbsp;&nbsp;File: </td>";
@@ -69,7 +69,7 @@ 
     $parsedMessageString .= "<tr><td>&nbsp;&nbsp;Line: </td>";
     $parsedMessageString .= "<td colspan='2'>$line</td><td>&nbsp;</td>";
     $parsedMessageString .= "</tr>";
-    if ($source!='') {
+    if ($source != '') {
         $parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Line $line source: </td>";
         $parsedMessageString .= "<td colspan='2'>$source</td><td>&nbsp;</td>";
         $parsedMessageString .= "</tr>";