evolution-cms / evolution

manager/actions/logging.static.php

Braces +36 added lines, -36 removed lines

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

-if (IN_MANAGER_MODE != "true") {

+if (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('logs')) {

+if (!$modx->hasPermission('logs')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 

-function array_unique_multi($array, $checkKey)

-{

+function array_unique_multi($array, $checkKey)
+{
     // Use the builtin if we're not a multi-dimensional array

-    if (!is_array(current($array)) || empty($checkKey)) {

+    if (!is_array(current($array)) || empty($checkKey)) {
         return array_unique($array);

     }

 

     $ret = array();

     $checkValues = array(); // contains the unique key Values

-    foreach ($array as $key => $current) {

-        if (in_array($current[$checkKey], $checkValues)) {

+    foreach ($array as $key => $current) {
+        if (in_array($current[$checkKey], $checkValues)) {
             continue;

         } // duplicate

 

@@ -26,17 +26,17 @@ 
     return $ret;

 }

 

-function record_sort($array, $key)

-{

+function record_sort($array, $key)
+{
     $hash = array();

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

+    foreach ($array as $k => $v) {
         $hash[$k] = $v[$key];

     }

 

     natsort($hash);

 

     $records = array();

-    foreach ($hash as $k => $row) {

+    foreach ($hash as $k => $row) {
         $records[$k] = $array[$k];

     }

 

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

                             // get all users currently in the log

                             $logs_user = record_sort(array_unique_multi($logs, 'internalKey'), 'username');

-                            foreach ($logs_user as $row) {

+                            foreach ($logs_user as $row) {
                                 $selectedtext = $row['internalKey'] == $_REQUEST['searchuser'] ? ' selected="selected"' : '';

                                 echo "\t\t" . '<option value="' . $row['internalKey'] . '"' . $selectedtext . '>' . $row['username'] . "</option>\n";

                             }

@@ -80,9 +80,9 @@ 
                             // get all available actions in the log

                             include_once "actionlist.inc.php";

                             $logs_actions = record_sort(array_unique_multi($logs, 'action'), 'action');

-                            foreach ($logs_actions as $row) {

+                            foreach ($logs_actions as $row) {
                                 $action = getAction($row['action']);

-                                if ($action == 'Idle') {

+                                if ($action == 'Idle') {
                                     continue;

                                 }

                                 $selectedtext = $row['action'] == $_REQUEST['action'] ? ' selected="selected"' : '';

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

                             // get all itemid currently in logging

                             $logs_items = record_sort(array_unique_multi($logs, 'itemid'), 'itemid');

-                            foreach ($logs_items as $row) {

+                            foreach ($logs_items as $row) {
                                 $selectedtext = $row['itemid'] == $_REQUEST['itemid'] ? ' selected="selected"' : '';

                                 echo "\t\t" . '<option value="' . $row['itemid'] . '"' . $selectedtext . '>' . $row['itemid'] . "</option>\n";

                             }

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

                             // get all itemname currently in logging

                             $logs_names = record_sort(array_unique_multi($logs, 'itemname'), 'itemname');

-                            foreach ($logs_names as $row) {

+                            foreach ($logs_names as $row) {
                                 $selectedtext = $row['itemname'] == $_REQUEST['itemname'] ? ' selected="selected"' : '';

                                 echo "\t\t" . '<option value="' . $row['itemname'] . '"' . $selectedtext . '>' . $row['itemname'] . "</option>\n";

                             }

@@ -172,36 +172,36 @@ 
     <div class="container container-body">

 

 <?php

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

+if (isset($_REQUEST['log_submit'])) {
     // get the selections the user made.

     $sqladd = array();

-    if ($_REQUEST['searchuser'] != 0) {

+    if ($_REQUEST['searchuser'] != 0) {
         $sqladd[] = "internalKey='" . intval($_REQUEST['searchuser']) . "'";

     }

-    if ($_REQUEST['action'] != 0) {

+    if ($_REQUEST['action'] != 0) {
         $sqladd[] = "action=" . intval($_REQUEST['action']);

     }

-    if ($_REQUEST['itemid'] != 0 || $_REQUEST['itemid'] == "-") {

+    if ($_REQUEST['itemid'] != 0 || $_REQUEST['itemid'] == "-") {
         $sqladd[] = "itemid='" . $_REQUEST['itemid'] . "'";

     }

-    if ($_REQUEST['itemname'] != '0') {

+    if ($_REQUEST['itemname'] != '0') {
         $sqladd[] = "itemname='" . $modx->db->escape($_REQUEST['itemname']) . "'";

     }

-    if ($_REQUEST['message'] != "") {

+    if ($_REQUEST['message'] != "") {
         $sqladd[] = "message LIKE '%" . $modx->db->escape($_REQUEST['message']) . "%'";

     }

     // date stuff

-    if ($_REQUEST['datefrom'] != "") {

+    if ($_REQUEST['datefrom'] != "") {
         $sqladd[] = "timestamp>" . $modx->toTimeStamp($_REQUEST['datefrom']);

     }

-    if ($_REQUEST['dateto'] != "") {

+    if ($_REQUEST['dateto'] != "") {
         $sqladd[] = "timestamp<" . $modx->toTimeStamp($_REQUEST['dateto']);

     }

 

     // If current position is not set, set it to zero

-    if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) {

+    if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) {
         $int_cur_position = 0;

-    } else {

+    } else {
         $int_cur_position = $_REQUEST['int_cur_position'];

     }

 

@@ -215,9 +215,9 @@ 
 

     $rs = $modx->db->select('*', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : ''), 'timestamp DESC, id DESC', "{$int_cur_position}, {$int_num_result}");

 

-if ($limit < 1) {

+if ($limit < 1) {
     echo '<p>' . $_lang["mgrlog_emptysrch"] . '</p>';

-} else {

+} else {
     echo '<p>' . $_lang["mgrlog_sortinst"] . '</p>';

 

     include_once "paginate.inc.php";

@@ -236,14 +236,14 @@ 
     $paging = $array_paging['first_link'] . $_lang["paging_first"] . (isset($array_paging['first_link']) ? "</a> " : " ");

     $paging .= $array_paging['previous_link'] . $_lang["paging_prev"] . (isset($array_paging['previous_link']) ? "</a> " : " ");

     $pagesfound = sizeof($array_row_paging);

-    if ($pagesfound > 6) {

+    if ($pagesfound > 6) {
         $paging .= $array_row_paging[$current_row - 2]; // ."&nbsp;";

         $paging .= $array_row_paging[$current_row - 1]; // ."&nbsp;";

         $paging .= $array_row_paging[$current_row]; // ."&nbsp;";

         $paging .= $array_row_paging[$current_row + 1]; // ."&nbsp;";

         $paging .= $array_row_paging[$current_row + 2]; // ."&nbsp;";

-    } else {

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

+    } else {
+        for ($i = 0; $i < $pagesfound; $i++) {
             $paging .= $array_row_paging[$i] . "&nbsp;";

         }

     }

@@ -278,12 +278,12 @@ 
                 // grab the entire log file...

                 $logentries = array();

                 $i = 0;

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

-                    if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) {

+                while ($logentry = $modx->db->getRow($rs)) {
+                    if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) {
                         $item = '<div style="text-align:center;">-</div>';

-                    } elseif ($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) {

+                    } elseif ($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) {
                         $item = '<a href="index.php?a=3&amp;id=' . $logentry['itemid'] . '">' . $logentry['itemname'] . '</a>';

-                    } else {

+                    } else {
                         $item = $logentry['itemname'];

                     }

                     //index.php?a=13&searchuser=' . $logentry['internalKey'] . '&action=' . $logentry['action'] . '&itemname=' . $logentry['itemname'] . '&log_submit=true'

@@ -318,6 +318,6 @@ 
     // @see index.php @ 915

     global $action;

     $action = 1;

-} else {

+} else {
     echo $_lang["mgrlog_noquery"];

 }

manager/actions/mutate_categories.dynamic.php

Braces +5 added lines, -5 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(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(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('category_manager')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
@@ -26,16 +28,14 @@ 
 $cm = new Module_Categories_Manager();
 
 // 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/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/site_schedule.static.php

Braces +11 added lines, -11 removed lines

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

-if(IN_MANAGER_MODE != "true") {

+if(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('view_eventlog')) {

+if(!$modx->hasPermission('view_eventlog')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 ?>

@@ -19,11 +19,11 @@ 
 			<?php

 			$rs = $modx->db->select('id, pagetitle, pub_date', $modx->getFullTableName('site_content'), "pub_date > " . time() . "", 'pub_date ASC');

 			$limit = $modx->db->getRecordCount($rs);

-			if($limit < 1) {

+			if($limit < 1) {
 				?>

 				<p><?= $_lang["no_docs_pending_publishing"] ?></p>

 				<?php

-			} else {

+			} else {
 				?>

 				<div class="table-responsive">

 					<table class="grid sortabletable" id="table-1">

@@ -36,7 +36,7 @@ 
 						</thead>

 						<tbody>

 						<?php

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

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

 							<tr>

 								<td class="text-right"><?= $row['id'] ?></td>

@@ -58,11 +58,11 @@ 
 			<?php

 			$rs = $modx->db->select('id, pagetitle, unpub_date', $modx->getFullTableName('site_content'), "unpub_date > " . time() . "", 'unpub_date ASC');

 			$limit = $modx->db->getRecordCount($rs);

-			if($limit < 1) {

+			if($limit < 1) {
 				?>

 				<p><?= $_lang["no_docs_pending_unpublishing"] ?></p>

 				<?php

-			} else {

+			} else {
 				?>

 				<div class="table-responsive">

 					<table class="grid sortabletable" id="table-2">

@@ -75,7 +75,7 @@ 
 						</thead>

 						<tbody>

 						<?php

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

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

 							<tr>

 								<td class="text-right"><?= $row['id'] ?></td>

@@ -97,11 +97,11 @@ 
 			<?php

 			$rs = $modx->db->select('id, pagetitle, pub_date, unpub_date', $modx->getFullTableName('site_content'), "pub_date > 0 OR unpub_date > 0", "pub_date DESC");

 			$limit = $modx->db->getRecordCount($rs);

-			if($limit < 1) {

+			if($limit < 1) {
 				?>

 				<p><?= $_lang["no_docs_pending_pubunpub"] ?></p>

 				<?php

-			} else {

+			} else {
 				?>

 				<div class="table-responsive">

 					<table class="grid sortabletable" id="table-3">

@@ -115,7 +115,7 @@ 
 						</thead>

 						<tbody>

 						<?php

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

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

 							<tr>

 								<td class="text-right"><?= $row['id'] ?></td>

manager/actions/mutate_module.dynamic.php

Braces +22 added lines, -21 removed lines

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

-if(IN_MANAGER_MODE != "true") {

+if(IN_MANAGER_MODE != "true") {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

-switch($modx->manager->action) {

+switch($modx->manager->action) {
 	case 107:

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

+		if(!$modx->hasPermission('new_module')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 		}

 		break;

 	case 108:

-		if(!$modx->hasPermission('edit_module')) {

+		if(!$modx->hasPermission('edit_module')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 		}

 		break;

@@ -29,7 +29,8 @@ 
 $tbl_site_templates = $modx->getFullTableName('site_templates');

 $tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars');

 // create globally unique identifiers (guid)

-function createGUID() {

+function createGUID()
+{
 	srand((double) microtime() * 1000000);

 	$r = rand();

 	$u = uniqid(getmypid() . $r . (double) microtime() * 1000000, 1);

@@ -38,7 +39,7 @@ 
 }

 

 // check to see the module editor isn't locked

-if($lockedEl = $modx->elementIsLocked(6, $id)) {

+if($lockedEl = $modx->elementIsLocked(6, $id)) {
 	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['module']));

 }

 // end check for lock

@@ -46,22 +47,22 @@ 
 // Lock snippet for other users to edit

 $modx->lockElement(6, $id);

 

-if(isset($_GET['id'])) {

+if(isset($_GET['id'])) {
 	$rs = $modx->db->select('*', $tbl_site_modules, "id='{$id}'");

 	$content = $modx->db->getRow($rs);

-	if(!$content) {

+	if(!$content) {
 		$modx->webAlertAndQuit("Module not found for id '{$id}'.");

 	}

 	$content['properties'] = str_replace("&", "&amp;", $content['properties']);

 	$_SESSION['itemname'] = $content['name'];

-	if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {

+	if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
 		$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 	}

-} else {

+} else {
 	$_SESSION['itemname'] = $_lang["new_module"];

 	$content['wrap'] = '1';

 }

-if($modx->manager->hasFormValues()) {

+if($modx->manager->hasFormValues()) {
 	$modx->manager->loadFormValues();

 }

 

@@ -435,7 +436,7 @@ 
 	<?php

 	// invoke OnModFormPrerender event

 	$evtOut = $modx->invokeEvent('OnModFormPrerender', array('id' => $id));

-	if(is_array($evtOut)) {

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

 	}

 

@@ -498,7 +499,7 @@ 
 								<option>&nbsp;</option>

 								<?php

 								include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');

-								foreach(getCategories() as $n => $v) {

+								foreach(getCategories() as $n => $v) {
 									echo "\t\t\t" . '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($v['category']) . "</option>\n";

 								}

 								?>

@@ -650,7 +651,7 @@ 
 					$rs = $modx->db->select('usergroup', $tbl_site_module_access, "module='{$id}'");

 					$groupsarray = $modx->db->getColumn('usergroup', $rs);

 

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

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

 						<!-- User Group Access Permissions -->

 						<script type="text/javascript">

@@ -678,21 +679,21 @@ 
 					}

 					$chk = '';

 					$rs = $modx->db->select('name, id', $tbl_membergroup_names, '', 'name');

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

+					while($row = $modx->db->getRow($rs)) {
 						$groupsarray = is_numeric($id) && $id > 0 ? $groupsarray : array();

 						$checked = in_array($row['id'], $groupsarray);

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

-							if($checked) {

+						if($modx->hasPermission('access_permissions')) {
+							if($checked) {
 								$notPublic = true;

 							}

 							$chks .= '<label><input type="checkbox" name="usrgroups[]" value="' . $row['id'] . '"' . ($checked ? ' checked="checked"' : '') . ' onclick="makePublic(false)" /> ' . $row['name'] . "</label><br />\n";

-						} else {

-							if($checked) {

+						} else {
+							if($checked) {
 								$chks = '<input type="hidden" name="usrgroups[]"  value="' . $row['id'] . '" />' . "\n" . $chks;

 							}

 						}

 					}

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

+					if($modx->hasPermission('access_permissions')) {
 						$chks = '<label><input type="checkbox" name="chkallgroups"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true)" /><span class="warning"> ' . $_lang['all_usr_groups'] . '</span></label><br />' . "\n" . $chks;

 					}

 					echo $chks;

@@ -714,7 +715,7 @@ 
 		<?php

 		// invoke OnModFormRender event

 		$evtOut = $modx->invokeEvent('OnModFormRender', array('id' => $id));

-		if(is_array($evtOut)) {

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

 		}

 		?>

manager/actions/search.static.php

Braces +3 added lines, -3 removed lines

@@ -118,18 +118,18 @@
 		$articul_query = "SELECT `contentid` FROM {$tbl_site_tmplvar_contentvalues} WHERE `value` LIKE '%{$searchfields}%'";
 		$articul_result = $modx->db->query($articul_query);
 		$articul_id_array = $modx->db->makeArray($articul_result);
-		if(count($articul_id_array)>0){
+		if(count($articul_id_array)>0) {
 			$articul_id = '';
 			$i = 1;
 			foreach( $articul_id_array as $articul ) {
 				$articul_id.=$articul['contentid'];
-				if($i !== count($articul_id_array)){
+				if($i !== count($articul_id_array)) {
 					$articul_id.=',';
 				}
 				$i++;
 			}  
 		$articul_id_query = " OR sc.id IN ({$articul_id})";
-		}else{
+		} else {
 			$articul_id_query = '';
 		}
 		/*end search by TV*/

manager/actions/category_mgr/inc/Module_Categories_Manager.php

Braces +11 added lines, -20 removed lines

@@ -3,8 +3,7 @@ 
  * Class for MODx Categories Manager
  */
 if( !is_object( $modx )
-    || $modx->isBackend() === false )
-{
+    || $modx->isBackend() === false ) {
     die('Please use the MODx Backend.');
 }
 
@@ -41,16 +40,11 @@ 
     {
         global $modx;
         
-        if( isset( $this->params[$key] ) )
-        {
+        if( isset( $this->params[$key] ) ) {
             return $this->params[$key];
-        }
-        elseif( isset( $modx->config[$key] ) )
-        {
+        } elseif( isset( $modx->config[$key] ) ) {
             return $modx->config[$key];
-        }
-        elseif( isset( $modx->event->params[$key] ) )
-        {
+        } elseif( isset( $modx->event->params[$key] ) ) {
             return $modx->event->params[$key];
         }
         return false;
@@ -65,8 +59,7 @@ 
 
     function getMessages( $namespace = 'default' )
     {
-        if( isset( $this->params['messages'][$namespace] ) )
-        {
+        if( isset( $this->params['messages'][$namespace] ) ) {
             return $this->params['messages'][$namespace];
         }
         return false;
@@ -82,12 +75,9 @@ 
         $view     = & $this;
 
         if( is_file( $file ) 
-            && is_readable( $file ) )
-        {
+            && is_readable( $file ) ) {
             include $file;
-        }
-        else
-        {
+        } else {
             echo sprintf(
                 'View "%s<strong>%s</strong>" not found.',
                 self::get('views_dir'), 
@@ -110,8 +100,7 @@ 
             "`id` = '" . (int)$element_id . "'"
         );
 
-        if( $this->db->getAffectedRows() === 1 )
-        {
+        if( $this->db->getAffectedRows() === 1 ) {
             return true;
         }
         return false;
@@ -121,7 +110,9 @@ 
     function txt( $txt )
     {
         global $_lang;
-        if(isset($_lang[$txt])) return $_lang[$txt];
+        if(isset($_lang[$txt])) {
+            return $_lang[$txt];
+        }
         return $txt;
     }
 }
\ No newline at end of file

manager/actions/category_mgr/inc/Categories.php

Braces +14 added lines, -28 removed lines

@@ -15,8 +15,7 @@ 
         $this->db                   = & $modx->db;
         $this->db_tbl['categories'] = $modx->getFullTableName('categories');
         
-        foreach( $this->elements as $element )
-        {
+        foreach( $this->elements as $element ) {
             $this->db_tbl[$element] = $modx->getFullTableName('site_' . $element );
         }
     }
@@ -37,8 +36,7 @@ 
             )
         );
 
-        if( !empty( $categories ) )
-        {
+        if( !empty( $categories ) ) {
             return $categories;
         }
         return false;
@@ -70,12 +68,10 @@ 
 
     function getAssignedElements( $category_id, $element )
     {
-        if( in_array( $element, $this->elements, true ) )
-        {
+        if( in_array( $element, $this->elements, true ) ) {
             
             $fields = '`name`,`description`';
-            if( $element === 'templates' )
-            {
+            if( $element === 'templates' ) {
                 $fields = '`templatename`,`description`';
             }
             
@@ -90,11 +86,9 @@ 
             );
             
             // correct the name of templates
-            if( $element === 'templates' )
-            {
+            if( $element === 'templates' ) {
                 $_elements_count = count($elements);
-                for( $i=0; $i < $_elements_count; $i++ )
-                {
+                for( $i=0; $i < $_elements_count; $i++ ) {
                     $elements[$i]['name'] = $elements[$i]['templatename'];
                 }
             }
@@ -106,8 +100,7 @@ 
     function getAllAssignedElements( $category_id )
     {
         $elements = array();
-        foreach( $this->elements as $element )
-        {
+        foreach( $this->elements as $element ) {
             $elements[$element] = $this->getAssignedElements( $category_id, $element );
         }
         return $elements;
@@ -116,8 +109,7 @@ 
     function deleteCategory( $category_id )
     {
         $_update = array('category' => 0);
-        foreach( $this->elements as $element )
-        {
+        foreach( $this->elements as $element ) {
             $this->db->update(
                 $_update,
                 $this->db_tbl[$element],
@@ -130,8 +122,7 @@ 
             "`id` = '" . $category_id . "'"
         );
         
-        if( $this->db->getAffectedRows() === 1 )
-        {
+        if( $this->db->getAffectedRows() === 1 ) {
             return true;    
         }
         return false;
@@ -140,8 +131,7 @@ 
     function updateCategory( $category_id, $data = array() )
     {
         if( empty( $data )
-            || empty( $category_id ) )
-        {
+            || empty( $category_id ) ) {
             return false;
         }
         
@@ -156,8 +146,7 @@ 
             "`id` = '" . (int)$category_id . "'"
         );
 
-        if( $this->db->getAffectedRows() === 1 )
-        {
+        if( $this->db->getAffectedRows() === 1 ) {
             return true;
         }
 
@@ -166,8 +155,7 @@ 
 
     function addCategory( $category_name, $category_rank )
     {
-        if( $this->isCategoryExists( $category_name ) )
-        {
+        if( $this->isCategoryExists( $category_name ) ) {
             return false;
         }
 
@@ -181,8 +169,7 @@ 
             $this->db_tbl['categories']
         );
         
-        if( $this->db->getAffectedRows() === 1 )
-        {
+        if( $this->db->getAffectedRows() === 1 ) {
             return $this->db->getInsertId();
         }
 
@@ -202,8 +189,7 @@ 
             )
         );
         
-        if( $this->db->getAffectedRows() === 1 )
-        {
+        if( $this->db->getAffectedRows() === 1 ) {
             return $category_id;
         }
         return false;

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

Braces +32 added lines, -67 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(
@@ -285,8 +251,7 @@ 
         );
     }
 
-    if( empty( $cm->new_translations ) )
-    {   
+    if( empty( $cm->new_translations ) ) {
        //$_REQUEST['webfxtab_manage-categories-pane'] = 0;
        // unset( $_COOKIE['webfxtab_manage-categories-pane'] );
        // setcookie('webfxtab_manage-categories-pane', 0);