evolution-cms / evolution

manager/actions/mutate_settings/tab3_user_settings.inc.php

Braces +3 added lines, -1 removed lines

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

             // invoke OnUserSettingsRender event

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

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

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

     </td>

   </tr>

Spacing +23 added lines, -23 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>

@@ -144,8 +144,8 @@ 
   <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 @@ 
         <?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/actions/mutate_settings/tab7_filebrowser_settings.inc.php

Spacing +58 added lines, -58 removed lines

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

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

     <td>

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

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

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

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

     </td>

   </tr>

   <tr>

@@ -18,7 +18,7 @@ 
     <td colspan="2"><div class="split"></div></td>

   </tr>

   

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

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

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

     <td>

         <select name="which_browser" size="1" class="inputBox" onchange="documentDirty=true;">

@@ -27,206 +27,206 @@ 
                 $dir = str_replace('\\', '/', $dir);

                 $browser_name = substr($dir, strrpos($dir, '/') + 1);

                 $selected = $browser_name == $which_browser ? ' selected="selected"' : '';

-                echo '<option value="' . $browser_name . '"' . $selected . '>' . "{$browser_name}</option>\n";

+                echo '<option value="'.$browser_name.'"'.$selected.'>'."{$browser_name}</option>\n";

             }

             ?>

         </select>

     </td>

   </tr>

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

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

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

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

   </tr>

   <tr>

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

   </tr>

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

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

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

     <td>

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

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

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

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

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

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

     </td>

   </tr>

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

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

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

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

   </tr>

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

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

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

   </tr>

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

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

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

     <td>

         <?php echo $_lang['default']; ?> <span id="default_rb_base_dir">[(base_path)]assets/</span><br />

         <input onchange="documentDirty=true;" type="text" maxlength="255" style="width: 250px;" name="rb_base_dir" id="rb_base_dir" value="<?php echo $rb_base_dir; ?>" /> <input type="button" onclick="reset_path('rb_base_dir');" value="<?php echo $_lang['reset']; ?>" name="reset_rb_base_dir">

     </td>

   </tr>

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

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

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

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

   </tr>

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

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

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

   </tr>

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

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

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

     <td>

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

       </td>

   </tr>

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

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

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

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

   </tr>

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

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

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

   </tr>

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

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

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

       <td>

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

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

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

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

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

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

       </td>

   </tr>

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

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

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

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

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

     </tr>

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

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

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

   </tr>

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

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

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

     <td>

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

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

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

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

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

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

     </td>

   </tr>

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

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

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

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

   </tr>

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

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

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

   </tr>

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

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

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

     <td>

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

     </td>

   </tr>

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

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

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

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

   </tr>

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

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

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

   </tr>

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

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

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

     <td>

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

     </td>

   </tr>

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

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

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

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

   </tr>

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

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

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

   </tr>

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

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

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

     <td>

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

     </td>

   </tr>

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

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

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

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

   </tr>

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

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

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

   </tr>

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

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

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

     <td>

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

     </td>

   </tr>

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

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

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

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

   </tr>

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

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

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

   </tr>

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

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

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

     <td>

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

     </td>

   </tr>

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

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

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

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

   </tr>

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

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

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

   </tr>

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

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

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

     <td>

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

     </td>

   </tr>

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

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

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

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

   </tr>

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

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

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

   </tr>

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

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

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

         <td>

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

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

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

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

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

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

         </td>

   </tr>

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

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

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

   </tr>

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

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

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

         <td>

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

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

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

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

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

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

         </td>

   </tr>

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

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

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

   </tr>

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

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

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

        <td>

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

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

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

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

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

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

         </td>

   </tr>

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

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

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

   </tr>

   

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

             // invoke OnMiscSettingsRender event

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

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

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

         ?>

     </td>

   </tr>

Braces +4 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
     <td>

         <select name="which_browser" size="1" class="inputBox" onchange="documentDirty=true;">

             <?php

-            foreach (glob("media/browser/*", GLOB_ONLYDIR) as $dir) {

+            foreach (glob("media/browser/*", GLOB_ONLYDIR) as $dir) {
                 $dir = str_replace('\\', '/', $dir);

                 $browser_name = substr($dir, strrpos($dir, '/') + 1);

                 $selected = $browser_name == $which_browser ? ' selected="selected"' : '';

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

             // invoke OnMiscSettingsRender event

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

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

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

     </td>

   </tr>

manager/actions/mutate_settings/tab4_manager_settings.inc.php

Braces +10 added lines, -10 removed lines

@@ -49,9 +49,9 @@ 
                 <select name="manager_theme" size="1" class="inputBox" onChange="documentDirty=true; document.forms['settings'].theme_refresher.value = Date.parse(new Date());">

                     <?php

                     $dir = dir("media/style/");

-                    while ($file = $dir->read()) {

-                        if ($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {

-                            if ($file === 'common') {

+                    while ($file = $dir->read()) {
+                        if ($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {
+                            if ($file === 'common') {
                                 continue;

                             }

                             $themename = $file;

@@ -209,7 +209,7 @@ 
                     $tpl = '<option value="[+value+]" [+selected+]>[+title+]</option>' . "\n";

                     $option = explode(',', $_lang['settings_group_tv_options']);

                     $output = array();

-                    foreach ($option as $k => $v) {

+                    foreach ($option as $k => $v) {
                         $selected = ($k == $group_tvs) ? 'selected' : '';

                         $s = array('[+value+]', '[+selected+]', '[+title+]');

                         $r = array($k, $selected, $v);

@@ -282,7 +282,7 @@ 
                     $tpl = '<option value="[+value+]" [+selected+]>[*[+value+]*]</option>' . "\n";

                     $option = array('pagetitle', 'longtitle', 'menutitle', 'alias', 'createdon', 'editedon', 'publishedon');

                     $output = array();

-                    foreach ($option as $v) {

+                    foreach ($option as $v) {
                         $selected = ($v == $resource_tree_node_name) ? 'selected' : '';

                         $s = array('[+value+]', '[+selected+]');

                         $r = array($v, $selected);

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

                     $datetime_format_list = array('dd-mm-YYYY', 'mm/dd/YYYY', 'YYYY/mm/dd');

                     $str = '';

-                    foreach ($datetime_format_list as $value) {

+                    foreach ($datetime_format_list as $value) {
                         $selectedtext = ($datetime_format == $value) ? ' selected' : '';

                         $str .= '<option value="' . $value . '"' . $selectedtext . '>';

                         $str .= $value . '</option>' . PHP_EOL;

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

         // invoke OnRichTextEditorRegister event

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

-        if (!is_array($evtOut)) {

+        if (!is_array($evtOut)) {
             $evtOut = array();

             $use_editor = 0;

         }

@@ -477,8 +477,8 @@ 
                     <?php

                     // invoke OnRichTextEditorRegister event

                     echo "<option value='none'" . ($which_editor == 'none' ? " selected='selected'" : "") . ">" . $_lang['none'] . "</option>\n";

-                    if (is_array($evtOut)) {

-                        foreach ($evtOut as $editor) {

+                    if (is_array($evtOut)) {
+                        foreach ($evtOut as $editor) {
                             echo "<option value='$editor'" . ($which_editor == $editor ? " selected='selected'" : "") . ">$editor</option>\n";

                         }

                     }

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

                 // invoke OnInterfaceSettingsRender event

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

-                if (is_array($evtOut)) {

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

                 }

                 ?>

Spacing +14 added lines, -14 removed lines

@@ -56,7 +56,7 @@ 
                             }

                             $themename = $file;

                             $selectedtext = $themename == $manager_theme ? "selected='selected'" : "";

-                            echo "<option value='$themename' $selectedtext>" . ucwords(str_replace("_", " ", $themename)) . "</option>";

+                            echo "<option value='$themename' $selectedtext>".ucwords(str_replace("_", " ", $themename))."</option>";

                         }

                     }

                     $dir->close();

@@ -124,7 +124,7 @@ 
             function BrowseServer() {

               var w = screen.width * 0.7;

               var h = screen.height * 0.7;

-              OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser;?>/browser.php?Type=images", w, h);

+              OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser; ?>/browser.php?Type=images", w, h);

             }

 

             function SetUrl(url, width, height, alt) {

@@ -162,7 +162,7 @@ 
             function BrowseServer() {

               var w = screen.width * 0.7;

               var h = screen.height * 0.7;

-              OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser;?>/browser.php?Type=images", w, h);

+              OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser; ?>/browser.php?Type=images", w, h);

             }

 

             function SetUrl(url, width, height, alt) {

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

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

         <td>

-            <?php echo wrap_label($_lang['login_form_position_left'],form_radio('login_form_position', 'left'));?><br />

-            <?php echo wrap_label($_lang['login_form_position_center'], form_radio('login_form_position', 'center'));?><br />

-            <?php echo wrap_label($_lang['login_form_position_right'], form_radio('login_form_position', 'right'));?>

+            <?php echo wrap_label($_lang['login_form_position_left'], form_radio('login_form_position', 'left')); ?><br />

+            <?php echo wrap_label($_lang['login_form_position_center'], form_radio('login_form_position', 'center')); ?><br />

+            <?php echo wrap_label($_lang['login_form_position_right'], form_radio('login_form_position', 'right')); ?>

         </td>

       </tr>

          <tr>

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

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

         <td>

-            <?php echo wrap_label($_lang['manager_menu_position_top'],form_radio('manager_menu_position', 'top'));?><br />

-            <?php echo wrap_label($_lang['manager_menu_position_left'], form_radio('manager_menu_position', 'left'));?><br />

+            <?php echo wrap_label($_lang['manager_menu_position_top'], form_radio('manager_menu_position', 'top')); ?><br />

+            <?php echo wrap_label($_lang['manager_menu_position_left'], form_radio('manager_menu_position', 'left')); ?><br />

         </td>

       </tr>

 

@@ -337,7 +337,7 @@ 
             <td>

                 <select name="group_tvs" size="1" class="form-control">

                     <?php

-                    $tpl = '<option value="[+value+]" [+selected+]>[+title+]</option>' . "\n";

+                    $tpl = '<option value="[+value+]" [+selected+]>[+title+]</option>'."\n";

                     $option = explode(',', $_lang['settings_group_tv_options']);

                     $output = array();

                     foreach ($option as $k => $v) {

@@ -410,7 +410,7 @@ 
             <td>

                 <select name="resource_tree_node_name" size="1" class="inputBox">

                     <?php

-                    $tpl = '<option value="[+value+]" [+selected+]>[*[+value+]*]</option>' . "\n";

+                    $tpl = '<option value="[+value+]" [+selected+]>[*[+value+]*]</option>'."\n";

                     $option = array('pagetitle', 'longtitle', 'menutitle', 'alias', 'createdon', 'editedon', 'publishedon');

                     $output = array();

                     foreach ($option as $v) {

@@ -496,8 +496,8 @@ 
                     $str = '';

                     foreach ($datetime_format_list as $value) {

                         $selectedtext = ($datetime_format == $value) ? ' selected' : '';

-                        $str .= '<option value="' . $value . '"' . $selectedtext . '>';

-                        $str .= $value . '</option>' . PHP_EOL;

+                        $str .= '<option value="'.$value.'"'.$selectedtext.'>';

+                        $str .= $value.'</option>'.PHP_EOL;

                     }

                     echo $str;

                     ?>

@@ -607,10 +607,10 @@ 
                 <select name="which_editor" onChange="documentDirty=true;">

                     <?php

                     // invoke OnRichTextEditorRegister event

-                    echo "<option value='none'" . ($which_editor == 'none' ? " selected='selected'" : "") . ">" . $_lang['none'] . "</option>\n";

+                    echo "<option value='none'".($which_editor == 'none' ? " selected='selected'" : "").">".$_lang['none']."</option>\n";

                     if (is_array($evtOut)) {

                         foreach ($evtOut as $editor) {

-                            echo "<option value='$editor'" . ($which_editor == $editor ? " selected='selected'" : "") . ">$editor</option>\n";

+                            echo "<option value='$editor'".($which_editor == $editor ? " selected='selected'" : "").">$editor</option>\n";

                         }

                     }

                     ?>

manager/actions/mutate_settings/tab1_site_settings.inc.php

Braces +16 added lines, -13 removed lines

@@ -82,23 +82,23 @@ 
         <?php

         

         $currentCategory = '';

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

+                        while ($row = $modx->db->getRow($rs)) {
             $thisCategory = $row['category'];

-            if($thisCategory == null) {

+            if($thisCategory == null) {
                 $thisCategory = $_lang['no_category'];

             }

-            if($thisCategory != $currentCategory) {

-                if($closeOptGroup) {

+            if($thisCategory != $currentCategory) {
+                if($closeOptGroup) {
                     echo "\t\t\t\t\t</optgroup>\n";

                 }

                 echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n";

                 $closeOptGroup = true;

-            } else {

+            } else {
                 $closeOptGroup = false;

             }

             

             $selectedtext = $row['id'] == $default_template ? ' selected="selected"' : '';

-            if ($selectedtext) {

+            if ($selectedtext) {
                 $oldTmpId = $row['id'];

                 $oldTmpName = $row['templatename'];

             }

@@ -106,7 +106,7 @@ 
             echo "\t\t\t\t\t".'<option value="'.$row['id'].'"'.$selectedtext.'>'.$row['templatename']."</option>\n";

             $currentCategory = $thisCategory;

         }

-        if($thisCategory != '') {

+        if($thisCategory != '') {
             echo "\t\t\t\t\t</optgroup>\n";

         }

 ?>

@@ -138,11 +138,12 @@ 
               $modx->db->select('id', '[+prefix+]site_plugins', 

               "plugincode LIKE '%phx.parser.class.inc.php%OnParseDocument();%' AND disabled != 1")

             );

-            if($count) {

+            if($count) {
                 $disabledFilters = 1;

                 echo '<b>'.$_lang['enable_filter_phx_warning'].'</b><br/>';

-            }

-            else $disabledFilters = false;

+            } else {
+                $disabledFilters = false;
+            }
         ?>

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

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

@@ -204,7 +205,7 @@ 
     <select name="lst_custom_contenttype" style="width:200px;height:100px;" size="5">

     <?php

         $ct = explode(",",$custom_contenttype);

-        for($i=0;$i<count($ct);$i++) {

+        for($i=0;$i<count($ct);$i++) {
             echo "<option value=\"".$ct[$i]."\">".$ct[$i]."</option>";

         }

     ?>

@@ -259,7 +260,7 @@ 
       <th><?php echo $_lang['serveroffset_title'] ?><br><small>[(server_offset_time)]</small></th>

       <td> <select name="server_offset_time" size="1" class="inputBox">

           <?php

-      for($i=-24; $i<25; $i++) {

+      for($i=-24; $i<25; $i++) {
           $seconds = $i*60*60;

           $selectedtext = $seconds==$server_offset_time ? "selected='selected'" : "" ;

       ?>

@@ -296,7 +297,9 @@ 
         <?php

             // invoke OnSiteSettingsRender event

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

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

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

     </td>

   </tr>

Indentation +9 added lines, -9 removed lines

@@ -1,5 +1,5 @@ 
 <?php

-  $site_unavailable_message_view = isset($site_unavailable_message) ? $site_unavailable_message : $_lang['siteunavailable_message_default'];

+    $site_unavailable_message_view = isset($site_unavailable_message) ? $site_unavailable_message : $_lang['siteunavailable_message_default'];

 ?>

 <style>

 table.sysSettings > tbody td, table.sysSettings > tbody th {border-bottom:1px dotted #ccc;padding:10px;}

@@ -135,8 +135,8 @@ 
         <?php

             // Check if PHX is enabled

             $count = $modx->db->getRecordCount(

-              $modx->db->select('id', '[+prefix+]site_plugins', 

-              "plugincode LIKE '%phx.parser.class.inc.php%OnParseDocument();%' AND disabled != 1")

+                $modx->db->select('id', '[+prefix+]site_plugins', 

+                "plugincode LIKE '%phx.parser.class.inc.php%OnParseDocument();%' AND disabled != 1")

             );

             if($count) {

                 $disabledFilters = 1;

@@ -259,14 +259,14 @@ 
       <th><?php echo $_lang['serveroffset_title'] ?><br><small>[(server_offset_time)]</small></th>

       <td> <select name="server_offset_time" size="1" class="inputBox">

           <?php

-      for($i=-24; $i<25; $i++) {

-          $seconds = $i*60*60;

-          $selectedtext = $seconds==$server_offset_time ? "selected='selected'" : "" ;

-      ?>

+        for($i=-24; $i<25; $i++) {

+            $seconds = $i*60*60;

+            $selectedtext = $seconds==$server_offset_time ? "selected='selected'" : "" ;

+        ?>

           <option value="<?php echo $seconds; ?>" <?php echo $selectedtext; ?>><?php echo $i; ?></option>

           <?php

-      }

-      ?>

+        }

+        ?>

         </select>

         <div class="comment"><?php printf($_lang['serveroffset_message'], strftime('%H:%M:%S', time()), strftime('%H:%M:%S', time()+$server_offset_time)); ?></div>

         </td>

Spacing +50 added lines, -50 removed lines

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

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

     <td>

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

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

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

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

     </td>

   </tr>

   <tr>

@@ -58,12 +58,12 @@ 
       <br />

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

       <select name="reload_site_unavailable" id="reload_site_unavailable_select" onchange="confirmLangChange(this, 'siteunavailable_message_default', 'site_unavailable_message_textarea');">

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

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

       </select>

     </th>

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

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

-  <div class="comment"><?php echo $_lang['siteunavailable_message'];?></div>

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

+  <div class="comment"><?php echo $_lang['siteunavailable_message']; ?></div>

     </td>

   </tr>

   <tr>

@@ -78,17 +78,17 @@ 
             'c.category, t.templatename ASC'

             );

     ?>

-      <select name="default_template" class="inputBox" onchange="documentDirty=true;wrap=document.getElementById('template_reset_options_wrapper');if(this.options[this.selectedIndex].value != '<?php echo $default_template;?>'){wrap.style.display='block';}else{wrap.style.display='none';}" style="width:150px">

+      <select name="default_template" class="inputBox" onchange="documentDirty=true;wrap=document.getElementById('template_reset_options_wrapper');if(this.options[this.selectedIndex].value != '<?php echo $default_template; ?>'){wrap.style.display='block';}else{wrap.style.display='none';}" style="width:150px">

         <?php

         

         $currentCategory = '';

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

             $thisCategory = $row['category'];

-            if($thisCategory == null) {

+            if ($thisCategory == null) {

                 $thisCategory = $_lang['no_category'];

             }

-            if($thisCategory != $currentCategory) {

-                if($closeOptGroup) {

+            if ($thisCategory != $currentCategory) {

+                if ($closeOptGroup) {

                     echo "\t\t\t\t\t</optgroup>\n";

                 }

                 echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n";

@@ -106,7 +106,7 @@ 
             echo "\t\t\t\t\t".'<option value="'.$row['id'].'"'.$selectedtext.'>'.$row['templatename']."</option>\n";

             $currentCategory = $thisCategory;

         }

-        if($thisCategory != '') {

+        if ($thisCategory != '') {

             echo "\t\t\t\t\t</optgroup>\n";

         }

 ?>

@@ -114,19 +114,19 @@ 
           <br />

         <div id="template_reset_options_wrapper" style="display:none;">

             <label><input type="radio" name="reset_template" value="1" /> <?php echo $_lang['template_reset_all']; ?></label><br />

-            <label><input type="radio" name="reset_template" value="2" /> <?php echo sprintf($_lang['template_reset_specific'],$oldTmpName); ?></label>

+            <label><input type="radio" name="reset_template" value="2" /> <?php echo sprintf($_lang['template_reset_specific'], $oldTmpName); ?></label>

         </div>

         <input type="hidden" name="old_template" value="<?php echo $oldTmpId; ?>" />

   <div class="comment"><?php echo $_lang['defaulttemplate_message'] ?></div>

     </td>

   </tr>

   <tr>

-        <th><?php echo $_lang['defaulttemplate_logic_title'];?><br><small>[(auto_template_logic)]</small></th>

+        <th><?php echo $_lang['defaulttemplate_logic_title']; ?><br><small>[(auto_template_logic)]</small></th>

         <td>

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

-            <label><input type="radio" name="auto_template_logic" value="system"<?php if($auto_template_logic == 'system') {echo " checked='checked'";}?>/> <?php echo $_lang['defaulttemplate_logic_system_message']; ?></label><br />

-            <label><input type="radio" name="auto_template_logic" value="parent"<?php if($auto_template_logic == 'parent') {echo " checked='checked'";}?>/> <?php echo $_lang['defaulttemplate_logic_parent_message']; ?></label><br />

-            <label><input type="radio" name="auto_template_logic" value="sibling"<?php if($auto_template_logic == 'sibling') {echo " checked='checked'";}?>/> <?php echo $_lang['defaulttemplate_logic_sibling_message']; ?></label><br />

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

+            <label><input type="radio" name="auto_template_logic" value="system"<?php if ($auto_template_logic == 'system') {echo " checked='checked'"; }?>/> <?php echo $_lang['defaulttemplate_logic_system_message']; ?></label><br />

+            <label><input type="radio" name="auto_template_logic" value="parent"<?php if ($auto_template_logic == 'parent') {echo " checked='checked'"; }?>/> <?php echo $_lang['defaulttemplate_logic_parent_message']; ?></label><br />

+            <label><input type="radio" name="auto_template_logic" value="sibling"<?php if ($auto_template_logic == 'sibling') {echo " checked='checked'"; }?>/> <?php echo $_lang['defaulttemplate_logic_sibling_message']; ?></label><br />

         </td>

     </tr>

     <tr>

@@ -138,22 +138,22 @@ 
               $modx->db->select('id', '[+prefix+]site_plugins', 

               "plugincode LIKE '%phx.parser.class.inc.php%OnParseDocument();%' AND disabled != 1")

             );

-            if($count) {

+            if ($count) {

                 $disabledFilters = 1;

                 echo '<b>'.$_lang['enable_filter_phx_warning'].'</b><br/>';

             }

             else $disabledFilters = false;

         ?>

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

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

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

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

         <div class="comment"><?php echo $_lang['enable_filter_message']; ?></div>

       </td>

     </tr>

     <tr>

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

       <td >

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

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

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

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

         <div class="comment">

             <?php echo $_lang['enable_at_syntax_message']; ?>

             <ul>

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

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

     <td>

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

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

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

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

         <div class="comment"><?php echo $_lang['defaultpublish_message'] ?></div>

     </td>

   </tr>

@@ -176,24 +176,24 @@ 
   <tr>

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

     <td>

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

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

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

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

         <div class="comment"><?php echo $_lang['defaultcache_message'] ?></div>

     </td>

   </tr>

   <tr>

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

     <td>

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

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

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

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

         <div class="comment"><?php echo $_lang['defaultsearch_message'] ?></div>

     </td>

   </tr>

   <tr>

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

     <td>

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

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

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

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

         <div class="comment"><?php echo $_lang['defaultmenuindex_message'] ?></div>

     </td>

   </tr>

@@ -203,8 +203,8 @@ 
     <table border="0" cellspacing="0" cellpadding="0"><tr><td valign="top">

     <select name="lst_custom_contenttype" style="width:200px;height:100px;" size="5">

     <?php

-        $ct = explode(",",$custom_contenttype);

-        for($i=0;$i<count($ct);$i++) {

+        $ct = explode(",", $custom_contenttype);

+        for ($i = 0; $i < count($ct); $i++) {

             echo "<option value=\"".$ct[$i]."\">".$ct[$i]."</option>";

         }

     ?>

@@ -218,14 +218,14 @@ 
 <th><?php echo $_lang['docid_incrmnt_method_title'] ?><br><small>[(docid_incrmnt_method)]</small></th>

 <td>

 <label><input type="radio" name="docid_incrmnt_method" value="0"

-    <?php echo ($docid_incrmnt_method=='0') ? 'checked="checked"' : "" ; ?> />

+    <?php echo ($docid_incrmnt_method == '0') ? 'checked="checked"' : ""; ?> />

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

     

 <label><input type="radio" name="docid_incrmnt_method" value="1"

-    <?php echo ($docid_incrmnt_method=='1') ? 'checked="checked"' : "" ; ?> />

+    <?php echo ($docid_incrmnt_method == '1') ? 'checked="checked"' : ""; ?> />

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

 <label><input type="radio" name="docid_incrmnt_method" value="2"

-    <?php echo ($docid_incrmnt_method=='2') ? 'checked="checked"' : "" ; ?> />

+    <?php echo ($docid_incrmnt_method == '2') ? 'checked="checked"' : ""; ?> />

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

 </td>

 </tr>

@@ -233,24 +233,24 @@ 
 <tr>

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

 <td>

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

-    <?php echo wrap_label($_lang['disabled'], form_radio('enable_cache', 0));?><br />

-    <?php echo wrap_label($_lang['disabled_at_login'], form_radio('enable_cache', 2));?>

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

+    <?php echo wrap_label($_lang['disabled'], form_radio('enable_cache', 0)); ?><br />

+    <?php echo wrap_label($_lang['disabled_at_login'], form_radio('enable_cache', 2)); ?>

 </td>

 </tr>

 

 <tr>

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

 <td>

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

-<?php echo wrap_label($_lang['cache_type_2'], form_radio('cache_type', 2));?>

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

+<?php echo wrap_label($_lang['cache_type_2'], form_radio('cache_type', 2)); ?>

 </td>

 </tr>

   <tr>

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

     <td>

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

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

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

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

 <div class="comment"><?php echo $_lang['minifyphp_incache_message'] ?></div>

     </td>

   </tr>

@@ -259,23 +259,23 @@ 
       <th><?php echo $_lang['serveroffset_title'] ?><br><small>[(server_offset_time)]</small></th>

       <td> <select name="server_offset_time" size="1" class="inputBox">

           <?php

-      for($i=-24; $i<25; $i++) {

-          $seconds = $i*60*60;

-          $selectedtext = $seconds==$server_offset_time ? "selected='selected'" : "" ;

+      for ($i = -24; $i < 25; $i++) {

+          $seconds = $i * 60 * 60;

+          $selectedtext = $seconds == $server_offset_time ? "selected='selected'" : "";

       ?>

           <option value="<?php echo $seconds; ?>" <?php echo $selectedtext; ?>><?php echo $i; ?></option>

           <?php

       }

       ?>

         </select>

-        <div class="comment"><?php printf($_lang['serveroffset_message'], strftime('%H:%M:%S', time()), strftime('%H:%M:%S', time()+$server_offset_time)); ?></div>

+        <div class="comment"><?php printf($_lang['serveroffset_message'], strftime('%H:%M:%S', time()), strftime('%H:%M:%S', time() + $server_offset_time)); ?></div>

         </td>

     </tr>

     <tr>

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

       <td>

-        <?php echo wrap_label($_lang['server_protocol_http'],form_radio('server_protocol', 'http'));?><br />

-        <?php echo wrap_label($_lang['server_protocol_https'], form_radio('server_protocol', 'https'));?>

+        <?php echo wrap_label($_lang['server_protocol_http'], form_radio('server_protocol', 'http')); ?><br />

+        <?php echo wrap_label($_lang['server_protocol_https'], form_radio('server_protocol', 'https')); ?>

         <div class="comment"><?php echo $_lang['server_protocol_message'] ?></div>

       </td>

     </tr>

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

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

      <td>

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

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

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

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

          <div class="comment"><?php echo $_lang['track_visitors_message'] ?></div>

      </td>

    </tr>

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

             // invoke OnSiteSettingsRender event

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

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

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

         ?>

     </td>

   </tr>

manager/actions/mutate_settings/snippet_smtp.inc.php

Spacing +4 added lines, -4 removed lines

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

     <td><?php echo $_lang['smtp_auth_title'] ?></td>

     <td>

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

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

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

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

     </td>

   </tr>

   <tr>

@@ -15,8 +15,8 @@ 
     <td >

      <select name="smtp_secure" size="1" class="inputBox">

   <option value="none" ><?php echo $_lang['no'] ?></option>

-   <option value="ssl" <?php if($smtp_secure == 'ssl') echo "selected='selected'"; ?> >SSL</option>

-  <option value="tls" <?php if($smtp_secure == 'tls') echo "selected='selected'"; ?> >TLS</option>

+   <option value="ssl" <?php if ($smtp_secure == 'ssl') echo "selected='selected'"; ?> >SSL</option>

+  <option value="tls" <?php if ($smtp_secure == 'tls') echo "selected='selected'"; ?> >TLS</option>

  </select>

  <br />

   </td>

Braces +8 added lines, -2 removed lines

@@ -15,8 +15,14 @@
     <td >

      <select name="smtp_secure" size="1" class="inputBox">

   <option value="none" ><?php echo $_lang['no'] ?></option>

-   <option value="ssl" <?php if($smtp_secure == 'ssl') echo "selected='selected'"; ?> >SSL</option>

-  <option value="tls" <?php if($smtp_secure == 'tls') echo "selected='selected'"; ?> >TLS</option>

+   <option value="ssl" <?php if($smtp_secure == 'ssl') {
+    echo "selected='selected'";
+}
+?> >SSL</option>

+  <option value="tls" <?php if($smtp_secure == 'tls') {
+    echo "selected='selected'";
+}
+?> >TLS</option>

  </select>

  <br />

   </td>

manager/actions/mutate_settings/tab2_furl_settings.inc.php

Spacing +47 added lines, -47 removed lines

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

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

 <td>

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

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

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

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

 </td>

 </tr>

 <tr>

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

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

     <td>

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

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

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

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

     </td>

 </tr>

 <tr>

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

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

 </tr>

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

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

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

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

 </tr>

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

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

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

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

 </tr>

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

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

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

 </tr>

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

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

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

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

 </tr>

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

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

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

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

 </tr>

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

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

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

 </tr>

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

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

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

 <td>

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

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

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

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

 </td>

 </tr>

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

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

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

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

       </tr>

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

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

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

 </tr>

   

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

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

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

 <td>

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

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

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

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

  </td>

 </tr>

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

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

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

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

 </tr>

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

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

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

 </tr>

 

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

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

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

   <td>

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

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

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

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

   </td>

 </tr>

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

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

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

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

 </tr>

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

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

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

 </tr>

 

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

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

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

 <td>

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

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

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

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

 </td>

 </tr>

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

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

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

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

 </tr>

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

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

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

 </tr>

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

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

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

 <td>

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

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

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

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

 </td>

 </tr>

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

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

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

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

 </tr>

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

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

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

 </tr>

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

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

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

 <td>

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

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

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

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

 </td>

 </tr>

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

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

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

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

 </tr>

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

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

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

 </tr>

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

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

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

 <td>

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

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

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

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

 </td>

 </tr>

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

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

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

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

 </tr>

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

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

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

 </tr>

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

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

 <td colspan="2">

     <?php

         // invoke OnFriendlyURLSettingsRender event

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

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

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

     ?>

 </td>

 </tr>

Braces +3 added lines, -1 removed lines

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

         // invoke OnFriendlyURLSettingsRender event

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

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

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

 </td>

 </tr>

manager/actions/files.dynamic.php

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

@@ -801,7 +801,7 @@
                 $complete_name = $path . str_replace('\\', '/', $zip_entry_name);
                 if (!file_exists($complete_path)) {
                     $tmp = '';
-                    foreach (explode('/', $complete_path) AS $k) {
+                    foreach (explode('/', $complete_path) as $k) {
                         $tmp .= $k . '/';
                         if (!is_dir($tmp)) {
                             mkdir($tmp, 0777);

Doc Comments +2 added lines, -2 removed lines

@@ -719,7 +719,7 @@ 
 
 /**
  * @param string $string
- * @return bool|string
+ * @return string|false
  */
 function removeLastPath($string)
 {
@@ -734,7 +734,7 @@ 
 
 /**
  * @param string $string
- * @return bool|string
+ * @return string|false
  */
 function getExtension($string)
 {

Braces +3 added lines, -1 removed lines

@@ -893,7 +893,9 @@
     $modx = evolutionCMS(); global $_lang, $startpath, $filemanager_path, $uploadablefiles, $new_file_permissions;
     $msg = '';
     foreach ($_FILES['userfile']['name'] as $i => $name) {
-        if (empty($_FILES['userfile']['tmp_name'][$i])) continue;
+        if (empty($_FILES['userfile']['tmp_name'][$i])) {
+            continue;
+        }
         $userfile= array();
 
         $userfile['tmp_name'] = $_FILES['userfile']['tmp_name'][$i];

Spacing +106 added lines, -106 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.");
 }
 if (!$modx->hasPermission('file_manager')) {
@@ -9,15 +9,15 @@ 
 $newToken = makeToken();
 
 // settings
-$theme_image_path = $modx->config['site_manager_url'] . 'media/style/' . $modx->config['manager_theme'] . '/images/';
+$theme_image_path = $modx->config['site_manager_url'].'media/style/'.$modx->config['manager_theme'].'/images/';
 $excludes = array(
     '.',
     '..',
     '.svn'
 );
-$alias_suffix = (!empty($friendly_url_suffix)) ? ',' . ltrim($friendly_url_suffix, '.') : '';
-$editablefiles = explode(',', 'txt,php,tpl,less,sass,shtml,html,htm,xml,js,css,pageCache,htaccess,json,ini' . $alias_suffix);
-$inlineviewablefiles = explode(',', 'txt,php,tpl,less,sass,html,htm,xml,js,css,pageCache,htaccess,json,ini' . $alias_suffix);
+$alias_suffix = (!empty($friendly_url_suffix)) ? ','.ltrim($friendly_url_suffix, '.') : '';
+$editablefiles = explode(',', 'txt,php,tpl,less,sass,shtml,html,htm,xml,js,css,pageCache,htaccess,json,ini'.$alias_suffix);
+$inlineviewablefiles = explode(',', 'txt,php,tpl,less,sass,html,htm,xml,js,css,pageCache,htaccess,json,ini'.$alias_suffix);
 $viewablefiles = explode(',', 'jpg,gif,png,ico');
 
 $editablefiles = add_dot($editablefiles);
@@ -30,31 +30,31 @@ 
 {
 */
 $protected_path[] = $modx->config['site_manager_path'];
-$protected_path[] = $modx->config['base_path'] . 'temp/backup';
-$protected_path[] = $modx->config['base_path'] . 'assets/backup';
+$protected_path[] = $modx->config['base_path'].'temp/backup';
+$protected_path[] = $modx->config['base_path'].'assets/backup';
 
 if (!$modx->hasPermission('save_plugin')) {
-    $protected_path[] = $modx->config['base_path'] . 'assets/plugins';
+    $protected_path[] = $modx->config['base_path'].'assets/plugins';
 }
 if (!$modx->hasPermission('save_snippet')) {
-    $protected_path[] = $modx->config['base_path'] . 'assets/snippets';
+    $protected_path[] = $modx->config['base_path'].'assets/snippets';
 }
 if (!$modx->hasPermission('save_template')) {
-    $protected_path[] = $modx->config['base_path'] . 'assets/templates';
+    $protected_path[] = $modx->config['base_path'].'assets/templates';
 }
 if (!$modx->hasPermission('save_module')) {
-    $protected_path[] = $modx->config['base_path'] . 'assets/modules';
+    $protected_path[] = $modx->config['base_path'].'assets/modules';
 }
 if (!$modx->hasPermission('empty_cache')) {
-    $protected_path[] = $modx->config['base_path'] . 'assets/cache';
+    $protected_path[] = $modx->config['base_path'].'assets/cache';
 }
 if (!$modx->hasPermission('import_static')) {
-    $protected_path[] = $modx->config['base_path'] . 'temp/import';
-    $protected_path[] = $modx->config['base_path'] . 'assets/import';
+    $protected_path[] = $modx->config['base_path'].'temp/import';
+    $protected_path[] = $modx->config['base_path'].'assets/import';
 }
 if (!$modx->hasPermission('export_static')) {
-    $protected_path[] = $modx->config['base_path'] . 'temp/export';
-    $protected_path[] = $modx->config['base_path'] . 'assets/export';
+    $protected_path[] = $modx->config['base_path'].'temp/export';
+    $protected_path[] = $modx->config['base_path'].'assets/export';
 }
 /*
 }
@@ -83,7 +83,7 @@ 
 {
     $count = count($array);
     for ($i = 0; $i < $count; $i++) {
-        $array[$i] = '.' . strtolower(trim($array[$i])); // add a dot :)
+        $array[$i] = '.'.strtolower(trim($array[$i])); // add a dot :)
     }
     return $array;
 }
@@ -108,15 +108,15 @@ 
 $rw = realpath('../');
 $webstart_path = str_replace('\\', '/', str_replace($rw, '', $rf));
 if (substr($webstart_path, 0, 1) == '/') {
-    $webstart_path = '..' . $webstart_path;
+    $webstart_path = '..'.$webstart_path;
 } else {
-    $webstart_path = '../' . $webstart_path;
+    $webstart_path = '../'.$webstart_path;
 }
 
 ?>
     <script type="text/javascript">
 
-        var current_path = '<?= $startpath;?>';
+        var current_path = '<?= $startpath; ?>';
 
         function viewfile (url)
         {
@@ -152,7 +152,7 @@ 
         function unzipFile (file)
         {
             if (confirmUnzip()) {
-                window.location.href = "index.php?a=31&mode=unzip&path=" + current_path + '/&file=' + file + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=unzip&path=" + current_path + '/&file=' + file + "&token=<?= $newToken; ?>";
                 return false;
             }
         }
@@ -174,7 +174,7 @@ 
         function deleteFolder (folder, status)
         {
             if (confirmDeleteFolder(status)) {
-                window.location.href = "index.php?a=31&mode=deletefolder&path=" + current_path + "&folderpath=" + current_path + '/' + folder + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=deletefolder&path=" + current_path + "&folderpath=" + current_path + '/' + folder + "&token=<?= $newToken; ?>";
                 return false;
             }
         }
@@ -182,7 +182,7 @@ 
         function deleteFile (file)
         {
             if (confirmDelete()) {
-                window.location.href = "index.php?a=31&mode=delete&path=" + current_path + '/' + file + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=delete&path=" + current_path + '/' + file + "&token=<?= $newToken; ?>";
                 return false;
             }
         }
@@ -191,7 +191,7 @@ 
         {
             var newFilename = prompt("<?= $_lang["files_dynamic_new_file_name"] ?>", file);
             if (newFilename !== null && newFilename !== file) {
-                window.location.href = "index.php?a=31&mode=duplicate&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=duplicate&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken; ?>";
             }
         }
 
@@ -199,7 +199,7 @@ 
         {
             var newDirname = prompt("<?= $_lang["files_dynamic_new_folder_name"] ?>", dir);
             if (newDirname !== null && newDirname !== dir) {
-                window.location.href = "index.php?a=31&mode=renameFolder&path=" + current_path + '&dirname=' + dir + "&newDirname=" + newDirname + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=renameFolder&path=" + current_path + '&dirname=' + dir + "&newDirname=" + newDirname + "&token=<?= $newToken; ?>";
             }
         }
 
@@ -207,7 +207,7 @@ 
         {
             var newFilename = prompt("<?= $_lang["files_dynamic_new_file_name"] ?>", file);
             if (newFilename !== null && newFilename !== file) {
-                window.location.href = "index.php?a=31&mode=renameFile&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=renameFile&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken; ?>";
             }
         }
 
@@ -226,7 +226,7 @@ 
             <?php endif ?>
             <?php
             if (isset($_GET['mode']) && $_GET['mode'] !== 'drill') {
-                $href = 'a=31&path=' . urlencode($_REQUEST['path']);
+                $href = 'a=31&path='.urlencode($_REQUEST['path']);
             } else {
                 $href = 'a=2';
             }
@@ -236,12 +236,12 @@ 
                 $tpl = '<a class="btn btn-secondary" href="[+href+]" onclick="return getFolderName(this);"><i class="[+image+]"></i><span>[+subject+]</span></a>';
                 $ph['image'] = $_style['files_folder-open'];
                 $ph['subject'] = $_lang['add_folder'];
-                $ph['href'] = 'index.php?a=31&mode=newfolder&path=' . urlencode($startpath) . '&name=';
+                $ph['href'] = 'index.php?a=31&mode=newfolder&path='.urlencode($startpath).'&name=';
                 $_ = parsePlaceholder($tpl, $ph);
 
-                $tpl = '<a class="btn btn-secondary" href="[+href+]" onclick="return getFileName(this);"><i class="[+image+]"></i><span>' . $_lang['files.dynamic.php1'] . '</span></a>';
+                $tpl = '<a class="btn btn-secondary" href="[+href+]" onclick="return getFileName(this);"><i class="[+image+]"></i><span>'.$_lang['files.dynamic.php1'].'</span></a>';
                 $ph['image'] = $_style['files_page_html'];
-                $ph['href'] = 'index.php?a=31&mode=newfile&path=' . urlencode($startpath) . '&name=';
+                $ph['href'] = 'index.php?a=31&mode=newfile&path='.urlencode($startpath).'&name=';
                 $_ .= parsePlaceholder($tpl, $ph);
                 echo $_;
             }
@@ -271,12 +271,12 @@ 
             $ph = array();
             $ph['style_path'] = $theme_image_path;
             // To Top Level with folder icon to the left
-            if ($startpath == $filemanager_path || $startpath . '/' == $filemanager_path) {
-                $ph['image'] = '' . $_style['files_top'] . '';
+            if ($startpath == $filemanager_path || $startpath.'/' == $filemanager_path) {
+                $ph['image'] = ''.$_style['files_top'].'';
                 $ph['subject'] = '<span>Top</span>';
             } else {
-                $ph['image'] = '' . $_style['files_top'] . '';
-                $ph['subject'] = '<a href="index.php?a=31&mode=drill&path=' . $filemanager_path . '">Top</a>/';
+                $ph['image'] = ''.$_style['files_top'].'';
+                $ph['subject'] = '<a href="index.php?a=31&mode=drill&path='.$filemanager_path.'">Top</a>/';
             }
 
             echo parsePlaceholder($tpl, $ph);
@@ -293,12 +293,12 @@ 
                     if (empty($v)) {
                         continue;
                     }
-                    $path .= rtrim($v, '/') . '/';
+                    $path .= rtrim($v, '/').'/';
                     if (1 < $count) {
-                        $href = 'index.php?a=31&mode=drill&path=' . urlencode($filemanager_path . $path);
-                        $pieces[$i] = '<a href="' . $href . '">' . trim($v, '/') . '</a>';
+                        $href = 'index.php?a=31&mode=drill&path='.urlencode($filemanager_path.$path);
+                        $pieces[$i] = '<a href="'.$href.'">'.trim($v, '/').'</a>';
                     } else {
-                        $pieces[$i] = '<span>' . trim($v, '/') . '</span>';
+                        $pieces[$i] = '<span>'.trim($v, '/').'</span>';
                     }
                     $count--;
                 }
@@ -311,16 +311,16 @@ 
         </div>
         <?php
         // check to see user isn't trying to move below the document_root
-        if (substr(strtolower(str_replace('//', '/', $startpath . "/")), 0, $len) != strtolower(str_replace('//', '/', $filemanager_path . '/'))) {
+        if (substr(strtolower(str_replace('//', '/', $startpath."/")), 0, $len) != strtolower(str_replace('//', '/', $filemanager_path.'/'))) {
             $modx->webAlertAndQuit($_lang["files_access_denied"]);
         }
 
         // Unzip .zip files - by Raymond
         if ($enablefileunzip && $_REQUEST['mode'] == 'unzip' && is_writable($startpath)) {
-            if (!$err = unzip(realpath("{$startpath}/" . $_REQUEST['file']), realpath($startpath))) {
-                echo '<span class="warning"><b>' . $_lang['file_unzip_fail'] . ($err === 0 ? 'Missing zip library (php_zip.dll / zip.so)' : '') . '</b></span><br /><br />';
+            if (!$err = unzip(realpath("{$startpath}/".$_REQUEST['file']), realpath($startpath))) {
+                echo '<span class="warning"><b>'.$_lang['file_unzip_fail'].($err === 0 ? 'Missing zip library (php_zip.dll / zip.so)' : '').'</b></span><br /><br />';
             } else {
-                echo '<span class="success"><b>' . $_lang['file_unzip'] . '</b></span><br /><br />';
+                echo '<span class="success"><b>'.$_lang['file_unzip'].'</b></span><br /><br />';
             }
         }
         // End Unzip - Raymond
@@ -332,9 +332,9 @@ 
             if ($_REQUEST['mode'] == 'deletefolder') {
                 $folder = $_REQUEST['folderpath'];
                 if (!$token_check || !@rrmdir($folder)) {
-                    echo '<span class="warning"><b>' . $_lang['file_folder_not_deleted'] . '</b></span><br /><br />';
+                    echo '<span class="warning"><b>'.$_lang['file_folder_not_deleted'].'</b></span><br /><br />';
                 } else {
-                    echo '<span class="success"><b>' . $_lang['file_folder_deleted'] . '</b></span><br /><br />';
+                    echo '<span class="success"><b>'.$_lang['file_folder_deleted'].'</b></span><br /><br />';
                 }
             }
 
@@ -345,10 +345,10 @@ 
                 if (!mkdirs("{$startpath}/{$foldername}", 0777)) {
                     echo '<span class="warning"><b>', $_lang['file_folder_not_created'], '</b></span><br /><br />';
                 } else {
-                    if (!@chmod($startpath . '/' . $foldername, $newfolderaccessmode)) {
-                        echo '<span class="warning"><b>' . $_lang['file_folder_chmod_error'] . '</b></span><br /><br />';
+                    if (!@chmod($startpath.'/'.$foldername, $newfolderaccessmode)) {
+                        echo '<span class="warning"><b>'.$_lang['file_folder_chmod_error'].'</b></span><br /><br />';
                     } else {
-                        echo '<span class="success"><b>' . $_lang['file_folder_created'] . '</b></span><br /><br />';
+                        echo '<span class="success"><b>'.$_lang['file_folder_created'].'</b></span><br /><br />';
                     }
                 }
                 umask($old_umask);
@@ -360,7 +360,7 @@ 
                 $filename = $modx->db->escape($filename);
 
                 if (!checkExtension($filename)) {
-                    echo '<span class="warning"><b>' . $_lang['files_filetype_notok'] . '</b></span><br /><br />';
+                    echo '<span class="warning"><b>'.$_lang['files_filetype_notok'].'</b></span><br /><br />';
                 } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $filename) !== 0) {
                     echo $_lang['files.dynamic.php3'];
                 } else {
@@ -382,11 +382,11 @@ 
                 $newFilename = $modx->db->escape($newFilename);
 
                 if (!checkExtension($newFilename)) {
-                    echo '<span class="warning"><b>' . $_lang['files_filetype_notok'] . '</b></span><br /><br />';
+                    echo '<span class="warning"><b>'.$_lang['files_filetype_notok'].'</b></span><br /><br />';
                 } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newFilename) !== 0) {
                     echo $_lang['files.dynamic.php3'];
                 } else {
-                    if (!copy($filename, MODX_BASE_PATH . $newFilename)) {
+                    if (!copy($filename, MODX_BASE_PATH.$newFilename)) {
                         echo $_lang['files.dynamic.php5'];
                     }
                     umask($old_umask);
@@ -395,7 +395,7 @@ 
             // Rename folder here
             if ($_REQUEST['mode'] == 'renameFolder') {
                 $old_umask = umask(0);
-                $dirname = $_REQUEST['path'] . '/' . $_REQUEST['dirname'];
+                $dirname = $_REQUEST['path'].'/'.$_REQUEST['dirname'];
                 $dirname = $modx->db->escape($dirname);
                 $newDirname = str_replace(array(
                     '..\\',
@@ -407,7 +407,7 @@ 
 
                 if (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newDirname) !== 0) {
                     echo $_lang['files.dynamic.php3'];
-                } else if (!rename($dirname, $_REQUEST['path'] . '/' . $newDirname)) {
+                } else if (!rename($dirname, $_REQUEST['path'].'/'.$newDirname)) {
                     echo '<span class="warning"><b>', $_lang['file_folder_not_created'], '</b></span><br /><br />';
                 }
                 umask($old_umask);
@@ -427,11 +427,11 @@ 
                 $newFilename = $modx->db->escape($newFilename);
 
                 if (!checkExtension($newFilename)) {
-                    echo '<span class="warning"><b>' . $_lang['files_filetype_notok'] . '</b></span><br /><br />';
+                    echo '<span class="warning"><b>'.$_lang['files_filetype_notok'].'</b></span><br /><br />';
                 } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newFilename) !== 0) {
                     echo $_lang['files.dynamic.php3'];
                 } else {
-                    if (!rename($filename, $path . '/' . $newFilename)) {
+                    if (!rename($filename, $path.'/'.$newFilename)) {
                         echo $_lang['files.dynamic.php5'];
                     }
                     umask($old_umask);
@@ -464,7 +464,7 @@ 
                 ls($startpath);
                 echo "\n\n\n";
                 if ($folders == 0 && $files == 0) {
-                    echo '<tr><td colspan="4"><i class="' . $_style['files_deleted_folder'] . ' FilesDeletedFolder"></i> <span style="color:#888;cursor:default;"> ' . $_lang['files_directory_is_empty'] . ' </span></td></tr>';
+                    echo '<tr><td colspan="4"><i class="'.$_style['files_deleted_folder'].' FilesDeletedFolder"></i> <span style="color:#888;cursor:default;"> '.$_lang['files_directory_is_empty'].' </span></td></tr>';
                 }
                 ?>
             </table>
@@ -473,10 +473,10 @@ 
         <div class="container">
             <p>
                 <?php
-                echo $_lang['files_directories'] . ': <b>' . $folders . '</b> ';
-                echo $_lang['files_files'] . ': <b>' . $files . '</b> ';
-                echo $_lang['files_data'] . ': <b><span dir="ltr">' . $modx->nicesize($filesizes) . '</span></b> ';
-                echo $_lang['files_dirwritable'] . ' <b>' . (is_writable($startpath) == 1 ? $_lang['yes'] . '.' : $_lang['no']) . '.</b>'
+                echo $_lang['files_directories'].': <b>'.$folders.'</b> ';
+                echo $_lang['files_files'].': <b>'.$files.'</b> ';
+                echo $_lang['files_data'].': <b><span dir="ltr">'.$modx->nicesize($filesizes).'</span></b> ';
+                echo $_lang['files_dirwritable'].' <b>'.(is_writable($startpath) == 1 ? $_lang['yes'].'.' : $_lang['no']).'.</b>'
                 ?>
             </p>
 
@@ -501,7 +501,7 @@ 
                 </form>
                 <?php
             } else {
-                echo "<p>" . $_lang['files_upload_inhibited_msg'] . "</p>";
+                echo "<p>".$_lang['files_upload_inhibited_msg']."</p>";
             }
             ?>
             <div id="imageviewer"></div>
@@ -586,7 +586,7 @@ 
     if ($file == $selFile) {
         $icon = isset($icons[$mode]) ? $icons[$mode] : $icons['default'];
     }
-    return '<i class="' . $icon . ' FilesPage"></i>';
+    return '<i class="'.$icon.' FilesPage"></i>';
 }
 
 /**
@@ -604,7 +604,7 @@ 
     );
     if ($file == $selFile) {
         $class = isset($classNames[$mode]) ? $classNames[$mode] : $classNames['default'];
-        return ' class="' . $class . '"';
+        return ' class="'.$class.'"';
     }
     return '';
 }
@@ -618,7 +618,7 @@ 
     global $excludes, $protected_path, $editablefiles, $inlineviewablefiles, $viewablefiles, $enablefileunzip, $enablefiledownload, $uploadablefiles, $folders, $files, $filesizes, $len, $dirs_array, $files_array, $webstart_path, $modx;
     $dircounter = 0;
     $filecounter = 0;
-    $curpath = str_replace('//', '/', $curpath . '/');
+    $curpath = str_replace('//', '/', $curpath.'/');
 
     if (!is_dir($curpath)) {
         echo 'Invalid path "', $curpath, '"<br />';
@@ -628,7 +628,7 @@ 
 
     // first, get info
     foreach ($dir as $file) {
-        $newpath = $curpath . $file;
+        $newpath = $curpath.$file;
         if ($file === '..' || $file === '.') {
             continue;
         }
@@ -638,7 +638,7 @@ 
             if ($file === '..' || $file === '.') {
                 continue;
             } elseif (!in_array($file, $excludes) && !in_array($newpath, $protected_path)) {
-                $dirs_array[$dircounter]['text'] = '<i class="' . $_style['files_folder'] . ' FilesFolder"></i> <a href="index.php?a=31&mode=drill&path=' . urlencode($newpath) . '"><b>' . $file . '</b></a>';
+                $dirs_array[$dircounter]['text'] = '<i class="'.$_style['files_folder'].' FilesFolder"></i> <a href="index.php?a=31&mode=drill&path='.urlencode($newpath).'"><b>'.$file.'</b></a>';
 
                 $dfiles = scandir($newpath);
                 foreach ($dfiles as $i => $infile) {
@@ -651,13 +651,13 @@ 
                 }
                 $file_exists = (0 < count($dfiles)) ? 'file_exists' : '';
 
-                $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<a href="javascript: deleteFolder(\'' . urlencode($file) . '\',\'' . $file_exists . '\');"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_folder'] . '"></i></a>' : '';
+                $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<a href="javascript: deleteFolder(\''.urlencode($file).'\',\''.$file_exists.'\');"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_folder'].'"></i></a>' : '';
             } else {
-                $dirs_array[$dircounter]['text'] = '<span><i class="' . $_style['files_deleted_folder'] . ' FilesDeletedFolder"></i> ' . $file . '</span>';
-                $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<span class="disabled"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_folder'] . '"></i></span>' : '';
+                $dirs_array[$dircounter]['text'] = '<span><i class="'.$_style['files_deleted_folder'].' FilesDeletedFolder"></i> '.$file.'</span>';
+                $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<span class="disabled"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_folder'].'"></i></span>' : '';
             }
 
-            $dirs_array[$dircounter]['rename'] = is_writable($curpath) ? '<a href="javascript:renameFolder(\'' . urlencode($file) . '\');"><i class="' . $_style['files_rename'] . '" title="' . $_lang['rename'] . '"></i></a> ' : '';
+            $dirs_array[$dircounter]['rename'] = is_writable($curpath) ? '<a href="javascript:renameFolder(\''.urlencode($file).'\');"><i class="'.$_style['files_rename'].'" title="'.$_lang['rename'].'"></i></a> ' : '';
 
             // increment the counter
             $dircounter++;
@@ -665,14 +665,14 @@ 
             $type = getExtension($newpath);
             $files_array[$filecounter]['file'] = $newpath;
             $files_array[$filecounter]['stats'] = lstat($newpath);
-            $files_array[$filecounter]['text'] = determineIcon($newpath, $_REQUEST['path'], $_REQUEST['mode']) . ' ' . $file;
-            $files_array[$filecounter]['view'] = (in_array($type, $viewablefiles)) ? '<a href="javascript:;" onclick="viewfile(\'' . $webstart_path . substr($newpath, $len, strlen($newpath)) . '\');"><i class="' . $_style['files_view'] . '" title="' . $_lang['files_viewfile'] . '"></i></a>' : (($enablefiledownload && in_array($type, $uploadablefiles)) ? '<a href="' . $webstart_path . implode('/', array_map('rawurlencode', explode('/', substr($newpath, $len, strlen($newpath))))) . '" style="cursor:pointer;"><i class="' . $_style['files_download'] . '" title="' . $_lang['file_download_file'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_view'] . '" title="' . $_lang['files_viewfile'] . '"></i></span>');
-            $files_array[$filecounter]['view'] = (in_array($type, $inlineviewablefiles)) ? '<a href="index.php?a=31&mode=view&path=' . urlencode($newpath) . '"><i class="' . $_style['files_view'] . '" title="' . $_lang['files_viewfile'] . '"></i></a>' : $files_array[$filecounter]['view'];
-            $files_array[$filecounter]['unzip'] = ($enablefileunzip && $type == '.zip') ? '<a href="javascript:unzipFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_unzip'] . '" title="' . $_lang['file_download_unzip'] . '"></i></a>' : '';
-            $files_array[$filecounter]['edit'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="index.php?a=31&mode=edit&path=' . urlencode($newpath) . '#file_editfile"><i class="' . $_style['files_edit'] . '" title="' . $_lang['files_editfile'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_edit'] . '" title="' . $_lang['files_editfile'] . '"></i></span>';
-            $files_array[$filecounter]['duplicate'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:duplicateFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_duplicate'] . '" title="' . $_lang['duplicate'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_duplicate'] . '" align="absmiddle" title="' . $_lang['duplicate'] . '"></i></span>';
-            $files_array[$filecounter]['rename'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:renameFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_rename'] . '" align="absmiddle" title="' . $_lang['rename'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_rename'] . '" align="absmiddle" title="' . $_lang['rename'] . '"></i></span>';
-            $files_array[$filecounter]['delete'] = is_writable($curpath) && is_writable($newpath) ? '<a href="javascript:deleteFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_file'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_file'] . '"></i></span>';
+            $files_array[$filecounter]['text'] = determineIcon($newpath, $_REQUEST['path'], $_REQUEST['mode']).' '.$file;
+            $files_array[$filecounter]['view'] = (in_array($type, $viewablefiles)) ? '<a href="javascript:;" onclick="viewfile(\''.$webstart_path.substr($newpath, $len, strlen($newpath)).'\');"><i class="'.$_style['files_view'].'" title="'.$_lang['files_viewfile'].'"></i></a>' : (($enablefiledownload && in_array($type, $uploadablefiles)) ? '<a href="'.$webstart_path.implode('/', array_map('rawurlencode', explode('/', substr($newpath, $len, strlen($newpath))))).'" style="cursor:pointer;"><i class="'.$_style['files_download'].'" title="'.$_lang['file_download_file'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_view'].'" title="'.$_lang['files_viewfile'].'"></i></span>');
+            $files_array[$filecounter]['view'] = (in_array($type, $inlineviewablefiles)) ? '<a href="index.php?a=31&mode=view&path='.urlencode($newpath).'"><i class="'.$_style['files_view'].'" title="'.$_lang['files_viewfile'].'"></i></a>' : $files_array[$filecounter]['view'];
+            $files_array[$filecounter]['unzip'] = ($enablefileunzip && $type == '.zip') ? '<a href="javascript:unzipFile(\''.urlencode($file).'\');"><i class="'.$_style['files_unzip'].'" title="'.$_lang['file_download_unzip'].'"></i></a>' : '';
+            $files_array[$filecounter]['edit'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="index.php?a=31&mode=edit&path='.urlencode($newpath).'#file_editfile"><i class="'.$_style['files_edit'].'" title="'.$_lang['files_editfile'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_edit'].'" title="'.$_lang['files_editfile'].'"></i></span>';
+            $files_array[$filecounter]['duplicate'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:duplicateFile(\''.urlencode($file).'\');"><i class="'.$_style['files_duplicate'].'" title="'.$_lang['duplicate'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_duplicate'].'" align="absmiddle" title="'.$_lang['duplicate'].'"></i></span>';
+            $files_array[$filecounter]['rename'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:renameFile(\''.urlencode($file).'\');"><i class="'.$_style['files_rename'].'" align="absmiddle" title="'.$_lang['rename'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_rename'].'" align="absmiddle" title="'.$_lang['rename'].'"></i></span>';
+            $files_array[$filecounter]['delete'] = is_writable($curpath) && is_writable($newpath) ? '<a href="javascript:deleteFile(\''.urlencode($file).'\');"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_file'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_file'].'"></i></span>';
 
             // increment the counter
             $filecounter++;
@@ -685,9 +685,9 @@ 
     for ($i = 0; $i < $folders; $i++) {
         $filesizes += $dirs_array[$i]['stats']['7'];
         echo '<tr>';
-        echo '<td>' . $dirs_array[$i]['text'] . '</td>';
-        echo '<td class="text-nowrap">' . $modx->toDateFormat($dirs_array[$i]['stats']['9']) . '</td>';
-        echo '<td class="text-right">' . $modx->nicesize($dirs_array[$i]['stats']['7']) . '</td>';
+        echo '<td>'.$dirs_array[$i]['text'].'</td>';
+        echo '<td class="text-nowrap">'.$modx->toDateFormat($dirs_array[$i]['stats']['9']).'</td>';
+        echo '<td class="text-right">'.$modx->nicesize($dirs_array[$i]['stats']['7']).'</td>';
         echo '<td class="actions text-right">';
         echo $dirs_array[$i]['rename'];
         echo $dirs_array[$i]['delete'];
@@ -700,10 +700,10 @@ 
     sort($files_array); // sorting the array alphabetically (Thanks pxl8r!)
     for ($i = 0; $i < $files; $i++) {
         $filesizes += $files_array[$i]['stats']['7'];
-        echo '<tr ' . markRow($files_array[$i]['file'], $_REQUEST['path'], $_REQUEST['mode']) . '>';
-        echo '<td>' . $files_array[$i]['text'] . '</td>';
-        echo '<td class="text-nowrap">' . $modx->toDateFormat($files_array[$i]['stats']['9']) . '</td>';
-        echo '<td class="text-right">' . $modx->nicesize($files_array[$i]['stats']['7']) . '</td>';
+        echo '<tr '.markRow($files_array[$i]['file'], $_REQUEST['path'], $_REQUEST['mode']).'>';
+        echo '<td>'.$files_array[$i]['text'].'</td>';
+        echo '<td class="text-nowrap">'.$modx->toDateFormat($files_array[$i]['stats']['9']).'</td>';
+        echo '<td class="text-right">'.$modx->nicesize($files_array[$i]['stats']['7']).'</td>';
         echo '<td class="actions text-right">';
         echo $files_array[$i]['unzip'];
         echo $files_array[$i]['view'];
@@ -840,17 +840,17 @@ 
     $zip = zip_open($file);
     if ($zip) {
         $old_umask = umask(0);
-        $path = rtrim($path, '/') . '/';
+        $path = rtrim($path, '/').'/';
         while ($zip_entry = zip_read($zip)) {
             if (zip_entry_filesize($zip_entry) > 0) {
                 // str_replace must be used under windows to convert "/" into "\"
                 $zip_entry_name = zip_entry_name($zip_entry);
-                $complete_path = $path . str_replace('\\', '/', dirname($zip_entry_name));
-                $complete_name = $path . str_replace('\\', '/', $zip_entry_name);
+                $complete_path = $path.str_replace('\\', '/', dirname($zip_entry_name));
+                $complete_name = $path.str_replace('\\', '/', $zip_entry_name);
                 if (!file_exists($complete_path)) {
                     $tmp = '';
                     foreach (explode('/', $complete_path) AS $k) {
-                        $tmp .= $k . '/';
+                        $tmp .= $k.'/';
                         if (!is_dir($tmp)) {
                             mkdir($tmp, 0777);
                         }
@@ -875,7 +875,7 @@ 
  */
 function rrmdir($dir)
 {
-    foreach (glob($dir . '/*') as $file) {
+    foreach (glob($dir.'/*') as $file) {
         if (is_dir($file)) {
             rrmdir($file);
         } else {
@@ -894,7 +894,7 @@ 
     $msg = '';
     foreach ($_FILES['userfile']['name'] as $i => $name) {
         if (empty($_FILES['userfile']['tmp_name'][$i])) continue;
-        $userfile= array();
+        $userfile = array();
 
         $userfile['tmp_name'] = $_FILES['userfile']['tmp_name'][$i];
         $userfile['error'] = $_FILES['userfile']['error'][$i];
@@ -911,12 +911,12 @@ 
         $userfile['type'] = $_FILES['userfile']['type'][$i];
 
         // this seems to be an upload action.
-        $path = $modx->config['site_url'] . substr($startpath, strlen($filemanager_path), strlen($startpath));
-        $path = rtrim($path, '/') . '/' . $userfile['name'];
+        $path = $modx->config['site_url'].substr($startpath, strlen($filemanager_path), strlen($startpath));
+        $path = rtrim($path, '/').'/'.$userfile['name'];
         $msg .= $path;
         if ($userfile['error'] == 0) {
-            $img = (strpos($userfile['type'], 'image') !== false) ? '<br /><img src="' . $path . '" height="75" />' : '';
-            $msg .= "<p>" . $_lang['files_file_type'] . $userfile['type'] . ", " . $modx->nicesize(filesize($userfile['tmp_name'])) . $img . '</p>';
+            $img = (strpos($userfile['type'], 'image') !== false) ? '<br /><img src="'.$path.'" height="75" />' : '';
+            $msg .= "<p>".$_lang['files_file_type'].$userfile['type'].", ".$modx->nicesize(filesize($userfile['tmp_name'])).$img.'</p>';
         }
 
         $userfilename = $userfile['tmp_name'];
@@ -924,15 +924,15 @@ 
         if (is_uploaded_file($userfilename)) {
             // file is uploaded file, process it!
             if (!checkExtension($userfile['name'])) {
-                $msg .= '<p><span class="warning">' . $_lang['files_filetype_notok'] . '</span></p>';
+                $msg .= '<p><span class="warning">'.$_lang['files_filetype_notok'].'</span></p>';
             } else {
-                if (@move_uploaded_file($userfile['tmp_name'], $_POST['path'] . '/' . $userfile['name'])) {
+                if (@move_uploaded_file($userfile['tmp_name'], $_POST['path'].'/'.$userfile['name'])) {
                     // Ryan: Repair broken permissions issue with file manager
                     if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
-                        @chmod($_POST['path'] . "/" . $userfile['name'], $new_file_permissions);
+                        @chmod($_POST['path']."/".$userfile['name'], $new_file_permissions);
                     }
                     // Ryan: End
-                    $msg .= '<p><span class="success">' . $_lang['files_upload_ok'] . '</span></p><hr/>';
+                    $msg .= '<p><span class="success">'.$_lang['files_upload_ok'].'</span></p><hr/>';
 
                     // invoke OnFileManagerUpload event
                     $modx->invokeEvent('OnFileManagerUpload', array(
@@ -940,13 +940,13 @@ 
                         'filename' => $userfile['name']
                     ));
                     // Log the change
-                    logFileChange('upload', $_POST['path'] . '/' . $userfile['name']);
+                    logFileChange('upload', $_POST['path'].'/'.$userfile['name']);
                 } else {
-                    $msg .= '<p><span class="warning">' . $_lang['files_upload_copyfailed'] . '</span> ' . $_lang["files_upload_permissions_error"] . '</p>';
+                    $msg .= '<p><span class="warning">'.$_lang['files_upload_copyfailed'].'</span> '.$_lang["files_upload_permissions_error"].'</p>';
                 }
             }
         } else {
-            $msg .= '<br /><span class="warning"><b>' . $_lang['files_upload_error'] . ':</b>';
+            $msg .= '<br /><span class="warning"><b>'.$_lang['files_upload_error'].':</b>';
             switch ($userfile['error']) {
                 case 0: //no error; possible file attack!
                     $msg .= $_lang['files_upload_error0'];
@@ -970,7 +970,7 @@ 
             $msg .= '</span><br />';
         }
     }
-    return $msg . '<br/>';
+    return $msg.'<br/>';
 }
 
 /**
@@ -986,9 +986,9 @@ 
 
     // Write $content to our opened file.
     if (file_put_contents($filename, $content) === false) {
-        $msg .= '<span class="warning"><b>' . $_lang['file_not_saved'] . '</b></span><br /><br />';
+        $msg .= '<span class="warning"><b>'.$_lang['file_not_saved'].'</b></span><br /><br />';
     } else {
-        $msg .= '<span class="success"><b>' . $_lang['file_saved'] . '</b></span><br /><br />';
+        $msg .= '<span class="success"><b>'.$_lang['file_saved'].'</b></span><br /><br />';
         $_REQUEST['mode'] = 'edit';
     }
     // Log the change
@@ -1007,9 +1007,9 @@ 
 
     $file = $_REQUEST['path'];
     if (!$token_check || !@unlink($file)) {
-        $msg .= '<span class="warning"><b>' . $_lang['file_not_deleted'] . '</b></span><br /><br />';
+        $msg .= '<span class="warning"><b>'.$_lang['file_not_deleted'].'</b></span><br /><br />';
     } else {
-        $msg .= '<span class="success"><b>' . $_lang['file_deleted'] . '</b></span><br /><br />';
+        $msg .= '<span class="success"><b>'.$_lang['file_deleted'].'</b></span><br /><br />';
     }
 
     // Log the change

manager/actions/refresh_site.dynamic.php

Braces +3 added lines, -1 removed lines

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

Indentation +5 added lines, -5 removed lines

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

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
@@ -29,8 +29,8 @@ 
 
 <div class="tab-page">
 	<div class="container container-body">
-		<?php if($num_rows_pub)   printf('<p>' . $_lang["refresh_published"]   . '</p>', $num_rows_pub) ?>
-		<?php if($num_rows_unpub) printf('<p>' . $_lang["refresh_unpublished"] . '</p>', $num_rows_unpub) ?>
+		<?php if ($num_rows_pub)   printf('<p>'.$_lang["refresh_published"].'</p>', $num_rows_pub) ?>
+		<?php if ($num_rows_unpub) printf('<p>'.$_lang["refresh_unpublished"].'</p>', $num_rows_unpub) ?>
 		<?php
 		$modx->clearCache('full', true);
 		// invoke OnSiteRefresh event

manager/processors/logout.processor.php

Indentation +8 added lines, -8 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
@@ -41,4 +41,4 @@ 
 						));
 
 // show login screen
-header('Location: ' . MODX_MANAGER_URL);
+header('Location: '.MODX_MANAGER_URL);