Completed
Push — develop ( 0132ab...e45b08 )
by Dmytro
13:40 queued 05:11
created
manager/media/browser/mcpuk/core/uploader.php 1 patch
Indentation   +74 added lines, -74 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 /** This file is part of KCFinder project
4
-  *
5
-  *      @desc Uploader class
6
-  *   @package KCFinder
7
-  *   @version 2.54
8
-  *    @author Pavel Tzonkov <[email protected]>
9
-  * @copyright 2010-2014 KCFinder Project
10
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
11
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
12
-  *      @link http://kcfinder.sunhater.com
13
-  */
4
+ *
5
+ *      @desc Uploader class
6
+ *   @package KCFinder
7
+ *   @version 2.54
8
+ *    @author Pavel Tzonkov <[email protected]>
9
+ * @copyright 2010-2014 KCFinder Project
10
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
11
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
12
+ *      @link http://kcfinder.sunhater.com
13
+ */
14 14
 
15 15
 class uploader {
16 16
 
@@ -18,92 +18,92 @@  discard block
 block discarded – undo
18 18
     const VERSION = "2.54";
19 19
 
20 20
 /** Config session-overrided settings
21
-  * @var array */
21
+ * @var array */
22 22
     protected $config = array();
23 23
 
24 24
 /** Default image driver
25
-  * @var string */
25
+ * @var string */
26 26
     protected $imageDriver = "gd";
27 27
 
28 28
 /** Opener applocation properties
29
-  *   $opener['name']                 Got from $_GET['opener'];
30
-  *   $opener['CKEditor']['funcNum']  CKEditor function number (got from $_GET)
31
-  *   $opener['TinyMCE']              Boolean
32
-  * @var array */
29
+ *   $opener['name']                 Got from $_GET['opener'];
30
+ *   $opener['CKEditor']['funcNum']  CKEditor function number (got from $_GET)
31
+ *   $opener['TinyMCE']              Boolean
32
+ * @var array */
33 33
     protected $opener = array();
34 34
 
35 35
 /** Got from $_GET['type'] or first one $config['types'] array key, if inexistant
36
-  * @var string */
36
+ * @var string */
37 37
     protected $type;
38 38
 
39 39
 /** Helper property. Local filesystem path to the Type Directory
40
-  * Equivalent: $config['uploadDir'] . "/" . $type
41
-  * @var string */
40
+ * Equivalent: $config['uploadDir'] . "/" . $type
41
+ * @var string */
42 42
     protected $typeDir;
43 43
 
44 44
 /** Helper property. Web URL to the Type Directory
45
-  * Equivalent: $config['uploadURL'] . "/" . $type
46
-  * @var string */
45
+ * Equivalent: $config['uploadURL'] . "/" . $type
46
+ * @var string */
47 47
     protected $typeURL;
48 48
 
49 49
 /** Linked to $config['types']
50
-  * @var array */
50
+ * @var array */
51 51
     protected $types = array();
52 52
 
53 53
 /** Settings which can override default settings if exists as keys in $config['types'][$type] array
54
-  * @var array */
54
+ * @var array */
55 55
     protected $typeSettings = array('disabled', 'theme', 'dirPerms', 'filePerms', 'denyZipDownload', 'maxImageWidth', 'maxImageHeight', 'thumbWidth', 'thumbHeight', 'jpegQuality', 'access', 'filenameChangeChars', 'dirnameChangeChars', 'denyExtensionRename', 'deniedExts', 'watermark');
56 56
 
57 57
 /** Got from language file
58
-  * @var string */
58
+ * @var string */
59 59
     protected $charset;
60 60
 
61 61
 /** The language got from $_GET['lng'] or $_GET['lang'] or... Please see next property
62
-  * @var string */
62
+ * @var string */
63 63
     protected $lang = 'en';
64 64
 
65 65
 /** Possible language $_GET keys
66
-  * @var array */
66
+ * @var array */
67 67
     protected $langInputNames = array('lang', 'langCode', 'lng', 'language', 'lang_code');
68 68
 
69 69
 /** Uploaded file(s) info. Linked to first $_FILES element
70
-  * @var array */
70
+ * @var array */
71 71
     protected $file;
72 72
 
73 73
 /** Next three properties are got from the current language file
74
-  * @var string */
74
+ * @var string */
75 75
     protected $dateTimeFull;   // Currently not used
76 76
     protected $dateTimeMid;    // Currently not used
77 77
     protected $dateTimeSmall;
78 78
 
79 79
 /** Contain Specified language labels
80
-  * @var array */
80
+ * @var array */
81 81
     protected $labels = array();
82 82
 
83 83
 /** Contain unprocessed $_GET array. Please use this instead of $_GET
84
-  * @var array */
84
+ * @var array */
85 85
     protected $get;
86 86
 
87 87
 /** Contain unprocessed $_POST array. Please use this instead of $_POST
88
-  * @var array */
88
+ * @var array */
89 89
     protected $post;
90 90
 
91 91
 /** Contain unprocessed $_COOKIE array. Please use this instead of $_COOKIE
92
-  * @var array */
92
+ * @var array */
93 93
     protected $cookie;
94 94
 
95 95
 /** Session array. Please use this property instead of $_SESSION
96
-  * @var array */
96
+ * @var array */
97 97
     protected $session;
98 98
 
99 99
 /** CMS integration attribute (got from $_GET['cms'])
100
-  * @var string */
100
+ * @var string */
101 101
     protected $cms = "";
102 102
 
103 103
     protected $modx = null;
104 104
 /** Magic method which allows read-only access to protected or private class properties
105
-  * @param string $property
106
-  * @return mixed */
105
+     * @param string $property
106
+     * @return mixed */
107 107
     public function __get($property) {
108 108
         return property_exists($this, $property) ? $this->$property : null;
109 109
     }
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
         )
133 133
             $this->cms = $this->get['cms'];
134 134
 
135
-		// LINKING UPLOADED FILE
135
+        // LINKING UPLOADED FILE
136 136
         if (count($_FILES))
137 137
             $this->file = &$_FILES[key($_FILES)];
138 138
 
@@ -228,8 +228,8 @@  discard block
 block discarded – undo
228 228
             $this->config['uploadDir'] = strlen($this->config['uploadDir'])
229 229
                 ? path::normalize($this->config['uploadDir'])
230 230
                 : path::url2fullPath("/$path");
231
-         $this->typeDir = "{$this->config['uploadDir']}/{$this->type}";
232
-         $this->typeURL = "{$this->config['siteURL']}/{$this->config['uploadURL']}/{$this->type}";
231
+            $this->typeDir = "{$this->config['uploadDir']}/{$this->type}";
232
+            $this->typeURL = "{$this->config['siteURL']}/{$this->config['uploadURL']}/{$this->type}";
233 233
 
234 234
         // SITE ROOT
235 235
         } elseif ($this->config['uploadURL'] == "/") {
@@ -365,36 +365,36 @@  discard block
 block discarded – undo
365 365
     }
366 366
 
367 367
 
368
-	protected function getTransaliasSettings() {
369
-		$modx = evolutionCMS();
370
-
371
-		// Cleaning uploaded filename?
372
-		$setting = $modx->db->select('count(*)', $modx->getFullTableName('system_settings'), 'setting_name="clean_uploaded_filename" AND setting_value=1');
373
-		if ($modx->db->getValue($setting)>0) {
374
-			// Transalias plugin active?
375
-			$res = $modx->db->select('properties', $modx->getFullTableName('site_plugins'), 'name="TransAlias" AND disabled=0');
376
-			if ($properties = $modx->db->getValue($res)) {
377
-				$properties = $modx->parseProperties($properties, 'TransAlias', 'plugin');
378
-			} else {
379
-				$properties = NULL;
380
-			}
381
-		} else {
382
-			$properties = NULL;
383
-		}
384
-		return $properties;
385
-	}
386
-
387
-
388
-	protected function normalizeFilename($filename) {
389
-		if ($this->getTransaliasSettings()) {
390
-        		$format = strrchr($filename, ".");
391
-        		$filename = str_replace($format, "", $filename);
392
-            		$filename = $this->modx->stripAlias($filename).$format;
393
-        	}
394
-        	return $filename;
395
-	}
396
-
397
-	protected function normalizeDirname($dirname) {
368
+    protected function getTransaliasSettings() {
369
+        $modx = evolutionCMS();
370
+
371
+        // Cleaning uploaded filename?
372
+        $setting = $modx->db->select('count(*)', $modx->getFullTableName('system_settings'), 'setting_name="clean_uploaded_filename" AND setting_value=1');
373
+        if ($modx->db->getValue($setting)>0) {
374
+            // Transalias plugin active?
375
+            $res = $modx->db->select('properties', $modx->getFullTableName('site_plugins'), 'name="TransAlias" AND disabled=0');
376
+            if ($properties = $modx->db->getValue($res)) {
377
+                $properties = $modx->parseProperties($properties, 'TransAlias', 'plugin');
378
+            } else {
379
+                $properties = NULL;
380
+            }
381
+        } else {
382
+            $properties = NULL;
383
+        }
384
+        return $properties;
385
+    }
386
+
387
+
388
+    protected function normalizeFilename($filename) {
389
+        if ($this->getTransaliasSettings()) {
390
+                $format = strrchr($filename, ".");
391
+                $filename = str_replace($format, "", $filename);
392
+                    $filename = $this->modx->stripAlias($filename).$format;
393
+            }
394
+            return $filename;
395
+    }
396
+
397
+    protected function normalizeDirname($dirname) {
398 398
         return $this->modx->stripAlias($dirname);
399 399
     }
400 400
 
@@ -472,10 +472,10 @@  discard block
 block discarded – undo
472 472
             return $this->label("The image is too big and/or cannot be resized.");
473 473
 
474 474
 
475
-	// CHECK FOR MODX MAX FILE SIZE
476
-	$actualfilesize=filesize($file['tmp_name']);
477
-	if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize'])
478
-	    return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
475
+    // CHECK FOR MODX MAX FILE SIZE
476
+    $actualfilesize=filesize($file['tmp_name']);
477
+    if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize'])
478
+        return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
479 479
 
480 480
         return true;
481 481
     }
@@ -627,7 +627,7 @@  discard block
 block discarded – undo
627 627
             $top = isset($this->config['watermark']['top'])
628 628
                 ? $this->config['watermark']['top'] : false;
629 629
             $img->watermark($this->config['watermark']['file'], $left, $top);
630
-		}
630
+        }
631 631
 
632 632
         $options = array( 'file' => $file );
633 633
 
Please login to merge, or discard this patch.
manager/index.php 1 patch
Indentation   +618 added lines, -618 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 
51 51
 $autoloader = realpath(__DIR__.'/../vendor/autoload.php');
52 52
 if (file_exists($autoloader) && is_readable($autoloader)) {
53
-	include_once($autoloader);
53
+    include_once($autoloader);
54 54
 }
55 55
 
56 56
 // get start time
@@ -65,22 +65,22 @@  discard block
 block discarded – undo
65 65
 $site_hostnames_path = $base_path . 'assets/cache/siteHostnames.php';
66 66
 if(is_file($site_hostnames_path)) include_once($site_hostnames_path);
67 67
 if(!defined('MGR_DIR') || MGR_DIR!==$mgr_dir) {
68
-	$src = "<?php\n";
69
-	$src .= "define('MGR_DIR', '{$mgr_dir}');\n";
70
-	$rs = file_put_contents($site_mgr_path,$src);
71
-	if(!$rs) {
72
-		echo 'siteManager.php write error';
73
-		exit;
74
-	}
75
-	sleep(1);
76
-	header('Location:' . $_SERVER['REQUEST_URI']);
77
-	exit;
68
+    $src = "<?php\n";
69
+    $src .= "define('MGR_DIR', '{$mgr_dir}');\n";
70
+    $rs = file_put_contents($site_mgr_path,$src);
71
+    if(!$rs) {
72
+        echo 'siteManager.php write error';
73
+        exit;
74
+    }
75
+    sleep(1);
76
+    header('Location:' . $_SERVER['REQUEST_URI']);
77
+    exit;
78 78
 }
79 79
 
80 80
 // we use this to make sure files are accessed through
81 81
 // the manager instead of seperately.
82 82
 if ( ! defined('IN_MANAGER_MODE')) {
83
-	define('IN_MANAGER_MODE', true);
83
+    define('IN_MANAGER_MODE', true);
84 84
 }
85 85
 
86 86
 // harden it
@@ -101,16 +101,16 @@  discard block
 block discarded – undo
101 101
 
102 102
 // check PHP version. EVO is compatible with php 5 (5.0.0+)
103 103
 $php_ver_comp =  version_compare(phpversion(), "5.0.0");
104
-		// -1 if left is less, 0 if equal, +1 if left is higher
104
+        // -1 if left is less, 0 if equal, +1 if left is higher
105 105
 if($php_ver_comp < 0) {
106
-	echo sprintf($_lang['php_version_check'], phpversion());
107
-	exit;
106
+    echo sprintf($_lang['php_version_check'], phpversion());
107
+    exit;
108 108
 }
109 109
 
110 110
 // check if iconv is installed
111 111
 if(!function_exists('iconv')) {
112
-	echo $_lang['iconv_not_available'];
113
-	exit;
112
+    echo $_lang['iconv_not_available'];
113
+    exit;
114 114
 }
115 115
 
116 116
 // set some runtime options
@@ -123,15 +123,15 @@  discard block
 block discarded – undo
123 123
 
124 124
 // set the document_root :|
125 125
 if(!isset($_SERVER['DOCUMENT_ROOT']) || empty($_SERVER['DOCUMENT_ROOT'])) {
126
-	$_SERVER['DOCUMENT_ROOT'] = str_replace($_SERVER['PATH_INFO'], "", preg_replace("/\\\\/", "/", $_SERVER['PATH_TRANSLATED']))."/";
126
+    $_SERVER['DOCUMENT_ROOT'] = str_replace($_SERVER['PATH_INFO'], "", preg_replace("/\\\\/", "/", $_SERVER['PATH_TRANSLATED']))."/";
127 127
 }
128 128
 
129 129
 // include_once config file
130 130
 $config_filename = "./includes/config.inc.php";
131 131
 if (!file_exists($config_filename)) {
132
-	echo "<h3>Unable to load configuration settings</h3>";
133
-	echo "Please run the EVO <a href='../install'>install utility</a>";
134
-	exit;
132
+    echo "<h3>Unable to load configuration settings</h3>";
133
+    echo "Please run the EVO <a href='../install'>install utility</a>";
134
+    exit;
135 135
 }
136 136
 
137 137
 // include the database configuration file
@@ -139,11 +139,11 @@  discard block
 block discarded – undo
139 139
 
140 140
 // initiate the content manager class
141 141
 if (isset($coreClass) && class_exists($coreClass)) {
142
-	$modx = new $coreClass;
142
+    $modx = new $coreClass;
143 143
 }
144 144
 if (!isset($modx) || !($modx instanceof DocumentParser)) {
145
-	include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
146
-	$modx = evolutionCMS();
145
+    include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
146
+    $modx = evolutionCMS();
147 147
 }
148 148
 
149 149
 $modx->loadExtension("ManagerAPI");
@@ -166,25 +166,25 @@  discard block
 block discarded – undo
166 166
 
167 167
 // now include_once different language file as english
168 168
 if(!isset($manager_language) || !file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
169
-	$manager_language = "english"; // if not set, get the english language file.
169
+    $manager_language = "english"; // if not set, get the english language file.
170 170
 }
171 171
 
172 172
 // $length_eng_lang = count($_lang); // Not used for now, required for difference-check with other languages than english (i.e. inside installer)
173 173
 
174 174
 if($manager_language!="english" && file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
175
-	include_once "lang/".$manager_language.".inc.php";
175
+    include_once "lang/".$manager_language.".inc.php";
176 176
 }
177 177
 
178 178
 // allow custom language overrides not altered by future EVO-updates
179 179
 if(file_exists(MODX_MANAGER_PATH."includes/lang/override/".$manager_language.".inc.php")) {
180
-	include_once "lang/override/".$manager_language.".inc.php";
180
+    include_once "lang/override/".$manager_language.".inc.php";
181 181
 }
182 182
 
183 183
 $s = array('[+MGR_DIR+]');
184 184
 $r = array(MGR_DIR);
185 185
 foreach($_lang as $k=>$v)
186 186
 {
187
-	if(strpos($v,'[+')!==false) $_lang[$k] = str_replace($s, $r, $v);
187
+    if(strpos($v,'[+')!==false) $_lang[$k] = str_replace($s, $r, $v);
188 188
 }
189 189
 
190 190
 // send the charset header
@@ -199,19 +199,19 @@  discard block
 block discarded – undo
199 199
 
200 200
 // double check the session
201 201
 if(!isset($_SESSION['mgrValidated'])){
202
-	echo "Not Logged In!";
203
-	exit;
202
+    echo "Not Logged In!";
203
+    exit;
204 204
 }
205 205
 
206 206
 // include_once the style variables file
207 207
 if(isset($manager_theme) && !isset($_style)) {
208
-	$_style = array();
209
-	include_once "media/style/".$manager_theme."/style.php";
208
+    $_style = array();
209
+    include_once "media/style/".$manager_theme."/style.php";
210 210
 }
211 211
 
212 212
 // check if user is allowed to access manager interface
213 213
 if(isset($allow_manager_access) && $allow_manager_access==0) {
214
-	include_once "manager.lockout.inc.php";
214
+    include_once "manager.lockout.inc.php";
215 215
 }
216 216
 
217 217
 // Initialize System Alert Message Queque
@@ -220,13 +220,13 @@  discard block
 block discarded – undo
220 220
 
221 221
 // first we check to see if this is a frameset request
222 222
 if(!isset($_POST['a']) && !isset($_GET['a']) && !isset($_POST['updateMsgCount'])) {
223
-	// this looks to be a top-level frameset request, so let's serve up a frameset
224
-	if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/frames/1.php")) {
225
-		include_once "media/style/".$manager_theme."/frames/1.php";
226
-	}else{
227
-		include_once "frames/1.php";
228
-	}
229
-	exit;
223
+    // this looks to be a top-level frameset request, so let's serve up a frameset
224
+    if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/frames/1.php")) {
225
+        include_once "media/style/".$manager_theme."/frames/1.php";
226
+    }else{
227
+        include_once "frames/1.php";
228
+    }
229
+    exit;
230 230
 }
231 231
 
232 232
 // OK, let's retrieve the action directive from the request
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
 else                       $action = null;
238 238
 
239 239
 if (isset($_POST['updateMsgCount']) && $modx->hasPermission('messages')) {
240
-	include_once 'messageCount.inc.php';
240
+    include_once 'messageCount.inc.php';
241 241
 }
242 242
 
243 243
 // save page to manager object
@@ -245,19 +245,19 @@  discard block
 block discarded – undo
245 245
 
246 246
 // attempt to foil some simple types of CSRF attacks
247 247
 if (isset($modx->config['validate_referer']) && (int)$modx->config['validate_referer']) {
248
-	if (isset($_SERVER['HTTP_REFERER'])) {
249
-		$referer = $_SERVER['HTTP_REFERER'];
250
-
251
-		if (!empty($referer)) {
252
-			if (!preg_match('/^'.preg_quote(MODX_SITE_URL, '/').'/i', $referer)) {
253
-				$modx->webAlertAndQuit("A possible CSRF attempt was detected from referer: {$referer}.", "index.php");
254
-			}
255
-		} else {
256
-				$modx->webAlertAndQuit("A possible CSRF attempt was detected. No referer was provided by the client.", "index.php");
257
-		}
258
-	} else {
259
-		$modx->webAlertAndQuit("A possible CSRF attempt was detected. No referer was provided by the server.", "index.php");
260
-	}
248
+    if (isset($_SERVER['HTTP_REFERER'])) {
249
+        $referer = $_SERVER['HTTP_REFERER'];
250
+
251
+        if (!empty($referer)) {
252
+            if (!preg_match('/^'.preg_quote(MODX_SITE_URL, '/').'/i', $referer)) {
253
+                $modx->webAlertAndQuit("A possible CSRF attempt was detected from referer: {$referer}.", "index.php");
254
+            }
255
+        } else {
256
+                $modx->webAlertAndQuit("A possible CSRF attempt was detected. No referer was provided by the client.", "index.php");
257
+        }
258
+    } else {
259
+        $modx->webAlertAndQuit("A possible CSRF attempt was detected. No referer was provided by the server.", "index.php");
260
+    }
261 261
 }
262 262
 
263 263
 // invoke OnManagerPageInit event
@@ -265,13 +265,13 @@  discard block
 block discarded – undo
265 265
 
266 266
 // return element filepath
267 267
 function includeFileProcessor ($filepath,$manager_theme) {
268
-	$element = "";
269
-	if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath)) {
270
-		$element = MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath;
271
-	}else{
272
-		$element = $filepath;
273
-	}
274
-	return $element;
268
+    $element = "";
269
+    if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath)) {
270
+        $element = MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath;
271
+    }else{
272
+        $element = $filepath;
273
+    }
274
+    return $element;
275 275
 }
276 276
 
277 277
 // Now we decide what to do according to the action request. This is a BIG list :)
@@ -279,714 +279,714 @@  discard block
 block discarded – undo
279 279
 /********************************************************************/
280 280
 /* frame management - show the requested frame                      */
281 281
 /********************************************************************/
282
-	case 1 :
283
-		// get the requested frame
284
-		$frame = preg_replace('/[^a-z0-9]/i','',$_REQUEST['f']);
285
-		if($frame>9) {
286
-			$enable_debug=false;    // this is to stop the debug thingy being attached to the framesets
287
-		}
288
-		include_once(includeFileProcessor("frames/".$frame.".php",$manager_theme));
289
-	break;
282
+    case 1 :
283
+        // get the requested frame
284
+        $frame = preg_replace('/[^a-z0-9]/i','',$_REQUEST['f']);
285
+        if($frame>9) {
286
+            $enable_debug=false;    // this is to stop the debug thingy being attached to the framesets
287
+        }
288
+        include_once(includeFileProcessor("frames/".$frame.".php",$manager_theme));
289
+    break;
290 290
 /********************************************************************/
291 291
 /* show the homepage                                                */
292 292
 /********************************************************************/
293
-	case 2:
294
-		// get the home page
295
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
296
-		include_once(includeFileProcessor("actions/welcome.static.php",$manager_theme));
297
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
298
-	break;
293
+    case 2:
294
+        // get the home page
295
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
296
+        include_once(includeFileProcessor("actions/welcome.static.php",$manager_theme));
297
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
298
+    break;
299 299
 /********************************************************************/
300 300
 /* document data                                                    */
301 301
 /********************************************************************/
302
-	case 3:
303
-		// get the page to show document's data
304
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
305
-		include_once(includeFileProcessor("actions/document_data.static.php",$manager_theme));
306
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
307
-	break;
302
+    case 3:
303
+        // get the page to show document's data
304
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
305
+        include_once(includeFileProcessor("actions/document_data.static.php",$manager_theme));
306
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
307
+    break;
308 308
 /********************************************************************/
309 309
 /* content management                                               */
310 310
 /********************************************************************/
311
-	case 85:
312
-		// get the mutate page for adding a folder
313
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
314
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
315
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
316
-	break;
317
-	case 27:
318
-		// get the mutate page for changing content
319
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
320
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
321
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
322
-	break;
323
-	case 4:
324
-		// get the mutate page for adding content
325
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
326
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
327
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
328
-	break;
329
-	case 5:
330
-		// get the save processor
331
-		include_once(includeFileProcessor("processors/save_content.processor.php",$manager_theme));
332
-	break;
333
-	case 6:
334
-		// get the delete processor
335
-		include_once(includeFileProcessor("processors/delete_content.processor.php",$manager_theme));
336
-	break;
337
-	case 63:
338
-		// get the undelete processor
339
-		include_once(includeFileProcessor("processors/undelete_content.processor.php",$manager_theme));
340
-	break;
341
-	case 51:
342
-		// get the move action
343
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
344
-		include_once(includeFileProcessor("actions/move_document.dynamic.php",$manager_theme));
345
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
346
-	break;
347
-	case 52:
348
-		// get the move document processor
349
-		include_once(includeFileProcessor("processors/move_document.processor.php",$manager_theme));
350
-	break;
351
-	case 61:
352
-		// get the processor for publishing content
353
-		include_once(includeFileProcessor("processors/publish_content.processor.php",$manager_theme));
354
-	break;
355
-	case 62:
356
-		// get the processor for publishing content
357
-		include_once(includeFileProcessor("processors/unpublish_content.processor.php",$manager_theme));
358
-	break;
359
-	case 56:
360
-		// get the sort menuindex action
361
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
362
-		include_once(includeFileProcessor("actions/mutate_menuindex_sort.dynamic.php",$manager_theme));
363
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
364
-		break;
311
+    case 85:
312
+        // get the mutate page for adding a folder
313
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
314
+        include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
315
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
316
+    break;
317
+    case 27:
318
+        // get the mutate page for changing content
319
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
320
+        include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
321
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
322
+    break;
323
+    case 4:
324
+        // get the mutate page for adding content
325
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
326
+        include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
327
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
328
+    break;
329
+    case 5:
330
+        // get the save processor
331
+        include_once(includeFileProcessor("processors/save_content.processor.php",$manager_theme));
332
+    break;
333
+    case 6:
334
+        // get the delete processor
335
+        include_once(includeFileProcessor("processors/delete_content.processor.php",$manager_theme));
336
+    break;
337
+    case 63:
338
+        // get the undelete processor
339
+        include_once(includeFileProcessor("processors/undelete_content.processor.php",$manager_theme));
340
+    break;
341
+    case 51:
342
+        // get the move action
343
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
344
+        include_once(includeFileProcessor("actions/move_document.dynamic.php",$manager_theme));
345
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
346
+    break;
347
+    case 52:
348
+        // get the move document processor
349
+        include_once(includeFileProcessor("processors/move_document.processor.php",$manager_theme));
350
+    break;
351
+    case 61:
352
+        // get the processor for publishing content
353
+        include_once(includeFileProcessor("processors/publish_content.processor.php",$manager_theme));
354
+    break;
355
+    case 62:
356
+        // get the processor for publishing content
357
+        include_once(includeFileProcessor("processors/unpublish_content.processor.php",$manager_theme));
358
+    break;
359
+    case 56:
360
+        // get the sort menuindex action
361
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
362
+        include_once(includeFileProcessor("actions/mutate_menuindex_sort.dynamic.php",$manager_theme));
363
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
364
+        break;
365 365
 /********************************************************************/
366 366
 /* show the wait page - gives the tree time to refresh (hopefully)  */
367 367
 /********************************************************************/
368
-	case 7:
369
-		// get the wait page (so the tree can reload)
370
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
371
-		include_once(includeFileProcessor("actions/wait.static.php",$manager_theme));
372
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
373
-	break;
368
+    case 7:
369
+        // get the wait page (so the tree can reload)
370
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
371
+        include_once(includeFileProcessor("actions/wait.static.php",$manager_theme));
372
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
373
+    break;
374 374
 /********************************************************************/
375 375
 /* let the user log out                                             */
376 376
 /********************************************************************/
377
-	case 8:
378
-		// get the logout processor
379
-		include_once(includeFileProcessor("processors/logout.processor.php",$manager_theme));
380
-	break;
377
+    case 8:
378
+        // get the logout processor
379
+        include_once(includeFileProcessor("processors/logout.processor.php",$manager_theme));
380
+    break;
381 381
 /********************************************************************/
382 382
 /* user management                                                  */
383 383
 /********************************************************************/
384
-	case 87:
385
-		// get the new web user page
386
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
387
-		include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php",$manager_theme));
388
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
389
-	break;
390
-	case 88:
391
-		// get the edit web user page
392
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
393
-		include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php",$manager_theme));
394
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
395
-	break;
396
-	case 89:
397
-		// get the save web user processor
398
-		include_once(includeFileProcessor("processors/save_web_user.processor.php",$manager_theme));
399
-	break;
400
-	case 90:
401
-		// get the delete web user page
402
-		include_once(includeFileProcessor("processors/delete_web_user.processor.php",$manager_theme));
403
-	break;
404
-	case 11:
405
-		// get the new user page
406
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
407
-		include_once(includeFileProcessor("actions/mutate_user.dynamic.php",$manager_theme));
408
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
409
-	break;
410
-	case 12:
411
-		// get the edit user page
412
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
413
-		include_once(includeFileProcessor("actions/mutate_user.dynamic.php",$manager_theme));
414
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
415
-	break;
416
-	case 32:
417
-		// get the save user processor
418
-		include_once(includeFileProcessor("processors/save_user.processor.php",$manager_theme));
419
-	break;
420
-	case 28:
421
-		// get the change password page
422
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
423
-		include_once(includeFileProcessor("actions/mutate_password.dynamic.php",$manager_theme));
424
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
425
-	break;
426
-	case 34:
427
-		// get the save new password page
428
-		include_once(includeFileProcessor("processors/save_password.processor.php",$manager_theme));
429
-	break;
430
-	case 33:
431
-		// get the delete user page
432
-		include_once(includeFileProcessor("processors/delete_user.processor.php",$manager_theme));
433
-	break;
384
+    case 87:
385
+        // get the new web user page
386
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
387
+        include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php",$manager_theme));
388
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
389
+    break;
390
+    case 88:
391
+        // get the edit web user page
392
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
393
+        include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php",$manager_theme));
394
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
395
+    break;
396
+    case 89:
397
+        // get the save web user processor
398
+        include_once(includeFileProcessor("processors/save_web_user.processor.php",$manager_theme));
399
+    break;
400
+    case 90:
401
+        // get the delete web user page
402
+        include_once(includeFileProcessor("processors/delete_web_user.processor.php",$manager_theme));
403
+    break;
404
+    case 11:
405
+        // get the new user page
406
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
407
+        include_once(includeFileProcessor("actions/mutate_user.dynamic.php",$manager_theme));
408
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
409
+    break;
410
+    case 12:
411
+        // get the edit user page
412
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
413
+        include_once(includeFileProcessor("actions/mutate_user.dynamic.php",$manager_theme));
414
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
415
+    break;
416
+    case 32:
417
+        // get the save user processor
418
+        include_once(includeFileProcessor("processors/save_user.processor.php",$manager_theme));
419
+    break;
420
+    case 28:
421
+        // get the change password page
422
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
423
+        include_once(includeFileProcessor("actions/mutate_password.dynamic.php",$manager_theme));
424
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
425
+    break;
426
+    case 34:
427
+        // get the save new password page
428
+        include_once(includeFileProcessor("processors/save_password.processor.php",$manager_theme));
429
+    break;
430
+    case 33:
431
+        // get the delete user page
432
+        include_once(includeFileProcessor("processors/delete_user.processor.php",$manager_theme));
433
+    break;
434 434
 /********************************************************************/
435 435
 /* role management                                                  */
436 436
 /********************************************************************/
437
-	case 38:
438
-		// get the new role page
439
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
440
-		include_once(includeFileProcessor("actions/mutate_role.dynamic.php",$manager_theme));
441
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
442
-	break;
443
-	case 35:
444
-		// get the edit role page
445
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
446
-		include_once(includeFileProcessor("actions/mutate_role.dynamic.php",$manager_theme));
447
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
448
-	break;
449
-	case 36:
450
-		// get the save role page
451
-		include_once(includeFileProcessor("processors/save_role.processor.php",$manager_theme));
452
-	break;
453
-	case 37:
454
-		// get the delete role page
455
-		include_once(includeFileProcessor("processors/delete_role.processor.php",$manager_theme));
456
-	break;
437
+    case 38:
438
+        // get the new role page
439
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
440
+        include_once(includeFileProcessor("actions/mutate_role.dynamic.php",$manager_theme));
441
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
442
+    break;
443
+    case 35:
444
+        // get the edit role page
445
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
446
+        include_once(includeFileProcessor("actions/mutate_role.dynamic.php",$manager_theme));
447
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
448
+    break;
449
+    case 36:
450
+        // get the save role page
451
+        include_once(includeFileProcessor("processors/save_role.processor.php",$manager_theme));
452
+    break;
453
+    case 37:
454
+        // get the delete role page
455
+        include_once(includeFileProcessor("processors/delete_role.processor.php",$manager_theme));
456
+    break;
457 457
 /********************************************************************/
458 458
 /* category management                                               */
459 459
 /********************************************************************/
460
-	case 120:
461
-		// get the edit category page
462
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
463
-		include_once(includeFileProcessor("actions/mutate_categories.dynamic.php",$manager_theme));
464
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
465
-	break;
466
-	case 121:
467
-		// for ajax-requests
468
-		include_once(includeFileProcessor("actions/mutate_categories.dynamic.php",$manager_theme));
469
-	break;
460
+    case 120:
461
+        // get the edit category page
462
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
463
+        include_once(includeFileProcessor("actions/mutate_categories.dynamic.php",$manager_theme));
464
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
465
+    break;
466
+    case 121:
467
+        // for ajax-requests
468
+        include_once(includeFileProcessor("actions/mutate_categories.dynamic.php",$manager_theme));
469
+    break;
470 470
 /********************************************************************/
471 471
 /* template management                                              */
472 472
 /********************************************************************/
473
-	case 16:
474
-		// get the edit template action
475
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
476
-		include_once(includeFileProcessor("actions/mutate_templates.dynamic.php",$manager_theme));
477
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
478
-	break;
479
-	case 19:
480
-		// get the new template action
481
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
482
-		include_once(includeFileProcessor("actions/mutate_templates.dynamic.php",$manager_theme));
483
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
484
-	break;
485
-	case 20:
486
-		// get the save processor
487
-		include_once(includeFileProcessor("processors/save_template.processor.php",$manager_theme));
488
-	break;
489
-	case 21:
490
-		// get the delete processor
491
-		include_once(includeFileProcessor("processors/delete_template.processor.php",$manager_theme));
492
-	break;
493
-	case 96:
494
-		// get the duplicate template processor
495
-		include_once(includeFileProcessor("processors/duplicate_template.processor.php",$manager_theme));
496
-	break;
497
-	case 117:
498
-		// change the tv rank for selected template
499
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
500
-		include_once(includeFileProcessor("actions/mutate_template_tv_rank.dynamic.php",$manager_theme));
501
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
502
-		break;
473
+    case 16:
474
+        // get the edit template action
475
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
476
+        include_once(includeFileProcessor("actions/mutate_templates.dynamic.php",$manager_theme));
477
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
478
+    break;
479
+    case 19:
480
+        // get the new template action
481
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
482
+        include_once(includeFileProcessor("actions/mutate_templates.dynamic.php",$manager_theme));
483
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
484
+    break;
485
+    case 20:
486
+        // get the save processor
487
+        include_once(includeFileProcessor("processors/save_template.processor.php",$manager_theme));
488
+    break;
489
+    case 21:
490
+        // get the delete processor
491
+        include_once(includeFileProcessor("processors/delete_template.processor.php",$manager_theme));
492
+    break;
493
+    case 96:
494
+        // get the duplicate template processor
495
+        include_once(includeFileProcessor("processors/duplicate_template.processor.php",$manager_theme));
496
+    break;
497
+    case 117:
498
+        // change the tv rank for selected template
499
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
500
+        include_once(includeFileProcessor("actions/mutate_template_tv_rank.dynamic.php",$manager_theme));
501
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
502
+        break;
503 503
 /********************************************************************/
504 504
 /* snippet management                                               */
505 505
 /********************************************************************/
506
-	case 22:
507
-		// get the edit snippet action
508
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
509
-		include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php",$manager_theme));
510
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
511
-	break;
512
-	case 23:
513
-		// get the new snippet action
514
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
515
-		include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php",$manager_theme));
516
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
517
-	break;
518
-	case 24:
519
-		// get the save processor
520
-		include_once(includeFileProcessor("processors/save_snippet.processor.php",$manager_theme));
521
-	break;
522
-	case 25:
523
-		// get the delete processor
524
-		include_once(includeFileProcessor("processors/delete_snippet.processor.php",$manager_theme));
525
-	break;
526
-	case 98:
527
-		// get the duplicate processor
528
-		include_once(includeFileProcessor("processors/duplicate_snippet.processor.php",$manager_theme));
529
-	break;
506
+    case 22:
507
+        // get the edit snippet action
508
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
509
+        include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php",$manager_theme));
510
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
511
+    break;
512
+    case 23:
513
+        // get the new snippet action
514
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
515
+        include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php",$manager_theme));
516
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
517
+    break;
518
+    case 24:
519
+        // get the save processor
520
+        include_once(includeFileProcessor("processors/save_snippet.processor.php",$manager_theme));
521
+    break;
522
+    case 25:
523
+        // get the delete processor
524
+        include_once(includeFileProcessor("processors/delete_snippet.processor.php",$manager_theme));
525
+    break;
526
+    case 98:
527
+        // get the duplicate processor
528
+        include_once(includeFileProcessor("processors/duplicate_snippet.processor.php",$manager_theme));
529
+    break;
530 530
 /********************************************************************/
531 531
 /* htmlsnippet management                                               */
532 532
 /********************************************************************/
533
-	case 78:
534
-		// get the edit snippet action
535
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
536
-		include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php",$manager_theme));
537
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
538
-	break;
539
-	case 77:
540
-		// get the new snippet action
541
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
542
-		include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php",$manager_theme));
543
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
544
-	break;
545
-	case 79:
546
-		// get the save processor
547
-		include_once(includeFileProcessor("processors/save_htmlsnippet.processor.php",$manager_theme));
548
-	break;
549
-	case 80:
550
-		// get the delete processor
551
-		include_once(includeFileProcessor("processors/delete_htmlsnippet.processor.php",$manager_theme));
552
-	break;
553
-	case 97:
554
-		// get the duplicate processor
555
-		include_once(includeFileProcessor("processors/duplicate_htmlsnippet.processor.php",$manager_theme));
556
-	break;
533
+    case 78:
534
+        // get the edit snippet action
535
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
536
+        include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php",$manager_theme));
537
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
538
+    break;
539
+    case 77:
540
+        // get the new snippet action
541
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
542
+        include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php",$manager_theme));
543
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
544
+    break;
545
+    case 79:
546
+        // get the save processor
547
+        include_once(includeFileProcessor("processors/save_htmlsnippet.processor.php",$manager_theme));
548
+    break;
549
+    case 80:
550
+        // get the delete processor
551
+        include_once(includeFileProcessor("processors/delete_htmlsnippet.processor.php",$manager_theme));
552
+    break;
553
+    case 97:
554
+        // get the duplicate processor
555
+        include_once(includeFileProcessor("processors/duplicate_htmlsnippet.processor.php",$manager_theme));
556
+    break;
557 557
 /********************************************************************/
558 558
 /* show the credits page                                            */
559 559
 /********************************************************************/
560
-	case 18:
561
-		// get the credits page
562
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
563
-		include_once(includeFileProcessor("actions/credits.static.php",$manager_theme));
564
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
565
-	break;
560
+    case 18:
561
+        // get the credits page
562
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
563
+        include_once(includeFileProcessor("actions/credits.static.php",$manager_theme));
564
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
565
+    break;
566 566
 /********************************************************************/
567 567
 /* empty cache & synchronisation                                    */
568 568
 /********************************************************************/
569
-	case 26:
570
-		// get the cache emptying processor
571
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
572
-		include_once(includeFileProcessor("actions/refresh_site.dynamic.php",$manager_theme));
573
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
574
-	break;
569
+    case 26:
570
+        // get the cache emptying processor
571
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
572
+        include_once(includeFileProcessor("actions/refresh_site.dynamic.php",$manager_theme));
573
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
574
+    break;
575 575
 /********************************************************************/
576 576
 /* Module management                                                */
577 577
 /********************************************************************/
578
-	case 106:
579
-		// get module management
580
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
581
-		include_once(includeFileProcessor("actions/modules.static.php",$manager_theme));
582
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
583
-	break;
584
-	case 107:
585
-		// get the new module action
586
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
587
-		include_once(includeFileProcessor("actions/mutate_module.dynamic.php",$manager_theme));
588
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
589
-	break;
590
-	case 108:
591
-		// get the edit module action
592
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
593
-		include_once(includeFileProcessor("actions/mutate_module.dynamic.php",$manager_theme));
594
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
595
-	break;
596
-	case 109:
597
-		// get the save processor
598
-		include_once(includeFileProcessor("processors/save_module.processor.php",$manager_theme));
599
-	break;
600
-	case 110:
601
-		// get the delete processor
602
-		include_once(includeFileProcessor("processors/delete_module.processor.php",$manager_theme));
603
-	break;
604
-	case 111:
605
-		// get the duplicate processor
606
-		include_once(includeFileProcessor("processors/duplicate_module.processor.php",$manager_theme));
607
-	break;
608
-	case 112:
609
-		// execute/run the module
610
-		//include_once "header.inc.php";
611
-		include_once(includeFileProcessor("processors/execute_module.processor.php",$manager_theme));
612
-		//include_once "footer.inc.php";
613
-		break;
614
-	case 113:
615
-		// get the module resources (dependencies) action
616
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
617
-		include_once(includeFileProcessor("actions/mutate_module_resources.dynamic.php",$manager_theme));
618
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
619
-	break;
578
+    case 106:
579
+        // get module management
580
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
581
+        include_once(includeFileProcessor("actions/modules.static.php",$manager_theme));
582
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
583
+    break;
584
+    case 107:
585
+        // get the new module action
586
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
587
+        include_once(includeFileProcessor("actions/mutate_module.dynamic.php",$manager_theme));
588
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
589
+    break;
590
+    case 108:
591
+        // get the edit module action
592
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
593
+        include_once(includeFileProcessor("actions/mutate_module.dynamic.php",$manager_theme));
594
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
595
+    break;
596
+    case 109:
597
+        // get the save processor
598
+        include_once(includeFileProcessor("processors/save_module.processor.php",$manager_theme));
599
+    break;
600
+    case 110:
601
+        // get the delete processor
602
+        include_once(includeFileProcessor("processors/delete_module.processor.php",$manager_theme));
603
+    break;
604
+    case 111:
605
+        // get the duplicate processor
606
+        include_once(includeFileProcessor("processors/duplicate_module.processor.php",$manager_theme));
607
+    break;
608
+    case 112:
609
+        // execute/run the module
610
+        //include_once "header.inc.php";
611
+        include_once(includeFileProcessor("processors/execute_module.processor.php",$manager_theme));
612
+        //include_once "footer.inc.php";
613
+        break;
614
+    case 113:
615
+        // get the module resources (dependencies) action
616
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
617
+        include_once(includeFileProcessor("actions/mutate_module_resources.dynamic.php",$manager_theme));
618
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
619
+    break;
620 620
 /********************************************************************/
621 621
 /* plugin management                                                */
622 622
 /********************************************************************/
623
-	case 100:
624
-		// change the plugin priority
625
-		//include_once "header.inc.php"; - in action file
626
-		include_once(includeFileProcessor("actions/mutate_plugin_priority.dynamic.php",$manager_theme));
627
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
628
-	break;
629
-	case 101:
630
-		// get the new plugin action
631
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
632
-		include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php",$manager_theme));
633
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
634
-	break;
635
-	case 102:
636
-		// get the edit plugin action
637
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
638
-		include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php",$manager_theme));
639
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
640
-	break;
641
-	case 103:
642
-		// get the save processor
643
-		include_once(includeFileProcessor("processors/save_plugin.processor.php",$manager_theme));
644
-	break;
645
-	case 104:
646
-		// get the delete processor
647
-		include_once(includeFileProcessor("processors/delete_plugin.processor.php",$manager_theme));
648
-	break;
649
-	case 105:
650
-		// get the duplicate processor
651
-		include_once(includeFileProcessor("processors/duplicate_plugin.processor.php",$manager_theme));
652
-	break;
653
-	case 119:
654
-		// get the purge processor
655
-		include_once(includeFileProcessor("processors/purge_plugin.processor.php",$manager_theme));
656
-	break;
623
+    case 100:
624
+        // change the plugin priority
625
+        //include_once "header.inc.php"; - in action file
626
+        include_once(includeFileProcessor("actions/mutate_plugin_priority.dynamic.php",$manager_theme));
627
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
628
+    break;
629
+    case 101:
630
+        // get the new plugin action
631
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
632
+        include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php",$manager_theme));
633
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
634
+    break;
635
+    case 102:
636
+        // get the edit plugin action
637
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
638
+        include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php",$manager_theme));
639
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
640
+    break;
641
+    case 103:
642
+        // get the save processor
643
+        include_once(includeFileProcessor("processors/save_plugin.processor.php",$manager_theme));
644
+    break;
645
+    case 104:
646
+        // get the delete processor
647
+        include_once(includeFileProcessor("processors/delete_plugin.processor.php",$manager_theme));
648
+    break;
649
+    case 105:
650
+        // get the duplicate processor
651
+        include_once(includeFileProcessor("processors/duplicate_plugin.processor.php",$manager_theme));
652
+    break;
653
+    case 119:
654
+        // get the purge processor
655
+        include_once(includeFileProcessor("processors/purge_plugin.processor.php",$manager_theme));
656
+    break;
657 657
 /********************************************************************/
658 658
 /* view phpinfo                                                     */
659 659
 /********************************************************************/
660
-	case 200:
661
-		// show phpInfo
662
-		if($modx->hasPermission('logs')) {
663
-			include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
664
-			include_once(includeFileProcessor("actions/phpinfo.static.php",$manager_theme));
665
-			include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
666
-		}
667
-	break;
660
+    case 200:
661
+        // show phpInfo
662
+        if($modx->hasPermission('logs')) {
663
+            include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
664
+            include_once(includeFileProcessor("actions/phpinfo.static.php",$manager_theme));
665
+            include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
666
+        }
667
+    break;
668 668
 /********************************************************************/
669 669
 /* errorpage                                            */
670 670
 /********************************************************************/
671
-	case 29:
672
-		// get the error page
673
-		include_once(includeFileProcessor("actions/error_dialog.static.php",$manager_theme));
674
-	break;
671
+    case 29:
672
+        // get the error page
673
+        include_once(includeFileProcessor("actions/error_dialog.static.php",$manager_theme));
674
+    break;
675 675
 /********************************************************************/
676 676
 /* file manager                                                     */
677 677
 /********************************************************************/
678
-	case 31:
679
-		// get the page to manage files
680
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
681
-		include_once(includeFileProcessor("actions/files.dynamic.php",$manager_theme));
682
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
683
-	break;
678
+    case 31:
679
+        // get the page to manage files
680
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
681
+        include_once(includeFileProcessor("actions/files.dynamic.php",$manager_theme));
682
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
683
+    break;
684 684
 /********************************************************************/
685 685
 /* access permissions                                               */
686 686
 /********************************************************************/
687
-	case 40:
688
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
689
-		include_once(includeFileProcessor("actions/access_permissions.dynamic.php",$manager_theme));
690
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
691
-	break;
692
-	case 91:
693
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
694
-		include_once(includeFileProcessor("actions/web_access_permissions.dynamic.php",$manager_theme));
695
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
696
-	break;
687
+    case 40:
688
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
689
+        include_once(includeFileProcessor("actions/access_permissions.dynamic.php",$manager_theme));
690
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
691
+    break;
692
+    case 91:
693
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
694
+        include_once(includeFileProcessor("actions/web_access_permissions.dynamic.php",$manager_theme));
695
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
696
+    break;
697 697
 /********************************************************************/
698 698
 /* access groups processor                                          */
699 699
 /********************************************************************/
700
-	case 41:
701
-		include_once(includeFileProcessor("processors/access_groups.processor.php",$manager_theme));
702
-	break;
703
-	case 92:
704
-		include_once(includeFileProcessor("processors/web_access_groups.processor.php",$manager_theme));
705
-	break;
700
+    case 41:
701
+        include_once(includeFileProcessor("processors/access_groups.processor.php",$manager_theme));
702
+    break;
703
+    case 92:
704
+        include_once(includeFileProcessor("processors/web_access_groups.processor.php",$manager_theme));
705
+    break;
706 706
 /********************************************************************/
707 707
 /* settings editor                                                  */
708 708
 /********************************************************************/
709
-	case 17:
710
-		// get the settings editor
711
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
712
-		include_once(includeFileProcessor("actions/mutate_settings.dynamic.php",$manager_theme));
713
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
714
-	break;
715
-	case 118:
716
-		// call settings ajax include
717
-		ob_clean();
718
-		include_once(includeFileProcessor("includes/mutate_settings.ajax.php",$manager_theme));
719
-	break;
709
+    case 17:
710
+        // get the settings editor
711
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
712
+        include_once(includeFileProcessor("actions/mutate_settings.dynamic.php",$manager_theme));
713
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
714
+    break;
715
+    case 118:
716
+        // call settings ajax include
717
+        ob_clean();
718
+        include_once(includeFileProcessor("includes/mutate_settings.ajax.php",$manager_theme));
719
+    break;
720 720
 /********************************************************************/
721 721
 /* save settings                                                    */
722 722
 /********************************************************************/
723
-	case 30:
724
-		// get the save settings processor
725
-		include_once(includeFileProcessor("processors/save_settings.processor.php",$manager_theme));
726
-	break;
723
+    case 30:
724
+        // get the save settings processor
725
+        include_once(includeFileProcessor("processors/save_settings.processor.php",$manager_theme));
726
+    break;
727 727
 /********************************************************************/
728 728
 /* system information                                               */
729 729
 /********************************************************************/
730
-	case 53:
731
-		// get the settings editor
732
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
733
-		include_once(includeFileProcessor("actions/sysinfo.static.php",$manager_theme));
734
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
735
-	break;
730
+    case 53:
731
+        // get the settings editor
732
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
733
+        include_once(includeFileProcessor("actions/sysinfo.static.php",$manager_theme));
734
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
735
+    break;
736 736
 /********************************************************************/
737 737
 /* optimise table                                               */
738 738
 /********************************************************************/
739
-	case 54:
740
-		// get the table optimizer/truncate processor
741
-		include_once(includeFileProcessor("processors/optimize_table.processor.php",$manager_theme));
742
-	break;
739
+    case 54:
740
+        // get the table optimizer/truncate processor
741
+        include_once(includeFileProcessor("processors/optimize_table.processor.php",$manager_theme));
742
+    break;
743 743
 /********************************************************************/
744 744
 /* view logging                                                     */
745 745
 /********************************************************************/
746
-	case 13:
747
-		// view logging
748
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
749
-		include_once(includeFileProcessor("actions/logging.static.php",$manager_theme));
750
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
751
-	break;
746
+    case 13:
747
+        // view logging
748
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
749
+        include_once(includeFileProcessor("actions/logging.static.php",$manager_theme));
750
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
751
+    break;
752 752
 /********************************************************************/
753 753
 /* empty logs                                                       */
754 754
 /********************************************************************/
755
-	case 55:
756
-		// get the settings editor
757
-		include_once(includeFileProcessor("processors/empty_table.processor.php",$manager_theme));
758
-	break;
755
+    case 55:
756
+        // get the settings editor
757
+        include_once(includeFileProcessor("processors/empty_table.processor.php",$manager_theme));
758
+    break;
759 759
 /********************************************************************/
760 760
 /* calls test page                                                      */
761 761
 /********************************************************************/
762
-	case 999:
763
-		// get the test page
764
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
765
-		include_once(includeFileProcessor("test_page.php",$manager_theme));
766
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
767
-	break;
762
+    case 999:
763
+        // get the test page
764
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
765
+        include_once(includeFileProcessor("test_page.php",$manager_theme));
766
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
767
+    break;
768 768
 /********************************************************************/
769 769
 /* Empty recycle bin                                                */
770 770
 /********************************************************************/
771
-	case 64:
772
-		// get the Recycle bin emptier
773
-		include_once(includeFileProcessor("processors/remove_content.processor.php",$manager_theme));
774
-	break;
771
+    case 64:
772
+        // get the Recycle bin emptier
773
+        include_once(includeFileProcessor("processors/remove_content.processor.php",$manager_theme));
774
+    break;
775 775
 /********************************************************************/
776 776
 /* Messages                                                     */
777 777
 /********************************************************************/
778
-	case 10:
779
-		// get the messages page
780
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
781
-		include_once(includeFileProcessor("actions/messages.static.php",$manager_theme));
782
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
783
-	break;
778
+    case 10:
779
+        // get the messages page
780
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
781
+        include_once(includeFileProcessor("actions/messages.static.php",$manager_theme));
782
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
783
+    break;
784 784
 /********************************************************************/
785 785
 /* Delete a message                                                 */
786 786
 /********************************************************************/
787
-	case 65:
788
-		// get the message deleter
789
-		include_once(includeFileProcessor("processors/delete_message.processor.php",$manager_theme));
790
-	break;
787
+    case 65:
788
+        // get the message deleter
789
+        include_once(includeFileProcessor("processors/delete_message.processor.php",$manager_theme));
790
+    break;
791 791
 /********************************************************************/
792 792
 /* Send a message                                                   */
793 793
 /********************************************************************/
794
-	case 66:
795
-		// get the message deleter
796
-		include_once(includeFileProcessor("processors/send_message.processor.php",$manager_theme));
797
-	break;
794
+    case 66:
795
+        // get the message deleter
796
+        include_once(includeFileProcessor("processors/send_message.processor.php",$manager_theme));
797
+    break;
798 798
 /********************************************************************/
799 799
 /* Remove locks                                                 */
800 800
 /********************************************************************/
801
-	case 67:
802
-		// get the lock remover
803
-		include_once(includeFileProcessor("processors/remove_locks.processor.php",$manager_theme));
804
-	break;
801
+    case 67:
802
+        // get the lock remover
803
+        include_once(includeFileProcessor("processors/remove_locks.processor.php",$manager_theme));
804
+    break;
805 805
 /********************************************************************/
806 806
 /* Site schedule                                                    */
807 807
 /********************************************************************/
808
-	case 70:
809
-		// get the schedule page
810
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
811
-		include_once(includeFileProcessor("actions/site_schedule.static.php",$manager_theme));
812
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
813
-	break;
808
+    case 70:
809
+        // get the schedule page
810
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
811
+        include_once(includeFileProcessor("actions/site_schedule.static.php",$manager_theme));
812
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
813
+    break;
814 814
 /********************************************************************/
815 815
 /* Search                                                           */
816 816
 /********************************************************************/
817
-	case 71:
818
-		// get the search page
819
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
820
-		include_once(includeFileProcessor("actions/search.static.php",$manager_theme));
821
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
822
-	break;
817
+    case 71:
818
+        // get the search page
819
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
820
+        include_once(includeFileProcessor("actions/search.static.php",$manager_theme));
821
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
822
+    break;
823 823
 /********************************************************************/
824 824
 /* About                                                            */
825 825
 /********************************************************************/
826
-	case 59:
827
-		// get the about page
828
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
829
-		include_once(includeFileProcessor("actions/about.static.php",$manager_theme));
830
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
831
-	break;
826
+    case 59:
827
+        // get the about page
828
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
829
+        include_once(includeFileProcessor("actions/about.static.php",$manager_theme));
830
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
831
+    break;
832 832
 /********************************************************************/
833 833
 /* Add weblink                                                          */
834 834
 /********************************************************************/
835
-	case 72:
836
-		// get the weblink page
837
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
838
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
839
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
840
-	break;
835
+    case 72:
836
+        // get the weblink page
837
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
838
+        include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
839
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
840
+    break;
841 841
 /********************************************************************/
842 842
 /* User management                                                  */
843 843
 /********************************************************************/
844
-	case 75:
845
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
846
-		include_once(includeFileProcessor("actions/user_management.static.php",$manager_theme));
847
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
848
-	break;
849
-	case 99:
850
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
851
-		include_once(includeFileProcessor("actions/web_user_management.static.php",$manager_theme));
852
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
853
-	break;
854
-	case 86:
855
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
856
-		include_once(includeFileProcessor("actions/role_management.static.php",$manager_theme));
857
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
858
-	break;
844
+    case 75:
845
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
846
+        include_once(includeFileProcessor("actions/user_management.static.php",$manager_theme));
847
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
848
+    break;
849
+    case 99:
850
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
851
+        include_once(includeFileProcessor("actions/web_user_management.static.php",$manager_theme));
852
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
853
+    break;
854
+    case 86:
855
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
856
+        include_once(includeFileProcessor("actions/role_management.static.php",$manager_theme));
857
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
858
+    break;
859 859
 /********************************************************************/
860 860
 /* template/ snippet management                                                 */
861 861
 /********************************************************************/
862
-	case 76:
863
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
864
-		include_once(includeFileProcessor("actions/resources.static.php",$manager_theme));
865
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
866
-	break;
862
+    case 76:
863
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
864
+        include_once(includeFileProcessor("actions/resources.static.php",$manager_theme));
865
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
866
+    break;
867 867
 /********************************************************************/
868 868
 /* Export to file                                                   */
869 869
 /********************************************************************/
870
-	case 83:
871
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
872
-		include_once(includeFileProcessor("actions/export_site.static.php",$manager_theme));
873
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
874
-	break;
870
+    case 83:
871
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
872
+        include_once(includeFileProcessor("actions/export_site.static.php",$manager_theme));
873
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
874
+    break;
875 875
 /********************************************************************/
876 876
 /* Resource Selector                                                    */
877 877
 /********************************************************************/
878
-	case 84:
879
-		include_once(includeFileProcessor("actions/resource_selector.static.php",$manager_theme));
880
-	break;
878
+    case 84:
879
+        include_once(includeFileProcessor("actions/resource_selector.static.php",$manager_theme));
880
+    break;
881 881
 /********************************************************************/
882 882
 /* Backup Manager                                                   */
883 883
 /********************************************************************/
884
-	case 93:
885
-		# header and footer will be handled interally
886
-		include_once(includeFileProcessor("actions/bkmanager.static.php",$manager_theme));
887
-	break;
884
+    case 93:
885
+        # header and footer will be handled interally
886
+        include_once(includeFileProcessor("actions/bkmanager.static.php",$manager_theme));
887
+    break;
888 888
 /********************************************************************/
889 889
 /* Duplicate Document                                                   */
890 890
 /********************************************************************/
891
-	case 94:
892
-		// get the duplicate processor
893
-		include_once(includeFileProcessor("processors/duplicate_content.processor.php",$manager_theme));
894
-	break;
891
+    case 94:
892
+        // get the duplicate processor
893
+        include_once(includeFileProcessor("processors/duplicate_content.processor.php",$manager_theme));
894
+    break;
895 895
 /********************************************************************/
896 896
 /* Import Document from file                                        */
897 897
 /********************************************************************/
898
-	case 95:
899
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
900
-		include_once(includeFileProcessor("actions/import_site.static.php",$manager_theme));
901
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
902
-	break;
898
+    case 95:
899
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
900
+        include_once(includeFileProcessor("actions/import_site.static.php",$manager_theme));
901
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
902
+    break;
903 903
 /********************************************************************/
904 904
 /* Help                                                             */
905 905
 /********************************************************************/
906
-	case 9:
907
-		// get the help page
908
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
909
-		include_once(includeFileProcessor("actions/help.static.php",$manager_theme));
910
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
911
-	break;
906
+    case 9:
907
+        // get the help page
908
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
909
+        include_once(includeFileProcessor("actions/help.static.php",$manager_theme));
910
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
911
+    break;
912 912
 /********************************************************************/
913 913
 /* Template Variables - Based on Apodigm's Docvars                  */
914 914
 /********************************************************************/
915
-	case 300:
916
-		// get the new document variable action
917
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
918
-		include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php",$manager_theme));
919
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
920
-	break;
921
-	case 301:
922
-		// get the edit document variable action
923
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
924
-		include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php",$manager_theme));
925
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
926
-	break;
927
-	case 302:
928
-		// get the save processor
929
-		include_once(includeFileProcessor("processors/save_tmplvars.processor.php",$manager_theme));
930
-	break;
931
-	case 303:
932
-		// get the delete processor
933
-		include_once(includeFileProcessor("processors/delete_tmplvars.processor.php",$manager_theme));
934
-	break;
935
-	case 304:
936
-		// get the duplicate processor
937
-		include_once(includeFileProcessor("processors/duplicate_tmplvars.processor.php",$manager_theme));
938
-	break;
939
-	case 305:
940
-		// get the tv-rank action
941
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
942
-		include_once(includeFileProcessor("actions/mutate_tv_rank.dynamic.php",$manager_theme));
943
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
944
-	break;
915
+    case 300:
916
+        // get the new document variable action
917
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
918
+        include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php",$manager_theme));
919
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
920
+    break;
921
+    case 301:
922
+        // get the edit document variable action
923
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
924
+        include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php",$manager_theme));
925
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
926
+    break;
927
+    case 302:
928
+        // get the save processor
929
+        include_once(includeFileProcessor("processors/save_tmplvars.processor.php",$manager_theme));
930
+    break;
931
+    case 303:
932
+        // get the delete processor
933
+        include_once(includeFileProcessor("processors/delete_tmplvars.processor.php",$manager_theme));
934
+    break;
935
+    case 304:
936
+        // get the duplicate processor
937
+        include_once(includeFileProcessor("processors/duplicate_tmplvars.processor.php",$manager_theme));
938
+    break;
939
+    case 305:
940
+        // get the tv-rank action
941
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
942
+        include_once(includeFileProcessor("actions/mutate_tv_rank.dynamic.php",$manager_theme));
943
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
944
+    break;
945 945
 /********************************************************************/
946 946
 /* Event viewer: show event message log                             */
947 947
 /********************************************************************/
948
-	case 114:
949
-		// get event logs
950
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
951
-		include_once(includeFileProcessor("actions/eventlog.dynamic.php",$manager_theme));
952
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
953
-	break;
954
-	case 115:
955
-		// get event log details viewer
956
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
957
-		include_once(includeFileProcessor("actions/eventlog_details.dynamic.php",$manager_theme));
958
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
959
-	break;
960
-	case 116:
961
-		// get the event log delete processor
962
-		include_once(includeFileProcessor("processors/delete_eventlog.processor.php",$manager_theme));
963
-	break;
964
-
965
-	case 501:
966
-		//delete category
967
-		include_once(includeFileProcessor("processors/delete_category.processor.php",$manager_theme));
968
-	break;
948
+    case 114:
949
+        // get event logs
950
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
951
+        include_once(includeFileProcessor("actions/eventlog.dynamic.php",$manager_theme));
952
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
953
+    break;
954
+    case 115:
955
+        // get event log details viewer
956
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
957
+        include_once(includeFileProcessor("actions/eventlog_details.dynamic.php",$manager_theme));
958
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
959
+    break;
960
+    case 116:
961
+        // get the event log delete processor
962
+        include_once(includeFileProcessor("processors/delete_eventlog.processor.php",$manager_theme));
963
+    break;
964
+
965
+    case 501:
966
+        //delete category
967
+        include_once(includeFileProcessor("processors/delete_category.processor.php",$manager_theme));
968
+    break;
969 969
 /********************************************************************/
970 970
 /* default action: show not implemented message                     */
971 971
 /********************************************************************/
972
-	default :
973
-		// say that what was requested doesn't do anything yet
974
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
975
-		echo "
972
+    default :
973
+        // say that what was requested doesn't do anything yet
974
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
975
+        echo "
976 976
 			<div class='sectionHeader'>".$_lang['functionnotimpl']."</div>
977 977
 			<div class='sectionBody'>
978 978
 				<p>".$_lang['functionnotimpl_message']."</p>
979 979
 			</div>
980 980
 		";
981
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
981
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
982 982
 }
983 983
 
984 984
 /********************************************************************/
985 985
 // log action, unless it's a frame request
986 986
 if($action!=1 && $action!=7 && $action!=2) {
987
-	include_once "log.class.inc.php";
988
-	$log = new logHandler;
989
-	$log->initAndWriteLog();
987
+    include_once "log.class.inc.php";
988
+    $log = new logHandler;
989
+    $log->initAndWriteLog();
990 990
 }
991 991
 /********************************************************************/
992 992
 // show debug
Please login to merge, or discard this patch.
manager/processors/undelete_content.processor.php 1 patch
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -3,12 +3,12 @@  discard block
 block discarded – undo
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_document')) {
6
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
6
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
7 7
 }
8 8
 
9 9
 $id = isset($_REQUEST['id'])? (int)$_REQUEST['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
 /************ webber ********/
@@ -32,14 +32,14 @@  discard block
 block discarded – undo
32 32
 $udperms->role = $_SESSION['mgrRole'];
33 33
 
34 34
 if(!$udperms->checkPermissions()) {
35
-	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
35
+    $modx->webAlertAndQuit($_lang["access_permission_denied"]);
36 36
 }
37 37
 
38 38
 // get the timestamp on which the document was deleted.
39 39
 $rs = $modx->db->select('deletedon', $modx->getFullTableName('site_content'), "id='{$id}' AND deleted=1");
40 40
 $deltime = $modx->db->getValue($rs);
41 41
 if(!$deltime) {
42
-	$modx->webAlertAndQuit("Couldn't find document to determine it's date of deletion!");
42
+    $modx->webAlertAndQuit("Couldn't find document to determine it's date of deletion!");
43 43
 }
44 44
 
45 45
 $children = array();
@@ -49,36 +49,36 @@  discard block
 block discarded – undo
49 49
  */
50 50
 function getChildren($parent) {
51 51
 
52
-	$modx = evolutionCMS();
53
-	global $children;
54
-	global $deltime;
55
-
56
-	$rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent='".(int)$parent."' AND deleted=1 AND deletedon='".(int)$deltime."'");
57
-		// the document has children documents, we'll need to delete those too
58
-		while ($row=$modx->db->getRow($rs)) {
59
-			$children[] = $row['id'];
60
-			getChildren($row['id']);
61
-			//echo "Found childNode of parentNode $parent: ".$row['id']."<br />";
62
-		}
52
+    $modx = evolutionCMS();
53
+    global $children;
54
+    global $deltime;
55
+
56
+    $rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent='".(int)$parent."' AND deleted=1 AND deletedon='".(int)$deltime."'");
57
+        // the document has children documents, we'll need to delete those too
58
+        while ($row=$modx->db->getRow($rs)) {
59
+            $children[] = $row['id'];
60
+            getChildren($row['id']);
61
+            //echo "Found childNode of parentNode $parent: ".$row['id']."<br />";
62
+        }
63 63
 }
64 64
 
65 65
 getChildren($id);
66 66
 
67 67
 if(count($children)>0) {
68
-	$modx->db->update(
69
-		array(
70
-			'deleted'   => 0,
71
-			'deletedby' => 0,
72
-			'deletedon' => 0,
73
-		), $modx->getFullTableName('site_content'), "id IN(".implode(", ", $children).")");
68
+    $modx->db->update(
69
+        array(
70
+            'deleted'   => 0,
71
+            'deletedby' => 0,
72
+            'deletedon' => 0,
73
+        ), $modx->getFullTableName('site_content'), "id IN(".implode(", ", $children).")");
74 74
 }
75 75
 //'undelete' the document.
76 76
 $modx->db->update(
77
-	array(
78
-		'deleted'   => 0,
79
-		'deletedby' => 0,
80
-		'deletedon' => 0,
81
-	), $modx->getFullTableName('site_content'), "id='{$id}'");
77
+    array(
78
+        'deleted'   => 0,
79
+        'deletedby' => 0,
80
+        'deletedon' => 0,
81
+    ), $modx->getFullTableName('site_content'), "id='{$id}'");
82 82
 
83 83
 $modx->invokeEvent("OnDocFormUnDelete",
84 84
     array(
Please login to merge, or discard this patch.
manager/processors/save_user.processor.php 1 patch
Indentation   +368 added lines, -368 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@  discard block
 block discarded – undo
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_user')) {
6
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
6
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
7 7
 }
8 8
 
9 9
 $modx->loadExtension('phpass');
@@ -45,134 +45,134 @@  discard block
 block discarded – undo
45 45
 
46 46
 // verify password
47 47
 if($passwordgenmethod == "spec" && $input['specifiedpassword'] != $input['confirmpassword']) {
48
-	webAlertAndQuit("Password typed is mismatched");
48
+    webAlertAndQuit("Password typed is mismatched");
49 49
 }
50 50
 
51 51
 // verify email
52 52
 if($email == '' || !preg_match("/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,24}$/i", $email)) {
53
-	webAlertAndQuit("E-mail address doesn't seem to be valid!");
53
+    webAlertAndQuit("E-mail address doesn't seem to be valid!");
54 54
 }
55 55
 
56 56
 // verify admin security
57 57
 if($_SESSION['mgrRole'] != 1) {
58
-	// Check to see if user tried to spoof a "1" (admin) role
59
-	if(!$modx->hasPermission('save_role')) {
60
-		webAlertAndQuit("Illegal attempt to create/modify administrator by non-administrator!");
61
-	}
62
-	// Verify that the user being edited wasn't an admin and the user ID got spoofed
63
-	$rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, "internalKey='{$id}' AND role=1");
64
-	$limit = $modx->db->getValue($rs);
65
-	if($limit > 0) {
66
-		webAlertAndQuit("You cannot alter an administrative user.");
67
-	}
58
+    // Check to see if user tried to spoof a "1" (admin) role
59
+    if(!$modx->hasPermission('save_role')) {
60
+        webAlertAndQuit("Illegal attempt to create/modify administrator by non-administrator!");
61
+    }
62
+    // Verify that the user being edited wasn't an admin and the user ID got spoofed
63
+    $rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, "internalKey='{$id}' AND role=1");
64
+    $limit = $modx->db->getValue($rs);
65
+    if($limit > 0) {
66
+        webAlertAndQuit("You cannot alter an administrative user.");
67
+    }
68 68
 
69 69
 }
70 70
 
71 71
 switch($input['mode']) {
72
-	case '11' : // new user
73
-		// check if this user name already exist
74
-		$rs = $modx->db->select('count(id)', $tbl_manager_users, sprintf("username='%s'", $modx->db->escape($newusername)));
75
-		$limit = $modx->db->getValue($rs);
76
-		if($limit > 0) {
77
-			webAlertAndQuit("User name is already in use!");
78
-		}
79
-
80
-		// check if the email address already exist
81
-		$rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, sprintf("email='%s' AND id!='%s'", $modx->db->escape($email), $id));
82
-		$limit = $modx->db->getValue($rs);
83
-		if($limit > 0) {
84
-			webAlertAndQuit("Email is already in use!");
85
-		}
86
-
87
-		// generate a new password for this user
88
-		if($specifiedpassword != "" && $passwordgenmethod == "spec") {
89
-			if(strlen($specifiedpassword) < 6) {
90
-				webAlertAndQuit("Password is too short!");
91
-			} else {
92
-				$newpassword = $specifiedpassword;
93
-			}
94
-		} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
95
-			webAlertAndQuit("You didn't specify a password for this user!");
96
-		} elseif($passwordgenmethod == 'g') {
97
-			$newpassword = generate_password(8);
98
-		} else {
99
-			webAlertAndQuit("No password generation method specified!");
100
-		}
101
-
102
-		// invoke OnBeforeUserFormSave event
103
-		$modx->invokeEvent("OnBeforeUserFormSave", array(
104
-			"mode" => "new",
105
-		));
106
-
107
-		// create the user account
108
-		$internalKey = $modx->db->insert(array('username' => $modx->db->escape($newusername)), $tbl_manager_users);
109
-
110
-		$field = array();
111
-		$field['password'] = $modx->phpass->HashPassword($newpassword);
112
-		$modx->db->update($field, $tbl_manager_users, "id='{$internalKey}'");
113
-
114
-		$field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');
115
-		$field = $modx->db->escape($field);
116
-		$modx->db->insert($field, $tbl_user_attributes);
117
-
118
-		// Save user settings
119
-		saveUserSettings($internalKey);
120
-
121
-		// invoke OnManagerSaveUser event
122
-		$modx->invokeEvent("OnManagerSaveUser", array(
123
-			"mode" => "new",
124
-			"userid" => $internalKey,
125
-			"username" => $newusername,
126
-			"userpassword" => $newpassword,
127
-			"useremail" => $email,
128
-			"userfullname" => $fullname,
129
-			"userroleid" => $role
130
-		));
131
-
132
-		// invoke OnUserFormSave event
133
-		$modx->invokeEvent("OnUserFormSave", array(
134
-			"mode" => "new",
135
-			"id" => $internalKey
136
-		));
137
-
138
-		// Set the item name for logger
139
-		$_SESSION['itemname'] = $newusername;
140
-
141
-		/*******************************************************************************/
142
-		// put the user in the user_groups he/ she should be in
143
-		// first, check that up_perms are switched on!
144
-		if($use_udperms == 1) {
145
-			if(!empty($user_groups)) {
146
-				for($i = 0; $i < count($user_groups); $i++) {
147
-					$f = array();
148
-					$f['user_group'] = (int)$user_groups[$i];
149
-					$f['member'] = $internalKey;
150
-					$modx->db->insert($f, $tbl_member_groups);
151
-				}
152
-			}
153
-		}
154
-		// end of user_groups stuff!
155
-
156
-		if($passwordnotifymethod == 'e') {
157
-			sendMailMessage($email, $newusername, $newpassword, $fullname);
158
-			if($input['stay'] != '') {
159
-				$a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
160
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
161
-				header($header);
162
-			} else {
163
-				$header = "Location: index.php?a=75&r=2";
164
-				header($header);
165
-			}
166
-		} else {
167
-			if($input['stay'] != '') {
168
-				$a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
169
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
170
-			} else {
171
-				$stayUrl = "index.php?a=75&r=2";
172
-			}
173
-
174
-			include_once "header.inc.php";
175
-			?>
72
+    case '11' : // new user
73
+        // check if this user name already exist
74
+        $rs = $modx->db->select('count(id)', $tbl_manager_users, sprintf("username='%s'", $modx->db->escape($newusername)));
75
+        $limit = $modx->db->getValue($rs);
76
+        if($limit > 0) {
77
+            webAlertAndQuit("User name is already in use!");
78
+        }
79
+
80
+        // check if the email address already exist
81
+        $rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, sprintf("email='%s' AND id!='%s'", $modx->db->escape($email), $id));
82
+        $limit = $modx->db->getValue($rs);
83
+        if($limit > 0) {
84
+            webAlertAndQuit("Email is already in use!");
85
+        }
86
+
87
+        // generate a new password for this user
88
+        if($specifiedpassword != "" && $passwordgenmethod == "spec") {
89
+            if(strlen($specifiedpassword) < 6) {
90
+                webAlertAndQuit("Password is too short!");
91
+            } else {
92
+                $newpassword = $specifiedpassword;
93
+            }
94
+        } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
95
+            webAlertAndQuit("You didn't specify a password for this user!");
96
+        } elseif($passwordgenmethod == 'g') {
97
+            $newpassword = generate_password(8);
98
+        } else {
99
+            webAlertAndQuit("No password generation method specified!");
100
+        }
101
+
102
+        // invoke OnBeforeUserFormSave event
103
+        $modx->invokeEvent("OnBeforeUserFormSave", array(
104
+            "mode" => "new",
105
+        ));
106
+
107
+        // create the user account
108
+        $internalKey = $modx->db->insert(array('username' => $modx->db->escape($newusername)), $tbl_manager_users);
109
+
110
+        $field = array();
111
+        $field['password'] = $modx->phpass->HashPassword($newpassword);
112
+        $modx->db->update($field, $tbl_manager_users, "id='{$internalKey}'");
113
+
114
+        $field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');
115
+        $field = $modx->db->escape($field);
116
+        $modx->db->insert($field, $tbl_user_attributes);
117
+
118
+        // Save user settings
119
+        saveUserSettings($internalKey);
120
+
121
+        // invoke OnManagerSaveUser event
122
+        $modx->invokeEvent("OnManagerSaveUser", array(
123
+            "mode" => "new",
124
+            "userid" => $internalKey,
125
+            "username" => $newusername,
126
+            "userpassword" => $newpassword,
127
+            "useremail" => $email,
128
+            "userfullname" => $fullname,
129
+            "userroleid" => $role
130
+        ));
131
+
132
+        // invoke OnUserFormSave event
133
+        $modx->invokeEvent("OnUserFormSave", array(
134
+            "mode" => "new",
135
+            "id" => $internalKey
136
+        ));
137
+
138
+        // Set the item name for logger
139
+        $_SESSION['itemname'] = $newusername;
140
+
141
+        /*******************************************************************************/
142
+        // put the user in the user_groups he/ she should be in
143
+        // first, check that up_perms are switched on!
144
+        if($use_udperms == 1) {
145
+            if(!empty($user_groups)) {
146
+                for($i = 0; $i < count($user_groups); $i++) {
147
+                    $f = array();
148
+                    $f['user_group'] = (int)$user_groups[$i];
149
+                    $f['member'] = $internalKey;
150
+                    $modx->db->insert($f, $tbl_member_groups);
151
+                }
152
+            }
153
+        }
154
+        // end of user_groups stuff!
155
+
156
+        if($passwordnotifymethod == 'e') {
157
+            sendMailMessage($email, $newusername, $newpassword, $fullname);
158
+            if($input['stay'] != '') {
159
+                $a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
160
+                $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
161
+                header($header);
162
+            } else {
163
+                $header = "Location: index.php?a=75&r=2";
164
+                header($header);
165
+            }
166
+        } else {
167
+            if($input['stay'] != '') {
168
+                $a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
169
+                $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
170
+            } else {
171
+                $stayUrl = "index.php?a=75&r=2";
172
+            }
173
+
174
+            include_once "header.inc.php";
175
+            ?>
176 176
 
177 177
 			<h1><?php echo $_lang['user_title']; ?></h1>
178 178
 
@@ -194,125 +194,125 @@  discard block
 block discarded – undo
194 194
 			</div>
195 195
 			<?php
196 196
 
197
-			include_once "footer.inc.php";
198
-		}
199
-		break;
200
-	case '12' : // edit user
201
-		// generate a new password for this user
202
-		if($genpassword == 1) {
203
-			if($specifiedpassword != "" && $passwordgenmethod == "spec") {
204
-				if(strlen($specifiedpassword) < 6) {
205
-					webAlertAndQuit("Password is too short!");
206
-				} else {
207
-					$newpassword = $specifiedpassword;
208
-				}
209
-			} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
210
-				webAlertAndQuit("You didn't specify a password for this user!");
211
-			} elseif($passwordgenmethod == 'g') {
212
-				$newpassword = generate_password(8);
213
-			} else {
214
-				webAlertAndQuit("No password generation method specified!");
215
-			}
216
-		}
217
-		if($passwordnotifymethod == 'e') {
218
-			sendMailMessage($email, $newusername, $newpassword, $fullname);
219
-		}
220
-
221
-		// check if the username already exist
222
-		$rs = $modx->db->select('count(id)', $tbl_manager_users, sprintf("username='%s' AND id!='%s'", $modx->db->escape($newusername), $id));
223
-		$limit = $modx->db->getValue($rs);
224
-		if($limit > 0) {
225
-			webAlertAndQuit("User name is already in use!");
226
-		}
227
-
228
-		// check if the email address already exists
229
-		$rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, sprintf("email='%s' AND internalKey!='%s'", $modx->db->escape($email), $id));
230
-		$limit = $modx->db->getValue($rs);
231
-		if($limit > 0) {
232
-			webAlertAndQuit("Email is already in use!");
233
-		}
234
-
235
-		// invoke OnBeforeUserFormSave event
236
-		$modx->invokeEvent("OnBeforeUserFormSave", array(
237
-			"mode" => "upd",
238
-			"id" => $id
239
-		));
240
-
241
-		// update user name and password
242
-		$field = array();
243
-		$field['username'] = $modx->db->escape($newusername);
244
-		if($genpassword == 1) {
245
-			$field['password'] = $modx->phpass->HashPassword($newpassword);
246
-		}
247
-		$modx->db->update($field, $tbl_manager_users, "id='{$id}'");
248
-		$field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter');
249
-		$field = $modx->db->escape($field);
250
-		$modx->db->update($field, $tbl_user_attributes, "internalKey='{$id}'");
251
-
252
-		// Save user settings
253
-		saveUserSettings($id);
254
-
255
-		// Set the item name for logger
256
-		$_SESSION['itemname'] = $newusername;
257
-
258
-		// invoke OnManagerSaveUser event
259
-		$modx->invokeEvent("OnManagerSaveUser", array(
260
-			"mode" => "upd",
261
-			"userid" => $id,
262
-			"username" => $newusername,
263
-			"userpassword" => $newpassword,
264
-			"useremail" => $email,
265
-			"userfullname" => $fullname,
266
-			"userroleid" => $role,
267
-			"oldusername" => (($oldusername != $newusername) ? $oldusername : ""),
268
-			"olduseremail" => (($oldemail != $email) ? $oldemail : "")
269
-		));
270
-
271
-		// invoke OnManagerChangePassword event
272
-		if($genpassword == 1) {
273
-			$modx->invokeEvent("OnManagerChangePassword", array(
274
-				"userid" => $id,
275
-				"username" => $newusername,
276
-				"userpassword" => $newpassword
277
-			));
278
-		}
279
-
280
-		// invoke OnUserFormSave event
281
-		$modx->invokeEvent("OnUserFormSave", array(
282
-			"mode" => "upd",
283
-			"id" => $id
284
-		));
285
-
286
-		/*******************************************************************************/
287
-		// put the user in the user_groups he/ she should be in
288
-		// first, check that up_perms are switched on!
289
-		if($use_udperms == 1) {
290
-			// as this is an existing user, delete his/ her entries in the groups before saving the new groups
291
-			$modx->db->delete($tbl_member_groups, "member='{$id}'");
292
-			if(!empty($user_groups)) {
293
-				for($i = 0; $i < count($user_groups); $i++) {
294
-					$field = array();
295
-					$field['user_group'] = (int)$user_groups[$i];
296
-					$field['member'] = $id;
297
-					$modx->db->insert($field, $tbl_member_groups);
298
-				}
299
-			}
300
-		}
301
-		// end of user_groups stuff!
302
-		/*******************************************************************************/
303
-		if($id == $modx->getLoginUserID() && ($genpassword !== 1 && $passwordnotifymethod != 's')) {
304
-			$modx->webAlertAndQuit($_lang["user_changeddata"], 'javascript:top.location.href="index.php?a=8";');
305
-		}
306
-		if($genpassword == 1 && $passwordnotifymethod == 's') {
307
-			if($input['stay'] != '') {
308
-				$a = ($input['stay'] == '2') ? "12&id={$id}" : "11";
309
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
310
-			} else {
311
-				$stayUrl = "index.php?a=75&r=2";
312
-			}
313
-
314
-			include_once "header.inc.php";
315
-			?>
197
+            include_once "footer.inc.php";
198
+        }
199
+        break;
200
+    case '12' : // edit user
201
+        // generate a new password for this user
202
+        if($genpassword == 1) {
203
+            if($specifiedpassword != "" && $passwordgenmethod == "spec") {
204
+                if(strlen($specifiedpassword) < 6) {
205
+                    webAlertAndQuit("Password is too short!");
206
+                } else {
207
+                    $newpassword = $specifiedpassword;
208
+                }
209
+            } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
210
+                webAlertAndQuit("You didn't specify a password for this user!");
211
+            } elseif($passwordgenmethod == 'g') {
212
+                $newpassword = generate_password(8);
213
+            } else {
214
+                webAlertAndQuit("No password generation method specified!");
215
+            }
216
+        }
217
+        if($passwordnotifymethod == 'e') {
218
+            sendMailMessage($email, $newusername, $newpassword, $fullname);
219
+        }
220
+
221
+        // check if the username already exist
222
+        $rs = $modx->db->select('count(id)', $tbl_manager_users, sprintf("username='%s' AND id!='%s'", $modx->db->escape($newusername), $id));
223
+        $limit = $modx->db->getValue($rs);
224
+        if($limit > 0) {
225
+            webAlertAndQuit("User name is already in use!");
226
+        }
227
+
228
+        // check if the email address already exists
229
+        $rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, sprintf("email='%s' AND internalKey!='%s'", $modx->db->escape($email), $id));
230
+        $limit = $modx->db->getValue($rs);
231
+        if($limit > 0) {
232
+            webAlertAndQuit("Email is already in use!");
233
+        }
234
+
235
+        // invoke OnBeforeUserFormSave event
236
+        $modx->invokeEvent("OnBeforeUserFormSave", array(
237
+            "mode" => "upd",
238
+            "id" => $id
239
+        ));
240
+
241
+        // update user name and password
242
+        $field = array();
243
+        $field['username'] = $modx->db->escape($newusername);
244
+        if($genpassword == 1) {
245
+            $field['password'] = $modx->phpass->HashPassword($newpassword);
246
+        }
247
+        $modx->db->update($field, $tbl_manager_users, "id='{$id}'");
248
+        $field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter');
249
+        $field = $modx->db->escape($field);
250
+        $modx->db->update($field, $tbl_user_attributes, "internalKey='{$id}'");
251
+
252
+        // Save user settings
253
+        saveUserSettings($id);
254
+
255
+        // Set the item name for logger
256
+        $_SESSION['itemname'] = $newusername;
257
+
258
+        // invoke OnManagerSaveUser event
259
+        $modx->invokeEvent("OnManagerSaveUser", array(
260
+            "mode" => "upd",
261
+            "userid" => $id,
262
+            "username" => $newusername,
263
+            "userpassword" => $newpassword,
264
+            "useremail" => $email,
265
+            "userfullname" => $fullname,
266
+            "userroleid" => $role,
267
+            "oldusername" => (($oldusername != $newusername) ? $oldusername : ""),
268
+            "olduseremail" => (($oldemail != $email) ? $oldemail : "")
269
+        ));
270
+
271
+        // invoke OnManagerChangePassword event
272
+        if($genpassword == 1) {
273
+            $modx->invokeEvent("OnManagerChangePassword", array(
274
+                "userid" => $id,
275
+                "username" => $newusername,
276
+                "userpassword" => $newpassword
277
+            ));
278
+        }
279
+
280
+        // invoke OnUserFormSave event
281
+        $modx->invokeEvent("OnUserFormSave", array(
282
+            "mode" => "upd",
283
+            "id" => $id
284
+        ));
285
+
286
+        /*******************************************************************************/
287
+        // put the user in the user_groups he/ she should be in
288
+        // first, check that up_perms are switched on!
289
+        if($use_udperms == 1) {
290
+            // as this is an existing user, delete his/ her entries in the groups before saving the new groups
291
+            $modx->db->delete($tbl_member_groups, "member='{$id}'");
292
+            if(!empty($user_groups)) {
293
+                for($i = 0; $i < count($user_groups); $i++) {
294
+                    $field = array();
295
+                    $field['user_group'] = (int)$user_groups[$i];
296
+                    $field['member'] = $id;
297
+                    $modx->db->insert($field, $tbl_member_groups);
298
+                }
299
+            }
300
+        }
301
+        // end of user_groups stuff!
302
+        /*******************************************************************************/
303
+        if($id == $modx->getLoginUserID() && ($genpassword !== 1 && $passwordnotifymethod != 's')) {
304
+            $modx->webAlertAndQuit($_lang["user_changeddata"], 'javascript:top.location.href="index.php?a=8";');
305
+        }
306
+        if($genpassword == 1 && $passwordnotifymethod == 's') {
307
+            if($input['stay'] != '') {
308
+                $a = ($input['stay'] == '2') ? "12&id={$id}" : "11";
309
+                $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
310
+            } else {
311
+                $stayUrl = "index.php?a=75&r=2";
312
+            }
313
+
314
+            include_once "header.inc.php";
315
+            ?>
316 316
 
317 317
 			<h1><?php echo $_lang['user_title']; ?></h1>
318 318
 
@@ -332,20 +332,20 @@  discard block
 block discarded – undo
332 332
 			</div>
333 333
 			<?php
334 334
 
335
-			include_once "footer.inc.php";
336
-		} else {
337
-			if($input['stay'] != '') {
338
-				$a = ($input['stay'] == '2') ? "12&id={$id}" : "11";
339
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
340
-				header($header);
341
-			} else {
342
-				$header = "Location: index.php?a=75&r=2";
343
-				header($header);
344
-			}
345
-		}
346
-		break;
347
-	default:
348
-		webAlertAndQuit("No operation set in request.");
335
+            include_once "footer.inc.php";
336
+        } else {
337
+            if($input['stay'] != '') {
338
+                $a = ($input['stay'] == '2') ? "12&id={$id}" : "11";
339
+                $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
340
+                header($header);
341
+            } else {
342
+                $header = "Location: index.php?a=75&r=2";
343
+                header($header);
344
+            }
345
+        }
346
+        break;
347
+    default:
348
+        webAlertAndQuit("No operation set in request.");
349 349
 }
350 350
 
351 351
 /**
@@ -357,31 +357,31 @@  discard block
 block discarded – undo
357 357
  * @param string $ufn
358 358
  */
359 359
 function sendMailMessage($email, $uid, $pwd, $ufn) {
360
-	$modx = evolutionCMS(); global $_lang, $signupemail_message;
361
-	global $emailsubject, $emailsender;
362
-	global $site_name;
363
-	$manager_url = MODX_MANAGER_URL;
364
-	$message = sprintf($signupemail_message, $uid, $pwd); // use old method
365
-	// replace placeholders
366
-	$message = str_replace("[+uid+]", $uid, $message);
367
-	$message = str_replace("[+pwd+]", $pwd, $message);
368
-	$message = str_replace("[+ufn+]", $ufn, $message);
369
-	$message = str_replace("[+sname+]", $site_name, $message);
370
-	$message = str_replace("[+saddr+]", $emailsender, $message);
371
-	$message = str_replace("[+semail+]", $emailsender, $message);
372
-	$message = str_replace("[+surl+]", $manager_url, $message);
373
-
374
-	$param = array();
375
-	$param['from'] = "{$site_name}<{$emailsender}>";
376
-	$param['subject'] = $emailsubject;
377
-	$param['body'] = $message;
378
-	$param['to'] = $email;
379
-	$param['type'] = 'text';
380
-	$rs = $modx->sendmail($param);
381
-	if(!$rs) {
382
-		$modx->manager->saveFormValues();
383
-		$modx->messageQuit("{$email} - {$_lang['error_sending_email']}");
384
-	}
360
+    $modx = evolutionCMS(); global $_lang, $signupemail_message;
361
+    global $emailsubject, $emailsender;
362
+    global $site_name;
363
+    $manager_url = MODX_MANAGER_URL;
364
+    $message = sprintf($signupemail_message, $uid, $pwd); // use old method
365
+    // replace placeholders
366
+    $message = str_replace("[+uid+]", $uid, $message);
367
+    $message = str_replace("[+pwd+]", $pwd, $message);
368
+    $message = str_replace("[+ufn+]", $ufn, $message);
369
+    $message = str_replace("[+sname+]", $site_name, $message);
370
+    $message = str_replace("[+saddr+]", $emailsender, $message);
371
+    $message = str_replace("[+semail+]", $emailsender, $message);
372
+    $message = str_replace("[+surl+]", $manager_url, $message);
373
+
374
+    $param = array();
375
+    $param['from'] = "{$site_name}<{$emailsender}>";
376
+    $param['subject'] = $emailsubject;
377
+    $param['body'] = $message;
378
+    $param['to'] = $email;
379
+    $param['type'] = 'text';
380
+    $rs = $modx->sendmail($param);
381
+    if(!$rs) {
382
+        $modx->manager->saveFormValues();
383
+        $modx->messageQuit("{$email} - {$_lang['error_sending_email']}");
384
+    }
385 385
 }
386 386
 
387 387
 /**
@@ -390,86 +390,86 @@  discard block
 block discarded – undo
390 390
  * @param int $id
391 391
  */
392 392
 function saveUserSettings($id) {
393
-	$modx = evolutionCMS();
394
-	$tbl_user_settings = $modx->getFullTableName('user_settings');
395
-
396
-	$ignore = array(
397
-		'id',
398
-		'oldusername',
399
-		'oldemail',
400
-		'newusername',
401
-		'fullname',
402
-		'newpassword',
403
-		'newpasswordcheck',
404
-		'passwordgenmethod',
405
-		'passwordnotifymethod',
406
-		'specifiedpassword',
407
-		'confirmpassword',
408
-		'email',
409
-		'phone',
410
-		'mobilephone',
411
-		'fax',
412
-		'dob',
413
-		'country',
414
-		'street',
415
-		'city',
416
-		'state',
417
-		'zip',
418
-		'gender',
419
-		'photo',
420
-		'comment',
421
-		'role',
422
-		'failedlogincount',
423
-		'blocked',
424
-		'blockeduntil',
425
-		'blockedafter',
426
-		'user_groups',
427
-		'mode',
428
-		'blockedmode',
429
-		'stay',
430
-		'save',
431
-		'theme_refresher'
432
-	);
433
-
434
-	// determine which settings can be saved blank (based on 'default_{settingname}' POST checkbox values)
435
-	$defaults = array(
436
-		'upload_images',
437
-		'upload_media',
438
-		'upload_flash',
439
-		'upload_files'
440
-	);
441
-
442
-	// get user setting field names
443
-	$settings = array();
444
-	foreach($_POST as $n => $v) {
445
-		if(in_array($n, $ignore) || (!in_array($n, $defaults) && is_scalar($v) && trim($v) == '') || (!in_array($n, $defaults) && is_array($v) && empty($v))) {
446
-			continue;
447
-		} // ignore blacklist and empties
448
-		$settings[$n] = $v; // this value should be saved
449
-	}
450
-
451
-	foreach($defaults as $k) {
452
-		if(isset($settings['default_' . $k]) && $settings['default_' . $k] == '1') {
453
-			unset($settings[$k]);
454
-		}
455
-		unset($settings['default_' . $k]);
456
-	}
457
-
458
-	$modx->db->delete($tbl_user_settings, "user='{$id}'");
459
-
460
-	foreach($settings as $n => $vl) {
461
-		if(is_array($vl)) {
462
-			$vl = implode(",", $vl);
463
-		}
464
-		if($vl != '') {
465
-			$f = array();
466
-			$f['user'] = $id;
467
-			$f['setting_name'] = $n;
468
-			$f['setting_value'] = $vl;
469
-			$f = $modx->db->escape($f);
470
-			$modx->db->insert($f, $tbl_user_settings);
471
-		}
472
-	}
393
+    $modx = evolutionCMS();
394
+    $tbl_user_settings = $modx->getFullTableName('user_settings');
395
+
396
+    $ignore = array(
397
+        'id',
398
+        'oldusername',
399
+        'oldemail',
400
+        'newusername',
401
+        'fullname',
402
+        'newpassword',
403
+        'newpasswordcheck',
404
+        'passwordgenmethod',
405
+        'passwordnotifymethod',
406
+        'specifiedpassword',
407
+        'confirmpassword',
408
+        'email',
409
+        'phone',
410
+        'mobilephone',
411
+        'fax',
412
+        'dob',
413
+        'country',
414
+        'street',
415
+        'city',
416
+        'state',
417
+        'zip',
418
+        'gender',
419
+        'photo',
420
+        'comment',
421
+        'role',
422
+        'failedlogincount',
423
+        'blocked',
424
+        'blockeduntil',
425
+        'blockedafter',
426
+        'user_groups',
427
+        'mode',
428
+        'blockedmode',
429
+        'stay',
430
+        'save',
431
+        'theme_refresher'
432
+    );
433
+
434
+    // determine which settings can be saved blank (based on 'default_{settingname}' POST checkbox values)
435
+    $defaults = array(
436
+        'upload_images',
437
+        'upload_media',
438
+        'upload_flash',
439
+        'upload_files'
440
+    );
441
+
442
+    // get user setting field names
443
+    $settings = array();
444
+    foreach($_POST as $n => $v) {
445
+        if(in_array($n, $ignore) || (!in_array($n, $defaults) && is_scalar($v) && trim($v) == '') || (!in_array($n, $defaults) && is_array($v) && empty($v))) {
446
+            continue;
447
+        } // ignore blacklist and empties
448
+        $settings[$n] = $v; // this value should be saved
449
+    }
450
+
451
+    foreach($defaults as $k) {
452
+        if(isset($settings['default_' . $k]) && $settings['default_' . $k] == '1') {
453
+            unset($settings[$k]);
454
+        }
455
+        unset($settings['default_' . $k]);
456
+    }
457
+
458
+    $modx->db->delete($tbl_user_settings, "user='{$id}'");
459
+
460
+    foreach($settings as $n => $vl) {
461
+        if(is_array($vl)) {
462
+            $vl = implode(",", $vl);
463
+        }
464
+        if($vl != '') {
465
+            $f = array();
466
+            $f['user'] = $id;
467
+            $f['setting_name'] = $n;
468
+            $f['setting_value'] = $vl;
469
+            $f = $modx->db->escape($f);
470
+            $modx->db->insert($f, $tbl_user_settings);
471
+        }
472
+    }
473 473
 }
474 474
 
475 475
 /**
@@ -478,10 +478,10 @@  discard block
 block discarded – undo
478 478
  * @param $msg
479 479
  */
480 480
 function webAlertAndQuit($msg) {
481
-	global $id, $modx;
482
-	$mode = $_POST['mode'];
483
-	$modx->manager->saveFormValues($mode);
484
-	$modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode == '12' ? "&id={$id}" : ''));
481
+    global $id, $modx;
482
+    $mode = $_POST['mode'];
483
+    $modx->manager->saveFormValues($mode);
484
+    $modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode == '12' ? "&id={$id}" : ''));
485 485
 }
486 486
 
487 487
 /**
@@ -491,12 +491,12 @@  discard block
 block discarded – undo
491 491
  * @return string
492 492
  */
493 493
 function generate_password($length = 10) {
494
-	$allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
495
-	$ps_len = strlen($allowable_characters);
496
-	mt_srand((double) microtime() * 1000000);
497
-	$pass = "";
498
-	for($i = 0; $i < $length; $i++) {
499
-		$pass .= $allowable_characters[mt_rand(0, $ps_len - 1)];
500
-	}
501
-	return $pass;
494
+    $allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
495
+    $ps_len = strlen($allowable_characters);
496
+    mt_srand((double) microtime() * 1000000);
497
+    $pass = "";
498
+    for($i = 0; $i < $length; $i++) {
499
+        $pass .= $allowable_characters[mt_rand(0, $ps_len - 1)];
500
+    }
501
+    return $pass;
502 502
 }
Please login to merge, or discard this patch.
manager/processors/move_document.processor.php 1 patch
Indentation   +65 added lines, -65 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
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('edit_document')) {
6
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
6
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
7 7
 }
8 8
 
9 9
 $newParentID = isset($_REQUEST['new_parent']) ? (int)$_REQUEST['new_parent'] : 0;
@@ -25,17 +25,17 @@  discard block
 block discarded – undo
25 25
 // check user has permission to move document to chosen location
26 26
 
27 27
 if ($use_udperms == 1) {
28
-	if ($oldparent != $newParentID) {
29
-		include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
30
-		$udperms = new udperms();
31
-		$udperms->user = $modx->getLoginUserID();
32
-		$udperms->document = $newParentID;
33
-		$udperms->role = $_SESSION['mgrRole'];
34
-
35
-		 if (!$udperms->checkPermissions()) {
36
-			$modx->webAlertAndQuit($_lang["access_permission_parent_denied"]);
37
-		 }
38
-	}
28
+    if ($oldparent != $newParentID) {
29
+        include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
30
+        $udperms = new udperms();
31
+        $udperms->user = $modx->getLoginUserID();
32
+        $udperms->document = $newParentID;
33
+        $udperms->role = $_SESSION['mgrRole'];
34
+
35
+            if (!$udperms->checkPermissions()) {
36
+            $modx->webAlertAndQuit($_lang["access_permission_parent_denied"]);
37
+            }
38
+    }
39 39
 }
40 40
 
41 41
 /**
@@ -43,67 +43,67 @@  discard block
 block discarded – undo
43 43
  * @return array
44 44
  */
45 45
 function allChildren($currDocID) {
46
-	$modx = evolutionCMS();
47
-	$children= array();
48
-	$currDocID = $modx->db->escape($currDocID);
49
-	$rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent = '{$currDocID}'");
50
-	while ($child= $modx->db->getRow($rs)) {
51
-		$children[]= $child['id'];
52
-		$children= array_merge($children, allChildren($child['id']));
53
-	}
54
-	return $children;
46
+    $modx = evolutionCMS();
47
+    $children= array();
48
+    $currDocID = $modx->db->escape($currDocID);
49
+    $rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent = '{$currDocID}'");
50
+    while ($child= $modx->db->getRow($rs)) {
51
+        $children[]= $child['id'];
52
+        $children= array_merge($children, allChildren($child['id']));
53
+    }
54
+    return $children;
55 55
 }
56 56
 
57 57
 $evtOut = $modx->invokeEvent("onBeforeMoveDocument", array (
58
-	"id_document" => $documentID,
59
-	"old_parent" => $oldparent,
60
-	"new_parent" => $newParentID
58
+    "id_document" => $documentID,
59
+    "old_parent" => $oldparent,
60
+    "new_parent" => $newParentID
61 61
 ));
62 62
 if (is_array($evtOut) && count($evtOut) > 0){
63
-	$newParent = array_pop($evtOut);
64
-	if($newParent == $oldparent) {
65
-		$modx->webAlertAndQuit($_lang["error_movedocument2"]);
66
-	}else{
67
-		$newParentID = $newParent;
68
-	}
63
+    $newParent = array_pop($evtOut);
64
+    if($newParent == $oldparent) {
65
+        $modx->webAlertAndQuit($_lang["error_movedocument2"]);
66
+    }else{
67
+        $newParentID = $newParent;
68
+    }
69 69
 }
70 70
 
71 71
 $children = allChildren($documentID);
72 72
 if (!array_search($newParentID, $children)) {
73
-	$modx->db->update(array(
74
-		'isfolder' => 1,
75
-	), $modx->getFullTableName('site_content'), "id='{$newParentID}'");
76
-
77
-	$modx->db->update(array(
78
-		'parent'   => $newParentID,
79
-		'editedby' => $modx->getLoginUserID(),
80
-		'editedon' => time(),
81
-	), $modx->getFullTableName('site_content'), "id='{$documentID}'");
82
-
83
-	// finished moving the document, now check to see if the old_parent should no longer be a folder.
84
-	$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_content'), "parent='{$oldparent}'");
85
-	$limit = $modx->db->getValue($rs);
86
-
87
-	if(!$limit>0) {
88
-		$modx->db->update(array(
89
-			'isfolder' => 0,
90
-		), $modx->getFullTableName('site_content'), "id='{$oldparent}'");
91
-	}
92
-	// Set the item name for logger
93
-	$pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$documentID}'"));
94
-	$_SESSION['itemname'] = $pagetitle;
95
-
96
-	$modx->invokeEvent("onAfterMoveDocument", array (
97
-		"id_document" => $documentID,
98
-		"old_parent" => $oldparent,
99
-		"new_parent" => $newParentID
100
-	));
101
-
102
-	// empty cache & sync site
103
-	$modx->clearCache('full');
104
-
105
-	$header="Location: index.php?a=3&id={$documentID}&r=9";
106
-	header($header);
73
+    $modx->db->update(array(
74
+        'isfolder' => 1,
75
+    ), $modx->getFullTableName('site_content'), "id='{$newParentID}'");
76
+
77
+    $modx->db->update(array(
78
+        'parent'   => $newParentID,
79
+        'editedby' => $modx->getLoginUserID(),
80
+        'editedon' => time(),
81
+    ), $modx->getFullTableName('site_content'), "id='{$documentID}'");
82
+
83
+    // finished moving the document, now check to see if the old_parent should no longer be a folder.
84
+    $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_content'), "parent='{$oldparent}'");
85
+    $limit = $modx->db->getValue($rs);
86
+
87
+    if(!$limit>0) {
88
+        $modx->db->update(array(
89
+            'isfolder' => 0,
90
+        ), $modx->getFullTableName('site_content'), "id='{$oldparent}'");
91
+    }
92
+    // Set the item name for logger
93
+    $pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$documentID}'"));
94
+    $_SESSION['itemname'] = $pagetitle;
95
+
96
+    $modx->invokeEvent("onAfterMoveDocument", array (
97
+        "id_document" => $documentID,
98
+        "old_parent" => $oldparent,
99
+        "new_parent" => $newParentID
100
+    ));
101
+
102
+    // empty cache & sync site
103
+    $modx->clearCache('full');
104
+
105
+    $header="Location: index.php?a=3&id={$documentID}&r=9";
106
+    header($header);
107 107
 } else {
108
-	$modx->webAlertAndQuit("You cannot move a document to a child document!");
108
+    $modx->webAlertAndQuit("You cannot move a document to a child document!");
109 109
 }
Please login to merge, or discard this patch.
manager/processors/duplicate_content.processor.php 1 patch
Indentation   +94 added lines, -94 removed lines patch added patch discarded remove patch
@@ -3,12 +3,12 @@  discard block
 block discarded – undo
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_document') || !$modx->hasPermission('save_document')) {
6
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
6
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
7 7
 }
8 8
 
9 9
 $id = isset($_GET['id'])? (int)$_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
 $children = array();
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 $udperms->duplicateDoc = true;
23 23
 
24 24
 if(!$udperms->checkPermissions()) {
25
-	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
25
+    $modx->webAlertAndQuit($_lang["access_permission_denied"]);
26 26
 }
27 27
 
28 28
 // Run the duplicator
@@ -43,103 +43,103 @@  discard block
 block discarded – undo
43 43
  * @return int
44 44
  */
45 45
 function duplicateDocument($docid, $parent=null, $_toplevel=0) {
46
-	$modx = evolutionCMS(); global $_lang;
47
-
48
-	// invoke OnBeforeDocDuplicate event
49
-	$evtOut = $modx->invokeEvent('OnBeforeDocDuplicate', array(
50
-		'id' => $docid
51
-	));
52
-
53
-	// if( !in_array( 'false', array_values( $evtOut ) ) ){}
54
-	// TODO: Determine necessary handling for duplicateDocument "return $newparent" if OnBeforeDocDuplicate were able to conditially control duplication
55
-	// [DISABLED]: Proceed with duplicateDocument if OnBeforeDocDuplicate did not return false via: $event->output('false');
56
-
57
-	$userID = $modx->getLoginUserID();
58
-
59
-	$tblsc = $modx->getFullTableName('site_content');
60
-
61
-	// Grab the original document
62
-	$rs = $modx->db->select('*', $tblsc, "id='{$docid}'");
63
-	$content = $modx->db->getRow($rs);
64
-
65
-	// Handle incremental ID
66
-	switch($modx->config['docid_incrmnt_method'])
67
-	{
68
-		case '1':
69
-			$from = "{$tblsc} AS T0 LEFT JOIN {$tblsc} AS T1 ON T0.id + 1 = T1.id";
70
-			$rs = $modx->db->select('MIN(T0.id)+1', $from, "T1.id IS NULL");
71
-			$content['id'] = $modx->db->getValue($rs);
72
-			break;
73
-		case '2':
74
-			$rs = $modx->db->select('MAX(id)+1',$tblsc);
75
-			$content['id'] = $modx->db->getValue($rs);
76
-			break;
77
-
78
-		default:
79
-			unset($content['id']); // remove the current id.
80
-	}
81
-
82
-	// Once we've grabbed the document object, start doing some modifications
83
-	if ($_toplevel == 0) {
84
-		// count duplicates
85
-		$pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$docid}'"));
86
-		$pagetitle = $modx->db->escape($pagetitle);
87
-		$count = $modx->db->getRecordCount($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "pagetitle LIKE '{$pagetitle} Duplicate%'"));
88
-		if($count>=1) $count = ' '.($count+1);
89
-		else $count = '';
90
-
91
-		$content['pagetitle'] = $_lang['duplicated_el_suffix'].$count.' '.$content['pagetitle'];
92
-		$content['alias'] = null;
93
-	} elseif($modx->config['friendly_urls'] == 0 || $modx->config['allow_duplicate_alias'] == 0) {
94
-		$content['alias'] = null;
95
-	}
96
-
97
-	// change the parent accordingly
98
-	if ($parent !== null) $content['parent'] = $parent;
99
-
100
-	// Change the author
101
-	$content['createdby'] = $userID;
102
-	$content['createdon'] = time();
103
-	// Remove other modification times
104
-	$content['editedby'] = $content['editedon'] = $content['deleted'] = $content['deletedby'] = $content['deletedon'] = 0;
105
-
106
-	// [FS#922] Should the published status be honored? - sirlancelot
46
+    $modx = evolutionCMS(); global $_lang;
47
+
48
+    // invoke OnBeforeDocDuplicate event
49
+    $evtOut = $modx->invokeEvent('OnBeforeDocDuplicate', array(
50
+        'id' => $docid
51
+    ));
52
+
53
+    // if( !in_array( 'false', array_values( $evtOut ) ) ){}
54
+    // TODO: Determine necessary handling for duplicateDocument "return $newparent" if OnBeforeDocDuplicate were able to conditially control duplication
55
+    // [DISABLED]: Proceed with duplicateDocument if OnBeforeDocDuplicate did not return false via: $event->output('false');
56
+
57
+    $userID = $modx->getLoginUserID();
58
+
59
+    $tblsc = $modx->getFullTableName('site_content');
60
+
61
+    // Grab the original document
62
+    $rs = $modx->db->select('*', $tblsc, "id='{$docid}'");
63
+    $content = $modx->db->getRow($rs);
64
+
65
+    // Handle incremental ID
66
+    switch($modx->config['docid_incrmnt_method'])
67
+    {
68
+        case '1':
69
+            $from = "{$tblsc} AS T0 LEFT JOIN {$tblsc} AS T1 ON T0.id + 1 = T1.id";
70
+            $rs = $modx->db->select('MIN(T0.id)+1', $from, "T1.id IS NULL");
71
+            $content['id'] = $modx->db->getValue($rs);
72
+            break;
73
+        case '2':
74
+            $rs = $modx->db->select('MAX(id)+1',$tblsc);
75
+            $content['id'] = $modx->db->getValue($rs);
76
+            break;
77
+
78
+        default:
79
+            unset($content['id']); // remove the current id.
80
+    }
81
+
82
+    // Once we've grabbed the document object, start doing some modifications
83
+    if ($_toplevel == 0) {
84
+        // count duplicates
85
+        $pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$docid}'"));
86
+        $pagetitle = $modx->db->escape($pagetitle);
87
+        $count = $modx->db->getRecordCount($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "pagetitle LIKE '{$pagetitle} Duplicate%'"));
88
+        if($count>=1) $count = ' '.($count+1);
89
+        else $count = '';
90
+
91
+        $content['pagetitle'] = $_lang['duplicated_el_suffix'].$count.' '.$content['pagetitle'];
92
+        $content['alias'] = null;
93
+    } elseif($modx->config['friendly_urls'] == 0 || $modx->config['allow_duplicate_alias'] == 0) {
94
+        $content['alias'] = null;
95
+    }
96
+
97
+    // change the parent accordingly
98
+    if ($parent !== null) $content['parent'] = $parent;
99
+
100
+    // Change the author
101
+    $content['createdby'] = $userID;
102
+    $content['createdon'] = time();
103
+    // Remove other modification times
104
+    $content['editedby'] = $content['editedon'] = $content['deleted'] = $content['deletedby'] = $content['deletedon'] = 0;
105
+
106
+    // [FS#922] Should the published status be honored? - sirlancelot
107 107
 //	if ($modx->hasPermission('publish_document')) {
108 108
 //		if ($modx->config['publish_default'])
109 109
 //			$content['pub_date'] = $content['pub_date']; // should this be changed to 1?
110 110
 //		else	$content['pub_date'] = 0;
111 111
 //	} else {
112
-		// User can't publish documents
112
+        // User can't publish documents
113 113
 //		$content['published'] = $content['pub_date'] = 0;
114 114
 //	}
115 115
 
116 116
     // Set the published status to unpublished by default (see above ... commit #3388)
117 117
     $content['published'] = $content['pub_date'] = 0;
118 118
 
119
-	// Escape the proper strings
120
-	$content = $modx->db->escape($content);
119
+    // Escape the proper strings
120
+    $content = $modx->db->escape($content);
121 121
 
122
-	// Duplicate the Document
123
-	$newparent = $modx->db->insert($content, $tblsc);
122
+    // Duplicate the Document
123
+    $newparent = $modx->db->insert($content, $tblsc);
124 124
 
125
-	// duplicate document's TVs
126
-	duplicateTVs($docid, $newparent);
127
-	duplicateAccess($docid, $newparent);
125
+    // duplicate document's TVs
126
+    duplicateTVs($docid, $newparent);
127
+    duplicateAccess($docid, $newparent);
128 128
 
129
-	// invoke OnDocDuplicate event
130
-	$evtOut = $modx->invokeEvent('OnDocDuplicate', array(
131
-		'id' => $docid,
132
-		'new_id' => $newparent
133
-	));
129
+    // invoke OnDocDuplicate event
130
+    $evtOut = $modx->invokeEvent('OnDocDuplicate', array(
131
+        'id' => $docid,
132
+        'new_id' => $newparent
133
+    ));
134 134
 
135
-	// Start duplicating all the child documents that aren't deleted.
136
-	$_toplevel++;
137
-	$rs = $modx->db->select('id', $tblsc, "parent='{$docid}' AND deleted=0", 'id ASC');
138
-		while ($row = $modx->db->getRow($rs))
139
-			duplicateDocument($row['id'], $newparent, $_toplevel);
135
+    // Start duplicating all the child documents that aren't deleted.
136
+    $_toplevel++;
137
+    $rs = $modx->db->select('id', $tblsc, "parent='{$docid}' AND deleted=0", 'id ASC');
138
+        while ($row = $modx->db->getRow($rs))
139
+            duplicateDocument($row['id'], $newparent, $_toplevel);
140 140
 
141
-	// return the new doc id
142
-	return $newparent;
141
+    // return the new doc id
142
+    return $newparent;
143 143
 }
144 144
 
145 145
 /**
@@ -149,17 +149,17 @@  discard block
 block discarded – undo
149 149
  * @param int $newid
150 150
  */
151 151
 function duplicateTVs($oldid, $newid){
152
-	$modx = evolutionCMS();
152
+    $modx = evolutionCMS();
153 153
 
154
-	$tbltvc = $modx->getFullTableName('site_tmplvar_contentvalues');
154
+    $tbltvc = $modx->getFullTableName('site_tmplvar_contentvalues');
155 155
 
156 156
     $newid = (int)$newid;
157 157
     $oldid = (int)$oldid;
158 158
 
159 159
     $modx->db->insert(
160
-		array('contentid'=>'', 'tmplvarid'=>'', 'value'=>''), $tbltvc, // Insert into
161
-		"{$newid}, tmplvarid, value", $tbltvc, "contentid='{$oldid}'" // Copy from
162
-	);
160
+        array('contentid'=>'', 'tmplvarid'=>'', 'value'=>''), $tbltvc, // Insert into
161
+        "{$newid}, tmplvarid, value", $tbltvc, "contentid='{$oldid}'" // Copy from
162
+    );
163 163
 }
164 164
 
165 165
 /**
@@ -169,15 +169,15 @@  discard block
 block discarded – undo
169 169
  * @param int $newid
170 170
  */
171 171
 function duplicateAccess($oldid, $newid){
172
-	$modx = evolutionCMS();
172
+    $modx = evolutionCMS();
173 173
 
174
-	$tbldg = $modx->getFullTableName('document_groups');
174
+    $tbldg = $modx->getFullTableName('document_groups');
175 175
 
176 176
     $newid = (int)$newid;
177 177
     $oldid = (int)$oldid;
178 178
 
179 179
     $modx->db->insert(
180
-		array('document'=>'', 'document_group'=>''), $tbldg, // Insert into
181
-		"{$newid}, document_group", $tbldg, "document='{$oldid}'" // Copy from
182
-	);
180
+        array('document'=>'', 'document_group'=>''), $tbldg, // Insert into
181
+        "{$newid}, document_group", $tbldg, "document='{$oldid}'" // Copy from
182
+    );
183 183
 }
Please login to merge, or discard this patch.
manager/processors/save_content.processor.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -492,7 +492,7 @@
 block discarded – undo
492 492
                 }elseif ((!empty($pub_date)&& $pub_date<=$currentdate && $published)) {
493 493
                 $publishedon = $pub_date;
494 494
                 $publishedby = $modx->getLoginUserID();
495
-                   }elseif ($was_published && !$published) {
495
+                    }elseif ($was_published && !$published) {
496 496
                 $publishedon = 0;
497 497
                 $publishedby = 0;
498 498
             } else {
Please login to merge, or discard this patch.
install/cli-install.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -339,9 +339,9 @@  discard block
 block discarded – undo
339 339
         echo $_lang['failed'] . ' ' . $_lang['table_prefix_not_exist'] . PHP_EOL;
340 340
         $errors++;
341 341
 
342
-  } else {
342
+    } else {
343 343
         echo $_lang['ok'] . PHP_EOL;
344
-  }
344
+    }
345 345
 }
346 346
 
347 347
 // check mysql version
@@ -1162,7 +1162,7 @@  discard block
 block discarded – undo
1162 1162
                         $tRow = mysqli_fetch_assoc($ts);
1163 1163
                         $templateId = $tRow['id'];
1164 1164
                         mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvar_templates` (tmplvarid, templateid) VALUES($id, $templateId)");
1165
-                   }
1165
+                    }
1166 1166
                 }
1167 1167
             }
1168 1168
         }
@@ -1527,9 +1527,9 @@  discard block
 block discarded – undo
1527 1527
 echo PHP_EOL . $_lang['installation_successful'] . PHP_EOL . PHP_EOL;
1528 1528
 //echo "<p>" . $_lang['to_log_into_content_manager'] . "</p>";
1529 1529
 if ($installMode == 0) {
1530
-   echo strip_tags($_lang['installation_note']) . PHP_EOL;
1530
+    echo strip_tags($_lang['installation_note']) . PHP_EOL;
1531 1531
 } else {
1532
-   echo strip_tags($_lang['upgrade_note']) . PHP_EOL;
1532
+    echo strip_tags($_lang['upgrade_note']) . PHP_EOL;
1533 1533
 }
1534 1534
 
1535 1535
 
Please login to merge, or discard this patch.
manager/actions/search.static.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -113,31 +113,31 @@
 block discarded – undo
113 113
     // Handle Input "Search in main fields"
114 114
     if ($searchfields != '') {
115 115
 
116
-		/*start search by TV. Added Rising13*/
117
-		$tbl_site_tmplvar_contentvalues = $modx->getFullTableName('site_tmplvar_contentvalues');
118
-		$articul_query = "SELECT `contentid` FROM {$tbl_site_tmplvar_contentvalues} WHERE `value` LIKE '%{$searchfields}%'";
119
-		$articul_result = $modx->db->query($articul_query);
120
-		$articul_id_array = $modx->db->makeArray($articul_result);
121
-		if(count($articul_id_array)>0){
122
-			$articul_id = '';
123
-			$i = 1;
124
-			foreach( $articul_id_array as $articul ) {
125
-				$articul_id.=$articul['contentid'];
126
-				if($i !== count($articul_id_array)){
127
-					$articul_id.=',';
128
-				}
129
-				$i++;
130
-			}
131
-		$articul_id_query = " OR sc.id IN ({$articul_id})";
132
-		}else{
133
-			$articul_id_query = '';
134
-		}
135
-		/*end search by TV*/
116
+        /*start search by TV. Added Rising13*/
117
+        $tbl_site_tmplvar_contentvalues = $modx->getFullTableName('site_tmplvar_contentvalues');
118
+        $articul_query = "SELECT `contentid` FROM {$tbl_site_tmplvar_contentvalues} WHERE `value` LIKE '%{$searchfields}%'";
119
+        $articul_result = $modx->db->query($articul_query);
120
+        $articul_id_array = $modx->db->makeArray($articul_result);
121
+        if(count($articul_id_array)>0){
122
+            $articul_id = '';
123
+            $i = 1;
124
+            foreach( $articul_id_array as $articul ) {
125
+                $articul_id.=$articul['contentid'];
126
+                if($i !== count($articul_id_array)){
127
+                    $articul_id.=',';
128
+                }
129
+                $i++;
130
+            }
131
+        $articul_id_query = " OR sc.id IN ({$articul_id})";
132
+        }else{
133
+            $articul_id_query = '';
134
+        }
135
+        /*end search by TV*/
136 136
 
137 137
         if (ctype_digit($searchfields)) {
138 138
             $sqladd .= "sc.id='{$searchfields}'";
139 139
             if (strlen($searchfields) > 3) {
140
-				$sqladd .= $articul_id_query;//search by TV
140
+                $sqladd .= $articul_id_query;//search by TV
141 141
                 $sqladd .= " OR sc.pagetitle LIKE '%{$searchfields}%'";
142 142
             }
143 143
         }
Please login to merge, or discard this patch.