@@ -3,21 +3,21 @@ discard block |
||
3 | 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('new_module')) { |
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 | // create globally unique identifiers (guid) |
15 | 15 | function createGUID(){ |
16 | - srand((double)microtime()*1000000); |
|
17 | - $r = rand() ; |
|
18 | - $u = uniqid(getmypid() . $r . (double)microtime()*1000000,1); |
|
19 | - $m = md5 ($u); |
|
20 | - return $m; |
|
16 | + srand((double)microtime()*1000000); |
|
17 | + $r = rand() ; |
|
18 | + $u = uniqid(getmypid() . $r . (double)microtime()*1000000,1); |
|
19 | + $m = md5 ($u); |
|
20 | + return $m; |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | // count duplicates |
@@ -28,40 +28,40 @@ discard block |
||
28 | 28 | |
29 | 29 | // duplicate module |
30 | 30 | $newid = $modx->db->insert( |
31 | - array( |
|
32 | - 'name'=>'', |
|
33 | - 'description'=>'', |
|
34 | - 'disabled'=>'', |
|
35 | - 'category'=>'', |
|
36 | - 'wrap'=>'', |
|
37 | - 'icon'=>'', |
|
38 | - 'enable_resource'=>'', |
|
39 | - 'resourcefile'=>'', |
|
40 | - 'createdon'=>'', |
|
41 | - 'editedon'=>'', |
|
42 | - 'guid'=>'', |
|
43 | - 'enable_sharedparams'=>'', |
|
44 | - 'properties'=>'', |
|
45 | - 'modulecode'=>'', |
|
46 | - ), $modx->getFullTableName('site_modules'), // Insert into |
|
47 | - "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 |
|
31 | + array( |
|
32 | + 'name'=>'', |
|
33 | + 'description'=>'', |
|
34 | + 'disabled'=>'', |
|
35 | + 'category'=>'', |
|
36 | + 'wrap'=>'', |
|
37 | + 'icon'=>'', |
|
38 | + 'enable_resource'=>'', |
|
39 | + 'resourcefile'=>'', |
|
40 | + 'createdon'=>'', |
|
41 | + 'editedon'=>'', |
|
42 | + 'guid'=>'', |
|
43 | + 'enable_sharedparams'=>'', |
|
44 | + 'properties'=>'', |
|
45 | + 'modulecode'=>'', |
|
46 | + ), $modx->getFullTableName('site_modules'), // Insert into |
|
47 | + "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 |
|
48 | 48 | |
49 | 49 | // duplicate module dependencies |
50 | 50 | $modx->db->insert( |
51 | - array( |
|
52 | - 'module'=>'', |
|
53 | - 'resource'=>'', |
|
54 | - 'type'=>'', |
|
55 | - ), $modx->getFullTableName('site_module_depobj'), // Insert into |
|
56 | - "'{$newid}', resource, type", $modx->getFullTableName('site_module_depobj'), "module='{$id}'"); // Copy from |
|
51 | + array( |
|
52 | + 'module'=>'', |
|
53 | + 'resource'=>'', |
|
54 | + 'type'=>'', |
|
55 | + ), $modx->getFullTableName('site_module_depobj'), // Insert into |
|
56 | + "'{$newid}', resource, type", $modx->getFullTableName('site_module_depobj'), "module='{$id}'"); // Copy from |
|
57 | 57 | |
58 | 58 | // duplicate module user group access |
59 | 59 | $modx->db->insert( |
60 | - array( |
|
61 | - 'module'=>'', |
|
62 | - 'usergroup'=>'', |
|
63 | - ), $modx->getFullTableName('site_module_access'), // Insert into |
|
64 | - "'{$newid}', usergroup", $modx->getFullTableName('site_module_access'), "module='{$id}'"); // Copy from |
|
60 | + array( |
|
61 | + 'module'=>'', |
|
62 | + 'usergroup'=>'', |
|
63 | + ), $modx->getFullTableName('site_module_access'), // Insert into |
|
64 | + "'{$newid}', usergroup", $modx->getFullTableName('site_module_access'), "module='{$id}'"); // Copy from |
|
65 | 65 | |
66 | 66 | // Set the item name for logger |
67 | 67 | $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_modules'), "id='{$newid}'")); |
@@ -1,9 +1,9 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | if( ! defined('IN_MANAGER_MODE') || 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_web_user')) { |
6 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
6 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
7 | 7 | } |
8 | 8 | |
9 | 9 | $tbl_web_users = $modx->getFullTableName('web_users'); |
@@ -12,10 +12,10 @@ discard block |
||
12 | 12 | |
13 | 13 | $input = $_POST; |
14 | 14 | foreach($input as $k => $v) { |
15 | - if($k !== 'comment') { |
|
16 | - $v = sanitize($v); |
|
17 | - } |
|
18 | - $input[$k] = $v; |
|
15 | + if($k !== 'comment') { |
|
16 | + $v = sanitize($v); |
|
17 | + } |
|
18 | + $input[$k] = $v; |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | $id = intval($input['id']); |
@@ -51,80 +51,80 @@ discard block |
||
51 | 51 | |
52 | 52 | // verify password |
53 | 53 | if($passwordgenmethod == "spec" && $input['specifiedpassword'] != $input['confirmpassword']) { |
54 | - webAlertAndQuit("Password typed is mismatched"); |
|
54 | + webAlertAndQuit("Password typed is mismatched"); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | // verify email |
58 | 58 | if($email == '' || !preg_match("/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,24}$/i", $email)) { |
59 | - webAlertAndQuit("E-mail address doesn't seem to be valid!"); |
|
59 | + webAlertAndQuit("E-mail address doesn't seem to be valid!"); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | switch($input['mode']) { |
63 | - case '87' : // new user |
|
64 | - // check if this user name already exist |
|
65 | - $rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}'"); |
|
66 | - $limit = $modx->db->getValue($rs); |
|
67 | - if($limit > 0) { |
|
68 | - webAlertAndQuit("User name is already in use!"); |
|
69 | - } |
|
70 | - |
|
71 | - // check if the email address already exist |
|
72 | - $rs = $modx->db->select('count(id)', $tbl_web_user_attributes, "email='{$esc_email}' AND id!='{$id}'"); |
|
73 | - $limit = $modx->db->getValue($rs); |
|
74 | - if($limit > 0) { |
|
75 | - webAlertAndQuit("Email is already in use!"); |
|
76 | - } |
|
77 | - |
|
78 | - // generate a new password for this user |
|
79 | - if($specifiedpassword != "" && $passwordgenmethod == "spec") { |
|
80 | - if(strlen($specifiedpassword) < 6) { |
|
81 | - webAlertAndQuit("Password is too short!"); |
|
82 | - } else { |
|
83 | - $newpassword = $specifiedpassword; |
|
84 | - } |
|
85 | - } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") { |
|
86 | - webAlertAndQuit("You didn't specify a password for this user!"); |
|
87 | - } elseif($passwordgenmethod == 'g') { |
|
88 | - $newpassword = generate_password(8); |
|
89 | - } else { |
|
90 | - webAlertAndQuit("No password generation method specified!"); |
|
91 | - } |
|
92 | - |
|
93 | - // invoke OnBeforeWUsrFormSave event |
|
94 | - $modx->invokeEvent("OnBeforeWUsrFormSave", array( |
|
95 | - "mode" => "new", |
|
96 | - )); |
|
97 | - |
|
98 | - // create the user account |
|
99 | - $field = array(); |
|
100 | - $field['username'] = $esc_newusername; |
|
101 | - $field['password'] = md5($newpassword); |
|
102 | - $internalKey = $modx->db->insert($field, $tbl_web_users); |
|
103 | - |
|
104 | - $field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter'); |
|
105 | - $field = $modx->db->escape($field); |
|
106 | - $modx->db->insert($field, $tbl_web_user_attributes); |
|
107 | - |
|
108 | - // Save User Settings |
|
109 | - saveUserSettings($internalKey); |
|
110 | - |
|
111 | - // Set the item name for logger |
|
112 | - $_SESSION['itemname'] = $newusername; |
|
113 | - |
|
114 | - /*******************************************************************************/ |
|
115 | - // put the user in the user_groups he/ she should be in |
|
116 | - // first, check that up_perms are switched on! |
|
117 | - if($use_udperms == 1) { |
|
118 | - if(!empty($user_groups)) { |
|
119 | - for($i = 0; $i < count($user_groups); $i++) { |
|
120 | - $f = array(); |
|
121 | - $f['webgroup'] = intval($user_groups[$i]); |
|
122 | - $f['webuser'] = $internalKey; |
|
123 | - $modx->db->insert($f, $tbl_web_groups); |
|
124 | - } |
|
125 | - } |
|
126 | - } |
|
127 | - // end of user_groups stuff! |
|
63 | + case '87' : // new user |
|
64 | + // check if this user name already exist |
|
65 | + $rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}'"); |
|
66 | + $limit = $modx->db->getValue($rs); |
|
67 | + if($limit > 0) { |
|
68 | + webAlertAndQuit("User name is already in use!"); |
|
69 | + } |
|
70 | + |
|
71 | + // check if the email address already exist |
|
72 | + $rs = $modx->db->select('count(id)', $tbl_web_user_attributes, "email='{$esc_email}' AND id!='{$id}'"); |
|
73 | + $limit = $modx->db->getValue($rs); |
|
74 | + if($limit > 0) { |
|
75 | + webAlertAndQuit("Email is already in use!"); |
|
76 | + } |
|
77 | + |
|
78 | + // generate a new password for this user |
|
79 | + if($specifiedpassword != "" && $passwordgenmethod == "spec") { |
|
80 | + if(strlen($specifiedpassword) < 6) { |
|
81 | + webAlertAndQuit("Password is too short!"); |
|
82 | + } else { |
|
83 | + $newpassword = $specifiedpassword; |
|
84 | + } |
|
85 | + } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") { |
|
86 | + webAlertAndQuit("You didn't specify a password for this user!"); |
|
87 | + } elseif($passwordgenmethod == 'g') { |
|
88 | + $newpassword = generate_password(8); |
|
89 | + } else { |
|
90 | + webAlertAndQuit("No password generation method specified!"); |
|
91 | + } |
|
92 | + |
|
93 | + // invoke OnBeforeWUsrFormSave event |
|
94 | + $modx->invokeEvent("OnBeforeWUsrFormSave", array( |
|
95 | + "mode" => "new", |
|
96 | + )); |
|
97 | + |
|
98 | + // create the user account |
|
99 | + $field = array(); |
|
100 | + $field['username'] = $esc_newusername; |
|
101 | + $field['password'] = md5($newpassword); |
|
102 | + $internalKey = $modx->db->insert($field, $tbl_web_users); |
|
103 | + |
|
104 | + $field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter'); |
|
105 | + $field = $modx->db->escape($field); |
|
106 | + $modx->db->insert($field, $tbl_web_user_attributes); |
|
107 | + |
|
108 | + // Save User Settings |
|
109 | + saveUserSettings($internalKey); |
|
110 | + |
|
111 | + // Set the item name for logger |
|
112 | + $_SESSION['itemname'] = $newusername; |
|
113 | + |
|
114 | + /*******************************************************************************/ |
|
115 | + // put the user in the user_groups he/ she should be in |
|
116 | + // first, check that up_perms are switched on! |
|
117 | + if($use_udperms == 1) { |
|
118 | + if(!empty($user_groups)) { |
|
119 | + for($i = 0; $i < count($user_groups); $i++) { |
|
120 | + $f = array(); |
|
121 | + $f['webgroup'] = intval($user_groups[$i]); |
|
122 | + $f['webuser'] = $internalKey; |
|
123 | + $modx->db->insert($f, $tbl_web_groups); |
|
124 | + } |
|
125 | + } |
|
126 | + } |
|
127 | + // end of user_groups stuff! |
|
128 | 128 | |
129 | 129 | // invoke OnWebSaveUser event |
130 | 130 | $modx->invokeEvent("OnWebSaveUser", array( |
@@ -142,26 +142,26 @@ discard block |
||
142 | 142 | "id" => $internalKey |
143 | 143 | )); |
144 | 144 | |
145 | - if($passwordnotifymethod == 'e') { |
|
146 | - sendMailMessage($email, $newusername, $newpassword, $fullname); |
|
147 | - if($input['stay'] != '') { |
|
148 | - $a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87"; |
|
149 | - $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
150 | - header($header); |
|
151 | - } else { |
|
152 | - $header = "Location: index.php?a=99&r=2"; |
|
153 | - header($header); |
|
154 | - } |
|
155 | - } else { |
|
156 | - if($input['stay'] != '') { |
|
157 | - $a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87"; |
|
158 | - $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
159 | - } else { |
|
160 | - $stayUrl = "index.php?a=99&r=2"; |
|
161 | - } |
|
162 | - |
|
163 | - include_once "header.inc.php"; |
|
164 | - ?> |
|
145 | + if($passwordnotifymethod == 'e') { |
|
146 | + sendMailMessage($email, $newusername, $newpassword, $fullname); |
|
147 | + if($input['stay'] != '') { |
|
148 | + $a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87"; |
|
149 | + $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
150 | + header($header); |
|
151 | + } else { |
|
152 | + $header = "Location: index.php?a=99&r=2"; |
|
153 | + header($header); |
|
154 | + } |
|
155 | + } else { |
|
156 | + if($input['stay'] != '') { |
|
157 | + $a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87"; |
|
158 | + $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
159 | + } else { |
|
160 | + $stayUrl = "index.php?a=99&r=2"; |
|
161 | + } |
|
162 | + |
|
163 | + include_once "header.inc.php"; |
|
164 | + ?> |
|
165 | 165 | |
166 | 166 | <h1><?php echo $_lang['web_user_title']; ?></h1> |
167 | 167 | |
@@ -183,84 +183,84 @@ discard block |
||
183 | 183 | </div> |
184 | 184 | <?php |
185 | 185 | |
186 | - include_once "footer.inc.php"; |
|
187 | - } |
|
188 | - break; |
|
189 | - case '88' : // edit user |
|
190 | - // generate a new password for this user |
|
191 | - if($genpassword == 1) { |
|
192 | - if($specifiedpassword != "" && $passwordgenmethod == "spec") { |
|
193 | - if(strlen($specifiedpassword) < 6) { |
|
194 | - webAlertAndQuit("Password is too short!"); |
|
195 | - } else { |
|
196 | - $newpassword = $specifiedpassword; |
|
197 | - } |
|
198 | - } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") { |
|
199 | - webAlertAndQuit("You didn't specify a password for this user!"); |
|
200 | - } elseif($passwordgenmethod == 'g') { |
|
201 | - $newpassword = generate_password(8); |
|
202 | - } else { |
|
203 | - webAlertAndQuit("No password generation method specified!"); |
|
204 | - } |
|
205 | - } |
|
206 | - if($passwordnotifymethod == 'e') { |
|
207 | - sendMailMessage($email, $newusername, $newpassword, $fullname); |
|
208 | - } |
|
209 | - |
|
210 | - // check if the username already exist |
|
211 | - $rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}' AND id!='{$id}'"); |
|
212 | - $limit = $modx->db->getValue($rs); |
|
213 | - if($limit > 0) { |
|
214 | - webAlertAndQuit("User name is already in use!"); |
|
215 | - } |
|
216 | - |
|
217 | - // check if the email address already exists |
|
218 | - $rs = $modx->db->select('count(internalKey)', $tbl_web_user_attributes, "email='{$esc_email}' AND internalKey!='{$id}'"); |
|
219 | - $limit = $modx->db->getValue($rs); |
|
220 | - if($limit > 0) { |
|
221 | - webAlertAndQuit("Email is already in use!"); |
|
222 | - } |
|
223 | - |
|
224 | - // invoke OnBeforeWUsrFormSave event |
|
225 | - $modx->invokeEvent("OnBeforeWUsrFormSave", array( |
|
226 | - "mode" => "upd", |
|
227 | - "id" => $id |
|
228 | - )); |
|
229 | - |
|
230 | - // update user name and password |
|
231 | - $field = array(); |
|
232 | - $field['username'] = $esc_newusername; |
|
233 | - if($genpassword == 1) { |
|
234 | - $field['password'] = md5($newpassword); |
|
235 | - } |
|
236 | - $modx->db->update($field, $tbl_web_users, "id='{$id}'"); |
|
237 | - $field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter'); |
|
238 | - $field = $modx->db->escape($field); |
|
239 | - $modx->db->update($field, $tbl_web_user_attributes, "internalKey='{$id}'"); |
|
240 | - |
|
241 | - // Save User Settings |
|
242 | - saveUserSettings($id); |
|
243 | - |
|
244 | - // Set the item name for logger |
|
245 | - $_SESSION['itemname'] = $newusername; |
|
246 | - |
|
247 | - /*******************************************************************************/ |
|
248 | - // put the user in the user_groups he/ she should be in |
|
249 | - // first, check that up_perms are switched on! |
|
250 | - if($use_udperms == 1) { |
|
251 | - // as this is an existing user, delete his/ her entries in the groups before saving the new groups |
|
252 | - $modx->db->delete($tbl_web_groups, "webuser='{$id}'"); |
|
253 | - if(!empty($user_groups)) { |
|
254 | - for($i = 0; $i < count($user_groups); $i++) { |
|
255 | - $field = array(); |
|
256 | - $field['webgroup'] = intval($user_groups[$i]); |
|
257 | - $field['webuser'] = $id; |
|
258 | - $modx->db->insert($field, $tbl_web_groups); |
|
259 | - } |
|
260 | - } |
|
261 | - } |
|
262 | - // end of user_groups stuff! |
|
263 | - /*******************************************************************************/ |
|
186 | + include_once "footer.inc.php"; |
|
187 | + } |
|
188 | + break; |
|
189 | + case '88' : // edit user |
|
190 | + // generate a new password for this user |
|
191 | + if($genpassword == 1) { |
|
192 | + if($specifiedpassword != "" && $passwordgenmethod == "spec") { |
|
193 | + if(strlen($specifiedpassword) < 6) { |
|
194 | + webAlertAndQuit("Password is too short!"); |
|
195 | + } else { |
|
196 | + $newpassword = $specifiedpassword; |
|
197 | + } |
|
198 | + } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") { |
|
199 | + webAlertAndQuit("You didn't specify a password for this user!"); |
|
200 | + } elseif($passwordgenmethod == 'g') { |
|
201 | + $newpassword = generate_password(8); |
|
202 | + } else { |
|
203 | + webAlertAndQuit("No password generation method specified!"); |
|
204 | + } |
|
205 | + } |
|
206 | + if($passwordnotifymethod == 'e') { |
|
207 | + sendMailMessage($email, $newusername, $newpassword, $fullname); |
|
208 | + } |
|
209 | + |
|
210 | + // check if the username already exist |
|
211 | + $rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}' AND id!='{$id}'"); |
|
212 | + $limit = $modx->db->getValue($rs); |
|
213 | + if($limit > 0) { |
|
214 | + webAlertAndQuit("User name is already in use!"); |
|
215 | + } |
|
216 | + |
|
217 | + // check if the email address already exists |
|
218 | + $rs = $modx->db->select('count(internalKey)', $tbl_web_user_attributes, "email='{$esc_email}' AND internalKey!='{$id}'"); |
|
219 | + $limit = $modx->db->getValue($rs); |
|
220 | + if($limit > 0) { |
|
221 | + webAlertAndQuit("Email is already in use!"); |
|
222 | + } |
|
223 | + |
|
224 | + // invoke OnBeforeWUsrFormSave event |
|
225 | + $modx->invokeEvent("OnBeforeWUsrFormSave", array( |
|
226 | + "mode" => "upd", |
|
227 | + "id" => $id |
|
228 | + )); |
|
229 | + |
|
230 | + // update user name and password |
|
231 | + $field = array(); |
|
232 | + $field['username'] = $esc_newusername; |
|
233 | + if($genpassword == 1) { |
|
234 | + $field['password'] = md5($newpassword); |
|
235 | + } |
|
236 | + $modx->db->update($field, $tbl_web_users, "id='{$id}'"); |
|
237 | + $field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter'); |
|
238 | + $field = $modx->db->escape($field); |
|
239 | + $modx->db->update($field, $tbl_web_user_attributes, "internalKey='{$id}'"); |
|
240 | + |
|
241 | + // Save User Settings |
|
242 | + saveUserSettings($id); |
|
243 | + |
|
244 | + // Set the item name for logger |
|
245 | + $_SESSION['itemname'] = $newusername; |
|
246 | + |
|
247 | + /*******************************************************************************/ |
|
248 | + // put the user in the user_groups he/ she should be in |
|
249 | + // first, check that up_perms are switched on! |
|
250 | + if($use_udperms == 1) { |
|
251 | + // as this is an existing user, delete his/ her entries in the groups before saving the new groups |
|
252 | + $modx->db->delete($tbl_web_groups, "webuser='{$id}'"); |
|
253 | + if(!empty($user_groups)) { |
|
254 | + for($i = 0; $i < count($user_groups); $i++) { |
|
255 | + $field = array(); |
|
256 | + $field['webgroup'] = intval($user_groups[$i]); |
|
257 | + $field['webuser'] = $id; |
|
258 | + $modx->db->insert($field, $tbl_web_groups); |
|
259 | + } |
|
260 | + } |
|
261 | + } |
|
262 | + // end of user_groups stuff! |
|
263 | + /*******************************************************************************/ |
|
264 | 264 | |
265 | 265 | // invoke OnWebSaveUser event |
266 | 266 | $modx->invokeEvent("OnWebSaveUser", array( |
@@ -289,16 +289,16 @@ discard block |
||
289 | 289 | "id" => $id |
290 | 290 | )); |
291 | 291 | |
292 | - if($genpassword == 1 && $passwordnotifymethod == 's') { |
|
293 | - if($input['stay'] != '') { |
|
294 | - $a = ($input['stay'] == '2') ? "88&id={$id}" : "87"; |
|
295 | - $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
296 | - } else { |
|
297 | - $stayUrl = "index.php?a=99&r=2"; |
|
298 | - } |
|
292 | + if($genpassword == 1 && $passwordnotifymethod == 's') { |
|
293 | + if($input['stay'] != '') { |
|
294 | + $a = ($input['stay'] == '2') ? "88&id={$id}" : "87"; |
|
295 | + $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
296 | + } else { |
|
297 | + $stayUrl = "index.php?a=99&r=2"; |
|
298 | + } |
|
299 | 299 | |
300 | - include_once "header.inc.php"; |
|
301 | - ?> |
|
300 | + include_once "header.inc.php"; |
|
301 | + ?> |
|
302 | 302 | |
303 | 303 | <h1><?php echo $_lang['web_user_title']; ?></h1> |
304 | 304 | |
@@ -318,124 +318,124 @@ discard block |
||
318 | 318 | </div> |
319 | 319 | <?php |
320 | 320 | |
321 | - include_once "footer.inc.php"; |
|
322 | - } else { |
|
323 | - if($input['stay'] != '') { |
|
324 | - $a = ($input['stay'] == '2') ? "88&id={$id}" : "87"; |
|
325 | - $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
326 | - header($header); |
|
327 | - } else { |
|
328 | - $header = "Location: index.php?a=99&r=2"; |
|
329 | - header($header); |
|
330 | - } |
|
331 | - } |
|
332 | - break; |
|
333 | - default : |
|
334 | - webAlertAndQuit("No operation set in request."); |
|
321 | + include_once "footer.inc.php"; |
|
322 | + } else { |
|
323 | + if($input['stay'] != '') { |
|
324 | + $a = ($input['stay'] == '2') ? "88&id={$id}" : "87"; |
|
325 | + $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
326 | + header($header); |
|
327 | + } else { |
|
328 | + $header = "Location: index.php?a=99&r=2"; |
|
329 | + header($header); |
|
330 | + } |
|
331 | + } |
|
332 | + break; |
|
333 | + default : |
|
334 | + webAlertAndQuit("No operation set in request."); |
|
335 | 335 | } |
336 | 336 | |
337 | 337 | // in case any plugins include a quoted_printable function |
338 | 338 | function save_user_quoted_printable($string) { |
339 | - $crlf = "\n"; |
|
340 | - $string = preg_replace('!(\r\n|\r|\n)!', $crlf, $string) . $crlf; |
|
341 | - $f[] = '/([\000-\010\013\014\016-\037\075\177-\377])/e'; |
|
342 | - $r[] = "'=' . sprintf('%02X', ord('\\1'))"; |
|
343 | - $f[] = '/([\011\040])' . $crlf . '/e'; |
|
344 | - $r[] = "'=' . sprintf('%02X', ord('\\1')) . '" . $crlf . "'"; |
|
345 | - $string = preg_replace($f, $r, $string); |
|
346 | - return trim(wordwrap($string, 70, ' =' . $crlf)); |
|
339 | + $crlf = "\n"; |
|
340 | + $string = preg_replace('!(\r\n|\r|\n)!', $crlf, $string) . $crlf; |
|
341 | + $f[] = '/([\000-\010\013\014\016-\037\075\177-\377])/e'; |
|
342 | + $r[] = "'=' . sprintf('%02X', ord('\\1'))"; |
|
343 | + $f[] = '/([\011\040])' . $crlf . '/e'; |
|
344 | + $r[] = "'=' . sprintf('%02X', ord('\\1')) . '" . $crlf . "'"; |
|
345 | + $string = preg_replace($f, $r, $string); |
|
346 | + return trim(wordwrap($string, 70, ' =' . $crlf)); |
|
347 | 347 | } |
348 | 348 | |
349 | 349 | // Send an email to the user |
350 | 350 | function sendMailMessage($email, $uid, $pwd, $ufn) { |
351 | - global $modx, $_lang, $websignupemail_message; |
|
352 | - global $emailsubject, $emailsender; |
|
353 | - global $site_name, $site_url; |
|
354 | - $message = sprintf($websignupemail_message, $uid, $pwd); // use old method |
|
355 | - // replace placeholders |
|
356 | - $message = str_replace("[+uid+]", $uid, $message); |
|
357 | - $message = str_replace("[+pwd+]", $pwd, $message); |
|
358 | - $message = str_replace("[+ufn+]", $ufn, $message); |
|
359 | - $message = str_replace("[+sname+]", $site_name, $message); |
|
360 | - $message = str_replace("[+saddr+]", $emailsender, $message); |
|
361 | - $message = str_replace("[+semail+]", $emailsender, $message); |
|
362 | - $message = str_replace("[+surl+]", $site_url, $message); |
|
363 | - |
|
364 | - $param = array(); |
|
365 | - $param['from'] = "{$site_name}<{$emailsender}>"; |
|
366 | - $param['subject'] = $emailsubject; |
|
367 | - $param['body'] = $message; |
|
368 | - $param['to'] = $email; |
|
369 | - $param['type'] = 'text'; |
|
370 | - $rs = $modx->sendmail($param); |
|
371 | - if(!$rs) { |
|
372 | - $modx->manager->saveFormValues(); |
|
373 | - $modx->messageQuit("{$email} - {$_lang['error_sending_email']}"); |
|
374 | - } |
|
351 | + global $modx, $_lang, $websignupemail_message; |
|
352 | + global $emailsubject, $emailsender; |
|
353 | + global $site_name, $site_url; |
|
354 | + $message = sprintf($websignupemail_message, $uid, $pwd); // use old method |
|
355 | + // replace placeholders |
|
356 | + $message = str_replace("[+uid+]", $uid, $message); |
|
357 | + $message = str_replace("[+pwd+]", $pwd, $message); |
|
358 | + $message = str_replace("[+ufn+]", $ufn, $message); |
|
359 | + $message = str_replace("[+sname+]", $site_name, $message); |
|
360 | + $message = str_replace("[+saddr+]", $emailsender, $message); |
|
361 | + $message = str_replace("[+semail+]", $emailsender, $message); |
|
362 | + $message = str_replace("[+surl+]", $site_url, $message); |
|
363 | + |
|
364 | + $param = array(); |
|
365 | + $param['from'] = "{$site_name}<{$emailsender}>"; |
|
366 | + $param['subject'] = $emailsubject; |
|
367 | + $param['body'] = $message; |
|
368 | + $param['to'] = $email; |
|
369 | + $param['type'] = 'text'; |
|
370 | + $rs = $modx->sendmail($param); |
|
371 | + if(!$rs) { |
|
372 | + $modx->manager->saveFormValues(); |
|
373 | + $modx->messageQuit("{$email} - {$_lang['error_sending_email']}"); |
|
374 | + } |
|
375 | 375 | } |
376 | 376 | |
377 | 377 | // Save User Settings |
378 | 378 | function saveUserSettings($id) { |
379 | - global $modx; |
|
380 | - $tbl_web_user_settings = $modx->getFullTableName('web_user_settings'); |
|
381 | - |
|
382 | - $settings = array( |
|
383 | - "login_home", |
|
384 | - "allowed_ip", |
|
385 | - "allowed_days" |
|
386 | - ); |
|
387 | - |
|
388 | - $modx->db->delete($tbl_web_user_settings, "webuser='{$id}'"); |
|
389 | - |
|
390 | - foreach($settings as $n) { |
|
391 | - $vl = $_POST[$n]; |
|
392 | - if(is_array($vl)) { |
|
393 | - $vl = implode(",", $vl); |
|
394 | - } |
|
395 | - if($vl != '') { |
|
396 | - $f = array(); |
|
397 | - $f['webuser'] = $id; |
|
398 | - $f['setting_name'] = $n; |
|
399 | - $f['setting_value'] = $vl; |
|
400 | - $f = $modx->db->escape($f); |
|
401 | - $modx->db->insert($f, $tbl_web_user_settings); |
|
402 | - } |
|
403 | - } |
|
379 | + global $modx; |
|
380 | + $tbl_web_user_settings = $modx->getFullTableName('web_user_settings'); |
|
381 | + |
|
382 | + $settings = array( |
|
383 | + "login_home", |
|
384 | + "allowed_ip", |
|
385 | + "allowed_days" |
|
386 | + ); |
|
387 | + |
|
388 | + $modx->db->delete($tbl_web_user_settings, "webuser='{$id}'"); |
|
389 | + |
|
390 | + foreach($settings as $n) { |
|
391 | + $vl = $_POST[$n]; |
|
392 | + if(is_array($vl)) { |
|
393 | + $vl = implode(",", $vl); |
|
394 | + } |
|
395 | + if($vl != '') { |
|
396 | + $f = array(); |
|
397 | + $f['webuser'] = $id; |
|
398 | + $f['setting_name'] = $n; |
|
399 | + $f['setting_value'] = $vl; |
|
400 | + $f = $modx->db->escape($f); |
|
401 | + $modx->db->insert($f, $tbl_web_user_settings); |
|
402 | + } |
|
403 | + } |
|
404 | 404 | } |
405 | 405 | |
406 | 406 | // Web alert - sends an alert to web browser |
407 | 407 | function webAlertAndQuit($msg) { |
408 | - global $id, $modx; |
|
409 | - $mode = $_POST['mode']; |
|
410 | - $modx->manager->saveFormValues($mode); |
|
411 | - $modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode == '88' ? "&id={$id}" : '')); |
|
408 | + global $id, $modx; |
|
409 | + $mode = $_POST['mode']; |
|
410 | + $modx->manager->saveFormValues($mode); |
|
411 | + $modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode == '88' ? "&id={$id}" : '')); |
|
412 | 412 | } |
413 | 413 | |
414 | 414 | // Generate password |
415 | 415 | function generate_password($length = 10) { |
416 | - $allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789"; |
|
417 | - $ps_len = strlen($allowable_characters); |
|
418 | - mt_srand((double) microtime() * 1000000); |
|
419 | - $pass = ""; |
|
420 | - for($i = 0; $i < $length; $i++) { |
|
421 | - $pass .= $allowable_characters[mt_rand(0, $ps_len - 1)]; |
|
422 | - } |
|
423 | - return $pass; |
|
416 | + $allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789"; |
|
417 | + $ps_len = strlen($allowable_characters); |
|
418 | + mt_srand((double) microtime() * 1000000); |
|
419 | + $pass = ""; |
|
420 | + for($i = 0; $i < $length; $i++) { |
|
421 | + $pass .= $allowable_characters[mt_rand(0, $ps_len - 1)]; |
|
422 | + } |
|
423 | + return $pass; |
|
424 | 424 | } |
425 | 425 | |
426 | 426 | function sanitize($str = '', $safecount = 0) { |
427 | - global $modx; |
|
428 | - $safecount++; |
|
429 | - if(1000 < $safecount) { |
|
430 | - exit("error too many loops '{$safecount}'"); |
|
431 | - } |
|
432 | - if(is_array($str)) { |
|
433 | - foreach($str as $i => $v) { |
|
434 | - $str[$i] = sanitize($v, $safecount); |
|
435 | - } |
|
436 | - } else { |
|
437 | - // $str = strip_tags($str); // LEAVE < and > intact |
|
438 | - $str = htmlspecialchars($str, ENT_NOQUOTES, $modx->config['modx_charset']); |
|
439 | - } |
|
440 | - return $str; |
|
427 | + global $modx; |
|
428 | + $safecount++; |
|
429 | + if(1000 < $safecount) { |
|
430 | + exit("error too many loops '{$safecount}'"); |
|
431 | + } |
|
432 | + if(is_array($str)) { |
|
433 | + foreach($str as $i => $v) { |
|
434 | + $str[$i] = sanitize($v, $safecount); |
|
435 | + } |
|
436 | + } else { |
|
437 | + // $str = strip_tags($str); // LEAVE < and > intact |
|
438 | + $str = htmlspecialchars($str, ENT_NOQUOTES, $modx->config['modx_charset']); |
|
439 | + } |
|
440 | + return $str; |
|
441 | 441 | } |
@@ -3,7 +3,7 @@ |
||
3 | 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('settings')) { |
6 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
6 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
7 | 7 | } |
8 | 8 | |
9 | 9 | $modx->db->truncate($modx->getFullTableName('manager_log')); |
@@ -3,33 +3,33 @@ |
||
3 | 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('settings') && ($modx->hasPermission('logs')||$modx->hasPermission('bk_manager')))) { |
6 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
6 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
7 | 7 | } |
8 | 8 | |
9 | 9 | if (isset($_REQUEST['t'])) { |
10 | 10 | |
11 | - if (empty($_REQUEST['t'])) { |
|
12 | - $modx->webAlertAndQuit($_lang["error_no_optimise_tablename"]); |
|
13 | - } |
|
11 | + if (empty($_REQUEST['t'])) { |
|
12 | + $modx->webAlertAndQuit($_lang["error_no_optimise_tablename"]); |
|
13 | + } |
|
14 | 14 | |
15 | - // Set the item name for logger |
|
16 | - $_SESSION['itemname'] = $_REQUEST['t']; |
|
15 | + // Set the item name for logger |
|
16 | + $_SESSION['itemname'] = $_REQUEST['t']; |
|
17 | 17 | |
18 | - $modx->db->optimize($_REQUEST['t']); |
|
18 | + $modx->db->optimize($_REQUEST['t']); |
|
19 | 19 | |
20 | 20 | } elseif (isset($_REQUEST['u'])) { |
21 | 21 | |
22 | - if (empty($_REQUEST['u'])) { |
|
23 | - $modx->webAlertAndQuit($_lang["error_no_truncate_tablename"]); |
|
24 | - } |
|
22 | + if (empty($_REQUEST['u'])) { |
|
23 | + $modx->webAlertAndQuit($_lang["error_no_truncate_tablename"]); |
|
24 | + } |
|
25 | 25 | |
26 | - // Set the item name for logger |
|
27 | - $_SESSION['itemname'] = $_REQUEST['u']; |
|
26 | + // Set the item name for logger |
|
27 | + $_SESSION['itemname'] = $_REQUEST['u']; |
|
28 | 28 | |
29 | - $modx->db->truncate($_REQUEST['u']); |
|
29 | + $modx->db->truncate($_REQUEST['u']); |
|
30 | 30 | |
31 | 31 | } else { |
32 | - $modx->webAlertAndQuit($_lang["error_no_optimise_tablename"]); |
|
32 | + $modx->webAlertAndQuit($_lang["error_no_optimise_tablename"]); |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | $mode = intval($_REQUEST['mode']); |
@@ -3,12 +3,12 @@ discard block |
||
3 | 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_snippet')) { |
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 | // Set the item name for logger |
@@ -17,18 +17,18 @@ discard block |
||
17 | 17 | |
18 | 18 | // invoke OnBeforeChunkFormDelete event |
19 | 19 | $modx->invokeEvent("OnBeforeChunkFormDelete", |
20 | - array( |
|
21 | - "id" => $id |
|
22 | - )); |
|
20 | + array( |
|
21 | + "id" => $id |
|
22 | + )); |
|
23 | 23 | |
24 | 24 | // delete the chunk. |
25 | 25 | $modx->db->delete($modx->getFullTableName('site_htmlsnippets'), "id='{$id}'"); |
26 | 26 | |
27 | 27 | // invoke OnChunkFormDelete event |
28 | 28 | $modx->invokeEvent("OnChunkFormDelete", |
29 | - array( |
|
30 | - "id" => $id |
|
31 | - )); |
|
29 | + array( |
|
30 | + "id" => $id |
|
31 | + )); |
|
32 | 32 | |
33 | 33 | // empty cache |
34 | 34 | $modx->clearCache('full'); |
@@ -1,26 +1,26 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | if( ! defined('IN_MANAGER_MODE') || 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 |
||
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 |
||
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 |
||
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 |
@@ -3,51 +3,51 @@ discard block |
||
3 | 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('exec_module')) { |
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 | // check if user has access permission, except admins |
15 | 15 | if($_SESSION['mgrRole']!=1){ |
16 | - $rs = $modx->db->select( |
|
17 | - 'sma.usergroup,mg.member', |
|
18 | - $modx->getFullTableName("site_module_access")." sma |
|
16 | + $rs = $modx->db->select( |
|
17 | + 'sma.usergroup,mg.member', |
|
18 | + $modx->getFullTableName("site_module_access")." sma |
|
19 | 19 | LEFT JOIN ".$modx->getFullTableName("member_groups")." mg ON mg.user_group = sma.usergroup AND member='".$modx->getLoginUserID()."'", |
20 | - "sma.module = '{$id}'" |
|
21 | - ); |
|
22 | - //initialize permission to -1, if it stays -1 no permissions |
|
23 | - //attached so permission granted |
|
24 | - $permissionAccessInt = -1; |
|
20 | + "sma.module = '{$id}'" |
|
21 | + ); |
|
22 | + //initialize permission to -1, if it stays -1 no permissions |
|
23 | + //attached so permission granted |
|
24 | + $permissionAccessInt = -1; |
|
25 | 25 | |
26 | - while ($row = $modx->db->getRow($rs)) { |
|
27 | - if($row["usergroup"] && $row["member"]) { |
|
28 | - //if there are permissions and this member has permission, ofcourse |
|
29 | - //this is granted |
|
30 | - $permissionAccessInt = 1; |
|
31 | - } elseif ($permissionAccessInt==-1) { |
|
32 | - //if there are permissions but this member has no permission and the |
|
33 | - //variable was still in init state we set permission to 0; no permissions |
|
34 | - $permissionAccessInt = 0; |
|
35 | - } |
|
36 | - } |
|
26 | + while ($row = $modx->db->getRow($rs)) { |
|
27 | + if($row["usergroup"] && $row["member"]) { |
|
28 | + //if there are permissions and this member has permission, ofcourse |
|
29 | + //this is granted |
|
30 | + $permissionAccessInt = 1; |
|
31 | + } elseif ($permissionAccessInt==-1) { |
|
32 | + //if there are permissions but this member has no permission and the |
|
33 | + //variable was still in init state we set permission to 0; no permissions |
|
34 | + $permissionAccessInt = 0; |
|
35 | + } |
|
36 | + } |
|
37 | 37 | |
38 | - if($permissionAccessInt==0) { |
|
39 | - $modx->webAlertAndQuit("You do not sufficient privileges to execute this module.", "index.php?a=106"); |
|
40 | - } |
|
38 | + if($permissionAccessInt==0) { |
|
39 | + $modx->webAlertAndQuit("You do not sufficient privileges to execute this module.", "index.php?a=106"); |
|
40 | + } |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | // get module data |
44 | 44 | $rs = $modx->db->select('*', $modx->getFullTableName("site_modules"), "id='{$id}'"); |
45 | 45 | $content = $modx->db->getRow($rs); |
46 | 46 | if(!$content) { |
47 | - $modx->webAlertAndQuit("No record found for id {$id}.", "index.php?a=106"); |
|
47 | + $modx->webAlertAndQuit("No record found for id {$id}.", "index.php?a=106"); |
|
48 | 48 | } |
49 | 49 | if($content['disabled']) { |
50 | - $modx->webAlertAndQuit("This module is disabled and cannot be executed.", "index.php?a=106"); |
|
50 | + $modx->webAlertAndQuit("This module is disabled and cannot be executed.", "index.php?a=106"); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | // Set the item name for logger |
@@ -65,38 +65,38 @@ discard block |
||
65 | 65 | |
66 | 66 | // evalModule |
67 | 67 | function evalModule($moduleCode,$params){ |
68 | - global $modx; |
|
69 | - $modx->event->params = &$params; // store params inside event object |
|
70 | - if(is_array($params)) { |
|
71 | - extract($params, EXTR_SKIP); |
|
72 | - } |
|
73 | - ob_start(); |
|
74 | - $mod = eval($moduleCode); |
|
75 | - $msg = ob_get_contents(); |
|
76 | - ob_end_clean(); |
|
77 | - if (isset($php_errormsg)) |
|
78 | - { |
|
79 | - $error_info = error_get_last(); |
|
68 | + global $modx; |
|
69 | + $modx->event->params = &$params; // store params inside event object |
|
70 | + if(is_array($params)) { |
|
71 | + extract($params, EXTR_SKIP); |
|
72 | + } |
|
73 | + ob_start(); |
|
74 | + $mod = eval($moduleCode); |
|
75 | + $msg = ob_get_contents(); |
|
76 | + ob_end_clean(); |
|
77 | + if (isset($php_errormsg)) |
|
78 | + { |
|
79 | + $error_info = error_get_last(); |
|
80 | 80 | switch($error_info['type']) |
81 | 81 | { |
82 | - case E_NOTICE : |
|
83 | - $error_level = 1; |
|
84 | - case E_USER_NOTICE : |
|
85 | - break; |
|
86 | - case E_DEPRECATED : |
|
87 | - case E_USER_DEPRECATED : |
|
88 | - case E_STRICT : |
|
89 | - $error_level = 2; |
|
90 | - break; |
|
91 | - default: |
|
92 | - $error_level = 99; |
|
82 | + case E_NOTICE : |
|
83 | + $error_level = 1; |
|
84 | + case E_USER_NOTICE : |
|
85 | + break; |
|
86 | + case E_DEPRECATED : |
|
87 | + case E_USER_DEPRECATED : |
|
88 | + case E_STRICT : |
|
89 | + $error_level = 2; |
|
90 | + break; |
|
91 | + default: |
|
92 | + $error_level = 99; |
|
93 | + } |
|
94 | + if($modx->config['error_reporting']==='99' || 2<$error_level) |
|
95 | + { |
|
96 | + $modx->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], $_SESSION['itemname'] . ' - Module', $error_info['message'], $error_info['line'], $msg); |
|
97 | + $modx->event->alert("An error occurred while loading. Please see the event log for more information<p>{$msg}</p>"); |
|
93 | 98 | } |
94 | - if($modx->config['error_reporting']==='99' || 2<$error_level) |
|
95 | - { |
|
96 | - $modx->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], $_SESSION['itemname'] . ' - Module', $error_info['message'], $error_info['line'], $msg); |
|
97 | - $modx->event->alert("An error occurred while loading. Please see the event log for more information<p>{$msg}</p>"); |
|
98 | - } |
|
99 | - } |
|
100 | - unset($modx->event->params); |
|
101 | - return $mod.$msg; |
|
99 | + } |
|
100 | + unset($modx->event->params); |
|
101 | + return $mod.$msg; |
|
102 | 102 | } |
@@ -3,7 +3,7 @@ discard block |
||
3 | 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('messages')) { |
6 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
6 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
7 | 7 | } |
8 | 8 | |
9 | 9 | $sendto = $_REQUEST['sendto']; |
@@ -16,55 +16,55 @@ discard block |
||
16 | 16 | $postdate = time(); |
17 | 17 | |
18 | 18 | if($sendto=='u') { |
19 | - if($userid==0) { |
|
20 | - $modx->webAlertAndQuit($_lang["error_no_user_selected"]); |
|
21 | - } |
|
22 | - $modx->db->insert( |
|
23 | - array( |
|
24 | - 'recipient' => $userid, |
|
25 | - 'sender' => $modx->getLoginUserID(), |
|
26 | - 'subject' => $subject, |
|
27 | - 'message' => $message, |
|
28 | - 'postdate' => $postdate, |
|
29 | - 'type' => 'Message', |
|
30 | - 'private' => 1, |
|
31 | - ), $modx->getFullTableName('user_messages')); |
|
19 | + if($userid==0) { |
|
20 | + $modx->webAlertAndQuit($_lang["error_no_user_selected"]); |
|
21 | + } |
|
22 | + $modx->db->insert( |
|
23 | + array( |
|
24 | + 'recipient' => $userid, |
|
25 | + 'sender' => $modx->getLoginUserID(), |
|
26 | + 'subject' => $subject, |
|
27 | + 'message' => $message, |
|
28 | + 'postdate' => $postdate, |
|
29 | + 'type' => 'Message', |
|
30 | + 'private' => 1, |
|
31 | + ), $modx->getFullTableName('user_messages')); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | if($sendto=='g') { |
35 | - if($groupid==0) { |
|
36 | - $modx->webAlertAndQuit($_lang["error_no_group_selected"]); |
|
37 | - } |
|
38 | - $rs = $modx->db->select('internalKey', $modx->getFullTableName('user_attributes'), "role='{$groupid}' AND internalKey!='".$modx->getLoginUserID()."'"); |
|
39 | - while ($row=$modx->db->getRow($rs)) { |
|
40 | - $modx->db->insert( |
|
41 | - array( |
|
42 | - 'recipient' => $row['internalKey'], |
|
43 | - 'sender' => $modx->getLoginUserID(), |
|
44 | - 'subject' => $subject, |
|
45 | - 'message' => $message, |
|
46 | - 'postdate' => $postdate, |
|
47 | - 'type' => 'Message', |
|
48 | - 'private' => 0, |
|
49 | - ), $modx->getFullTableName('user_messages')); |
|
50 | - } |
|
35 | + if($groupid==0) { |
|
36 | + $modx->webAlertAndQuit($_lang["error_no_group_selected"]); |
|
37 | + } |
|
38 | + $rs = $modx->db->select('internalKey', $modx->getFullTableName('user_attributes'), "role='{$groupid}' AND internalKey!='".$modx->getLoginUserID()."'"); |
|
39 | + while ($row=$modx->db->getRow($rs)) { |
|
40 | + $modx->db->insert( |
|
41 | + array( |
|
42 | + 'recipient' => $row['internalKey'], |
|
43 | + 'sender' => $modx->getLoginUserID(), |
|
44 | + 'subject' => $subject, |
|
45 | + 'message' => $message, |
|
46 | + 'postdate' => $postdate, |
|
47 | + 'type' => 'Message', |
|
48 | + 'private' => 0, |
|
49 | + ), $modx->getFullTableName('user_messages')); |
|
50 | + } |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | |
54 | 54 | if($sendto=='a') { |
55 | - $rs = $modx->db->select('id', $modx->getFullTableName('manager_users'), "id!='".$modx->getLoginUserID()."'"); |
|
56 | - while ($row=$modx->db->getRow($rs)) { |
|
57 | - $modx->db->insert( |
|
58 | - array( |
|
59 | - 'recipient' => $row['id'], |
|
60 | - 'sender' => $modx->getLoginUserID(), |
|
61 | - 'subject' => $subject, |
|
62 | - 'message' => $message, |
|
63 | - 'postdate' => $postdate, |
|
64 | - 'type' => 'Message', |
|
65 | - 'private' => 0, |
|
66 | - ), $modx->getFullTableName('user_messages')); |
|
67 | - } |
|
55 | + $rs = $modx->db->select('id', $modx->getFullTableName('manager_users'), "id!='".$modx->getLoginUserID()."'"); |
|
56 | + while ($row=$modx->db->getRow($rs)) { |
|
57 | + $modx->db->insert( |
|
58 | + array( |
|
59 | + 'recipient' => $row['id'], |
|
60 | + 'sender' => $modx->getLoginUserID(), |
|
61 | + 'subject' => $subject, |
|
62 | + 'message' => $message, |
|
63 | + 'postdate' => $postdate, |
|
64 | + 'type' => 'Message', |
|
65 | + 'private' => 0, |
|
66 | + ), $modx->getFullTableName('user_messages')); |
|
67 | + } |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | $header = "Location: index.php?a=10"; |
@@ -3,7 +3,7 @@ discard block |
||
3 | 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('access_permissions')) { |
6 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
6 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
7 | 7 | } |
8 | 8 | |
9 | 9 | // access group processor. |
@@ -20,113 +20,113 @@ discard block |
||
20 | 20 | $operation = $_REQUEST['operation']; |
21 | 21 | |
22 | 22 | switch ($operation) { |
23 | - case "add_user_group" : |
|
24 | - $newgroup = $_REQUEST['newusergroup']; |
|
25 | - if(empty($newgroup)) { |
|
26 | - $modx->webAlertAndQuit("No group name specified."); |
|
27 | - } else { |
|
28 | - $id = $modx->db->insert(array('name' => $modx->db->escape($newgroup)), $tbl_membergroup_names); |
|
23 | + case "add_user_group" : |
|
24 | + $newgroup = $_REQUEST['newusergroup']; |
|
25 | + if(empty($newgroup)) { |
|
26 | + $modx->webAlertAndQuit("No group name specified."); |
|
27 | + } else { |
|
28 | + $id = $modx->db->insert(array('name' => $modx->db->escape($newgroup)), $tbl_membergroup_names); |
|
29 | 29 | |
30 | - // invoke OnManagerCreateGroup event |
|
31 | - $modx->invokeEvent('OnManagerCreateGroup', array( |
|
32 | - 'groupid' => $id, |
|
33 | - 'groupname' => $newgroup, |
|
34 | - )); |
|
35 | - } |
|
36 | - break; |
|
37 | - case "add_document_group" : |
|
38 | - $newgroup = $_REQUEST['newdocgroup']; |
|
39 | - if(empty($newgroup)) { |
|
40 | - $modx->webAlertAndQuit("No group name specified."); |
|
41 | - } else { |
|
42 | - $id = $modx->db->insert(array('name' => $modx->db->escape($newgroup)), $tbl_documentgroup_names); |
|
30 | + // invoke OnManagerCreateGroup event |
|
31 | + $modx->invokeEvent('OnManagerCreateGroup', array( |
|
32 | + 'groupid' => $id, |
|
33 | + 'groupname' => $newgroup, |
|
34 | + )); |
|
35 | + } |
|
36 | + break; |
|
37 | + case "add_document_group" : |
|
38 | + $newgroup = $_REQUEST['newdocgroup']; |
|
39 | + if(empty($newgroup)) { |
|
40 | + $modx->webAlertAndQuit("No group name specified."); |
|
41 | + } else { |
|
42 | + $id = $modx->db->insert(array('name' => $modx->db->escape($newgroup)), $tbl_documentgroup_names); |
|
43 | 43 | |
44 | - // invoke OnCreateDocGroup event |
|
45 | - $modx->invokeEvent('OnCreateDocGroup', array( |
|
46 | - 'groupid' => $id, |
|
47 | - 'groupname' => $newgroup, |
|
48 | - )); |
|
49 | - } |
|
50 | - break; |
|
51 | - case "delete_user_group" : |
|
52 | - $updategroupaccess = true; |
|
53 | - $usergroup = intval($_REQUEST['usergroup']); |
|
54 | - if(empty($usergroup)) { |
|
55 | - $modx->webAlertAndQuit("No user group id specified for deletion."); |
|
56 | - } else { |
|
57 | - $modx->db->delete($tbl_membergroup_names, "id='{$usergroup}'"); |
|
44 | + // invoke OnCreateDocGroup event |
|
45 | + $modx->invokeEvent('OnCreateDocGroup', array( |
|
46 | + 'groupid' => $id, |
|
47 | + 'groupname' => $newgroup, |
|
48 | + )); |
|
49 | + } |
|
50 | + break; |
|
51 | + case "delete_user_group" : |
|
52 | + $updategroupaccess = true; |
|
53 | + $usergroup = intval($_REQUEST['usergroup']); |
|
54 | + if(empty($usergroup)) { |
|
55 | + $modx->webAlertAndQuit("No user group id specified for deletion."); |
|
56 | + } else { |
|
57 | + $modx->db->delete($tbl_membergroup_names, "id='{$usergroup}'"); |
|
58 | 58 | |
59 | - $modx->db->delete($tbl_membergroup_access, "membergroup='{$usergroup}'"); |
|
59 | + $modx->db->delete($tbl_membergroup_access, "membergroup='{$usergroup}'"); |
|
60 | 60 | |
61 | - $modx->db->delete($tbl_member_groups, "user_group='{$usergroup}'"); |
|
62 | - } |
|
63 | - break; |
|
64 | - case "delete_document_group" : |
|
65 | - $group = intval($_REQUEST['documentgroup']); |
|
66 | - if(empty($group)) { |
|
67 | - $modx->webAlertAndQuit("No document group id specified for deletion."); |
|
68 | - } else { |
|
69 | - $modx->db->delete($tbl_documentgroup_names, "id='{$group}'"); |
|
61 | + $modx->db->delete($tbl_member_groups, "user_group='{$usergroup}'"); |
|
62 | + } |
|
63 | + break; |
|
64 | + case "delete_document_group" : |
|
65 | + $group = intval($_REQUEST['documentgroup']); |
|
66 | + if(empty($group)) { |
|
67 | + $modx->webAlertAndQuit("No document group id specified for deletion."); |
|
68 | + } else { |
|
69 | + $modx->db->delete($tbl_documentgroup_names, "id='{$group}'"); |
|
70 | 70 | |
71 | - $modx->db->delete($tbl_membergroup_access, "documentgroup='{$group}'"); |
|
71 | + $modx->db->delete($tbl_membergroup_access, "documentgroup='{$group}'"); |
|
72 | 72 | |
73 | - $modx->db->delete($tbl_document_groups, "document_group='{$group}'"); |
|
74 | - } |
|
75 | - break; |
|
76 | - case "rename_user_group" : |
|
77 | - $newgroupname = $_REQUEST['newgroupname']; |
|
78 | - if(empty($newgroupname)) { |
|
79 | - $modx->webAlertAndQuit("No group name specified."); |
|
80 | - } |
|
81 | - $groupid = intval($_REQUEST['groupid']); |
|
82 | - if(empty($groupid)) { |
|
83 | - $modx->webAlertAndQuit("No group id specified for rename."); |
|
84 | - } |
|
73 | + $modx->db->delete($tbl_document_groups, "document_group='{$group}'"); |
|
74 | + } |
|
75 | + break; |
|
76 | + case "rename_user_group" : |
|
77 | + $newgroupname = $_REQUEST['newgroupname']; |
|
78 | + if(empty($newgroupname)) { |
|
79 | + $modx->webAlertAndQuit("No group name specified."); |
|
80 | + } |
|
81 | + $groupid = intval($_REQUEST['groupid']); |
|
82 | + if(empty($groupid)) { |
|
83 | + $modx->webAlertAndQuit("No group id specified for rename."); |
|
84 | + } |
|
85 | 85 | |
86 | - $modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_membergroup_names, "id='{$groupid}'"); |
|
87 | - break; |
|
88 | - case "rename_document_group" : |
|
89 | - $newgroupname = $_REQUEST['newgroupname']; |
|
90 | - if(empty($newgroupname)) { |
|
91 | - $modx->webAlertAndQuit("No group name specified."); |
|
92 | - } |
|
93 | - $groupid = intval($_REQUEST['groupid']); |
|
94 | - if(empty($groupid)) { |
|
95 | - $modx->webAlertAndQuit("No group id specified for rename."); |
|
96 | - } |
|
86 | + $modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_membergroup_names, "id='{$groupid}'"); |
|
87 | + break; |
|
88 | + case "rename_document_group" : |
|
89 | + $newgroupname = $_REQUEST['newgroupname']; |
|
90 | + if(empty($newgroupname)) { |
|
91 | + $modx->webAlertAndQuit("No group name specified."); |
|
92 | + } |
|
93 | + $groupid = intval($_REQUEST['groupid']); |
|
94 | + if(empty($groupid)) { |
|
95 | + $modx->webAlertAndQuit("No group id specified for rename."); |
|
96 | + } |
|
97 | 97 | |
98 | - $modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_documentgroup_names, "id='{$groupid}'"); |
|
99 | - break; |
|
100 | - case "add_document_group_to_user_group" : |
|
101 | - $updategroupaccess = true; |
|
102 | - $usergroup = intval($_REQUEST['usergroup']); |
|
103 | - $docgroup = intval($_REQUEST['docgroup']); |
|
104 | - $rs = $modx->db->select('COUNT(*)', $tbl_membergroup_access, "membergroup='{$usergroup}' AND documentgroup='{$docgroup}'"); |
|
105 | - $limit = $modx->db->getValue($rs); |
|
106 | - if($limit<=0) { |
|
107 | - $modx->db->insert(array('membergroup' => $usergroup, 'documentgroup' => $docgroup), $tbl_membergroup_access); |
|
108 | - } else { |
|
109 | - //alert user that coupling already exists? |
|
110 | - } |
|
111 | - break; |
|
112 | - case "remove_document_group_from_user_group" : |
|
113 | - $updategroupaccess = true; |
|
114 | - $coupling = intval($_REQUEST['coupling']); |
|
115 | - $modx->db->delete($tbl_membergroup_access, "id='{$coupling}'"); |
|
116 | - break; |
|
117 | - default : |
|
118 | - $modx->webAlertAndQuit("No operation set in request."); |
|
98 | + $modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_documentgroup_names, "id='{$groupid}'"); |
|
99 | + break; |
|
100 | + case "add_document_group_to_user_group" : |
|
101 | + $updategroupaccess = true; |
|
102 | + $usergroup = intval($_REQUEST['usergroup']); |
|
103 | + $docgroup = intval($_REQUEST['docgroup']); |
|
104 | + $rs = $modx->db->select('COUNT(*)', $tbl_membergroup_access, "membergroup='{$usergroup}' AND documentgroup='{$docgroup}'"); |
|
105 | + $limit = $modx->db->getValue($rs); |
|
106 | + if($limit<=0) { |
|
107 | + $modx->db->insert(array('membergroup' => $usergroup, 'documentgroup' => $docgroup), $tbl_membergroup_access); |
|
108 | + } else { |
|
109 | + //alert user that coupling already exists? |
|
110 | + } |
|
111 | + break; |
|
112 | + case "remove_document_group_from_user_group" : |
|
113 | + $updategroupaccess = true; |
|
114 | + $coupling = intval($_REQUEST['coupling']); |
|
115 | + $modx->db->delete($tbl_membergroup_access, "id='{$coupling}'"); |
|
116 | + break; |
|
117 | + default : |
|
118 | + $modx->webAlertAndQuit("No operation set in request."); |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | // secure manager documents - flag as private |
122 | 122 | if($updategroupaccess==true){ |
123 | - include MODX_MANAGER_PATH."includes/secure_mgr_documents.inc.php"; |
|
124 | - secureMgrDocument(); |
|
123 | + include MODX_MANAGER_PATH."includes/secure_mgr_documents.inc.php"; |
|
124 | + secureMgrDocument(); |
|
125 | 125 | |
126 | - // Update the private group column |
|
127 | - $modx->db->update( |
|
128 | - 'dgn.private_memgroup = (mga.membergroup IS NOT NULL)', |
|
129 | - "{$tbl_documentgroup_names} AS dgn LEFT JOIN {$tbl_membergroup_access} AS mga ON mga.documentgroup = dgn.id"); |
|
126 | + // Update the private group column |
|
127 | + $modx->db->update( |
|
128 | + 'dgn.private_memgroup = (mga.membergroup IS NOT NULL)', |
|
129 | + "{$tbl_documentgroup_names} AS dgn LEFT JOIN {$tbl_membergroup_access} AS mga ON mga.documentgroup = dgn.id"); |
|
130 | 130 | } |
131 | 131 | |
132 | 132 | $header = "Location: index.php?a=40"; |