evolution-cms / evolution

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;

manager/includes/log.class.inc.php

Braces +14 added lines, -5 removed lines

@@ -12,11 +12,13 @@ 
 
 */
 
-class logHandler {
+class logHandler
+{
     // Single variable for a log entry
     var $entry = array();
 
-    function initAndWriteLog($msg="", $internalKey="", $username="", $action="", $itemid="", $itemname="") {
+    function initAndWriteLog($msg="", $internalKey="", $username="", $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
@@ -26,10 +28,16 @@ 
         $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
-        if($this->entry['itemId'] == 0) $this->entry['itemId'] = "-"; // to stop items having id 0
+        if($this->entry['itemId'] == 0) {
+            $this->entry['itemId'] = "-";
+        }
+        // to stop items having id 0
 
         $this->entry['itemName'] = ($itemname == "" && isset($_SESSION['itemname']))? $_SESSION['itemname'] : $itemname; // writes the id to the object
-        if($this->entry['itemName'] == "") $this->entry['itemName'] = "-"; // to stop item name being empty
+        if($this->entry['itemName'] == "") {
+            $this->entry['itemName'] = "-";
+        }
+        // to stop item name being empty
 
         $this->writeToLog();
         return;
@@ -38,7 +46,8 @@ 
     // function to write to the log
     // collects all required info, and
     // writes it to the logging table
-    function writeToLog() {
+    function writeToLog()
+    {
         global $modx;
         $tbl_manager_log = $modx->getFullTableName('manager_log');
         

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

Braces +26 added lines, -22 removed lines

@@ -7,9 +7,11 @@ 
  *

  */

 

-Class TemplateParser {

+Class TemplateParser
+{
 

-	function __construct() {

+	function __construct()
+	{
 	}

 

 	/**

@@ -17,46 +19,47 @@ 
 	 * @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'] . ')' : '';

 

-		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 . '

 			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 {

+				} else {
 					$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') . ');

 					</script>';

 

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

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

 						unset($tab['category_name']);

-						foreach($tab as $item) {

+						foreach($tab as $item) {
 							$output .= $item;

 						}

 						$output .= '</div>';

@@ -69,7 +72,8 @@ 
 		return $output;

 	}

 

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

@@ -79,7 +83,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>

@@ -113,16 +117,16 @@ 
 				$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) {

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

 					}

-				} else {

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

+				} else {
+					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>';

 						}

@@ -138,9 +142,9 @@ 
 				$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]);

 					}

@@ -154,9 +158,9 @@ 
 				$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]);

 					}

manager/includes/controls/contextmenu.php

Braces +12 added lines, -6 removed lines

@@ -3,10 +3,12 @@ 
 global $ContextMenuCnt;
 $ContextMenuCnt = 0;
 
-class ContextMenu {
+class ContextMenu
+{
 	var $id;
 
-	function __construct($id = '', $width = 120, $visible = false) {
+	function __construct($id = '', $width = 120, $visible = false)
+	{
 		global $ContextMenuCnt;
 		$ContextMenuCnt++;
 		$this->html = "";
@@ -15,7 +17,8 @@ 
 		$this->id = $id ? $id : "cntxMnu" . $ContextMenuCnt;    // set id
 	}
 
-	function addItem($text, $action = "", $img = "", $disabled = 0) {
+	function addItem($text, $action = "", $img = "", $disabled = 0)
+	{
 		global $base_url, $_style;
         if($disabled) {
             return;
@@ -40,13 +43,15 @@ 
 		$this->html .= $img . '&nbsp;' . $text . '</div>';
 	}
 
-	function addSeparator() {
+	function addSeparator()
+	{
 		$this->html .= "
 			<div class='cntxMnuSeparator'></div>
 		";
 	}
 
-	function render() {
+	function render()
+	{
 		global $ContextMenuScript;
 
 		$html = $ContextMenuScript . "<div id='" . $this->id . "' class='contextMenu' style='width:" . $this->width . "px; visibility:" . ($this->visible ? 'visible' : 'hidden') . "'>" . $this->html . "</div>";
@@ -54,7 +59,8 @@ 
 		return $html;
 	}
 
-	function getClientScriptObject() {
+	function getClientScriptObject()
+	{
 		return "getCntxMenu('" . $this->id . "')";
 	}
 }

manager/includes/controls/datagrid.class.php

Braces +15 added lines, -7 removed lines

@@ -10,7 +10,8 @@ 
 
 $__DataGridCnt = 0;
 
-class DataGrid {
+class DataGrid
+{
 
 	var $ds; // datasource
 	var $id;
@@ -52,7 +53,8 @@ 
 	var $selPageClass;
 	var $noRecordMsg = "No records found.";
 
-	function __construct($id, $ds, $pageSize = 20, $pageNumber = -1) {
+	function __construct($id, $ds, $pageSize = 20, $pageNumber = -1)
+	{
 		global $__DataGridCnt;
 
 		// set id
@@ -68,11 +70,13 @@ 
 		$this->pagerLocation = 'top-right';
 	}
 
-	function setDataSource($ds) {
+	function setDataSource($ds)
+	{
 		$this->ds = $ds;
 	}
 
-	function render() {
+	function render()
+	{
 		global $modx;
 		$columnHeaderStyle = ($this->columnHeaderStyle) ? "style='" . $this->columnHeaderStyle . "'" : '';
 		$columnHeaderClass = ($this->columnHeaderClass) ? "class='" . $this->columnHeaderClass . "'" : "";
@@ -107,7 +111,9 @@ 
 
 		if($this->_isDataset && !$this->columns) {
 			$cols = $modx->db->numFields($this->ds);
-			for($i = 0; $i < $cols; $i++) $this->columns .= ($i ? "," : "") . $modx->db->fieldName($this->ds, $i);
+			for($i = 0; $i < $cols; $i++) {
+			    $this->columns .= ($i ? "," : "") . $modx->db->fieldName($this->ds, $i);
+			}
 		}
 
 		// start grid
@@ -187,7 +193,8 @@ 
 
 	// format column values
 
-	function RenderRowFnc($n, $row) {
+	function RenderRowFnc($n, $row)
+	{
 		if($this->_alt == 0) {
 			$Style = $this->_itemStyle;
 			$Class = $this->_itemClass;
@@ -217,7 +224,8 @@ 
 		return $o;
 	}
 
-	function formatColumnValue($row, $value, $type, &$align) {
+	function formatColumnValue($row, $value, $type, &$align)
+	{
 		if(strpos($type, ":") !== false) {
 			list($type, $type_format) = explode(":", $type, 2);
 		}