Inspection of "Patch 4" - evolution-cms/evolution - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — develop (#534)

by Agel_Nash

created 2018-02-25 12:38 UTC

Status

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?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.");
 }
 
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
 	'999'	=> 'Viewing test page',
 );
 
-function getAction($actionId, $itemid='') {
+function getAction($actionId, $itemid = ''){
 	global $action_list;
 
 	$ret = sprintf($action_list[$actionId], $itemid);

Please login to merge, or discard this patch.

manager/includes/extenders/ex_getUserData.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@
 block discarded – undo
 <?php
-if(( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) && IN_PARSER_MODE!="true") {
+if ((!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) && IN_PARSER_MODE != "true") {
     die("<b>INCLUDE ACCESS ERROR</b><br /><br />Direct access to this file prohibited.");
 }
 $tmpArray = array();

Please login to merge, or discard this patch.

manager/includes/extenders/message.quit.inc.php 1 patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -3,7 +3,7 @@  discard block
 block discarded – undo
  * Message Quit Template
  *
  */
-if(( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) && IN_PARSER_MODE!="true") {
+if ((!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) && IN_PARSER_MODE != "true") {
     die("<b>INCLUDE ACCESS ERROR</b><br /><br />Direct access to this file prohibited.");
 }
 
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
 </script>
 </head><body>
 ";
-if($is_error) {
+if ($is_error) {
 	$parsedMessageString .= "<h3 style='color:red;background:#e0e0e0;padding:2px;'>&nbsp;MODX Parse Error </h3>
 	<table border='0' cellpadding='1' cellspacing='0'>
 	<tr><td colspan='3'>MODX encountered the following error while attempting to parse the requested resource:</td></tr>
@@ -32,14 +32,14 @@  discard block
 block discarded – undo
 	<tr><td colspan='3'><b style='color:#003399;'>&laquo; $msg &raquo;</b></td></tr>";
 }
 
-if(!empty($query)) {
+if (!empty($query)) {
 	$parsedMessageString .= "<tr><td colspan='3'><hr size='1' width='98%' style='color:#e0e0e0'/><b style='color:#999;font-size: 9px;border-left:1px solid #c0c0c0; margin-left:10px;'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;SQL:&nbsp;<span id='sqlHolder'>$query</span></b><hr size='1' width='98%' style='color:#e0e0e0'/>
 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='javascript:copyToClip();' style='color:#821517;font-size: 9px; text-decoration: none'>[Copy SQL to ClipBoard]</a><textarea id='holdtext' style='display:none;'></textarea></td></tr>";
 }
 
-if($text!='') {
+if ($text != '') {
 
-	$errortype = array (
+	$errortype = array(
 		E_ERROR          => "Error",
 		E_WARNING        => "Warning",
 		E_PARSE          => "Parsing Error",
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
 	$parsedMessageString .= "<tr><td>&nbsp;&nbsp;Line: </td>";
 	$parsedMessageString .= "<td colspan='2'>$line</td><td>&nbsp;</td>";
 	$parsedMessageString .= "</tr>";
-	if($source!='') {
+	if ($source != '') {
 		$parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Line $line source: </td>";
 		$parsedMessageString .= "<td colspan='2'>$source</td><td>&nbsp;</td>";
 		$parsedMessageString .= "</tr>";

Please login to merge, or discard this patch.

manager/includes/mutate_settings.ajax.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -3,11 +3,11 @@  discard block
 block discarded – undo
  * mutate_settings.ajax.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.");
 }
 
-require_once(dirname(__FILE__) . '/protect.inc.php');
+require_once(dirname(__FILE__).'/protect.inc.php');
 
 $action = preg_replace('/[^A-Za-z0-9_\-\.\/]/', '', $_POST['action']);
 $lang = preg_replace('/[^A-Za-z0-9_\s\+\-\.\/]/', '', $_POST['lang']);
@@ -22,10 +22,10 @@  discard block
 block discarded – undo
 $str = '';
 $emptyCache = false;
 
-switch(true){
-    case ($action == 'get' && preg_match('/^[A-z0-9_-]+$/',$lang) && file_exists(dirname(__FILE__) . '/lang/'.$lang.'.inc.php')):{
-        include(dirname(__FILE__) . '/lang/'.$lang.'.inc.php');
-        $str = isset($key,$_lang,$_lang[$key]) ? $_lang[$key] : "" ;
+switch (true) {
+    case ($action == 'get' && preg_match('/^[A-z0-9_-]+$/', $lang) && file_exists(dirname(__FILE__).'/lang/'.$lang.'.inc.php')):{
+        include(dirname(__FILE__).'/lang/'.$lang.'.inc.php');
+        $str = isset($key, $_lang, $_lang[$key]) ? $_lang[$key] : "";
         break;
     }
     case ($action == 'setsetting' && !empty($key) && !empty($value)):{
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
     }
 }
 
-if($emptyCache) {
+if ($emptyCache) {
 	$modx->clearCache('full');
 }
 

Please login to merge, or discard this patch.

manager/includes/messageCount.inc.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@
 block discarded – undo
 <?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.");
 }
 

Please login to merge, or discard this patch.

manager/includes/protect.inc.php 1 patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -10,13 +10,13 @@  discard block
 block discarded – undo
     die();
 
 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')) {
-    function modx_sanitize_gpc(& $values, $depth=0) {
-        if(200 < $depth) exit('GPC Array nested too deep!');
-        if(is_array($values)) {
+    function modx_sanitize_gpc(& $values, $depth = 0){
+        if (200 < $depth) exit('GPC Array nested too deep!');
+        if (is_array($values)) {
             $depth++;
             foreach ($values as $key => $value) {
                 if (is_array($value)) modx_sanitize_gpc($value, $depth);
@@ -29,16 +29,16 @@  discard block
 block discarded – undo
     }
 }
 
-function getSanitizedValue($value='') {
+function getSanitizedValue($value = ''){
     global $sanitize_seed;
 
-    if(!$value) return $value;
+    if (!$value) return $value;
 
     $brackets = explode(' ', '[[ ]] [! !] [* *] [( )] {{ }} [+ +] [~ ~] [^ ^]');
-    foreach($brackets as $bracket) {
-        if(strpos($value,$bracket)===false) continue;
-        $sanitizedBracket = str_replace('#', $sanitize_seed, sprintf('#%s#%s#', substr($bracket,0,1), substr($bracket,1,1)));
-        $value = str_replace($bracket,$sanitizedBracket,$value);
+    foreach ($brackets as $bracket) {
+        if (strpos($value, $bracket) === false) continue;
+        $sanitizedBracket = str_replace('#', $sanitize_seed, sprintf('#%s#%s#', substr($bracket, 0, 1), substr($bracket, 1, 1)));
+        $value = str_replace($bracket, $sanitizedBracket, $value);
     }
     $value = str_ireplace('<script', 'sanitized_by_modx<s cript', $value);
     $value = preg_replace('/&#(\d+);/', 'sanitized_by_modx& #$1', $value);
@@ -46,13 +46,13 @@  discard block
 block discarded – undo
 }
 
 modx_sanitize_gpc($_GET);
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     modx_sanitize_gpc($_POST);
 }
 modx_sanitize_gpc($_COOKIE);
 modx_sanitize_gpc($_REQUEST);
 
-foreach (array ('PHP_SELF', 'HTTP_USER_AGENT', 'HTTP_REFERER', 'QUERY_STRING') as $key) {
+foreach (array('PHP_SELF', 'HTTP_USER_AGENT', 'HTTP_REFERER', 'QUERY_STRING') as $key) {
     $_SERVER[$key] = isset ($_SERVER[$key]) ? htmlspecialchars($_SERVER[$key], ENT_QUOTES) : null;
 }
 

Please login to merge, or discard this patch.

manager/includes/manager.lockout.inc.php 1 patch

Spacing +32 added lines, -32 removed lines patch added patch discarded remove patch

@@ -1,75 +1,75 @@
 block discarded – undo
 <?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.");
 }
 
-if($modx->manager->action!='8' && isset($_SESSION['mgrValidated'])){
+if ($modx->manager->action != '8' && isset($_SESSION['mgrValidated'])) {
 
-    $homeurl = $modx->makeUrl($manager_login_startup>0 ? $manager_login_startup:$site_start);
+    $homeurl = $modx->makeUrl($manager_login_startup > 0 ? $manager_login_startup : $site_start);
     $logouturl = MODX_MANAGER_URL.'index.php?a=8';
 
-    $modx->setPlaceholder('modx_charset',$modx_manager_charset);
-    $modx->setPlaceholder('theme',$manager_theme);
+    $modx->setPlaceholder('modx_charset', $modx_manager_charset);
+    $modx->setPlaceholder('theme', $manager_theme);
 
-    $modx->setPlaceholder('site_name',$site_name);
-    $modx->setPlaceholder('logo_slogan',$_lang["logo_slogan"]);
-    $modx->setPlaceholder('manager_lockout_message',$_lang["manager_lockout_message"]);
+    $modx->setPlaceholder('site_name', $site_name);
+    $modx->setPlaceholder('logo_slogan', $_lang["logo_slogan"]);
+    $modx->setPlaceholder('manager_lockout_message', $_lang["manager_lockout_message"]);
 
-    $modx->setPlaceholder('home',$_lang["home"]);
-    $modx->setPlaceholder('homeurl',$homeurl);
-    $modx->setPlaceholder('logout',$_lang["logout"]);
-    $modx->setPlaceholder('logouturl',$logouturl);
-    $modx->setPlaceholder('manager_theme_url',MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/');
-    $modx->setPlaceholder('year',date('Y'));
+    $modx->setPlaceholder('home', $_lang["home"]);
+    $modx->setPlaceholder('homeurl', $homeurl);
+    $modx->setPlaceholder('logout', $_lang["logout"]);
+    $modx->setPlaceholder('logouturl', $logouturl);
+    $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/');
+    $modx->setPlaceholder('year', date('Y'));
 
     // load template
-    if(!isset($modx->config['manager_lockout_tpl']) || empty($modx->config['manager_lockout_tpl'])) {
-    	$modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
+    if (!isset($modx->config['manager_lockout_tpl']) || empty($modx->config['manager_lockout_tpl'])) {
+    	$modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH.'media/style/common/manager.lockout.tpl';
     }
 
     $target = $modx->config['manager_lockout_tpl'];
     $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
     $target = $modx->mergeSettingsContent($target);
 
-    if(substr($target,0,1)==='@') {
-    	if(substr($target,0,6)==='@CHUNK') {
-    		$target = trim(substr($target,7));
+    if (substr($target, 0, 1) === '@') {
+    	if (substr($target, 0, 6) === '@CHUNK') {
+    		$target = trim(substr($target, 7));
     		$lockout_tpl = $modx->getChunk($target);
     	}
-    	elseif(substr($target,0,5)==='@FILE') {
-    		$target = trim(substr($target,6));
+    	elseif (substr($target, 0, 5) === '@FILE') {
+    		$target = trim(substr($target, 6));
     		$lockout_tpl = file_get_contents($target);
     	}
 	} else {
     	$chunk = $modx->getChunk($target);
-    	if($chunk!==false && !empty($chunk)) {
+    	if ($chunk !== false && !empty($chunk)) {
     		$lockout_tpl = $chunk;
     	}
-    	elseif(is_file(MODX_BASE_PATH . $target)) {
-    		$target = MODX_BASE_PATH . $target;
+    	elseif (is_file(MODX_BASE_PATH.$target)) {
+    		$target = MODX_BASE_PATH.$target;
     		$lockout_tpl = file_get_contents($target);
     	}
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
-    		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl';
+    	elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/manager.lockout.tpl')) {
+    		$target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/manager.lockout.tpl';
     		$lockout_tpl = file_get_contents($target);
     	}
-	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
-		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl';
+	elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/templates/actions/manager.lockout.tpl')) {
+		$target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/templates/actions/manager.lockout.tpl';
 		$login_tpl = file_get_contents($target);
 	}
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible
-    		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html';
+    	elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/manager.lockout.html')) { // ClipperCMS compatible
+    		$target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/manager.lockout.html';
     		$lockout_tpl = file_get_contents($target);
     	}
     	else {
-    		$target = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
+    		$target = MODX_MANAGER_PATH.'media/style/common/manager.lockout.tpl';
     		$lockout_tpl = file_get_contents($target);
     	}
 	}
 
     // merge placeholders
     $lockout_tpl = $modx->mergePlaceholderContent($lockout_tpl);
-    $regx = strpos($lockout_tpl,'[[+')!==false ? '~\[\[\+(.*?)\]\]~' : '~\[\+(.*?)\+\]~'; // little tweak for newer parsers
+    $regx = strpos($lockout_tpl, '[[+') !== false ? '~\[\[\+(.*?)\]\]~' : '~\[\+(.*?)\+\]~'; // little tweak for newer parsers
     $lockout_tpl = preg_replace($regx, '', $lockout_tpl); //cleanup
 
     echo $lockout_tpl;

Please login to merge, or discard this patch.

manager/includes/settings.inc.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -1,12 +1,12 @@  discard block
 block discarded – undo
 <?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.");
 }
 
 // get the settings from the database.
 $settings = array();
-if ($modx && count($modx->config)>0) $settings = $modx->config;
-else{
+if ($modx && count($modx->config) > 0) $settings = $modx->config;
+else {
 	$rs = $modx->db->select('setting_name, setting_value', $modx->getFullTableName('system_settings'));
 	while ($row = $modx->db->getRow($rs)) {
 		$settings[$row['setting_name']] = $row['setting_value'];
@@ -16,4 +16,4 @@  discard block
 block discarded – undo
 extract($settings, EXTR_OVERWRITE);
 
 // setup default site id - new installation should generate a unique id for the site.
-if(!isset($site_id)) $site_id = "MzGeQ2faT4Dw06+U49x3";
+if (!isset($site_id)) $site_id = "MzGeQ2faT4Dw06+U49x3";

Please login to merge, or discard this patch.

manager/includes/secure_mgr_documents.inc.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?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.");
 }
 
@@ -12,19 +12,19 @@  discard block
 block discarded – undo
  *
  */
 
-function secureMgrDocument($docid='') {
+function secureMgrDocument($docid = ''){
 	global $modx;
 
-	$modx->db->update('privatemgr = 0', $modx->getFullTableName("site_content"), ($docid>0 ? "id='$docid'":"privatemgr = 1"));
+	$modx->db->update('privatemgr = 0', $modx->getFullTableName("site_content"), ($docid > 0 ? "id='$docid'" : "privatemgr = 1"));
 	$rs = $modx->db->select(
 		'DISTINCT sc.id',
 		$modx->getFullTableName("site_content")." sc
 			LEFT JOIN ".$modx->getFullTableName("document_groups")." dg ON dg.document = sc.id
 			LEFT JOIN ".$modx->getFullTableName("membergroup_access")." mga ON mga.documentgroup = dg.document_group",
-		($docid>0 ? " sc.id='{$docid}' AND ":"")."mga.id>0"
+		($docid > 0 ? " sc.id='{$docid}' AND " : "")."mga.id>0"
 		);
-	$ids = $modx->db->getColumn("id",$rs);
-	if(count($ids)>0) {
-		$modx->db->update('privatemgr = 1', $modx->getFullTableName("site_content"), "id IN (".implode(", ",$ids).")");
+	$ids = $modx->db->getColumn("id", $rs);
+	if (count($ids) > 0) {
+		$modx->db->update('privatemgr = 1', $modx->getFullTableName("site_content"), "id IN (".implode(", ", $ids).")");
 	}
 }

Please login to merge, or discard this patch.

		@@ -1,5 +1,5 @@ discard block
		block discarded – undo
1	1	<?php
2		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	2	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3	3	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4	4	}
5	5
		@@ -134,7 +134,7 @@ discard block
		block discarded – undo
134	134	'999' => 'Viewing test page',
135	135	);
136	136
137		-function getAction($actionId, $itemid='') {
	137	+function getAction($actionId, $itemid = ''){
138	138	global $action_list;
139	139
140	140	$ret = sprintf($action_list[$actionId], $itemid);

		@@ -1,5 +1,5 @@
		block discarded – undo
1	1	<?php
2		-if(( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) && IN_PARSER_MODE!="true") {
	2	+if ((!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) && IN_PARSER_MODE != "true") {
3	3	die("<b>INCLUDE ACCESS ERROR</b><br /><br />Direct access to this file prohibited.");
4	4	}
5	5	$tmpArray = array();

		@@ -3,7 +3,7 @@ discard block
		block discarded – undo
3	3	* Message Quit Template
4	4	*
5	5	*/
6		-if(( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) && IN_PARSER_MODE!="true") {
	6	+if ((!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) && IN_PARSER_MODE != "true") {
7	7	die("<b>INCLUDE ACCESS ERROR</b><br /><br />Direct access to this file prohibited.");
8	8	}
9	9
		@@ -20,7 +20,7 @@ discard block
		block discarded – undo
20	20	</script>
21	21	</head><body>
22	22	";
23		-if($is_error) {
	23	+if ($is_error) {
24	24	$parsedMessageString .= "<h3 style='color:red;background:#e0e0e0;padding:2px;'> MODX Parse Error </h3>
25	25	<table border='0' cellpadding='1' cellspacing='0'>
26	26	<tr><td colspan='3'>MODX encountered the following error while attempting to parse the requested resource:</td></tr>
		@@ -32,14 +32,14 @@ discard block
		block discarded – undo
32	32	<tr><td colspan='3'><b style='color:#003399;'>« $msg »</b></td></tr>";
33	33	}
34	34
35		-if(!empty($query)) {
	35	+if (!empty($query)) {
36	36	$parsedMessageString .= "<tr><td colspan='3'><hr size='1' width='98%' style='color:#e0e0e0'/><b style='color:#999;font-size: 9px;border-left:1px solid #c0c0c0; margin-left:10px;'>      SQL: <span id='sqlHolder'>$query</span></b><hr size='1' width='98%' style='color:#e0e0e0'/>
37	37	<a href='javascript:copyToClip();' style='color:#821517;font-size: 9px; text-decoration: none'>[Copy SQL to ClipBoard]</a><textarea id='holdtext' style='display:none;'></textarea></td></tr>";
38	38	}
39	39
40		-if($text!='') {
	40	+if ($text != '') {
41	41
42		- $errortype = array (
	42	+ $errortype = array(
43	43	E_ERROR => "Error",
44	44	E_WARNING => "Warning",
45	45	E_PARSE => "Parsing Error",
		@@ -70,7 +70,7 @@ discard block
		block discarded – undo
70	70	$parsedMessageString .= "<tr><td>  Line: </td>";
71	71	$parsedMessageString .= "<td colspan='2'>$line</td><td> </td>";
72	72	$parsedMessageString .= "</tr>";
73		- if($source!='') {
	73	+ if ($source != '') {
74	74	$parsedMessageString .= "<tr><td valign='top'>  Line $line source: </td>";
75	75	$parsedMessageString .= "<td colspan='2'>$source</td><td> </td>";
76	76	$parsedMessageString .= "</tr>";

		@@ -3,11 +3,11 @@ discard block
		block discarded – undo
3	3	* mutate_settings.ajax.php
4	4	*
5	5	*/
6		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	6	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
7	7	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
8	8	}
9	9
10		-require_once(dirname(__FILE__) . '/protect.inc.php');
	10	+require_once(dirname(__FILE__).'/protect.inc.php');
11	11
12	12	$action = preg_replace('/[^A-Za-z0-9_\-\.\/]/', '', $_POST['action']);
13	13	$lang = preg_replace('/[^A-Za-z0-9_\s\+\-\.\/]/', '', $_POST['lang']);
		@@ -22,10 +22,10 @@ discard block
		block discarded – undo
22	22	$str = '';
23	23	$emptyCache = false;
24	24
25		-switch(true){
26		- case ($action == 'get' && preg_match('/^[A-z0-9_-]+$/',$lang) && file_exists(dirname(__FILE__) . '/lang/'.$lang.'.inc.php')):{
27		- include(dirname(__FILE__) . '/lang/'.$lang.'.inc.php');
28		- $str = isset($key,$_lang,$_lang[$key]) ? $_lang[$key] : "" ;
	25	+switch (true) {
	26	+ case ($action == 'get' && preg_match('/^[A-z0-9_-]+$/', $lang) && file_exists(dirname(__FILE__).'/lang/'.$lang.'.inc.php')):{
	27	+ include(dirname(__FILE__).'/lang/'.$lang.'.inc.php');
	28	+ $str = isset($key, $_lang, $_lang[$key]) ? $_lang[$key] : "";
29	29	break;
30	30	}
31	31	case ($action == 'setsetting' && !empty($key) && !empty($value)):{
		@@ -52,7 +52,7 @@ discard block
		block discarded – undo
52	52	}
53	53	}
54	54
55		-if($emptyCache) {
	55	+if ($emptyCache) {
56	56	$modx->clearCache('full');
57	57	}
58	58

		@@ -10,13 +10,13 @@ discard block
		block discarded – undo
10	10	die();
11	11
12	12	global $sanitize_seed;
13		-$sanitize_seed = 'sanitize_seed_' . base_convert(md5(__FILE__),16,36);
	13	+$sanitize_seed = 'sanitize_seed_'.base_convert(md5(__FILE__), 16, 36);
14	14
15	15	// sanitize array
16	16	if (!function_exists('modx_sanitize_gpc')) {
17		- function modx_sanitize_gpc(& $values, $depth=0) {
18		- if(200 < $depth) exit('GPC Array nested too deep!');
19		- if(is_array($values)) {
	17	+ function modx_sanitize_gpc(& $values, $depth = 0){
	18	+ if (200 < $depth) exit('GPC Array nested too deep!');
	19	+ if (is_array($values)) {
20	20	$depth++;
21	21	foreach ($values as $key => $value) {
22	22	if (is_array($value)) modx_sanitize_gpc($value, $depth);
		@@ -29,16 +29,16 @@ discard block
		block discarded – undo
29	29	}
30	30	}
31	31
32		-function getSanitizedValue($value='') {
	32	+function getSanitizedValue($value = ''){
33	33	global $sanitize_seed;
34	34
35		- if(!$value) return $value;
	35	+ if (!$value) return $value;
36	36
37	37	$brackets = explode(' ', '[[ ]] [! !] [* *] [( )] {{ }} [+ +] [~ ~] [^ ^]');
38		- foreach($brackets as $bracket) {
39		- if(strpos($value,$bracket)===false) continue;
40		- $sanitizedBracket = str_replace('#', $sanitize_seed, sprintf('#%s#%s#', substr($bracket,0,1), substr($bracket,1,1)));
41		- $value = str_replace($bracket,$sanitizedBracket,$value);
	38	+ foreach ($brackets as $bracket) {
	39	+ if (strpos($value, $bracket) === false) continue;
	40	+ $sanitizedBracket = str_replace('#', $sanitize_seed, sprintf('#%s#%s#', substr($bracket, 0, 1), substr($bracket, 1, 1)));
	41	+ $value = str_replace($bracket, $sanitizedBracket, $value);
42	42	}
43	43	$value = str_ireplace('<script', 'sanitized_by_modx<s cript', $value);
44	44	$value = preg_replace('/&#(\d+);/', 'sanitized_by_modx& #$1', $value);
		@@ -46,13 +46,13 @@ discard block
		block discarded – undo
46	46	}
47	47
48	48	modx_sanitize_gpc($_GET);
49		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	49	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
50	50	modx_sanitize_gpc($_POST);
51	51	}
52	52	modx_sanitize_gpc($_COOKIE);
53	53	modx_sanitize_gpc($_REQUEST);
54	54
55		-foreach (array ('PHP_SELF', 'HTTP_USER_AGENT', 'HTTP_REFERER', 'QUERY_STRING') as $key) {
	55	+foreach (array('PHP_SELF', 'HTTP_USER_AGENT', 'HTTP_REFERER', 'QUERY_STRING') as $key) {
56	56	$_SERVER[$key] = isset ($_SERVER[$key]) ? htmlspecialchars($_SERVER[$key], ENT_QUOTES) : null;
57	57	}
58	58

		@@ -1,75 +1,75 @@
		block discarded – undo
1	1	<?php
2		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	2	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3	3	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4	4	}
5	5
6		-if($modx->manager->action!='8' && isset($_SESSION['mgrValidated'])){
	6	+if ($modx->manager->action != '8' && isset($_SESSION['mgrValidated'])) {
7	7
8		- $homeurl = $modx->makeUrl($manager_login_startup>0 ? $manager_login_startup:$site_start);
	8	+ $homeurl = $modx->makeUrl($manager_login_startup > 0 ? $manager_login_startup : $site_start);
9	9	$logouturl = MODX_MANAGER_URL.'index.php?a=8';
10	10
11		- $modx->setPlaceholder('modx_charset',$modx_manager_charset);
12		- $modx->setPlaceholder('theme',$manager_theme);
	11	+ $modx->setPlaceholder('modx_charset', $modx_manager_charset);
	12	+ $modx->setPlaceholder('theme', $manager_theme);
13	13
14		- $modx->setPlaceholder('site_name',$site_name);
15		- $modx->setPlaceholder('logo_slogan',$_lang["logo_slogan"]);
16		- $modx->setPlaceholder('manager_lockout_message',$_lang["manager_lockout_message"]);
	14	+ $modx->setPlaceholder('site_name', $site_name);
	15	+ $modx->setPlaceholder('logo_slogan', $_lang["logo_slogan"]);
	16	+ $modx->setPlaceholder('manager_lockout_message', $_lang["manager_lockout_message"]);
17	17
18		- $modx->setPlaceholder('home',$_lang["home"]);
19		- $modx->setPlaceholder('homeurl',$homeurl);
20		- $modx->setPlaceholder('logout',$_lang["logout"]);
21		- $modx->setPlaceholder('logouturl',$logouturl);
22		- $modx->setPlaceholder('manager_theme_url',MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/');
23		- $modx->setPlaceholder('year',date('Y'));
	18	+ $modx->setPlaceholder('home', $_lang["home"]);
	19	+ $modx->setPlaceholder('homeurl', $homeurl);
	20	+ $modx->setPlaceholder('logout', $_lang["logout"]);
	21	+ $modx->setPlaceholder('logouturl', $logouturl);
	22	+ $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/');
	23	+ $modx->setPlaceholder('year', date('Y'));
24	24
25	25	// load template
26		- if(!isset($modx->config['manager_lockout_tpl']) \|\| empty($modx->config['manager_lockout_tpl'])) {
27		- $modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
	26	+ if (!isset($modx->config['manager_lockout_tpl']) \|\| empty($modx->config['manager_lockout_tpl'])) {
	27	+ $modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH.'media/style/common/manager.lockout.tpl';
28	28	}
29	29
30	30	$target = $modx->config['manager_lockout_tpl'];
31	31	$target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
32	32	$target = $modx->mergeSettingsContent($target);
33	33
34		- if(substr($target,0,1)==='@') {
35		- if(substr($target,0,6)==='@CHUNK') {
36		- $target = trim(substr($target,7));
	34	+ if (substr($target, 0, 1) === '@') {
	35	+ if (substr($target, 0, 6) === '@CHUNK') {
	36	+ $target = trim(substr($target, 7));
37	37	$lockout_tpl = $modx->getChunk($target);
38	38	}
39		- elseif(substr($target,0,5)==='@FILE') {
40		- $target = trim(substr($target,6));
	39	+ elseif (substr($target, 0, 5) === '@FILE') {
	40	+ $target = trim(substr($target, 6));
41	41	$lockout_tpl = file_get_contents($target);
42	42	}
43	43	} else {
44	44	$chunk = $modx->getChunk($target);
45		- if($chunk!==false && !empty($chunk)) {
	45	+ if ($chunk !== false && !empty($chunk)) {
46	46	$lockout_tpl = $chunk;
47	47	}
48		- elseif(is_file(MODX_BASE_PATH . $target)) {
49		- $target = MODX_BASE_PATH . $target;
	48	+ elseif (is_file(MODX_BASE_PATH.$target)) {
	49	+ $target = MODX_BASE_PATH.$target;
50	50	$lockout_tpl = file_get_contents($target);
51	51	}
52		- elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
53		- $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl';
	52	+ elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/manager.lockout.tpl')) {
	53	+ $target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/manager.lockout.tpl';
54	54	$lockout_tpl = file_get_contents($target);
55	55	}
56		- elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
57		- $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl';
	56	+ elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/templates/actions/manager.lockout.tpl')) {
	57	+ $target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/templates/actions/manager.lockout.tpl';
58	58	$login_tpl = file_get_contents($target);
59	59	}
60		- elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible
61		- $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html';
	60	+ elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/manager.lockout.html')) { // ClipperCMS compatible
	61	+ $target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/manager.lockout.html';
62	62	$lockout_tpl = file_get_contents($target);
63	63	}
64	64	else {
65		- $target = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
	65	+ $target = MODX_MANAGER_PATH.'media/style/common/manager.lockout.tpl';
66	66	$lockout_tpl = file_get_contents($target);
67	67	}
68	68	}
69	69
70	70	// merge placeholders
71	71	$lockout_tpl = $modx->mergePlaceholderContent($lockout_tpl);
72		- $regx = strpos($lockout_tpl,'[[+')!==false ? '~\[\[\+(.?)\]\]~' : '~\[\+(.?)\+\]~'; // little tweak for newer parsers
	72	+ $regx = strpos($lockout_tpl, '[[+') !== false ? '~\[\[\+(.?)\]\]~' : '~\[\+(.?)\+\]~'; // little tweak for newer parsers
73	73	$lockout_tpl = preg_replace($regx, '', $lockout_tpl); //cleanup
74	74
75	75	echo $lockout_tpl;

		@@ -1,12 +1,12 @@ discard block
		block discarded – undo
1	1	<?php
2		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	2	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3	3	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4	4	}
5	5
6	6	// get the settings from the database.
7	7	$settings = array();
8		-if ($modx && count($modx->config)>0) $settings = $modx->config;
9		-else{
	8	+if ($modx && count($modx->config) > 0) $settings = $modx->config;
	9	+else {
10	10	$rs = $modx->db->select('setting_name, setting_value', $modx->getFullTableName('system_settings'));
11	11	while ($row = $modx->db->getRow($rs)) {
12	12	$settings[$row['setting_name']] = $row['setting_value'];
		@@ -16,4 +16,4 @@ discard block
		block discarded – undo
16	16	extract($settings, EXTR_OVERWRITE);
17	17
18	18	// setup default site id - new installation should generate a unique id for the site.
19		-if(!isset($site_id)) $site_id = "MzGeQ2faT4Dw06+U49x3";
	19	+if (!isset($site_id)) $site_id = "MzGeQ2faT4Dw06+U49x3";

evolution-cms / evolution

Pull Request — develop (#534)

Status

Category

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

Spacing +32 added lines, -32 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch