evolution-cms / evolution

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

Indentation +11 added lines, -11 removed lines

@@ -11,18 +11,18 @@
  */
 
 function secureWebDocument($docid='') {
-	global $modx;
+    global $modx;
 
-	$modx->db->update('privateweb = 0', $modx->getFullTableName("site_content"), ($docid>0 ? "id='$docid'":"privateweb = 1"));
-	$rs = $modx->db->select(
-		'DISTINCT sc.id',
-		$modx->getFullTableName("site_content")." sc
+    $modx->db->update('privateweb = 0', $modx->getFullTableName("site_content"), ($docid>0 ? "id='$docid'":"privateweb = 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("webgroup_access")." wga ON wga.documentgroup = dg.document_group",
-		($docid>0 ? " sc.id='{$docid}' AND ":"")."wga.id>0"
-		);
-	$ids = $modx->db->getColumn("id",$rs);
-	if(count($ids)>0) {
-		$modx->db->update('privateweb = 1', $modx->getFullTableName("site_content"), "id IN (".implode(", ",$ids).")");
-	}
+        ($docid>0 ? " sc.id='{$docid}' AND ":"")."wga.id>0"
+        );
+    $ids = $modx->db->getColumn("id",$rs);
+    if(count($ids)>0) {
+        $modx->db->update('privateweb = 1', $modx->getFullTableName("site_content"), "id IN (".implode(", ",$ids).")");
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?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,19 +10,19 @@ 
  *
  */
 
-function secureWebDocument($docid='') {
+function secureWebDocument($docid = ''){
 	global $modx;
 
-	$modx->db->update('privateweb = 0', $modx->getFullTableName("site_content"), ($docid>0 ? "id='$docid'":"privateweb = 1"));
+	$modx->db->update('privateweb = 0', $modx->getFullTableName("site_content"), ($docid > 0 ? "id='$docid'" : "privateweb = 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("webgroup_access")." wga ON wga.documentgroup = dg.document_group",
-		($docid>0 ? " sc.id='{$docid}' AND ":"")."wga.id>0"
+		($docid > 0 ? " sc.id='{$docid}' AND " : "")."wga.id>0"
 		);
-	$ids = $modx->db->getColumn("id",$rs);
-	if(count($ids)>0) {
-		$modx->db->update('privateweb = 1', $modx->getFullTableName("site_content"), "id IN (".implode(", ",$ids).")");
+	$ids = $modx->db->getColumn("id", $rs);
+	if (count($ids) > 0) {
+		$modx->db->update('privateweb = 1', $modx->getFullTableName("site_content"), "id IN (".implode(", ", $ids).")");
 	}
 }

manager/includes/charsets.php

Spacing +17 added lines, -17 removed lines

@@ -65,26 +65,26 @@
 $_['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();
-foreach($_ as $value=>$label) {
-    $selected = $value===$modx_charset ? 'selected' : '';
+foreach ($_ as $value=>$label) {
+    $selected = $value === $modx_charset ? 'selected' : '';
     $options[] = sprintf($tpl, $value, $selected, $label);
 }
 echo join("\n", $options);

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

Indentation +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 }
 
 if($emptyCache) {
-	$modx->clearCache('full');
+    $modx->clearCache('full');
 }
 
 echo $str;
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -3,9 +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');
+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']);
@@ -20,10 +20,10 @@ 
 $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)):{
@@ -50,7 +50,7 @@ 
     }
 }
 
-if($emptyCache) {
+if ($emptyCache) {
 	$modx->clearCache('full');
 }
 

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

Spacing +7 added lines, -7 removed lines

@@ -3,10 +3,10 @@ 
 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);

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

 }

 

 function startCMSSession(){

@@ -15,7 +15,7 @@ 
     

     session_name($site_sessionname);

     removeInvalidCmsSessionIds($site_sessionname);

-    $cookieExpiration= 0;

+    $cookieExpiration = 0;

     $secure = ((isset ($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') || $_SERVER['SERVER_PORT'] == $https_port);

     $cookiePath = !empty($session_cookie_path) ? $session_cookie_path : MODX_BASE_URL;

     $cookieDomain = !empty($session_cookie_domain) ? $session_cookie_domain : '';

@@ -24,8 +24,8 @@ 
 

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

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

-        $cookieLifetime= intval($_SESSION[$key]);

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

+        $cookieLifetime = intval($_SESSION[$key]);

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

         setcookie(session_name(), session_id(), $cookieExpiration, $cookiePath, $cookieDomain, $secure, true);

     }

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

@@ -33,14 +33,14 @@ 
     }

 }

 

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

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

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

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?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.");
 
 $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID()." AND messageread=0");
 $nrnewmessages = $modx->db->getValue($rs);

Braces +3 added lines, -1 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.");
+}
 
 $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID()." AND messageread=0");
 $nrnewmessages = $modx->db->getValue($rs);

Indentation +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@
 
 // ajax response
 if (isset($_POST['updateMsgCount'])) {
-	header("Content-Type: application/json; charset=utf-8");
-	print $nrnewmessages.','.$nrtotalmessages;
-	exit;
+    header("Content-Type: application/json; charset=utf-8");
+    print $nrnewmessages.','.$nrtotalmessages;
+    exit;
 }

manager/includes/error.class.inc.php

Indentation +59 added lines, -59 removed lines

@@ -5,72 +5,72 @@ 
 var $errorcode;
 var $errors = array();
 
-	function __construct() {
+    function __construct() {
 		
-		$_lang = $this->include_lang('errormsg');
+        $_lang = $this->include_lang('errormsg');
 		
-		$this->errors = array(
-		0	=>	$_lang["No errors occured."],
-		1	=>	$_lang["An error occured!"],
-		2	=>	$_lang["Document's ID not passed in request!"],
-		3	=>	$_lang["You don't have enough privileges for this action!"],
-		4	=>	$_lang["ID passed in request is NaN!"],
-		5	=>	$_lang["The document is locked!"],
-		6	=>	$_lang["Too many results returned from database!"],
-		7	=>	$_lang["Not enough/ no results returned from database!"],
-		8	=>	$_lang["Couldn't find parent document's name!"],
-		9	=>	$_lang["Logging error!"],
-		10	=>	$_lang["Table to optimise not found in request!"],
-		11	=>	$_lang["No settings found in request!"],
-		12	=>	$_lang["The document must have a title!"],
-		13	=>	$_lang["No user selected as recipient of this message!"],
-		14	=>	$_lang["No group selected as recipient of this message!"],
-		15	=>	$_lang["The document was not found!"],
+        $this->errors = array(
+        0	=>	$_lang["No errors occured."],
+        1	=>	$_lang["An error occured!"],
+        2	=>	$_lang["Document's ID not passed in request!"],
+        3	=>	$_lang["You don't have enough privileges for this action!"],
+        4	=>	$_lang["ID passed in request is NaN!"],
+        5	=>	$_lang["The document is locked!"],
+        6	=>	$_lang["Too many results returned from database!"],
+        7	=>	$_lang["Not enough/ no results returned from database!"],
+        8	=>	$_lang["Couldn't find parent document's name!"],
+        9	=>	$_lang["Logging error!"],
+        10	=>	$_lang["Table to optimise not found in request!"],
+        11	=>	$_lang["No settings found in request!"],
+        12	=>	$_lang["The document must have a title!"],
+        13	=>	$_lang["No user selected as recipient of this message!"],
+        14	=>	$_lang["No group selected as recipient of this message!"],
+        15	=>	$_lang["The document was not found!"],
 	
-		100 =>	$_lang["Double action (GET & POST) posted!"],
-		600 =>	$_lang["Document cannot be it's own parent!"],
-		601 =>	$_lang["Document's ID not passed in request!"],
-		602 =>	$_lang["New parent not set in request!"],
-		900 =>	$_lang["don't know the user!"], // don't know the user!
-		901 =>	$_lang["wrong password!"], // wrong password!
-		902 =>	$_lang["Due to too many failed logins, you have been blocked!"],
-		903 =>	$_lang["You are blocked and cannot log in!"],
-		904 =>	$_lang["You are blocked and cannot log in! Please try again later."],
-		905 =>	$_lang["The security code you entered didn't validate! Please try to login again!"]
-	);
-	}
+        100 =>	$_lang["Double action (GET & POST) posted!"],
+        600 =>	$_lang["Document cannot be it's own parent!"],
+        601 =>	$_lang["Document's ID not passed in request!"],
+        602 =>	$_lang["New parent not set in request!"],
+        900 =>	$_lang["don't know the user!"], // don't know the user!
+        901 =>	$_lang["wrong password!"], // wrong password!
+        902 =>	$_lang["Due to too many failed logins, you have been blocked!"],
+        903 =>	$_lang["You are blocked and cannot log in!"],
+        904 =>	$_lang["You are blocked and cannot log in! Please try again later."],
+        905 =>	$_lang["The security code you entered didn't validate! Please try to login again!"]
+    );
+    }
 
-	function include_lang($context='common') {
-		global $modx;
-		$_lang = array();
+    function include_lang($context='common') {
+        global $modx;
+        $_lang = array();
 		
-		$context = trim($context,'/');
-		if(strpos($context,'..')!==false) return;
+        $context = trim($context,'/');
+        if(strpos($context,'..')!==false) return;
 		
-		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");
-		return $_lang;
-	}
+        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");
+        return $_lang;
+    }
 	
-	function setError($errorcode, $custommessage=""){
-		$this->errorcode=$errorcode;
-		$this->errormessage=$this->errors[$errorcode];
-		if($custommessage!="") {
-			$this->errormessage=$custommessage;
-		}
-	}	
+    function setError($errorcode, $custommessage=""){
+        $this->errorcode=$errorcode;
+        $this->errormessage=$this->errors[$errorcode];
+        if($custommessage!="") {
+            $this->errormessage=$custommessage;
+        }
+    }	
 	
-	function getError() {
-		return $this->errorcode;
-	}
+    function getError() {
+        return $this->errorcode;
+    }
 	
-	function dumpError(){
+    function dumpError(){
 ?>
 	<html>
 	<head>
@@ -88,7 +88,7 @@ 
 	</body>
 	</html>
 <?php
-		exit;
-	}
+        exit;
+    }
 }
 ?>
\ No newline at end of file

Spacing +15 added lines, -15 removed lines

@@ -5,7 +5,7 @@ 
 var $errorcode;
 var $errors = array();
 
-	function __construct() {
+	function __construct(){
 		
 		$_lang = $this->include_lang('errormsg');
 		
@@ -40,33 +40,33 @@ 
 	);
 	}
 
-	function include_lang($context='common') {
+	function include_lang($context = 'common'){
 		global $modx;
 		$_lang = array();
 		
-		$context = trim($context,'/');
-		if(strpos($context,'..')!==false) return;
+		$context = trim($context, '/');
+		if (strpos($context, '..') !== false) return;
 		
-		if($context === 'common')
-			$lang_path = MODX_MANAGER_PATH . 'includes/lang/';
+		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');
+			$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"))
+		if (is_file("{$lang_path}{$manager_language}.inc.php"))
 			include_once("{$lang_path}{$manager_language}.inc.php");
 		return $_lang;
 	}
 	
-	function setError($errorcode, $custommessage=""){
-		$this->errorcode=$errorcode;
-		$this->errormessage=$this->errors[$errorcode];
-		if($custommessage!="") {
-			$this->errormessage=$custommessage;
+	function setError($errorcode, $custommessage = ""){
+		$this->errorcode = $errorcode;
+		$this->errormessage = $this->errors[$errorcode];
+		if ($custommessage != "") {
+			$this->errormessage = $custommessage;
 		}
 	}	
 	
-	function getError() {
+	function getError(){
 		return $this->errorcode;
 	}
 	

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

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?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.");
 
 // START HACK
 if (isset ($modx)) {
@@ -15,7 +15,7 @@ 
 
 	$which_browser_default = $which_browser;
 	while ($row = $modx->db->getRow($rs)) {
-		if($row['setting_name'] == 'which_browser' && $row['setting_value'] == 'default') $row['setting_value'] = $which_browser_default;
+		if ($row['setting_name'] == 'which_browser' && $row['setting_value'] == 'default') $row['setting_value'] = $which_browser_default;
 		$settings[$row['setting_name']] = $row['setting_value'];
 		if (isset($modx->config)) {
 			$modx->config[$row['setting_name']] = $row['setting_value'];

Braces +6 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.");
+}
 
 // START HACK
 if (isset ($modx)) {
@@ -15,7 +17,9 @@ 
 
 	$which_browser_default = $which_browser;
 	while ($row = $modx->db->getRow($rs)) {
-		if($row['setting_name'] == 'which_browser' && $row['setting_value'] == 'default') $row['setting_value'] = $which_browser_default;
+		if($row['setting_name'] == 'which_browser' && $row['setting_value'] == 'default') {
+		    $row['setting_value'] = $which_browser_default;
+		}
 		$settings[$row['setting_name']] = $row['setting_value'];
 		if (isset($modx->config)) {
 			$modx->config[$row['setting_name']] = $row['setting_value'];

Indentation +13 added lines, -13 removed lines

@@ -3,23 +3,23 @@
 
 // START HACK
 if (isset ($modx)) {
-	$user_id = $modx->getLoginUserID();
+    $user_id = $modx->getLoginUserID();
 } else {
-	$user_id = $_SESSION['mgrInternalKey'];
+    $user_id = $_SESSION['mgrInternalKey'];
 }
 // END HACK
 
 if (!empty($user_id)) {
-	// Raymond: grab the user settings from the database.
-	$rs = $modx->db->select('setting_name, setting_value', $modx->getFullTableName('user_settings'), "user=".$modx->getLoginUserID());
+    // Raymond: grab the user settings from the database.
+    $rs = $modx->db->select('setting_name, setting_value', $modx->getFullTableName('user_settings'), "user=".$modx->getLoginUserID());
 
-	$which_browser_default = $which_browser;
-	while ($row = $modx->db->getRow($rs)) {
-		if($row['setting_name'] == 'which_browser' && $row['setting_value'] == 'default') $row['setting_value'] = $which_browser_default;
-		$settings[$row['setting_name']] = $row['setting_value'];
-		if (isset($modx->config)) {
-			$modx->config[$row['setting_name']] = $row['setting_value'];
-		}
-	}
-	extract($settings, EXTR_OVERWRITE);
+    $which_browser_default = $which_browser;
+    while ($row = $modx->db->getRow($rs)) {
+        if($row['setting_name'] == 'which_browser' && $row['setting_value'] == 'default') $row['setting_value'] = $which_browser_default;
+        $settings[$row['setting_name']] = $row['setting_value'];
+        if (isset($modx->config)) {
+            $modx->config[$row['setting_name']] = $row['setting_value'];
+        }
+    }
+    extract($settings, EXTR_OVERWRITE);
 }

manager/includes/active_user_locks.inc.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
         var stay = document.getElementById('stay');
         // Trigger unlock
         if ((stay && stay.value !== '2') || !form_save) {
-          var url = '<?php echo MODX_MANAGER_URL; ?>?a=67&type=<?php echo $lockElementType;?>&id=<?php echo $lockElementId;?>&o=' + Math.random();
+          var url = '<?php echo MODX_MANAGER_URL; ?>?a=67&type=<?php echo $lockElementType; ?>&id=<?php echo $lockElementId; ?>&o=' + Math.random();
           if (navigator.sendBeacon) {
             navigator.sendBeacon(url)
           } else {

manager/includes/secure_mgr_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 Manager Documents
@@ -10,7 +12,8 @@ 
  *
  */
 
-function secureMgrDocument($docid='') {
+function secureMgrDocument($docid='')
+{
 	global $modx;
 		
 	$modx->db->update('privatemgr = 0', $modx->getFullTableName("site_content"), ($docid>0 ? "id='$docid'":"privatemgr = 1"));

Indentation +11 added lines, -11 removed lines

@@ -11,18 +11,18 @@
  */
 
 function secureMgrDocument($docid='') {
-	global $modx;
+    global $modx;
 
-	$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
+    $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"
-		);
-	$ids = $modx->db->getColumn("id",$rs);
-	if(count($ids)>0) {
-		$modx->db->update('privatemgr = 1', $modx->getFullTableName("site_content"), "id IN (".implode(", ",$ids).")");
-	}
+        ($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).")");
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?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 Manager Documents
@@ -10,19 +10,19 @@ 
  *
  */
 
-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).")");
 	}
 }