evolution-cms / evolution

manager/actions/import_site.static.php

Braces +14 added lines, -7 removed lines

@@ -101,7 +101,8 @@ 
 	</div>
 
 <?php
-function run() {
+function run()
+{
 	global $modx;
 
 	$tbl_site_content = $modx->getFullTableName('site_content');
@@ -160,7 +161,8 @@ 
 	return $output;
 }
 
-function importFiles($parent, $filedir, $files, $mode) {
+function importFiles($parent, $filedir, $files, $mode)
+{
 	global $modx;
 	global $_lang, $allowedfiles;
 	global $search_default, $cache_default, $publish_default;
@@ -302,7 +304,8 @@ 
 	}
 }
 
-function getFiles($directory, $listing = array(), $count = 0) {
+function getFiles($directory, $listing = array(), $count = 0)
+{
 	global $_lang;
 	global $filesfound;
 	$dummy = $count;
@@ -326,7 +329,8 @@ 
 	return ($listing);
 }
 
-function getFileContent($filepath) {
+function getFileContent($filepath)
+{
 	global $_lang;
 	// get the file
 	if(!$buffer = file_get_contents($filepath)) {
@@ -336,7 +340,8 @@ 
 	}
 }
 
-function pop_index($array) {
+function pop_index($array)
+{
 	$new_array = array();
 	foreach($array as $k => $v) {
 		if($v !== 'index.html' && $v !== 'index.htm') {
@@ -353,7 +358,8 @@ 
 	return $new_array;
 }
 
-function treatContent($src, $filename, $alias) {
+function treatContent($src, $filename, $alias)
+{
 	global $modx;
 
 	$src = mb_convert_encoding($src, $modx->config['modx_charset'], 'UTF-8,SJIS-win,eucJP-win,SJIS,EUC-JP,ASCII');
@@ -394,7 +400,8 @@ 
 	);
 }
 
-function convertLink() {
+function convertLink()
+{
 	global $modx;
 	$tbl_site_content = $modx->getFullTableName('site_content');
 

manager/actions/mutate_settings/tab5_security_settings.inc.php

Braces +10 added lines, -4 removed lines

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

     $MODX_SITE_HOSTNAMES = MODX_SITE_HOSTNAMES; // Fix for PHP 5.4

-    if(empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) $valid_hostnames = $_SERVER['HTTP_HOST'];

-?>

+    if(empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) {
+        $valid_hostnames = $_SERVER['HTTP_HOST'];
+    }
+    ?>

 <!-- Interface & editor settings -->

 <div class="tab-page" id="tabPageSecurity">

 <h2 class="tab"><?php echo $_lang['settings_security'] ?></h2>

@@ -153,7 +155,9 @@ 
 <th><?php echo $_lang['pwd_hash_algo_title'] ?><br><small>[(pwd_hash_algo)]</small></th>

 <td>

 <?php

-if(empty($pwd_hash_algo)) $phm['sel']['UNCRYPT'] = 1;

+if(empty($pwd_hash_algo)) {
+    $phm['sel']['UNCRYPT'] = 1;
+}
 $phm['e']['BLOWFISH_Y'] = $modx->manager->checkHashAlgorithm('BLOWFISH_Y') ? 0:1;

 $phm['e']['BLOWFISH_A'] = $modx->manager->checkHashAlgorithm('BLOWFISH_A') ? 0:1;

 $phm['e']['SHA512']     = $modx->manager->checkHashAlgorithm('SHA512') ? 0:1;

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

 <?php

 $gdAvailable = extension_loaded('gd');

-if(!$gdAvailable) $use_captcha = 0;

+if(!$gdAvailable) {
+    $use_captcha = 0;
+}
 ?>

   <tr>

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

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>

manager/actions/mutate_settings/tab7_filebrowser_settings.inc.php

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

                 }

                 ?>

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>

manager/actions/mutate_settings/functions.inc.php

Braces +34 added lines, -20 removed lines

@@ -4,12 +4,13 @@ 
  * 

  * @return array of keys from a language file

  */

-function get_lang_keys($filename) {

+function get_lang_keys($filename)
+{
     $file = MODX_MANAGER_PATH.'includes/lang' . DIRECTORY_SEPARATOR . $filename;

-    if(is_file($file) && is_readable($file)) {

+    if(is_file($file) && is_readable($file)) {
         include($file);

         return array_keys($_lang);

-    } else {

+    } else {
         return array();

     }

 }

@@ -18,11 +19,12 @@ 
  * 

  * @return array of languages that define the key in their file

  */

-function get_langs_by_key($key) {

+function get_langs_by_key($key)
+{
     global $lang_keys;

     $lang_return = array();

-    foreach($lang_keys as $lang=>$keys) {

-        if(in_array($key, $keys)) {

+    foreach($lang_keys as $lang=>$keys) {
+        if(in_array($key, $keys)) {
             $lang_return[] = $lang;

         }

     }

@@ -38,23 +40,24 @@ 
  * @param string $selected_lang specify language to select in option list, default none

  * @return html option list

  */

-function get_lang_options($key=null, $selected_lang=null) {

+function get_lang_options($key=null, $selected_lang=null)
+{
     global $lang_keys, $_lang;

     $lang_options = '';

-    if($key) {

+    if($key) {
         $languages = get_langs_by_key($key);

         sort($languages);

         $lang_options .= '<option value="">'.$_lang['language_title'].'</option>';

 

-        foreach($languages as $language_name) {

+        foreach($languages as $language_name) {
             $uclanguage_name = ucwords(str_replace("_", " ", $language_name));

             $lang_options .= '<option value="'.$language_name.'">'.$uclanguage_name.'</option>';

         }

         return $lang_options;

-    } else {

+    } else {
         $languages = array_keys($lang_keys);

         sort($languages);

-        foreach($languages as $language_name) {

+        foreach($languages as $language_name) {
             $uclanguage_name = ucwords(str_replace("_", " ", $language_name));

             $sel = $language_name == $selected_lang ? ' selected="selected"' : '';

             $lang_options .= '<option value="'.$language_name.'" '.$sel.'>'.$uclanguage_name.'</option>';

@@ -63,31 +66,42 @@ 
     }

 }

 

-function form_radio($name,$value,$add='',$disabled=false) {

+function form_radio($name,$value,$add='',$disabled=false)
+{
     global ${$name};

     $var = ${$name};

     $checked  = ($var==$value) ? ' checked="checked"' : '';

-    if($disabled) $disabled = ' disabled'; else $disabled = '';

-  if($add)     $add = ' ' . $add;

+    if($disabled) {
+        $disabled = ' disabled';
+    } else {
+        $disabled = '';
+    }
+  if($add) {
+      $add = ' ' . $add;
+  }
   return sprintf('<input onchange="documentDirty=true;" type="radio" name="%s" value="%s" %s %s %s />', $name, $value, $checked, $disabled, $add);

 }

 

-function wrap_label($str='',$object) {

+function wrap_label($str='',$object)
+{
   return "<label>{$object}\n{$str}</label>";

 }

 

-function parseText($tpl='', $ph=array()) {

-    if(empty($ph) || empty($tpl)) return $tpl;

+function parseText($tpl='', $ph=array())
+{
+    if(empty($ph) || empty($tpl)) {
+        return $tpl;
+    }
     

-    foreach($ph as $k=>$v)

-    {

+    foreach($ph as $k=>$v) {
         $k = "[+{$k}+]";

         $tpl = str_replace($k, $v, $tpl);

     }

     return $tpl;

 }

 

-function showHide($cond=true) {

+function showHide($cond=true)
+{
     global $displayStyle;

     $showHide = $cond ? $displayStyle : 'none';

     return sprintf('style="display:%s"', $showHide);

manager/actions/mutate_settings/snippet_smtp.inc.php

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

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>