evolution-cms / evolution

manager/processors/delete_message.processor.php

Spacing +5 added lines, -5 removed lines

@@ -1,13 +1,13 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || 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('messages')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if ($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
     $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
@@ -18,12 +18,12 @@ 
     $modx->webAlertAndQuit("Wrong number of messages returned!");
 }
 
-if ($message['recipient']!=$modx->getLoginUserID()) {
+if ($message['recipient'] != $modx->getLoginUserID()) {
     $modx->webAlertAndQuit("You are not allowed to delete this message!");
 }
 
 // delete message
 $modx->getDatabase()->delete($modx->getDatabase()->getFullTableName('user_messages'), "id='{$id}'");
 
-$header="Location: index.php?a=10";
+$header = "Location: index.php?a=10";
 header($header);

manager/processors/duplicate_tmplvars.processor.php

Indentation +26 added lines, -26 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('edit_template')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
@@ -19,37 +19,37 @@ 
 
 // duplicate TV
 $newid = $modx->getDatabase()->insert(
-	array(
-		'type'=>'',
-		'name'=>'',
-		'caption'=>'',
-		'description'=>'',
-		'default_text'=>'',
-		'elements'=>'',
-		'rank'=>'',
-		'display'=>'',
-		'display_params'=>'',
-		'category'=>'',
-		), $modx->getDatabase()->getFullTableName('site_tmplvars'), // Insert into
-	"type, CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, CONCAT(caption, ' Duplicate{$count}') AS caption, description, default_text, elements, rank, display, display_params, category", $modx->getDatabase()->getFullTableName('site_tmplvars'), "id='{$id}'"); // Copy from
+    array(
+        'type'=>'',
+        'name'=>'',
+        'caption'=>'',
+        'description'=>'',
+        'default_text'=>'',
+        'elements'=>'',
+        'rank'=>'',
+        'display'=>'',
+        'display_params'=>'',
+        'category'=>'',
+        ), $modx->getDatabase()->getFullTableName('site_tmplvars'), // Insert into
+    "type, CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, CONCAT(caption, ' Duplicate{$count}') AS caption, description, default_text, elements, rank, display, display_params, category", $modx->getDatabase()->getFullTableName('site_tmplvars'), "id='{$id}'"); // Copy from
 
 
 // duplicate TV Template Access Permissions
 $modx->getDatabase()->insert(
-	array(
-		'tmplvarid'=>'',
-		'templateid'=>'',
-		'rank'=>'',
-		), $modx->getDatabase()->getFullTableName('site_tmplvar_templates'), // Insert into
-	"'{$newid}', templateid, rank", $modx->getDatabase()->getFullTableName('site_tmplvar_templates'), "tmplvarid='{$id}'"); // Copy from
+    array(
+        'tmplvarid'=>'',
+        'templateid'=>'',
+        'rank'=>'',
+        ), $modx->getDatabase()->getFullTableName('site_tmplvar_templates'), // Insert into
+    "'{$newid}', templateid, rank", $modx->getDatabase()->getFullTableName('site_tmplvar_templates'), "tmplvarid='{$id}'"); // Copy from
 
 // duplicate TV Access Permissions
 $modx->getDatabase()->insert(
-	array(
-		'tmplvarid'=>'',
-		'documentgroup'=>'',
-		), $modx->getDatabase()->getFullTableName('site_tmplvar_access'), // Insert into
-	"'{$newid}', documentgroup", $modx->getDatabase()->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'"); // Copy from
+    array(
+        'tmplvarid'=>'',
+        'documentgroup'=>'',
+        ), $modx->getDatabase()->getFullTableName('site_tmplvar_access'), // Insert into
+    "'{$newid}', documentgroup", $modx->getDatabase()->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'"); // Copy from
 
 // Set the item name for logger
 $name = $modx->getDatabase()->getValue($modx->getDatabase()->select('name', $modx->getDatabase()->getFullTableName('site_tmplvars'), "id='{$newid}'"));

Spacing +6 added lines, -6 removed lines

@@ -1,20 +1,20 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || 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('edit_template')) {
+if (!$modx->hasPermission('edit_template')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
 $name = $modx->getDatabase()->getValue($modx->getDatabase()->select('name', $modx->getDatabase()->getFullTableName('site_tmplvars'), "id='{$id}'"));
 $count = $modx->getDatabase()->getRecordCount($modx->getDatabase()->select('name', $modx->getDatabase()->getFullTableName('site_tmplvars'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
+if ($count >= 1) $count = ' '.($count + 1);
 else $count = '';
 
 // duplicate TV
@@ -56,5 +56,5 @@ 
 $_SESSION['itemname'] = $name;
 
 // finish duplicating - redirect to new variable
-$header="Location: index.php?r=2&a=301&id=$newid";
+$header = "Location: index.php?r=2&a=301&id=$newid";
 header($header);

Braces +5 added lines, -2 removed lines

@@ -14,8 +14,11 @@
 // count duplicates
 $name = $modx->getDatabase()->getValue($modx->getDatabase()->select('name', $modx->getDatabase()->getFullTableName('site_tmplvars'), "id='{$id}'"));
 $count = $modx->getDatabase()->getRecordCount($modx->getDatabase()->select('name', $modx->getDatabase()->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->getDatabase()->insert(

manager/processors/remove_locks.processor.php

Indentation +16 added lines, -16 removed lines

@@ -4,23 +4,23 @@
 }
 
 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->getDatabase()->truncate($modx->getDatabase()->getFullTableName('active_user_locks'));
+    // Remove all locks
+    $modx->getDatabase()->truncate($modx->getDatabase()->getFullTableName('active_user_locks'));
 
-	$header = "Location: index.php?a=2";
-	header($header);
+    $header = "Location: index.php?a=2";
+    header($header);
 } else {
-	// Remove single locks via AJAX / window.onbeforeunload
-	$type = (int)$_GET['type'];
-	$id = (int)$_GET['id'];
-	$includeAllUsers = $modx->hasPermission('remove_locks'); // Enables usage of "unlock"-ajax-button
-	if($type && $id) {
-		$modx->unlockElement($type, $id, $includeAllUsers);
-		echo '1';
-		exit;
-	} else {
-		echo 'No type or id sent with request.';
-	}
+    // Remove single locks via AJAX / window.onbeforeunload
+    $type = (int)$_GET['type'];
+    $id = (int)$_GET['id'];
+    $includeAllUsers = $modx->hasPermission('remove_locks'); // Enables usage of "unlock"-ajax-button
+    if($type && $id) {
+        $modx->unlockElement($type, $id, $includeAllUsers);
+        echo '1';
+        exit;
+    } else {
+        echo 'No type or id sent with request.';
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -1,10 +1,10 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || 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(!isset($_GET['id'])) {
-	if(!$modx->hasPermission('remove_locks')) $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+if (!isset($_GET['id'])) {
+	if (!$modx->hasPermission('remove_locks')) $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 
 	// Remove all locks
 	$modx->getDatabase()->truncate($modx->getDatabase()->getFullTableName('active_user_locks'));
@@ -13,10 +13,10 @@ 
 	header($header);
 } else {
 	// Remove single locks via AJAX / window.onbeforeunload
-	$type = (int)$_GET['type'];
-	$id = (int)$_GET['id'];
+	$type = (int) $_GET['type'];
+	$id = (int) $_GET['id'];
 	$includeAllUsers = $modx->hasPermission('remove_locks'); // Enables usage of "unlock"-ajax-button
-	if($type && $id) {
+	if ($type && $id) {
 		$modx->unlockElement($type, $id, $includeAllUsers);
 		echo '1';
 		exit;

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->getDatabase()->truncate($modx->getDatabase()->getFullTableName('active_user_locks'));

manager/processors/duplicate_plugin.processor.php

Indentation +18 added lines, -18 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('new_plugin')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
@@ -19,25 +19,25 @@ 
 
 // duplicate Plugin
 $newid = $modx->getDatabase()->insert(
-	array(
-		'name'=>'',
-		'description'=>'',
-		'disabled'=>'',
-		'moduleguid'=>'',
-		'plugincode'=>'',
-		'properties'=>'',
-		'category'=>'',
-		), $modx->getDatabase()->getFullTableName('site_plugins'), // Insert into
-	"CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, '1' AS disabled, moduleguid, plugincode, properties, category", $modx->getDatabase()->getFullTableName('site_plugins'), "id='{$id}'"); // Copy from
+    array(
+        'name'=>'',
+        'description'=>'',
+        'disabled'=>'',
+        'moduleguid'=>'',
+        'plugincode'=>'',
+        'properties'=>'',
+        'category'=>'',
+        ), $modx->getDatabase()->getFullTableName('site_plugins'), // Insert into
+    "CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, '1' AS disabled, moduleguid, plugincode, properties, category", $modx->getDatabase()->getFullTableName('site_plugins'), "id='{$id}'"); // Copy from
 
 // duplicate Plugin Event Listeners
 $modx->getDatabase()->insert(
-	array(
-		'pluginid'=>'',
-		'evtid'=>'',
-		'priority'=>'',
-		), $modx->getDatabase()->getFullTableName('site_plugin_events'), // Insert into
-	"'{$newid}', evtid, priority", $modx->getDatabase()->getFullTableName('site_plugin_events'), "pluginid='{$id}'"); // Copy from
+    array(
+        'pluginid'=>'',
+        'evtid'=>'',
+        'priority'=>'',
+        ), $modx->getDatabase()->getFullTableName('site_plugin_events'), // Insert into
+    "'{$newid}', evtid, priority", $modx->getDatabase()->getFullTableName('site_plugin_events'), "pluginid='{$id}'"); // Copy from
 
 // Set the item name for logger
 $name = $modx->getDatabase()->getValue($modx->getDatabase()->select('name', $modx->getDatabase()->getFullTableName('site_plugins'), "id='{$newid}'"));

Spacing +6 added lines, -6 removed lines

@@ -1,20 +1,20 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || 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('new_plugin')) {
+if (!$modx->hasPermission('new_plugin')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
 $name = $modx->getDatabase()->getValue($modx->getDatabase()->select('name', $modx->getDatabase()->getFullTableName('site_plugins'), "id='{$id}'"));
 $count = $modx->getDatabase()->getRecordCount($modx->getDatabase()->select('name', $modx->getDatabase()->getFullTableName('site_plugins'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
+if ($count >= 1) $count = ' '.($count + 1);
 else $count = '';
 
 // duplicate Plugin
@@ -44,5 +44,5 @@ 
 $_SESSION['itemname'] = $name;
 
 // finish duplicating - redirect to new plugin
-$header="Location: index.php?r=2&a=102&id=$newid";
+$header = "Location: index.php?r=2&a=102&id=$newid";
 header($header);

Braces +5 added lines, -2 removed lines

@@ -14,8 +14,11 @@
 // count duplicates
 $name = $modx->getDatabase()->getValue($modx->getDatabase()->select('name', $modx->getDatabase()->getFullTableName('site_plugins'), "id='{$id}'"));
 $count = $modx->getDatabase()->getRecordCount($modx->getDatabase()->select('name', $modx->getDatabase()->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->getDatabase()->insert(

manager/processors/delete_content.processor.php

Spacing +15 added lines, -15 removed lines

@@ -1,25 +1,25 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || 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('delete_document')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if ($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
     $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /*******ищем родителя чтобы к нему вернуться********/
-$content=$modx->getDatabase()->getRow($modx->getDatabase()->select('parent, pagetitle', $modx->getDatabase()->getFullTableName('site_content'), "id='{$id}'"));
-$pid=($content['parent']==0?$id:$content['parent']);
+$content = $modx->getDatabase()->getRow($modx->getDatabase()->select('parent, pagetitle', $modx->getDatabase()->getFullTableName('site_content'), "id='{$id}'"));
+$pid = ($content['parent'] == 0 ? $id : $content['parent']);
 
 /************ а заодно и путь возврата (сам путь внизу файла) **********/
-$sd=isset($_REQUEST['dir'])?'&dir='.$_REQUEST['dir']:'&dir=DESC';
-$sb=isset($_REQUEST['sort'])?'&sort='.$_REQUEST['sort']:'&sort=createdon';
-$pg=isset($_REQUEST['page'])?'&page='.(int)$_REQUEST['page']:'';
-$add_path=$sd.$sb.$pg;
+$sd = isset($_REQUEST['dir']) ? '&dir='.$_REQUEST['dir'] : '&dir=DESC';
+$sb = isset($_REQUEST['sort']) ? '&sort='.$_REQUEST['sort'] : '&sort=createdon';
+$pg = isset($_REQUEST['page']) ? '&page='.(int) $_REQUEST['page'] : '';
+$add_path = $sd.$sb.$pg;
 
 /*****************************/
 
@@ -45,7 +45,7 @@ 
                             "children"=>$children
                         ));
 
-if (count($children)>0) {
+if (count($children) > 0) {
     $modx->getDatabase()->update(
         array(
             'deleted'   => 1,
@@ -54,19 +54,19 @@ 
         ), $modx->getDatabase()->getFullTableName('site_content'), "id IN (".implode(", ", $children).")");
 }
 
-if ($site_start==$id) {
+if ($site_start == $id) {
     $modx->webAlertAndQuit("Document is 'Site start' and cannot be deleted!");
 }
 
-if ($site_unavailable_page==$id) {
+if ($site_unavailable_page == $id) {
     $modx->webAlertAndQuit("Document is used as the 'Site unavailable page' and cannot be deleted!");
 }
 
-if ($error_page==$id) {
+if ($error_page == $id) {
     $modx->webAlertAndQuit("Document is used as the 'Site error page' and cannot be deleted!");
 }
 
-if ($unauthorized_page==$id) {
+if ($unauthorized_page == $id) {
     $modx->webAlertAndQuit("Document is used as the 'Site unauthorized page' and cannot be deleted!");
 }
 
@@ -92,5 +92,5 @@ 
 $modx->clearCache('full');
 
 // finished emptying cache - redirect
-$header="Location: index.php?a=3&id=$pid&r=1".$add_path;
+$header = "Location: index.php?a=3&id=$pid&r=1".$add_path;
 header($header);

manager/processors/execute_module.processor.php

Indentation +27 added lines, -27 removed lines

@@ -3,51 +3,51 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('exec_module')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // check if user has access permission, except admins
 if($_SESSION['mgrRole']!=1){
-	$rs = $modx->getDatabase()->select(
-		'sma.usergroup,mg.member',
-		$modx->getDatabase()->getFullTableName("site_module_access")." sma
+    $rs = $modx->getDatabase()->select(
+        'sma.usergroup,mg.member',
+        $modx->getDatabase()->getFullTableName("site_module_access")." sma
 			LEFT JOIN ".$modx->getDatabase()->getFullTableName("member_groups")." mg ON mg.user_group = sma.usergroup AND member='".$modx->getLoginUserID()."'",
-		"sma.module = '{$id}'"
-		);
-	//initialize permission to -1, if it stays -1 no permissions
-	//attached so permission granted
-	$permissionAccessInt = -1;
+        "sma.module = '{$id}'"
+        );
+    //initialize permission to -1, if it stays -1 no permissions
+    //attached so permission granted
+    $permissionAccessInt = -1;
 
-	while ($row = $modx->getDatabase()->getRow($rs)) {
-		if($row["usergroup"] && $row["member"]) {
-			//if there are permissions and this member has permission, ofcourse
-			//this is granted
-			$permissionAccessInt = 1;
-		} elseif ($permissionAccessInt==-1) {
-			//if there are permissions but this member has no permission and the
-			//variable was still in init state we set permission to 0; no permissions
-			$permissionAccessInt = 0;
-		}
-	}
+    while ($row = $modx->getDatabase()->getRow($rs)) {
+        if($row["usergroup"] && $row["member"]) {
+            //if there are permissions and this member has permission, ofcourse
+            //this is granted
+            $permissionAccessInt = 1;
+        } elseif ($permissionAccessInt==-1) {
+            //if there are permissions but this member has no permission and the
+            //variable was still in init state we set permission to 0; no permissions
+            $permissionAccessInt = 0;
+        }
+    }
 
-	if($permissionAccessInt==0) {
-		$modx->webAlertAndQuit("You do not sufficient privileges to execute this module.", "index.php?a=106");
-	}
+    if($permissionAccessInt==0) {
+        $modx->webAlertAndQuit("You do not sufficient privileges to execute this module.", "index.php?a=106");
+    }
 }
 
 // get module data
 $rs = $modx->getDatabase()->select('*', $modx->getDatabase()->getFullTableName("site_modules"), "id='{$id}'");
 $content = $modx->getDatabase()->getRow($rs);
 if(!$content) {
-	$modx->webAlertAndQuit("No record found for id {$id}.", "index.php?a=106");
+    $modx->webAlertAndQuit("No record found for id {$id}.", "index.php?a=106");
 }
 if($content['disabled']) {
-	$modx->webAlertAndQuit("This module is disabled and cannot be executed.", "index.php?a=106");
+    $modx->webAlertAndQuit("This module is disabled and cannot be executed.", "index.php?a=106");
 }
 
 // Set the item name for logger
@@ -62,7 +62,7 @@ 
 
 $output = evalModule($content["modulecode"],$parameter);
 if (strpos(trim($output),'<')===0 && strpos(trim($output),'<?xml')!==0) {
-	echo "<style>@supports (-webkit-overflow-scrolling: touch) {body,html {-webkit-overflow-scrolling: touch;overflow:auto!important;height:100%!important}}</style>"; // for iframe scroller
+    echo "<style>@supports (-webkit-overflow-scrolling: touch) {body,html {-webkit-overflow-scrolling: touch;overflow:auto!important;height:100%!important}}</style>"; // for iframe scroller
 }
 echo $output;
 include MODX_MANAGER_PATH."includes/sysalert.display.inc.php";

Spacing +12 added lines, -12 removed lines

@@ -1,18 +1,18 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || 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('exec_module')) {
+if (!$modx->hasPermission('exec_module')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // check if user has access permission, except admins
-if($_SESSION['mgrRole']!=1){
+if ($_SESSION['mgrRole'] != 1) {
 	$rs = $modx->getDatabase()->select(
 		'sma.usergroup,mg.member',
 		$modx->getDatabase()->getFullTableName("site_module_access")." sma
@@ -24,18 +24,18 @@ 
 	$permissionAccessInt = -1;
 
 	while ($row = $modx->getDatabase()->getRow($rs)) {
-		if($row["usergroup"] && $row["member"]) {
+		if ($row["usergroup"] && $row["member"]) {
 			//if there are permissions and this member has permission, ofcourse
 			//this is granted
 			$permissionAccessInt = 1;
-		} elseif ($permissionAccessInt==-1) {
+		} elseif ($permissionAccessInt == -1) {
 			//if there are permissions but this member has no permission and the
 			//variable was still in init state we set permission to 0; no permissions
 			$permissionAccessInt = 0;
 		}
 	}
 
-	if($permissionAccessInt==0) {
+	if ($permissionAccessInt == 0) {
 		$modx->webAlertAndQuit("You do not sufficient privileges to execute this module.", "index.php?a=106");
 	}
 }
@@ -43,10 +43,10 @@ 
 // get module data
 $rs = $modx->getDatabase()->select('*', $modx->getDatabase()->getFullTableName("site_modules"), "id='{$id}'");
 $content = $modx->getDatabase()->getRow($rs);
-if(!$content) {
+if (!$content) {
 	$modx->webAlertAndQuit("No record found for id {$id}.", "index.php?a=106");
 }
-if($content['disabled']) {
+if ($content['disabled']) {
 	$modx->webAlertAndQuit("This module is disabled and cannot be executed.", "index.php?a=106");
 }
 
@@ -60,8 +60,8 @@ 
 $_SESSION['itemname'] = $content['name'];
 
 
-$output = evalModule($content["modulecode"],$parameter);
-if (strpos(trim($output),'<')===0 && strpos(trim($output),'<?xml')!==0) {
+$output = evalModule($content["modulecode"], $parameter);
+if (strpos(trim($output), '<') === 0 && strpos(trim($output), '<?xml') !== 0) {
 	echo "<style>@supports (-webkit-overflow-scrolling: touch) {body,html {-webkit-overflow-scrolling: touch;overflow:auto!important;height:100%!important}}</style>"; // for iframe scroller
 }
 echo $output;

Braces +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 }
 
 // check if user has access permission, except admins
-if($_SESSION['mgrRole']!=1){
+if($_SESSION['mgrRole']!=1) {
 	$rs = $modx->getDatabase()->select(
 		'sma.usergroup,mg.member',
 		$modx->getDatabase()->getFullTableName("site_module_access")." sma

manager/processors/move_document.processor.php

Indentation +48 added lines, -48 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->hasPermission('edit_document')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $newParentID = isset($_REQUEST['new_parent']) ? (int)$_REQUEST['new_parent'] : 0;
@@ -25,68 +25,68 @@ 
 // check user has permission to move document to chosen location
 
 if ($use_udperms == 1) {
-	if ($oldparent != $newParentID) {
-		$udperms = new EvolutionCMS\Legacy\Permissions();
-		$udperms->user = $modx->getLoginUserID();
-		$udperms->document = $newParentID;
-		$udperms->role = $_SESSION['mgrRole'];
+    if ($oldparent != $newParentID) {
+        $udperms = new EvolutionCMS\Legacy\Permissions();
+        $udperms->user = $modx->getLoginUserID();
+        $udperms->document = $newParentID;
+        $udperms->role = $_SESSION['mgrRole'];
 
-		 if (!$udperms->checkPermissions()) {
-			$modx->webAlertAndQuit($_lang["access_permission_parent_denied"]);
-		 }
-	}
+            if (!$udperms->checkPermissions()) {
+            $modx->webAlertAndQuit($_lang["access_permission_parent_denied"]);
+            }
+    }
 }
 
 $evtOut = $modx->invokeEvent("onBeforeMoveDocument", array (
-	"id_document" => $documentID,
-	"old_parent" => $oldparent,
-	"new_parent" => $newParentID
+    "id_document" => $documentID,
+    "old_parent" => $oldparent,
+    "new_parent" => $newParentID
 ));
 if (is_array($evtOut) && count($evtOut) > 0){
-	$newParent = array_pop($evtOut);
-	if($newParent == $oldparent) {
-		$modx->webAlertAndQuit($_lang["error_movedocument2"]);
-	}else{
-		$newParentID = $newParent;
-	}
+    $newParent = array_pop($evtOut);
+    if($newParent == $oldparent) {
+        $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+    }else{
+        $newParentID = $newParent;
+    }
 }
 
 $children = allChildren($documentID);
 if (!array_search($newParentID, $children)) {
-	$modx->getDatabase()->update(array(
-		'isfolder' => 1,
-	), $modx->getDatabase()->getFullTableName('site_content'), "id='{$newParentID}'");
+    $modx->getDatabase()->update(array(
+        'isfolder' => 1,
+    ), $modx->getDatabase()->getFullTableName('site_content'), "id='{$newParentID}'");
 
-	$modx->getDatabase()->update(array(
-		'parent'   => $newParentID,
-		'editedby' => $modx->getLoginUserID(),
-		'editedon' => time(),
-	), $modx->getDatabase()->getFullTableName('site_content'), "id='{$documentID}'");
+    $modx->getDatabase()->update(array(
+        'parent'   => $newParentID,
+        'editedby' => $modx->getLoginUserID(),
+        'editedon' => time(),
+    ), $modx->getDatabase()->getFullTableName('site_content'), "id='{$documentID}'");
 
-	// finished moving the document, now check to see if the old_parent should no longer be a folder.
-	$rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('site_content'), "parent='{$oldparent}'");
-	$limit = $modx->getDatabase()->getValue($rs);
+    // finished moving the document, now check to see if the old_parent should no longer be a folder.
+    $rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('site_content'), "parent='{$oldparent}'");
+    $limit = $modx->getDatabase()->getValue($rs);
 
-	if(!$limit>0) {
-		$modx->getDatabase()->update(array(
-			'isfolder' => 0,
-		), $modx->getDatabase()->getFullTableName('site_content'), "id='{$oldparent}'");
-	}
-	// Set the item name for logger
-	$pagetitle = $modx->getDatabase()->getValue($modx->getDatabase()->select('pagetitle', $modx->getDatabase()->getFullTableName('site_content'), "id='{$documentID}'"));
-	$_SESSION['itemname'] = $pagetitle;
+    if(!$limit>0) {
+        $modx->getDatabase()->update(array(
+            'isfolder' => 0,
+        ), $modx->getDatabase()->getFullTableName('site_content'), "id='{$oldparent}'");
+    }
+    // Set the item name for logger
+    $pagetitle = $modx->getDatabase()->getValue($modx->getDatabase()->select('pagetitle', $modx->getDatabase()->getFullTableName('site_content'), "id='{$documentID}'"));
+    $_SESSION['itemname'] = $pagetitle;
 
-	$modx->invokeEvent("onAfterMoveDocument", array (
-		"id_document" => $documentID,
-		"old_parent" => $oldparent,
-		"new_parent" => $newParentID
-	));
+    $modx->invokeEvent("onAfterMoveDocument", array (
+        "id_document" => $documentID,
+        "old_parent" => $oldparent,
+        "new_parent" => $newParentID
+    ));
 
-	// empty cache & sync site
-	$modx->clearCache('full');
+    // empty cache & sync site
+    $modx->clearCache('full');
 
-	$header="Location: index.php?a=3&id={$documentID}&r=9";
-	header($header);
+    $header="Location: index.php?a=3&id={$documentID}&r=9";
+    header($header);
 } else {
-	$modx->webAlertAndQuit("You cannot move a document to a child document!");
+    $modx->webAlertAndQuit("You cannot move a document to a child document!");
 }

Spacing +14 added lines, -14 removed lines

@@ -1,20 +1,20 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || 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('edit_document')) {
+if (!$modx->hasPermission('edit_document')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$newParentID = isset($_REQUEST['new_parent']) ? (int)$_REQUEST['new_parent'] : 0;
-$documentID = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$newParentID = isset($_REQUEST['new_parent']) ? (int) $_REQUEST['new_parent'] : 0;
+$documentID = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 // ok, two things to check.
 // first, document cannot be moved to itself
 // second, new parent must be a folder. If not, set it to folder.
-if($documentID==$newParentID) $modx->webAlertAndQuit($_lang["error_movedocument1"]);
-if($documentID <= 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
-if($newParentID < 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+if ($documentID == $newParentID) $modx->webAlertAndQuit($_lang["error_movedocument1"]);
+if ($documentID <= 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+if ($newParentID < 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
 
 $parents = $modx->getParentIds($newParentID);
 if (in_array($documentID, $parents))  $modx->webAlertAndQuit($_lang["error_movedocument2"]);
@@ -37,16 +37,16 @@ 
 	}
 }
 
-$evtOut = $modx->invokeEvent("onBeforeMoveDocument", array (
+$evtOut = $modx->invokeEvent("onBeforeMoveDocument", array(
 	"id_document" => $documentID,
 	"old_parent" => $oldparent,
 	"new_parent" => $newParentID
 ));
-if (is_array($evtOut) && count($evtOut) > 0){
+if (is_array($evtOut) && count($evtOut) > 0) {
 	$newParent = array_pop($evtOut);
-	if($newParent == $oldparent) {
+	if ($newParent == $oldparent) {
 		$modx->webAlertAndQuit($_lang["error_movedocument2"]);
-	}else{
+	} else {
 		$newParentID = $newParent;
 	}
 }
@@ -67,7 +67,7 @@ 
 	$rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('site_content'), "parent='{$oldparent}'");
 	$limit = $modx->getDatabase()->getValue($rs);
 
-	if(!$limit>0) {
+	if (!$limit > 0) {
 		$modx->getDatabase()->update(array(
 			'isfolder' => 0,
 		), $modx->getDatabase()->getFullTableName('site_content'), "id='{$oldparent}'");
@@ -76,7 +76,7 @@ 
 	$pagetitle = $modx->getDatabase()->getValue($modx->getDatabase()->select('pagetitle', $modx->getDatabase()->getFullTableName('site_content'), "id='{$documentID}'"));
 	$_SESSION['itemname'] = $pagetitle;
 
-	$modx->invokeEvent("onAfterMoveDocument", array (
+	$modx->invokeEvent("onAfterMoveDocument", array(
 		"id_document" => $documentID,
 		"old_parent" => $oldparent,
 		"new_parent" => $newParentID
@@ -85,7 +85,7 @@ 
 	// empty cache & sync site
 	$modx->clearCache('full');
 
-	$header="Location: index.php?a=3&id={$documentID}&r=9";
+	$header = "Location: index.php?a=3&id={$documentID}&r=9";
 	header($header);
 } else {
 	$modx->webAlertAndQuit("You cannot move a document to a child document!");

Braces +14 added lines, -6 removed lines

@@ -12,12 +12,20 @@ 
 // ok, two things to check.
 // first, document cannot be moved to itself
 // second, new parent must be a folder. If not, set it to folder.
-if($documentID==$newParentID) $modx->webAlertAndQuit($_lang["error_movedocument1"]);
-if($documentID <= 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
-if($newParentID < 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+if($documentID==$newParentID) {
+    $modx->webAlertAndQuit($_lang["error_movedocument1"]);
+}
+if($documentID <= 0) {
+    $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+}
+if($newParentID < 0) {
+    $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+}
 
 $parents = $modx->getParentIds($newParentID);
-if (in_array($documentID, $parents))  $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+if (in_array($documentID, $parents)) {
+    $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+}
 
 $rs = $modx->getDatabase()->select('parent', $modx->getDatabase()->getFullTableName('site_content'), "id='{$documentID}'");
 $oldparent = $modx->getDatabase()->getValue($rs);
@@ -42,11 +50,11 @@ 
 	"old_parent" => $oldparent,
 	"new_parent" => $newParentID
 ));
-if (is_array($evtOut) && count($evtOut) > 0){
+if (is_array($evtOut) && count($evtOut) > 0) {
 	$newParent = array_pop($evtOut);
 	if($newParent == $oldparent) {
 		$modx->webAlertAndQuit($_lang["error_movedocument2"]);
-	}else{
+	} else {
 		$newParentID = $newParent;
 	}
 }

manager/processors/save_role.processor.php

Indentation +106 added lines, -106 removed lines

@@ -1,135 +1,135 @@
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('save_role')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 extract($_POST);
 
 if($name == '' || !isset ($name)) {
-	$modx->webAlertAndQuit("Please enter a name for this role!", "index.php?a={$mode}" . ($mode = 35 ? "&id={$id}" : ""));
+    $modx->webAlertAndQuit("Please enter a name for this role!", "index.php?a={$mode}" . ($mode = 35 ? "&id={$id}" : ""));
 }
 
 // setup fields
 $fields = array(
-	'name' => $name,
-	'description' => $description,
-	'frames' => $frames,
-	'home' => $home,
-	'view_document' => $view_document,
-	'new_document' => $new_document,
-	'save_document' => $save_document,
-	'publish_document' => $publish_document,
-	'delete_document' => $delete_document,
-	'empty_trash' => $empty_trash,
-	'action_ok' => $action_ok,
-	'logout' => $logout,
-	'help' => $help,
-	'messages' => $messages,
-	'new_user' => $new_user,
-	'edit_user' => $edit_user,
-	'logs' => $logs,
-	'edit_parser' => (isset ($edit_parser)) ? $edit_parser : '0',
-	'save_parser' => (isset ($save_parser)) ? $save_parser : '0',
-	'edit_template' => $edit_template,
-	'settings' => $settings,
-	'credits' => $credits,
-	'new_template' => $new_template,
-	'save_template' => $save_template,
-	'delete_template' => $delete_template,
-	'edit_snippet' => $edit_snippet,
-	'new_snippet' => $new_snippet,
-	'save_snippet' => $save_snippet,
-	'delete_snippet' => $delete_snippet,
-	'edit_chunk' => $edit_chunk,
-	'new_chunk' => $new_chunk,
-	'save_chunk' => $save_chunk,
-	'delete_chunk' => $delete_chunk,
-	'empty_cache' => $empty_cache,
-	'edit_document' => $edit_document,
-	'change_password' => $change_password,
-	'error_dialog' => $error_dialog,
-	'about' => $about,
-	'file_manager' => $file_manager,
-	'assets_files' => $assets_files,
-	'assets_images' => $assets_images,
-	'save_user' => $save_user,
-	'delete_user' => $delete_user,
-	'save_password' => $save_password,
-	'edit_role' => $edit_role,
-	'save_role' => $save_role,
-	'delete_role' => $delete_role,
-	'new_role' => $new_role,
-	'access_permissions' => $access_permissions,
-	'bk_manager' => $bk_manager,
-	'new_plugin' => $new_plugin,
-	'edit_plugin' => $edit_plugin,
-	'save_plugin' => $save_plugin,
-	'delete_plugin' => $delete_plugin,
-	'new_module' => $new_module,
-	'edit_module' => $edit_module,
-	'save_module' => $save_module,
-	'delete_module' => $delete_module,
-	'exec_module' => $exec_module,
-	'view_eventlog' => $view_eventlog,
-	'delete_eventlog' => $delete_eventlog,
-	'new_web_user' => $new_web_user,
-	'edit_web_user' => $edit_web_user,
-	'save_web_user' => $save_web_user,
-	'delete_web_user' => $delete_web_user,
-	'web_access_permissions' => $web_access_permissions,
-	'view_unpublished' => $view_unpublished,
-	'import_static' => $import_static,
-	'export_static' => $export_static,
-	'remove_locks' => $remove_locks,
-	'display_locks' => $display_locks,
-	'change_resourcetype' => $change_resourcetype,
-	'category_manager' => $category_manager
+    'name' => $name,
+    'description' => $description,
+    'frames' => $frames,
+    'home' => $home,
+    'view_document' => $view_document,
+    'new_document' => $new_document,
+    'save_document' => $save_document,
+    'publish_document' => $publish_document,
+    'delete_document' => $delete_document,
+    'empty_trash' => $empty_trash,
+    'action_ok' => $action_ok,
+    'logout' => $logout,
+    'help' => $help,
+    'messages' => $messages,
+    'new_user' => $new_user,
+    'edit_user' => $edit_user,
+    'logs' => $logs,
+    'edit_parser' => (isset ($edit_parser)) ? $edit_parser : '0',
+    'save_parser' => (isset ($save_parser)) ? $save_parser : '0',
+    'edit_template' => $edit_template,
+    'settings' => $settings,
+    'credits' => $credits,
+    'new_template' => $new_template,
+    'save_template' => $save_template,
+    'delete_template' => $delete_template,
+    'edit_snippet' => $edit_snippet,
+    'new_snippet' => $new_snippet,
+    'save_snippet' => $save_snippet,
+    'delete_snippet' => $delete_snippet,
+    'edit_chunk' => $edit_chunk,
+    'new_chunk' => $new_chunk,
+    'save_chunk' => $save_chunk,
+    'delete_chunk' => $delete_chunk,
+    'empty_cache' => $empty_cache,
+    'edit_document' => $edit_document,
+    'change_password' => $change_password,
+    'error_dialog' => $error_dialog,
+    'about' => $about,
+    'file_manager' => $file_manager,
+    'assets_files' => $assets_files,
+    'assets_images' => $assets_images,
+    'save_user' => $save_user,
+    'delete_user' => $delete_user,
+    'save_password' => $save_password,
+    'edit_role' => $edit_role,
+    'save_role' => $save_role,
+    'delete_role' => $delete_role,
+    'new_role' => $new_role,
+    'access_permissions' => $access_permissions,
+    'bk_manager' => $bk_manager,
+    'new_plugin' => $new_plugin,
+    'edit_plugin' => $edit_plugin,
+    'save_plugin' => $save_plugin,
+    'delete_plugin' => $delete_plugin,
+    'new_module' => $new_module,
+    'edit_module' => $edit_module,
+    'save_module' => $save_module,
+    'delete_module' => $delete_module,
+    'exec_module' => $exec_module,
+    'view_eventlog' => $view_eventlog,
+    'delete_eventlog' => $delete_eventlog,
+    'new_web_user' => $new_web_user,
+    'edit_web_user' => $edit_web_user,
+    'save_web_user' => $save_web_user,
+    'delete_web_user' => $delete_web_user,
+    'web_access_permissions' => $web_access_permissions,
+    'view_unpublished' => $view_unpublished,
+    'import_static' => $import_static,
+    'export_static' => $export_static,
+    'remove_locks' => $remove_locks,
+    'display_locks' => $display_locks,
+    'change_resourcetype' => $change_resourcetype,
+    'category_manager' => $category_manager
 );
 
 $fields = $modx->getDatabase()->escape($fields);
 
 switch($_POST['mode']) {
-	case '38' :
-		$tbl = $modx->getDatabase()->getFullTableName("user_roles");
+    case '38' :
+        $tbl = $modx->getDatabase()->getFullTableName("user_roles");
 
-		// disallow duplicate names for role
-		$rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('user_roles'), "name='{$fields['name']}'");
-		if($modx->getDatabase()->getValue($rs) > 0) {
-			$modx->getManagerApi()->saveFormValues(38);
-			$modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['role'], $name), "index.php?a=38");
-		}
+        // disallow duplicate names for role
+        $rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('user_roles'), "name='{$fields['name']}'");
+        if($modx->getDatabase()->getValue($rs) > 0) {
+            $modx->getManagerApi()->saveFormValues(38);
+            $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['role'], $name), "index.php?a=38");
+        }
 
-		$modx->getDatabase()->insert($fields, $tbl);
+        $modx->getDatabase()->insert($fields, $tbl);
 
-		// Set the item name for logger
-		$_SESSION['itemname'] = $_POST['name'];
+        // Set the item name for logger
+        $_SESSION['itemname'] = $_POST['name'];
 
-		$header = "Location: index.php?a=86&r=2";
-		header($header);
-		break;
-	case '35' :
-		$tbl = $modx->getDatabase()->getFullTableName("user_roles");
+        $header = "Location: index.php?a=86&r=2";
+        header($header);
+        break;
+    case '35' :
+        $tbl = $modx->getDatabase()->getFullTableName("user_roles");
 
-		// disallow duplicate names for role
-		$rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('user_roles'), "name='{$fields['name']}' AND id!='{$id}'");
-		if($modx->getDatabase()->getValue($rs) > 0) {
-			$modx->getManagerApi()->saveFormValues(35);
-			$modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['role'], $name), "index.php?a=35&id={$id}");
-		}
+        // disallow duplicate names for role
+        $rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('user_roles'), "name='{$fields['name']}' AND id!='{$id}'");
+        if($modx->getDatabase()->getValue($rs) > 0) {
+            $modx->getManagerApi()->saveFormValues(35);
+            $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['role'], $name), "index.php?a=35&id={$id}");
+        }
 
-		$modx->getDatabase()->update($fields, $tbl, "id='{$id}'");
+        $modx->getDatabase()->update($fields, $tbl, "id='{$id}'");
 
-		// Set the item name for logger
-		$_SESSION['itemname'] = $_POST['name'];
+        // Set the item name for logger
+        $_SESSION['itemname'] = $_POST['name'];
 
-		$header = "Location: index.php?a=86&r=2";
-		header($header);
-		break;
-	default :
-		$modx->webAlertAndQuit("No operation set in request.");
+        $header = "Location: index.php?a=86&r=2";
+        header($header);
+        break;
+    default :
+        $modx->webAlertAndQuit("No operation set in request.");
 }
 
 $modx->unlockElement(8, $id);

Spacing +7 added lines, -7 removed lines

@@ -1,15 +1,15 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || 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('save_role')) {
+if (!$modx->hasPermission('save_role')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 extract($_POST);
 
-if($name == '' || !isset ($name)) {
-	$modx->webAlertAndQuit("Please enter a name for this role!", "index.php?a={$mode}" . ($mode = 35 ? "&id={$id}" : ""));
+if ($name == '' || !isset ($name)) {
+	$modx->webAlertAndQuit("Please enter a name for this role!", "index.php?a={$mode}".($mode = 35 ? "&id={$id}" : ""));
 }
 
 // setup fields
@@ -91,13 +91,13 @@ 
 
 $fields = $modx->getDatabase()->escape($fields);
 
-switch($_POST['mode']) {
+switch ($_POST['mode']) {
 	case '38' :
 		$tbl = $modx->getDatabase()->getFullTableName("user_roles");
 
 		// disallow duplicate names for role
 		$rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('user_roles'), "name='{$fields['name']}'");
-		if($modx->getDatabase()->getValue($rs) > 0) {
+		if ($modx->getDatabase()->getValue($rs) > 0) {
 			$modx->getManagerApi()->saveFormValues(38);
 			$modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['role'], $name), "index.php?a=38");
 		}
@@ -115,7 +115,7 @@ 
 
 		// disallow duplicate names for role
 		$rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('user_roles'), "name='{$fields['name']}' AND id!='{$id}'");
-		if($modx->getDatabase()->getValue($rs) > 0) {
+		if ($modx->getDatabase()->getValue($rs) > 0) {
 			$modx->getManagerApi()->saveFormValues(35);
 			$modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['role'], $name), "index.php?a=35&id={$id}");
 		}

manager/processors/delete_role.processor.php

Indentation +4 added lines, -4 removed lines

@@ -3,22 +3,22 @@
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('delete_role')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 if($id==1){
-	$modx->webAlertAndQuit("The role you are trying to delete is the admin role. This role cannot be deleted!");
+    $modx->webAlertAndQuit("The role you are trying to delete is the admin role. This role cannot be deleted!");
 }
 
 $rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('user_attributes'), "role='{$id}'");
 $count=$modx->getDatabase()->getValue($rs);
 if($count>0){
-	$modx->webAlertAndQuit("There are users with this role. It can't be deleted.");
+    $modx->webAlertAndQuit("There are users with this role. It can't be deleted.");
 }
 
 // Set the item name for logger

Spacing +8 added lines, -8 removed lines

@@ -1,23 +1,23 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || 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('delete_role')) {
+if (!$modx->hasPermission('delete_role')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
-if($id==1){
+if ($id == 1) {
 	$modx->webAlertAndQuit("The role you are trying to delete is the admin role. This role cannot be deleted!");
 }
 
 $rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('user_attributes'), "role='{$id}'");
-$count=$modx->getDatabase()->getValue($rs);
-if($count>0){
+$count = $modx->getDatabase()->getValue($rs);
+if ($count > 0) {
 	$modx->webAlertAndQuit("There are users with this role. It can't be deleted.");
 }
 
@@ -28,5 +28,5 @@ 
 // delete the attributes
 $modx->getDatabase()->delete($modx->getDatabase()->getFullTableName('user_roles'), "id='{$id}'");
 
-$header="Location: index.php?a=86";
+$header = "Location: index.php?a=86";
 header($header);

Braces +2 added lines, -2 removed lines

@@ -11,13 +11,13 @@
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
-if($id==1){
+if($id==1) {
 	$modx->webAlertAndQuit("The role you are trying to delete is the admin role. This role cannot be deleted!");
 }
 
 $rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('user_attributes'), "role='{$id}'");
 $count=$modx->getDatabase()->getValue($rs);
-if($count>0){
+if($count>0) {
 	$modx->webAlertAndQuit("There are users with this role. It can't be deleted.");
 }