evolution-cms / evolution

manager/includes/footer.inc.php

Indentation +12 added lines, -12 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 global $SystemAlertMsgQueque;
 // display system alert window if messages are available
 if(count($SystemAlertMsgQueque) > 0) {
-	include "sysalert.display.inc.php";
+    include "sysalert.display.inc.php";
 }
 ?>
 <script type='text/javascript'>
@@ -19,17 +19,17 @@ 
 </script>
 <?php
 if(in_array($modx->getManagerApi()->action, array(
-	85,
-	27,
-	4,
-	72,
-	13,
-	11,
-	12,
-	87,
-	88
+    85,
+    27,
+    4,
+    72,
+    13,
+    11,
+    12,
+    87,
+    88
 ))) {
-	echo $modx->getManagerApi()->loadDatePicker($modx->config['mgr_date_picker_path']);
+    echo $modx->getManagerApi()->loadDatePicker($modx->config['mgr_date_picker_path']);
 }
 ?>
 </body>

Spacing +3 added lines, -3 removed lines

@@ -1,10 +1,10 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 global $SystemAlertMsgQueque;
 // display system alert window if messages are available
-if(count($SystemAlertMsgQueque) > 0) {
+if (count($SystemAlertMsgQueque) > 0) {
 	include "sysalert.display.inc.php";
 }
 ?>
@@ -18,7 +18,7 @@ 
 	});
 </script>
 <?php
-if(in_array($modx->getManagerApi()->action, array(
+if (in_array($modx->getManagerApi()->action, array(
 	85,
 	27,
 	4,

manager/includes/sysalert.display.inc.php

Indentation +20 added lines, -20 removed lines

@@ -1,30 +1,30 @@ 
 <?php
 
-	/**
-	 *	System Alert Message Queue Display file
-	 *	Written By Raymond Irving, April, 2005
-	 *
-	 *	Used to display system alert messages inside the browser
-	 *
-	 */
+    /**
+     *	System Alert Message Queue Display file
+     *	Written By Raymond Irving, April, 2005
+     *
+     *	Used to display system alert messages inside the browser
+     *
+     */
 
-	require_once(dirname(__FILE__).'/protect.inc.php');
+    require_once(dirname(__FILE__).'/protect.inc.php');
 
-	$sysMsgs = "";
-	$limit = count($SystemAlertMsgQueque);
-	for($i=0;$i<$limit;$i++) {
-		$sysMsgs .= $SystemAlertMsgQueque[$i]."<hr sys/>";
-	}
-	// reset message queque
-	unset($_SESSION['SystemAlertMsgQueque']);
-	$_SESSION['SystemAlertMsgQueque'] = array();
-	$SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
+    $sysMsgs = "";
+    $limit = count($SystemAlertMsgQueque);
+    for($i=0;$i<$limit;$i++) {
+        $sysMsgs .= $SystemAlertMsgQueque[$i]."<hr sys/>";
+    }
+    // reset message queque
+    unset($_SESSION['SystemAlertMsgQueque']);
+    $_SESSION['SystemAlertMsgQueque'] = array();
+    $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
 
-	if($sysMsgs!="") {
+    if($sysMsgs!="") {
 ?>
 
 <?php // fetch the styles
-	echo '<link rel="stylesheet" type="text/css" href="'.MODX_MANAGER_URL.'media/style/'.$manager_theme.'/style.css'.'" />';
+    echo '<link rel="stylesheet" type="text/css" href="'.MODX_MANAGER_URL.'media/style/'.$manager_theme.'/style.css'.'" />';
 ?>
 <script type="text/javascript">
 // <![CDATA[
@@ -42,5 +42,5 @@ 
 // ]]>
 </script>
 <?php
-	}
+    }
 ?>

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 
 	$sysMsgs = "";
 	$limit = count($SystemAlertMsgQueque);
-	for($i=0;$i<$limit;$i++) {
+	for ($i = 0; $i < $limit; $i++) {
 		$sysMsgs .= $SystemAlertMsgQueque[$i]."<hr sys/>";
 	}
 	// reset message queque
@@ -20,7 +20,7 @@ 
 	$_SESSION['SystemAlertMsgQueque'] = array();
 	$SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
 
-	if($sysMsgs!="") {
+	if ($sysMsgs != "") {
 ?>
 
 <?php // fetch the styles
@@ -32,7 +32,7 @@ 
 			var sysAlert = new Element('div').setProperties({
 				'class': 'sysAlert'
 			});
-			sysAlert.innerHTML = '<?php echo $modx->getDatabase()->escape($sysMsgs);?>';
+			sysAlert.innerHTML = '<?php echo $modx->getDatabase()->escape($sysMsgs); ?>';
 			var boxHtml = new MooPrompt('<?php echo $_lang['sys_alert']; ?>', sysAlert, {
 				buttons: 1,
 				button1: 'Ok',

manager/includes/src/Legacy/ManagerApi.php

Braces +4 added lines, -2 removed lines

@@ -116,7 +116,8 @@ 
      * @return string
      */
     public function getHashType($db_value = '')
-    { // md5 | v1 | phpass
+    {
+// md5 | v1 | phpass
         $c = substr($db_value, 0, 1);
         if ($c === '$') {
             return 'phpass';
@@ -135,7 +136,8 @@ 
      * @return string
      */
     public function genV1Hash($password, $seed = '1')
-    { // $seed is user_id basically
+    {
+// $seed is user_id basically
         $modx = evolutionCMS();
 
         if (isset($modx->config['pwd_hash_algo']) && !empty($modx->config['pwd_hash_algo'])) {

Spacing +14 added lines, -14 removed lines

@@ -146,33 +146,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;
     }
@@ -254,7 +254,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;
             }
@@ -277,7 +277,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;
             }
@@ -296,7 +296,7 @@ 
     {
         $modx = evolutionCMS();
         $tbl_system_settings = $modx->getDatabase()->getFullTableName('system_settings');
-        $sql = "REPLACE INTO {$tbl_system_settings} (setting_name, setting_value) VALUES ('sys_files_checksum','" . $modx->getDatabase()->escape($checksum) . "')";
+        $sql = "REPLACE INTO {$tbl_system_settings} (setting_name, setting_value) VALUES ('sys_files_checksum','".$modx->getDatabase()->escape($checksum)."')";
         $modx->getDatabase()->query($sql);
     }
 
@@ -373,10 +373,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->getDatabase()->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->getDatabase()->insert($f, $modx->getDatabase()->getFullTableName('user_settings'));
             }

manager/includes/src/Legacy/ExportSite.php

Braces +4 added lines, -2 removed lines

@@ -279,7 +279,8 @@ 
             $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)) {
@@ -307,7 +308,8 @@ 
                 $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
+                        '.') === 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) {

Spacing +14 added lines, -14 removed lines

@@ -59,7 +59,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();
         }
@@ -114,7 +114,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 = '';
         }
@@ -124,7 +124,7 @@ 
         $noncache = ($noncache == 1) ? '' : 'AND cacheable=1';
         $where = "deleted=0 AND ((published=1 AND type='document') OR (isfolder=1)) {$noncache} {$ignore_ids}";
         $rs = $modx->getDatabase()->select('count(id)', $tbl_site_content, $where);
-        $this->total = (int)$modx->getDatabase()->getValue($rs);
+        $this->total = (int) $modx->getDatabase()->getValue($rs);
 
         return $this->total;
     }
@@ -153,7 +153,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);
@@ -182,7 +182,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}");
         }
 
 
@@ -217,12 +217,12 @@ 
         $modx = evolutionCMS();
 
         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;
@@ -240,7 +240,7 @@ 
         $tbl_site_content = $modx->getDatabase()->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'];
@@ -250,7 +250,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"];
@@ -283,7 +283,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);
@@ -311,7 +311,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;
                 }
@@ -327,7 +327,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;
@@ -351,8 +351,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/src/Legacy/Permissions.php

Spacing +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
         $role = $this->role;
 
         if ($role == 1) {
-            return true;  // administrator - grant all document permissions
+            return true; // administrator - grant all document permissions
         }
 
         if ($modx->config['use_udperms'] == 0 || $modx->config['use_udperms'] == "" || !isset($modx->config['use_udperms'])) {
@@ -66,14 +66,14 @@ 
             are private to the manager users will not be private to web users if the
             document group is not assigned to a web user group and visa versa.
          */
-        $permissionsok = false;  // set permissions to false
+        $permissionsok = false; // set permissions to false
 
         $rs = $modx->getDatabase()->select(
             'count(DISTINCT sc.id)',
             "{$tblsc} AS sc 
 				LEFT JOIN {$tbldg} AS dg on dg.document = sc.id 
 				LEFT JOIN {$tbldgn} dgn ON dgn.id = dg.document_group",
-            "sc.id='{$this->document}' AND (" . (empty($docgrp) ? '' : "dg.document_group = " . $docgrp . " ||") . " sc.privatemgr = 0)"
+            "sc.id='{$this->document}' AND (".(empty($docgrp) ? '' : "dg.document_group = ".$docgrp." ||")." sc.privatemgr = 0)"
         );
         $limit = $modx->getDatabase()->getValue($rs);
         if ($limit == 1) {

manager/includes/src/Legacy/DeprecatedCore.php

Indentation +4 added lines, -4 removed lines

@@ -5,10 +5,10 @@
 class DeprecatedCore implements DeprecatedCoreInterface
 {
     /**
-    * @deprecated
-    *
-    * return @void
-    */
+     * @deprecated
+     *
+     * return @void
+     */
     public function dbConnect()
     {
         $modx = evolutionCMS();

Spacing +7 added lines, -7 removed lines

@@ -119,16 +119,16 @@ 
         for ($i = 0; $i < $tablevel; $i++) {
             $tabs .= "\t";
         }
-        $listhtml = $ordered == true ? $tabs . "<ol class='$ulroot'$typestr>\n" : $tabs . "<ul class='$ulroot'$typestr>\n";
+        $listhtml = $ordered == true ? $tabs."<ol class='$ulroot'$typestr>\n" : $tabs."<ul class='$ulroot'$typestr>\n";
         foreach ($array as $key => $value) {
             if (is_array($value)) {
-                $listhtml .= $tabs . "\t<li>" . $key . "\n" . $this->makeList($value, $ulprefix . $ulroot, $ulprefix,
-                        $type, $ordered, $tablevel + 2) . $tabs . "\t</li>\n";
+                $listhtml .= $tabs."\t<li>".$key."\n".$this->makeList($value, $ulprefix.$ulroot, $ulprefix,
+                        $type, $ordered, $tablevel + 2).$tabs."\t</li>\n";
             } else {
-                $listhtml .= $tabs . "\t<li>" . $value . "</li>\n";
+                $listhtml .= $tabs."\t<li>".$value."</li>\n";
             }
         }
-        $listhtml .= $ordered == true ? $tabs . "</ol>\n" : $tabs . "</ul>\n";
+        $listhtml .= $ordered == true ? $tabs."</ol>\n" : $tabs."</ul>\n";
 
         return $listhtml;
     }
@@ -299,9 +299,9 @@ 
         $msg = addslashes($modx->getDatabase()->escape($msg));
         if (substr(strtolower($url), 0, 11) == "javascript:") {
             $act = "__WebAlert();";
-            $fnc = "function __WebAlert(){" . substr($url, 11) . "};";
+            $fnc = "function __WebAlert(){".substr($url, 11)."};";
         } else {
-            $act = ($url ? "window.location.href='" . addslashes($url) . "';" : "");
+            $act = ($url ? "window.location.href='".addslashes($url)."';" : "");
         }
         $html = "<script>$fnc window.setTimeout(\"alert('$msg');$act\",100);</script>";
         if ($modx->isFrontend()) {

Braces +2 added lines, -1 removed lines

@@ -177,7 +177,8 @@
      * @return bool|string
      */
     public function putChunk($chunkName)
-    { // alias name >.<
+    {
+// alias name >.<
         $modx = evolutionCMS();
 
         return $modx->getChunk($chunkName);

manager/includes/src/Legacy/PasswordHash.php

Spacing +4 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
 
         $this->portable_hashes = $portable_hashes;
 
-        $this->random_state = microtime() . uniqid(mt_rand(), true);
+        $this->random_state = microtime().uniqid(mt_rand(), true);
     }
 
     /**
@@ -68,7 +68,7 @@ 
             $output = '';
             for ($i = 0; $i < $count; $i += 16) {
                 $this->random_state =
-                    md5(microtime() . $this->random_state);
+                    md5(microtime().$this->random_state);
                 $output .=
                     pack('H*', md5($this->random_state));
             }
@@ -160,9 +160,9 @@ 
         // consequently in lower iteration counts and hashes that are
         // quicker to crack (by non-PHP code).
 
-        $hash = md5($salt . $password, true);
+        $hash = md5($salt.$password, true);
         do {
-            $hash = md5($hash . $password, true);
+            $hash = md5($hash.$password, true);
         } while (--$count);
 
         $output = substr($setting, 0, 12);

manager/includes/src/Legacy/ModuleCategoriesManager.php

Spacing +5 added lines, -5 removed lines

@@ -85,8 +85,8 @@ 
     {
         global $_lang, $_style;
 
-        $filename = trim($view_name) . '.tpl.phtml';
-        $file = self::get('views_dir') . $filename;
+        $filename = trim($view_name).'.tpl.phtml';
+        $file = self::get('views_dir').$filename;
         $view = &$this;
 
         if (is_file($file)
@@ -111,14 +111,14 @@ 
     {
 
         $_update = array(
-            'id'       => (int)$element_id,
-            'category' => (int)$category_id
+            'id'       => (int) $element_id,
+            'category' => (int) $category_id
         );
 
         $this->getDatabase()->update(
             $_update,
             $this->db_tbl[$element],
-            "`id` = '" . (int)$element_id . "'"
+            "`id` = '".(int) $element_id."'"
         );
 
         return $this->getDatabase()->getAffectedRows() === 1;

manager/includes/src/Exceptions/ServiceNotFoundException.php

Braces +3 added lines, -1 removed lines

@@ -2,4 +2,6 @@
 
 use Exception;
 
-class ServiceNotFoundException extends Exception{}
+class ServiceNotFoundException extends Exception
+{
+}