evolution-cms / evolution

manager/actions/resources.static.php

Braces +6 added lines, -2 removed lines

@@ -28,7 +28,9 @@ 
 	'type7' => $_lang["lock_element_type_7"],
 	'type8' => $_lang["lock_element_type_8"]
 );
-foreach($unlockTranslations as $key => $value) $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+foreach($unlockTranslations as $key => $value) {
+    $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+}
 
 // Prepare lang-strings for mgrResAction()
 $mraTranslations = array(
@@ -44,7 +46,9 @@ 
 	'confirm_delete_plugin' => $_lang["confirm_delete_plugin"],
 	'confirm_delete_module' => $_lang["confirm_delete_module"],
 );
-foreach($mraTranslations as $key => $value) $mraTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+foreach($mraTranslations as $key => $value) {
+    $mraTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+}
 ?>
 <script>var trans = <?php echo json_encode($unlockTranslations); ?>;</script>
 <script>var mraTrans = <?php echo json_encode($mraTranslations); ?>;</script>

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

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

manager/frames/mainmenu.php

Braces +35 added lines, -33 removed lines

@@ -32,7 +32,7 @@ 
 	'active'

 );

 

-if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {

+if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {
 	$sitemenu['elements'] = array(

 		'elements',

 		'main',

@@ -48,7 +48,7 @@ 
 	);

 }

 

-if($modx->hasPermission('exec_module')) {

+if($modx->hasPermission('exec_module')) {
 	$sitemenu['modules'] = array(

 		'modules',

 		'main',

@@ -64,7 +64,7 @@ 
 	);

 }

 

-if($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {

+if($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {
 	$sitemenu['users'] = array(

 		'users',

 		'main',

@@ -80,7 +80,7 @@ 
 	);

 }

 

-if($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {

+if($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {
 	$sitemenu['tools'] = array(

 		'tools',

 		'main',

@@ -97,7 +97,7 @@ 
 }

 

 $tab = 0;

-if($modx->hasPermission('edit_template')) {

+if($modx->hasPermission('edit_template')) {
 	$sitemenu['element_templates'] = array(

 		'element_templates',

 		'elements',

@@ -112,7 +112,7 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {

+if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
 	$sitemenu['element_tplvars'] = array(

 		'element_tplvars',

 		'elements',

@@ -127,7 +127,7 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_chunk')) {

+if($modx->hasPermission('edit_chunk')) {
 	$sitemenu['element_htmlsnippets'] = array(

 		'element_htmlsnippets',

 		'elements',

@@ -142,7 +142,7 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_snippet')) {

+if($modx->hasPermission('edit_snippet')) {
 	$sitemenu['element_snippets'] = array(

 		'element_snippets',

 		'elements',

@@ -157,7 +157,7 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_plugin')) {

+if($modx->hasPermission('edit_plugin')) {
 	$sitemenu['element_plugins'] = array(

 		'element_plugins',

 		'elements',

@@ -174,7 +174,7 @@ 
 }

 //$sitemenu['element_categories']     = array('element_categories','elements',$_lang['element_categories'],'index.php?a=76&tab=5',$_lang['element_categories'],'','new_template,edit_template,new_snippet,edit_snippet,new_chunk,edit_chunk,new_plugin,edit_plugin','main',1,60,'');

 

-if($modx->hasPermission('file_manager')) {

+if($modx->hasPermission('file_manager')) {
 	$sitemenu['manage_files'] = array(

 		'manage_files',

 		'elements',

@@ -189,7 +189,7 @@ 
 		''

 	);

 }

-if($modx->hasPermission('category_manager')) {

+if($modx->hasPermission('category_manager')) {
 	$sitemenu['manage_categories'] = array(

 		'manage_categories',

 		'elements',

@@ -206,7 +206,7 @@ 
 }

 

 // Modules Menu Items

-if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {

+if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {
 	$sitemenu['new_module'] = array(

 		'new_module',

 		'modules',

@@ -222,19 +222,19 @@ 
 	);

 }

 

-if($modx->hasPermission('exec_module')) {

-	if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {

+if($modx->hasPermission('exec_module')) {
+	if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
 		$rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member

 				FROM ' . $modx->getFullTableName('site_modules') . ' AS sm

 				LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id

 				LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group

                 WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1

                 ORDER BY sm.name');

-	} else {

+	} else {
 		$rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');

 	}

-	if($modx->db->getRecordCount($rs)) {

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

+	if($modx->db->getRecordCount($rs)) {
+	    while ($row = $modx->db->getRow($rs)) {
             $sitemenu['module' . $row['id']] = array(

                 'module' . $row['id'],

                 'modules',

@@ -254,7 +254,7 @@ 
 

 // security menu items (users)

 

-if($modx->hasPermission('edit_user')) {

+if($modx->hasPermission('edit_user')) {
 	$sitemenu['user_management_title'] = array(

 		'user_management_title',

 		'users',

@@ -270,7 +270,7 @@ 
 	);

 }

 

-if($modx->hasPermission('edit_web_user')) {

+if($modx->hasPermission('edit_web_user')) {
 	$sitemenu['web_user_management_title'] = array(

 		'web_user_management_title',

 		'users',

@@ -286,7 +286,7 @@ 
 	);

 }

 

-if($modx->hasPermission('edit_role')) {

+if($modx->hasPermission('edit_role')) {
 	$sitemenu['role_management_title'] = array(

 		'role_management_title',

 		'users',

@@ -302,7 +302,7 @@ 
 	);

 }

 

-if($modx->hasPermission('access_permissions')) {

+if($modx->hasPermission('access_permissions')) {
 	$sitemenu['manager_permissions'] = array(

 		'manager_permissions',

 		'users',

@@ -318,7 +318,7 @@ 
 	);

 }

 

-if($modx->hasPermission('web_access_permissions')) {

+if($modx->hasPermission('web_access_permissions')) {
 	$sitemenu['web_permissions'] = array(

 		'web_permissions',

 		'users',

@@ -374,7 +374,7 @@ 
 	''

 );

 

-if($modx->hasPermission('bk_manager')) {

+if($modx->hasPermission('bk_manager')) {
 	$sitemenu['bk_manager'] = array(

 		'bk_manager',

 		'tools',

@@ -390,7 +390,7 @@ 
 	);

 }

 

-if($modx->hasPermission('remove_locks')) {

+if($modx->hasPermission('remove_locks')) {
 	$sitemenu['remove_locks'] = array(

 		'remove_locks',

 		'tools',

@@ -406,7 +406,7 @@ 
 	);

 }

 

-if($modx->hasPermission('import_static')) {

+if($modx->hasPermission('import_static')) {
 	$sitemenu['import_site'] = array(

 		'import_site',

 		'tools',

@@ -422,7 +422,7 @@ 
 	);

 }

 

-if($modx->hasPermission('export_static')) {

+if($modx->hasPermission('export_static')) {
 	$sitemenu['export_site'] = array(

 		'export_site',

 		'tools',

@@ -439,19 +439,21 @@ 
 }

 

 $menu = $modx->invokeEvent("OnManagerMenuPrerender", array('menu' => $sitemenu));

-if(is_array($menu)) {

+if(is_array($menu)) {
 	$newmenu = array();

-	foreach($menu as $item){

-		if(is_array(unserialize($item))){

+	foreach($menu as $item) {
+		if(is_array(unserialize($item))) {
 			$newmenu = array_merge($newmenu, unserialize($item));

 		}

 	}

-	if(count($newmenu)> 0) $sitemenu = $newmenu;

-}

+	if(count($newmenu)> 0) {
+	    $sitemenu = $newmenu;
+	}
+	}

 

-if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {

+if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {
 	include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php');

-} else {

+} else {
 	include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php');

 }

 $menu = new EVOmenu();