Completed
Push — develop ( 62a102...75b835 )
by Maxim
05:41
created
manager/includes/accesscontrol.inc.php 1 patch
Spacing   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -1,14 +1,14 @@  discard block
 block discarded – undo
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
 
6
-if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
6
+if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
7 7
 	header('HTTP/1.0 404 Not Found');
8 8
 	exit;
9 9
 }
10 10
 
11
-if(isset($_SESSION['mgrValidated']) && $_SESSION['usertype'] != 'manager') {
11
+if (isset($_SESSION['mgrValidated']) && $_SESSION['usertype'] != 'manager') {
12 12
 	//		if (isset($_COOKIE[session_name()])) {
13 13
 	//			setcookie(session_name(), '', 0, MODX_BASE_URL);
14 14
 	//		}
@@ -18,16 +18,16 @@  discard block
 block discarded – undo
18 18
 }
19 19
 
20 20
 // andrazk 20070416 - if installer is running, destroy active sessions
21
-if(file_exists(MODX_BASE_PATH . 'assets/cache/installProc.inc.php')) {
22
-	include_once(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
23
-	if(isset($installStartTime)) {
24
-		if((time() - $installStartTime) > 5 * 60) { // if install flag older than 5 minutes, discard
21
+if (file_exists(MODX_BASE_PATH.'assets/cache/installProc.inc.php')) {
22
+	include_once(MODX_BASE_PATH.'assets/cache/installProc.inc.php');
23
+	if (isset($installStartTime)) {
24
+		if ((time() - $installStartTime) > 5 * 60) { // if install flag older than 5 minutes, discard
25 25
 			unset($installStartTime);
26
-			@ chmod(MODX_BASE_PATH . 'assets/cache/installProc.inc.php', 0755);
27
-			unlink(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
26
+			@ chmod(MODX_BASE_PATH.'assets/cache/installProc.inc.php', 0755);
27
+			unlink(MODX_BASE_PATH.'assets/cache/installProc.inc.php');
28 28
 		} else {
29
-			if($_SERVER['REQUEST_METHOD'] != 'POST') {
30
-				if(isset($_COOKIE[session_name()])) {
29
+			if ($_SERVER['REQUEST_METHOD'] != 'POST') {
30
+				if (isset($_COOKIE[session_name()])) {
31 31
 					session_unset();
32 32
 					@session_destroy();
33 33
 					//					setcookie(session_name(), '', 0, MODX_BASE_URL);
@@ -39,37 +39,37 @@  discard block
 block discarded – undo
39 39
 }
40 40
 
41 41
 // andrazk 20070416 - if session started before install and was not destroyed yet
42
-if(isset($lastInstallTime)) {
43
-	if(isset($_SESSION['mgrValidated'])) {
44
-		if(isset($_SESSION['modx.session.created.time'])) {
45
-			if($_SESSION['modx.session.created.time'] < $lastInstallTime) {
46
-				if($_SERVER['REQUEST_METHOD'] != 'POST') {
47
-					if(isset($_COOKIE[session_name()])) {
42
+if (isset($lastInstallTime)) {
43
+	if (isset($_SESSION['mgrValidated'])) {
44
+		if (isset($_SESSION['modx.session.created.time'])) {
45
+			if ($_SESSION['modx.session.created.time'] < $lastInstallTime) {
46
+				if ($_SERVER['REQUEST_METHOD'] != 'POST') {
47
+					if (isset($_COOKIE[session_name()])) {
48 48
 						session_unset();
49 49
 						@session_destroy();
50 50
 						//						setcookie(session_name(), '', 0, MODX_BASE_URL);
51 51
 					}
52 52
 					header('HTTP/1.0 307 Redirect');
53
-					header('Location: ' . MODX_MANAGER_URL . 'index.php?installGoingOn=2');
53
+					header('Location: '.MODX_MANAGER_URL.'index.php?installGoingOn=2');
54 54
 				}
55 55
 			}
56 56
 		}
57 57
 	}
58 58
 }
59 59
 
60
-if(!isset($_SESSION['mgrValidated'])) {
61
-	if(isset($manager_language)) {
60
+if (!isset($_SESSION['mgrValidated'])) {
61
+	if (isset($manager_language)) {
62 62
 		// establish fallback to English default
63 63
 		include_once "lang/english.inc.php";
64 64
 		// include localized overrides
65
-		include_once "lang/" . $manager_language . ".inc.php";
65
+		include_once "lang/".$manager_language.".inc.php";
66 66
 	} else {
67 67
 		include_once "lang/english.inc.php";
68 68
 	}
69 69
 
70 70
 	$modx->setPlaceholder('modx_charset', $modx_manager_charset);
71 71
 	$modx->setPlaceholder('theme', $manager_theme);
72
-    $modx->setPlaceholder('favicon', (file_exists(MODX_BASE_PATH . 'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/' . $modx->config['manager_theme'] . '/images/favicon.ico'));
72
+    $modx->setPlaceholder('favicon', (file_exists(MODX_BASE_PATH.'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/'.$modx->config['manager_theme'].'/images/favicon.ico'));
73 73
 
74 74
 	// invoke OnManagerLoginFormPrerender event
75 75
 	$evtOut = $modx->invokeEvent('OnManagerLoginFormPrerender');
@@ -80,29 +80,29 @@  discard block
 block discarded – undo
80 80
 	$modx->setPlaceholder('manager_path', MGR_DIR);
81 81
 	$modx->setPlaceholder('logo_slogan', $_lang["logo_slogan"]);
82 82
 	$modx->setPlaceholder('login_message', $_lang["login_message"]);
83
-	$modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/');
83
+	$modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/');
84 84
 	$modx->setPlaceholder('year', date('Y'));
85 85
 	$modx->setPlaceholder('manager_theme_style', (isset($_COOKIE['MODX_themeColor']) ? $_COOKIE['MODX_themeColor'] : ''));
86 86
 
87 87
 	// andrazk 20070416 - notify user of install/update
88
-	if(isset($_GET['installGoingOn'])) {
88
+	if (isset($_GET['installGoingOn'])) {
89 89
 		$installGoingOn = $_GET['installGoingOn'];
90 90
 	}
91
-	if(isset($installGoingOn)) {
92
-		switch($installGoingOn) {
91
+	if (isset($installGoingOn)) {
92
+		switch ($installGoingOn) {
93 93
 			case 1 :
94
-				$modx->setPlaceholder('login_message', "<p><span class=\"fail\">" . $_lang["login_cancelled_install_in_progress"] . "</p><p>" . $_lang["login_message"] . "</p>");
94
+				$modx->setPlaceholder('login_message', "<p><span class=\"fail\">".$_lang["login_cancelled_install_in_progress"]."</p><p>".$_lang["login_message"]."</p>");
95 95
 				break;
96 96
 			case 2 :
97
-				$modx->setPlaceholder('login_message', "<p><span class=\"fail\">" . $_lang["login_cancelled_site_was_updated"] . "</p><p>" . $_lang["login_message"] . "</p>");
97
+				$modx->setPlaceholder('login_message', "<p><span class=\"fail\">".$_lang["login_cancelled_site_was_updated"]."</p><p>".$_lang["login_message"]."</p>");
98 98
 				break;
99 99
 		}
100 100
 	}
101 101
 
102
-	if($modx->config['use_captcha'] == 1) {
102
+	if ($modx->config['use_captcha'] == 1) {
103 103
 		$modx->setPlaceholder('login_captcha_message', $_lang["login_captcha_message"]);
104
-		$modx->setPlaceholder('captcha_image', '<a href="' . MODX_MANAGER_URL . '" class="loginCaptcha"><img id="captcha_image" src="' . MODX_MANAGER_URL . 'includes/veriword.php?rand=' . rand() . '" alt="' . $_lang["login_captcha_message"] . '" /></a>');
105
-		$modx->setPlaceholder('captcha_input', '<label>' . $_lang["captcha_code"] . '</label> <input type="text" name="captcha_code" tabindex="3" value="" />');
104
+		$modx->setPlaceholder('captcha_image', '<a href="'.MODX_MANAGER_URL.'" class="loginCaptcha"><img id="captcha_image" src="'.MODX_MANAGER_URL.'includes/veriword.php?rand='.rand().'" alt="'.$_lang["login_captcha_message"].'" /></a>');
105
+		$modx->setPlaceholder('captcha_input', '<label>'.$_lang["captcha_code"].'</label> <input type="text" name="captcha_code" tabindex="3" value="" />');
106 106
 	}
107 107
 
108 108
 	// login info
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 
120 120
 	// invoke OnManagerLoginFormRender event
121 121
 	$evtOut = $modx->invokeEvent('OnManagerLoginFormRender');
122
-	$html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">' . implode('', $evtOut) . '</div>' : '';
122
+	$html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">'.implode('', $evtOut).'</div>' : '';
123 123
 	$modx->setPlaceholder('OnManagerLoginFormRender', $html);
124 124
 
125 125
 	// load template
@@ -128,38 +128,38 @@  discard block
 block discarded – undo
128 128
 	$target = $modx->mergeSettingsContent($target);
129 129
 
130 130
 	$login_tpl = null;
131
-	if(substr($target, 0, 1) === '@') {
132
-		if(substr($target, 0, 6) === '@CHUNK') {
131
+	if (substr($target, 0, 1) === '@') {
132
+		if (substr($target, 0, 6) === '@CHUNK') {
133 133
 			$target = trim(substr($target, 7));
134 134
 			$login_tpl = $modx->getChunk($target);
135
-		} elseif(substr($target, 0, 5) === '@FILE') {
135
+		} elseif (substr($target, 0, 5) === '@FILE') {
136 136
 			$target = trim(substr($target, 6));
137 137
 			$login_tpl = file_get_contents($target);
138 138
 		}
139 139
 	} else {
140
-		$theme_path = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/';
141
-		if(is_file($theme_path . 'style.php')) {
142
-			include($theme_path . 'style.php');
140
+		$theme_path = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/';
141
+		if (is_file($theme_path.'style.php')) {
142
+			include($theme_path.'style.php');
143 143
 		}
144 144
 		$chunk = $modx->getChunk($target);
145
-		if($chunk !== false && !empty($chunk)) {
145
+		if ($chunk !== false && !empty($chunk)) {
146 146
 			$login_tpl = $chunk;
147
-		} elseif(is_file(MODX_BASE_PATH . $target)) {
148
-			$target = MODX_BASE_PATH . $target;
147
+		} elseif (is_file(MODX_BASE_PATH.$target)) {
148
+			$target = MODX_BASE_PATH.$target;
149 149
 			$login_tpl = file_get_contents($target);
150
-		} elseif(is_file($target)) {
150
+		} elseif (is_file($target)) {
151 151
 			$login_tpl = file_get_contents($target);
152
-		} elseif(is_file($theme_path . 'login.tpl')) {
153
-			$target = $theme_path . 'login.tpl';
152
+		} elseif (is_file($theme_path.'login.tpl')) {
153
+			$target = $theme_path.'login.tpl';
154 154
 			$login_tpl = file_get_contents($target);
155
-		} elseif(is_file($theme_path . 'templates/actions/login.tpl')) {
156
-			$target = $theme_path . 'templates/actions/login.tpl';
155
+		} elseif (is_file($theme_path.'templates/actions/login.tpl')) {
156
+			$target = $theme_path.'templates/actions/login.tpl';
157 157
 			$login_tpl = file_get_contents($target);
158
-		} elseif(is_file($theme_path . 'html/login.html')) { // ClipperCMS compatible
159
-			$target = $theme_path . 'html/login.html';
158
+		} elseif (is_file($theme_path.'html/login.html')) { // ClipperCMS compatible
159
+			$target = $theme_path.'html/login.html';
160 160
 			$login_tpl = file_get_contents($target);
161 161
 		} else {
162
-			$target = MODX_MANAGER_PATH . 'media/style/common/login.tpl';
162
+			$target = MODX_MANAGER_PATH.'media/style/common/login.tpl';
163 163
 			$login_tpl = file_get_contents($target);
164 164
 		}
165 165
 	}
@@ -182,8 +182,8 @@  discard block
 block discarded – undo
182 182
 	$lasthittime = time();
183 183
 	$action = isset($_REQUEST['a']) ? (int) $_REQUEST['a'] : 1;
184 184
 
185
-	if($action !== 1) {
186
-		if(!intval($itemid)) {
185
+	if ($action !== 1) {
186
+		if (!intval($itemid)) {
187 187
 			$itemid = null;
188 188
 		}
189 189
 		$sql = sprintf("REPLACE INTO %s (sid, internalKey, username, lasthit, action, id) VALUES ('%s', %d, '%s', %d, '%s', %s)", $modx->getFullTableName('active_users') // Table
Please login to merge, or discard this patch.
manager/includes/debug.inc.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@  discard block
 block discarded – undo
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
 
6 6
 // show debug information
7
-if(isset($enable_debug) && $enable_debug==true) {
7
+if (isset($enable_debug) && $enable_debug == true) {
8 8
 	?>
9 9
 	<script language="javascript">
10 10
 	//document.onload = removeDebug();
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 	}
36 36
 	</style>
37 37
 	<?php
38
-	$mtime = microtime(); $mtime = explode(" ",$mtime); $mtime = $mtime[1] + $mtime[0]; $tend = $mtime; $totaltime = ($tend - $tstart);
38
+	$mtime = microtime(); $mtime = explode(" ", $mtime); $mtime = $mtime[1] + $mtime[0]; $tend = $mtime; $totaltime = ($tend - $tstart);
39 39
 	?>
40 40
 	<div class='debug' id='debug' name='debug' onClick="removeDebugDiv();">
41 41
 		<table border="0" cellspacing="0" cellpadding="0">
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 		  </tr>
45 45
 		  <tr>
46 46
 			<td width="70">Time taken</td>
47
-			<td width="80"><?php echo printf ("%6.5f s", $totaltime); ?></td>
47
+			<td width="80"><?php echo printf("%6.5f s", $totaltime); ?></td>
48 48
 		  </tr>
49 49
 		</table>
50 50
 	</div>
Please login to merge, or discard this patch.
manager/includes/footer.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@  discard block
 block discarded – undo
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
 global $SystemAlertMsgQueque;
6 6
 // display system alert window if messages are available
7
-if(count($SystemAlertMsgQueque) > 0) {
7
+if (count($SystemAlertMsgQueque) > 0) {
8 8
 	include "sysalert.display.inc.php";
9 9
 }
10 10
 ?>
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 	});
19 19
 </script>
20 20
 <?php
21
-if(in_array($modx->manager->action, array(
21
+if (in_array($modx->manager->action, array(
22 22
 	85,
23 23
 	27,
24 24
 	4,
Please login to merge, or discard this patch.
manager/processors/export_site.processor.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@  discard block
 block discarded – undo
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('export_static')) {
5
+if (!$modx->hasPermission('export_static')) {
6 6
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7 7
 }
8 8
 
@@ -12,15 +12,15 @@  discard block
 block discarded – undo
12 12
 $modx->loadExtension('EXPORT_SITE');
13 13
 
14 14
 
15
-if(is_dir(MODX_BASE_PATH . 'temp'))       $export_dir = MODX_BASE_PATH . 'temp/export';
16
-elseif(is_dir(MODX_BASE_PATH . 'assets')) $export_dir = MODX_BASE_PATH . 'assets/export';
15
+if (is_dir(MODX_BASE_PATH.'temp'))       $export_dir = MODX_BASE_PATH.'temp/export';
16
+elseif (is_dir(MODX_BASE_PATH.'assets')) $export_dir = MODX_BASE_PATH.'assets/export';
17 17
 $modx->export->targetDir = $export_dir;
18 18
 
19
-if(strpos($modx->config['base_path'],"{$export_dir}/")===0 && 0 <= strlen(str_replace("{$export_dir}/",'',$modx->config['base_path'])))
19
+if (strpos($modx->config['base_path'], "{$export_dir}/") === 0 && 0 <= strlen(str_replace("{$export_dir}/", '', $modx->config['base_path'])))
20 20
 	return $_lang['export_site.static.php6'];
21
-elseif($modx->config['rb_base_dir'] === $export_dir . '/')
22
-	return $modx->parsePlaceholder($_lang['export_site.static.php7'],'rb_base_url=' . $modx->config['base_url'] . $modx->config['rb_base_url']);
23
-elseif(!is_writable($export_dir))
21
+elseif ($modx->config['rb_base_dir'] === $export_dir.'/')
22
+	return $modx->parsePlaceholder($_lang['export_site.static.php7'], 'rb_base_url='.$modx->config['base_url'].$modx->config['rb_base_url']);
23
+elseif (!is_writable($export_dir))
24 24
 	return $_lang['export_site_target_unwritable'];
25 25
 
26 26
 $modx->export->generate_mode = $_POST['generate_mode'];
@@ -33,10 +33,10 @@  discard block
 block discarded – undo
33 33
 $repl_after      = $_POST['repl_after'];
34 34
 $includenoncache = $_POST['includenoncache'];
35 35
 
36
-if($ignore_ids!==$_POST['ignore_ids']
37
- ||$includenoncache!==$_POST['includenoncache']
38
- ||$repl_before!==$_POST['repl_before']
39
- ||$repl_after !==$_POST['repl_after']) {
36
+if ($ignore_ids !== $_POST['ignore_ids']
37
+ ||$includenoncache !== $_POST['includenoncache']
38
+ ||$repl_before !== $_POST['repl_before']
39
+ ||$repl_after !== $_POST['repl_after']) {
40 40
 	$modx->clearCache('full');
41 41
 }
42 42
 
@@ -52,5 +52,5 @@  discard block
 block discarded – undo
52 52
 
53 53
 $exportend = $modx->export->get_mtime();
54 54
 $totaltime = ($exportend - $modx->export->exportstart);
55
-$output .= sprintf ('<p>'.$_lang["export_site_time"].'</p>', round($totaltime, 3));
55
+$output .= sprintf('<p>'.$_lang["export_site_time"].'</p>', round($totaltime, 3));
56 56
 return $output;
Please login to merge, or discard this patch.
manager/processors/delete_module.processor.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@  discard block
 block discarded – undo
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'])? intval($_GET['id']) : 0;
10
-if($id==0) {
9
+$id = isset($_GET['id']) ? intval($_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
 block discarded – undo
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);
Please login to merge, or discard this patch.
manager/processors/duplicate_content.processor.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,27 +1,27 @@  discard block
 block discarded – undo
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'])? intval($_GET['id']) : 0;
10
-if($id==0) {
9
+$id = isset($_GET['id']) ? intval($_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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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');
Please login to merge, or discard this patch.
manager/processors/delete_eventlog.processor.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@  discard block
 block discarded – undo
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_eventlog')) {
5
+if (!$modx->hasPermission('delete_eventlog')) {
6 6
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7 7
 }
8 8
 
9
-if (isset($_GET['cls']) && $_GET['cls']==1) {
9
+if (isset($_GET['cls']) && $_GET['cls'] == 1) {
10 10
 	$where = '';
11 11
 } else {
12
-	$id = isset($_GET['id'])? intval($_GET['id']) : 0;
13
-	if($id==0) {
12
+	$id = isset($_GET['id']) ? intval($_GET['id']) : 0;
13
+	if ($id == 0) {
14 14
 		$modx->webAlertAndQuit($_lang["error_no_id"]);
15 15
 	}
16 16
 	$where = "id='{$id}'";
@@ -19,5 +19,5 @@  discard block
 block discarded – undo
19 19
 // delete event log
20 20
 $modx->db->delete($modx->getFullTableName('event_log'), $where);
21 21
 
22
-$header="Location: index.php?a=114";
22
+$header = "Location: index.php?a=114";
23 23
 header($header);
Please login to merge, or discard this patch.
manager/processors/delete_user.processor.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,18 +1,18 @@  discard block
 block discarded – undo
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_user')) {
5
+if (!$modx->hasPermission('delete_user')) {
6 6
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7 7
 }
8 8
 
9
-$id = isset($_GET['id'])? intval($_GET['id']) : 0;
10
-if($id==0) {
9
+$id = isset($_GET['id']) ? intval($_GET['id']) : 0;
10
+if ($id == 0) {
11 11
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
12 12
 }
13 13
 
14 14
 // delete the user, but first check if we are deleting our own record
15
-if($id==$modx->getLoginUserID()) {
15
+if ($id == $modx->getLoginUserID()) {
16 16
 	$modx->webAlertAndQuit("You can't delete yourself!");
17 17
 }
18 18
 
@@ -50,5 +50,5 @@  discard block
 block discarded – undo
50 50
 		"id"	=> $id
51 51
 	));
52 52
 
53
-$header="Location: index.php?a=75";
53
+$header = "Location: index.php?a=75";
54 54
 header($header);
Please login to merge, or discard this patch.
manager/processors/duplicate_plugin.processor.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,20 +1,20 @@  discard block
 block discarded – undo
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_plugin')) {
5
+if (!$modx->hasPermission('new_plugin')) {
6 6
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7 7
 }
8 8
 
9
-$id = isset($_GET['id'])? intval($_GET['id']) : 0;
10
-if($id==0) {
9
+$id = isset($_GET['id']) ? intval($_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_plugins'), "id='{$id}'"));
16 16
 $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_plugins'), "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 Plugin
@@ -44,5 +44,5 @@  discard block
 block discarded – undo
44 44
 $_SESSION['itemname'] = $name;
45 45
 
46 46
 // finish duplicating - redirect to new plugin
47
-$header="Location: index.php?r=2&a=102&id=$newid";
47
+$header = "Location: index.php?r=2&a=102&id=$newid";
48 48
 header($header);
Please login to merge, or discard this patch.