evolution-cms / evolution

manager/actions/mutate_categories.dynamic.php

Braces +2 added lines, -4 removed lines

@@ -27,16 +27,14 @@
 $cm = new EvolutionCMS\Legacy\ModuleCategoriesManager();
 
 // assign module_params to internal params
-foreach( $_module_params as $param => $value )
-{
+foreach( $_module_params as $param => $value ) {
 	$cm->set( $param, $value );
 }
 
 // catch the request actions
 include_once $cm->get('inc_dir') . 'request_trigger.inc.php';
 
-if( !$categories = $cm->getCategories() )
-{
+if( !$categories = $cm->getCategories() ) {
 	setcookie('webfxtab_manage-categories-pane', 0 );
 	$cm->addMessage( $cm->txt('Currently no categories available... JUST ADD A NEW ONE!'), 'global' );
 }

manager/actions/category_mgr/inc/Categories.php

Braces +3 added lines, -1 removed lines

@@ -4,4 +4,6 @@
  * Class to handle the modx-categories
  * @deprecated use EvolutionCMS\Legacy\Categories
  */
-class Categories extends EvolutionCMS\Legacy\Categories{}
+class Categories extends EvolutionCMS\Legacy\Categories
+{
+}

manager/actions/bkmanager.static.php

Braces +3 added lines, -1 removed lines

@@ -491,4 +491,6 @@
 /**
  * @deprecated use EvolutionCMS\Support\MysqlDumper
  */
-class Mysqldumper extends EvolutionCMS\Support\MysqlDumper{}
+class Mysqldumper extends EvolutionCMS\Support\MysqlDumper
+{
+}

manager/actions/resources/functions.inc.php

Braces +11 added lines, -6 removed lines

@@ -21,7 +21,8 @@ 
  * @param array $ph
  * @return string
  */
-function parsePh($tpl, $ph) {
+function parsePh($tpl, $ph)
+{
     $modx = evolutionCMS(); global $_lang;
     $tpl = $modx->parseText($tpl, $_lang, '[%', '%]');
     return $modx->parseText($tpl, $ph);
@@ -31,7 +32,8 @@ 
  * @param string|int $cssId
  * @return string
  */
-function renderViewSwitchButtons($cssId) {
+function renderViewSwitchButtons($cssId)
+{
     $modx = evolutionCMS(); global $_lang, $tpl;
 
     return parsePh($tpl['viewForm'], array(
@@ -44,7 +46,8 @@ 
  * @param mgrResources $resources
  * @return string
  */
-function createResourceList($resourceTable, $resources) {
+function createResourceList($resourceTable, $resources)
+{
     $modx = evolutionCMS(); global $_lang, $_style, $modx_textdir, $tpl;
 
     $items = isset($resources->items[$resourceTable]) ? $resources->items[$resourceTable] : false;
@@ -97,7 +100,8 @@ 
  * @param mgrResources $resources
  * @return string
  */
-function createCombinedView($resources) {
+function createCombinedView($resources)
+{
     $modx = evolutionCMS(); global $_lang, $_style, $modx_textdir;
 
     $itemsPerCategory = isset($resources->itemsPerCategory) ? $resources->itemsPerCategory : false;
@@ -154,14 +158,15 @@ 
  * @param mgrResources $resources
  * @return array
  */
-function prepareElementRowPh($row, $resourceTable, $resources) {
+function prepareElementRowPh($row, $resourceTable, $resources)
+{
     $modx = evolutionCMS(); global $modx_textdir, $_style, $_lang;
 
     $types = isset($resources->types[$resourceTable]) ? $resources->types[$resourceTable] : false;
 
     $_lang["confirm_delete"] = $_lang["delete"];
 
-    switch($resourceTable){
+    switch($resourceTable) {
         case 'site_templates':
             $class = $row['selectable'] ? '' : 'disabledPlugin';
             $lockElementType = 1;

manager/actions/resources/mgrResources.class.php

Braces +3 added lines, -1 removed lines

@@ -6,4 +6,6 @@
 /**
  * Don't delete
  */
-class mgrResources extends EvolutionCMS\Legacy\mgrResources{}
+class mgrResources extends EvolutionCMS\Legacy\mgrResources
+{
+}

manager/includes/src/Interfaces/ManagerThemeInterface.php

Braces +3 added lines, -1 removed lines

@@ -1,3 +1,5 @@
 <?php namespace EvolutionCMS\Interfaces;
 
-interface ManagerThemeInterface{}
+interface ManagerThemeInterface
+{
+}

manager/media/style/default/style.php

Braces +15 added lines, -15 removed lines

@@ -10,12 +10,12 @@ 
  */

 $style_path = 'media/style/' . $modx->config['manager_theme'] . '/images/';

 $modx->config['mgr_date_picker_path'] = 'media/calendar/datepicker.inc.php';

-if(!$modx->config['lang_code']) {

+if(!$modx->config['lang_code']) {
 	global $modx_lang_attribute;

 	$modx->config['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute;

 }

 

-if(!empty($_GET['a']) && $_GET['a'] == 2) {

+if(!empty($_GET['a']) && $_GET['a'] == 2) {
 	include_once('welcome.php');

 }

 

@@ -262,68 +262,68 @@ 
 

 // actions buttons templates

 $action = isset($_REQUEST['a']) ? $_REQUEST['a'] : '';

-if (!empty($modx->config['global_tabs']) && !isset($_SESSION['stay'])) {

+if (!empty($modx->config['global_tabs']) && !isset($_SESSION['stay'])) {
     $_REQUEST['stay'] = 2;

 }

-if (isset($_REQUEST['stay'])) {

+if (isset($_REQUEST['stay'])) {
     $_SESSION['stay'] = $_REQUEST['stay'];

-} else if (isset($_SESSION['stay'])) {

+} else if (isset($_SESSION['stay'])) {
     $_REQUEST['stay'] = $_SESSION['stay'];

 }

 $stay = isset($_REQUEST['stay']) ? $_REQUEST['stay'] : '';

 $addnew = 0;

 $run = 0;

-switch($action) {

+switch($action) {
 	case '3':

 	case '4':

 	case '27':

 	case '72':

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

+		if($modx->hasPermission('new_document')) {
 			$addnew = 1;

 		}

 		break;

 	case '16':

 	case '19':

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

+		if($modx->hasPermission('new_template')) {
 			$addnew = 1;

 		}

 		break;

 	case '300':

 	case '301':

-		if($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {

+		if($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {
 			$addnew = 1;

 		}

 		break;

 	case '77':

 	case '78':

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

+		if($modx->hasPermission('new_chunk')) {
 			$addnew = 1;

 		}

 		break;

 	case '22':

 	case '23':

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

+		if($modx->hasPermission('new_snippet')) {
 			$addnew = 1;

 		}

 		break;

 	case '101':

 	case '102':

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

+		if($modx->hasPermission('new_plugin')) {
 			$addnew = 1;

 		}

 		break;

 	case '106':

 	case '107':

 	case '108':

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

+		if($modx->hasPermission('new_module')) {
 			$addnew = 1;

 		}

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

+		if($modx->hasPermission('exec_module')) {
 			$run = 1;

 		}

 		break;

 	case '88':

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

+		if($modx->hasPermission('new_web_user')) {
 			$addnew = 1;

 		}

 		break;

install/src/template/actions/install.php

Braces +80 added lines, -32 removed lines

@@ -16,7 +16,8 @@ 
         <span class="notok"><?=$_lang['setup_database_create_connection_failed']?></span>
     </p>
     <p><?=$_lang['setup_database_create_connection_failed_note']?></p>
-<?php else : ?>
+<?php else {
+    : ?>
     <p><?=$_lang['setup_database_create_connection']?> <span class="ok"><?=$_lang['ok']?></span></p>
     <?php if ($selectDatabase === false) : ?>
         <p><?=rtrim($_lang['setup_database_selection'], '`')?> <strong><?=trim($dbase, '`')?></strong>:
@@ -41,13 +42,18 @@ 
                 <?=rtrim($_lang['setup_database_creation'], '`')?> <strong><?=trim($dbase, '`')?></strong>:
                 <span class="ok"><?=$_lang['ok']?></span>
             </p>
-        <?php endif; ?>
-    <?php else : ?>
+        <?php endif;
+}
+?>
+    <?php else {
+    : ?>
         <p>
             <?=rtrim($_lang['setup_database_selection'], '`')?> <strong><?=trim($dbase, '`')?></strong>:
             <span class="ok"><?=$_lang['ok']?></span>
         </p>
-    <?php endif; ?>
+    <?php endif;
+}
+?>
 <?php endif; ?>
 
 <?php if ($installLevel >= 1) : ?>
@@ -57,12 +63,15 @@ 
             <span class="notok"><?=$_lang['failed']?></span> <?=$_lang['table_prefix_already_inuse']?>
         </p>
         <p><?=$_lang['table_prefix_already_inuse_note']?></p>
-    <?php else : ?>
+    <?php else {
+    : ?>
         <p>
             <?=rtrim($_lang['checking_table_prefix'], '`')?> <strong><?=trim($table_prefix, '`')?></strong>:
             <span class="ok"><?=$_lang['ok']?></span>
         </p>
-    <?php endif; ?>
+    <?php endif;
+}
+?>
 <?php endif; ?>
 
 <?php if ($installLevel >=  2 && $moduleSQLBaseFile) : ?>
@@ -81,9 +90,12 @@ 
             <hr />
         <?php endfor; ?>
         <p><?=$_lang['some_tables_not_updated']?></p>
-    <?php else : ?>
+    <?php else {
+    : ?>
         <p><?=$_lang['setup_database_creating_tables']?> <span class="ok"><?=$_lang['ok']?></span></p>
-    <?php endif; ?>
+    <?php endif;
+}
+?>
 <?php endif; ?>
 
 <?php if ($installLevel >= 3) : ?>
@@ -94,11 +106,14 @@ 
         <p><?=$_lang['cant_write_config_file']?> <span class="mono"><?=MGR_DIR?>/includes/config.inc.php</span></p>
         <textarea style="width:400px; height:160px;"><?=$configString?></textarea>
         <p><?=$_lang['cant_write_config_file_note']?></p>
-    <?php else : ?>
+    <?php else {
+    : ?>
         <p>
             <?=$_lang['writing_config_file']?> <span class="ok"><?=$_lang['ok']?></span>
         </p>
-    <?php endif; ?>
+    <?php endif;
+}
+?>
 <?php endif; ?>
 
 <?php if ($installLevel >= 4 && $installData && $moduleSQLDataFile && $moduleSQLResetFile) : ?>
@@ -117,12 +132,15 @@ 
         <?php endfor; ?>
         </p>
         <p><?=$_lang['some_tables_not_updated']?></p>
-    <?php else : ?>
+    <?php else {
+    : ?>
         <p>
             <?=$_lang['resetting_database']?>
             <span class="ok"><?=$_lang['ok']?></span>
         </p>
-    <?php endif; ?>
+    <?php endif;
+}
+?>
 <?php endif; ?>
 
 <?php if ($installLevel >= 5) : ?>
@@ -135,7 +153,8 @@ 
                 <?php elseif($itemData['type'] === 'update') : ?>
                     <p>&nbsp;&nbsp;&#10003;&nbsp;&nbsp;<?=$itemName?>: <span class="ok"><?=$_lang['upgraded']?></span></p>
                 <?php endif; ?>
-            <?php else : ?>
+            <?php else {
+    : ?>
                 <?php if ($itemData['error']['type'] === 'sql') : ?>
                     <p>&#10060; <?=$itemData['error']['content']?></p>
                 <?php elseif ($itemData['error']['type'] === 'file_not_found') : ?>
@@ -145,7 +164,9 @@ 
                             <?=$_lang['not_found']?>.
                         </span>
                     </p>
-                <?php endif; ?>
+                <?php endif;
+}
+?>
             <?php endif; ?>
         <?php endforeach; ?>
     <?php endif; ?>
@@ -161,10 +182,13 @@ 
                 <?php elseif($itemData['type'] === 'skip') : ?>
                     <!-- SKIP -->
                 <?php endif; ?>
-            <?php else : ?>
+            <?php else {
+    : ?>
                 <?php if ($itemData['error']['type'] === 'sql') : ?>
                     <p>&#10060; <?=$itemData['error']['content']?></p>
-                <?php endif; ?>
+                <?php endif;
+}
+?>
             <?php endif; ?>
         <?php endforeach; ?>
     <?php endif; ?>
@@ -182,7 +206,8 @@ 
                 <?php elseif($itemData['type'] === 'skip') : ?>
                     <!-- SKIP -->
                 <?php endif; ?>
-            <?php else : ?>
+            <?php else {
+    : ?>
                 <?php if ($itemData['error']['type'] === 'sql') : ?>
                     <p>&#10060; <?=$itemData['error']['content']?></p>
                 <?php elseif ($itemData['error']['type'] === 'file_not_found') : ?>
@@ -192,7 +217,9 @@ 
                             <?=$_lang['not_found']?>.
                         </span>
                     </p>
-                <?php endif; ?>
+                <?php endif;
+}
+?>
             <?php endif; ?>
         <?php endforeach; ?>
     <?php endif; ?>
@@ -208,7 +235,8 @@ 
                 <?php elseif($itemData['type'] === 'skip') : ?>
                     <!-- SKIP -->
                 <?php endif; ?>
-            <?php else : ?>
+            <?php else {
+    : ?>
                 <?php if ($itemData['error']['type'] === 'sql') : ?>
                     <p>&#10060; <?=$itemData['error']['content']?></p>
                 <?php elseif ($itemData['error']['type'] === 'file_not_found') : ?>
@@ -218,7 +246,9 @@ 
                             <?=$_lang['not_found']?>.
                         </span>
                     </p>
-                <?php endif; ?>
+                <?php endif;
+}
+?>
             <?php endif; ?>
         <?php endforeach; ?>
     <?php endif; ?>
@@ -234,7 +264,8 @@ 
                 <?php elseif($itemData['type'] === 'skip') : ?>
                     <!-- SKIP -->
                 <?php endif; ?>
-            <?php else : ?>
+            <?php else {
+    : ?>
                 <?php if ($itemData['error']['type'] === 'sql') : ?>
                     <p>&#10060; <?=$itemData['error']['content']?></p>
                 <?php elseif ($itemData['error']['type'] === 'file_not_found') : ?>
@@ -244,7 +275,9 @@ 
                             <?=$_lang['not_found']?>.
                         </span>
                     </p>
-                <?php endif; ?>
+                <?php endif;
+}
+?>
             <?php endif; ?>
         <?php endforeach; ?>
     <?php endif; ?>
@@ -262,7 +295,8 @@ 
                 <?php elseif($itemData['type'] === 'skip') : ?>
                     <!-- SKIP -->
                 <?php endif; ?>
-            <?php else : ?>
+            <?php else {
+    : ?>
                 <?php if ($itemData['error']['type'] === 'sql') : ?>
                     <p>&#10060; <?=$itemData['error']['content']?></p>
                 <?php elseif ($itemData['error']['type'] === 'file_not_found') : ?>
@@ -272,7 +306,9 @@ 
                             <?=$_lang['not_found']?>.
                         </span>
                     </p>
-                <?php endif; ?>
+                <?php endif;
+}
+?>
             <?php endif; ?>
         <?php endforeach; ?>
     <?php endif; ?>
@@ -281,7 +317,8 @@ 
         <h3><?=$_lang['installing_demo_site']?></h3>
         <?php if (empty($installDataLevel['demo']['error'])) : ?>
             <p>&nbsp;&nbsp;&#10003;&nbsp;&nbsp<span class="ok"><?=$_lang['ok']?></span></p>
-        <?php else : ?>
+        <?php else {
+    : ?>
             <p><span class="notok"><b><?=$_lang['database_alerts']?></span></p>
             <p><?=$_lang['setup_couldnt_install']?></p>
             <p><?=$_lang['installation_error_occured']?></p>
@@ -291,7 +328,9 @@ 
                 <?=$_lang['during_execution_of_sql']?>
                 <span class="mono"><?=htmlspecialchars($error['sql'])?></span>
                 <hr />
-            <?php endforeach; ?>
+            <?php endforeach;
+}
+?>
             <p><?=$_lang['some_tables_not_updated']?></p>
         <?php endif; ?>
     <?php endif; ?>
@@ -316,10 +355,13 @@ 
                     <span class="ok"><?=$_lang['guid_set']?></span>
                 </p>
             <?php endif; ?>
-        <?php else : ?>
+        <?php else {
+    : ?>
             <?php if ($itemData['error']['type'] === 'sql') : ?>
                 <p>&#10060; <?=$itemData['error']['content']?></p>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
         <?php endif; ?>
     <?php endforeach; ?>
 <?php endif; ?>
@@ -332,12 +374,15 @@ 
             <img src="img/ico_info.png" width="40" height="42" align="left" style="margin-right:10px;" />
             <?=$_lang['installation_note']?>
         </p>
-    <?php else : ?>
+    <?php else {
+    : ?>
         <p>
             <img src="img/ico_info.png" width="40" height="42" align="left" style="margin-right:10px;" />
             <?=$_lang['upgrade_note']?>
         </p>
-    <?php endif; ?>
+    <?php endif;
+}
+?>
 
     <form name="install" id="install_form" action="index.php?action=options" method="post">
             <?php if ($errors === 0) : ?>
@@ -350,11 +395,14 @@ 
                       />
                         <?=$_lang['remove_install_folder_auto'] ?>
                 </span>
-                <?php else : ?>
+                <?php else {
+    : ?>
                     <span id="removeinstall" style="float:left;color:#505050;line-height:18px;">
                     <?=$_lang['remove_install_folder_manual'] ?>
                 </span>
-                <?php endif; ?>
+                <?php endif;
+}
+?>
             <?php endif; ?>
         <p class="buttonlinks">
             <a href="javascript:closepage();" title="<?=$_lang['btnclose_value'] ?>">

manager/includes/manager.lockout.inc.php

Braces +8 added lines, -13 removed lines

@@ -3,7 +3,7 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-if($modx->getManagerApi()->action!='8' && isset($_SESSION['mgrValidated'])){
+if($modx->getManagerApi()->action!='8' && isset($_SESSION['mgrValidated'])) {
 
     $homeurl = $modx->makeUrl($manager_login_startup>0 ? $manager_login_startup:$site_start);
     $logouturl = MODX_MANAGER_URL.'index.php?a=8';
@@ -35,8 +35,7 @@ 
     	if(substr($target,0,6)==='@CHUNK') {
     		$target = trim(substr($target,7));
     		$lockout_tpl = $modx->getChunk($target);
-    	}
-    	elseif(substr($target,0,5)==='@FILE') {
+    	} elseif(substr($target,0,5)==='@FILE') {
     		$target = trim(substr($target,6));
     		$lockout_tpl = file_get_contents($target);
     	}
@@ -44,24 +43,20 @@ 
     	$chunk = $modx->getChunk($target);
     	if($chunk!==false && !empty($chunk)) {
     		$lockout_tpl = $chunk;
-    	}
-    	elseif(is_file(MODX_BASE_PATH . $target)) {
+    	} elseif(is_file(MODX_BASE_PATH . $target)) {
     		$target = MODX_BASE_PATH . $target;
     		$lockout_tpl = file_get_contents($target);
-    	}
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
+    	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
     		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl';
     		$lockout_tpl = file_get_contents($target);
-    	}
-	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
+    	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
 		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl';
 		$login_tpl = file_get_contents($target);
-	}
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible
+	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) {
+// ClipperCMS compatible
     		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html';
     		$lockout_tpl = file_get_contents($target);
-    	}
-    	else {
+    	} else {
     		$target = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
     		$lockout_tpl = file_get_contents($target);
     	}