Inspection of "Issue #672" - evolution-cms/evolution - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — develop (#740)

by Maxim

created 2018-06-22 10:32 UTC

Status

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -1,13 +1,13 @@
 block discarded – undo
 <?php
 
-class DATEPICKER {
-	function __construct() {
+class DATEPICKER{
+	function __construct(){
 	}
 
-	function getDP() {
+	function getDP(){
 		$modx = evolutionCMS(); global $_lang;
 
-		$tpl = file_get_contents(dirname(__FILE__) . '/datepicker.tpl');
+		$tpl = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
 		return $modx->parseText($tpl, $_lang, '[%', '%]');
 	}
 }

Please login to merge, or discard this patch.

manager/media/style/common/moo-datepicker/datepicker.inc.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -1,11 +1,11 @@
 block discarded – undo
 <?php
-class DATEPICKER {
-    function __construct() {
+class DATEPICKER{
+    function __construct(){
     }
-    function getDP() {
+    function getDP(){
         $modx = evolutionCMS(); global$_lang;
 
         $tpl = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
-        return $modx->parseText($tpl,$_lang,'[%','%]');
+        return $modx->parseText($tpl, $_lang, '[%', '%]');
     }
 }

Please login to merge, or discard this patch.

manager/media/script/air-datepicker/datepicker.inc.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -1,13 +1,13 @@  discard block
 block discarded – undo
 <?php
-class DATEPICKER {
+class DATEPICKER{
     /**
      * @return string
      */
-    public function getDP() {
+    public function getDP(){
         $modx = evolutionCMS();
 
         $load_script = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
-        if(!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
+        if (!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
 		$modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
         return $modx->mergeSettingsContent($load_script);
     }
@@ -15,14 +15,14 @@  discard block
 block discarded – undo
     /**
      * @return string
      */
-    public function getLangCode() {
+    public function getLangCode(){
         $modx = evolutionCMS(); global $modx_lang_attribute;
 
-        if(!$modx_lang_attribute) return 'en';
+        if (!$modx_lang_attribute) return 'en';
 
         $lc = $modx_lang_attribute;
-        if($lc === 'uk') return 'ru';
-        $dp_path = str_replace('\\','/',dirname(__FILE__));
+        if ($lc === 'uk') return 'ru';
+        $dp_path = str_replace('\\', '/', dirname(__FILE__));
 
         return (is_file("{$dp_path}/i18n/datepicker.{$lc}.js")) ? $modx_lang_attribute : 'en';
     }

Please login to merge, or discard this patch.

manager/actions/help/version_notices/1.3.6.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@
 block discarded – undo
 <?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.");
 }
 ?>

Please login to merge, or discard this patch.

manager/actions/help/version_notices/1.4.1.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@
 block discarded – undo
 <?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.");
 }
 ?>

Please login to merge, or discard this patch.

manager/actions/help/version_notices/1.4.0.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@
 block discarded – undo
 <?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.");
 }
 ?>

Please login to merge, or discard this patch.

manager/actions/mutate_settings/tab3_user_settings.inc.php 1 patch

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

@@ -6,8 +6,8 @@  discard block
 block discarded – undo
   <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 @@  discard block
 block discarded – undo
   <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 @@  discard block
 block discarded – undo
   <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 @@  discard block
 block discarded – undo
   <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 @@  discard block
 block discarded – undo
       <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 @@  discard block
 block discarded – undo
       <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 @@  discard block
 block discarded – undo
       <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 @@  discard block
 block discarded – undo
       <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>
@@ -144,8 +144,8 @@  discard block
 block discarded – undo
   <tr>
     <td nowrap class="warning" valign="top"><?php echo $_lang['allow_multiple_emails_title'] ?><br><small>[(allow_multiple_emails)]</small></td>
     <td>
-      <?php echo wrap_label($_lang['yes'],form_radio('allow_multiple_emails','1'));?><br />
-      <?php echo wrap_label($_lang['no'], form_radio('allow_multiple_emails','0'));?>
+      <?php echo wrap_label($_lang['yes'], form_radio('allow_multiple_emails', '1')); ?><br />
+      <?php echo wrap_label($_lang['no'], form_radio('allow_multiple_emails', '0')); ?>
     </td>
   </tr>
   <tr>
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
         <?php
             // invoke OnUserSettingsRender event
             $evtOut = $modx->invokeEvent('OnUserSettingsRender');
-            if(is_array($evtOut)) echo implode("",$evtOut);
+            if (is_array($evtOut)) echo implode("", $evtOut);
         ?>
     </td>
   </tr>

Please login to merge, or discard this patch.

manager/actions/mutate_settings/tab6_filemanager_settings.inc.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -113,7 +113,7 @@
 block discarded – undo
         <?php
             // invoke OnMiscSettingsRender event
             $evtOut = $modx->invokeEvent('OnFileManagerSettingsRender');
-            if(is_array($evtOut)) echo implode("",$evtOut);
+            if (is_array($evtOut)) echo implode("", $evtOut);
         ?>
     </td>
   </tr>

Please login to merge, or discard this patch.

manager/includes/header.inc.php 1 patch

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

@@ -20,28 +20,28 @@  discard block
 block discarded – undo
 $body_class = '';
 $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']];
 }
 
-$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')) {
+    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')) {
         $files = array(
-            'bootstrap' => MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css',
-            'font-awesome' => MODX_MANAGER_PATH . 'media/style/common/font-awesome/css/font-awesome.min.css',
-            'fonts' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/fonts.css',
-            'forms' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/forms.css',
-            'mainmenu' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/mainmenu.css',
-            'tree' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tree.css',
-            'custom' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/custom.css',
-            'tabpane' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tabpane.css',
-            'contextmenu' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/contextmenu.css',
-            'index' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/index.css',
-            'main' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/main.css'
+            'bootstrap' => MODX_MANAGER_PATH.'media/style/common/bootstrap/css/bootstrap.min.css',
+            'font-awesome' => MODX_MANAGER_PATH.'media/style/common/font-awesome/css/font-awesome.min.css',
+            'fonts' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/fonts.css',
+            'forms' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/forms.css',
+            'mainmenu' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/mainmenu.css',
+            'tree' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tree.css',
+            'custom' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/custom.css',
+            'tabpane' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tabpane.css',
+            'contextmenu' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/contextmenu.css',
+            'index' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/index.css',
+            'main' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/main.css'
         );
         $evtOut = $modx->invokeEvent('OnBeforeMinifyCss', array(
             'files' => $files,
@@ -58,16 +58,16 @@  discard block
 block discarded – undo
             default:
                 $modx->webAlertAndQuit(sprintf($_lang['invalid_event_response'], 'OnBeforeMinifyManagerCss'));
         }
-        require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php';
+        require_once MODX_BASE_PATH.'assets/lib/Formatter/CSSMinify.php';
         $minifier = new Formatter\CSSMinify($files);
         $css = $minifier->minify();
         file_put_contents(
-            MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css',
+            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;
     }
 }
 
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
     <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>
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
     <?php } ?>
 
     <!-- OnManagerMainFrameHeaderHTMLBlock -->
-    <?= $onManagerMainFrameHeaderHTMLBlock . "\n" ?>
+    <?= $onManagerMainFrameHeaderHTMLBlock."\n" ?>
 
     <script type="text/javascript">
       if (!evo) {
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
     <script>
         <?php
         if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {
-            echo 'doRefresh(' . $_REQUEST['r'] . ");\n";
+            echo 'doRefresh('.$_REQUEST['r'].");\n";
         }
         ?>
     </script>

Please login to merge, or discard this patch.

		@@ -1,13 +1,13 @@
		block discarded – undo
1	1	<?php
2	2
3		-class DATEPICKER {
4		- function __construct() {
	3	+class DATEPICKER{
	4	+ function __construct(){
5	5	}
6	6
7		- function getDP() {
	7	+ function getDP(){
8	8	$modx = evolutionCMS(); global $_lang;
9	9
10		- $tpl = file_get_contents(dirname(__FILE__) . '/datepicker.tpl');
	10	+ $tpl = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
11	11	return $modx->parseText($tpl, $_lang, '[%', '%]');
12	12	}
13	13	}

		@@ -1,11 +1,11 @@
		block discarded – undo
1	1	<?php
2		-class DATEPICKER {
3		- function __construct() {
	2	+class DATEPICKER{
	3	+ function __construct(){
4	4	}
5		- function getDP() {
	5	+ function getDP(){
6	6	$modx = evolutionCMS(); global$_lang;
7	7
8	8	$tpl = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
9		- return $modx->parseText($tpl,$_lang,'[%','%]');
	9	+ return $modx->parseText($tpl, $_lang, '[%', '%]');
10	10	}
11	11	}

		@@ -1,13 +1,13 @@ discard block
		block discarded – undo
1	1	<?php
2		-class DATEPICKER {
	2	+class DATEPICKER{
3	3	/**
4	4	* @return string
5	5	*/
6		- public function getDP() {
	6	+ public function getDP(){
7	7	$modx = evolutionCMS();
8	8
9	9	$load_script = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
10		- if(!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
	10	+ if (!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
11	11	$modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
12	12	return $modx->mergeSettingsContent($load_script);
13	13	}
		@@ -15,14 +15,14 @@ discard block
		block discarded – undo
15	15	/**
16	16	* @return string
17	17	*/
18		- public function getLangCode() {
	18	+ public function getLangCode(){
19	19	$modx = evolutionCMS(); global $modx_lang_attribute;
20	20
21		- if(!$modx_lang_attribute) return 'en';
	21	+ if (!$modx_lang_attribute) return 'en';
22	22
23	23	$lc = $modx_lang_attribute;
24		- if($lc === 'uk') return 'ru';
25		- $dp_path = str_replace('\\','/',dirname(__FILE__));
	24	+ if ($lc === 'uk') return 'ru';
	25	+ $dp_path = str_replace('\\', '/', dirname(__FILE__));
26	26
27	27	return (is_file("{$dp_path}/i18n/datepicker.{$lc}.js")) ? $modx_lang_attribute : 'en';
28	28	}

		@@ -1,5 +1,5 @@
		block discarded – undo
1	1	<?php
2		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	2	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3	3	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4	4	}
5	5	?>

		@@ -6,8 +6,8 @@ discard block
		block discarded – undo
6	6	<tr>
7	7	<td nowrap class="warning"><?php echo $_lang['udperms_title'] ?><br><small>[(use_udperms)]</small></td>
8	8	<td>
9		- <?php echo wrap_label($_lang['yes'],form_radio('use_udperms', 1, 'id="udPermsOn"'));?><br />
10		- <?php echo wrap_label($_lang['no'], form_radio('use_udperms', 0, 'id="udPermsOff"'));?>
	9	+ <?php echo wrap_label($_lang['yes'], form_radio('use_udperms', 1, 'id="udPermsOn"')); ?><br />
	10	+ <?php echo wrap_label($_lang['no'], form_radio('use_udperms', 0, 'id="udPermsOff"')); ?>
11	11	</td>
12	12	</tr>
13	13	<tr>
		@@ -17,16 +17,16 @@ discard block
		block discarded – undo
17	17	<tr>
18	18	<td colspan="2"><div class="split"></div></td>
19	19	</tr>
20		- <tr class="udPerms" <?php echo showHide($use_udperms==1);?>>
	20	+ <tr class="udPerms" <?php echo showHide($use_udperms == 1); ?>>
21	21	<td nowrap class="warning"><?php echo $_lang['udperms_allowroot_title'] ?><br><small>[(udperms_allowroot)]</small></td>
22	22	<td>
23		- <label><input type="radio" name="udperms_allowroot" value="1" <?php echo $udperms_allowroot=='1' ? 'checked="checked"' : "" ; ?> />
	23	+ <label><input type="radio" name="udperms_allowroot" value="1" <?php echo $udperms_allowroot == '1' ? 'checked="checked"' : ""; ?> />
24	24	<?php echo $_lang['yes']?></label><br />
25		- <label><input type="radio" name="udperms_allowroot" value="0" <?php echo $udperms_allowroot=='0' ? 'checked="checked"' : "" ; ?> />
	25	+ <label><input type="radio" name="udperms_allowroot" value="0" <?php echo $udperms_allowroot == '0' ? 'checked="checked"' : ""; ?> />
26	26	<?php echo $_lang['no']?></label>
27	27	</td>
28	28	</tr>
29		- <tr class="udPerms" <?php echo showHide($use_udperms==1);?>>
	29	+ <tr class="udPerms" <?php echo showHide($use_udperms == 1); ?>>
30	30	<td width="200"> </td>
31	31	<td class="comment"><?php echo $_lang['udperms_allowroot_message'] ?></td>
32	32	</tr>
		@@ -37,9 +37,9 @@ discard block
		block discarded – undo
37	37	<tr>
38	38	<td nowrap class="warning"><?php echo $_lang['email_sender_method'] ?><br><small>[(email_sender_method)]</small></td>
39	39	<td>
40		- <label><input type="radio" name="email_sender_method" value="1" <?php echo $email_sender_method=='1' ? 'checked="checked"' : "" ; ?> />
	40	+ <label><input type="radio" name="email_sender_method" value="1" <?php echo $email_sender_method == '1' ? 'checked="checked"' : ""; ?> />
41	41	<?php echo $_lang['auto']?></label><br />
42		- <label><input type="radio" name="email_sender_method" value="0" <?php echo $email_sender_method=='0' ? 'checked="checked"' : "" ; ?> />
	42	+ <label><input type="radio" name="email_sender_method" value="0" <?php echo $email_sender_method == '0' ? 'checked="checked"' : ""; ?> />
43	43	<?php echo $_lang['use_emailsender']?></label>
44	44	</td>
45	45	</tr>
		@@ -55,10 +55,10 @@ discard block
		block discarded – undo
55	55	<tr>
56	56	<td nowrap class="warning"><?php echo $_lang['email_method_title'] ?><br><small>[(email_method)]</small></td>
57	57	<td>
58		- <?php echo wrap_label($_lang['email_method_mail'],form_radio('email_method','mail','id="useMail"'));?><br />
59		- <?php echo wrap_label($_lang['email_method_smtp'],form_radio('email_method','smtp','id="useSmtp"'));?>
60		- <div class="smtpRow" <?php echo showHide($email_method=='smtp');?>>
61		- <?php include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/snippet_smtp.inc.php'); ?>
	58	+ <?php echo wrap_label($_lang['email_method_mail'], form_radio('email_method', 'mail', 'id="useMail"')); ?><br />
	59	+ <?php echo wrap_label($_lang['email_method_smtp'], form_radio('email_method', 'smtp', 'id="useSmtp"')); ?>
	60	+ <div class="smtpRow" <?php echo showHide($email_method == 'smtp'); ?>>
	61	+ <?php include_once(MODX_MANAGER_PATH.'actions/mutate_settings/snippet_smtp.inc.php'); ?>
62	62	</div>
63	63	</td>
64	64	</tr>
		@@ -70,11 +70,11 @@ discard block
		block discarded – undo
70	70	<br />
71	71	<p><?php echo $_lang['update_settings_from_language']; ?></p>
72	72	<select name="reload_emailsubject" id="reload_emailsubject_select" onchange="confirmLangChange(this, 'emailsubject_default', 'emailsubject_field');">
73		-<?php echo get_lang_options('emailsubject_default');?>
	73	+<?php echo get_lang_options('emailsubject_default'); ?>
74	74	</select>
75	75	</td>
76	76	<td ><input id="emailsubject_field" name="emailsubject" onchange="documentDirty=true;" type="text" maxlength="255" style="width: 250px;" value="<?php echo $emailsubject; ?>" />
77		- <input type="hidden" name="emailsubject_default" id="emailsubject_default_hidden" value="<?php echo addslashes($_lang['emailsubject_default']);?>" />
	77	+ <input type="hidden" name="emailsubject_default" id="emailsubject_default_hidden" value="<?php echo addslashes($_lang['emailsubject_default']); ?>" />
78	78	</td>
79	79	</tr>
80	80	<tr>
		@@ -89,11 +89,11 @@ discard block
		block discarded – undo
89	89	<br />
90	90	<p><?php echo $_lang['update_settings_from_language']; ?></p>
91	91	<select name="reload_signupemail_message" id="reload_signupemail_message_select" onchange="confirmLangChange(this, 'system_email_signup', 'signupemail_message_textarea');">
92		-<?php echo get_lang_options('system_email_signup');?>
	92	+<?php echo get_lang_options('system_email_signup'); ?>
93	93	</select>
94	94	</td>
95	95	<td> <textarea id="signupemail_message_textarea" name="signupemail_message" style="width:100%; height: 120px;"><?php echo $signupemail_message; ?></textarea>
96		- <input type="hidden" name="system_email_signup_default" id="system_email_signup_hidden" value="<?php echo addslashes($_lang['system_email_signup']);?>" />
	96	+ <input type="hidden" name="system_email_signup_default" id="system_email_signup_hidden" value="<?php echo addslashes($_lang['system_email_signup']); ?>" />
97	97	</td>
98	98	</tr>
99	99	<tr>
		@@ -108,11 +108,11 @@ discard block
		block discarded – undo
108	108	<br />
109	109	<p><?php echo $_lang['update_settings_from_language']; ?></p>
110	110	<select name="reload_websignupemail_message" id="reload_websignupemail_message_select" onchange="confirmLangChange(this, 'system_email_websignup', 'websignupemail_message_textarea');">
111		-<?php echo get_lang_options('system_email_websignup');?>
	111	+<?php echo get_lang_options('system_email_websignup'); ?>
112	112	</select>
113	113	</td>
114	114	<td> <textarea id="websignupemail_message_textarea" name="websignupemail_message" style="width:100%; height: 120px;"><?php echo $websignupemail_message; ?></textarea>
115		- <input type="hidden" name="system_email_websignup_default" id="system_email_websignup_hidden" value="<?php echo addslashes($_lang['system_email_websignup']);?>" />
	115	+ <input type="hidden" name="system_email_websignup_default" id="system_email_websignup_hidden" value="<?php echo addslashes($_lang['system_email_websignup']); ?>" />
116	116	</td>
117	117	</tr>
118	118	<tr>
		@@ -127,11 +127,11 @@ discard block
		block discarded – undo
127	127	<br />
128	128	<p><?php echo $_lang['update_settings_from_language']; ?></p>
129	129	<select name="reload_system_email_webreminder_message" id="reload_system_email_webreminder_select" onchange="confirmLangChange(this, 'system_email_webreminder', 'system_email_webreminder_textarea');">
130		-<?php echo get_lang_options('system_email_webreminder');?>
	130	+<?php echo get_lang_options('system_email_webreminder'); ?>
131	131	</select>
132	132	</td>
133	133	<td> <textarea id="system_email_webreminder_textarea" name="webpwdreminder_message" style="width:100%; height: 120px;"><?php echo $webpwdreminder_message; ?></textarea>
134		- <input type="hidden" name="system_email_webreminder_default" id="system_email_webreminder_hidden" value="<?php echo addslashes($_lang['system_email_webreminder']);?>" />
	134	+ <input type="hidden" name="system_email_webreminder_default" id="system_email_webreminder_hidden" value="<?php echo addslashes($_lang['system_email_webreminder']); ?>" />
135	135	</td>
136	136	</tr>
137	137	<tr>
		@@ -144,8 +144,8 @@ discard block
		block discarded – undo
144	144	<tr>
145	145	<td nowrap class="warning" valign="top"><?php echo $_lang['allow_multiple_emails_title'] ?><br><small>[(allow_multiple_emails)]</small></td>
146	146	<td>
147		- <?php echo wrap_label($_lang['yes'],form_radio('allow_multiple_emails','1'));?><br />
148		- <?php echo wrap_label($_lang['no'], form_radio('allow_multiple_emails','0'));?>
	147	+ <?php echo wrap_label($_lang['yes'], form_radio('allow_multiple_emails', '1')); ?><br />
	148	+ <?php echo wrap_label($_lang['no'], form_radio('allow_multiple_emails', '0')); ?>
149	149	</td>
150	150	</tr>
151	151	<tr>
		@@ -157,7 +157,7 @@ discard block
		block discarded – undo
157	157	<?php
158	158	// invoke OnUserSettingsRender event
159	159	$evtOut = $modx->invokeEvent('OnUserSettingsRender');
160		- if(is_array($evtOut)) echo implode("",$evtOut);
	160	+ if (is_array($evtOut)) echo implode("", $evtOut);
161	161	?>
162	162	</td>
163	163	</tr>

		@@ -113,7 +113,7 @@
		block discarded – undo
113	113	<?php
114	114	// invoke OnMiscSettingsRender event
115	115	$evtOut = $modx->invokeEvent('OnFileManagerSettingsRender');
116		- if(is_array($evtOut)) echo implode("",$evtOut);
	116	+ if (is_array($evtOut)) echo implode("", $evtOut);
117	117	?>
118	118	</td>
119	119	</tr>

		@@ -20,28 +20,28 @@ discard block
		block discarded – undo
20	20	$body_class = '';
21	21	$theme_modes = array('', 'lightness', 'light', 'dark', 'darkness');
22	22	if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {
23		- $body_class .= ' ' . $theme_modes[$_COOKIE['MODX_themeMode']];
	23	+ $body_class .= ' '.$theme_modes[$_COOKIE['MODX_themeMode']];
24	24	} elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {
25		- $body_class .= ' ' . $theme_modes[$modx->config['manager_theme_mode']];
	25	+ $body_class .= ' '.$theme_modes[$modx->config['manager_theme_mode']];
26	26	}
27	27
28		-$css = 'media/style/' . $modx->config['manager_theme'] . '/style.css?v=' . $lastInstallTime;
	28	+$css = 'media/style/'.$modx->config['manager_theme'].'/style.css?v='.$lastInstallTime;
29	29
30	30	if ($modx->config['manager_theme'] == 'default') {
31		- if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')
32		- && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {
	31	+ if (!file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')
	32	+ && is_writable(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css')) {
33	33	$files = array(
34		- 'bootstrap' => MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css',
35		- 'font-awesome' => MODX_MANAGER_PATH . 'media/style/common/font-awesome/css/font-awesome.min.css',
36		- 'fonts' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/fonts.css',
37		- 'forms' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/forms.css',
38		- 'mainmenu' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/mainmenu.css',
39		- 'tree' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tree.css',
40		- 'custom' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/custom.css',
41		- 'tabpane' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tabpane.css',
42		- 'contextmenu' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/contextmenu.css',
43		- 'index' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/index.css',
44		- 'main' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/main.css'
	34	+ 'bootstrap' => MODX_MANAGER_PATH.'media/style/common/bootstrap/css/bootstrap.min.css',
	35	+ 'font-awesome' => MODX_MANAGER_PATH.'media/style/common/font-awesome/css/font-awesome.min.css',
	36	+ 'fonts' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/fonts.css',
	37	+ 'forms' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/forms.css',
	38	+ 'mainmenu' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/mainmenu.css',
	39	+ 'tree' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tree.css',
	40	+ 'custom' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/custom.css',
	41	+ 'tabpane' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tabpane.css',
	42	+ 'contextmenu' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/contextmenu.css',
	43	+ 'index' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/index.css',
	44	+ 'main' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/main.css'
45	45	);
46	46	$evtOut = $modx->invokeEvent('OnBeforeMinifyCss', array(
47	47	'files' => $files,
		@@ -58,16 +58,16 @@ discard block
		block discarded – undo
58	58	default:
59	59	$modx->webAlertAndQuit(sprintf($_lang['invalid_event_response'], 'OnBeforeMinifyManagerCss'));
60	60	}
61		- require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php';
	61	+ require_once MODX_BASE_PATH.'assets/lib/Formatter/CSSMinify.php';
62	62	$minifier = new Formatter\CSSMinify($files);
63	63	$css = $minifier->minify();
64	64	file_put_contents(
65		- MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css',
	65	+ MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css',
66	66	$css
67	67	);
68	68	}
69		- if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
70		- $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime;
	69	+ if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')) {
	70	+ $css = 'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css?v='.$lastInstallTime;
71	71	}
72	72	}
73	73
		@@ -82,7 +82,7 @@ discard block
		block discarded – undo
82	82	<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
83	83	<link rel="stylesheet" type="text/css" href="<?= $css ?>"/>
84	84	<script type="text/javascript" src="media/script/tabpane.js"></script>
85		- <?= sprintf('<script type="text/javascript" src="%s"></script>' . "\n", $modx->config['mgr_jquery_path']) ?>
	85	+ <?= sprintf('<script type="text/javascript" src="%s"></script>'."\n", $modx->config['mgr_jquery_path']) ?>
86	86	<?php if ($modx->config['show_picker'] != "0") { ?>
87	87	<script src="media/style/<?= $modx->config['manager_theme'] ?>/js/color.switcher.js"
88	88	type="text/javascript"></script>
		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95	<?php } ?>
96	96
97	97	<!-- OnManagerMainFrameHeaderHTMLBlock -->
98		- <?= $onManagerMainFrameHeaderHTMLBlock . "\n" ?>
	98	+ <?= $onManagerMainFrameHeaderHTMLBlock."\n" ?>
99	99
100	100	<script type="text/javascript">
101	101	if (!evo) {
		@@ -125,7 +125,7 @@ discard block
		block discarded – undo
125	125	<script>
126	126	<?php
127	127	if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {
128		- echo 'doRefresh(' . $_REQUEST['r'] . ");\n";
	128	+ echo 'doRefresh('.$_REQUEST['r'].");\n";
129	129	}
130	130	?>
131	131	</script>

evolution-cms / evolution

Pull Request — develop (#740)

Status

Category

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch