evolution-cms / evolution

manager/includes/error.class.inc.php

Spacing +3 added lines, -3 removed lines

@@ -71,11 +71,11 @@
         }
 
         if ($context === 'common') {
-            $lang_path = MODX_MANAGER_PATH . 'includes/lang/';
+            $lang_path = MODX_MANAGER_PATH.'includes/lang/';
         } else {
-            $lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
+            $lang_path = MODX_MANAGER_PATH."includes/lang/{$context}/";
         }
-        include_once($lang_path . 'english.inc.php');
+        include_once($lang_path.'english.inc.php');
         $manager_language = $modx->config['manager_language'];
         if (is_file("{$lang_path}{$manager_language}.inc.php")) {
             include_once("{$lang_path}{$manager_language}.inc.php");

manager/includes/protect.inc.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 }
 
 global $sanitize_seed;
-$sanitize_seed = 'sanitize_seed_' . base_convert(md5(__FILE__), 16, 36);
+$sanitize_seed = 'sanitize_seed_'.base_convert(md5(__FILE__), 16, 36);
 
 // sanitize array
 if (!function_exists('modx_sanitize_gpc')) {

manager/includes/extenders/ex_dbapi.inc.php

Spacing +4 added lines, -4 removed lines

@@ -11,12 +11,12 @@
 
 $out = false;
 $class = 'DBAPI';
-if( ! class_exists($class)){
-    include_once MODX_MANAGER_PATH . 'includes/extenders/dbapi.' . $database_type . '.class.inc.php';
+if (!class_exists($class)) {
+    include_once MODX_MANAGER_PATH.'includes/extenders/dbapi.'.$database_type.'.class.inc.php';
 }
 
-if(class_exists($class)){
-    $this->db= new $class;
+if (class_exists($class)) {
+    $this->db = new $class;
     $out = true;
 }
 

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

Spacing +14 added lines, -14 removed lines

@@ -144,33 +144,33 @@ 
             $algorithm = 'UNCRYPT';
         }
 
-        $salt = md5($password . $seed);
+        $salt = md5($password.$seed);
 
         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') {
-            $password = sha1($password) . crypt($password, $salt);
+            $password = sha1($password).crypt($password, $salt);
         } else {
-            $password = sha1($salt . $password);
+            $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;
     }
@@ -252,7 +252,7 @@ 
         $check_files = explode("\n", $check_files);
         foreach ($check_files as $file) {
             $file = trim($file);
-            $file = MODX_BASE_PATH . $file;
+            $file = MODX_BASE_PATH.$file;
             if (!is_file($file)) {
                 continue;
             }
@@ -275,7 +275,7 @@ 
         $checksum = unserialize($checksum);
         foreach ($check_files as $file) {
             $file = trim($file);
-            $filePath = MODX_BASE_PATH . $file;
+            $filePath = MODX_BASE_PATH.$file;
             if (!is_file($filePath)) {
                 continue;
             }
@@ -294,7 +294,7 @@ 
     {
         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);
     }
 
@@ -371,10 +371,10 @@ 
             foreach ($settings as $key => $val) {
                 $f = array();
                 $f['user'] = $_SESSION['mgrInternalKey'];
-                $f['setting_name'] = '_LAST_' . $key;
+                $f['setting_name'] = '_LAST_'.$key;
                 $f['setting_value'] = $val;
                 $f = $modx->db->escape($f);
-                $f = "(`" . implode("`, `", array_keys($f)) . "`) VALUES('" . implode("', '", array_values($f)) . "')";
+                $f = "(`".implode("`, `", array_keys($f))."`) VALUES('".implode("', '", array_values($f))."')";
                 $f .= " ON DUPLICATE KEY UPDATE setting_value = VALUES(setting_value)";
                 $modx->db->insert($f, $modx->getFullTableName('user_settings'));
             }

manager/includes/extenders/ex_phpcompat.inc.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
     return true;
 }
 
-if (!include_once(MODX_MANAGER_PATH . 'includes/extenders/phpcompat.class.inc.php')) {
+if (!include_once(MODX_MANAGER_PATH.'includes/extenders/phpcompat.class.inc.php')) {
     return false;
 } else {
     $this->phpcompat = new PHPCOMPAT;

manager/includes/extenders/ex_export_site.inc.php

Spacing +1 added lines, -1 removed lines

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

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

Spacing +14 added lines, -14 removed lines

@@ -57,7 +57,7 @@ 
         $this->count = 0;
         $this->setUrlMode();
         $this->generate_mode = 'crawl';
-        $this->targetDir = $modx->config['base_path'] . 'temp/export';
+        $this->targetDir = $modx->config['base_path'].'temp/export';
         if (!isset($this->total)) {
             $this->getTotal();
         }
@@ -112,7 +112,7 @@ 
 
         $ignore_ids = array_filter(array_map('intval', explode(',', $ignore_ids)));
         if (count($ignore_ids) > 0) {
-            $ignore_ids = "AND NOT id IN ('" . implode("','", $ignore_ids) . "')";
+            $ignore_ids = "AND NOT id IN ('".implode("','", $ignore_ids)."')";
         } else {
             $ignore_ids = '';
         }
@@ -122,7 +122,7 @@ 
         $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 = (int)$modx->db->getValue($rs);
+        $this->total = (int) $modx->db->getValue($rs);
 
         return $this->total;
     }
@@ -151,7 +151,7 @@ 
         } elseif (!is_readable($directory)) {
             return $rs;
         } else {
-            $files = glob($directory . '/*');
+            $files = glob($directory.'/*');
             if (!empty($files)) {
                 foreach ($files as $path) {
                     $rs = is_dir($path) ? $this->removeDirectoryAll($path) : unlink($path);
@@ -180,7 +180,7 @@ 
 
             $_lang = $back_lang;
         } else {
-            $src = $this->curl_get_contents(MODX_SITE_URL . "index.php?id={$docid}");
+            $src = $this->curl_get_contents(MODX_SITE_URL."index.php?id={$docid}");
         }
 
 
@@ -215,12 +215,12 @@ 
         global $modx;
 
         if ($alias === '') {
-            $filename = $prefix . $docid . $suffix;
+            $filename = $prefix.$docid.$suffix;
         } else {
             if ($modx->config['suffix_mode'] === '1' && strpos($alias, '.') !== false) {
                 $suffix = '';
             }
-            $filename = $prefix . $alias . $suffix;
+            $filename = $prefix.$alias.$suffix;
         }
 
         return $filename;
@@ -238,7 +238,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'];
@@ -248,7 +248,7 @@ 
 
         $ph['status'] = 'fail';
         $ph['msg1'] = $_lang['export_site_failed'];
-        $ph['msg2'] = $_lang["export_site_failed_no_write"] . ' - ' . $dirpath;
+        $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"];
@@ -281,7 +281,7 @@ 
 
             if (!$row['wasNull']) { // needs writing a document
                 $docname = $this->getFileName($row['id'], $row['alias'], $prefix, $suffix);
-                $filename = $dirpath . $docname;
+                $filename = $dirpath.$docname;
                 if (!is_file($filename)) {
                     if ($row['published'] === '1') {
                         $status = $this->makeFile($row['id'], $filename);
@@ -309,7 +309,7 @@ 
             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;
+                $dir_path = $dirpath.$end_dir;
                 if (strpos($dir_path, MODX_BASE_PATH) === false) {
                     return false;
                 }
@@ -325,7 +325,7 @@ 
 
                 if ($modx->config['make_folders'] === '1' && $row['published'] === '1') {
                     if (!empty($filename) && is_file($filename)) {
-                        rename($filename, $dir_path . '/index.html');
+                        rename($filename, $dir_path.'/index.html');
                     }
                 }
                 $this->targetDir = $dir_path;
@@ -349,8 +349,8 @@ 
 
         $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_TIMEOUT, $timeout);

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

Spacing +32 added lines, -32 removed lines

@@ -30,7 +30,7 @@ 
         $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'];
@@ -70,7 +70,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'
                         ));
@@ -85,8 +85,8 @@ 
             $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;
@@ -119,7 +119,7 @@ 
         if (1000 < $safeCount) {
             exit("Too many loops '{$safeCount}'");
         }
-        if ( ! ($this->conn instanceof mysqli)) {
+        if (!($this->conn instanceof mysqli)) {
             $this->connect();
         }
         if (is_array($s)) {
@@ -145,7 +145,7 @@ 
     public function query($sql, $watchError = true)
     {
         global $modx;
-        if ( ! ($this->conn instanceof mysqli)) {
+        if (!($this->conn instanceof mysqli)) {
             $this->connect();
         }
         $tStart = $modx->getMicroTime();
@@ -165,7 +165,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();
@@ -179,24 +179,24 @@ 
                     $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>';
+                $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>';
+                    $modx->queryCode .= 'Current Event  => '.$modx->event->name.'<br>';
                 }
                 if ($modx->event->activePlugin) {
-                    $modx->queryCode .= 'Current Plugin => ' . $modx->event->activePlugin . '<br>';
+                    $modx->queryCode .= 'Current Plugin => '.$modx->event->activePlugin.'<br>';
                 }
                 if ($modx->currentSnippet) {
-                    $modx->queryCode .= 'Current Snippet => ' . $modx->currentSnippet . '<br>';
+                    $modx->queryCode .= 'Current Snippet => '.$modx->currentSnippet.'<br>';
                 }
                 if (stripos($sql, 'select') === 0) {
-                    $modx->queryCode .= 'Record Count => ' . $this->getRecordCount($result) . '<br>';
+                    $modx->queryCode .= 'Record Count => '.$this->getRecordCount($result).'<br>';
                 } else {
-                    $modx->queryCode .= 'Affected Rows => ' . $this->getAffectedRows() . '<br>';
+                    $modx->queryCode .= 'Affected Rows => '.$this->getAffectedRows().'<br>';
                 }
-                $modx->queryCode .= 'Functions Path => ' . $debug_path . '<br>';
+                $modx->queryCode .= 'Functions Path => '.$debug_path.'<br>';
                 $modx->queryCode .= "</fieldset><br />";
             }
             $modx->executedQueries++;
@@ -303,9 +303,9 @@ 
                     if ($value === null || strtolower($value) === 'null') {
                         $f = 'NULL';
                     } else {
-                        $f = "'" . $value . "'";
+                        $f = "'".$value."'";
                     }
-                    $fields[$key] = "`{$key}` = " . $f;
+                    $fields[$key] = "`{$key}` = ".$f;
                 }
                 $fields = implode(',', $fields);
             }
@@ -340,12 +340,12 @@ 
                 $this->query("INSERT INTO {$intotable} {$fields}");
             } else {
                 if (empty($fromtable)) {
-                    $fields = "(`" . implode("`, `", array_keys($fields)) . "`) VALUES('" . implode("', '",
-                            array_values($fields)) . "')";
+                    $fields = "(`".implode("`, `", array_keys($fields))."`) VALUES('".implode("', '",
+                            array_values($fields))."')";
                     $this->query("INSERT INTO {$intotable} {$fields}");
                 } else {
                     $fromtable = $this->replaceFullTableName($fromtable);
-                    $fields = "(" . implode(",", array_keys($fields)) . ")";
+                    $fields = "(".implode(",", array_keys($fields)).")";
                     $where = trim($where);
                     $limit = trim($limit);
                     if ($where !== '' && stripos($where, 'WHERE') !== 0) {
@@ -439,8 +439,8 @@ 
      */
     public function getInsertId($conn = null)
     {
-        if (! ($conn instanceof mysqli)) {
-            $conn =& $this->conn;
+        if (!($conn instanceof mysqli)) {
+            $conn = & $this->conn;
         }
 
         return $conn->insert_id;
@@ -452,8 +452,8 @@ 
      */
     public function getAffectedRows($conn = null)
     {
-        if (! ($conn instanceof mysqli)) {
-            $conn =& $this->conn;
+        if (!($conn instanceof mysqli)) {
+            $conn = & $this->conn;
         }
 
         return $conn->affected_rows;
@@ -465,8 +465,8 @@ 
      */
     public function getLastError($conn = null)
     {
-        if (! ($conn instanceof mysqli)) {
-            $conn =& $this->conn;
+        if (!($conn instanceof mysqli)) {
+            $conn = & $this->conn;
         }
 
         return $conn->error;
@@ -490,7 +490,7 @@ 
     {
         $out = false;
         if ($ds instanceof mysqli_result) {
-            switch($mode){
+            switch ($mode) {
                 case 'assoc':
                     $out = $ds->fetch_assoc();
                     break;
@@ -520,7 +520,7 @@ 
     public function getColumn($name, $dsq)
     {
         $col = array();
-        if ( ! ($dsq instanceof mysqli_result)) {
+        if (!($dsq instanceof mysqli_result)) {
             $dsq = $this->query($dsq);
         }
         if ($dsq) {
@@ -539,7 +539,7 @@ 
     public function getColumnNames($dsq)
     {
         $names = array();
-        if ( ! ($dsq instanceof mysqli_result)) {
+        if (!($dsq instanceof mysqli_result)) {
             $dsq = $this->query($dsq);
         }
         if ($dsq) {
@@ -559,7 +559,7 @@ 
     public function getValue($dsq)
     {
         $out = false;
-        if ( ! ($dsq instanceof mysqli_result)) {
+        if (!($dsq instanceof mysqli_result)) {
             $dsq = $this->query($dsq);
         }
         if ($dsq) {
@@ -657,7 +657,7 @@ 
         $tableName = trim($tableName);
         $dbase = trim($this->config['dbase'], '`');
         $prefix = $this->config['table_prefix'];
-        if ((bool)$force === true) {
+        if ((bool) $force === true) {
             $result = "`{$dbase}`.`{$prefix}{$tableName}`";
         } elseif (strpos($tableName, '[+prefix+]') !== false) {
             $result = preg_replace('@\[\+prefix\+\]([0-9a-zA-Z_]+)@', "`{$dbase}`.`{$prefix}$1`", $tableName);

manager/includes/extenders/ex_phpass.inc.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
     return true;
 }
 
-if (!include_once(MODX_MANAGER_PATH . 'includes/extenders/phpass.class.inc.php')) {
+if (!include_once(MODX_MANAGER_PATH.'includes/extenders/phpass.class.inc.php')) {
     return false;
 } else {
     $this->phpass = new PasswordHash;