@@ -1,8 +1,8 @@ discard block |
||
1 | 1 | <?php |
2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
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 | -if(!$modx->hasPermission('save_web_user')) { |
|
5 | +if (!$modx->hasPermission('save_web_user')) { |
|
6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
7 | 7 | } |
8 | 8 | |
@@ -11,14 +11,14 @@ discard block |
||
11 | 11 | $tbl_web_groups = $modx->getFullTableName('web_groups'); |
12 | 12 | |
13 | 13 | $input = $_POST; |
14 | -foreach($input as $k => $v) { |
|
15 | - if($k !== 'comment') { |
|
14 | +foreach ($input as $k => $v) { |
|
15 | + if ($k !== 'comment') { |
|
16 | 16 | $v = sanitize($v); |
17 | 17 | } |
18 | 18 | $input[$k] = $v; |
19 | 19 | } |
20 | 20 | |
21 | -$id = (int)$input['id']; |
|
21 | +$id = (int) $input['id']; |
|
22 | 22 | $oldusername = $input['oldusername']; |
23 | 23 | $newusername = !empty ($input['newusername']) ? trim($input['newusername']) : "New User"; |
24 | 24 | $esc_newusername = $modx->db->escape($newusername); |
@@ -50,41 +50,41 @@ discard block |
||
50 | 50 | $user_groups = $input['user_groups']; |
51 | 51 | |
52 | 52 | // verify password |
53 | -if($passwordgenmethod == "spec" && $input['specifiedpassword'] != $input['confirmpassword']) { |
|
53 | +if ($passwordgenmethod == "spec" && $input['specifiedpassword'] != $input['confirmpassword']) { |
|
54 | 54 | webAlertAndQuit("Password typed is mismatched"); |
55 | 55 | } |
56 | 56 | |
57 | 57 | // verify email |
58 | -if($email == '' || !preg_match("/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,24}$/i", $email)) { |
|
58 | +if ($email == '' || !preg_match("/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,24}$/i", $email)) { |
|
59 | 59 | webAlertAndQuit("E-mail address doesn't seem to be valid!"); |
60 | 60 | } |
61 | 61 | |
62 | -switch($input['mode']) { |
|
62 | +switch ($input['mode']) { |
|
63 | 63 | case '87' : // new user |
64 | 64 | // check if this user name already exist |
65 | 65 | $rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}'"); |
66 | 66 | $limit = $modx->db->getValue($rs); |
67 | - if($limit > 0) { |
|
67 | + if ($limit > 0) { |
|
68 | 68 | webAlertAndQuit("User name is already in use!"); |
69 | 69 | } |
70 | 70 | |
71 | 71 | // check if the email address already exist |
72 | 72 | $rs = $modx->db->select('count(id)', $tbl_web_user_attributes, "email='{$esc_email}' AND id!='{$id}'"); |
73 | 73 | $limit = $modx->db->getValue($rs); |
74 | - if($limit > 0) { |
|
74 | + if ($limit > 0) { |
|
75 | 75 | webAlertAndQuit("Email is already in use!"); |
76 | 76 | } |
77 | 77 | |
78 | 78 | // generate a new password for this user |
79 | - if($specifiedpassword != "" && $passwordgenmethod == "spec") { |
|
80 | - if(strlen($specifiedpassword) < 6) { |
|
79 | + if ($specifiedpassword != "" && $passwordgenmethod == "spec") { |
|
80 | + if (strlen($specifiedpassword) < 6) { |
|
81 | 81 | webAlertAndQuit("Password is too short!"); |
82 | 82 | } else { |
83 | 83 | $newpassword = $specifiedpassword; |
84 | 84 | } |
85 | - } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") { |
|
85 | + } elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") { |
|
86 | 86 | webAlertAndQuit("You didn't specify a password for this user!"); |
87 | - } elseif($passwordgenmethod == 'g') { |
|
87 | + } elseif ($passwordgenmethod == 'g') { |
|
88 | 88 | $newpassword = generate_password(8); |
89 | 89 | } else { |
90 | 90 | webAlertAndQuit("No password generation method specified!"); |
@@ -114,11 +114,11 @@ discard block |
||
114 | 114 | /*******************************************************************************/ |
115 | 115 | // put the user in the user_groups he/ she should be in |
116 | 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++) { |
|
117 | + if ($use_udperms == 1) { |
|
118 | + if (!empty($user_groups)) { |
|
119 | + for ($i = 0; $i < count($user_groups); $i++) { |
|
120 | 120 | $f = array(); |
121 | - $f['webgroup'] = (int)$user_groups[$i]; |
|
121 | + $f['webgroup'] = (int) $user_groups[$i]; |
|
122 | 122 | $f['webuser'] = $internalKey; |
123 | 123 | $modx->db->insert($f, $tbl_web_groups); |
124 | 124 | } |
@@ -142,20 +142,20 @@ discard block |
||
142 | 142 | "id" => $internalKey |
143 | 143 | )); |
144 | 144 | |
145 | - if($passwordnotifymethod == 'e') { |
|
145 | + if ($passwordnotifymethod == 'e') { |
|
146 | 146 | sendMailMessage($email, $newusername, $newpassword, $fullname); |
147 | - if($input['stay'] != '') { |
|
147 | + if ($input['stay'] != '') { |
|
148 | 148 | $a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87"; |
149 | - $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
149 | + $header = "Location: index.php?a={$a}&r=2&stay=".$input['stay']; |
|
150 | 150 | header($header); |
151 | 151 | } else { |
152 | 152 | $header = "Location: index.php?a=99&r=2"; |
153 | 153 | header($header); |
154 | 154 | } |
155 | 155 | } else { |
156 | - if($input['stay'] != '') { |
|
156 | + if ($input['stay'] != '') { |
|
157 | 157 | $a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87"; |
158 | - $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
158 | + $stayUrl = "index.php?a={$a}&r=2&stay=".$input['stay']; |
|
159 | 159 | } else { |
160 | 160 | $stayUrl = "index.php?a=99&r=2"; |
161 | 161 | } |
@@ -188,36 +188,36 @@ discard block |
||
188 | 188 | break; |
189 | 189 | case '88' : // edit user |
190 | 190 | // generate a new password for this user |
191 | - if($genpassword == 1) { |
|
192 | - if($specifiedpassword != "" && $passwordgenmethod == "spec") { |
|
193 | - if(strlen($specifiedpassword) < 6) { |
|
191 | + if ($genpassword == 1) { |
|
192 | + if ($specifiedpassword != "" && $passwordgenmethod == "spec") { |
|
193 | + if (strlen($specifiedpassword) < 6) { |
|
194 | 194 | webAlertAndQuit("Password is too short!"); |
195 | 195 | } else { |
196 | 196 | $newpassword = $specifiedpassword; |
197 | 197 | } |
198 | - } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") { |
|
198 | + } elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") { |
|
199 | 199 | webAlertAndQuit("You didn't specify a password for this user!"); |
200 | - } elseif($passwordgenmethod == 'g') { |
|
200 | + } elseif ($passwordgenmethod == 'g') { |
|
201 | 201 | $newpassword = generate_password(8); |
202 | 202 | } else { |
203 | 203 | webAlertAndQuit("No password generation method specified!"); |
204 | 204 | } |
205 | 205 | } |
206 | - if($passwordnotifymethod == 'e') { |
|
206 | + if ($passwordnotifymethod == 'e') { |
|
207 | 207 | sendMailMessage($email, $newusername, $newpassword, $fullname); |
208 | 208 | } |
209 | 209 | |
210 | 210 | // check if the username already exist |
211 | 211 | $rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}' AND id!='{$id}'"); |
212 | 212 | $limit = $modx->db->getValue($rs); |
213 | - if($limit > 0) { |
|
213 | + if ($limit > 0) { |
|
214 | 214 | webAlertAndQuit("User name is already in use!"); |
215 | 215 | } |
216 | 216 | |
217 | 217 | // check if the email address already exists |
218 | 218 | $rs = $modx->db->select('count(internalKey)', $tbl_web_user_attributes, "email='{$esc_email}' AND internalKey!='{$id}'"); |
219 | 219 | $limit = $modx->db->getValue($rs); |
220 | - if($limit > 0) { |
|
220 | + if ($limit > 0) { |
|
221 | 221 | webAlertAndQuit("Email is already in use!"); |
222 | 222 | } |
223 | 223 | |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | // update user name and password |
231 | 231 | $field = array(); |
232 | 232 | $field['username'] = $esc_newusername; |
233 | - if($genpassword == 1) { |
|
233 | + if ($genpassword == 1) { |
|
234 | 234 | $field['password'] = md5($newpassword); |
235 | 235 | } |
236 | 236 | $modx->db->update($field, $tbl_web_users, "id='{$id}'"); |
@@ -247,13 +247,13 @@ discard block |
||
247 | 247 | /*******************************************************************************/ |
248 | 248 | // put the user in the user_groups he/ she should be in |
249 | 249 | // first, check that up_perms are switched on! |
250 | - if($use_udperms == 1) { |
|
250 | + if ($use_udperms == 1) { |
|
251 | 251 | // as this is an existing user, delete his/ her entries in the groups before saving the new groups |
252 | 252 | $modx->db->delete($tbl_web_groups, "webuser='{$id}'"); |
253 | - if(!empty($user_groups)) { |
|
254 | - for($i = 0; $i < count($user_groups); $i++) { |
|
253 | + if (!empty($user_groups)) { |
|
254 | + for ($i = 0; $i < count($user_groups); $i++) { |
|
255 | 255 | $field = array(); |
256 | - $field['webgroup'] = (int)$user_groups[$i]; |
|
256 | + $field['webgroup'] = (int) $user_groups[$i]; |
|
257 | 257 | $field['webuser'] = $id; |
258 | 258 | $modx->db->insert($field, $tbl_web_groups); |
259 | 259 | } |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | )); |
276 | 276 | |
277 | 277 | // invoke OnWebChangePassword event |
278 | - if($genpassword == 1) { |
|
278 | + if ($genpassword == 1) { |
|
279 | 279 | $modx->invokeEvent("OnWebChangePassword", array( |
280 | 280 | "userid" => $id, |
281 | 281 | "username" => $newusername, |
@@ -289,10 +289,10 @@ discard block |
||
289 | 289 | "id" => $id |
290 | 290 | )); |
291 | 291 | |
292 | - if($genpassword == 1 && $passwordnotifymethod == 's') { |
|
293 | - if($input['stay'] != '') { |
|
292 | + if ($genpassword == 1 && $passwordnotifymethod == 's') { |
|
293 | + if ($input['stay'] != '') { |
|
294 | 294 | $a = ($input['stay'] == '2') ? "88&id={$id}" : "87"; |
295 | - $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
295 | + $stayUrl = "index.php?a={$a}&r=2&stay=".$input['stay']; |
|
296 | 296 | } else { |
297 | 297 | $stayUrl = "index.php?a=99&r=2"; |
298 | 298 | } |
@@ -320,9 +320,9 @@ discard block |
||
320 | 320 | |
321 | 321 | include_once "footer.inc.php"; |
322 | 322 | } else { |
323 | - if($input['stay'] != '') { |
|
323 | + if ($input['stay'] != '') { |
|
324 | 324 | $a = ($input['stay'] == '2') ? "88&id={$id}" : "87"; |
325 | - $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
325 | + $header = "Location: index.php?a={$a}&r=2&stay=".$input['stay']; |
|
326 | 326 | header($header); |
327 | 327 | } else { |
328 | 328 | $header = "Location: index.php?a=99&r=2"; |
@@ -335,19 +335,19 @@ discard block |
||
335 | 335 | } |
336 | 336 | |
337 | 337 | // in case any plugins include a quoted_printable function |
338 | -function save_user_quoted_printable($string) { |
|
338 | +function save_user_quoted_printable($string){ |
|
339 | 339 | $crlf = "\n"; |
340 | - $string = preg_replace('!(\r\n|\r|\n)!', $crlf, $string) . $crlf; |
|
340 | + $string = preg_replace('!(\r\n|\r|\n)!', $crlf, $string).$crlf; |
|
341 | 341 | $f[] = '/([\000-\010\013\014\016-\037\075\177-\377])/e'; |
342 | 342 | $r[] = "'=' . sprintf('%02X', ord('\\1'))"; |
343 | - $f[] = '/([\011\040])' . $crlf . '/e'; |
|
344 | - $r[] = "'=' . sprintf('%02X', ord('\\1')) . '" . $crlf . "'"; |
|
343 | + $f[] = '/([\011\040])'.$crlf.'/e'; |
|
344 | + $r[] = "'=' . sprintf('%02X', ord('\\1')) . '".$crlf."'"; |
|
345 | 345 | $string = preg_replace($f, $r, $string); |
346 | - return trim(wordwrap($string, 70, ' =' . $crlf)); |
|
346 | + return trim(wordwrap($string, 70, ' ='.$crlf)); |
|
347 | 347 | } |
348 | 348 | |
349 | 349 | // Send an email to the user |
350 | -function sendMailMessage($email, $uid, $pwd, $ufn) { |
|
350 | +function sendMailMessage($email, $uid, $pwd, $ufn){ |
|
351 | 351 | global $modx, $_lang, $websignupemail_message; |
352 | 352 | global $emailsubject, $emailsender; |
353 | 353 | global $site_name, $site_url; |
@@ -368,14 +368,14 @@ discard block |
||
368 | 368 | $param['to'] = $email; |
369 | 369 | $param['type'] = 'text'; |
370 | 370 | $rs = $modx->sendmail($param); |
371 | - if(!$rs) { |
|
371 | + if (!$rs) { |
|
372 | 372 | $modx->manager->saveFormValues(); |
373 | 373 | $modx->messageQuit("{$email} - {$_lang['error_sending_email']}"); |
374 | 374 | } |
375 | 375 | } |
376 | 376 | |
377 | 377 | // Save User Settings |
378 | -function saveUserSettings($id) { |
|
378 | +function saveUserSettings($id){ |
|
379 | 379 | global $modx; |
380 | 380 | $tbl_web_user_settings = $modx->getFullTableName('web_user_settings'); |
381 | 381 | |
@@ -387,12 +387,12 @@ discard block |
||
387 | 387 | |
388 | 388 | $modx->db->delete($tbl_web_user_settings, "webuser='{$id}'"); |
389 | 389 | |
390 | - foreach($settings as $n) { |
|
390 | + foreach ($settings as $n) { |
|
391 | 391 | $vl = $_POST[$n]; |
392 | - if(is_array($vl)) { |
|
392 | + if (is_array($vl)) { |
|
393 | 393 | $vl = implode(",", $vl); |
394 | 394 | } |
395 | - if($vl != '') { |
|
395 | + if ($vl != '') { |
|
396 | 396 | $f = array(); |
397 | 397 | $f['webuser'] = $id; |
398 | 398 | $f['setting_name'] = $n; |
@@ -404,33 +404,33 @@ discard block |
||
404 | 404 | } |
405 | 405 | |
406 | 406 | // Web alert - sends an alert to web browser |
407 | -function webAlertAndQuit($msg) { |
|
407 | +function webAlertAndQuit($msg){ |
|
408 | 408 | global $id, $modx; |
409 | 409 | $mode = $_POST['mode']; |
410 | 410 | $modx->manager->saveFormValues($mode); |
411 | - $modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode == '88' ? "&id={$id}" : '')); |
|
411 | + $modx->webAlertAndQuit($msg, "index.php?a={$mode}".($mode == '88' ? "&id={$id}" : '')); |
|
412 | 412 | } |
413 | 413 | |
414 | 414 | // Generate password |
415 | -function generate_password($length = 10) { |
|
415 | +function generate_password($length = 10){ |
|
416 | 416 | $allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789"; |
417 | 417 | $ps_len = strlen($allowable_characters); |
418 | 418 | mt_srand((double) microtime() * 1000000); |
419 | 419 | $pass = ""; |
420 | - for($i = 0; $i < $length; $i++) { |
|
420 | + for ($i = 0; $i < $length; $i++) { |
|
421 | 421 | $pass .= $allowable_characters[mt_rand(0, $ps_len - 1)]; |
422 | 422 | } |
423 | 423 | return $pass; |
424 | 424 | } |
425 | 425 | |
426 | -function sanitize($str = '', $safecount = 0) { |
|
426 | +function sanitize($str = '', $safecount = 0){ |
|
427 | 427 | global $modx; |
428 | 428 | $safecount++; |
429 | - if(1000 < $safecount) { |
|
429 | + if (1000 < $safecount) { |
|
430 | 430 | exit("error too many loops '{$safecount}'"); |
431 | 431 | } |
432 | - if(is_array($str)) { |
|
433 | - foreach($str as $i => $v) { |
|
432 | + if (is_array($str)) { |
|
433 | + foreach ($str as $i => $v) { |
|
434 | 434 | $str[$i] = sanitize($v, $safecount); |
435 | 435 | } |
436 | 436 | } else { |
@@ -1,12 +1,12 @@ discard block |
||
1 | 1 | <?php |
2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
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('save_module')) { |
6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
7 | 7 | } |
8 | 8 | |
9 | -$id = (int)$_POST['id']; |
|
9 | +$id = (int) $_POST['id']; |
|
10 | 10 | $name = $modx->db->escape(trim($_POST['name'])); |
11 | 11 | $description = $modx->db->escape($_POST['description']); |
12 | 12 | $resourcefile = $modx->db->escape($_POST['resourcefile']); |
@@ -25,11 +25,11 @@ discard block |
||
25 | 25 | |
26 | 26 | //Kyle Jaebker - added category support |
27 | 27 | if (empty($_POST['newcategory']) && $_POST['categoryid'] > 0) { |
28 | - $categoryid = (int)$_POST['categoryid']; |
|
28 | + $categoryid = (int) $_POST['categoryid']; |
|
29 | 29 | } elseif (empty($_POST['newcategory']) && $_POST['categoryid'] <= 0) { |
30 | 30 | $categoryid = 0; |
31 | 31 | } else { |
32 | - include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php'); |
|
32 | + include_once(MODX_MANAGER_PATH.'includes/categories.inc.php'); |
|
33 | 33 | $categoryid = checkCategory($_POST['newcategory']); |
34 | 34 | if (!$categoryid) { |
35 | 35 | $categoryid = newCategory($_POST['newcategory']); |
@@ -45,15 +45,15 @@ discard block |
||
45 | 45 | $name = isset($parsed['name']) ? $parsed['name'] : $name; |
46 | 46 | $properties = isset($parsed['properties']) ? $parsed['properties'] : $properties; |
47 | 47 | $guid = isset($parsed['guid']) ? $parsed['guid'] : $guid; |
48 | - $enable_sharedparams = isset($parsed['shareparams']) ? (int)$parsed['shareparams'] : $enable_sharedparams; |
|
48 | + $enable_sharedparams = isset($parsed['shareparams']) ? (int) $parsed['shareparams'] : $enable_sharedparams; |
|
49 | 49 | |
50 | 50 | $description = isset($parsed['description']) ? $parsed['description'] : $description; |
51 | - $version = isset($parsed['version']) ? '<b>' . $parsed['version'] . '</b> ' : ''; |
|
51 | + $version = isset($parsed['version']) ? '<b>'.$parsed['version'].'</b> ' : ''; |
|
52 | 52 | if ($version) { |
53 | - $description = $version . trim(preg_replace('/(<b>.+?)+(<\/b>)/i', '', $description)); |
|
53 | + $description = $version.trim(preg_replace('/(<b>.+?)+(<\/b>)/i', '', $description)); |
|
54 | 54 | } |
55 | 55 | if (isset($parsed['modx_category'])) { |
56 | - include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php'); |
|
56 | + include_once(MODX_MANAGER_PATH.'includes/categories.inc.php'); |
|
57 | 57 | $categoryid = getCategory($parsed['modx_category']); |
58 | 58 | } |
59 | 59 | } |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | // finished emptying cache - redirect |
112 | 112 | if ($_POST['stay'] != '') { |
113 | 113 | $a = ($_POST['stay'] == '2') ? "108&id=$newid" : "107"; |
114 | - $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay']; |
|
114 | + $header = "Location: index.php?a=".$a."&r=2&stay=".$_POST['stay']; |
|
115 | 115 | header($header); |
116 | 116 | } else { |
117 | 117 | $header = "Location: index.php?a=106&r=2"; |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | // finished emptying cache - redirect |
169 | 169 | if ($_POST['stay'] != '') { |
170 | 170 | $a = ($_POST['stay'] == '2') ? "108&id=$id" : "107"; |
171 | - $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay']; |
|
171 | + $header = "Location: index.php?a=".$a."&r=2&stay=".$_POST['stay']; |
|
172 | 172 | header($header); |
173 | 173 | } else { |
174 | 174 | $modx->unlockElement(6, $id); |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | public $role; |
8 | 8 | public $duplicateDoc = false; |
9 | 9 | |
10 | - public function checkPermissions() { |
|
10 | + public function checkPermissions(){ |
|
11 | 11 | |
12 | 12 | global $udperms_allowroot; |
13 | 13 | global $modx; |
@@ -19,17 +19,17 @@ discard block |
||
19 | 19 | $document = $this->document; |
20 | 20 | $role = $this->role; |
21 | 21 | |
22 | - if($role==1) { |
|
23 | - return true; // administrator - grant all document permissions |
|
22 | + if ($role == 1) { |
|
23 | + return true; // administrator - grant all document permissions |
|
24 | 24 | } |
25 | 25 | |
26 | - if($modx->config['use_udperms']==0 || $modx->config['use_udperms']=="" || !isset($modx->config['use_udperms'])) { |
|
26 | + if ($modx->config['use_udperms'] == 0 || $modx->config['use_udperms'] == "" || !isset($modx->config['use_udperms'])) { |
|
27 | 27 | return true; // permissions aren't in use |
28 | 28 | } |
29 | 29 | |
30 | 30 | $parent = $modx->db->getValue($modx->db->select('parent', $tblsc, "id='{$this->document}'")); |
31 | - if($document == 0 && $parent == NULL && $udperms_allowroot == 1) return true; // User is allowed to create new document in root |
|
32 | - if (($this->duplicateDoc==true || $document==0) && $parent==0 && $udperms_allowroot==0) { |
|
31 | + if ($document == 0 && $parent == NULL && $udperms_allowroot == 1) return true; // User is allowed to create new document in root |
|
32 | + if (($this->duplicateDoc == true || $document == 0) && $parent == 0 && $udperms_allowroot == 0) { |
|
33 | 33 | return false; // deny duplicate || create new document at root if Allow Root is No |
34 | 34 | } |
35 | 35 | |
@@ -44,17 +44,17 @@ discard block |
||
44 | 44 | are private to the manager users will not be private to web users if the |
45 | 45 | document group is not assigned to a web user group and visa versa. |
46 | 46 | */ |
47 | - $permissionsok = false; // set permissions to false |
|
47 | + $permissionsok = false; // set permissions to false |
|
48 | 48 | |
49 | 49 | $rs = $modx->db->select( |
50 | 50 | 'count(DISTINCT sc.id)', |
51 | 51 | "{$tblsc} AS sc |
52 | 52 | LEFT JOIN {$tbldg} AS dg on dg.document = sc.id |
53 | 53 | LEFT JOIN {$tbldgn} dgn ON dgn.id = dg.document_group", |
54 | - "sc.id='{$this->document}' AND (". (empty($docgrp) ? '' : "dg.document_group = ".$docgrp." ||" ) . " sc.privatemgr = 0)" |
|
54 | + "sc.id='{$this->document}' AND (".(empty($docgrp) ? '' : "dg.document_group = ".$docgrp." ||")." sc.privatemgr = 0)" |
|
55 | 55 | ); |
56 | 56 | $limit = $modx->db->getValue($rs); |
57 | - if($limit==1) $permissionsok = true; |
|
57 | + if ($limit == 1) $permissionsok = true; |
|
58 | 58 | |
59 | 59 | return $permissionsok; |
60 | 60 | } |
@@ -1,29 +1,29 @@ discard block |
||
1 | 1 | <?php |
2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
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 | -if(!$modx->hasPermission('new_module')) { |
|
5 | +if (!$modx->hasPermission('new_module')) { |
|
6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
7 | 7 | } |
8 | 8 | |
9 | -$id = isset($_GET['id'])? (int)$_GET['id'] : 0; |
|
10 | -if($id==0) { |
|
9 | +$id = isset($_GET['id']) ? (int) $_GET['id'] : 0; |
|
10 | +if ($id == 0) { |
|
11 | 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); |
|
16 | + srand((double) microtime() * 1000000); |
|
17 | + $r = rand(); |
|
18 | + $u = uniqid(getmypid().$r.(double) microtime() * 1000000, 1); |
|
19 | + $m = md5($u); |
|
20 | 20 | return $m; |
21 | 21 | } |
22 | 22 | |
23 | 23 | // count duplicates |
24 | 24 | $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_modules'), "id='{$id}'")); |
25 | 25 | $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_modules'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'")); |
26 | -if($count>=1) $count = ' '.($count+1); |
|
26 | +if ($count >= 1) $count = ' '.($count + 1); |
|
27 | 27 | else $count = ''; |
28 | 28 | |
29 | 29 | // duplicate module |
@@ -68,5 +68,5 @@ discard block |
||
68 | 68 | $_SESSION['itemname'] = $name; |
69 | 69 | |
70 | 70 | // finish duplicating - redirect to new module |
71 | -$header="Location: index.php?r=2&a=108&id=$newid"; |
|
71 | +$header = "Location: index.php?r=2&a=108&id=$newid"; |
|
72 | 72 | header($header); |
@@ -1,27 +1,27 @@ discard block |
||
1 | 1 | <?php |
2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
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 | -if(!$modx->hasPermission('new_document') || !$modx->hasPermission('save_document')) { |
|
5 | +if (!$modx->hasPermission('new_document') || !$modx->hasPermission('save_document')) { |
|
6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
7 | 7 | } |
8 | 8 | |
9 | -$id = isset($_GET['id'])? (int)$_GET['id'] : 0; |
|
10 | -if($id==0) { |
|
9 | +$id = isset($_GET['id']) ? (int) $_GET['id'] : 0; |
|
10 | +if ($id == 0) { |
|
11 | 11 | $modx->webAlertAndQuit($_lang["error_no_id"]); |
12 | 12 | } |
13 | 13 | |
14 | 14 | $children = array(); |
15 | 15 | |
16 | 16 | // check permissions on the document |
17 | -include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php"; |
|
17 | +include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php"; |
|
18 | 18 | $udperms = new udperms(); |
19 | 19 | $udperms->user = $modx->getLoginUserID(); |
20 | 20 | $udperms->document = $id; |
21 | 21 | $udperms->role = $_SESSION['mgrRole']; |
22 | 22 | $udperms->duplicateDoc = true; |
23 | 23 | |
24 | -if(!$udperms->checkPermissions()) { |
|
24 | +if (!$udperms->checkPermissions()) { |
|
25 | 25 | $modx->webAlertAndQuit($_lang["access_permission_denied"]); |
26 | 26 | } |
27 | 27 | |
@@ -33,10 +33,10 @@ discard block |
||
33 | 33 | $_SESSION['itemname'] = $name; |
34 | 34 | |
35 | 35 | // finish cloning - redirect |
36 | -$header="Location: index.php?r=1&a=3&id=$id"; |
|
36 | +$header = "Location: index.php?r=1&a=3&id=$id"; |
|
37 | 37 | header($header); |
38 | 38 | |
39 | -function duplicateDocument($docid, $parent=null, $_toplevel=0) { |
|
39 | +function duplicateDocument($docid, $parent = null, $_toplevel = 0){ |
|
40 | 40 | global $modx, $_lang; |
41 | 41 | |
42 | 42 | // invoke OnBeforeDocDuplicate event |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | $content = $modx->db->getRow($rs); |
58 | 58 | |
59 | 59 | // Handle incremental ID |
60 | - switch($modx->config['docid_incrmnt_method']) |
|
60 | + switch ($modx->config['docid_incrmnt_method']) |
|
61 | 61 | { |
62 | 62 | case '1': |
63 | 63 | $from = "{$tblsc} AS T0 LEFT JOIN {$tblsc} AS T1 ON T0.id + 1 = T1.id"; |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | $content['id'] = $modx->db->getValue($rs); |
66 | 66 | break; |
67 | 67 | case '2': |
68 | - $rs = $modx->db->select('MAX(id)+1',$tblsc); |
|
68 | + $rs = $modx->db->select('MAX(id)+1', $tblsc); |
|
69 | 69 | $content['id'] = $modx->db->getValue($rs); |
70 | 70 | break; |
71 | 71 | |
@@ -79,12 +79,12 @@ discard block |
||
79 | 79 | $pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$docid}'")); |
80 | 80 | $pagetitle = $modx->db->escape($pagetitle); |
81 | 81 | $count = $modx->db->getRecordCount($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "pagetitle LIKE '{$pagetitle} Duplicate%'")); |
82 | - if($count>=1) $count = ' '.($count+1); |
|
82 | + if ($count >= 1) $count = ' '.($count + 1); |
|
83 | 83 | else $count = ''; |
84 | 84 | |
85 | 85 | $content['pagetitle'] = $_lang['duplicated_el_suffix'].$count.' '.$content['pagetitle']; |
86 | 86 | $content['alias'] = null; |
87 | - } elseif($modx->config['friendly_urls'] == 0 || $modx->config['allow_duplicate_alias'] == 0) { |
|
87 | + } elseif ($modx->config['friendly_urls'] == 0 || $modx->config['allow_duplicate_alias'] == 0) { |
|
88 | 88 | $content['alias'] = null; |
89 | 89 | } |
90 | 90 | |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | } |
138 | 138 | |
139 | 139 | // Duplicate Document TVs |
140 | -function duplicateTVs($oldid,$newid){ |
|
140 | +function duplicateTVs($oldid, $newid){ |
|
141 | 141 | global $modx; |
142 | 142 | |
143 | 143 | $tbltvc = $modx->getFullTableName('site_tmplvar_contentvalues'); |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | } |
150 | 150 | |
151 | 151 | // Duplicate Document Access Permissions |
152 | -function duplicateAccess($oldid,$newid){ |
|
152 | +function duplicateAccess($oldid, $newid){ |
|
153 | 153 | global $modx; |
154 | 154 | |
155 | 155 | $tbldg = $modx->getFullTableName('document_groups'); |
@@ -1,18 +1,18 @@ discard block |
||
1 | 1 | <?php |
2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
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 | -if(!$modx->hasPermission('exec_module')) { |
|
5 | +if (!$modx->hasPermission('exec_module')) { |
|
6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
7 | 7 | } |
8 | 8 | |
9 | -$id = isset($_GET['id'])? (int)$_GET['id'] : 0; |
|
10 | -if($id==0) { |
|
9 | +$id = isset($_GET['id']) ? (int) $_GET['id'] : 0; |
|
10 | +if ($id == 0) { |
|
11 | 11 | $modx->webAlertAndQuit($_lang["error_no_id"]); |
12 | 12 | } |
13 | 13 | |
14 | 14 | // check if user has access permission, except admins |
15 | -if($_SESSION['mgrRole']!=1){ |
|
15 | +if ($_SESSION['mgrRole'] != 1) { |
|
16 | 16 | $rs = $modx->db->select( |
17 | 17 | 'sma.usergroup,mg.member', |
18 | 18 | $modx->getFullTableName("site_module_access")." sma |
@@ -24,18 +24,18 @@ discard block |
||
24 | 24 | $permissionAccessInt = -1; |
25 | 25 | |
26 | 26 | while ($row = $modx->db->getRow($rs)) { |
27 | - if($row["usergroup"] && $row["member"]) { |
|
27 | + if ($row["usergroup"] && $row["member"]) { |
|
28 | 28 | //if there are permissions and this member has permission, ofcourse |
29 | 29 | //this is granted |
30 | 30 | $permissionAccessInt = 1; |
31 | - } elseif ($permissionAccessInt==-1) { |
|
31 | + } elseif ($permissionAccessInt == -1) { |
|
32 | 32 | //if there are permissions but this member has no permission and the |
33 | 33 | //variable was still in init state we set permission to 0; no permissions |
34 | 34 | $permissionAccessInt = 0; |
35 | 35 | } |
36 | 36 | } |
37 | 37 | |
38 | - if($permissionAccessInt==0) { |
|
38 | + if ($permissionAccessInt == 0) { |
|
39 | 39 | $modx->webAlertAndQuit("You do not sufficient privileges to execute this module.", "index.php?a=106"); |
40 | 40 | } |
41 | 41 | } |
@@ -43,10 +43,10 @@ discard block |
||
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 | -if(!$content) { |
|
46 | +if (!$content) { |
|
47 | 47 | $modx->webAlertAndQuit("No record found for id {$id}.", "index.php?a=106"); |
48 | 48 | } |
49 | -if($content['disabled']) { |
|
49 | +if ($content['disabled']) { |
|
50 | 50 | $modx->webAlertAndQuit("This module is disabled and cannot be executed.", "index.php?a=106"); |
51 | 51 | } |
52 | 52 | |
@@ -59,15 +59,15 @@ discard block |
||
59 | 59 | // Set the item name for logger |
60 | 60 | $_SESSION['itemname'] = $content['name']; |
61 | 61 | |
62 | -$output = evalModule($content["modulecode"],$parameter); |
|
62 | +$output = evalModule($content["modulecode"], $parameter); |
|
63 | 63 | echo $output; |
64 | 64 | include MODX_MANAGER_PATH."includes/sysalert.display.inc.php"; |
65 | 65 | |
66 | 66 | // evalModule |
67 | -function evalModule($moduleCode,$params){ |
|
67 | +function evalModule($moduleCode, $params){ |
|
68 | 68 | global $modx; |
69 | 69 | $modx->event->params = &$params; // store params inside event object |
70 | - if(is_array($params)) { |
|
70 | + if (is_array($params)) { |
|
71 | 71 | extract($params, EXTR_SKIP); |
72 | 72 | } |
73 | 73 | ob_start(); |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | if (isset($php_errormsg)) |
78 | 78 | { |
79 | 79 | $error_info = error_get_last(); |
80 | - switch($error_info['type']) |
|
80 | + switch ($error_info['type']) |
|
81 | 81 | { |
82 | 82 | case E_NOTICE : |
83 | 83 | $error_level = 1; |
@@ -91,9 +91,9 @@ discard block |
||
91 | 91 | default: |
92 | 92 | $error_level = 99; |
93 | 93 | } |
94 | - if($modx->config['error_reporting']==='99' || 2<$error_level) |
|
94 | + if ($modx->config['error_reporting'] === '99' || 2 < $error_level) |
|
95 | 95 | { |
96 | - $modx->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], $_SESSION['itemname'] . ' - Module', $error_info['message'], $error_info['line'], $msg); |
|
96 | + $modx->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], $_SESSION['itemname'].' - Module', $error_info['message'], $error_info['line'], $msg); |
|
97 | 97 | $modx->event->alert("An error occurred while loading. Please see the event log for more information<p>{$msg}</p>"); |
98 | 98 | } |
99 | 99 | } |
@@ -1,20 +1,20 @@ discard block |
||
1 | 1 | <?php |
2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
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 | -if(!$modx->hasPermission('new_snippet')) { |
|
5 | +if (!$modx->hasPermission('new_snippet')) { |
|
6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
7 | 7 | } |
8 | 8 | |
9 | -$id = isset($_GET['id'])? (int)$_GET['id'] : 0; |
|
10 | -if($id==0) { |
|
9 | +$id = isset($_GET['id']) ? (int) $_GET['id'] : 0; |
|
10 | +if ($id == 0) { |
|
11 | 11 | $modx->webAlertAndQuit($_lang["error_no_id"]); |
12 | 12 | } |
13 | 13 | |
14 | 14 | // count duplicates |
15 | 15 | $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_snippets'), "id='{$id}'")); |
16 | 16 | $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_snippets'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'")); |
17 | -if($count>=1) $count = ' '.($count+1); |
|
17 | +if ($count >= 1) $count = ' '.($count + 1); |
|
18 | 18 | else $count = ''; |
19 | 19 | |
20 | 20 | // duplicate Snippet |
@@ -33,5 +33,5 @@ discard block |
||
33 | 33 | $_SESSION['itemname'] = $name; |
34 | 34 | |
35 | 35 | // finish duplicating - redirect to new snippet |
36 | -$header="Location: index.php?r=2&a=22&id=$newid"; |
|
36 | +$header = "Location: index.php?r=2&a=22&id=$newid"; |
|
37 | 37 | header($header); |
@@ -1,38 +1,38 @@ discard block |
||
1 | 1 | <?php |
2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
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 | -if(!$modx->hasPermission('save_document')||!$modx->hasPermission('publish_document')) { |
|
5 | +if (!$modx->hasPermission('save_document') || !$modx->hasPermission('publish_document')) { |
|
6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
7 | 7 | } |
8 | 8 | |
9 | -$id = isset($_REQUEST['id'])? (int)$_REQUEST['id'] : 0; |
|
10 | -if($id==0) { |
|
9 | +$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0; |
|
10 | +if ($id == 0) { |
|
11 | 11 | $modx->webAlertAndQuit($_lang["error_no_id"]); |
12 | 12 | } |
13 | 13 | |
14 | 14 | /************webber ********/ |
15 | -$content=$modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'")); |
|
16 | -$pid=($content['parent']==0?$id:$content['parent']); |
|
15 | +$content = $modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'")); |
|
16 | +$pid = ($content['parent'] == 0 ? $id : $content['parent']); |
|
17 | 17 | |
18 | 18 | /************** webber *************/ |
19 | -$sd=isset($_REQUEST['dir'])?'&dir='.$_REQUEST['dir']:'&dir=DESC'; |
|
20 | -$sb=isset($_REQUEST['sort'])?'&sort='.$_REQUEST['sort']:'&sort=createdon'; |
|
21 | -$pg=isset($_REQUEST['page'])?'&page='.(int)$_REQUEST['page']:''; |
|
22 | -$add_path=$sd.$sb.$pg; |
|
19 | +$sd = isset($_REQUEST['dir']) ? '&dir='.$_REQUEST['dir'] : '&dir=DESC'; |
|
20 | +$sb = isset($_REQUEST['sort']) ? '&sort='.$_REQUEST['sort'] : '&sort=createdon'; |
|
21 | +$pg = isset($_REQUEST['page']) ? '&page='.(int) $_REQUEST['page'] : ''; |
|
22 | +$add_path = $sd.$sb.$pg; |
|
23 | 23 | |
24 | 24 | /***********************************/ |
25 | 25 | |
26 | 26 | |
27 | 27 | |
28 | 28 | // check permissions on the document |
29 | -include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php"; |
|
29 | +include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php"; |
|
30 | 30 | $udperms = new udperms(); |
31 | 31 | $udperms->user = $modx->getLoginUserID(); |
32 | 32 | $udperms->document = $id; |
33 | 33 | $udperms->role = $_SESSION['mgrRole']; |
34 | 34 | |
35 | -if(!$udperms->checkPermissions()) { |
|
35 | +if (!$udperms->checkPermissions()) { |
|
36 | 36 | $modx->webAlertAndQuit($_lang["access_permission_denied"]); |
37 | 37 | } |
38 | 38 | |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | ), $modx->getFullTableName('site_content'), "id='{$id}'"); |
50 | 50 | |
51 | 51 | // invoke OnDocUnPublished event |
52 | -$modx->invokeEvent("OnDocUnPublished",array("docid"=>$id)); |
|
52 | +$modx->invokeEvent("OnDocUnPublished", array("docid"=>$id)); |
|
53 | 53 | |
54 | 54 | // Set the item name for logger |
55 | 55 | $_SESSION['itemname'] = $content['pagetitle']; |
@@ -57,6 +57,6 @@ discard block |
||
57 | 57 | // empty cache |
58 | 58 | $modx->clearCache('full'); |
59 | 59 | |
60 | -$header="Location: index.php?a=3&id=$pid&r=1".$add_path; |
|
60 | +$header = "Location: index.php?a=3&id=$pid&r=1".$add_path; |
|
61 | 61 | |
62 | 62 | header($header); |
@@ -1,13 +1,13 @@ discard block |
||
1 | 1 | <?php |
2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
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 | -if(!$modx->hasPermission('delete_module')) { |
|
5 | +if (!$modx->hasPermission('delete_module')) { |
|
6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
7 | 7 | } |
8 | 8 | |
9 | -$id = isset($_GET['id'])? (int)$_GET['id'] : 0; |
|
10 | -if($id==0) { |
|
9 | +$id = isset($_GET['id']) ? (int) $_GET['id'] : 0; |
|
10 | +if ($id == 0) { |
|
11 | 11 | $modx->webAlertAndQuit($_lang["error_no_id"]); |
12 | 12 | } |
13 | 13 | |
@@ -40,5 +40,5 @@ discard block |
||
40 | 40 | $modx->clearCache('full'); |
41 | 41 | |
42 | 42 | // finished emptying cache - redirect |
43 | -$header="Location: index.php?a=106&r=2"; |
|
43 | +$header = "Location: index.php?a=106&r=2"; |
|
44 | 44 | header($header); |