evolution-cms / evolution

manager/index.php

Braces +37 added lines, -18 removed lines

@@ -61,9 +61,13 @@ 
 $mgr_dir   = substr($self_dir,strrpos($self_dir,'/')+1);
 $base_path = str_replace($mgr_dir . '/index.php','',$self);
 $site_mgr_path = $base_path . 'assets/cache/siteManager.php';
-if(is_file($site_mgr_path)) include_once($site_mgr_path);
+if(is_file($site_mgr_path)) {
+    include_once($site_mgr_path);
+}
 $site_hostnames_path = $base_path . 'assets/cache/siteHostnames.php';
-if(is_file($site_hostnames_path)) include_once($site_hostnames_path);
+if(is_file($site_hostnames_path)) {
+    include_once($site_hostnames_path);
+}
 if(!defined('MGR_DIR') || MGR_DIR!==$mgr_dir) {
 	$src = "<?php\n";
 	$src .= "define('MGR_DIR', '{$mgr_dir}');\n";
@@ -117,9 +121,15 @@ 
 $incPath = str_replace("\\","/",dirname(__FILE__)."/includes/"); // Mod by Raymond
 set_include_path(get_include_path() . PATH_SEPARATOR . $incPath);
 
-if (!defined("ENT_COMPAT")) define("ENT_COMPAT", 2);
-if (!defined("ENT_NOQUOTES")) define("ENT_NOQUOTES", 0);
-if (!defined("ENT_QUOTES")) define("ENT_QUOTES", 3);
+if (!defined("ENT_COMPAT")) {
+    define("ENT_COMPAT", 2);
+}
+if (!defined("ENT_NOQUOTES")) {
+    define("ENT_NOQUOTES", 0);
+}
+if (!defined("ENT_QUOTES")) {
+    define("ENT_QUOTES", 3);
+}
 
 // set the document_root :|
 if(!isset($_SERVER["DOCUMENT_ROOT"]) || empty($_SERVER["DOCUMENT_ROOT"])) {
@@ -182,10 +192,11 @@ 
 
 $s = array('[+MGR_DIR+]');
 $r = array(MGR_DIR);
-foreach($_lang as $k=>$v)
-{
-	if(strpos($v,'[+')!==false) $_lang[$k] = str_replace($s, $r, $v);
-}
+foreach($_lang as $k=>$v) {
+	if(strpos($v,'[+')!==false) {
+	    $_lang[$k] = str_replace($s, $r, $v);
+	}
+	}
 
 // send the charset header
 header('Content-Type: text/html; charset='.$modx_manager_charset);
@@ -198,7 +209,7 @@ 
 include_once "accesscontrol.inc.php";
 
 // double check the session
-if(!isset($_SESSION['mgrValidated'])){
+if(!isset($_SESSION['mgrValidated'])) {
 	echo "Not Logged In!";
 	exit;
 }
@@ -215,7 +226,9 @@ 
 }
 
 // Initialize System Alert Message Queque
-if (!isset($_SESSION['SystemAlertMsgQueque'])) $_SESSION['SystemAlertMsgQueque'] = array();
+if (!isset($_SESSION['SystemAlertMsgQueque'])) {
+    $_SESSION['SystemAlertMsgQueque'] = array();
+}
 $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
 
 // first we check to see if this is a frameset request
@@ -223,7 +236,7 @@ 
 	// this looks to be a top-level frameset request, so let's serve up a frameset
 	if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/frames/1.php")) {
 		include_once "media/style/".$manager_theme."/frames/1.php";
-	}else{
+	} else {
 		include_once "frames/1.php";
 	}
 	exit;
@@ -231,10 +244,15 @@ 
 
 // OK, let's retrieve the action directive from the request
 $option = array('min_range'=>1,'max_range'=>2000);
-if(isset($_GET['a']) && isset($_POST['a'])) $modx->webAlertAndQuit($_lang['error_double_action']);
-elseif(isset($_GET['a']))  $action = filter_input(INPUT_GET, 'a',FILTER_VALIDATE_INT,$option);
-elseif(isset($_POST['a'])) $action = filter_input(INPUT_POST,'a',FILTER_VALIDATE_INT,$option);
-else                       $action = null;
+if(isset($_GET['a']) && isset($_POST['a'])) {
+    $modx->webAlertAndQuit($_lang['error_double_action']);
+} elseif(isset($_GET['a'])) {
+    $action = filter_input(INPUT_GET, 'a',FILTER_VALIDATE_INT,$option);
+} elseif(isset($_POST['a'])) {
+    $action = filter_input(INPUT_POST,'a',FILTER_VALIDATE_INT,$option);
+} else {
+    $action = null;
+}
 
 if (isset($_POST['updateMsgCount']) && $modx->hasPermission('messages')) {
 	include_once 'messageCount.inc.php';
@@ -264,11 +282,12 @@ 
 $modx->invokeEvent("OnManagerPageInit", array("action" => $action));
 
 // return element filepath
-function includeFileProcessor ($filepath,$manager_theme) {
+function includeFileProcessor ($filepath,$manager_theme)
+{
 	$element = "";
 	if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath)) {
 		$element = MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath;
-	}else{
+	} else {
 		$element = $filepath;
 	}
 	return $element;

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

Braces +5 added lines, -2 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(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(IN_MANAGER_MODE!="true") {
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+}
 
 /**
  *	Secure Web Documents
@@ -10,7 +12,8 @@ 
  *
  */
 
-function secureWebDocument($docid='') {
+function secureWebDocument($docid='')
+{
 	global $modx;
 		
 	$modx->db->update('privateweb = 0', $modx->getFullTableName("site_content"), ($docid>0 ? "id='$docid'":"privateweb = 1"));

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/mutate_settings.ajax.php

Braces +4 added lines, -2 removed lines

@@ -3,7 +3,9 @@ 
  * mutate_settings.ajax.php
  * 
  */
-if(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(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');
 
@@ -20,7 +22,7 @@ 
 $str = '';
 $emptyCache = false;
 
-switch(true){
+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] : "" ;

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');