Inspection of "[I] Add missing system events for System Settings..." - evolution-cms/evolution - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — develop (#702)

unknown

created 2018-05-25 09:08 UTC

Status

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

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
     $MODX_SITE_HOSTNAMES = MODX_SITE_HOSTNAMES; // Fix for PHP 5.4
-    if(empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) {
+    if (empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) {
         $valid_hostnames = $_SERVER['HTTP_HOST'];
     } else {
         $valid_hostnames = $MODX_SITE_HOSTNAMES;
@@ -15,10 +15,10 @@  discard block
 block discarded – undo
 <tr>
 <th><?php echo $_lang['allow_eval_title']; ?><br><small>[(allow_eval)]</small></th>
 <td>
-<?php echo wrap_label($_lang['allow_eval_with_scan']         , form_radio('allow_eval','with_scan'));?><br />
-<?php echo wrap_label($_lang['allow_eval_with_scan_at_post'] , form_radio('allow_eval','with_scan_at_post'));?><br />
-<?php echo wrap_label($_lang['allow_eval_everytime_eval']    , form_radio('allow_eval','everytime_eval'));?><br />
-<?php echo wrap_label($_lang['allow_eval_dont_eval']         , form_radio('allow_eval','dont_eval'));?>
+<?php echo wrap_label($_lang['allow_eval_with_scan'], form_radio('allow_eval', 'with_scan')); ?><br />
+<?php echo wrap_label($_lang['allow_eval_with_scan_at_post'], form_radio('allow_eval', 'with_scan_at_post')); ?><br />
+<?php echo wrap_label($_lang['allow_eval_everytime_eval'], form_radio('allow_eval', 'everytime_eval')); ?><br />
+<?php echo wrap_label($_lang['allow_eval_dont_eval'], form_radio('allow_eval', 'dont_eval')); ?>
     <div class="comment">
         <?php echo $_lang['allow_eval_msg'] ?>
     </div>
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
 <tr>
     <th><?php echo $_lang['check_files_onlogin_title'] ?><br><small>[(check_files_onlogin)]</small></th>
     <td>
-      <textarea name="check_files_onlogin"><?php echo $check_files_onlogin;?></textarea><br />
+      <textarea name="check_files_onlogin"><?php echo $check_files_onlogin; ?></textarea><br />
         
 </td>
 </tr>
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
     <tr>
       <td nowrap class="warning"><?php echo $_lang['validate_referer_title'] ?><br><small>[(validate_referer)]</small></td>
       <td>
-        <?php echo wrap_label($_lang['yes'],form_radio('validate_referer', 1));?><br />
-        <?php echo wrap_label($_lang['no'], form_radio('validate_referer', 0));?>
+        <?php echo wrap_label($_lang['yes'], form_radio('validate_referer', 1)); ?><br />
+        <?php echo wrap_label($_lang['no'], form_radio('validate_referer', 0)); ?>
       </td>
     </tr>
     <tr>
@@ -89,25 +89,25 @@  discard block
 block discarded – undo
   <tr>
 <th><?php echo $_lang['a17_error_reporting_title']; ?><br><small>[(error_reporting)]</small></th>
 <td>
-<?php echo wrap_label($_lang['a17_error_reporting_opt0'], form_radio('error_reporting','0'));?><br />
-<?php echo wrap_label($_lang['a17_error_reporting_opt1'], form_radio('error_reporting','1'));?><br />
-<?php echo wrap_label($_lang['a17_error_reporting_opt2'], form_radio('error_reporting','2'));?><br />
-<?php echo wrap_label($_lang['a17_error_reporting_opt99'],form_radio('error_reporting','99'));?>
+<?php echo wrap_label($_lang['a17_error_reporting_opt0'], form_radio('error_reporting', '0')); ?><br />
+<?php echo wrap_label($_lang['a17_error_reporting_opt1'], form_radio('error_reporting', '1')); ?><br />
+<?php echo wrap_label($_lang['a17_error_reporting_opt2'], form_radio('error_reporting', '2')); ?><br />
+<?php echo wrap_label($_lang['a17_error_reporting_opt99'], form_radio('error_reporting', '99')); ?>
 </td>
 </tr>
 <tr>
     <td width="200">&nbsp;</td>
-    <td class="comment"> <?php echo $_lang['a17_error_reporting_msg'];?></td>
+    <td class="comment"> <?php echo $_lang['a17_error_reporting_msg']; ?></td>
 </tr>
 <tr><td colspan="2"><div class="split"></div></td></tr>
 <tr>
 <th><?php echo $_lang['mutate_settings.dynamic.php6']; ?><br><small>[(send_errormail)]</small></th>
 <td>
-<?php echo wrap_label($_lang['mutate_settings.dynamic.php7'],form_radio('send_errormail','0'));?><br />
-<?php echo wrap_label('error',form_radio('send_errormail','3'));?><br />
-<?php echo wrap_label('error + warning',form_radio('send_errormail','2'));?><br />
-<?php echo wrap_label('error + warning + information',form_radio('send_errormail','1'));?><br />
-<?php echo parseText($_lang['mutate_settings.dynamic.php8'],array('emailsender'=>$modx->config['emailsender']));?></td>
+<?php echo wrap_label($_lang['mutate_settings.dynamic.php7'], form_radio('send_errormail', '0')); ?><br />
+<?php echo wrap_label('error', form_radio('send_errormail', '3')); ?><br />
+<?php echo wrap_label('error + warning', form_radio('send_errormail', '2')); ?><br />
+<?php echo wrap_label('error + warning + information', form_radio('send_errormail', '1')); ?><br />
+<?php echo parseText($_lang['mutate_settings.dynamic.php8'], array('emailsender'=>$modx->config['emailsender'])); ?></td>
 </tr>
    <tr>
     <td colspan="2"><div class="split"></div></td>
@@ -115,8 +115,8 @@  discard block
 block discarded – undo
 <tr>
 <th><?php echo $_lang['enable_bindings_title'] ?><br><small>[(enable_bindings)]</small></th>
 <td>
-<?php echo wrap_label($_lang['yes'],form_radio('enable_bindings','1'));?><br />
-<?php echo wrap_label($_lang['no'], form_radio('enable_bindings','0'));?>
+<?php echo wrap_label($_lang['yes'], form_radio('enable_bindings', '1')); ?><br />
+<?php echo wrap_label($_lang['no'], form_radio('enable_bindings', '0')); ?>
 
 </td>
 </tr>
@@ -157,20 +157,20 @@  discard block
 block discarded – undo
 <th><?php echo $_lang['pwd_hash_algo_title'] ?><br><small>[(pwd_hash_algo)]</small></th>
 <td>
 <?php
-if(empty($pwd_hash_algo)) $phm['sel']['UNCRYPT'] = 1;
-$phm['e']['BLOWFISH_Y'] = $modx->manager->checkHashAlgorithm('BLOWFISH_Y') ? 0:1;
-$phm['e']['BLOWFISH_A'] = $modx->manager->checkHashAlgorithm('BLOWFISH_A') ? 0:1;
-$phm['e']['SHA512']     = $modx->manager->checkHashAlgorithm('SHA512') ? 0:1;
-$phm['e']['SHA256']     = $modx->manager->checkHashAlgorithm('SHA256') ? 0:1;
-$phm['e']['MD5']        = $modx->manager->checkHashAlgorithm('MD5') ? 0:1;
-$phm['e']['UNCRYPT']    = $modx->manager->checkHashAlgorithm('UNCRYPT') ? 0:1;
+if (empty($pwd_hash_algo)) $phm['sel']['UNCRYPT'] = 1;
+$phm['e']['BLOWFISH_Y'] = $modx->manager->checkHashAlgorithm('BLOWFISH_Y') ? 0 : 1;
+$phm['e']['BLOWFISH_A'] = $modx->manager->checkHashAlgorithm('BLOWFISH_A') ? 0 : 1;
+$phm['e']['SHA512']     = $modx->manager->checkHashAlgorithm('SHA512') ? 0 : 1;
+$phm['e']['SHA256']     = $modx->manager->checkHashAlgorithm('SHA256') ? 0 : 1;
+$phm['e']['MD5']        = $modx->manager->checkHashAlgorithm('MD5') ? 0 : 1;
+$phm['e']['UNCRYPT']    = $modx->manager->checkHashAlgorithm('UNCRYPT') ? 0 : 1;
 ?>
-<?php echo wrap_label('CRYPT_BLOWFISH_Y (salt &amp; stretch)',form_radio('pwd_hash_algo','BLOWFISH_Y', '', $phm['e']['BLOWFISH_Y']));?><br />
-<?php echo wrap_label('CRYPT_BLOWFISH_A (salt &amp; stretch)',form_radio('pwd_hash_algo','BLOWFISH_A', '', $phm['e']['BLOWFISH_A']));?><br />
-<?php echo wrap_label('CRYPT_SHA512 (salt &amp; stretch)'    ,form_radio('pwd_hash_algo','SHA512'    , '', $phm['e']['SHA512']));?><br />
-<?php echo wrap_label('CRYPT_SHA256 (salt &amp; stretch)'    ,form_radio('pwd_hash_algo','SHA256'    , '', $phm['e']['SHA256']));?><br />
-<?php echo wrap_label('CRYPT_MD5 (salt &amp; stretch)'       ,form_radio('pwd_hash_algo','MD5'       , '', $phm['e']['MD5']));?><br />
-<?php echo wrap_label('UNCRYPT(32 chars salt + SHA-1 hash)'  ,form_radio('pwd_hash_algo','UNCRYPT'  , '', $phm['e']['UNCRYPT']));?>
+<?php echo wrap_label('CRYPT_BLOWFISH_Y (salt &amp; stretch)', form_radio('pwd_hash_algo', 'BLOWFISH_Y', '', $phm['e']['BLOWFISH_Y'])); ?><br />
+<?php echo wrap_label('CRYPT_BLOWFISH_A (salt &amp; stretch)', form_radio('pwd_hash_algo', 'BLOWFISH_A', '', $phm['e']['BLOWFISH_A'])); ?><br />
+<?php echo wrap_label('CRYPT_SHA512 (salt &amp; stretch)', form_radio('pwd_hash_algo', 'SHA512', '', $phm['e']['SHA512'])); ?><br />
+<?php echo wrap_label('CRYPT_SHA256 (salt &amp; stretch)', form_radio('pwd_hash_algo', 'SHA256', '', $phm['e']['SHA256'])); ?><br />
+<?php echo wrap_label('CRYPT_MD5 (salt &amp; stretch)', form_radio('pwd_hash_algo', 'MD5', '', $phm['e']['MD5'])); ?><br />
+<?php echo wrap_label('UNCRYPT(32 chars salt + SHA-1 hash)', form_radio('pwd_hash_algo', 'UNCRYPT', '', $phm['e']['UNCRYPT'])); ?>
 </td>
 </tr>
 <tr>
@@ -186,13 +186,13 @@  discard block
 block discarded – undo
   ?>
 <?php
 $gdAvailable = extension_loaded('gd');
-if(!$gdAvailable) $use_captcha = 0;
+if (!$gdAvailable) $use_captcha = 0;
 ?>
   <tr>
     <td nowrap class="warning"><?php echo $_lang['captcha_title'] ?><br><small>[(use_captcha)]</small></td>
-    <td> <label><input type="radio" id="captchaOn" name="use_captcha" value="1" <?php echo ($use_captcha==1) ? 'checked="checked"' : "" ; echo (!$gdAvailable)? ' readonly="readonly"' : ''; ?> />
+    <td> <label><input type="radio" id="captchaOn" name="use_captcha" value="1" <?php echo ($use_captcha == 1) ? 'checked="checked"' : ""; echo (!$gdAvailable) ? ' readonly="readonly"' : ''; ?> />
       <?php echo $_lang['yes']?></label><br />
-      <label><input type="radio" id="captchaOff" name="use_captcha" value="0" <?php echo ($use_captcha==0) ? 'checked="checked"' : "" ; echo (!$gdAvailable)? ' readonly="readonly"' : '';?> />
+      <label><input type="radio" id="captchaOff" name="use_captcha" value="0" <?php echo ($use_captcha == 0) ? 'checked="checked"' : ""; echo (!$gdAvailable) ? ' readonly="readonly"' : ''; ?> />
       <?php echo $_lang['no']?></label> </td>
   </tr>
   <tr>
@@ -202,23 +202,23 @@  discard block
 block discarded – undo
   <tr>
     <td colspan="2"><div class="split"></div></td>
   </tr>
-  <tr class="captchaRow" <?php echo showHide($use_captcha==1);?>>
+  <tr class="captchaRow" <?php echo showHide($use_captcha == 1); ?>>
     <td nowrap class="warning"><?php echo $_lang['captcha_words_title'] ?><br><small>[(captcha_words)]</small>
       <br />
       <p><?php echo $_lang['update_settings_from_language']; ?></p>
       <select name="reload_captcha_words" id="reload_captcha_words_select" onchange="confirmLangChange(this, 'captcha_words_default', 'captcha_words_input');">
-<?php echo get_lang_options('captcha_words_default');?>
+<?php echo get_lang_options('captcha_words_default'); ?>
       </select>
     </td>
     <td><input type="text" id="captcha_words_input" name="captcha_words" style="width:250px" value="<?php echo $captcha_words; ?>" />
-        <input type="hidden" name="captcha_words_default" id="captcha_words_default_hidden" value="<?php echo addslashes($_lang['captcha_words_default']);?>" />
+        <input type="hidden" name="captcha_words_default" id="captcha_words_default_hidden" value="<?php echo addslashes($_lang['captcha_words_default']); ?>" />
     </td>
   </tr>
-  <tr class="captchaRow" <?php echo showHide($use_captcha==1);?>>
+  <tr class="captchaRow" <?php echo showHide($use_captcha == 1); ?>>
     <td width="200">&nbsp;</td>
     <td class="comment"><?php echo $_lang['captcha_words_message'] ?></td>
   </tr>
-  <tr class="captchaRow" <?php echo showHide($use_captcha==1);?>>
+  <tr class="captchaRow" <?php echo showHide($use_captcha == 1); ?>>
     <td colspan="2"><div class="split"></div></td>
   </tr>
   <tr>
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
         <?php
             // invoke OnMiscSettingsRender event
             $evtOut = $modx->invokeEvent('OnSecuritySettingsRender');
-            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.

		@@ -1,6 +1,6 @@ discard block
		block discarded – undo
1	1	<?php
2	2	$MODX_SITE_HOSTNAMES = MODX_SITE_HOSTNAMES; // Fix for PHP 5.4
3		- if(empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) {
	3	+ if (empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) {
4	4	$valid_hostnames = $_SERVER['HTTP_HOST'];
5	5	} else {
6	6	$valid_hostnames = $MODX_SITE_HOSTNAMES;
		@@ -15,10 +15,10 @@ discard block
		block discarded – undo
15	15	<tr>
16	16	<th><?php echo $_lang['allow_eval_title']; ?><br><small>[(allow_eval)]</small></th>
17	17	<td>
18		-<?php echo wrap_label($_lang['allow_eval_with_scan'] , form_radio('allow_eval','with_scan'));?><br />
19		-<?php echo wrap_label($_lang['allow_eval_with_scan_at_post'] , form_radio('allow_eval','with_scan_at_post'));?><br />
20		-<?php echo wrap_label($_lang['allow_eval_everytime_eval'] , form_radio('allow_eval','everytime_eval'));?><br />
21		-<?php echo wrap_label($_lang['allow_eval_dont_eval'] , form_radio('allow_eval','dont_eval'));?>
	18	+<?php echo wrap_label($_lang['allow_eval_with_scan'], form_radio('allow_eval', 'with_scan')); ?><br />
	19	+<?php echo wrap_label($_lang['allow_eval_with_scan_at_post'], form_radio('allow_eval', 'with_scan_at_post')); ?><br />
	20	+<?php echo wrap_label($_lang['allow_eval_everytime_eval'], form_radio('allow_eval', 'everytime_eval')); ?><br />
	21	+<?php echo wrap_label($_lang['allow_eval_dont_eval'], form_radio('allow_eval', 'dont_eval')); ?>
22	22	<div class="comment">
23	23	<?php echo $_lang['allow_eval_msg'] ?>
24	24	</div>
		@@ -43,7 +43,7 @@ discard block
		block discarded – undo
43	43	<tr>
44	44	<th><?php echo $_lang['check_files_onlogin_title'] ?><br><small>[(check_files_onlogin)]</small></th>
45	45	<td>
46		- <textarea name="check_files_onlogin"><?php echo $check_files_onlogin;?></textarea><br />
	46	+ <textarea name="check_files_onlogin"><?php echo $check_files_onlogin; ?></textarea><br />
47	47
48	48	</td>
49	49	</tr>
		@@ -53,8 +53,8 @@ discard block
		block discarded – undo
53	53	<tr>
54	54	<td nowrap class="warning"><?php echo $_lang['validate_referer_title'] ?><br><small>[(validate_referer)]</small></td>
55	55	<td>
56		- <?php echo wrap_label($_lang['yes'],form_radio('validate_referer', 1));?><br />
57		- <?php echo wrap_label($_lang['no'], form_radio('validate_referer', 0));?>
	56	+ <?php echo wrap_label($_lang['yes'], form_radio('validate_referer', 1)); ?><br />
	57	+ <?php echo wrap_label($_lang['no'], form_radio('validate_referer', 0)); ?>
58	58	</td>
59	59	</tr>
60	60	<tr>
		@@ -89,25 +89,25 @@ discard block
		block discarded – undo
89	89	<tr>
90	90	<th><?php echo $_lang['a17_error_reporting_title']; ?><br><small>[(error_reporting)]</small></th>
91	91	<td>
92		-<?php echo wrap_label($_lang['a17_error_reporting_opt0'], form_radio('error_reporting','0'));?><br />
93		-<?php echo wrap_label($_lang['a17_error_reporting_opt1'], form_radio('error_reporting','1'));?><br />
94		-<?php echo wrap_label($_lang['a17_error_reporting_opt2'], form_radio('error_reporting','2'));?><br />
95		-<?php echo wrap_label($_lang['a17_error_reporting_opt99'],form_radio('error_reporting','99'));?>
	92	+<?php echo wrap_label($_lang['a17_error_reporting_opt0'], form_radio('error_reporting', '0')); ?><br />
	93	+<?php echo wrap_label($_lang['a17_error_reporting_opt1'], form_radio('error_reporting', '1')); ?><br />
	94	+<?php echo wrap_label($_lang['a17_error_reporting_opt2'], form_radio('error_reporting', '2')); ?><br />
	95	+<?php echo wrap_label($_lang['a17_error_reporting_opt99'], form_radio('error_reporting', '99')); ?>
96	96	</td>
97	97	</tr>
98	98	<tr>
99	99	<td width="200"> </td>
100		- <td class="comment"> <?php echo $_lang['a17_error_reporting_msg'];?></td>
	100	+ <td class="comment"> <?php echo $_lang['a17_error_reporting_msg']; ?></td>
101	101	</tr>
102	102	<tr><td colspan="2"><div class="split"></div></td></tr>
103	103	<tr>
104	104	<th><?php echo $_lang['mutate_settings.dynamic.php6']; ?><br><small>[(send_errormail)]</small></th>
105	105	<td>
106		-<?php echo wrap_label($_lang['mutate_settings.dynamic.php7'],form_radio('send_errormail','0'));?><br />
107		-<?php echo wrap_label('error',form_radio('send_errormail','3'));?><br />
108		-<?php echo wrap_label('error + warning',form_radio('send_errormail','2'));?><br />
109		-<?php echo wrap_label('error + warning + information',form_radio('send_errormail','1'));?><br />
110		-<?php echo parseText($_lang['mutate_settings.dynamic.php8'],array('emailsender'=>$modx->config['emailsender']));?></td>
	106	+<?php echo wrap_label($_lang['mutate_settings.dynamic.php7'], form_radio('send_errormail', '0')); ?><br />
	107	+<?php echo wrap_label('error', form_radio('send_errormail', '3')); ?><br />
	108	+<?php echo wrap_label('error + warning', form_radio('send_errormail', '2')); ?><br />
	109	+<?php echo wrap_label('error + warning + information', form_radio('send_errormail', '1')); ?><br />
	110	+<?php echo parseText($_lang['mutate_settings.dynamic.php8'], array('emailsender'=>$modx->config['emailsender'])); ?></td>
111	111	</tr>
112	112	<tr>
113	113	<td colspan="2"><div class="split"></div></td>
		@@ -115,8 +115,8 @@ discard block
		block discarded – undo
115	115	<tr>
116	116	<th><?php echo $_lang['enable_bindings_title'] ?><br><small>[(enable_bindings)]</small></th>
117	117	<td>
118		-<?php echo wrap_label($_lang['yes'],form_radio('enable_bindings','1'));?><br />
119		-<?php echo wrap_label($_lang['no'], form_radio('enable_bindings','0'));?>
	118	+<?php echo wrap_label($_lang['yes'], form_radio('enable_bindings', '1')); ?><br />
	119	+<?php echo wrap_label($_lang['no'], form_radio('enable_bindings', '0')); ?>
120	120
121	121	</td>
122	122	</tr>
		@@ -157,20 +157,20 @@ discard block
		block discarded – undo
157	157	<th><?php echo $_lang['pwd_hash_algo_title'] ?><br><small>[(pwd_hash_algo)]</small></th>
158	158	<td>
159	159	<?php
160		-if(empty($pwd_hash_algo)) $phm['sel']['UNCRYPT'] = 1;
161		-$phm['e']['BLOWFISH_Y'] = $modx->manager->checkHashAlgorithm('BLOWFISH_Y') ? 0:1;
162		-$phm['e']['BLOWFISH_A'] = $modx->manager->checkHashAlgorithm('BLOWFISH_A') ? 0:1;
163		-$phm['e']['SHA512'] = $modx->manager->checkHashAlgorithm('SHA512') ? 0:1;
164		-$phm['e']['SHA256'] = $modx->manager->checkHashAlgorithm('SHA256') ? 0:1;
165		-$phm['e']['MD5'] = $modx->manager->checkHashAlgorithm('MD5') ? 0:1;
166		-$phm['e']['UNCRYPT'] = $modx->manager->checkHashAlgorithm('UNCRYPT') ? 0:1;
	160	+if (empty($pwd_hash_algo)) $phm['sel']['UNCRYPT'] = 1;
	161	+$phm['e']['BLOWFISH_Y'] = $modx->manager->checkHashAlgorithm('BLOWFISH_Y') ? 0 : 1;
	162	+$phm['e']['BLOWFISH_A'] = $modx->manager->checkHashAlgorithm('BLOWFISH_A') ? 0 : 1;
	163	+$phm['e']['SHA512'] = $modx->manager->checkHashAlgorithm('SHA512') ? 0 : 1;
	164	+$phm['e']['SHA256'] = $modx->manager->checkHashAlgorithm('SHA256') ? 0 : 1;
	165	+$phm['e']['MD5'] = $modx->manager->checkHashAlgorithm('MD5') ? 0 : 1;
	166	+$phm['e']['UNCRYPT'] = $modx->manager->checkHashAlgorithm('UNCRYPT') ? 0 : 1;
167	167	?>
168		-<?php echo wrap_label('CRYPT_BLOWFISH_Y (salt & stretch)',form_radio('pwd_hash_algo','BLOWFISH_Y', '', $phm['e']['BLOWFISH_Y']));?><br />
169		-<?php echo wrap_label('CRYPT_BLOWFISH_A (salt & stretch)',form_radio('pwd_hash_algo','BLOWFISH_A', '', $phm['e']['BLOWFISH_A']));?><br />
170		-<?php echo wrap_label('CRYPT_SHA512 (salt & stretch)' ,form_radio('pwd_hash_algo','SHA512' , '', $phm['e']['SHA512']));?><br />
171		-<?php echo wrap_label('CRYPT_SHA256 (salt & stretch)' ,form_radio('pwd_hash_algo','SHA256' , '', $phm['e']['SHA256']));?><br />
172		-<?php echo wrap_label('CRYPT_MD5 (salt & stretch)' ,form_radio('pwd_hash_algo','MD5' , '', $phm['e']['MD5']));?><br />
173		-<?php echo wrap_label('UNCRYPT(32 chars salt + SHA-1 hash)' ,form_radio('pwd_hash_algo','UNCRYPT' , '', $phm['e']['UNCRYPT']));?>
	168	+<?php echo wrap_label('CRYPT_BLOWFISH_Y (salt & stretch)', form_radio('pwd_hash_algo', 'BLOWFISH_Y', '', $phm['e']['BLOWFISH_Y'])); ?><br />
	169	+<?php echo wrap_label('CRYPT_BLOWFISH_A (salt & stretch)', form_radio('pwd_hash_algo', 'BLOWFISH_A', '', $phm['e']['BLOWFISH_A'])); ?><br />
	170	+<?php echo wrap_label('CRYPT_SHA512 (salt & stretch)', form_radio('pwd_hash_algo', 'SHA512', '', $phm['e']['SHA512'])); ?><br />
	171	+<?php echo wrap_label('CRYPT_SHA256 (salt & stretch)', form_radio('pwd_hash_algo', 'SHA256', '', $phm['e']['SHA256'])); ?><br />
	172	+<?php echo wrap_label('CRYPT_MD5 (salt & stretch)', form_radio('pwd_hash_algo', 'MD5', '', $phm['e']['MD5'])); ?><br />
	173	+<?php echo wrap_label('UNCRYPT(32 chars salt + SHA-1 hash)', form_radio('pwd_hash_algo', 'UNCRYPT', '', $phm['e']['UNCRYPT'])); ?>
174	174	</td>
175	175	</tr>
176	176	<tr>
		@@ -186,13 +186,13 @@ discard block
		block discarded – undo
186	186	?>
187	187	<?php
188	188	$gdAvailable = extension_loaded('gd');
189		-if(!$gdAvailable) $use_captcha = 0;
	189	+if (!$gdAvailable) $use_captcha = 0;
190	190	?>
191	191	<tr>
192	192	<td nowrap class="warning"><?php echo $_lang['captcha_title'] ?><br><small>[(use_captcha)]</small></td>
193		- <td> <label><input type="radio" id="captchaOn" name="use_captcha" value="1" <?php echo ($use_captcha==1) ? 'checked="checked"' : "" ; echo (!$gdAvailable)? ' readonly="readonly"' : ''; ?> />
	193	+ <td> <label><input type="radio" id="captchaOn" name="use_captcha" value="1" <?php echo ($use_captcha == 1) ? 'checked="checked"' : ""; echo (!$gdAvailable) ? ' readonly="readonly"' : ''; ?> />
194	194	<?php echo $_lang['yes']?></label><br />
195		- <label><input type="radio" id="captchaOff" name="use_captcha" value="0" <?php echo ($use_captcha==0) ? 'checked="checked"' : "" ; echo (!$gdAvailable)? ' readonly="readonly"' : '';?> />
	195	+ <label><input type="radio" id="captchaOff" name="use_captcha" value="0" <?php echo ($use_captcha == 0) ? 'checked="checked"' : ""; echo (!$gdAvailable) ? ' readonly="readonly"' : ''; ?> />
196	196	<?php echo $_lang['no']?></label> </td>
197	197	</tr>
198	198	<tr>
		@@ -202,23 +202,23 @@ discard block
		block discarded – undo
202	202	<tr>
203	203	<td colspan="2"><div class="split"></div></td>
204	204	</tr>
205		- <tr class="captchaRow" <?php echo showHide($use_captcha==1);?>>
	205	+ <tr class="captchaRow" <?php echo showHide($use_captcha == 1); ?>>
206	206	<td nowrap class="warning"><?php echo $_lang['captcha_words_title'] ?><br><small>[(captcha_words)]</small>
207	207	<br />
208	208	<p><?php echo $_lang['update_settings_from_language']; ?></p>
209	209	<select name="reload_captcha_words" id="reload_captcha_words_select" onchange="confirmLangChange(this, 'captcha_words_default', 'captcha_words_input');">
210		-<?php echo get_lang_options('captcha_words_default');?>
	210	+<?php echo get_lang_options('captcha_words_default'); ?>
211	211	</select>
212	212	</td>
213	213	<td><input type="text" id="captcha_words_input" name="captcha_words" style="width:250px" value="<?php echo $captcha_words; ?>" />
214		- <input type="hidden" name="captcha_words_default" id="captcha_words_default_hidden" value="<?php echo addslashes($_lang['captcha_words_default']);?>" />
	214	+ <input type="hidden" name="captcha_words_default" id="captcha_words_default_hidden" value="<?php echo addslashes($_lang['captcha_words_default']); ?>" />
215	215	</td>
216	216	</tr>
217		- <tr class="captchaRow" <?php echo showHide($use_captcha==1);?>>
	217	+ <tr class="captchaRow" <?php echo showHide($use_captcha == 1); ?>>
218	218	<td width="200"> </td>
219	219	<td class="comment"><?php echo $_lang['captcha_words_message'] ?></td>
220	220	</tr>
221		- <tr class="captchaRow" <?php echo showHide($use_captcha==1);?>>
	221	+ <tr class="captchaRow" <?php echo showHide($use_captcha == 1); ?>>
222	222	<td colspan="2"><div class="split"></div></td>
223	223	</tr>
224	224	<tr>
		@@ -226,7 +226,7 @@ discard block
		block discarded – undo
226	226	<?php
227	227	// invoke OnMiscSettingsRender event
228	228	$evtOut = $modx->invokeEvent('OnSecuritySettingsRender');
229		- if(is_array($evtOut)) echo implode("",$evtOut);
	229	+ if (is_array($evtOut)) echo implode("", $evtOut);
230	230	?>
231	231	</td>
232	232	</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>

evolution-cms / evolution

Pull Request — develop (#702)

Status

Category

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

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