evolution-cms / evolution

manager/includes/extenders/ex_phpcompat.inc.php

Spacing +3 added lines, -3 removed lines

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

manager/includes/extenders/ex_phpass.inc.php

Spacing +3 added lines, -3 removed lines

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

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

Spacing +53 added lines, -53 removed lines

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

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

Spacing +19 added lines, -19 removed lines

@@ -11,9 +11,9 @@ 
 use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\Exception;
 
-require MODX_MANAGER_PATH . 'includes/controls/phpmailer/Exception.php';
-require MODX_MANAGER_PATH . 'includes/controls/phpmailer/PHPMailer.php';
-require MODX_MANAGER_PATH . 'includes/controls/phpmailer/SMTP.php';
+require MODX_MANAGER_PATH.'includes/controls/phpmailer/Exception.php';
+require MODX_MANAGER_PATH.'includes/controls/phpmailer/PHPMailer.php';
+require MODX_MANAGER_PATH.'includes/controls/phpmailer/SMTP.php';
 
 /**
  * Class MODxMailer
@@ -31,7 +31,7 @@ 
     public function init(\DocumentParser $modx)
     {
         $this->modx = $modx;
-        $this->PluginDir = MODX_MANAGER_PATH . 'includes/controls/phpmailer/';
+        $this->PluginDir = MODX_MANAGER_PATH.'includes/controls/phpmailer/';
 
         switch ($modx->config['email_method']) {
             case 'smtp':
@@ -95,7 +95,7 @@ 
             mb_language($this->mb_language);
             mb_internal_encoding($modx->config['modx_charset']);
         }
-        $exconf = MODX_MANAGER_PATH . 'includes/controls/phpmailer/config.inc.php';
+        $exconf = MODX_MANAGER_PATH.'includes/controls/phpmailer/config.inc.php';
         if (is_file($exconf)) {
             include($exconf);
         }
@@ -163,12 +163,12 @@ 
         }
 
         if ($this->modx->debug) {
-            $debug_info = 'CharSet = ' . $this->CharSet . "\n";
-            $debug_info .= 'Encoding = ' . $this->Encoding . "\n";
-            $debug_info .= 'mb_language = ' . $this->mb_language . "\n";
-            $debug_info .= 'encode_header_method = ' . $this->encode_header_method . "\n";
+            $debug_info = 'CharSet = '.$this->CharSet."\n";
+            $debug_info .= 'Encoding = '.$this->Encoding."\n";
+            $debug_info .= 'mb_language = '.$this->mb_language."\n";
+            $debug_info .= 'encode_header_method = '.$this->encode_header_method."\n";
             $debug_info .= "send_mode = {$mode}\n";
-            $debug_info .= 'Subject = ' . $this->Subject . "\n";
+            $debug_info .= 'Subject = '.$this->Subject."\n";
             $log = "<pre>{$debug_info}\n{$header}\n{$org_body}</pre>";
             $this->modx->logEvent(1, 1, $log, 'MODxMailer debug information');
 
@@ -228,7 +228,7 @@ 
             ini_set('sendmail_from', $old_from);
         }
         if (!$rt) {
-            $msg = $this->Lang('instantiate') . "<br />\n";
+            $msg = $this->Lang('instantiate')."<br />\n";
             $msg .= "{$this->Subject}<br />\n";
             $msg .= "{$this->FromName}&lt;{$this->From}&gt;<br />\n";
             $msg .= mb_convert_encoding($body, $this->modx->config['modx_charset'], $this->CharSet);
@@ -247,7 +247,7 @@ 
      */
     public function SetError($msg)
     {
-        $msg .= '<pre>' . print_r(get_object_vars($this), true) . '</pre>';
+        $msg .= '<pre>'.print_r(get_object_vars($this), true).'</pre>';
         $this->modx->config['send_errormail'] = '0';
         $this->modx->logEvent(0, 3, $msg, 'phpmailer');
 
@@ -276,14 +276,14 @@ 
     /**
      * @return string
      */
-    public function getMIMEHeader() {
+    public function getMIMEHeader(){
         return $this->MIMEHeader;
     }
 
     /**
      * @return string
      */
-    public function getMIMEBody() {
+    public function getMIMEBody(){
         return $this->MIMEBody;
     }
 
@@ -292,7 +292,7 @@ 
      * 
      * @return $this
      */
-    public function setMIMEHeader($header = '') {
+    public function setMIMEHeader($header = ''){
         $this->MIMEHeader = $header;
 
         return $this;
@@ -303,7 +303,7 @@ 
      * 
      * @return $this
      */
-    public function setMIMEBody($body = '') {
+    public function setMIMEBody($body = ''){
         $this->MIMEBody = $body;
 
         return $this;
@@ -314,7 +314,7 @@ 
      * 
      * @return $this
      */
-    public function setMailHeader($header = '') {
+    public function setMailHeader($header = ''){
         $this->mailHeader = $header;
 
         return $this;
@@ -323,7 +323,7 @@ 
     /**
      * @return string
      */
-    public function getMessageID() {
-        return trim($this->lastMessageID,'<>');
+    public function getMessageID(){
+        return trim($this->lastMessageID, '<>');
     }
 }

manager/includes/extenders/ex_getUserData.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if(IN_MANAGER_MODE!="true" && IN_PARSER_MODE!="true") die("<b>INCLUDE ACCESS ERROR</b><br /><br />Direct access to this file prohibited.");
+if (IN_MANAGER_MODE != "true" && IN_PARSER_MODE != "true") die("<b>INCLUDE ACCESS ERROR</b><br /><br />Direct access to this file prohibited.");
 $tmpArray = array();
 $tmpArray['ip'] = $_SERVER['REMOTE_ADDR'];
 $tmpArray['ua'] = $_SERVER['HTTP_USER_AGENT'];

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

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(' ', $_);

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;

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

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(' ', $_);

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

Spacing +60 added lines, -60 removed lines

@@ -15,19 +15,19 @@ 
 	{
 		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();
+		$this->targetDir = $modx->config['base_path'].'temp/export';
+		if (!isset($this->total)) $this->getTotal();
 	}
 	
 	function setExportDir($dir)
 	{
-		$dir = str_replace('\\','/',$dir);
+		$dir = str_replace('\\', '/', $dir);
 		$dir = rtrim($dir, '/');
 		$this->targetDir = $dir;
 	}
@@ -44,7 +44,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;
@@ -53,13 +53,13 @@ 
 		$modx->config['make_folders'] = '1';
 	}
 	
-	function getTotal($ignore_ids='', $noncache='0')
+	function getTotal($ignore_ids = '', $noncache = '0')
 	{
 		global $modx;
 		$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 {
@@ -70,72 +70,72 @@ 
 		
 		$noncache = ($noncache == 1) ? '' : 'AND cacheable=1';
 		$where = "deleted=0 AND ((published=1 AND type='document') OR (isfolder=1)) {$noncache} {$ignore_ids}";
-		$rs  = $modx->db->select('count(id)',$tbl_site_content,$where);
+		$rs = $modx->db->select('count(id)', $tbl_site_content, $where);
 		$this->total = $modx->db->getValue($rs);
 		return $this->total;
 	}
 	
-	function removeDirectoryAll($directory='')
+	function removeDirectoryAll($directory = '')
 	{
-		if(empty($directory)) $directory = $this->targetDir;
-		$directory = rtrim($directory,'/');
+		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;
+		if (!is_dir($directory))          return FALSE;
+		elseif (!is_readable($directory)) return FALSE;
 		else
 		{
-			$files = glob($directory . '/*');
-			if(!empty($files))
+			$files = glob($directory.'/*');
+			if (!empty($files))
 			{
-    			foreach($files as $path)
+    			foreach ($files as $path)
     			{
-    				if(is_dir($path)) $this->removeDirectoryAll($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;
 	}
 
 	function makeFile($docid, $filepath)
 	{
-		global  $modx,$_lang;
+		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 ($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 ($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) return 'success';
+			if ($result !== false) return 'success';
 			else                  return 'failed_no_write';
 		}
 		else                      return 'failed_no_retrieve';
 	}
 
-	function getFileName($docid, $alias='', $prefix, $suffix)
+	function getFileName($docid, $alias = '', $prefix, $suffix)
 	{
 		global $modx;
 		
-		if($alias==='') $filename = $prefix.$docid.$suffix;
+		if ($alias === '') $filename = $prefix.$docid.$suffix;
 		else
 		{
-			if($modx->config['suffix_mode']==='1' && strpos($alias, '.')!==false)
+			if ($modx->config['suffix_mode'] === '1' && strpos($alias, '.') !== false)
 			{
 				$suffix = '';
 			}
@@ -144,7 +144,7 @@ 
 		return $filename;
 	}
 
-	function run($parent=0)
+	function run($parent = 0)
 	{
 		global $_lang;
 		global $modx;
@@ -152,7 +152,7 @@ 
 		$tbl_site_content = $modx->getFullTableName('site_content');
 		
 		$ignore_ids = $this->ignore_ids;
-		$dirpath = $this->targetDir . '/';
+		$dirpath = $this->targetDir.'/';
 		
 		$prefix = $modx->config['friendly_url_prefix'];
 		$suffix = $modx->config['friendly_url_suffix'];
@@ -162,36 +162,36 @@ 
 		
 		$ph['status'] = 'fail';
 		$ph['msg1']   = $_lang['export_site_failed'];
-		$ph['msg2']   = $_lang["export_site_failed_no_write"] . ' - ' . $dirpath;
-		$msg_failed_no_write    = $this->parsePlaceholder($tpl,$ph);
+		$ph['msg2']   = $_lang["export_site_failed_no_write"].' - '.$dirpath;
+		$msg_failed_no_write    = $this->parsePlaceholder($tpl, $ph);
 		
 		$ph['msg2']   = $_lang["export_site_failed_no_retrieve"];
-		$msg_failed_no_retrieve = $this->parsePlaceholder($tpl,$ph);
+		$msg_failed_no_retrieve = $this->parsePlaceholder($tpl, $ph);
 		
 		$ph['status'] = 'success';
 		$ph['msg1']   = $_lang['export_site_success'];
 		$ph['msg2']   = '';
-		$msg_success            = $this->parsePlaceholder($tpl,$ph);
+		$msg_success = $this->parsePlaceholder($tpl, $ph);
 		
 		$ph['msg2']   = $_lang['export_site_success_skip_doc'];
-		$msg_success_skip_doc = $this->parsePlaceholder($tpl,$ph);
+		$msg_success_skip_doc = $this->parsePlaceholder($tpl, $ph);
 		
 		$ph['msg2']   = $_lang['export_site_success_skip_dir'];
-		$msg_success_skip_dir = $this->parsePlaceholder($tpl,$ph);
+		$msg_success_skip_dir = $this->parsePlaceholder($tpl, $ph);
 		
 		$fields = "id, alias, pagetitle, isfolder, (content = '' AND template = 0) AS wasNull, published";
-		$noncache = $_POST['includenoncache']==1 ? '' : 'AND cacheable=1';
+		$noncache = $_POST['includenoncache'] == 1 ? '' : 'AND cacheable=1';
 		$where = "parent = '{$parent}' AND deleted=0 AND ((published=1 AND type='document') OR (isfolder=1)) {$noncache} {$ignore_ids}";
-		$rs = $modx->db->select($fields,$tbl_site_content,$where);
+		$rs = $modx->db->select($fields, $tbl_site_content, $where);
 		
 		$ph = array();
-		$ph['total']     = $this->total;
+		$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['count'] = $this->count;
 			$row['url'] = $modx->makeUrl($row['id']);
 			
 			if (!$row['wasNull'])
@@ -200,10 +200,10 @@ 
 				$filename = $dirpath.$docname;
 				if (!is_file($filename))
 				{
-					if($row['published']==='1')
+					if ($row['published'] === '1')
 					{
 						$status = $this->makeFile($row['id'], $filename);
-						switch($status)
+						switch ($status)
 						{
 							case 'failed_no_write'   :
                                                             $row['status'] = $msg_failed_no_write;
@@ -225,11 +225,11 @@ 
 				$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))
+			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;
+				$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);
@@ -239,9 +239,9 @@ 
 				}
 				
 				
-				if($modx->config['make_folders']==='1' && $row['published']==='1')
+				if ($modx->config['make_folders'] === '1' && $row['published'] === '1')
 				{
-					if(is_file($filename)) rename($filename,$dir_path . '/index.html');
+					if (is_file($filename)) rename($filename, $dir_path.'/index.html');
 				}
 				$this->targetDir = $dir_path;
 				$this->run($row['id']);
@@ -250,16 +250,16 @@ 
 		return implode("\n", $this->output);
 	}
 	
-    function curl_get_contents($url, $timeout = 30 )
+    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);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);    // 0 = DO NOT VERIFY AUTHENTICITY OF SSL-CERT
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);    // 2 = CERT MUST INDICATE BEING CONNECTED TO RIGHT SERVER
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); // 0 = DO NOT VERIFY AUTHENTICITY OF SSL-CERT
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2); // 2 = CERT MUST INDICATE BEING CONNECTED TO RIGHT SERVER
         curl_setopt($ch, CURLOPT_HEADER, false);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true );
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
         curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
         $result = curl_exec($ch);
@@ -267,12 +267,12 @@ 
         return $result;
     }
 
-    function parsePlaceholder($tpl,$ph=array())
+    function parsePlaceholder($tpl, $ph = array())
     {
-    	foreach($ph as $k=>$v)
+    	foreach ($ph as $k=>$v)
     	{
     		$k = "[+{$k}+]";
-    		$tpl = str_replace($k,$v,$tpl);
+    		$tpl = str_replace($k, $v, $tpl);
     	}
     	return $tpl;
     }