Completed
Push — develop ( 923a1c...1e9876 )
by Maxim
47s queued 29s
created
manager/processors/save_role.processor.php 1 patch
Indentation   +106 added lines, -106 removed lines patch added patch discarded remove patch
@@ -1,135 +1,135 @@
 block discarded – undo
1 1
 <?php
2 2
 if(IN_MANAGER_MODE != "true") {
3
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
3
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4
 }
5 5
 if(!$modx->hasPermission('save_role')) {
6
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
6
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
7 7
 }
8 8
 
9 9
 extract($_POST);
10 10
 
11 11
 if($name == '' || !isset ($name)) {
12
-	$modx->webAlertAndQuit("Please enter a name for this role!", "index.php?a={$mode}" . ($mode = 35 ? "&id={$id}" : ""));
12
+    $modx->webAlertAndQuit("Please enter a name for this role!", "index.php?a={$mode}" . ($mode = 35 ? "&id={$id}" : ""));
13 13
 }
14 14
 
15 15
 // setup fields
16 16
 $fields = array(
17
-	'name' => $name,
18
-	'description' => $description,
19
-	'frames' => $frames,
20
-	'home' => $home,
21
-	'view_document' => $view_document,
22
-	'new_document' => $new_document,
23
-	'save_document' => $save_document,
24
-	'publish_document' => $publish_document,
25
-	'delete_document' => $delete_document,
26
-	'empty_trash' => $empty_trash,
27
-	'action_ok' => $action_ok,
28
-	'logout' => $logout,
29
-	'help' => $help,
30
-	'messages' => $messages,
31
-	'new_user' => $new_user,
32
-	'edit_user' => $edit_user,
33
-	'logs' => $logs,
34
-	'edit_parser' => (isset ($edit_parser)) ? $edit_parser : '0',
35
-	'save_parser' => (isset ($save_parser)) ? $save_parser : '0',
36
-	'edit_template' => $edit_template,
37
-	'settings' => $settings,
38
-	'credits' => $credits,
39
-	'new_template' => $new_template,
40
-	'save_template' => $save_template,
41
-	'delete_template' => $delete_template,
42
-	'edit_snippet' => $edit_snippet,
43
-	'new_snippet' => $new_snippet,
44
-	'save_snippet' => $save_snippet,
45
-	'delete_snippet' => $delete_snippet,
46
-	'edit_chunk' => $edit_chunk,
47
-	'new_chunk' => $new_chunk,
48
-	'save_chunk' => $save_chunk,
49
-	'delete_chunk' => $delete_chunk,
50
-	'empty_cache' => $empty_cache,
51
-	'edit_document' => $edit_document,
52
-	'change_password' => $change_password,
53
-	'error_dialog' => $error_dialog,
54
-	'about' => $about,
55
-	'file_manager' => $file_manager,
56
-	'assets_files' => $assets_files,
57
-	'assets_images' => $assets_images,
58
-	'save_user' => $save_user,
59
-	'delete_user' => $delete_user,
60
-	'save_password' => $save_password,
61
-	'edit_role' => $edit_role,
62
-	'save_role' => $save_role,
63
-	'delete_role' => $delete_role,
64
-	'new_role' => $new_role,
65
-	'access_permissions' => $access_permissions,
66
-	'bk_manager' => $bk_manager,
67
-	'new_plugin' => $new_plugin,
68
-	'edit_plugin' => $edit_plugin,
69
-	'save_plugin' => $save_plugin,
70
-	'delete_plugin' => $delete_plugin,
71
-	'new_module' => $new_module,
72
-	'edit_module' => $edit_module,
73
-	'save_module' => $save_module,
74
-	'delete_module' => $delete_module,
75
-	'exec_module' => $exec_module,
76
-	'view_eventlog' => $view_eventlog,
77
-	'delete_eventlog' => $delete_eventlog,
78
-	'new_web_user' => $new_web_user,
79
-	'edit_web_user' => $edit_web_user,
80
-	'save_web_user' => $save_web_user,
81
-	'delete_web_user' => $delete_web_user,
82
-	'web_access_permissions' => $web_access_permissions,
83
-	'view_unpublished' => $view_unpublished,
84
-	'import_static' => $import_static,
85
-	'export_static' => $export_static,
86
-	'remove_locks' => $remove_locks,
87
-	'display_locks' => $display_locks,
88
-	'change_resourcetype' => $change_resourcetype,
89
-	'category_manager' => $category_manager
17
+    'name' => $name,
18
+    'description' => $description,
19
+    'frames' => $frames,
20
+    'home' => $home,
21
+    'view_document' => $view_document,
22
+    'new_document' => $new_document,
23
+    'save_document' => $save_document,
24
+    'publish_document' => $publish_document,
25
+    'delete_document' => $delete_document,
26
+    'empty_trash' => $empty_trash,
27
+    'action_ok' => $action_ok,
28
+    'logout' => $logout,
29
+    'help' => $help,
30
+    'messages' => $messages,
31
+    'new_user' => $new_user,
32
+    'edit_user' => $edit_user,
33
+    'logs' => $logs,
34
+    'edit_parser' => (isset ($edit_parser)) ? $edit_parser : '0',
35
+    'save_parser' => (isset ($save_parser)) ? $save_parser : '0',
36
+    'edit_template' => $edit_template,
37
+    'settings' => $settings,
38
+    'credits' => $credits,
39
+    'new_template' => $new_template,
40
+    'save_template' => $save_template,
41
+    'delete_template' => $delete_template,
42
+    'edit_snippet' => $edit_snippet,
43
+    'new_snippet' => $new_snippet,
44
+    'save_snippet' => $save_snippet,
45
+    'delete_snippet' => $delete_snippet,
46
+    'edit_chunk' => $edit_chunk,
47
+    'new_chunk' => $new_chunk,
48
+    'save_chunk' => $save_chunk,
49
+    'delete_chunk' => $delete_chunk,
50
+    'empty_cache' => $empty_cache,
51
+    'edit_document' => $edit_document,
52
+    'change_password' => $change_password,
53
+    'error_dialog' => $error_dialog,
54
+    'about' => $about,
55
+    'file_manager' => $file_manager,
56
+    'assets_files' => $assets_files,
57
+    'assets_images' => $assets_images,
58
+    'save_user' => $save_user,
59
+    'delete_user' => $delete_user,
60
+    'save_password' => $save_password,
61
+    'edit_role' => $edit_role,
62
+    'save_role' => $save_role,
63
+    'delete_role' => $delete_role,
64
+    'new_role' => $new_role,
65
+    'access_permissions' => $access_permissions,
66
+    'bk_manager' => $bk_manager,
67
+    'new_plugin' => $new_plugin,
68
+    'edit_plugin' => $edit_plugin,
69
+    'save_plugin' => $save_plugin,
70
+    'delete_plugin' => $delete_plugin,
71
+    'new_module' => $new_module,
72
+    'edit_module' => $edit_module,
73
+    'save_module' => $save_module,
74
+    'delete_module' => $delete_module,
75
+    'exec_module' => $exec_module,
76
+    'view_eventlog' => $view_eventlog,
77
+    'delete_eventlog' => $delete_eventlog,
78
+    'new_web_user' => $new_web_user,
79
+    'edit_web_user' => $edit_web_user,
80
+    'save_web_user' => $save_web_user,
81
+    'delete_web_user' => $delete_web_user,
82
+    'web_access_permissions' => $web_access_permissions,
83
+    'view_unpublished' => $view_unpublished,
84
+    'import_static' => $import_static,
85
+    'export_static' => $export_static,
86
+    'remove_locks' => $remove_locks,
87
+    'display_locks' => $display_locks,
88
+    'change_resourcetype' => $change_resourcetype,
89
+    'category_manager' => $category_manager
90 90
 );
91 91
 
92 92
 $fields = $modx->db->escape($fields);
93 93
 
94 94
 switch($_POST['mode']) {
95
-	case '38' :
96
-		$tbl = $modx->getFullTableName("user_roles");
95
+    case '38' :
96
+        $tbl = $modx->getFullTableName("user_roles");
97 97
 
98
-		// disallow duplicate names for role
99
-		$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_roles'), "name='{$fields['name']}'");
100
-		if($modx->db->getValue($rs) > 0) {
101
-			$modx->manager->saveFormValues(38);
102
-			$modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['role'], $name), "index.php?a=38");
103
-		}
98
+        // disallow duplicate names for role
99
+        $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_roles'), "name='{$fields['name']}'");
100
+        if($modx->db->getValue($rs) > 0) {
101
+            $modx->manager->saveFormValues(38);
102
+            $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['role'], $name), "index.php?a=38");
103
+        }
104 104
 
105
-		$modx->db->insert($fields, $tbl);
105
+        $modx->db->insert($fields, $tbl);
106 106
 
107
-		// Set the item name for logger
108
-		$_SESSION['itemname'] = $_POST['name'];
107
+        // Set the item name for logger
108
+        $_SESSION['itemname'] = $_POST['name'];
109 109
 
110
-		$header = "Location: index.php?a=86&r=2";
111
-		header($header);
112
-		break;
113
-	case '35' :
114
-		$tbl = $modx->getFullTableName("user_roles");
110
+        $header = "Location: index.php?a=86&r=2";
111
+        header($header);
112
+        break;
113
+    case '35' :
114
+        $tbl = $modx->getFullTableName("user_roles");
115 115
 
116
-		// disallow duplicate names for role
117
-		$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_roles'), "name='{$fields['name']}' AND id!='{$id}'");
118
-		if($modx->db->getValue($rs) > 0) {
119
-			$modx->manager->saveFormValues(35);
120
-			$modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['role'], $name), "index.php?a=35&id={$id}");
121
-		}
116
+        // disallow duplicate names for role
117
+        $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_roles'), "name='{$fields['name']}' AND id!='{$id}'");
118
+        if($modx->db->getValue($rs) > 0) {
119
+            $modx->manager->saveFormValues(35);
120
+            $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['role'], $name), "index.php?a=35&id={$id}");
121
+        }
122 122
 
123
-		$modx->db->update($fields, $tbl, "id='{$id}'");
123
+        $modx->db->update($fields, $tbl, "id='{$id}'");
124 124
 
125
-		// Set the item name for logger
126
-		$_SESSION['itemname'] = $_POST['name'];
125
+        // Set the item name for logger
126
+        $_SESSION['itemname'] = $_POST['name'];
127 127
 
128
-		$header = "Location: index.php?a=86&r=2";
129
-		header($header);
130
-		break;
131
-	default :
132
-		$modx->webAlertAndQuit("No operation set in request.");
128
+        $header = "Location: index.php?a=86&r=2";
129
+        header($header);
130
+        break;
131
+    default :
132
+        $modx->webAlertAndQuit("No operation set in request.");
133 133
 }
134 134
 
135 135
 $modx->unlockElement(8, $id);
Please login to merge, or discard this patch.
manager/processors/delete_role.processor.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,22 +1,22 @@
 block discarded – undo
1 1
 <?php
2 2
 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.");
3 3
 if(!$modx->hasPermission('delete_role')) {
4
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
4
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
5 5
 }
6 6
 
7 7
 $id = isset($_GET['id'])? intval($_GET['id']) : 0;
8 8
 if($id==0) {
9
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
9
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
10 10
 }
11 11
 
12 12
 if($id==1){
13
-	$modx->webAlertAndQuit("The role you are trying to delete is the admin role. This role cannot be deleted!");
13
+    $modx->webAlertAndQuit("The role you are trying to delete is the admin role. This role cannot be deleted!");
14 14
 }
15 15
 
16 16
 $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_attributes'), "role='{$id}'");
17 17
 $count=$modx->db->getValue($rs);
18 18
 if($count>0){
19
-	$modx->webAlertAndQuit("There are users with this role. It can't be deleted.");
19
+    $modx->webAlertAndQuit("There are users with this role. It can't be deleted.");
20 20
 }
21 21
 
22 22
 // Set the item name for logger
Please login to merge, or discard this patch.
manager/processors/delete_user.processor.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -1,17 +1,17 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 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.");
3 3
 if(!$modx->hasPermission('delete_user')) {
4
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
4
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
5 5
 }
6 6
 
7 7
 $id = isset($_GET['id'])? intval($_GET['id']) : 0;
8 8
 if($id==0) {
9
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
9
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
10 10
 }
11 11
 
12 12
 // delete the user, but first check if we are deleting our own record
13 13
 if($id==$modx->getLoginUserID()) {
14
-	$modx->webAlertAndQuit("You can't delete yourself!");
14
+    $modx->webAlertAndQuit("You can't delete yourself!");
15 15
 }
16 16
 
17 17
 // Set the item name for logger
@@ -20,9 +20,9 @@  discard block
 block discarded – undo
20 20
 
21 21
 // invoke OnBeforeUserFormDelete event
22 22
 $modx->invokeEvent("OnBeforeUserFormDelete",
23
-	array(
24
-		"id"	=> $id
25
-	));
23
+    array(
24
+        "id"	=> $id
25
+    ));
26 26
 
27 27
 // delete the user.
28 28
 $modx->db->delete($modx->getFullTableName('manager_users'), "id='{$id}'");
@@ -37,16 +37,16 @@  discard block
 block discarded – undo
37 37
 
38 38
 // invoke OnManagerDeleteUser event
39 39
 $modx->invokeEvent("OnManagerDeleteUser",
40
-	array(
41
-		"userid"		=> $id,
42
-		"username"		=> $username
43
-	));
40
+    array(
41
+        "userid"		=> $id,
42
+        "username"		=> $username
43
+    ));
44 44
 
45 45
 // invoke OnUserFormDelete event
46 46
 $modx->invokeEvent("OnUserFormDelete",
47
-	array(
48
-		"id"	=> $id
49
-	));
47
+    array(
48
+        "id"	=> $id
49
+    ));
50 50
 
51 51
 $header="Location: index.php?a=75";
52 52
 header($header);
Please login to merge, or discard this patch.
manager/processors/delete_tmplvars.processor.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -1,26 +1,26 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 if(IN_MANAGER_MODE != "true") {
3
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
3
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4
 }
5 5
 if(!$modx->hasPermission('delete_template')) {
6
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
6
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
7 7
 }
8 8
 
9 9
 $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
10 10
 if($id == 0) {
11
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
11
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
12 12
 }
13 13
 
14 14
 $forced = isset($_GET['force']) ? $_GET['force'] : 0;
15 15
 
16 16
 // check for relations
17 17
 if(!$forced) {
18
-	$drs = $modx->db->select('sc.id, sc.pagetitle,sc.description', $modx->getFullTableName('site_content') . " AS sc
18
+    $drs = $modx->db->select('sc.id, sc.pagetitle,sc.description', $modx->getFullTableName('site_content') . " AS sc
19 19
 			INNER JOIN " . $modx->getFullTableName('site_tmplvar_contentvalues') . " AS stcv ON stcv.contentid=sc.id", "stcv.tmplvarid='{$id}'");
20
-	$count = $modx->db->getRecordCount($drs);
21
-	if($count > 0) {
22
-		include_once "header.inc.php";
23
-		?>
20
+    $count = $modx->db->getRecordCount($drs);
21
+    if($count > 0) {
22
+        include_once "header.inc.php";
23
+        ?>
24 24
 		<script>
25 25
 			var actions = {
26 26
 				delete: function() {
@@ -42,17 +42,17 @@  discard block
 block discarded – undo
42 42
 				<p><?= $_lang['tmplvar_inuse'] ?></p>
43 43
 				<ul>
44 44
 					<?php
45
-					while($row = $modx->db->getRow($drs)) {
46
-						echo '<li><span style="width: 200px"><a href="index.php?id=' . $row['id'] . '&a=27">' . $row['pagetitle'] . '</a></span>' . ($row['description'] != '' ? ' - ' . $row['description'] : '') . '</li>';
47
-					}
48
-					?>
45
+                    while($row = $modx->db->getRow($drs)) {
46
+                        echo '<li><span style="width: 200px"><a href="index.php?id=' . $row['id'] . '&a=27">' . $row['pagetitle'] . '</a></span>' . ($row['description'] != '' ? ' - ' . $row['description'] : '') . '</li>';
47
+                    }
48
+                    ?>
49 49
 				</ul>
50 50
 			</div>
51 51
 		</div>
52 52
 		<?php
53
-		include_once "footer.inc.php";
54
-		exit;
55
-	}
53
+        include_once "footer.inc.php";
54
+        exit;
55
+    }
56 56
 }
57 57
 
58 58
 // Set the item name for logger
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 
62 62
 // invoke OnBeforeTVFormDelete event
63 63
 $modx->invokeEvent("OnBeforeTVFormDelete", array(
64
-	"id" => $id
64
+    "id" => $id
65 65
 ));
66 66
 
67 67
 // delete variable
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 
79 79
 // invoke OnTVFormDelete event
80 80
 $modx->invokeEvent("OnTVFormDelete", array(
81
-	"id" => $id
81
+    "id" => $id
82 82
 ));
83 83
 
84 84
 // empty cache
Please login to merge, or discard this patch.
manager/processors/delete_snippet.processor.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 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.");
3 3
 if(!$modx->hasPermission('delete_snippet')) {
4
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
4
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
5 5
 }
6 6
 
7 7
 $id = isset($_GET['id'])? intval($_GET['id']) : 0;
8 8
 if($id==0) {
9
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
9
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
10 10
 }
11 11
 
12 12
 // Set the item name for logger
@@ -15,18 +15,18 @@  discard block
 block discarded – undo
15 15
 
16 16
 // invoke OnBeforeSnipFormDelete event
17 17
 $modx->invokeEvent("OnBeforeSnipFormDelete",
18
-	array(
19
-		"id"	=> $id
20
-	));
18
+    array(
19
+        "id"	=> $id
20
+    ));
21 21
 
22 22
 // delete the snippet.
23 23
 $modx->db->delete($modx->getFullTableName('site_snippets'), "id='{$id}'");
24 24
 
25 25
 // invoke OnSnipFormDelete event
26 26
 $modx->invokeEvent("OnSnipFormDelete",
27
-	array(
28
-		"id"	=> $id
29
-	));
27
+    array(
28
+        "id"	=> $id
29
+    ));
30 30
 
31 31
 // empty cache
32 32
 $modx->clearCache('full');
Please login to merge, or discard this patch.
manager/processors/execute_module.processor.php 1 patch
Indentation   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -1,51 +1,51 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 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.");
3 3
 if(!$modx->hasPermission('exec_module')) {	
4
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
4
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
5 5
 }
6 6
 
7 7
 $id = isset($_GET['id'])? intval($_GET['id']) : 0;
8 8
 if($id==0) {
9
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
9
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
10 10
 }
11 11
 
12 12
 // check if user has access permission, except admins
13 13
 if($_SESSION['mgrRole']!=1){
14
-	$rs = $modx->db->select(
15
-		'sma.usergroup,mg.member',
16
-		$modx->getFullTableName("site_module_access")." sma
14
+    $rs = $modx->db->select(
15
+        'sma.usergroup,mg.member',
16
+        $modx->getFullTableName("site_module_access")." sma
17 17
 			LEFT JOIN ".$modx->getFullTableName("member_groups")." mg ON mg.user_group = sma.usergroup AND member='".$modx->getLoginUserID()."'",
18
-		"sma.module = '{$id}'"
19
-		);
20
-	//initialize permission to -1, if it stays -1 no permissions
21
-	//attached so permission granted
22
-	$permissionAccessInt = -1;
18
+        "sma.module = '{$id}'"
19
+        );
20
+    //initialize permission to -1, if it stays -1 no permissions
21
+    //attached so permission granted
22
+    $permissionAccessInt = -1;
23 23
 
24
-	while ($row = $modx->db->getRow($rs)) {
25
-		if($row["usergroup"] && $row["member"]) {
26
-			//if there are permissions and this member has permission, ofcourse
27
-			//this is granted
28
-			$permissionAccessInt = 1;
29
-		} elseif ($permissionAccessInt==-1) {
30
-			//if there are permissions but this member has no permission and the
31
-			//variable was still in init state we set permission to 0; no permissions
32
-			$permissionAccessInt = 0;
33
-		}
34
-	}
24
+    while ($row = $modx->db->getRow($rs)) {
25
+        if($row["usergroup"] && $row["member"]) {
26
+            //if there are permissions and this member has permission, ofcourse
27
+            //this is granted
28
+            $permissionAccessInt = 1;
29
+        } elseif ($permissionAccessInt==-1) {
30
+            //if there are permissions but this member has no permission and the
31
+            //variable was still in init state we set permission to 0; no permissions
32
+            $permissionAccessInt = 0;
33
+        }
34
+    }
35 35
 
36
-	if($permissionAccessInt==0) {
37
-		$modx->webAlertAndQuit("You do not sufficient privileges to execute this module.", "index.php?a=106");
38
-	}
36
+    if($permissionAccessInt==0) {
37
+        $modx->webAlertAndQuit("You do not sufficient privileges to execute this module.", "index.php?a=106");
38
+    }
39 39
 }
40 40
 
41 41
 // get module data
42 42
 $rs = $modx->db->select('*', $modx->getFullTableName("site_modules"), "id='{$id}'");
43 43
 $content = $modx->db->getRow($rs);
44 44
 if(!$content) {
45
-	$modx->webAlertAndQuit("No record found for id {$id}.", "index.php?a=106");
45
+    $modx->webAlertAndQuit("No record found for id {$id}.", "index.php?a=106");
46 46
 }
47 47
 if($content['disabled']) {
48
-	$modx->webAlertAndQuit("This module is disabled and cannot be executed.", "index.php?a=106");
48
+    $modx->webAlertAndQuit("This module is disabled and cannot be executed.", "index.php?a=106");
49 49
 }
50 50
 
51 51
 // Set the item name for logger
@@ -63,38 +63,38 @@  discard block
 block discarded – undo
63 63
 
64 64
 // evalModule
65 65
 function evalModule($moduleCode,$params){
66
-	global $modx;
67
-	$modx->event->params = &$params; // store params inside event object
68
-	if(is_array($params)) {
69
-		extract($params, EXTR_SKIP);
70
-	}
71
-	ob_start();
72
-	$mod = eval($moduleCode);
73
-	$msg = ob_get_contents();
74
-	ob_end_clean();
75
-	if (isset($php_errormsg))
76
-	{
77
-		$error_info = error_get_last();
66
+    global $modx;
67
+    $modx->event->params = &$params; // store params inside event object
68
+    if(is_array($params)) {
69
+        extract($params, EXTR_SKIP);
70
+    }
71
+    ob_start();
72
+    $mod = eval($moduleCode);
73
+    $msg = ob_get_contents();
74
+    ob_end_clean();
75
+    if (isset($php_errormsg))
76
+    {
77
+        $error_info = error_get_last();
78 78
         switch($error_info['type'])
79 79
         {
80
-        	case E_NOTICE :
81
-        		$error_level = 1;
82
-        	case E_USER_NOTICE :
83
-        		break;
84
-        	case E_DEPRECATED :
85
-        	case E_USER_DEPRECATED :
86
-        	case E_STRICT :
87
-        		$error_level = 2;
88
-        		break;
89
-        	default:
90
-        		$error_level = 99;
80
+            case E_NOTICE :
81
+                $error_level = 1;
82
+            case E_USER_NOTICE :
83
+                break;
84
+            case E_DEPRECATED :
85
+            case E_USER_DEPRECATED :
86
+            case E_STRICT :
87
+                $error_level = 2;
88
+                break;
89
+            default:
90
+                $error_level = 99;
91
+        }
92
+        if($modx->config['error_reporting']==='99' || 2<$error_level)
93
+        {
94
+            $modx->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], $_SESSION['itemname'] . ' - Module', $error_info['message'], $error_info['line'], $msg);
95
+            $modx->event->alert("An error occurred while loading. Please see the event log for more information<p>{$msg}</p>");
91 96
         }
92
-		if($modx->config['error_reporting']==='99' || 2<$error_level)
93
-		{
94
-			$modx->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], $_SESSION['itemname'] . ' - Module', $error_info['message'], $error_info['line'], $msg);
95
-			$modx->event->alert("An error occurred while loading. Please see the event log for more information<p>{$msg}</p>");
96
-		}
97
-	}
98
-	unset($modx->event->params);
99
-	return $mod.$msg;
97
+    }
98
+    unset($modx->event->params);
99
+    return $mod.$msg;
100 100
 }
Please login to merge, or discard this patch.
manager/processors/delete_template.processor.php 1 patch
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -1,22 +1,22 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 if(IN_MANAGER_MODE != "true") {
3
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
3
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4
 }
5 5
 if(!$modx->hasPermission('delete_template')) {
6
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
6
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
7 7
 }
8 8
 
9 9
 $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
10 10
 if($id == 0) {
11
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
11
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
12 12
 }
13 13
 
14 14
 // delete the template, but first check it doesn't have any documents using it
15 15
 $rs = $modx->db->select('id, pagetitle,introtext', $modx->getFullTableName('site_content'), "template='{$id}' AND deleted=0");
16 16
 $limit = $modx->db->getRecordCount($rs);
17 17
 if($limit > 0) {
18
-	include "header.inc.php";
19
-	?>
18
+    include "header.inc.php";
19
+    ?>
20 20
 
21 21
 	<h1><?php echo $_lang['manage_templates']; ?></h1>
22 22
 
@@ -28,20 +28,20 @@  discard block
 block discarded – undo
28 28
 			<p>Documents using this template:</p>
29 29
 			<ul>
30 30
 				<?php
31
-				while($row = $modx->db->getRow($rs)) {
32
-					echo '<li><span style="width: 200px"><a href="index.php?id=' . $row['id'] . '&a=27">' . $row['pagetitle'] . '</a></span>' . ($row['introtext'] != '' ? ' - ' . $row['introtext'] : '') . '</li>';
33
-				}
34
-				?>
31
+                while($row = $modx->db->getRow($rs)) {
32
+                    echo '<li><span style="width: 200px"><a href="index.php?id=' . $row['id'] . '&a=27">' . $row['pagetitle'] . '</a></span>' . ($row['introtext'] != '' ? ' - ' . $row['introtext'] : '') . '</li>';
33
+                }
34
+                ?>
35 35
 			</ul>
36 36
 		</div>
37 37
 	</div>
38 38
 	<?php
39
-	include_once "footer.inc.php";
40
-	exit;
39
+    include_once "footer.inc.php";
40
+    exit;
41 41
 }
42 42
 
43 43
 if($id == $default_template) {
44
-	$modx->webAlertAndQuit("This template is set as the default template. Please choose a different default template in the MODX configuration before deleting this template.");
44
+    $modx->webAlertAndQuit("This template is set as the default template. Please choose a different default template in the MODX configuration before deleting this template.");
45 45
 }
46 46
 
47 47
 // Set the item name for logger
@@ -50,8 +50,8 @@  discard block
 block discarded – undo
50 50
 
51 51
 // invoke OnBeforeTempFormDelete event
52 52
 $modx->invokeEvent("OnBeforeTempFormDelete", array(
53
-		"id" => $id
54
-	));
53
+        "id" => $id
54
+    ));
55 55
 
56 56
 // delete the document.
57 57
 $modx->db->delete($modx->getFullTableName('site_templates'), "id='{$id}'");
@@ -60,8 +60,8 @@  discard block
 block discarded – undo
60 60
 
61 61
 // invoke OnTempFormDelete event
62 62
 $modx->invokeEvent("OnTempFormDelete", array(
63
-		"id" => $id
64
-	));
63
+        "id" => $id
64
+    ));
65 65
 
66 66
 // empty cache
67 67
 $modx->clearCache('full');
Please login to merge, or discard this patch.
manager/processors/web_access_groups.processor.php 1 patch
Indentation   +95 added lines, -95 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 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.");
3 3
 if(!$modx->hasPermission('web_access_permissions')) {
4
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
4
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
5 5
 }
6 6
 
7 7
 // web access group processor.
@@ -18,111 +18,111 @@  discard block
 block discarded – undo
18 18
 $operation = $_REQUEST['operation'];
19 19
 
20 20
 switch ($operation) {
21
-	case "add_user_group" :
22
-		$newgroup = $_REQUEST['newusergroup'];
23
-		if(empty($newgroup)) {
24
-			$modx->webAlertAndQuit("No group name specified.");
25
-		} else {
26
-			$id = $modx->db->insert(array('name'=>$modx->db->escape($newgroup)), $tbl_webgroup_names);
21
+    case "add_user_group" :
22
+        $newgroup = $_REQUEST['newusergroup'];
23
+        if(empty($newgroup)) {
24
+            $modx->webAlertAndQuit("No group name specified.");
25
+        } else {
26
+            $id = $modx->db->insert(array('name'=>$modx->db->escape($newgroup)), $tbl_webgroup_names);
27 27
 
28
-			// invoke OnWebCreateGroup event
29
-			$modx->invokeEvent('OnWebCreateGroup', array(
30
-				'groupid'   => $id,
31
-				'groupname' => $newgroup,
32
-			));
33
-		}
34
-	break;
35
-	case "add_document_group" :
36
-		$newgroup = $_REQUEST['newdocgroup'];
37
-		if(empty($newgroup)) {
38
-			$modx->webAlertAndQuit("No group name specified.");
39
-		} else {
40
-			$id = $modx->db->insert(array('name'=>$modx->db->escape($newgroup)), $tbl_documentgroup_names);
28
+            // invoke OnWebCreateGroup event
29
+            $modx->invokeEvent('OnWebCreateGroup', array(
30
+                'groupid'   => $id,
31
+                'groupname' => $newgroup,
32
+            ));
33
+        }
34
+    break;
35
+    case "add_document_group" :
36
+        $newgroup = $_REQUEST['newdocgroup'];
37
+        if(empty($newgroup)) {
38
+            $modx->webAlertAndQuit("No group name specified.");
39
+        } else {
40
+            $id = $modx->db->insert(array('name'=>$modx->db->escape($newgroup)), $tbl_documentgroup_names);
41 41
 
42
-			// invoke OnCreateDocGroup event
43
-			$modx->invokeEvent('OnCreateDocGroup', array(
44
-				'groupid'   => $id,
45
-				'groupname' => $newgroup,
46
-			));
47
-		}
48
-	break;
49
-	case "delete_user_group" :
50
-		$updategroupaccess = true;
51
-		$usergroup = intval($_REQUEST['usergroup']);
52
-		if(empty($usergroup)) {
53
-			$modx->webAlertAndQuit("No user group id specified for deletion.");
54
-		} else {
55
-			$modx->db->delete($tbl_webgroup_names, "id='{$usergroup}'");
42
+            // invoke OnCreateDocGroup event
43
+            $modx->invokeEvent('OnCreateDocGroup', array(
44
+                'groupid'   => $id,
45
+                'groupname' => $newgroup,
46
+            ));
47
+        }
48
+    break;
49
+    case "delete_user_group" :
50
+        $updategroupaccess = true;
51
+        $usergroup = intval($_REQUEST['usergroup']);
52
+        if(empty($usergroup)) {
53
+            $modx->webAlertAndQuit("No user group id specified for deletion.");
54
+        } else {
55
+            $modx->db->delete($tbl_webgroup_names, "id='{$usergroup}'");
56 56
 			
57
-			$modx->db->delete($tbl_webgroup_access, "webgroup='{$usergroup}'");
57
+            $modx->db->delete($tbl_webgroup_access, "webgroup='{$usergroup}'");
58 58
 			
59
-			$modx->db->delete($tbl_web_groups, "webuser='{$usergroup}'");
60
-		}
61
-	break;
62
-	case "delete_document_group" :
63
-		$group = intval($_REQUEST['documentgroup']);
64
-		if(empty($group)) {
65
-			$modx->webAlertAndQuit("No document group id specified for deletion.");
66
-		} else {
67
-			$modx->db->delete($tbl_documentgroup_names, "id='{$group}'");
59
+            $modx->db->delete($tbl_web_groups, "webuser='{$usergroup}'");
60
+        }
61
+    break;
62
+    case "delete_document_group" :
63
+        $group = intval($_REQUEST['documentgroup']);
64
+        if(empty($group)) {
65
+            $modx->webAlertAndQuit("No document group id specified for deletion.");
66
+        } else {
67
+            $modx->db->delete($tbl_documentgroup_names, "id='{$group}'");
68 68
 			
69
-			$modx->db->delete($tbl_webgroup_access, "documentgroup='{$group}'");
69
+            $modx->db->delete($tbl_webgroup_access, "documentgroup='{$group}'");
70 70
 			
71
-			$modx->db->delete($tbl_document_groups, "document_group='{$group}'");
72
-		}
73
-	break;
74
-	case "rename_user_group" :
75
-		$newgroupname = $_REQUEST['newgroupname'];
76
-		if(empty($newgroupname)) {
77
-			$modx->webAlertAndQuit("No group name specified.");
78
-		}
79
-		$groupid = intval($_REQUEST['groupid']);
80
-		if(empty($groupid)) {
81
-			$modx->webAlertAndQuit("No user group id specified for rename.");
82
-		}
83
-		$modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_webgroup_names, "id='{$groupid}'");
84
-	break;
85
-	case "rename_document_group" :
86
-		$newgroupname = $_REQUEST['newgroupname'];
87
-		if(empty($newgroupname)) {
88
-			$modx->webAlertAndQuit("No group name specified.");
89
-		}
90
-		$groupid = intval($_REQUEST['groupid']);
91
-		if(empty($groupid)) {
92
-			$modx->webAlertAndQuit("No document group id specified for rename.");
93
-		}
94
-		$modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_documentgroup_names, "id='{$groupid}'");
95
-	break;
96
-	case "add_document_group_to_user_group" :
97
-		$updategroupaccess = true;
98
-		$usergroup = intval($_REQUEST['usergroup']);
99
-		$docgroup = intval($_REQUEST['docgroup']);
100
-		$rs = $modx->db->select('COUNT(*)', $tbl_webgroup_access, "webgroup='{$usergroup}' AND documentgroup='{$docgroup}'");
101
-		$limit = $modx->db->getValue($rs);
102
-		if($limit<=0) {
103
-			$modx->db->insert(array('webgroup'=>$usergroup, 'documentgroup'=>$docgroup), $tbl_webgroup_access);
104
-		} else {
105
-			//alert user that coupling already exists?
106
-		}
107
-	break;
108
-	case "remove_document_group_from_user_group" :
109
-		$updategroupaccess = true;
110
-		$coupling = intval($_REQUEST['coupling']);
111
-		$modx->db->delete($tbl_webgroup_access, "id='{$coupling}'");
112
-	break;
113
-	default :
114
-		$modx->webAlertAndQuit("No operation set in request.");
71
+            $modx->db->delete($tbl_document_groups, "document_group='{$group}'");
72
+        }
73
+    break;
74
+    case "rename_user_group" :
75
+        $newgroupname = $_REQUEST['newgroupname'];
76
+        if(empty($newgroupname)) {
77
+            $modx->webAlertAndQuit("No group name specified.");
78
+        }
79
+        $groupid = intval($_REQUEST['groupid']);
80
+        if(empty($groupid)) {
81
+            $modx->webAlertAndQuit("No user group id specified for rename.");
82
+        }
83
+        $modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_webgroup_names, "id='{$groupid}'");
84
+    break;
85
+    case "rename_document_group" :
86
+        $newgroupname = $_REQUEST['newgroupname'];
87
+        if(empty($newgroupname)) {
88
+            $modx->webAlertAndQuit("No group name specified.");
89
+        }
90
+        $groupid = intval($_REQUEST['groupid']);
91
+        if(empty($groupid)) {
92
+            $modx->webAlertAndQuit("No document group id specified for rename.");
93
+        }
94
+        $modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_documentgroup_names, "id='{$groupid}'");
95
+    break;
96
+    case "add_document_group_to_user_group" :
97
+        $updategroupaccess = true;
98
+        $usergroup = intval($_REQUEST['usergroup']);
99
+        $docgroup = intval($_REQUEST['docgroup']);
100
+        $rs = $modx->db->select('COUNT(*)', $tbl_webgroup_access, "webgroup='{$usergroup}' AND documentgroup='{$docgroup}'");
101
+        $limit = $modx->db->getValue($rs);
102
+        if($limit<=0) {
103
+            $modx->db->insert(array('webgroup'=>$usergroup, 'documentgroup'=>$docgroup), $tbl_webgroup_access);
104
+        } else {
105
+            //alert user that coupling already exists?
106
+        }
107
+    break;
108
+    case "remove_document_group_from_user_group" :
109
+        $updategroupaccess = true;
110
+        $coupling = intval($_REQUEST['coupling']);
111
+        $modx->db->delete($tbl_webgroup_access, "id='{$coupling}'");
112
+    break;
113
+    default :
114
+        $modx->webAlertAndQuit("No operation set in request.");
115 115
 }
116 116
 
117 117
 // secure web documents - flag as private
118 118
 if($updategroupaccess==true){
119
-	include MODX_MANAGER_PATH."includes/secure_web_documents.inc.php";
120
-	secureWebDocument();
119
+    include MODX_MANAGER_PATH."includes/secure_web_documents.inc.php";
120
+    secureWebDocument();
121 121
 
122
-	// Update the private group column
123
-	$modx->db->update(
124
-		'dgn.private_webgroup = (wga.webgroup IS NOT NULL)',
125
-		"{$tbl_documentgroup_names} AS dgn LEFT JOIN {$tbl_webgroup_access} AS wga ON wga.documentgroup = dgn.id");
122
+    // Update the private group column
123
+    $modx->db->update(
124
+        'dgn.private_webgroup = (wga.webgroup IS NOT NULL)',
125
+        "{$tbl_documentgroup_names} AS dgn LEFT JOIN {$tbl_webgroup_access} AS wga ON wga.documentgroup = dgn.id");
126 126
 }
127 127
 
128 128
 $header = "Location: index.php?a=91";
Please login to merge, or discard this patch.
manager/processors/duplicate_module.processor.php 1 patch
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -1,21 +1,21 @@  discard block
 block discarded – undo
1 1
 <?php 
2 2
 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.");
3 3
 if(!$modx->hasPermission('new_module')) {
4
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
4
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
5 5
 }
6 6
 
7 7
 $id = isset($_GET['id'])? intval($_GET['id']) : 0;
8 8
 if($id==0) {
9
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
9
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
10 10
 }
11 11
 
12 12
 // create globally unique identifiers (guid)
13 13
 function createGUID(){
14
-	srand((double)microtime()*1000000);
15
-	$r = rand() ;
16
-	$u = uniqid(getmypid() . $r . (double)microtime()*1000000,1);
17
-	$m = md5 ($u);
18
-	return $m;
14
+    srand((double)microtime()*1000000);
15
+    $r = rand() ;
16
+    $u = uniqid(getmypid() . $r . (double)microtime()*1000000,1);
17
+    $m = md5 ($u);
18
+    return $m;
19 19
 }
20 20
 
21 21
 // count duplicates
@@ -26,40 +26,40 @@  discard block
 block discarded – undo
26 26
 
27 27
 // duplicate module
28 28
 $newid = $modx->db->insert(
29
-	array(
30
-		'name'=>'',
31
-		'description'=>'',
32
-		'disabled'=>'',
33
-		'category'=>'',
34
-		'wrap'=>'',
35
-		'icon'=>'',
36
-		'enable_resource'=>'',
37
-		'resourcefile'=>'',
38
-		'createdon'=>'',
39
-		'editedon'=>'',
40
-		'guid'=>'',
41
-		'enable_sharedparams'=>'',
42
-		'properties'=>'',
43
-		'modulecode'=>'',
44
-		), $modx->getFullTableName('site_modules'), // Insert into
45
-	"CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, '1' AS disabled, category, wrap, icon, enable_resource, resourcefile, createdon, editedon, '".createGUID()."' AS guid, enable_sharedparams, properties, modulecode", $modx->getFullTableName('site_modules'), "id='{$id}'"); // Copy from
29
+    array(
30
+        'name'=>'',
31
+        'description'=>'',
32
+        'disabled'=>'',
33
+        'category'=>'',
34
+        'wrap'=>'',
35
+        'icon'=>'',
36
+        'enable_resource'=>'',
37
+        'resourcefile'=>'',
38
+        'createdon'=>'',
39
+        'editedon'=>'',
40
+        'guid'=>'',
41
+        'enable_sharedparams'=>'',
42
+        'properties'=>'',
43
+        'modulecode'=>'',
44
+        ), $modx->getFullTableName('site_modules'), // Insert into
45
+    "CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, '1' AS disabled, category, wrap, icon, enable_resource, resourcefile, createdon, editedon, '".createGUID()."' AS guid, enable_sharedparams, properties, modulecode", $modx->getFullTableName('site_modules'), "id='{$id}'"); // Copy from
46 46
 
47 47
 // duplicate module dependencies
48 48
 $modx->db->insert(
49
-	array(
50
-		'module'=>'',
51
-		'resource'=>'',
52
-		'type'=>'',
53
-		), $modx->getFullTableName('site_module_depobj'), // Insert into
54
-	"'{$newid}', resource, type", $modx->getFullTableName('site_module_depobj'), "module='{$id}'"); // Copy from
49
+    array(
50
+        'module'=>'',
51
+        'resource'=>'',
52
+        'type'=>'',
53
+        ), $modx->getFullTableName('site_module_depobj'), // Insert into
54
+    "'{$newid}', resource, type", $modx->getFullTableName('site_module_depobj'), "module='{$id}'"); // Copy from
55 55
 
56 56
 // duplicate module user group access
57 57
 $modx->db->insert(
58
-	array(
59
-		'module'=>'',
60
-		'usergroup'=>'',
61
-		), $modx->getFullTableName('site_module_access'), // Insert into
62
-	"'{$newid}', usergroup", $modx->getFullTableName('site_module_access'), "module='{$id}'"); // Copy from
58
+    array(
59
+        'module'=>'',
60
+        'usergroup'=>'',
61
+        ), $modx->getFullTableName('site_module_access'), // Insert into
62
+    "'{$newid}', usergroup", $modx->getFullTableName('site_module_access'), "module='{$id}'"); // Copy from
63 63
 
64 64
 // Set the item name for logger
65 65
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_modules'), "id='{$newid}'"));
Please login to merge, or discard this patch.