evolution-cms / evolution

manager/media/rss/rss_utils.inc

Braces +4 added lines, -5 removed lines

@@ -22,7 +22,8 @@ 
     NOTE: http://www.w3.org/TR/NOTE-datetime
 \*======================================================================*/
 
-function parse_w3cdtf ( $date_str ) {
+function parse_w3cdtf ( $date_str )
+{
     
     # regex to match wc3dtf
     $pat = "/(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(:(\d{2}))?(?:([-+])(\d{2}):?(\d{2})|(Z))?/";
@@ -37,8 +38,7 @@ 
         $offset = 0;
         if ( $match[10] == 'Z' ) {
             # zulu time, aka GMT
-        }
-        else {
+        } else {
             list( $tz_mod, $tz_hour, $tz_min ) =
                 array( $match[8], $match[9], $match[10]);
             
@@ -58,8 +58,7 @@ 
         }
         $epoch = $epoch + $offset;
         return $epoch;
-    }
-    else {
+    } else {
         return -1;
     }
 }

Spacing +12 added lines, -12 removed lines

@@ -22,35 +22,35 @@
     NOTE: http://www.w3.org/TR/NOTE-datetime
 \*======================================================================*/
 
-function parse_w3cdtf ( $date_str ) {
+function parse_w3cdtf($date_str){
 
     # regex to match wc3dtf
     $pat = "/(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(:(\d{2}))?(?:([-+])(\d{2}):?(\d{2})|(Z))?/";
 
-    if ( preg_match( $pat, $date_str, $match ) ) {
-        list( $year, $month, $day, $hours, $minutes, $seconds) =
-            array( $match[1], $match[2], $match[3], $match[4], $match[5], $match[6]);
+    if (preg_match($pat, $date_str, $match)) {
+        list($year, $month, $day, $hours, $minutes, $seconds) =
+            array($match[1], $match[2], $match[3], $match[4], $match[5], $match[6]);
 
         # calc epoch for current date assuming GMT
-        $epoch = gmmktime( $hours, $minutes, $seconds, $month, $day, $year);
+        $epoch = gmmktime($hours, $minutes, $seconds, $month, $day, $year);
 
         $offset = 0;
-        if ( $match[10] == 'Z' ) {
+        if ($match[10] == 'Z') {
             # zulu time, aka GMT
         }
         else {
-            list( $tz_mod, $tz_hour, $tz_min ) =
-                array( $match[8], $match[9], $match[10]);
+            list($tz_mod, $tz_hour, $tz_min) =
+                array($match[8], $match[9], $match[10]);
 
             # zero out the variables
-            if ( ! $tz_hour ) { $tz_hour = 0; }
-            if ( ! $tz_min ) { $tz_min = 0; }
+            if (!$tz_hour) { $tz_hour = 0; }
+            if (!$tz_min) { $tz_min = 0; }
 
-            $offset_secs = (($tz_hour*60)+$tz_min)*60;
+            $offset_secs = (($tz_hour * 60) + $tz_min) * 60;
 
             # is timezone ahead of GMT?  then subtract offset
             #
-            if ( $tz_mod == '+' ) {
+            if ($tz_mod == '+') {
                 $offset_secs = $offset_secs * -1;
             }
 

manager/includes/default_config.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php

 

-$c  = &$settings;

+$c = &$settings;

 

 $c['site_name']                = 'My MODX Site';

 $c['site_start']               = 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();

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 implode("\n", $options);

manager/includes/tmplvars.commands.inc.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
                     $modx->setPlaceholder($rvKey, $rvValue);
                 }
                 $param = $modx->mergePlaceholderContent($param);
-                $rs = $modx->db->query("SELECT $param;");
+                $rs = $modx->db->query("select $param;");
                 $output = $rs;
                 break;
 

Doc Comments +1 added lines, -1 removed lines

@@ -163,7 +163,7 @@
  *
  * @param string $param
  * @param array $tvsArray
- * @return mixed
+ * @return string
  */
 function parseTvValues($param, $tvsArray)
 {

Indentation +18 added lines, -18 removed lines

@@ -131,8 +131,8 @@ 
  */
 function ProcessFile($file) {
     // get the file
-	$buffer = @file_get_contents($file);
-	if ($buffer === false) $buffer = " Could not retrieve document '$file'.";
+    $buffer = @file_get_contents($file);
+    if ($buffer === false) $buffer = " Could not retrieve document '$file'.";
     return $buffer;
 }
 
@@ -168,20 +168,20 @@ 
 function parseTvValues($param, $tvsArray)
 {
     $modx = evolutionCMS();
-	$tvsArray = is_array($modx->documentObject) ? array_merge($tvsArray, $modx->documentObject) : $tvsArray;
-	if (strpos($param, '[*') !== false) {
-		$matches = $modx->getTagsFromContent($param, '[*', '*]');
-		foreach ($matches[0] as $i=>$match) {
-			if(isset($tvsArray[ $matches[1][$i] ])) {
-				if(is_array($tvsArray[ $matches[1][$i] ])) {
-					$value = $tvsArray[$matches[1][$i]]['value'];
-					$value = $value === '' ? $tvsArray[$matches[1][$i]]['default_text'] : $value;
-				} else {
-					$value = $tvsArray[ $matches[1][$i] ];
-				}
-				$param = str_replace($match, $value, $param);
-			}
-		}
-	}
-	return $param;
+    $tvsArray = is_array($modx->documentObject) ? array_merge($tvsArray, $modx->documentObject) : $tvsArray;
+    if (strpos($param, '[*') !== false) {
+        $matches = $modx->getTagsFromContent($param, '[*', '*]');
+        foreach ($matches[0] as $i=>$match) {
+            if(isset($tvsArray[ $matches[1][$i] ])) {
+                if(is_array($tvsArray[ $matches[1][$i] ])) {
+                    $value = $tvsArray[$matches[1][$i]]['value'];
+                    $value = $value === '' ? $tvsArray[$matches[1][$i]]['default_text'] : $value;
+                } else {
+                    $value = $tvsArray[ $matches[1][$i] ];
+                }
+                $param = str_replace($match, $value, $param);
+            }
+        }
+    }
+    return $param;
 }

Spacing +16 added lines, -16 removed lines

@@ -4,7 +4,7 @@ 
  * Created by Raymond Irving Feb, 2005
  */
 global $BINDINGS; // Array of supported bindings. must be upper case
-$BINDINGS = array (
+$BINDINGS = array(
     'FILE',
     'CHUNK',
     'DOCUMENT',
@@ -22,13 +22,13 @@ 
  * @param array $tvsArray
  * @return string
  */
-function ProcessTVCommand($value, $name = '', $docid = '', $src='docform', $tvsArray = array()) {
+function ProcessTVCommand($value, $name = '', $docid = '', $src = 'docform', $tvsArray = array()){
     $modx = evolutionCMS();
-    $docid = (int)$docid > 0 ? (int)$docid : $modx->documentIdentifier;
+    $docid = (int) $docid > 0 ? (int) $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') {
+    elseif (isset($modx->config['enable_bindings']) && $modx->config['enable_bindings'] != 1 && $src === 'docform') {
         return '@Bindings is disabled.';
     }
     else {
@@ -54,8 +54,8 @@ 
                 break;
 
             case "SELECT" : // selects a record from the cms database
-                $rt = array ();
-                $replacementVars = array (
+                $rt = array();
+                $replacementVars = array(
                     'DBASE' => $modx->db->config['dbase'],
                     'PREFIX' => $modx->db->config['table_prefix']
                 );
@@ -96,8 +96,8 @@ 
                 break;
 
             case 'DIRECTORY' :
-                $files = array ();
-                $path = $modx->config['base_path'] . $param;
+                $files = array();
+                $path = $modx->config['base_path'].$param;
                 if (substr($path, -1, 1) != '/') {
                     $path .= '/';
                 }
@@ -129,7 +129,7 @@ 
  * @param $file
  * @return string
  */
-function ProcessFile($file) {
+function ProcessFile($file){
     // get the file
 	$buffer = @file_get_contents($file);
 	if ($buffer === false) $buffer = " Could not retrieve document '$file'.";
@@ -146,12 +146,12 @@ 
 {
     global $BINDINGS;
     $binding_array = array();
-    foreach($BINDINGS as $cmd)
+    foreach ($BINDINGS as $cmd)
     {
-        if(strpos($binding_string,'@'.$cmd)===0)
+        if (strpos($binding_string, '@'.$cmd) === 0)
         {
-            $code = substr($binding_string,strlen($cmd)+1);
-            $binding_array = array($cmd,trim($code));
+            $code = substr($binding_string, strlen($cmd) + 1);
+            $binding_array = array($cmd, trim($code));
             break;
         }
     }
@@ -172,12 +172,12 @@ 
 	if (strpos($param, '[*') !== false) {
 		$matches = $modx->getTagsFromContent($param, '[*', '*]');
 		foreach ($matches[0] as $i=>$match) {
-			if(isset($tvsArray[ $matches[1][$i] ])) {
-				if(is_array($tvsArray[ $matches[1][$i] ])) {
+			if (isset($tvsArray[$matches[1][$i]])) {
+				if (is_array($tvsArray[$matches[1][$i]])) {
 					$value = $tvsArray[$matches[1][$i]]['value'];
 					$value = $value === '' ? $tvsArray[$matches[1][$i]]['default_text'] : $value;
 				} else {
-					$value = $tvsArray[ $matches[1][$i] ];
+					$value = $tvsArray[$matches[1][$i]];
 				}
 				$param = str_replace($match, $value, $param);
 			}

Braces +22 added lines, -18 removed lines

@@ -22,16 +22,16 @@ 
  * @param array $tvsArray
  * @return string
  */
-function ProcessTVCommand($value, $name = '', $docid = '', $src='docform', $tvsArray = array()) {
+function ProcessTVCommand($value, $name = '', $docid = '', $src='docform', $tvsArray = array())
+{
     $modx = evolutionCMS();
     $docid = (int)$docid > 0 ? (int)$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);
@@ -47,10 +47,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
@@ -80,8 +81,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']);
 
@@ -129,10 +132,13 @@ 
  * @param $file
  * @return string
  */
-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;
 }
 
@@ -146,10 +152,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/sysalert.display.inc.php

Indentation +20 added lines, -20 removed lines

@@ -1,30 +1,30 @@ 
 <?php
 
-	/**
-	 *	System Alert Message Queue Display file
-	 *	Written By Raymond Irving, April, 2005
-	 *
-	 *	Used to display system alert messages inside the browser
-	 *
-	 */
+    /**
+     *	System Alert Message Queue Display file
+     *	Written By Raymond Irving, April, 2005
+     *
+     *	Used to display system alert messages inside the browser
+     *
+     */
 
-	require_once(dirname(__FILE__).'/protect.inc.php');
+    require_once(dirname(__FILE__).'/protect.inc.php');
 
-	$sysMsgs = "";
-	$limit = count($SystemAlertMsgQueque);
-	for($i=0;$i<$limit;$i++) {
-		$sysMsgs .= $SystemAlertMsgQueque[$i]."<hr sys/>";
-	}
-	// reset message queque
-	unset($_SESSION['SystemAlertMsgQueque']);
-	$_SESSION['SystemAlertMsgQueque'] = array();
-	$SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
+    $sysMsgs = "";
+    $limit = count($SystemAlertMsgQueque);
+    for($i=0;$i<$limit;$i++) {
+        $sysMsgs .= $SystemAlertMsgQueque[$i]."<hr sys/>";
+    }
+    // reset message queque
+    unset($_SESSION['SystemAlertMsgQueque']);
+    $_SESSION['SystemAlertMsgQueque'] = array();
+    $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
 
-	if($sysMsgs!="") {
+    if($sysMsgs!="") {
 ?>
 
 <?php // fetch the styles
-	echo '<link rel="stylesheet" type="text/css" href="'.MODX_MANAGER_URL.'media/style/'.$manager_theme.'/style.css'.'" />';
+    echo '<link rel="stylesheet" type="text/css" href="'.MODX_MANAGER_URL.'media/style/'.$manager_theme.'/style.css'.'" />';
 ?>
 <script type="text/javascript">
 // <![CDATA[
@@ -42,5 +42,5 @@ 
 // ]]>
 </script>
 <?php
-	}
+    }
 ?>
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 
 	$sysMsgs = "";
 	$limit = count($SystemAlertMsgQueque);
-	for($i=0;$i<$limit;$i++) {
+	for ($i = 0; $i < $limit; $i++) {
 		$sysMsgs .= $SystemAlertMsgQueque[$i]."<hr sys/>";
 	}
 	// reset message queque
@@ -20,7 +20,7 @@ 
 	$_SESSION['SystemAlertMsgQueque'] = array();
 	$SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
 
-	if($sysMsgs!="") {
+	if ($sysMsgs != "") {
 ?>
 
 <?php // fetch the styles
@@ -32,7 +32,7 @@ 
 			var sysAlert = new Element('div').setProperties({
 				'class': 'sysAlert'
 			});
-			sysAlert.innerHTML = '<?php echo $modx->db->escape($sysMsgs);?>';
+			sysAlert.innerHTML = '<?php echo $modx->db->escape($sysMsgs); ?>';
 			var boxHtml = new MooPrompt('<?php echo $_lang['sys_alert']; ?>', sysAlert, {
 				buttons: 1,
 				button1: 'Ok',

manager/includes/config_check.inc.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
 }
 </script>
 
-JS;
+js;
         $modx->regClientScript($script);
         }
     }

Indentation +16 added lines, -16 removed lines

@@ -5,14 +5,14 @@ 
 
 // PROCESSOR FIRST
 if($_SESSION['mgrRole'] == 1) {
-	if($_REQUEST['b'] == 'resetSysfilesChecksum' && $modx->hasPermission('settings')) {
-		$current = $modx->manager->getSystemChecksum($modx->config['check_files_onlogin']);
-		if(!empty($current)) {
-			$modx->manager->setSystemChecksum($current);
-			$modx->clearCache('full');
-			$modx->config['sys_files_checksum'] = $current;
-		};
-	}
+    if($_REQUEST['b'] == 'resetSysfilesChecksum' && $modx->hasPermission('settings')) {
+        $current = $modx->manager->getSystemChecksum($modx->config['check_files_onlogin']);
+        if(!empty($current)) {
+            $modx->manager->setSystemChecksum($current);
+            $modx->clearCache('full');
+            $modx->config['sys_files_checksum'] = $current;
+        };
+    }
 }
 
 // NOW CHECK CONFIG
@@ -20,15 +20,15 @@ 
 
 $sysfiles_check = $modx->manager->checkSystemChecksum();
 if ($sysfiles_check!=='0'){
-      $warningspresent = 1;
-      $warnings[] = array($_lang['configcheck_sysfiles_mod']);
+        $warningspresent = 1;
+        $warnings[] = array($_lang['configcheck_sysfiles_mod']);
 }
 
 if (is_writable("includes/config.inc.php")){
     // Warn if world writable
     if(@fileperms('includes/config.inc.php') & 0x0002) {
-      $warningspresent = 1;
-      $warnings[] = array($_lang['configcheck_configinc']);
+        $warningspresent = 1;
+        $warnings[] = array($_lang['configcheck_configinc']);
     }
 }
 
@@ -179,10 +179,10 @@ 
             break;
         case $_lang['configcheck_sysfiles_mod']:
             $warnings[$i][1] = $_lang["configcheck_sysfiles_mod_msg"];
-			$warnings[$i][2] = '<ul><li>'. implode('</li><li>', $sysfiles_check) .'</li></ul>';
-			if($modx->hasPermission('settings')) {
-				$warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\'' . $_lang["reset_sysfiles_checksum_alert"] . '\')">' . $_lang["reset_sysfiles_checksum_button"] . '</a></li></ul>';
-			}
+            $warnings[$i][2] = '<ul><li>'. implode('</li><li>', $sysfiles_check) .'</li></ul>';
+            if($modx->hasPermission('settings')) {
+                $warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\'' . $_lang["reset_sysfiles_checksum_alert"] . '\')">' . $_lang["reset_sysfiles_checksum_button"] . '</a></li></ul>';
+            }
             if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1]." ".implode(', ',$sysfiles_check),$_lang['configcheck_sysfiles_mod']);
             break;
         case $_lang['configcheck_lang_difference'] :

Spacing +41 added lines, -41 removed lines

@@ -1,13 +1,13 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
 // PROCESSOR FIRST
-if($_SESSION['mgrRole'] == 1) {
-	if($_REQUEST['b'] == 'resetSysfilesChecksum' && $modx->hasPermission('settings')) {
+if ($_SESSION['mgrRole'] == 1) {
+	if ($_REQUEST['b'] == 'resetSysfilesChecksum' && $modx->hasPermission('settings')) {
 		$current = $modx->manager->getSystemChecksum($modx->config['check_files_onlogin']);
-		if(!empty($current)) {
+		if (!empty($current)) {
 			$modx->manager->setSystemChecksum($current);
 			$modx->clearCache('full');
 			$modx->config['sys_files_checksum'] = $current;
@@ -19,14 +19,14 @@ 
 $warningspresent = 0;
 
 $sysfiles_check = $modx->manager->checkSystemChecksum();
-if ($sysfiles_check!=='0'){
+if ($sysfiles_check !== '0') {
       $warningspresent = 1;
       $warnings[] = array($_lang['configcheck_sysfiles_mod']);
 }
 
-if (is_writable("includes/config.inc.php")){
+if (is_writable("includes/config.inc.php")) {
     // Warn if world writable
-    if(@fileperms('includes/config.inc.php') & 0x0002) {
+    if (@fileperms('includes/config.inc.php') & 0x0002) {
       $warningspresent = 1;
       $warnings[] = array($_lang['configcheck_configinc']);
     }
@@ -42,8 +42,8 @@ 
     $warnings[] = array($_lang['configcheck_php_gdzip']);
 }
 
-if(!isset($modx->config['_hide_configcheck_validate_referer']) || $modx->config['_hide_configcheck_validate_referer'] !== '1') {
-    if(isset($_SESSION['mgrPermissions']['settings']) && $_SESSION['mgrPermissions']['settings'] == '1') {
+if (!isset($modx->config['_hide_configcheck_validate_referer']) || $modx->config['_hide_configcheck_validate_referer'] !== '1') {
+    if (isset($_SESSION['mgrPermissions']['settings']) && $_SESSION['mgrPermissions']['settings'] == '1') {
         if ($modx->db->getValue($modx->db->select('COUNT(setting_value)', $modx->getFullTableName('system_settings'), "setting_name='validate_referer' AND setting_value='0'"))) {
             $warningspresent = 1;
             $warnings[] = array($_lang['configcheck_validate_referer']);
@@ -52,11 +52,11 @@ 
 }
 
 // check for Template Switcher plugin
-if(!isset($modx->config['_hide_configcheck_templateswitcher_present']) || $modx->config['_hide_configcheck_templateswitcher_present'] !== '1') {
-    if(isset($_SESSION['mgrPermissions']['edit_plugin']) && $_SESSION['mgrPermissions']['edit_plugin'] == '1') {
+if (!isset($modx->config['_hide_configcheck_templateswitcher_present']) || $modx->config['_hide_configcheck_templateswitcher_present'] !== '1') {
+    if (isset($_SESSION['mgrPermissions']['edit_plugin']) && $_SESSION['mgrPermissions']['edit_plugin'] == '1') {
         $rs = $modx->db->select('name, disabled', $modx->getFullTableName('site_plugins'), "name IN ('TemplateSwitcher', 'Template Switcher', 'templateswitcher', 'template_switcher', 'template switcher') OR plugincode LIKE '%TemplateSwitcher%'");
         $row = $modx->db->getRow($rs);
-        if($row && $row['disabled'] == 0) {
+        if ($row && $row['disabled'] == 0) {
             $warningspresent = 1;
             $warnings[] = array($_lang['configcheck_templateswitcher_present']);
             $tplName = $row['name'];
@@ -120,36 +120,36 @@ 
     /**
      * @return bool
      */
-    function checkSiteCache() {
+    function checkSiteCache(){
         $modx = evolutionCMS();
-        $checked= true;
-        if (file_exists($modx->config['base_path'] . 'assets/cache/siteCache.idx.php')) {
-            $checked= @include_once ($modx->config['base_path'] . 'assets/cache/siteCache.idx.php');
+        $checked = true;
+        if (file_exists($modx->config['base_path'].'assets/cache/siteCache.idx.php')) {
+            $checked = @include_once ($modx->config['base_path'].'assets/cache/siteCache.idx.php');
         }
         return $checked;
     }
 }
 
-if (!is_writable(MODX_BASE_PATH . "assets/cache/")) {
+if (!is_writable(MODX_BASE_PATH."assets/cache/")) {
     $warningspresent = 1;
     $warnings[] = array($_lang['configcheck_cache']);
 }
 
 if (!checkSiteCache()) {
     $warningspresent = 1;
-    $warnings[]= array($lang['configcheck_sitecache_integrity']);
+    $warnings[] = array($lang['configcheck_sitecache_integrity']);
 }
 
-if (!is_writable(MODX_BASE_PATH . "assets/images/")) {
+if (!is_writable(MODX_BASE_PATH."assets/images/")) {
     $warningspresent = 1;
     $warnings[] = array($_lang['configcheck_images']);
 }
 
-if(strpos($modx->config['rb_base_dir'],MODX_BASE_PATH)!==0) {
+if (strpos($modx->config['rb_base_dir'], MODX_BASE_PATH) !== 0) {
     $warningspresent = 1;
     $warnings[] = array($_lang['configcheck_rb_base_dir']);
 }
-if(strpos($modx->config['filemanager_path'],MODX_BASE_PATH)!==0) {
+if (strpos($modx->config['filemanager_path'], MODX_BASE_PATH) !== 0) {
     $warningspresent = 1;
     $warnings[] = array($_lang['configcheck_filemanager_path']);
 }
@@ -157,36 +157,36 @@ 
 // clear file info cache
 clearstatcache();
 
-if ($warningspresent==1) {
+if ($warningspresent == 1) {
 
-if(!isset($modx->config['send_errormail'])) $modx->config['send_errormail']='3';
+if (!isset($modx->config['send_errormail'])) $modx->config['send_errormail'] = '3';
 $config_check_results = "<h3>".$_lang['configcheck_notok']."</h3>";
 
-for ($i=0;$i<count($warnings);$i++) {
+for ($i = 0; $i < count($warnings); $i++) {
     switch ($warnings[$i][0]) {
         case $_lang['configcheck_configinc'];
             $warnings[$i][1] = $_lang['configcheck_configinc_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_configinc']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 3, $warnings[$i][1], $_lang['configcheck_configinc']);
             break;
         case $_lang['configcheck_installer'] :
             $warnings[$i][1] = $_lang['configcheck_installer_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_installer']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 3, $warnings[$i][1], $_lang['configcheck_installer']);
             break;
         case $_lang['configcheck_cache'] :
             $warnings[$i][1] = $_lang['configcheck_cache_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_cache']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 2, $warnings[$i][1], $_lang['configcheck_cache']);
             break;
         case $_lang['configcheck_images'] :
             $warnings[$i][1] = $_lang['configcheck_images_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_images']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 2, $warnings[$i][1], $_lang['configcheck_images']);
             break;
         case $_lang['configcheck_sysfiles_mod']:
             $warnings[$i][1] = $_lang["configcheck_sysfiles_mod_msg"];
-			$warnings[$i][2] = '<ul><li>'. implode('</li><li>', $sysfiles_check) .'</li></ul>';
-			if($modx->hasPermission('settings')) {
-				$warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\'' . $_lang["reset_sysfiles_checksum_alert"] . '\')">' . $_lang["reset_sysfiles_checksum_button"] . '</a></li></ul>';
+			$warnings[$i][2] = '<ul><li>'.implode('</li><li>', $sysfiles_check).'</li></ul>';
+			if ($modx->hasPermission('settings')) {
+				$warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\''.$_lang["reset_sysfiles_checksum_alert"].'\')">'.$_lang["reset_sysfiles_checksum_button"].'</a></li></ul>';
 			}
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1]." ".implode(', ',$sysfiles_check),$_lang['configcheck_sysfiles_mod']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 3, $warnings[$i][1]." ".implode(', ', $sysfiles_check), $_lang['configcheck_sysfiles_mod']);
             break;
         case $_lang['configcheck_lang_difference'] :
             $warnings[$i][1] = $_lang['configcheck_lang_difference_msg'];
@@ -208,18 +208,18 @@ 
             break;
         case $_lang['configcheck_validate_referer'] :
             $msg = $_lang['configcheck_validate_referer_msg'];
-            $msg .= '<br />' . sprintf($_lang["configcheck_hide_warning"], 'validate_referer');
+            $msg .= '<br />'.sprintf($_lang["configcheck_hide_warning"], 'validate_referer');
             $warnings[$i][1] = "<span id=\"validate_referer_warning_wrapper\">{$msg}</span>\n";
             break;
         case $_lang['configcheck_templateswitcher_present'] :
             $msg = $_lang["configcheck_templateswitcher_present_msg"];
-            if(isset($_SESSION['mgrPermissions']['save_plugin']) && $_SESSION['mgrPermissions']['save_plugin'] == '1') {
-                $msg .= '<br />' . $_lang["configcheck_templateswitcher_present_disable"];
+            if (isset($_SESSION['mgrPermissions']['save_plugin']) && $_SESSION['mgrPermissions']['save_plugin'] == '1') {
+                $msg .= '<br />'.$_lang["configcheck_templateswitcher_present_disable"];
             }
-            if(isset($_SESSION['mgrPermissions']['delete_plugin']) && $_SESSION['mgrPermissions']['delete_plugin'] == '1') {
-                $msg .= '<br />' . $_lang["configcheck_templateswitcher_present_delete"];
+            if (isset($_SESSION['mgrPermissions']['delete_plugin']) && $_SESSION['mgrPermissions']['delete_plugin'] == '1') {
+                $msg .= '<br />'.$_lang["configcheck_templateswitcher_present_delete"];
             }
-            $msg .= '<br />' . sprintf($_lang["configcheck_hide_warning"], 'templateswitcher_present');
+            $msg .= '<br />'.sprintf($_lang["configcheck_hide_warning"], 'templateswitcher_present');
             $warnings[$i][1] = "<span id=\"templateswitcher_present_warning_wrapper\">{$msg}</span>\n";
             break;
         case $_lang['configcheck_rb_base_dir'] :
@@ -232,7 +232,7 @@ 
             $warnings[$i][1] = $_lang['configcheck_default_msg'];
     }
 
-    $admin_warning = $_SESSION['mgrRole']!=1 ? $_lang['configcheck_admin'] : "" ;
+    $admin_warning = $_SESSION['mgrRole'] != 1 ? $_lang['configcheck_admin'] : "";
     $config_check_results .= "
             <fieldset>
             <p><strong>".$_lang['configcheck_warning']."</strong> '".$warnings[$i][0]."'</p>
@@ -241,11 +241,11 @@ 
             ".(isset($warnings[$i][2]) ? '<div style="padding-left:1em">'.$warnings[$i][2].'</div>' : '')."
             </fieldset>
 ";
-        if ($i!=count($warnings)-1) {
+        if ($i != count($warnings) - 1) {
             $config_check_results .= "<br />";
         }
     }
-    $_SESSION["mgrConfigCheck"]=true;
+    $_SESSION["mgrConfigCheck"] = true;
 } else {
     $config_check_results = $_lang['configcheck_ok'];
 }

Braces +22 added lines, -9 removed lines

@@ -19,12 +19,12 @@ 
 $warningspresent = 0;
 
 $sysfiles_check = $modx->manager->checkSystemChecksum();
-if ($sysfiles_check!=='0'){
+if ($sysfiles_check!=='0') {
       $warningspresent = 1;
       $warnings[] = array($_lang['configcheck_sysfiles_mod']);
 }
 
-if (is_writable("includes/config.inc.php")){
+if (is_writable("includes/config.inc.php")) {
     // Warn if world writable
     if(@fileperms('includes/config.inc.php') & 0x0002) {
       $warningspresent = 1;
@@ -120,7 +120,8 @@ 
     /**
      * @return bool
      */
-    function checkSiteCache() {
+    function checkSiteCache()
+    {
         $modx = evolutionCMS();
         $checked= true;
         if (file_exists($modx->config['base_path'] . 'assets/cache/siteCache.idx.php')) {
@@ -159,26 +160,36 @@ 
 
 if ($warningspresent==1) {
 
-if(!isset($modx->config['send_errormail'])) $modx->config['send_errormail']='3';
+if(!isset($modx->config['send_errormail'])) {
+    $modx->config['send_errormail']='3';
+}
 $config_check_results = "<h3>".$_lang['configcheck_notok']."</h3>";
 
 for ($i=0;$i<count($warnings);$i++) {
     switch ($warnings[$i][0]) {
         case $_lang['configcheck_configinc'];
             $warnings[$i][1] = $_lang['configcheck_configinc_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_configinc']);
+            if(!$_SESSION["mgrConfigCheck"]) {
+                $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_configinc']);
+            }
             break;
         case $_lang['configcheck_installer'] :
             $warnings[$i][1] = $_lang['configcheck_installer_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_installer']);
+            if(!$_SESSION["mgrConfigCheck"]) {
+                $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_installer']);
+            }
             break;
         case $_lang['configcheck_cache'] :
             $warnings[$i][1] = $_lang['configcheck_cache_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_cache']);
+            if(!$_SESSION["mgrConfigCheck"]) {
+                $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_cache']);
+            }
             break;
         case $_lang['configcheck_images'] :
             $warnings[$i][1] = $_lang['configcheck_images_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_images']);
+            if(!$_SESSION["mgrConfigCheck"]) {
+                $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_images']);
+            }
             break;
         case $_lang['configcheck_sysfiles_mod']:
             $warnings[$i][1] = $_lang["configcheck_sysfiles_mod_msg"];
@@ -186,7 +197,9 @@ 
 			if($modx->hasPermission('settings')) {
 				$warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\'' . $_lang["reset_sysfiles_checksum_alert"] . '\')">' . $_lang["reset_sysfiles_checksum_button"] . '</a></li></ul>';
 			}
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1]." ".implode(', ',$sysfiles_check),$_lang['configcheck_sysfiles_mod']);
+            if(!$_SESSION["mgrConfigCheck"]) {
+                $modx->logEvent(0,3,$warnings[$i][1]." ".implode(', ',$sysfiles_check),$_lang['configcheck_sysfiles_mod']);
+            }
             break;
         case $_lang['configcheck_lang_difference'] :
             $warnings[$i][1] = $_lang['configcheck_lang_difference_msg'];

manager/includes/debug.inc.php

Indentation +3 added lines, -3 removed lines

@@ -3,7 +3,7 @@ 
 
 // show debug information
 if(isset($enable_debug) && $enable_debug==true) {
-	?>
+    ?>
 	<script language="javascript">
 	//document.onload = removeDebug();
 	
@@ -33,8 +33,8 @@ 
 	}
 	</style>
 	<?php
-	$mtime = microtime(); $mtime = explode(" ",$mtime); $mtime = $mtime[1] + $mtime[0]; $tend = $mtime; $totaltime = ($tend - $tstart);
-	?>
+    $mtime = microtime(); $mtime = explode(" ",$mtime); $mtime = $mtime[1] + $mtime[0]; $tend = $mtime; $totaltime = ($tend - $tstart);
+    ?>
 	<div class='debug' id='debug' name='debug' onClick="removeDebugDiv();">
 		<table border="0" cellspacing="0" cellpadding="0">
 		  <tr>

Spacing +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
 // show debug information
-if(isset($enable_debug) && $enable_debug==true) {
+if (isset($enable_debug) && $enable_debug == true) {
 	?>
 	<script language="javascript">
 	//document.onload = removeDebug();
@@ -35,7 +35,7 @@ 
 	}
 	</style>
 	<?php
-	$mtime = microtime(); $mtime = explode(" ",$mtime); $mtime = $mtime[1] + $mtime[0]; $tend = $mtime; $totaltime = ($tend - $tstart);
+	$mtime = microtime(); $mtime = explode(" ", $mtime); $mtime = $mtime[1] + $mtime[0]; $tend = $mtime; $totaltime = ($tend - $tstart);
 	?>
 	<div class='debug' id='debug' name='debug' onClick="removeDebugDiv();">
 		<table border="0" cellspacing="0" cellpadding="0">
@@ -44,7 +44,7 @@ 
 		  </tr>
 		  <tr>
 			<td width="70">Time taken</td>
-			<td width="80"><?php echo printf ("%6.5f s", $totaltime); ?></td>
+			<td width="80"><?php echo printf("%6.5f s", $totaltime); ?></td>
 		  </tr>
 		</table>
 	</div>

manager/includes/controls/contextmenu.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -69,4 +69,4 @@
 		cm.style.visibility = 'hidden';
 	}
 </script>
-BLOCK;
+block;

Indentation +35 added lines, -35 removed lines

@@ -4,71 +4,71 @@
 $ContextMenuCnt = 0;
 
 class ContextMenu {
-	public $id;
+    public $id;
     /**
      * @var string
      */
-	public $html = '';
+    public $html = '';
     /**
      * @var bool
      */
-	public $visible = false;
+    public $visible = false;
     /**
      * @var int
      */
-	public $width = 120;
+    public $width = 120;
 
     public function __construct($id = '', $width = 120, $visible = false) {
-		global $ContextMenuCnt;
-		$ContextMenuCnt++;
-		$this->html = "";
-		$this->visible = $visible ? $visible : false;
-		$this->width = is_numeric($width) ? (int)$width : 120;
-		$this->id = $id ? $id : "cntxMnu" . $ContextMenuCnt;    // set id
-	}
+        global $ContextMenuCnt;
+        $ContextMenuCnt++;
+        $this->html = "";
+        $this->visible = $visible ? $visible : false;
+        $this->width = is_numeric($width) ? (int)$width : 120;
+        $this->id = $id ? $id : "cntxMnu" . $ContextMenuCnt;    // set id
+    }
 
     public function addItem($text, $action = "", $img = "", $disabled = 0) {
-		global $base_url, $_style;
+        global $base_url, $_style;
         if($disabled) {
             return;
         }
-		if(!$img) {
-			$img = $base_url . $_style['tx'];
-		}
-		if(substr($action, 0, 3) == "js:") {
-			$action = substr($action, 3);
-		} else if(substr($action, 0, 3) == "hl:") {
-			$action = "window.location.href='" . substr($action, 3) . "'";
-		} else {
-			$action = "window.location.href='" . $action . "'";
-		}
-		$action = " onmouseover=\"this.className='cntxMnuItemOver';\" onmouseout=\"this.className='cntxMnuItem';\" onclick=\"$action; hideCntxMenu('" . $this->id . "');\"";
-		$this->html .= "<div class='" . ($disabled ? "cntxMnuItemDisabled" : "cntxMnuItem") . "' $action>";
+        if(!$img) {
+            $img = $base_url . $_style['tx'];
+        }
+        if(substr($action, 0, 3) == "js:") {
+            $action = substr($action, 3);
+        } else if(substr($action, 0, 3) == "hl:") {
+            $action = "window.location.href='" . substr($action, 3) . "'";
+        } else {
+            $action = "window.location.href='" . $action . "'";
+        }
+        $action = " onmouseover=\"this.className='cntxMnuItemOver';\" onmouseout=\"this.className='cntxMnuItem';\" onclick=\"$action; hideCntxMenu('" . $this->id . "');\"";
+        $this->html .= "<div class='" . ($disabled ? "cntxMnuItemDisabled" : "cntxMnuItem") . "' $action>";
         if(substr($img, 0, 5) == 'fa fa') {
             $img = '<i class="' . $img . '"></i>';
         } else if(substr($img, 0, 1) != '<') {
             $img = '<img src="' . $img . '" />';
         }
-		$this->html .= $img . '&nbsp;' . $text . '</div>';
-	}
+        $this->html .= $img . '&nbsp;' . $text . '</div>';
+    }
 
     public function addSeparator() {
-		$this->html .= "
+        $this->html .= "
 			<div class='cntxMnuSeparator'></div>
 		";
-	}
+    }
 
     public function render() {
-		global $ContextMenuScript;
+        global $ContextMenuScript;
 
-		$html = $ContextMenuScript . "<div id='" . $this->id . "' class='contextMenu' style='width:" . $this->width . "px; visibility:" . ($this->visible ? 'visible' : 'hidden') . "'>" . $this->html . "</div>";
-		$ContextMenuScript = ""; // reset css
-		return $html;
-	}
+        $html = $ContextMenuScript . "<div id='" . $this->id . "' class='contextMenu' style='width:" . $this->width . "px; visibility:" . ($this->visible ? 'visible' : 'hidden') . "'>" . $this->html . "</div>";
+        $ContextMenuScript = ""; // reset css
+        return $html;
+    }
 
     public function getClientScriptObject() {
-		return "getCntxMenu('" . $this->id . "')";
-	}
+        return "getCntxMenu('" . $this->id . "')";
+    }
 }
 
 $ContextMenuScript = <<<BLOCK

Spacing +24 added lines, -24 removed lines

@@ -3,7 +3,7 @@ 
 global $ContextMenuCnt;
 $ContextMenuCnt = 0;
 
-class ContextMenu {
+class ContextMenu{
 	public $id;
     /**
      * @var string
@@ -18,56 +18,56 @@ 
      */
 	public $width = 120;
 
-    public function __construct($id = '', $width = 120, $visible = false) {
+    public function __construct($id = '', $width = 120, $visible = false){
 		global $ContextMenuCnt;
 		$ContextMenuCnt++;
 		$this->html = "";
 		$this->visible = $visible ? $visible : false;
-		$this->width = is_numeric($width) ? (int)$width : 120;
-		$this->id = $id ? $id : "cntxMnu" . $ContextMenuCnt;    // set id
+		$this->width = is_numeric($width) ? (int) $width : 120;
+		$this->id = $id ? $id : "cntxMnu".$ContextMenuCnt; // set id
 	}
 
-    public function addItem($text, $action = "", $img = "", $disabled = 0) {
+    public function addItem($text, $action = "", $img = "", $disabled = 0){
 		global $base_url, $_style;
-        if($disabled) {
+        if ($disabled) {
             return;
         }
-		if(!$img) {
-			$img = $base_url . $_style['tx'];
+		if (!$img) {
+			$img = $base_url.$_style['tx'];
 		}
-		if(substr($action, 0, 3) == "js:") {
+		if (substr($action, 0, 3) == "js:") {
 			$action = substr($action, 3);
-		} else if(substr($action, 0, 3) == "hl:") {
-			$action = "window.location.href='" . substr($action, 3) . "'";
+		} else if (substr($action, 0, 3) == "hl:") {
+			$action = "window.location.href='".substr($action, 3)."'";
 		} else {
-			$action = "window.location.href='" . $action . "'";
+			$action = "window.location.href='".$action."'";
 		}
-		$action = " onmouseover=\"this.className='cntxMnuItemOver';\" onmouseout=\"this.className='cntxMnuItem';\" onclick=\"$action; hideCntxMenu('" . $this->id . "');\"";
-		$this->html .= "<div class='" . ($disabled ? "cntxMnuItemDisabled" : "cntxMnuItem") . "' $action>";
-        if(substr($img, 0, 5) == 'fa fa') {
-            $img = '<i class="' . $img . '"></i>';
-        } else if(substr($img, 0, 1) != '<') {
-            $img = '<img src="' . $img . '" />';
+		$action = " onmouseover=\"this.className='cntxMnuItemOver';\" onmouseout=\"this.className='cntxMnuItem';\" onclick=\"$action; hideCntxMenu('".$this->id."');\"";
+		$this->html .= "<div class='".($disabled ? "cntxMnuItemDisabled" : "cntxMnuItem")."' $action>";
+        if (substr($img, 0, 5) == 'fa fa') {
+            $img = '<i class="'.$img.'"></i>';
+        } else if (substr($img, 0, 1) != '<') {
+            $img = '<img src="'.$img.'" />';
         }
-		$this->html .= $img . '&nbsp;' . $text . '</div>';
+		$this->html .= $img.'&nbsp;'.$text.'</div>';
 	}
 
-    public function addSeparator() {
+    public function addSeparator(){
 		$this->html .= "
 			<div class='cntxMnuSeparator'></div>
 		";
 	}
 
-    public function render() {
+    public 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>";
+		$html = $ContextMenuScript."<div id='".$this->id."' class='contextMenu' style='width:".$this->width."px; visibility:".($this->visible ? 'visible' : 'hidden')."'>".$this->html."</div>";
 		$ContextMenuScript = ""; // reset css
 		return $html;
 	}
 
-    public function getClientScriptObject() {
-		return "getCntxMenu('" . $this->id . "')";
+    public function getClientScriptObject(){
+		return "getCntxMenu('".$this->id."')";
 	}
 }
 

Braces +12 added lines, -6 removed lines

@@ -3,7 +3,8 @@ 
 global $ContextMenuCnt;
 $ContextMenuCnt = 0;
 
-class ContextMenu {
+class ContextMenu
+{
 	public $id;
     /**
      * @var string
@@ -18,7 +19,8 @@ 
      */
 	public $width = 120;
 
-    public function __construct($id = '', $width = 120, $visible = false) {
+    public function __construct($id = '', $width = 120, $visible = false)
+    {
 		global $ContextMenuCnt;
 		$ContextMenuCnt++;
 		$this->html = "";
@@ -27,7 +29,8 @@ 
 		$this->id = $id ? $id : "cntxMnu" . $ContextMenuCnt;    // set id
 	}
 
-    public function addItem($text, $action = "", $img = "", $disabled = 0) {
+    public function addItem($text, $action = "", $img = "", $disabled = 0)
+    {
 		global $base_url, $_style;
         if($disabled) {
             return;
@@ -52,13 +55,15 @@ 
 		$this->html .= $img . '&nbsp;' . $text . '</div>';
 	}
 
-    public function addSeparator() {
+    public function addSeparator()
+    {
 		$this->html .= "
 			<div class='cntxMnuSeparator'></div>
 		";
 	}
 
-    public function render() {
+    public 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>";
@@ -66,7 +71,8 @@ 
 		return $html;
 	}
 
-    public function getClientScriptObject() {
+    public function getClientScriptObject()
+    {
 		return "getCntxMenu('" . $this->id . "')";
 	}
 }

manager/includes/controls/phpmailer/OAuth.php

Spacing +4 added lines, -4 removed lines

@@ -128,10 +128,10 @@
         }
 
         return base64_encode(
-            'user=' .
-            $this->oauthUserEmail .
-            "\001auth=Bearer " .
-            $this->oauthToken .
+            'user='.
+            $this->oauthUserEmail.
+            "\001auth=Bearer ".
+            $this->oauthToken.
             "\001\001"
         );
     }