evolution-cms / evolution

manager/includes/accesscontrol.inc.php

Braces +4 added lines, -2 removed lines

@@ -21,7 +21,8 @@ 
 if(file_exists(MODX_BASE_PATH . 'assets/cache/installProc.inc.php')) {
 	include_once(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
 	if(isset($installStartTime)) {
-		if((time() - $installStartTime) > 5 * 60) { // if install flag older than 5 minutes, discard
+		if((time() - $installStartTime) > 5 * 60) {
+// if install flag older than 5 minutes, discard
 			unset($installStartTime);
 			@ chmod(MODX_BASE_PATH . 'assets/cache/installProc.inc.php', 0755);
 			unlink(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
@@ -155,7 +156,8 @@ 
 		} elseif(is_file($theme_path . 'templates/actions/login.tpl')) {
 			$target = $theme_path . 'templates/actions/login.tpl';
 			$login_tpl = file_get_contents($target);
-		} elseif(is_file($theme_path . 'html/login.html')) { // ClipperCMS compatible
+		} elseif(is_file($theme_path . 'html/login.html')) {
+// ClipperCMS compatible
 			$target = $theme_path . 'html/login.html';
 			$login_tpl = file_get_contents($target);
 		} else {

manager/includes/tmplvars.format.inc.php

Braces +21 added lines, -8 removed lines

@@ -5,7 +5,8 @@ 
  */
 
 // Added by Raymond 20-Jan-2005
-function getTVDisplayFormat($name, $value, $format, $paramstring = "", $tvtype = "", $docid = "", $sep = '') {
+function getTVDisplayFormat($name, $value, $format, $paramstring = "", $tvtype = "", $docid = "", $sep = '')
+{
 
 	global $modx;
 
@@ -49,7 +50,9 @@ 
 					if(isset($params['align']) && $params['align'] != 'none') {
 						$attr['align'] = $params['align'];
 					}
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+					foreach($attr as $k => $v) {
+					    $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+					}
 					$attributes .= ' ' . $params['attrib'];
 
 					// Output the image with attributes
@@ -117,7 +120,9 @@ 
 						'style' => $params['style'],
 						'target' => $params['target'],
 					);
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+					foreach($attr as $k => $v) {
+					    $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+					}
 					$attributes .= ' ' . $params['attrib']; // add extra
 
 					// Output the link
@@ -145,7 +150,9 @@ 
 					'class' => $params['class'],
 					'style' => $params['style'],
 				);
-				foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+				foreach($attr as $k => $v) {
+				    $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+				}
 				$attributes .= ' ' . $params['attrib']; // add extra
 
 				// Output the HTML Tag
@@ -325,19 +332,24 @@ 
 	return $o;
 }
 
-function decodeParamValue($s) {
+function decodeParamValue($s)
+{
 	$s = str_replace("%3D", '=', $s); // =
 	$s = str_replace("%26", '&', $s); // &
 	return $s;
 }
 
 // returns an array if a delimiter is present. returns array is a recordset is present
-function parseInput($src, $delim = "||", $type = "string", $columns = true) { // type can be: string, array
+function parseInput($src, $delim = "||", $type = "string", $columns = true)
+{
+// type can be: string, array
 	global $modx;
 	if($modx->db->isResult($src)) {
 		// must be a recordset
 		$rows = array();
-		while($cols = $modx->db->getRow($src, 'num')) $rows[] = ($columns) ? $cols : implode(" ", $cols);
+		while($cols = $modx->db->getRow($src, 'num')) {
+		    $rows[] = ($columns) ? $cols : implode(" ", $cols);
+		}
 		return ($type == "array") ? $rows : implode($delim, $rows);
 	} else {
 		// must be a text
@@ -349,7 +361,8 @@ 
 	}
 }
 
-function getUnixtimeFromDateString($value) {
+function getUnixtimeFromDateString($value)
+{
 	$timestamp = false;
 	// Check for MySQL or legacy style date
 	$date_match_1 = '/^([0-9]{2})-([0-9]{2})-([0-9]{4})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';

manager/includes/rss.inc.php

Braces +3 added lines, -2 removed lines

@@ -29,7 +29,8 @@ 
 // include MagPieRSS
 require_once(MODX_MANAGER_PATH.'media/rss/rss_fetch.inc');
 // Convert relative path into absolute url
-function rel2abs( $rel, $base ) {
+function rel2abs( $rel, $base )
+{
 	// parse base URL  and convert to local variables: $scheme, $host,  $path
 	extract( parse_url( $base ) );
 	if ( strpos( $rel,"//" ) === 0 ) {
@@ -63,7 +64,7 @@ 
 foreach ($urls as $section=>$url) {
 	$output = '';
     $rss = @fetch_rss($url);
-    if( !$rss ){
+    if( !$rss ) {
     	$feedData[$section] = 'Failed to retrieve ' . $url;
     	continue;
 	}

manager/includes/charsets.php

Braces +31 added lines, -15 removed lines

@@ -65,21 +65,37 @@
 $_['macintosh']         = 'Western European (Mac) - macintosh';
 $_['Windows-1252']      = 'Western European (Windows) - Windows-1252';
 
-if($modx_charset     == 'euc-jp')      $_['euc-jp']      = 'Japanese (EUC) - euc-jp';
-elseif($modx_charset == 'shift_jis')   $_['shift_jis']   = 'Japanese (Shift-JIS) - shift_jis';
-elseif($modx_charset == 'iso-2022-jp') $_['iso-2022-jp'] = 'Japanese (JIS-Allow 1 byte Kana - SO/SI) - iso-2022-jp';
-elseif($modx_charset == 'csISO2022JP') $_['csISO2022JP'] = 'Japanese (JIS-Allow 1 byte Kana) - csISO2022JP';
-elseif($modx_charset == 'EUC-CN')            $_['EUC-CN']            = 'Chinese Simplified (EUC) - EUC-CN';
-elseif($modx_charset == 'hz-gb-2312')        $_['hz-gb-2312']        = 'Chinese Simplified (HZ) - hz-gb-2312';
-elseif($modx_charset == 'x-mac-chinesesimp') $_['x-mac-chinesesimp'] = 'Chinese Simplified (Mac) - x-mac-chinesesimp';
-elseif($modx_charset == 'x-Chinese-CNS')     $_['x-Chinese-CNS']     = 'Chinese Traditional (CNS) - x-Chinese-CNS';
-elseif($modx_charset == 'x-Chinese-Eten')    $_['x-Chinese-Eten']    = 'Chinese Traditional (Eten) - x-Chinese-Eten';
-elseif($modx_charset == 'x-mac-chinesetrad') $_['x-mac-chinesetrad'] = 'Chinese Traditional (Mac) - x-mac-chinesetrad';
-elseif($modx_charset == 'ks_c_5601-1987') $_['ks_c_5601-1987'] = 'Korean - ks_c_5601-1987';
-elseif($modx_charset == 'euc-kr')         $_['euc-kr']         = 'Korean (EUC) - euc-kr';
-elseif($modx_charset == 'iso-2022-kr')    $_['iso-2022-kr']    = 'Korean (ISO) - iso-2022-kr';
-elseif($modx_charset == 'Johab')          $_['Johab']          = 'Korean (Johab) - Johab';
-elseif($modx_charset == 'x-mac-korean')   $_['x-mac-korean']   = 'Korean (Mac) - x-mac-korean';
+if($modx_charset     == 'euc-jp') {
+    $_['euc-jp']      = 'Japanese (EUC) - euc-jp';
+} elseif($modx_charset == 'shift_jis') {
+    $_['shift_jis']   = 'Japanese (Shift-JIS) - shift_jis';
+} elseif($modx_charset == 'iso-2022-jp') {
+    $_['iso-2022-jp'] = 'Japanese (JIS-Allow 1 byte Kana - SO/SI) - iso-2022-jp';
+} elseif($modx_charset == 'csISO2022JP') {
+    $_['csISO2022JP'] = 'Japanese (JIS-Allow 1 byte Kana) - csISO2022JP';
+} elseif($modx_charset == 'EUC-CN') {
+    $_['EUC-CN']            = 'Chinese Simplified (EUC) - EUC-CN';
+} elseif($modx_charset == 'hz-gb-2312') {
+    $_['hz-gb-2312']        = 'Chinese Simplified (HZ) - hz-gb-2312';
+} elseif($modx_charset == 'x-mac-chinesesimp') {
+    $_['x-mac-chinesesimp'] = 'Chinese Simplified (Mac) - x-mac-chinesesimp';
+} elseif($modx_charset == 'x-Chinese-CNS') {
+    $_['x-Chinese-CNS']     = 'Chinese Traditional (CNS) - x-Chinese-CNS';
+} elseif($modx_charset == 'x-Chinese-Eten') {
+    $_['x-Chinese-Eten']    = 'Chinese Traditional (Eten) - x-Chinese-Eten';
+} elseif($modx_charset == 'x-mac-chinesetrad') {
+    $_['x-mac-chinesetrad'] = 'Chinese Traditional (Mac) - x-mac-chinesetrad';
+} elseif($modx_charset == 'ks_c_5601-1987') {
+    $_['ks_c_5601-1987'] = 'Korean - ks_c_5601-1987';
+} elseif($modx_charset == 'euc-kr') {
+    $_['euc-kr']         = 'Korean (EUC) - euc-kr';
+} elseif($modx_charset == 'iso-2022-kr') {
+    $_['iso-2022-kr']    = 'Korean (ISO) - iso-2022-kr';
+} elseif($modx_charset == 'Johab') {
+    $_['Johab']          = 'Korean (Johab) - Johab';
+} elseif($modx_charset == 'x-mac-korean') {
+    $_['x-mac-korean']   = 'Korean (Mac) - x-mac-korean';
+}
 
 $tpl = '<option value="%s" %s>%s</option>';
 $options = array();

manager/includes/preload.functions.inc.php

Braces +14 added lines, -9 removed lines

@@ -3,13 +3,15 @@ 
 global $site_sessionname;

 $site_sessionname = genEvoSessionName(); // For legacy extras not using startCMSSession

 

-function genEvoSessionName() {

+function genEvoSessionName()
+{
     $_ = crc32(__FILE__);

     $_ = sprintf('%u', $_);

     return 'evo' . base_convert($_,10,36);

 }

 

-function startCMSSession(){

+function startCMSSession()
+{
     

     global $site_sessionname, $https_port, $session_cookie_path, $session_cookie_domain;

     

@@ -23,24 +25,27 @@ 
     session_start();

 

     $key = "modx.{$context}.session.cookie.lifetime";

-    if (isset($_SESSION[$key]) && is_numeric($_SESSION[$key])) {

+    if (isset($_SESSION[$key]) && is_numeric($_SESSION[$key])) {
         $cookieLifetime= intval($_SESSION[$key]);

-        if($cookieLifetime) $cookieExpiration = $_SERVER['REQUEST_TIME']+$cookieLifetime;

+        if($cookieLifetime) {
+            $cookieExpiration = $_SERVER['REQUEST_TIME']+$cookieLifetime;
+        }
         setcookie(session_name(), session_id(), $cookieExpiration, $cookiePath, $cookieDomain, $secure, true);

     }

-    if (!isset($_SESSION['modx.session.created.time'])) {

+    if (!isset($_SESSION['modx.session.created.time'])) {
         $_SESSION['modx.session.created.time'] = $_SERVER['REQUEST_TIME'];

     }

 }

 

-function removeInvalidCmsSessionFromStorage(&$storage, $session_name) {

-    if (isset($storage[$session_name]) && ($storage[$session_name] === '' || $storage[$session_name] === 'deleted'))

-    {

+function removeInvalidCmsSessionFromStorage(&$storage, $session_name)
+{
+    if (isset($storage[$session_name]) && ($storage[$session_name] === '' || $storage[$session_name] === 'deleted')) {
     unset($storage[$session_name]);

     }

 }

 

-function removeInvalidCmsSessionIds($session_name) {

+function removeInvalidCmsSessionIds($session_name)
+{
     // session ids is invalid iff it is empty string

     // storage priorioty can see in PHP source ext/session/session.c

     removeInvalidCmsSessionFromStorage($_COOKIE, $session_name);

manager/includes/categories.inc.php

Braces +16 added lines, -7 removed lines

@@ -3,18 +3,22 @@ 
 //Kyle Jaebker - 08/07/06
 
 //Create a new category
-function newCategory($newCat) {
+function newCategory($newCat)
+{
     global $modx;
     $useTable = $modx->getFullTableName('categories');
     $categoryId = $modx->db->insert(
         array(
             'category' => $modx->db->escape($newCat),
         ), $useTable);
-    if (!$categoryId) $categoryId = 0;
+    if (!$categoryId) {
+        $categoryId = 0;
+    }
     return $categoryId;
 }
 //check if new category already exists
-function checkCategory($newCat = '') {
+function checkCategory($newCat = '')
+{
     global $modx;
     $useTable = $modx->getFullTableName('categories');
     $newCat = $modx->db->escape($newCat);
@@ -25,13 +29,17 @@ 
     return 0;
 }
 //Check for category, create new if not exists
-function getCategory($category='') {
+function getCategory($category='')
+{
     $categoryId = checkCategory($category);
-    if(!$categoryId) $categoryId = newCategory($category);
+    if(!$categoryId) {
+        $categoryId = newCategory($category);
+    }
     return $categoryId;
 }
 //Get all categories
-function getCategories() {
+function getCategories()
+{
     global $modx;
     $useTable = $modx->getFullTableName('categories');
     $cats = $modx->db->select('id, category', $modx->getFullTableName('categories'), '', 'category');
@@ -43,7 +51,8 @@ 
     return $resourceArray;
 }
 //Delete category & associations
-function deleteCategory($catId=0) {
+function deleteCategory($catId=0)
+{
     global $modx;
     if ($catId) {
         $resetTables = array('site_plugins', 'site_snippets', 'site_htmlsnippets', 'site_templates', 'site_tmplvars', 'site_modules');

manager/includes/protect.inc.php

Braces +22 added lines, -9 removed lines

@@ -6,37 +6,50 @@
 error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED);
 
 // Null is evil
-if (isset($_SERVER['QUERY_STRING']) && strpos(urldecode($_SERVER['QUERY_STRING']), chr(0)) !== false)
+if (isset($_SERVER['QUERY_STRING']) && strpos(urldecode($_SERVER['QUERY_STRING']), chr(0)) !== false) {
     die();
+}
 
 global $sanitize_seed;
 $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!');
+    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);
-                else                  $values[$key] = getSanitizedValue($value);
+                if (is_array($value)) {
+                    modx_sanitize_gpc($value, $depth);
+                } else {
+                    $values[$key] = getSanitizedValue($value);
+                }
             }
+        } else {
+            $values = getSanitizedValue($values);
         }
-        else $values = getSanitizedValue($values);
         
         return $values;
     }
 }
 
-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;
+        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);
     }

manager/includes/error.class.inc.php

Braces +23 added lines, -13 removed lines

@@ -1,11 +1,13 @@ 
 <?php
 // this is the old error handler. Here for legacy, until i replace all the old errors.
-class errorHandler{
+class errorHandler
+{
 
 var $errorcode;
 var $errors = array();
 
-	function __construct() {
+	function __construct()
+	{
 		
 		$_lang = $this->include_lang('errormsg');
 		
@@ -40,25 +42,31 @@ 
 	);
 	}
 
-	function include_lang($context='common') {
+	function include_lang($context='common')
+	{
 		global $modx;
 		$_lang = array();
 		
 		$context = trim($context,'/');
-		if(strpos($context,'..')!==false) return;
+		if(strpos($context,'..')!==false) {
+		    return;
+		}
 		
-		if($context === 'common')
-			$lang_path = MODX_MANAGER_PATH . 'includes/lang/';
-		else
-			$lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
+		if($context === 'common') {
+					$lang_path = MODX_MANAGER_PATH . 'includes/lang/';
+		} else {
+					$lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
+		}
 		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");
+		if(is_file("{$lang_path}{$manager_language}.inc.php")) {
+					include_once("{$lang_path}{$manager_language}.inc.php");
+		}
 		return $_lang;
 	}
 	
-	function setError($errorcode, $custommessage=""){
+	function setError($errorcode, $custommessage="")
+	{
 		$this->errorcode=$errorcode;
 		$this->errormessage=$this->errors[$errorcode];
 		if($custommessage!="") {
@@ -66,11 +74,13 @@ 
 		}
 	}	
 	
-	function getError() {
+	function getError()
+	{
 		return $this->errorcode;
 	}
 	
-	function dumpError(){
+	function dumpError()
+	{
 ?>
 	<html>
 	<head>

manager/includes/tmplvars.commands.inc.php

Braces +22 added lines, -18 removed lines

@@ -14,16 +14,16 @@ 
     'DIRECTORY'
 );
 
-function ProcessTVCommand($value, $name = '', $docid = '', $src='docform', $tvsArray = array()) {
+function ProcessTVCommand($value, $name = '', $docid = '', $src='docform', $tvsArray = array())
+{
     global $modx;
     $docid = intval($docid) ? intval($docid) : $modx->documentIdentifier;
     $nvalue = trim($value);
-    if (substr($nvalue, 0, 1) != '@')
-        return $value;
-    elseif(isset($modx->config['enable_bindings']) && $modx->config['enable_bindings']!=1 && $src==='docform') {
+    if (substr($nvalue, 0, 1) != '@') {
+            return $value;
+    } elseif(isset($modx->config['enable_bindings']) && $modx->config['enable_bindings']!=1 && $src==='docform') {
         return '@Bindings is disabled.';
-    }
-    else {
+    } else {
         list ($cmd, $param) = ParseCommand($nvalue);
         $cmd = trim($cmd);
         $param = parseTvValues($param, $tvsArray);
@@ -39,10 +39,11 @@ 
 
             case "DOCUMENT" : // retrieve a document and process it's content
                 $rs = $modx->getDocument($param);
-                if (is_array($rs))
-                    $output = $rs['content'];
-                else
-                    $output = "Unable to locate document $param";
+                if (is_array($rs)) {
+                                    $output = $rs['content'];
+                } else {
+                                    $output = "Unable to locate document $param";
+                }
                 break;
 
             case "SELECT" : // selects a record from the cms database
@@ -72,8 +73,10 @@ 
 
                     // Grab document regardless of publish status
                     $doc = $modx->getPageInfo($parent_id, 0, 'id,parent,published');
-                    if ($doc['parent'] != 0 && !$doc['published'])
-                        continue; // hide unpublished docs if we're not at the top
+                    if ($doc['parent'] != 0 && !$doc['published']) {
+                                            continue;
+                    }
+                    // hide unpublished docs if we're not at the top
 
                     $tv = $modx->getTemplateVar($name, '*', $doc['id'], $doc['published']);
 
@@ -117,10 +120,13 @@ 
     }
 }
 
-function ProcessFile($file) {
+function ProcessFile($file)
+{
     // get the file
 	$buffer = @file_get_contents($file);
-	if ($buffer===false) $buffer = " Could not retrieve document '$file'.";
+	if ($buffer===false) {
+	    $buffer = " Could not retrieve document '$file'.";
+	}
     return $buffer;
 }
 
@@ -129,10 +135,8 @@ 
 {
     global $BINDINGS;
     $binding_array = array();
-    foreach($BINDINGS as $cmd)
-    {
-        if(strpos($binding_string,'@'.$cmd)===0)
-        {
+    foreach($BINDINGS as $cmd) {
+        if(strpos($binding_string,'@'.$cmd)===0) {
             $code = substr($binding_string,strlen($cmd)+1);
             $binding_array = array($cmd,trim($code));
             break;