evolution-cms / evolution

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

manager/includes/extenders/ex_export_site.inc.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  * Time: 14:24
  */
 
-if(include_once(MODX_MANAGER_PATH . 'includes/extenders/export.class.inc.php'))
+if (include_once(MODX_MANAGER_PATH.'includes/extenders/export.class.inc.php'))
 {
     $this->export = new EXPORT_SITE;
     return true;

Braces +1 added lines, -2 removed lines

@@ -5,8 +5,7 @@
  * Time: 14:24
  */
 
-if(include_once(MODX_MANAGER_PATH . 'includes/extenders/export.class.inc.php'))
-{
+if(include_once(MODX_MANAGER_PATH . 'includes/extenders/export.class.inc.php')) {
     $this->export = new EXPORT_SITE;
     return true;
 } else {

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

Indentation +496 added lines, -496 removed lines

@@ -7,187 +7,187 @@ 
 
 class DBAPI {
 
-   var $conn;
-   var $config;
-   var $lastQuery;
-   var $isConnected;
+    var $conn;
+    var $config;
+    var $lastQuery;
+    var $isConnected;
 
-   /**
-    * @name:  DBAPI
-    *
-    */
-   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->initDataTypes();
-   }
+    /**
+     * @name:  DBAPI
+     *
+     */
+    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->initDataTypes();
+    }
 
-   /**
-    * @name:  initDataTypes
-    * @desc:  called in the constructor to set up arrays containing the types
-    *         of database fields that can be used with specific PHP types
-    */
-   function initDataTypes() {
-      $this->dataTypes['numeric'] = array (
-         'INT',
-         'INTEGER',
-         'TINYINT',
-         'BOOLEAN',
-         'DECIMAL',
-         'DEC',
-         'NUMERIC',
-         'FLOAT',
-         'DOUBLE PRECISION',
-         'REAL',
-         'SMALLINT',
-         'MEDIUMINT',
-         'BIGINT',
-         'BIT'
-      );
-      $this->dataTypes['string'] = array (
-         'CHAR',
-         'VARCHAR',
-         'BINARY',
-         'VARBINARY',
-         'TINYBLOB',
-         'BLOB',
-         'MEDIUMBLOB',
-         'LONGBLOB',
-         'TINYTEXT',
-         'TEXT',
-         'MEDIUMTEXT',
-         'LONGTEXT',
-         'ENUM',
-         'SET'
-      );
-      $this->dataTypes['date'] = array (
-         'DATE',
-         'DATETIME',
-         'TIMESTAMP',
-         'TIME',
-         'YEAR'
-      );
-   }
+    /**
+     * @name:  initDataTypes
+     * @desc:  called in the constructor to set up arrays containing the types
+     *         of database fields that can be used with specific PHP types
+     */
+    function initDataTypes() {
+        $this->dataTypes['numeric'] = array (
+            'INT',
+            'INTEGER',
+            'TINYINT',
+            'BOOLEAN',
+            'DECIMAL',
+            'DEC',
+            'NUMERIC',
+            'FLOAT',
+            'DOUBLE PRECISION',
+            'REAL',
+            'SMALLINT',
+            'MEDIUMINT',
+            'BIGINT',
+            'BIT'
+        );
+        $this->dataTypes['string'] = array (
+            'CHAR',
+            'VARCHAR',
+            'BINARY',
+            'VARBINARY',
+            'TINYBLOB',
+            'BLOB',
+            'MEDIUMBLOB',
+            'LONGBLOB',
+            'TINYTEXT',
+            'TEXT',
+            'MEDIUMTEXT',
+            'LONGTEXT',
+            'ENUM',
+            'SET'
+        );
+        $this->dataTypes['date'] = array (
+            'DATE',
+            'DATETIME',
+            'TIMESTAMP',
+            'TIME',
+            'YEAR'
+        );
+    }
 
-   /**
-    * @name:  connect
-    *
-    */
-   function connect($host = '', $dbase = '', $uid = '', $pwd = '', $persist = 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'];
-      $charset = $this->config['charset'];
-      $connection_method = $this->config['connection_method'];
-      $tstart = $modx->getMicroTime();
-      $safe_count = 0;
-      while(!$this->conn && $safe_count<3)
-      {
-          if($persist!=0) $this->conn = mysql_pconnect($host, $uid, $pwd);
-          else            $this->conn = mysql_connect($host, $uid, $pwd, true);
+    /**
+     * @name:  connect
+     *
+     */
+    function connect($host = '', $dbase = '', $uid = '', $pwd = '', $persist = 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'];
+        $charset = $this->config['charset'];
+        $connection_method = $this->config['connection_method'];
+        $tstart = $modx->getMicroTime();
+        $safe_count = 0;
+        while(!$this->conn && $safe_count<3)
+        {
+            if($persist!=0) $this->conn = mysql_pconnect($host, $uid, $pwd);
+            else            $this->conn = mysql_connect($host, $uid, $pwd, true);
           
-          if(!$this->conn)
-          {
+            if(!$this->conn)
+            {
             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']);
+                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')
-				  );
-               }
+                    $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++;
-          }
-      }
-      if (!$this->conn) {
-         $modx->messageQuit("Failed to create the database connection!");
-         exit;
-      } else {
-         $dbase = trim($dbase,'`'); // remove the `` chars
-         if (!@ mysql_select_db($dbase, $this->conn)) {
+            }
+        }
+        if (!$this->conn) {
+            $modx->messageQuit("Failed to create the database connection!");
+            exit;
+        } else {
+            $dbase = trim($dbase,'`'); // remove the `` chars
+            if (!@ mysql_select_db($dbase, $this->conn)) {
             $modx->messageQuit("Failed to select the database '" . $dbase . "'!");
             exit;
-         }
-         @mysql_query("{$connection_method} {$charset}", $this->conn);
-         $tend = $modx->getMicroTime();
-         $totaltime = $tend - $tstart;
-         if ($modx->dumpSQL) {
+            }
+            @mysql_query("{$connection_method} {$charset}", $this->conn);
+            $tend = $modx->getMicroTime();
+            $totaltime = $tend - $tstart;
+            if ($modx->dumpSQL) {
             $modx->queryCode .= "<fieldset style='text-align:left'><legend>Database connection</legend>" . sprintf("Database connection was created in %2.4f s", $totaltime) . "</fieldset><br />";
-         }
+            }
             if (function_exists('mysql_set_charset')) {
                 mysql_set_charset($this->config['charset']);
             } else {
                 @mysql_query("SET NAMES {$this->config['charset']}", $this->conn);
             }
-         $this->isConnected = true;
-         // FIXME (Fixed by line below):
-         // this->queryTime = this->queryTime + $totaltime;
-         $modx->queryTime += $totaltime;
-      }
-   }
+            $this->isConnected = true;
+            // FIXME (Fixed by line below):
+            // this->queryTime = this->queryTime + $totaltime;
+            $modx->queryTime += $totaltime;
+        }
+    }
 
-   /**
-    * @name:  disconnect
-    *
-    */
-   function disconnect() {
-      @ mysql_close($this->conn);
-      $this->conn = null;
-      $this->isConnected = false;
-   }
+    /**
+     * @name:  disconnect
+     *
+     */
+    function disconnect() {
+        @ mysql_close($this->conn);
+        $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}'");
+        $safecount++;
+        if(1000<$safecount) exit("Too many loops '{$safecount}'");
       
-      if (empty ($this->conn) || !is_resource($this->conn)) {
-         $this->connect();
-       }
+        if (empty ($this->conn) || !is_resource($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 = mysql_real_escape_string($s, $this->conn);
-          return $s;
-   }
+        if(is_array($s)) {
+            if(count($s) === 0) $s = '';
+            else {
+                foreach($s as $i=>$v) {
+                    $s[$i] = $this->escape($v,$safecount);
+                }
+            }
+        }
+        else $s = mysql_real_escape_string($s, $this->conn);
+            return $s;
+    }
 
-   /**
-    * @name:  query
-    * @desc:  Mainly for internal use.
-    * Developers should use select, update, insert, delete where possible
-    */
-   function query($sql,$watchError=true) {
-      global $modx;
-      if (empty ($this->conn) || !is_resource($this->conn)) {
-         $this->connect();
-      }
-      $tstart = $modx->getMicroTime();
-      if(is_array($sql)) $sql = join("\n", $sql);
-      $this->lastQuery = $sql;
-      if (!$result = @ mysql_query($sql, $this->conn)) {
-         if(!$watchError) return;
+    /**
+     * @name:  query
+     * @desc:  Mainly for internal use.
+     * Developers should use select, update, insert, delete where possible
+     */
+    function query($sql,$watchError=true) {
+        global $modx;
+        if (empty ($this->conn) || !is_resource($this->conn)) {
+            $this->connect();
+        }
+        $tstart = $modx->getMicroTime();
+        if(is_array($sql)) $sql = join("\n", $sql);
+        $this->lastQuery = $sql;
+        if (!$result = @ mysql_query($sql, $this->conn)) {
+            if(!$watchError) return;
             switch(mysql_errno()) {
                 case 1054:
                 case 1060:
@@ -198,11 +198,11 @@ 
                 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) {
+        } else {
+            $tend = $modx->getMicroTime();
+            $totaltime = $tend - $tstart;
+            $modx->queryTime = $modx->queryTime + $totaltime;
+            if ($modx->dumpSQL) {
             $debug = debug_backtrace();
             array_shift($debug);	
             $debug_path = array();
@@ -217,124 +217,124 @@ 
             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;
-      }
-   }
+            }
+            $modx->executedQueries = $modx->executedQueries + 1;
+            return $result;
+        }
+    }
 
-   /**
-    * @name:  delete
-    *
-    */
-   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}");
-      }
-   }
+    /**
+     * @name:  delete
+     *
+     */
+    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}");
+        }
+    }
 
-   /**
-    * @name:  select
-    *
-    */
-   function select($fields = "*", $from = "", $where = "", $orderby = "", $limit = "") {
-      global $modx;
+    /**
+     * @name:  select
+     *
+     */
+    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);
-      $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}");
-   }
+        $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}");
+    }
 
-   /**
-    * @name:  update
-    *
-    */
-   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;
-			 }
+    /**
+     * @name:  update
+     *
+     */
+    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}");
-      }
-   }
+            }
+            $where = trim($where);
+            if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
+            return $this->query("UPDATE {$table} SET {$fields} {$where}");
+        }
+    }
 
-   /**
-    * @name:  insert
-    * @desc:  returns either last id inserted or the result from the query
-    */
-   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)) {
+    /**
+     * @name:  insert
+     * @desc:  returns either last id inserted or the result from the query
+     */
+    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 {
+            } else {
             if (empty($fromtable)) {
-               $fields = "(`".implode("`, `", array_keys($fields))."`) VALUES('".implode("', '", array_values($fields))."')";
-               $rt = $this->query("INSERT INTO {$intotable} {$fields}");
+                $fields = "(`".implode("`, `", array_keys($fields))."`) VALUES('".implode("', '", array_values($fields))."')";
+                $rt = $this->query("INSERT INTO {$intotable} {$fields}");
             } else {
-               if (version_compare($this->getVersion(),"4.0.14")>=0) {
-                  $fromtable = $this->replaceFullTableName($fromtable);
-                  $fields = "(".implode(",", array_keys($fields)).")";
-                  $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}");
-               } else {
-                  $ds = $this->select($fromfields, $fromtable, $where, '', $limit);
-                  while ($row = $this->getRow($ds)) {
-                     $fields = "(".implode(",", array_keys($fields)).") VALUES('".implode("', '", $row)."')";
-                     $rt = $this->query("INSERT INTO {$intotable} {$fields}");
-                  }
-               }
+                if (version_compare($this->getVersion(),"4.0.14")>=0) {
+                    $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}");
+                } else {
+                    $ds = $this->select($fromfields, $fromtable, $where, '', $limit);
+                    while ($row = $this->getRow($ds)) {
+                        $fields = "(".implode(",", array_keys($fields)).") VALUES('".implode("', '", $row)."')";
+                        $rt = $this->query("INSERT INTO {$intotable} {$fields}");
+                    }
+                }
+            }
             }
-         }
-         if (($lid = $this->getInsertId())===false) $modx->messageQuit("Couldn't get last insert key!");
-         return $lid;
-      }
-   }
+            if (($lid = $this->getInsertId())===false) $modx->messageQuit("Couldn't get last insert key!");
+            return $lid;
+        }
+    }
    
     function save($fields, $table, $where='') {
         
@@ -346,277 +346,277 @@ 
         else                 return $this->update($fields, $table, $where);
     }
     
-   /**
-    * @name:  isResult
-    *
-    */
-   function isResult($rs) {
-      return is_resource($rs);
-   }
+    /**
+     * @name:  isResult
+     *
+     */
+    function isResult($rs) {
+        return is_resource($rs);
+    }
 
-   /**
-    * @name:  freeResult
-    *
-    */
-   function freeResult($rs) {
-      mysql_free_result($rs);
-   }
+    /**
+     * @name:  freeResult
+     *
+     */
+    function freeResult($rs) {
+        mysql_free_result($rs);
+    }
    
-   /**
-    * @name:  numFields
-    *
-    */
-   function numFields($rs) {
-      return mysql_num_fields($rs);
-   }
+    /**
+     * @name:  numFields
+     *
+     */
+    function numFields($rs) {
+        return mysql_num_fields($rs);
+    }
    
-   /**
-    * @name:  fieldName
-    *
-    */
-   function fieldName($rs,$col=0) {
-      return mysql_field_name($rs,$col);
-   }
+    /**
+     * @name:  fieldName
+     *
+     */
+    function fieldName($rs,$col=0) {
+        return mysql_field_name($rs,$col);
+    }
    
     /**
-    * @name:  selectDb
-    *
-    */
-   function selectDb($name) {
-      mysql_select_db($name);
-   }
+     * @name:  selectDb
+     *
+     */
+    function selectDb($name) {
+        mysql_select_db($name);
+    }
    
 
-   /**
-    * @name:  getInsertId
-    *
-    */
-   function getInsertId($conn=NULL) {
-      if( !is_resource($conn)) $conn =& $this->conn;
-      return mysql_insert_id($conn);
-   }
+    /**
+     * @name:  getInsertId
+     *
+     */
+    function getInsertId($conn=NULL) {
+        if( !is_resource($conn)) $conn =& $this->conn;
+        return mysql_insert_id($conn);
+    }
 
-   /**
-    * @name:  getAffectedRows
-    *
-    */
-   function getAffectedRows($conn=NULL) {
-      if (!is_resource($conn)) $conn =& $this->conn;
-      return mysql_affected_rows($conn);
-   }
+    /**
+     * @name:  getAffectedRows
+     *
+     */
+    function getAffectedRows($conn=NULL) {
+        if (!is_resource($conn)) $conn =& $this->conn;
+        return mysql_affected_rows($conn);
+    }
 
-   /**
-    * @name:  getLastError
-    *
-    */
-   function getLastError($conn=NULL) {
-      if (!is_resource($conn)) $conn =& $this->conn;
-      return mysql_error($conn);
-   }
+    /**
+     * @name:  getLastError
+     *
+     */
+    function getLastError($conn=NULL) {
+        if (!is_resource($conn)) $conn =& $this->conn;
+        return mysql_error($conn);
+    }
 
-   /**
-    * @name:  getRecordCount
-    *
-    */
-   function getRecordCount($ds) {
-      return (is_resource($ds)) ? mysql_num_rows($ds) : 0;
-   }
+    /**
+     * @name:  getRecordCount
+     *
+     */
+    function getRecordCount($ds) {
+        return (is_resource($ds)) ? mysql_num_rows($ds) : 0;
+    }
 
-   /**
-    * @name:  getRow
-    * @desc:  returns an array of column values
-    * @param: $dsq - dataset
-    *
-    */
-   function getRow($ds, $mode = 'assoc') {
-      if (is_resource($ds)) {
-         if ($mode == 'assoc') {
+    /**
+     * @name:  getRow
+     * @desc:  returns an array of column values
+     * @param: $dsq - dataset
+     *
+     */
+    function getRow($ds, $mode = 'assoc') {
+        if (is_resource($ds)) {
+            if ($mode == 'assoc') {
             return mysql_fetch_assoc($ds);
-         }
-         elseif ($mode == 'num') {
+            }
+            elseif ($mode == 'num') {
             return mysql_fetch_row($ds);
-         }
-		 elseif ($mode == 'object') {
+            }
+            elseif ($mode == 'object') {
             return mysql_fetch_object($ds);
-         }
-         elseif ($mode == 'both') {
+            }
+            elseif ($mode == 'both') {
             return mysql_fetch_array($ds, MYSQL_BOTH);
-         } else {
+            } else {
             global $modx;
             $modx->messageQuit("Unknown get type ($mode) specified for fetchRow - must be empty, 'assoc', 'num' or 'both'.");
-         }
-      }
-   }
+            }
+        }
+    }
 
-   /**
-    * @name:  getColumn
-    * @desc:  returns an array of the values found on colun $name
-    * @param: $dsq - dataset or query string
-    */
-   function getColumn($name, $dsq) {
-      if (!is_resource($dsq))
-         $dsq = $this->query($dsq);
-      if ($dsq) {
-         $col = array ();
-         while ($row = $this->getRow($dsq)) {
+    /**
+     * @name:  getColumn
+     * @desc:  returns an array of the values found on colun $name
+     * @param: $dsq - dataset or query string
+     */
+    function getColumn($name, $dsq) {
+        if (!is_resource($dsq))
+            $dsq = $this->query($dsq);
+        if ($dsq) {
+            $col = array ();
+            while ($row = $this->getRow($dsq)) {
             $col[] = $row[$name];
-         }
-         return $col;
-      }
-   }
+            }
+            return $col;
+        }
+    }
 
-   /**
-    * @name:  getColumnNames
-    * @desc:  returns an array containing the column $name
-    * @param: $dsq - dataset or query string
-    */
-   function getColumnNames($dsq) {
-      if (!is_resource($dsq))
-         $dsq = $this->query($dsq);
-      if ($dsq) {
-         $names = array ();
-         $limit = mysql_num_fields($dsq);
-         for ($i = 0; $i < $limit; $i++) {
+    /**
+     * @name:  getColumnNames
+     * @desc:  returns an array containing the column $name
+     * @param: $dsq - dataset or query string
+     */
+    function getColumnNames($dsq) {
+        if (!is_resource($dsq))
+            $dsq = $this->query($dsq);
+        if ($dsq) {
+            $names = array ();
+            $limit = mysql_num_fields($dsq);
+            for ($i = 0; $i < $limit; $i++) {
             $names[] = mysql_field_name($dsq, $i);
-         }
-         return $names;
-      }
-   }
+            }
+            return $names;
+        }
+    }
 
-   /**
-    * @name:  getValue
-    * @desc:  returns the value from the first column in the set
-    * @param: $dsq - dataset or query string
-    */
-   function getValue($dsq) {
-      if (!is_resource($dsq))
-         $dsq = $this->query($dsq);
-      if ($dsq) {
-         $r = $this->getRow($dsq, "num");
-         return $r[0];
-      }
-   }
+    /**
+     * @name:  getValue
+     * @desc:  returns the value from the first column in the set
+     * @param: $dsq - dataset or query string
+     */
+    function getValue($dsq) {
+        if (!is_resource($dsq))
+            $dsq = $this->query($dsq);
+        if ($dsq) {
+            $r = $this->getRow($dsq, "num");
+            return $r[0];
+        }
+    }
 
-   /**
-    * @name:  getTableMetaData
-    * @desc:  returns an array of MySQL structure detail for each column of a
-    *         table
-    * @param: $table: the full name of the database table
-    */
-   function getTableMetaData($table) {
-      $metadata = false;
-      if (!empty ($table)) {
-         $sql = "SHOW FIELDS FROM $table";
-         if ($ds = $this->query($sql)) {
+    /**
+     * @name:  getTableMetaData
+     * @desc:  returns an array of MySQL structure detail for each column of a
+     *         table
+     * @param: $table: the full name of the database table
+     */
+    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;
+                $fieldName = $row['Field'];
+                $metadata[$fieldName] = $row;
+            }
             }
-         }
-      }
-      return $metadata;
-   }
+        }
+        return $metadata;
+    }
 
-   /**
-    * @name:  prepareDate
-    * @desc:  prepares a date in the proper format for specific database types
-    *         given a UNIX timestamp
-    * @param: $timestamp: a UNIX timestamp
-    * @param: $fieldType: the type of field to format the date for
-    *         (in MySQL, you have DATE, TIME, YEAR, and DATETIME)
-    */
-   function prepareDate($timestamp, $fieldType = 'DATETIME') {
-      $date = '';
-      if (!$timestamp === false && $timestamp > 0) {
-         switch ($fieldType) {
+    /**
+     * @name:  prepareDate
+     * @desc:  prepares a date in the proper format for specific database types
+     *         given a UNIX timestamp
+     * @param: $timestamp: a UNIX timestamp
+     * @param: $fieldType: the type of field to format the date for
+     *         (in MySQL, you have DATE, TIME, YEAR, and DATETIME)
+     */
+    function prepareDate($timestamp, $fieldType = 'DATETIME') {
+        $date = '';
+        if (!$timestamp === false && $timestamp > 0) {
+            switch ($fieldType) {
             case 'DATE' :
                $date = date('Y-m-d', $timestamp);
-               break;
+                break;
             case 'TIME' :
                $date = date('H:i:s', $timestamp);
-               break;
+                break;
             case 'YEAR' :
                $date = date('Y', $timestamp);
-               break;
+                break;
             default :
                $date = date('Y-m-d H:i:s', $timestamp);
-               break;
-         }
-      }
-      return $date;
-   }
+                break;
+            }
+        }
+        return $date;
+    }
 
-   /**
-   * @name:  makeArray
-   * @desc:  turns a recordset into a multidimensional array
-   * @return: an array of row arrays from recordset, or empty array
-   *          if the recordset was empty, returns false if no recordset
-   *          was passed
-   * @param: $rs Recordset to be packaged into an array
-   */
-	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;
-	}
+    /**
+     * @name:  makeArray
+     * @desc:  turns a recordset into a multidimensional array
+     * @return: an array of row arrays from recordset, or empty array
+     *          if the recordset was empty, returns false if no recordset
+     *          was passed
+     * @param: $rs Recordset to be packaged into an array
+     */
+    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;
+    }
    
-   /**
-    * @name	getVersion
-    * @desc	returns a string containing the database server version
-    *
-    * @return string
-    */
-   function getVersion() {
-       return mysql_get_server_info();
-   }
+    /**
+     * @name	getVersion
+     * @desc	returns a string containing the database server version
+     *
+     * @return string
+     */
+    function getVersion() {
+        return mysql_get_server_info();
+    }
    
-   /**
-    * @name replaceFullTableName
-    * @desc  Get full table name. Append table name and table prefix.
-    * 
-    * @param string $str
-    * @return string 
-    */
-   function replaceFullTableName($str,$force=null) {
+    /**
+     * @name replaceFullTableName
+     * @desc  Get full table name. Append table name and table prefix.
+     * 
+     * @param string $str
+     * @return string 
+     */
+    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;
+        $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;
-   }
+        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) {
+    function dataSeek($result, $row_number) {
     return mysql_data_seek($result, $row_number);
-  }
+    }
   
     function _getFieldsStringFromArray($fields=array()) {
         

Spacing +98 added lines, -98 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-class DBAPI {
+class DBAPI{
 
    var $conn;
    var $config;
@@ -16,13 +16,13 @@ 
     * @name:  DBAPI
     *
     */
-   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'];
       $this->initDataTypes();
    }
@@ -32,8 +32,8 @@ 
     * @desc:  called in the constructor to set up arrays containing the types
     *         of database fields that can be used with specific PHP types
     */
-   function initDataTypes() {
-      $this->dataTypes['numeric'] = array (
+   function initDataTypes(){
+      $this->dataTypes['numeric'] = array(
          'INT',
          'INTEGER',
          'TINYINT',
@@ -49,7 +49,7 @@ 
          'BIGINT',
          'BIT'
       );
-      $this->dataTypes['string'] = array (
+      $this->dataTypes['string'] = array(
          'CHAR',
          'VARCHAR',
          'BINARY',
@@ -65,7 +65,7 @@ 
          'ENUM',
          'SET'
       );
-      $this->dataTypes['date'] = array (
+      $this->dataTypes['date'] = array(
          'DATE',
          'DATETIME',
          'TIMESTAMP',
@@ -78,7 +78,7 @@ 
     * @name:  connect
     *
     */
-   function connect($host = '', $dbase = '', $uid = '', $pwd = '', $persist = 0) {
+   function connect($host = '', $dbase = '', $uid = '', $pwd = '', $persist = 0){
       global $modx;
       $uid = $uid ? $uid : $this->config['user'];
       $pwd = $pwd ? $pwd : $this->config['pass'];
@@ -88,16 +88,16 @@ 
       $connection_method = $this->config['connection_method'];
       $tstart = $modx->getMicroTime();
       $safe_count = 0;
-      while(!$this->conn && $safe_count<3)
+      while (!$this->conn && $safe_count < 3)
       {
-          if($persist!=0) $this->conn = mysql_pconnect($host, $uid, $pwd);
+          if ($persist != 0) $this->conn = mysql_pconnect($host, $uid, $pwd);
           else            $this->conn = mysql_connect($host, $uid, $pwd, true);
           
-          if(!$this->conn)
+          if (!$this->conn)
           {
-            if(isset($modx->config['send_errormail']) && $modx->config['send_errormail'] !== '0')
+            if (isset($modx->config['send_errormail']) && $modx->config['send_errormail'] !== '0')
             {
-               if($modx->config['send_errormail'] <= 2)
+               if ($modx->config['send_errormail'] <= 2)
                {
                   $logtitle    = 'Failed to create the database connection!';
                   $request_uri = $modx->htmlspecialchars($_SERVER['REQUEST_URI']);
@@ -105,7 +105,7 @@ 
                   $referer     = $modx->htmlspecialchars($_SERVER['HTTP_REFERER']);
 
                   $modx->sendmail(array(
-					  'subject' => 'Missing to create the database connection! from ' . $modx->config['site_name'],
+					  'subject' => 'Missing to create the database connection! from '.$modx->config['site_name'],
 					  'body' => "{$logtitle}\n{$request_uri}\n{$ua}\n{$referer}",
 					  'type' => 'text')
 				  );
@@ -119,16 +119,16 @@ 
          $modx->messageQuit("Failed to create the database connection!");
          exit;
       } else {
-         $dbase = trim($dbase,'`'); // remove the `` chars
+         $dbase = trim($dbase, '`'); // remove the `` chars
          if (!@ mysql_select_db($dbase, $this->conn)) {
-            $modx->messageQuit("Failed to select the database '" . $dbase . "'!");
+            $modx->messageQuit("Failed to select the database '".$dbase."'!");
             exit;
          }
          @mysql_query("{$connection_method} {$charset}", $this->conn);
          $tend = $modx->getMicroTime();
          $totaltime = $tend - $tstart;
          if ($modx->dumpSQL) {
-            $modx->queryCode .= "<fieldset style='text-align:left'><legend>Database connection</legend>" . sprintf("Database connection was created in %2.4f s", $totaltime) . "</fieldset><br />";
+            $modx->queryCode .= "<fieldset style='text-align:left'><legend>Database connection</legend>".sprintf("Database connection was created in %2.4f s", $totaltime)."</fieldset><br />";
          }
             if (function_exists('mysql_set_charset')) {
                 mysql_set_charset($this->config['charset']);
@@ -146,26 +146,26 @@ 
     * @name:  disconnect
     *
     */
-   function disconnect() {
+   function disconnect(){
       @ mysql_close($this->conn);
       $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_resource($this->conn)) {
          $this->connect();
        }
        
-      if(is_array($s)) {
-          if(count($s) === 0) $s = '';
+      if (is_array($s)) {
+          if (count($s) === 0) $s = '';
           else {
-              foreach($s as $i=>$v) {
-                  $s[$i] = $this->escape($v,$safecount);
+              foreach ($s as $i=>$v) {
+                  $s[$i] = $this->escape($v, $safecount);
               }
           }
       }
@@ -178,17 +178,17 @@ 
     * @desc:  Mainly for internal use.
     * Developers should use select, update, insert, delete where possible
     */
-   function query($sql,$watchError=true) {
+   function query($sql, $watchError = true){
       global $modx;
       if (empty ($this->conn) || !is_resource($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 = @ mysql_query($sql, $this->conn)) {
-         if(!$watchError) return;
-            switch(mysql_errno()) {
+         if (!$watchError) return;
+            switch (mysql_errno()) {
                 case 1054:
                 case 1060:
                 case 1061:
@@ -196,7 +196,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();
@@ -207,15 +207,15 @@ 
             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>';
+            $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;
@@ -227,7 +227,7 @@ 
     * @name:  delete
     *
     */
-   function delete($from, $where='', $orderby='', $limit = '') {
+   function delete($from, $where = '', $orderby = '', $limit = ''){
       global $modx;
       if (!$from)
          $modx->messageQuit("Empty \$from parameters in DBAPI::delete().");
@@ -236,9 +236,9 @@ 
          $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}");
       }
    }
@@ -247,12 +247,12 @@ 
     * @name:  select
     *
     */
-   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().");
@@ -264,9 +264,9 @@ 
       $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}");
    }
 
@@ -274,7 +274,7 @@ 
     * @name:  update
     *
     */
-   function update($fields, $table, $where = "") {
+   function update($fields, $table, $where = ""){
       global $modx;
       if (!$table)
          $modx->messageQuit("Empty \$table parameter in DBAPI::update().");
@@ -282,17 +282,17 @@ 
          $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}");
       }
    }
@@ -301,7 +301,7 @@ 
     * @name:  insert
     * @desc:  returns either last id inserted or the result from the query
     */
-   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().");
@@ -314,13 +314,13 @@ 
                $fields = "(`".implode("`, `", array_keys($fields))."`) VALUES('".implode("', '", array_values($fields))."')";
                $rt = $this->query("INSERT INTO {$intotable} {$fields}");
             } else {
-               if (version_compare($this->getVersion(),"4.0.14")>=0) {
+               if (version_compare($this->getVersion(), "4.0.14") >= 0) {
                   $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}";
+                  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}");
                } else {
                   $ds = $this->select($fromfields, $fromtable, $where, '', $limit);
@@ -331,18 +331,18 @@ 
                }
             }
          }
-         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='') {
+    function save($fields, $table, $where = ''){
         
-        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);
     }
     
@@ -350,7 +350,7 @@ 
     * @name:  isResult
     *
     */
-   function isResult($rs) {
+   function isResult($rs){
       return is_resource($rs);
    }
 
@@ -358,7 +358,7 @@ 
     * @name:  freeResult
     *
     */
-   function freeResult($rs) {
+   function freeResult($rs){
       mysql_free_result($rs);
    }
    
@@ -366,7 +366,7 @@ 
     * @name:  numFields
     *
     */
-   function numFields($rs) {
+   function numFields($rs){
       return mysql_num_fields($rs);
    }
    
@@ -374,15 +374,15 @@ 
     * @name:  fieldName
     *
     */
-   function fieldName($rs,$col=0) {
-      return mysql_field_name($rs,$col);
+   function fieldName($rs, $col = 0){
+      return mysql_field_name($rs, $col);
    }
    
     /**
     * @name:  selectDb
     *
     */
-   function selectDb($name) {
+   function selectDb($name){
       mysql_select_db($name);
    }
    
@@ -391,8 +391,8 @@ 
     * @name:  getInsertId
     *
     */
-   function getInsertId($conn=NULL) {
-      if( !is_resource($conn)) $conn =& $this->conn;
+   function getInsertId($conn = NULL){
+      if (!is_resource($conn)) $conn = & $this->conn;
       return mysql_insert_id($conn);
    }
 
@@ -400,8 +400,8 @@ 
     * @name:  getAffectedRows
     *
     */
-   function getAffectedRows($conn=NULL) {
-      if (!is_resource($conn)) $conn =& $this->conn;
+   function getAffectedRows($conn = NULL){
+      if (!is_resource($conn)) $conn = & $this->conn;
       return mysql_affected_rows($conn);
    }
 
@@ -409,8 +409,8 @@ 
     * @name:  getLastError
     *
     */
-   function getLastError($conn=NULL) {
-      if (!is_resource($conn)) $conn =& $this->conn;
+   function getLastError($conn = NULL){
+      if (!is_resource($conn)) $conn = & $this->conn;
       return mysql_error($conn);
    }
 
@@ -418,7 +418,7 @@ 
     * @name:  getRecordCount
     *
     */
-   function getRecordCount($ds) {
+   function getRecordCount($ds){
       return (is_resource($ds)) ? mysql_num_rows($ds) : 0;
    }
 
@@ -428,7 +428,7 @@ 
     * @param: $dsq - dataset
     *
     */
-   function getRow($ds, $mode = 'assoc') {
+   function getRow($ds, $mode = 'assoc'){
       if (is_resource($ds)) {
          if ($mode == 'assoc') {
             return mysql_fetch_assoc($ds);
@@ -453,11 +453,11 @@ 
     * @desc:  returns an array of the values found on colun $name
     * @param: $dsq - dataset or query string
     */
-   function getColumn($name, $dsq) {
+   function getColumn($name, $dsq){
       if (!is_resource($dsq))
          $dsq = $this->query($dsq);
       if ($dsq) {
-         $col = array ();
+         $col = array();
          while ($row = $this->getRow($dsq)) {
             $col[] = $row[$name];
          }
@@ -470,11 +470,11 @@ 
     * @desc:  returns an array containing the column $name
     * @param: $dsq - dataset or query string
     */
-   function getColumnNames($dsq) {
+   function getColumnNames($dsq){
       if (!is_resource($dsq))
          $dsq = $this->query($dsq);
       if ($dsq) {
-         $names = array ();
+         $names = array();
          $limit = mysql_num_fields($dsq);
          for ($i = 0; $i < $limit; $i++) {
             $names[] = mysql_field_name($dsq, $i);
@@ -488,7 +488,7 @@ 
     * @desc:  returns the value from the first column in the set
     * @param: $dsq - dataset or query string
     */
-   function getValue($dsq) {
+   function getValue($dsq){
       if (!is_resource($dsq))
          $dsq = $this->query($dsq);
       if ($dsq) {
@@ -503,7 +503,7 @@ 
     *         table
     * @param: $table: the full name of the database table
     */
-   function getTableMetaData($table) {
+   function getTableMetaData($table){
       $metadata = false;
       if (!empty ($table)) {
          $sql = "SHOW FIELDS FROM $table";
@@ -525,7 +525,7 @@ 
     * @param: $fieldType: the type of field to format the date for
     *         (in MySQL, you have DATE, TIME, YEAR, and DATETIME)
     */
-   function prepareDate($timestamp, $fieldType = 'DATETIME') {
+   function prepareDate($timestamp, $fieldType = 'DATETIME'){
       $date = '';
       if (!$timestamp === false && $timestamp > 0) {
          switch ($fieldType) {
@@ -554,7 +554,7 @@ 
    *          was passed
    * @param: $rs Recordset to be packaged into an array
    */
-	function makeArray($rs='',$index=false){
+	function makeArray($rs = '', $index = false){
 		if (!$rs) return false;
 		$rsArray = array();
 		$iterator = 0;
@@ -572,7 +572,7 @@ 
     *
     * @return string
     */
-   function getVersion() {
+   function getVersion(){
        return mysql_get_server_info();
    }
    
@@ -583,16 +583,16 @@ 
     * @param string $str
     * @return string 
     */
-   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))
+       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);
        }
@@ -604,7 +604,7 @@ 
    function optimize($table_name)
    {
        $rs = $this->query("OPTIMIZE TABLE {$table_name}");
-       if($rs) $rs = $this->query("ALTER TABLE {$table_name}");
+       if ($rs) $rs = $this->query("ALTER TABLE {$table_name}");
        return $rs;
    }
    
@@ -614,25 +614,25 @@ 
        return $rs;
    }
 
-  function dataSeek($result, $row_number) {
+  function dataSeek($result, $row_number){
     return mysql_data_seek($result, $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 +207 added lines, -110 removed lines

@@ -5,7 +5,8 @@ 
  *
  */
 
-class DBAPI {
+class DBAPI
+{
 
    var $conn;
    var $config;
@@ -16,7 +17,8 @@ 
     * @name:  DBAPI
     *
     */
-   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'];
@@ -32,7 +34,8 @@ 
     * @desc:  called in the constructor to set up arrays containing the types
     *         of database fields that can be used with specific PHP types
     */
-   function initDataTypes() {
+   function initDataTypes()
+   {
       $this->dataTypes['numeric'] = array (
          'INT',
          'INTEGER',
@@ -78,7 +81,8 @@ 
     * @name:  connect
     *
     */
-   function connect($host = '', $dbase = '', $uid = '', $pwd = '', $persist = 0) {
+   function connect($host = '', $dbase = '', $uid = '', $pwd = '', $persist = 0)
+   {
       global $modx;
       $uid = $uid ? $uid : $this->config['user'];
       $pwd = $pwd ? $pwd : $this->config['pass'];
@@ -88,17 +92,16 @@ 
       $connection_method = $this->config['connection_method'];
       $tstart = $modx->getMicroTime();
       $safe_count = 0;
-      while(!$this->conn && $safe_count<3)
-      {
-          if($persist!=0) $this->conn = mysql_pconnect($host, $uid, $pwd);
-          else            $this->conn = mysql_connect($host, $uid, $pwd, true);
+      while(!$this->conn && $safe_count<3) {
+          if($persist!=0) {
+              $this->conn = mysql_pconnect($host, $uid, $pwd);
+          } else {
+              $this->conn = mysql_connect($host, $uid, $pwd, true);
+          }
           
-          if(!$this->conn)
-          {
-            if(isset($modx->config['send_errormail']) && $modx->config['send_errormail'] !== '0')
-            {
-               if($modx->config['send_errormail'] <= 2)
-               {
+          if(!$this->conn) {
+            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']);
@@ -146,30 +149,36 @@ 
     * @name:  disconnect
     *
     */
-   function disconnect() {
+   function disconnect()
+   {
       @ mysql_close($this->conn);
       $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_resource($this->conn)) {
          $this->connect();
        }
        
       if(is_array($s)) {
-          if(count($s) === 0) $s = '';
-          else {
+          if(count($s) === 0) {
+              $s = '';
+          } else {
               foreach($s as $i=>$v) {
                   $s[$i] = $this->escape($v,$safecount);
               }
           }
+      } else {
+          $s = mysql_real_escape_string($s, $this->conn);
       }
-      else $s = mysql_real_escape_string($s, $this->conn);
           return $s;
    }
 
@@ -178,16 +187,21 @@ 
     * @desc:  Mainly for internal use.
     * Developers should use select, update, insert, delete where possible
     */
-   function query($sql,$watchError=true) {
+   function query($sql,$watchError=true)
+   {
       global $modx;
       if (empty ($this->conn) || !is_resource($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 = @ mysql_query($sql, $this->conn)) {
-         if(!$watchError) return;
+         if(!$watchError) {
+             return;
+         }
             switch(mysql_errno()) {
                 case 1054:
                 case 1060:
@@ -206,15 +220,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 />";
          }
@@ -227,18 +252,25 @@ 
     * @name:  delete
     *
     */
-   function delete($from, $where='', $orderby='', $limit = '') {
+   function delete($from, $where='', $orderby='', $limit = '')
+   {
       global $modx;
-      if (!$from)
-         $modx->messageQuit("Empty \$from parameters in DBAPI::delete().");
-      else {
+      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}";
+         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}");
       }
    }
@@ -247,12 +279,19 @@ 
     * @name:  select
     *
     */
-   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().");
@@ -264,9 +303,15 @@ 
       $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}");
    }
 
@@ -274,17 +319,18 @@ 
     * @name:  update
     *
     */
-   function update($fields, $table, $where = "") {
+   function update($fields, $table, $where = "")
+   {
       global $modx;
-      if (!$table)
-         $modx->messageQuit("Empty \$table parameter in DBAPI::update().");
-      else {
+      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'){
+				 if(is_null($value) || strtolower($value) === 'null') {
 					 $flds = 'NULL';
-				 }else{
+				 } else {
 					 $flds = "'" . $value . "'";
 				 }
 				 $fields[$key] = "`{$key}` = ".$flds;
@@ -292,7 +338,9 @@ 
             $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}");
       }
    }
@@ -301,11 +349,12 @@ 
     * @name:  insert
     * @desc:  returns either last id inserted or the result from the query
     */
-   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().");
-      else {
+      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}");
@@ -319,8 +368,12 @@ 
                   $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}");
                } else {
                   $ds = $this->select($fromfields, $fromtable, $where, '', $limit);
@@ -331,26 +384,37 @@ 
                }
             }
          }
-         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='') {
+    function save($fields, $table, $where='')
+    {
         
-        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);
+        }
     }
     
    /**
     * @name:  isResult
     *
     */
-   function isResult($rs) {
+   function isResult($rs)
+   {
       return is_resource($rs);
    }
 
@@ -358,7 +422,8 @@ 
     * @name:  freeResult
     *
     */
-   function freeResult($rs) {
+   function freeResult($rs)
+   {
       mysql_free_result($rs);
    }
    
@@ -366,7 +431,8 @@ 
     * @name:  numFields
     *
     */
-   function numFields($rs) {
+   function numFields($rs)
+   {
       return mysql_num_fields($rs);
    }
    
@@ -374,7 +440,8 @@ 
     * @name:  fieldName
     *
     */
-   function fieldName($rs,$col=0) {
+   function fieldName($rs,$col=0)
+   {
       return mysql_field_name($rs,$col);
    }
    
@@ -382,7 +449,8 @@ 
     * @name:  selectDb
     *
     */
-   function selectDb($name) {
+   function selectDb($name)
+   {
       mysql_select_db($name);
    }
    
@@ -391,8 +459,11 @@ 
     * @name:  getInsertId
     *
     */
-   function getInsertId($conn=NULL) {
-      if( !is_resource($conn)) $conn =& $this->conn;
+   function getInsertId($conn=NULL)
+   {
+      if( !is_resource($conn)) {
+          $conn =& $this->conn;
+      }
       return mysql_insert_id($conn);
    }
 
@@ -400,8 +471,11 @@ 
     * @name:  getAffectedRows
     *
     */
-   function getAffectedRows($conn=NULL) {
-      if (!is_resource($conn)) $conn =& $this->conn;
+   function getAffectedRows($conn=NULL)
+   {
+      if (!is_resource($conn)) {
+          $conn =& $this->conn;
+      }
       return mysql_affected_rows($conn);
    }
 
@@ -409,8 +483,11 @@ 
     * @name:  getLastError
     *
     */
-   function getLastError($conn=NULL) {
-      if (!is_resource($conn)) $conn =& $this->conn;
+   function getLastError($conn=NULL)
+   {
+      if (!is_resource($conn)) {
+          $conn =& $this->conn;
+      }
       return mysql_error($conn);
    }
 
@@ -418,7 +495,8 @@ 
     * @name:  getRecordCount
     *
     */
-   function getRecordCount($ds) {
+   function getRecordCount($ds)
+   {
       return (is_resource($ds)) ? mysql_num_rows($ds) : 0;
    }
 
@@ -428,18 +506,16 @@ 
     * @param: $dsq - dataset
     *
     */
-   function getRow($ds, $mode = 'assoc') {
+   function getRow($ds, $mode = 'assoc')
+   {
       if (is_resource($ds)) {
          if ($mode == 'assoc') {
             return mysql_fetch_assoc($ds);
-         }
-         elseif ($mode == 'num') {
+         } elseif ($mode == 'num') {
             return mysql_fetch_row($ds);
-         }
-		 elseif ($mode == 'object') {
+         } elseif ($mode == 'object') {
             return mysql_fetch_object($ds);
-         }
-         elseif ($mode == 'both') {
+         } elseif ($mode == 'both') {
             return mysql_fetch_array($ds, MYSQL_BOTH);
          } else {
             global $modx;
@@ -453,9 +529,11 @@ 
     * @desc:  returns an array of the values found on colun $name
     * @param: $dsq - dataset or query string
     */
-   function getColumn($name, $dsq) {
-      if (!is_resource($dsq))
-         $dsq = $this->query($dsq);
+   function getColumn($name, $dsq)
+   {
+      if (!is_resource($dsq)) {
+               $dsq = $this->query($dsq);
+      }
       if ($dsq) {
          $col = array ();
          while ($row = $this->getRow($dsq)) {
@@ -470,9 +548,11 @@ 
     * @desc:  returns an array containing the column $name
     * @param: $dsq - dataset or query string
     */
-   function getColumnNames($dsq) {
-      if (!is_resource($dsq))
-         $dsq = $this->query($dsq);
+   function getColumnNames($dsq)
+   {
+      if (!is_resource($dsq)) {
+               $dsq = $this->query($dsq);
+      }
       if ($dsq) {
          $names = array ();
          $limit = mysql_num_fields($dsq);
@@ -488,9 +568,11 @@ 
     * @desc:  returns the value from the first column in the set
     * @param: $dsq - dataset or query string
     */
-   function getValue($dsq) {
-      if (!is_resource($dsq))
-         $dsq = $this->query($dsq);
+   function getValue($dsq)
+   {
+      if (!is_resource($dsq)) {
+               $dsq = $this->query($dsq);
+      }
       if ($dsq) {
          $r = $this->getRow($dsq, "num");
          return $r[0];
@@ -503,7 +585,8 @@ 
     *         table
     * @param: $table: the full name of the database table
     */
-   function getTableMetaData($table) {
+   function getTableMetaData($table)
+   {
       $metadata = false;
       if (!empty ($table)) {
          $sql = "SHOW FIELDS FROM $table";
@@ -525,7 +608,8 @@ 
     * @param: $fieldType: the type of field to format the date for
     *         (in MySQL, you have DATE, TIME, YEAR, and DATETIME)
     */
-   function prepareDate($timestamp, $fieldType = 'DATETIME') {
+   function prepareDate($timestamp, $fieldType = 'DATETIME')
+   {
       $date = '';
       if (!$timestamp === false && $timestamp > 0) {
          switch ($fieldType) {
@@ -554,8 +638,11 @@ 
    *          was passed
    * @param: $rs Recordset to be packaged into an array
    */
-	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)) {
@@ -572,7 +659,8 @@ 
     *
     * @return string
     */
-   function getVersion() {
+   function getVersion()
+   {
        return mysql_get_server_info();
    }
    
@@ -583,20 +671,19 @@ 
     * @param string $str
     * @return string 
     */
-   function replaceFullTableName($str,$force=null) {
+   function replaceFullTableName($str,$force=null)
+   {
        
        $str = trim($str);
        $dbase  = trim($this->config['dbase'],'`');
        $prefix = $this->config['table_prefix'];
-       if(!empty($force))
-       {
+       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;
        }
-       else $result = $str;
        
        return $result;
    }
@@ -604,7 +691,9 @@ 
    function optimize($table_name)
    {
        $rs = $this->query("OPTIMIZE TABLE {$table_name}");
-       if($rs) $rs = $this->query("ALTER TABLE {$table_name}");
+       if($rs) {
+           $rs = $this->query("ALTER TABLE {$table_name}");
+       }
        return $rs;
    }
    
@@ -614,23 +703,31 @@ 
        return $rs;
    }
 
-  function dataSeek($result, $row_number) {
+  function dataSeek($result, $row_number)
+  {
     return mysql_data_seek($result, $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

@@ -16,14 +16,14 @@ 
     * @name:  DBAPI
     *
     */
-   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'];
       $this->initDataTypes();
    }
 
@@ -236,9 +236,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}");
       }
    }
@@ -264,10 +264,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}");
    }
 
    /**
@@ -292,8 +292,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}");
       }
    }
 
@@ -319,8 +319,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}");
                } else {
                   $ds = $this->select($fromfields, $fromtable, $where, '', $limit);
@@ -391,7 +391,7 @@ 
     * @name:  getInsertId
     *
     */
-   function getInsertId($conn=NULL) {
+   function getInsertId($conn=null) {
       if( !is_resource($conn)) $conn =& $this->conn;
       return mysql_insert_id($conn);
    }
@@ -400,7 +400,7 @@ 
     * @name:  getAffectedRows
     *
     */
-   function getAffectedRows($conn=NULL) {
+   function getAffectedRows($conn=null) {
       if (!is_resource($conn)) $conn =& $this->conn;
       return mysql_affected_rows($conn);
    }
@@ -409,7 +409,7 @@ 
     * @name:  getLastError
     *
     */
-   function getLastError($conn=NULL) {
+   function getLastError($conn=null) {
       if (!is_resource($conn)) $conn =& $this->conn;
       return mysql_error($conn);
    }
@@ -610,7 +610,7 @@ 
    
    function truncate($table_name)
    {
-       $rs = $this->query("TRUNCATE {$table_name}");
+       $rs = $this->query("truncate {$table_name}");
        return $rs;
    }
 

Doc Comments +10 added lines

@@ -452,6 +452,7 @@ 
     * @name:  getColumn
     * @desc:  returns an array of the values found on colun $name
     * @param: $dsq - dataset or query string
+    * @param string $name
     */
    function getColumn($name, $dsq) {
       if (!is_resource($dsq))
@@ -601,6 +602,9 @@ 
        return $result;
    }
    
+   /**
+    * @param string $table_name
+    */
    function optimize($table_name)
    {
        $rs = $this->query("OPTIMIZE TABLE {$table_name}");
@@ -618,6 +622,9 @@ 
     return mysql_data_seek($result, $row_number);
   }
   
+    /**
+     * @return string
+     */
     function _getFieldsStringFromArray($fields=array()) {
         
         if(empty($fields)) return '*';
@@ -630,6 +637,9 @@ 
         return join(',', $_);
     }
     
+    /**
+     * @return string
+     */
     function _getFromStringFromArray($tables=array()) {
         $_ = array();
         foreach($tables as $k=>$v) {

manager/includes/extenders/ex_dbapi.inc.php

Spacing +3 added lines, -3 removed lines

@@ -9,9 +9,9 @@
 
 if (empty($database_type)) $database_type = 'mysql';
 
-if (!include_once MODX_MANAGER_PATH . 'includes/extenders/dbapi.' . $database_type . '.class.inc.php'){
+if (!include_once MODX_MANAGER_PATH.'includes/extenders/dbapi.'.$database_type.'.class.inc.php') {
     return false;
-}else{
-    $this->db= new DBAPI;
+} else {
+    $this->db = new DBAPI;
     return true;
 }

Braces +5 added lines, -3 removed lines

@@ -7,11 +7,13 @@
 
 global $database_type;
 
-if (empty($database_type)) $database_type = 'mysql';
+if (empty($database_type)) {
+    $database_type = 'mysql';
+}
 
-if (!include_once MODX_MANAGER_PATH . 'includes/extenders/dbapi.' . $database_type . '.class.inc.php'){
+if (!include_once MODX_MANAGER_PATH . 'includes/extenders/dbapi.' . $database_type . '.class.inc.php') {
     return false;
-}else{
+} else {
     $this->db= new DBAPI;
     return true;
 }

manager/includes/extenders/phpcompat.class.inc.php

Indentation +16 added lines, -16 removed lines

@@ -2,26 +2,26 @@
 // todo file_put_contents(), strftime(), mb_*()
 class PHPCOMPAT
 {
-	function __construct()
-	{
-	}
+    function __construct()
+    {
+    }
 	
-	function htmlspecialchars($str='', $flags = ENT_COMPAT, $encode='')
-	{
-		global $modx;
+    function htmlspecialchars($str='', $flags = ENT_COMPAT, $encode='')
+    {
+        global $modx;
 		
-		if($str=='') return '';
+        if($str=='') return '';
 		
-		if($encode=='') $encode = $modx->config['modx_charset'];
+        if($encode=='') $encode = $modx->config['modx_charset'];
 		
-		$ent_str = htmlspecialchars($str, $flags, $encode);
+        $ent_str = htmlspecialchars($str, $flags, $encode);
 		
-		if(!empty($str) && empty($ent_str))
-		{
-			$detect_order = implode(',', mb_detect_order());
-			$ent_str = mb_convert_encoding($str, $encode, $detect_order); 
-		}
+        if(!empty($str) && empty($ent_str))
+        {
+            $detect_order = implode(',', mb_detect_order());
+            $ent_str = mb_convert_encoding($str, $encode, $detect_order); 
+        }
 		
-		return $ent_str;
-	}
+        return $ent_str;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -6,17 +6,17 @@
 	{
 	}
 	
-	function htmlspecialchars($str='', $flags = ENT_COMPAT, $encode='')
+	function htmlspecialchars($str = '', $flags = ENT_COMPAT, $encode = '')
 	{
 		global $modx;
 		
-		if($str=='') return '';
+		if ($str == '') return '';
 		
-		if($encode=='') $encode = $modx->config['modx_charset'];
+		if ($encode == '') $encode = $modx->config['modx_charset'];
 		
 		$ent_str = htmlspecialchars($str, $flags, $encode);
 		
-		if(!empty($str) && empty($ent_str))
+		if (!empty($str) && empty($ent_str))
 		{
 			$detect_order = implode(',', mb_detect_order());
 			$ent_str = mb_convert_encoding($str, $encode, $detect_order); 

Braces +7 added lines, -4 removed lines

@@ -10,14 +10,17 @@
 	{
 		global $modx;
 		
-		if($str=='') return '';
+		if($str=='') {
+		    return '';
+		}
 		
-		if($encode=='') $encode = $modx->config['modx_charset'];
+		if($encode=='') {
+		    $encode = $modx->config['modx_charset'];
+		}
 		
 		$ent_str = htmlspecialchars($str, $flags, $encode);
 		
-		if(!empty($str) && empty($ent_str))
-		{
+		if(!empty($str) && empty($ent_str)) {
 			$detect_order = implode(',', mb_detect_order());
 			$ent_str = mb_convert_encoding($str, $encode, $detect_order); 
 		}

Doc Comments +3 added lines

@@ -6,6 +6,9 @@
 	{
 	}
 	
+	/**
+	 * @param integer $flags
+	 */
 	function htmlspecialchars($str='', $flags = ENT_COMPAT, $encode='')
 	{
 		global $modx;

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

Indentation +2 added lines, -2 removed lines

@@ -598,7 +598,7 @@ 
                     else               $opt = true;
                 }
                 elseif(isset($modx->config['mce_element_format'])&&$modx->config['mce_element_format']==='html')
-                                       $opt = false;
+                                        $opt = false;
                 else                   $opt = true;
                 return nl2br($value,$opt);
             case 'ltrim':
@@ -1022,7 +1022,7 @@ 
         {
             $bt = $content;
             if(strpos($content,'[*')!==false && $modx->documentIdentifier)
-                                              $content = $modx->mergeDocumentContent($content);
+                                                $content = $modx->mergeDocumentContent($content);
             if(strpos($content,'[(')!==false) $content = $modx->mergeSettingsContent($content);
             if(strpos($content,'{{')!==false) $content = $modx->mergeChunkContent($content);
             if(strpos($content,'[!')!==false) $content = str_replace(array('[!','!]'),array('[[',']]'),$content);

Spacing +342 added lines, -342 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-if(!defined('MODX_CORE_PATH')) define('MODX_CORE_PATH', MODX_MANAGER_PATH.'includes/');
+if (!defined('MODX_CORE_PATH')) define('MODX_CORE_PATH', MODX_MANAGER_PATH.'includes/');
 
-class MODIFIERS {
+class MODIFIERS{
     
     var $placeholders = array();
     var $vars = array();
@@ -24,14 +24,14 @@ 
         $this->condModifiers = '=,is,eq,equals,ne,neq,notequals,isnot,isnt,not,%,isempty,isnotempty,isntempty,>=,gte,eg,gte,greaterthan,>,gt,isgreaterthan,isgt,lowerthan,<,lt,<=,lte,islte,islowerthan,islt,el,find,in,inarray,in_array,fnmatch,wcard,wcard_match,wildcard,wildcard_match,is_file,is_dir,file_exists,is_readable,is_writable,is_image,regex,preg,preg_match,memberof,mo,isinrole,ir';
     }
     
-    function phxFilter($key,$value,$modifiers)
+    function phxFilter($key, $value, $modifiers)
     {
         global $modx;
-        if(substr($modifiers,0,3)!=='id(') $value = $this->parseDocumentSource($value);
+        if (substr($modifiers, 0, 3) !== 'id(') $value = $this->parseDocumentSource($value);
         $this->srcValue = $value;
         $modifiers = trim($modifiers);
-        $modifiers = ':'.trim($modifiers,':');
-        $modifiers = str_replace(array("\r\n","\r"), "\n", $modifiers);
+        $modifiers = ':'.trim($modifiers, ':');
+        $modifiers = str_replace(array("\r\n", "\r"), "\n", $modifiers);
         $modifiers = $this->splitEachModifiers($modifiers);
         
         $this->placeholders = array();
@@ -39,117 +39,117 @@ 
         $this->placeholders['dummy'] = '';
         $this->condition = array();
         $this->vars = array();
-        $this->vars['name']    = & $key;
-        $value = $this->parsePhx($key,$value,$modifiers);
+        $this->vars['name'] = & $key;
+        $value = $this->parsePhx($key, $value, $modifiers);
         $this->vars = array();
         return $value;
     }
     
-    function _getDelim($mode,$modifiers) {
-        $c = substr($modifiers,0,1);
-        if(!in_array($c, array('"', "'", '`')) ) return false;
+    function _getDelim($mode, $modifiers){
+        $c = substr($modifiers, 0, 1);
+        if (!in_array($c, array('"', "'", '`'))) return false;
         
-        $modifiers = substr($modifiers,1);
-        $closure = $mode=='(' ? "{$c})" : $c;
-        if(strpos($modifiers, $closure)===false) return false;
+        $modifiers = substr($modifiers, 1);
+        $closure = $mode == '(' ? "{$c})" : $c;
+        if (strpos($modifiers, $closure) === false) return false;
         
         return  $c;
     }
     
-    function _getOpt($mode,$delim,$modifiers) {
-        if($delim) {
-            if($mode=='(') return substr($modifiers,1,strpos($modifiers, $delim . ')' )-1);
+    function _getOpt($mode, $delim, $modifiers){
+        if ($delim) {
+            if ($mode == '(') return substr($modifiers, 1, strpos($modifiers, $delim.')') - 1);
             
-            return substr($modifiers,1,strpos($modifiers,$delim,1)-1);
+            return substr($modifiers, 1, strpos($modifiers, $delim, 1) - 1);
         }
         else {
-            if($mode=='(') return substr($modifiers,0,strpos($modifiers, ')') );
+            if ($mode == '(') return substr($modifiers, 0, strpos($modifiers, ')'));
             
             $chars = str_split($modifiers);
-            $opt='';
-            foreach($chars as $c) {
-                if($c==':' || $c==')') break;
-                $opt .=$c;
+            $opt = '';
+            foreach ($chars as $c) {
+                if ($c == ':' || $c == ')') break;
+                $opt .= $c;
             }
             return $opt;
         }
     }
-    function _getRemainModifiers($mode,$delim,$modifiers) {
-        if($delim) {
-            if($mode=='(')
-                return $this->_fetchContent($modifiers, $delim . ')');
+    function _getRemainModifiers($mode, $delim, $modifiers){
+        if ($delim) {
+            if ($mode == '(')
+                return $this->_fetchContent($modifiers, $delim.')');
             else {
                 $modifiers = trim($modifiers);
-                $modifiers = substr($modifiers,1);
+                $modifiers = substr($modifiers, 1);
                 return $this->_fetchContent($modifiers, $delim);
             }
         }
         else {
-            if($mode=='(') return $this->_fetchContent($modifiers, ')');
+            if ($mode == '(') return $this->_fetchContent($modifiers, ')');
             $chars = str_split($modifiers);
-            foreach($chars as $c) {
-                if($c==':') return $modifiers;
-                else $modifiers = substr($modifiers,1);
+            foreach ($chars as $c) {
+                if ($c == ':') return $modifiers;
+                else $modifiers = substr($modifiers, 1);
             }
             return $modifiers;
         }
     }
     
-    function _fetchContent($string,$delim) {
+    function _fetchContent($string, $delim){
         $len = strlen($delim);
         $string = $this->parseDocumentSource($string);
-        return substr($string,strpos($string, $delim)+$len);
+        return substr($string, strpos($string, $delim) + $len);
     }
     
-    function splitEachModifiers($modifiers) {
+    function splitEachModifiers($modifiers){
         global $modx;
         
         $cmd = '';
         $bt = '';
-        while($bt!==$modifiers) {
+        while ($bt !== $modifiers) {
             $bt = $modifiers;
-            $c = substr($modifiers,0,1);
-            $modifiers = substr($modifiers,1);
+            $c = substr($modifiers, 0, 1);
+            $modifiers = substr($modifiers, 1);
             
-            if($c===':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) { // :=, :!=, :<=, :>=, :!<=, :!>=
-                $c = substr($modifiers,strlen($match[1]),1);
+            if ($c === ':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) { // :=, :!=, :<=, :>=, :!<=, :!>=
+                $c = substr($modifiers, strlen($match[1]), 1);
                 $debuginfo = "#i=0 #c=[{$c}] #m=[{$modifiers}]";
-                if($c==='(') $modifiers = substr($modifiers,strlen($match[1])+1);
-                else         $modifiers = substr($modifiers,strlen($match[1]));
+                if ($c === '(') $modifiers = substr($modifiers, strlen($match[1]) + 1);
+                else         $modifiers = substr($modifiers, strlen($match[1]));
                 
-                $delim     = $this->_getDelim($c,$modifiers);
-                $opt       = $this->_getOpt($c,$delim,$modifiers);
-                $modifiers = trim($this->_getRemainModifiers($c,$delim,$modifiers));
+                $delim     = $this->_getDelim($c, $modifiers);
+                $opt       = $this->_getOpt($c, $delim, $modifiers);
+                $modifiers = trim($this->_getRemainModifiers($c, $delim, $modifiers));
                 
-                $result[]=array('cmd'=>trim($match[1]),'opt'=>$opt,'debuginfo'=>$debuginfo);
+                $result[] = array('cmd'=>trim($match[1]), 'opt'=>$opt, 'debuginfo'=>$debuginfo);
                 $cmd = '';
             }
-            elseif(in_array($c,array('+','-','*','/')) && preg_match('@^[0-9]+@', $modifiers, $match)) { // :+3, :-3, :*3 ...
-                $modifiers = substr($modifiers,strlen($match[0]));
-                $result[]=array('cmd'=>'math','opt'=>'%s'.$c.$match[0]);
+            elseif (in_array($c, array('+', '-', '*', '/')) && preg_match('@^[0-9]+@', $modifiers, $match)) { // :+3, :-3, :*3 ...
+                $modifiers = substr($modifiers, strlen($match[0]));
+                $result[] = array('cmd'=>'math', 'opt'=>'%s'.$c.$match[0]);
                 $cmd = '';
             }
-            elseif($c==='(' || $c==='=') {
+            elseif ($c === '(' || $c === '=') {
                 $modifiers = $m1 = trim($modifiers);
-                $delim     = $this->_getDelim($c,$modifiers);
-                $opt       = $this->_getOpt($c,$delim,$modifiers);
-                $modifiers = trim($this->_getRemainModifiers($c,$delim,$modifiers));
+                $delim     = $this->_getDelim($c, $modifiers);
+                $opt       = $this->_getOpt($c, $delim, $modifiers);
+                $modifiers = trim($this->_getRemainModifiers($c, $delim, $modifiers));
                 $debuginfo = "#i=1 #c=[{$c}] #delim=[{$delim}] #m1=[{$m1}] remainMdf=[{$modifiers}]";
                 
-                $result[]=array('cmd'=>trim($cmd),'opt'=>$opt,'debuginfo'=>$debuginfo);
+                $result[] = array('cmd'=>trim($cmd), 'opt'=>$opt, 'debuginfo'=>$debuginfo);
                 
                 $cmd = '';
             }
-            elseif($c==':') {
+            elseif ($c == ':') {
                 $debuginfo = "#i=2 #c=[{$c}] #m=[{$modifiers}]";
-                if($cmd!=='') $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
+                if ($cmd !== '') $result[] = array('cmd'=>trim($cmd), 'opt'=>'', 'debuginfo'=>$debuginfo);
                 
                 $cmd = '';
             }
-            elseif(trim($modifiers)=='' && trim($cmd)!=='') {
+            elseif (trim($modifiers) == '' && trim($cmd) !== '') {
                 $debuginfo = "#i=3 #c=[{$c}] #m=[{$modifiers}]";
                 $cmd .= $c;
-                $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
+                $result[] = array('cmd'=>trim($cmd), 'opt'=>'', 'debuginfo'=>$debuginfo);
                 
                 break;
             }
@@ -158,64 +158,64 @@ 
             }
         }
         
-        if(empty($result)) return array();
+        if (empty($result)) return array();
         
-        foreach($result as $i=>$a)
+        foreach ($result as $i=>$a)
         {
             $a['opt'] = $this->parseDocumentSource($a['opt']);
-            $result[$i]['opt'] = $modx->mergePlaceholderContent($a['opt'],$this->placeholders);
+            $result[$i]['opt'] = $modx->mergePlaceholderContent($a['opt'], $this->placeholders);
         }
         
         return $result;
     }
     
-    function parsePhx($key,$value,$modifiers)
+    function parsePhx($key, $value, $modifiers)
     {
         global $modx;
-        $cacheKey = md5(sprintf('parsePhx#%s#%s#%s',$key,$value,print_r($modifiers,true)));
-        if(isset($this->tmpCache[$cacheKey])) return $this->tmpCache[$cacheKey];
-        if(empty($modifiers)) return '';
+        $cacheKey = md5(sprintf('parsePhx#%s#%s#%s', $key, $value, print_r($modifiers, true)));
+        if (isset($this->tmpCache[$cacheKey])) return $this->tmpCache[$cacheKey];
+        if (empty($modifiers)) return '';
         
-        foreach($modifiers as $m)
+        foreach ($modifiers as $m)
         {
             $lastKey = strtolower($m['cmd']);
         }
-        $_ = explode(',',$this->condModifiers);
-        if(in_array($lastKey,$_))
+        $_ = explode(',', $this->condModifiers);
+        if (in_array($lastKey, $_))
         {
-            $modifiers[] = array('cmd'=>'then','opt'=>'1');
-            $modifiers[] = array('cmd'=>'else','opt'=>'0');
+            $modifiers[] = array('cmd'=>'then', 'opt'=>'1');
+            $modifiers[] = array('cmd'=>'else', 'opt'=>'0');
         }
         
-        foreach($modifiers as $i=>$a)
+        foreach ($modifiers as $i=>$a)
         {
-            $value = $this->Filter($key,$value, $a['cmd'], $a['opt']);
+            $value = $this->Filter($key, $value, $a['cmd'], $a['opt']);
         }
         $this->tmpCache[$cacheKey] = $value;
         return $value;
     }
     
     // Parser: modifier detection and eXtended processing if needed
-    function Filter($key, $value, $cmd, $opt='')
+    function Filter($key, $value, $cmd, $opt = '')
     {
         global $modx;
         
-        if($key==='documentObject') $value = $modx->documentIdentifier;
+        if ($key === 'documentObject') $value = $modx->documentIdentifier;
         $cmd = $this->parseDocumentSource($cmd);
-        if(preg_match('@^[1-9][/0-9]*$@',$cmd))
+        if (preg_match('@^[1-9][/0-9]*$@', $cmd))
         {
-            if(strpos($cmd,'/')!==false)
-                $cmd = $this->substr($cmd,strrpos($cmd,'/')+1);
+            if (strpos($cmd, '/') !== false)
+                $cmd = $this->substr($cmd, strrpos($cmd, '/') + 1);
             $opt = $cmd;
             $cmd = 'id';
         }
         
-        if(isset($modx->snippetCache["phx:{$cmd}"]))   $this->elmName = "phx:{$cmd}";
-        elseif(isset($modx->chunkCache["phx:{$cmd}"])) $this->elmName = "phx:{$cmd}";
+        if (isset($modx->snippetCache["phx:{$cmd}"]))   $this->elmName = "phx:{$cmd}";
+        elseif (isset($modx->chunkCache["phx:{$cmd}"])) $this->elmName = "phx:{$cmd}";
         else                                           $this->elmName = '';
         
         $cmd = strtolower($cmd);
-        if($this->elmName!=='')
+        if ($this->elmName !== '')
             $value = $this->getValueFromElement($key, $value, $cmd, $opt);
         else
             $value = $this->getValueFromPreset($key, $value, $cmd, $opt);
@@ -225,12 +225,12 @@ 
         return $value;
     }
     
-    function isEmpty($cmd,$value)
+    function isEmpty($cmd, $value)
     {
-        if($value!=='') return false;
+        if ($value !== '') return false;
         
-        $_ = explode(',', $this->condModifiers . ',_default,default,if,input,or,and,show,this,select,switch,then,else,id,ifempty,smart_desc,smart_description,summary');
-        if(in_array($cmd,$_)) return false;
+        $_ = explode(',', $this->condModifiers.',_default,default,if,input,or,and,show,this,select,switch,then,else,id,ifempty,smart_desc,smart_description,summary');
+        if (in_array($cmd, $_)) return false;
         else                  return true;
     }
     
@@ -238,7 +238,7 @@ 
     {
         global $modx;
         
-        if($this->isEmpty($cmd,$value)) return '';
+        if ($this->isEmpty($cmd, $value)) return '';
         
         $this->key = $key;
         $this->value  = $value;
@@ -249,7 +249,7 @@ 
             #####  Conditional Modifiers 
             case 'input':
             case 'if':
-                if(!$opt) return $value;
+                if (!$opt) return $value;
                 return $opt;
             case '=':
             case 'eq':
@@ -262,9 +262,9 @@ 
             case 'isnot':
             case 'isnt':
             case 'not':
-                $this->condition[] = intval($value != $opt);break;
+                $this->condition[] = intval($value != $opt); break;
             case '%':
-                $this->condition[] = intval($value%$opt==0);break;
+                $this->condition[] = intval($value % $opt == 0); break;
             case 'isempty':
                 $this->condition[] = intval(empty($value)); break;
             case 'isntempty':
@@ -274,57 +274,57 @@ 
             case 'gte':
             case 'eg':
             case 'isgte':
-                $this->condition[] = intval($value >= $opt);break;
+                $this->condition[] = intval($value >= $opt); break;
             case '<=':
             case 'lte':
             case 'el':
             case 'islte':
-                $this->condition[] = intval($value <= $opt);break;
+                $this->condition[] = intval($value <= $opt); break;
             case '>':
             case 'gt':
             case 'greaterthan':
             case 'isgreaterthan':
             case 'isgt':
-                $this->condition[] = intval($value > $opt);break;
+                $this->condition[] = intval($value > $opt); break;
             case '<':
             case 'lt':
             case 'lowerthan':
             case 'islowerthan':
             case 'islt':
-                $this->condition[] = intval($value < $opt);break;
+                $this->condition[] = intval($value < $opt); break;
             case 'find':
-                $this->condition[] = intval(strpos($value, $opt)!==false);break;
+                $this->condition[] = intval(strpos($value, $opt) !== false); break;
             case 'inarray':
             case 'in_array':
             case 'in':
                 $opt = explode(',', $opt);
-                $this->condition[] = intval(in_array($value, $opt)!==false);break;
+                $this->condition[] = intval(in_array($value, $opt) !== false); break;
             case 'wildcard_match':
             case 'wcard_match':
             case 'wildcard':
             case 'wcard':
             case 'fnmatch':
-                $this->condition[] = intval(fnmatch($opt, $value)!==false);break;
+                $this->condition[] = intval(fnmatch($opt, $value) !== false); break;
             case 'is_file':
             case 'is_dir':
             case 'file_exists':
             case 'is_readable':
             case 'is_writable':
-                if(!$opt) $path = $value;
+                if (!$opt) $path = $value;
                 else      $path = $opt;
-                if(strpos($path,MODX_MANAGER_PATH)!==false) exit('Can not read core path');
-                if(strpos($path,$modx->config['base_path'])===false) $path = ltrim($path,'/');
-                $this->condition[] = intval($cmd($path)!==false);break;
+                if (strpos($path, MODX_MANAGER_PATH) !== false) exit('Can not read core path');
+                if (strpos($path, $modx->config['base_path']) === false) $path = ltrim($path, '/');
+                $this->condition[] = intval($cmd($path) !== false); break;
             case 'is_image':
-                if(!$opt) $path = $value;
+                if (!$opt) $path = $value;
                 else      $path = $opt;
-                if(!is_file($path)) {$this->condition[]='0';break;}
+                if (!is_file($path)) {$this->condition[] = '0'; break; }
                 $_ = getimagesize($path);
-                $this->condition[] = intval($_[0]);break;
+                $this->condition[] = intval($_[0]); break;
             case 'regex':
             case 'preg':
             case 'preg_match':
-                $this->condition[] = intval(preg_match($opt,$value));break;
+                $this->condition[] = intval(preg_match($opt, $value)); break;
             case 'isinrole':
             case 'ir':
             case 'memberof':
@@ -333,50 +333,50 @@ 
                 $this->condition[] = $this->includeMdfFile('memberof');
                 break;
             case 'or':
-                $this->condition[] = '||';break;
+                $this->condition[] = '||'; break;
             case 'and':
-                $this->condition[] = '&&';break;
+                $this->condition[] = '&&'; break;
             case 'show':
             case 'this':
-                $conditional = join(' ',$this->condition);
+                $conditional = join(' ', $this->condition);
                 $isvalid = intval(eval("return ({$conditional});"));
                 if ($isvalid) return $this->srcValue;
                 return NULL;
             case 'then':
-                $conditional = join(' ',$this->condition);
+                $conditional = join(' ', $this->condition);
                 $isvalid = intval(eval("return ({$conditional});"));
                 if ($isvalid)  return $opt;
                 return null;
             case 'else':
-                $conditional = join(' ',$this->condition);
+                $conditional = join(' ', $this->condition);
                 $isvalid = intval(eval("return ({$conditional});"));
                 if (!$isvalid) return $opt;
                 break;
             case 'select':
             case 'switch':
-                $raw = explode('&',$opt);
+                $raw = explode('&', $opt);
                 $map = array();
                 $c = count($raw);
-                for($m=0; $m<$c; $m++) {
-                    $mi = explode('=',$raw[$m],2);
+                for ($m = 0; $m < $c; $m++) {
+                    $mi = explode('=', $raw[$m], 2);
                     $map[$mi[0]] = $mi[1];
                 }
-                if(isset($map[$value])) return $map[$value];
+                if (isset($map[$value])) return $map[$value];
                 else                    return '';
             ##### End of Conditional Modifiers
             
             #####  Encode / Decode / Hash / Escape
             case 'htmlent':
             case 'htmlentities':
-                return htmlentities($value,ENT_QUOTES,$modx->config['modx_charset']);
+                return htmlentities($value, ENT_QUOTES, $modx->config['modx_charset']);
             case 'html_entity_decode':
             case 'decode_html':
             case 'html_decode':
-                return html_entity_decode($value,ENT_QUOTES,$modx->config['modx_charset']);
+                return html_entity_decode($value, ENT_QUOTES, $modx->config['modx_charset']);
             case 'esc':
             case 'escape':
                 $value = preg_replace('/&amp;(#[0-9]+|[a-z]+);/i', '&$1;', htmlspecialchars($value, ENT_QUOTES, $modx->config['modx_charset']));
-                return str_replace(array('[', ']', '`'),array('&#91;', '&#93;', '&#96;'),$value);
+                return str_replace(array('[', ']', '`'), array('&#91;', '&#93;', '&#96;'), $value);
             case 'sql_escape':
             case 'encode_js':
                 return $modx->db->escape($value);
@@ -386,39 +386,39 @@ 
             case 'html_encode':
                 return preg_replace('/&amp;(#[0-9]+|[a-z]+);/i', '&$1;', htmlspecialchars($value, ENT_QUOTES, $modx->config['modx_charset']));
             case 'spam_protect':
-                return str_replace(array('@','.'),array('&#64;','&#46;'),$value);
+                return str_replace(array('@', '.'), array('&#64;', '&#46;'), $value);
             case 'strip':
-                if($opt==='') $opt = ' ';
+                if ($opt === '') $opt = ' ';
                 return preg_replace('/[\n\r\t\s]+/', $opt, $value);
             case 'strip_linefeeds':
-                return str_replace(array("\n","\r"), '', $value);
+                return str_replace(array("\n", "\r"), '', $value);
             case 'notags':
             case 'strip_tags':
             case 'remove_html':
-                if($opt!=='')
+                if ($opt !== '')
                 {
                     $param = array();
-                    foreach(explode(',',$opt) as $v)
+                    foreach (explode(',', $opt) as $v)
                     {
-                        $v = trim($v,'</> ');
+                        $v = trim($v, '</> ');
                         $param[] = "<{$v}>";
                     }
-                    $params = join(',',$param);
+                    $params = join(',', $param);
                 }
                 else $params = '';
-                if(!strpos($params,'<br>')===false) {
-                    $value = preg_replace('@(<br[ /]*>)\n@','$1',$value);
-                    $value = preg_replace('@<br[ /]*>@',"\n",$value);
+                if (!strpos($params, '<br>') === false) {
+                    $value = preg_replace('@(<br[ /]*>)\n@', '$1', $value);
+                    $value = preg_replace('@<br[ /]*>@', "\n", $value);
                 }
-                return $this->strip_tags($value,$params);
+                return $this->strip_tags($value, $params);
             case 'urlencode':
             case 'url_encode':
             case 'encode_url':
                 return urlencode($value);
             case 'base64_decode':
-                if($opt!=='false') $opt = true;
+                if ($opt !== 'false') $opt = true;
                 else               $opt = false;
-                return base64_decode($value,$opt);
+                return base64_decode($value, $opt);
             case 'encode_sha1': $cmd = 'sha1';
             case 'addslashes':
             case 'urldecode':
@@ -442,18 +442,18 @@ 
             case 'upper_case':
                 return $this->strtoupper($value);
             case 'capitalize':
-                $_ = explode(' ',$value);
-                foreach($_ as $i=>$v)
+                $_ = explode(' ', $value);
+                foreach ($_ as $i=>$v)
                 {
                     $_[$i] = ucfirst($v);
                 }
-                return join(' ',$_);
+                return join(' ', $_);
             case 'zenhan':
-                if(empty($opt)) $opt='VKas';
-                return mb_convert_kana($value,$opt,$modx->config['modx_charset']);
+                if (empty($opt)) $opt = 'VKas';
+                return mb_convert_kana($value, $opt, $modx->config['modx_charset']);
             case 'hanzen':
-                if(empty($opt)) $opt='VKAS';
-                return mb_convert_kana($value,$opt,$modx->config['modx_charset']);
+                if (empty($opt)) $opt = 'VKAS';
+                return mb_convert_kana($value, $opt, $modx->config['modx_charset']);
             case 'str_shuffle':
             case 'shuffle':
                 return $this->str_shuffle($value);
@@ -467,7 +467,7 @@ 
                 return $this->strlen($value);
             case 'count_words':
                 $value = trim($value);
-                return count(preg_split('/\s+/',$value));
+                return count(preg_split('/\s+/', $value));
             case 'str_word_count':
             case 'word_count':
             case 'wordcount':
@@ -475,55 +475,55 @@ 
             case 'count_paragraphs':
                 $value = trim($value);
                 $value = preg_replace('/\r/', '', $value);
-                return count(preg_split('/\n+/',$value));
+                return count(preg_split('/\n+/', $value));
             case 'strpos':
-                if($opt!=0&&empty($opt)) return $value;
-                return $this->strpos($value,$opt);
+                if ($opt != 0 && empty($opt)) return $value;
+                return $this->strpos($value, $opt);
             case 'wordwrap':
                 // default: 70
                   $wrapat = intval($opt) ? intval($opt) : 70;
                 if (version_compare(PHP_VERSION, '5.3.0') >= 0) return $this->includeMdfFile('wordwrap');
-                else return preg_replace("@(\b\w+\b)@e","wordwrap('\\1',\$wrapat,' ',1)",$value);
+                else return preg_replace("@(\b\w+\b)@e", "wordwrap('\\1',\$wrapat,' ',1)", $value);
             case 'wrap_text':
-                $width = preg_match('/^[1-9][0-9]*$/',$opt) ? $opt : 70;
-                if($modx->config['manager_language']==='japanese-utf8') {
+                $width = preg_match('/^[1-9][0-9]*$/', $opt) ? $opt : 70;
+                if ($modx->config['manager_language'] === 'japanese-utf8') {
                     $chunk = array();
-                    $bt='';
-                    while($bt!=$value) {
+                    $bt = '';
+                    while ($bt != $value) {
                         $bt = $value;
-                        if($this->strlen($value)<$width) {
+                        if ($this->strlen($value) < $width) {
                             $chunk[] = $value;
                             break;
                         }
-                        $chunk[] = $this->substr($value,0,$width);
-                        $value = $this->substr($value,$width);
+                        $chunk[] = $this->substr($value, 0, $width);
+                        $value = $this->substr($value, $width);
                     }
-                    return join("\n",$chunk);
+                    return join("\n", $chunk);
                 }
                 else
-                    return wordwrap($value,$width,"\n",true);
+                    return wordwrap($value, $width, "\n", true);
             case 'substr':
-                if(empty($opt)) break;
-                if(strpos($opt,',')!==false) {
-                    list($b,$e) = explode(',',$opt,2);
-                    return $this->substr($value,$b,(int)$e);
+                if (empty($opt)) break;
+                if (strpos($opt, ',') !== false) {
+                    list($b, $e) = explode(',', $opt, 2);
+                    return $this->substr($value, $b, (int) $e);
                 }
-                else return $this->substr($value,$opt);
+                else return $this->substr($value, $opt);
             case 'limit':
             case 'trim_to': // http://www.movabletype.jp/documentation/appendices/modifiers/trim_to.html
-                if(strpos($opt,'+')!==false)
-                    list($len,$str) = explode('+',$opt,2);
+                if (strpos($opt, '+') !== false)
+                    list($len, $str) = explode('+', $opt, 2);
                 else {
                     $len = $opt;
                     $str = '';
                 }
-                if($len==='') $len = 100;
-                if(abs($len) > $this->strlen($value)) $str ='';
-                if(preg_match('/^[1-9][0-9]*$/',$len)) {
-                    return $this->substr($value,0,$len) . $str;
+                if ($len === '') $len = 100;
+                if (abs($len) > $this->strlen($value)) $str = '';
+                if (preg_match('/^[1-9][0-9]*$/', $len)) {
+                    return $this->substr($value, 0, $len).$str;
                 }
-                elseif(preg_match('/^\-[1-9][0-9]*$/',$len)) {
-                    return $str . $this->substr($value,$len);
+                elseif (preg_match('/^\-[1-9][0-9]*$/', $len)) {
+                    return $str.$this->substr($value, $len);
                 }
                 break;
             case 'summary':
@@ -532,81 +532,81 @@ 
                 return $this->includeMdfFile('summary');
             case 'replace':
             case 'str_replace':
-                if(empty($opt) || strpos($opt,',')===false) break;
-                if    (substr_count($opt, ',') ==1) $delim = ',';
-                elseif(substr_count($opt, '|') ==1) $delim = '|';
-                elseif(substr_count($opt, '=>')==1) $delim = '=>';
-                elseif(substr_count($opt, '/') ==1) $delim = '/';
+                if (empty($opt) || strpos($opt, ',') === false) break;
+                if (substr_count($opt, ',') == 1) $delim = ',';
+                elseif (substr_count($opt, '|') == 1) $delim = '|';
+                elseif (substr_count($opt, '=>') == 1) $delim = '=>';
+                elseif (substr_count($opt, '/') == 1) $delim = '/';
                 else break;
-                list($s,$r) = explode($delim,$opt);
-                if($value!=='') return str_replace($s,$r,$value);
+                list($s, $r) = explode($delim, $opt);
+                if ($value !== '') return str_replace($s, $r, $value);
                 break;
             case 'replace_to':
             case 'tpl':
-                if($value!=='') return str_replace(array('[+value+]','[+output+]','{value}','%s'),$value,$opt);
+                if ($value !== '') return str_replace(array('[+value+]', '[+output+]', '{value}', '%s'), $value, $opt);
                 break;
             case 'eachtpl':
-                $value = explode('||',$value);
+                $value = explode('||', $value);
                 $_ = array();
-                foreach($value as $v) {
-                    $_[] = str_replace(array('[+value+]','[+output+]','{value}','%s'),$v,$opt);
+                foreach ($value as $v) {
+                    $_[] = str_replace(array('[+value+]', '[+output+]', '{value}', '%s'), $v, $opt);
                 }
                 return join("\n", $_);
             case 'array_pop':
             case 'array_shift':
-                if(strpos($value,'||')!==false) $delim = '||';
+                if (strpos($value, '||') !== false) $delim = '||';
                 else                            $delim = ',';
-                return $cmd(explode($delim,$value));
+                return $cmd(explode($delim, $value));
             case 'preg_replace':
             case 'regex_replace':
-                if(empty($opt) || strpos($opt,',')===false) break;
-                list($s,$r) = explode(',',$opt,2);
-                if($value!=='') return preg_replace($s,$r,$value);
+                if (empty($opt) || strpos($opt, ',') === false) break;
+                list($s, $r) = explode(',', $opt, 2);
+                if ($value !== '') return preg_replace($s, $r, $value);
                 break;
             case 'cat':
             case 'concatenate':
             case '.':
-                if($value!=='') return $value . $opt;
+                if ($value !== '') return $value.$opt;
                 break;
             case 'sprintf':
             case 'string_format':
-                if($value!=='') return sprintf($opt,$value);
+                if ($value !== '') return sprintf($opt, $value);
                 break;
             case 'number_format':
-                    if($opt=='') $opt = 0;
-                    return number_format($value,$opt);
+                    if ($opt == '') $opt = 0;
+                    return number_format($value, $opt);
             case 'money_format':
-                    setlocale(LC_MONETARY,setlocale(LC_TIME,0));
-                    if($value!=='') return money_format($opt,(double)$value);
+                    setlocale(LC_MONETARY, setlocale(LC_TIME, 0));
+                    if ($value !== '') return money_format($opt, (double) $value);
                     break;
             case 'tobool':
                 return boolval($value);
             case 'nl2lf':
-                if($value!=='') return str_replace(array("\r\n","\n", "\r"), '\n', $value);
+                if ($value !== '') return str_replace(array("\r\n", "\n", "\r"), '\n', $value);
                 break;
             case 'br2nl':
                 return preg_replace('@<br[\s/]*>@i', "\n", $value);
             case 'nl2br':
                 if (version_compare(PHP_VERSION, '5.3.0', '<'))
                     return nl2br($value);
-                if($opt!=='')
+                if ($opt !== '')
                 {
                     $opt = trim($opt);
                     $opt = strtolower($opt);
-                    if($opt==='false') $opt = false;
-                    elseif($opt==='0') $opt = false;
+                    if ($opt === 'false') $opt = false;
+                    elseif ($opt === '0') $opt = false;
                     else               $opt = true;
                 }
-                elseif(isset($modx->config['mce_element_format'])&&$modx->config['mce_element_format']==='html')
+                elseif (isset($modx->config['mce_element_format']) && $modx->config['mce_element_format'] === 'html')
                                        $opt = false;
                 else                   $opt = true;
-                return nl2br($value,$opt);
+                return nl2br($value, $opt);
             case 'ltrim':
             case 'rtrim':
             case 'trim': // ref http://mblo.info/modifiers/custom-modifiers/rtrim_opt.html
-                if($opt==='')
+                if ($opt === '')
                     return $cmd($value);
-                else return $cmd($value,$opt);
+                else return $cmd($value, $opt);
             // These are all straight wrappers for PHP functions
             case 'ucfirst':
             case 'lcfirst':
@@ -617,16 +617,16 @@ 
             case 'strftime':
             case 'date':
             case 'dateformat':
-                if(empty($opt)) $opt = $modx->toDateFormat(null, 'formatOnly');
-                if(!preg_match('@^[0-9]+$@',$value)) $value = strtotime($value);
-                if(strpos($opt,'%')!==false)
-                    return strftime($opt,0+$value);
+                if (empty($opt)) $opt = $modx->toDateFormat(null, 'formatOnly');
+                if (!preg_match('@^[0-9]+$@', $value)) $value = strtotime($value);
+                if (strpos($opt, '%') !== false)
+                    return strftime($opt, 0 + $value);
                 else
-                    return date($opt,0+$value);
+                    return date($opt, 0 + $value);
             case 'time':
-                if(empty($opt)) $opt = '%H:%M';
-                if(!preg_match('@^[0-9]+$@',$value)) $value = strtotime($value);
-                return strftime($opt,0+$value);
+                if (empty($opt)) $opt = '%H:%M';
+                if (!preg_match('@^[0-9]+$@', $value)) $value = strtotime($value);
+                return strftime($opt, 0 + $value);
             case 'strtotime':
                 return strtotime($value);
             #####  mathematical function
@@ -635,40 +635,40 @@ 
             case 'tofloat':
                 return floatval($value);
             case 'round':
-                if(!$opt) $opt = 0;
-                return $cmd($value,$opt);
+                if (!$opt) $opt = 0;
+                return $cmd($value, $opt);
             case 'max':
             case 'min':
-                return $cmd(explode(',',$value));
+                return $cmd(explode(',', $value));
             case 'floor':
             case 'ceil':
             case 'abs':
                 return $cmd($value);
             case 'math':
             case 'calc':
-                $value = (int)$value;
-                if(empty($value)) $value = '0';
-                $filter = str_replace(array('[+value+]','[+output+]','{value}','%s'),'?',$opt);
-                $filter = preg_replace('@([a-zA-Z\n\r\t\s])@','',$filter);
-                if(strpos($filter,'?')===false) $filter = "?{$filter}";
-                $filter = str_replace('?',$value,$filter);
+                $value = (int) $value;
+                if (empty($value)) $value = '0';
+                $filter = str_replace(array('[+value+]', '[+output+]', '{value}', '%s'), '?', $opt);
+                $filter = preg_replace('@([a-zA-Z\n\r\t\s])@', '', $filter);
+                if (strpos($filter, '?') === false) $filter = "?{$filter}";
+                $filter = str_replace('?', $value, $filter);
                 return eval("return {$filter};");
             case 'count':
-                if($value=='') return 0;
-                $value = explode(',',$value);
+                if ($value == '') return 0;
+                $value = explode(',', $value);
                 return count($value);
             case 'sort':
             case 'rsort':
-                if(strpos($value,"\n")!==false) $delim="\n";
+                if (strpos($value, "\n") !== false) $delim = "\n";
                 else $delim = ',';
-                $swap = explode($delim,$value);
-                if(!$opt) $opt = SORT_REGULAR;
+                $swap = explode($delim, $value);
+                if (!$opt) $opt = SORT_REGULAR;
                 else      $opt = constant($opt);
-                $cmd($swap,$opt);
-                return join($delim,$swap);
+                $cmd($swap, $opt);
+                return join($delim, $swap);
             #####  Resource fields
             case 'id':
-                if($opt) return $this->getDocumentObject($opt,$key);
+                if ($opt) return $this->getDocumentObject($opt, $key);
                 break;
             case 'type':
             case 'contenttype':
@@ -705,36 +705,36 @@ 
             case 'privatemgr':
             case 'content_dispo':
             case 'hidemenu':
-                if($cmd==='contenttype') $cmd = 'contentType';
-                return $this->getDocumentObject($value,$cmd);
+                if ($cmd === 'contenttype') $cmd = 'contentType';
+                return $this->getDocumentObject($value, $cmd);
             case 'title':
-                $pagetitle = $this->getDocumentObject($value,'pagetitle');
-                $longtitle = $this->getDocumentObject($value,'longtitle');
+                $pagetitle = $this->getDocumentObject($value, 'pagetitle');
+                $longtitle = $this->getDocumentObject($value, 'longtitle');
                 return $longtitle ? $longtitle : $pagetitle;
             case 'shorttitle':
-                $pagetitle = $this->getDocumentObject($value,'pagetitle');
-                $menutitle = $this->getDocumentObject($value,'menutitle');
+                $pagetitle = $this->getDocumentObject($value, 'pagetitle');
+                $menutitle = $this->getDocumentObject($value, 'menutitle');
                 return $menutitle ? $menutitle : $pagetitle;
             case 'templatename':
-                $rs = $modx->db->select('templatename','[+prefix+]site_templates',"id='{$value}'");
+                $rs = $modx->db->select('templatename', '[+prefix+]site_templates', "id='{$value}'");
                 $templateName = $modx->db->getValue($rs);
                 return !$templateName ? '(blank)' : $templateName;
             case 'getfield':
-                if(!$opt) $opt = 'content';
-                return $modx->getField($opt,$value);
+                if (!$opt) $opt = 'content';
+                return $modx->getField($opt, $value);
             case 'children':
             case 'childids':
-                if($value=='') $value = 0; // 値がない場合はルートと見なす
+                if ($value == '') $value = 0; // 値がない場合はルートと見なす
                 $published = 1;
-                if($opt=='') $opt = 'page';
-                $_ = explode(',',$opt);
+                if ($opt == '') $opt = 'page';
+                $_ = explode(',', $opt);
                 $where = array();
-                foreach($_ as $opt) {
-                    switch(trim($opt)) {
+                foreach ($_ as $opt) {
+                    switch (trim($opt)) {
                         case 'page'; case '!folder'; case '!isfolder': $where[] = 'sc.isfolder=0'; break;
                         case 'folder'; case 'isfolder':                $where[] = 'sc.isfolder=1'; break;
-                        case  'menu';  case  'show_menu':              $where[] = 'sc.hidemenu=0'; break;
-                        case '!menu';  case '!show_menu':              $where[] = 'sc.hidemenu=1'; break;
+                        case  'menu'; case  'show_menu':              $where[] = 'sc.hidemenu=0'; break;
+                        case '!menu'; case '!show_menu':              $where[] = 'sc.hidemenu=1'; break;
                         case  'published':                             $published = 1; break;
                         case '!published':                             $published = 0; break;
                     }
@@ -742,69 +742,69 @@ 
                 $where = join(' AND ', $where);
                 $children = $modx->getDocumentChildren($value, $published, '0', 'id', $where);
                 $result = array();
-                foreach((array)$children as $child){
+                foreach ((array) $children as $child) {
                     $result[] = $child['id'];
                 }
                 return join(',', $result);
             case 'fullurl':
-                if(!is_numeric($value)) return $value;
+                if (!is_numeric($value)) return $value;
                 return $modx->makeUrl($value);
             case 'makeurl':
-                if(!is_numeric($value)) return $value;
-                if(!$opt) $opt = 'full';
-                return $modx->makeUrl($value,'','',$opt);
+                if (!is_numeric($value)) return $value;
+                if (!$opt) $opt = 'full';
+                return $modx->makeUrl($value, '', '', $opt);
                 
             #####  File system
             case 'getimageinfo':
             case 'imageinfo':
-                if(!is_file($value)) return '';
+                if (!is_file($value)) return '';
                 $_ = getimagesize($value);
-                if(!$_[0]) return '';
+                if (!$_[0]) return '';
                 $info['width']  = $_[0];
                 $info['height'] = $_[1];
-                if    ($_[0] > $_[1]) $info['aspect'] = 'landscape';
-                elseif($_[0] < $_[1]) $info['aspect'] = 'portrait';
+                if ($_[0] > $_[1]) $info['aspect'] = 'landscape';
+                elseif ($_[0] < $_[1]) $info['aspect'] = 'portrait';
                 else                  $info['aspect'] = 'square';
-                switch($_[2]) {
+                switch ($_[2]) {
                     case IMAGETYPE_GIF  : $info['type'] = 'gif'; break;
                     case IMAGETYPE_JPEG : $info['type'] = 'jpg'; break;
                     case IMAGETYPE_PNG  : $info['type'] = 'png'; break;
                     default             : $info['type'] = 'unknown';
                 }
                 $info['attrib'] = $_[3];
-                switch($opt) {
+                switch ($opt) {
                     case 'width' : return $info['width'];
                     case 'height': return $info['height'];
                     case 'aspect': return $info['aspect'];
                     case 'type'  : return $info['type'];
                     case 'attrib': return $info['attrib'];
-                    default      : return print_r($info,true);
+                    default      : return print_r($info, true);
                 }
             
             case 'file_get_contents':
             case 'readfile':
-                if(!is_file($value)) return $value;
+                if (!is_file($value)) return $value;
                 $value = realpath($value);
-                if(strpos($value,MODX_MANAGER_PATH)!==false) exit('Can not read core file');
-                $ext = strtolower(substr($value,-4));
-                if($ext==='.php') exit('Can not read php file');
-                if($ext==='.cgi') exit('Can not read cgi file');
+                if (strpos($value, MODX_MANAGER_PATH) !== false) exit('Can not read core file');
+                $ext = strtolower(substr($value, -4));
+                if ($ext === '.php') exit('Can not read php file');
+                if ($ext === '.cgi') exit('Can not read cgi file');
                 return file_get_contents($value);
             case 'filesize':
-                if($value == '') return '';
+                if ($value == '') return '';
                 $filename = $value;
                 
                 $site_url = $modx->config['site_url'];
-                if(strpos($filename,$site_url) === 0)
-                    $filename = substr($filename,0,strlen($site_url));
-                $filename = trim($filename,'/');
+                if (strpos($filename, $site_url) === 0)
+                    $filename = substr($filename, 0, strlen($site_url));
+                $filename = trim($filename, '/');
                 
-                $opt = trim($opt,'/');
-                if($opt!=='') $opt .= '/';
+                $opt = trim($opt, '/');
+                if ($opt !== '') $opt .= '/';
                 
                 $filename = MODX_BASE_PATH.$opt.$filename;
                 
-                if(is_file($filename)){
+                if (is_file($filename)) {
                     clearstatcache();
                     $size = filesize($filename);
                     return $size;
@@ -837,10 +837,10 @@ 
                 $this->opt = $cmd;
                 return $this->includeMdfFile('moduser');
             case 'userinfo':
-                if(empty($opt)) $this->opt = 'username';
+                if (empty($opt)) $this->opt = 'username';
                 return $this->includeMdfFile('moduser');
             case 'webuserinfo':
-                if(empty($opt)) $this->opt = 'username';
+                if (empty($opt)) $this->opt = 'username';
                 $this->value = -$value;
                 return $this->includeMdfFile('moduser');
             #####  Special functions 
@@ -851,28 +851,28 @@ 
             case 'ifnotempty':
                 if (!empty($value)) return $opt; break;
             case 'datagrid':
-                include_once(MODX_CORE_PATH . 'controls/datagrid.class.php');
+                include_once(MODX_CORE_PATH.'controls/datagrid.class.php');
                 $grd = new DataGrid();
                 $grd->ds = trim($value);
                 $grd->itemStyle = '';
                 $grd->altItemStyle = '';
-                $pos = strpos($value,"\n");
-                if($pos) $_ = substr($value,0,$pos);
+                $pos = strpos($value, "\n");
+                if ($pos) $_ = substr($value, 0, $pos);
                 else $_ = $pos;
-                $grd->cdelim = strpos($_,"\t")!==false ? 'tab' : ',';
+                $grd->cdelim = strpos($_, "\t") !== false ? 'tab' : ',';
                 return $grd->render();
             case 'rotate':
             case 'evenodd':
-                if(strpos($opt,',')===false) $opt = 'odd,even';
+                if (strpos($opt, ',') === false) $opt = 'odd,even';
                 $_ = explode(',', $opt);
                 $c = count($_);
                 $i = $value + $c;
                 $i = $i % $c;
                 return $_[$i];
             case 'takeval':
-                $arr = explode(",",$opt);
+                $arr = explode(",", $opt);
                 $idx = $value;
-                if(!is_numeric($idx)) return $value;
+                if (!is_numeric($idx)) return $value;
                 return $arr[$idx];
             case 'getimage':
                 return $this->includeMdfFile('getimage');
@@ -880,17 +880,17 @@ 
                     return $modx->nicesize($value);
             case 'googlemap':
             case 'googlemaps':
-                if(empty($opt)) $opt = 'border:none;width:500px;height:350px;';
+                if (empty($opt)) $opt = 'border:none;width:500px;height:350px;';
                 $tpl = '<iframe style="[+style+]" src="https://maps.google.co.jp/maps?ll=[+value+]&output=embed&z=15"></iframe>';
                 $ph['style'] = $opt;
                 $ph['value'] = $value;
-                return $modx->parseText($tpl,$ph);
+                return $modx->parseText($tpl, $ph);
             case 'youtube':
             case 'youtube16x9':
-                if(empty($opt)) $opt = 560;
-                $h = round($opt*0.5625);
+                if (empty($opt)) $opt = 560;
+                $h = round($opt * 0.5625);
                 $tpl = '<iframe width="%s" height="%s" src="https://www.youtube.com/embed/%s" frameborder="0" allowfullscreen></iframe>';
-                return sprintf($tpl,$opt,$h,$value);
+                return sprintf($tpl, $opt, $h, $value);
             //case 'youtube4x3':%s*0.75＋25
             case 'setvar':
                 $modx->placeholders[$opt] = $value;
@@ -920,7 +920,7 @@ 
         return $value;
     }
 
-    function includeMdfFile($cmd) {
+    function includeMdfFile($cmd){
         global $modx;
         $key = $this->key;
         $value  = $this->value;
@@ -931,54 +931,54 @@ 
     function getValueFromElement($key, $value, $cmd, $opt)
     {
         global $modx;
-        if( isset($modx->snippetCache[$this->elmName]) )
+        if (isset($modx->snippetCache[$this->elmName]))
         {
             $php = $modx->snippetCache[$this->elmName];
         }
         else
         {
             $esc_elmName = $modx->db->escape($this->elmName);
-            $result = $modx->db->select('snippet','[+prefix+]site_snippets',"name='{$esc_elmName}'");
+            $result = $modx->db->select('snippet', '[+prefix+]site_snippets', "name='{$esc_elmName}'");
             $total = $modx->db->getRecordCount($result);
-            if($total == 1)
+            if ($total == 1)
             {
                 $row = $modx->db->getRow($result);
                 $php = $row['snippet'];
             }
-            elseif($total == 0)
+            elseif ($total == 0)
             {
                 $assets_path = MODX_BASE_PATH.'assets/';
-                if(is_file($assets_path."modifiers/mdf_{$cmd}.inc.php"))
+                if (is_file($assets_path."modifiers/mdf_{$cmd}.inc.php"))
                     $modifiers_path = $assets_path."modifiers/mdf_{$cmd}.inc.php";
-                elseif(is_file($assets_path."plugins/phx/modifiers/{$cmd}.phx.php"))
+                elseif (is_file($assets_path."plugins/phx/modifiers/{$cmd}.phx.php"))
                     $modifiers_path = $assets_path."plugins/phx/modifiers/{$cmd}.phx.php";
-                elseif(is_file(MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php"))
+                elseif (is_file(MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php"))
                     $modifiers_path = MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php";
                 else $modifiers_path = false;
                 
-                if($modifiers_path) {
+                if ($modifiers_path) {
                     $php = @file_get_contents($modifiers_path);
                     $php = trim($php);
-                    if(substr($php,0,5)==='<?php') $php = substr($php,6);
-                    if(substr($php,0,2)==='<?')    $php = substr($php,3);
-                    if(substr($php,-2)==='?>')     $php = substr($php,0,-2);
-                    if($this->elmName!=='')
+                    if (substr($php, 0, 5) === '<?php') $php = substr($php, 6);
+                    if (substr($php, 0, 2) === '<?')    $php = substr($php, 3);
+                    if (substr($php, -2) === '?>')     $php = substr($php, 0, -2);
+                    if ($this->elmName !== '')
                         $modx->snippetCache[$this->elmName.'Props'] = '';
                 }
                 else
                     $php = false;
             }
             else $php = false;
-            if($this->elmName!=='') $modx->snippetCache[$this->elmName]= $php;
+            if ($this->elmName !== '') $modx->snippetCache[$this->elmName] = $php;
         }
-        if($php==='') $php=false;
+        if ($php === '') $php = false;
         
-        if($php===false) $html = $modx->getChunk($this->elmName);
+        if ($php === false) $html = $modx->getChunk($this->elmName);
         else             $html = false;
 
         $self = '[+output+]';
         
-        if($php !== false)
+        if ($php !== false)
         {
             ob_start();
             $options = $opt;
@@ -991,71 +991,71 @@ 
             $this->vars['options'] = & $opt;
             $custom = eval($php);
             $msg = ob_get_contents();
-            if($value===$this->bt) $value = $msg . $custom;
+            if ($value === $this->bt) $value = $msg.$custom;
             ob_end_clean();
         }
-        elseif($html!==false && isset($value) && $value!=='')
+        elseif ($html !== false && isset($value) && $value !== '')
         {
-            $html = str_replace(array($self,'[+value+]'), $value, $html);
-            $value = str_replace(array('[+options+]','[+param+]'), $opt, $html);
+            $html = str_replace(array($self, '[+value+]'), $value, $html);
+            $value = str_replace(array('[+options+]', '[+param+]'), $opt, $html);
         }
         else return false;
         
-        if($php===false && $html===false && $value!==''
-           && (strpos($cmd,'[+value+]')!==false || strpos($cmd,$self)!==false))
+        if ($php === false && $html === false && $value !== ''
+           && (strpos($cmd, '[+value+]') !== false || strpos($cmd, $self) !== false))
         {
-            $value = str_replace(array('[+value+]',$self),$value,$cmd);
+            $value = str_replace(array('[+value+]', $self), $value, $cmd);
         }
         return $value;
     }
     
-    function parseDocumentSource($content='')
+    function parseDocumentSource($content = '')
     {
         global $modx;
         
-        if(strpos($content,'[')===false && strpos($content,'{')===false) return $content;
+        if (strpos($content, '[') === false && strpos($content, '{') === false) return $content;
         
-        if(!$modx->maxParserPasses) $modx->maxParserPasses = 10;
-        $bt='';
-        $i=0;
-        while($bt!==$content)
+        if (!$modx->maxParserPasses) $modx->maxParserPasses = 10;
+        $bt = '';
+        $i = 0;
+        while ($bt !== $content)
         {
             $bt = $content;
-            if(strpos($content,'[*')!==false && $modx->documentIdentifier)
+            if (strpos($content, '[*') !== false && $modx->documentIdentifier)
                                               $content = $modx->mergeDocumentContent($content);
-            if(strpos($content,'[(')!==false) $content = $modx->mergeSettingsContent($content);
-            if(strpos($content,'{{')!==false) $content = $modx->mergeChunkContent($content);
-            if(strpos($content,'[!')!==false) $content = str_replace(array('[!','!]'),array('[[',']]'),$content);
-            if(strpos($content,'[[')!==false) $content = $modx->evalSnippets($content);
+            if (strpos($content, '[(') !== false) $content = $modx->mergeSettingsContent($content);
+            if (strpos($content, '{{') !== false) $content = $modx->mergeChunkContent($content);
+            if (strpos($content, '[!') !== false) $content = str_replace(array('[!', '!]'), array('[[', ']]'), $content);
+            if (strpos($content, '[[') !== false) $content = $modx->evalSnippets($content);
             
-            if($content===$bt)              break;
-            if($modx->maxParserPasses < $i) break;
+            if ($content === $bt)              break;
+            if ($modx->maxParserPasses < $i) break;
             $i++;
         }
         return $content;
     }
     
-    function getDocumentObject($target='',$field='pagetitle')
+    function getDocumentObject($target = '', $field = 'pagetitle')
     {
         global $modx;
         
         $target = trim($target);
-        if(empty($target)) $target = $modx->config['site_start'];
-        if(preg_match('@^[1-9][0-9]*$@',$target)) $method='id';
+        if (empty($target)) $target = $modx->config['site_start'];
+        if (preg_match('@^[1-9][0-9]*$@', $target)) $method = 'id';
         else $method = 'alias';
 
-        if(!isset($this->documentObject[$target]))
+        if (!isset($this->documentObject[$target]))
         {
-            $this->documentObject[$target] = $modx->getDocumentObject($method,$target,'direct');
+            $this->documentObject[$target] = $modx->getDocumentObject($method, $target, 'direct');
         }
         
-        if($this->documentObject[$target]['publishedon']==='0')
+        if ($this->documentObject[$target]['publishedon'] === '0')
             return '';
-        elseif(isset($this->documentObject[$target][$field]))
+        elseif (isset($this->documentObject[$target][$field]))
         {
-            if(is_array($this->documentObject[$target][$field]))
+            if (is_array($this->documentObject[$target][$field]))
             {
-                $a = $modx->getTemplateVarOutput($field,$target);
+                $a = $modx->getTemplateVarOutput($field, $target);
                 $this->documentObject[$target][$field] = $a[$field];
             }
         }
@@ -1064,8 +1064,8 @@ 
         return $this->documentObject[$target][$field];
     }
     
-    function setPlaceholders($value = '', $key = '', $path = '') {
-        if($path!=='') $key = "{$path}.{$key}";
+    function setPlaceholders($value = '', $key = '', $path = ''){
+        if ($path !== '') $key = "{$path}.{$key}";
         if (is_array($value)) {
             foreach ($value as $subkey => $subval) {
                 $this->setPlaceholders($subval, $subkey, $key);
@@ -1075,77 +1075,77 @@ 
     }
     
     // Sets a placeholder variable which can only be access by Modifiers
-    function setModifiersVariable($key, $value) {
+    function setModifiersVariable($key, $value){
         if ($key != 'phx' && $key != 'dummy') $this->placeholders[$key] = $value;
     }
     
     //mbstring
-    function substr($str, $s, $l = null) {
+    function substr($str, $s, $l = null){
         global $modx;
-        if(is_null($l)) $l = $this->strlen($str);
+        if (is_null($l)) $l = $this->strlen($str);
         if (function_exists('mb_substr'))
         {
-            if(strpos($str,"\r")!==false)
-                $str = str_replace(array("\r\n","\r"), "\n", $str);
+            if (strpos($str, "\r") !== false)
+                $str = str_replace(array("\r\n", "\r"), "\n", $str);
             return mb_substr($str, $s, $l, $modx->config['modx_charset']);
         }
         return substr($str, $s, $l);
     }
-    function strpos($haystack,$needle,$offset=0) {
+    function strpos($haystack, $needle, $offset = 0){
         global $modx;
-        if (function_exists('mb_strpos')) return mb_strpos($haystack,$needle,$offset,$modx->config['modx_charset']);
-        return strpos($haystack,$needle,$offset);
+        if (function_exists('mb_strpos')) return mb_strpos($haystack, $needle, $offset, $modx->config['modx_charset']);
+        return strpos($haystack, $needle, $offset);
     }
-    function strlen($str) {
+    function strlen($str){
         global $modx;
-        if (function_exists('mb_strlen')) return mb_strlen(str_replace("\r\n", "\n", $str),$modx->config['modx_charset']);
+        if (function_exists('mb_strlen')) return mb_strlen(str_replace("\r\n", "\n", $str), $modx->config['modx_charset']);
         return strlen($str);
     }
-    function strtolower($str) {
+    function strtolower($str){
         if (function_exists('mb_strtolower')) return mb_strtolower($str);
         return strtolower($str);
     }
-    function strtoupper($str) {
+    function strtoupper($str){
         if (function_exists('mb_strtoupper')) return mb_strtoupper($str);
         return strtoupper($str);
     }
-    function ucfirst($str) {
+    function ucfirst($str){
         if (function_exists('mb_strtoupper')) 
             return mb_strtoupper($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
         return ucfirst($str);
     }
-    function lcfirst($str) {
+    function lcfirst($str){
         if (function_exists('mb_strtolower')) 
             return mb_strtolower($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
         return lcfirst($str);
     }
-    function ucwords($str) {
+    function ucwords($str){
         if (function_exists('mb_convert_case'))
             return mb_convert_case($str, MB_CASE_TITLE);
         return ucwords($str);
     }
-    function strrev($str) {
+    function strrev($str){
         preg_match_all('/./us', $str, $ar);
         return join(array_reverse($ar[0]));
     }
-    function str_shuffle($str) {
+    function str_shuffle($str){
         preg_match_all('/./us', $str, $ar);
         shuffle($ar[0]);
         return join($ar[0]);
     }
-    function str_word_count($str) {
-        return count(preg_split('~[^\p{L}\p{N}\']+~u',$str));
+    function str_word_count($str){
+        return count(preg_split('~[^\p{L}\p{N}\']+~u', $str));
     }
-    function strip_tags($value,$params='') {
+    function strip_tags($value, $params = ''){
         global $modx;
 
-        if(stripos($params,'style')===false && stripos($value,'</style>')!==false) {
+        if (stripos($params, 'style') === false && stripos($value, '</style>') !== false) {
             $value = preg_replace('@<style.*?>.*?</style>@is', '', $value);
         }
-        if(stripos($params,'script')===false && stripos($value,'</script>')!==false) {
+        if (stripos($params, 'script') === false && stripos($value, '</script>') !== false) {
             $value = preg_replace('@<script.*?>.*?</script>@is', '', $value);        
         }
   
-        return trim(strip_tags($value,$params));
+        return trim(strip_tags($value, $params));
     }
 }

Braces +543 added lines, -281 removed lines

@@ -1,8 +1,11 @@ 
 <?php
 
-if(!defined('MODX_CORE_PATH')) define('MODX_CORE_PATH', MODX_MANAGER_PATH.'includes/');
+if(!defined('MODX_CORE_PATH')) {
+    define('MODX_CORE_PATH', MODX_MANAGER_PATH.'includes/');
+}
 
-class MODIFIERS {
+class MODIFIERS
+{
     
     var $placeholders = array();
     var $vars = array();
@@ -20,14 +23,18 @@ 
     {
         global $modx;
         
-        if (function_exists('mb_internal_encoding')) mb_internal_encoding($modx->config['modx_charset']);
+        if (function_exists('mb_internal_encoding')) {
+            mb_internal_encoding($modx->config['modx_charset']);
+        }
         $this->condModifiers = '=,is,eq,equals,ne,neq,notequals,isnot,isnt,not,%,isempty,isnotempty,isntempty,>=,gte,eg,gte,greaterthan,>,gt,isgreaterthan,isgt,lowerthan,<,lt,<=,lte,islte,islowerthan,islt,el,find,in,inarray,in_array,fnmatch,wcard,wcard_match,wildcard,wildcard_match,is_file,is_dir,file_exists,is_readable,is_writable,is_image,regex,preg,preg_match,memberof,mo,isinrole,ir';
     }
     
     function phxFilter($key,$value,$modifiers)
     {
         global $modx;
-        if(substr($modifiers,0,3)!=='id(') $value = $this->parseDocumentSource($value);
+        if(substr($modifiers,0,3)!=='id(') {
+            $value = $this->parseDocumentSource($value);
+        }
         $this->srcValue = $value;
         $modifiers = trim($modifiers);
         $modifiers = ':'.trim($modifiers,':');
@@ -45,63 +52,81 @@ 
         return $value;
     }
     
-    function _getDelim($mode,$modifiers) {
+    function _getDelim($mode,$modifiers)
+    {
         $c = substr($modifiers,0,1);
-        if(!in_array($c, array('"', "'", '`')) ) return false;
+        if(!in_array($c, array('"', "'", '`')) ) {
+            return false;
+        }
         
         $modifiers = substr($modifiers,1);
         $closure = $mode=='(' ? "{$c})" : $c;
-        if(strpos($modifiers, $closure)===false) return false;
+        if(strpos($modifiers, $closure)===false) {
+            return false;
+        }
         
         return  $c;
     }
     
-    function _getOpt($mode,$delim,$modifiers) {
+    function _getOpt($mode,$delim,$modifiers)
+    {
         if($delim) {
-            if($mode=='(') return substr($modifiers,1,strpos($modifiers, $delim . ')' )-1);
+            if($mode=='(') {
+                return substr($modifiers,1,strpos($modifiers, $delim . ')' )-1);
+            }
             
             return substr($modifiers,1,strpos($modifiers,$delim,1)-1);
-        }
-        else {
-            if($mode=='(') return substr($modifiers,0,strpos($modifiers, ')') );
+        } else {
+            if($mode=='(') {
+                return substr($modifiers,0,strpos($modifiers, ')') );
+            }
             
             $chars = str_split($modifiers);
             $opt='';
             foreach($chars as $c) {
-                if($c==':' || $c==')') break;
+                if($c==':' || $c==')') {
+                    break;
+                }
                 $opt .=$c;
             }
             return $opt;
         }
     }
-    function _getRemainModifiers($mode,$delim,$modifiers) {
+    function _getRemainModifiers($mode,$delim,$modifiers)
+    {
         if($delim) {
-            if($mode=='(')
-                return $this->_fetchContent($modifiers, $delim . ')');
-            else {
+            if($mode=='(') {
+                            return $this->_fetchContent($modifiers, $delim . ')');
+            } else {
                 $modifiers = trim($modifiers);
                 $modifiers = substr($modifiers,1);
                 return $this->_fetchContent($modifiers, $delim);
             }
-        }
-        else {
-            if($mode=='(') return $this->_fetchContent($modifiers, ')');
+        } else {
+            if($mode=='(') {
+                return $this->_fetchContent($modifiers, ')');
+            }
             $chars = str_split($modifiers);
             foreach($chars as $c) {
-                if($c==':') return $modifiers;
-                else $modifiers = substr($modifiers,1);
+                if($c==':') {
+                    return $modifiers;
+                } else {
+                    $modifiers = substr($modifiers,1);
+                }
             }
             return $modifiers;
         }
     }
     
-    function _fetchContent($string,$delim) {
+    function _fetchContent($string,$delim)
+    {
         $len = strlen($delim);
         $string = $this->parseDocumentSource($string);
         return substr($string,strpos($string, $delim)+$len);
     }
     
-    function splitEachModifiers($modifiers) {
+    function splitEachModifiers($modifiers)
+    {
         global $modx;
         
         $cmd = '';
@@ -111,11 +136,15 @@ 
             $c = substr($modifiers,0,1);
             $modifiers = substr($modifiers,1);
             
-            if($c===':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) { // :=, :!=, :<=, :>=, :!<=, :!>=
+            if($c===':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) {
+// :=, :!=, :<=, :>=, :!<=, :!>=
                 $c = substr($modifiers,strlen($match[1]),1);
                 $debuginfo = "#i=0 #c=[{$c}] #m=[{$modifiers}]";
-                if($c==='(') $modifiers = substr($modifiers,strlen($match[1])+1);
-                else         $modifiers = substr($modifiers,strlen($match[1]));
+                if($c==='(') {
+                    $modifiers = substr($modifiers,strlen($match[1])+1);
+                } else {
+                    $modifiers = substr($modifiers,strlen($match[1]));
+                }
                 
                 $delim     = $this->_getDelim($c,$modifiers);
                 $opt       = $this->_getOpt($c,$delim,$modifiers);
@@ -123,13 +152,12 @@ 
                 
                 $result[]=array('cmd'=>trim($match[1]),'opt'=>$opt,'debuginfo'=>$debuginfo);
                 $cmd = '';
-            }
-            elseif(in_array($c,array('+','-','*','/')) && preg_match('@^[0-9]+@', $modifiers, $match)) { // :+3, :-3, :*3 ...
+            } elseif(in_array($c,array('+','-','*','/')) && preg_match('@^[0-9]+@', $modifiers, $match)) {
+// :+3, :-3, :*3 ...
                 $modifiers = substr($modifiers,strlen($match[0]));
                 $result[]=array('cmd'=>'math','opt'=>'%s'.$c.$match[0]);
                 $cmd = '';
-            }
-            elseif($c==='(' || $c==='=') {
+            } elseif($c==='(' || $c==='=') {
                 $modifiers = $m1 = trim($modifiers);
                 $delim     = $this->_getDelim($c,$modifiers);
                 $opt       = $this->_getOpt($c,$delim,$modifiers);
@@ -139,29 +167,29 @@ 
                 $result[]=array('cmd'=>trim($cmd),'opt'=>$opt,'debuginfo'=>$debuginfo);
                 
                 $cmd = '';
-            }
-            elseif($c==':') {
+            } elseif($c==':') {
                 $debuginfo = "#i=2 #c=[{$c}] #m=[{$modifiers}]";
-                if($cmd!=='') $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
+                if($cmd!=='') {
+                    $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
+                }
                 
                 $cmd = '';
-            }
-            elseif(trim($modifiers)=='' && trim($cmd)!=='') {
+            } elseif(trim($modifiers)=='' && trim($cmd)!=='') {
                 $debuginfo = "#i=3 #c=[{$c}] #m=[{$modifiers}]";
                 $cmd .= $c;
                 $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
                 
                 break;
-            }
-            else {
+            } else {
                 $cmd .= $c;
             }
         }
         
-        if(empty($result)) return array();
+        if(empty($result)) {
+            return array();
+        }
         
-        foreach($result as $i=>$a)
-        {
+        foreach($result as $i=>$a) {
             $a['opt'] = $this->parseDocumentSource($a['opt']);
             $result[$i]['opt'] = $modx->mergePlaceholderContent($a['opt'],$this->placeholders);
         }
@@ -173,22 +201,23 @@ 
     {
         global $modx;
         $cacheKey = md5(sprintf('parsePhx#%s#%s#%s',$key,$value,print_r($modifiers,true)));
-        if(isset($this->tmpCache[$cacheKey])) return $this->tmpCache[$cacheKey];
-        if(empty($modifiers)) return '';
+        if(isset($this->tmpCache[$cacheKey])) {
+            return $this->tmpCache[$cacheKey];
+        }
+        if(empty($modifiers)) {
+            return '';
+        }
         
-        foreach($modifiers as $m)
-        {
+        foreach($modifiers as $m) {
             $lastKey = strtolower($m['cmd']);
         }
         $_ = explode(',',$this->condModifiers);
-        if(in_array($lastKey,$_))
-        {
+        if(in_array($lastKey,$_)) {
             $modifiers[] = array('cmd'=>'then','opt'=>'1');
             $modifiers[] = array('cmd'=>'else','opt'=>'0');
         }
         
-        foreach($modifiers as $i=>$a)
-        {
+        foreach($modifiers as $i=>$a) {
             $value = $this->Filter($key,$value, $a['cmd'], $a['opt']);
         }
         $this->tmpCache[$cacheKey] = $value;
@@ -200,25 +229,32 @@ 
     {
         global $modx;
         
-        if($key==='documentObject') $value = $modx->documentIdentifier;
+        if($key==='documentObject') {
+            $value = $modx->documentIdentifier;
+        }
         $cmd = $this->parseDocumentSource($cmd);
-        if(preg_match('@^[1-9][/0-9]*$@',$cmd))
-        {
-            if(strpos($cmd,'/')!==false)
-                $cmd = $this->substr($cmd,strrpos($cmd,'/')+1);
+        if(preg_match('@^[1-9][/0-9]*$@',$cmd)) {
+            if(strpos($cmd,'/')!==false) {
+                            $cmd = $this->substr($cmd,strrpos($cmd,'/')+1);
+            }
             $opt = $cmd;
             $cmd = 'id';
         }
         
-        if(isset($modx->snippetCache["phx:{$cmd}"]))   $this->elmName = "phx:{$cmd}";
-        elseif(isset($modx->chunkCache["phx:{$cmd}"])) $this->elmName = "phx:{$cmd}";
-        else                                           $this->elmName = '';
+        if(isset($modx->snippetCache["phx:{$cmd}"])) {
+            $this->elmName = "phx:{$cmd}";
+        } elseif(isset($modx->chunkCache["phx:{$cmd}"])) {
+            $this->elmName = "phx:{$cmd}";
+        } else {
+            $this->elmName = '';
+        }
         
         $cmd = strtolower($cmd);
-        if($this->elmName!=='')
-            $value = $this->getValueFromElement($key, $value, $cmd, $opt);
-        else
-            $value = $this->getValueFromPreset($key, $value, $cmd, $opt);
+        if($this->elmName!=='') {
+                    $value = $this->getValueFromElement($key, $value, $cmd, $opt);
+        } else {
+                    $value = $this->getValueFromPreset($key, $value, $cmd, $opt);
+        }
         
         $value = str_replace('[+key+]', $key, $value);
         
@@ -227,29 +263,37 @@ 
     
     function isEmpty($cmd,$value)
     {
-        if($value!=='') return false;
+        if($value!=='') {
+            return false;
+        }
         
         $_ = explode(',', $this->condModifiers . ',_default,default,if,input,or,and,show,this,select,switch,then,else,id,ifempty,smart_desc,smart_description,summary');
-        if(in_array($cmd,$_)) return false;
-        else                  return true;
+        if(in_array($cmd,$_)) {
+            return false;
+        } else {
+            return true;
+        }
     }
     
     function getValueFromPreset($key, $value, $cmd, $opt)
     {
         global $modx;
         
-        if($this->isEmpty($cmd,$value)) return '';
+        if($this->isEmpty($cmd,$value)) {
+            return '';
+        }
         
         $this->key = $key;
         $this->value  = $value;
         $this->opt    = $opt;
         
-        switch ($cmd)
-        {
+        switch ($cmd) {
             #####  Conditional Modifiers 
             case 'input':
             case 'if':
-                if(!$opt) return $value;
+                if(!$opt) {
+                    return $value;
+                }
                 return $opt;
             case '=':
             case 'eq':
@@ -310,14 +354,24 @@ 
             case 'file_exists':
             case 'is_readable':
             case 'is_writable':
-                if(!$opt) $path = $value;
-                else      $path = $opt;
-                if(strpos($path,MODX_MANAGER_PATH)!==false) exit('Can not read core path');
-                if(strpos($path,$modx->config['base_path'])===false) $path = ltrim($path,'/');
+                if(!$opt) {
+                    $path = $value;
+                } else {
+                    $path = $opt;
+                }
+                if(strpos($path,MODX_MANAGER_PATH)!==false) {
+                    exit('Can not read core path');
+                }
+                if(strpos($path,$modx->config['base_path'])===false) {
+                    $path = ltrim($path,'/');
+                }
                 $this->condition[] = intval($cmd($path)!==false);break;
             case 'is_image':
-                if(!$opt) $path = $value;
-                else      $path = $opt;
+                if(!$opt) {
+                    $path = $value;
+                } else {
+                    $path = $opt;
+                }
                 if(!is_file($path)) {$this->condition[]='0';break;}
                 $_ = getimagesize($path);
                 $this->condition[] = intval($_[0]);break;
@@ -340,17 +394,23 @@ 
             case 'this':
                 $conditional = join(' ',$this->condition);
                 $isvalid = intval(eval("return ({$conditional});"));
-                if ($isvalid) return $this->srcValue;
+                if ($isvalid) {
+                    return $this->srcValue;
+                }
                 return NULL;
             case 'then':
                 $conditional = join(' ',$this->condition);
                 $isvalid = intval(eval("return ({$conditional});"));
-                if ($isvalid)  return $opt;
+                if ($isvalid) {
+                    return $opt;
+                }
                 return null;
             case 'else':
                 $conditional = join(' ',$this->condition);
                 $isvalid = intval(eval("return ({$conditional});"));
-                if (!$isvalid) return $opt;
+                if (!$isvalid) {
+                    return $opt;
+                }
                 break;
             case 'select':
             case 'switch':
@@ -361,8 +421,11 @@ 
                     $mi = explode('=',$raw[$m],2);
                     $map[$mi[0]] = $mi[1];
                 }
-                if(isset($map[$value])) return $map[$value];
-                else                    return '';
+                if(isset($map[$value])) {
+                    return $map[$value];
+                } else {
+                    return '';
+                }
             ##### End of Conditional Modifiers
             
             #####  Encode / Decode / Hash / Escape
@@ -388,24 +451,25 @@ 
             case 'spam_protect':
                 return str_replace(array('@','.'),array('&#64;','&#46;'),$value);
             case 'strip':
-                if($opt==='') $opt = ' ';
+                if($opt==='') {
+                    $opt = ' ';
+                }
                 return preg_replace('/[\n\r\t\s]+/', $opt, $value);
             case 'strip_linefeeds':
                 return str_replace(array("\n","\r"), '', $value);
             case 'notags':
             case 'strip_tags':
             case 'remove_html':
-                if($opt!=='')
-                {
+                if($opt!=='') {
                     $param = array();
-                    foreach(explode(',',$opt) as $v)
-                    {
+                    foreach(explode(',',$opt) as $v) {
                         $v = trim($v,'</> ');
                         $param[] = "<{$v}>";
                     }
                     $params = join(',',$param);
+                } else {
+                    $params = '';
                 }
-                else $params = '';
                 if(!strpos($params,'<br>')===false) {
                     $value = preg_replace('@(<br[ /]*>)\n@','$1',$value);
                     $value = preg_replace('@<br[ /]*>@',"\n",$value);
@@ -416,8 +480,11 @@ 
             case 'encode_url':
                 return urlencode($value);
             case 'base64_decode':
-                if($opt!=='false') $opt = true;
-                else               $opt = false;
+                if($opt!=='false') {
+                    $opt = true;
+                } else {
+                    $opt = false;
+                }
                 return base64_decode($value,$opt);
             case 'encode_sha1': $cmd = 'sha1';
             case 'addslashes':
@@ -443,16 +510,19 @@ 
                 return $this->strtoupper($value);
             case 'capitalize':
                 $_ = explode(' ',$value);
-                foreach($_ as $i=>$v)
-                {
+                foreach($_ as $i=>$v) {
                     $_[$i] = ucfirst($v);
                 }
                 return join(' ',$_);
             case 'zenhan':
-                if(empty($opt)) $opt='VKas';
+                if(empty($opt)) {
+                    $opt='VKas';
+                }
                 return mb_convert_kana($value,$opt,$modx->config['modx_charset']);
             case 'hanzen':
-                if(empty($opt)) $opt='VKAS';
+                if(empty($opt)) {
+                    $opt='VKAS';
+                }
                 return mb_convert_kana($value,$opt,$modx->config['modx_charset']);
             case 'str_shuffle':
             case 'shuffle':
@@ -477,13 +547,18 @@ 
                 $value = preg_replace('/\r/', '', $value);
                 return count(preg_split('/\n+/',$value));
             case 'strpos':
-                if($opt!=0&&empty($opt)) return $value;
+                if($opt!=0&&empty($opt)) {
+                    return $value;
+                }
                 return $this->strpos($value,$opt);
             case 'wordwrap':
                 // default: 70
                   $wrapat = intval($opt) ? intval($opt) : 70;
-                if (version_compare(PHP_VERSION, '5.3.0') >= 0) return $this->includeMdfFile('wordwrap');
-                else return preg_replace("@(\b\w+\b)@e","wordwrap('\\1',\$wrapat,' ',1)",$value);
+                if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
+                    return $this->includeMdfFile('wordwrap');
+                } else {
+                    return preg_replace("@(\b\w+\b)@e","wordwrap('\\1',\$wrapat,' ',1)",$value);
+                }
             case 'wrap_text':
                 $width = preg_match('/^[1-9][0-9]*$/',$opt) ? $opt : 70;
                 if($modx->config['manager_language']==='japanese-utf8') {
@@ -499,30 +574,36 @@ 
                         $value = $this->substr($value,$width);
                     }
                     return join("\n",$chunk);
+                } else {
+                                    return wordwrap($value,$width,"\n",true);
                 }
-                else
-                    return wordwrap($value,$width,"\n",true);
             case 'substr':
-                if(empty($opt)) break;
+                if(empty($opt)) {
+                    break;
+                }
                 if(strpos($opt,',')!==false) {
                     list($b,$e) = explode(',',$opt,2);
                     return $this->substr($value,$b,(int)$e);
+                } else {
+                    return $this->substr($value,$opt);
                 }
-                else return $this->substr($value,$opt);
             case 'limit':
             case 'trim_to': // http://www.movabletype.jp/documentation/appendices/modifiers/trim_to.html
-                if(strpos($opt,'+')!==false)
-                    list($len,$str) = explode('+',$opt,2);
-                else {
+                if(strpos($opt,'+')!==false) {
+                                    list($len,$str) = explode('+',$opt,2);
+                } else {
                     $len = $opt;
                     $str = '';
                 }
-                if($len==='') $len = 100;
-                if(abs($len) > $this->strlen($value)) $str ='';
+                if($len==='') {
+                    $len = 100;
+                }
+                if(abs($len) > $this->strlen($value)) {
+                    $str ='';
+                }
                 if(preg_match('/^[1-9][0-9]*$/',$len)) {
                     return $this->substr($value,0,$len) . $str;
-                }
-                elseif(preg_match('/^\-[1-9][0-9]*$/',$len)) {
+                } elseif(preg_match('/^\-[1-9][0-9]*$/',$len)) {
                     return $str . $this->substr($value,$len);
                 }
                 break;
@@ -532,18 +613,30 @@ 
                 return $this->includeMdfFile('summary');
             case 'replace':
             case 'str_replace':
-                if(empty($opt) || strpos($opt,',')===false) break;
-                if    (substr_count($opt, ',') ==1) $delim = ',';
-                elseif(substr_count($opt, '|') ==1) $delim = '|';
-                elseif(substr_count($opt, '=>')==1) $delim = '=>';
-                elseif(substr_count($opt, '/') ==1) $delim = '/';
-                else break;
+                if(empty($opt) || strpos($opt,',')===false) {
+                    break;
+                }
+                if    (substr_count($opt, ',') ==1) {
+                    $delim = ',';
+                } elseif(substr_count($opt, '|') ==1) {
+                    $delim = '|';
+                } elseif(substr_count($opt, '=>')==1) {
+                    $delim = '=>';
+                } elseif(substr_count($opt, '/') ==1) {
+                    $delim = '/';
+                } else {
+                    break;
+                }
                 list($s,$r) = explode($delim,$opt);
-                if($value!=='') return str_replace($s,$r,$value);
+                if($value!=='') {
+                    return str_replace($s,$r,$value);
+                }
                 break;
             case 'replace_to':
             case 'tpl':
-                if($value!=='') return str_replace(array('[+value+]','[+output+]','{value}','%s'),$value,$opt);
+                if($value!=='') {
+                    return str_replace(array('[+value+]','[+output+]','{value}','%s'),$value,$opt);
+                }
                 break;
             case 'eachtpl':
                 $value = explode('||',$value);
@@ -554,59 +647,83 @@ 
                 return join("\n", $_);
             case 'array_pop':
             case 'array_shift':
-                if(strpos($value,'||')!==false) $delim = '||';
-                else                            $delim = ',';
+                if(strpos($value,'||')!==false) {
+                    $delim = '||';
+                } else {
+                    $delim = ',';
+                }
                 return $cmd(explode($delim,$value));
             case 'preg_replace':
             case 'regex_replace':
-                if(empty($opt) || strpos($opt,',')===false) break;
+                if(empty($opt) || strpos($opt,',')===false) {
+                    break;
+                }
                 list($s,$r) = explode(',',$opt,2);
-                if($value!=='') return preg_replace($s,$r,$value);
+                if($value!=='') {
+                    return preg_replace($s,$r,$value);
+                }
                 break;
             case 'cat':
             case 'concatenate':
             case '.':
-                if($value!=='') return $value . $opt;
+                if($value!=='') {
+                    return $value . $opt;
+                }
                 break;
             case 'sprintf':
             case 'string_format':
-                if($value!=='') return sprintf($opt,$value);
+                if($value!=='') {
+                    return sprintf($opt,$value);
+                }
                 break;
             case 'number_format':
-                    if($opt=='') $opt = 0;
+                    if($opt=='') {
+                        $opt = 0;
+                    }
                     return number_format($value,$opt);
             case 'money_format':
                     setlocale(LC_MONETARY,setlocale(LC_TIME,0));
-                    if($value!=='') return money_format($opt,(double)$value);
+                    if($value!=='') {
+                        return money_format($opt,(double)$value);
+                    }
                     break;
             case 'tobool':
                 return boolval($value);
             case 'nl2lf':
-                if($value!=='') return str_replace(array("\r\n","\n", "\r"), '\n', $value);
+                if($value!=='') {
+                    return str_replace(array("\r\n","\n", "\r"), '\n', $value);
+                }
                 break;
             case 'br2nl':
                 return preg_replace('@<br[\s/]*>@i', "\n", $value);
             case 'nl2br':
-                if (version_compare(PHP_VERSION, '5.3.0', '<'))
-                    return nl2br($value);
-                if($opt!=='')
-                {
+                if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+                                    return nl2br($value);
+                }
+                if($opt!=='') {
                     $opt = trim($opt);
                     $opt = strtolower($opt);
-                    if($opt==='false') $opt = false;
-                    elseif($opt==='0') $opt = false;
-                    else               $opt = true;
+                    if($opt==='false') {
+                        $opt = false;
+                    } elseif($opt==='0') {
+                        $opt = false;
+                    } else {
+                        $opt = true;
+                    }
+                } elseif(isset($modx->config['mce_element_format'])&&$modx->config['mce_element_format']==='html') {
+                                                       $opt = false;
+                } else {
+                    $opt = true;
                 }
-                elseif(isset($modx->config['mce_element_format'])&&$modx->config['mce_element_format']==='html')
-                                       $opt = false;
-                else                   $opt = true;
                 return nl2br($value,$opt);
             case 'ltrim':
             case 'rtrim':
             case 'trim': // ref http://mblo.info/modifiers/custom-modifiers/rtrim_opt.html
-                if($opt==='')
-                    return $cmd($value);
-                else return $cmd($value,$opt);
+                if($opt==='') {
+                                    return $cmd($value);
+                } else {
+                    return $cmd($value,$opt);
+                }
             // These are all straight wrappers for PHP functions
             case 'ucfirst':
             case 'lcfirst':
@@ -617,15 +734,24 @@ 
             case 'strftime':
             case 'date':
             case 'dateformat':
-                if(empty($opt)) $opt = $modx->toDateFormat(null, 'formatOnly');
-                if(!preg_match('@^[0-9]+$@',$value)) $value = strtotime($value);
-                if(strpos($opt,'%')!==false)
-                    return strftime($opt,0+$value);
-                else
-                    return date($opt,0+$value);
+                if(empty($opt)) {
+                    $opt = $modx->toDateFormat(null, 'formatOnly');
+                }
+                if(!preg_match('@^[0-9]+$@',$value)) {
+                    $value = strtotime($value);
+                }
+                if(strpos($opt,'%')!==false) {
+                                    return strftime($opt,0+$value);
+                } else {
+                                    return date($opt,0+$value);
+                }
             case 'time':
-                if(empty($opt)) $opt = '%H:%M';
-                if(!preg_match('@^[0-9]+$@',$value)) $value = strtotime($value);
+                if(empty($opt)) {
+                    $opt = '%H:%M';
+                }
+                if(!preg_match('@^[0-9]+$@',$value)) {
+                    $value = strtotime($value);
+                }
                 return strftime($opt,0+$value);
             case 'strtotime':
                 return strtotime($value);
@@ -635,7 +761,9 @@ 
             case 'tofloat':
                 return floatval($value);
             case 'round':
-                if(!$opt) $opt = 0;
+                if(!$opt) {
+                    $opt = 0;
+                }
                 return $cmd($value,$opt);
             case 'max':
             case 'min':
@@ -647,28 +775,42 @@ 
             case 'math':
             case 'calc':
                 $value = (int)$value;
-                if(empty($value)) $value = '0';
+                if(empty($value)) {
+                    $value = '0';
+                }
                 $filter = str_replace(array('[+value+]','[+output+]','{value}','%s'),'?',$opt);
                 $filter = preg_replace('@([a-zA-Z\n\r\t\s])@','',$filter);
-                if(strpos($filter,'?')===false) $filter = "?{$filter}";
+                if(strpos($filter,'?')===false) {
+                    $filter = "?{$filter}";
+                }
                 $filter = str_replace('?',$value,$filter);
                 return eval("return {$filter};");
             case 'count':
-                if($value=='') return 0;
+                if($value=='') {
+                    return 0;
+                }
                 $value = explode(',',$value);
                 return count($value);
             case 'sort':
             case 'rsort':
-                if(strpos($value,"\n")!==false) $delim="\n";
-                else $delim = ',';
+                if(strpos($value,"\n")!==false) {
+                    $delim="\n";
+                } else {
+                    $delim = ',';
+                }
                 $swap = explode($delim,$value);
-                if(!$opt) $opt = SORT_REGULAR;
-                else      $opt = constant($opt);
+                if(!$opt) {
+                    $opt = SORT_REGULAR;
+                } else {
+                    $opt = constant($opt);
+                }
                 $cmd($swap,$opt);
                 return join($delim,$swap);
             #####  Resource fields
             case 'id':
-                if($opt) return $this->getDocumentObject($opt,$key);
+                if($opt) {
+                    return $this->getDocumentObject($opt,$key);
+                }
                 break;
             case 'type':
             case 'contenttype':
@@ -705,7 +847,9 @@ 
             case 'privatemgr':
             case 'content_dispo':
             case 'hidemenu':
-                if($cmd==='contenttype') $cmd = 'contentType';
+                if($cmd==='contenttype') {
+                    $cmd = 'contentType';
+                }
                 return $this->getDocumentObject($value,$cmd);
             case 'title':
                 $pagetitle = $this->getDocumentObject($value,'pagetitle');
@@ -720,13 +864,20 @@ 
                 $templateName = $modx->db->getValue($rs);
                 return !$templateName ? '(blank)' : $templateName;
             case 'getfield':
-                if(!$opt) $opt = 'content';
+                if(!$opt) {
+                    $opt = 'content';
+                }
                 return $modx->getField($opt,$value);
             case 'children':
             case 'childids':
-                if($value=='') $value = 0; // 値がない場合はルートと見なす
+                if($value=='') {
+                    $value = 0;
+                }
+                // 値がない場合はルートと見なす
                 $published = 1;
-                if($opt=='') $opt = 'page';
+                if($opt=='') {
+                    $opt = 'page';
+                }
                 $_ = explode(',',$opt);
                 $where = array();
                 foreach($_ as $opt) {
@@ -742,29 +893,43 @@ 
                 $where = join(' AND ', $where);
                 $children = $modx->getDocumentChildren($value, $published, '0', 'id', $where);
                 $result = array();
-                foreach((array)$children as $child){
+                foreach((array)$children as $child) {
                     $result[] = $child['id'];
                 }
                 return join(',', $result);
             case 'fullurl':
-                if(!is_numeric($value)) return $value;
+                if(!is_numeric($value)) {
+                    return $value;
+                }
                 return $modx->makeUrl($value);
             case 'makeurl':
-                if(!is_numeric($value)) return $value;
-                if(!$opt) $opt = 'full';
+                if(!is_numeric($value)) {
+                    return $value;
+                }
+                if(!$opt) {
+                    $opt = 'full';
+                }
                 return $modx->makeUrl($value,'','',$opt);
                 
             #####  File system
             case 'getimageinfo':
             case 'imageinfo':
-                if(!is_file($value)) return '';
+                if(!is_file($value)) {
+                    return '';
+                }
                 $_ = getimagesize($value);
-                if(!$_[0]) return '';
+                if(!$_[0]) {
+                    return '';
+                }
                 $info['width']  = $_[0];
                 $info['height'] = $_[1];
-                if    ($_[0] > $_[1]) $info['aspect'] = 'landscape';
-                elseif($_[0] < $_[1]) $info['aspect'] = 'portrait';
-                else                  $info['aspect'] = 'square';
+                if    ($_[0] > $_[1]) {
+                    $info['aspect'] = 'landscape';
+                } elseif($_[0] < $_[1]) {
+                    $info['aspect'] = 'portrait';
+                } else {
+                    $info['aspect'] = 'square';
+                }
                 switch($_[2]) {
                     case IMAGETYPE_GIF  : $info['type'] = 'gif'; break;
                     case IMAGETYPE_JPEG : $info['type'] = 'jpg'; break;
@@ -783,33 +948,47 @@ 
             
             case 'file_get_contents':
             case 'readfile':
-                if(!is_file($value)) return $value;
+                if(!is_file($value)) {
+                    return $value;
+                }
                 $value = realpath($value);
-                if(strpos($value,MODX_MANAGER_PATH)!==false) exit('Can not read core file');
+                if(strpos($value,MODX_MANAGER_PATH)!==false) {
+                    exit('Can not read core file');
+                }
                 $ext = strtolower(substr($value,-4));
-                if($ext==='.php') exit('Can not read php file');
-                if($ext==='.cgi') exit('Can not read cgi file');
+                if($ext==='.php') {
+                    exit('Can not read php file');
+                }
+                if($ext==='.cgi') {
+                    exit('Can not read cgi file');
+                }
                 return file_get_contents($value);
             case 'filesize':
-                if($value == '') return '';
+                if($value == '') {
+                    return '';
+                }
                 $filename = $value;
                 
                 $site_url = $modx->config['site_url'];
-                if(strpos($filename,$site_url) === 0)
-                    $filename = substr($filename,0,strlen($site_url));
+                if(strpos($filename,$site_url) === 0) {
+                                    $filename = substr($filename,0,strlen($site_url));
+                }
                 $filename = trim($filename,'/');
                 
                 $opt = trim($opt,'/');
-                if($opt!=='') $opt .= '/';
+                if($opt!=='') {
+                    $opt .= '/';
+                }
                 
                 $filename = MODX_BASE_PATH.$opt.$filename;
                 
-                if(is_file($filename)){
+                if(is_file($filename)) {
                     clearstatcache();
                     $size = filesize($filename);
                     return $size;
+                } else {
+                    return '';
                 }
-                else return '';
             #####  User info
             case 'username':
             case 'fullname':
@@ -837,19 +1016,29 @@ 
                 $this->opt = $cmd;
                 return $this->includeMdfFile('moduser');
             case 'userinfo':
-                if(empty($opt)) $this->opt = 'username';
+                if(empty($opt)) {
+                    $this->opt = 'username';
+                }
                 return $this->includeMdfFile('moduser');
             case 'webuserinfo':
-                if(empty($opt)) $this->opt = 'username';
+                if(empty($opt)) {
+                    $this->opt = 'username';
+                }
                 $this->value = -$value;
                 return $this->includeMdfFile('moduser');
             #####  Special functions 
             case 'ifempty':
             case '_default':
             case 'default':
-                if (empty($value)) return $opt; break;
+                if (empty($value)) {
+                    return $opt;
+                }
+                break;
             case 'ifnotempty':
-                if (!empty($value)) return $opt; break;
+                if (!empty($value)) {
+                    return $opt;
+                }
+                break;
             case 'datagrid':
                 include_once(MODX_CORE_PATH . 'controls/datagrid.class.php');
                 $grd = new DataGrid();
@@ -857,13 +1046,18 @@ 
                 $grd->itemStyle = '';
                 $grd->altItemStyle = '';
                 $pos = strpos($value,"\n");
-                if($pos) $_ = substr($value,0,$pos);
-                else $_ = $pos;
+                if($pos) {
+                    $_ = substr($value,0,$pos);
+                } else {
+                    $_ = $pos;
+                }
                 $grd->cdelim = strpos($_,"\t")!==false ? 'tab' : ',';
                 return $grd->render();
             case 'rotate':
             case 'evenodd':
-                if(strpos($opt,',')===false) $opt = 'odd,even';
+                if(strpos($opt,',')===false) {
+                    $opt = 'odd,even';
+                }
                 $_ = explode(',', $opt);
                 $c = count($_);
                 $i = $value + $c;
@@ -872,7 +1066,9 @@ 
             case 'takeval':
                 $arr = explode(",",$opt);
                 $idx = $value;
-                if(!is_numeric($idx)) return $value;
+                if(!is_numeric($idx)) {
+                    return $value;
+                }
                 return $arr[$idx];
             case 'getimage':
                 return $this->includeMdfFile('getimage');
@@ -880,14 +1076,18 @@ 
                     return $modx->nicesize($value);
             case 'googlemap':
             case 'googlemaps':
-                if(empty($opt)) $opt = 'border:none;width:500px;height:350px;';
+                if(empty($opt)) {
+                    $opt = 'border:none;width:500px;height:350px;';
+                }
                 $tpl = '<iframe style="[+style+]" src="https://maps.google.co.jp/maps?ll=[+value+]&output=embed&z=15"></iframe>';
                 $ph['style'] = $opt;
                 $ph['value'] = $value;
                 return $modx->parseText($tpl,$ph);
             case 'youtube':
             case 'youtube16x9':
-                if(empty($opt)) $opt = 560;
+                if(empty($opt)) {
+                    $opt = 560;
+                }
                 $h = round($opt*0.5625);
                 $tpl = '<iframe width="%s" height="%s" src="https://www.youtube.com/embed/%s" frameborder="0" allowfullscreen></iframe>';
                 return sprintf($tpl,$opt,$h,$value);
@@ -920,7 +1120,8 @@ 
         return $value;
     }
 
-    function includeMdfFile($cmd) {
+    function includeMdfFile($cmd)
+    {
         global $modx;
         $key = $this->key;
         $value  = $this->value;
@@ -931,55 +1132,65 @@ 
     function getValueFromElement($key, $value, $cmd, $opt)
     {
         global $modx;
-        if( isset($modx->snippetCache[$this->elmName]) )
-        {
+        if( isset($modx->snippetCache[$this->elmName]) ) {
             $php = $modx->snippetCache[$this->elmName];
-        }
-        else
-        {
+        } else {
             $esc_elmName = $modx->db->escape($this->elmName);
             $result = $modx->db->select('snippet','[+prefix+]site_snippets',"name='{$esc_elmName}'");
             $total = $modx->db->getRecordCount($result);
-            if($total == 1)
-            {
+            if($total == 1) {
                 $row = $modx->db->getRow($result);
                 $php = $row['snippet'];
-            }
-            elseif($total == 0)
-            {
+            } elseif($total == 0) {
                 $assets_path = MODX_BASE_PATH.'assets/';
-                if(is_file($assets_path."modifiers/mdf_{$cmd}.inc.php"))
-                    $modifiers_path = $assets_path."modifiers/mdf_{$cmd}.inc.php";
-                elseif(is_file($assets_path."plugins/phx/modifiers/{$cmd}.phx.php"))
-                    $modifiers_path = $assets_path."plugins/phx/modifiers/{$cmd}.phx.php";
-                elseif(is_file(MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php"))
-                    $modifiers_path = MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php";
-                else $modifiers_path = false;
+                if(is_file($assets_path."modifiers/mdf_{$cmd}.inc.php")) {
+                                    $modifiers_path = $assets_path."modifiers/mdf_{$cmd}.inc.php";
+                } elseif(is_file($assets_path."plugins/phx/modifiers/{$cmd}.phx.php")) {
+                                    $modifiers_path = $assets_path."plugins/phx/modifiers/{$cmd}.phx.php";
+                } elseif(is_file(MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php")) {
+                                    $modifiers_path = MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php";
+                } else {
+                    $modifiers_path = false;
+                }
                 
                 if($modifiers_path) {
                     $php = @file_get_contents($modifiers_path);
                     $php = trim($php);
-                    if(substr($php,0,5)==='<?php') $php = substr($php,6);
-                    if(substr($php,0,2)==='<?')    $php = substr($php,3);
-                    if(substr($php,-2)==='?>')     $php = substr($php,0,-2);
-                    if($this->elmName!=='')
-                        $modx->snippetCache[$this->elmName.'Props'] = '';
-                }
-                else
-                    $php = false;
+                    if(substr($php,0,5)==='<?php') {
+                        $php = substr($php,6);
+                    }
+                    if(substr($php,0,2)==='<?') {
+                        $php = substr($php,3);
+                    }
+                    if(substr($php,-2)==='?>') {
+                        $php = substr($php,0,-2);
+                    }
+                    if($this->elmName!=='') {
+                                            $modx->snippetCache[$this->elmName.'Props'] = '';
+                    }
+                } else {
+                                    $php = false;
+                }
+            } else {
+                $php = false;
             }
-            else $php = false;
-            if($this->elmName!=='') $modx->snippetCache[$this->elmName]= $php;
+            if($this->elmName!=='') {
+                $modx->snippetCache[$this->elmName]= $php;
+            }
+        }
+        if($php==='') {
+            $php=false;
         }
-        if($php==='') $php=false;
         
-        if($php===false) $html = $modx->getChunk($this->elmName);
-        else             $html = false;
+        if($php===false) {
+            $html = $modx->getChunk($this->elmName);
+        } else {
+            $html = false;
+        }
 
         $self = '[+output+]';
         
-        if($php !== false)
-        {
+        if($php !== false) {
             ob_start();
             $options = $opt;
             $output = $value;
@@ -991,19 +1202,19 @@ 
             $this->vars['options'] = & $opt;
             $custom = eval($php);
             $msg = ob_get_contents();
-            if($value===$this->bt) $value = $msg . $custom;
+            if($value===$this->bt) {
+                $value = $msg . $custom;
+            }
             ob_end_clean();
-        }
-        elseif($html!==false && isset($value) && $value!=='')
-        {
+        } elseif($html!==false && isset($value) && $value!=='') {
             $html = str_replace(array($self,'[+value+]'), $value, $html);
             $value = str_replace(array('[+options+]','[+param+]'), $opt, $html);
+        } else {
+            return false;
         }
-        else return false;
         
         if($php===false && $html===false && $value!==''
-           && (strpos($cmd,'[+value+]')!==false || strpos($cmd,$self)!==false))
-        {
+           && (strpos($cmd,'[+value+]')!==false || strpos($cmd,$self)!==false)) {
             $value = str_replace(array('[+value+]',$self),$value,$cmd);
         }
         return $value;
@@ -1013,23 +1224,39 @@ 
     {
         global $modx;
         
-        if(strpos($content,'[')===false && strpos($content,'{')===false) return $content;
+        if(strpos($content,'[')===false && strpos($content,'{')===false) {
+            return $content;
+        }
         
-        if(!$modx->maxParserPasses) $modx->maxParserPasses = 10;
+        if(!$modx->maxParserPasses) {
+            $modx->maxParserPasses = 10;
+        }
         $bt='';
         $i=0;
-        while($bt!==$content)
-        {
+        while($bt!==$content) {
             $bt = $content;
-            if(strpos($content,'[*')!==false && $modx->documentIdentifier)
-                                              $content = $modx->mergeDocumentContent($content);
-            if(strpos($content,'[(')!==false) $content = $modx->mergeSettingsContent($content);
-            if(strpos($content,'{{')!==false) $content = $modx->mergeChunkContent($content);
-            if(strpos($content,'[!')!==false) $content = str_replace(array('[!','!]'),array('[[',']]'),$content);
-            if(strpos($content,'[[')!==false) $content = $modx->evalSnippets($content);
+            if(strpos($content,'[*')!==false && $modx->documentIdentifier) {
+                                                          $content = $modx->mergeDocumentContent($content);
+            }
+            if(strpos($content,'[(')!==false) {
+                $content = $modx->mergeSettingsContent($content);
+            }
+            if(strpos($content,'{{')!==false) {
+                $content = $modx->mergeChunkContent($content);
+            }
+            if(strpos($content,'[!')!==false) {
+                $content = str_replace(array('[!','!]'),array('[[',']]'),$content);
+            }
+            if(strpos($content,'[[')!==false) {
+                $content = $modx->evalSnippets($content);
+            }
             
-            if($content===$bt)              break;
-            if($modx->maxParserPasses < $i) break;
+            if($content===$bt) {
+                break;
+            }
+            if($modx->maxParserPasses < $i) {
+                break;
+            }
             $i++;
         }
         return $content;
@@ -1040,103 +1267,138 @@ 
         global $modx;
         
         $target = trim($target);
-        if(empty($target)) $target = $modx->config['site_start'];
-        if(preg_match('@^[1-9][0-9]*$@',$target)) $method='id';
-        else $method = 'alias';
+        if(empty($target)) {
+            $target = $modx->config['site_start'];
+        }
+        if(preg_match('@^[1-9][0-9]*$@',$target)) {
+            $method='id';
+        } else {
+            $method = 'alias';
+        }
 
-        if(!isset($this->documentObject[$target]))
-        {
+        if(!isset($this->documentObject[$target])) {
             $this->documentObject[$target] = $modx->getDocumentObject($method,$target,'direct');
         }
         
-        if($this->documentObject[$target]['publishedon']==='0')
-            return '';
-        elseif(isset($this->documentObject[$target][$field]))
-        {
-            if(is_array($this->documentObject[$target][$field]))
-            {
+        if($this->documentObject[$target]['publishedon']==='0') {
+                    return '';
+        } elseif(isset($this->documentObject[$target][$field])) {
+            if(is_array($this->documentObject[$target][$field])) {
                 $a = $modx->getTemplateVarOutput($field,$target);
                 $this->documentObject[$target][$field] = $a[$field];
             }
+        } else {
+            $this->documentObject[$target][$field] = false;
         }
-        else $this->documentObject[$target][$field] = false;
         
         return $this->documentObject[$target][$field];
     }
     
-    function setPlaceholders($value = '', $key = '', $path = '') {
-        if($path!=='') $key = "{$path}.{$key}";
+    function setPlaceholders($value = '', $key = '', $path = '')
+    {
+        if($path!=='') {
+            $key = "{$path}.{$key}";
+        }
         if (is_array($value)) {
             foreach ($value as $subkey => $subval) {
                 $this->setPlaceholders($subval, $subkey, $key);
             }
+        } else {
+            $this->setModifiersVariable($key, $value);
         }
-        else $this->setModifiersVariable($key, $value);
     }
     
     // Sets a placeholder variable which can only be access by Modifiers
-    function setModifiersVariable($key, $value) {
-        if ($key != 'phx' && $key != 'dummy') $this->placeholders[$key] = $value;
+    function setModifiersVariable($key, $value)
+    {
+        if ($key != 'phx' && $key != 'dummy') {
+            $this->placeholders[$key] = $value;
+        }
     }
     
     //mbstring
-    function substr($str, $s, $l = null) {
+    function substr($str, $s, $l = null)
+    {
         global $modx;
-        if(is_null($l)) $l = $this->strlen($str);
-        if (function_exists('mb_substr'))
-        {
-            if(strpos($str,"\r")!==false)
-                $str = str_replace(array("\r\n","\r"), "\n", $str);
+        if(is_null($l)) {
+            $l = $this->strlen($str);
+        }
+        if (function_exists('mb_substr')) {
+            if(strpos($str,"\r")!==false) {
+                            $str = str_replace(array("\r\n","\r"), "\n", $str);
+            }
             return mb_substr($str, $s, $l, $modx->config['modx_charset']);
         }
         return substr($str, $s, $l);
     }
-    function strpos($haystack,$needle,$offset=0) {
+    function strpos($haystack,$needle,$offset=0)
+    {
         global $modx;
-        if (function_exists('mb_strpos')) return mb_strpos($haystack,$needle,$offset,$modx->config['modx_charset']);
+        if (function_exists('mb_strpos')) {
+            return mb_strpos($haystack,$needle,$offset,$modx->config['modx_charset']);
+        }
         return strpos($haystack,$needle,$offset);
     }
-    function strlen($str) {
+    function strlen($str)
+    {
         global $modx;
-        if (function_exists('mb_strlen')) return mb_strlen(str_replace("\r\n", "\n", $str),$modx->config['modx_charset']);
+        if (function_exists('mb_strlen')) {
+            return mb_strlen(str_replace("\r\n", "\n", $str),$modx->config['modx_charset']);
+        }
         return strlen($str);
     }
-    function strtolower($str) {
-        if (function_exists('mb_strtolower')) return mb_strtolower($str);
+    function strtolower($str)
+    {
+        if (function_exists('mb_strtolower')) {
+            return mb_strtolower($str);
+        }
         return strtolower($str);
     }
-    function strtoupper($str) {
-        if (function_exists('mb_strtoupper')) return mb_strtoupper($str);
+    function strtoupper($str)
+    {
+        if (function_exists('mb_strtoupper')) {
+            return mb_strtoupper($str);
+        }
         return strtoupper($str);
     }
-    function ucfirst($str) {
-        if (function_exists('mb_strtoupper')) 
-            return mb_strtoupper($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
+    function ucfirst($str)
+    {
+        if (function_exists('mb_strtoupper')) {
+                    return mb_strtoupper($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
+        }
         return ucfirst($str);
     }
-    function lcfirst($str) {
-        if (function_exists('mb_strtolower')) 
-            return mb_strtolower($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
+    function lcfirst($str)
+    {
+        if (function_exists('mb_strtolower')) {
+                    return mb_strtolower($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
+        }
         return lcfirst($str);
     }
-    function ucwords($str) {
-        if (function_exists('mb_convert_case'))
-            return mb_convert_case($str, MB_CASE_TITLE);
+    function ucwords($str)
+    {
+        if (function_exists('mb_convert_case')) {
+                    return mb_convert_case($str, MB_CASE_TITLE);
+        }
         return ucwords($str);
     }
-    function strrev($str) {
+    function strrev($str)
+    {
         preg_match_all('/./us', $str, $ar);
         return join(array_reverse($ar[0]));
     }
-    function str_shuffle($str) {
+    function str_shuffle($str)
+    {
         preg_match_all('/./us', $str, $ar);
         shuffle($ar[0]);
         return join($ar[0]);
     }
-    function str_word_count($str) {
+    function str_word_count($str)
+    {
         return count(preg_split('~[^\p{L}\p{N}\']+~u',$str));
     }
-    function strip_tags($value,$params='') {
+    function strip_tags($value,$params='')
+    {
         global $modx;
 
         if(stripos($params,'style')===false && stripos($value,'</style>')!==false) {

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

@@ -341,7 +341,7 @@
                 $conditional = join(' ',$this->condition);
                 $isvalid = intval(eval("return ({$conditional});"));
                 if ($isvalid) return $this->srcValue;
-                return NULL;
+                return null;
             case 'then':
                 $conditional = join(' ',$this->condition);
                 $isvalid = intval(eval("return ({$conditional});"));

Doc Comments +35 added lines

@@ -24,6 +24,11 @@ 
         $this->condModifiers = '=,is,eq,equals,ne,neq,notequals,isnot,isnt,not,%,isempty,isnotempty,isntempty,>=,gte,eg,gte,greaterthan,>,gt,isgreaterthan,isgt,lowerthan,<,lt,<=,lte,islte,islowerthan,islt,el,find,in,inarray,in_array,fnmatch,wcard,wcard_match,wildcard,wildcard_match,is_file,is_dir,file_exists,is_readable,is_writable,is_image,regex,preg,preg_match,memberof,mo,isinrole,ir';
     }
     
+    /**
+     * @param string $key
+     * @param string $value
+     * @param string|false $modifiers
+     */
     function phxFilter($key,$value,$modifiers)
     {
         global $modx;
@@ -45,6 +50,10 @@ 
         return $value;
     }
     
+    /**
+     * @param string $mode
+     * @param string $modifiers
+     */
     function _getDelim($mode,$modifiers) {
         $c = substr($modifiers,0,1);
         if(!in_array($c, array('"', "'", '`')) ) return false;
@@ -56,6 +65,11 @@ 
         return  $c;
     }
     
+    /**
+     * @param string $mode
+     * @param false|string $delim
+     * @param string $modifiers
+     */
     function _getOpt($mode,$delim,$modifiers) {
         if($delim) {
             if($mode=='(') return substr($modifiers,1,strpos($modifiers, $delim . ')' )-1);
@@ -74,6 +88,14 @@ 
             return $opt;
         }
     }
+
+    /**
+     * @param string $mode
+     * @param false|string $delim
+     * @param string $modifiers
+     *
+     * @return string
+     */
     function _getRemainModifiers($mode,$delim,$modifiers) {
         if($delim) {
             if($mode=='(')
@@ -101,6 +123,9 @@ 
         return substr($string,strpos($string, $delim)+$len);
     }
     
+    /**
+     * @param string $modifiers
+     */
     function splitEachModifiers($modifiers) {
         global $modx;
         
@@ -234,6 +259,9 @@ 
         else                  return true;
     }
     
+    /**
+     * @param string $cmd
+     */
     function getValueFromPreset($key, $value, $cmd, $opt)
     {
         global $modx;
@@ -920,6 +948,9 @@ 
         return $value;
     }
 
+    /**
+     * @param string $cmd
+     */
     function includeMdfFile($cmd) {
         global $modx;
         $key = $this->key;
@@ -1075,6 +1106,10 @@ 
     }
     
     // Sets a placeholder variable which can only be access by Modifiers
+
+    /**
+     * @param string $value
+     */
     function setModifiersVariable($key, $value) {
         if ($key != 'phx' && $key != 'dummy') $this->placeholders[$key] = $value;
     }

manager/includes/extenders/ex_modxmailer.inc.php

Spacing +2 added lines, -2 removed lines

@@ -6,9 +6,9 @@
  * Time: 14:17
  */
 
-if (!include_once(MODX_MANAGER_PATH . 'includes/extenders/modxmailer.class.inc.php')){
+if (!include_once(MODX_MANAGER_PATH.'includes/extenders/modxmailer.class.inc.php')) {
     return false;
-}else{
+} else {
     $this->mail = new MODxMailer;
     $this->mail->init($this);
     return true;

Braces +2 added lines, -2 removed lines

@@ -6,9 +6,9 @@
  * Time: 14:17
  */
 
-if (!include_once(MODX_MANAGER_PATH . 'includes/extenders/modxmailer.class.inc.php')){
+if (!include_once(MODX_MANAGER_PATH . 'includes/extenders/modxmailer.class.inc.php')) {
     return false;
-}else{
+} else {
     $this->mail = new MODxMailer;
     $this->mail->init($this);
     return true;

install/actions/action_summary.php

Indentation +2 added lines, -2 removed lines

@@ -248,9 +248,9 @@
         echo '<span class="notok">' . $_lang['failed'] . '</span></b>' . $_lang['table_prefix_not_exist'] . '</p>';
         $errors++;
         echo '<p>' . $_lang['table_prefix_not_exist_note'] . '</p>';
-  } else {
+    } else {
         echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
-  }
+    }
 }
 
 // check mysql version

Spacing +78 added lines, -78 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! function_exists('f_owc')){
+if (!function_exists('f_owc')) {
     /**
      * @param $path
      * @param $data
@@ -12,30 +12,30 @@ 
             fwrite($hnd, $data);
             fclose($hnd);
 
-            if(null !== $mode) chmod($path, $mode);
-        }catch(Exception $e){
+            if (null !== $mode) chmod($path, $mode);
+        } catch (Exception $e) {
             // Nothing, this is NOT normal
             unset($e);
         }
     }
 }
 
-$installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0;
-if( ! isset($_lang)) $_lang = array();
+$installMode = isset($_POST['installmode']) ? (int) $_POST['installmode'] : 0;
+if (!isset($_lang)) $_lang = array();
 
 echo '<div class="stepcontainer">
       <ul class="progressbar">
-          <li class="visited">' . $_lang['choose_language'] . '</li>
-          <li class="visited">' . $_lang['installation_mode'] . '</li>
-          <li class="visited">' . $_lang['optional_items'] . '</li>
-          <li class="active">' . $_lang['preinstall_validation'] . '</li>
-          <li>' . $_lang['install_results'] . '</li>
+          <li class="visited">' . $_lang['choose_language'].'</li>
+          <li class="visited">' . $_lang['installation_mode'].'</li>
+          <li class="visited">' . $_lang['optional_items'].'</li>
+          <li class="active">' . $_lang['preinstall_validation'].'</li>
+          <li>' . $_lang['install_results'].'</li>
   </ul>
   <div class="clearleft"></div>
 </div>';
 
-echo '<h2>' . $_lang['preinstall_validation'] . '</h2>';
-echo '<h3>' . $_lang['summary_setup_check'] . '</h3>';
+echo '<h2>'.$_lang['preinstall_validation'].'</h2>';
+echo '<h3>'.$_lang['summary_setup_check'].'</h3>';
 
 $errors = 0;
 
@@ -43,73 +43,73 @@ 
 // check PHP version
 define('PHP_MIN_VERSION', '5.4.0');
 $phpMinVersion = PHP_MIN_VERSION; // Maybe not necessary. For backward compatibility
-echo '<p>' . $_lang['checking_php_version'];
+echo '<p>'.$_lang['checking_php_version'];
 // -1 if left is less, 0 if equal, +1 if left is higher
 if (version_compare(phpversion(), PHP_MIN_VERSION) < 0) {
     $errors++;
-    $tmp = $_lang['you_running_php'] . phpversion() . str_replace('[+min_version+]', PHP_MIN_VERSION, $_lang["modx_requires_php"]);
-    echo '<span class="notok">' . $_lang['failed'] . '</span>' . $tmp . '</p>';
+    $tmp = $_lang['you_running_php'].phpversion().str_replace('[+min_version+]', PHP_MIN_VERSION, $_lang["modx_requires_php"]);
+    echo '<span class="notok">'.$_lang['failed'].'</span>'.$tmp.'</p>';
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 // check if iconv is available
-echo '<p>' . $_lang['checking_iconv'];
+echo '<p>'.$_lang['checking_iconv'];
 $iconv = (int) function_exists('iconv');
-if ($iconv == '0'){
-    echo '<span class="notok">' . $_lang['failed'].'</span></p><p><strong>'.$_lang['checking_iconv_note'].'</strong></p>';
+if ($iconv == '0') {
+    echo '<span class="notok">'.$_lang['failed'].'</span></p><p><strong>'.$_lang['checking_iconv_note'].'</strong></p>';
     $errors++;
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 // check sessions
-echo '<p>' . $_lang['checking_sessions'];
+echo '<p>'.$_lang['checking_sessions'];
 if ($_SESSION['test'] != 1) {
-    echo '<span class="notok">' . $_lang['failed'].  '</span></p>';
+    echo '<span class="notok">'.$_lang['failed'].'</span></p>';
     $errors++;
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 // check directories
 // cache exists?
-echo '<p>' . $_lang['checking_if_cache_exist'];
+echo '<p>'.$_lang['checking_if_cache_exist'];
 if (!file_exists("../assets/cache") || !file_exists("../assets/cache/rss")) {
-    echo '<span class="notok">' . $_lang['failed'] . '</span></p>';
+    echo '<span class="notok">'.$_lang['failed'].'</span></p>';
     $errors++;
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 // cache writable?
-echo '<p>' . $_lang['checking_if_cache_writable'];
+echo '<p>'.$_lang['checking_if_cache_writable'];
 if (!is_writable("../assets/cache")) {
     $errors++;
-    echo '<span class="notok">' . $_lang['failed'] . '</span></p>';
+    echo '<span class="notok">'.$_lang['failed'].'</span></p>';
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 // cache files writable?
-echo '<p>' . $_lang['checking_if_cache_file_writable'];
+echo '<p>'.$_lang['checking_if_cache_file_writable'];
 $tmp = "../assets/cache/siteCache.idx.php";
-if ( ! file_exists($tmp)) {
+if (!file_exists($tmp)) {
     f_owc($tmp, "<?php //EVO site cache file ?>");
 }
-if ( ! is_writable($tmp)) {
+if (!is_writable($tmp)) {
     $errors++;
-    echo '<span class="notok">' . $_lang['failed'] . '</span></p>';
+    echo '<span class="notok">'.$_lang['failed'].'</span></p>';
 } else {
     echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 echo '<p>'.$_lang['checking_if_cache_file2_writable'];
-if ( ! is_writable("../assets/cache/sitePublishing.idx.php")) {
+if (!is_writable("../assets/cache/sitePublishing.idx.php")) {
     $errors++;
     echo '<span class="notok">'.$_lang['failed'].'</span></p>';
 } else {
@@ -119,7 +119,7 @@ 
 
 // File Browser directories exists?
 echo '<p>'.$_lang['checking_if_images_exist'];
-switch(true){
+switch (true) {
     case !file_exists("../assets/images"):
     case !file_exists("../assets/files"):
     case !file_exists("../assets/backup"):
@@ -134,7 +134,7 @@ 
 
 // File Browser directories writable?
 echo '<p>'.$_lang['checking_if_images_writable'];
-switch(true){
+switch (true) {
     case !is_writable("../assets/images"):
     case !is_writable("../assets/files"):
     case !is_writable("../assets/backup"):
@@ -194,7 +194,7 @@ 
     $database_charset = substr($database_collation, 0, strpos($database_collation, '_') - 1);
     $database_connection_charset = $_POST['database_connection_charset'];
     $database_connection_method = $_POST['database_connection_method'];
-    $dbase = '`' . $_POST['database_name'] . '`';
+    $dbase = '`'.$_POST['database_name'].'`';
     $table_prefix = $_POST['tableprefix'];
 }
 echo '<p>'.$_lang['creating_database_connection'];
@@ -234,54 +234,54 @@ 
 
 // check table prefix
 if ($conn && $installMode == 0) {
-    echo '<p>' . $_lang['checking_table_prefix'] . $table_prefix . '`: ';
-    if ($rs= mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) {
-        echo '<span class="notok">' . $_lang['failed'] . '</span></b>' . $_lang['table_prefix_already_inuse'] . '</p>';
+    echo '<p>'.$_lang['checking_table_prefix'].$table_prefix.'`: ';
+    if ($rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) {
+        echo '<span class="notok">'.$_lang['failed'].'</span></b>'.$_lang['table_prefix_already_inuse'].'</p>';
         $errors++;
-        echo "<p>" . $_lang['table_prefix_already_inuse_note'] . '</p>';
+        echo "<p>".$_lang['table_prefix_already_inuse_note'].'</p>';
     } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span></p>';
     }
 } elseif ($conn && $installMode == 2) {
-    echo '<p>' . $_lang['checking_table_prefix'] . $table_prefix . '`: ';
-    if (!$rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) {
-        echo '<span class="notok">' . $_lang['failed'] . '</span></b>' . $_lang['table_prefix_not_exist'] . '</p>';
+    echo '<p>'.$_lang['checking_table_prefix'].$table_prefix.'`: ';
+    if (!$rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) {
+        echo '<span class="notok">'.$_lang['failed'].'</span></b>'.$_lang['table_prefix_not_exist'].'</p>';
         $errors++;
-        echo '<p>' . $_lang['table_prefix_not_exist_note'] . '</p>';
+        echo '<p>'.$_lang['table_prefix_not_exist_note'].'</p>';
   } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span></p>';
   }
 }
 
 // check mysql version
 if ($conn) {
-    echo '<p>' . $_lang['checking_mysql_version'];
-    if ( version_compare(mysqli_get_server_info($conn), '5.0.51', '=') ) {
-        echo '<span class="notok">'  . $_lang['warning'] . '</span></b>&nbsp;&nbsp;<strong>' . $_lang['mysql_5051'] . '</strong></p>';
-        echo '<p><span class="notok">' . $_lang['mysql_5051_warning'] . '</span></p>';
+    echo '<p>'.$_lang['checking_mysql_version'];
+    if (version_compare(mysqli_get_server_info($conn), '5.0.51', '=')) {
+        echo '<span class="notok">'.$_lang['warning'].'</span></b>&nbsp;&nbsp;<strong>'.$_lang['mysql_5051'].'</strong></p>';
+        echo '<p><span class="notok">'.$_lang['mysql_5051_warning'].'</span></p>';
     } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span>&nbsp;&nbsp;<strong>' . $_lang['mysql_version_is'] . mysqli_get_server_info($conn) . '</strong></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span>&nbsp;&nbsp;<strong>'.$_lang['mysql_version_is'].mysqli_get_server_info($conn).'</strong></p>';
     }
 }
 
 // check for strict mode
 if ($conn) {
-    echo '<p>'. $_lang['checking_mysql_strict_mode'];
+    echo '<p>'.$_lang['checking_mysql_strict_mode'];
     $mysqlmode = mysqli_query($conn, "SELECT @@global.sql_mode");
-    if (mysqli_num_rows($mysqlmode) > 0){
+    if (mysqli_num_rows($mysqlmode) > 0) {
         $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM);
         //$modes = array("STRICT_TRANS_TABLES"); // for testing
         // print_r($modes);
         foreach ($modes as $mode) {
             if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) {
-                echo '<span class="notok">' . $_lang['warning'] . '</span></b> <strong>&nbsp;&nbsp;' . $_lang['strict_mode'] . '</strong></p>';
-                echo '<p><span class="notok">' . $_lang['strict_mode_error'] . '</span></p>';
+                echo '<span class="notok">'.$_lang['warning'].'</span></b> <strong>&nbsp;&nbsp;'.$_lang['strict_mode'].'</strong></p>';
+                echo '<p><span class="notok">'.$_lang['strict_mode_error'].'</span></p>';
             } else {
-                echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+                echo '<span class="ok">'.$_lang['ok'].'</span></p>';
             }
         }
     } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span></p>';
     }
 }
 // Version and strict mode check end
@@ -297,18 +297,18 @@ 
     f_owc("../assets/cache/installProc.inc.php", '<?php $installStartTime = '.time().'; ?>');
 }
 
-if($installMode > 0 && $_POST['installdata'] == "1") {
-    echo '<p class="notes"><strong>' . $_lang['sample_web_site'] . ':</strong> ' . $_lang['sample_web_site_note'] . '</p>';
+if ($installMode > 0 && $_POST['installdata'] == "1") {
+    echo '<p class="notes"><strong>'.$_lang['sample_web_site'].':</strong> '.$_lang['sample_web_site_note'].'</p>';
 }
 
 if ($errors > 0) {
     echo '<p>';
-    echo $_lang['setup_cannot_continue'] . ' ';
+    echo $_lang['setup_cannot_continue'].' ';
 
-    if($errors > 1){
-        echo $errors . " " . $_lang['errors'] . $_lang['please_correct_errors'] . $_lang['and_try_again_plural'];
-    }else{
-        echo $_lang['error'] . $_lang['please_correct_error'] . $_lang['and_try_again'];
+    if ($errors > 1) {
+        echo $errors." ".$_lang['errors'].$_lang['please_correct_errors'].$_lang['and_try_again_plural'];
+    } else {
+        echo $_lang['error'].$_lang['please_correct_error'].$_lang['and_try_again'];
     }
 
     echo $_lang['visit_forum'];
@@ -317,10 +317,10 @@ 
 
 echo '<p>&nbsp;</p>';
 
-$nextAction= $errors > 0 ? 'summary' : 'install';
-$nextButton= $errors > 0 ? $_lang['retry'] : $_lang['install'];
-$nextVisibility= $errors > 0 || isset($_POST['chkagree']) ? 'visible' : 'hidden';
-$agreeToggle= $errors > 0 ? '' : ' onclick="if(document.getElementById(\'chkagree\').checked){document.getElementById(\'nextbutton\').style.visibility=\'visible\';}else{document.getElementById(\'nextbutton\').style.visibility=\'hidden\';}"';
+$nextAction = $errors > 0 ? 'summary' : 'install';
+$nextButton = $errors > 0 ? $_lang['retry'] : $_lang['install'];
+$nextVisibility = $errors > 0 || isset($_POST['chkagree']) ? 'visible' : 'hidden';
+$agreeToggle = $errors > 0 ? '' : ' onclick="if(document.getElementById(\'chkagree\').checked){document.getElementById(\'nextbutton\').style.visibility=\'visible\';}else{document.getElementById(\'nextbutton\').style.visibility=\'hidden\';}"';
 ?>
 <form name="install" id="install_form" action="index.php?action=<?php echo $nextAction ?>" method="post">
   <div>
@@ -342,32 +342,32 @@ 
 
     <input type="hidden" value="<?php echo $_POST['installdata'] ?>" name="installdata" />
 <?php
-    $templates = isset ($_POST['template']) ? $_POST['template'] : array ();
+    $templates = isset ($_POST['template']) ? $_POST['template'] : array();
     foreach ($templates as $i => $template) echo '<input type="hidden" name="template[]" value="'.$template.'" />';
 
-    $tvs = isset ($_POST['tv']) ? $_POST['tv'] : array ();
+    $tvs = isset ($_POST['tv']) ? $_POST['tv'] : array();
     foreach ($tvs as $i => $tv) echo '<input type="hidden" name="tv[]" value="'.$tv.'" />';
 
-    $chunks = isset ($_POST['chunk']) ? $_POST['chunk'] : array ();
+    $chunks = isset ($_POST['chunk']) ? $_POST['chunk'] : array();
     foreach ($chunks as $i => $chunk) echo '<input type="hidden" name="chunk[]" value="'.$chunk.'" />';
 
-    $snippets = isset ($_POST['snippet']) ? $_POST['snippet'] : array ();
+    $snippets = isset ($_POST['snippet']) ? $_POST['snippet'] : array();
     foreach ($snippets as $i => $snippet) echo '<input type="hidden" name="snippet[]" value="'.$snippet.'" />';
 
-    $plugins = isset ($_POST['plugin']) ? $_POST['plugin'] : array ();
+    $plugins = isset ($_POST['plugin']) ? $_POST['plugin'] : array();
     foreach ($plugins as $i => $plugin) echo '<input type="hidden" name="plugin[]" value="'.$plugin.'" />';
 
-    $modules = isset ($_POST['module']) ? $_POST['module'] : array ();
+    $modules = isset ($_POST['module']) ? $_POST['module'] : array();
     foreach ($modules as $i => $module) echo '<input type="hidden" name="module[]" value="'.$module.'" />';
 ?>
 </div>
 
-<h2><?php echo $_lang['agree_to_terms'];?></h2>
+<h2><?php echo $_lang['agree_to_terms']; ?></h2>
 <p>
-<input type="checkbox" value="1" id="chkagree" name="chkagree" style="line-height:18px" <?php echo isset($_POST['chkagree']) ? 'checked="checked" ':""; ?><?php echo $agreeToggle;?>/><label for="chkagree" style="display:inline;float:none;line-height:18px;"> <?php echo $_lang['iagree_box']?> </label>
+<input type="checkbox" value="1" id="chkagree" name="chkagree" style="line-height:18px" <?php echo isset($_POST['chkagree']) ? 'checked="checked" ' : ""; ?><?php echo $agreeToggle; ?>/><label for="chkagree" style="display:inline;float:none;line-height:18px;"> <?php echo $_lang['iagree_box']?> </label>
 </p>
     <p class="buttonlinks">
         <a href="javascript:document.getElementById('install_form').action='index.php?action=options&language=<?php echo $install_language?>';document.getElementById('install_form').submit();" class="prev" title="<?php echo $_lang['btnback_value']?>"><span><?php echo $_lang['btnback_value']?></span></a>
-        <a id="nextbutton" href="javascript:document.getElementById('install_form').submit();" title="<?php echo $nextButton ?>" style="visibility:<?php echo $nextVisibility;?>"><span><?php echo $nextButton ?></span></a>
+        <a id="nextbutton" href="javascript:document.getElementById('install_form').submit();" title="<?php echo $nextButton ?>" style="visibility:<?php echo $nextVisibility; ?>"><span><?php echo $nextButton ?></span></a>
     </p>
 </form>

Braces +35 added lines, -18 removed lines

@@ -1,19 +1,22 @@ 
 <?php
-if( ! function_exists('f_owc')){
+if( ! function_exists('f_owc')) {
     /**
      * @param $path
      * @param $data
      * @param null|int $mode
      */
-    function f_owc($path, $data, $mode = null){
+    function f_owc($path, $data, $mode = null)
+    {
         try {
             // make an attempt to create the file
             $hnd = fopen($path, 'w');
             fwrite($hnd, $data);
             fclose($hnd);
 
-            if(null !== $mode) chmod($path, $mode);
-        }catch(Exception $e){
+            if(null !== $mode) {
+                chmod($path, $mode);
+            }
+        } catch(Exception $e) {
             // Nothing, this is NOT normal
             unset($e);
         }
@@ -21,7 +24,9 @@ 
 }
 
 $installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0;
-if( ! isset($_lang)) $_lang = array();
+if( ! isset($_lang)) {
+    $_lang = array();
+}
 
 echo '<div class="stepcontainer">
       <ul class="progressbar">
@@ -57,7 +62,7 @@ 
 // check if iconv is available
 echo '<p>' . $_lang['checking_iconv'];
 $iconv = (int) function_exists('iconv');
-if ($iconv == '0'){
+if ($iconv == '0') {
     echo '<span class="notok">' . $_lang['failed'].'</span></p><p><strong>'.$_lang['checking_iconv_note'].'</strong></p>';
     $errors++;
 } else {
@@ -119,7 +124,7 @@ 
 
 // File Browser directories exists?
 echo '<p>'.$_lang['checking_if_images_exist'];
-switch(true){
+switch(true) {
     case !file_exists("../assets/images"):
     case !file_exists("../assets/files"):
     case !file_exists("../assets/backup"):
@@ -134,7 +139,7 @@ 
 
 // File Browser directories writable?
 echo '<p>'.$_lang['checking_if_images_writable'];
-switch(true){
+switch(true) {
     case !is_writable("../assets/images"):
     case !is_writable("../assets/files"):
     case !is_writable("../assets/backup"):
@@ -268,7 +273,7 @@ 
 if ($conn) {
     echo '<p>'. $_lang['checking_mysql_strict_mode'];
     $mysqlmode = mysqli_query($conn, "SELECT @@global.sql_mode");
-    if (mysqli_num_rows($mysqlmode) > 0){
+    if (mysqli_num_rows($mysqlmode) > 0) {
         $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM);
         //$modes = array("STRICT_TRANS_TABLES"); // for testing
         // print_r($modes);
@@ -305,9 +310,9 @@ 
     echo '<p>';
     echo $_lang['setup_cannot_continue'] . ' ';
 
-    if($errors > 1){
+    if($errors > 1) {
         echo $errors . " " . $_lang['errors'] . $_lang['please_correct_errors'] . $_lang['and_try_again_plural'];
-    }else{
+    } else {
         echo $_lang['error'] . $_lang['please_correct_error'] . $_lang['and_try_again'];
     }
 
@@ -343,23 +348,35 @@ 
     <input type="hidden" value="<?php echo $_POST['installdata'] ?>" name="installdata" />
 <?php
     $templates = isset ($_POST['template']) ? $_POST['template'] : array ();
-    foreach ($templates as $i => $template) echo '<input type="hidden" name="template[]" value="'.$template.'" />';
+    foreach ($templates as $i => $template) {
+        echo '<input type="hidden" name="template[]" value="'.$template.'" />';
+    }
 
     $tvs = isset ($_POST['tv']) ? $_POST['tv'] : array ();
-    foreach ($tvs as $i => $tv) echo '<input type="hidden" name="tv[]" value="'.$tv.'" />';
+    foreach ($tvs as $i => $tv) {
+        echo '<input type="hidden" name="tv[]" value="'.$tv.'" />';
+    }
 
     $chunks = isset ($_POST['chunk']) ? $_POST['chunk'] : array ();
-    foreach ($chunks as $i => $chunk) echo '<input type="hidden" name="chunk[]" value="'.$chunk.'" />';
+    foreach ($chunks as $i => $chunk) {
+        echo '<input type="hidden" name="chunk[]" value="'.$chunk.'" />';
+    }
 
     $snippets = isset ($_POST['snippet']) ? $_POST['snippet'] : array ();
-    foreach ($snippets as $i => $snippet) echo '<input type="hidden" name="snippet[]" value="'.$snippet.'" />';
+    foreach ($snippets as $i => $snippet) {
+        echo '<input type="hidden" name="snippet[]" value="'.$snippet.'" />';
+    }
 
     $plugins = isset ($_POST['plugin']) ? $_POST['plugin'] : array ();
-    foreach ($plugins as $i => $plugin) echo '<input type="hidden" name="plugin[]" value="'.$plugin.'" />';
+    foreach ($plugins as $i => $plugin) {
+        echo '<input type="hidden" name="plugin[]" value="'.$plugin.'" />';
+    }
 
     $modules = isset ($_POST['module']) ? $_POST['module'] : array ();
-    foreach ($modules as $i => $module) echo '<input type="hidden" name="module[]" value="'.$module.'" />';
-?>
+    foreach ($modules as $i => $module) {
+        echo '<input type="hidden" name="module[]" value="'.$module.'" />';
+    }
+    ?>
 </div>
 
 <h2><?php echo $_lang['agree_to_terms'];?></h2>

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

@@ -207,7 +207,7 @@
 
 
 // make sure we can use the database
-if ($installMode > 0 && !mysqli_query($conn, "USE {$dbase}")) {
+if ($installMode > 0 && !mysqli_query($conn, "use {$dbase}")) {
     $errors++;
     echo '<span class="notok">'.$_lang['database_use_failed'].'</span><p />'.$_lang["database_use_failed_note"].'</p>';
 }

install/actions/action_mode.php

Spacing +11 added lines, -11 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 // Determine upgradeability
 $upgradeable = 0;
-if (is_file($base_path . MGR_DIR . '/includes/config.inc.php')) { // Include the file so we can test its validity
-    include $base_path . MGR_DIR . '/includes/config.inc.php';
+if (is_file($base_path.MGR_DIR.'/includes/config.inc.php')) { // Include the file so we can test its validity
+    include $base_path.MGR_DIR.'/includes/config.inc.php';
     // We need to have all connection settings - tho prefix may be empty so we have to ignore it
     if (isset($dbase)) {
         if (!$conn = @mysqli_connect($database_server, $database_user, $database_password))
@@ -17,16 +17,16 @@ 
 }
 
 $ph['moduleName']       = $moduleName;
-$ph['displayNew']       = ($upgradeable!=0) ? 'display:none;' : '';
-$ph['displayUpg']       = ($upgradeable==0) ? 'display:none;' : '';
+$ph['displayNew']       = ($upgradeable != 0) ? 'display:none;' : '';
+$ph['displayUpg']       = ($upgradeable == 0) ? 'display:none;' : '';
 $ph['displayAdvUpg']    = $ph['displayUpg'];
-$ph['checkedNew']       = !$upgradeable     ? 'checked' : '';
-$ph['checkedUpg']       = ($_POST['installmode']==1 || $upgradeable==1) ? 'checked' : '';
-$ph['checkedAdvUpg']    = ($_POST['installmode']==2 || $upgradeable==2) ? 'checked' : '';
+$ph['checkedNew']       = !$upgradeable ? 'checked' : '';
+$ph['checkedUpg']       = ($_POST['installmode'] == 1 || $upgradeable == 1) ? 'checked' : '';
+$ph['checkedAdvUpg']    = ($_POST['installmode'] == 2 || $upgradeable == 2) ? 'checked' : '';
 $ph['install_language'] = $install_language;
-$ph['disabledUpg']      = ($upgradeable!=1) ? 'disabled' : '';
-$ph['disabledAdvUpg']   = ($upgradeable==0) ? 'disabled' : '';
+$ph['disabledUpg']      = ($upgradeable != 1) ? 'disabled' : '';
+$ph['disabledAdvUpg']   = ($upgradeable == 0) ? 'disabled' : '';
 
-$tpl = file_get_contents($base_path . 'install/actions/tpl_mode.html');
+$tpl = file_get_contents($base_path.'install/actions/tpl_mode.html');
 $content = parse($tpl, $ph);
-echo parse($content, $_lang,'[%','%]');
+echo parse($content, $_lang, '[%', '%]');

Braces +12 added lines, -10 removed lines

@@ -1,20 +1,22 @@
 <?php
 // Determine upgradeability
 $upgradeable = 0;
-if (is_file($base_path . MGR_DIR . '/includes/config.inc.php')) { // Include the file so we can test its validity
+if (is_file($base_path . MGR_DIR . '/includes/config.inc.php')) {
+// Include the file so we can test its validity
     include $base_path . MGR_DIR . '/includes/config.inc.php';
     // We need to have all connection settings - tho prefix may be empty so we have to ignore it
     if (isset($dbase)) {
-        if (!$conn = @mysqli_connect($database_server, $database_user, $database_password))
-            $upgradeable = isset($_POST['installmode']) && $_POST['installmode'] == 'new' ? 0 : 2;
-        elseif (!@mysqli_select_db($conn, trim($dbase, '`')))
-            $upgradeable = isset($_POST['installmode']) && $_POST['installmode'] == 'new' ? 0 : 2;
-        else
-            $upgradeable = 1;
+        if (!$conn = @mysqli_connect($database_server, $database_user, $database_password)) {
+                    $upgradeable = isset($_POST['installmode']) && $_POST['installmode'] == 'new' ? 0 : 2;
+        } elseif (!@mysqli_select_db($conn, trim($dbase, '`'))) {
+                    $upgradeable = isset($_POST['installmode']) && $_POST['installmode'] == 'new' ? 0 : 2;
+        } else {
+                    $upgradeable = 1;
+        }
+    } else {
+            $upgradeable = 2;
+    }
     }
-    else
-        $upgradeable = 2;
-}
 
 $ph['moduleName']       = $moduleName;
 $ph['displayNew']       = ($upgradeable!=0) ? 'display:none;' : '';