evolution-cms / evolution

manager/actions/help/version_notices/1.4.0.php

Spacing +1 added lines, -1 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.");
 }
 ?>

manager/includes/extenders/modxmailer.class.inc.php

Spacing +12 added lines, -12 removed lines

@@ -11,9 +11,9 @@ 
 use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\Exception as PHPMailerException;
 
-require MODX_MANAGER_PATH . 'includes/controls/phpmailer/Exception.php';
-require MODX_MANAGER_PATH . 'includes/controls/phpmailer/PHPMailer.php';
-require MODX_MANAGER_PATH . 'includes/controls/phpmailer/SMTP.php';
+require MODX_MANAGER_PATH.'includes/controls/phpmailer/Exception.php';
+require MODX_MANAGER_PATH.'includes/controls/phpmailer/PHPMailer.php';
+require MODX_MANAGER_PATH.'includes/controls/phpmailer/SMTP.php';
 
 /**
  * Class MODxMailer
@@ -46,7 +46,7 @@ 
     public function init(DocumentParser $modx)
     {
         $this->modx = $modx;
-        $this->PluginDir = MODX_MANAGER_PATH . 'includes/controls/phpmailer/';
+        $this->PluginDir = MODX_MANAGER_PATH.'includes/controls/phpmailer/';
 
         switch ($modx->config['email_method']) {
             case 'smtp':
@@ -110,7 +110,7 @@ 
             mb_language($this->mb_language);
             mb_internal_encoding($modx->config['modx_charset']);
         }
-        $exconf = MODX_MANAGER_PATH . 'includes/controls/phpmailer/config.inc.php';
+        $exconf = MODX_MANAGER_PATH.'includes/controls/phpmailer/config.inc.php';
         if (is_file($exconf)) {
             include($exconf);
         }
@@ -178,12 +178,12 @@ 
         }
 
         if ($this->modx->debug) {
-            $debug_info = 'CharSet = ' . $this->CharSet . "\n";
-            $debug_info .= 'Encoding = ' . $this->Encoding . "\n";
-            $debug_info .= 'mb_language = ' . $this->mb_language . "\n";
-            $debug_info .= 'encode_header_method = ' . $this->encode_header_method . "\n";
+            $debug_info = 'CharSet = '.$this->CharSet."\n";
+            $debug_info .= 'Encoding = '.$this->Encoding."\n";
+            $debug_info .= 'mb_language = '.$this->mb_language."\n";
+            $debug_info .= 'encode_header_method = '.$this->encode_header_method."\n";
             $debug_info .= "send_mode = {$mode}\n";
-            $debug_info .= 'Subject = ' . $this->Subject . "\n";
+            $debug_info .= 'Subject = '.$this->Subject."\n";
             $log = "<pre>{$debug_info}\n{$header}\n{$org_body}</pre>";
             $this->modx->logEvent(1, 1, $log, 'MODxMailer debug information');
 
@@ -249,7 +249,7 @@ 
             ini_set('sendmail_from', $old_from);
         }
         if (!$rt) {
-            $msg = $this->Lang('instantiate') . "<br />\n";
+            $msg = $this->Lang('instantiate')."<br />\n";
             $msg .= "{$this->Subject}<br />\n";
             $msg .= "{$this->FromName}&lt;{$this->From}&gt;<br />\n";
             $msg .= mb_convert_encoding($body, $this->modx->config['modx_charset'], $this->CharSet);
@@ -268,7 +268,7 @@ 
      */
     public function SetError($msg)
     {
-        $msg .= '<pre>' . print_r(call_user_func('get_object_vars', $this), true) . '</pre>';
+        $msg .= '<pre>'.print_r(call_user_func('get_object_vars', $this), true).'</pre>';
         $this->modx->config['send_errormail'] = '0';
         $this->modx->logEvent(0, 3, $msg, 'phpmailer');
 

manager/actions/mutate_settings/tab3_user_settings.inc.php

Spacing +21 added lines, -21 removed lines

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

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

     <td>

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

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

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

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

     </td>

   </tr>

   <tr>

@@ -17,16 +17,16 @@ 
   <tr>

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

   </tr>

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

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

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

     <td>

-      <label><input type="radio" name="udperms_allowroot" value="1" <?php echo $udperms_allowroot=='1' ? 'checked="checked"' : "" ; ?> />

+      <label><input type="radio" name="udperms_allowroot" value="1" <?php echo $udperms_allowroot == '1' ? 'checked="checked"' : ""; ?> />

       <?php echo $_lang['yes']?></label><br />

-      <label><input type="radio" name="udperms_allowroot" value="0" <?php echo $udperms_allowroot=='0' ? 'checked="checked"' : "" ; ?> />

+      <label><input type="radio" name="udperms_allowroot" value="0" <?php echo $udperms_allowroot == '0' ? 'checked="checked"' : ""; ?> />

       <?php echo $_lang['no']?></label>

     </td>

   </tr>

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

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

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

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

   </tr>

@@ -37,9 +37,9 @@ 
   <tr>

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

     <td>

-      <label><input type="radio" name="email_sender_method" value="1" <?php echo $email_sender_method=='1' ? 'checked="checked"' : "" ; ?> />

+      <label><input type="radio" name="email_sender_method" value="1" <?php echo $email_sender_method == '1' ? 'checked="checked"' : ""; ?> />

       <?php echo $_lang['auto']?></label><br />

-      <label><input type="radio" name="email_sender_method" value="0" <?php echo $email_sender_method=='0' ? 'checked="checked"' : "" ; ?> />

+      <label><input type="radio" name="email_sender_method" value="0" <?php echo $email_sender_method == '0' ? 'checked="checked"' : ""; ?> />

       <?php echo $_lang['use_emailsender']?></label>

     </td>

   </tr>

@@ -55,10 +55,10 @@ 
   <tr>

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

     <td>

-        <?php echo wrap_label($_lang['email_method_mail'],form_radio('email_method','mail','id="useMail"'));?><br />

-        <?php echo wrap_label($_lang['email_method_smtp'],form_radio('email_method','smtp','id="useSmtp"'));?>

-        <div class="smtpRow" <?php echo showHide($email_method=='smtp');?>>

-            <?php include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/snippet_smtp.inc.php'); ?>

+        <?php echo wrap_label($_lang['email_method_mail'], form_radio('email_method', 'mail', 'id="useMail"')); ?><br />

+        <?php echo wrap_label($_lang['email_method_smtp'], form_radio('email_method', 'smtp', 'id="useSmtp"')); ?>

+        <div class="smtpRow" <?php echo showHide($email_method == 'smtp'); ?>>

+            <?php include_once(MODX_MANAGER_PATH.'actions/mutate_settings/snippet_smtp.inc.php'); ?>

         </div>

     </td>

   </tr>

@@ -70,11 +70,11 @@ 
       <br />

       <p><?php echo $_lang['update_settings_from_language']; ?></p>

       <select name="reload_emailsubject" id="reload_emailsubject_select" onchange="confirmLangChange(this, 'emailsubject_default', 'emailsubject_field');">

-<?php echo get_lang_options('emailsubject_default');?>

+<?php echo get_lang_options('emailsubject_default'); ?>

       </select>

     </td>

     <td ><input id="emailsubject_field" name="emailsubject" onchange="documentDirty=true;" type="text" maxlength="255" style="width: 250px;" value="<?php echo $emailsubject; ?>" />

-        <input type="hidden" name="emailsubject_default" id="emailsubject_default_hidden" value="<?php echo addslashes($_lang['emailsubject_default']);?>" />

+        <input type="hidden" name="emailsubject_default" id="emailsubject_default_hidden" value="<?php echo addslashes($_lang['emailsubject_default']); ?>" />

     </td>

   </tr>

   <tr>

@@ -89,11 +89,11 @@ 
       <br />

       <p><?php echo $_lang['update_settings_from_language']; ?></p>

       <select name="reload_signupemail_message" id="reload_signupemail_message_select" onchange="confirmLangChange(this, 'system_email_signup', 'signupemail_message_textarea');">

-<?php echo get_lang_options('system_email_signup');?>

+<?php echo get_lang_options('system_email_signup'); ?>

       </select>

     </td>

     <td> <textarea id="signupemail_message_textarea" name="signupemail_message" style="width:100%; height: 120px;"><?php echo $signupemail_message; ?></textarea>

-        <input type="hidden" name="system_email_signup_default" id="system_email_signup_hidden" value="<?php echo addslashes($_lang['system_email_signup']);?>" />

+        <input type="hidden" name="system_email_signup_default" id="system_email_signup_hidden" value="<?php echo addslashes($_lang['system_email_signup']); ?>" />

     </td>

   </tr>

   <tr>

@@ -108,11 +108,11 @@ 
       <br />

       <p><?php echo $_lang['update_settings_from_language']; ?></p>

       <select name="reload_websignupemail_message" id="reload_websignupemail_message_select" onchange="confirmLangChange(this, 'system_email_websignup', 'websignupemail_message_textarea');">

-<?php echo get_lang_options('system_email_websignup');?>

+<?php echo get_lang_options('system_email_websignup'); ?>

       </select>

     </td>

     <td> <textarea id="websignupemail_message_textarea" name="websignupemail_message" style="width:100%; height: 120px;"><?php echo $websignupemail_message; ?></textarea>

-        <input type="hidden" name="system_email_websignup_default" id="system_email_websignup_hidden" value="<?php echo addslashes($_lang['system_email_websignup']);?>" />

+        <input type="hidden" name="system_email_websignup_default" id="system_email_websignup_hidden" value="<?php echo addslashes($_lang['system_email_websignup']); ?>" />

     </td>

   </tr>

   <tr>

@@ -127,11 +127,11 @@ 
       <br />

       <p><?php echo $_lang['update_settings_from_language']; ?></p>

       <select name="reload_system_email_webreminder_message" id="reload_system_email_webreminder_select" onchange="confirmLangChange(this, 'system_email_webreminder', 'system_email_webreminder_textarea');">

-<?php echo get_lang_options('system_email_webreminder');?>

+<?php echo get_lang_options('system_email_webreminder'); ?>

       </select>

     </td>

     <td> <textarea id="system_email_webreminder_textarea" name="webpwdreminder_message" style="width:100%; height: 120px;"><?php echo $webpwdreminder_message; ?></textarea>

-        <input type="hidden" name="system_email_webreminder_default" id="system_email_webreminder_hidden" value="<?php echo addslashes($_lang['system_email_webreminder']);?>" />

+        <input type="hidden" name="system_email_webreminder_default" id="system_email_webreminder_hidden" value="<?php echo addslashes($_lang['system_email_webreminder']); ?>" />

     </td>

   </tr>

   <tr>

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

             // invoke OnUserSettingsRender event

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

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

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

         ?>

     </td>

   </tr>

manager/frames/mainmenu.php

Spacing +69 added lines, -69 removed lines

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

 	'site',

 	'main',

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

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

 	'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>' . $_lang['elements'],

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

 		'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>' . $_lang['modules'],

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

 		'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>' . $_lang['users'],

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

 		'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>' . $_lang['tools'],

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

 		'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/includes/header.inc.php

Spacing +22 added lines, -22 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.");

 }

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

@@ -17,33 +17,33 @@ 
 }

 

 if (isset($_COOKIE['MODX_themeColor'])) {

-    $body_class .= ' ' . $_COOKIE['MODX_themeColor'];

+    $body_class .= ' '.$_COOKIE['MODX_themeColor'];

 } else {

     $body_class .= ' dark';

 }

 

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

+$css = 'media/style/'.$modx->config['manager_theme'].'/style.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;

     }

 }

 

@@ -58,7 +58,7 @@ 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />

     <link rel="stylesheet" type="text/css" href="<?= $css ?>" />

     <script type="text/javascript" src="media/script/tabpane.js"></script>

-    <?= sprintf('<script type="text/javascript" src="%s"></script>' . "\n", $modx->config['mgr_jquery_path']) ?>

+    <?= sprintf('<script type="text/javascript" src="%s"></script>'."\n", $modx->config['mgr_jquery_path']) ?>

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

         <script src="media/style/<?= $modx->config['manager_theme'] ?>/js/color.switcher.js" type="text/javascript"></script>

     <?php } ?>

@@ -70,7 +70,7 @@ 
     <?php } ?>

 

     <!-- OnManagerMainFrameHeaderHTMLBlock -->

-    <?= $onManagerMainFrameHeaderHTMLBlock . "\n" ?>

+    <?= $onManagerMainFrameHeaderHTMLBlock."\n" ?>

 

     <script type="text/javascript">

       /* <![CDATA[ */

@@ -366,7 +366,7 @@ 
 

           <?php

           if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {

-              echo 'doRefresh(' . $_REQUEST['r'] . ");\n";

+              echo 'doRefresh('.$_REQUEST['r'].");\n";

           }

           ?>

 

manager/includes/accesscontrol.inc.php

Spacing +29 added lines, -29 removed lines

@@ -18,13 +18,13 @@ 
 }
 
 // andrazk 20070416 - if installer is running, destroy active sessions
-if (file_exists(MODX_BASE_PATH . 'assets/cache/installProc.inc.php')) {
-    include_once(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
+if (file_exists(MODX_BASE_PATH.'assets/cache/installProc.inc.php')) {
+    include_once(MODX_BASE_PATH.'assets/cache/installProc.inc.php');
     if (isset($installStartTime)) {
         if ((time() - $installStartTime) > 5 * 60) { // if install flag older than 5 minutes, discard
             unset($installStartTime);
-            @ chmod(MODX_BASE_PATH . 'assets/cache/installProc.inc.php', 0755);
-            unlink(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
+            @ chmod(MODX_BASE_PATH.'assets/cache/installProc.inc.php', 0755);
+            unlink(MODX_BASE_PATH.'assets/cache/installProc.inc.php');
         } else {
             if ($_SERVER['REQUEST_METHOD'] != 'POST') {
                 if (isset($_COOKIE[session_name()])) {
@@ -50,7 +50,7 @@ 
                         //						setcookie(session_name(), '', 0, MODX_BASE_URL);
                     }
                     header('HTTP/1.0 307 Redirect');
-                    header('Location: ' . MODX_MANAGER_URL . 'index.php?installGoingOn=2');
+                    header('Location: '.MODX_MANAGER_URL.'index.php?installGoingOn=2');
                 }
             }
         }
@@ -62,7 +62,7 @@ 
         // establish fallback to English default
         include_once "lang/english.inc.php";
         // include localized overrides
-        include_once "lang/" . $manager_language . ".inc.php";
+        include_once "lang/".$manager_language.".inc.php";
     } else {
         include_once "lang/english.inc.php";
     }
@@ -70,7 +70,7 @@ 
     $modx->setPlaceholder('modx_charset', $modx_manager_charset);
     $modx->setPlaceholder('theme', $manager_theme);
     $modx->setPlaceholder('favicon',
-        (file_exists(MODX_BASE_PATH . 'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/' . $modx->config['manager_theme'] . '/images/favicon.ico'));
+        (file_exists(MODX_BASE_PATH.'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/'.$modx->config['manager_theme'].'/images/favicon.ico'));
 
     // invoke OnManagerLoginFormPrerender event
     $evtOut = $modx->invokeEvent('OnManagerLoginFormPrerender');
@@ -82,7 +82,7 @@ 
     $modx->setPlaceholder('logo_slogan', $_lang["logo_slogan"]);
     $modx->setPlaceholder('login_message', $_lang["login_message"]);
     $modx->setPlaceholder('manager_theme_url',
-        MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/');
+        MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/');
     $modx->setPlaceholder('year', date('Y'));
     $modx->setPlaceholder('manager_theme_style',
         (isset($_COOKIE['MODX_themeColor']) ? $_COOKIE['MODX_themeColor'] : 'dark'));
@@ -95,11 +95,11 @@ 
         switch ($installGoingOn) {
             case 1 :
                 $modx->setPlaceholder('login_message',
-                    "<p><span class=\"fail\">" . $_lang["login_cancelled_install_in_progress"] . "</p><p>" . $_lang["login_message"] . "</p>");
+                    "<p><span class=\"fail\">".$_lang["login_cancelled_install_in_progress"]."</p><p>".$_lang["login_message"]."</p>");
                 break;
             case 2 :
                 $modx->setPlaceholder('login_message',
-                    "<p><span class=\"fail\">" . $_lang["login_cancelled_site_was_updated"] . "</p><p>" . $_lang["login_message"] . "</p>");
+                    "<p><span class=\"fail\">".$_lang["login_cancelled_site_was_updated"]."</p><p>".$_lang["login_message"]."</p>");
                 break;
         }
     }
@@ -107,9 +107,9 @@ 
     if ($modx->config['use_captcha'] == 1) {
         $modx->setPlaceholder('login_captcha_message', $_lang["login_captcha_message"]);
         $modx->setPlaceholder('captcha_image',
-            '<a href="' . MODX_MANAGER_URL . '" class="loginCaptcha"><img id="captcha_image" src="' . MODX_MANAGER_URL . 'includes/veriword.php?rand=' . rand() . '" alt="' . $_lang["login_captcha_message"] . '" /></a>');
+            '<a href="'.MODX_MANAGER_URL.'" class="loginCaptcha"><img id="captcha_image" src="'.MODX_MANAGER_URL.'includes/veriword.php?rand='.rand().'" alt="'.$_lang["login_captcha_message"].'" /></a>');
         $modx->setPlaceholder('captcha_input',
-            '<label>' . $_lang["captcha_code"] . '</label> <input type="text" name="captcha_code" tabindex="3" value="" />');
+            '<label>'.$_lang["captcha_code"].'</label> <input type="text" name="captcha_code" tabindex="3" value="" />');
     }
 
     // login info
@@ -127,7 +127,7 @@ 
 
     // invoke OnManagerLoginFormRender event
     $evtOut = $modx->invokeEvent('OnManagerLoginFormRender');
-    $html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">' . implode('', $evtOut) . '</div>' : '';
+    $html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">'.implode('', $evtOut).'</div>' : '';
     $modx->setPlaceholder('OnManagerLoginFormRender', $html);
 
     // load template
@@ -145,29 +145,29 @@ 
             $login_tpl = file_get_contents($target);
         }
     } else {
-        $theme_path = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/';
-        if (is_file($theme_path . 'style.php')) {
-            include($theme_path . 'style.php');
+        $theme_path = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/';
+        if (is_file($theme_path.'style.php')) {
+            include($theme_path.'style.php');
         }
         $chunk = $modx->getChunk($target);
         if ($chunk !== false && !empty($chunk)) {
             $login_tpl = $chunk;
-        } elseif (is_file(MODX_BASE_PATH . $target)) {
-            $target = MODX_BASE_PATH . $target;
+        } elseif (is_file(MODX_BASE_PATH.$target)) {
+            $target = MODX_BASE_PATH.$target;
             $login_tpl = file_get_contents($target);
         } elseif (is_file($target)) {
             $login_tpl = file_get_contents($target);
-        } elseif (is_file($theme_path . 'login.tpl')) {
-            $target = $theme_path . 'login.tpl';
+        } elseif (is_file($theme_path.'login.tpl')) {
+            $target = $theme_path.'login.tpl';
             $login_tpl = file_get_contents($target);
-        } elseif (is_file($theme_path . 'templates/actions/login.tpl')) {
-            $target = $theme_path . 'templates/actions/login.tpl';
+        } elseif (is_file($theme_path.'templates/actions/login.tpl')) {
+            $target = $theme_path.'templates/actions/login.tpl';
             $login_tpl = file_get_contents($target);
-        } elseif (is_file($theme_path . 'html/login.html')) { // ClipperCMS compatible
-            $target = $theme_path . 'html/login.html';
+        } elseif (is_file($theme_path.'html/login.html')) { // ClipperCMS compatible
+            $target = $theme_path.'html/login.html';
             $login_tpl = file_get_contents($target);
         } else {
-            $target = MODX_MANAGER_PATH . 'media/style/common/login.tpl';
+            $target = MODX_MANAGER_PATH.'media/style/common/login.tpl';
             $login_tpl = file_get_contents($target);
         }
     }
@@ -187,17 +187,17 @@ 
     $modx->updateValidatedUserSession();
 
     // Update last action in table active_users
-    $itemid = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : '';
+    $itemid = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : '';
     $lasthittime = time();
-    $action = isset($_REQUEST['a']) ? (int)$_REQUEST['a'] : 1;
+    $action = isset($_REQUEST['a']) ? (int) $_REQUEST['a'] : 1;
 
     if ($action !== 1) {
-        if ((int)$itemid <= 0) {
+        if ((int) $itemid <= 0) {
             $itemid = null;
         }
         $sql = sprintf("REPLACE INTO %s (sid, internalKey, username, lasthit, action, id) VALUES ('%s', %d, '%s', %d, '%s', %s)",
             $modx->getFullTableName('active_users') // Table
-            , session_id(), $modx->getLoginUserID(), $_SESSION['mgrShortname'], $lasthittime, (string)$action,
+            , session_id(), $modx->getLoginUserID(), $_SESSION['mgrShortname'], $lasthittime, (string) $action,
             $itemid == null ? var_export(null, true) : $itemid);
         $modx->db->query($sql);
     }

manager/frames/1.php

Spacing +40 added lines, -40 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");

@@ -46,7 +46,7 @@ 
 }

 

 if (isset($_COOKIE['MODX_themeColor'])) {

-    $body_class .= ' ' . $_COOKIE['MODX_themeColor'];

+    $body_class .= ' '.$_COOKIE['MODX_themeColor'];

 } else {

     $body_class .= ' dark';

 }

@@ -76,36 +76,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 ?>" />

@@ -136,20 +136,20 @@ 
         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'] ?>',

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

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

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

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

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

 

@@ -234,11 +234,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>

@@ -320,7 +320,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 } ?>

@@ -347,7 +347,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>

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

         }

@@ -539,7 +539,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();

@@ -557,12 +557,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) {

@@ -575,12 +575,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) {

@@ -634,7 +634,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>