evolution-cms / evolution

manager/includes/extenders/ex_phpcompat.inc.php

Braces +3 added lines, -3 removed lines

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

manager/includes/extenders/ex_phpass.inc.php

Braces +3 added lines, -3 removed lines

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

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

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;

manager/includes/extenders/ex_export_site.inc.php

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

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;

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

Braces +81 added lines, -62 removed lines

@@ -15,14 +15,18 @@ 
 	{
 		global $modx;
 		
-		if(!defined('MODX_BASE_PATH'))  return false;
+		if(!defined('MODX_BASE_PATH')) {
+		    return false;
+		}
 		$this->exportstart = $this->get_mtime();
 		$this->count = 0;
 		$this->setUrlMode();
 		$this->dirCheckCount = 0;
 		$this->generate_mode = 'crawl';
 		$this->targetDir = $modx->config['base_path'] . 'temp/export';
-		if(!isset($this->total)) $this->getTotal();
+		if(!isset($this->total)) {
+		    $this->getTotal();
+		}
 	}
 	
 	function setExportDir($dir)
@@ -44,8 +48,7 @@ 
 	{
 		global $modx;
 		
-		if($modx->config['friendly_urls']==0)
-		{
+		if($modx->config['friendly_urls']==0) {
 			$modx->config['friendly_urls']  = 1;
 			$modx->config['use_alias_path'] = 1;
 			$modx->clearCache('full');
@@ -59,8 +62,7 @@ 
 		$tbl_site_content = $modx->getFullTableName('site_content');
 		
 		$ignore_ids = array_filter(array_map('intval', explode(',', $ignore_ids)));
-		if(count($ignore_ids)>0)
-		{
+		if(count($ignore_ids)>0) {
 			$ignore_ids = "AND NOT id IN ('".implode("','", $ignore_ids)."')";
 		} else {
 			$ignore_ids = '';
@@ -77,27 +79,37 @@ 
 	
 	function removeDirectoryAll($directory='')
 	{
-		if(empty($directory)) $directory = $this->targetDir;
+		if(empty($directory)) {
+		    $directory = $this->targetDir;
+		}
 		$directory = rtrim($directory,'/');
 		// if the path is not valid or is not a directory ...
-		if(empty($directory)) return false;
-		if(strpos($directory,MODX_BASE_PATH)===false) return FALSE;
+		if(empty($directory)) {
+		    return false;
+		}
+		if(strpos($directory,MODX_BASE_PATH)===false) {
+		    return FALSE;
+		}
 		
-		if(!is_dir($directory))          return FALSE;
-		elseif(!is_readable($directory)) return FALSE;
-		else
-		{
+		if(!is_dir($directory)) {
+		    return FALSE;
+		} elseif(!is_readable($directory)) {
+		    return FALSE;
+		} else {
 			$files = glob($directory . '/*');
-			if(!empty($files))
-			{
-    			foreach($files as $path)
-    			{
-    				if(is_dir($path)) $this->removeDirectoryAll($path);
-    				else              $rs = unlink($path);
+			if(!empty($files)) {
+    			foreach($files as $path) {
+    				if(is_dir($path)) {
+    				    $this->removeDirectoryAll($path);
+    				} else {
+    				    $rs = unlink($path);
+    				}
     			}
 			}
 		}
-		if($directory !== $this->targetDir) $rs = rmdir($directory);
+		if($directory !== $this->targetDir) {
+		    $rs = rmdir($directory);
+		}
 		
 		return $rs;
 	}
@@ -106,37 +118,43 @@ 
 	{
 		global  $modx,$_lang;
 		$file_permission = octdec($modx->config['new_file_permissions']);
-		if($this->generate_mode==='direct')
-		{
+		if($this->generate_mode==='direct') {
 			$back_lang = $_lang;
 			$src = $modx->executeParser($docid);
 			
 			$_lang = $back_lang;
+		} else {
+		    $src = $this->curl_get_contents(MODX_SITE_URL . "index.php?id={$docid}");
 		}
-		else $src = $this->curl_get_contents(MODX_SITE_URL . "index.php?id={$docid}");
 		
 		
-		if($src !== false)
-		{
-			if($this->repl_before!==$this->repl_after) $src = str_replace($this->repl_before,$this->repl_after,$src);
+		if($src !== false) {
+			if($this->repl_before!==$this->repl_after) {
+			    $src = str_replace($this->repl_before,$this->repl_after,$src);
+			}
 			$result = file_put_contents($filepath,$src);
-			if($result!==false) @chmod($filepath, $file_permission);
+			if($result!==false) {
+			    @chmod($filepath, $file_permission);
+			}
 			
-			if($result !== false) return 'success';
-			else                  return 'failed_no_write';
+			if($result !== false) {
+			    return 'success';
+			} else {
+			    return 'failed_no_write';
+			}
+		} else {
+		    return 'failed_no_retrieve';
 		}
-		else                      return 'failed_no_retrieve';
 	}
 
 	function getFileName($docid, $alias='', $prefix, $suffix)
 	{
 		global $modx;
 		
-		if($alias==='') $filename = $prefix.$docid.$suffix;
-		else
-		{
-			if($modx->config['suffix_mode']==='1' && strpos($alias, '.')!==false)
-			{
+		if($alias==='') {
+		    $filename = $prefix.$docid.$suffix;
+		} else {
+			if($modx->config['suffix_mode']==='1' && strpos($alias, '.')!==false) {
 				$suffix = '';
 			}
 			$filename = $prefix.$alias.$suffix;
@@ -187,24 +205,20 @@ 
 		$ph = array();
 		$ph['total']     = $this->total;
 		$folder_permission = octdec($modx->config['new_folder_permissions']);
-		while($row = $modx->db->getRow($rs))
-		{
+		while($row = $modx->db->getRow($rs)) {
 			$this->count++;
 			
 			$row['count']     = $this->count;
 			$row['url'] = $modx->makeUrl($row['id']);
 			
-			if (!$row['wasNull'])
-			{ // needs writing a document
+			if (!$row['wasNull']) {
+// needs writing a document
 				$docname = $this->getFileName($row['id'], $row['alias'], $prefix, $suffix);
 				$filename = $dirpath.$docname;
-				if (!is_file($filename))
-				{
-					if($row['published']==='1')
-					{
+				if (!is_file($filename)) {
+					if($row['published']==='1') {
 						$status = $this->makeFile($row['id'], $filename);
-						switch($status)
-						{
+						switch($status) {
 							case 'failed_no_write'   :
                                                             $row['status'] = $msg_failed_no_write;
                                                             break;
@@ -214,34 +228,38 @@ 
 							default:
                                                             $row['status'] = $msg_success;
 						}
+					} else {
+					    $row['status'] = $msg_failed_no_retrieve;
 					}
-					else $row['status'] = $msg_failed_no_retrieve;
+				} else {
+				    $row['status'] = $msg_success_skip_doc;
 				}
-				else     $row['status'] = $msg_success_skip_doc;
 				$this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row);
-			}
-			else
-			{
+			} else {
 				$row['status'] = $msg_success_skip_dir;
 				$this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row);
 			}
-			if ($row['isfolder']==='1' && ($modx->config['suffix_mode']!=='1' || strpos($row['alias'],'.')===false))
-			{ // needs making a folder
+			if ($row['isfolder']==='1' && ($modx->config['suffix_mode']!=='1' || strpos($row['alias'],'.')===false)) {
+// needs making a folder
 				$end_dir = ($row['alias']!=='') ? $row['alias'] : $row['id'];
 				$dir_path = $dirpath . $end_dir;
-				if(strpos($dir_path,MODX_BASE_PATH)===false) return FALSE;
-				if (!is_dir($dir_path))
-				{
-					if (is_file($dir_path)) @unlink($dir_path);
+				if(strpos($dir_path,MODX_BASE_PATH)===false) {
+				    return FALSE;
+				}
+				if (!is_dir($dir_path)) {
+					if (is_file($dir_path)) {
+					    @unlink($dir_path);
+					}
 					mkdir($dir_path);
 					@chmod($dir_path, $folder_permission);
 					
 				}
 				
 				
-				if($modx->config['make_folders']==='1' && $row['published']==='1')
-				{
-					if(is_file($filename)) rename($filename,$dir_path . '/index.html');
+				if($modx->config['make_folders']==='1' && $row['published']==='1') {
+					if(is_file($filename)) {
+					    rename($filename,$dir_path . '/index.html');
+					}
 				}
 				$this->targetDir = $dir_path;
 				$this->run($row['id']);
@@ -252,7 +270,9 @@ 
 	
     function curl_get_contents($url, $timeout = 30 )
     {
-    	if(!function_exists('curl_init')) return @file_get_contents($url);
+    	if(!function_exists('curl_init')) {
+    	    return @file_get_contents($url);
+    	}
 
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
@@ -269,8 +289,7 @@ 
 
     function parsePlaceholder($tpl,$ph=array())
     {
-    	foreach($ph as $k=>$v)
-    	{
+    	foreach($ph as $k=>$v) {
     		$k = "[+{$k}+]";
     		$tpl = str_replace($k,$v,$tpl);
     	}

manager/includes/extenders/ex_dbapi.inc.php

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/manager.api.class.inc.php

Braces +106 added lines, -59 removed lines

@@ -8,16 +8,19 @@ 
 global $_PAGE; // page view state object. Usage $_PAGE['vs']['propertyname'] = $value;
 
 // Content manager wrapper class
-class ManagerAPI {
+class ManagerAPI
+{
 	
 	var $action; // action directive
 
-	function __construct(){
+	function __construct()
+	{
 		global $action;
 		$this->action = $action; // set action directive
 	}
 	
-	function initPageViewState($id=0){
+	function initPageViewState($id=0)
+	{
 		global $_PAGE;
 		$vsid = isset($_SESSION["mgrPageViewSID"]) ? $_SESSION["mgrPageViewSID"] : '';
 		if($vsid!=$this->action) {
@@ -28,33 +31,38 @@ 
 	}
 
 	// save page view state - not really necessary,
-	function savePageViewState($id=0){
+	function savePageViewState($id=0)
+	{
 		global $_PAGE;
 		$_SESSION["mgrPageViewSDATA"] = $_PAGE['vs'];
 		$_SESSION["mgrPageViewSID"] = $id>0 ? $id:$this->action;
 	}
 	
 	// check for saved form
-	function hasFormValues() {
-		if(isset($_SESSION["mgrFormValueId"])) {		
+	function hasFormValues()
+	{
+		if(isset($_SESSION["mgrFormValueId"])) {
 			if($this->action==$_SESSION["mgrFormValueId"]) {
 				return true;
-			}
-			else {
+			} else {
 				$this->clearSavedFormValues();
 			}
 		}
 		return false;
 	}	
 	// saved form post from $_POST
-	function saveFormValues($id=0){
+	function saveFormValues($id=0)
+	{
 		$_SESSION["mgrFormValues"] = $_POST;
 		$_SESSION["mgrFormValueId"] = $id>0 ? $id:$this->action;
 	}		
 	// load saved form values into $_POST
-	function loadFormValues(){
+	function loadFormValues()
+	{
 		
-		if(!$this->hasFormValues()) return false;
+		if(!$this->hasFormValues()) {
+		    return false;
+		}
 		
 		$p = $_SESSION["mgrFormValues"];
 		$this->clearSavedFormValues();
@@ -64,31 +72,41 @@ 
 		return true;
 	}
 	// clear form post
-	function clearSavedFormValues(){
+	function clearSavedFormValues()
+	{
 		unset($_SESSION["mgrFormValues"]);
 		unset($_SESSION["mgrFormValueId"]);	
 	}
 	
-	function getHashType($db_value='') { // md5 | v1 | phpass
+	function getHashType($db_value='')
+	{
+// md5 | v1 | phpass
 		$c = substr($db_value,0,1);
-		if($c==='$')                                      return 'phpass';
-		elseif(strlen($db_value)===32)                    return 'md5';
-		elseif($c!=='$' && strpos($db_value,'>')!==false) return 'v1';
-		else                                              return 'unknown';
+		if($c==='$') {
+		    return 'phpass';
+		} elseif(strlen($db_value)===32) {
+		    return 'md5';
+		} elseif($c!=='$' && strpos($db_value,'>')!==false) {
+		    return 'v1';
+		} else {
+		    return 'unknown';
+		}
 	}
 	
 	function genV1Hash($password, $seed='1')
-	{ // $seed is user_id basically
+	{
+// $seed is user_id basically
 		global $modx;
 		
-		if(isset($modx->config['pwd_hash_algo']) && !empty($modx->config['pwd_hash_algo']))
-			$algorithm = $modx->config['pwd_hash_algo'];
-		else $algorithm = 'UNCRYPT';
+		if(isset($modx->config['pwd_hash_algo']) && !empty($modx->config['pwd_hash_algo'])) {
+					$algorithm = $modx->config['pwd_hash_algo'];
+		} else {
+		    $algorithm = 'UNCRYPT';
+		}
 		
 		$salt = md5($password . $seed);
 		
-		switch($algorithm)
-		{
+		switch($algorithm) {
 			case 'BLOWFISH_Y':
 				$salt = '$2y$07$' . substr($salt,0,22);
 				break;
@@ -106,11 +124,11 @@ 
 				break;
 		}
 		
-		if($algorithm!=='UNCRYPT')
-		{
+		if($algorithm!=='UNCRYPT') {
 			$password = sha1($password) . crypt($password,$salt);
+		} else {
+		    $password = sha1($salt.$password);
 		}
-		else $password = sha1($salt.$password);
 		
 		$result = strtolower($algorithm) . '>' . md5($salt.$password) . substr(md5($salt),0,8);
 		
@@ -124,9 +142,9 @@ 
 		$rs = $modx->db->select('password',$tbl_manager_users,"id='{$uid}'");
 		$password = $modx->db->getValue($rs);
 		
-		if(strpos($password,'>')===false) $algo = 'NOSALT';
-		else
-		{
+		if(strpos($password,'>')===false) {
+		    $algo = 'NOSALT';
+		} else {
 			$algo = substr($password,0,strpos($password,'>'));
 		}
 		return strtoupper($algo);
@@ -135,27 +153,34 @@ 
 	function checkHashAlgorithm($algorithm='')
 	{
 		$result = false;
-		if (!empty($algorithm))
-		{
-			switch ($algorithm)
-			{
+		if (!empty($algorithm)) {
+			switch ($algorithm) {
 				case 'BLOWFISH_Y':
-					if (defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1)
-					{
-						if (version_compare('5.3.7', PHP_VERSION) <= 0) $result = true;
+					if (defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1) {
+						if (version_compare('5.3.7', PHP_VERSION) <= 0) {
+						    $result = true;
+						}
 					}
 					break;
 				case 'BLOWFISH_A':
-					if (defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1) $result = true;
+					if (defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1) {
+					    $result = true;
+					}
 					break;
 				case 'SHA512':
-					if (defined('CRYPT_SHA512') && CRYPT_SHA512 == 1) $result = true;
+					if (defined('CRYPT_SHA512') && CRYPT_SHA512 == 1) {
+					    $result = true;
+					}
 					break;
 				case 'SHA256':
-					if (defined('CRYPT_SHA256') && CRYPT_SHA256 == 1) $result = true;
+					if (defined('CRYPT_SHA256') && CRYPT_SHA256 == 1) {
+					    $result = true;
+					}
 					break;
 				case 'MD5':
-					if (defined('CRYPT_MD5') && CRYPT_MD5 == 1 && PHP_VERSION != '5.3.7') $result = true;
+					if (defined('CRYPT_MD5') && CRYPT_MD5 == 1 && PHP_VERSION != '5.3.7') {
+					    $result = true;
+					}
 					break;
 				case 'UNCRYPT':
 					$result = true;
@@ -165,20 +190,24 @@ 
 		return $result;
 	}
 
-	function getSystemChecksum($check_files) {
+	function getSystemChecksum($check_files)
+	{
 		$_ = array();
 		$check_files = trim($check_files);
 		$check_files = explode("\n", $check_files);
 		foreach($check_files as $file) {
 			$file = trim($file);
 			$file = MODX_BASE_PATH . $file;
-			if(!is_file($file)) continue;
+			if(!is_file($file)) {
+			    continue;
+			}
 			$_[$file]= md5_file($file);
 		}
 		return serialize($_);
 	}
 
-	function getModifiedSystemFilesList($check_files, $checksum) {
+	function getModifiedSystemFilesList($check_files, $checksum)
+	{
 		$_ = array();
 		$check_files = trim($check_files);
 		$check_files = explode("\n", $check_files);
@@ -186,41 +215,52 @@ 
 		foreach($check_files as $file) {
 			$file = trim($file);
 			$filePath = MODX_BASE_PATH . $file;
-			if(!is_file($filePath)) continue;
-			if(md5_file($filePath) != $checksum[$filePath]) $_[] = $file;
+			if(!is_file($filePath)) {
+			    continue;
+			}
+			if(md5_file($filePath) != $checksum[$filePath]) {
+			    $_[] = $file;
+			}
 		}
 		return $_;
 	}
 
-	function setSystemChecksum($checksum) {
+	function setSystemChecksum($checksum)
+	{
 		global $modx;
 		$tbl_system_settings = $modx->getFullTableName('system_settings');
 		$sql = "REPLACE INTO {$tbl_system_settings} (setting_name, setting_value) VALUES ('sys_files_checksum','" . $modx->db->escape($checksum) . "')";
         $modx->db->query($sql);
 	}
 	
-	function checkSystemChecksum() {
+	function checkSystemChecksum()
+	{
 		global $modx;
 
-		if(!isset($modx->config['check_files_onlogin']) || empty($modx->config['check_files_onlogin'])) return '0';
+		if(!isset($modx->config['check_files_onlogin']) || empty($modx->config['check_files_onlogin'])) {
+		    return '0';
+		}
 		
 		$current = $this->getSystemChecksum($modx->config['check_files_onlogin']);
-		if(empty($current)) return '0';
+		if(empty($current)) {
+		    return '0';
+		}
 		
-		if(!isset($modx->config['sys_files_checksum']) || empty($modx->config['sys_files_checksum']))
-		{
+		if(!isset($modx->config['sys_files_checksum']) || empty($modx->config['sys_files_checksum'])) {
 			$this->setSystemChecksum($current);
 			return '0';
 		}
-		if($current===$modx->config['sys_files_checksum']) $result = '0';
-		else {
+		if($current===$modx->config['sys_files_checksum']) {
+		    $result = '0';
+		} else {
 			$result = $this->getModifiedSystemFilesList($modx->config['check_files_onlogin'], $modx->config['sys_files_checksum']);
 		} 
 
 		return $result;
 	}
 
-    function getLastUserSetting($key=false) {
+    function getLastUserSetting($key=false)
+    {
         global $modx;
         
         $rs = $modx->db->select('*', $modx->getFullTableName('user_settings'), "user = '{$_SESSION['mgrInternalKey']}'");
@@ -233,15 +273,21 @@ 
             }
         }
         
-        if(!$key) return $usersettings;
-        else return isset($usersettings[$key]) ? $usersettings[$key] : NULL;
+        if(!$key) {
+            return $usersettings;
+        } else {
+            return isset($usersettings[$key]) ? $usersettings[$key] : NULL;
+        }
     }
     
-    function saveLastUserSetting($settings, $val='') {
+    function saveLastUserSetting($settings, $val='')
+    {
         global $modx;
         
         if(!empty($settings)) {
-            if(!is_array($settings)) $settings = array($settings=>$val);
+            if(!is_array($settings)) {
+                $settings = array($settings=>$val);
+            }
             
             foreach ($settings as $key => $val) {
                 $f = array();
@@ -256,7 +302,8 @@ 
         }
     }
     
-    function loadDatePicker($path) {
+    function loadDatePicker($path)
+    {
         global $modx;
         include_once($path);
         $dp = new DATEPICKER();

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

Braces +47 added lines, -31 removed lines

@@ -24,7 +24,8 @@ 
 // Obviously, since this code is in the public domain, the above are not
 // requirements (there can be none), but merely suggestions.
 //
-class PasswordHash {
+class PasswordHash
+{
     var $itoa64;
     var $iteration_count_log2;
     var $portable_hashes;
@@ -34,8 +35,9 @@ 
     {
         $this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
 
-        if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31)
-            $iteration_count_log2 = 8;
+        if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31) {
+                    $iteration_count_log2 = 8;
+        }
         $this->iteration_count_log2 = $iteration_count_log2;
 
         $this->portable_hashes = $portable_hashes;
@@ -73,16 +75,20 @@ 
         do {
             $value = ord($input[$i++]);
             $output .= $this->itoa64[$value & 0x3f];
-            if ($i < $count)
-                $value |= ord($input[$i]) << 8;
+            if ($i < $count) {
+                            $value |= ord($input[$i]) << 8;
+            }
             $output .= $this->itoa64[($value >> 6) & 0x3f];
-            if ($i++ >= $count)
-                break;
-            if ($i < $count)
-                $value |= ord($input[$i]) << 16;
+            if ($i++ >= $count) {
+                            break;
+            }
+            if ($i < $count) {
+                            $value |= ord($input[$i]) << 16;
+            }
             $output .= $this->itoa64[($value >> 12) & 0x3f];
-            if ($i++ >= $count)
-                break;
+            if ($i++ >= $count) {
+                            break;
+            }
             $output .= $this->itoa64[($value >> 18) & 0x3f];
         } while ($i < $count);
 
@@ -101,23 +107,27 @@ 
     function crypt_private($password, $setting)
     {
         $output = '*0';
-        if (substr($setting, 0, 2) == $output)
-            $output = '*1';
+        if (substr($setting, 0, 2) == $output) {
+                    $output = '*1';
+        }
 
         $id = substr($setting, 0, 3);
         // We use "$P$", phpBB3 uses "$H$" for the same thing
-        if ($id != '$P$' && $id != '$H$')
-            return $output;
+        if ($id != '$P$' && $id != '$H$') {
+                    return $output;
+        }
 
         $count_log2 = strpos($this->itoa64, $setting[3]);
-        if ($count_log2 < 7 || $count_log2 > 30)
-            return $output;
+        if ($count_log2 < 7 || $count_log2 > 30) {
+                    return $output;
+        }
 
         $count = 1 << $count_log2;
 
         $salt = substr($setting, 4, 8);
-        if (strlen($salt) != 8)
-            return $output;
+        if (strlen($salt) != 8) {
+                    return $output;
+        }
 
         // We're kind of forced to use MD5 here since it's the only
         // cryptographic primitive available in all versions of PHP
@@ -208,26 +218,31 @@ 
             $random = $this->get_random_bytes(16);
             $hash =
                 crypt($password, $this->gensalt_blowfish($random));
-            if (strlen($hash) == 60)
-                return $hash;
+            if (strlen($hash) == 60) {
+                            return $hash;
+            }
         }
 
         if (CRYPT_EXT_DES == 1 && !$this->portable_hashes) {
-            if (strlen($random) < 3)
-                $random = $this->get_random_bytes(3);
+            if (strlen($random) < 3) {
+                            $random = $this->get_random_bytes(3);
+            }
             $hash =
                 crypt($password, $this->gensalt_extended($random));
-            if (strlen($hash) == 20)
-                return $hash;
+            if (strlen($hash) == 20) {
+                            return $hash;
+            }
         }
 
-        if (strlen($random) < 6)
-            $random = $this->get_random_bytes(6);
+        if (strlen($random) < 6) {
+                    $random = $this->get_random_bytes(6);
+        }
         $hash =
             $this->crypt_private($password,
             $this->gensalt_private($random));
-        if (strlen($hash) == 34)
-            return $hash;
+        if (strlen($hash) == 34) {
+                    return $hash;
+        }
 
         // Returning '*' on error is safe here, but would _not_ be safe
         // in a crypt(3)-like function used _both_ for generating new
@@ -242,8 +257,9 @@ 
         }
 
         $hash = $this->crypt_private($password, $stored_hash);
-        if (substr($hash,0,1) === '*')
-            $hash = crypt($password, $stored_hash);
+        if (substr($hash,0,1) === '*') {
+                    $hash = crypt($password, $stored_hash);
+        }
 
         return ($hash===$stored_hash) ? true : false;
     }