evolution-cms / evolution

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +6 added lines, -6 removed lines

@@ -1,21 +1,21 @@
 <?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';
 $blockElms .= ',address,math,style,input,p,h1,h2,h3,h4,h5,h6,hr,object,param,embed';
 $blockElms .= ',noframes,noscript,section,article,aside,hgroup,footer,address,code';
 $blockElms = explode(',', $blockElms);
-$lines = explode("\n",$text);
+$lines = explode("\n", $text);
 $c = count($lines);
-foreach($lines as $i=>$line)
+foreach ($lines as $i=>$line)
 {
     $line = rtrim($line);
-    if($i===$c-1) break;
-    foreach($blockElms as $block)
+    if ($i === $c - 1) break;
+    foreach ($blockElms as $block)
     {
-        if(preg_match("@</?{$block}" . '[^>]*>$@',$line))
+        if (preg_match("@</?{$block}".'[^>]*>$@', $line))
             continue 2;
     }
     $lines[$i] = "{$line}<br />";

Braces +8 added lines, -7 removed lines

@@ -9,14 +9,15 @@
 $blockElms = explode(',', $blockElms);
 $lines = explode("\n",$text);
 $c = count($lines);
-foreach($lines as $i=>$line)
-{
+foreach($lines as $i=>$line) {
     $line = rtrim($line);
-    if($i===$c-1) break;
-    foreach($blockElms as $block)
-    {
-        if(preg_match("@</?{$block}" . '[^>]*>$@',$line))
-            continue 2;
+    if($i===$c-1) {
+        break;
+    }
+    foreach($blockElms as $block) {
+        if(preg_match("@</?{$block}" . '[^>]*>$@',$line)) {
+                    continue 2;
+        }
     }
     $lines[$i] = "{$line}<br />";
 }

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

Spacing +18 added lines, -18 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' ? '。' : '.';
+if ($delim === '') $delim = $modx->config['manager_language'] === 'japanese-utf8' ? '。' : '.';
 $limit = intval($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 = intval($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/modifiers/mdf_memberof.inc.php

Spacing +7 added lines, -7 removed lines

@@ -2,22 +2,22 @@
 $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->filter->cache['mo'][$userID])) $grpNames = $modx->filter->cache['mo'][$userID];
 else {
-    $from = sprintf("[+prefix+]webgroup_names wgn INNER JOIN [+prefix+]web_groups wg ON wg.webgroup=wgn.id AND wg.webuser='%s'",$userID);
-    $rs = $modx->db->select('wgn.name',$from);
-    $modx->filter->cache['mo'][$userID] = $grpNames = $modx->db->getColumn('name',$rs);
+    $from = sprintf("[+prefix+]webgroup_names wgn INNER JOIN [+prefix+]web_groups wg ON wg.webgroup=wgn.id AND wg.webuser='%s'", $userID);
+    $rs = $modx->db->select('wgn.name', $from);
+    $modx->filter->cache['mo'][$userID] = $grpNames = $modx->db->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->filter->cache['mo'][$userID])) $grpNames = $modx->filter->cache['mo'][$userID];
-else {
+if (isset($modx->filter->cache['mo'][$userID])) {
+    $grpNames = $modx->filter->cache['mo'][$userID];
+} else {
     $from = sprintf("[+prefix+]webgroup_names wgn INNER JOIN [+prefix+]web_groups wg ON wg.webgroup=wgn.id AND wg.webuser='%s'",$userID);
     $rs = $modx->db->select('wgn.name',$from);
     $modx->filter->cache['mo'][$userID] = $grpNames = $modx->db->getColumn('name',$rs);
@@ -17,8 +20,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/extenders/message.quit.inc.php

Indentation +34 added lines, -34 removed lines

@@ -19,60 +19,60 @@
 </head><body>
 ";
 if($is_error) {
-	$parsedMessageString .= "<h3 style='color:red;background:#e0e0e0;padding:2px;'>&nbsp;MODX Parse Error </h3>
+    $parsedMessageString .= "<h3 style='color:red;background:#e0e0e0;padding:2px;'>&nbsp;MODX Parse Error </h3>
 	<table border='0' cellpadding='1' cellspacing='0'>
 	<tr><td colspan='3'>MODX encountered the following error while attempting to parse the requested resource:</td></tr>
 	<tr><td colspan='3'><b style='color:red;'>&laquo; $msg &raquo;</b></td></tr>";
 } else {
-	$parsedMessageString .= "<h3 style='color:#003399; background:#eeeeee;padding:2px;'>&nbsp;MODX Debug/ stop message </h3>
+    $parsedMessageString .= "<h3 style='color:#003399; background:#eeeeee;padding:2px;'>&nbsp;MODX Debug/ stop message </h3>
 	<table border='0' cellpadding='1' cellspacing='0'>
 	<tr><td colspan='3'>The MODX parser recieved the following debug/ stop message:</td></tr>
 	<tr><td colspan='3'><b style='color:#003399;'>&laquo; $msg &raquo;</b></td></tr>";
 }
 
 if(!empty($query)) {
-	$parsedMessageString .= "<tr><td colspan='3'><hr size='1' width='98%' style='color:#e0e0e0'/><b style='color:#999;font-size: 9px;border-left:1px solid #c0c0c0; margin-left:10px;'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;SQL:&nbsp;<span id='sqlHolder'>$query</span></b><hr size='1' width='98%' style='color:#e0e0e0'/>
+    $parsedMessageString .= "<tr><td colspan='3'><hr size='1' width='98%' style='color:#e0e0e0'/><b style='color:#999;font-size: 9px;border-left:1px solid #c0c0c0; margin-left:10px;'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;SQL:&nbsp;<span id='sqlHolder'>$query</span></b><hr size='1' width='98%' style='color:#e0e0e0'/>
 	&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!='') {
 
-	$errortype = array (
-		E_ERROR          => "Error",
-		E_WARNING        => "Warning",
-		E_PARSE          => "Parsing Error",
-		E_NOTICE          => "Notice",
-		E_CORE_ERROR      => "Core Error",
-		E_CORE_WARNING    => "Core Warning",
-		E_COMPILE_ERROR  => "Compile Error",
-		E_COMPILE_WARNING => "Compile Warning",
-		E_USER_ERROR      => "User Error",
-		E_USER_WARNING    => "User Warning",
-		E_USER_NOTICE    => "User Notice",
-	);
+    $errortype = array (
+        E_ERROR          => "Error",
+        E_WARNING        => "Warning",
+        E_PARSE          => "Parsing Error",
+        E_NOTICE          => "Notice",
+        E_CORE_ERROR      => "Core Error",
+        E_CORE_WARNING    => "Core Warning",
+        E_COMPILE_ERROR  => "Compile Error",
+        E_COMPILE_WARNING => "Compile Warning",
+        E_USER_ERROR      => "User Error",
+        E_USER_WARNING    => "User Warning",
+        E_USER_NOTICE    => "User Notice",
+    );
 
-	$parsedMessageString .= "<tr><td>&nbsp;</td></tr><tr><td colspan='3'><b>PHP error debug</b></td></tr>";
+    $parsedMessageString .= "<tr><td>&nbsp;</td></tr><tr><td colspan='3'><b>PHP error debug</b></td></tr>";
 
-	$parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Error: </td>";
-	$parsedMessageString .= "<td colspan='2'>$text</td><td>&nbsp;</td>";
-	$parsedMessageString .= "</tr>";
+    $parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Error: </td>";
+    $parsedMessageString .= "<td colspan='2'>$text</td><td>&nbsp;</td>";
+    $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 .= "</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 .= "</tr>";
 
-	$parsedMessageString .= "<tr><td>&nbsp;&nbsp;File: </td>";
-	$parsedMessageString .= "<td colspan='2'>$file</td><td>&nbsp;</td>";
-	$parsedMessageString .= "</tr>";
+    $parsedMessageString .= "<tr><td>&nbsp;&nbsp;File: </td>";
+    $parsedMessageString .= "<td colspan='2'>$file</td><td>&nbsp;</td>";
+    $parsedMessageString .= "</tr>";
 
-	$parsedMessageString .= "<tr><td>&nbsp;&nbsp;Line: </td>";
-	$parsedMessageString .= "<td colspan='2'>$line</td><td>&nbsp;</td>";
-	$parsedMessageString .= "</tr>";
-	if($source!='') {
-		$parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Line $line source: </td>";
-		$parsedMessageString .= "<td colspan='2'>$source</td><td>&nbsp;</td>";
-		$parsedMessageString .= "</tr>";
-	}
+    $parsedMessageString .= "<tr><td>&nbsp;&nbsp;Line: </td>";
+    $parsedMessageString .= "<td colspan='2'>$line</td><td>&nbsp;</td>";
+    $parsedMessageString .= "</tr>";
+    if($source!='') {
+        $parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Line $line source: </td>";
+        $parsedMessageString .= "<td colspan='2'>$source</td><td>&nbsp;</td>";
+        $parsedMessageString .= "</tr>";
+    }
 }
 
 $parsedMessageString .= "<tr><td>&nbsp;</td></tr><tr><td colspan='3'><b>Parser timing</b></td></tr>";

Spacing +6 added lines, -6 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.");
 }
 
@@ -20,7 +20,7 @@ 
 </script>
 </head><body>
 ";
-if($is_error) {
+if ($is_error) {
 	$parsedMessageString .= "<h3 style='color:red;background:#e0e0e0;padding:2px;'>&nbsp;MODX Parse Error </h3>
 	<table border='0' cellpadding='1' cellspacing='0'>
 	<tr><td colspan='3'>MODX encountered the following error while attempting to parse the requested resource:</td></tr>
@@ -32,14 +32,14 @@ 
 	<tr><td colspan='3'><b style='color:#003399;'>&laquo; $msg &raquo;</b></td></tr>";
 }
 
-if(!empty($query)) {
+if (!empty($query)) {
 	$parsedMessageString .= "<tr><td colspan='3'><hr size='1' width='98%' style='color:#e0e0e0'/><b style='color:#999;font-size: 9px;border-left:1px solid #c0c0c0; margin-left:10px;'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;SQL:&nbsp;<span id='sqlHolder'>$query</span></b><hr size='1' width='98%' style='color:#e0e0e0'/>
 	&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 (
+	$errortype = array(
 		E_ERROR          => "Error",
 		E_WARNING        => "Warning",
 		E_PARSE          => "Parsing Error",
@@ -70,7 +70,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>";

manager/includes/extenders/ex_phpcompat.inc.php

Spacing +3 added lines, -3 removed lines

@@ -5,13 +5,13 @@
  * Time: 12:25
  */
 
-if (isset($this->phpcompat) && is_object($this->phpcompat)){
+if (isset($this->phpcompat) && is_object($this->phpcompat)) {
     return true;
 }
 
-if (!include_once(MODX_MANAGER_PATH . 'includes/extenders/phpcompat.class.inc.php')){
+if (!include_once(MODX_MANAGER_PATH.'includes/extenders/phpcompat.class.inc.php')) {
     return false;
-}else{
+} else {
     $this->phpcompat = new PHPCOMPAT;
     return true;
 }

Braces +3 added lines, -3 removed lines

@@ -5,13 +5,13 @@
  * Time: 12:25
  */
 
-if (isset($this->phpcompat) && is_object($this->phpcompat)){
+if (isset($this->phpcompat) && is_object($this->phpcompat)) {
     return true;
 }
 
-if (!include_once(MODX_MANAGER_PATH . 'includes/extenders/phpcompat.class.inc.php')){
+if (!include_once(MODX_MANAGER_PATH . 'includes/extenders/phpcompat.class.inc.php')) {
     return false;
-}else{
+} else {
     $this->phpcompat = new PHPCOMPAT;
     return true;
 }

manager/includes/extenders/ex_phpass.inc.php

Spacing +3 added lines, -3 removed lines

@@ -5,13 +5,13 @@
  * Time: 19:14
  */
 
-if (isset($this->phpass) && is_object($this->phpass)){
+if (isset($this->phpass) && is_object($this->phpass)) {
     return true;
 }
 
-if (!include_once(MODX_MANAGER_PATH . 'includes/extenders/phpass.class.inc.php')){
+if (!include_once(MODX_MANAGER_PATH.'includes/extenders/phpass.class.inc.php')) {
     return false;
-}else{
+} else {
     $this->phpass = new PasswordHash;
     return true;
 }
\ No newline at end of file

Braces +3 added lines, -3 removed lines

@@ -5,13 +5,13 @@
  * Time: 19:14
  */
 
-if (isset($this->phpass) && is_object($this->phpass)){
+if (isset($this->phpass) && is_object($this->phpass)) {
     return true;
 }
 
-if (!include_once(MODX_MANAGER_PATH . 'includes/extenders/phpass.class.inc.php')){
+if (!include_once(MODX_MANAGER_PATH . 'includes/extenders/phpass.class.inc.php')) {
     return false;
-}else{
+} else {
     $this->phpass = new PasswordHash;
     return true;
 }
\ No newline at end of file

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

Indentation +6 added lines, -6 removed lines

@@ -40,7 +40,7 @@ 
     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
     function putChunk($chunkName) { // alias name >.<
-    	global $modx;
+        global $modx;
         return $modx->getChunk($chunkName);
     }
 
     function getDocGroups() {
-    	global $modx;
+        global $modx;
         return $modx->getUserDocGroups();
     } // deprecated
 
@@ -74,7 +74,7 @@ 
     } // deprecated
     
     function userLoggedIn() {
-    	global $modx;
+        global $modx;
         $userdetails= array ();
         if ($modx->isFrontend() && isset ($_SESSION['webValidated'])) {
             // web user
@@ -98,7 +98,7 @@ 
     
     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
      */
     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{
 
-    function dbConnect()                 {global $modx;       $modx->db->connect();$modx->rs = $modx->db->conn;}
-    function dbQuery($sql)               {global $modx;return $modx->db->query($sql);}
-    function recordCount($rs)            {global $modx;return $modx->db->getRecordCount($rs);}
-    function fetchRow($rs,$mode='assoc') {global $modx;return $modx->db->getRow($rs, $mode);}
-    function affectedRows($rs)           {global $modx;return $modx->db->getAffectedRows($rs);}
-    function insertId($rs)               {global $modx;return $modx->db->getInsertId($rs);}
-    function dbClose()                   {global $modx;       $modx->db->disconnect();}
+    function dbConnect(){global $modx; $modx->db->connect(); $modx->rs = $modx->db->conn; }
+    function dbQuery($sql){global $modx; return $modx->db->query($sql); }
+    function recordCount($rs){global $modx; return $modx->db->getRecordCount($rs); }
+    function fetchRow($rs, $mode = 'assoc'){global $modx; return $modx->db->getRow($rs, $mode); }
+    function affectedRows($rs){global $modx; return $modx->db->getAffectedRows($rs); }
+    function insertId($rs){global $modx; return $modx->db->getInsertId($rs); }
+    function dbClose(){global $modx; $modx->db->disconnect(); }
 
-    function makeList($array, $ulroot= 'root', $ulprefix= 'sub_', $type= '', $ordered= false, $tablevel= 0) {
+    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;
     }
 
 
-    function getUserData() {
+    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
-    function insideManager() {
-        $m= false;
-        if( defined('IN_MANAGER_MODE') && IN_MANAGER_MODE === true) {
-            $m= true;
+    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
-    function putChunk($chunkName) { // alias name >.<
+    function putChunk($chunkName){ // alias name >.<
     	global $modx;
         return $modx->getChunk($chunkName);
     }
 
-    function getDocGroups() {
+    function getDocGroups(){
     	global $modx;
         return $modx->getUserDocGroups();
     } // deprecated
 
-    function changePassword($o, $n) {
+    function changePassword($o, $n){
         return changeWebUserPassword($o, $n);
     } // deprecated
 
-    function userLoggedIn() {
+    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;
             }
     }
 
-    function getFormVars($method= "", $prefix= "", $trim= "", $REQUEST_METHOD) {
+    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
      */
-    function webAlert($msg, $url= "") {
+    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
+{
 
-    function dbConnect()                 {global $modx;       $modx->db->connect();$modx->rs = $modx->db->conn;}
-    function dbQuery($sql)               {global $modx;return $modx->db->query($sql);}
-    function recordCount($rs)            {global $modx;return $modx->db->getRecordCount($rs);}
-    function fetchRow($rs,$mode='assoc') {global $modx;return $modx->db->getRow($rs, $mode);}
-    function affectedRows($rs)           {global $modx;return $modx->db->getAffectedRows($rs);}
-    function insertId($rs)               {global $modx;return $modx->db->getInsertId($rs);}
-    function dbClose()                   {global $modx;       $modx->db->disconnect();}
+    function dbConnect()
+    {
+global $modx;       $modx->db->connect();$modx->rs = $modx->db->conn;}
+    function dbQuery($sql)
+    {
+global $modx;return $modx->db->query($sql);}
+    function recordCount($rs)
+    {
+global $modx;return $modx->db->getRecordCount($rs);}
+    function fetchRow($rs,$mode='assoc')
+    {
+global $modx;return $modx->db->getRow($rs, $mode);}
+    function affectedRows($rs)
+    {
+global $modx;return $modx->db->getAffectedRows($rs);}
+    function insertId($rs)
+    {
+global $modx;return $modx->db->getInsertId($rs);}
+    function dbClose()
+    {
+global $modx;       $modx->db->disconnect();}
 
-    function makeList($array, $ulroot= 'root', $ulprefix= 'sub_', $type= '', $ordered= false, $tablevel= 0) {
+    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 @@ 
     }
 
 
-    function getUserData() {
+    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
-    function insideManager() {
+    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
-    function putChunk($chunkName) { // alias name >.<
+    function putChunk($chunkName)
+    {
+// alias name >.<
     	global $modx;
         return $modx->getChunk($chunkName);
     }
 
-    function getDocGroups() {
+    function getDocGroups()
+    {
     	global $modx;
         return $modx->getUserDocGroups();
     } // deprecated
 
-    function changePassword($o, $n) {
+    function changePassword($o, $n)
+    {
         return changeWebUserPassword($o, $n);
     } // deprecated
 
-    function userLoggedIn() {
+    function userLoggedIn()
+    {
     	global $modx;
         $userdetails= array ();
         if ($modx->isFrontend() && isset ($_SESSION['webValidated'])) {
@@ -96,18 +120,22 @@ 
             }
     }
 
-    function getFormVars($method= "", $prefix= "", $trim= "", $REQUEST_METHOD) {
+    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
      */
-    function webAlert($msg, $url= "") {
+    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/extenders/dbapi.mysqli.class.inc.php

Indentation +349 added lines, -349 removed lines

@@ -1,104 +1,104 @@ 
 <?php
 class DBAPI {
-	var $conn;
-	var $config;
-	var $lastQuery;
-	var $isConnected;
+    var $conn;
+    var $config;
+    var $lastQuery;
+    var $isConnected;
 
-	function __construct($host='', $dbase='', $uid='', $pwd='', $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'];
-		$this->config['pass'] = $pwd ? $pwd : $GLOBALS['database_password'];
-		$this->config['charset'] = $charset ? $charset : $GLOBALS['database_connection_charset'];
-		$this->config['connection_method'] =  $this->_dbconnectionmethod = (isset($GLOBALS['database_connection_method']) ? $GLOBALS['database_connection_method'] : $connection_method);
-		$this->config['table_prefix'] = ($pre !== NULL) ? $pre : $GLOBALS['table_prefix'];
-	}
+    function __construct($host='', $dbase='', $uid='', $pwd='', $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'];
+        $this->config['pass'] = $pwd ? $pwd : $GLOBALS['database_password'];
+        $this->config['charset'] = $charset ? $charset : $GLOBALS['database_connection_charset'];
+        $this->config['connection_method'] =  $this->_dbconnectionmethod = (isset($GLOBALS['database_connection_method']) ? $GLOBALS['database_connection_method'] : $connection_method);
+        $this->config['table_prefix'] = ($pre !== NULL) ? $pre : $GLOBALS['table_prefix'];
+    }
 
-	function connect($host = '', $dbase = '', $uid = '', $pwd = '', $tmp = 0) {
-		global $modx;
-		$uid     = $uid   ? $uid   : $this->config['user'];
-		$pwd     = $pwd   ? $pwd   : $this->config['pass'];
-		$host    = $host  ? $host  : $this->config['host'];
-		$dbase   = $dbase ? $dbase : $this->config['dbase'];
-		$dbase   = trim($dbase, '`'); // remove the `` chars
-		$charset = $this->config['charset'];
-		$connection_method = $this->config['connection_method'];
-		$tstart = $modx->getMicroTime();
-		$safe_count = 0;
-		do {
-			$this->conn = new mysqli($host, $uid, $pwd, $dbase);
-			if ($this->conn->connect_error) {
-				$this->conn = null;
-				if (isset($modx->config['send_errormail']) && $modx->config['send_errormail'] !== '0') {
-					if ($modx->config['send_errormail'] <= 2) {
-						$logtitle    = 'Failed to create the database connection!';
-						$request_uri = $modx->htmlspecialchars($_SERVER['REQUEST_URI']);
-						$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'],
-							'body' => "{$logtitle}\n{$request_uri}\n{$ua}\n{$referer}",
-							'type' => 'text'
-						));
-					}
-				}
-				sleep(1);
-				$safe_count++;
-			}
-		} while (!$this->conn && $safe_count<3);
-		if (!$this->conn) {
-			$modx->messageQuit("Failed to create the database connection!");
-			exit;
-		} else {
-			$this->conn->query("{$connection_method} {$charset}");
-			$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 />";
-			}
-			$this->conn->set_charset($this->config['charset']);
-			$this->isConnected = true;
-			$modx->queryTime += $totaltime;
-		}
-	}
+    function connect($host = '', $dbase = '', $uid = '', $pwd = '', $tmp = 0) {
+        global $modx;
+        $uid     = $uid   ? $uid   : $this->config['user'];
+        $pwd     = $pwd   ? $pwd   : $this->config['pass'];
+        $host    = $host  ? $host  : $this->config['host'];
+        $dbase   = $dbase ? $dbase : $this->config['dbase'];
+        $dbase   = trim($dbase, '`'); // remove the `` chars
+        $charset = $this->config['charset'];
+        $connection_method = $this->config['connection_method'];
+        $tstart = $modx->getMicroTime();
+        $safe_count = 0;
+        do {
+            $this->conn = new mysqli($host, $uid, $pwd, $dbase);
+            if ($this->conn->connect_error) {
+                $this->conn = null;
+                if (isset($modx->config['send_errormail']) && $modx->config['send_errormail'] !== '0') {
+                    if ($modx->config['send_errormail'] <= 2) {
+                        $logtitle    = 'Failed to create the database connection!';
+                        $request_uri = $modx->htmlspecialchars($_SERVER['REQUEST_URI']);
+                        $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'],
+                            'body' => "{$logtitle}\n{$request_uri}\n{$ua}\n{$referer}",
+                            'type' => 'text'
+                        ));
+                    }
+                }
+                sleep(1);
+                $safe_count++;
+            }
+        } while (!$this->conn && $safe_count<3);
+        if (!$this->conn) {
+            $modx->messageQuit("Failed to create the database connection!");
+            exit;
+        } else {
+            $this->conn->query("{$connection_method} {$charset}");
+            $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 />";
+            }
+            $this->conn->set_charset($this->config['charset']);
+            $this->isConnected = true;
+            $modx->queryTime += $totaltime;
+        }
+    }
 
-	function disconnect() {
-		$this->conn->close();
-		$this->conn = null;
-		$this->isConnected = false;
-	}
+    function disconnect() {
+        $this->conn->close();
+        $this->conn = null;
+        $this->isConnected = false;
+    }
 
-	function escape($s, $safecount=0) {
-		$safecount++;
-		if (1000<$safecount) exit("Too many loops '{$safecount}'");
-		if (empty ($this->conn) || !is_object($this->conn)) {
-			$this->connect();
-		}
-		if (is_array($s)) {
-			if (count($s) === 0) {
-				$s = '';
-			} else {
-				foreach ($s as $i=>$v) {
-					$s[$i] = $this->escape($v, $safecount);
-				}
-			}
-		} else {
-			$s = $this->conn->escape_string($s);
-		}
-		return $s;
-	}
+    function escape($s, $safecount=0) {
+        $safecount++;
+        if (1000<$safecount) exit("Too many loops '{$safecount}'");
+        if (empty ($this->conn) || !is_object($this->conn)) {
+            $this->connect();
+        }
+        if (is_array($s)) {
+            if (count($s) === 0) {
+                $s = '';
+            } else {
+                foreach ($s as $i=>$v) {
+                    $s[$i] = $this->escape($v, $safecount);
+                }
+            }
+        } else {
+            $s = $this->conn->escape_string($s);
+        }
+        return $s;
+    }
 
-	function query($sql,$watchError=true) {
-		global $modx;
-		if (empty ($this->conn) || !is_object($this->conn)) {
-			$this->connect();
-		}
-		$tstart = $modx->getMicroTime();
-		if(is_array($sql)) $sql = join("\n", $sql);
-		$this->lastQuery = $sql;
-		if (!($result = $this->conn->query($sql))) {
-			if(!$watchError) return;
+    function query($sql,$watchError=true) {
+        global $modx;
+        if (empty ($this->conn) || !is_object($this->conn)) {
+            $this->connect();
+        }
+        $tstart = $modx->getMicroTime();
+        if(is_array($sql)) $sql = join("\n", $sql);
+        $this->lastQuery = $sql;
+        if (!($result = $this->conn->query($sql))) {
+            if(!$watchError) return;
             switch(mysqli_errno($this->conn)) {
                 case 1054:
                 case 1060:
@@ -109,119 +109,119 @@ 
                 default:
                     $modx->messageQuit('Execution of a query to the database failed - ' . $this->getLastError(), $sql);
             }
-		} else {
-			$tend = $modx->getMicroTime();
-			$totaltime = $tend - $tstart;
-			$modx->queryTime = $modx->queryTime + $totaltime;
-			if ($modx->dumpSQL) {
-				$debug = debug_backtrace();
-				array_shift($debug);
-				$debug_path = array();
-				foreach ($debug as $line) $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>';
-				if ($modx->event->name) $modx->queryCode .= 'Current Event  => ' . $modx->event->name . '<br>';
-				if ($modx->event->activePlugin) $modx->queryCode .= 'Current Plugin => ' . $modx->event->activePlugin . '<br>';
-				if ($modx->currentSnippet) $modx->queryCode .= 'Current Snippet => ' . $modx->currentSnippet . '<br>';
-				if (stripos($sql, 'select')===0) $modx->queryCode .= 'Record Count => ' . $this->getRecordCount($result) . '<br>';
-				else $modx->queryCode .= 'Affected Rows => ' . $this->getAffectedRows() . '<br>';
-				$modx->queryCode .= 'Functions Path => ' . $debug_path . '<br>';
-				$modx->queryCode .= "</fieldset><br />";
-			}
-			$modx->executedQueries = $modx->executedQueries + 1;
-			return $result;
-		}
-	}
+        } else {
+            $tend = $modx->getMicroTime();
+            $totaltime = $tend - $tstart;
+            $modx->queryTime = $modx->queryTime + $totaltime;
+            if ($modx->dumpSQL) {
+                $debug = debug_backtrace();
+                array_shift($debug);
+                $debug_path = array();
+                foreach ($debug as $line) $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>';
+                if ($modx->event->name) $modx->queryCode .= 'Current Event  => ' . $modx->event->name . '<br>';
+                if ($modx->event->activePlugin) $modx->queryCode .= 'Current Plugin => ' . $modx->event->activePlugin . '<br>';
+                if ($modx->currentSnippet) $modx->queryCode .= 'Current Snippet => ' . $modx->currentSnippet . '<br>';
+                if (stripos($sql, 'select')===0) $modx->queryCode .= 'Record Count => ' . $this->getRecordCount($result) . '<br>';
+                else $modx->queryCode .= 'Affected Rows => ' . $this->getAffectedRows() . '<br>';
+                $modx->queryCode .= 'Functions Path => ' . $debug_path . '<br>';
+                $modx->queryCode .= "</fieldset><br />";
+            }
+            $modx->executedQueries = $modx->executedQueries + 1;
+            return $result;
+        }
+    }
 
-	function delete($from, $where='', $orderby='', $limit = '') {
-		global $modx;
-		if (!$from) {
-			$modx->messageQuit("Empty \$from parameters in DBAPI::delete().");
-		} else {
-			$from = $this->replaceFullTableName($from);
-			$where   = trim($where);
-			$orderby = trim($orderby);
-			$limit   = trim($limit);
-			if($where!==''    && stripos($where,  'WHERE')!==0)    $where   = "WHERE {$where}";
-			if($orderby!== '' && stripos($orderby,'ORDER BY')!==0) $orderby = "ORDER BY {$orderby}";
-			if($limit!== ''   && stripos($limit,  'LIMIT')!==0)    $limit   = "LIMIT {$limit}";
-			return $this->query("DELETE FROM {$from} {$where} {$orderby} {$limit}");
-		}
-	}
+    function delete($from, $where='', $orderby='', $limit = '') {
+        global $modx;
+        if (!$from) {
+            $modx->messageQuit("Empty \$from parameters in DBAPI::delete().");
+        } else {
+            $from = $this->replaceFullTableName($from);
+            $where   = trim($where);
+            $orderby = trim($orderby);
+            $limit   = trim($limit);
+            if($where!==''    && stripos($where,  'WHERE')!==0)    $where   = "WHERE {$where}";
+            if($orderby!== '' && stripos($orderby,'ORDER BY')!==0) $orderby = "ORDER BY {$orderby}";
+            if($limit!== ''   && stripos($limit,  'LIMIT')!==0)    $limit   = "LIMIT {$limit}";
+            return $this->query("DELETE FROM {$from} {$where} {$orderby} {$limit}");
+        }
+    }
 
-	function select($fields = "*", $from = "", $where = "", $orderby = "", $limit = "") {
-		global $modx;
+    function select($fields = "*", $from = "", $where = "", $orderby = "", $limit = "") {
+        global $modx;
 		
-		if(is_array($fields)) $fields = $this->_getFieldsStringFromArray($fields);
-		if(is_array($from))   $from   = $this->_getFromStringFromArray($from);
-		if(is_array($where))  $where  = join(' ', $where);
+        if(is_array($fields)) $fields = $this->_getFieldsStringFromArray($fields);
+        if(is_array($from))   $from   = $this->_getFromStringFromArray($from);
+        if(is_array($where))  $where  = join(' ', $where);
 		
-		if (!$from) {
-			$modx->messageQuit("Empty \$from parameters in DBAPI::select().");
-			exit;
-		}
+        if (!$from) {
+            $modx->messageQuit("Empty \$from parameters in DBAPI::select().");
+            exit;
+        }
 		
-		$fields = $this->replaceFullTableName($fields);
-		$from = $this->replaceFullTableName($from);
+        $fields = $this->replaceFullTableName($fields);
+        $from = $this->replaceFullTableName($from);
         $where   = trim($where);
         $orderby = trim($orderby);
         $limit   = trim($limit);
         if($where!==''   && stripos($where,'WHERE')!==0)   $where   = "WHERE {$where}";
         if($orderby!=='' && stripos($orderby,'ORDER')!==0) $orderby = "ORDER BY {$orderby}";
         if($limit!==''   && stripos($limit,'LIMIT')!==0)   $limit   = "LIMIT {$limit}";
-		return $this->query("SELECT {$fields} FROM {$from} {$where} {$orderby} {$limit}");
-	}
+        return $this->query("SELECT {$fields} FROM {$from} {$where} {$orderby} {$limit}");
+    }
 
-	function update($fields, $table, $where = "") {
-		global $modx;
-		if (!$table) {
-			$modx->messageQuit("Empty \$table parameter in DBAPI::update().");
-		} else {
-			$table = $this->replaceFullTableName($table);
-			if (is_array($fields)) {
-				foreach ($fields as $key => $value) {
-					if(is_null($value) || strtolower($value) === 'null'){
-						$flds = 'NULL';
-					}else{
-						$flds = "'" . $value . "'";
-					}
-					$fields[$key] = "`{$key}` = ".$flds;
-				}
-				$fields = implode(",", $fields);
-			}
-			$where = trim($where);
-			if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
-			return $this->query("UPDATE {$table} SET {$fields} {$where}");
-		}
-	}
+    function update($fields, $table, $where = "") {
+        global $modx;
+        if (!$table) {
+            $modx->messageQuit("Empty \$table parameter in DBAPI::update().");
+        } else {
+            $table = $this->replaceFullTableName($table);
+            if (is_array($fields)) {
+                foreach ($fields as $key => $value) {
+                    if(is_null($value) || strtolower($value) === 'null'){
+                        $flds = 'NULL';
+                    }else{
+                        $flds = "'" . $value . "'";
+                    }
+                    $fields[$key] = "`{$key}` = ".$flds;
+                }
+                $fields = implode(",", $fields);
+            }
+            $where = trim($where);
+            if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
+            return $this->query("UPDATE {$table} SET {$fields} {$where}");
+        }
+    }
 
-	function insert($fields, $intotable, $fromfields = "*", $fromtable = "", $where = "", $limit = "") {
-		global $modx;
-		if (!$intotable) {
-			$modx->messageQuit("Empty \$intotable parameters in DBAPI::insert().");
-		} else {
-			$intotable = $this->replaceFullTableName($intotable);
-			if (!is_array($fields)) {
-				$this->query("INSERT INTO {$intotable} {$fields}");
-			} else {
-				if (empty($fromtable)) {
-					$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)).")";
-					$where = trim($where);
-					$limit = trim($limit);
-					if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
-					if($limit!=='' && stripos($limit, 'LIMIT')!==0) $limit = "LIMIT {$limit}";
-					$rt = $this->query("INSERT INTO {$intotable} {$fields} SELECT {$fromfields} FROM {$fromtable} {$where} {$limit}");
-				}
-			}
-			if (($lid = $this->getInsertId())===false) $modx->messageQuit("Couldn't get last insert key!");
-			return $lid;
-		}
-	}
+    function insert($fields, $intotable, $fromfields = "*", $fromtable = "", $where = "", $limit = "") {
+        global $modx;
+        if (!$intotable) {
+            $modx->messageQuit("Empty \$intotable parameters in DBAPI::insert().");
+        } else {
+            $intotable = $this->replaceFullTableName($intotable);
+            if (!is_array($fields)) {
+                $this->query("INSERT INTO {$intotable} {$fields}");
+            } else {
+                if (empty($fromtable)) {
+                    $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)).")";
+                    $where = trim($where);
+                    $limit = trim($limit);
+                    if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
+                    if($limit!=='' && stripos($limit, 'LIMIT')!==0) $limit = "LIMIT {$limit}";
+                    $rt = $this->query("INSERT INTO {$intotable} {$fields} SELECT {$fromfields} FROM {$fromtable} {$where} {$limit}");
+                }
+            }
+            if (($lid = $this->getInsertId())===false) $modx->messageQuit("Couldn't get last insert key!");
+            return $lid;
+        }
+    }
 
     function save($fields, $table, $where='') { // This is similar to "replace into table".
         
@@ -233,182 +233,182 @@ 
         else                 return $this->update($fields, $table, $where);
     }
     
-	function isResult($rs) {
-		return is_object($rs);
-	}
+    function isResult($rs) {
+        return is_object($rs);
+    }
 
-	function freeResult($rs) {
-		$rs->free_result();
-	}
+    function freeResult($rs) {
+        $rs->free_result();
+    }
 
-	function numFields($rs) {
-		return $rs->field_count;
-	}
+    function numFields($rs) {
+        return $rs->field_count;
+    }
 
-	function fieldName($rs,$col=0) {
-		$field = $rs->fetch_field_direct($col);
-		return $field->name;
-	}
+    function fieldName($rs,$col=0) {
+        $field = $rs->fetch_field_direct($col);
+        return $field->name;
+    }
 
-	function selectDb($name) {
-		$this->conn->select_db($name);
-	}
+    function selectDb($name) {
+        $this->conn->select_db($name);
+    }
 
 
-	function getInsertId($conn=NULL) {
-		if (!is_object($conn)) $conn =& $this->conn;
-		return $conn->insert_id;
-	}
+    function getInsertId($conn=NULL) {
+        if (!is_object($conn)) $conn =& $this->conn;
+        return $conn->insert_id;
+    }
 
-	function getAffectedRows($conn=NULL) {
-		if (!is_object($conn)) $conn =& $this->conn;
-		return $conn->affected_rows;
-	}
+    function getAffectedRows($conn=NULL) {
+        if (!is_object($conn)) $conn =& $this->conn;
+        return $conn->affected_rows;
+    }
 
-	function getLastError($conn=NULL) {
-		if (!is_object($conn)) $conn =& $this->conn;
-		return $conn->error;
-	}
+    function getLastError($conn=NULL) {
+        if (!is_object($conn)) $conn =& $this->conn;
+        return $conn->error;
+    }
 
-	function getRecordCount($ds) {
-		return (is_object($ds)) ? $ds->num_rows : 0;
-	}
+    function getRecordCount($ds) {
+        return (is_object($ds)) ? $ds->num_rows : 0;
+    }
 
-	function getRow($ds, $mode = 'assoc') {
-		if (is_object($ds)) {
-			if ($mode == 'assoc') {
-				return $ds->fetch_assoc();
-			} elseif ($mode == 'num') {
-				return $ds->fetch_row();
-			} elseif ($mode == 'object') {
-				return $ds->fetch_object();
-			} elseif ($mode == 'both') {
-				return $ds->fetch_array(MYSQLI_BOTH);
-			} else {
-				global $modx;
-				$modx->messageQuit("Unknown get type ($mode) specified for fetchRow - must be empty, 'assoc', 'num' or 'both'.");
-			}
-		}
-	}
+    function getRow($ds, $mode = 'assoc') {
+        if (is_object($ds)) {
+            if ($mode == 'assoc') {
+                return $ds->fetch_assoc();
+            } elseif ($mode == 'num') {
+                return $ds->fetch_row();
+            } elseif ($mode == 'object') {
+                return $ds->fetch_object();
+            } elseif ($mode == 'both') {
+                return $ds->fetch_array(MYSQLI_BOTH);
+            } else {
+                global $modx;
+                $modx->messageQuit("Unknown get type ($mode) specified for fetchRow - must be empty, 'assoc', 'num' or 'both'.");
+            }
+        }
+    }
 
-	function getColumn($name, $dsq) {
-		if (!is_object($dsq)) {
-			$dsq = $this->query($dsq);
-		}
-		if ($dsq) {
-			$col = array ();
-			while ($row = $this->getRow($dsq)) {
-				$col[] = $row[$name];
-			}
-			return $col;
-		}
-	}
+    function getColumn($name, $dsq) {
+        if (!is_object($dsq)) {
+            $dsq = $this->query($dsq);
+        }
+        if ($dsq) {
+            $col = array ();
+            while ($row = $this->getRow($dsq)) {
+                $col[] = $row[$name];
+            }
+            return $col;
+        }
+    }
 
-	function getColumnNames($dsq) {
-		if (!is_object($dsq)) {
-			$dsq = $this->query($dsq);
-		}
-		if ($dsq) {
-			$names = array ();
-			$limit = $this->numFields($dsq);
-			for ($i = 0; $i < $limit; $i++) {
-				$names[] = $this->fieldName($dsq, $i);
-			}
-			return $names;
-		}
-	}
+    function getColumnNames($dsq) {
+        if (!is_object($dsq)) {
+            $dsq = $this->query($dsq);
+        }
+        if ($dsq) {
+            $names = array ();
+            $limit = $this->numFields($dsq);
+            for ($i = 0; $i < $limit; $i++) {
+                $names[] = $this->fieldName($dsq, $i);
+            }
+            return $names;
+        }
+    }
 
-	function getValue($dsq) {
-		if (!is_object($dsq)) {
-			$dsq = $this->query($dsq);
-		}
-		if ($dsq) {
-			$r = $this->getRow($dsq, "num");
-			return $r[0];
-		}
-	}
+    function getValue($dsq) {
+        if (!is_object($dsq)) {
+            $dsq = $this->query($dsq);
+        }
+        if ($dsq) {
+            $r = $this->getRow($dsq, "num");
+            return $r[0];
+        }
+    }
 
-	function getTableMetaData($table) {
-		$metadata = false;
-		if (!empty ($table)) {
-			$sql = "SHOW FIELDS FROM $table";
-			if ($ds = $this->query($sql)) {
-				while ($row = $this->getRow($ds)) {
-					$fieldName = $row['Field'];
-					$metadata[$fieldName] = $row;
-				}
-			}
-		}
-		return $metadata;
-	}
+    function getTableMetaData($table) {
+        $metadata = false;
+        if (!empty ($table)) {
+            $sql = "SHOW FIELDS FROM $table";
+            if ($ds = $this->query($sql)) {
+                while ($row = $this->getRow($ds)) {
+                    $fieldName = $row['Field'];
+                    $metadata[$fieldName] = $row;
+                }
+            }
+        }
+        return $metadata;
+    }
 
-	function prepareDate($timestamp, $fieldType = 'DATETIME') {
-		$date = '';
-		if (!$timestamp === false && $timestamp > 0) {
-			switch ($fieldType) {
-				case 'DATE' :
-					$date = date('Y-m-d', $timestamp);
-					break;
-				case 'TIME' :
-					$date = date('H:i:s', $timestamp);
-					break;
-				case 'YEAR' :
-					$date = date('Y', $timestamp);
-					break;
-				default :
-					$date = date('Y-m-d H:i:s', $timestamp);
-					break;
-			}
-		}
-		return $date;
-	}
+    function prepareDate($timestamp, $fieldType = 'DATETIME') {
+        $date = '';
+        if (!$timestamp === false && $timestamp > 0) {
+            switch ($fieldType) {
+                case 'DATE' :
+                    $date = date('Y-m-d', $timestamp);
+                    break;
+                case 'TIME' :
+                    $date = date('H:i:s', $timestamp);
+                    break;
+                case 'YEAR' :
+                    $date = date('Y', $timestamp);
+                    break;
+                default :
+                    $date = date('Y-m-d H:i:s', $timestamp);
+                    break;
+            }
+        }
+        return $date;
+    }
 
-	function makeArray($rs='',$index=false){
-		if (!$rs) return false;
-		$rsArray = array();
-		$iterator = 0;
-		while ($row = $this->getRow($rs)) {
-			$returnIndex = $index !== false && isset($row[$index]) ? $row[$index] : $iterator; 
-			$rsArray[$returnIndex] = $row;
-			$iterator++;
-		}
-		return $rsArray;
-	}
+    function makeArray($rs='',$index=false){
+        if (!$rs) return false;
+        $rsArray = array();
+        $iterator = 0;
+        while ($row = $this->getRow($rs)) {
+            $returnIndex = $index !== false && isset($row[$index]) ? $row[$index] : $iterator; 
+            $rsArray[$returnIndex] = $row;
+            $iterator++;
+        }
+        return $rsArray;
+    }
 
-	function getVersion() {
-		return $this->conn->server_info;
-	}
+    function getVersion() {
+        return $this->conn->server_info;
+    }
 
-	function replaceFullTableName($str,$force=null) {
-		$str = trim($str);
-		$dbase  = trim($this->config['dbase'],'`');
-		$prefix = $this->config['table_prefix'];
-		if (!empty($force)) {
-			$result = "`{$dbase}`.`{$prefix}{$str}`";
-		} elseif (strpos($str,'[+prefix+]')!==false) {
-			$result = preg_replace('@\[\+prefix\+\]([0-9a-zA-Z_]+)@', "`{$dbase}`.`{$prefix}$1`", $str);
-		} else {
-			$result = $str;
-		}
-		return $result;
-	}
+    function replaceFullTableName($str,$force=null) {
+        $str = trim($str);
+        $dbase  = trim($this->config['dbase'],'`');
+        $prefix = $this->config['table_prefix'];
+        if (!empty($force)) {
+            $result = "`{$dbase}`.`{$prefix}{$str}`";
+        } elseif (strpos($str,'[+prefix+]')!==false) {
+            $result = preg_replace('@\[\+prefix\+\]([0-9a-zA-Z_]+)@', "`{$dbase}`.`{$prefix}$1`", $str);
+        } else {
+            $result = $str;
+        }
+        return $result;
+    }
 
-	function optimize($table_name) {
-		$rs = $this->query("OPTIMIZE TABLE {$table_name}");
-		if ($rs) {
-			$rs = $this->query("ALTER TABLE {$table_name}");
-		}
-		return $rs;
-	}
+    function optimize($table_name) {
+        $rs = $this->query("OPTIMIZE TABLE {$table_name}");
+        if ($rs) {
+            $rs = $this->query("ALTER TABLE {$table_name}");
+        }
+        return $rs;
+    }
 
-	function truncate($table_name) {
-		$rs = $this->query("TRUNCATE {$table_name}");
-		return $rs;
-	}
+    function truncate($table_name) {
+        $rs = $this->query("TRUNCATE {$table_name}");
+        return $rs;
+    }
 
-	function dataSeek($result, $row_number) {
-		return $result->data_seek($row_number);
-	}
+    function dataSeek($result, $row_number) {
+        return $result->data_seek($row_number);
+    }
 	
     function _getFieldsStringFromArray($fields=array()) {
         

Spacing +84 added lines, -84 removed lines

@@ -1,25 +1,25 @@ 
 <?php
-class DBAPI {
+class DBAPI{
 	var $conn;
 	var $config;
 	var $lastQuery;
 	var $isConnected;
 
-	function __construct($host='', $dbase='', $uid='', $pwd='', $pre=NULL, $charset='', $connection_method='SET CHARACTER SET') {
+	function __construct($host = '', $dbase = '', $uid = '', $pwd = '', $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'];
 		$this->config['pass'] = $pwd ? $pwd : $GLOBALS['database_password'];
 		$this->config['charset'] = $charset ? $charset : $GLOBALS['database_connection_charset'];
-		$this->config['connection_method'] =  $this->_dbconnectionmethod = (isset($GLOBALS['database_connection_method']) ? $GLOBALS['database_connection_method'] : $connection_method);
+		$this->config['connection_method'] = $this->_dbconnectionmethod = (isset($GLOBALS['database_connection_method']) ? $GLOBALS['database_connection_method'] : $connection_method);
 		$this->config['table_prefix'] = ($pre !== NULL) ? $pre : $GLOBALS['table_prefix'];
 	}
 
-	function connect($host = '', $dbase = '', $uid = '', $pwd = '', $tmp = 0) {
+	function connect($host = '', $dbase = '', $uid = '', $pwd = '', $tmp = 0){
 		global $modx;
-		$uid     = $uid   ? $uid   : $this->config['user'];
-		$pwd     = $pwd   ? $pwd   : $this->config['pass'];
-		$host    = $host  ? $host  : $this->config['host'];
+		$uid     = $uid ? $uid : $this->config['user'];
+		$pwd     = $pwd ? $pwd : $this->config['pass'];
+		$host    = $host ? $host : $this->config['host'];
 		$dbase   = $dbase ? $dbase : $this->config['dbase'];
 		$dbase   = trim($dbase, '`'); // remove the `` chars
 		$charset = $this->config['charset'];
@@ -37,7 +37,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'
 						));
@@ -46,7 +46,7 @@ 
 				sleep(1);
 				$safe_count++;
 			}
-		} while (!$this->conn && $safe_count<3);
+		} while (!$this->conn && $safe_count < 3);
 		if (!$this->conn) {
 			$modx->messageQuit("Failed to create the database connection!");
 			exit;
@@ -55,7 +55,7 @@ 
 			$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;
@@ -63,15 +63,15 @@ 
 		}
 	}
 
-	function disconnect() {
+	function disconnect(){
 		$this->conn->close();
 		$this->conn = null;
 		$this->isConnected = false;
 	}
 
-	function escape($s, $safecount=0) {
+	function escape($s, $safecount = 0){
 		$safecount++;
-		if (1000<$safecount) exit("Too many loops '{$safecount}'");
+		if (1000 < $safecount) exit("Too many loops '{$safecount}'");
 		if (empty ($this->conn) || !is_object($this->conn)) {
 			$this->connect();
 		}
@@ -89,17 +89,17 @@ 
 		return $s;
 	}
 
-	function query($sql,$watchError=true) {
+	function query($sql, $watchError = true){
 		global $modx;
 		if (empty ($this->conn) || !is_object($this->conn)) {
 			$this->connect();
 		}
 		$tstart = $modx->getMicroTime();
-		if(is_array($sql)) $sql = join("\n", $sql);
+		if (is_array($sql)) $sql = join("\n", $sql);
 		$this->lastQuery = $sql;
 		if (!($result = $this->conn->query($sql))) {
-			if(!$watchError) return;
-            switch(mysqli_errno($this->conn)) {
+			if (!$watchError) return;
+            switch (mysqli_errno($this->conn)) {
                 case 1054:
                 case 1060:
                 case 1061:
@@ -107,7 +107,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();
@@ -119,14 +119,14 @@ 
 				$debug_path = array();
 				foreach ($debug as $line) $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>';
-				if ($modx->event->name) $modx->queryCode .= 'Current Event  => ' . $modx->event->name . '<br>';
-				if ($modx->event->activePlugin) $modx->queryCode .= 'Current Plugin => ' . $modx->event->activePlugin . '<br>';
-				if ($modx->currentSnippet) $modx->queryCode .= 'Current Snippet => ' . $modx->currentSnippet . '<br>';
-				if (stripos($sql, 'select')===0) $modx->queryCode .= 'Record Count => ' . $this->getRecordCount($result) . '<br>';
-				else $modx->queryCode .= 'Affected Rows => ' . $this->getAffectedRows() . '<br>';
-				$modx->queryCode .= 'Functions Path => ' . $debug_path . '<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>';
+				if ($modx->event->activePlugin) $modx->queryCode .= 'Current Plugin => '.$modx->event->activePlugin.'<br>';
+				if ($modx->currentSnippet) $modx->queryCode .= 'Current Snippet => '.$modx->currentSnippet.'<br>';
+				if (stripos($sql, 'select') === 0) $modx->queryCode .= 'Record Count => '.$this->getRecordCount($result).'<br>';
+				else $modx->queryCode .= 'Affected Rows => '.$this->getAffectedRows().'<br>';
+				$modx->queryCode .= 'Functions Path => '.$debug_path.'<br>';
 				$modx->queryCode .= "</fieldset><br />";
 			}
 			$modx->executedQueries = $modx->executedQueries + 1;
@@ -134,7 +134,7 @@ 
 		}
 	}
 
-	function delete($from, $where='', $orderby='', $limit = '') {
+	function delete($from, $where = '', $orderby = '', $limit = ''){
 		global $modx;
 		if (!$from) {
 			$modx->messageQuit("Empty \$from parameters in DBAPI::delete().");
@@ -143,19 +143,19 @@ 
 			$where   = trim($where);
 			$orderby = trim($orderby);
 			$limit   = trim($limit);
-			if($where!==''    && stripos($where,  'WHERE')!==0)    $where   = "WHERE {$where}";
-			if($orderby!== '' && stripos($orderby,'ORDER BY')!==0) $orderby = "ORDER BY {$orderby}";
-			if($limit!== ''   && stripos($limit,  'LIMIT')!==0)    $limit   = "LIMIT {$limit}";
+			if ($where !== '' && stripos($where, 'WHERE') !== 0)    $where   = "WHERE {$where}";
+			if ($orderby !== '' && stripos($orderby, 'ORDER BY') !== 0) $orderby = "ORDER BY {$orderby}";
+			if ($limit !== '' && stripos($limit, 'LIMIT') !== 0)    $limit   = "LIMIT {$limit}";
 			return $this->query("DELETE FROM {$from} {$where} {$orderby} {$limit}");
 		}
 	}
 
-	function select($fields = "*", $from = "", $where = "", $orderby = "", $limit = "") {
+	function select($fields = "*", $from = "", $where = "", $orderby = "", $limit = ""){
 		global $modx;
 		
-		if(is_array($fields)) $fields = $this->_getFieldsStringFromArray($fields);
-		if(is_array($from))   $from   = $this->_getFromStringFromArray($from);
-		if(is_array($where))  $where  = join(' ', $where);
+		if (is_array($fields)) $fields = $this->_getFieldsStringFromArray($fields);
+		if (is_array($from))   $from   = $this->_getFromStringFromArray($from);
+		if (is_array($where))  $where  = join(' ', $where);
 		
 		if (!$from) {
 			$modx->messageQuit("Empty \$from parameters in DBAPI::select().");
@@ -167,13 +167,13 @@ 
         $where   = trim($where);
         $orderby = trim($orderby);
         $limit   = trim($limit);
-        if($where!==''   && stripos($where,'WHERE')!==0)   $where   = "WHERE {$where}";
-        if($orderby!=='' && stripos($orderby,'ORDER')!==0) $orderby = "ORDER BY {$orderby}";
-        if($limit!==''   && stripos($limit,'LIMIT')!==0)   $limit   = "LIMIT {$limit}";
+        if ($where !== '' && stripos($where, 'WHERE') !== 0)   $where   = "WHERE {$where}";
+        if ($orderby !== '' && stripos($orderby, 'ORDER') !== 0) $orderby = "ORDER BY {$orderby}";
+        if ($limit !== '' && stripos($limit, 'LIMIT') !== 0)   $limit   = "LIMIT {$limit}";
 		return $this->query("SELECT {$fields} FROM {$from} {$where} {$orderby} {$limit}");
 	}
 
-	function update($fields, $table, $where = "") {
+	function update($fields, $table, $where = ""){
 		global $modx;
 		if (!$table) {
 			$modx->messageQuit("Empty \$table parameter in DBAPI::update().");
@@ -181,22 +181,22 @@ 
 			$table = $this->replaceFullTableName($table);
 			if (is_array($fields)) {
 				foreach ($fields as $key => $value) {
-					if(is_null($value) || strtolower($value) === 'null'){
+					if (is_null($value) || strtolower($value) === 'null') {
 						$flds = 'NULL';
-					}else{
-						$flds = "'" . $value . "'";
+					} else {
+						$flds = "'".$value."'";
 					}
 					$fields[$key] = "`{$key}` = ".$flds;
 				}
 				$fields = implode(",", $fields);
 			}
 			$where = trim($where);
-			if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
+			if ($where !== '' && stripos($where, 'WHERE') !== 0) $where = "WHERE {$where}";
 			return $this->query("UPDATE {$table} SET {$fields} {$where}");
 		}
 	}
 
-	function insert($fields, $intotable, $fromfields = "*", $fromtable = "", $where = "", $limit = "") {
+	function insert($fields, $intotable, $fromfields = "*", $fromtable = "", $where = "", $limit = ""){
 		global $modx;
 		if (!$intotable) {
 			$modx->messageQuit("Empty \$intotable parameters in DBAPI::insert().");
@@ -213,68 +213,68 @@ 
 					$fields = "(".implode(",", array_keys($fields)).")";
 					$where = trim($where);
 					$limit = trim($limit);
-					if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
-					if($limit!=='' && stripos($limit, 'LIMIT')!==0) $limit = "LIMIT {$limit}";
+					if ($where !== '' && stripos($where, 'WHERE') !== 0) $where = "WHERE {$where}";
+					if ($limit !== '' && stripos($limit, 'LIMIT') !== 0) $limit = "LIMIT {$limit}";
 					$rt = $this->query("INSERT INTO {$intotable} {$fields} SELECT {$fromfields} FROM {$fromtable} {$where} {$limit}");
 				}
 			}
-			if (($lid = $this->getInsertId())===false) $modx->messageQuit("Couldn't get last insert key!");
+			if (($lid = $this->getInsertId()) === false) $modx->messageQuit("Couldn't get last insert key!");
 			return $lid;
 		}
 	}
 
-    function save($fields, $table, $where='') { // This is similar to "replace into table".
+    function save($fields, $table, $where = ''){ // This is similar to "replace into table".
         
-        if($where === '')                                                  $mode = 'insert';
-        elseif($this->getRecordCount($this->select('*',$table,$where))==0) $mode = 'insert';
+        if ($where === '')                                                  $mode = 'insert';
+        elseif ($this->getRecordCount($this->select('*', $table, $where)) == 0) $mode = 'insert';
         else                                                               $mode = 'update';
         
-        if($mode==='insert') return $this->insert($fields, $table);
+        if ($mode === 'insert') return $this->insert($fields, $table);
         else                 return $this->update($fields, $table, $where);
     }
     
-	function isResult($rs) {
+	function isResult($rs){
 		return is_object($rs);
 	}
 
-	function freeResult($rs) {
+	function freeResult($rs){
 		$rs->free_result();
 	}
 
-	function numFields($rs) {
+	function numFields($rs){
 		return $rs->field_count;
 	}
 
-	function fieldName($rs,$col=0) {
+	function fieldName($rs, $col = 0){
 		$field = $rs->fetch_field_direct($col);
 		return $field->name;
 	}
 
-	function selectDb($name) {
+	function selectDb($name){
 		$this->conn->select_db($name);
 	}
 
 
-	function getInsertId($conn=NULL) {
-		if (!is_object($conn)) $conn =& $this->conn;
+	function getInsertId($conn = NULL){
+		if (!is_object($conn)) $conn = & $this->conn;
 		return $conn->insert_id;
 	}
 
-	function getAffectedRows($conn=NULL) {
-		if (!is_object($conn)) $conn =& $this->conn;
+	function getAffectedRows($conn = NULL){
+		if (!is_object($conn)) $conn = & $this->conn;
 		return $conn->affected_rows;
 	}
 
-	function getLastError($conn=NULL) {
-		if (!is_object($conn)) $conn =& $this->conn;
+	function getLastError($conn = NULL){
+		if (!is_object($conn)) $conn = & $this->conn;
 		return $conn->error;
 	}
 
-	function getRecordCount($ds) {
+	function getRecordCount($ds){
 		return (is_object($ds)) ? $ds->num_rows : 0;
 	}
 
-	function getRow($ds, $mode = 'assoc') {
+	function getRow($ds, $mode = 'assoc'){
 		if (is_object($ds)) {
 			if ($mode == 'assoc') {
 				return $ds->fetch_assoc();
@@ -291,12 +291,12 @@ 
 		}
 	}
 
-	function getColumn($name, $dsq) {
+	function getColumn($name, $dsq){
 		if (!is_object($dsq)) {
 			$dsq = $this->query($dsq);
 		}
 		if ($dsq) {
-			$col = array ();
+			$col = array();
 			while ($row = $this->getRow($dsq)) {
 				$col[] = $row[$name];
 			}
@@ -304,12 +304,12 @@ 
 		}
 	}
 
-	function getColumnNames($dsq) {
+	function getColumnNames($dsq){
 		if (!is_object($dsq)) {
 			$dsq = $this->query($dsq);
 		}
 		if ($dsq) {
-			$names = array ();
+			$names = array();
 			$limit = $this->numFields($dsq);
 			for ($i = 0; $i < $limit; $i++) {
 				$names[] = $this->fieldName($dsq, $i);
@@ -318,7 +318,7 @@ 
 		}
 	}
 
-	function getValue($dsq) {
+	function getValue($dsq){
 		if (!is_object($dsq)) {
 			$dsq = $this->query($dsq);
 		}
@@ -328,7 +328,7 @@ 
 		}
 	}
 
-	function getTableMetaData($table) {
+	function getTableMetaData($table){
 		$metadata = false;
 		if (!empty ($table)) {
 			$sql = "SHOW FIELDS FROM $table";
@@ -342,7 +342,7 @@ 
 		return $metadata;
 	}
 
-	function prepareDate($timestamp, $fieldType = 'DATETIME') {
+	function prepareDate($timestamp, $fieldType = 'DATETIME'){
 		$date = '';
 		if (!$timestamp === false && $timestamp > 0) {
 			switch ($fieldType) {
@@ -363,7 +363,7 @@ 
 		return $date;
 	}
 
-	function makeArray($rs='',$index=false){
+	function makeArray($rs = '', $index = false){
 		if (!$rs) return false;
 		$rsArray = array();
 		$iterator = 0;
@@ -375,17 +375,17 @@ 
 		return $rsArray;
 	}
 
-	function getVersion() {
+	function getVersion(){
 		return $this->conn->server_info;
 	}
 
-	function replaceFullTableName($str,$force=null) {
+	function replaceFullTableName($str, $force = null){
 		$str = trim($str);
-		$dbase  = trim($this->config['dbase'],'`');
+		$dbase  = trim($this->config['dbase'], '`');
 		$prefix = $this->config['table_prefix'];
 		if (!empty($force)) {
 			$result = "`{$dbase}`.`{$prefix}{$str}`";
-		} elseif (strpos($str,'[+prefix+]')!==false) {
+		} elseif (strpos($str, '[+prefix+]') !== false) {
 			$result = preg_replace('@\[\+prefix\+\]([0-9a-zA-Z_]+)@', "`{$dbase}`.`{$prefix}$1`", $str);
 		} else {
 			$result = $str;
@@ -393,7 +393,7 @@ 
 		return $result;
 	}
 
-	function optimize($table_name) {
+	function optimize($table_name){
 		$rs = $this->query("OPTIMIZE TABLE {$table_name}");
 		if ($rs) {
 			$rs = $this->query("ALTER TABLE {$table_name}");
@@ -401,30 +401,30 @@ 
 		return $rs;
 	}
 
-	function truncate($table_name) {
+	function truncate($table_name){
 		$rs = $this->query("TRUNCATE {$table_name}");
 		return $rs;
 	}
 
-	function dataSeek($result, $row_number) {
+	function dataSeek($result, $row_number){
 		return $result->data_seek($row_number);
 	}
 	
-    function _getFieldsStringFromArray($fields=array()) {
+    function _getFieldsStringFromArray($fields = array()){
         
-        if(empty($fields)) return '*';
+        if (empty($fields)) return '*';
         
         $_ = array();
-        foreach($fields as $k=>$v) {
-            if($k!==$v) $_[] = "{$v} as {$k}";
+        foreach ($fields as $k=>$v) {
+            if ($k !== $v) $_[] = "{$v} as {$k}";
             else        $_[] = $v;
         }
         return join(',', $_);
     }
     
-    function _getFromStringFromArray($tables=array()) {
+    function _getFromStringFromArray($tables = array()){
         $_ = array();
-        foreach($tables as $k=>$v) {
+        foreach ($tables as $k=>$v) {
             $_[] = $v;
         }
         return join(' ', $_);

Braces +168 added lines, -70 removed lines

@@ -1,11 +1,13 @@ 
 <?php
-class DBAPI {
+class DBAPI
+{
 	var $conn;
 	var $config;
 	var $lastQuery;
 	var $isConnected;
 
-	function __construct($host='', $dbase='', $uid='', $pwd='', $pre=NULL, $charset='', $connection_method='SET CHARACTER SET') {
+	function __construct($host='', $dbase='', $uid='', $pwd='', $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'];
@@ -15,7 +17,8 @@ 
 		$this->config['table_prefix'] = ($pre !== NULL) ? $pre : $GLOBALS['table_prefix'];
 	}
 
-	function connect($host = '', $dbase = '', $uid = '', $pwd = '', $tmp = 0) {
+	function connect($host = '', $dbase = '', $uid = '', $pwd = '', $tmp = 0)
+	{
 		global $modx;
 		$uid     = $uid   ? $uid   : $this->config['user'];
 		$pwd     = $pwd   ? $pwd   : $this->config['pass'];
@@ -63,15 +66,19 @@ 
 		}
 	}
 
-	function disconnect() {
+	function disconnect()
+	{
 		$this->conn->close();
 		$this->conn = null;
 		$this->isConnected = false;
 	}
 
-	function escape($s, $safecount=0) {
+	function escape($s, $safecount=0)
+	{
 		$safecount++;
-		if (1000<$safecount) exit("Too many loops '{$safecount}'");
+		if (1000<$safecount) {
+		    exit("Too many loops '{$safecount}'");
+		}
 		if (empty ($this->conn) || !is_object($this->conn)) {
 			$this->connect();
 		}
@@ -89,16 +96,21 @@ 
 		return $s;
 	}
 
-	function query($sql,$watchError=true) {
+	function query($sql,$watchError=true)
+	{
 		global $modx;
 		if (empty ($this->conn) || !is_object($this->conn)) {
 			$this->connect();
 		}
 		$tstart = $modx->getMicroTime();
-		if(is_array($sql)) $sql = join("\n", $sql);
+		if(is_array($sql)) {
+		    $sql = join("\n", $sql);
+		}
 		$this->lastQuery = $sql;
 		if (!($result = $this->conn->query($sql))) {
-			if(!$watchError) return;
+			if(!$watchError) {
+			    return;
+			}
             switch(mysqli_errno($this->conn)) {
                 case 1054:
                 case 1060:
@@ -117,15 +129,26 @@ 
 				$debug = debug_backtrace();
 				array_shift($debug);
 				$debug_path = array();
-				foreach ($debug as $line) $debug_path[] = $line['function'];
+				foreach ($debug as $line) {
+				    $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>';
-				if ($modx->event->name) $modx->queryCode .= 'Current Event  => ' . $modx->event->name . '<br>';
-				if ($modx->event->activePlugin) $modx->queryCode .= 'Current Plugin => ' . $modx->event->activePlugin . '<br>';
-				if ($modx->currentSnippet) $modx->queryCode .= 'Current Snippet => ' . $modx->currentSnippet . '<br>';
-				if (stripos($sql, 'select')===0) $modx->queryCode .= 'Record Count => ' . $this->getRecordCount($result) . '<br>';
-				else $modx->queryCode .= 'Affected Rows => ' . $this->getAffectedRows() . '<br>';
+				if ($modx->event->name) {
+				    $modx->queryCode .= 'Current Event  => ' . $modx->event->name . '<br>';
+				}
+				if ($modx->event->activePlugin) {
+				    $modx->queryCode .= 'Current Plugin => ' . $modx->event->activePlugin . '<br>';
+				}
+				if ($modx->currentSnippet) {
+				    $modx->queryCode .= 'Current Snippet => ' . $modx->currentSnippet . '<br>';
+				}
+				if (stripos($sql, 'select')===0) {
+				    $modx->queryCode .= 'Record Count => ' . $this->getRecordCount($result) . '<br>';
+				} else {
+				    $modx->queryCode .= 'Affected Rows => ' . $this->getAffectedRows() . '<br>';
+				}
 				$modx->queryCode .= 'Functions Path => ' . $debug_path . '<br>';
 				$modx->queryCode .= "</fieldset><br />";
 			}
@@ -134,7 +157,8 @@ 
 		}
 	}
 
-	function delete($from, $where='', $orderby='', $limit = '') {
+	function delete($from, $where='', $orderby='', $limit = '')
+	{
 		global $modx;
 		if (!$from) {
 			$modx->messageQuit("Empty \$from parameters in DBAPI::delete().");
@@ -143,19 +167,32 @@ 
 			$where   = trim($where);
 			$orderby = trim($orderby);
 			$limit   = trim($limit);
-			if($where!==''    && stripos($where,  'WHERE')!==0)    $where   = "WHERE {$where}";
-			if($orderby!== '' && stripos($orderby,'ORDER BY')!==0) $orderby = "ORDER BY {$orderby}";
-			if($limit!== ''   && stripos($limit,  'LIMIT')!==0)    $limit   = "LIMIT {$limit}";
+			if($where!==''    && stripos($where,  'WHERE')!==0) {
+			    $where   = "WHERE {$where}";
+			}
+			if($orderby!== '' && stripos($orderby,'ORDER BY')!==0) {
+			    $orderby = "ORDER BY {$orderby}";
+			}
+			if($limit!== ''   && stripos($limit,  'LIMIT')!==0) {
+			    $limit   = "LIMIT {$limit}";
+			}
 			return $this->query("DELETE FROM {$from} {$where} {$orderby} {$limit}");
 		}
 	}
 
-	function select($fields = "*", $from = "", $where = "", $orderby = "", $limit = "") {
+	function select($fields = "*", $from = "", $where = "", $orderby = "", $limit = "")
+	{
 		global $modx;
 		
-		if(is_array($fields)) $fields = $this->_getFieldsStringFromArray($fields);
-		if(is_array($from))   $from   = $this->_getFromStringFromArray($from);
-		if(is_array($where))  $where  = join(' ', $where);
+		if(is_array($fields)) {
+		    $fields = $this->_getFieldsStringFromArray($fields);
+		}
+		if(is_array($from)) {
+		    $from   = $this->_getFromStringFromArray($from);
+		}
+		if(is_array($where)) {
+		    $where  = join(' ', $where);
+		}
 		
 		if (!$from) {
 			$modx->messageQuit("Empty \$from parameters in DBAPI::select().");
@@ -167,13 +204,20 @@ 
         $where   = trim($where);
         $orderby = trim($orderby);
         $limit   = trim($limit);
-        if($where!==''   && stripos($where,'WHERE')!==0)   $where   = "WHERE {$where}";
-        if($orderby!=='' && stripos($orderby,'ORDER')!==0) $orderby = "ORDER BY {$orderby}";
-        if($limit!==''   && stripos($limit,'LIMIT')!==0)   $limit   = "LIMIT {$limit}";
+        if($where!==''   && stripos($where,'WHERE')!==0) {
+            $where   = "WHERE {$where}";
+        }
+        if($orderby!=='' && stripos($orderby,'ORDER')!==0) {
+            $orderby = "ORDER BY {$orderby}";
+        }
+        if($limit!==''   && stripos($limit,'LIMIT')!==0) {
+            $limit   = "LIMIT {$limit}";
+        }
 		return $this->query("SELECT {$fields} FROM {$from} {$where} {$orderby} {$limit}");
 	}
 
-	function update($fields, $table, $where = "") {
+	function update($fields, $table, $where = "")
+	{
 		global $modx;
 		if (!$table) {
 			$modx->messageQuit("Empty \$table parameter in DBAPI::update().");
@@ -181,9 +225,9 @@ 
 			$table = $this->replaceFullTableName($table);
 			if (is_array($fields)) {
 				foreach ($fields as $key => $value) {
-					if(is_null($value) || strtolower($value) === 'null'){
+					if(is_null($value) || strtolower($value) === 'null') {
 						$flds = 'NULL';
-					}else{
+					} else {
 						$flds = "'" . $value . "'";
 					}
 					$fields[$key] = "`{$key}` = ".$flds;
@@ -191,12 +235,15 @@ 
 				$fields = implode(",", $fields);
 			}
 			$where = trim($where);
-			if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
+			if($where!=='' && stripos($where, 'WHERE')!==0) {
+			    $where = "WHERE {$where}";
+			}
 			return $this->query("UPDATE {$table} SET {$fields} {$where}");
 		}
 	}
 
-	function insert($fields, $intotable, $fromfields = "*", $fromtable = "", $where = "", $limit = "") {
+	function insert($fields, $intotable, $fromfields = "*", $fromtable = "", $where = "", $limit = "")
+	{
 		global $modx;
 		if (!$intotable) {
 			$modx->messageQuit("Empty \$intotable parameters in DBAPI::insert().");
@@ -213,68 +260,99 @@ 
 					$fields = "(".implode(",", array_keys($fields)).")";
 					$where = trim($where);
 					$limit = trim($limit);
-					if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
-					if($limit!=='' && stripos($limit, 'LIMIT')!==0) $limit = "LIMIT {$limit}";
+					if($where!=='' && stripos($where, 'WHERE')!==0) {
+					    $where = "WHERE {$where}";
+					}
+					if($limit!=='' && stripos($limit, 'LIMIT')!==0) {
+					    $limit = "LIMIT {$limit}";
+					}
 					$rt = $this->query("INSERT INTO {$intotable} {$fields} SELECT {$fromfields} FROM {$fromtable} {$where} {$limit}");
 				}
 			}
-			if (($lid = $this->getInsertId())===false) $modx->messageQuit("Couldn't get last insert key!");
+			if (($lid = $this->getInsertId())===false) {
+			    $modx->messageQuit("Couldn't get last insert key!");
+			}
 			return $lid;
 		}
 	}
 
-    function save($fields, $table, $where='') { // This is similar to "replace into table".
+    function save($fields, $table, $where='')
+    {
+// This is similar to "replace into table".
         
-        if($where === '')                                                  $mode = 'insert';
-        elseif($this->getRecordCount($this->select('*',$table,$where))==0) $mode = 'insert';
-        else                                                               $mode = 'update';
+        if($where === '') {
+            $mode = 'insert';
+        } elseif($this->getRecordCount($this->select('*',$table,$where))==0) {
+            $mode = 'insert';
+        } else {
+            $mode = 'update';
+        }
         
-        if($mode==='insert') return $this->insert($fields, $table);
-        else                 return $this->update($fields, $table, $where);
+        if($mode==='insert') {
+            return $this->insert($fields, $table);
+        } else {
+            return $this->update($fields, $table, $where);
+        }
     }
     
-	function isResult($rs) {
+	function isResult($rs)
+	{
 		return is_object($rs);
 	}
 
-	function freeResult($rs) {
+	function freeResult($rs)
+	{
 		$rs->free_result();
 	}
 
-	function numFields($rs) {
+	function numFields($rs)
+	{
 		return $rs->field_count;
 	}
 
-	function fieldName($rs,$col=0) {
+	function fieldName($rs,$col=0)
+	{
 		$field = $rs->fetch_field_direct($col);
 		return $field->name;
 	}
 
-	function selectDb($name) {
+	function selectDb($name)
+	{
 		$this->conn->select_db($name);
 	}
 
 
-	function getInsertId($conn=NULL) {
-		if (!is_object($conn)) $conn =& $this->conn;
+	function getInsertId($conn=NULL)
+	{
+		if (!is_object($conn)) {
+		    $conn =& $this->conn;
+		}
 		return $conn->insert_id;
 	}
 
-	function getAffectedRows($conn=NULL) {
-		if (!is_object($conn)) $conn =& $this->conn;
+	function getAffectedRows($conn=NULL)
+	{
+		if (!is_object($conn)) {
+		    $conn =& $this->conn;
+		}
 		return $conn->affected_rows;
 	}
 
-	function getLastError($conn=NULL) {
-		if (!is_object($conn)) $conn =& $this->conn;
+	function getLastError($conn=NULL)
+	{
+		if (!is_object($conn)) {
+		    $conn =& $this->conn;
+		}
 		return $conn->error;
 	}
 
-	function getRecordCount($ds) {
+	function getRecordCount($ds)
+	{
 		return (is_object($ds)) ? $ds->num_rows : 0;
 	}
 
-	function getRow($ds, $mode = 'assoc') {
+	function getRow($ds, $mode = 'assoc')
+	{
 		if (is_object($ds)) {
 			if ($mode == 'assoc') {
 				return $ds->fetch_assoc();
@@ -291,7 +369,8 @@ 
 		}
 	}
 
-	function getColumn($name, $dsq) {
+	function getColumn($name, $dsq)
+	{
 		if (!is_object($dsq)) {
 			$dsq = $this->query($dsq);
 		}
@@ -304,7 +383,8 @@ 
 		}
 	}
 
-	function getColumnNames($dsq) {
+	function getColumnNames($dsq)
+	{
 		if (!is_object($dsq)) {
 			$dsq = $this->query($dsq);
 		}
@@ -318,7 +398,8 @@ 
 		}
 	}
 
-	function getValue($dsq) {
+	function getValue($dsq)
+	{
 		if (!is_object($dsq)) {
 			$dsq = $this->query($dsq);
 		}
@@ -328,7 +409,8 @@ 
 		}
 	}
 
-	function getTableMetaData($table) {
+	function getTableMetaData($table)
+	{
 		$metadata = false;
 		if (!empty ($table)) {
 			$sql = "SHOW FIELDS FROM $table";
@@ -342,7 +424,8 @@ 
 		return $metadata;
 	}
 
-	function prepareDate($timestamp, $fieldType = 'DATETIME') {
+	function prepareDate($timestamp, $fieldType = 'DATETIME')
+	{
 		$date = '';
 		if (!$timestamp === false && $timestamp > 0) {
 			switch ($fieldType) {
@@ -363,8 +446,11 @@ 
 		return $date;
 	}
 
-	function makeArray($rs='',$index=false){
-		if (!$rs) return false;
+	function makeArray($rs='',$index=false)
+	{
+		if (!$rs) {
+		    return false;
+		}
 		$rsArray = array();
 		$iterator = 0;
 		while ($row = $this->getRow($rs)) {
@@ -375,11 +461,13 @@ 
 		return $rsArray;
 	}
 
-	function getVersion() {
+	function getVersion()
+	{
 		return $this->conn->server_info;
 	}
 
-	function replaceFullTableName($str,$force=null) {
+	function replaceFullTableName($str,$force=null)
+	{
 		$str = trim($str);
 		$dbase  = trim($this->config['dbase'],'`');
 		$prefix = $this->config['table_prefix'];
@@ -393,7 +481,8 @@ 
 		return $result;
 	}
 
-	function optimize($table_name) {
+	function optimize($table_name)
+	{
 		$rs = $this->query("OPTIMIZE TABLE {$table_name}");
 		if ($rs) {
 			$rs = $this->query("ALTER TABLE {$table_name}");
@@ -401,28 +490,37 @@ 
 		return $rs;
 	}
 
-	function truncate($table_name) {
+	function truncate($table_name)
+	{
 		$rs = $this->query("TRUNCATE {$table_name}");
 		return $rs;
 	}
 
-	function dataSeek($result, $row_number) {
+	function dataSeek($result, $row_number)
+	{
 		return $result->data_seek($row_number);
 	}
 	
-    function _getFieldsStringFromArray($fields=array()) {
+    function _getFieldsStringFromArray($fields=array())
+    {
         
-        if(empty($fields)) return '*';
+        if(empty($fields)) {
+            return '*';
+        }
         
         $_ = array();
         foreach($fields as $k=>$v) {
-            if($k!==$v) $_[] = "{$v} as {$k}";
-            else        $_[] = $v;
+            if($k!==$v) {
+                $_[] = "{$v} as {$k}";
+            } else {
+                $_[] = $v;
+            }
         }
         return join(',', $_);
     }
     
-    function _getFromStringFromArray($tables=array()) {
+    function _getFromStringFromArray($tables=array())
+    {
         $_ = array();
         foreach($tables as $k=>$v) {
             $_[] = $v;

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

@@ -5,14 +5,14 @@ 
 	var $lastQuery;
 	var $isConnected;
 
-	function __construct($host='', $dbase='', $uid='', $pwd='', $pre=NULL, $charset='', $connection_method='SET CHARACTER SET') {
+	function __construct($host='', $dbase='', $uid='', $pwd='', $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'];
 		$this->config['pass'] = $pwd ? $pwd : $GLOBALS['database_password'];
 		$this->config['charset'] = $charset ? $charset : $GLOBALS['database_connection_charset'];
 		$this->config['connection_method'] =  $this->_dbconnectionmethod = (isset($GLOBALS['database_connection_method']) ? $GLOBALS['database_connection_method'] : $connection_method);
-		$this->config['table_prefix'] = ($pre !== NULL) ? $pre : $GLOBALS['table_prefix'];
+		$this->config['table_prefix'] = ($pre !== null) ? $pre : $GLOBALS['table_prefix'];
 	}
 
 	function connect($host = '', $dbase = '', $uid = '', $pwd = '', $tmp = 0) {
@@ -143,9 +143,9 @@ 
 			$where   = trim($where);
 			$orderby = trim($orderby);
 			$limit   = trim($limit);
-			if($where!==''    && stripos($where,  'WHERE')!==0)    $where   = "WHERE {$where}";
+			if($where!==''    && stripos($where,  'WHERE')!==0)    $where   = "where {$where}";
 			if($orderby!== '' && stripos($orderby,'ORDER BY')!==0) $orderby = "ORDER BY {$orderby}";
-			if($limit!== ''   && stripos($limit,  'LIMIT')!==0)    $limit   = "LIMIT {$limit}";
+			if($limit!== ''   && stripos($limit,  'LIMIT')!==0)    $limit   = "limit {$limit}";
 			return $this->query("DELETE FROM {$from} {$where} {$orderby} {$limit}");
 		}
 	}
@@ -167,10 +167,10 @@ 
         $where   = trim($where);
         $orderby = trim($orderby);
         $limit   = trim($limit);
-        if($where!==''   && stripos($where,'WHERE')!==0)   $where   = "WHERE {$where}";
+        if($where!==''   && stripos($where,'WHERE')!==0)   $where   = "where {$where}";
         if($orderby!=='' && stripos($orderby,'ORDER')!==0) $orderby = "ORDER BY {$orderby}";
-        if($limit!==''   && stripos($limit,'LIMIT')!==0)   $limit   = "LIMIT {$limit}";
-		return $this->query("SELECT {$fields} FROM {$from} {$where} {$orderby} {$limit}");
+        if($limit!==''   && stripos($limit,'LIMIT')!==0)   $limit   = "limit {$limit}";
+		return $this->query("select {$fields} FROM {$from} {$where} {$orderby} {$limit}");
 	}
 
 	function update($fields, $table, $where = "") {
@@ -191,8 +191,8 @@ 
 				$fields = implode(",", $fields);
 			}
 			$where = trim($where);
-			if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
-			return $this->query("UPDATE {$table} SET {$fields} {$where}");
+			if($where!=='' && stripos($where, 'WHERE')!==0) $where = "where {$where}";
+			return $this->query("update {$table} SET {$fields} {$where}");
 		}
 	}
 
@@ -213,8 +213,8 @@ 
 					$fields = "(".implode(",", array_keys($fields)).")";
 					$where = trim($where);
 					$limit = trim($limit);
-					if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
-					if($limit!=='' && stripos($limit, 'LIMIT')!==0) $limit = "LIMIT {$limit}";
+					if($where!=='' && stripos($where, 'WHERE')!==0) $where = "where {$where}";
+					if($limit!=='' && stripos($limit, 'LIMIT')!==0) $limit = "limit {$limit}";
 					$rt = $this->query("INSERT INTO {$intotable} {$fields} SELECT {$fromfields} FROM {$fromtable} {$where} {$limit}");
 				}
 			}
@@ -255,17 +255,17 @@ 
 	}
 
 
-	function getInsertId($conn=NULL) {
+	function getInsertId($conn=null) {
 		if (!is_object($conn)) $conn =& $this->conn;
 		return $conn->insert_id;
 	}
 
-	function getAffectedRows($conn=NULL) {
+	function getAffectedRows($conn=null) {
 		if (!is_object($conn)) $conn =& $this->conn;
 		return $conn->affected_rows;
 	}
 
-	function getLastError($conn=NULL) {
+	function getLastError($conn=null) {
 		if (!is_object($conn)) $conn =& $this->conn;
 		return $conn->error;
 	}
@@ -402,7 +402,7 @@ 
 	}
 
 	function truncate($table_name) {
-		$rs = $this->query("TRUNCATE {$table_name}");
+		$rs = $this->query("truncate {$table_name}");
 		return $rs;
 	}
 

Doc Comments +15 added lines

@@ -291,6 +291,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $name
+	 */
 	function getColumn($name, $dsq) {
 		if (!is_object($dsq)) {
 			$dsq = $this->query($dsq);
@@ -375,6 +378,9 @@ 
 		return $rsArray;
 	}
 
+	/**
+	 * @return string
+	 */
 	function getVersion() {
 		return $this->conn->server_info;
 	}
@@ -393,6 +399,9 @@ 
 		return $result;
 	}
 
+	/**
+	 * @param string $table_name
+	 */
 	function optimize($table_name) {
 		$rs = $this->query("OPTIMIZE TABLE {$table_name}");
 		if ($rs) {
@@ -410,6 +419,9 @@ 
 		return $result->data_seek($row_number);
 	}
 	
+    /**
+     * @return string
+     */
     function _getFieldsStringFromArray($fields=array()) {
         
         if(empty($fields)) return '*';
@@ -422,6 +434,9 @@ 
         return join(',', $_);
     }
     
+    /**
+     * @return string
+     */
     function _getFromStringFromArray($tables=array()) {
         $_ = array();
         foreach($tables as $k=>$v) {