evolution-cms / evolution

manager/actions/mutate_settings/tab5_security_settings.inc.php

Spacing +42 added lines, -42 removed lines

@@ -1,6 +1,6 @@ 
 <?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 @@ 
 <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 @@ 
 <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 @@ 
     <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 @@ 
   <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 @@ 
 <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 @@ 
 <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 @@ 
   ?>

 <?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 @@ 
   <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 @@ 
         <?php

             // invoke OnMiscSettingsRender event

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

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

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

         ?>

     </td>

   </tr>

Braces +11 added lines, -5 removed lines

@@ -1,8 +1,8 @@ 
 <?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 {

+    } else {
         $valid_hostnames = $MODX_SITE_HOSTNAMES;

     }

 ?>

@@ -157,7 +157,9 @@ 
 <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;

+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;

@@ -186,7 +188,9 @@ 
   ?>

 <?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>

@@ -226,7 +230,9 @@ 
         <?php

             // invoke OnMiscSettingsRender event

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

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

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

     </td>

   </tr>

manager/actions/mutate_settings/tab6_filemanager_settings.inc.php

Spacing +1 added lines, -1 removed lines

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

             // invoke OnMiscSettingsRender event

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

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

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

         ?>

     </td>

   </tr>

Braces +3 added lines, -1 removed lines

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

             // invoke OnMiscSettingsRender event

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

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

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

     </td>

   </tr>