evolution-cms / evolution

manager/includes/controls/phpmailer/POP3.php

Doc Comments +1 added lines, -1 removed lines

@@ -209,7 +209,7 @@
      * Connect to a POP3 server.
      *
      * @param string   $host
-     * @param int|bool $port
+     * @param integer $port
      * @param int      $tval
      *
      * @return bool

Spacing +4 added lines, -4 removed lines

@@ -149,7 +149,7 @@ 
         $username = '',
         $password = '',
         $debug_level = 0
-    ) {
+    ){
         $pop = new self();
 
         return $pop->authorise($host, $port, $timeout, $username, $password, $debug_level);
@@ -288,11 +288,11 @@ 
         }
 
         // Send the Username
-        $this->sendString("USER $username" . static::LE);
+        $this->sendString("USER $username".static::LE);
         $pop3_response = $this->getResponse();
         if ($this->checkResponse($pop3_response)) {
             // Send the Password
-            $this->sendString("PASS $password" . static::LE);
+            $this->sendString("PASS $password".static::LE);
             $pop3_response = $this->getResponse();
             if ($this->checkResponse($pop3_response)) {
                 return true;
@@ -412,7 +412,7 @@ 
     protected function catchWarning($errno, $errstr, $errfile, $errline)
     {
         $this->setError(
-            'Connecting to the POP3 server raised a PHP warning:' .
+            'Connecting to the POP3 server raised a PHP warning:'.
             "errno: $errno errstr: $errstr; errfile: $errfile; errline: $errline"
         );
     }

Braces +2 added lines, -1 removed lines

@@ -344,7 +344,8 @@
     protected function sendString($string)
     {
         if ($this->pop_conn) {
-            if ($this->do_debug >= 2) { //Show client messages when debug >= 2
+            if ($this->do_debug >= 2) {
+//Show client messages when debug >= 2
                 echo 'Client -> Server: ', $string;
             }
 

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

@@ -288,11 +288,11 @@
         }
 
         // Send the Username
-        $this->sendString("USER $username" . static::LE);
+        $this->sendString("user $username" . static::LE);
         $pop3_response = $this->getResponse();
         if ($this->checkResponse($pop3_response)) {
             // Send the Password
-            $this->sendString("PASS $password" . static::LE);
+            $this->sendString("pass $password" . static::LE);
             $pop3_response = $this->getResponse();
             if ($this->checkResponse($pop3_response)) {
                 return true;

manager/includes/controls/phpmailer/SMTP.php

Doc Comments +1 added lines, -1 removed lines

@@ -1314,7 +1314,7 @@
      * If no reply has been received yet, it will return null.
      * If no pattern was matched, it will return false.
      *
-     * @return bool|null|string
+     * @return string
      *
      * @see recordLastTransactionID()
      */

Spacing +31 added lines, -31 removed lines

@@ -307,7 +307,7 @@ 
         }
         // Connect to the SMTP server
         $this->edebug(
-            "Connection: opening to $host:$port, timeout=$timeout, options=" .
+            "Connection: opening to $host:$port, timeout=$timeout, options=".
             (count($options) > 0 ? var_export($options, true) : 'array()'),
             self::DEBUG_CONNECTION
         );
@@ -317,7 +317,7 @@ 
             $socket_context = stream_context_create($options);
             set_error_handler([$this, 'errorHandler']);
             $this->smtp_conn = stream_socket_client(
-                $host . ':' . $port,
+                $host.':'.$port,
                 $errno,
                 $errstr,
                 $timeout,
@@ -350,7 +350,7 @@ 
                 (string) $errstr
             );
             $this->edebug(
-                'SMTP ERROR: ' . $this->error['error']
+                'SMTP ERROR: '.$this->error['error']
                 . ": $errstr ($errno)",
                 self::DEBUG_CLIENT
             );
@@ -370,7 +370,7 @@ 
         }
         // Get any announcement
         $announce = $this->get_lines();
-        $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER);
+        $this->edebug('SERVER -> CLIENT: '.$announce, self::DEBUG_SERVER);
 
         return true;
     }
@@ -426,7 +426,7 @@ 
         $password,
         $authtype = null,
         $OAuth = null
-    ) {
+    ){
         if (!$this->server_caps) {
             $this->setError('Authentication is not allowed before HELO/EHLO');
 
@@ -443,15 +443,15 @@ 
                 return false;
             }
 
-            $this->edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
+            $this->edebug('Auth method requested: '.($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
             $this->edebug(
-                'Auth methods available on the server: ' . implode(',', $this->server_caps['AUTH']),
+                'Auth methods available on the server: '.implode(',', $this->server_caps['AUTH']),
                 self::DEBUG_LOWLEVEL
             );
 
             //If we have requested a specific auth type, check the server supports it before trying others
             if (!in_array($authtype, $this->server_caps['AUTH'])) {
-                $this->edebug('Requested auth method not available: ' . $authtype, self::DEBUG_LOWLEVEL);
+                $this->edebug('Requested auth method not available: '.$authtype, self::DEBUG_LOWLEVEL);
                 $authtype = null;
             }
 
@@ -469,7 +469,7 @@ 
 
                     return false;
                 }
-                self::edebug('Auth method selected: ' . $authtype, self::DEBUG_LOWLEVEL);
+                self::edebug('Auth method selected: '.$authtype, self::DEBUG_LOWLEVEL);
             }
 
             if (!in_array($authtype, $this->server_caps['AUTH'])) {
@@ -489,7 +489,7 @@ 
                 // Send encoded username and password
                 if (!$this->sendCommand(
                     'User & Password',
-                    base64_encode("\0" . $username . "\0" . $password),
+                    base64_encode("\0".$username."\0".$password),
                     235
                 )
                 ) {
@@ -517,7 +517,7 @@ 
                 $challenge = base64_decode(substr($this->last_reply, 4));
 
                 // Build the response
-                $response = $username . ' ' . $this->hmac($challenge, $password);
+                $response = $username.' '.$this->hmac($challenge, $password);
 
                 // send encoded credentials
                 return $this->sendCommand('Username', base64_encode($response), 235);
@@ -529,7 +529,7 @@ 
                 $oauth = $OAuth->getOauth64();
 
                 // Start authentication
-                if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2 ' . $oauth, 235)) {
+                if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2 '.$oauth, 235)) {
                     return false;
                 }
                 break;
@@ -576,7 +576,7 @@ 
         $k_ipad = $key ^ $ipad;
         $k_opad = $key ^ $opad;
 
-        return md5($k_opad . pack('H*', md5($k_ipad . $data)));
+        return md5($k_opad.pack('H*', md5($k_ipad.$data)));
     }
 
     /**
@@ -691,7 +691,7 @@ 
                 }
                 //If processing headers add a LWSP-char to the front of new line RFC822 section 3.1.1
                 if ($in_headers) {
-                    $line = "\t" . $line;
+                    $line = "\t".$line;
                 }
             }
             $lines_out[] = $line;
@@ -700,9 +700,9 @@ 
             foreach ($lines_out as $line_out) {
                 //RFC2821 section 4.5.2
                 if (!empty($line_out) and $line_out[0] == '.') {
-                    $line_out = '.' . $line_out;
+                    $line_out = '.'.$line_out;
                 }
-                $this->client_send($line_out . static::LE, 'DATA');
+                $this->client_send($line_out.static::LE, 'DATA');
             }
         }
 
@@ -748,7 +748,7 @@ 
      */
     protected function sendHello($hello, $host)
     {
-        $noerror = $this->sendCommand($hello, $hello . ' ' . $host, 250);
+        $noerror = $this->sendCommand($hello, $hello.' '.$host, 250);
         $this->helo_rply = $this->last_reply;
         if ($noerror) {
             $this->parseHelloFields($hello);
@@ -819,7 +819,7 @@ 
 
         return $this->sendCommand(
             'MAIL FROM',
-            'MAIL FROM:<' . $from . '>' . $useVerp,
+            'MAIL FROM:<'.$from.'>'.$useVerp,
             250
         );
     }
@@ -859,7 +859,7 @@ 
     {
         return $this->sendCommand(
             'RCPT TO',
-            'RCPT TO:<' . $address . '>',
+            'RCPT TO:<'.$address.'>',
             [250, 251]
         );
     }
@@ -898,7 +898,7 @@ 
 
             return false;
         }
-        $this->client_send($commandstring . static::LE, $command);
+        $this->client_send($commandstring.static::LE, $command);
 
         $this->last_reply = $this->get_lines();
         // Fetch SMTP code and possible error code explanation
@@ -908,8 +908,8 @@ 
             $code_ex = (count($matches) > 2 ? $matches[2] : null);
             // Cut off error code from each response line
             $detail = preg_replace(
-                "/{$code}[ -]" .
-                ($code_ex ? str_replace('.', '\\.', $code_ex) . ' ' : '') . '/m',
+                "/{$code}[ -]".
+                ($code_ex ? str_replace('.', '\\.', $code_ex).' ' : '').'/m',
                 '',
                 $this->last_reply
             );
@@ -920,7 +920,7 @@ 
             $detail = substr($this->last_reply, 4);
         }
 
-        $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
+        $this->edebug('SERVER -> CLIENT: '.$this->last_reply, self::DEBUG_SERVER);
 
         if (!in_array($code, (array) $expect)) {
             $this->setError(
@@ -930,7 +930,7 @@ 
                 $code_ex
             );
             $this->edebug(
-                'SMTP ERROR: ' . $this->error['error'] . ': ' . $this->last_reply,
+                'SMTP ERROR: '.$this->error['error'].': '.$this->last_reply,
                 self::DEBUG_CLIENT
             );
 
@@ -996,7 +996,7 @@ 
     public function turn()
     {
         $this->setError('The SMTP TURN command is not implemented');
-        $this->edebug('SMTP NOTICE: ' . $this->error['error'], self::DEBUG_CLIENT);
+        $this->edebug('SMTP NOTICE: '.$this->error['error'], self::DEBUG_CLIENT);
 
         return false;
     }
@@ -1017,7 +1017,7 @@ 
             in_array($command, ['User & Password', 'Username', 'Password'], true)) {
             $this->edebug('CLIENT -> SERVER: <credentials hidden>', self::DEBUG_CLIENT);
         } else {
-            $this->edebug('CLIENT -> SERVER: ' . $data, self::DEBUG_CLIENT);
+            $this->edebug('CLIENT -> SERVER: '.$data, self::DEBUG_CLIENT);
         }
         set_error_handler([$this, 'errorHandler']);
         $result = fwrite($this->smtp_conn, $data);
@@ -1123,14 +1123,14 @@ 
             //Must pass vars in here as params are by reference
             if (!stream_select($selR, $selW, $selW, $this->Timelimit)) {
                 $this->edebug(
-                    'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
+                    'SMTP -> get_lines(): timed-out ('.$this->Timeout.' sec)',
                     self::DEBUG_LOWLEVEL
                 );
                 break;
             }
             //Deliberate noise suppression - errors are handled afterwards
             $str = @fgets($this->smtp_conn, 515);
-            $this->edebug('SMTP INBOUND: "' . trim($str) . '"', self::DEBUG_LOWLEVEL);
+            $this->edebug('SMTP INBOUND: "'.trim($str).'"', self::DEBUG_LOWLEVEL);
             $data .= $str;
             // If response is only 3 chars (not valid, but RFC5321 S4.2 says it must be handled),
             // or 4th character is a space, we are done reading, break the loop,
@@ -1142,7 +1142,7 @@ 
             $info = stream_get_meta_data($this->smtp_conn);
             if ($info['timed_out']) {
                 $this->edebug(
-                    'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
+                    'SMTP -> get_lines(): timed-out ('.$this->Timeout.' sec)',
                     self::DEBUG_LOWLEVEL
                 );
                 break;
@@ -1150,8 +1150,8 @@ 
             // Now check if reads took too long
             if ($endtime and time() > $endtime) {
                 $this->edebug(
-                    'SMTP -> get_lines(): timelimit reached (' .
-                    $this->Timelimit . ' sec)',
+                    'SMTP -> get_lines(): timelimit reached ('.
+                    $this->Timelimit.' sec)',
                     self::DEBUG_LOWLEVEL
                 );
                 break;

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

@@ -888,7 +888,7 @@ 
     protected function sendCommand($command, $commandstring, $expect)
     {
         if (!$this->connected()) {
-            $this->setError("Called $command without being connected");
+            $this->setError("called $command without being connected");
 
             return false;
         }
@@ -970,7 +970,7 @@ 
      */
     public function verify($name)
     {
-        return $this->sendCommand('VRFY', "VRFY $name", [250, 251]);
+        return $this->sendCommand('VRFY', "vrfy $name", [250, 251]);
     }
 
     /**

manager/includes/document.parser.class.inc.php

Doc Comments +25 added lines, -25 removed lines

@@ -177,7 +177,7 @@ 
      * MODX_MANAGER_PATH."includes/extenders/ex_{$extname}.inc.php"
      * $extname - extension name in lowercase
      *
-     * @param $extname
+     * @param string $extname
      * @param bool $reload
      * @return bool
      */
@@ -218,9 +218,9 @@ 
      *
      * @param string $url
      * @param int $count_attempts
-     * @param string|type $type $type
-     * @param string|type $responseCode
-     * @return bool
+     * @param string $type $type
+     * @param string $responseCode
+     * @return false|null
      * @global string $base_url
      * @global string $site_url
      */
@@ -915,7 +915,7 @@ 
     }
 
     /**
-     * @param $contents
+     * @param string $contents
      * @return mixed
      */
     function RecoveryEscapedTags($contents)
@@ -939,7 +939,7 @@ 
     }
 
     /**
-     * @param $tstart
+     * @param double $tstart
      * @return array
      */
     function getTimerStats($tstart)
@@ -1692,7 +1692,7 @@ 
 
     /**
      * Remove Comment-Tags from output like <!--@- Comment -@-->
-     * @param $content
+     * @param string $content
      * @param string $left
      * @param string $right
      * @return mixed
@@ -1862,7 +1862,7 @@ 
     /**
      * Run snippets as per the tags in $documentSource and replace the tags with the returned values.
      *
-     * @param $content
+     * @param string $content
      * @return string
      * @internal param string $documentSource
      */
@@ -2901,7 +2901,7 @@ 
 
     /**
      * @param $templateID
-     * @return mixed
+     * @return string
      */
     function _getTemplateCodeFromDB($templateID)
     {
@@ -2942,9 +2942,9 @@ 
     }
 
     /**
-     * @param $id
+     * @param integer $id
      * @param int $top
-     * @return mixed
+     * @return string
      */
     function getUltimateParentId($id, $top = 0)
     {
@@ -3275,7 +3275,7 @@ 
      *
      * @param int $type Types: 1=template, 2=tv, 3=chunk, 4=snippet, 5=plugin, 6=module, 7=resource, 8=role
      * @param int $id Element- / Resource-id
-     * @return bool
+     * @return false|null
      */
     function lockElement($type, $id)
     {
@@ -3297,7 +3297,7 @@ 
      * @param int $type Types: 1=template, 2=tv, 3=chunk, 4=snippet, 5=plugin, 6=module, 7=resource, 8=role
      * @param int $id Element- / Resource-id
      * @param bool $includeAllUsers true = Deletes not only own user-locks
-     * @return bool
+     * @return false|null
      */
     function unlockElement($type, $id, $includeAllUsers = false)
     {
@@ -3909,7 +3909,7 @@ 
      *
      * @param string $type
      * @param bool $report
-     * @return bool
+     * @return boolean|null
      */
     function clearCache($type = '', $report = false)
     {
@@ -5256,7 +5256,7 @@ 
      * Remove event listener - only for use within the current execution cycle
      *
      * @param string $evtName
-     * @return boolean
+     * @return false|null
      */
     function removeEventListener($evtName)
     {
@@ -5280,7 +5280,7 @@ 
      *
      * @param string $evtName
      * @param array $extParams Parameters available to plugins. Each array key will be the PHP variable name, and the array value will be the variable value.
-     * @return boolean|array
+     * @return false|null
      */
     function invokeEvent($evtName, $extParams = array())
     {
@@ -5701,7 +5701,7 @@ 
 
     /**
      * @param string $string
-     * @return mixed|string
+     * @return string
      */
     function removeSanitizeSeed($string = '')
     {
@@ -5716,7 +5716,7 @@ 
 
     /**
      * @param string $content
-     * @return mixed|string
+     * @return string
      */
     function cleanUpMODXTags($content = '')
     {
@@ -5879,7 +5879,7 @@ 
 
     /**
      * @param string $str
-     * @return bool|mixed|string
+     * @return string
      */
     function atBindFileContent($str = '')
     {
@@ -5930,8 +5930,8 @@ 
     }
 
     /**
-     * @param $str
-     * @return bool|string
+     * @param string $str
+     * @return false|string
      */
     function getExtFromFilename($str)
     {
@@ -5959,7 +5959,7 @@ 
      * @param string $text Error message
      * @param string $file File where the error was detected
      * @param string $line Line number within $file
-     * @return boolean
+     * @return boolean|null
      */
     function phpError($nr, $text, $file, $line)
     {
@@ -6011,7 +6011,7 @@ 
      * @param string $text
      * @param string $line
      * @param string $output
-     * @return bool
+     * @return null|boolean
      */
     function messageQuit($msg = 'unspecified error', $query = '', $is_error = true, $nr = '', $file = '', $source = '', $text = '', $line = '', $output = '')
     {
@@ -6434,7 +6434,7 @@ 
 
     /**
      * @param string $str
-     * @return bool|mixed|string
+     * @return string
      */
     function atBindInclude($str = '')
     {
@@ -6493,7 +6493,7 @@ 
     }
 
     /**
-     * @param $string
+     * @param string $string
      * @param bool $returnData
      * @return bool|mixed
      */

Spacing +251 added lines, -251 removed lines

@@ -126,7 +126,7 @@ 
      */
     function __call($method_name, $arguments)
     {
-        include_once(MODX_MANAGER_PATH . 'includes/extenders/deprecated.functions.inc.php');
+        include_once(MODX_MANAGER_PATH.'includes/extenders/deprecated.functions.inc.php');
         if (method_exists($this->old, $method_name)) {
             $error_type = 1;
         } else {
@@ -144,12 +144,12 @@ 
             $info = debug_backtrace();
             $m[] = $msg;
             if (!empty($this->currentSnippet)) {
-                $m[] = 'Snippet - ' . $this->currentSnippet;
+                $m[] = 'Snippet - '.$this->currentSnippet;
             } elseif (!empty($this->event->activePlugin)) {
-                $m[] = 'Plugin - ' . $this->event->activePlugin;
+                $m[] = 'Plugin - '.$this->event->activePlugin;
             }
             $m[] = $this->decoded_request_uri;
-            $m[] = str_replace('\\', '/', $info[0]['file']) . '(line:' . $info[0]['line'] . ')';
+            $m[] = str_replace('\\', '/', $info[0]['file']).'(line:'.$info[0]['line'].')';
             $msg = implode('<br />', $m);
             $this->logEvent(0, $error_type, $msg, $title);
         }
@@ -166,7 +166,7 @@ 
     {
         $flag = false;
         if (is_scalar($connector) && !empty($connector) && isset($this->{$connector}) && $this->{$connector} instanceof DBAPI) {
-            $flag = (bool)$this->{$connector}->conn;
+            $flag = (bool) $this->{$connector}->conn;
         }
         return $flag;
     }
@@ -193,7 +193,7 @@ 
         }
         if (!$out && $flag) {
             $extname = trim(str_replace(array('..', '/', '\\'), '', strtolower($extname)));
-            $filename = MODX_MANAGER_PATH . "includes/extenders/ex_{$extname}.inc.php";
+            $filename = MODX_MANAGER_PATH."includes/extenders/ex_{$extname}.inc.php";
             $out = is_file($filename) ? include $filename : false;
         }
         if ($out && !in_array($extname, $this->extensions)) {
@@ -210,7 +210,7 @@ 
     function getMicroTime()
     {
         list ($usec, $sec) = explode(' ', microtime());
-        return ((float)$usec + (float)$sec);
+        return ((float) $usec + (float) $sec);
     }
 
     /**
@@ -233,7 +233,7 @@ 
             // append the redirect count string to the url
             $currentNumberOfRedirects = isset ($_REQUEST['err']) ? $_REQUEST['err'] : 0;
             if ($currentNumberOfRedirects > 3) {
-                $this->messageQuit('Redirection attempt failed - please ensure the document you\'re trying to redirect to exists. <p>Redirection URL: <i>' . $url . '</i></p>');
+                $this->messageQuit('Redirection attempt failed - please ensure the document you\'re trying to redirect to exists. <p>Redirection URL: <i>'.$url.'</i></p>');
             } else {
                 $currentNumberOfRedirects += 1;
                 if (strpos($url, "?") > 0) {
@@ -244,9 +244,9 @@ 
             }
         }
         if ($type == 'REDIRECT_REFRESH') {
-            $header = 'Refresh: 0;URL=' . $url;
+            $header = 'Refresh: 0;URL='.$url;
         } elseif ($type == 'REDIRECT_META') {
-            $header = '<META HTTP-EQUIV="Refresh" CONTENT="0; URL=' . $url . '" />';
+            $header = '<META HTTP-EQUIV="Refresh" CONTENT="0; URL='.$url.'" />';
             echo $header;
             exit;
         } elseif ($type == 'REDIRECT_HEADER' || empty ($type)) {
@@ -254,10 +254,10 @@ 
             global $base_url, $site_url;
             if (substr($url, 0, strlen($base_url)) == $base_url) {
                 // append $site_url to make it work with Location:
-                $url = $site_url . substr($url, strlen($base_url));
+                $url = $site_url.substr($url, strlen($base_url));
             }
             if (strpos($url, "\n") === false) {
-                $header = 'Location: ' . $url;
+                $header = 'Location: '.$url;
             } else {
                 $this->messageQuit('No newline allowed in redirect url.');
             }
@@ -366,8 +366,8 @@ 
 
     private function recoverySiteCache()
     {
-        $site_cache_dir = MODX_BASE_PATH . $this->getCacheFolder();
-        $site_cache_path = $site_cache_dir . 'siteCache.idx.php';
+        $site_cache_dir = MODX_BASE_PATH.$this->getCacheFolder();
+        $site_cache_path = $site_cache_dir.'siteCache.idx.php';
 
         if (is_file($site_cache_path)) {
             include($site_cache_path);
@@ -376,7 +376,7 @@ 
             return;
         }
 
-        include_once(MODX_MANAGER_PATH . 'processors/cache_sync.class.processor.php');
+        include_once(MODX_MANAGER_PATH.'processors/cache_sync.class.processor.php');
         $cache = new synccache();
         $cache->setCachepath($site_cache_dir);
         $cache->setReport(false);
@@ -427,8 +427,8 @@ 
                 $this->invokeEvent("OnBeforeManagerPageInit");
             }
 
-            if (isset ($_SESSION[$usrType . 'UsrConfigSet'])) {
-                $usrSettings = &$_SESSION[$usrType . 'UsrConfigSet'];
+            if (isset ($_SESSION[$usrType.'UsrConfigSet'])) {
+                $usrSettings = &$_SESSION[$usrType.'UsrConfigSet'];
             } else {
                 if ($usrType == 'web') {
                     $from = $tbl_web_user_settings;
@@ -448,7 +448,7 @@ 
                     $usrSettings[$row['setting_name']] = $row['setting_value'];
                 }
                 if (isset ($usrType)) {
-                    $_SESSION[$usrType . 'UsrConfigSet'] = $usrSettings;
+                    $_SESSION[$usrType.'UsrConfigSet'] = $usrSettings;
                 } // store user settings in session
             }
         }
@@ -593,10 +593,10 @@ 
         $suf = $this->config['friendly_url_suffix'];
         $pre = preg_quote($pre, '/');
         $suf = preg_quote($suf, '/');
-        if ($pre && preg_match('@^' . $pre . '(.*)$@', $q, $_)) {
+        if ($pre && preg_match('@^'.$pre.'(.*)$@', $q, $_)) {
             $q = $_[1];
         }
-        if ($suf && preg_match('@(.*)' . $suf . '$@', $q, $_)) {
+        if ($suf && preg_match('@(.*)'.$suf.'$@', $q, $_)) {
             $q = $_[1];
         }
 
@@ -618,7 +618,7 @@ 
         if (preg_match('@^[1-9][0-9]*$@', $q) && !isset($this->documentListing[$q])) { /* we got an ID returned, check to make sure it's not an alias */
             /* FS#476 and FS#308: check that id is valid in terms of virtualDir structure */
             if ($this->config['use_alias_path'] == 1) {
-                if (($this->virtualDir != '' && !isset($this->documentListing[$this->virtualDir . '/' . $q]) || ($this->virtualDir == '' && !isset($this->documentListing[$q]))) && (($this->virtualDir != '' && isset($this->documentListing[$this->virtualDir]) && in_array($q, $this->getChildIds($this->documentListing[$this->virtualDir], 1))) || ($this->virtualDir == '' && in_array($q, $this->getChildIds(0, 1))))) {
+                if (($this->virtualDir != '' && !isset($this->documentListing[$this->virtualDir.'/'.$q]) || ($this->virtualDir == '' && !isset($this->documentListing[$q]))) && (($this->virtualDir != '' && isset($this->documentListing[$this->virtualDir]) && in_array($q, $this->getChildIds($this->documentListing[$this->virtualDir], 1))) || ($this->virtualDir == '' && in_array($q, $this->getChildIds(0, 1))))) {
                     $this->documentMethod = 'id';
                     return $q;
                 } else { /* not a valid id in terms of virtualDir, treat as alias */
@@ -652,7 +652,7 @@ 
      */
     public function getHashFile($key)
     {
-        return $this->getCacheFolder() . "docid_" . $key . ".pageCache.php";
+        return $this->getCacheFolder()."docid_".$key.".pageCache.php";
     }
 
     /**
@@ -663,9 +663,9 @@ 
         $hash = $id;
         $tmp = null;
         $params = array();
-        if(!empty($this->systemCacheKey)){
+        if (!empty($this->systemCacheKey)) {
             $hash = $this->systemCacheKey;
-        }else {
+        } else {
             if (!empty($_GET)) {
                 // Sort GET parameters so that the order of parameters on the HTTP request don't affect the generated cache ID.
                 $params = $_GET;
@@ -673,8 +673,8 @@ 
                 $hash .= '_'.md5(http_build_query($params));
             }
         }
-        $evtOut = $this->invokeEvent("OnMakePageCacheKey", array ("hash" => $hash, "id" => $id, 'params' => $params));
-        if (is_array($evtOut) && count($evtOut) > 0){
+        $evtOut = $this->invokeEvent("OnMakePageCacheKey", array("hash" => $hash, "id" => $id, 'params' => $params));
+        if (is_array($evtOut) && count($evtOut) > 0) {
             $tmp = array_pop($evtOut);
         }
         return empty($tmp) ? $hash : $tmp;
@@ -816,12 +816,12 @@ 
         if ($js = $this->getRegisteredClientStartupScripts()) {
             // change to just before closing </head>
             // $this->documentContent = preg_replace("/(<head[^>]*>)/i", "\\1\n".$js, $this->documentContent);
-            $this->documentOutput = preg_replace("/(<\/head>)/i", $js . "\n\\1", $this->documentOutput);
+            $this->documentOutput = preg_replace("/(<\/head>)/i", $js."\n\\1", $this->documentOutput);
         }
 
         // Insert jscripts & html block into template - template must have a </body> tag
         if ($js = $this->getRegisteredClientScripts()) {
-            $this->documentOutput = preg_replace("/(<\/body>)/i", $js . "\n\\1", $this->documentOutput);
+            $this->documentOutput = preg_replace("/(<\/body>)/i", $js."\n\\1", $this->documentOutput);
         }
         // End fix by sirlancelot
 
@@ -832,7 +832,7 @@ 
         // send out content-type and content-disposition headers
         if (IN_PARSER_MODE == "true") {
             $type = !empty ($this->contentTypes[$this->documentIdentifier]) ? $this->contentTypes[$this->documentIdentifier] : "text/html";
-            header('Content-Type: ' . $type . '; charset=' . $this->config['modx_charset']);
+            header('Content-Type: '.$type.'; charset='.$this->config['modx_charset']);
             //            if (($this->documentIdentifier == $this->config['error_page']) || $redirect_error)
             //                header('HTTP/1.0 404 Not Found');
             if (!$this->checkPreview() && $this->documentObject['content_dispo'] == 1) {
@@ -850,7 +850,7 @@ 
                     $name = preg_replace('|-+|', '-', $name);
                     $name = trim($name, '-');
                 }
-                $header = 'Content-Disposition: attachment; filename=' . $name;
+                $header = 'Content-Disposition: attachment; filename='.$name;
                 header($header);
             }
         }
@@ -858,7 +858,7 @@ 
 
         $stats = $this->getTimerStats($this->tstart);
 
-        $out =& $this->documentOutput;
+        $out = & $this->documentOutput;
         $out = str_replace("[^q^]", $stats['queries'], $out);
         $out = str_replace("[^qt^]", $stats['queryTime'], $out);
         $out = str_replace("[^p^]", $stats['phpTime'], $out);
@@ -897,17 +897,17 @@ 
                 $sc .= sprintf("%s. %s (%s)<br>", $s, $sname, sprintf("%2.2f ms", $t)); // currentSnippet
                 $tt += $t;
             }
-            echo "<fieldset><legend><b>Snippets</b> (" . count($this->snippetsTime) . " / " . sprintf("%2.2f ms", $tt) . ")</legend>{$sc}</fieldset><br />";
+            echo "<fieldset><legend><b>Snippets</b> (".count($this->snippetsTime)." / ".sprintf("%2.2f ms", $tt).")</legend>{$sc}</fieldset><br />";
             echo $this->snippetsCode;
         }
         if ($this->dumpPlugins) {
             $ps = "";
             $tc = 0;
             foreach ($this->pluginsTime as $s => $t) {
-                $ps .= "$s (" . sprintf("%2.2f ms", $t * 1000) . ")<br>";
+                $ps .= "$s (".sprintf("%2.2f ms", $t * 1000).")<br>";
                 $tt += $t;
             }
-            echo "<fieldset><legend><b>Plugins</b> (" . count($this->pluginsTime) . " / " . sprintf("%2.2f ms", $tt * 1000) . ")</legend>{$ps}</fieldset><br />";
+            echo "<fieldset><legend><b>Plugins</b> (".count($this->pluginsTime)." / ".sprintf("%2.2f ms", $tt * 1000).")</legend>{$ps}</fieldset><br />";
             echo $this->pluginsCode;
         }
 
@@ -933,7 +933,7 @@ 
         $srcTags = explode(',', $tags);
         $repTags = array();
         foreach ($srcTags as $tag) {
-            $repTags[] = '\\' . $tag[0] . '\\' . $tag[1];
+            $repTags[] = '\\'.$tag[0].'\\'.$tag[1];
         }
         return array($srcTags, $repTags);
     }
@@ -955,7 +955,7 @@ 
         $stats['phpTime'] = sprintf("%2.4f s", $stats['phpTime']);
         $stats['source'] = $this->documentGenerated == 1 ? "database" : "cache";
         $stats['queries'] = isset ($this->executedQueries) ? $this->executedQueries : 0;
-        $stats['phpMemory'] = (memory_get_peak_usage(true) / 1024 / 1024) . " mb";
+        $stats['phpMemory'] = (memory_get_peak_usage(true) / 1024 / 1024)." mb";
 
         return $stats;
     }
@@ -988,7 +988,7 @@ 
     {
         $cacheRefreshTime = 0;
         $recent_update = 0;
-        @include(MODX_BASE_PATH . $this->getCacheFolder() . 'sitePublishing.idx.php');
+        @include(MODX_BASE_PATH.$this->getCacheFolder().'sitePublishing.idx.php');
         $this->recentUpdate = $recent_update;
 
         $timeNow = $_SERVER['REQUEST_TIME'] + $this->config['server_offset_time'];
@@ -1042,8 +1042,8 @@ 
                 }
 
                 $docObjSerial = serialize($this->documentObject);
-                $cacheContent = $docObjSerial . "<!--__MODxCacheSpliter__-->" . $this->documentContent;
-                $page_cache_path = MODX_BASE_PATH . $this->getHashFile($this->cacheKey);
+                $cacheContent = $docObjSerial."<!--__MODxCacheSpliter__-->".$this->documentContent;
+                $page_cache_path = MODX_BASE_PATH.$this->getHashFile($this->cacheKey);
                 file_put_contents($page_cache_path, "<?php die('Unauthorized access.'); ?>$cacheContent");
             }
         }
@@ -1085,16 +1085,16 @@ 
             return array();
         }
         $spacer = md5('<<<EVO>>>');
-        if($left==='{{' && strpos($content,';}}')!==false)  $content = str_replace(';}}', sprintf(';}%s}',   $spacer),$content);
-        if($left==='{{' && strpos($content,'{{}}')!==false) $content = str_replace('{{}}',sprintf('{%$1s{}%$1s}',$spacer),$content);
-        if($left==='[[' && strpos($content,']]]]')!==false) $content = str_replace(']]]]',sprintf(']]%s]]',  $spacer),$content);
-        if($left==='[[' && strpos($content,']]]')!==false)  $content = str_replace(']]]', sprintf(']%s]]',   $spacer),$content);
+        if ($left === '{{' && strpos($content, ';}}') !== false)  $content = str_replace(';}}', sprintf(';}%s}', $spacer), $content);
+        if ($left === '{{' && strpos($content, '{{}}') !== false) $content = str_replace('{{}}', sprintf('{%$1s{}%$1s}', $spacer), $content);
+        if ($left === '[[' && strpos($content, ']]]]') !== false) $content = str_replace(']]]]', sprintf(']]%s]]', $spacer), $content);
+        if ($left === '[[' && strpos($content, ']]]') !== false)  $content = str_replace(']]]', sprintf(']%s]]', $spacer), $content);
 
         $pos['<![CDATA['] = strpos($content, '<![CDATA[');
         $pos[']]>'] = strpos($content, ']]>');
 
         if ($pos['<![CDATA['] !== false && $pos[']]>'] !== false) {
-            $content = substr($content, 0, $pos['<![CDATA[']) . substr($content, $pos[']]>'] + 3);
+            $content = substr($content, 0, $pos['<![CDATA[']).substr($content, $pos[']]>'] + 3);
         }
 
         $lp = explode($left, $content);
@@ -1158,8 +1158,8 @@ 
                 }
             }
         }
-        foreach($tags as $i=>$tag) {
-            if(strpos($tag,$spacer)!==false) $tags[$i] = str_replace($spacer, '', $tag);
+        foreach ($tags as $i=>$tag) {
+            if (strpos($tag, $spacer) !== false) $tags[$i] = str_replace($spacer, '', $tag);
         }
         return $tags;
     }
@@ -1199,7 +1199,7 @@ 
         }
 
         foreach ($matches[1] as $i => $key) {
-            if(strpos($key,'[+')!==false) continue; // Allow chunk {{chunk?&param=`xxx`}} with [*tv_name_[+param+]*] as content
+            if (strpos($key, '[+') !== false) continue; // Allow chunk {{chunk?&param=`xxx`}} with [*tv_name_[+param+]*] as content
             if (substr($key, 0, 1) == '#') {
                 $key = substr($key, 1);
             } // remove # for QuickEdit format
@@ -1219,8 +1219,8 @@ 
             }
 
             if (is_array($value)) {
-                include_once(MODX_MANAGER_PATH . 'includes/tmplvars.format.inc.php');
-                include_once(MODX_MANAGER_PATH . 'includes/tmplvars.commands.inc.php');
+                include_once(MODX_MANAGER_PATH.'includes/tmplvars.format.inc.php');
+                include_once(MODX_MANAGER_PATH.'includes/tmplvars.commands.inc.php');
                 $value = getTVDisplayFormat($value[0], $value[1], $value[2], $value[3], $value[4]);
             }
 
@@ -1231,8 +1231,8 @@ 
 
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('mergeDocumentContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('mergeDocumentContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
 
@@ -1399,8 +1399,8 @@ 
             $s = &$matches[0][$i];
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('mergeSettingsContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('mergeSettingsContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
         return $content;
@@ -1453,7 +1453,7 @@ 
             }
 
             $value = $this->parseText($value, $params); // parse local scope placeholers for ConditionalTags
-            $value = $this->mergePlaceholderContent($value, $params);  // parse page global placeholers
+            $value = $this->mergePlaceholderContent($value, $params); // parse page global placeholers
             if ($this->config['enable_at_syntax']) {
                 $value = $this->mergeConditionalTagsContent($value);
             }
@@ -1468,8 +1468,8 @@ 
             $s = &$matches[0][$i];
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('mergeChunkContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('mergeChunkContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
         return $content;
@@ -1527,8 +1527,8 @@ 
             $s = &$matches[0][$i];
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('mergePlaceholderContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('mergePlaceholderContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
         return $content;
@@ -1552,7 +1552,7 @@ 
             return $content;
         }
 
-        $sp = '#' . md5('ConditionalTags' . $_SERVER['REQUEST_TIME']) . '#';
+        $sp = '#'.md5('ConditionalTags'.$_SERVER['REQUEST_TIME']).'#';
         $content = str_replace(array('<?php', '<?=', '<?', '?>'), array("{$sp}b", "{$sp}p", "{$sp}s", "{$sp}e"), $content);
 
         $pieces = explode('<@IF:', $content);
@@ -1563,7 +1563,7 @@ 
             }
             list($cmd, $text) = explode('>', $split, 2);
             $cmd = str_replace("'", "\'", $cmd);
-            $content .= "<?php if(\$this->_parseCTagCMD('" . $cmd . "')): ?>";
+            $content .= "<?php if(\$this->_parseCTagCMD('".$cmd."')): ?>";
             $content .= $text;
         }
         $pieces = explode('<@ELSEIF:', $content);
@@ -1574,13 +1574,13 @@ 
             }
             list($cmd, $text) = explode('>', $split, 2);
             $cmd = str_replace("'", "\'", $cmd);
-            $content .= "<?php elseif(\$this->_parseCTagCMD('" . $cmd . "')): ?>";
+            $content .= "<?php elseif(\$this->_parseCTagCMD('".$cmd."')): ?>";
             $content .= $text;
         }
 
         $content = str_replace(array('<@ELSE>', '<@ENDIF>'), array('<?php else:?>', '<?php endif;?>'), $content);
         ob_start();
-        $content = eval('?>' . $content);
+        $content = eval('?>'.$content);
         $content = ob_get_clean();
         $content = str_replace(array("{$sp}b", "{$sp}p", "{$sp}s", "{$sp}e"), array('<?php', '<?=', '<?', '?>'), $content);
 
@@ -1706,7 +1706,7 @@ 
         $matches = $this->getTagsFromContent($content, $left, $right);
         if (!empty($matches)) {
             foreach ($matches[0] as $i => $v) {
-                $addBreakMatches[$i] = $v . "\n";
+                $addBreakMatches[$i] = $v."\n";
             }
             $content = str_replace($addBreakMatches, '', $content);
             if (strpos($content, $left) !== false) {
@@ -1739,8 +1739,8 @@ 
             $s = &$matches[0][$i];
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $v, $content);
-            } elseif($this->debug) {
-                $this->addLog('ignoreCommentedTagsContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('ignoreCommentedTagsContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
         return $content;
@@ -1801,7 +1801,7 @@ 
                 $msg = ($msg === false) ? 'ob_get_contents() error' : $msg;
                 $this->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], 'Plugin', $error_info['message'], $error_info['line'], $msg);
                 if ($this->isBackend()) {
-                    $this->event->alert('An error occurred while loading. Please see the event log for more information.<p>' . $msg . '</p>');
+                    $this->event->alert('An error occurred while loading. Please see the event log for more information.<p>'.$msg.'</p>');
                 }
             }
         } else {
@@ -1847,7 +1847,7 @@ 
                 $echo = ($echo === false) ? 'ob_get_contents() error' : $echo;
                 $this->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], 'Snippet', $error_info['message'], $error_info['line'], $echo);
                 if ($this->isBackend()) {
-                    $this->event->alert('An error occurred while loading. Please see the event log for more information<p>' . $echo . $return . '</p>');
+                    $this->event->alert('An error occurred while loading. Please see the event log for more information<p>'.$echo.$return.'</p>');
                 }
             }
         }
@@ -1855,7 +1855,7 @@ 
         if (is_array($return) || is_object($return)) {
             return $return;
         } else {
-            return $echo . $return;
+            return $echo.$return;
         }
     }
 
@@ -1893,8 +1893,8 @@ 
                 }
                 if (strpos($content, $s) !== false) {
                     $content = str_replace($s, $value, $content);
-                } elseif($this->debug) {
-                    $this->addLog('evalSnippetsSGVar parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+                } elseif ($this->debug) {
+                    $this->addLog('evalSnippetsSGVar parse error', $_SERVER['REQUEST_URI'].$s, 2);
                 }
                 continue;
             }
@@ -1905,8 +1905,8 @@ 
 
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('evalSnippets parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('evalSnippets parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
 
@@ -1998,7 +1998,7 @@ 
             $eventtime = sprintf('%2.2f ms', $eventtime * 1000);
             $code = str_replace("\t", '  ', $this->htmlspecialchars($value));
             $piece = str_replace("\t", '  ', $this->htmlspecialchars($piece));
-            $print_r_params = str_replace("\t", '  ', $this->htmlspecialchars('$modx->event->params = ' . print_r($params, true)));
+            $print_r_params = str_replace("\t", '  ', $this->htmlspecialchars('$modx->event->params = '.print_r($params, true)));
             $this->snippetsCode .= sprintf('<fieldset style="margin:1em;"><legend><b>%s</b>(%s)</legend><pre style="white-space: pre-wrap;background-color:#fff;width:90%%;">[[%s]]</pre><pre style="white-space: pre-wrap;background-color:#fff;width:90%%;">%s</pre><pre style="white-space: pre-wrap;background-color:#fff;width:90%%;">%s</pre></fieldset>', $snippetObject['name'], $eventtime, $piece, $print_r_params, $code);
             $this->snippetsTime[] = array('sname' => $key, 'time' => $eventtime);
         }
@@ -2239,7 +2239,7 @@ 
             $rs = $this->db->select('name,snippet,properties', '[+prefix+]site_snippets', $where);
             $count = $this->db->getRecordCount($rs);
             if (1 < $count) {
-                exit('Error $modx->_getSnippetObject()' . $snip_name);
+                exit('Error $modx->_getSnippetObject()'.$snip_name);
             }
             if ($count) {
                 $row = $this->db->getRow($rs);
@@ -2265,7 +2265,7 @@ 
     function toAlias($text)
     {
         $suff = $this->config['friendly_url_suffix'];
-        return str_replace(array('.xml' . $suff, '.rss' . $suff, '.js' . $suff, '.css' . $suff, '.txt' . $suff, '.json' . $suff, '.pdf' . $suff), array('.xml', '.rss', '.js', '.css', '.txt', '.json', '.pdf'), $text);
+        return str_replace(array('.xml'.$suff, '.rss'.$suff, '.js'.$suff, '.css'.$suff, '.txt'.$suff, '.json'.$suff, '.pdf'.$suff), array('.xml', '.rss', '.js', '.css', '.txt', '.json', '.pdf'), $text);
     }
 
     /**
@@ -2297,7 +2297,7 @@ 
                 $suff = '/';
             }
 
-            $url = ($dir != '' ? $dir . '/' : '') . $pre . $alias . $suff;
+            $url = ($dir != '' ? $dir.'/' : '').$pre.$alias.$suff;
         }
 
         $evtOut = $this->invokeEvent('OnMakeDocUrl', array(
@@ -2334,7 +2334,7 @@ 
                 preg_match_all('!\[\~([0-9]+)\~\]!ise', $documentSource, $match);
                 $ids = implode(',', array_unique($match['1']));
                 if ($ids) {
-                    $res = $this->db->select("id,alias,isfolder,parent,alias_visible", $this->getFullTableName('site_content'), "id IN (" . $ids . ") AND isfolder = '0'");
+                    $res = $this->db->select("id,alias,isfolder,parent,alias_visible", $this->getFullTableName('site_content'), "id IN (".$ids.") AND isfolder = '0'");
                     while ($row = $this->db->getRow($res)) {
                         if ($this->config['use_alias_path'] == '1' && $row['parent'] != 0) {
                             $parent = $row['parent'];
@@ -2345,7 +2345,7 @@ 
                                 $parent = $this->aliasListing[$parent]['parent'];
                             }
 
-                            $aliases[$row['id']] = $path . '/' . $row['alias'];
+                            $aliases[$row['id']] = $path.'/'.$row['alias'];
                         } else {
                             $aliases[$row['id']] = $row['alias'];
                         }
@@ -2357,7 +2357,7 @@ 
             $isfriendly = ($this->config['friendly_alias_urls'] == 1 ? 1 : 0);
             $pref = $this->config['friendly_url_prefix'];
             $suff = $this->config['friendly_url_suffix'];
-            $documentSource = preg_replace_callback($in, function ($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff) {
+            $documentSource = preg_replace_callback($in, function($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff) {
                 global $modx;
                 $thealias = $aliases[$m[1]];
                 $thefolder = $isfolder[$m[1]];
@@ -2373,7 +2373,7 @@ 
 
         } else {
             $in = '!\[\~([0-9]+)\~\]!is';
-            $out = "index.php?id=" . '\1';
+            $out = "index.php?id=".'\1';
             $documentSource = preg_replace($in, $out, $documentSource);
         }
 
@@ -2398,7 +2398,7 @@ 
         } else {
             $url_path = $_SERVER['REQUEST_URI'];
         }
-        $url_path = $q;//LANG
+        $url_path = $q; //LANG
 
 
         if (substr($url_path, 0, $len_base_url) === $this->config['base_url']) {
@@ -2411,7 +2411,7 @@ 
             $strictURL = substr($strictURL, $len_base_url);
         }
         $http_host = $_SERVER['HTTP_HOST'];
-        $requestedURL = "{$scheme}://{$http_host}" . '/' . $q; //LANG
+        $requestedURL = "{$scheme}://{$http_host}".'/'.$q; //LANG
 
         $site_url = $this->config['site_url'];
 
@@ -2427,7 +2427,7 @@ 
                 }
                 if ($this->config['base_url'] != $_SERVER['REQUEST_URI']) {
                     if (empty($_POST)) {
-                        if (($this->config['base_url'] . '?' . $qstring) != $_SERVER['REQUEST_URI']) {
+                        if (($this->config['base_url'].'?'.$qstring) != $_SERVER['REQUEST_URI']) {
                             $this->sendRedirect($url, 0, 'REDIRECT_HEADER', 'HTTP/1.0 301 Moved Permanently');
                             exit(0);
                         }
@@ -2490,7 +2490,7 @@ 
                 $docgrp = implode(",", $docgrp);
             }
             // get document
-            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
             $rs = $this->db->select('sc.*', "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg ON dg.document = sc.id", "sc.{$method} = '{$identifier}' AND ({$access})", "", 1);
             if ($this->db->getRecordCount($rs) < 1) {
@@ -2526,9 +2526,9 @@ 
             }
             if ($documentObject['template']) {
                 // load TVs and merge with document - Orig by Apodigm - Docvars
-                $rs = $this->db->select("tv.*, IF(tvc.value!='',tvc.value,tv.default_text) as value", $this->getFullTableName("site_tmplvars") . " tv
-                INNER JOIN " . $this->getFullTableName("site_tmplvar_templates") . " tvtpl ON tvtpl.tmplvarid = tv.id
-                LEFT JOIN " . $this->getFullTableName("site_tmplvar_contentvalues") . " tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$documentObject['id']}'", "tvtpl.templateid = '{$documentObject['template']}'");
+                $rs = $this->db->select("tv.*, IF(tvc.value!='',tvc.value,tv.default_text) as value", $this->getFullTableName("site_tmplvars")." tv
+                INNER JOIN " . $this->getFullTableName("site_tmplvar_templates")." tvtpl ON tvtpl.tmplvarid = tv.id
+                LEFT JOIN " . $this->getFullTableName("site_tmplvar_contentvalues")." tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$documentObject['id']}'", "tvtpl.templateid = '{$documentObject['template']}'");
                 $tmplvars = array();
                 while ($row = $this->db->getRow($rs)) {
                     $tmplvars[$row['name']] = array(
@@ -2574,7 +2574,7 @@ 
                 $st = md5($source);
             }
             if ($this->dumpSnippets == 1) {
-                $this->snippetsCode .= "<fieldset><legend><b style='color: #821517;'>PARSE PASS " . ($i + 1) . "</b></legend><p>The following snippets (if any) were parsed during this pass.</p>";
+                $this->snippetsCode .= "<fieldset><legend><b style='color: #821517;'>PARSE PASS ".($i + 1)."</b></legend><p>The following snippets (if any) were parsed during this pass.</p>";
             }
 
             // invoke OnParseDocument event
@@ -2660,7 +2660,7 @@ 
 
             // Check use_alias_path and check if $this->virtualDir is set to anything, then parse the path
             if ($this->config['use_alias_path'] == 1) {
-                $alias = (strlen($this->virtualDir) > 0 ? $this->virtualDir . '/' : '') . $this->documentIdentifier;
+                $alias = (strlen($this->virtualDir) > 0 ? $this->virtualDir.'/' : '').$this->documentIdentifier;
                 if (isset($this->documentListing[$alias])) {
                     $this->documentIdentifier = $this->documentListing[$alias];
                 } else {
@@ -2721,7 +2721,7 @@ 
                 } else {
                     $docAlias = $this->db->escape($this->documentIdentifier);
                     $rs = $this->db->select('id', $this->getFullTableName('site_content'), "deleted=0 and alias='{$docAlias}'");
-                    $this->documentIdentifier = (int)$this->db->getValue($rs);
+                    $this->documentIdentifier = (int) $this->db->getValue($rs);
                 }
             }
             $this->documentMethod = 'id';
@@ -2778,7 +2778,7 @@ 
                 $_REQUEST[$n] = $_GET[$n] = $v;
             }
         }
-        $_SERVER['PHP_SELF'] = $this->config['base_url'] . $qp['path'];
+        $_SERVER['PHP_SELF'] = $this->config['base_url'].$qp['path'];
         $this->q = $qp['path'];
         return $qp['path'];
     }
@@ -2872,7 +2872,7 @@ 
             $this->sendErrorPage();
         } else {
             // Inculde the necessary files to check document permissions
-            include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
+            include_once(MODX_MANAGER_PATH.'processors/user_documents_permissions.class.php');
             $udperms = new udperms();
             $udperms->user = $this->getLoginUserID();
             $udperms->document = $this->documentIdentifier;
@@ -2926,7 +2926,7 @@ 
         while ($id && $height--) {
             $thisid = $id;
             if ($this->config['aliaslistingfolder'] == 1) {
-                $id = isset($this->aliasListing[$id]['parent']) ? $this->aliasListing[$id]['parent'] : $this->db->getValue("SELECT `parent` FROM " . $this->getFullTableName("site_content") . " WHERE `id` = '{$id}' LIMIT 0,1");
+                $id = isset($this->aliasListing[$id]['parent']) ? $this->aliasListing[$id]['parent'] : $this->db->getValue("SELECT `parent` FROM ".$this->getFullTableName("site_content")." WHERE `id` = '{$id}' LIMIT 0,1");
                 if (!$id || $id == '0') {
                     break;
                 }
@@ -2977,15 +2977,15 @@ 
 
         if ($this->config['aliaslistingfolder'] == 1) {
 
-            $res = $this->db->select("id,alias,isfolder,parent", $this->getFullTableName('site_content'), "parent IN (" . $id . ") AND deleted = '0'");
+            $res = $this->db->select("id,alias,isfolder,parent", $this->getFullTableName('site_content'), "parent IN (".$id.") AND deleted = '0'");
             $idx = array();
             while ($row = $this->db->getRow($res)) {
                 $pAlias = '';
                 if (isset($this->aliasListing[$row['parent']])) {
-                    $pAlias .= !empty($this->aliasListing[$row['parent']]['path']) ? $this->aliasListing[$row['parent']]['path'] . '/' : '';
-                    $pAlias .= !empty($this->aliasListing[$row['parent']]['alias']) ? $this->aliasListing[$row['parent']]['alias'] . '/' : '';
+                    $pAlias .= !empty($this->aliasListing[$row['parent']]['path']) ? $this->aliasListing[$row['parent']]['path'].'/' : '';
+                    $pAlias .= !empty($this->aliasListing[$row['parent']]['alias']) ? $this->aliasListing[$row['parent']]['alias'].'/' : '';
                 };
-                $children[$pAlias . $row['alias']] = $row['id'];
+                $children[$pAlias.$row['alias']] = $row['id'];
                 if ($row['isfolder'] == 1) {
                     $idx[] = $row['id'];
                 }
@@ -3017,7 +3017,7 @@ 
                 $depth--;
 
                 foreach ($documentMap_cache[$id] as $childId) {
-                    $pkey = (strlen($this->aliasListing[$childId]['path']) ? "{$this->aliasListing[$childId]['path']}/" : '') . $this->aliasListing[$childId]['alias'];
+                    $pkey = (strlen($this->aliasListing[$childId]['path']) ? "{$this->aliasListing[$childId]['path']}/" : '').$this->aliasListing[$childId]['alias'];
                     if (!strlen($pkey)) {
                         $pkey = "{$childId}";
                     }
@@ -3046,7 +3046,7 @@ 
         if (substr(strtolower($url), 0, 11) == "javascript:") {
             $fnc = substr($url, 11);
         } elseif ($url) {
-            $fnc = "window.location.href='" . addslashes($url) . "';";
+            $fnc = "window.location.href='".addslashes($url)."';";
         } else {
             $fnc = "history.back(-1);";
         }
@@ -3055,7 +3055,7 @@ 
             <meta http-equiv=\"Content-Type\" content=\"text/html; charset={$modx_manager_charset};\">
             <script>
                 function __alertQuit() {
-                    alert('" . addslashes($msg) . "');
+                    alert('".addslashes($msg)."');
                     {$fnc}
                 }
                 window.setTimeout('__alertQuit();',100);
@@ -3079,7 +3079,7 @@ 
         if ($pms) {
             $state = ($pms[$pm] == 1);
         }
-        return (int)$state;
+        return (int) $state;
     }
 
     /**
@@ -3160,7 +3160,7 @@ 
             $this->lockedElements = array();
             $this->cleanupExpiredLocks();
 
-            $rs = $this->db->select('sid,internalKey,elementType,elementId,lasthit,username', $this->getFullTableName('active_user_locks') . " ul
+            $rs = $this->db->select('sid,internalKey,elementType,elementId,lasthit,username', $this->getFullTableName('active_user_locks')." ul
                 LEFT JOIN {$this->getFullTableName('manager_users')} mu on ul.internalKey = mu.id");
             while ($row = $this->db->getRow($rs)) {
                 $this->lockedElements[$row['elementType']][$row['elementId']] = array(
@@ -3196,7 +3196,7 @@ 
             foreach ($rs as $row) {
                 $userSids[] = $row['sid'];
             }
-            $userSids = "'" . implode("','", $userSids) . "'";
+            $userSids = "'".implode("','", $userSids)."'";
             $this->db->delete($this->getFullTableName('active_user_locks'), "sid NOT IN({$userSids})");
         } else {
             $this->db->delete($this->getFullTableName('active_user_locks'));
@@ -3393,8 +3393,8 @@ 
         if (isset($this->config['send_errormail']) && $this->config['send_errormail'] !== '0') {
             if ($this->config['send_errormail'] <= $type) {
                 $this->sendmail(array(
-                    'subject' => 'MODX System Error on ' . $this->config['site_name'],
-                    'body' => 'Source: ' . $source . ' - The details of the error could be seen in the MODX system events log.',
+                    'subject' => 'MODX System Error on '.$this->config['site_name'],
+                    'body' => 'Source: '.$source.' - The details of the error could be seen in the MODX system events log.',
                     'type' => 'text'
                 ));
             }
@@ -3442,7 +3442,7 @@ 
             $p['fromname'] = $userinfo['username'];
         }
         if ($msg === '' && !isset($p['body'])) {
-            $p['body'] = $_SERVER['REQUEST_URI'] . "\n" . $_SERVER['HTTP_USER_AGENT'] . "\n" . $_SERVER['HTTP_REFERER'];
+            $p['body'] = $_SERVER['REQUEST_URI']."\n".$_SERVER['HTTP_USER_AGENT']."\n".$_SERVER['HTTP_REFERER'];
         } elseif (is_string($msg) && 0 < strlen($msg)) {
             $p['body'] = $msg;
         }
@@ -3482,8 +3482,8 @@ 
             $files = array();
         }
         foreach ($files as $f) {
-            if (file_exists(MODX_BASE_PATH . $f) && is_file(MODX_BASE_PATH . $f) && is_readable(MODX_BASE_PATH . $f)) {
-                $this->mail->AddAttachment(MODX_BASE_PATH . $f);
+            if (file_exists(MODX_BASE_PATH.$f) && is_file(MODX_BASE_PATH.$f) && is_readable(MODX_BASE_PATH.$f)) {
+                $this->mail->AddAttachment(MODX_BASE_PATH.$f);
             }
         }
         $rs = $this->mail->send();
@@ -3561,14 +3561,14 @@ 
         $tblsc = $this->getFullTableName("site_content");
         $tbldg = $this->getFullTableName("document_groups");
         // modify field names to use sc. table reference
-        $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-        $sort = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+        $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+        $sort = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
         // get document groups for current user
         if ($docgrp = $this->getUserDocGroups()) {
             $docgrp = implode(",", $docgrp);
         }
         // build query
-        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
         $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg on dg.document = sc.id", "sc.parent = '{$id}' AND ({$access}) GROUP BY sc.id", "{$sort} {$dir}");
         $resourceArray = $this->db->makeArray($result);
@@ -3598,14 +3598,14 @@ 
         $tbldg = $this->getFullTableName("document_groups");
 
         // modify field names to use sc. table reference
-        $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-        $sort = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+        $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+        $sort = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
         // get document groups for current user
         if ($docgrp = $this->getUserDocGroups()) {
             $docgrp = implode(",", $docgrp);
         }
         // build query
-        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
         $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg on dg.document = sc.id", "sc.parent = '{$id}' AND sc.published=1 AND sc.deleted=0 AND ({$access}) GROUP BY sc.id", "{$sort} {$dir}");
         $resourceArray = $this->db->makeArray($result);
@@ -3640,16 +3640,16 @@ 
             return $this->tmpCache[__FUNCTION__][$cacheKey];
         }
 
-        $published = ($published !== 'all') ? 'AND sc.published = ' . $published : '';
-        $deleted = ($deleted !== 'all') ? 'AND sc.deleted = ' . $deleted : '';
+        $published = ($published !== 'all') ? 'AND sc.published = '.$published : '';
+        $deleted = ($deleted !== 'all') ? 'AND sc.deleted = '.$deleted : '';
 
         if ($where != '') {
-            $where = 'AND ' . $where;
+            $where = 'AND '.$where;
         }
 
         // modify field names to use sc. table reference
-        $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-        $sort = ($sort == '') ? '' : 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+        $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+        $sort = ($sort == '') ? '' : 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
 
         // get document groups for current user
         if ($docgrp = $this->getUserDocGroups()) {
@@ -3657,7 +3657,7 @@ 
         }
 
         // build query
-        $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="' . $_SESSION['mgrRole'] . '" OR sc.privatemgr=0') . (!$docgrp ? '' : ' OR dg.document_group IN (' . $docgrp . ')');
+        $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="'.$_SESSION['mgrRole'].'" OR sc.privatemgr=0').(!$docgrp ? '' : ' OR dg.document_group IN ('.$docgrp.')');
 
         $tblsc = $this->getFullTableName('site_content');
         $tbldg = $this->getFullTableName('document_groups');
@@ -3709,10 +3709,10 @@ 
             return false;
         } else {
             // modify field names to use sc. table reference
-            $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-            $sort = ($sort == '') ? '' : 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+            $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+            $sort = ($sort == '') ? '' : 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
             if ($where != '') {
-                $where = 'AND ' . $where;
+                $where = 'AND '.$where;
             }
 
             $published = ($published !== 'all') ? "AND sc.published = '{$published}'" : '';
@@ -3723,13 +3723,13 @@ 
                 $docgrp = implode(',', $docgrp);
             }
 
-            $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="' . $_SESSION['mgrRole'] . '" OR sc.privatemgr=0') . (!$docgrp ? '' : ' OR dg.document_group IN (' . $docgrp . ')');
+            $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="'.$_SESSION['mgrRole'].'" OR sc.privatemgr=0').(!$docgrp ? '' : ' OR dg.document_group IN ('.$docgrp.')');
 
             $tblsc = $this->getFullTableName('site_content');
             $tbldg = $this->getFullTableName('document_groups');
 
             $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc
-                    LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id IN (" . implode(',', $ids) . ") {$published} {$deleted} {$where}) AND ({$access}) GROUP BY sc.id", ($sort ? "{$sort} {$dir}" : ""), $limit);
+                    LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id IN (".implode(',', $ids).") {$published} {$deleted} {$where}) AND ({$access}) GROUP BY sc.id", ($sort ? "{$sort} {$dir}" : ""), $limit);
 
             $resourceArray = $this->db->makeArray($result);
 
@@ -3834,12 +3834,12 @@ 
             $tbldg = $this->getFullTableName("document_groups");
             $activeSql = $active == 1 ? "AND sc.published=1 AND sc.deleted=0" : "";
             // modify field names to use sc. table reference
-            $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+            $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
             // get document groups for current user
             if ($docgrp = $this->getUserDocGroups()) {
                 $docgrp = implode(",", $docgrp);
             }
-            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
             $result = $this->db->select($fields, "{$tblsc} sc LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id='{$pageid}' {$activeSql}) AND ({$access})", "", 1);
             $pageInfo = $this->db->getRow($result);
 
@@ -3886,7 +3886,7 @@ 
     {
         if ($this->currentSnippet) {
             $tbl = $this->getFullTableName("site_snippets");
-            $rs = $this->db->select('id', $tbl, "name='" . $this->db->escape($this->currentSnippet) . "'", '', 1);
+            $rs = $this->db->select('id', $tbl, "name='".$this->db->escape($this->currentSnippet)."'", '', 1);
             if ($snippetId = $this->db->getValue($rs)) {
                 return $snippetId;
             }
@@ -3913,23 +3913,23 @@ 
      */
     function clearCache($type = '', $report = false)
     {
-        $cache_dir = MODX_BASE_PATH . $this->getCacheFolder();
+        $cache_dir = MODX_BASE_PATH.$this->getCacheFolder();
         if (is_array($type)) {
             foreach ($type as $_) {
                 $this->clearCache($_, $report);
             }
         } elseif ($type == 'full') {
-            include_once(MODX_MANAGER_PATH . 'processors/cache_sync.class.processor.php');
+            include_once(MODX_MANAGER_PATH.'processors/cache_sync.class.processor.php');
             $sync = new synccache();
             $sync->setCachepath($cache_dir);
             $sync->setReport($report);
             $sync->emptyCache();
         } elseif (preg_match('@^[1-9][0-9]*$@', $type)) {
             $key = ($this->config['cache_type'] == 2) ? $this->makePageCacheKey($type) : $type;
-            $file_name = "docid_" . $key . "_*.pageCache.php";
-            $cache_path = $cache_dir . $file_name;
+            $file_name = "docid_".$key."_*.pageCache.php";
+            $cache_path = $cache_dir.$file_name;
             $files = glob($cache_path);
-            $files[] = $cache_dir . "docid_" . $key . ".pageCache.php";
+            $files[] = $cache_dir."docid_".$key.".pageCache.php";
             foreach ($files as $file) {
                 if (!is_file($file)) {
                     continue;
@@ -3937,7 +3937,7 @@ 
                 unlink($file);
             }
         } else {
-            $files = glob($cache_dir . '*');
+            $files = glob($cache_dir.'*');
             foreach ($files as $file) {
                 $name = basename($file);
                 if (strpos($name, '.pageCache.php') === false) {
@@ -4007,7 +4007,7 @@ 
                         $f_url_suffix = '/';
                     }
 
-                    $alPath = !empty ($al['path']) ? $al['path'] . '/' : '';
+                    $alPath = !empty ($al['path']) ? $al['path'].'/' : '';
 
                     if ($al && $al['alias']) {
                         $alias = $al['alias'];
@@ -4015,7 +4015,7 @@ 
 
                 }
 
-                $alias = $alPath . $f_url_prefix . $alias . $f_url_suffix;
+                $alias = $alPath.$f_url_prefix.$alias.$f_url_suffix;
                 $url = "{$alias}{$args}";
             } else {
                 $url = "index.php?id={$id}{$args}";
@@ -4034,7 +4034,7 @@ 
             }
 
             //TODO: check to make sure that $site_url incudes the url :port (e.g. :8080)
-            $host = $scheme == 'full' ? $this->config['site_url'] : $scheme . '://' . $_SERVER['HTTP_HOST'] . $host;
+            $host = $scheme == 'full' ? $this->config['site_url'] : $scheme.'://'.$_SERVER['HTTP_HOST'].$host;
         }
 
         //fix strictUrl by Bumkaka
@@ -4043,9 +4043,9 @@ 
         }
 
         if ($this->config['xhtml_urls']) {
-            $url = preg_replace("/&(?!amp;)/", "&amp;", $host . $virtualDir . $url);
+            $url = preg_replace("/&(?!amp;)/", "&amp;", $host.$virtualDir.$url);
         } else {
-            $url = $host . $virtualDir . $url;
+            $url = $host.$virtualDir.$url;
         }
 
         $evtOut = $this->invokeEvent('OnMakeDocUrl', array(
@@ -4069,21 +4069,21 @@ 
         if (isset($this->aliasListing[$id])) {
             $out = $this->aliasListing[$id];
         } else {
-            $q = $this->db->query("SELECT id,alias,isfolder,parent FROM " . $this->getFullTableName("site_content") . " WHERE id=" . (int)$id);
+            $q = $this->db->query("SELECT id,alias,isfolder,parent FROM ".$this->getFullTableName("site_content")." WHERE id=".(int) $id);
             if ($this->db->getRecordCount($q) == '1') {
                 $q = $this->db->getRow($q);
                 $this->aliasListing[$id] = array(
-                    'id' => (int)$q['id'],
+                    'id' => (int) $q['id'],
                     'alias' => $q['alias'] == '' ? $q['id'] : $q['alias'],
-                    'parent' => (int)$q['parent'],
-                    'isfolder' => (int)$q['isfolder'],
+                    'parent' => (int) $q['parent'],
+                    'isfolder' => (int) $q['isfolder'],
                 );
                 if ($this->aliasListing[$id]['parent'] > 0) {
                     //fix alias_path_usage
                     if ($this->config['use_alias_path'] == '1') {
                         //&& $tmp['path'] != '' - fix error slash with epty path
                         $tmp = $this->getAliasListing($this->aliasListing[$id]['parent']);
-                        $this->aliasListing[$id]['path'] = $tmp['path'] . ($tmp['alias_visible'] ? (($tmp['parent'] > 0 && $tmp['path'] != '') ? '/' : '') . $tmp['alias'] : '');
+                        $this->aliasListing[$id]['path'] = $tmp['path'].($tmp['alias_visible'] ? (($tmp['parent'] > 0 && $tmp['path'] != '') ? '/' : '').$tmp['alias'] : '');
                     } else {
                         $this->aliasListing[$id]['path'] = '';
                     }
@@ -4124,7 +4124,7 @@ 
         $out = array();
         if (empty($this->version) || !is_array($this->version)) {
             //include for compatibility modx version < 1.0.10
-            include MODX_MANAGER_PATH . "includes/version.inc.php";
+            include MODX_MANAGER_PATH."includes/version.inc.php";
             $this->version = array();
             $this->version['version'] = isset($modx_version) ? $modx_version : '';
             $this->version['branch'] = isset($modx_branch) ? $modx_branch : '';
@@ -4146,18 +4146,18 @@ 
     {
         if (isset ($this->snippetCache[$snippetName])) {
             $snippet = $this->snippetCache[$snippetName];
-            $properties = !empty($this->snippetCache[$snippetName . "Props"]) ? $this->snippetCache[$snippetName . "Props"] : '';
+            $properties = !empty($this->snippetCache[$snippetName."Props"]) ? $this->snippetCache[$snippetName."Props"] : '';
         } else { // not in cache so let's check the db
-            $sql = "SELECT ss.`name`, ss.`snippet`, ss.`properties`, sm.properties as `sharedproperties` FROM " . $this->getFullTableName("site_snippets") . " as ss LEFT JOIN " . $this->getFullTableName('site_modules') . " as sm on sm.guid=ss.moduleguid WHERE ss.`name`='" . $this->db->escape($snippetName) . "'  AND ss.disabled=0;";
+            $sql = "SELECT ss.`name`, ss.`snippet`, ss.`properties`, sm.properties as `sharedproperties` FROM ".$this->getFullTableName("site_snippets")." as ss LEFT JOIN ".$this->getFullTableName('site_modules')." as sm on sm.guid=ss.moduleguid WHERE ss.`name`='".$this->db->escape($snippetName)."'  AND ss.disabled=0;";
             $result = $this->db->query($sql);
             if ($this->db->getRecordCount($result) == 1) {
                 $row = $this->db->getRow($result);
                 $snippet = $this->snippetCache[$snippetName] = $row['snippet'];
                 $mergedProperties = array_merge($this->parseProperties($row['properties']), $this->parseProperties($row['sharedproperties']));
-                $properties = $this->snippetCache[$snippetName . "Props"] = json_encode($mergedProperties);
+                $properties = $this->snippetCache[$snippetName."Props"] = json_encode($mergedProperties);
             } else {
                 $snippet = $this->snippetCache[$snippetName] = "return false;";
-                $properties = $this->snippetCache[$snippetName . "Props"] = '';
+                $properties = $this->snippetCache[$snippetName."Props"] = '';
             }
         }
         // load default params/properties
@@ -4260,8 +4260,8 @@ 
             }
             if (strpos($tpl, $s) !== false) {
                 $tpl = str_replace($s, $value, $tpl);
-            } elseif($this->debug) {
-                $this->addLog('parseText parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('parseText parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
 
@@ -4310,7 +4310,7 @@ 
             case 'CODE':
                 break;
             case 'FILE':
-                $template = file_get_contents(MODX_BASE_PATH . $template);
+                $template = file_get_contents(MODX_BASE_PATH.$template);
                 break;
             case 'CHUNK':
                 $template = $this->getChunk($template);
@@ -4363,7 +4363,7 @@ 
         }
 
         if (empty($mode)) {
-            $strTime = strftime($dateFormat . " %H:%M:%S", $timestamp);
+            $strTime = strftime($dateFormat." %H:%M:%S", $timestamp);
         } elseif ($mode == 'dateOnly') {
             $strTime = strftime($dateFormat, $timestamp);
         } elseif ($mode == 'formatOnly') {
@@ -4459,7 +4459,7 @@ 
                     if ($v === 'value') {
                         unset($_[$i]);
                     } else {
-                        $_[$i] = 'tv.' . $v;
+                        $_[$i] = 'tv.'.$v;
                     }
                 }
                 $fields = join(',', $_);
@@ -4468,12 +4468,12 @@ 
             }
 
             if ($tvsort != '') {
-                $tvsort = 'tv.' . join(',tv.', array_filter(array_map('trim', explode(',', $tvsort))));
+                $tvsort = 'tv.'.join(',tv.', array_filter(array_map('trim', explode(',', $tvsort))));
             }
             if ($tvidnames == "*") {
                 $query = "tv.id<>0";
             } else {
-                $query = (is_numeric($tvidnames[0]) ? "tv.id" : "tv.name") . " IN ('" . join("','", $tvidnames) . "')";
+                $query = (is_numeric($tvidnames[0]) ? "tv.id" : "tv.name")." IN ('".join("','", $tvidnames)."')";
             }
 
             if ($docgrp = $this->getUserDocGroups()) {
@@ -4619,7 +4619,7 @@ 
             return $this->tmpCache[__FUNCTION__][$cacheKey];
         }
 
-        if (($idnames != '*' && !is_array($idnames)) || empty($idnames) ) {
+        if (($idnames != '*' && !is_array($idnames)) || empty($idnames)) {
             return false;
         } else {
 
@@ -4637,23 +4637,23 @@ 
             }
 
             // get user defined template variables
-            $fields = ($fields == '') ? 'tv.*' : 'tv.' . implode(',tv.', array_filter(array_map('trim', explode(',', $fields))));
-            $sort = ($sort == '') ? '' : 'tv.' . implode(',tv.', array_filter(array_map('trim', explode(',', $sort))));
+            $fields = ($fields == '') ? 'tv.*' : 'tv.'.implode(',tv.', array_filter(array_map('trim', explode(',', $fields))));
+            $sort = ($sort == '') ? '' : 'tv.'.implode(',tv.', array_filter(array_map('trim', explode(',', $sort))));
 
             if ($idnames == '*') {
                 $query = 'tv.id<>0';
             } else {
-                $query = (is_numeric($idnames[0]) ? 'tv.id' : 'tv.name') . " IN ('" . implode("','", $idnames) . "')";
+                $query = (is_numeric($idnames[0]) ? 'tv.id' : 'tv.name')." IN ('".implode("','", $idnames)."')";
             }
 
-            $rs = $this->db->select("{$fields}, IF(tvc.value != '', tvc.value, tv.default_text) as value", $this->getFullTableName('site_tmplvars') . " tv
-                    INNER JOIN " . $this->getFullTableName('site_tmplvar_templates') . " tvtpl ON tvtpl.tmplvarid = tv.id
-                    LEFT JOIN " . $this->getFullTableName('site_tmplvar_contentvalues') . " tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$docid}'", "{$query} AND tvtpl.templateid = '{$docRow['template']}'", ($sort ? "{$sort} {$dir}" : ""));
+            $rs = $this->db->select("{$fields}, IF(tvc.value != '', tvc.value, tv.default_text) as value", $this->getFullTableName('site_tmplvars')." tv
+                    INNER JOIN " . $this->getFullTableName('site_tmplvar_templates')." tvtpl ON tvtpl.tmplvarid = tv.id
+                    LEFT JOIN " . $this->getFullTableName('site_tmplvar_contentvalues')." tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$docid}'", "{$query} AND tvtpl.templateid = '{$docRow['template']}'", ($sort ? "{$sort} {$dir}" : ""));
 
             $result = $this->db->makeArray($rs);
 
             // get default/built-in template variables
-            if(is_array($docRow)){ 
+            if (is_array($docRow)) { 
                 ksort($docRow);
 
                 foreach ($docRow as $key => $value) {
@@ -4691,7 +4691,7 @@ 
      */
     function getTemplateVarOutput($idnames = array(), $docid = '', $published = 1, $sep = '')
     {
-        if (is_array($idnames) && empty($idnames) ) {
+        if (is_array($idnames) && empty($idnames)) {
             return false;
         } else {
             $output = array();
@@ -4704,9 +4704,9 @@ 
             if ($result == false) {
                 return false;
             } else {
-                $baspath = MODX_MANAGER_PATH . 'includes';
-                include_once $baspath . '/tmplvars.format.inc.php';
-                include_once $baspath . '/tmplvars.commands.inc.php';
+                $baspath = MODX_MANAGER_PATH.'includes';
+                include_once $baspath.'/tmplvars.format.inc.php';
+                include_once $baspath.'/tmplvars.commands.inc.php';
 
                 for ($i = 0; $i < count($result); $i++) {
                     $row = $result[$i];
@@ -4731,7 +4731,7 @@ 
      */
     function getFullTableName($tbl)
     {
-        return $this->db->config['dbase'] . ".`" . $this->db->config['table_prefix'] . $tbl . "`";
+        return $this->db->config['dbase'].".`".$this->db->config['table_prefix'].$tbl."`";
     }
 
     /**
@@ -4810,7 +4810,7 @@ 
     function getCachePath()
     {
         global $base_url;
-        $pth = $base_url . $this->getCacheFolder();
+        $pth = $base_url.$this->getCacheFolder();
         return $pth;
     }
 
@@ -4862,8 +4862,8 @@ 
         $out = false;
 
         if (!empty($context)) {
-            if (is_scalar($context) && isset($_SESSION[$context . 'Validated'])) {
-                $out = $_SESSION[$context . 'InternalKey'];
+            if (is_scalar($context) && isset($_SESSION[$context.'Validated'])) {
+                $out = $_SESSION[$context.'InternalKey'];
             }
         } else {
             switch (true) {
@@ -4891,8 +4891,8 @@ 
         $out = false;
 
         if (!empty($context)) {
-            if (is_scalar($context) && isset($_SESSION[$context . 'Validated'])) {
-                $out = $_SESSION[$context . 'Shortname'];
+            if (is_scalar($context) && isset($_SESSION[$context.'Validated'])) {
+                $out = $_SESSION[$context.'Shortname'];
             }
         } else {
             switch (true) {
@@ -4963,8 +4963,8 @@ 
      */
     function getWebUserInfo($uid)
     {
-        $rs = $this->db->select('wu.username, wu.password, wua.*', $this->getFullTableName("web_users") . " wu
-                INNER JOIN " . $this->getFullTableName("web_user_attributes") . " wua ON wua.internalkey=wu.id", "wu.id='{$uid}'");
+        $rs = $this->db->select('wu.username, wu.password, wua.*', $this->getFullTableName("web_users")." wu
+                INNER JOIN " . $this->getFullTableName("web_user_attributes")." wua ON wua.internalkey=wu.id", "wu.id='{$uid}'");
         if ($row = $this->db->getRow($rs)) {
             if (!isset($row['usertype']) or !$row["usertype"]) {
                 $row["usertype"] = "web";
@@ -5000,7 +5000,7 @@ 
         } else if (is_array($dg)) {
             // resolve ids to names
             $dgn = array();
-            $ds = $this->db->select('name', $this->getFullTableName("documentgroup_names"), "id IN (" . implode(",", $dg) . ")");
+            $ds = $this->db->select('name', $this->getFullTableName("documentgroup_names"), "id IN (".implode(",", $dg).")");
             while ($row = $this->db->getRow($ds)) {
                 $dgn[] = $row['name'];
             }
@@ -5028,7 +5028,7 @@ 
         $rt = false;
         if ($_SESSION["webValidated"] == 1) {
             $tbl = $this->getFullTableName("web_users");
-            $ds = $this->db->select('id, username, password', $tbl, "id='" . $this->getLoginUserID() . "'");
+            $ds = $this->db->select('id, username, password', $tbl, "id='".$this->getLoginUserID()."'");
             if ($row = $this->db->getRow($ds)) {
                 if ($row["password"] == md5($oldPwd)) {
                     if (strlen($newPwd) < 6) {
@@ -5038,7 +5038,7 @@ 
                     } else {
                         $this->db->update(array(
                             'password' => $this->db->escape($newPwd),
-                        ), $tbl, "id='" . $this->getLoginUserID() . "'");
+                        ), $tbl, "id='".$this->getLoginUserID()."'");
                         // invoke OnWebChangePassword event
                         $this->invokeEvent("OnWebChangePassword", array(
                             "userid" => $row["id"],
@@ -5068,8 +5068,8 @@ 
         // check cache
         $grpNames = isset ($_SESSION['webUserGroupNames']) ? $_SESSION['webUserGroupNames'] : false;
         if (!is_array($grpNames)) {
-            $rs = $this->db->select('wgn.name', $this->getFullTableName("webgroup_names") . " wgn
-                    INNER JOIN " . $this->getFullTableName("web_groups") . " wg ON wg.webgroup=wgn.id AND wg.webuser='" . $this->getLoginUserID() . "'");
+            $rs = $this->db->select('wgn.name', $this->getFullTableName("webgroup_names")." wgn
+                    INNER JOIN " . $this->getFullTableName("web_groups")." wg ON wg.webgroup=wgn.id AND wg.webuser='".$this->getLoginUserID()."'");
             $grpNames = $this->db->getColumn("name", $rs);
             // save to cache
             $_SESSION['webUserGroupNames'] = $grpNames;
@@ -5102,7 +5102,7 @@ 
         if (strpos(strtolower($src), "<style") !== false || strpos(strtolower($src), "<link") !== false) {
             $this->sjscripts[$nextpos] = $src;
         } else {
-            $this->sjscripts[$nextpos] = "\t" . '<link rel="stylesheet" type="text/css" href="' . $src . '" ' . ($media ? 'media="' . $media . '" ' : '') . '/>';
+            $this->sjscripts[$nextpos] = "\t".'<link rel="stylesheet" type="text/css" href="'.$src.'" '.($media ? 'media="'.$media.'" ' : '').'/>';
         }
     }
 
@@ -5181,7 +5181,7 @@ 
         }
 
         if ($useThisVer && $plaintext != true && (strpos(strtolower($src), "<script") === false)) {
-            $src = "\t" . '<script type="text/javascript" src="' . $src . '"></script>';
+            $src = "\t".'<script type="text/javascript" src="'.$src.'"></script>';
         }
         if ($startup) {
             $pos = isset($overwritepos) ? $overwritepos : max(array_merge(array(0), array_keys($this->sjscripts))) + 1;
@@ -5327,7 +5327,7 @@ 
                 $eventtime = $this->getMicroTime() - $eventtime;
                 $this->pluginsCode .= sprintf('<fieldset><legend><b>%s / %s</b> (%2.2f ms)</legend>', $evtName, $pluginName, $eventtime * 1000);
                 foreach ($parameter as $k => $v) {
-                    $this->pluginsCode .= "{$k} => " . print_r($v, true) . '<br>';
+                    $this->pluginsCode .= "{$k} => ".print_r($v, true).'<br>';
                 }
                 $this->pluginsCode .= '</fieldset><br />';
                 $this->pluginsTime["{$evtName} / {$pluginName}"] += $eventtime;
@@ -5355,13 +5355,13 @@ 
         $plugin = array();
         if (isset ($this->pluginCache[$pluginName])) {
             $pluginCode = $this->pluginCache[$pluginName];
-            $pluginProperties = isset($this->pluginCache[$pluginName . "Props"]) ? $this->pluginCache[$pluginName . "Props"] : '';
+            $pluginProperties = isset($this->pluginCache[$pluginName."Props"]) ? $this->pluginCache[$pluginName."Props"] : '';
         } else {
             $pluginName = $this->db->escape($pluginName);
             $result = $this->db->select('name, plugincode, properties', $this->getFullTableName("site_plugins"), "name='{$pluginName}' AND disabled=0");
             if ($row = $this->db->getRow($result)) {
                 $pluginCode = $this->pluginCache[$row['name']] = $row['plugincode'];
-                $pluginProperties = $this->pluginCache[$row['name'] . "Props"] = $row['properties'];
+                $pluginProperties = $this->pluginCache[$row['name']."Props"] = $row['properties'];
             } else {
                 $pluginCode = $this->pluginCache[$pluginName] = "return false;";
                 $pluginProperties = '';
@@ -5468,7 +5468,7 @@ 
     function parseDocBlockFromFile($element_dir, $filename, $escapeValues = false)
     {
         $params = array();
-        $fullpath = $element_dir . '/' . $filename;
+        $fullpath = $element_dir.'/'.$filename;
         if (is_readable($fullpath)) {
             $tpl = @fopen($fullpath, "r");
             if ($tpl) {
@@ -5635,8 +5635,8 @@ 
         $ph = array('site_url' => MODX_SITE_URL);
         $regexUrl = "/((http|https|ftp|ftps)\:\/\/[^\/]+(\/[^\s]+[^,.?!:;\s])?)/";
         $regexEmail = '#([0-9a-z]([-_.]?[0-9a-z])*@[0-9a-z]([-.]?[0-9a-z])*\\.[a-wyz][a-z](fo|g|l|m|mes|o|op|pa|ro|seum|t|u|v|z)?)#i';
-        $emailSubject = isset($parsed['name']) ? '?subject=' . $parsed['name'] : '';
-        $emailSubject .= isset($parsed['version']) ? ' v' . $parsed['version'] : '';
+        $emailSubject = isset($parsed['name']) ? '?subject='.$parsed['name'] : '';
+        $emailSubject .= isset($parsed['version']) ? ' v'.$parsed['version'] : '';
         foreach ($parsed as $key => $val) {
             if (is_array($val)) {
                 foreach ($val as $key2 => $val2) {
@@ -5645,7 +5645,7 @@ 
                         $val2 = preg_replace($regexUrl, "<a href=\"{$url[0]}\" target=\"_blank\">{$url[0]}</a> ", $val2);
                     }
                     if (preg_match($regexEmail, $val2, $url)) {
-                        $val2 = preg_replace($regexEmail, '<a href="mailto:\\1' . $emailSubject . '">\\1</a>', $val2);
+                        $val2 = preg_replace($regexEmail, '<a href="mailto:\\1'.$emailSubject.'">\\1</a>', $val2);
                     }
                     $parsed[$key][$key2] = $val2;
                 }
@@ -5655,7 +5655,7 @@ 
                     $val = preg_replace($regexUrl, "<a href=\"{$url[0]}\" target=\"_blank\">{$url[0]}</a> ", $val);
                 }
                 if (preg_match($regexEmail, $val, $url)) {
-                    $val = preg_replace($regexEmail, '<a href="mailto:\\1' . $emailSubject . '">\\1</a>', $val);
+                    $val = preg_replace($regexEmail, '<a href="mailto:\\1'.$emailSubject.'">\\1</a>', $val);
                 }
                 $parsed[$key] = $val;
             }
@@ -5669,32 +5669,32 @@ 
         );
 
         $nl = "\n";
-        $list = isset($parsed['logo']) ? '<img src="' . $this->config['base_url'] . ltrim($parsed['logo'], "/") . '" style="float:right;max-width:100px;height:auto;" />' . $nl : '';
-        $list .= '<p>' . $nl;
-        $list .= isset($parsed['name']) ? '<strong>' . $parsed['name'] . '</strong><br/>' . $nl : '';
-        $list .= isset($parsed['description']) ? $parsed['description'] . $nl : '';
-        $list .= '</p><br/>' . $nl;
-        $list .= isset($parsed['version']) ? '<p><strong>' . $_lang['version'] . ':</strong> ' . $parsed['version'] . '</p>' . $nl : '';
-        $list .= isset($parsed['license']) ? '<p><strong>' . $_lang['license'] . ':</strong> ' . $parsed['license'] . '</p>' . $nl : '';
-        $list .= isset($parsed['lastupdate']) ? '<p><strong>' . $_lang['last_update'] . ':</strong> ' . $parsed['lastupdate'] . '</p>' . $nl : '';
-        $list .= '<br/>' . $nl;
+        $list = isset($parsed['logo']) ? '<img src="'.$this->config['base_url'].ltrim($parsed['logo'], "/").'" style="float:right;max-width:100px;height:auto;" />'.$nl : '';
+        $list .= '<p>'.$nl;
+        $list .= isset($parsed['name']) ? '<strong>'.$parsed['name'].'</strong><br/>'.$nl : '';
+        $list .= isset($parsed['description']) ? $parsed['description'].$nl : '';
+        $list .= '</p><br/>'.$nl;
+        $list .= isset($parsed['version']) ? '<p><strong>'.$_lang['version'].':</strong> '.$parsed['version'].'</p>'.$nl : '';
+        $list .= isset($parsed['license']) ? '<p><strong>'.$_lang['license'].':</strong> '.$parsed['license'].'</p>'.$nl : '';
+        $list .= isset($parsed['lastupdate']) ? '<p><strong>'.$_lang['last_update'].':</strong> '.$parsed['lastupdate'].'</p>'.$nl : '';
+        $list .= '<br/>'.$nl;
         $first = true;
         foreach ($arrayParams as $param => $label) {
             if (isset($parsed[$param])) {
                 if ($first) {
-                    $list .= '<p><strong>' . $_lang['references'] . '</strong></p>' . $nl;
-                    $list .= '<ul class="docBlockList">' . $nl;
+                    $list .= '<p><strong>'.$_lang['references'].'</strong></p>'.$nl;
+                    $list .= '<ul class="docBlockList">'.$nl;
                     $first = false;
                 }
-                $list .= '    <li><strong>' . $label . '</strong>' . $nl;
-                $list .= '        <ul>' . $nl;
+                $list .= '    <li><strong>'.$label.'</strong>'.$nl;
+                $list .= '        <ul>'.$nl;
                 foreach ($parsed[$param] as $val) {
-                    $list .= '            <li>' . $val . '</li>' . $nl;
+                    $list .= '            <li>'.$val.'</li>'.$nl;
                 }
-                $list .= '        </ul></li>' . $nl;
+                $list .= '        </ul></li>'.$nl;
             }
         }
-        $list .= !$first ? '</ul>' . $nl : '';
+        $list .= !$first ? '</ul>'.$nl : '';
 
         return $list;
     }
@@ -5770,7 +5770,7 @@ 
      */
     function addSnippet($name, $phpCode)
     {
-        $this->snippetCache['#' . $name] = $phpCode;
+        $this->snippetCache['#'.$name] = $phpCode;
     }
 
     /**
@@ -5779,7 +5779,7 @@ 
      */
     function addChunk($name, $text)
     {
-        $this->chunkCache['#' . $name] = $text;
+        $this->chunkCache['#'.$name] = $text;
     }
 
     /**
@@ -5815,7 +5815,7 @@ 
         }
 
         if (!$isSafe) {
-            $msg = $phpcode . "\n" . $this->currentSnippet . "\n" . print_r($_SERVER, true);
+            $msg = $phpcode."\n".$this->currentSnippet."\n".print_r($_SERVER, true);
             $title = sprintf('Unknown eval was executed (%s)', $this->htmlspecialchars(substr(trim($phpcode), 0, 50)));
             $this->messageQuit($title, '', true, '', '', 'Parser', $msg);
             return;
@@ -5829,7 +5829,7 @@ 
             return 'array()';
         }
 
-        $output = $echo . $return;
+        $output = $echo.$return;
         modx_sanitize_gpc($output);
         return $this->htmlspecialchars($output); // Maybe, all html tags are dangerous
     }
@@ -5847,8 +5847,8 @@ 
 
         $safe = explode(',', $safe_functions);
 
-        $phpcode = rtrim($phpcode, ';') . ';';
-        $tokens = token_get_all('<?php ' . $phpcode);
+        $phpcode = rtrim($phpcode, ';').';';
+        $tokens = token_get_all('<?php '.$phpcode);
         foreach ($tokens as $i => $token) {
             if (!is_array($token)) {
                 continue;
@@ -5884,7 +5884,7 @@ 
     function atBindFileContent($str = '')
     {
 
-        $search_path = array('assets/tvs/', 'assets/chunks/', 'assets/templates/', $this->config['rb_base_url'] . 'files/', '');
+        $search_path = array('assets/tvs/', 'assets/chunks/', 'assets/templates/', $this->config['rb_base_url'].'files/', '');
 
         if (stripos($str, '@FILE') !== 0) {
             return $str;
@@ -5907,7 +5907,7 @@ 
         $errorMsg = sprintf("Could not retrieve string '%s'.", $str);
 
         foreach ($search_path as $path) {
-            $file_path = MODX_BASE_PATH . $path . $str;
+            $file_path = MODX_BASE_PATH.$path.$str;
             if (strpos($file_path, MODX_MANAGER_PATH) === 0) {
                 return $errorMsg;
             } elseif (is_file($file_path)) {
@@ -5921,7 +5921,7 @@ 
             return $errorMsg;
         }
 
-        $content = (string)file_get_contents($file_path);
+        $content = (string) file_get_contents($file_path);
         if ($content === false) {
             return $errorMsg;
         }
@@ -6034,22 +6034,22 @@ 
 
         $version = isset ($GLOBALS['modx_version']) ? $GLOBALS['modx_version'] : '';
         $release_date = isset ($GLOBALS['release_date']) ? $GLOBALS['release_date'] : '';
-        $request_uri = "http://" . $_SERVER['HTTP_HOST'] . ($_SERVER["SERVER_PORT"] == 80 ? "" : (":" . $_SERVER["SERVER_PORT"])) . $_SERVER['REQUEST_URI'];
+        $request_uri = "http://".$_SERVER['HTTP_HOST'].($_SERVER["SERVER_PORT"] == 80 ? "" : (":".$_SERVER["SERVER_PORT"])).$_SERVER['REQUEST_URI'];
         $request_uri = $this->htmlspecialchars($request_uri, ENT_QUOTES, $this->config['modx_charset']);
         $ua = $this->htmlspecialchars($_SERVER['HTTP_USER_AGENT'], ENT_QUOTES, $this->config['modx_charset']);
         $referer = $this->htmlspecialchars($_SERVER['HTTP_REFERER'], ENT_QUOTES, $this->config['modx_charset']);
         if ($is_error) {
             $str = '<h2 style="color:red">&laquo; Evo Parse Error &raquo;</h2>';
             if ($msg != 'PHP Parse Error') {
-                $str .= '<h3 style="color:red">' . $msg . '</h3>';
+                $str .= '<h3 style="color:red">'.$msg.'</h3>';
             }
         } else {
             $str = '<h2 style="color:#003399">&laquo; Evo Debug/ stop message &raquo;</h2>';
-            $str .= '<h3 style="color:#003399">' . $msg . '</h3>';
+            $str .= '<h3 style="color:#003399">'.$msg.'</h3>';
         }
 
         if (!empty ($query)) {
-            $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">SQL &gt; <span id="sqlHolder">' . $query . '</span></div>';
+            $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">SQL &gt; <span id="sqlHolder">'.$query.'</span></div>';
         }
 
         $errortype = array(
@@ -6072,13 +6072,13 @@ 
 
         if (!empty($nr) || !empty($file)) {
             if ($text != '') {
-                $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">Error : ' . $text . '</div>';
+                $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">Error : '.$text.'</div>';
             }
             if ($output != '') {
-                $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">' . $output . '</div>';
+                $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">'.$output.'</div>';
             }
             if ($nr !== '') {
-                $table[] = array('ErrorType[num]', $errortype [$nr] . "[" . $nr . "]");
+                $table[] = array('ErrorType[num]', $errortype [$nr]."[".$nr."]");
             }
             if ($file) {
                 $table[] = array('File', $file);
@@ -6098,7 +6098,7 @@ 
         }
 
         if (!empty($this->event->activePlugin)) {
-            $table[] = array('Current Plugin', $this->event->activePlugin . '(' . $this->event->name . ')');
+            $table[] = array('Current Plugin', $this->event->activePlugin.'('.$this->event->name.')');
         }
 
         $str .= $MakeTable->create($table, array('Error information', ''));
@@ -6108,17 +6108,17 @@ 
         $table[] = array('REQUEST_URI', $request_uri);
 
         if ($this->manager->action) {
-            include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');
+            include_once(MODX_MANAGER_PATH.'includes/actionlist.inc.php');
             global $action_list;
             $actionName = (isset($action_list[$this->manager->action])) ? " - {$action_list[$this->manager->action]}" : '';
 
-            $table[] = array('Manager action', $this->manager->action . $actionName);
+            $table[] = array('Manager action', $this->manager->action.$actionName);
         }
 
         if (preg_match('@^[0-9]+@', $this->documentIdentifier)) {
             $resource = $this->getDocumentObject('id', $this->documentIdentifier);
             $url = $this->makeUrl($this->documentIdentifier, '', '', 'full');
-            $table[] = array('Resource', '[' . $this->documentIdentifier . '] <a href="' . $url . '" target="_blank">' . $resource['pagetitle'] . '</a>');
+            $table[] = array('Resource', '['.$this->documentIdentifier.'] <a href="'.$url.'" target="_blank">'.$resource['pagetitle'].'</a>');
         }
         $table[] = array('Referer', $referer);
         $table[] = array('User Agent', $ua);
@@ -6139,7 +6139,7 @@ 
 
         $mem = memory_get_peak_usage(true);
         $total_mem = $mem - $this->mstart;
-        $total_mem = ($total_mem / 1024 / 1024) . ' mb';
+        $total_mem = ($total_mem / 1024 / 1024).' mb';
 
         $queryTime = $this->queryTime;
         $phpTime = $totalTime - $queryTime;
@@ -6160,18 +6160,18 @@ 
         $str .= $this->get_backtrace(debug_backtrace());
         // Log error
         if (!empty($this->currentSnippet)) {
-            $source = 'Snippet - ' . $this->currentSnippet;
+            $source = 'Snippet - '.$this->currentSnippet;
         } elseif (!empty($this->event->activePlugin)) {
-            $source = 'Plugin - ' . $this->event->activePlugin;
+            $source = 'Plugin - '.$this->event->activePlugin;
         } elseif ($source !== '') {
-            $source = 'Parser - ' . $source;
+            $source = 'Parser - '.$source;
         } elseif ($query !== '') {
             $source = 'SQL Query';
         } else {
             $source = 'Parser';
         }
         if ($msg) {
-            $source .= ' / ' . $msg;
+            $source .= ' / '.$msg;
         }
         if (isset($actionName) && !empty($actionName)) {
             $source .= $actionName;
@@ -6203,12 +6203,12 @@ 
 
         // Display error
         if (isset($_SESSION['mgrValidated'])) {
-            echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"><html><head><title>EVO Content Manager ' . $version . ' &raquo; ' . $release_date . '</title>
+            echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"><html><head><title>EVO Content Manager '.$version.' &raquo; '.$release_date.'</title>
                  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-                 <link rel="stylesheet" type="text/css" href="' . $this->config['site_manager_url'] . 'media/style/' . $this->config['manager_theme'] . '/style.css" />
+                 <link rel="stylesheet" type="text/css" href="' . $this->config['site_manager_url'].'media/style/'.$this->config['manager_theme'].'/style.css" />
                  <style type="text/css">body { padding:10px; } td {font:inherit;}</style>
                  </head><body>
-                 ' . $str . '</body></html>';
+                 ' . $str.'</body></html>';
 
         } else {
             echo 'Error';
@@ -6246,7 +6246,7 @@ 
             switch ($val['type']) {
                 case '->':
                 case '::':
-                    $functionName = $val['function'] = $val['class'] . $val['type'] . $val['function'];
+                    $functionName = $val['function'] = $val['class'].$val['type'].$val['function'];
                     break;
                 default:
                     $functionName = $val['function'];
@@ -6256,7 +6256,7 @@ 
             $args = array_pad(array(), $_, '$var');
             $args = implode(", ", $args);
             $modx = &$this;
-            $args = preg_replace_callback('/\$var/', function () use ($modx, &$tmp, $val) {
+            $args = preg_replace_callback('/\$var/', function() use ($modx, &$tmp, $val) {
                 $arg = $val['args'][$tmp - 1];
                 switch (true) {
                     case is_null($arg): {
@@ -6268,7 +6268,7 @@ 
                         break;
                     }
                     case is_scalar($arg): {
-                        $out = strlen($arg) > 20 ? 'string $var' . $tmp : ("'" . $this->htmlspecialchars(str_replace("'", "\\'", $arg)) . "'");
+                        $out = strlen($arg) > 20 ? 'string $var'.$tmp : ("'".$this->htmlspecialchars(str_replace("'", "\\'", $arg))."'");
                         break;
                     }
                     case is_bool($arg): {
@@ -6276,23 +6276,23 @@ 
                         break;
                     }
                     case is_array($arg): {
-                        $out = 'array $var' . $tmp;
+                        $out = 'array $var'.$tmp;
                         break;
                     }
                     case is_object($arg): {
-                        $out = get_class($arg) . ' $var' . $tmp;
+                        $out = get_class($arg).' $var'.$tmp;
                         break;
                     }
                     default: {
-                        $out = '$var' . $tmp;
+                        $out = '$var'.$tmp;
                     }
                 }
                 $tmp++;
                 return $out;
             }, $args);
             $line = array(
-                "<strong>" . $functionName . "</strong>(" . $args . ")",
-                $path . " on line " . $val['line']
+                "<strong>".$functionName."</strong>(".$args.")",
+                $path." on line ".$val['line']
             );
             $table[] = array(implode("<br />", $line));
         }
@@ -6333,7 +6333,7 @@ 
             $alias = strip_tags($alias); // strip HTML
             $alias = preg_replace('/[^\.A-Za-z0-9 _-]/', '', $alias); // strip non-alphanumeric characters
             $alias = preg_replace('/\s+/', '-', $alias); // convert white-space to dash
-            $alias = preg_replace('/-+/', '-', $alias);  // convert multiple dashes to one
+            $alias = preg_replace('/-+/', '-', $alias); // convert multiple dashes to one
             $alias = trim($alias, '-'); // trim excess
             return $alias;
         }
@@ -6349,7 +6349,7 @@ 
         $precisions = count($sizes) - 1;
         foreach ($sizes as $unit => $bytes) {
             if ($size >= $bytes) {
-                return number_format($size / $bytes, $precisions) . ' ' . $unit;
+                return number_format($size / $bytes, $precisions).' '.$unit;
             }
             $precisions--;
         }
@@ -6454,10 +6454,10 @@ 
 
         if (strpos($str, MODX_MANAGER_PATH) === 0) {
             return false;
-        } elseif (is_file(MODX_BASE_PATH . $str)) {
-            $file_path = MODX_BASE_PATH . $str;
-        } elseif (is_file(MODX_BASE_PATH . "{$tpl_dir}{$str}")) {
-            $file_path = MODX_BASE_PATH . $tpl_dir . $str;
+        } elseif (is_file(MODX_BASE_PATH.$str)) {
+            $file_path = MODX_BASE_PATH.$str;
+        } elseif (is_file(MODX_BASE_PATH."{$tpl_dir}{$str}")) {
+            $file_path = MODX_BASE_PATH.$tpl_dir.$str;
         } else {
             return false;
         }
@@ -6582,7 +6582,7 @@ 
             $title = 'no title';
         }
         if (is_array($msg)) {
-            $msg = '<pre>' . print_r($msg, true) . '</pre>';
+            $msg = '<pre>'.print_r($msg, true).'</pre>';
         } elseif ($msg === '') {
             $msg = $_SERVER['REQUEST_URI'];
         }
@@ -6627,7 +6627,7 @@ 
         if (is_array($SystemAlertMsgQueque)) {
             $title = '';
             if ($this->name && $this->activePlugin) {
-                $title = "<div><b>" . $this->activePlugin . "</b> - <span style='color:maroon;'>" . $this->name . "</span></div>";
+                $title = "<div><b>".$this->activePlugin."</b> - <span style='color:maroon;'>".$this->name."</span></div>";
             }
             $SystemAlertMsgQueque[] = "$title<div style='margin-left:10px;margin-top:3px;'>$msg</div>";
         }

Braces +55 added lines, -26 removed lines

@@ -615,13 +615,15 @@ 
             $this->virtualDir = '';
         }
 
-        if (preg_match('@^[1-9][0-9]*$@', $q) && !isset($this->documentListing[$q])) { /* we got an ID returned, check to make sure it's not an alias */
+        if (preg_match('@^[1-9][0-9]*$@', $q) && !isset($this->documentListing[$q])) {
+/* we got an ID returned, check to make sure it's not an alias */
             /* FS#476 and FS#308: check that id is valid in terms of virtualDir structure */
             if ($this->config['use_alias_path'] == 1) {
                 if (($this->virtualDir != '' && !isset($this->documentListing[$this->virtualDir . '/' . $q]) || ($this->virtualDir == '' && !isset($this->documentListing[$q]))) && (($this->virtualDir != '' && isset($this->documentListing[$this->virtualDir]) && in_array($q, $this->getChildIds($this->documentListing[$this->virtualDir], 1))) || ($this->virtualDir == '' && in_array($q, $this->getChildIds(0, 1))))) {
                     $this->documentMethod = 'id';
                     return $q;
-                } else { /* not a valid id in terms of virtualDir, treat as alias */
+                } else {
+/* not a valid id in terms of virtualDir, treat as alias */
                     $this->documentMethod = 'alias';
                     return $q;
                 }
@@ -629,7 +631,8 @@ 
                 $this->documentMethod = 'id';
                 return $q;
             }
-        } else { /* we didn't get an ID back, so instead we assume it's an alias */
+        } else {
+/* we didn't get an ID back, so instead we assume it's an alias */
             if ($this->config['friendly_alias_urls'] != 1) {
                 $q = $qOrig;
             }
@@ -659,13 +662,14 @@ 
      * @param $id
      * @return array|mixed|null|string
      */
-    public function makePageCacheKey($id){
+    public function makePageCacheKey($id)
+    {
         $hash = $id;
         $tmp = null;
         $params = array();
-        if(!empty($this->systemCacheKey)){
+        if(!empty($this->systemCacheKey)) {
             $hash = $this->systemCacheKey;
-        }else {
+        } else {
             if (!empty($_GET)) {
                 // Sort GET parameters so that the order of parameters on the HTTP request don't affect the generated cache ID.
                 $params = $_GET;
@@ -674,7 +678,7 @@ 
             }
         }
         $evtOut = $this->invokeEvent("OnMakePageCacheKey", array ("hash" => $hash, "id" => $id, 'params' => $params));
-        if (is_array($evtOut) && count($evtOut) > 0){
+        if (is_array($evtOut) && count($evtOut) > 0) {
             $tmp = array_pop($evtOut);
         }
         return empty($tmp) ? $hash : $tmp;
@@ -1085,10 +1089,18 @@ 
             return array();
         }
         $spacer = md5('<<<EVO>>>');
-        if($left==='{{' && strpos($content,';}}')!==false)  $content = str_replace(';}}', sprintf(';}%s}',   $spacer),$content);
-        if($left==='{{' && strpos($content,'{{}}')!==false) $content = str_replace('{{}}',sprintf('{%$1s{}%$1s}',$spacer),$content);
-        if($left==='[[' && strpos($content,']]]]')!==false) $content = str_replace(']]]]',sprintf(']]%s]]',  $spacer),$content);
-        if($left==='[[' && strpos($content,']]]')!==false)  $content = str_replace(']]]', sprintf(']%s]]',   $spacer),$content);
+        if($left==='{{' && strpos($content,';}}')!==false) {
+            $content = str_replace(';}}', sprintf(';}%s}',   $spacer),$content);
+        }
+        if($left==='{{' && strpos($content,'{{}}')!==false) {
+            $content = str_replace('{{}}',sprintf('{%$1s{}%$1s}',$spacer),$content);
+        }
+        if($left==='[[' && strpos($content,']]]]')!==false) {
+            $content = str_replace(']]]]',sprintf(']]%s]]',  $spacer),$content);
+        }
+        if($left==='[[' && strpos($content,']]]')!==false) {
+            $content = str_replace(']]]', sprintf(']%s]]',   $spacer),$content);
+        }
 
         $pos['<![CDATA['] = strpos($content, '<![CDATA[');
         $pos[']]>'] = strpos($content, ']]>');
@@ -1141,7 +1153,8 @@ 
                         }
                     }
 
-                    if (!in_array($fetch, $tags)) {  // Avoid double Matches
+                    if (!in_array($fetch, $tags)) {
+// Avoid double Matches
                         $tags[] = $fetch; // Fetch
                     };
                     $fetch = ''; // and reset
@@ -1159,7 +1172,9 @@ 
             }
         }
         foreach($tags as $i=>$tag) {
-            if(strpos($tag,$spacer)!==false) $tags[$i] = str_replace($spacer, '', $tag);
+            if(strpos($tag,$spacer)!==false) {
+                $tags[$i] = str_replace($spacer, '', $tag);
+            }
         }
         return $tags;
     }
@@ -1199,7 +1214,10 @@ 
         }
 
         foreach ($matches[1] as $i => $key) {
-            if(strpos($key,'[+')!==false) continue; // Allow chunk {{chunk?&param=`xxx`}} with [*tv_name_[+param+]*] as content
+            if(strpos($key,'[+')!==false) {
+                continue;
+            }
+            // Allow chunk {{chunk?&param=`xxx`}} with [*tv_name_[+param+]*] as content
             if (substr($key, 0, 1) == '#') {
                 $key = substr($key, 1);
             } // remove # for QuickEdit format
@@ -1922,7 +1940,8 @@ 
      * @return mixed|string
      */
     function _getSGVar($value)
-    { // Get super globals
+    {
+// Get super globals
         $key = $value;
         $_ = $this->config['enable_filter'];
         $this->config['enable_filter'] = 1;
@@ -2324,7 +2343,8 @@ 
         if ($this->config['friendly_urls'] == 1) {
             $aliases = array();
             if (is_array($this->documentListing)) {
-                foreach ($this->documentListing as $path => $docid) { // This is big Loop on large site!
+                foreach ($this->documentListing as $path => $docid) {
+// This is big Loop on large site!
                     $aliases[$docid] = $path;
                     $isfolder[$docid] = $this->aliasListing[$docid]['isfolder'];
                 }
@@ -2357,7 +2377,7 @@ 
             $isfriendly = ($this->config['friendly_alias_urls'] == 1 ? 1 : 0);
             $pref = $this->config['friendly_url_prefix'];
             $suff = $this->config['friendly_url_suffix'];
-            $documentSource = preg_replace_callback($in, function ($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff) {
+            $documentSource = preg_replace_callback($in, function ($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff){
                 global $modx;
                 $thealias = $aliases[$m[1]];
                 $thefolder = $isfolder[$m[1]];
@@ -4147,7 +4167,8 @@ 
         if (isset ($this->snippetCache[$snippetName])) {
             $snippet = $this->snippetCache[$snippetName];
             $properties = !empty($this->snippetCache[$snippetName . "Props"]) ? $this->snippetCache[$snippetName . "Props"] : '';
-        } else { // not in cache so let's check the db
+        } else {
+// not in cache so let's check the db
             $sql = "SELECT ss.`name`, ss.`snippet`, ss.`properties`, sm.properties as `sharedproperties` FROM " . $this->getFullTableName("site_snippets") . " as ss LEFT JOIN " . $this->getFullTableName('site_modules') . " as sm on sm.guid=ss.moduleguid WHERE ss.`name`='" . $this->db->escape($snippetName) . "'  AND ss.disabled=0;";
             $result = $this->db->query($sql);
             if ($this->db->getRecordCount($result) == 1) {
@@ -4653,7 +4674,7 @@ 
             $result = $this->db->makeArray($rs);
 
             // get default/built-in template variables
-            if(is_array($docRow)){ 
+            if(is_array($docRow)) {
                 ksort($docRow);
 
                 foreach ($docRow as $key => $value) {
@@ -5131,12 +5152,16 @@ 
             return '';
         } // nothing to register
         if (!is_array($options)) {
-            if (is_bool($options))  // backward compatibility with old plaintext parameter
+            if (is_bool($options)) {
+                // backward compatibility with old plaintext parameter
             {
                 $options = array('plaintext' => $options);
-            } elseif (is_string($options)) // Also allow script name as 2nd param
+            }
+            } elseif (is_string($options)) {
+                // Also allow script name as 2nd param
             {
                 $options = array('name' => $options);
+            }
             } else {
                 $options = array();
             }
@@ -5148,7 +5173,8 @@ 
         unset($overwritepos); // probably unnecessary--just making sure
 
         $useThisVer = true;
-        if (isset($this->loadedjscripts[$key])) { // a matching script was found
+        if (isset($this->loadedjscripts[$key])) {
+// a matching script was found
             // if existing script is a startup script, make sure the candidate is also a startup script
             if ($this->loadedjscripts[$key]['startup']) {
                 $startup = true;
@@ -5168,7 +5194,8 @@ 
                     // overwrite the old script (the position may be important for dependent scripts)
                     $overwritepos = $this->loadedjscripts[$key]['pos'];
                 }
-            } else { // Use the original version
+            } else {
+// Use the original version
                 if ($startup == true && $this->loadedjscripts[$key]['startup'] == false) {
                     // need to move the exisiting script to the head
                     $version = $this->loadedjscripts[$key][$version];
@@ -5292,7 +5319,8 @@ 
         }
 
         $results = null;
-        foreach ($this->pluginEvent[$evtName] as $pluginName) { // start for loop
+        foreach ($this->pluginEvent[$evtName] as $pluginName) {
+// start for loop
             if ($this->dumpPlugins) {
                 $eventtime = $this->getMicroTime();
             }
@@ -5840,7 +5868,8 @@ 
      * @return bool
      */
     function isSafeCode($phpcode = '', $safe_functions = '')
-    { // return true or false
+    {
+// return true or false
         if ($safe_functions == '') {
             return false;
         }
@@ -6256,7 +6285,7 @@ 
             $args = array_pad(array(), $_, '$var');
             $args = implode(", ", $args);
             $modx = &$this;
-            $args = preg_replace_callback('/\$var/', function () use ($modx, &$tmp, $val) {
+            $args = preg_replace_callback('/\$var/', function () use ($modx, &$tmp, $val){
                 $arg = $val['args'][$tmp - 1];
                 switch (true) {
                     case is_null($arg): {

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

@@ -2224,11 +2224,11 @@ 
         if (isset($this->snippetCache[$snip_name])) {
             $snippetObject['name'] = $snip_name;
             $snippetObject['content'] = $this->snippetCache[$snip_name];
-            if (isset($this->snippetCache["{$snip_name}Props"])) {
-                if (!isset($this->snippetCache["{$snip_name}Props"])) {
-                    $this->snippetCache["{$snip_name}Props"] = '';
+            if (isset($this->snippetCache["{$snip_name}props"])) {
+                if (!isset($this->snippetCache["{$snip_name}props"])) {
+                    $this->snippetCache["{$snip_name}props"] = '';
                 }
-                $snippetObject['properties'] = $this->snippetCache["{$snip_name}Props"];
+                $snippetObject['properties'] = $this->snippetCache["{$snip_name}props"];
             }
         } elseif (substr($snip_name, 0, 1) === '@' && isset($this->pluginEvent[trim($snip_name, '@')])) {
             $snippetObject['name'] = trim($snip_name, '@');
@@ -2253,7 +2253,7 @@ 
             $snippetObject['content'] = $snip_content;
             $snippetObject['properties'] = $snip_prop;
             $this->snippetCache[$snip_name] = $snip_content;
-            $this->snippetCache["{$snip_name}Props"] = $snip_prop;
+            $this->snippetCache["{$snip_name}props"] = $snip_prop;
         }
         return $snippetObject;
     }
@@ -3569,7 +3569,7 @@ 
         }
         // build query
         $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
-        $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc
+        $result = $this->db->select("distinct {$fields}", "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg on dg.document = sc.id", "sc.parent = '{$id}' AND ({$access}) GROUP BY sc.id", "{$sort} {$dir}");
         $resourceArray = $this->db->makeArray($result);
         $this->tmpCache[__FUNCTION__][$cacheKey] = $resourceArray;
@@ -3606,7 +3606,7 @@ 
         }
         // build query
         $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
-        $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc
+        $result = $this->db->select("distinct {$fields}", "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg on dg.document = sc.id", "sc.parent = '{$id}' AND sc.published=1 AND sc.deleted=0 AND ({$access}) GROUP BY sc.id", "{$sort} {$dir}");
         $resourceArray = $this->db->makeArray($result);
 
@@ -3662,7 +3662,7 @@ 
         $tblsc = $this->getFullTableName('site_content');
         $tbldg = $this->getFullTableName('document_groups');
 
-        $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc
+        $result = $this->db->select("distinct {$fields}", "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg on dg.document = sc.id", "sc.parent = '{$parentid}' {$published} {$deleted} {$where} AND ({$access}) GROUP BY sc.id", ($sort ? "{$sort} {$dir}" : ""), $limit);
 
         $resourceArray = $this->db->makeArray($result);
@@ -3728,7 +3728,7 @@ 
             $tblsc = $this->getFullTableName('site_content');
             $tbldg = $this->getFullTableName('document_groups');
 
-            $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc
+            $result = $this->db->select("distinct {$fields}", "{$tblsc} sc
                     LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id IN (" . implode(',', $ids) . ") {$published} {$deleted} {$where}) AND ({$access}) GROUP BY sc.id", ($sort ? "{$sort} {$dir}" : ""), $limit);
 
             $resourceArray = $this->db->makeArray($result);
@@ -4320,7 +4320,7 @@ 
                 $template = $doc['content'];
                 break;
             case 'SELECT':
-                $this->db->getValue($this->db->query("SELECT {$template}"));
+                $this->db->getValue($this->db->query("select {$template}"));
                 break;
             default:
                 if (!($template = $this->getChunk($tpl))) {

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

Doc Comments +6 added lines

@@ -618,6 +618,9 @@ 
     return mysql_data_seek($result, $row_number);
   }
   
+    /**
+     * @return string
+     */
     function _getFieldsStringFromArray($fields=array()) {
         
         if(empty($fields)) return '*';
@@ -630,6 +633,9 @@ 
         return join(',', $_);
     }
     
+    /**
+     * @return string
+     */
     function _getFromStringFromArray($tables=array()) {
         $_ = array();
         foreach($tables as $k=>$v) {

Indentation +496 added lines, -496 removed lines

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

Spacing +98 added lines, -98 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-class DBAPI {
+class DBAPI{
 
    var $conn;
    var $config;
@@ -16,13 +16,13 @@ 
     * @name:  DBAPI
     *
     */
-   function __construct($host='',$dbase='', $uid='',$pwd='',$pre=NULL,$charset='',$connection_method='SET CHARACTER SET') {
+   function __construct($host = '', $dbase = '', $uid = '', $pwd = '', $pre = NULL, $charset = '', $connection_method = 'SET CHARACTER SET'){
       $this->config['host'] = $host ? $host : $GLOBALS['database_server'];
       $this->config['dbase'] = $dbase ? $dbase : $GLOBALS['dbase'];
       $this->config['user'] = $uid ? $uid : $GLOBALS['database_user'];
       $this->config['pass'] = $pwd ? $pwd : $GLOBALS['database_password'];
       $this->config['charset'] = $charset ? $charset : $GLOBALS['database_connection_charset'];
-      $this->config['connection_method'] =  $this->_dbconnectionmethod = (isset($GLOBALS['database_connection_method']) ? $GLOBALS['database_connection_method'] : $connection_method);
+      $this->config['connection_method'] = $this->_dbconnectionmethod = (isset($GLOBALS['database_connection_method']) ? $GLOBALS['database_connection_method'] : $connection_method);
       $this->config['table_prefix'] = ($pre !== NULL) ? $pre : $GLOBALS['table_prefix'];
       $this->initDataTypes();
    }
@@ -32,8 +32,8 @@ 
     * @desc:  called in the constructor to set up arrays containing the types
     *         of database fields that can be used with specific PHP types
     */
-   function initDataTypes() {
-      $this->dataTypes['numeric'] = array (
+   function initDataTypes(){
+      $this->dataTypes['numeric'] = array(
          'INT',
          'INTEGER',
          'TINYINT',
@@ -49,7 +49,7 @@ 
          'BIGINT',
          'BIT'
       );
-      $this->dataTypes['string'] = array (
+      $this->dataTypes['string'] = array(
          'CHAR',
          'VARCHAR',
          'BINARY',
@@ -65,7 +65,7 @@ 
          'ENUM',
          'SET'
       );
-      $this->dataTypes['date'] = array (
+      $this->dataTypes['date'] = array(
          'DATE',
          'DATETIME',
          'TIMESTAMP',
@@ -78,7 +78,7 @@ 
     * @name:  connect
     *
     */
-   function connect($host = '', $dbase = '', $uid = '', $pwd = '', $persist = 0) {
+   function connect($host = '', $dbase = '', $uid = '', $pwd = '', $persist = 0){
       global $modx;
       $uid = $uid ? $uid : $this->config['user'];
       $pwd = $pwd ? $pwd : $this->config['pass'];
@@ -88,16 +88,16 @@ 
       $connection_method = $this->config['connection_method'];
       $tstart = $modx->getMicroTime();
       $safe_count = 0;
-      while(!$this->conn && $safe_count<3)
+      while (!$this->conn && $safe_count < 3)
       {
-          if($persist!=0) $this->conn = mysql_pconnect($host, $uid, $pwd);
+          if ($persist != 0) $this->conn = mysql_pconnect($host, $uid, $pwd);
           else            $this->conn = mysql_connect($host, $uid, $pwd, true);
           
-          if(!$this->conn)
+          if (!$this->conn)
           {
-            if(isset($modx->config['send_errormail']) && $modx->config['send_errormail'] !== '0')
+            if (isset($modx->config['send_errormail']) && $modx->config['send_errormail'] !== '0')
             {
-               if($modx->config['send_errormail'] <= 2)
+               if ($modx->config['send_errormail'] <= 2)
                {
                   $logtitle    = 'Failed to create the database connection!';
                   $request_uri = $modx->htmlspecialchars($_SERVER['REQUEST_URI']);
@@ -105,7 +105,7 @@ 
                   $referer     = $modx->htmlspecialchars($_SERVER['HTTP_REFERER']);
 
                   $modx->sendmail(array(
-					  'subject' => 'Missing to create the database connection! from ' . $modx->config['site_name'],
+					  'subject' => 'Missing to create the database connection! from '.$modx->config['site_name'],
 					  'body' => "{$logtitle}\n{$request_uri}\n{$ua}\n{$referer}",
 					  'type' => 'text')
 				  );
@@ -119,16 +119,16 @@ 
          $modx->messageQuit("Failed to create the database connection!");
          exit;
       } else {
-         $dbase = trim($dbase,'`'); // remove the `` chars
+         $dbase = trim($dbase, '`'); // remove the `` chars
          if (!@ mysql_select_db($dbase, $this->conn)) {
-            $modx->messageQuit("Failed to select the database '" . $dbase . "'!");
+            $modx->messageQuit("Failed to select the database '".$dbase."'!");
             exit;
          }
          @mysql_query("{$connection_method} {$charset}", $this->conn);
          $tend = $modx->getMicroTime();
          $totaltime = $tend - $tstart;
          if ($modx->dumpSQL) {
-            $modx->queryCode .= "<fieldset style='text-align:left'><legend>Database connection</legend>" . sprintf("Database connection was created in %2.4f s", $totaltime) . "</fieldset><br />";
+            $modx->queryCode .= "<fieldset style='text-align:left'><legend>Database connection</legend>".sprintf("Database connection was created in %2.4f s", $totaltime)."</fieldset><br />";
          }
             if (function_exists('mysql_set_charset')) {
                 mysql_set_charset($this->config['charset']);
@@ -146,26 +146,26 @@ 
     * @name:  disconnect
     *
     */
-   function disconnect() {
+   function disconnect(){
       @ mysql_close($this->conn);
       $this->conn = null;
       $this->isConnected = false;
    }
 
-   function escape($s, $safecount=0) {
+   function escape($s, $safecount = 0){
       
       $safecount++;
-      if(1000<$safecount) exit("Too many loops '{$safecount}'");
+      if (1000 < $safecount) exit("Too many loops '{$safecount}'");
       
       if (empty ($this->conn) || !is_resource($this->conn)) {
          $this->connect();
        }
        
-      if(is_array($s)) {
-          if(count($s) === 0) $s = '';
+      if (is_array($s)) {
+          if (count($s) === 0) $s = '';
           else {
-              foreach($s as $i=>$v) {
-                  $s[$i] = $this->escape($v,$safecount);
+              foreach ($s as $i=>$v) {
+                  $s[$i] = $this->escape($v, $safecount);
               }
           }
       }
@@ -178,17 +178,17 @@ 
     * @desc:  Mainly for internal use.
     * Developers should use select, update, insert, delete where possible
     */
-   function query($sql,$watchError=true) {
+   function query($sql, $watchError = true){
       global $modx;
       if (empty ($this->conn) || !is_resource($this->conn)) {
          $this->connect();
       }
       $tstart = $modx->getMicroTime();
-      if(is_array($sql)) $sql = join("\n", $sql);
+      if (is_array($sql)) $sql = join("\n", $sql);
       $this->lastQuery = $sql;
       if (!$result = @ mysql_query($sql, $this->conn)) {
-         if(!$watchError) return;
-            switch(mysql_errno()) {
+         if (!$watchError) return;
+            switch (mysql_errno()) {
                 case 1054:
                 case 1060:
                 case 1061:
@@ -196,7 +196,7 @@ 
                 case 1091:
                     break;
                 default:
-                    $modx->messageQuit('Execution of a query to the database failed - ' . $this->getLastError(), $sql);
+                    $modx->messageQuit('Execution of a query to the database failed - '.$this->getLastError(), $sql);
             }
       } else {
          $tend = $modx->getMicroTime();
@@ -207,15 +207,15 @@ 
             array_shift($debug);	
             $debug_path = array();
             foreach ($debug as $line) $debug_path[] = $line['function'];
-            $debug_path = implode(' > ',array_reverse($debug_path));
-            $modx->queryCode .= "<fieldset style='text-align:left'><legend>Query " . ($modx->executedQueries + 1) . " - " . sprintf("%2.2f ms", $totaltime*1000) . "</legend>";
-            $modx->queryCode .= $sql . '<br><br>';
-            if ($modx->event->name) $modx->queryCode .= 'Current Event  => ' . $modx->event->name . '<br>';
-            if ($modx->event->activePlugin) $modx->queryCode .= 'Current Plugin => ' . $modx->event->activePlugin . '<br>';
-            if ($modx->currentSnippet) $modx->queryCode .= 'Current Snippet => ' . $modx->currentSnippet . '<br>';
-            if (stripos($sql, 'select')===0) $modx->queryCode .= 'Record Count => ' . $this->getRecordCount($result) . '<br>';
-            else $modx->queryCode .= 'Affected Rows => ' . $this->getAffectedRows() . '<br>';
-            $modx->queryCode .= 'Functions Path => ' . $debug_path . '<br>';
+            $debug_path = implode(' > ', array_reverse($debug_path));
+            $modx->queryCode .= "<fieldset style='text-align:left'><legend>Query ".($modx->executedQueries + 1)." - ".sprintf("%2.2f ms", $totaltime * 1000)."</legend>";
+            $modx->queryCode .= $sql.'<br><br>';
+            if ($modx->event->name) $modx->queryCode .= 'Current Event  => '.$modx->event->name.'<br>';
+            if ($modx->event->activePlugin) $modx->queryCode .= 'Current Plugin => '.$modx->event->activePlugin.'<br>';
+            if ($modx->currentSnippet) $modx->queryCode .= 'Current Snippet => '.$modx->currentSnippet.'<br>';
+            if (stripos($sql, 'select') === 0) $modx->queryCode .= 'Record Count => '.$this->getRecordCount($result).'<br>';
+            else $modx->queryCode .= 'Affected Rows => '.$this->getAffectedRows().'<br>';
+            $modx->queryCode .= 'Functions Path => '.$debug_path.'<br>';
             $modx->queryCode .= "</fieldset><br />";
          }
          $modx->executedQueries = $modx->executedQueries + 1;
@@ -227,7 +227,7 @@ 
     * @name:  delete
     *
     */
-   function delete($from, $where='', $orderby='', $limit = '') {
+   function delete($from, $where = '', $orderby = '', $limit = ''){
       global $modx;
       if (!$from)
          $modx->messageQuit("Empty \$from parameters in DBAPI::delete().");
@@ -236,9 +236,9 @@ 
          $where   = trim($where);
          $orderby = trim($orderby);
          $limit   = trim($limit);
-         if($where!==''   && stripos($where,   'WHERE')!==0)    $where   = "WHERE {$where}";
-         if($orderby!=='' && stripos($orderby, 'ORDER BY')!==0) $orderby = "ORDER BY {$orderby}";
-         if($limit!==''   && stripos($limit,   'LIMIT')!==0)    $limit   = "LIMIT {$limit}";
+         if ($where !== '' && stripos($where, 'WHERE') !== 0)    $where   = "WHERE {$where}";
+         if ($orderby !== '' && stripos($orderby, 'ORDER BY') !== 0) $orderby = "ORDER BY {$orderby}";
+         if ($limit !== '' && stripos($limit, 'LIMIT') !== 0)    $limit   = "LIMIT {$limit}";
          return $this->query("DELETE FROM {$from} {$where} {$orderby} {$limit}");
       }
    }
@@ -247,12 +247,12 @@ 
     * @name:  select
     *
     */
-   function select($fields = "*", $from = "", $where = "", $orderby = "", $limit = "") {
+   function select($fields = "*", $from = "", $where = "", $orderby = "", $limit = ""){
       global $modx;
       
-      if(is_array($fields)) $fields = $this->_getFieldsStringFromArray($fields);
-      if(is_array($from))   $from   = $this->_getFromStringFromArray($from);
-      if(is_array($where))  $where  = join(' ', $where);
+      if (is_array($fields)) $fields = $this->_getFieldsStringFromArray($fields);
+      if (is_array($from))   $from   = $this->_getFromStringFromArray($from);
+      if (is_array($where))  $where  = join(' ', $where);
       
       if (!$from) {
          $modx->messageQuit("Empty \$from parameters in DBAPI::select().");
@@ -264,9 +264,9 @@ 
       $where   = trim($where);
       $orderby = trim($orderby);
       $limit   = trim($limit);
-      if($where!==''   && stripos($where,'WHERE')!==0)   $where   = "WHERE {$where}";
-      if($orderby!=='' && stripos($orderby,'ORDER')!==0) $orderby = "ORDER BY {$orderby}";
-      if($limit!==''   && stripos($limit,'LIMIT')!==0)   $limit   = "LIMIT {$limit}";
+      if ($where !== '' && stripos($where, 'WHERE') !== 0)   $where   = "WHERE {$where}";
+      if ($orderby !== '' && stripos($orderby, 'ORDER') !== 0) $orderby = "ORDER BY {$orderby}";
+      if ($limit !== '' && stripos($limit, 'LIMIT') !== 0)   $limit   = "LIMIT {$limit}";
       return $this->query("SELECT {$fields} FROM {$from} {$where} {$orderby} {$limit}");
    }
 
@@ -274,7 +274,7 @@ 
     * @name:  update
     *
     */
-   function update($fields, $table, $where = "") {
+   function update($fields, $table, $where = ""){
       global $modx;
       if (!$table)
          $modx->messageQuit("Empty \$table parameter in DBAPI::update().");
@@ -282,17 +282,17 @@ 
          $table = $this->replaceFullTableName($table);
          if (is_array($fields)) {
 			 foreach ($fields as $key => $value) {
-				 if(is_null($value) || strtolower($value) === 'null'){
+				 if (is_null($value) || strtolower($value) === 'null') {
 					 $flds = 'NULL';
-				 }else{
-					 $flds = "'" . $value . "'";
+				 } else {
+					 $flds = "'".$value."'";
 				 }
 				 $fields[$key] = "`{$key}` = ".$flds;
 			 }
             $fields = implode(",", $fields);
          }
          $where = trim($where);
-         if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
+         if ($where !== '' && stripos($where, 'WHERE') !== 0) $where = "WHERE {$where}";
          return $this->query("UPDATE {$table} SET {$fields} {$where}");
       }
    }
@@ -301,7 +301,7 @@ 
     * @name:  insert
     * @desc:  returns either last id inserted or the result from the query
     */
-   function insert($fields, $intotable, $fromfields = "*", $fromtable = "", $where = "", $limit = "") {
+   function insert($fields, $intotable, $fromfields = "*", $fromtable = "", $where = "", $limit = ""){
       global $modx;
       if (!$intotable)
          $modx->messageQuit("Empty \$intotable parameters in DBAPI::insert().");
@@ -314,13 +314,13 @@ 
                $fields = "(`".implode("`, `", array_keys($fields))."`) VALUES('".implode("', '", array_values($fields))."')";
                $rt = $this->query("INSERT INTO {$intotable} {$fields}");
             } else {
-               if (version_compare($this->getVersion(),"4.0.14")>=0) {
+               if (version_compare($this->getVersion(), "4.0.14") >= 0) {
                   $fromtable = $this->replaceFullTableName($fromtable);
                   $fields = "(".implode(",", array_keys($fields)).")";
                   $where = trim($where);
                   $limit = trim($limit);
-                  if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
-                  if($limit!=='' && stripos($limit, 'LIMIT')!==0) $limit = "LIMIT {$limit}";
+                  if ($where !== '' && stripos($where, 'WHERE') !== 0) $where = "WHERE {$where}";
+                  if ($limit !== '' && stripos($limit, 'LIMIT') !== 0) $limit = "LIMIT {$limit}";
                   $rt = $this->query("INSERT INTO {$intotable} {$fields} SELECT {$fromfields} FROM {$fromtable} {$where} {$limit}");
                } else {
                   $ds = $this->select($fromfields, $fromtable, $where, '', $limit);
@@ -331,18 +331,18 @@ 
                }
             }
          }
-         if (($lid = $this->getInsertId())===false) $modx->messageQuit("Couldn't get last insert key!");
+         if (($lid = $this->getInsertId()) === false) $modx->messageQuit("Couldn't get last insert key!");
          return $lid;
       }
    }
    
-    function save($fields, $table, $where='') {
+    function save($fields, $table, $where = ''){
         
-        if($where === '')                                                  $mode = 'insert';
-        elseif($this->getRecordCount($this->select('*',$table,$where))==0) $mode = 'insert';
+        if ($where === '')                                                  $mode = 'insert';
+        elseif ($this->getRecordCount($this->select('*', $table, $where)) == 0) $mode = 'insert';
         else                                                               $mode = 'update';
         
-        if($mode==='insert') return $this->insert($fields, $table);
+        if ($mode === 'insert') return $this->insert($fields, $table);
         else                 return $this->update($fields, $table, $where);
     }
     
@@ -350,7 +350,7 @@ 
     * @name:  isResult
     *
     */
-   function isResult($rs) {
+   function isResult($rs){
       return is_resource($rs);
    }
 
@@ -358,7 +358,7 @@ 
     * @name:  freeResult
     *
     */
-   function freeResult($rs) {
+   function freeResult($rs){
       mysql_free_result($rs);
    }
    
@@ -366,7 +366,7 @@ 
     * @name:  numFields
     *
     */
-   function numFields($rs) {
+   function numFields($rs){
       return mysql_num_fields($rs);
    }
    
@@ -374,15 +374,15 @@ 
     * @name:  fieldName
     *
     */
-   function fieldName($rs,$col=0) {
-      return mysql_field_name($rs,$col);
+   function fieldName($rs, $col = 0){
+      return mysql_field_name($rs, $col);
    }
    
     /**
     * @name:  selectDb
     *
     */
-   function selectDb($name) {
+   function selectDb($name){
       mysql_select_db($name);
    }
    
@@ -391,8 +391,8 @@ 
     * @name:  getInsertId
     *
     */
-   function getInsertId($conn=NULL) {
-      if( !is_resource($conn)) $conn =& $this->conn;
+   function getInsertId($conn = NULL){
+      if (!is_resource($conn)) $conn = & $this->conn;
       return mysql_insert_id($conn);
    }
 
@@ -400,8 +400,8 @@ 
     * @name:  getAffectedRows
     *
     */
-   function getAffectedRows($conn=NULL) {
-      if (!is_resource($conn)) $conn =& $this->conn;
+   function getAffectedRows($conn = NULL){
+      if (!is_resource($conn)) $conn = & $this->conn;
       return mysql_affected_rows($conn);
    }
 
@@ -409,8 +409,8 @@ 
     * @name:  getLastError
     *
     */
-   function getLastError($conn=NULL) {
-      if (!is_resource($conn)) $conn =& $this->conn;
+   function getLastError($conn = NULL){
+      if (!is_resource($conn)) $conn = & $this->conn;
       return mysql_error($conn);
    }
 
@@ -418,7 +418,7 @@ 
     * @name:  getRecordCount
     *
     */
-   function getRecordCount($ds) {
+   function getRecordCount($ds){
       return (is_resource($ds)) ? mysql_num_rows($ds) : 0;
    }
 
@@ -428,7 +428,7 @@ 
     * @param: $dsq - dataset
     *
     */
-   function getRow($ds, $mode = 'assoc') {
+   function getRow($ds, $mode = 'assoc'){
       if (is_resource($ds)) {
          if ($mode == 'assoc') {
             return mysql_fetch_assoc($ds);
@@ -453,11 +453,11 @@ 
     * @desc:  returns an array of the values found on colun $name
     * @param: $dsq - dataset or query string
     */
-   function getColumn($name, $dsq) {
+   function getColumn($name, $dsq){
       if (!is_resource($dsq))
          $dsq = $this->query($dsq);
       if ($dsq) {
-         $col = array ();
+         $col = array();
          while ($row = $this->getRow($dsq)) {
             $col[] = $row[$name];
          }
@@ -470,11 +470,11 @@ 
     * @desc:  returns an array containing the column $name
     * @param: $dsq - dataset or query string
     */
-   function getColumnNames($dsq) {
+   function getColumnNames($dsq){
       if (!is_resource($dsq))
          $dsq = $this->query($dsq);
       if ($dsq) {
-         $names = array ();
+         $names = array();
          $limit = mysql_num_fields($dsq);
          for ($i = 0; $i < $limit; $i++) {
             $names[] = mysql_field_name($dsq, $i);
@@ -488,7 +488,7 @@ 
     * @desc:  returns the value from the first column in the set
     * @param: $dsq - dataset or query string
     */
-   function getValue($dsq) {
+   function getValue($dsq){
       if (!is_resource($dsq))
          $dsq = $this->query($dsq);
       if ($dsq) {
@@ -503,7 +503,7 @@ 
     *         table
     * @param: $table: the full name of the database table
     */
-   function getTableMetaData($table) {
+   function getTableMetaData($table){
       $metadata = false;
       if (!empty ($table)) {
          $sql = "SHOW FIELDS FROM $table";
@@ -525,7 +525,7 @@ 
     * @param: $fieldType: the type of field to format the date for
     *         (in MySQL, you have DATE, TIME, YEAR, and DATETIME)
     */
-   function prepareDate($timestamp, $fieldType = 'DATETIME') {
+   function prepareDate($timestamp, $fieldType = 'DATETIME'){
       $date = '';
       if (!$timestamp === false && $timestamp > 0) {
          switch ($fieldType) {
@@ -554,7 +554,7 @@ 
    *          was passed
    * @param: $rs Recordset to be packaged into an array
    */
-	function makeArray($rs='',$index=false){
+	function makeArray($rs = '', $index = false){
 		if (!$rs) return false;
 		$rsArray = array();
 		$iterator = 0;
@@ -572,7 +572,7 @@ 
     *
     * @return string
     */
-   function getVersion() {
+   function getVersion(){
        return mysql_get_server_info();
    }
    
@@ -583,16 +583,16 @@ 
     * @param string $str
     * @return string 
     */
-   function replaceFullTableName($str,$force=null) {
+   function replaceFullTableName($str, $force = null){
        
        $str = trim($str);
-       $dbase  = trim($this->config['dbase'],'`');
+       $dbase  = trim($this->config['dbase'], '`');
        $prefix = $this->config['table_prefix'];
-       if(!empty($force))
+       if (!empty($force))
        {
            $result = "`{$dbase}`.`{$prefix}{$str}`";
        }
-       elseif(strpos($str,'[+prefix+]')!==false)
+       elseif (strpos($str, '[+prefix+]') !== false)
        {
            $result = preg_replace('@\[\+prefix\+\]([0-9a-zA-Z_]+)@', "`{$dbase}`.`{$prefix}$1`", $str);
        }
@@ -604,7 +604,7 @@ 
    function optimize($table_name)
    {
        $rs = $this->query("OPTIMIZE TABLE {$table_name}");
-       if($rs) $rs = $this->query("ALTER TABLE {$table_name}");
+       if ($rs) $rs = $this->query("ALTER TABLE {$table_name}");
        return $rs;
    }
    
@@ -614,25 +614,25 @@ 
        return $rs;
    }
 
-  function dataSeek($result, $row_number) {
+  function dataSeek($result, $row_number){
     return mysql_data_seek($result, $row_number);
   }
   
-    function _getFieldsStringFromArray($fields=array()) {
+    function _getFieldsStringFromArray($fields = array()){
         
-        if(empty($fields)) return '*';
+        if (empty($fields)) return '*';
         
         $_ = array();
-        foreach($fields as $k=>$v) {
-            if($k!==$v) $_[] = "{$v} as {$k}";
+        foreach ($fields as $k=>$v) {
+            if ($k !== $v) $_[] = "{$v} as {$k}";
             else        $_[] = $v;
         }
         return join(',', $_);
     }
     
-    function _getFromStringFromArray($tables=array()) {
+    function _getFromStringFromArray($tables = array()){
         $_ = array();
-        foreach($tables as $k=>$v) {
+        foreach ($tables as $k=>$v) {
             $_[] = $v;
         }
         return join(' ', $_);

Braces +207 added lines, -110 removed lines

@@ -5,7 +5,8 @@ 
  *
  */
 
-class DBAPI {
+class DBAPI
+{
 
    var $conn;
    var $config;
@@ -16,7 +17,8 @@ 
     * @name:  DBAPI
     *
     */
-   function __construct($host='',$dbase='', $uid='',$pwd='',$pre=NULL,$charset='',$connection_method='SET CHARACTER SET') {
+   function __construct($host='',$dbase='', $uid='',$pwd='',$pre=NULL,$charset='',$connection_method='SET CHARACTER SET')
+   {
       $this->config['host'] = $host ? $host : $GLOBALS['database_server'];
       $this->config['dbase'] = $dbase ? $dbase : $GLOBALS['dbase'];
       $this->config['user'] = $uid ? $uid : $GLOBALS['database_user'];
@@ -32,7 +34,8 @@ 
     * @desc:  called in the constructor to set up arrays containing the types
     *         of database fields that can be used with specific PHP types
     */
-   function initDataTypes() {
+   function initDataTypes()
+   {
       $this->dataTypes['numeric'] = array (
          'INT',
          'INTEGER',
@@ -78,7 +81,8 @@ 
     * @name:  connect
     *
     */
-   function connect($host = '', $dbase = '', $uid = '', $pwd = '', $persist = 0) {
+   function connect($host = '', $dbase = '', $uid = '', $pwd = '', $persist = 0)
+   {
       global $modx;
       $uid = $uid ? $uid : $this->config['user'];
       $pwd = $pwd ? $pwd : $this->config['pass'];
@@ -88,17 +92,16 @@ 
       $connection_method = $this->config['connection_method'];
       $tstart = $modx->getMicroTime();
       $safe_count = 0;
-      while(!$this->conn && $safe_count<3)
-      {
-          if($persist!=0) $this->conn = mysql_pconnect($host, $uid, $pwd);
-          else            $this->conn = mysql_connect($host, $uid, $pwd, true);
+      while(!$this->conn && $safe_count<3) {
+          if($persist!=0) {
+              $this->conn = mysql_pconnect($host, $uid, $pwd);
+          } else {
+              $this->conn = mysql_connect($host, $uid, $pwd, true);
+          }
           
-          if(!$this->conn)
-          {
-            if(isset($modx->config['send_errormail']) && $modx->config['send_errormail'] !== '0')
-            {
-               if($modx->config['send_errormail'] <= 2)
-               {
+          if(!$this->conn) {
+            if(isset($modx->config['send_errormail']) && $modx->config['send_errormail'] !== '0') {
+               if($modx->config['send_errormail'] <= 2) {
                   $logtitle    = 'Failed to create the database connection!';
                   $request_uri = $modx->htmlspecialchars($_SERVER['REQUEST_URI']);
                   $ua          = $modx->htmlspecialchars($_SERVER['HTTP_USER_AGENT']);
@@ -146,30 +149,36 @@ 
     * @name:  disconnect
     *
     */
-   function disconnect() {
+   function disconnect()
+   {
       @ mysql_close($this->conn);
       $this->conn = null;
       $this->isConnected = false;
    }
 
-   function escape($s, $safecount=0) {
+   function escape($s, $safecount=0)
+   {
       
       $safecount++;
-      if(1000<$safecount) exit("Too many loops '{$safecount}'");
+      if(1000<$safecount) {
+          exit("Too many loops '{$safecount}'");
+      }
       
       if (empty ($this->conn) || !is_resource($this->conn)) {
          $this->connect();
        }
        
       if(is_array($s)) {
-          if(count($s) === 0) $s = '';
-          else {
+          if(count($s) === 0) {
+              $s = '';
+          } else {
               foreach($s as $i=>$v) {
                   $s[$i] = $this->escape($v,$safecount);
               }
           }
+      } else {
+          $s = mysql_real_escape_string($s, $this->conn);
       }
-      else $s = mysql_real_escape_string($s, $this->conn);
           return $s;
    }
 
@@ -178,16 +187,21 @@ 
     * @desc:  Mainly for internal use.
     * Developers should use select, update, insert, delete where possible
     */
-   function query($sql,$watchError=true) {
+   function query($sql,$watchError=true)
+   {
       global $modx;
       if (empty ($this->conn) || !is_resource($this->conn)) {
          $this->connect();
       }
       $tstart = $modx->getMicroTime();
-      if(is_array($sql)) $sql = join("\n", $sql);
+      if(is_array($sql)) {
+          $sql = join("\n", $sql);
+      }
       $this->lastQuery = $sql;
       if (!$result = @ mysql_query($sql, $this->conn)) {
-         if(!$watchError) return;
+         if(!$watchError) {
+             return;
+         }
             switch(mysql_errno()) {
                 case 1054:
                 case 1060:
@@ -206,15 +220,26 @@ 
             $debug = debug_backtrace();
             array_shift($debug);	
             $debug_path = array();
-            foreach ($debug as $line) $debug_path[] = $line['function'];
+            foreach ($debug as $line) {
+                $debug_path[] = $line['function'];
+            }
             $debug_path = implode(' > ',array_reverse($debug_path));
             $modx->queryCode .= "<fieldset style='text-align:left'><legend>Query " . ($modx->executedQueries + 1) . " - " . sprintf("%2.2f ms", $totaltime*1000) . "</legend>";
             $modx->queryCode .= $sql . '<br><br>';
-            if ($modx->event->name) $modx->queryCode .= 'Current Event  => ' . $modx->event->name . '<br>';
-            if ($modx->event->activePlugin) $modx->queryCode .= 'Current Plugin => ' . $modx->event->activePlugin . '<br>';
-            if ($modx->currentSnippet) $modx->queryCode .= 'Current Snippet => ' . $modx->currentSnippet . '<br>';
-            if (stripos($sql, 'select')===0) $modx->queryCode .= 'Record Count => ' . $this->getRecordCount($result) . '<br>';
-            else $modx->queryCode .= 'Affected Rows => ' . $this->getAffectedRows() . '<br>';
+            if ($modx->event->name) {
+                $modx->queryCode .= 'Current Event  => ' . $modx->event->name . '<br>';
+            }
+            if ($modx->event->activePlugin) {
+                $modx->queryCode .= 'Current Plugin => ' . $modx->event->activePlugin . '<br>';
+            }
+            if ($modx->currentSnippet) {
+                $modx->queryCode .= 'Current Snippet => ' . $modx->currentSnippet . '<br>';
+            }
+            if (stripos($sql, 'select')===0) {
+                $modx->queryCode .= 'Record Count => ' . $this->getRecordCount($result) . '<br>';
+            } else {
+                $modx->queryCode .= 'Affected Rows => ' . $this->getAffectedRows() . '<br>';
+            }
             $modx->queryCode .= 'Functions Path => ' . $debug_path . '<br>';
             $modx->queryCode .= "</fieldset><br />";
          }
@@ -227,18 +252,25 @@ 
     * @name:  delete
     *
     */
-   function delete($from, $where='', $orderby='', $limit = '') {
+   function delete($from, $where='', $orderby='', $limit = '')
+   {
       global $modx;
-      if (!$from)
-         $modx->messageQuit("Empty \$from parameters in DBAPI::delete().");
-      else {
+      if (!$from) {
+               $modx->messageQuit("Empty \$from parameters in DBAPI::delete().");
+      } else {
          $from = $this->replaceFullTableName($from);
          $where   = trim($where);
          $orderby = trim($orderby);
          $limit   = trim($limit);
-         if($where!==''   && stripos($where,   'WHERE')!==0)    $where   = "WHERE {$where}";
-         if($orderby!=='' && stripos($orderby, 'ORDER BY')!==0) $orderby = "ORDER BY {$orderby}";
-         if($limit!==''   && stripos($limit,   'LIMIT')!==0)    $limit   = "LIMIT {$limit}";
+         if($where!==''   && stripos($where,   'WHERE')!==0) {
+             $where   = "WHERE {$where}";
+         }
+         if($orderby!=='' && stripos($orderby, 'ORDER BY')!==0) {
+             $orderby = "ORDER BY {$orderby}";
+         }
+         if($limit!==''   && stripos($limit,   'LIMIT')!==0) {
+             $limit   = "LIMIT {$limit}";
+         }
          return $this->query("DELETE FROM {$from} {$where} {$orderby} {$limit}");
       }
    }
@@ -247,12 +279,19 @@ 
     * @name:  select
     *
     */
-   function select($fields = "*", $from = "", $where = "", $orderby = "", $limit = "") {
+   function select($fields = "*", $from = "", $where = "", $orderby = "", $limit = "")
+   {
       global $modx;
       
-      if(is_array($fields)) $fields = $this->_getFieldsStringFromArray($fields);
-      if(is_array($from))   $from   = $this->_getFromStringFromArray($from);
-      if(is_array($where))  $where  = join(' ', $where);
+      if(is_array($fields)) {
+          $fields = $this->_getFieldsStringFromArray($fields);
+      }
+      if(is_array($from)) {
+          $from   = $this->_getFromStringFromArray($from);
+      }
+      if(is_array($where)) {
+          $where  = join(' ', $where);
+      }
       
       if (!$from) {
          $modx->messageQuit("Empty \$from parameters in DBAPI::select().");
@@ -264,9 +303,15 @@ 
       $where   = trim($where);
       $orderby = trim($orderby);
       $limit   = trim($limit);
-      if($where!==''   && stripos($where,'WHERE')!==0)   $where   = "WHERE {$where}";
-      if($orderby!=='' && stripos($orderby,'ORDER')!==0) $orderby = "ORDER BY {$orderby}";
-      if($limit!==''   && stripos($limit,'LIMIT')!==0)   $limit   = "LIMIT {$limit}";
+      if($where!==''   && stripos($where,'WHERE')!==0) {
+          $where   = "WHERE {$where}";
+      }
+      if($orderby!=='' && stripos($orderby,'ORDER')!==0) {
+          $orderby = "ORDER BY {$orderby}";
+      }
+      if($limit!==''   && stripos($limit,'LIMIT')!==0) {
+          $limit   = "LIMIT {$limit}";
+      }
       return $this->query("SELECT {$fields} FROM {$from} {$where} {$orderby} {$limit}");
    }
 
@@ -274,17 +319,18 @@ 
     * @name:  update
     *
     */
-   function update($fields, $table, $where = "") {
+   function update($fields, $table, $where = "")
+   {
       global $modx;
-      if (!$table)
-         $modx->messageQuit("Empty \$table parameter in DBAPI::update().");
-      else {
+      if (!$table) {
+               $modx->messageQuit("Empty \$table parameter in DBAPI::update().");
+      } else {
          $table = $this->replaceFullTableName($table);
          if (is_array($fields)) {
 			 foreach ($fields as $key => $value) {
-				 if(is_null($value) || strtolower($value) === 'null'){
+				 if(is_null($value) || strtolower($value) === 'null') {
 					 $flds = 'NULL';
-				 }else{
+				 } else {
 					 $flds = "'" . $value . "'";
 				 }
 				 $fields[$key] = "`{$key}` = ".$flds;
@@ -292,7 +338,9 @@ 
             $fields = implode(",", $fields);
          }
          $where = trim($where);
-         if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
+         if($where!=='' && stripos($where, 'WHERE')!==0) {
+             $where = "WHERE {$where}";
+         }
          return $this->query("UPDATE {$table} SET {$fields} {$where}");
       }
    }
@@ -301,11 +349,12 @@ 
     * @name:  insert
     * @desc:  returns either last id inserted or the result from the query
     */
-   function insert($fields, $intotable, $fromfields = "*", $fromtable = "", $where = "", $limit = "") {
+   function insert($fields, $intotable, $fromfields = "*", $fromtable = "", $where = "", $limit = "")
+   {
       global $modx;
-      if (!$intotable)
-         $modx->messageQuit("Empty \$intotable parameters in DBAPI::insert().");
-      else {
+      if (!$intotable) {
+               $modx->messageQuit("Empty \$intotable parameters in DBAPI::insert().");
+      } else {
          $intotable = $this->replaceFullTableName($intotable);
          if (!is_array($fields)) {
             $this->query("INSERT INTO {$intotable} {$fields}");
@@ -319,8 +368,12 @@ 
                   $fields = "(".implode(",", array_keys($fields)).")";
                   $where = trim($where);
                   $limit = trim($limit);
-                  if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
-                  if($limit!=='' && stripos($limit, 'LIMIT')!==0) $limit = "LIMIT {$limit}";
+                  if($where!=='' && stripos($where, 'WHERE')!==0) {
+                      $where = "WHERE {$where}";
+                  }
+                  if($limit!=='' && stripos($limit, 'LIMIT')!==0) {
+                      $limit = "LIMIT {$limit}";
+                  }
                   $rt = $this->query("INSERT INTO {$intotable} {$fields} SELECT {$fromfields} FROM {$fromtable} {$where} {$limit}");
                } else {
                   $ds = $this->select($fromfields, $fromtable, $where, '', $limit);
@@ -331,26 +384,37 @@ 
                }
             }
          }
-         if (($lid = $this->getInsertId())===false) $modx->messageQuit("Couldn't get last insert key!");
+         if (($lid = $this->getInsertId())===false) {
+             $modx->messageQuit("Couldn't get last insert key!");
+         }
          return $lid;
       }
    }
    
-    function save($fields, $table, $where='') {
+    function save($fields, $table, $where='')
+    {
         
-        if($where === '')                                                  $mode = 'insert';
-        elseif($this->getRecordCount($this->select('*',$table,$where))==0) $mode = 'insert';
-        else                                                               $mode = 'update';
+        if($where === '') {
+            $mode = 'insert';
+        } elseif($this->getRecordCount($this->select('*',$table,$where))==0) {
+            $mode = 'insert';
+        } else {
+            $mode = 'update';
+        }
         
-        if($mode==='insert') return $this->insert($fields, $table);
-        else                 return $this->update($fields, $table, $where);
+        if($mode==='insert') {
+            return $this->insert($fields, $table);
+        } else {
+            return $this->update($fields, $table, $where);
+        }
     }
     
    /**
     * @name:  isResult
     *
     */
-   function isResult($rs) {
+   function isResult($rs)
+   {
       return is_resource($rs);
    }
 
@@ -358,7 +422,8 @@ 
     * @name:  freeResult
     *
     */
-   function freeResult($rs) {
+   function freeResult($rs)
+   {
       mysql_free_result($rs);
    }
    
@@ -366,7 +431,8 @@ 
     * @name:  numFields
     *
     */
-   function numFields($rs) {
+   function numFields($rs)
+   {
       return mysql_num_fields($rs);
    }
    
@@ -374,7 +440,8 @@ 
     * @name:  fieldName
     *
     */
-   function fieldName($rs,$col=0) {
+   function fieldName($rs,$col=0)
+   {
       return mysql_field_name($rs,$col);
    }
    
@@ -382,7 +449,8 @@ 
     * @name:  selectDb
     *
     */
-   function selectDb($name) {
+   function selectDb($name)
+   {
       mysql_select_db($name);
    }
    
@@ -391,8 +459,11 @@ 
     * @name:  getInsertId
     *
     */
-   function getInsertId($conn=NULL) {
-      if( !is_resource($conn)) $conn =& $this->conn;
+   function getInsertId($conn=NULL)
+   {
+      if( !is_resource($conn)) {
+          $conn =& $this->conn;
+      }
       return mysql_insert_id($conn);
    }
 
@@ -400,8 +471,11 @@ 
     * @name:  getAffectedRows
     *
     */
-   function getAffectedRows($conn=NULL) {
-      if (!is_resource($conn)) $conn =& $this->conn;
+   function getAffectedRows($conn=NULL)
+   {
+      if (!is_resource($conn)) {
+          $conn =& $this->conn;
+      }
       return mysql_affected_rows($conn);
    }
 
@@ -409,8 +483,11 @@ 
     * @name:  getLastError
     *
     */
-   function getLastError($conn=NULL) {
-      if (!is_resource($conn)) $conn =& $this->conn;
+   function getLastError($conn=NULL)
+   {
+      if (!is_resource($conn)) {
+          $conn =& $this->conn;
+      }
       return mysql_error($conn);
    }
 
@@ -418,7 +495,8 @@ 
     * @name:  getRecordCount
     *
     */
-   function getRecordCount($ds) {
+   function getRecordCount($ds)
+   {
       return (is_resource($ds)) ? mysql_num_rows($ds) : 0;
    }
 
@@ -428,18 +506,16 @@ 
     * @param: $dsq - dataset
     *
     */
-   function getRow($ds, $mode = 'assoc') {
+   function getRow($ds, $mode = 'assoc')
+   {
       if (is_resource($ds)) {
          if ($mode == 'assoc') {
             return mysql_fetch_assoc($ds);
-         }
-         elseif ($mode == 'num') {
+         } elseif ($mode == 'num') {
             return mysql_fetch_row($ds);
-         }
-		 elseif ($mode == 'object') {
+         } elseif ($mode == 'object') {
             return mysql_fetch_object($ds);
-         }
-         elseif ($mode == 'both') {
+         } elseif ($mode == 'both') {
             return mysql_fetch_array($ds, MYSQL_BOTH);
          } else {
             global $modx;
@@ -453,9 +529,11 @@ 
     * @desc:  returns an array of the values found on colun $name
     * @param: $dsq - dataset or query string
     */
-   function getColumn($name, $dsq) {
-      if (!is_resource($dsq))
-         $dsq = $this->query($dsq);
+   function getColumn($name, $dsq)
+   {
+      if (!is_resource($dsq)) {
+               $dsq = $this->query($dsq);
+      }
       if ($dsq) {
          $col = array ();
          while ($row = $this->getRow($dsq)) {
@@ -470,9 +548,11 @@ 
     * @desc:  returns an array containing the column $name
     * @param: $dsq - dataset or query string
     */
-   function getColumnNames($dsq) {
-      if (!is_resource($dsq))
-         $dsq = $this->query($dsq);
+   function getColumnNames($dsq)
+   {
+      if (!is_resource($dsq)) {
+               $dsq = $this->query($dsq);
+      }
       if ($dsq) {
          $names = array ();
          $limit = mysql_num_fields($dsq);
@@ -488,9 +568,11 @@ 
     * @desc:  returns the value from the first column in the set
     * @param: $dsq - dataset or query string
     */
-   function getValue($dsq) {
-      if (!is_resource($dsq))
-         $dsq = $this->query($dsq);
+   function getValue($dsq)
+   {
+      if (!is_resource($dsq)) {
+               $dsq = $this->query($dsq);
+      }
       if ($dsq) {
          $r = $this->getRow($dsq, "num");
          return $r[0];
@@ -503,7 +585,8 @@ 
     *         table
     * @param: $table: the full name of the database table
     */
-   function getTableMetaData($table) {
+   function getTableMetaData($table)
+   {
       $metadata = false;
       if (!empty ($table)) {
          $sql = "SHOW FIELDS FROM $table";
@@ -525,7 +608,8 @@ 
     * @param: $fieldType: the type of field to format the date for
     *         (in MySQL, you have DATE, TIME, YEAR, and DATETIME)
     */
-   function prepareDate($timestamp, $fieldType = 'DATETIME') {
+   function prepareDate($timestamp, $fieldType = 'DATETIME')
+   {
       $date = '';
       if (!$timestamp === false && $timestamp > 0) {
          switch ($fieldType) {
@@ -554,8 +638,11 @@ 
    *          was passed
    * @param: $rs Recordset to be packaged into an array
    */
-	function makeArray($rs='',$index=false){
-		if (!$rs) return false;
+	function makeArray($rs='',$index=false)
+	{
+		if (!$rs) {
+		    return false;
+		}
 		$rsArray = array();
 		$iterator = 0;
 		while ($row = $this->getRow($rs)) {
@@ -572,7 +659,8 @@ 
     *
     * @return string
     */
-   function getVersion() {
+   function getVersion()
+   {
        return mysql_get_server_info();
    }
    
@@ -583,20 +671,19 @@ 
     * @param string $str
     * @return string 
     */
-   function replaceFullTableName($str,$force=null) {
+   function replaceFullTableName($str,$force=null)
+   {
        
        $str = trim($str);
        $dbase  = trim($this->config['dbase'],'`');
        $prefix = $this->config['table_prefix'];
-       if(!empty($force))
-       {
+       if(!empty($force)) {
            $result = "`{$dbase}`.`{$prefix}{$str}`";
-       }
-       elseif(strpos($str,'[+prefix+]')!==false)
-       {
+       } elseif(strpos($str,'[+prefix+]')!==false) {
            $result = preg_replace('@\[\+prefix\+\]([0-9a-zA-Z_]+)@', "`{$dbase}`.`{$prefix}$1`", $str);
+       } else {
+           $result = $str;
        }
-       else $result = $str;
        
        return $result;
    }
@@ -604,7 +691,9 @@ 
    function optimize($table_name)
    {
        $rs = $this->query("OPTIMIZE TABLE {$table_name}");
-       if($rs) $rs = $this->query("ALTER TABLE {$table_name}");
+       if($rs) {
+           $rs = $this->query("ALTER TABLE {$table_name}");
+       }
        return $rs;
    }
    
@@ -614,23 +703,31 @@ 
        return $rs;
    }
 
-  function dataSeek($result, $row_number) {
+  function dataSeek($result, $row_number)
+  {
     return mysql_data_seek($result, $row_number);
   }
   
-    function _getFieldsStringFromArray($fields=array()) {
+    function _getFieldsStringFromArray($fields=array())
+    {
         
-        if(empty($fields)) return '*';
+        if(empty($fields)) {
+            return '*';
+        }
         
         $_ = array();
         foreach($fields as $k=>$v) {
-            if($k!==$v) $_[] = "{$v} as {$k}";
-            else        $_[] = $v;
+            if($k!==$v) {
+                $_[] = "{$v} as {$k}";
+            } else {
+                $_[] = $v;
+            }
         }
         return join(',', $_);
     }
     
-    function _getFromStringFromArray($tables=array()) {
+    function _getFromStringFromArray($tables=array())
+    {
         $_ = array();
         foreach($tables as $k=>$v) {
             $_[] = $v;

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

@@ -16,14 +16,14 @@ 
     * @name:  DBAPI
     *
     */
-   function __construct($host='',$dbase='', $uid='',$pwd='',$pre=NULL,$charset='',$connection_method='SET CHARACTER SET') {
+   function __construct($host='',$dbase='', $uid='',$pwd='',$pre=null,$charset='',$connection_method='SET CHARACTER SET') {
       $this->config['host'] = $host ? $host : $GLOBALS['database_server'];
       $this->config['dbase'] = $dbase ? $dbase : $GLOBALS['dbase'];
       $this->config['user'] = $uid ? $uid : $GLOBALS['database_user'];
       $this->config['pass'] = $pwd ? $pwd : $GLOBALS['database_password'];
       $this->config['charset'] = $charset ? $charset : $GLOBALS['database_connection_charset'];
       $this->config['connection_method'] =  $this->_dbconnectionmethod = (isset($GLOBALS['database_connection_method']) ? $GLOBALS['database_connection_method'] : $connection_method);
-      $this->config['table_prefix'] = ($pre !== NULL) ? $pre : $GLOBALS['table_prefix'];
+      $this->config['table_prefix'] = ($pre !== null) ? $pre : $GLOBALS['table_prefix'];
       $this->initDataTypes();
    }
 
@@ -236,9 +236,9 @@ 
          $where   = trim($where);
          $orderby = trim($orderby);
          $limit   = trim($limit);
-         if($where!==''   && stripos($where,   'WHERE')!==0)    $where   = "WHERE {$where}";
+         if($where!==''   && stripos($where,   'WHERE')!==0)    $where   = "where {$where}";
          if($orderby!=='' && stripos($orderby, 'ORDER BY')!==0) $orderby = "ORDER BY {$orderby}";
-         if($limit!==''   && stripos($limit,   'LIMIT')!==0)    $limit   = "LIMIT {$limit}";
+         if($limit!==''   && stripos($limit,   'LIMIT')!==0)    $limit   = "limit {$limit}";
          return $this->query("DELETE FROM {$from} {$where} {$orderby} {$limit}");
       }
    }
@@ -264,10 +264,10 @@ 
       $where   = trim($where);
       $orderby = trim($orderby);
       $limit   = trim($limit);
-      if($where!==''   && stripos($where,'WHERE')!==0)   $where   = "WHERE {$where}";
+      if($where!==''   && stripos($where,'WHERE')!==0)   $where   = "where {$where}";
       if($orderby!=='' && stripos($orderby,'ORDER')!==0) $orderby = "ORDER BY {$orderby}";
-      if($limit!==''   && stripos($limit,'LIMIT')!==0)   $limit   = "LIMIT {$limit}";
-      return $this->query("SELECT {$fields} FROM {$from} {$where} {$orderby} {$limit}");
+      if($limit!==''   && stripos($limit,'LIMIT')!==0)   $limit   = "limit {$limit}";
+      return $this->query("select {$fields} FROM {$from} {$where} {$orderby} {$limit}");
    }
 
    /**
@@ -292,8 +292,8 @@ 
             $fields = implode(",", $fields);
          }
          $where = trim($where);
-         if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
-         return $this->query("UPDATE {$table} SET {$fields} {$where}");
+         if($where!=='' && stripos($where, 'WHERE')!==0) $where = "where {$where}";
+         return $this->query("update {$table} SET {$fields} {$where}");
       }
    }
 
@@ -319,8 +319,8 @@ 
                   $fields = "(".implode(",", array_keys($fields)).")";
                   $where = trim($where);
                   $limit = trim($limit);
-                  if($where!=='' && stripos($where, 'WHERE')!==0) $where = "WHERE {$where}";
-                  if($limit!=='' && stripos($limit, 'LIMIT')!==0) $limit = "LIMIT {$limit}";
+                  if($where!=='' && stripos($where, 'WHERE')!==0) $where = "where {$where}";
+                  if($limit!=='' && stripos($limit, 'LIMIT')!==0) $limit = "limit {$limit}";
                   $rt = $this->query("INSERT INTO {$intotable} {$fields} SELECT {$fromfields} FROM {$fromtable} {$where} {$limit}");
                } else {
                   $ds = $this->select($fromfields, $fromtable, $where, '', $limit);
@@ -391,7 +391,7 @@ 
     * @name:  getInsertId
     *
     */
-   function getInsertId($conn=NULL) {
+   function getInsertId($conn=null) {
       if( !is_resource($conn)) $conn =& $this->conn;
       return mysql_insert_id($conn);
    }
@@ -400,7 +400,7 @@ 
     * @name:  getAffectedRows
     *
     */
-   function getAffectedRows($conn=NULL) {
+   function getAffectedRows($conn=null) {
       if (!is_resource($conn)) $conn =& $this->conn;
       return mysql_affected_rows($conn);
    }
@@ -409,7 +409,7 @@ 
     * @name:  getLastError
     *
     */
-   function getLastError($conn=NULL) {
+   function getLastError($conn=null) {
       if (!is_resource($conn)) $conn =& $this->conn;
       return mysql_error($conn);
    }
@@ -610,7 +610,7 @@ 
    
    function truncate($table_name)
    {
-       $rs = $this->query("TRUNCATE {$table_name}");
+       $rs = $this->query("truncate {$table_name}");
        return $rs;
    }
 

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

Doc Comments +9 added lines

@@ -375,6 +375,9 @@ 
 		return $rsArray;
 	}
 
+	/**
+	 * @return string
+	 */
 	function getVersion() {
 		return $this->conn->server_info;
 	}
@@ -410,6 +413,9 @@ 
 		return $result->data_seek($row_number);
 	}
 	
+    /**
+     * @return string
+     */
     function _getFieldsStringFromArray($fields=array()) {
         
         if(empty($fields)) return '*';
@@ -422,6 +428,9 @@ 
         return join(',', $_);
     }
     
+    /**
+     * @return string
+     */
     function _getFromStringFromArray($tables=array()) {
         $_ = array();
         foreach($tables as $k=>$v) {

Indentation +349 added lines, -349 removed lines

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

Spacing +84 added lines, -84 removed lines

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

Braces +168 added lines, -70 removed lines

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

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

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

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

Doc Comments +6 added lines

@@ -102,6 +102,9 @@ 
 		return $rs;
 	}
 
+	/**
+	 * @param string $filepath
+	 */
 	function makeFile($docid, $filepath)
 	{
 		global  $modx,$_lang;
@@ -250,6 +253,9 @@ 
 		return implode("\n", $this->output);
 	}
 	
+    /**
+     * @param string $url
+     */
     function curl_get_contents($url, $timeout = 30 )
     {
     	if(!function_exists('curl_init')) return @file_get_contents($url);

Indentation +213 added lines, -213 removed lines

@@ -1,258 +1,258 @@ 
 <?php
 class EXPORT_SITE
 {
-	var $targetDir;
-	var $generate_mode;
-	var $total;
-	var $count;
-	var $ignore_ids;
-	var $exportstart;
-	var $repl_before;
-	var $repl_after;
-	var $output = array();
+    var $targetDir;
+    var $generate_mode;
+    var $total;
+    var $count;
+    var $ignore_ids;
+    var $exportstart;
+    var $repl_before;
+    var $repl_after;
+    var $output = array();
 	
-	function __construct()
-	{
-		global $modx;
+    function __construct()
+    {
+        global $modx;
 		
-		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(!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();
+    }
 	
-	function setExportDir($dir)
-	{
-		$dir = str_replace('\\','/',$dir);
-		$dir = rtrim($dir, '/');
-		$this->targetDir = $dir;
-	}
+    function setExportDir($dir)
+    {
+        $dir = str_replace('\\','/',$dir);
+        $dir = rtrim($dir, '/');
+        $this->targetDir = $dir;
+    }
 	
-	function get_mtime()
-	{
-		$mtime = microtime();
-		$mtime = explode(' ', $mtime);
-		$mtime = $mtime[1] + $mtime[0];
-		return $mtime;
-	}
+    function get_mtime()
+    {
+        $mtime = microtime();
+        $mtime = explode(' ', $mtime);
+        $mtime = $mtime[1] + $mtime[0];
+        return $mtime;
+    }
 	
-	function setUrlMode()
-	{
-		global $modx;
+    function setUrlMode()
+    {
+        global $modx;
 		
-		if($modx->config['friendly_urls']==0)
-		{
-			$modx->config['friendly_urls']  = 1;
-			$modx->config['use_alias_path'] = 1;
-			$modx->clearCache('full');
-		}
-		$modx->config['make_folders'] = '1';
-	}
+        if($modx->config['friendly_urls']==0)
+        {
+            $modx->config['friendly_urls']  = 1;
+            $modx->config['use_alias_path'] = 1;
+            $modx->clearCache('full');
+        }
+        $modx->config['make_folders'] = '1';
+    }
 	
-	function getTotal($ignore_ids='', $noncache='0')
-	{
-		global $modx;
-		$tbl_site_content = $modx->getFullTableName('site_content');
+    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)
-		{
-			$ignore_ids = "AND NOT id IN ('".implode("','", $ignore_ids)."')";
-		} else {
-			$ignore_ids = '';
-		}
+        $ignore_ids = array_filter(array_map('intval', explode(',', $ignore_ids)));
+        if(count($ignore_ids)>0)
+        {
+            $ignore_ids = "AND NOT id IN ('".implode("','", $ignore_ids)."')";
+        } else {
+            $ignore_ids = '';
+        }
 		
-		$this->ignore_ids = $ignore_ids;
+        $this->ignore_ids = $ignore_ids;
 		
-		$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);
-		$this->total = $modx->db->getValue($rs);
-		return $this->total;
-	}
+        $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);
+        $this->total = $modx->db->getValue($rs);
+        return $this->total;
+    }
 	
-	function removeDirectoryAll($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;
+    function removeDirectoryAll($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(!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($directory !== $this->targetDir) $rs = rmdir($directory);
+        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($directory !== $this->targetDir) $rs = rmdir($directory);
 		
-		return $rs;
-	}
+        return $rs;
+    }
 
-	function makeFile($docid, $filepath)
-	{
-		global  $modx,$_lang;
-		$file_permission = octdec($modx->config['new_file_permissions']);
-		if($this->generate_mode==='direct')
-		{
-			$back_lang = $_lang;
-			$src = $modx->executeParser($docid);
+    function makeFile($docid, $filepath)
+    {
+        global  $modx,$_lang;
+        $file_permission = octdec($modx->config['new_file_permissions']);
+        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}");
+            $_lang = $back_lang;
+        }
+        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);
-			$result = file_put_contents($filepath,$src);
-			if($result!==false) @chmod($filepath, $file_permission);
+        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) return 'success';
-			else                  return 'failed_no_write';
-		}
-		else                      return 'failed_no_retrieve';
-	}
+            if($result !== false) return 'success';
+            else                  return 'failed_no_write';
+        }
+        else                      return 'failed_no_retrieve';
+    }
 
-	function getFileName($docid, $alias='', $prefix, $suffix)
-	{
-		global $modx;
+    function getFileName($docid, $alias='', $prefix, $suffix)
+    {
+        global $modx;
 		
-		if($alias==='') $filename = $prefix.$docid.$suffix;
-		else
-		{
-			if($modx->config['suffix_mode']==='1' && strpos($alias, '.')!==false)
-			{
-				$suffix = '';
-			}
-			$filename = $prefix.$alias.$suffix;
-		}
-		return $filename;
-	}
+        if($alias==='') $filename = $prefix.$docid.$suffix;
+        else
+        {
+            if($modx->config['suffix_mode']==='1' && strpos($alias, '.')!==false)
+            {
+                $suffix = '';
+            }
+            $filename = $prefix.$alias.$suffix;
+        }
+        return $filename;
+    }
 
-	function run($parent=0)
-	{
-		global $_lang;
-		global $modx;
+    function run($parent=0)
+    {
+        global $_lang;
+        global $modx;
 		
-		$tbl_site_content = $modx->getFullTableName('site_content');
+        $tbl_site_content = $modx->getFullTableName('site_content');
 		
-		$ignore_ids = $this->ignore_ids;
-		$dirpath = $this->targetDir . '/';
+        $ignore_ids = $this->ignore_ids;
+        $dirpath = $this->targetDir . '/';
 		
-		$prefix = $modx->config['friendly_url_prefix'];
-		$suffix = $modx->config['friendly_url_suffix'];
+        $prefix = $modx->config['friendly_url_prefix'];
+        $suffix = $modx->config['friendly_url_suffix'];
 		
-		$tpl = ' <span class="[+status+]">[+msg1+]</span> [+msg2+]</span>';
-		$ph = array();
+        $tpl = ' <span class="[+status+]">[+msg1+]</span> [+msg2+]</span>';
+        $ph = array();
 		
-		$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['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_retrieve"];
-		$msg_failed_no_retrieve = $this->parsePlaceholder($tpl,$ph);
+        $ph['msg2']   = $_lang["export_site_failed_no_retrieve"];
+        $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);
+        $ph['status'] = 'success';
+        $ph['msg1']   = $_lang['export_site_success'];
+        $ph['msg2']   = '';
+        $msg_success            = $this->parsePlaceholder($tpl,$ph);
 		
-		$ph['msg2']   = $_lang['export_site_success_skip_doc'];
-		$msg_success_skip_doc = $this->parsePlaceholder($tpl,$ph);
+        $ph['msg2']   = $_lang['export_site_success_skip_doc'];
+        $msg_success_skip_doc = $this->parsePlaceholder($tpl,$ph);
 		
-		$ph['msg2']   = $_lang['export_site_success_skip_dir'];
-		$msg_success_skip_dir = $this->parsePlaceholder($tpl,$ph);
+        $ph['msg2']   = $_lang['export_site_success_skip_dir'];
+        $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';
-		$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);
+        $fields = "id, alias, pagetitle, isfolder, (content = '' AND template = 0) AS wasNull, published";
+        $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);
 		
-		$ph = array();
-		$ph['total']     = $this->total;
-		$folder_permission = octdec($modx->config['new_folder_permissions']);
-		while($row = $modx->db->getRow($rs))
-		{
-			$this->count++;
+        $ph = array();
+        $ph['total']     = $this->total;
+        $folder_permission = octdec($modx->config['new_folder_permissions']);
+        while($row = $modx->db->getRow($rs))
+        {
+            $this->count++;
 			
-			$row['count']     = $this->count;
-			$row['url'] = $modx->makeUrl($row['id']);
+            $row['count']     = $this->count;
+            $row['url'] = $modx->makeUrl($row['id']);
 			
-			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')
-					{
-						$status = $this->makeFile($row['id'], $filename);
-						switch($status)
-						{
-							case 'failed_no_write'   :
+            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')
+                    {
+                        $status = $this->makeFile($row['id'], $filename);
+                        switch($status)
+                        {
+                            case 'failed_no_write'   :
                                                             $row['status'] = $msg_failed_no_write;
                                                             break;
-							case 'failed_no_retrieve':
+                            case 'failed_no_retrieve':
                                                             $row['status'] = $msg_failed_no_retrieve;
                                                             break;
-							default:
+                            default:
                                                             $row['status'] = $msg_success;
-						}
-					}
-					else $row['status'] = $msg_failed_no_retrieve;
-				}
-				else     $row['status'] = $msg_success_skip_doc;
-				$this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row);
-			}
-			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
-				$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);
-					mkdir($dir_path);
-					@chmod($dir_path, $folder_permission);
+                        }
+                    }
+                    else $row['status'] = $msg_failed_no_retrieve;
+                }
+                else     $row['status'] = $msg_success_skip_doc;
+                $this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row);
+            }
+            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
+                $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);
+                    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');
-				}
-				$this->targetDir = $dir_path;
-				$this->run($row['id']);
-			}
-		}
-		return implode("\n", $this->output);
-	}
+                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']);
+            }
+        }
+        return implode("\n", $this->output);
+    }
 	
     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,12 +269,12 @@ 
 
     function parsePlaceholder($tpl,$ph=array())
     {
-    	foreach($ph as $k=>$v)
-    	{
-    		$k = "[+{$k}+]";
-    		$tpl = str_replace($k,$v,$tpl);
-    	}
-    	return $tpl;
+        foreach($ph as $k=>$v)
+        {
+            $k = "[+{$k}+]";
+            $tpl = str_replace($k,$v,$tpl);
+        }
+        return $tpl;
     }
 
 }

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

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

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

@@ -81,10 +81,10 @@ 
 		$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(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 . '/*');
@@ -229,7 +229,7 @@ 
 			{ // 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(strpos($dir_path,MODX_BASE_PATH)===false) return false;
 				if (!is_dir($dir_path))
 				{
 					if (is_file($dir_path)) @unlink($dir_path);

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

Doc Comments +3 added lines

@@ -192,6 +192,9 @@
 		return $_;
 	}
 
+	/**
+	 * @param string $checksum
+	 */
 	function setSystemChecksum($checksum) {
 		global $modx;
 		$tbl_system_settings = $modx->getFullTableName('system_settings');

Indentation +183 added lines, -183 removed lines

@@ -10,215 +10,215 @@
 // Content manager wrapper class
 class ManagerAPI {
 	
-	var $action; // action directive
+    var $action; // action directive
 
-	function __construct(){
-		global $action;
-		$this->action = $action; // set action directive
-	}
+    function __construct(){
+        global $action;
+        $this->action = $action; // set action directive
+    }
 	
-	function initPageViewState($id=0){
-		global $_PAGE;
-		$vsid = isset($_SESSION["mgrPageViewSID"]) ? $_SESSION["mgrPageViewSID"] : '';
-		if($vsid!=$this->action) {
-			$_SESSION["mgrPageViewSDATA"] = array(); // new view state
-			$_SESSION["mgrPageViewSID"] = $id>0 ? $id:$this->action; // set id
-		}
-		$_PAGE['vs'] = &$_SESSION["mgrPageViewSDATA"]; // restore viewstate
-	}
+    function initPageViewState($id=0){
+        global $_PAGE;
+        $vsid = isset($_SESSION["mgrPageViewSID"]) ? $_SESSION["mgrPageViewSID"] : '';
+        if($vsid!=$this->action) {
+            $_SESSION["mgrPageViewSDATA"] = array(); // new view state
+            $_SESSION["mgrPageViewSID"] = $id>0 ? $id:$this->action; // set id
+        }
+        $_PAGE['vs'] = &$_SESSION["mgrPageViewSDATA"]; // restore viewstate
+    }
 
-	// save page view state - not really necessary,
-	function savePageViewState($id=0){
-		global $_PAGE;
-		$_SESSION["mgrPageViewSDATA"] = $_PAGE['vs'];
-		$_SESSION["mgrPageViewSID"] = $id>0 ? $id:$this->action;
-	}
+    // save page view state - not really necessary,
+    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"])) {		
-			if($this->action==$_SESSION["mgrFormValueId"]) {
-				return true;
-			}
-			else {
-				$this->clearSavedFormValues();
-			}
-		}
-		return false;
-	}	
-	// saved form post from $_POST
-	function saveFormValues($id=0){
-		$_SESSION["mgrFormValues"] = $_POST;
-		$_SESSION["mgrFormValueId"] = $id>0 ? $id:$this->action;
-	}		
-	// load saved form values into $_POST
-	function loadFormValues(){
+    // check for saved form
+    function hasFormValues() {
+        if(isset($_SESSION["mgrFormValueId"])) {		
+            if($this->action==$_SESSION["mgrFormValueId"]) {
+                return true;
+            }
+            else {
+                $this->clearSavedFormValues();
+            }
+        }
+        return false;
+    }	
+    // saved form post from $_POST
+    function saveFormValues($id=0){
+        $_SESSION["mgrFormValues"] = $_POST;
+        $_SESSION["mgrFormValueId"] = $id>0 ? $id:$this->action;
+    }		
+    // load saved form values into $_POST
+    function loadFormValues(){
 		
-		if(!$this->hasFormValues()) return false;
+        if(!$this->hasFormValues()) return false;
 		
-		$p = $_SESSION["mgrFormValues"];
-		$this->clearSavedFormValues();
-		foreach($p as $k=>$v) {
-			$_POST[$k]=$v;
-		}
-		return true;
-	}
-	// clear form post
-	function clearSavedFormValues(){
-		unset($_SESSION["mgrFormValues"]);
-		unset($_SESSION["mgrFormValueId"]);	
-	}
+        $p = $_SESSION["mgrFormValues"];
+        $this->clearSavedFormValues();
+        foreach($p as $k=>$v) {
+            $_POST[$k]=$v;
+        }
+        return true;
+    }
+    // clear form post
+    function clearSavedFormValues(){
+        unset($_SESSION["mgrFormValues"]);
+        unset($_SESSION["mgrFormValueId"]);	
+    }
 	
-	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';
-	}
+    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';
+    }
 	
-	function genV1Hash($password, $seed='1')
-	{ // $seed is user_id basically
-		global $modx;
+    function genV1Hash($password, $seed='1')
+    { // $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);
+        $salt = md5($password . $seed);
 		
-		switch($algorithm)
-		{
-			case 'BLOWFISH_Y':
-				$salt = '$2y$07$' . substr($salt,0,22);
-				break;
-			case 'BLOWFISH_A':
-				$salt = '$2a$07$' . substr($salt,0,22);
-				break;
-			case 'SHA512':
-				$salt = '$6$' . substr($salt,0,16);
-				break;
-			case 'SHA256':
-				$salt = '$5$' . substr($salt,0,16);
-				break;
-			case 'MD5':
-				$salt = '$1$' . substr($salt,0,8);
-				break;
-		}
+        switch($algorithm)
+        {
+            case 'BLOWFISH_Y':
+                $salt = '$2y$07$' . substr($salt,0,22);
+                break;
+            case 'BLOWFISH_A':
+                $salt = '$2a$07$' . substr($salt,0,22);
+                break;
+            case 'SHA512':
+                $salt = '$6$' . substr($salt,0,16);
+                break;
+            case 'SHA256':
+                $salt = '$5$' . substr($salt,0,16);
+                break;
+            case 'MD5':
+                $salt = '$1$' . substr($salt,0,8);
+                break;
+        }
 		
-		if($algorithm!=='UNCRYPT')
-		{
-			$password = sha1($password) . crypt($password,$salt);
-		}
-		else $password = sha1($salt.$password);
+        if($algorithm!=='UNCRYPT')
+        {
+            $password = sha1($password) . crypt($password,$salt);
+        }
+        else $password = sha1($salt.$password);
 		
-		$result = strtolower($algorithm) . '>' . md5($salt.$password) . substr(md5($salt),0,8);
+        $result = strtolower($algorithm) . '>' . md5($salt.$password) . substr(md5($salt),0,8);
 		
-		return $result;
-	}
+        return $result;
+    }
 	
-	function getV1UserHashAlgorithm($uid)
-	{
-		global $modx;
-		$tbl_manager_users = $modx->getFullTableName('manager_users');
-		$rs = $modx->db->select('password',$tbl_manager_users,"id='{$uid}'");
-		$password = $modx->db->getValue($rs);
+    function getV1UserHashAlgorithm($uid)
+    {
+        global $modx;
+        $tbl_manager_users = $modx->getFullTableName('manager_users');
+        $rs = $modx->db->select('password',$tbl_manager_users,"id='{$uid}'");
+        $password = $modx->db->getValue($rs);
 		
-		if(strpos($password,'>')===false) $algo = 'NOSALT';
-		else
-		{
-			$algo = substr($password,0,strpos($password,'>'));
-		}
-		return strtoupper($algo);
-	}
+        if(strpos($password,'>')===false) $algo = 'NOSALT';
+        else
+        {
+            $algo = substr($password,0,strpos($password,'>'));
+        }
+        return strtoupper($algo);
+    }
 	
-	function checkHashAlgorithm($algorithm='')
-	{
-		$result = false;
-		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;
-					}
-					break;
-				case 'BLOWFISH_A':
-					if (defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1) $result = true;
-					break;
-				case 'SHA512':
-					if (defined('CRYPT_SHA512') && CRYPT_SHA512 == 1) $result = true;
-					break;
-				case 'SHA256':
-					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;
-					break;
-				case 'UNCRYPT':
-					$result = true;
-					break;
-			}
-		}
-		return $result;
-	}
+    function checkHashAlgorithm($algorithm='')
+    {
+        $result = false;
+        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;
+                    }
+                    break;
+                case 'BLOWFISH_A':
+                    if (defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1) $result = true;
+                    break;
+                case 'SHA512':
+                    if (defined('CRYPT_SHA512') && CRYPT_SHA512 == 1) $result = true;
+                    break;
+                case 'SHA256':
+                    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;
+                    break;
+                case 'UNCRYPT':
+                    $result = true;
+                    break;
+            }
+        }
+        return $result;
+    }
 
-	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;
-			$_[$file]= md5_file($file);
-		}
-		return serialize($_);
-	}
+    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;
+            $_[$file]= md5_file($file);
+        }
+        return serialize($_);
+    }
 
-	function getModifiedSystemFilesList($check_files, $checksum) {
-		$_ = array();
-		$check_files = trim($check_files);
-		$check_files = explode("\n", $check_files);
-		$checksum = unserialize($checksum);
-		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;
-		}
-		return $_;
-	}
+    function getModifiedSystemFilesList($check_files, $checksum) {
+        $_ = array();
+        $check_files = trim($check_files);
+        $check_files = explode("\n", $check_files);
+        $checksum = unserialize($checksum);
+        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;
+        }
+        return $_;
+    }
 
-	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) . "')";
+    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() {
-		global $modx;
+    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';
+        $current = $this->getSystemChecksum($modx->config['check_files_onlogin']);
+        if(empty($current)) return '0';
 		
-		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 {
-			$result = $this->getModifiedSystemFilesList($modx->config['check_files_onlogin'], $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 {
+            $result = $this->getModifiedSystemFilesList($modx->config['check_files_onlogin'], $modx->config['sys_files_checksum']);
+        } 
 
-		return $result;
-	}
+        return $result;
+    }
 
     function getLastUserSetting($key=false) {
         global $modx;

Spacing +60 added lines, -60 removed lines

@@ -8,7 +8,7 @@ 
 global $_PAGE; // page view state object. Usage $_PAGE['vs']['propertyname'] = $value;
 
 // Content manager wrapper class
-class ManagerAPI {
+class ManagerAPI{
 	
 	var $action; // action directive
 
@@ -17,27 +17,27 @@ 
 		$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) {
+		if ($vsid != $this->action) {
 			$_SESSION["mgrPageViewSDATA"] = array(); // new view state
-			$_SESSION["mgrPageViewSID"] = $id>0 ? $id:$this->action; // set id
+			$_SESSION["mgrPageViewSID"] = $id > 0 ? $id : $this->action; // set id
 		}
 		$_PAGE['vs'] = &$_SESSION["mgrPageViewSDATA"]; // restore viewstate
 	}
 
 	// 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;
+		$_SESSION["mgrPageViewSID"] = $id > 0 ? $id : $this->action;
 	}
 	
 	// check for saved form
-	function hasFormValues() {
-		if(isset($_SESSION["mgrFormValueId"])) {		
-			if($this->action==$_SESSION["mgrFormValueId"]) {
+	function hasFormValues(){
+		if (isset($_SESSION["mgrFormValueId"])) {		
+			if ($this->action == $_SESSION["mgrFormValueId"]) {
 				return true;
 			}
 			else {
@@ -47,19 +47,19 @@ 
 		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;
+		$_SESSION["mgrFormValueId"] = $id > 0 ? $id : $this->action;
 	}		
 	// load saved form values into $_POST
 	function loadFormValues(){
 		
-		if(!$this->hasFormValues()) return false;
+		if (!$this->hasFormValues()) return false;
 		
 		$p = $_SESSION["mgrFormValues"];
 		$this->clearSavedFormValues();
-		foreach($p as $k=>$v) {
-			$_POST[$k]=$v;
+		foreach ($p as $k=>$v) {
+			$_POST[$k] = $v;
 		}
 		return true;
 	}
@@ -69,50 +69,50 @@ 
 		unset($_SESSION["mgrFormValueId"]);	
 	}
 	
-	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';
+	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';
 	}
 	
-	function genV1Hash($password, $seed='1')
+	function genV1Hash($password, $seed = '1')
 	{ // $seed is user_id basically
 		global $modx;
 		
-		if(isset($modx->config['pwd_hash_algo']) && !empty($modx->config['pwd_hash_algo']))
+		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);
+		$salt = md5($password.$seed);
 		
-		switch($algorithm)
+		switch ($algorithm)
 		{
 			case 'BLOWFISH_Y':
-				$salt = '$2y$07$' . substr($salt,0,22);
+				$salt = '$2y$07$'.substr($salt, 0, 22);
 				break;
 			case 'BLOWFISH_A':
-				$salt = '$2a$07$' . substr($salt,0,22);
+				$salt = '$2a$07$'.substr($salt, 0, 22);
 				break;
 			case 'SHA512':
-				$salt = '$6$' . substr($salt,0,16);
+				$salt = '$6$'.substr($salt, 0, 16);
 				break;
 			case 'SHA256':
-				$salt = '$5$' . substr($salt,0,16);
+				$salt = '$5$'.substr($salt, 0, 16);
 				break;
 			case 'MD5':
-				$salt = '$1$' . substr($salt,0,8);
+				$salt = '$1$'.substr($salt, 0, 8);
 				break;
 		}
 		
-		if($algorithm!=='UNCRYPT')
+		if ($algorithm !== 'UNCRYPT')
 		{
-			$password = sha1($password) . crypt($password,$salt);
+			$password = sha1($password).crypt($password, $salt);
 		}
 		else $password = sha1($salt.$password);
 		
-		$result = strtolower($algorithm) . '>' . md5($salt.$password) . substr(md5($salt),0,8);
+		$result = strtolower($algorithm).'>'.md5($salt.$password).substr(md5($salt), 0, 8);
 		
 		return $result;
 	}
@@ -121,18 +121,18 @@ 
 	{
 		global $modx;
 		$tbl_manager_users = $modx->getFullTableName('manager_users');
-		$rs = $modx->db->select('password',$tbl_manager_users,"id='{$uid}'");
+		$rs = $modx->db->select('password', $tbl_manager_users, "id='{$uid}'");
 		$password = $modx->db->getValue($rs);
 		
-		if(strpos($password,'>')===false) $algo = 'NOSALT';
+		if (strpos($password, '>') === false) $algo = 'NOSALT';
 		else
 		{
-			$algo = substr($password,0,strpos($password,'>'));
+			$algo = substr($password, 0, strpos($password, '>'));
 		}
 		return strtoupper($algo);
 	}
 	
-	function checkHashAlgorithm($algorithm='')
+	function checkHashAlgorithm($algorithm = '')
 	{
 		$result = false;
 		if (!empty($algorithm))
@@ -165,54 +165,54 @@ 
 		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) {
+		foreach ($check_files as $file) {
 			$file = trim($file);
-			$file = MODX_BASE_PATH . $file;
-			if(!is_file($file)) continue;
-			$_[$file]= md5_file($file);
+			$file = MODX_BASE_PATH.$file;
+			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);
 		$checksum = unserialize($checksum);
-		foreach($check_files as $file) {
+		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;
+			$filePath = MODX_BASE_PATH.$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) . "')";
+		$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';
+		if ($current === $modx->config['sys_files_checksum']) $result = '0';
 		else {
 			$result = $this->getModifiedSystemFilesList($modx->config['check_files_onlogin'], $modx->config['sys_files_checksum']);
 		} 
@@ -220,28 +220,28 @@ 
 		return $result;
 	}
 
-    function getLastUserSetting($key=false) {
+    function getLastUserSetting($key = false){
         global $modx;
         
         $rs = $modx->db->select('*', $modx->getFullTableName('user_settings'), "user = '{$_SESSION['mgrInternalKey']}'");
         
-        $usersettings = array ();
+        $usersettings = array();
         while ($row = $modx->db->getRow($rs)) {
-            if(substr($row['setting_name'], 0, 6) == '_LAST_') {
+            if (substr($row['setting_name'], 0, 6) == '_LAST_') {
                 $name = substr($row['setting_name'], 6);
                 $usersettings[$name] = $row['setting_value'];
             }
         }
         
-        if(!$key) return $usersettings;
+        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 (!empty($settings)) {
+            if (!is_array($settings)) $settings = array($settings=>$val);
             
             foreach ($settings as $key => $val) {
                 $f = array();
@@ -256,7 +256,7 @@ 
         }
     }
     
-    function loadDatePicker($path) {
+    function loadDatePicker($path){
         global $modx;
         include_once($path);
         $dp = new DATEPICKER();

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

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

@@ -234,7 +234,7 @@
         }
         
         if(!$key) return $usersettings;
-        else return isset($usersettings[$key]) ? $usersettings[$key] : NULL;
+        else return isset($usersettings[$key]) ? $usersettings[$key] : null;
     }
     
     function saveLastUserSetting($settings, $val='') {

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

Doc Comments +30 added lines

@@ -45,6 +45,10 @@ 
         return $value;
     }
     
+    /**
+     * @param string $mode
+     * @param string $modifiers
+     */
     function _getDelim($mode,$modifiers) {
         $c = substr($modifiers,0,1);
         if(!in_array($c, array('"', "'", '`')) ) return false;
@@ -56,6 +60,11 @@ 
         return  $c;
     }
     
+    /**
+     * @param string $mode
+     * @param false|string $delim
+     * @param string $modifiers
+     */
     function _getOpt($mode,$delim,$modifiers) {
         if($delim) {
             if($mode=='(') return substr($modifiers,1,strpos($modifiers, $delim . ')' )-1);
@@ -74,6 +83,14 @@ 
             return $opt;
         }
     }
+
+    /**
+     * @param string $mode
+     * @param false|string $delim
+     * @param string $modifiers
+     *
+     * @return string
+     */
     function _getRemainModifiers($mode,$delim,$modifiers) {
         if($delim) {
             if($mode=='(')
@@ -101,6 +118,9 @@ 
         return substr($string,strpos($string, $delim)+$len);
     }
     
+    /**
+     * @param string $modifiers
+     */
     function splitEachModifiers($modifiers) {
         global $modx;
         
@@ -234,6 +254,9 @@ 
         else                  return true;
     }
     
+    /**
+     * @param string $cmd
+     */
     function getValueFromPreset($key, $value, $cmd, $opt)
     {
         global $modx;
@@ -920,6 +943,9 @@ 
         return $value;
     }
 
+    /**
+     * @param string $cmd
+     */
     function includeMdfFile($cmd) {
         global $modx;
         $key = $this->key;
@@ -1075,6 +1101,10 @@ 
     }
     
     // Sets a placeholder variable which can only be access by Modifiers
+
+    /**
+     * @param string $value
+     */
     function setModifiersVariable($key, $value) {
         if ($key != 'phx' && $key != 'dummy') $this->placeholders[$key] = $value;
     }

Indentation +2 added lines, -2 removed lines

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

Spacing +342 added lines, -342 removed lines

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

Braces +543 added lines, -281 removed lines

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

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

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

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

Doc Comments +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
      * @param string $header The message headers
      * @param string $body   The message body
      * 
-     * @return bool
+     * @return boolean|null
      */
     public function MailSend($header, $body)
     {

Unused Use Statements +1 added lines, -1 removed lines

@@ -8,8 +8,8 @@
  *******************************************************
  */
 
-use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\Exception;
+use PHPMailer\PHPMailer\PHPMailer;
 
 require MODX_MANAGER_PATH . 'includes/controls/phpmailer/Exception.php';
 require MODX_MANAGER_PATH . 'includes/controls/phpmailer/PHPMailer.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, '<>');
     }
 }

Braces +12 added lines, -6 removed lines

@@ -276,14 +276,16 @@ 
     /**
      * @return string
      */
-    public function getMIMEHeader() {
+    public function getMIMEHeader()
+    {
         return $this->MIMEHeader;
     }
 
     /**
      * @return string
      */
-    public function getMIMEBody() {
+    public function getMIMEBody()
+    {
         return $this->MIMEBody;
     }
 
@@ -292,7 +294,8 @@ 
      * 
      * @return $this
      */
-    public function setMIMEHeader($header = '') {
+    public function setMIMEHeader($header = '')
+    {
         $this->MIMEHeader = $header;
 
         return $this;
@@ -303,7 +306,8 @@ 
      * 
      * @return $this
      */
-    public function setMIMEBody($body = '') {
+    public function setMIMEBody($body = '')
+    {
         $this->MIMEBody = $body;
 
         return $this;
@@ -314,7 +318,8 @@ 
      * 
      * @return $this
      */
-    public function setMailHeader($header = '') {
+    public function setMailHeader($header = '')
+    {
         $this->mailHeader = $header;
 
         return $this;
@@ -323,7 +328,8 @@ 
     /**
      * @return string
      */
-    public function getMessageID() {
+    public function getMessageID()
+    {
         return trim($this->lastMessageID,'<>');
     }
 }