evolution-cms / evolution

manager/actions/mutate_settings/tab2_furl_settings.inc.php

Spacing +47 added lines, -47 removed lines

@@ -6,8 +6,8 @@ 
 <tr>

 <td nowrap class="warning" valign="top"><?php echo $_lang['friendlyurls_title'] ?><br><small>[(friendly_urls)]</small></td>

 <td>

-    <?php echo wrap_label($_lang['yes'],form_radio('friendly_urls', 1, 'id="furlRowOn"'));?><br />

-    <?php echo wrap_label($_lang['no'], form_radio('friendly_urls', 0, 'id="furlRowOff"'));?>

+    <?php echo wrap_label($_lang['yes'], form_radio('friendly_urls', 1, 'id="furlRowOn"')); ?><br />

+    <?php echo wrap_label($_lang['no'], form_radio('friendly_urls', 0, 'id="furlRowOff"')); ?>

 </td>

 </tr>

 <tr>

@@ -20,8 +20,8 @@ 
 <tr>

     <td nowrap class="warning"><?php echo $_lang['xhtml_urls_title'] ?><br><small>[(xhtml_urls)]</small></td>

     <td>

-        <?php echo wrap_label($_lang['yes'],form_radio('xhtml_urls', 1));?><br />

-        <?php echo wrap_label($_lang['no'], form_radio('xhtml_urls', 0));?>

+        <?php echo wrap_label($_lang['yes'], form_radio('xhtml_urls', 1)); ?><br />

+        <?php echo wrap_label($_lang['no'], form_radio('xhtml_urls', 0)); ?>

     </td>

 </tr>

 <tr>

@@ -31,135 +31,135 @@ 
 <tr>

 <td colspan="2"><div class="split"></div></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td nowrap class="warning" valign="top"><?php echo $_lang['friendlyurlsprefix_title'] ?><br><small>[(friendly_url_prefix)]</small></td>

 <td><input onchange="documentDirty=true;" type="text" maxlength="50" style="width: 200px;" name="friendly_url_prefix" value="<?php echo $friendly_url_prefix; ?>" /></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td width="200">&nbsp;</td>

 <td class="comment"><?php echo $_lang['friendlyurlsprefix_message'] ?></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td colspan="2"><div class="split"></div></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td nowrap class="warning" valign="top"><?php echo $_lang['friendlyurlsuffix_title'] ?><br><small>[(friendly_url_suffix)]</small></td>

 <td><input onchange="documentDirty=true;" type="text" maxlength="50" style="width: 200px;" name="friendly_url_suffix" value="<?php echo $friendly_url_suffix; ?>" /></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td width="200">&nbsp;</td>

 <td class="comment"><?php echo $_lang['friendlyurlsuffix_message'] ?></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td colspan="2"><div class="split"></div></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <th><?php echo $_lang['make_folders_title'] ?><br><small>[(make_folders)]</small></th>

 <td>

-  <?php echo wrap_label($_lang['yes'],form_radio('make_folders','1'));?><br />

-  <?php echo wrap_label($_lang['no'],form_radio('make_folders','0'));?>

+  <?php echo wrap_label($_lang['yes'], form_radio('make_folders', '1')); ?><br />

+  <?php echo wrap_label($_lang['no'], form_radio('make_folders', '0')); ?>

 </td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

         <td width="200">&nbsp;</td>

         <td class="comment"><?php echo $_lang['make_folders_message'] ?></td>

       </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td colspan="2"><div class="split"></div></td>

 </tr>

   

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <th><?php echo $_lang['seostrict_title'] ?><br><small>[(seostrict)]</small></th>

 <td>

-  <?php echo wrap_label($_lang['yes'],form_radio('seostrict','1'));?><br />

-  <?php echo wrap_label($_lang['no'],form_radio('seostrict','0'));?>

+  <?php echo wrap_label($_lang['yes'], form_radio('seostrict', '1')); ?><br />

+  <?php echo wrap_label($_lang['no'], form_radio('seostrict', '0')); ?>

  </td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

         <td width="200">&nbsp;</td>

         <td class="comment"><?php echo $_lang['seostrict_message'] ?></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td colspan="2"><div class="split"></div></td>

 </tr>

 

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

   <th><?php echo $_lang['aliaslistingfolder_title'] ?><br><small>[(aliaslistingfolder)]</small></th>

   <td>

-      <?php echo wrap_label($_lang['yes'],form_radio('aliaslistingfolder','1'));?><br />

-      <?php echo wrap_label($_lang['no'],form_radio('aliaslistingfolder','0'));?>

+      <?php echo wrap_label($_lang['yes'], form_radio('aliaslistingfolder', '1')); ?><br />

+      <?php echo wrap_label($_lang['no'], form_radio('aliaslistingfolder', '0')); ?>

   </td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

   <td width="200">&nbsp;</td>

   <td class="comment"><?php echo $_lang['aliaslistingfolder_message'] ?></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

   <td colspan="2"><div class="split"></div></td>

 </tr>

 

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td nowrap class="warning" valign="top"><?php echo $_lang['friendly_alias_title'] ?><br><small>[(friendly_alias_urls)]</small></td>

 <td>

-  <?php echo wrap_label($_lang['yes'],form_radio('friendly_alias_urls','1'));?><br />

-  <?php echo wrap_label($_lang['no'],form_radio('friendly_alias_urls','0'));?>

+  <?php echo wrap_label($_lang['yes'], form_radio('friendly_alias_urls', '1')); ?><br />

+  <?php echo wrap_label($_lang['no'], form_radio('friendly_alias_urls', '0')); ?>

 </td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td width="200">&nbsp;</td>

 <td class="comment"><?php echo $_lang['friendly_alias_message'] ?></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td colspan="2"><div class="split"></div></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td nowrap class="warning" valign="top"><?php echo $_lang['use_alias_path_title'] ?><br><small>[(use_alias_path)]</small></td>

 <td>

-  <?php echo wrap_label($_lang['yes'],form_radio('use_alias_path','1'));?><br />

-  <?php echo wrap_label($_lang['no'],form_radio('use_alias_path','0'));?>

+  <?php echo wrap_label($_lang['yes'], form_radio('use_alias_path', '1')); ?><br />

+  <?php echo wrap_label($_lang['no'], form_radio('use_alias_path', '0')); ?>

 </td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td width="200">&nbsp;</td>

 <td class="comment"><?php echo $_lang['use_alias_path_message'] ?></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td colspan="2"><div class="split"></div></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td nowrap class="warning" valign="top"><?php echo $_lang['duplicate_alias_title'] ?><br><small>[(allow_duplicate_alias)]</small></td>

 <td>

-  <?php echo wrap_label($_lang['yes'],form_radio('allow_duplicate_alias','1'));?><br />

-  <?php echo wrap_label($_lang['no'],form_radio('allow_duplicate_alias','0'));?>

+  <?php echo wrap_label($_lang['yes'], form_radio('allow_duplicate_alias', '1')); ?><br />

+  <?php echo wrap_label($_lang['no'], form_radio('allow_duplicate_alias', '0')); ?>

 </td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td width="200">&nbsp;</td>

 <td class="comment"><?php echo $_lang['duplicate_alias_message'] ?></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td colspan="2"><div class="split"></div></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td nowrap class="warning" valign="top"><?php echo $_lang['automatic_alias_title'] ?><br><small>[(automatic_alias)]</small></td>

 <td>

-  <?php echo wrap_label($_lang['yes'],form_radio('automatic_alias','1'));?><br />

-  <?php echo wrap_label($_lang['no'],form_radio('automatic_alias','0'));?>

+  <?php echo wrap_label($_lang['yes'], form_radio('automatic_alias', '1')); ?><br />

+  <?php echo wrap_label($_lang['no'], form_radio('automatic_alias', '0')); ?>

 </td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td width="200">&nbsp;</td>

 <td class="comment"><?php echo $_lang['automatic_alias_message'] ?></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td colspan="2"><div class="split"></div></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td colspan="2">

     <?php

         // invoke OnFriendlyURLSettingsRender event

         $evtOut = $modx->invokeEvent('OnFriendlyURLSettingsRender');

-        if(is_array($evtOut)) echo implode("",$evtOut);

+        if (is_array($evtOut)) echo implode("", $evtOut);

     ?>

 </td>

 </tr>

Braces +3 added lines, -1 removed lines

@@ -159,7 +159,9 @@
     <?php

         // invoke OnFriendlyURLSettingsRender event

         $evtOut = $modx->invokeEvent('OnFriendlyURLSettingsRender');

-        if(is_array($evtOut)) echo implode("",$evtOut);

+        if(is_array($evtOut)) {
+            echo implode("",$evtOut);
+        }
     ?>

 </td>

 </tr>

manager/actions/refresh_site.dynamic.php

Braces +3 added lines, -1 removed lines

@@ -29,10 +29,12 @@
 
 <div class="tab-page">
 	<div class="container container-body">
-		<?php if($num_rows_pub)   printf('<p>' . $_lang["refresh_published"]   . '</p>', $num_rows_pub) ?>
+		<?php if($num_rows_pub) {
+    printf('<p>' . $_lang["refresh_published"]   . '</p>', $num_rows_pub) ?>
 		<?php if($num_rows_unpub) printf('<p>' . $_lang["refresh_unpublished"] . '</p>', $num_rows_unpub) ?>
 		<?php
 		$modx->clearCache('full', true);
+}
 		// invoke OnSiteRefresh event
 		$modx->invokeEvent("OnSiteRefresh");
 		?>

Indentation +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 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.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
 // (un)publishing of documents, version 2!
@@ -32,9 +32,9 @@ 
 		<?php if($num_rows_pub)   printf('<p>' . $_lang["refresh_published"]   . '</p>', $num_rows_pub) ?>
 		<?php if($num_rows_unpub) printf('<p>' . $_lang["refresh_unpublished"] . '</p>', $num_rows_unpub) ?>
 		<?php
-		$modx->clearCache('full', true);
-		// invoke OnSiteRefresh event
-		$modx->invokeEvent("OnSiteRefresh");
-		?>
+        $modx->clearCache('full', true);
+        // invoke OnSiteRefresh event
+        $modx->invokeEvent("OnSiteRefresh");
+        ?>
 	</div>
 </div>

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?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.");
 }
 
@@ -29,8 +29,8 @@ 
 
 <div class="tab-page">
 	<div class="container container-body">
-		<?php if($num_rows_pub)   printf('<p>' . $_lang["refresh_published"]   . '</p>', $num_rows_pub) ?>
-		<?php if($num_rows_unpub) printf('<p>' . $_lang["refresh_unpublished"] . '</p>', $num_rows_unpub) ?>
+		<?php if ($num_rows_pub)   printf('<p>'.$_lang["refresh_published"].'</p>', $num_rows_pub) ?>
+		<?php if ($num_rows_unpub) printf('<p>'.$_lang["refresh_unpublished"].'</p>', $num_rows_unpub) ?>
 		<?php
 		$modx->clearCache('full', true);
 		// invoke OnSiteRefresh event

manager/processors/logout.processor.php

Indentation +8 added lines, -8 removed lines

@@ -7,10 +7,10 @@ 
 
 // invoke OnBeforeManagerLogout event
 $modx->invokeEvent("OnBeforeManagerLogout",
-						array(
-							"userid"		=> $internalKey,
-							"username"		=> $username
-						));
+                        array(
+                            "userid"		=> $internalKey,
+                            "username"		=> $username
+                        ));
 
 //// Unset all of the session variables.
 //$_SESSION = array();
@@ -33,10 +33,10 @@ 
 
 // invoke OnManagerLogout event
 $modx->invokeEvent("OnManagerLogout",
-						array(
-							"userid"		=> $internalKey,
-							"username"		=> $username
-						));
+                        array(
+                            "userid"		=> $internalKey,
+                            "username"		=> $username
+                        ));
 
 // show login screen
 header('Location: ' . MODX_MANAGER_URL);

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?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.");
 }
 
@@ -41,4 +41,4 @@ 
 						));
 
 // show login screen
-header('Location: ' . MODX_MANAGER_URL);
+header('Location: '.MODX_MANAGER_URL);

manager/processors/save_settings.processor.php

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

@@ -21,7 +21,7 @@ 
 		}
 		elseif(is_writable($htaccess))
 		{
-			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
+			$_ = preg_replace('@RewriteBase.+@',"rewritebase {$dir}", $_);
 			if(!@file_put_contents($htaccess,$_))
 			{
 				$warnings[] = $_lang["settings_friendlyurls_alert2"];
@@ -37,7 +37,7 @@ 
 		elseif($modx->config['base_url']!=='/')
 		{
 			$_ = file_get_contents($htaccess);
-			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
+			$_ = preg_replace('@RewriteBase.+@',"rewritebase {$dir}", $_);
 			if(!@file_put_contents($htaccess,$_))
 			{
 				$warnings[] = $_lang["settings_friendlyurls_alert2"];

Indentation +109 added lines, -109 removed lines

@@ -3,7 +3,7 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('settings')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 $data = $_POST;
 // lose the POST now, gets rid of quirky issue with Safari 3 - see FS#972
@@ -11,41 +11,41 @@ 
 
 if($data['friendly_urls']==='1' && strpos($_SERVER['SERVER_SOFTWARE'],'IIS')===false)
 {
-	$htaccess        = $modx->config['base_path'] . '.htaccess';
-	$sample_htaccess = $modx->config['base_path'] . 'ht.access';
-	$dir = '/' . trim($modx->config['base_url'],'/');
-	if(is_file($htaccess))
-	{
-		$_ = file_get_contents($htaccess);
-		if(strpos($_,'RewriteBase')===false)
-		{
-			$warnings[] = $_lang["settings_friendlyurls_alert2"];
-		}
-		elseif(is_writable($htaccess))
-		{
-			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
-			if(!@file_put_contents($htaccess,$_))
-			{
-				$warnings[] = $_lang["settings_friendlyurls_alert2"];
-			}
-		}
-	}
-	elseif(is_file($sample_htaccess))
-	{
-		if(!@rename($sample_htaccess,$htaccess))
+    $htaccess        = $modx->config['base_path'] . '.htaccess';
+    $sample_htaccess = $modx->config['base_path'] . 'ht.access';
+    $dir = '/' . trim($modx->config['base_url'],'/');
+    if(is_file($htaccess))
+    {
+        $_ = file_get_contents($htaccess);
+        if(strpos($_,'RewriteBase')===false)
         {
-        	$warnings[] = $_lang["settings_friendlyurls_alert"];
-		}
-		elseif($modx->config['base_url']!=='/')
-		{
-			$_ = file_get_contents($htaccess);
-			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
-			if(!@file_put_contents($htaccess,$_))
-			{
-				$warnings[] = $_lang["settings_friendlyurls_alert2"];
-			}
-		}
-	}
+            $warnings[] = $_lang["settings_friendlyurls_alert2"];
+        }
+        elseif(is_writable($htaccess))
+        {
+            $_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
+            if(!@file_put_contents($htaccess,$_))
+            {
+                $warnings[] = $_lang["settings_friendlyurls_alert2"];
+            }
+        }
+    }
+    elseif(is_file($sample_htaccess))
+    {
+        if(!@rename($sample_htaccess,$htaccess))
+        {
+            $warnings[] = $_lang["settings_friendlyurls_alert"];
+        }
+        elseif($modx->config['base_url']!=='/')
+        {
+            $_ = file_get_contents($htaccess);
+            $_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
+            if(!@file_put_contents($htaccess,$_))
+            {
+                $warnings[] = $_lang["settings_friendlyurls_alert2"];
+            }
+        }
+    }
 }
 
 if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
@@ -56,22 +56,22 @@ 
 $data['rb_base_dir']      = str_replace('[(base_path)]',MODX_BASE_PATH,$data['rb_base_dir']);
 
 if (isset($data) && count($data) > 0) {
-	if(isset($data['manager_language'])) {
-		$lang_path = MODX_MANAGER_PATH . 'includes/lang/' . $data['manager_language'] . '.inc.php';
-		if(is_file($lang_path)) {
-			include($lang_path);
+    if(isset($data['manager_language'])) {
+        $lang_path = MODX_MANAGER_PATH . 'includes/lang/' . $data['manager_language'] . '.inc.php';
+        if(is_file($lang_path)) {
+            include($lang_path);
             global $modx_lang_attribute;
             $data['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute;
-		}
-	}
-	$savethese = array();
-	$data['sys_files_checksum'] = $modx->manager->getSystemChecksum($data['check_files_onlogin']);
-	$data['mail_check_timeperiod'] = (int)$data['mail_check_timeperiod'] < 60 ? 60 : $data['mail_check_timeperiod']; // updateMail() in mainMenu no faster than every minute
-	foreach ($data as $k => $v) {
-		switch ($k) {
-			case 'site_name':
-				$v = htmlspecialchars($v);
-				break;
+        }
+    }
+    $savethese = array();
+    $data['sys_files_checksum'] = $modx->manager->getSystemChecksum($data['check_files_onlogin']);
+    $data['mail_check_timeperiod'] = (int)$data['mail_check_timeperiod'] < 60 ? 60 : $data['mail_check_timeperiod']; // updateMail() in mainMenu no faster than every minute
+    foreach ($data as $k => $v) {
+        switch ($k) {
+            case 'site_name':
+                $v = htmlspecialchars($v);
+                break;
             case 'settings_version':{
                 if($modx->getVersionData('version')!=$data['settings_version']){
                     $modx->logEvent(17,2,'<pre>'.var_export($data['settings_version'],true).'</pre>','fake settings_version');
@@ -79,24 +79,24 @@ 
                 }
                 break;
             }
-			case 'error_page':
-			case 'unauthorized_page':
-			if (trim($v) == '' || !is_numeric($v)) {
-				$v = $data['site_start'];
-			}
-			break;
+            case 'error_page':
+            case 'unauthorized_page':
+            if (trim($v) == '' || !is_numeric($v)) {
+                $v = $data['site_start'];
+            }
+            break;
 
-			case 'lst_custom_contenttype':
-			case 'txt_custom_contenttype':
-				// Skip these
-				$k = '';
-				break;
-			case 'rb_base_dir':
-			case 'rb_base_url':
-			case 'filemanager_path':
-				$v = trim($v);
-				$v = rtrim($v,'/') . '/';
-				break;
+            case 'lst_custom_contenttype':
+            case 'txt_custom_contenttype':
+                // Skip these
+                $k = '';
+                break;
+            case 'rb_base_dir':
+            case 'rb_base_url':
+            case 'filemanager_path':
+                $v = trim($v);
+                $v = rtrim($v,'/') . '/';
+                break;
             case 'manager_language':
                 $langDir = realpath(MODX_MANAGER_PATH . 'includes/lang');
                 $langFile = realpath(MODX_MANAGER_PATH . 'includes/lang/' . $v . '.inc.php');
@@ -104,56 +104,56 @@ 
                 if($langDir !== $langFileDir || !file_exists($langFile)) {
                     $v = 'english';
                 }
-				break;
-			case 'smtppw':
-				if ($v !== '********************' && $v !== '') {
-					$v = trim($v);
-					$v = base64_encode($v) . substr(str_shuffle('abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'), 0, 7);
-					$v = str_replace('=','%',$v);
-				} elseif ($v === '********************') {
-					$k = '';
-				}
-				break;
+                break;
+            case 'smtppw':
+                if ($v !== '********************' && $v !== '') {
+                    $v = trim($v);
+                    $v = base64_encode($v) . substr(str_shuffle('abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'), 0, 7);
+                    $v = str_replace('=','%',$v);
+                } elseif ($v === '********************') {
+                    $k = '';
+                }
+                break;
             case 'valid_hostnames':
-				$v = str_replace(array(' ,', ', '), ',', $v);
-				if ($v !== ',') {
-					$v = ($v != 'MODX_SITE_HOSTNAMES') ? $v : '';
-					$configString = '<?php' . "\n" . 'define(\'MODX_SITE_HOSTNAMES\', \'' . $v . '\');' . "\n";
-					@file_put_contents(MODX_BASE_PATH . 'assets/cache/siteHostnames.php', $configString);
-				}
-				$k = '';
-				break;
-			case 'session_timeout':
-				$mail_check_timeperiod = $data['mail_check_timeperiod'];
-				$v = (int)$v < ($data['mail_check_timeperiod']/60+1) ? ($data['mail_check_timeperiod']/60+1) : $v; // updateMail() in mainMenu pings as per mail_check_timeperiod, so +1min is minimum
-				break;
-			default:
-			break;
-		}
-		$v = is_array($v) ? implode(",", $v) : $v;
+                $v = str_replace(array(' ,', ', '), ',', $v);
+                if ($v !== ',') {
+                    $v = ($v != 'MODX_SITE_HOSTNAMES') ? $v : '';
+                    $configString = '<?php' . "\n" . 'define(\'MODX_SITE_HOSTNAMES\', \'' . $v . '\');' . "\n";
+                    @file_put_contents(MODX_BASE_PATH . 'assets/cache/siteHostnames.php', $configString);
+                }
+                $k = '';
+                break;
+            case 'session_timeout':
+                $mail_check_timeperiod = $data['mail_check_timeperiod'];
+                $v = (int)$v < ($data['mail_check_timeperiod']/60+1) ? ($data['mail_check_timeperiod']/60+1) : $v; // updateMail() in mainMenu pings as per mail_check_timeperiod, so +1min is minimum
+                break;
+            default:
+            break;
+        }
+        $v = is_array($v) ? implode(",", $v) : $v;
 
-		$modx->config[$k] = $v;
+        $modx->config[$k] = $v;
 
-		if(!empty($k)) $savethese[] = '(\''.$modx->db->escape($k).'\', \''.$modx->db->escape($v).'\')';
-	}
+        if(!empty($k)) $savethese[] = '(\''.$modx->db->escape($k).'\', \''.$modx->db->escape($v).'\')';
+    }
 
-	// Run a single query to save all the values
-	$sql = "REPLACE INTO ".$modx->getFullTableName("system_settings")." (setting_name, setting_value)
+    // Run a single query to save all the values
+    $sql = "REPLACE INTO ".$modx->getFullTableName("system_settings")." (setting_name, setting_value)
 		VALUES ".implode(', ', $savethese);
-	$modx->db->query($sql);
+    $modx->db->query($sql);
 
-	// Reset Template Pages
-	if (isset($data['reset_template'])) {
-		$newtemplate = (int)$data['default_template'];
-		$oldtemplate = (int)$data['old_template'];
-		$tbl = $modx->getFullTableName('site_content');
-		$reset = $data['reset_template'];
-		if($reset==1) $modx->db->update(array('template' => $newtemplate), $tbl, "type='document'");
-		else if($reset==2) $modx->db->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");
-	}
+    // Reset Template Pages
+    if (isset($data['reset_template'])) {
+        $newtemplate = (int)$data['default_template'];
+        $oldtemplate = (int)$data['old_template'];
+        $tbl = $modx->getFullTableName('site_content');
+        $reset = $data['reset_template'];
+        if($reset==1) $modx->db->update(array('template' => $newtemplate), $tbl, "type='document'");
+        else if($reset==2) $modx->db->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");
+    }
 
-	// empty cache
-	$modx->clearCache('full');
+    // empty cache
+    $modx->clearCache('full');
 }
 $header="Location: index.php?a=7&r=10";
 header($header);

Spacing +41 added lines, -41 removed lines

@@ -1,46 +1,46 @@ 
 <?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.");
 }
-if(!$modx->hasPermission('settings')) {
+if (!$modx->hasPermission('settings')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 $data = $_POST;
 // lose the POST now, gets rid of quirky issue with Safari 3 - see FS#972
 unset($_POST);
 
-if($data['friendly_urls']==='1' && strpos($_SERVER['SERVER_SOFTWARE'],'IIS')===false)
+if ($data['friendly_urls'] === '1' && strpos($_SERVER['SERVER_SOFTWARE'], 'IIS') === false)
 {
-	$htaccess        = $modx->config['base_path'] . '.htaccess';
-	$sample_htaccess = $modx->config['base_path'] . 'ht.access';
-	$dir = '/' . trim($modx->config['base_url'],'/');
-	if(is_file($htaccess))
+	$htaccess        = $modx->config['base_path'].'.htaccess';
+	$sample_htaccess = $modx->config['base_path'].'ht.access';
+	$dir = '/'.trim($modx->config['base_url'], '/');
+	if (is_file($htaccess))
 	{
 		$_ = file_get_contents($htaccess);
-		if(strpos($_,'RewriteBase')===false)
+		if (strpos($_, 'RewriteBase') === false)
 		{
 			$warnings[] = $_lang["settings_friendlyurls_alert2"];
 		}
-		elseif(is_writable($htaccess))
+		elseif (is_writable($htaccess))
 		{
-			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
-			if(!@file_put_contents($htaccess,$_))
+			$_ = preg_replace('@RewriteBase.+@', "RewriteBase {$dir}", $_);
+			if (!@file_put_contents($htaccess, $_))
 			{
 				$warnings[] = $_lang["settings_friendlyurls_alert2"];
 			}
 		}
 	}
-	elseif(is_file($sample_htaccess))
+	elseif (is_file($sample_htaccess))
 	{
-		if(!@rename($sample_htaccess,$htaccess))
+		if (!@rename($sample_htaccess, $htaccess))
         {
         	$warnings[] = $_lang["settings_friendlyurls_alert"];
 		}
-		elseif($modx->config['base_url']!=='/')
+		elseif ($modx->config['base_url'] !== '/')
 		{
 			$_ = file_get_contents($htaccess);
-			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
-			if(!@file_put_contents($htaccess,$_))
+			$_ = preg_replace('@RewriteBase.+@', "RewriteBase {$dir}", $_);
+			if (!@file_put_contents($htaccess, $_))
 			{
 				$warnings[] = $_lang["settings_friendlyurls_alert2"];
 			}
@@ -48,17 +48,17 @@ 
 	}
 }
 
-if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
-    unlink(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css');
+if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')) {
+    unlink(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css');
 }
 
-$data['filemanager_path'] = str_replace('[(base_path)]',MODX_BASE_PATH,$data['filemanager_path']);
-$data['rb_base_dir']      = str_replace('[(base_path)]',MODX_BASE_PATH,$data['rb_base_dir']);
+$data['filemanager_path'] = str_replace('[(base_path)]', MODX_BASE_PATH, $data['filemanager_path']);
+$data['rb_base_dir']      = str_replace('[(base_path)]', MODX_BASE_PATH, $data['rb_base_dir']);
 
 if (isset($data) && count($data) > 0) {
-	if(isset($data['manager_language'])) {
-		$lang_path = MODX_MANAGER_PATH . 'includes/lang/' . $data['manager_language'] . '.inc.php';
-		if(is_file($lang_path)) {
+	if (isset($data['manager_language'])) {
+		$lang_path = MODX_MANAGER_PATH.'includes/lang/'.$data['manager_language'].'.inc.php';
+		if (is_file($lang_path)) {
 			include($lang_path);
             global $modx_lang_attribute;
             $data['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute;
@@ -66,15 +66,15 @@ 
 	}
 	$savethese = array();
 	$data['sys_files_checksum'] = $modx->manager->getSystemChecksum($data['check_files_onlogin']);
-	$data['mail_check_timeperiod'] = (int)$data['mail_check_timeperiod'] < 60 ? 60 : $data['mail_check_timeperiod']; // updateMail() in mainMenu no faster than every minute
+	$data['mail_check_timeperiod'] = (int) $data['mail_check_timeperiod'] < 60 ? 60 : $data['mail_check_timeperiod']; // updateMail() in mainMenu no faster than every minute
 	foreach ($data as $k => $v) {
 		switch ($k) {
 			case 'site_name':
 				$v = htmlspecialchars($v);
 				break;
             case 'settings_version':{
-                if($modx->getVersionData('version')!=$data['settings_version']){
-                    $modx->logEvent(17,2,'<pre>'.var_export($data['settings_version'],true).'</pre>','fake settings_version');
+                if ($modx->getVersionData('version') != $data['settings_version']) {
+                    $modx->logEvent(17, 2, '<pre>'.var_export($data['settings_version'], true).'</pre>', 'fake settings_version');
                     $v = $modx->getVersionData('version');
                 }
                 break;
@@ -95,21 +95,21 @@ 
 			case 'rb_base_url':
 			case 'filemanager_path':
 				$v = trim($v);
-				$v = rtrim($v,'/') . '/';
+				$v = rtrim($v, '/').'/';
 				break;
             case 'manager_language':
-                $langDir = realpath(MODX_MANAGER_PATH . 'includes/lang');
-                $langFile = realpath(MODX_MANAGER_PATH . 'includes/lang/' . $v . '.inc.php');
+                $langDir = realpath(MODX_MANAGER_PATH.'includes/lang');
+                $langFile = realpath(MODX_MANAGER_PATH.'includes/lang/'.$v.'.inc.php');
                 $langFileDir = dirname($langFile);
-                if($langDir !== $langFileDir || !file_exists($langFile)) {
+                if ($langDir !== $langFileDir || !file_exists($langFile)) {
                     $v = 'english';
                 }
 				break;
 			case 'smtppw':
 				if ($v !== '********************' && $v !== '') {
 					$v = trim($v);
-					$v = base64_encode($v) . substr(str_shuffle('abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'), 0, 7);
-					$v = str_replace('=','%',$v);
+					$v = base64_encode($v).substr(str_shuffle('abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'), 0, 7);
+					$v = str_replace('=', '%', $v);
 				} elseif ($v === '********************') {
 					$k = '';
 				}
@@ -118,14 +118,14 @@ 
 				$v = str_replace(array(' ,', ', '), ',', $v);
 				if ($v !== ',') {
 					$v = ($v != 'MODX_SITE_HOSTNAMES') ? $v : '';
-					$configString = '<?php' . "\n" . 'define(\'MODX_SITE_HOSTNAMES\', \'' . $v . '\');' . "\n";
-					@file_put_contents(MODX_BASE_PATH . 'assets/cache/siteHostnames.php', $configString);
+					$configString = '<?php'."\n".'define(\'MODX_SITE_HOSTNAMES\', \''.$v.'\');'."\n";
+					@file_put_contents(MODX_BASE_PATH.'assets/cache/siteHostnames.php', $configString);
 				}
 				$k = '';
 				break;
 			case 'session_timeout':
 				$mail_check_timeperiod = $data['mail_check_timeperiod'];
-				$v = (int)$v < ($data['mail_check_timeperiod']/60+1) ? ($data['mail_check_timeperiod']/60+1) : $v; // updateMail() in mainMenu pings as per mail_check_timeperiod, so +1min is minimum
+				$v = (int) $v < ($data['mail_check_timeperiod'] / 60 + 1) ? ($data['mail_check_timeperiod'] / 60 + 1) : $v; // updateMail() in mainMenu pings as per mail_check_timeperiod, so +1min is minimum
 				break;
 			default:
 			break;
@@ -134,7 +134,7 @@ 
 
 		$modx->config[$k] = $v;
 
-		if(!empty($k)) $savethese[] = '(\''.$modx->db->escape($k).'\', \''.$modx->db->escape($v).'\')';
+		if (!empty($k)) $savethese[] = '(\''.$modx->db->escape($k).'\', \''.$modx->db->escape($v).'\')';
 	}
 
 	// Run a single query to save all the values
@@ -144,16 +144,16 @@ 
 
 	// Reset Template Pages
 	if (isset($data['reset_template'])) {
-		$newtemplate = (int)$data['default_template'];
-		$oldtemplate = (int)$data['old_template'];
+		$newtemplate = (int) $data['default_template'];
+		$oldtemplate = (int) $data['old_template'];
 		$tbl = $modx->getFullTableName('site_content');
 		$reset = $data['reset_template'];
-		if($reset==1) $modx->db->update(array('template' => $newtemplate), $tbl, "type='document'");
-		else if($reset==2) $modx->db->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");
+		if ($reset == 1) $modx->db->update(array('template' => $newtemplate), $tbl, "type='document'");
+		else if ($reset == 2) $modx->db->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");
 	}
 
 	// empty cache
 	$modx->clearCache('full');
 }
-$header="Location: index.php?a=7&r=10";
+$header = "Location: index.php?a=7&r=10";
 header($header);

Braces +18 added lines, -25 removed lines

@@ -9,39 +9,27 @@ 
 // lose the POST now, gets rid of quirky issue with Safari 3 - see FS#972
 unset($_POST);
 
-if($data['friendly_urls']==='1' && strpos($_SERVER['SERVER_SOFTWARE'],'IIS')===false)
-{
+if($data['friendly_urls']==='1' && strpos($_SERVER['SERVER_SOFTWARE'],'IIS')===false) {
 	$htaccess        = $modx->config['base_path'] . '.htaccess';
 	$sample_htaccess = $modx->config['base_path'] . 'ht.access';
 	$dir = '/' . trim($modx->config['base_url'],'/');
-	if(is_file($htaccess))
-	{
+	if(is_file($htaccess)) {
 		$_ = file_get_contents($htaccess);
-		if(strpos($_,'RewriteBase')===false)
-		{
+		if(strpos($_,'RewriteBase')===false) {
 			$warnings[] = $_lang["settings_friendlyurls_alert2"];
-		}
-		elseif(is_writable($htaccess))
-		{
+		} elseif(is_writable($htaccess)) {
 			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
-			if(!@file_put_contents($htaccess,$_))
-			{
+			if(!@file_put_contents($htaccess,$_)) {
 				$warnings[] = $_lang["settings_friendlyurls_alert2"];
 			}
 		}
-	}
-	elseif(is_file($sample_htaccess))
-	{
-		if(!@rename($sample_htaccess,$htaccess))
-        {
+	} elseif(is_file($sample_htaccess)) {
+		if(!@rename($sample_htaccess,$htaccess)) {
         	$warnings[] = $_lang["settings_friendlyurls_alert"];
-		}
-		elseif($modx->config['base_url']!=='/')
-		{
+		} elseif($modx->config['base_url']!=='/') {
 			$_ = file_get_contents($htaccess);
 			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
-			if(!@file_put_contents($htaccess,$_))
-			{
+			if(!@file_put_contents($htaccess,$_)) {
 				$warnings[] = $_lang["settings_friendlyurls_alert2"];
 			}
 		}
@@ -73,7 +61,7 @@ 
 				$v = htmlspecialchars($v);
 				break;
             case 'settings_version':{
-                if($modx->getVersionData('version')!=$data['settings_version']){
+                if($modx->getVersionData('version')!=$data['settings_version']) {
                     $modx->logEvent(17,2,'<pre>'.var_export($data['settings_version'],true).'</pre>','fake settings_version');
                     $v = $modx->getVersionData('version');
                 }
@@ -134,7 +122,9 @@ 
 
 		$modx->config[$k] = $v;
 
-		if(!empty($k)) $savethese[] = '(\''.$modx->db->escape($k).'\', \''.$modx->db->escape($v).'\')';
+		if(!empty($k)) {
+		    $savethese[] = '(\''.$modx->db->escape($k).'\', \''.$modx->db->escape($v).'\')';
+		}
 	}
 
 	// Run a single query to save all the values
@@ -148,8 +138,11 @@ 
 		$oldtemplate = (int)$data['old_template'];
 		$tbl = $modx->getFullTableName('site_content');
 		$reset = $data['reset_template'];
-		if($reset==1) $modx->db->update(array('template' => $newtemplate), $tbl, "type='document'");
-		else if($reset==2) $modx->db->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");
+		if($reset==1) {
+		    $modx->db->update(array('template' => $newtemplate), $tbl, "type='document'");
+		} else if($reset==2) {
+		    $modx->db->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");
+		}
 	}
 
 	// empty cache

manager/processors/save_snippet.processor.php

Switch Indentation +107 added lines, -107 removed lines

@@ -66,111 +66,111 @@
 }
 
 switch ($_POST['mode']) {
-    case '23': // Save new snippet
-
-        // invoke OnBeforeSnipFormSave event
-        $modx->invokeEvent("OnBeforeSnipFormSave", array(
-            "mode" => "new",
-            "id" => $id
-        ));
-
-        // disallow duplicate names for new snippets
-        $rs = $modx->db->select('COUNT(id)', $modx->getFullTableName('site_snippets'), "name='{$name}'");
-        $count = $modx->db->getValue($rs);
-        if ($count > 0) {
-            $modx->manager->saveFormValues(23);
-            $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=23");
-        }
-
-        //do stuff to save the new doc
-        $newid = $modx->db->insert(array(
-            'name' => $name,
-            'description' => $description,
-            'snippet' => $snippet,
-            'moduleguid' => $moduleguid,
-            'locked' => $locked,
-            'properties' => $properties,
-            'category' => $categoryid,
-            'disabled' => $disabled,
-            'createdon' => $currentdate,
-            'editedon' => $currentdate
-        ), $modx->getFullTableName('site_snippets'));
-
-        // invoke OnSnipFormSave event
-        $modx->invokeEvent("OnSnipFormSave", array(
-            "mode" => "new",
-            "id" => $newid
-        ));
-
-        // Set the item name for logger
-        $_SESSION['itemname'] = $name;
-
-        // empty cache
-        $modx->clearCache('full');
-
-        // finished emptying cache - redirect
-        if ($_POST['stay'] != '') {
-            $a = ($_POST['stay'] == '2') ? "22&id=$newid" : "23";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
-            header($header);
-        } else {
-            $header = "Location: index.php?a=76&r=2";
-            header($header);
-        }
-        break;
-    case '22': // Save existing snippet
-        // invoke OnBeforeSnipFormSave event
-        $modx->invokeEvent("OnBeforeSnipFormSave", array(
-            "mode" => "upd",
-            "id" => $id
-        ));
-
-        // disallow duplicate names for snippets
-        $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_snippets'), "name='{$name}' AND id!='{$id}'");
-        if ($modx->db->getValue($rs) > 0) {
-            $modx->manager->saveFormValues(22);
-            $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=22&id={$id}");
-        }
-
-        //do stuff to save the edited doc
-        $modx->db->update(array(
-            'name' => $name,
-            'description' => $description,
-            'snippet' => $snippet,
-            'moduleguid' => $moduleguid,
-            'locked' => $locked,
-            'properties' => $properties,
-            'category' => $categoryid,
-            'disabled' => $disabled,
-            'editedon' => $currentdate
-        ), $modx->getFullTableName('site_snippets'), "id='{$id}'");
-
-        // invoke OnSnipFormSave event
-        $modx->invokeEvent("OnSnipFormSave", array(
-            "mode" => "upd",
-            "id" => $id
-        ));
-
-        // Set the item name for logger
-        $_SESSION['itemname'] = $name;
-
-        // empty cache
-        $modx->clearCache('full');
-
-        if ($_POST['runsnippet']) {
-            run_snippet($snippet);
-        }
-        // finished emptying cache - redirect
-        if ($_POST['stay'] != '') {
-            $a = ($_POST['stay'] == '2') ? "22&id=$id" : "23";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
-            header($header);
-        } else {
-            $modx->unlockElement(4, $id);
-            $header = "Location: index.php?a=76&r=2";
-            header($header);
-        }
-        break;
-    default:
-        $modx->webAlertAndQuit("No operation set in request.");
+        case '23': // Save new snippet
+
+            // invoke OnBeforeSnipFormSave event
+            $modx->invokeEvent("OnBeforeSnipFormSave", array(
+                "mode" => "new",
+                "id" => $id
+            ));
+
+            // disallow duplicate names for new snippets
+            $rs = $modx->db->select('COUNT(id)', $modx->getFullTableName('site_snippets'), "name='{$name}'");
+            $count = $modx->db->getValue($rs);
+            if ($count > 0) {
+                $modx->manager->saveFormValues(23);
+                $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=23");
+            }
+
+            //do stuff to save the new doc
+            $newid = $modx->db->insert(array(
+                'name' => $name,
+                'description' => $description,
+                'snippet' => $snippet,
+                'moduleguid' => $moduleguid,
+                'locked' => $locked,
+                'properties' => $properties,
+                'category' => $categoryid,
+                'disabled' => $disabled,
+                'createdon' => $currentdate,
+                'editedon' => $currentdate
+            ), $modx->getFullTableName('site_snippets'));
+
+            // invoke OnSnipFormSave event
+            $modx->invokeEvent("OnSnipFormSave", array(
+                "mode" => "new",
+                "id" => $newid
+            ));
+
+            // Set the item name for logger
+            $_SESSION['itemname'] = $name;
+
+            // empty cache
+            $modx->clearCache('full');
+
+            // finished emptying cache - redirect
+            if ($_POST['stay'] != '') {
+                $a = ($_POST['stay'] == '2') ? "22&id=$newid" : "23";
+                $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+                header($header);
+            } else {
+                $header = "Location: index.php?a=76&r=2";
+                header($header);
+            }
+            break;
+        case '22': // Save existing snippet
+            // invoke OnBeforeSnipFormSave event
+            $modx->invokeEvent("OnBeforeSnipFormSave", array(
+                "mode" => "upd",
+                "id" => $id
+            ));
+
+            // disallow duplicate names for snippets
+            $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_snippets'), "name='{$name}' AND id!='{$id}'");
+            if ($modx->db->getValue($rs) > 0) {
+                $modx->manager->saveFormValues(22);
+                $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=22&id={$id}");
+            }
+
+            //do stuff to save the edited doc
+            $modx->db->update(array(
+                'name' => $name,
+                'description' => $description,
+                'snippet' => $snippet,
+                'moduleguid' => $moduleguid,
+                'locked' => $locked,
+                'properties' => $properties,
+                'category' => $categoryid,
+                'disabled' => $disabled,
+                'editedon' => $currentdate
+            ), $modx->getFullTableName('site_snippets'), "id='{$id}'");
+
+            // invoke OnSnipFormSave event
+            $modx->invokeEvent("OnSnipFormSave", array(
+                "mode" => "upd",
+                "id" => $id
+            ));
+
+            // Set the item name for logger
+            $_SESSION['itemname'] = $name;
+
+            // empty cache
+            $modx->clearCache('full');
+
+            if ($_POST['runsnippet']) {
+                run_snippet($snippet);
+            }
+            // finished emptying cache - redirect
+            if ($_POST['stay'] != '') {
+                $a = ($_POST['stay'] == '2') ? "22&id=$id" : "23";
+                $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+                header($header);
+            } else {
+                $modx->unlockElement(4, $id);
+                $header = "Location: index.php?a=76&r=2";
+                header($header);
+            }
+            break;
+        default:
+            $modx->webAlertAndQuit("No operation set in request.");
 }

Spacing +9 added lines, -9 removed lines

@@ -1,12 +1,12 @@ 
 <?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.");
 }
 if (!$modx->hasPermission('save_snippet')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = (int)$_POST['id'];
+$id = (int) $_POST['id'];
 $snippet = trim($_POST['post']);
 $name = $modx->db->escape(trim($_POST['name']));
 $description = $modx->db->escape($_POST['description']);
@@ -33,11 +33,11 @@ 
 
 //Kyle Jaebker - added category support
 if (empty($_POST['newcategory']) && $_POST['categoryid'] > 0) {
-    $categoryid = (int)$_POST['categoryid'];
+    $categoryid = (int) $_POST['categoryid'];
 } elseif (empty($_POST['newcategory']) && $_POST['categoryid'] <= 0) {
     $categoryid = 0;
 } else {
-    include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+    include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
     $categoryid = checkCategory($_POST['newcategory']);
     if (!$categoryid) {
         $categoryid = newCategory($_POST['newcategory']);
@@ -55,12 +55,12 @@ 
     $moduleguid = isset($parsed['guid']) ? $parsed['guid'] : $moduleguid;
 
     $description = isset($parsed['description']) ? $parsed['description'] : $description;
-    $version = isset($parsed['version']) ? '<b>' . $parsed['version'] . '</b> ' : '';
+    $version = isset($parsed['version']) ? '<b>'.$parsed['version'].'</b> ' : '';
     if ($version) {
-        $description = $version . trim(preg_replace('/(<b>.+?)+(<\/b>)/i', '', $description));
+        $description = $version.trim(preg_replace('/(<b>.+?)+(<\/b>)/i', '', $description));
     }
     if (isset($parsed['modx_category'])) {
-        include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+        include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
         $categoryid = getCategory($parsed['modx_category']);
     }
 }
@@ -111,7 +111,7 @@ 
         // finished emptying cache - redirect
         if ($_POST['stay'] != '') {
             $a = ($_POST['stay'] == '2') ? "22&id=$newid" : "23";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+            $header = "Location: index.php?a=".$a."&r=2&stay=".$_POST['stay'];
             header($header);
         } else {
             $header = "Location: index.php?a=76&r=2";
@@ -163,7 +163,7 @@ 
         // finished emptying cache - redirect
         if ($_POST['stay'] != '') {
             $a = ($_POST['stay'] == '2') ? "22&id=$id" : "23";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+            $header = "Location: index.php?a=".$a."&r=2&stay=".$_POST['stay'];
             header($header);
         } else {
             $modx->unlockElement(4, $id);

manager/processors/login.processor.php

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

@@ -239,7 +239,7 @@
 	if(version_compare(PHP_VERSION, '5.2', '<')) {
 		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, '; HttpOnly', $secure);
 	} else {
-		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, NULL, $secure, true);
+		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, null, $secure, true);
 	}
 } else {
 	$_SESSION['modx.mgr.session.cookie.lifetime'] = 0;

Indentation +127 added lines, -127 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-	header('HTTP/1.0 404 Not Found');
-	exit('error');
+    header('HTTP/1.0 404 Not Found');
+    exit('error');
 }
 define('IN_MANAGER_MODE', true);  // we use this to make sure files are accessed through
 define('MODX_API_MODE', true);
@@ -18,12 +18,12 @@ 
 include_once("{$core_path}lang/english.inc.php");
 
 if($manager_language !== 'english' && is_file("{$core_path}lang/{$manager_language}.inc.php")) {
-	include_once("{$core_path}lang/{$manager_language}.inc.php");
+    include_once("{$core_path}lang/{$manager_language}.inc.php");
 }
 
 // Initialize System Alert Message Queque
 if(!isset($_SESSION['SystemAlertMsgQueque'])) {
-	$_SESSION['SystemAlertMsgQueque'] = array();
+    $_SESSION['SystemAlertMsgQueque'] = array();
 }
 $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
 
@@ -38,10 +38,10 @@ 
 
 // invoke OnBeforeManagerLogin event
 $modx->invokeEvent('OnBeforeManagerLogin', array(
-		'username' => $username,
-		'userpassword' => $givenPassword,
-		'rememberme' => $rememberme
-	));
+        'username' => $username,
+        'userpassword' => $givenPassword,
+        'rememberme' => $rememberme
+    ));
 $fields = 'mu.*, ua.*';
 $from = '[+prefix+]manager_users AS mu, [+prefix+]user_attributes AS ua';
 $where = "BINARY mu.username='{$username}' and ua.internalKey=mu.id";
@@ -49,8 +49,8 @@ 
 $limit = $modx->db->getRecordCount($rs);
 
 if($limit == 0 || $limit > 1) {
-	jsAlert($_lang['login_processor_unknown_user']);
-	return;
+    jsAlert($_lang['login_processor_unknown_user']);
+    return;
 }
 
 $row = $modx->db->getRow($rs);
@@ -71,127 +71,127 @@ 
 // get the user settings from the database
 $rs = $modx->db->select('setting_name, setting_value', '[+prefix+]user_settings', "user='{$internalKey}' AND setting_value!=''");
 while($row = $modx->db->getRow($rs)) {
-	extract($row);
-	${$setting_name} = $setting_value;
+    extract($row);
+    ${$setting_name} = $setting_value;
 }
 
 // blocked due to number of login errors.
 if($failedlogins >= $failed_allowed && $blockeduntildate > time()) {
-	@session_destroy();
-	session_unset();
-	if($cip = getenv("HTTP_CLIENT_IP")) {
-		$ip = $cip;
-	} elseif($cip = getenv("HTTP_X_FORWARDED_FOR")) {
-		$ip = $cip;
-	} elseif($cip = getenv("REMOTE_ADDR")) {
-		$ip = $cip;
-	} else {
-		$ip = "UNKNOWN";
-	}
-	$log = new EvolutionCMS\Legacy\LogHandler();
-	$log->initAndWriteLog("Login Fail (Temporary Block)", $internalKey, $username, "119", $internalKey, "IP: " . $ip);
-	jsAlert($_lang['login_processor_many_failed_logins']);
-	return;
+    @session_destroy();
+    session_unset();
+    if($cip = getenv("HTTP_CLIENT_IP")) {
+        $ip = $cip;
+    } elseif($cip = getenv("HTTP_X_FORWARDED_FOR")) {
+        $ip = $cip;
+    } elseif($cip = getenv("REMOTE_ADDR")) {
+        $ip = $cip;
+    } else {
+        $ip = "UNKNOWN";
+    }
+    $log = new EvolutionCMS\Legacy\LogHandler();
+    $log->initAndWriteLog("Login Fail (Temporary Block)", $internalKey, $username, "119", $internalKey, "IP: " . $ip);
+    jsAlert($_lang['login_processor_many_failed_logins']);
+    return;
 }
 
 // blocked due to number of login errors, but get to try again
 if($failedlogins >= $failed_allowed && $blockeduntildate < time()) {
-	$fields = array();
-	$fields['failedlogincount'] = '0';
-	$fields['blockeduntil'] = time() - 1;
-	$modx->db->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
+    $fields = array();
+    $fields['failedlogincount'] = '0';
+    $fields['blockeduntil'] = time() - 1;
+    $modx->db->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
 }
 
 // this user has been blocked by an admin, so no way he's loggin in!
 if($blocked == '1') {
-	@session_destroy();
-	session_unset();
-	jsAlert($_lang['login_processor_blocked1']);
-	return;
+    @session_destroy();
+    session_unset();
+    jsAlert($_lang['login_processor_blocked1']);
+    return;
 }
 
 // blockuntil: this user has a block until date
 if($blockeduntildate > time()) {
-	@session_destroy();
-	session_unset();
-	jsAlert($_lang['login_processor_blocked2']);
-	return;
+    @session_destroy();
+    session_unset();
+    jsAlert($_lang['login_processor_blocked2']);
+    return;
 }
 
 // blockafter: this user has a block after date
 if($blockedafterdate > 0 && $blockedafterdate < time()) {
-	@session_destroy();
-	session_unset();
-	jsAlert($_lang['login_processor_blocked3']);
-	return;
+    @session_destroy();
+    session_unset();
+    jsAlert($_lang['login_processor_blocked3']);
+    return;
 }
 
 // allowed ip
 if($allowed_ip) {
-	if(($hostname = gethostbyaddr($_SERVER['REMOTE_ADDR'])) && ($hostname != $_SERVER['REMOTE_ADDR'])) {
-		if(gethostbyname($hostname) != $_SERVER['REMOTE_ADDR']) {
-			jsAlert($_lang['login_processor_remotehost_ip']);
-			return;
-		}
-	}
-	if(!in_array($_SERVER['REMOTE_ADDR'], array_filter(array_map('trim', explode(',', $allowed_ip))))) {
-		jsAlert($_lang['login_processor_remote_ip']);
-		return;
-	}
+    if(($hostname = gethostbyaddr($_SERVER['REMOTE_ADDR'])) && ($hostname != $_SERVER['REMOTE_ADDR'])) {
+        if(gethostbyname($hostname) != $_SERVER['REMOTE_ADDR']) {
+            jsAlert($_lang['login_processor_remotehost_ip']);
+            return;
+        }
+    }
+    if(!in_array($_SERVER['REMOTE_ADDR'], array_filter(array_map('trim', explode(',', $allowed_ip))))) {
+        jsAlert($_lang['login_processor_remote_ip']);
+        return;
+    }
 }
 
 // allowed days
 if($allowed_days) {
-	$date = getdate();
-	$day = $date['wday'] + 1;
-	if(!in_array($day,explode(',',$allowed_days))) {
-		jsAlert($_lang['login_processor_date']);
-		return;
-	}
+    $date = getdate();
+    $day = $date['wday'] + 1;
+    if(!in_array($day,explode(',',$allowed_days))) {
+        jsAlert($_lang['login_processor_date']);
+        return;
+    }
 }
 
 // invoke OnManagerAuthentication event
 $rt = $modx->invokeEvent('OnManagerAuthentication', array(
-		'userid' => $internalKey,
-		'username' => $username,
-		'userpassword' => $givenPassword,
-		'savedpassword' => $dbasePassword,
-		'rememberme' => $rememberme
-	));
+        'userid' => $internalKey,
+        'username' => $username,
+        'userpassword' => $givenPassword,
+        'savedpassword' => $dbasePassword,
+        'rememberme' => $rememberme
+    ));
 
 // check if plugin authenticated the user
 $matchPassword = false;
 if(!isset($rt) || !$rt || (is_array($rt) && !in_array(true, $rt))) {
-	// check user password - local authentication
-	$hashType = $modx->manager->getHashType($dbasePassword);
-	if($hashType == 'phpass') {
-		$matchPassword = login($username, $_REQUEST['password'], $dbasePassword);
-	} elseif($hashType == 'md5') {
-		$matchPassword = loginMD5($internalKey, $_REQUEST['password'], $dbasePassword, $username);
-	} elseif($hashType == 'v1') {
-		$matchPassword = loginV1($internalKey, $_REQUEST['password'], $dbasePassword, $username);
-	} else {
-		$matchPassword = false;
-	}
+    // check user password - local authentication
+    $hashType = $modx->manager->getHashType($dbasePassword);
+    if($hashType == 'phpass') {
+        $matchPassword = login($username, $_REQUEST['password'], $dbasePassword);
+    } elseif($hashType == 'md5') {
+        $matchPassword = loginMD5($internalKey, $_REQUEST['password'], $dbasePassword, $username);
+    } elseif($hashType == 'v1') {
+        $matchPassword = loginV1($internalKey, $_REQUEST['password'], $dbasePassword, $username);
+    } else {
+        $matchPassword = false;
+    }
 } else if($rt === true || (is_array($rt) && in_array(true, $rt))) {
-	$matchPassword = true;
+    $matchPassword = true;
 }
 
 if(!$matchPassword) {
-	jsAlert($_lang['login_processor_wrong_password']);
-	incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
-	return;
+    jsAlert($_lang['login_processor_wrong_password']);
+    incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
+    return;
 }
 
 if($modx->config['use_captcha'] == 1) {
-	if(!isset ($_SESSION['veriword'])) {
-		jsAlert($_lang['login_processor_captcha_config']);
-		return;
-	} elseif($_SESSION['veriword'] != $captcha_code) {
-		jsAlert($_lang['login_processor_bad_code']);
-		incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
-		return;
-	}
+    if(!isset ($_SESSION['veriword'])) {
+        jsAlert($_lang['login_processor_captcha_config']);
+        return;
+    } elseif($_SESSION['veriword'] != $captcha_code) {
+        jsAlert($_lang['login_processor_bad_code']);
+        incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
+        return;
+    }
 }
 
 $modx->cleanupExpiredLocks();
@@ -226,36 +226,36 @@ 
 $_SESSION['mgrToken'] = md5($currentsessionid);
 
 if($rememberme == '1') {
-	$_SESSION['modx.mgr.session.cookie.lifetime'] = (int)$modx->config['session.cookie.lifetime'];
-
-	// Set a cookie separate from the session cookie with the username in it.
-	// Are we using secure connection? If so, make sure the cookie is secure
-	global $https_port;
-
-	$secure = ((isset ($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') || $_SERVER['SERVER_PORT'] == $https_port);
-	if(version_compare(PHP_VERSION, '5.2', '<')) {
-		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, '; HttpOnly', $secure);
-	} else {
-		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, NULL, $secure, true);
-	}
+    $_SESSION['modx.mgr.session.cookie.lifetime'] = (int)$modx->config['session.cookie.lifetime'];
+
+    // Set a cookie separate from the session cookie with the username in it.
+    // Are we using secure connection? If so, make sure the cookie is secure
+    global $https_port;
+
+    $secure = ((isset ($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') || $_SERVER['SERVER_PORT'] == $https_port);
+    if(version_compare(PHP_VERSION, '5.2', '<')) {
+        setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, '; HttpOnly', $secure);
+    } else {
+        setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, NULL, $secure, true);
+    }
 } else {
-	$_SESSION['modx.mgr.session.cookie.lifetime'] = 0;
+    $_SESSION['modx.mgr.session.cookie.lifetime'] = 0;
 
-	// Remove the Remember Me cookie
-	setcookie('modx_remember_manager', '', time() - 3600, MODX_BASE_URL);
+    // Remove the Remember Me cookie
+    setcookie('modx_remember_manager', '', time() - 3600, MODX_BASE_URL);
 }
 
 // Check if user already has an active session, if not check if user pressed logout end of last session
 $rs = $modx->db->select('lasthit', $modx->getFullTableName('active_user_sessions'), "internalKey='{$internalKey}'");
 $activeSession = $modx->db->getValue($rs);
 if(!$activeSession) {
-	$rs = $modx->db->select('lasthit', $modx->getFullTableName('active_users'), "internalKey='{$internalKey}' AND action != 8");
-	if($lastHit = $modx->db->getValue($rs)) {
-		$_SESSION['show_logout_reminder'] = array(
-			'type' => 'logout_reminder',
-			'lastHit' => $lastHit
-		);
-	}
+    $rs = $modx->db->select('lasthit', $modx->getFullTableName('active_users'), "internalKey='{$internalKey}' AND action != 8");
+    if($lastHit = $modx->db->getValue($rs)) {
+        $_SESSION['show_logout_reminder'] = array(
+            'type' => 'logout_reminder',
+            'lastHit' => $lastHit
+        );
+    }
 }
 
 $log = new EvolutionCMS\Legacy\LogHandler();
@@ -263,27 +263,27 @@ 
 
 // invoke OnManagerLogin event
 $modx->invokeEvent('OnManagerLogin', array(
-		'userid' => $internalKey,
-		'username' => $username,
-		'userpassword' => $givenPassword,
-		'rememberme' => $rememberme
-	));
+        'userid' => $internalKey,
+        'username' => $username,
+        'userpassword' => $givenPassword,
+        'rememberme' => $rememberme
+    ));
 
 // check if we should redirect user to a web page
 $rs = $modx->db->select('setting_value', '[+prefix+]user_settings', "user='{$internalKey}' AND setting_name='manager_login_startup'");
 $id = (int)$modx->db->getValue($rs);
 if($id > 0) {
-	$header = 'Location: ' . $modx->makeUrl($id, '', '', 'full');
-	if($_POST['ajax'] == 1) {
-		echo $header;
-	} else {
-		header($header);
-	}
+    $header = 'Location: ' . $modx->makeUrl($id, '', '', 'full');
+    if($_POST['ajax'] == 1) {
+        echo $header;
+    } else {
+        header($header);
+    }
 } else {
-	$header = 'Location: ' . MODX_MANAGER_URL;
-	if($_POST['ajax'] == 1) {
-		echo $header;
-	} else {
-		header($header);
-	}
+    $header = 'Location: ' . MODX_MANAGER_URL;
+    if($_POST['ajax'] == 1) {
+        echo $header;
+    } else {
+        header($header);
+    }
 }

Spacing +46 added lines, -46 removed lines

@@ -1,28 +1,28 @@ 
 <?php
-if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
 	header('HTTP/1.0 404 Not Found');
 	exit('error');
 }
-define('IN_MANAGER_MODE', true);  // we use this to make sure files are accessed through
+define('IN_MANAGER_MODE', true); // we use this to make sure files are accessed through
 define('MODX_API_MODE', true);
-include_once(__DIR__ . '/../../index.php');
+include_once(__DIR__.'/../../index.php');
 $modx->db->connect();
 $modx->getSettings();
 $modx->invokeEvent('OnManagerPageInit');
 $modx->loadExtension('ManagerAPI');
 $modx->loadExtension('phpass');
 
-$core_path = MODX_MANAGER_PATH . 'includes/';
+$core_path = MODX_MANAGER_PATH.'includes/';
 // include_once the language file
 $_lang = array();
 include_once("{$core_path}lang/english.inc.php");
 
-if($manager_language !== 'english' && is_file("{$core_path}lang/{$manager_language}.inc.php")) {
+if ($manager_language !== 'english' && is_file("{$core_path}lang/{$manager_language}.inc.php")) {
 	include_once("{$core_path}lang/{$manager_language}.inc.php");
 }
 
 // Initialize System Alert Message Queque
-if(!isset($_SESSION['SystemAlertMsgQueque'])) {
+if (!isset($_SESSION['SystemAlertMsgQueque'])) {
 	$_SESSION['SystemAlertMsgQueque'] = array();
 }
 $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
@@ -48,7 +48,7 @@ 
 $rs = $modx->db->select($fields, $from, $where);
 $limit = $modx->db->getRecordCount($rs);
 
-if($limit == 0 || $limit > 1) {
+if ($limit == 0 || $limit > 1) {
 	jsAlert($_lang['login_processor_unknown_user']);
 	return;
 }
@@ -70,32 +70,32 @@ 
 
 // get the user settings from the database
 $rs = $modx->db->select('setting_name, setting_value', '[+prefix+]user_settings', "user='{$internalKey}' AND setting_value!=''");
-while($row = $modx->db->getRow($rs)) {
+while ($row = $modx->db->getRow($rs)) {
 	extract($row);
 	${$setting_name} = $setting_value;
 }
 
 // blocked due to number of login errors.
-if($failedlogins >= $failed_allowed && $blockeduntildate > time()) {
+if ($failedlogins >= $failed_allowed && $blockeduntildate > time()) {
 	@session_destroy();
 	session_unset();
-	if($cip = getenv("HTTP_CLIENT_IP")) {
+	if ($cip = getenv("HTTP_CLIENT_IP")) {
 		$ip = $cip;
-	} elseif($cip = getenv("HTTP_X_FORWARDED_FOR")) {
+	} elseif ($cip = getenv("HTTP_X_FORWARDED_FOR")) {
 		$ip = $cip;
-	} elseif($cip = getenv("REMOTE_ADDR")) {
+	} elseif ($cip = getenv("REMOTE_ADDR")) {
 		$ip = $cip;
 	} else {
 		$ip = "UNKNOWN";
 	}
 	$log = new EvolutionCMS\Legacy\LogHandler();
-	$log->initAndWriteLog("Login Fail (Temporary Block)", $internalKey, $username, "119", $internalKey, "IP: " . $ip);
+	$log->initAndWriteLog("Login Fail (Temporary Block)", $internalKey, $username, "119", $internalKey, "IP: ".$ip);
 	jsAlert($_lang['login_processor_many_failed_logins']);
 	return;
 }
 
 // blocked due to number of login errors, but get to try again
-if($failedlogins >= $failed_allowed && $blockeduntildate < time()) {
+if ($failedlogins >= $failed_allowed && $blockeduntildate < time()) {
 	$fields = array();
 	$fields['failedlogincount'] = '0';
 	$fields['blockeduntil'] = time() - 1;
@@ -103,7 +103,7 @@ 
 }
 
 // this user has been blocked by an admin, so no way he's loggin in!
-if($blocked == '1') {
+if ($blocked == '1') {
 	@session_destroy();
 	session_unset();
 	jsAlert($_lang['login_processor_blocked1']);
@@ -111,7 +111,7 @@ 
 }
 
 // blockuntil: this user has a block until date
-if($blockeduntildate > time()) {
+if ($blockeduntildate > time()) {
 	@session_destroy();
 	session_unset();
 	jsAlert($_lang['login_processor_blocked2']);
@@ -119,7 +119,7 @@ 
 }
 
 // blockafter: this user has a block after date
-if($blockedafterdate > 0 && $blockedafterdate < time()) {
+if ($blockedafterdate > 0 && $blockedafterdate < time()) {
 	@session_destroy();
 	session_unset();
 	jsAlert($_lang['login_processor_blocked3']);
@@ -127,24 +127,24 @@ 
 }
 
 // allowed ip
-if($allowed_ip) {
-	if(($hostname = gethostbyaddr($_SERVER['REMOTE_ADDR'])) && ($hostname != $_SERVER['REMOTE_ADDR'])) {
-		if(gethostbyname($hostname) != $_SERVER['REMOTE_ADDR']) {
+if ($allowed_ip) {
+	if (($hostname = gethostbyaddr($_SERVER['REMOTE_ADDR'])) && ($hostname != $_SERVER['REMOTE_ADDR'])) {
+		if (gethostbyname($hostname) != $_SERVER['REMOTE_ADDR']) {
 			jsAlert($_lang['login_processor_remotehost_ip']);
 			return;
 		}
 	}
-	if(!in_array($_SERVER['REMOTE_ADDR'], array_filter(array_map('trim', explode(',', $allowed_ip))))) {
+	if (!in_array($_SERVER['REMOTE_ADDR'], array_filter(array_map('trim', explode(',', $allowed_ip))))) {
 		jsAlert($_lang['login_processor_remote_ip']);
 		return;
 	}
 }
 
 // allowed days
-if($allowed_days) {
+if ($allowed_days) {
 	$date = getdate();
 	$day = $date['wday'] + 1;
-	if(!in_array($day,explode(',',$allowed_days))) {
+	if (!in_array($day, explode(',', $allowed_days))) {
 		jsAlert($_lang['login_processor_date']);
 		return;
 	}
@@ -161,33 +161,33 @@ 
 
 // check if plugin authenticated the user
 $matchPassword = false;
-if(!isset($rt) || !$rt || (is_array($rt) && !in_array(true, $rt))) {
+if (!isset($rt) || !$rt || (is_array($rt) && !in_array(true, $rt))) {
 	// check user password - local authentication
 	$hashType = $modx->manager->getHashType($dbasePassword);
-	if($hashType == 'phpass') {
+	if ($hashType == 'phpass') {
 		$matchPassword = login($username, $_REQUEST['password'], $dbasePassword);
-	} elseif($hashType == 'md5') {
+	} elseif ($hashType == 'md5') {
 		$matchPassword = loginMD5($internalKey, $_REQUEST['password'], $dbasePassword, $username);
-	} elseif($hashType == 'v1') {
+	} elseif ($hashType == 'v1') {
 		$matchPassword = loginV1($internalKey, $_REQUEST['password'], $dbasePassword, $username);
 	} else {
 		$matchPassword = false;
 	}
-} else if($rt === true || (is_array($rt) && in_array(true, $rt))) {
+} else if ($rt === true || (is_array($rt) && in_array(true, $rt))) {
 	$matchPassword = true;
 }
 
-if(!$matchPassword) {
+if (!$matchPassword) {
 	jsAlert($_lang['login_processor_wrong_password']);
 	incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
 	return;
 }
 
-if($modx->config['use_captcha'] == 1) {
-	if(!isset ($_SESSION['veriword'])) {
+if ($modx->config['use_captcha'] == 1) {
+	if (!isset ($_SESSION['veriword'])) {
 		jsAlert($_lang['login_processor_captcha_config']);
 		return;
-	} elseif($_SESSION['veriword'] != $captcha_code) {
+	} elseif ($_SESSION['veriword'] != $captcha_code) {
 		jsAlert($_lang['login_processor_bad_code']);
 		incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
 		return;
@@ -215,25 +215,25 @@ 
 $_SESSION['mgrPermissions'] = $modx->db->getRow($rs);
 
 // successful login so reset fail count and update key values
-$modx->db->update('failedlogincount=0, ' . 'logincount=logincount+1, ' . 'lastlogin=thislogin, ' . 'thislogin=' . time() . ', ' . "sessionid='{$currentsessionid}'", '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
+$modx->db->update('failedlogincount=0, '.'logincount=logincount+1, '.'lastlogin=thislogin, '.'thislogin='.time().', '."sessionid='{$currentsessionid}'", '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
 
 // get user's document groups
 $i = 0;
-$rs = $modx->db->select('uga.documentgroup', $modx->getFullTableName('member_groups') . ' ug
-		INNER JOIN ' . $modx->getFullTableName('membergroup_access') . ' uga ON uga.membergroup=ug.user_group', "ug.member='{$internalKey}'");
+$rs = $modx->db->select('uga.documentgroup', $modx->getFullTableName('member_groups').' ug
+		INNER JOIN ' . $modx->getFullTableName('membergroup_access').' uga ON uga.membergroup=ug.user_group', "ug.member='{$internalKey}'");
 $_SESSION['mgrDocgroups'] = $modx->db->getColumn('documentgroup', $rs);
 
 $_SESSION['mgrToken'] = md5($currentsessionid);
 
-if($rememberme == '1') {
-	$_SESSION['modx.mgr.session.cookie.lifetime'] = (int)$modx->config['session.cookie.lifetime'];
+if ($rememberme == '1') {
+	$_SESSION['modx.mgr.session.cookie.lifetime'] = (int) $modx->config['session.cookie.lifetime'];
 
 	// Set a cookie separate from the session cookie with the username in it.
 	// Are we using secure connection? If so, make sure the cookie is secure
 	global $https_port;
 
 	$secure = ((isset ($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') || $_SERVER['SERVER_PORT'] == $https_port);
-	if(version_compare(PHP_VERSION, '5.2', '<')) {
+	if (version_compare(PHP_VERSION, '5.2', '<')) {
 		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, '; HttpOnly', $secure);
 	} else {
 		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, NULL, $secure, true);
@@ -248,9 +248,9 @@ 
 // Check if user already has an active session, if not check if user pressed logout end of last session
 $rs = $modx->db->select('lasthit', $modx->getFullTableName('active_user_sessions'), "internalKey='{$internalKey}'");
 $activeSession = $modx->db->getValue($rs);
-if(!$activeSession) {
+if (!$activeSession) {
 	$rs = $modx->db->select('lasthit', $modx->getFullTableName('active_users'), "internalKey='{$internalKey}' AND action != 8");
-	if($lastHit = $modx->db->getValue($rs)) {
+	if ($lastHit = $modx->db->getValue($rs)) {
 		$_SESSION['show_logout_reminder'] = array(
 			'type' => 'logout_reminder',
 			'lastHit' => $lastHit
@@ -271,17 +271,17 @@ 
 
 // check if we should redirect user to a web page
 $rs = $modx->db->select('setting_value', '[+prefix+]user_settings', "user='{$internalKey}' AND setting_name='manager_login_startup'");
-$id = (int)$modx->db->getValue($rs);
-if($id > 0) {
-	$header = 'Location: ' . $modx->makeUrl($id, '', '', 'full');
-	if($_POST['ajax'] == 1) {
+$id = (int) $modx->db->getValue($rs);
+if ($id > 0) {
+	$header = 'Location: '.$modx->makeUrl($id, '', '', 'full');
+	if ($_POST['ajax'] == 1) {
 		echo $header;
 	} else {
 		header($header);
 	}
 } else {
-	$header = 'Location: ' . MODX_MANAGER_URL;
-	if($_POST['ajax'] == 1) {
+	$header = 'Location: '.MODX_MANAGER_URL;
+	if ($_POST['ajax'] == 1) {
 		echo $header;
 	} else {
 		header($header);

manager/frames/1.php

Indentation +3 added lines, -3 removed lines

@@ -236,9 +236,9 @@
         lockedElementsTranslation: <?= json_encode($unlockTranslations, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE) . "\n" ?>

       };

       <?php

-      $opened = array_filter(array_map('intval', explode('|', $_SESSION['openedArray'])));

-      echo (empty($opened) ? '' : 'modx.openedArray[' . implode("] = 1;\n		modx.openedArray[", $opened) . '] = 1;') . "\n";

-      ?>

+        $opened = array_filter(array_map('intval', explode('|', $_SESSION['openedArray'])));

+        echo (empty($opened) ? '' : 'modx.openedArray[' . implode("] = 1;\n		modx.openedArray[", $opened) . '] = 1;') . "\n";

+        ?>

     </script>

     <script src="media/style/<?= $modx->config['manager_theme'] ?>/js/modx.min.js?v=<?= $lastInstallTime ?>"></script>

     <?php if ($modx->config['show_picker'] != "0") { ?>

Spacing +42 added lines, -42 removed lines

@@ -1,5 +1,5 @@ 
 <?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.");

 }

 header("X-XSS-Protection: 0");

@@ -47,9 +47,9 @@ 
 

 $theme_modes = array('', 'lightness', 'light', 'dark', 'darkness');

 if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {

-    $body_class .= ' ' . $theme_modes[$_COOKIE['MODX_themeMode']];

+    $body_class .= ' '.$theme_modes[$_COOKIE['MODX_themeMode']];

 } elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {

-    $body_class .= ' ' . $theme_modes[$modx->config['manager_theme_mode']];

+    $body_class .= ' '.$theme_modes[$modx->config['manager_theme_mode']];

 }

 

 $navbar_position = $modx->config['manager_menu_position'];

@@ -82,36 +82,36 @@ 
     $user['which_browser'] = $modx->config['which_browser'];

 }

 

-$css = 'media/style/' . $modx->config['manager_theme'] . '/css/page.css?v=' . $lastInstallTime;

+$css = 'media/style/'.$modx->config['manager_theme'].'/css/page.css?v='.$lastInstallTime;

 

 if ($modx->config['manager_theme'] == 'default') {

-    if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css') && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {

-        require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php';

+    if (!file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css') && is_writable(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css')) {

+        require_once MODX_BASE_PATH.'assets/lib/Formatter/CSSMinify.php';

         $minifier = new Formatter\CSSMinify();

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/font-awesome/css/font-awesome.min.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/fonts.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/forms.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/mainmenu.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tree.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/custom.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tabpane.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/contextmenu.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/index.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/main.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/bootstrap/css/bootstrap.min.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/font-awesome/css/font-awesome.min.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/fonts.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/forms.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/mainmenu.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tree.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/custom.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tabpane.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/contextmenu.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/index.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/main.css');

         $css = $minifier->minify();

-        file_put_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css', $css);

+        file_put_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css', $css);

     }

-    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {

-        $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime;

+    if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')) {

+        $css = 'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css?v='.$lastInstallTime;

     }

 }

 

-$modx->config['global_tabs'] = (int)($modx->config['global_tabs'] && ($user['role'] == 1 || $modx->hasPermission('edit_template') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_plugin')));

+$modx->config['global_tabs'] = (int) ($modx->config['global_tabs'] && ($user['role'] == 1 || $modx->hasPermission('edit_template') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_plugin')));

 

 ?>

 <!DOCTYPE html>

-<html <?= (isset($modx_textdir) && $modx_textdir ? 'dir="rtl" lang="' : 'lang="') . $mxla . '" xml:lang="' . $mxla . '"' ?>>

+<html <?= (isset($modx_textdir) && $modx_textdir ? 'dir="rtl" lang="' : 'lang="').$mxla.'" xml:lang="'.$mxla.'"' ?>>

 <head>

     <title><?= $site_name ?>- (EVO CMS Manager)</title>

     <meta http-equiv="Content-Type" content="text/html; charset=<?= $modx_manager_charset ?>" />

@@ -142,21 +142,21 @@ 
         MODX_SITE_URL: '<?= MODX_SITE_URL ?>',

         MODX_MANAGER_URL: '<?= MODX_MANAGER_URL ?>',

         user: {

-          role: <?= (int)$user['role'] ?>,

+          role: <?= (int) $user['role'] ?>,

           username: '<?= $user['username'] ?>'

         },

         config: {

           mail_check_timeperiod: <?= $modx->config['mail_check_timeperiod'] ?>,

-          menu_height: <?= (int)$menu_height ?>,

-          tree_width: <?= (int)$tree_width ?>,

-          tree_min_width: <?= (int)$tree_min_width ?>,

-          session_timeout: <?= (int)$modx->config['session_timeout'] ?>,

-          site_start: <?= (int)$modx->config['site_start'] ?>,

-          tree_page_click: <?=(!empty($modx->config['tree_page_click']) ? (int)$modx->config['tree_page_click'] : 27) ?>,

+          menu_height: <?= (int) $menu_height ?>,

+          tree_width: <?= (int) $tree_width ?>,

+          tree_min_width: <?= (int) $tree_min_width ?>,

+          session_timeout: <?= (int) $modx->config['session_timeout'] ?>,

+          site_start: <?= (int) $modx->config['site_start'] ?>,

+          tree_page_click: <?=(!empty($modx->config['tree_page_click']) ? (int) $modx->config['tree_page_click'] : 27) ?>,

           theme: '<?= $modx->config['manager_theme'] ?>',

           theme_mode: '<?= $modx->config['manager_theme_mode'] ?>',

           which_browser: '<?= $user['which_browser'] ?>',

-          layout: <?= (int)$manager_layout ?>,

+          layout: <?= (int) $manager_layout ?>,

           textdir: '<?= $modx_textdir ?>',

           global_tabs: <?= $modx->config['global_tabs'] ?>

 

@@ -241,11 +241,11 @@ 
           delete a[b];

         },

         openedArray: [],

-        lockedElementsTranslation: <?= json_encode($unlockTranslations, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE) . "\n" ?>

+        lockedElementsTranslation: <?= json_encode($unlockTranslations, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE)."\n" ?>

       };

       <?php

       $opened = array_filter(array_map('intval', explode('|', $_SESSION['openedArray'])));

-      echo (empty($opened) ? '' : 'modx.openedArray[' . implode("] = 1;\n		modx.openedArray[", $opened) . '] = 1;') . "\n";

+      echo (empty($opened) ? '' : 'modx.openedArray['.implode("] = 1;\n		modx.openedArray[", $opened).'] = 1;')."\n";

       ?>

     </script>

     <script src="media/style/<?= $modx->config['manager_theme'] ?>/js/modx.min.js?v=<?= $lastInstallTime ?>"></script>

@@ -327,7 +327,7 @@ 
                             <a href="javascript:;" class="dropdown-toggle" onclick="return false;">

                                 <span class="username"><?= $user['username'] ?></span>

                                 <?php if ($user['photo']) { ?>

-                                    <span class="icon photo" style="background-image: url(<?= MODX_SITE_URL . $user['photo'] ?>);"></span>

+                                    <span class="icon photo" style="background-image: url(<?= MODX_SITE_URL.$user['photo'] ?>);"></span>

                                 <?php } else { ?>

                                     <span class="icon"><?= $_style['menu_user'] ?></span>

                                 <?php } ?>

@@ -354,7 +354,7 @@ 
                                 $version = 'Evolution';

                                 ?>

                                 <?php

-                                echo sprintf('<li><span class="dropdown-item" title="%s &ndash; %s" %s>' . $version . ' %s</span></li>', $site_name, $modx->getVersionData('full_appname'), $style, $modx->config['settings_version']);

+                                echo sprintf('<li><span class="dropdown-item" title="%s &ndash; %s" %s>'.$version.' %s</span></li>', $site_name, $modx->getVersionData('full_appname'), $style, $modx->config['settings_version']);

                                 ?>

                             </ul>

                         </li>

@@ -535,7 +535,7 @@ 
     </div>

 

     <?php

-    if(!function_exists('constructLink')) {

+    if (!function_exists('constructLink')) {

         /**

          * @param string $action

          * @param string $img

@@ -544,7 +544,7 @@ 
          */

         function constructLink($action, $img, $text, $allowed)

         {

-            if ((bool)$allowed) {

+            if ((bool) $allowed) {

                 echo sprintf('<div class="menuLink" id="item%s" onclick="modx.tree.menuHandler(%s);">', $action,

                     $action);

                 echo sprintf('<i class="%s"></i> %s</div>', $img, $text);

@@ -557,7 +557,7 @@ 
     <script type="text/javascript">

 

       if (document.getElementById('treeMenu')) {

-          <?php if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin')) { ?>

+          <?php if ($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin')) { ?>

 

         document.getElementById('treeMenu_openelements').onclick = function(e) {

           e.preventDefault();

@@ -575,12 +575,12 @@ 
           }

         };

           <?php } ?>

-          <?php if($use_browser && $modx->hasPermission('assets_images')) { ?>

+          <?php if ($use_browser && $modx->hasPermission('assets_images')) { ?>

 

         document.getElementById('treeMenu_openimages').onclick = function(e) {

           e.preventDefault();

           if (modx.config.global_tabs && !e.shiftKey) {

-            modx.tabs({url: '<?= MODX_MANAGER_URL . 'media/browser/' . $which_browser . '/browse.php?filemanager=media/browser/' . $which_browser . '/browse.php&type=images' ?>', title: '<?= $_lang["images_management"] ?>'});

+            modx.tabs({url: '<?= MODX_MANAGER_URL.'media/browser/'.$which_browser.'/browse.php?filemanager=media/browser/'.$which_browser.'/browse.php&type=images' ?>', title: '<?= $_lang["images_management"] ?>'});

           } else {

             var randomNum = '<?= $_lang["files_files"] ?>';

             if (e.shiftKey) {

@@ -593,12 +593,12 @@ 
           }

         };

           <?php } ?>

-          <?php if($use_browser && $modx->hasPermission('assets_files')) { ?>

+          <?php if ($use_browser && $modx->hasPermission('assets_files')) { ?>

 

         document.getElementById('treeMenu_openfiles').onclick = function(e) {

           e.preventDefault();

           if (modx.config.global_tabs && !e.shiftKey) {

-            modx.tabs({url: '<?= MODX_MANAGER_URL . 'media/browser/' . $which_browser . '/browse.php?filemanager=media/browser/' . $which_browser . '/browse.php&type=files' ?>', title: '<?= $_lang["files_files"] ?>'});

+            modx.tabs({url: '<?= MODX_MANAGER_URL.'media/browser/'.$which_browser.'/browse.php?filemanager=media/browser/'.$which_browser.'/browse.php&type=files' ?>', title: '<?= $_lang["files_files"] ?>'});

           } else {

             var randomNum = '<?= $_lang["files_files"] ?>';

             if (e.shiftKey) {

@@ -652,7 +652,7 @@ 
 

 </div>

 <?php if ($modx->config['show_picker'] != "0") {

-    include('media/style/' . $modx->config['manager_theme'] . '/color.switcher.php');

+    include('media/style/'.$modx->config['manager_theme'].'/color.switcher.php');

 } ?>

 </body>

 </html>

Braces +32 added lines, -29 removed lines

@@ -1,5 +1,5 @@ 
 <?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.");

 }

 header("X-XSS-Protection: 0");

@@ -11,22 +11,22 @@ 
 

 $mxla = $modx_lang_attribute ? $modx_lang_attribute : 'en';

 

-if (!isset($modx->config['manager_menu_height'])) {

+if (!isset($modx->config['manager_menu_height'])) {
     $modx->config['manager_menu_height'] = 2.2; // rem

 }

 

-if (!isset($modx->config['manager_tree_width'])) {

+if (!isset($modx->config['manager_tree_width'])) {
     $modx->config['manager_tree_width'] = 20; // rem

 }

 

-if (isset($_SESSION['onLoginForwardToAction']) && is_int($_SESSION['onLoginForwardToAction'])) {

+if (isset($_SESSION['onLoginForwardToAction']) && is_int($_SESSION['onLoginForwardToAction'])) {
     $initMainframeAction = $_SESSION['onLoginForwardToAction'];

     unset($_SESSION['onLoginForwardToAction']);

-} else {

+} else {
     $initMainframeAction = 2; // welcome.static

 }

 

-if (!isset($_SESSION['tree_show_only_folders'])) {

+if (!isset($_SESSION['tree_show_only_folders'])) {
     $_SESSION['tree_show_only_folders'] = 0;

 }

 

@@ -35,29 +35,29 @@ 
 $tree_width = $modx->config['manager_tree_width'];

 $tree_min_width = 0;

 

-if (isset($_COOKIE['MODX_widthSideBar'])) {

+if (isset($_COOKIE['MODX_widthSideBar'])) {
     $MODX_widthSideBar = $_COOKIE['MODX_widthSideBar'];

-} else {

+} else {
     $MODX_widthSideBar = $tree_width;

 }

 

-if (!$MODX_widthSideBar) {

+if (!$MODX_widthSideBar) {
     $body_class .= 'sidebar-closed';

 }

 

 $theme_modes = array('', 'lightness', 'light', 'dark', 'darkness');

-if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {

+if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {
     $body_class .= ' ' . $theme_modes[$_COOKIE['MODX_themeMode']];

-} elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {

+} elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {
     $body_class .= ' ' . $theme_modes[$modx->config['manager_theme_mode']];

 }

 

 $navbar_position = $modx->config['manager_menu_position'];

-if ($navbar_position == 'left') {

+if ($navbar_position == 'left') {
     $body_class .= ' navbar-left navbar-left-icon-and-text';

 }

 

-if (isset($modx->pluginCache['ElementsInTree'])) {

+if (isset($modx->pluginCache['ElementsInTree'])) {
     $body_class .= ' ElementsInTree';

 }

 

@@ -73,19 +73,19 @@ 
     'type8' => $_lang["lock_element_type_8"]

 );

 

-foreach ($unlockTranslations as $key => $value) {

+foreach ($unlockTranslations as $key => $value) {
     $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);

 }

 

 $user = $modx->getUserInfo($modx->getLoginUserID());

-if ($user['which_browser'] == 'default') {

+if ($user['which_browser'] == 'default') {
     $user['which_browser'] = $modx->config['which_browser'];

 }

 

 $css = 'media/style/' . $modx->config['manager_theme'] . '/css/page.css?v=' . $lastInstallTime;

 

-if ($modx->config['manager_theme'] == 'default') {

-    if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css') && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {

+if ($modx->config['manager_theme'] == 'default') {
+    if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css') && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {
         require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php';

         $minifier = new Formatter\CSSMinify();

         $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css');

@@ -102,7 +102,7 @@ 
         $css = $minifier->minify();

         file_put_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css', $css);

     }

-    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {

+    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
         $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime;

     }

 }

@@ -257,7 +257,7 @@ 
     <?php

     // invoke OnManagerTopPrerender event

     $evtOut = $modx->invokeEvent('OnManagerTopPrerender', $_REQUEST);

-    if (is_array($evtOut)) {

+    if (is_array($evtOut)) {
         echo implode("\n", $evtOut);

     }

     ?>

@@ -428,11 +428,14 @@ 
             <div id="evo-tab-page-home" class="evo-tab-page show iframe-scroller">

                 <iframe id="mainframe" src="index.php?a=<?= $initMainframeAction ?>" scrolling="auto" frameborder="0" onload="modx.main.onload(event);"></iframe>

             </div>

-        <?php else: ?>

+        <?php else {
+    : ?>

             <div class="iframe-scroller">

                 <iframe id="mainframe" name="main" src="index.php?a=<?= $initMainframeAction ?>" scrolling="auto" frameborder="0" onload="modx.main.onload(event);"></iframe>

             </div>

-        <?php endif; ?>

+        <?php endif;
+}
+?>

         <script>

             if (/iPhone|iPad|iPod/i.test(navigator.userAgent)) {

                 document.getElementById('mainframe').setAttribute('scrolling', 'no');

@@ -451,11 +454,11 @@ 
             'tree_sortdir',

             'tree_nodename'

         );

-        foreach ($sortParams as $param) {

-            if (isset($_REQUEST[$param])) {

+        foreach ($sortParams as $param) {
+            if (isset($_REQUEST[$param])) {
                 $modx->manager->saveLastUserSetting($param, $_REQUEST[$param]);

                 $_SESSION[$param] = $_REQUEST[$param];

-            } else if (!isset($_SESSION[$param])) {

+            } else if (!isset($_SESSION[$param])) {
                 $_SESSION[$param] = $modx->manager->getLastUserSetting($param);

             }

         }

@@ -535,16 +538,16 @@ 
     </div>

 

     <?php

-    if(!function_exists('constructLink')) {

+    if(!function_exists('constructLink')) {
         /**

          * @param string $action

          * @param string $img

          * @param string $text

          * @param bool $allowed

          */

-        function constructLink($action, $img, $text, $allowed)

-        {

-            if ((bool)$allowed) {

+        function constructLink($action, $img, $text, $allowed)
+        {
+            if ((bool)$allowed) {
                 echo sprintf('<div class="menuLink" id="item%s" onclick="modx.tree.menuHandler(%s);">', $action,

                     $action);

                 echo sprintf('<i class="%s"></i> %s</div>', $img, $text);

@@ -651,7 +654,7 @@ 
     ?>

 

 </div>

-<?php if ($modx->config['show_picker'] != "0") {

+<?php if ($modx->config['show_picker'] != "0") {
     include('media/style/' . $modx->config['manager_theme'] . '/color.switcher.php');

 } ?>

 </body>

manager/frames/mainmenu.php

Braces +35 added lines, -33 removed lines

@@ -32,7 +32,7 @@ 
 	'active'

 );

 

-if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {

+if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {
 	$sitemenu['elements'] = array(

 		'elements',

 		'main',

@@ -48,7 +48,7 @@ 
 	);

 }

 

-if($modx->hasPermission('exec_module')) {

+if($modx->hasPermission('exec_module')) {
 	$sitemenu['modules'] = array(

 		'modules',

 		'main',

@@ -64,7 +64,7 @@ 
 	);

 }

 

-if($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {

+if($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {
 	$sitemenu['users'] = array(

 		'users',

 		'main',

@@ -80,7 +80,7 @@ 
 	);

 }

 

-if($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {

+if($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {
 	$sitemenu['tools'] = array(

 		'tools',

 		'main',

@@ -97,7 +97,7 @@ 
 }

 

 $tab = 0;

-if($modx->hasPermission('edit_template')) {

+if($modx->hasPermission('edit_template')) {
 	$sitemenu['element_templates'] = array(

 		'element_templates',

 		'elements',

@@ -112,7 +112,7 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {

+if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
 	$sitemenu['element_tplvars'] = array(

 		'element_tplvars',

 		'elements',

@@ -127,7 +127,7 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_chunk')) {

+if($modx->hasPermission('edit_chunk')) {
 	$sitemenu['element_htmlsnippets'] = array(

 		'element_htmlsnippets',

 		'elements',

@@ -142,7 +142,7 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_snippet')) {

+if($modx->hasPermission('edit_snippet')) {
 	$sitemenu['element_snippets'] = array(

 		'element_snippets',

 		'elements',

@@ -157,7 +157,7 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_plugin')) {

+if($modx->hasPermission('edit_plugin')) {
 	$sitemenu['element_plugins'] = array(

 		'element_plugins',

 		'elements',

@@ -174,7 +174,7 @@ 
 }

 //$sitemenu['element_categories']     = array('element_categories','elements',$_lang['element_categories'],'index.php?a=76&tab=5',$_lang['element_categories'],'','new_template,edit_template,new_snippet,edit_snippet,new_chunk,edit_chunk,new_plugin,edit_plugin','main',1,60,'');

 

-if($modx->hasPermission('file_manager')) {

+if($modx->hasPermission('file_manager')) {
 	$sitemenu['manage_files'] = array(

 		'manage_files',

 		'elements',

@@ -189,7 +189,7 @@ 
 		''

 	);

 }

-if($modx->hasPermission('category_manager')) {

+if($modx->hasPermission('category_manager')) {
 	$sitemenu['manage_categories'] = array(

 		'manage_categories',

 		'elements',

@@ -206,7 +206,7 @@ 
 }

 

 // Modules Menu Items

-if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {

+if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {
 	$sitemenu['new_module'] = array(

 		'new_module',

 		'modules',

@@ -222,19 +222,19 @@ 
 	);

 }

 

-if($modx->hasPermission('exec_module')) {

-	if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {

+if($modx->hasPermission('exec_module')) {
+	if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
 		$rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member

 				FROM ' . $modx->getFullTableName('site_modules') . ' AS sm

 				LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id

 				LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group

                 WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1

                 ORDER BY sm.name');

-	} else {

+	} else {
 		$rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');

 	}

-	if($modx->db->getRecordCount($rs)) {

-	    while ($row = $modx->db->getRow($rs)) {

+	if($modx->db->getRecordCount($rs)) {
+	    while ($row = $modx->db->getRow($rs)) {
             $sitemenu['module' . $row['id']] = array(

                 'module' . $row['id'],

                 'modules',

@@ -254,7 +254,7 @@ 
 

 // security menu items (users)

 

-if($modx->hasPermission('edit_user')) {

+if($modx->hasPermission('edit_user')) {
 	$sitemenu['user_management_title'] = array(

 		'user_management_title',

 		'users',

@@ -270,7 +270,7 @@ 
 	);

 }

 

-if($modx->hasPermission('edit_web_user')) {

+if($modx->hasPermission('edit_web_user')) {
 	$sitemenu['web_user_management_title'] = array(

 		'web_user_management_title',

 		'users',

@@ -286,7 +286,7 @@ 
 	);

 }

 

-if($modx->hasPermission('edit_role')) {

+if($modx->hasPermission('edit_role')) {
 	$sitemenu['role_management_title'] = array(

 		'role_management_title',

 		'users',

@@ -302,7 +302,7 @@ 
 	);

 }

 

-if($modx->hasPermission('access_permissions')) {

+if($modx->hasPermission('access_permissions')) {
 	$sitemenu['manager_permissions'] = array(

 		'manager_permissions',

 		'users',

@@ -318,7 +318,7 @@ 
 	);

 }

 

-if($modx->hasPermission('web_access_permissions')) {

+if($modx->hasPermission('web_access_permissions')) {
 	$sitemenu['web_permissions'] = array(

 		'web_permissions',

 		'users',

@@ -374,7 +374,7 @@ 
 	''

 );

 

-if($modx->hasPermission('bk_manager')) {

+if($modx->hasPermission('bk_manager')) {
 	$sitemenu['bk_manager'] = array(

 		'bk_manager',

 		'tools',

@@ -390,7 +390,7 @@ 
 	);

 }

 

-if($modx->hasPermission('remove_locks')) {

+if($modx->hasPermission('remove_locks')) {
 	$sitemenu['remove_locks'] = array(

 		'remove_locks',

 		'tools',

@@ -406,7 +406,7 @@ 
 	);

 }

 

-if($modx->hasPermission('import_static')) {

+if($modx->hasPermission('import_static')) {
 	$sitemenu['import_site'] = array(

 		'import_site',

 		'tools',

@@ -422,7 +422,7 @@ 
 	);

 }

 

-if($modx->hasPermission('export_static')) {

+if($modx->hasPermission('export_static')) {
 	$sitemenu['export_site'] = array(

 		'export_site',

 		'tools',

@@ -439,19 +439,21 @@ 
 }

 

 $menu = $modx->invokeEvent("OnManagerMenuPrerender", array('menu' => $sitemenu));

-if(is_array($menu)) {

+if(is_array($menu)) {
 	$newmenu = array();

-	foreach($menu as $item){

-		if(is_array(unserialize($item))){

+	foreach($menu as $item) {
+		if(is_array(unserialize($item))) {
 			$newmenu = array_merge($newmenu, unserialize($item));

 		}

 	}

-	if(count($newmenu)> 0) $sitemenu = $newmenu;

-}

+	if(count($newmenu)> 0) {
+	    $sitemenu = $newmenu;
+	}
+	}

 

-if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {

+if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {
 	include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php');

-} else {

+} else {
 	include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php');

 }

 $menu = new EVOmenu();

Indentation +325 added lines, -325 removed lines

@@ -4,237 +4,237 @@ 
 */

 

 $sitemenu['bars'] = array(

-	'bars',

-	'main',

-	'<i class="fa fa-bars"></i>',

-	'javascript:;',

-	$_lang['home'],

-	'modx.resizer.toggle(); return false;',

-	' return false;',

-	'',

-	0,

-	10,

-	''

+    'bars',

+    'main',

+    '<i class="fa fa-bars"></i>',

+    'javascript:;',

+    $_lang['home'],

+    'modx.resizer.toggle(); return false;',

+    ' return false;',

+    '',

+    0,

+    10,

+    ''

 );

 

 //mainMenu

 $sitemenu['site'] = array(

-	'site',

-	'main',

-	'<i class="fa fa-tachometer"></i><span class="menu-item-text">' . $_lang['home'] . '</span>',

-	'index.php?a=2',

-	$_lang['home'],

-	'',

-	'',

-	'main',

-	0,

-	10,

-	'active'

+    'site',

+    'main',

+    '<i class="fa fa-tachometer"></i><span class="menu-item-text">' . $_lang['home'] . '</span>',

+    'index.php?a=2',

+    $_lang['home'],

+    '',

+    '',

+    'main',

+    0,

+    10,

+    'active'

 );

 

 if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {

-	$sitemenu['elements'] = array(

-		'elements',

-		'main',

-		'<i class="fa fa-th"></i><span class="menu-item-text">' . $_lang['elements'] . '</span>',

-		'javascript:;',

-		$_lang['elements'],

-		' return false;',

-		'',

-		'',

-		0,

-		20,

-		''

-	);

+    $sitemenu['elements'] = array(

+        'elements',

+        'main',

+        '<i class="fa fa-th"></i><span class="menu-item-text">' . $_lang['elements'] . '</span>',

+        'javascript:;',

+        $_lang['elements'],

+        ' return false;',

+        '',

+        '',

+        0,

+        20,

+        ''

+    );

 }

 

 if($modx->hasPermission('exec_module')) {

-	$sitemenu['modules'] = array(

-		'modules',

-		'main',

-		'<i class="'.$_style['icons_modules'] .'"></i><span class="menu-item-text">' . $_lang['modules'] . '</span>',

-		'javascript:;',

-		$_lang['modules'],

-		' return false;',

-		'',

-		'',

-		0,

-		30,

-		''

-	);

+    $sitemenu['modules'] = array(

+        'modules',

+        'main',

+        '<i class="'.$_style['icons_modules'] .'"></i><span class="menu-item-text">' . $_lang['modules'] . '</span>',

+        'javascript:;',

+        $_lang['modules'],

+        ' return false;',

+        '',

+        '',

+        0,

+        30,

+        ''

+    );

 }

 

 if($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {

-	$sitemenu['users'] = array(

-		'users',

-		'main',

-		'<i class="fa fa-users"></i><span class="menu-item-text">' . $_lang['users'] . '</span>',

-		'javascript:;',

-		$_lang['users'],

-		' return false;',

-		'edit_user',

-		'',

-		0,

-		40,

-		''

-	);

+    $sitemenu['users'] = array(

+        'users',

+        'main',

+        '<i class="fa fa-users"></i><span class="menu-item-text">' . $_lang['users'] . '</span>',

+        'javascript:;',

+        $_lang['users'],

+        ' return false;',

+        'edit_user',

+        '',

+        0,

+        40,

+        ''

+    );

 }

 

 if($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {

-	$sitemenu['tools'] = array(

-		'tools',

-		'main',

-		'<i class="fa fa-wrench"></i><span class="menu-item-text">' . $_lang['tools'] . '</span>',

-		'javascript:;',

-		$_lang['tools'],

-		' return false;',

-		'',

-		'',

-		0,

-		50,

-		''

-	);

+    $sitemenu['tools'] = array(

+        'tools',

+        'main',

+        '<i class="fa fa-wrench"></i><span class="menu-item-text">' . $_lang['tools'] . '</span>',

+        'javascript:;',

+        $_lang['tools'],

+        ' return false;',

+        '',

+        '',

+        0,

+        50,

+        ''

+    );

 }

 

 $tab = 0;

 if($modx->hasPermission('edit_template')) {

-	$sitemenu['element_templates'] = array(

-		'element_templates',

-		'elements',

-		'<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=76&tab=' . $tab++,

-		$_lang['manage_templates'],

-		'',

-		'new_template,edit_template',

-		'main',

-		0,

-		10,

-		'dropdown-toggle'

-	);

+    $sitemenu['element_templates'] = array(

+        'element_templates',

+        'elements',

+        '<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=76&tab=' . $tab++,

+        $_lang['manage_templates'],

+        '',

+        'new_template,edit_template',

+        'main',

+        0,

+        10,

+        'dropdown-toggle'

+    );

 }

 if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {

-	$sitemenu['element_tplvars'] = array(

-		'element_tplvars',

-		'elements',

-		'<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=76&tab=' . $tab++,

-		$_lang['tmplvars'],

-		'',

-		'new_template,edit_template',

-		'main',

-		0,

-		20,

-		'dropdown-toggle'

-	);

+    $sitemenu['element_tplvars'] = array(

+        'element_tplvars',

+        'elements',

+        '<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=76&tab=' . $tab++,

+        $_lang['tmplvars'],

+        '',

+        'new_template,edit_template',

+        'main',

+        0,

+        20,

+        'dropdown-toggle'

+    );

 }

 if($modx->hasPermission('edit_chunk')) {

-	$sitemenu['element_htmlsnippets'] = array(

-		'element_htmlsnippets',

-		'elements',

-		'<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=76&tab=' . $tab++,

-		$_lang['manage_htmlsnippets'],

-		'',

-		'new_chunk,edit_chunk',

-		'main',

-		0,

-		30,

-		'dropdown-toggle'

-	);

+    $sitemenu['element_htmlsnippets'] = array(

+        'element_htmlsnippets',

+        'elements',

+        '<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=76&tab=' . $tab++,

+        $_lang['manage_htmlsnippets'],

+        '',

+        'new_chunk,edit_chunk',

+        'main',

+        0,

+        30,

+        'dropdown-toggle'

+    );

 }

 if($modx->hasPermission('edit_snippet')) {

-	$sitemenu['element_snippets'] = array(

-		'element_snippets',

-		'elements',

-		'<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=76&tab=' . $tab++,

-		$_lang['manage_snippets'],

-		'',

-		'new_snippet,edit_snippet',

-		'main',

-		0,

-		40,

-		'dropdown-toggle'

-	);

+    $sitemenu['element_snippets'] = array(

+        'element_snippets',

+        'elements',

+        '<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=76&tab=' . $tab++,

+        $_lang['manage_snippets'],

+        '',

+        'new_snippet,edit_snippet',

+        'main',

+        0,

+        40,

+        'dropdown-toggle'

+    );

 }

 if($modx->hasPermission('edit_plugin')) {

-	$sitemenu['element_plugins'] = array(

-		'element_plugins',

-		'elements',

-		'<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=76&tab=' . $tab++,

-		$_lang['manage_plugins'],

-		'',

-		'new_plugin,edit_plugin',

-		'main',

-		0,

-		50,

-		'dropdown-toggle'

-	);

+    $sitemenu['element_plugins'] = array(

+        'element_plugins',

+        'elements',

+        '<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=76&tab=' . $tab++,

+        $_lang['manage_plugins'],

+        '',

+        'new_plugin,edit_plugin',

+        'main',

+        0,

+        50,

+        'dropdown-toggle'

+    );

 }

 //$sitemenu['element_categories']     = array('element_categories','elements',$_lang['element_categories'],'index.php?a=76&tab=5',$_lang['element_categories'],'','new_template,edit_template,new_snippet,edit_snippet,new_chunk,edit_chunk,new_plugin,edit_plugin','main',1,60,'');

 

 if($modx->hasPermission('file_manager')) {

-	$sitemenu['manage_files'] = array(

-		'manage_files',

-		'elements',

-		'<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'],

-		'index.php?a=31',

-		$_lang['manage_files'],

-		'',

-		'file_manager',

-		'main',

-		0,

-		80,

-		''

-	);

+    $sitemenu['manage_files'] = array(

+        'manage_files',

+        'elements',

+        '<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'],

+        'index.php?a=31',

+        $_lang['manage_files'],

+        '',

+        'file_manager',

+        'main',

+        0,

+        80,

+        ''

+    );

 }

 if($modx->hasPermission('category_manager')) {

-	$sitemenu['manage_categories'] = array(

-		'manage_categories',

-		'elements',

-		'<i class="fa fa-object-group"></i>' . $_lang['manage_categories'],

-		'index.php?a=120',

-		$_lang['manage_categories'],

-		'',

-		'category_manager',

-		'main',

-		0,

-		70,

-		''

-	);

+    $sitemenu['manage_categories'] = array(

+        'manage_categories',

+        'elements',

+        '<i class="fa fa-object-group"></i>' . $_lang['manage_categories'],

+        'index.php?a=120',

+        $_lang['manage_categories'],

+        '',

+        'category_manager',

+        'main',

+        0,

+        70,

+        ''

+    );

 }

 

 // Modules Menu Items

 if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {

-	$sitemenu['new_module'] = array(

-		'new_module',

-		'modules',

-		'<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'],

-		'index.php?a=106',

-		$_lang['module_management'],

-		'',

-		'new_module,edit_module',

-		'main',

-		1,

-		0,

-		''

-	);

+    $sitemenu['new_module'] = array(

+        'new_module',

+        'modules',

+        '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'],

+        'index.php?a=106',

+        $_lang['module_management'],

+        '',

+        'new_module,edit_module',

+        'main',

+        1,

+        0,

+        ''

+    );

 }

 

 if($modx->hasPermission('exec_module')) {

-	if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {

-		$rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member

+    if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {

+        $rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member

 				FROM ' . $modx->getFullTableName('site_modules') . ' AS sm

 				LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id

 				LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group

                 WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1

                 ORDER BY sm.name');

-	} else {

-		$rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');

-	}

-	if($modx->db->getRecordCount($rs)) {

-	    while ($row = $modx->db->getRow($rs)) {

+    } else {

+        $rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');

+    }

+    if($modx->db->getRecordCount($rs)) {

+        while ($row = $modx->db->getRow($rs)) {

             $sitemenu['module' . $row['id']] = array(

                 'module' . $row['id'],

                 'modules',

@@ -255,83 +255,83 @@ 
 // security menu items (users)

 

 if($modx->hasPermission('edit_user')) {

-	$sitemenu['user_management_title'] = array(

-		'user_management_title',

-		'users',

-		'<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=75',

-		$_lang['user_management_title'],

-		'',

-		'edit_user',

-		'main',

-		0,

-		10,

-		'dropdown-toggle'

-	);

+    $sitemenu['user_management_title'] = array(

+        'user_management_title',

+        'users',

+        '<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=75',

+        $_lang['user_management_title'],

+        '',

+        'edit_user',

+        'main',

+        0,

+        10,

+        'dropdown-toggle'

+    );

 }

 

 if($modx->hasPermission('edit_web_user')) {

-	$sitemenu['web_user_management_title'] = array(

-		'web_user_management_title',

-		'users',

-		'<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=99',

-		$_lang['web_user_management_title'],

-		'',

-		'edit_web_user',

-		'main',

-		0,

-		20,

-		'dropdown-toggle'

-	);

+    $sitemenu['web_user_management_title'] = array(

+        'web_user_management_title',

+        'users',

+        '<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=99',

+        $_lang['web_user_management_title'],

+        '',

+        'edit_web_user',

+        'main',

+        0,

+        20,

+        'dropdown-toggle'

+    );

 }

 

 if($modx->hasPermission('edit_role')) {

-	$sitemenu['role_management_title'] = array(

-		'role_management_title',

-		'users',

-		'<i class="fa fa-legal"></i>' . $_lang['role_management_title'],

-		'index.php?a=86',

-		$_lang['role_management_title'],

-		'',

-		'new_role,edit_role,delete_role',

-		'main',

-		0,

-		30,

-		''

-	);

+    $sitemenu['role_management_title'] = array(

+        'role_management_title',

+        'users',

+        '<i class="fa fa-legal"></i>' . $_lang['role_management_title'],

+        'index.php?a=86',

+        $_lang['role_management_title'],

+        '',

+        'new_role,edit_role,delete_role',

+        'main',

+        0,

+        30,

+        ''

+    );

 }

 

 if($modx->hasPermission('access_permissions')) {

-	$sitemenu['manager_permissions'] = array(

-		'manager_permissions',

-		'users',

-		'<i class="fa fa-male"></i>' . $_lang['manager_permissions'],

-		'index.php?a=40',

-		$_lang['manager_permissions'],

-		'',

-		'access_permissions',

-		'main',

-		0,

-		40,

-		''

-	);

+    $sitemenu['manager_permissions'] = array(

+        'manager_permissions',

+        'users',

+        '<i class="fa fa-male"></i>' . $_lang['manager_permissions'],

+        'index.php?a=40',

+        $_lang['manager_permissions'],

+        '',

+        'access_permissions',

+        'main',

+        0,

+        40,

+        ''

+    );

 }

 

 if($modx->hasPermission('web_access_permissions')) {

-	$sitemenu['web_permissions'] = array(

-		'web_permissions',

-		'users',

-		'<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'],

-		'index.php?a=91',

-		$_lang['web_permissions'],

-		'',

-		'web_access_permissions',

-		'main',

-		0,

-		50,

-		''

-	);

+    $sitemenu['web_permissions'] = array(

+        'web_permissions',

+        'users',

+        '<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'],

+        'index.php?a=91',

+        $_lang['web_permissions'],

+        '',

+        'web_access_permissions',

+        'main',

+        0,

+        50,

+        ''

+    );

 }

 

 // Tools Menu

@@ -361,104 +361,104 @@ 
 );

 

 $sitemenu['search'] = array(

-	'search',

-	'tools',

-	'<i class="fa fa-search"></i>' . $_lang['search'],

-	'index.php?a=71',

-	$_lang['search'],

-	'',

-	'',

-	'main',

-	1,

-	9,

-	''

+    'search',

+    'tools',

+    '<i class="fa fa-search"></i>' . $_lang['search'],

+    'index.php?a=71',

+    $_lang['search'],

+    '',

+    '',

+    'main',

+    1,

+    9,

+    ''

 );

 

 if($modx->hasPermission('bk_manager')) {

-	$sitemenu['bk_manager'] = array(

-		'bk_manager',

-		'tools',

-		'<i class="fa fa-database"></i>' . $_lang['bk_manager'],

-		'index.php?a=93',

-		$_lang['bk_manager'],

-		'',

-		'bk_manager',

-		'main',

-		0,

-		10,

-		''

-	);

+    $sitemenu['bk_manager'] = array(

+        'bk_manager',

+        'tools',

+        '<i class="fa fa-database"></i>' . $_lang['bk_manager'],

+        'index.php?a=93',

+        $_lang['bk_manager'],

+        '',

+        'bk_manager',

+        'main',

+        0,

+        10,

+        ''

+    );

 }

 

 if($modx->hasPermission('remove_locks')) {

-	$sitemenu['remove_locks'] = array(

-		'remove_locks',

-		'tools',

-		'<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'],

-		'javascript:modx.removeLocks();',

-		$_lang['remove_locks'],

-		'',

-		'remove_locks',

-		'',

-		0,

-		20,

-		''

-	);

+    $sitemenu['remove_locks'] = array(

+        'remove_locks',

+        'tools',

+        '<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'],

+        'javascript:modx.removeLocks();',

+        $_lang['remove_locks'],

+        '',

+        'remove_locks',

+        '',

+        0,

+        20,

+        ''

+    );

 }

 

 if($modx->hasPermission('import_static')) {

-	$sitemenu['import_site'] = array(

-		'import_site',

-		'tools',

-		'<i class="fa fa-upload"></i>' . $_lang['import_site'],

-		'index.php?a=95',

-		$_lang['import_site'],

-		'',

-		'import_static',

-		'main',

-		0,

-		30,

-		''

-	);

+    $sitemenu['import_site'] = array(

+        'import_site',

+        'tools',

+        '<i class="fa fa-upload"></i>' . $_lang['import_site'],

+        'index.php?a=95',

+        $_lang['import_site'],

+        '',

+        'import_static',

+        'main',

+        0,

+        30,

+        ''

+    );

 }

 

 if($modx->hasPermission('export_static')) {

-	$sitemenu['export_site'] = array(

-		'export_site',

-		'tools',

-		'<i class="fa fa-download"></i>' . $_lang['export_site'],

-		'index.php?a=83',

-		$_lang['export_site'],

-		'',

-		'export_static',

-		'main',

-		1,

-		40,

-		''

-	);

+    $sitemenu['export_site'] = array(

+        'export_site',

+        'tools',

+        '<i class="fa fa-download"></i>' . $_lang['export_site'],

+        'index.php?a=83',

+        $_lang['export_site'],

+        '',

+        'export_static',

+        'main',

+        1,

+        40,

+        ''

+    );

 }

 

 $menu = $modx->invokeEvent("OnManagerMenuPrerender", array('menu' => $sitemenu));

 if(is_array($menu)) {

-	$newmenu = array();

-	foreach($menu as $item){

-		if(is_array(unserialize($item))){

-			$newmenu = array_merge($newmenu, unserialize($item));

-		}

-	}

-	if(count($newmenu)> 0) $sitemenu = $newmenu;

+    $newmenu = array();

+    foreach($menu as $item){

+        if(is_array(unserialize($item))){

+            $newmenu = array_merge($newmenu, unserialize($item));

+        }

+    }

+    if(count($newmenu)> 0) $sitemenu = $newmenu;

 }

 

 if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {

-	include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php');

+    include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php');

 } else {

-	include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php');

+    include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php');

 }

 $menu = new EVOmenu();

 $menu->Build($sitemenu, array(

-	'outerClass' => 'nav',

-	'innerClass' => 'dropdown-menu',

-	'parentClass' => 'dropdown',

+    'outerClass' => 'nav',

+    'innerClass' => 'dropdown-menu',

+    'parentClass' => 'dropdown',

     'parentLinkClass' => 'dropdown-toggle',

     'parentLinkAttr' => '',

     'parentLinkIn' => ''

Spacing +69 added lines, -69 removed lines

@@ -21,7 +21,7 @@ 
 $sitemenu['site'] = array(

 	'site',

 	'main',

-	'<i class="fa fa-tachometer"></i><span class="menu-item-text">' . $_lang['home'] . '</span>',

+	'<i class="fa fa-tachometer"></i><span class="menu-item-text">'.$_lang['home'].'</span>',

 	'index.php?a=2',

 	$_lang['home'],

 	'',

@@ -32,11 +32,11 @@ 
 	'active'

 );

 

-if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {

+if ($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {

 	$sitemenu['elements'] = array(

 		'elements',

 		'main',

-		'<i class="fa fa-th"></i><span class="menu-item-text">' . $_lang['elements'] . '</span>',

+		'<i class="fa fa-th"></i><span class="menu-item-text">'.$_lang['elements'].'</span>',

 		'javascript:;',

 		$_lang['elements'],

 		' return false;',

@@ -48,11 +48,11 @@ 
 	);

 }

 

-if($modx->hasPermission('exec_module')) {

+if ($modx->hasPermission('exec_module')) {

 	$sitemenu['modules'] = array(

 		'modules',

 		'main',

-		'<i class="'.$_style['icons_modules'] .'"></i><span class="menu-item-text">' . $_lang['modules'] . '</span>',

+		'<i class="'.$_style['icons_modules'].'"></i><span class="menu-item-text">'.$_lang['modules'].'</span>',

 		'javascript:;',

 		$_lang['modules'],

 		' return false;',

@@ -64,11 +64,11 @@ 
 	);

 }

 

-if($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {

+if ($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {

 	$sitemenu['users'] = array(

 		'users',

 		'main',

-		'<i class="fa fa-users"></i><span class="menu-item-text">' . $_lang['users'] . '</span>',

+		'<i class="fa fa-users"></i><span class="menu-item-text">'.$_lang['users'].'</span>',

 		'javascript:;',

 		$_lang['users'],

 		' return false;',

@@ -80,11 +80,11 @@ 
 	);

 }

 

-if($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {

+if ($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {

 	$sitemenu['tools'] = array(

 		'tools',

 		'main',

-		'<i class="fa fa-wrench"></i><span class="menu-item-text">' . $_lang['tools'] . '</span>',

+		'<i class="fa fa-wrench"></i><span class="menu-item-text">'.$_lang['tools'].'</span>',

 		'javascript:;',

 		$_lang['tools'],

 		' return false;',

@@ -97,12 +97,12 @@ 
 }

 

 $tab = 0;

-if($modx->hasPermission('edit_template')) {

+if ($modx->hasPermission('edit_template')) {

 	$sitemenu['element_templates'] = array(

 		'element_templates',

 		'elements',

-		'<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=76&tab=' . $tab++,

+		'<i class="fa fa-newspaper-o"></i>'.$_lang['manage_templates'].'<i class="fa fa-angle-right toggle"></i>',

+		'index.php?a=76&tab='.$tab++,

 		$_lang['manage_templates'],

 		'',

 		'new_template,edit_template',

@@ -112,12 +112,12 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {

+if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {

 	$sitemenu['element_tplvars'] = array(

 		'element_tplvars',

 		'elements',

-		'<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=76&tab=' . $tab++,

+		'<i class="fa fa-list-alt"></i>'.$_lang['tmplvars'].'<i class="fa fa-angle-right toggle"></i>',

+		'index.php?a=76&tab='.$tab++,

 		$_lang['tmplvars'],

 		'',

 		'new_template,edit_template',

@@ -127,12 +127,12 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_chunk')) {

+if ($modx->hasPermission('edit_chunk')) {

 	$sitemenu['element_htmlsnippets'] = array(

 		'element_htmlsnippets',

 		'elements',

-		'<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=76&tab=' . $tab++,

+		'<i class="fa fa-th-large"></i>'.$_lang['manage_htmlsnippets'].'<i class="fa fa-angle-right toggle"></i>',

+		'index.php?a=76&tab='.$tab++,

 		$_lang['manage_htmlsnippets'],

 		'',

 		'new_chunk,edit_chunk',

@@ -142,12 +142,12 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_snippet')) {

+if ($modx->hasPermission('edit_snippet')) {

 	$sitemenu['element_snippets'] = array(

 		'element_snippets',

 		'elements',

-		'<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=76&tab=' . $tab++,

+		'<i class="fa fa-code"></i>'.$_lang['manage_snippets'].'<i class="fa fa-angle-right toggle"></i>',

+		'index.php?a=76&tab='.$tab++,

 		$_lang['manage_snippets'],

 		'',

 		'new_snippet,edit_snippet',

@@ -157,12 +157,12 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_plugin')) {

+if ($modx->hasPermission('edit_plugin')) {

 	$sitemenu['element_plugins'] = array(

 		'element_plugins',

 		'elements',

-		'<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=76&tab=' . $tab++,

+		'<i class="fa fa-plug"></i>'.$_lang['manage_plugins'].'<i class="fa fa-angle-right toggle"></i>',

+		'index.php?a=76&tab='.$tab++,

 		$_lang['manage_plugins'],

 		'',

 		'new_plugin,edit_plugin',

@@ -174,11 +174,11 @@ 
 }

 //$sitemenu['element_categories']     = array('element_categories','elements',$_lang['element_categories'],'index.php?a=76&tab=5',$_lang['element_categories'],'','new_template,edit_template,new_snippet,edit_snippet,new_chunk,edit_chunk,new_plugin,edit_plugin','main',1,60,'');

 

-if($modx->hasPermission('file_manager')) {

+if ($modx->hasPermission('file_manager')) {

 	$sitemenu['manage_files'] = array(

 		'manage_files',

 		'elements',

-		'<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'],

+		'<i class="fa fa-folder-open-o"></i>'.$_lang['manage_files'],

 		'index.php?a=31',

 		$_lang['manage_files'],

 		'',

@@ -189,11 +189,11 @@ 
 		''

 	);

 }

-if($modx->hasPermission('category_manager')) {

+if ($modx->hasPermission('category_manager')) {

 	$sitemenu['manage_categories'] = array(

 		'manage_categories',

 		'elements',

-		'<i class="fa fa-object-group"></i>' . $_lang['manage_categories'],

+		'<i class="fa fa-object-group"></i>'.$_lang['manage_categories'],

 		'index.php?a=120',

 		$_lang['manage_categories'],

 		'',

@@ -206,11 +206,11 @@ 
 }

 

 // Modules Menu Items

-if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {

+if ($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {

 	$sitemenu['new_module'] = array(

 		'new_module',

 		'modules',

-		'<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'],

+		'<i class="'.$_style['icons_modules'].'"></i>'.$_lang['module_management'],

 		'index.php?a=106',

 		$_lang['module_management'],

 		'',

@@ -222,24 +222,24 @@ 
 	);

 }

 

-if($modx->hasPermission('exec_module')) {

-	if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {

+if ($modx->hasPermission('exec_module')) {

+	if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {

 		$rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member

-				FROM ' . $modx->getFullTableName('site_modules') . ' AS sm

-				LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id

-				LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group

-                WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1

+				FROM ' . $modx->getFullTableName('site_modules').' AS sm

+				LEFT JOIN ' . $modx->getFullTableName('site_module_access').' AS sma ON sma.module = sm.id

+				LEFT JOIN ' . $modx->getFullTableName('member_groups').' AS mg ON sma.usergroup = mg.user_group

+                WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID().') AND sm.disabled != 1 AND sm.locked != 1

                 ORDER BY sm.name');

 	} else {

 		$rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');

 	}

-	if($modx->db->getRecordCount($rs)) {

+	if ($modx->db->getRecordCount($rs)) {

 	    while ($row = $modx->db->getRow($rs)) {

-            $sitemenu['module' . $row['id']] = array(

-                'module' . $row['id'],

+            $sitemenu['module'.$row['id']] = array(

+                'module'.$row['id'],

                 'modules',

-                ($row['icon'] != '' ? '<i class="'.$row['icon'].'"></i>' : '<i class="'.$_style['icons_module'].'"></i>') . $row['name'],

-                'index.php?a=112&id=' . $row['id'],

+                ($row['icon'] != '' ? '<i class="'.$row['icon'].'"></i>' : '<i class="'.$_style['icons_module'].'"></i>').$row['name'],

+                'index.php?a=112&id='.$row['id'],

                 $row['name'],

                 '',

                 '',

@@ -254,11 +254,11 @@ 
 

 // security menu items (users)

 

-if($modx->hasPermission('edit_user')) {

+if ($modx->hasPermission('edit_user')) {

 	$sitemenu['user_management_title'] = array(

 		'user_management_title',

 		'users',

-		'<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',

+		'<i class="fa fa fa-user"></i>'.$_lang['user_management_title'].'<i class="fa fa-angle-right toggle"></i>',

 		'index.php?a=75',

 		$_lang['user_management_title'],

 		'',

@@ -270,11 +270,11 @@ 
 	);

 }

 

-if($modx->hasPermission('edit_web_user')) {

+if ($modx->hasPermission('edit_web_user')) {

 	$sitemenu['web_user_management_title'] = array(

 		'web_user_management_title',

 		'users',

-		'<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',

+		'<i class="fa fa-users"></i>'.$_lang['web_user_management_title'].'<i class="fa fa-angle-right toggle"></i>',

 		'index.php?a=99',

 		$_lang['web_user_management_title'],

 		'',

@@ -286,11 +286,11 @@ 
 	);

 }

 

-if($modx->hasPermission('edit_role')) {

+if ($modx->hasPermission('edit_role')) {

 	$sitemenu['role_management_title'] = array(

 		'role_management_title',

 		'users',

-		'<i class="fa fa-legal"></i>' . $_lang['role_management_title'],

+		'<i class="fa fa-legal"></i>'.$_lang['role_management_title'],

 		'index.php?a=86',

 		$_lang['role_management_title'],

 		'',

@@ -302,11 +302,11 @@ 
 	);

 }

 

-if($modx->hasPermission('access_permissions')) {

+if ($modx->hasPermission('access_permissions')) {

 	$sitemenu['manager_permissions'] = array(

 		'manager_permissions',

 		'users',

-		'<i class="fa fa-male"></i>' . $_lang['manager_permissions'],

+		'<i class="fa fa-male"></i>'.$_lang['manager_permissions'],

 		'index.php?a=40',

 		$_lang['manager_permissions'],

 		'',

@@ -318,11 +318,11 @@ 
 	);

 }

 

-if($modx->hasPermission('web_access_permissions')) {

+if ($modx->hasPermission('web_access_permissions')) {

 	$sitemenu['web_permissions'] = array(

 		'web_permissions',

 		'users',

-		'<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'],

+		'<i class="fa fa-universal-access"></i>'.$_lang['web_permissions'],

 		'index.php?a=91',

 		$_lang['web_permissions'],

 		'',

@@ -339,7 +339,7 @@ 
 $sitemenu['refresh_site'] = array(

     'refresh_site',

     'tools',

-    '<i class="fa fa-recycle"></i>' . $_lang['refresh_site'],

+    '<i class="fa fa-recycle"></i>'.$_lang['refresh_site'],

     'index.php?a=26',

     $_lang['refresh_site'],

     '',

@@ -353,7 +353,7 @@ 
             'a', // tag

             'javascript:;', // href

             'btn btn-secondary', // class or btn-success

-            'modx.popup({url:\'index.php?a=26\', title:\'' . $_lang['refresh_site'] . '\', icon: \'fa-recycle\', iframe: \'ajax\', selector: \'.tab-page>.container\', position: \'right top\', width: \'auto\', maxheight: \'50%\', wrap: \'body\' })', // onclick

+            'modx.popup({url:\'index.php?a=26\', title:\''.$_lang['refresh_site'].'\', icon: \'fa-recycle\', iframe: \'ajax\', selector: \'.tab-page>.container\', position: \'right top\', width: \'auto\', maxheight: \'50%\', wrap: \'body\' })', // onclick

             $_lang['refresh_site'], // title

             '<i class="fa fa-recycle"></i>' // innerHTML

         )

@@ -363,7 +363,7 @@ 
 $sitemenu['search'] = array(

 	'search',

 	'tools',

-	'<i class="fa fa-search"></i>' . $_lang['search'],

+	'<i class="fa fa-search"></i>'.$_lang['search'],

 	'index.php?a=71',

 	$_lang['search'],

 	'',

@@ -374,11 +374,11 @@ 
 	''

 );

 

-if($modx->hasPermission('bk_manager')) {

+if ($modx->hasPermission('bk_manager')) {

 	$sitemenu['bk_manager'] = array(

 		'bk_manager',

 		'tools',

-		'<i class="fa fa-database"></i>' . $_lang['bk_manager'],

+		'<i class="fa fa-database"></i>'.$_lang['bk_manager'],

 		'index.php?a=93',

 		$_lang['bk_manager'],

 		'',

@@ -390,11 +390,11 @@ 
 	);

 }

 

-if($modx->hasPermission('remove_locks')) {

+if ($modx->hasPermission('remove_locks')) {

 	$sitemenu['remove_locks'] = array(

 		'remove_locks',

 		'tools',

-		'<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'],

+		'<i class="fa fa-hourglass"></i>'.$_lang['remove_locks'],

 		'javascript:modx.removeLocks();',

 		$_lang['remove_locks'],

 		'',

@@ -406,11 +406,11 @@ 
 	);

 }

 

-if($modx->hasPermission('import_static')) {

+if ($modx->hasPermission('import_static')) {

 	$sitemenu['import_site'] = array(

 		'import_site',

 		'tools',

-		'<i class="fa fa-upload"></i>' . $_lang['import_site'],

+		'<i class="fa fa-upload"></i>'.$_lang['import_site'],

 		'index.php?a=95',

 		$_lang['import_site'],

 		'',

@@ -422,11 +422,11 @@ 
 	);

 }

 

-if($modx->hasPermission('export_static')) {

+if ($modx->hasPermission('export_static')) {

 	$sitemenu['export_site'] = array(

 		'export_site',

 		'tools',

-		'<i class="fa fa-download"></i>' . $_lang['export_site'],

+		'<i class="fa fa-download"></i>'.$_lang['export_site'],

 		'index.php?a=83',

 		$_lang['export_site'],

 		'',

@@ -439,20 +439,20 @@ 
 }

 

 $menu = $modx->invokeEvent("OnManagerMenuPrerender", array('menu' => $sitemenu));

-if(is_array($menu)) {

+if (is_array($menu)) {

 	$newmenu = array();

-	foreach($menu as $item){

-		if(is_array(unserialize($item))){

+	foreach ($menu as $item) {

+		if (is_array(unserialize($item))) {

 			$newmenu = array_merge($newmenu, unserialize($item));

 		}

 	}

-	if(count($newmenu)> 0) $sitemenu = $newmenu;

+	if (count($newmenu) > 0) $sitemenu = $newmenu;

 }

 

-if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {

-	include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php');

+if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/includes/menu.class.inc.php')) {

+	include_once(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/includes/menu.class.inc.php');

 } else {

-	include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php');

+	include_once(MODX_MANAGER_PATH.'includes/menu.class.inc.php');

 }

 $menu = new EVOmenu();

 $menu->Build($sitemenu, array(

manager/media/browser/mcpuk/core/types/type_img.php

Indentation +10 added lines, -10 removed lines

@@ -1,16 +1,16 @@
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Image detection class
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <sunhater@sunhater.com>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ *
+ *      @desc Image detection class
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <sunhater@sunhater.com>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 class type_img {
 

Spacing +2 added lines, -2 removed lines

@@ -12,9 +12,9 @@
   *      @link http://kcfinder.sunhater.com
   */
 
-class type_img {
+class type_img{
 
-    public function checkFile($file, array $config) {
+    public function checkFile($file, array $config){
 
         $driver = isset($config['imageDriversPriority'])
             ? image::getDriver(explode(" ", $config['imageDriversPriority'])) : "gd";

Braces +7 added lines, -4 removed lines

@@ -12,17 +12,20 @@
   *      @link http://kcfinder.sunhater.com
   */
 
-class type_img {
+class type_img
+{
 
-    public function checkFile($file, array $config) {
+    public function checkFile($file, array $config)
+    {
 
         $driver = isset($config['imageDriversPriority'])
             ? image::getDriver(explode(" ", $config['imageDriversPriority'])) : "gd";
 
         $img = image::factory($driver, $file);
 
-        if ($img->initError)
-            return "Unknown image format/encoding.";
+        if ($img->initError) {
+                    return "Unknown image format/encoding.";
+        }
 
         return true;
     }