evolution-cms / evolution

manager/processors/purge_plugin.processor.php

Indentation +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 }
 
 if(!$modx->hasPermission('delete_plugin')) {
-	$e->setError(3);
-	$e->dumpError();
+    $e->setError(3);
+    $e->dumpError();
 }
 
 $tbl_site_plugins = $modx->getFullTablename('site_plugins');

Spacing +5 added lines, -5 removed lines

@@ -1,9 +1,9 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     exit();
 }
 
-if(!$modx->hasPermission('delete_plugin')) {
+if (!$modx->hasPermission('delete_plugin')) {
 	$e->setError(3);
 	$e->dumpError();
 }
@@ -14,18 +14,18 @@ 
 // Get unique list of latest added plugins by highest sql-id
 $rs = $modx->db->query("SELECT t1.id FROM {$tbl_site_plugins} t1 LEFT JOIN {$tbl_site_plugins} t2 ON (t1.name = t2.name AND t1.id < t2.id) WHERE t2.id IS NULL;");
 $latestIds = array();
-while($row = $modx->db->getRow($rs)) {
+while ($row = $modx->db->getRow($rs)) {
     $latestIds[] = $row['id'];
 }
 
 // Get list of plugins with disabled and enabled versions
 $rs = $modx->db->query("SELECT id FROM {$tbl_site_plugins} t1 WHERE disabled = 1 AND name IN (SELECT name FROM {$tbl_site_plugins} t2 WHERE t1.name = t2.name AND t1.id != t2.id)");
 
-while($row = $modx->db->getRow($rs)) {
+while ($row = $modx->db->getRow($rs)) {
 
     $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));

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

manager/processors/delete_role.processor.php

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->db->select('COUNT(*)', $modx->getFullTableName('user_attributes'), "role='{$id}'");
 $count=$modx->db->getValue($rs);
-if($count>0){
+if($count>0) {
 	$modx->webAlertAndQuit("There are users with this role. It can't be deleted.");
 }
 

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->db->select('COUNT(*)', $modx->getFullTableName('user_attributes'), "role='{$id}'");
 $count=$modx->db->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->db->select('COUNT(*)', $modx->getFullTableName('user_attributes'), "role='{$id}'");
-$count=$modx->db->getValue($rs);
-if($count>0){
+$count = $modx->db->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->db->delete($modx->getFullTableName('user_roles'), "id='{$id}'");
 
-$header="Location: index.php?a=86";
+$header = "Location: index.php?a=86";
 header($header);

manager/processors/duplicate_htmlsnippet.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_htmlsnippets'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_htmlsnippets'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
-else $count = '';
+if($count>=1) {
+    $count = ' '.($count+1);
+} else {
+    $count = '';
+}
 
 // duplicate htmlsnippet
 $newid = $modx->db->insert(

Indentation +9 added lines, -9 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_chunk')) {
-	$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,13 +19,13 @@ 
 
 // duplicate htmlsnippet
 $newid = $modx->db->insert(
-	array(
-		'name'=>'',
-		'description'=>'',
-		'snippet'=>'',
-		'category'=>'',
-		), $modx->getFullTableName('site_htmlsnippets'), // Insert into
-	"CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, snippet, category", $modx->getFullTableName('site_htmlsnippets'), "id='{$id}'"); // Copy from
+    array(
+        'name'=>'',
+        'description'=>'',
+        'snippet'=>'',
+        'category'=>'',
+        ), $modx->getFullTableName('site_htmlsnippets'), // Insert into
+    "CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, snippet, category", $modx->getFullTableName('site_htmlsnippets'), "id='{$id}'"); // Copy from
 
 // Set the item name for logger
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_htmlsnippets'), "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_chunk')) {
+if (!$modx->hasPermission('new_chunk')) {
 	$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->db->getValue($modx->db->select('name', $modx->getFullTableName('site_htmlsnippets'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_htmlsnippets'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
+if ($count >= 1) $count = ' '.($count + 1);
 else $count = '';
 
 // duplicate htmlsnippet
@@ -32,5 +32,5 @@ 
 $_SESSION['itemname'] = $name;
 
 // finish duplicating - redirect to new chunk
-$header="Location: index.php?r=2&a=78&id=$newid";
+$header = "Location: index.php?r=2&a=78&id=$newid";
 header($header);

manager/processors/remove_content.processor.php

Indentation +14 added lines, -14 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('delete_document')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "deleted=1");
@@ -11,9 +11,9 @@ 
 
 // invoke OnBeforeEmptyTrash event
 $modx->invokeEvent("OnBeforeEmptyTrash",
-						array(
-							"ids"=>$ids
-						));
+                        array(
+                            "ids"=>$ids
+                        ));
 
 // remove the document groups link.
 $sql = "DELETE document_groups
@@ -32,15 +32,15 @@ 
 //'undelete' the document.
 $modx->db->delete($modx->getFullTableName('site_content'), "deleted=1");
 
-	// invoke OnEmptyTrash event
-	$modx->invokeEvent("OnEmptyTrash",
-						array(
-							"ids"=>$ids
-						));
+    // invoke OnEmptyTrash event
+    $modx->invokeEvent("OnEmptyTrash",
+                        array(
+                            "ids"=>$ids
+                        ));
 
-	// empty cache
-	$modx->clearCache('full');
+    // empty cache
+    $modx->clearCache('full');
 
-	// finished emptying cache - redirect
-	$header="Location: index.php?a=2&r=1";
-	header($header);
+    // finished emptying cache - redirect
+    $header="Location: index.php?a=2&r=1";
+    header($header);

Spacing +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@ 
 <?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')) {
+if (!$modx->hasPermission('delete_document')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -42,5 +42,5 @@ 
 	$modx->clearCache('full');
 
 	// finished emptying cache - redirect
-	$header="Location: index.php?a=2&r=1";
+	$header = "Location: index.php?a=2&r=1";
 	header($header);

manager/processors/save_password.processor.php

Indentation +14 added lines, -14 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('save_password')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = $_POST['id'];
@@ -11,26 +11,26 @@ 
 $pass2 = $_POST['pass2'];
 
 if($pass1!=$pass2){
-	$modx->webAlertAndQuit("Passwords don't match!");
+    $modx->webAlertAndQuit("Passwords don't match!");
 }
 
 if(strlen($pass1)<6){
-	$modx->webAlertAndQuit("Password is too short. Please specify a password of at least 6 characters.");
+    $modx->webAlertAndQuit("Password is too short. Please specify a password of at least 6 characters.");
 }
 
     $pass1 = $modx->htmlspecialchars($pass1, ENT_NOQUOTES);
-	$tbl_manager_users = $modx->getFullTableName('manager_users');
-	$uid = $modx->getLoginUserID();
-	$modx->loadExtension('phpass');
-	$f['password'] = $modx->phpass->HashPassword($pass1);
-	$modx->db->update($f,$tbl_manager_users,"id='{$uid}'");
+    $tbl_manager_users = $modx->getFullTableName('manager_users');
+    $uid = $modx->getLoginUserID();
+    $modx->loadExtension('phpass');
+    $f['password'] = $modx->phpass->HashPassword($pass1);
+    $modx->db->update($f,$tbl_manager_users,"id='{$uid}'");
 
-	// invoke OnManagerChangePassword event
-	$modx->invokeEvent('OnManagerChangePassword', array (
-		'userid' => $uid,
-		'username' => $_SESSION['mgrShortname'],
-		'userpassword' => $pass1
-	));
+    // invoke OnManagerChangePassword event
+    $modx->invokeEvent('OnManagerChangePassword', array (
+        'userid' => $uid,
+        'username' => $_SESSION['mgrShortname'],
+        'userpassword' => $pass1
+    ));
 
 $header="Location: index.php?a=2";
 header($header);

Spacing +7 added lines, -7 removed lines

@@ -1,8 +1,8 @@ 
 <?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_password')) {
+if (!$modx->hasPermission('save_password')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -10,11 +10,11 @@ 
 $pass1 = $_POST['pass1'];
 $pass2 = $_POST['pass2'];
 
-if($pass1!=$pass2){
+if ($pass1 != $pass2) {
 	$modx->webAlertAndQuit("Passwords don't match!");
 }
 
-if(strlen($pass1)<6){
+if (strlen($pass1) < 6) {
 	$modx->webAlertAndQuit("Password is too short. Please specify a password of at least 6 characters.");
 }
 
@@ -23,14 +23,14 @@ 
 	$uid = $modx->getLoginUserID();
 	$modx->loadExtension('phpass');
 	$f['password'] = $modx->phpass->HashPassword($pass1);
-	$modx->db->update($f,$tbl_manager_users,"id='{$uid}'");
+	$modx->db->update($f, $tbl_manager_users, "id='{$uid}'");
 
 	// invoke OnManagerChangePassword event
-	$modx->invokeEvent('OnManagerChangePassword', array (
+	$modx->invokeEvent('OnManagerChangePassword', array(
 		'userid' => $uid,
 		'username' => $_SESSION['mgrShortname'],
 		'userpassword' => $pass1
 	));
 
-$header="Location: index.php?a=2";
+$header = "Location: index.php?a=2";
 header($header);

Braces +2 added lines, -2 removed lines

@@ -10,11 +10,11 @@
 $pass1 = $_POST['pass1'];
 $pass2 = $_POST['pass2'];
 
-if($pass1!=$pass2){
+if($pass1!=$pass2) {
 	$modx->webAlertAndQuit("Passwords don't match!");
 }
 
-if(strlen($pass1)<6){
+if(strlen($pass1)<6) {
 	$modx->webAlertAndQuit("Password is too short. Please specify a password of at least 6 characters.");
 }
 

manager/processors/duplicate_template.processor.php

Braces +5 added lines, -2 removed lines

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

Indentation +15 added lines, -15 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_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,22 +19,22 @@ 
 
 // duplicate template
 $newid = $modx->db->insert(
-	array(
-		'templatename'=>'',
-		'description'=>'',
-		'content'=>'',
-		'category'=>'',
-		), $modx->getFullTableName('site_templates'), // Insert into
-	"CONCAT(templatename, ' {$_lang['duplicated_el_suffix']}{$count}') AS templatename, description, content, category", $modx->getFullTableName('site_templates'), "id='{$id}'"); // Copy from
+    array(
+        'templatename'=>'',
+        'description'=>'',
+        'content'=>'',
+        'category'=>'',
+        ), $modx->getFullTableName('site_templates'), // Insert into
+    "CONCAT(templatename, ' {$_lang['duplicated_el_suffix']}{$count}') AS templatename, description, content, category", $modx->getFullTableName('site_templates'), "id='{$id}'"); // Copy from
 
 // duplicate TV values
 $modx->db->insert(
-	array(
-		'tmplvarid'=>'',
-		'templateid'=>'',
-		'rank'=>'',
-		), $modx->getFullTableName('site_tmplvar_templates'), // Insert into
-	"tmplvarid, '{$newid}', rank", $modx->getFullTableName('site_tmplvar_templates'), "templateid='{$id}'"); // Copy from
+    array(
+        'tmplvarid'=>'',
+        'templateid'=>'',
+        'rank'=>'',
+        ), $modx->getFullTableName('site_tmplvar_templates'), // Insert into
+    "tmplvarid, '{$newid}', rank", $modx->getFullTableName('site_tmplvar_templates'), "templateid='{$id}'"); // Copy from
 
 // Set the item name for logger
 $name = $modx->db->getValue($modx->db->select('templatename', $modx->getFullTableName('site_templates'), "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_template')) {
+if (!$modx->hasPermission('new_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->db->getValue($modx->db->select('templatename', $modx->getFullTableName('site_templates'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('templatename', $modx->getFullTableName('site_templates'), "templatename LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
+if ($count >= 1) $count = ' '.($count + 1);
 else $count = '';
 
 // duplicate template
@@ -41,5 +41,5 @@ 
 $_SESSION['itemname'] = $name;
 
 // finish duplicating - redirect to new template
-$header="Location: index.php?r=2&a=16&id=$newid";
+$header = "Location: index.php?r=2&a=16&id=$newid";
 header($header);

manager/processors/empty_table.processor.php

Indentation +1 added lines, -1 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('settings')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $modx->db->truncate($modx->getFullTableName('manager_log'));

Spacing +3 added lines, -3 removed lines

@@ -1,12 +1,12 @@
 <?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('settings')) {
+if (!$modx->hasPermission('settings')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $modx->db->truncate($modx->getFullTableName('manager_log'));
 
-$header="Location: index.php?a=13";
+$header = "Location: index.php?a=13";
 header($header);

manager/processors/send_message.processor.php

Indentation +43 added lines, -43 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('messages')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $sendto = $_REQUEST['sendto'];
@@ -16,55 +16,55 @@ 
 $postdate = time();
 
 if($sendto=='u') {
-	if($userid==0) {
-		$modx->webAlertAndQuit($_lang["error_no_user_selected"]);
-	}
-	$modx->db->insert(
-		array(
-			'recipient' => $userid,
-			'sender'    => $modx->getLoginUserID(),
-			'subject'   => $subject,
-			'message'   => $message,
-			'postdate'  => $postdate,
-			'type'      => 'Message',
-			'private'   => 1,
-		), $modx->getFullTableName('user_messages'));
+    if($userid==0) {
+        $modx->webAlertAndQuit($_lang["error_no_user_selected"]);
+    }
+    $modx->db->insert(
+        array(
+            'recipient' => $userid,
+            'sender'    => $modx->getLoginUserID(),
+            'subject'   => $subject,
+            'message'   => $message,
+            'postdate'  => $postdate,
+            'type'      => 'Message',
+            'private'   => 1,
+        ), $modx->getFullTableName('user_messages'));
 }
 
 if($sendto=='g') {
-	if($groupid==0) {
-		$modx->webAlertAndQuit($_lang["error_no_group_selected"]);
-	}
-	$rs = $modx->db->select('internalKey', $modx->getFullTableName('user_attributes'), "role='{$groupid}' AND internalKey!='".$modx->getLoginUserID()."'");
-	while ($row=$modx->db->getRow($rs)) {
-		$modx->db->insert(
-			array(
-				'recipient' => $row['internalKey'],
-				'sender'    => $modx->getLoginUserID(),
-				'subject'   => $subject,
-				'message'   => $message,
-				'postdate'  => $postdate,
-				'type'      => 'Message',
-				'private'   => 0,
-			), $modx->getFullTableName('user_messages'));
-	}
+    if($groupid==0) {
+        $modx->webAlertAndQuit($_lang["error_no_group_selected"]);
+    }
+    $rs = $modx->db->select('internalKey', $modx->getFullTableName('user_attributes'), "role='{$groupid}' AND internalKey!='".$modx->getLoginUserID()."'");
+    while ($row=$modx->db->getRow($rs)) {
+        $modx->db->insert(
+            array(
+                'recipient' => $row['internalKey'],
+                'sender'    => $modx->getLoginUserID(),
+                'subject'   => $subject,
+                'message'   => $message,
+                'postdate'  => $postdate,
+                'type'      => 'Message',
+                'private'   => 0,
+            ), $modx->getFullTableName('user_messages'));
+    }
 }
 
 
 if($sendto=='a') {
-	$rs = $modx->db->select('id', $modx->getFullTableName('manager_users'), "id!='".$modx->getLoginUserID()."'");
-	while ($row=$modx->db->getRow($rs)) {
-		$modx->db->insert(
-			array(
-				'recipient' => $row['id'],
-				'sender'    => $modx->getLoginUserID(),
-				'subject'   => $subject,
-				'message'   => $message,
-				'postdate'  => $postdate,
-				'type'      => 'Message',
-				'private'   => 0,
-			), $modx->getFullTableName('user_messages'));
-	}
+    $rs = $modx->db->select('id', $modx->getFullTableName('manager_users'), "id!='".$modx->getLoginUserID()."'");
+    while ($row=$modx->db->getRow($rs)) {
+        $modx->db->insert(
+            array(
+                'recipient' => $row['id'],
+                'sender'    => $modx->getLoginUserID(),
+                'subject'   => $subject,
+                'message'   => $message,
+                'postdate'  => $postdate,
+                'type'      => 'Message',
+                'private'   => 0,
+            ), $modx->getFullTableName('user_messages'));
+    }
 }
 
 $header = "Location: index.php?a=10";

Spacing +11 added lines, -11 removed lines

@@ -1,8 +1,8 @@ 
 <?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')) {
+if (!$modx->hasPermission('messages')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -10,13 +10,13 @@ 
 $userid = $_REQUEST['user'];
 $groupid = $_REQUEST['group'];
 $subject = $modx->db->escape($_REQUEST['messagesubject']);
-if($subject=="") $subject="(no subject)";
+if ($subject == "") $subject = "(no subject)";
 $message = $modx->db->escape($_REQUEST['messagebody']);
-if($message=="") $message="(no message)";
+if ($message == "") $message = "(no message)";
 $postdate = time();
 
-if($sendto=='u') {
-	if($userid==0) {
+if ($sendto == 'u') {
+	if ($userid == 0) {
 		$modx->webAlertAndQuit($_lang["error_no_user_selected"]);
 	}
 	$modx->db->insert(
@@ -31,12 +31,12 @@ 
 		), $modx->getFullTableName('user_messages'));
 }
 
-if($sendto=='g') {
-	if($groupid==0) {
+if ($sendto == 'g') {
+	if ($groupid == 0) {
 		$modx->webAlertAndQuit($_lang["error_no_group_selected"]);
 	}
 	$rs = $modx->db->select('internalKey', $modx->getFullTableName('user_attributes'), "role='{$groupid}' AND internalKey!='".$modx->getLoginUserID()."'");
-	while ($row=$modx->db->getRow($rs)) {
+	while ($row = $modx->db->getRow($rs)) {
 		$modx->db->insert(
 			array(
 				'recipient' => $row['internalKey'],
@@ -51,9 +51,9 @@ 
 }
 
 
-if($sendto=='a') {
+if ($sendto == 'a') {
 	$rs = $modx->db->select('id', $modx->getFullTableName('manager_users'), "id!='".$modx->getLoginUserID()."'");
-	while ($row=$modx->db->getRow($rs)) {
+	while ($row = $modx->db->getRow($rs)) {
 		$modx->db->insert(
 			array(
 				'recipient' => $row['id'],

Braces +6 added lines, -2 removed lines

@@ -10,9 +10,13 @@
 $userid = $_REQUEST['user'];
 $groupid = $_REQUEST['group'];
 $subject = $modx->db->escape($_REQUEST['messagesubject']);
-if($subject=="") $subject="(no subject)";
+if($subject=="") {
+    $subject="(no subject)";
+}
 $message = $modx->db->escape($_REQUEST['messagebody']);
-if($message=="") $message="(no message)";
+if($message=="") {
+    $message="(no message)";
+}
 $postdate = time();
 
 if($sendto=='u') {

manager/processors/access_groups.processor.php

Braces +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
 }
 
 // secure manager documents - flag as private
-if($updategroupaccess==true){
+if($updategroupaccess==true) {
 	include MODX_MANAGER_PATH."includes/secure_mgr_documents.inc.php";
 	secureMgrDocument();
 

Indentation +95 added lines, -95 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('access_permissions')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 // access group processor.
@@ -20,113 +20,113 @@ 
 $operation = $_REQUEST['operation'];
 
 switch ($operation) {
-	case "add_user_group" :
-		$newgroup = $_REQUEST['newusergroup'];
-		if(empty($newgroup)) {
-			$modx->webAlertAndQuit("No group name specified.");
-		} else {
-			$id = $modx->db->insert(array('name' => $modx->db->escape($newgroup)), $tbl_membergroup_names);
+    case "add_user_group" :
+        $newgroup = $_REQUEST['newusergroup'];
+        if(empty($newgroup)) {
+            $modx->webAlertAndQuit("No group name specified.");
+        } else {
+            $id = $modx->db->insert(array('name' => $modx->db->escape($newgroup)), $tbl_membergroup_names);
 
-			// invoke OnManagerCreateGroup event
-			$modx->invokeEvent('OnManagerCreateGroup', array(
-				'groupid'   => $id,
-				'groupname' => $newgroup,
-			));
-		}
-	break;
-	case "add_document_group" :
-		$newgroup = $_REQUEST['newdocgroup'];
-		if(empty($newgroup)) {
-			$modx->webAlertAndQuit("No group name specified.");
-		} else {
-			$id = $modx->db->insert(array('name' => $modx->db->escape($newgroup)), $tbl_documentgroup_names);
+            // invoke OnManagerCreateGroup event
+            $modx->invokeEvent('OnManagerCreateGroup', array(
+                'groupid'   => $id,
+                'groupname' => $newgroup,
+            ));
+        }
+    break;
+    case "add_document_group" :
+        $newgroup = $_REQUEST['newdocgroup'];
+        if(empty($newgroup)) {
+            $modx->webAlertAndQuit("No group name specified.");
+        } else {
+            $id = $modx->db->insert(array('name' => $modx->db->escape($newgroup)), $tbl_documentgroup_names);
 
-			// invoke OnCreateDocGroup event
-			$modx->invokeEvent('OnCreateDocGroup', array(
-				'groupid'   => $id,
-				'groupname' => $newgroup,
-			));
-		}
-	break;
-	case "delete_user_group" :
-		$updategroupaccess = true;
-		$usergroup = (int)$_REQUEST['usergroup'];
-		if(empty($usergroup)) {
-			$modx->webAlertAndQuit("No user group id specified for deletion.");
-		} else {
-			$modx->db->delete($tbl_membergroup_names, "id='{$usergroup}'");
+            // invoke OnCreateDocGroup event
+            $modx->invokeEvent('OnCreateDocGroup', array(
+                'groupid'   => $id,
+                'groupname' => $newgroup,
+            ));
+        }
+    break;
+    case "delete_user_group" :
+        $updategroupaccess = true;
+        $usergroup = (int)$_REQUEST['usergroup'];
+        if(empty($usergroup)) {
+            $modx->webAlertAndQuit("No user group id specified for deletion.");
+        } else {
+            $modx->db->delete($tbl_membergroup_names, "id='{$usergroup}'");
 
-			$modx->db->delete($tbl_membergroup_access, "membergroup='{$usergroup}'");
+            $modx->db->delete($tbl_membergroup_access, "membergroup='{$usergroup}'");
 
-			$modx->db->delete($tbl_member_groups, "user_group='{$usergroup}'");
-		}
-	break;
-	case "delete_document_group" :
-		$group = (int)$_REQUEST['documentgroup'];
-		if(empty($group)) {
-			$modx->webAlertAndQuit("No document group id specified for deletion.");
-		} else {
-			$modx->db->delete($tbl_documentgroup_names, "id='{$group}'");
+            $modx->db->delete($tbl_member_groups, "user_group='{$usergroup}'");
+        }
+    break;
+    case "delete_document_group" :
+        $group = (int)$_REQUEST['documentgroup'];
+        if(empty($group)) {
+            $modx->webAlertAndQuit("No document group id specified for deletion.");
+        } else {
+            $modx->db->delete($tbl_documentgroup_names, "id='{$group}'");
 
-			$modx->db->delete($tbl_membergroup_access, "documentgroup='{$group}'");
+            $modx->db->delete($tbl_membergroup_access, "documentgroup='{$group}'");
 
-			$modx->db->delete($tbl_document_groups, "document_group='{$group}'");
-		}
-	break;
-	case "rename_user_group" :
-		$newgroupname = $_REQUEST['newgroupname'];
-		if(empty($newgroupname)) {
-			$modx->webAlertAndQuit("No group name specified.");
-		}
-		$groupid = (int)$_REQUEST['groupid'];
-		if(empty($groupid)) {
-			$modx->webAlertAndQuit("No group id specified for rename.");
-		}
+            $modx->db->delete($tbl_document_groups, "document_group='{$group}'");
+        }
+    break;
+    case "rename_user_group" :
+        $newgroupname = $_REQUEST['newgroupname'];
+        if(empty($newgroupname)) {
+            $modx->webAlertAndQuit("No group name specified.");
+        }
+        $groupid = (int)$_REQUEST['groupid'];
+        if(empty($groupid)) {
+            $modx->webAlertAndQuit("No group id specified for rename.");
+        }
 
-		$modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_membergroup_names, "id='{$groupid}'");
-	break;
-	case "rename_document_group" :
-		$newgroupname = $_REQUEST['newgroupname'];
-		if(empty($newgroupname)) {
-			$modx->webAlertAndQuit("No group name specified.");
-		}
-		$groupid = (int)$_REQUEST['groupid'];
-		if(empty($groupid)) {
-			$modx->webAlertAndQuit("No group id specified for rename.");
-		}
+        $modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_membergroup_names, "id='{$groupid}'");
+    break;
+    case "rename_document_group" :
+        $newgroupname = $_REQUEST['newgroupname'];
+        if(empty($newgroupname)) {
+            $modx->webAlertAndQuit("No group name specified.");
+        }
+        $groupid = (int)$_REQUEST['groupid'];
+        if(empty($groupid)) {
+            $modx->webAlertAndQuit("No group id specified for rename.");
+        }
 
-		$modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_documentgroup_names, "id='{$groupid}'");
-	break;
-	case "add_document_group_to_user_group" :
-		$updategroupaccess = true;
-		$usergroup = (int)$_REQUEST['usergroup'];
-		$docgroup = (int)$_REQUEST['docgroup'];
-		$rs = $modx->db->select('COUNT(*)', $tbl_membergroup_access, "membergroup='{$usergroup}' AND documentgroup='{$docgroup}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit<=0) {
-			$modx->db->insert(array('membergroup' => $usergroup, 'documentgroup' => $docgroup), $tbl_membergroup_access);
-		} else {
-			//alert user that coupling already exists?
-		}
-	break;
-	case "remove_document_group_from_user_group" :
-		$updategroupaccess = true;
-		$coupling = (int)$_REQUEST['coupling'];
-		$modx->db->delete($tbl_membergroup_access, "id='{$coupling}'");
-	break;
-	default :
-		$modx->webAlertAndQuit("No operation set in request.");
+        $modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_documentgroup_names, "id='{$groupid}'");
+    break;
+    case "add_document_group_to_user_group" :
+        $updategroupaccess = true;
+        $usergroup = (int)$_REQUEST['usergroup'];
+        $docgroup = (int)$_REQUEST['docgroup'];
+        $rs = $modx->db->select('COUNT(*)', $tbl_membergroup_access, "membergroup='{$usergroup}' AND documentgroup='{$docgroup}'");
+        $limit = $modx->db->getValue($rs);
+        if($limit<=0) {
+            $modx->db->insert(array('membergroup' => $usergroup, 'documentgroup' => $docgroup), $tbl_membergroup_access);
+        } else {
+            //alert user that coupling already exists?
+        }
+    break;
+    case "remove_document_group_from_user_group" :
+        $updategroupaccess = true;
+        $coupling = (int)$_REQUEST['coupling'];
+        $modx->db->delete($tbl_membergroup_access, "id='{$coupling}'");
+    break;
+    default :
+        $modx->webAlertAndQuit("No operation set in request.");
 }
 
 // secure manager documents - flag as private
 if($updategroupaccess==true){
-	include MODX_MANAGER_PATH."includes/secure_mgr_documents.inc.php";
-	secureMgrDocument();
+    include MODX_MANAGER_PATH."includes/secure_mgr_documents.inc.php";
+    secureMgrDocument();
 
-	// Update the private group column
-	$modx->db->update(
-		'dgn.private_memgroup = (mga.membergroup IS NOT NULL)',
-		"{$tbl_documentgroup_names} AS dgn LEFT JOIN {$tbl_membergroup_access} AS mga ON mga.documentgroup = dgn.id");
+    // Update the private group column
+    $modx->db->update(
+        'dgn.private_memgroup = (mga.membergroup IS NOT NULL)',
+        "{$tbl_documentgroup_names} AS dgn LEFT JOIN {$tbl_membergroup_access} AS mga ON mga.documentgroup = dgn.id");
 }
 
 $header = "Location: index.php?a=40";

Spacing +19 added lines, -19 removed lines

@@ -1,8 +1,8 @@ 
 <?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('access_permissions')) {
+if (!$modx->hasPermission('access_permissions')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -22,7 +22,7 @@ 
 switch ($operation) {
 	case "add_user_group" :
 		$newgroup = $_REQUEST['newusergroup'];
-		if(empty($newgroup)) {
+		if (empty($newgroup)) {
 			$modx->webAlertAndQuit("No group name specified.");
 		} else {
 			$id = $modx->db->insert(array('name' => $modx->db->escape($newgroup)), $tbl_membergroup_names);
@@ -36,7 +36,7 @@ 
 	break;
 	case "add_document_group" :
 		$newgroup = $_REQUEST['newdocgroup'];
-		if(empty($newgroup)) {
+		if (empty($newgroup)) {
 			$modx->webAlertAndQuit("No group name specified.");
 		} else {
 			$id = $modx->db->insert(array('name' => $modx->db->escape($newgroup)), $tbl_documentgroup_names);
@@ -50,8 +50,8 @@ 
 	break;
 	case "delete_user_group" :
 		$updategroupaccess = true;
-		$usergroup = (int)$_REQUEST['usergroup'];
-		if(empty($usergroup)) {
+		$usergroup = (int) $_REQUEST['usergroup'];
+		if (empty($usergroup)) {
 			$modx->webAlertAndQuit("No user group id specified for deletion.");
 		} else {
 			$modx->db->delete($tbl_membergroup_names, "id='{$usergroup}'");
@@ -62,8 +62,8 @@ 
 		}
 	break;
 	case "delete_document_group" :
-		$group = (int)$_REQUEST['documentgroup'];
-		if(empty($group)) {
+		$group = (int) $_REQUEST['documentgroup'];
+		if (empty($group)) {
 			$modx->webAlertAndQuit("No document group id specified for deletion.");
 		} else {
 			$modx->db->delete($tbl_documentgroup_names, "id='{$group}'");
@@ -75,11 +75,11 @@ 
 	break;
 	case "rename_user_group" :
 		$newgroupname = $_REQUEST['newgroupname'];
-		if(empty($newgroupname)) {
+		if (empty($newgroupname)) {
 			$modx->webAlertAndQuit("No group name specified.");
 		}
-		$groupid = (int)$_REQUEST['groupid'];
-		if(empty($groupid)) {
+		$groupid = (int) $_REQUEST['groupid'];
+		if (empty($groupid)) {
 			$modx->webAlertAndQuit("No group id specified for rename.");
 		}
 
@@ -87,11 +87,11 @@ 
 	break;
 	case "rename_document_group" :
 		$newgroupname = $_REQUEST['newgroupname'];
-		if(empty($newgroupname)) {
+		if (empty($newgroupname)) {
 			$modx->webAlertAndQuit("No group name specified.");
 		}
-		$groupid = (int)$_REQUEST['groupid'];
-		if(empty($groupid)) {
+		$groupid = (int) $_REQUEST['groupid'];
+		if (empty($groupid)) {
 			$modx->webAlertAndQuit("No group id specified for rename.");
 		}
 
@@ -99,11 +99,11 @@ 
 	break;
 	case "add_document_group_to_user_group" :
 		$updategroupaccess = true;
-		$usergroup = (int)$_REQUEST['usergroup'];
-		$docgroup = (int)$_REQUEST['docgroup'];
+		$usergroup = (int) $_REQUEST['usergroup'];
+		$docgroup = (int) $_REQUEST['docgroup'];
 		$rs = $modx->db->select('COUNT(*)', $tbl_membergroup_access, "membergroup='{$usergroup}' AND documentgroup='{$docgroup}'");
 		$limit = $modx->db->getValue($rs);
-		if($limit<=0) {
+		if ($limit <= 0) {
 			$modx->db->insert(array('membergroup' => $usergroup, 'documentgroup' => $docgroup), $tbl_membergroup_access);
 		} else {
 			//alert user that coupling already exists?
@@ -111,7 +111,7 @@ 
 	break;
 	case "remove_document_group_from_user_group" :
 		$updategroupaccess = true;
-		$coupling = (int)$_REQUEST['coupling'];
+		$coupling = (int) $_REQUEST['coupling'];
 		$modx->db->delete($tbl_membergroup_access, "id='{$coupling}'");
 	break;
 	default :
@@ -119,7 +119,7 @@ 
 }
 
 // secure manager documents - flag as private
-if($updategroupaccess==true){
+if ($updategroupaccess == true) {
 	include MODX_MANAGER_PATH."includes/secure_mgr_documents.inc.php";
 	secureMgrDocument();