evolution-cms / evolution

manager/actions/category_mgr/inc/request_trigger.inc.php

Braces +31 added lines, -65 removed lines

@@ -6,26 +6,22 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-if( isset( $_REQUEST[$cm->get('request_key')]['ajax'] ) )
-{
+if( isset( $_REQUEST[$cm->get('request_key')]['ajax'] ) ) {
     $_data  = $_REQUEST[$cm->get('request_key')];
     $output = '';
     $task   = $_data['task'];
-    switch( $task )
-    {
+    switch( $task ) {
         /**
          * get categories
          */
         case 'categorize_load_elements':
             $elements = $_data['elements'];
 
-            if( $uncategorized_elements = $cm->getAssignedElements( 0, $_data['elements'] ) )
-            {
+            if( $uncategorized_elements = $cm->getAssignedElements( 0, $_data['elements'] ) ) {
                $output .= $cm->renderView('chunks/categorize/uncategorized_elements', $uncategorized_elements);
             }
 
-            foreach( $cm->getCategories() as $category )
-            {
+            foreach( $cm->getCategories() as $category ) {
                 $category['elements'] = $cm->getAssignedElements( $category['id'], $_data['elements'] );
                 $output .= $cm->renderView('chunks/categorize/category', $category);
             }
@@ -41,8 +37,7 @@ 
  * @see http://modxcms.com/forums/index.php/topic,40430.msg251476.html#msg251476
  *
  */
-if( isset( $_POST[$cm->get('request_key')]['categorize']['submit'] ) )
-{
+if( isset( $_POST[$cm->get('request_key')]['categorize']['submit'] ) ) {
     $_data = $_POST[$cm->get('request_key')]['categorize'];
     $_changes = 0;
 
@@ -54,16 +49,13 @@ 
         'categorize'
     );
 
-    if( !isset( $_data['elements'] ) )
-    {
+    if( !isset( $_data['elements'] ) ) {
         $cm->addMessage( $cm->txt('cm_unknown_error'), 'categorize' );
         return;
     }
 
-    foreach( $_data['elements'] as $element_id => $data )
-    {
-        if( $cm->updateElement( $_data['elementsgroup'], $element_id, $data['category_id'] ) )
-        {
+    foreach( $_data['elements'] as $element_id => $data ) {
+        if( $cm->updateElement( $_data['elementsgroup'], $element_id, $data['category_id'] ) ) {
             $cm->addMessage(
                 sprintf(
                     $cm->txt('cm_x_assigned_to_category_y'),
@@ -78,13 +70,10 @@ 
         }
     }
 
-    if( $_changes === 0 )
-    {
+    if( $_changes === 0 ) {
         $cm->addMessage( $cm->txt('cm_no_categorization'), 'categorize' );
         return;
-    }
-    else
-    {
+    } else {
         $cm->addMessage(
             sprintf(
                 $cm->txt('cm_x_changes_made'),
@@ -98,26 +87,22 @@ 
 /**
  * Add a new category
  */
-if( isset( $_POST[$cm->get('request_key')]['add']['submit'] ) )
-{
+if( isset( $_POST[$cm->get('request_key')]['add']['submit'] ) ) {
     $_data    = $_POST[$cm->get('request_key')]['add']['data'];
     $category = trim( html_entity_decode($_data['name']) );
     $rank     = (int) $_data['rank'];
 
-    if( empty( $category ) )
-    {
+    if( empty( $category ) ) {
        $cm->addMessage( $cm->txt('cm_enter_name_for_category'), 'add' );
        return;
     }
 
-    if( $cm->isCategoryExists( $category ) )
-    {
+    if( $cm->isCategoryExists( $category ) ) {
        $cm->addMessage( sprintf( $cm->txt('cm_category_x_exists'), $category ), 'add' );
        return;
     }
 
-    if( $cm->addCategory( $category, $rank ) !== 0 )
-    {
+    if( $cm->addCategory( $category, $rank ) !== 0 ) {
         $cm->addMessage(
             sprintf(
                 $cm->txt( 'cm_category_x_saved_at_position_y' ),
@@ -126,9 +111,7 @@ 
             ),
             'add'
         );
-    }
-    else
-    {
+    } else {
         $cm->addMessage( $cm->txt('cm_unknown_error'), 'add' );
     }
 }
@@ -136,20 +119,17 @@ 
 /**
  * Sort categories
  */
-if( isset( $_POST[$cm->get('request_key')]['sort']['submit'] ) )
-{
+if( isset( $_POST[$cm->get('request_key')]['sort']['submit'] ) ) {
     $categories = $_POST[$cm->get('request_key')]['sort']['data'];
     $_changes   = 0;
 
-    foreach( $categories as $category_id => $_data  )
-    {
+    foreach( $categories as $category_id => $_data  ) {
         $data = array(
             'category' => urldecode( $_data['category'] ),
             'rank'     => $_data['rank']
         );
 
-        if( $cm->updateCategory( $category_id, $data ) )
-        {
+        if( $cm->updateCategory( $category_id, $data ) ) {
             $cm->addMessage(
                 sprintf(
                     $cm->txt('cm_category_x_moved_to_position_y'),
@@ -162,12 +142,9 @@ 
         }
     }
 
-    if( $_changes === 0 )
-    {
+    if( $_changes === 0 ) {
         $cm->addMessage( $cm->txt( 'cm_no_changes' ), 'sort');
-    }
-    else
-    {
+    } else {
         $cm->addMessage(
             sprintf(
                 $cm->txt('cm_x_changes_made'),
@@ -181,17 +158,13 @@ 
 /**
  * Edit categories
  */
-if( isset( $_POST[$cm->get('request_key')]['edit']['submit'] ) )
-{
+if( isset( $_POST[$cm->get('request_key')]['edit']['submit'] ) ) {
     $categories = $_POST[$cm->get('request_key')]['edit']['data'];
     $_changes   = 0;
 
-    foreach( $categories as $category_id => $_data  )
-    {
-        if( isset( $_data['delete'] ) )
-        {
-            if( $cm->deleteCategory( $category_id ) )
-            {
+    foreach( $categories as $category_id => $_data  ) {
+        if( isset( $_data['delete'] ) ) {
+            if( $cm->deleteCategory( $category_id ) ) {
                 $cm->addMessage(
                     sprintf(
                         $cm->txt('cm_category_x_deleted'),
@@ -209,8 +182,7 @@ 
             'rank'     => $_data['rank']
         );
 
-        if( $cm->updateCategory( $category_id, $data ) )
-        {
+        if( $cm->updateCategory( $category_id, $data ) ) {
             $cm->addMessage(
                 sprintf(
                     $cm->txt('cm_category_x_renamed_to_y'),
@@ -223,8 +195,7 @@ 
         }
     }
 
-    if( $_changes === 0 )
-    {
+    if( $_changes === 0 ) {
         $cm->addMessage( $cm->txt( 'cm_no_changes' ), 'edit');
     }
 }
@@ -233,12 +204,10 @@ 
  * Delete singel category by $_GET
  */
 if( isset( $_GET[$cm->get('request_key')]['delete'] )
-    && !empty( $_GET[$cm->get('request_key')]['delete'] ) )
-{
+    && !empty( $_GET[$cm->get('request_key')]['delete'] ) ) {
     $category_id = (int)$_GET[$cm->get('request_key')]['delete'];
 
-    if( $cm->deleteCategory( $category_id ) )
-    {
+    if( $cm->deleteCategory( $category_id ) ) {
         $cm->addMessage(
             sprintf(
                 $cm->txt('cm_category_x_deleted'),
@@ -251,16 +220,13 @@ 
 /**
  * Translate phrases
  */
-if( isset( $_POST[$cm->get('request_key')]['translate']['submit'] ) )
-{
+if( isset( $_POST[$cm->get('request_key')]['translate']['submit'] ) ) {
     $translations = $_POST[$cm->get('request_key')]['translate']['data'];
 
-    foreach( $translations as $native_phrase => $translation )
-    {
+    foreach( $translations as $native_phrase => $translation ) {
         $native_phrase = urldecode( $native_phrase );
 
-        if( empty( $translation ) )
-        {
+        if( empty( $translation ) ) {
             $translation = $native_phrase;
 
             $cm->addMessage(

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->manager->action!='8' && isset($_SESSION['mgrValidated'])){
+if($modx->manager->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);
     	}

manager/processors/export_site.processor.php

Braces +9 added lines, -5 removed lines

@@ -12,16 +12,20 @@
 $modx->loadExtension('EXPORT_SITE');
 
 
-if(is_dir(MODX_BASE_PATH . 'temp'))       $export_dir = MODX_BASE_PATH . 'temp/export';
-elseif(is_dir(MODX_BASE_PATH . 'assets')) $export_dir = MODX_BASE_PATH . 'assets/export';
+if(is_dir(MODX_BASE_PATH . 'temp')) {
+    $export_dir = MODX_BASE_PATH . 'temp/export';
+} elseif(is_dir(MODX_BASE_PATH . 'assets')) {
+    $export_dir = MODX_BASE_PATH . 'assets/export';
+}
 $modx->export->targetDir = $export_dir;
 
-if(strpos($modx->config['base_path'],"{$export_dir}/")===0 && 0 <= strlen(str_replace("{$export_dir}/",'',$modx->config['base_path'])))
+if(strpos($modx->config['base_path'],"{$export_dir}/")===0 && 0 <= strlen(str_replace("{$export_dir}/",'',$modx->config['base_path']))) {
 	return $_lang['export_site.static.php6'];
-elseif($modx->config['rb_base_dir'] === $export_dir . '/')
+} elseif($modx->config['rb_base_dir'] === $export_dir . '/') {
 	return $modx->parsePlaceholder($_lang['export_site.static.php7'],'rb_base_url=' . $modx->config['base_url'] . $modx->config['rb_base_url']);
-elseif(!is_writable($export_dir))
+} elseif(!is_writable($export_dir)) {
 	return $_lang['export_site_target_unwritable'];
+}
 
 $modx->export->generate_mode = $_POST['generate_mode'];
 

manager/processors/duplicate_plugin.processor.php

Braces +5 added lines, -2 removed lines

@@ -14,8 +14,11 @@
 // count duplicates
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_plugins'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_plugins'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
-else $count = '';
+if($count>=1) {
+    $count = ' '.($count+1);
+} else {
+    $count = '';
+}
 
 // duplicate Plugin
 $newid = $modx->db->insert(

manager/processors/duplicate_tmplvars.processor.php

Braces +5 added lines, -2 removed lines

@@ -14,8 +14,11 @@
 // count duplicates
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_tmplvars'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_tmplvars'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
-else $count = '';
+if($count>=1) {
+    $count = ' '.($count+1);
+} else {
+    $count = '';
+}
 
 // duplicate TV
 $newid = $modx->db->insert(

manager/processors/remove_locks.processor.php

Braces +3 added lines, -1 removed lines

@@ -4,7 +4,9 @@
 }
 
 if(!isset($_GET['id'])) {
-	if(!$modx->hasPermission('remove_locks')) $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+	if(!$modx->hasPermission('remove_locks')) {
+	    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+	}
 
 	// Remove all locks
 	$modx->db->truncate($modx->getFullTableName('active_user_locks'));

manager/processors/web_access_groups.processor.php

Braces +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
 }
 
 // secure web documents - flag as private
-if($updategroupaccess==true){
+if($updategroupaccess==true) {
 	include MODX_MANAGER_PATH."includes/secure_web_documents.inc.php";
 	secureWebDocument();
 

manager/processors/duplicate_snippet.processor.php

Braces +5 added lines, -2 removed lines

@@ -14,8 +14,11 @@
 // count duplicates
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_snippets'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_snippets'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
-else $count = '';
+if($count>=1) {
+    $count = ' '.($count+1);
+} else {
+    $count = '';
+}
 
 // duplicate Snippet
 $newid = $modx->db->insert(

manager/processors/purge_plugin.processor.php

Braces +4 added lines, -1 removed lines

@@ -25,7 +25,10 @@
 
     $id = $row['id'];
 
-    if(in_array($id,$latestIds)) continue;	// Keep latest version of disabled plugins
+    if(in_array($id,$latestIds)) {
+        continue;
+    }
+    // Keep latest version of disabled plugins
 
     // invoke OnBeforePluginFormDelete event
     $modx->invokeEvent('OnBeforePluginFormDelete', array('id'=> $id));