evolution-cms / evolution

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

Spacing +33 added lines, -33 removed lines

@@ -7,53 +7,53 @@ 
  *

  */

 

-Class TemplateParser {

+Class TemplateParser{

 

     /**

 	 * @param array $config [action, tabs, toArray]

 	 * @param array $data

 	 * @return string

 	 */

-	public function output($config = array(), $data = array()) {

+	public function output($config = array(), $data = array()){

 		global $modx;

 

 		$output = '';

 		$action = !empty($config['action']) ? $config['action'] : (!empty($_REQUEST['a']) ? $_REQUEST['a'] : '');

-		$tab = isset($config['tab']) ? ' AND tab IN(' . $config['tab'] . ')' : '';

+		$tab = isset($config['tab']) ? ' AND tab IN('.$config['tab'].')' : '';

 

-		if($action) {

+		if ($action) {

 			$sql = $modx->db->query('SELECT t1.*, IF(t1.alias=\'\',t1.name,t1.alias) AS alias, t2.category AS category_name

-			FROM ' . $modx->getFullTableName('system_templates') . ' AS t1

-			INNER JOIN ' . $modx->getFullTableName('categories') . ' AS t2 ON t2.id=t1.category

-			WHERE t1.action IN(' . $action . ') ' . $tab . '

+			FROM ' . $modx->getFullTableName('system_templates').' AS t1

+			INNER JOIN ' . $modx->getFullTableName('categories').' AS t2 ON t2.id=t1.category

+			WHERE t1.action IN(' . $action.') '.$tab.'

 			ORDER BY t1.tab ASC, t1.rank ASC');

 

-			if($modx->db->getRecordCount($sql)) {

+			if ($modx->db->getRecordCount($sql)) {

 				$tabs = array();

-				while($row = $modx->db->getRow($sql)) {

-					if(!$row['value'] && !empty($data[$row['name']])) {

+				while ($row = $modx->db->getRow($sql)) {

+					if (!$row['value'] && !empty($data[$row['name']])) {

 						$row['value'] = $data[$row['name']];

 					}

 					$tabs[$row['tab']]['category_name'] = $row['category_name'];

 					$tabs[$row['tab']][$row['name']] = TemplateParser::render($row);

 				}

 

-				if(!empty($config['toArray'])) {

+				if (!empty($config['toArray'])) {

 					$output = $tabs;

 				} else {

-					$output .= '<div class="tab-pane" id="pane_' . $action . '">';

+					$output .= '<div class="tab-pane" id="pane_'.$action.'">';

 					$output .= '

 					<script type="text/javascript">

-						var pane_' . $action . ' = new WebFXTabPane(document.getElementById("pane_' . $action . '"), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . ');

+						var pane_' . $action.' = new WebFXTabPane(document.getElementById("pane_'.$action.'"), '.($modx->config['remember_last_tab'] == 1 ? 'true' : 'false').');

 					</script>';

 

-					foreach($tabs as $idTab => $tab) {

-						$output .= '<div class="tab-page" id="tab_' . $action . '_' . $idTab . '">';

+					foreach ($tabs as $idTab => $tab) {

+						$output .= '<div class="tab-page" id="tab_'.$action.'_'.$idTab.'">';

 						$output .= '

-						<h2 class="tab">' . (!empty($config['tabs'][$idTab]) ? $config['tabs'][$idTab] : $tab['category_name']) . '</h2>

-						<script type="text/javascript">pane_' . $action . '.addTabPage(document.getElementById("tab_' . $action . '_' . $idTab . '"));</script>';

+						<h2 class="tab">' . (!empty($config['tabs'][$idTab]) ? $config['tabs'][$idTab] : $tab['category_name']).'</h2>

+						<script type="text/javascript">pane_' . $action.'.addTabPage(document.getElementById("tab_'.$action.'_'.$idTab.'"));</script>';

 						unset($tab['category_name']);

-						foreach($tab as $item) {

+						foreach ($tab as $item) {

 							$output .= $item;

 						}

 						$output .= '</div>';

@@ -70,7 +70,7 @@ 
      * @param array $data

      * @return string

      */

-	private function render($data) {

+	private function render($data){

 		global $modx, $_lang, $_country_lang;

 

 		$data['lang.name'] = (isset($_lang[$data['alias']]) ? $_lang[$data['alias']] : $data['alias']);

@@ -80,7 +80,7 @@ 
 		$output = '';

 		$output .= '<div class="form-group row">';

 

-		switch($data['type']) {

+		switch ($data['type']) {

 

 			case 'text':

 				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

@@ -114,18 +114,18 @@ 
 				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

 				$output .= '<div class="col-sm-7">';

 				$output .= '<select name="[+name+]" class="form-control" id="[+name+]" onChange="documentDirty=true;">';

-				if($data['name'] == 'country' && isset($_country_lang)) {

+				if ($data['name'] == 'country' && isset($_country_lang)) {

 					$chosenCountry = isset($_POST['country']) ? $_POST['country'] : $data['country'];

-					$output .= '<option value=""' . (!isset($chosenCountry) ? ' selected' : '') . '>&nbsp;</option>';

-					foreach($_country_lang as $key => $value) {

-						$output .= '<option value="' . $key . '"' . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . '>' . $value . '</option>';

+					$output .= '<option value=""'.(!isset($chosenCountry) ? ' selected' : '').'>&nbsp;</option>';

+					foreach ($_country_lang as $key => $value) {

+						$output .= '<option value="'.$key.'"'.(isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '').'>'.$value.'</option>';

 					}

 				} else {

-					if($data['elements']) {

+					if ($data['elements']) {

 						$elements = explode('||', $data['elements']);

-						foreach($elements as $key => $value) {

+						foreach ($elements as $key => $value) {

 							$value = explode('==', $value);

-							$output .= '<option value="' . $value[1] . '">' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]) . '</option>';

+							$output .= '<option value="'.$value[1].'">'.(isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]).'</option>';

 						}

 					}

 				}

@@ -139,11 +139,11 @@ 
 				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

 				$output .= '<div class="col-sm-7">';

 				$output .= '<input type="checkbox" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

-				if($data['elements']) {

+				if ($data['elements']) {

 					$elements = explode('||', $data['elements']);

-					foreach($elements as $key => $value) {

+					foreach ($elements as $key => $value) {

 						$value = explode('==', $value);

-						$output .= '<br /><input type="checkbox" name="' . $value[0] . '" class="form-control" id="' . $value[0] . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

+						$output .= '<br /><input type="checkbox" name="'.$value[0].'" class="form-control" id="'.$value[0].'" value="'.$value[1].'" onChange="documentDirty=true;"[+readonly+] /> '.(isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

 					}

 				}

 				$output .= $data['content'];

@@ -155,11 +155,11 @@ 
 				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

 				$output .= '<div class="col-sm-7">';

 				$output .= '<input type="radio" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

-				if($data['elements']) {

+				if ($data['elements']) {

 					$elements = explode('||', $data['elements']);

-					foreach($elements as $key => $value) {

+					foreach ($elements as $key => $value) {

 						$value = explode('==', $value);

-						$output .= '<br /><input type="radio" name="[+name+]" class="form-control" id="[+name+]_' . $key . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

+						$output .= '<br /><input type="radio" name="[+name+]" class="form-control" id="[+name+]_'.$key.'" value="'.$value[1].'" onChange="documentDirty=true;"[+readonly+] /> '.(isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

 					}

 				}

 				$output .= $data['content'];

manager/includes/actionlist.inc.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?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.");
 }
 
@@ -139,7 +139,7 @@ 
  * @param string $itemid
  * @return string
  */
-function getAction($actionId, $itemid='') {
+function getAction($actionId, $itemid = ''){
 	global $action_list;
 
 	$ret = sprintf($action_list[$actionId], $itemid);

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

Spacing +6 added lines, -6 removed lines

@@ -36,16 +36,16 @@ 
         $action = "",
         $itemid = "",
         $itemname = ""
-    ) {
+    ){
         global $modx;
         $this->entry['msg'] = $msg; // writes testmessage to the object
-        $this->entry['action'] = empty($action) ? $modx->manager->action : $action;    // writes the action to the object
+        $this->entry['action'] = empty($action) ? $modx->manager->action : $action; // writes the action to the object
 
         // User Credentials
         $this->entry['internalKey'] = $internalKey == "" ? $modx->getLoginUserID() : $internalKey;
         $this->entry['username'] = $username == "" ? $modx->getLoginUserName() : $username;
 
-        $this->entry['itemId'] = (empty($itemid) && isset($_REQUEST['id'])) ? (int)$_REQUEST['id'] : $itemid;  // writes the id to the object
+        $this->entry['itemId'] = (empty($itemid) && isset($_REQUEST['id'])) ? (int) $_REQUEST['id'] : $itemid; // writes the id to the object
         if ($this->entry['itemId'] == 0) {
             $this->entry['itemId'] = "-";
         } // to stop items having id 0
@@ -93,10 +93,10 @@ 
         $fields['message'] = $modx->db->escape($this->entry['msg']);
         $insert_id = $modx->db->insert($fields, $tbl_manager_log);
         if (!$insert_id) {
-            $modx->messageQuit("Logging error: couldn't save log to table! Error code: " . $modx->db->getLastError());
+            $modx->messageQuit("Logging error: couldn't save log to table! Error code: ".$modx->db->getLastError());
         } else {
-            $limit = (isset($modx->config['manager_log_limit'])) ? (int)$modx->config['manager_log_limit'] : 3000;
-            $trim = (isset($modx->config['manager_log_trim'])) ? (int)$modx->config['manager_log_trim'] : 100;
+            $limit = (isset($modx->config['manager_log_limit'])) ? (int) $modx->config['manager_log_limit'] : 3000;
+            $trim = (isset($modx->config['manager_log_trim'])) ? (int) $modx->config['manager_log_trim'] : 100;
             if (($insert_id % $trim) === 0) {
                 $modx->rotate_log('manager_log', $limit, $trim);
             }

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;