evolution-cms / evolution

index.php

Indentation +13 added lines, -13 removed lines

@@ -47,7 +47,7 @@ 
 
 $autoloader = __DIR__.'/vendor/autoload.php';
 if (file_exists($autoloader) && is_readable($autoloader)) {
-	include_once($autoloader);
+    include_once($autoloader);
 }
 
 if(!isset($_SERVER['REQUEST_TIME_FLOAT'])) $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true);
@@ -56,11 +56,11 @@ 
 if(is_file($base_path . 'assets/cache/siteManager.php'))
     include_once($base_path . 'assets/cache/siteManager.php');
 if(!defined('MGR_DIR') && is_dir("{$base_path}manager"))
-	define('MGR_DIR', 'manager');
+    define('MGR_DIR', 'manager');
 if(is_file($base_path . 'assets/cache/siteHostnames.php'))
     include_once($base_path . 'assets/cache/siteHostnames.php');
 if(!defined('MODX_SITE_HOSTNAMES'))
-	define('MODX_SITE_HOSTNAMES', '');
+    define('MODX_SITE_HOSTNAMES', '');
 
 // get start time
 $mstart = memory_get_usage();
@@ -84,7 +84,7 @@ 
 
 define('IN_PARSER_MODE', true);
 if ( ! defined('IN_MANAGER_MODE')) {
-	define('IN_MANAGER_MODE', false);
+    define('IN_MANAGER_MODE', false);
 }
 if (!defined('MODX_API_MODE')) {
     define('MODX_API_MODE', false);
@@ -92,12 +92,12 @@ 
 
 // get the required includes
 if(!isset($database_user) || $database_user=="") {
-	$rt = @include_once(dirname(__FILE__).'/'.MGR_DIR.'/includes/config.inc.php');
-	// Be sure config.inc.php is there and that it contains some important values
-	if(!$rt || !$database_type || !$database_server || !$database_user || !$dbase) {
-		readfile('install/not_installed.tpl');
-		exit;
-	}
+    $rt = @include_once(dirname(__FILE__).'/'.MGR_DIR.'/includes/config.inc.php');
+    // Be sure config.inc.php is there and that it contains some important values
+    if(!$rt || !$database_type || !$database_server || !$database_user || !$dbase) {
+        readfile('install/not_installed.tpl');
+        exit;
+    }
 }
 
 // start session
@@ -105,11 +105,11 @@ 
 
 // initiate a new document parser
 if (isset($coreClass) && class_exists($coreClass)) {
-	$modx = new $coreClass;
+    $modx = new $coreClass;
 }
 if (!isset($modx) || !($modx instanceof \DocumentParser)) {
-	include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
-	$modx = new \DocumentParser;
+    include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
+    $modx = new \DocumentParser;
 }
 
 // set some parser options

install/instprocessor.php

Indentation +64 added lines, -64 removed lines

@@ -85,7 +85,7 @@ 
     echo "<span class=\"notok\" style='color:#707070'>".$_lang['setup_database_selection_failed']."</span>".$_lang['setup_database_selection_failed_note']."</p>";
     $create = true;
 } else {
-	if (function_exists('mysqli_set_charset')) mysqli_set_charset($conn, $database_charset);
+    if (function_exists('mysqli_set_charset')) mysqli_set_charset($conn, $database_charset);
     mysqli_query($conn, "{$database_connection_method} {$database_connection_charset}");
     echo '<span class="ok">'.$_lang['ok']."</span></p>";
 }
@@ -280,23 +280,23 @@ 
 
 // Reset database for installation of demo-site
 if ($installData && $moduleSQLDataFile && $moduleSQLResetFile) {
-	echo "<p>" . $_lang['resetting_database'];
-	$sqlParser->process($moduleSQLResetFile);
-	// display database results
-	if ($sqlParser->installFailed == true) {
-		$errors += 1;
-		echo "<span class=\"notok\"><b>" . $_lang['database_alerts'] . "</span></p>";
-		echo "<p>" . $_lang['setup_couldnt_install'] . "</p>";
-		echo "<p>" . $_lang['installation_error_occured'] . "<br /><br />";
-		for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) {
-			echo "<em>" . $sqlParser->mysqlErrors[$i]["error"] . "</em>" . $_lang['during_execution_of_sql'] . "<span class='mono'>" . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . "</span>.<hr />";
-		}
-		echo "</p>";
-		echo "<p>" . $_lang['some_tables_not_updated'] . "</p>";
-		return;
-	} else {
-		echo '<span class="ok">'.$_lang['ok']."</span></p>";
-	}
+    echo "<p>" . $_lang['resetting_database'];
+    $sqlParser->process($moduleSQLResetFile);
+    // display database results
+    if ($sqlParser->installFailed == true) {
+        $errors += 1;
+        echo "<span class=\"notok\"><b>" . $_lang['database_alerts'] . "</span></p>";
+        echo "<p>" . $_lang['setup_couldnt_install'] . "</p>";
+        echo "<p>" . $_lang['installation_error_occured'] . "<br /><br />";
+        for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) {
+            echo "<em>" . $sqlParser->mysqlErrors[$i]["error"] . "</em>" . $_lang['during_execution_of_sql'] . "<span class='mono'>" . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . "</span>.<hr />";
+        }
+        echo "</p>";
+        echo "<p>" . $_lang['some_tables_not_updated'] . "</p>";
+        return;
+    } else {
+        echo '<span class="ok">'.$_lang['ok']."</span></p>";
+    }
 }
 
 // Install Templates
@@ -418,7 +418,7 @@ 
                         $tRow = mysqli_fetch_assoc($ts);
                         $templateId = $tRow['id'];
                         mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvar_templates` (tmplvarid, templateid) VALUES($id, $templateId)");
-                   }
+                    }
                 }
             }
         }
@@ -687,51 +687,51 @@ 
 
 // Install Dependencies
 foreach ($moduleDependencies as $dependency) {
-	$ds = mysqli_query($sqlParser->conn, 'SELECT id, guid FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_modules` WHERE name="' . $dependency['module'] . '"');
-	if (!$ds) {
-		echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
-		return;
-	} else {
-		$row = mysqli_fetch_assoc($ds);
-		$moduleId = $row["id"];
-		$moduleGuid = $row["guid"];
-	}
-	// get extra id
-	$ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE ' . $dependency['column'] . '="' . $dependency['name'] . '"');
-	if (!$ds) {
-		echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
-		return;
-	} else {
-		$row = mysqli_fetch_assoc($ds);
-		$extraId = $row["id"];
-	}
-	// setup extra as module dependency
-	$ds = mysqli_query($sqlParser->conn, 'SELECT module FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type'] . ' LIMIT 1');
-	if (!$ds) {
-		echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
-		return;
-	} else {
-		if (mysqli_num_rows($ds) === 0) {
-			mysqli_query($sqlParser->conn, 'INSERT INTO ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` (module, resource, type) VALUES(' . $moduleId . ',' . $extraId . ',' . $dependency['type'] . ')');
-			echo '<p>&nbsp;&nbsp;' . $dependency['module'] . ' Module: <span class="ok">' . $_lang['depedency_create'] . '</span></p>';
-		} else {
-			mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` SET module = ' . $moduleId . ', resource = ' . $extraId . ', type = ' . $dependency['type'] . ' WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type']);
-			echo '<p>&nbsp;&nbsp;' . $dependency['module'] . ' Module: <span class="ok">' . $_lang['depedency_update'] . '</span></p>';
-		}
-		if ($dependency['type'] == 30 || $dependency['type'] == 40) {
-			// set extra guid for plugins and snippets
-			$ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE id=' . $extraId . ' LIMIT 1');
-			if (!$ds) {
-				echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
-				return;
-			} else {
-				if (mysqli_num_rows($ds) != 0) {
-					mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` SET moduleguid = ' . $moduleGuid . ' WHERE id=' . $extraId);
-					echo '<p>&nbsp;&nbsp;' . $dependency['name'] . ': <span class="ok">' . $_lang['guid_set'] . '</span></p>';
-				}
-			}
-		}
-	}
+    $ds = mysqli_query($sqlParser->conn, 'SELECT id, guid FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_modules` WHERE name="' . $dependency['module'] . '"');
+    if (!$ds) {
+        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+        return;
+    } else {
+        $row = mysqli_fetch_assoc($ds);
+        $moduleId = $row["id"];
+        $moduleGuid = $row["guid"];
+    }
+    // get extra id
+    $ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE ' . $dependency['column'] . '="' . $dependency['name'] . '"');
+    if (!$ds) {
+        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+        return;
+    } else {
+        $row = mysqli_fetch_assoc($ds);
+        $extraId = $row["id"];
+    }
+    // setup extra as module dependency
+    $ds = mysqli_query($sqlParser->conn, 'SELECT module FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type'] . ' LIMIT 1');
+    if (!$ds) {
+        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+        return;
+    } else {
+        if (mysqli_num_rows($ds) === 0) {
+            mysqli_query($sqlParser->conn, 'INSERT INTO ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` (module, resource, type) VALUES(' . $moduleId . ',' . $extraId . ',' . $dependency['type'] . ')');
+            echo '<p>&nbsp;&nbsp;' . $dependency['module'] . ' Module: <span class="ok">' . $_lang['depedency_create'] . '</span></p>';
+        } else {
+            mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` SET module = ' . $moduleId . ', resource = ' . $extraId . ', type = ' . $dependency['type'] . ' WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type']);
+            echo '<p>&nbsp;&nbsp;' . $dependency['module'] . ' Module: <span class="ok">' . $_lang['depedency_update'] . '</span></p>';
+        }
+        if ($dependency['type'] == 30 || $dependency['type'] == 40) {
+            // set extra guid for plugins and snippets
+            $ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE id=' . $extraId . ' LIMIT 1');
+            if (!$ds) {
+                echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                return;
+            } else {
+                if (mysqli_num_rows($ds) != 0) {
+                    mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` SET moduleguid = ' . $moduleGuid . ' WHERE id=' . $extraId);
+                    echo '<p>&nbsp;&nbsp;' . $dependency['name'] . ': <span class="ok">' . $_lang['guid_set'] . '</span></p>';
+                }
+            }
+        }
+    }
 }
 
 // call back function

manager/media/browser/mcpuk/lib/class_fastImage.php

Indentation +218 added lines, -218 removed lines

@@ -13,227 +13,227 @@
 
 class fastImage
 {
-	private $strpos = 0;
-	private $str;
-	private $uri;
-	private $type;
-	private $handle;
+    private $strpos = 0;
+    private $str;
+    private $uri;
+    private $type;
+    private $handle;
 
-	public function __construct($uri = null)
-	{
-		if ($uri) $this->load($uri);
-	}
+    public function __construct($uri = null)
+    {
+        if ($uri) $this->load($uri);
+    }
 
 
-	public function load($uri)
-	{
-		if ($this->handle) $this->close();
-
-		$this->uri = $uri;
-		$this->handle = fopen($uri, 'r');
-	}
-
-
-	public function close()
-	{
-		if (is_resource($this->handle)) fclose($this->handle);
-	}
+    public function load($uri)
+    {
+        if ($this->handle) $this->close();
+
+        $this->uri = $uri;
+        $this->handle = fopen($uri, 'r');
+    }
+
+
+    public function close()
+    {
+        if (is_resource($this->handle)) fclose($this->handle);
+    }
 
 
-	public function getSize()
-	{
-		$this->strpos = 0;
-		if ($this->getType())
-		{
-			return array_values($this->parseSize());
-		}
-
-		return false;
-	}
-
-
-	public function getType()
-	{
-		$this->strpos = 0;
-
-		if (!$this->type)
-		{
-			switch ($this->getChars(2))
-			{
-				case "BM":
-					return $this->type = 'bmp';
-				case "GI":
-					return $this->type = 'gif';
-				case chr(0xFF).chr(0xd8):
-					return $this->type = 'jpeg';
-				case chr(0x89).'P':
-					return $this->type = 'png';
-				default:
-					return false;
-			}
-		}
-
-		return $this->type;
-	}
-
-
-	private function parseSize()
-	{
-		$this->strpos = 0;
-
-		switch ($this->type)
-		{
-			case 'png':
-				return $this->parseSizeForPNG();
-			case 'gif':
-				return $this->parseSizeForGIF();
-			case 'bmp':
-				return $this->parseSizeForBMP();
-			case 'jpeg':
-				return $this->parseSizeForJPEG();
-		}
-
-		return null;
-	}
-
-
-	private function parseSizeForPNG()
-	{
-		$chars = $this->getChars(25);
-
-		return unpack("N*", substr($chars, 16, 8));
-	}
-
-
-	private function parseSizeForGIF()
-	{
-		$chars = $this->getChars(11);
-
-		return unpack("S*", substr($chars, 6, 4));
-	}
-
-
-	private function parseSizeForBMP()
-	{
-		$chars = $this->getChars(29);
-	 	$chars = substr($chars, 14, 14);
-		$type = unpack('C', $chars);
-
-		return (reset($type) == 40) ? unpack('L*', substr($chars, 4)) : unpack('L*', substr($chars, 4, 8));
-	}
-
-
-	private function parseSizeForJPEG()
-	{
-		$state = null;
-
-		while (true)
-		{
-			switch ($state)
-			{
-				default:
-					$this->getChars(2);
-					$state = 'started';
-					break;
-
-				case 'started':
-					$b = $this->getByte();
-					if ($b === false) return false;
-
-					$state = $b == 0xFF ? 'sof' : 'started';
-					break;
-
-				case 'sof':
-					$b = $this->getByte();
-					if (in_array($b, range(0xe0, 0xef)))
-					{
-						$state = 'skipframe';
-					}
-					elseif (in_array($b, array_merge(range(0xC0,0xC3), range(0xC5,0xC7), range(0xC9,0xCB), range(0xCD,0xCF))))
-					{
-						$state = 'readsize';
-					}
-					elseif ($b == 0xFF)
-					{
-						$state = 'sof';
-					}
-					else
-					{
-						$state = 'skipframe';
-					}
-					break;
-
-				case 'skipframe':
-					$skip = $this->readInt($this->getChars(2)) - 2;
-					$state = 'doskip';
-					break;
-
-				case 'doskip':
-					$this->getChars($skip);
-					$state = 'started';
-					break;
-
-				case 'readsize':
-					$c = $this->getChars(7);
-
-					return array($this->readInt(substr($c, 5, 2)), $this->readInt(substr($c, 3, 2)));
-			}
-		}
-	}
-
-
-	private function getChars($n)
-	{
-		$response = null;
-
-		// do we need more data?
-		if ($this->strpos + $n -1 >= strlen($this->str))
-		{
-			$end = ($this->strpos + $n);
-
-			while (strlen($this->str) < $end && $response !== false)
-			{
-				// read more from the file handle
-				$need = $end - ftell($this->handle);
-
-				if ($response = fread($this->handle, $need))
-				{
-					$this->str .= $response;
-				}
-				else
-				{
-					return false;
-				}
-			}
-		}
-
-		$result = substr($this->str, $this->strpos, $n);
-		$this->strpos += $n;
-
-		// we are dealing with bytes here, so force the encoding
-		return mb_convert_encoding($result, "8BIT");
-	}
-
-
-	private function getByte()
-	{
-		$c = $this->getChars(1);
-		$b = unpack("C", $c);
-
-		return reset($b);
-	}
-
-
-	private function readInt($str)
-	{
-		$size = unpack("C*", $str);
-
-	    	return ($size[1] << 8) + $size[2];
-	}
-
-
-	public function __destruct()
-	{
-		$this->close();
-	}
+    public function getSize()
+    {
+        $this->strpos = 0;
+        if ($this->getType())
+        {
+            return array_values($this->parseSize());
+        }
+
+        return false;
+    }
+
+
+    public function getType()
+    {
+        $this->strpos = 0;
+
+        if (!$this->type)
+        {
+            switch ($this->getChars(2))
+            {
+                case "BM":
+                    return $this->type = 'bmp';
+                case "GI":
+                    return $this->type = 'gif';
+                case chr(0xFF).chr(0xd8):
+                    return $this->type = 'jpeg';
+                case chr(0x89).'P':
+                    return $this->type = 'png';
+                default:
+                    return false;
+            }
+        }
+
+        return $this->type;
+    }
+
+
+    private function parseSize()
+    {
+        $this->strpos = 0;
+
+        switch ($this->type)
+        {
+            case 'png':
+                return $this->parseSizeForPNG();
+            case 'gif':
+                return $this->parseSizeForGIF();
+            case 'bmp':
+                return $this->parseSizeForBMP();
+            case 'jpeg':
+                return $this->parseSizeForJPEG();
+        }
+
+        return null;
+    }
+
+
+    private function parseSizeForPNG()
+    {
+        $chars = $this->getChars(25);
+
+        return unpack("N*", substr($chars, 16, 8));
+    }
+
+
+    private function parseSizeForGIF()
+    {
+        $chars = $this->getChars(11);
+
+        return unpack("S*", substr($chars, 6, 4));
+    }
+
+
+    private function parseSizeForBMP()
+    {
+        $chars = $this->getChars(29);
+            $chars = substr($chars, 14, 14);
+        $type = unpack('C', $chars);
+
+        return (reset($type) == 40) ? unpack('L*', substr($chars, 4)) : unpack('L*', substr($chars, 4, 8));
+    }
+
+
+    private function parseSizeForJPEG()
+    {
+        $state = null;
+
+        while (true)
+        {
+            switch ($state)
+            {
+                default:
+                    $this->getChars(2);
+                    $state = 'started';
+                    break;
+
+                case 'started':
+                    $b = $this->getByte();
+                    if ($b === false) return false;
+
+                    $state = $b == 0xFF ? 'sof' : 'started';
+                    break;
+
+                case 'sof':
+                    $b = $this->getByte();
+                    if (in_array($b, range(0xe0, 0xef)))
+                    {
+                        $state = 'skipframe';
+                    }
+                    elseif (in_array($b, array_merge(range(0xC0,0xC3), range(0xC5,0xC7), range(0xC9,0xCB), range(0xCD,0xCF))))
+                    {
+                        $state = 'readsize';
+                    }
+                    elseif ($b == 0xFF)
+                    {
+                        $state = 'sof';
+                    }
+                    else
+                    {
+                        $state = 'skipframe';
+                    }
+                    break;
+
+                case 'skipframe':
+                    $skip = $this->readInt($this->getChars(2)) - 2;
+                    $state = 'doskip';
+                    break;
+
+                case 'doskip':
+                    $this->getChars($skip);
+                    $state = 'started';
+                    break;
+
+                case 'readsize':
+                    $c = $this->getChars(7);
+
+                    return array($this->readInt(substr($c, 5, 2)), $this->readInt(substr($c, 3, 2)));
+            }
+        }
+    }
+
+
+    private function getChars($n)
+    {
+        $response = null;
+
+        // do we need more data?
+        if ($this->strpos + $n -1 >= strlen($this->str))
+        {
+            $end = ($this->strpos + $n);
+
+            while (strlen($this->str) < $end && $response !== false)
+            {
+                // read more from the file handle
+                $need = $end - ftell($this->handle);
+
+                if ($response = fread($this->handle, $need))
+                {
+                    $this->str .= $response;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+        }
+
+        $result = substr($this->str, $this->strpos, $n);
+        $this->strpos += $n;
+
+        // we are dealing with bytes here, so force the encoding
+        return mb_convert_encoding($result, "8BIT");
+    }
+
+
+    private function getByte()
+    {
+        $c = $this->getChars(1);
+        $b = unpack("C", $c);
+
+        return reset($b);
+    }
+
+
+    private function readInt($str)
+    {
+        $size = unpack("C*", $str);
+
+            return ($size[1] << 8) + $size[2];
+    }
+
+
+    public function __destruct()
+    {
+        $this->close();
+    }
 }

manager/media/rss/rss_parse.inc

Indentation +40 added lines, -40 removed lines

@@ -98,8 +98,8 @@ 
         #
         if (!function_exists('xml_parser_create')) {
             $this->error( "Failed to load PHP's XML Extension. " .
-                          "http://www.php.net/manual/en/ref.xml.php",
-                           E_USER_ERROR );
+                            "http://www.php.net/manual/en/ref.xml.php",
+                            E_USER_ERROR );
         }
 
         list($parser, $source) = $this->create_parser($source,
@@ -108,8 +108,8 @@ 
 
         if (!is_resource($parser)) {
             $this->error( "Failed to create an instance of PHP's XML parser. " .
-                          "http://www.php.net/manual/en/ref.xml.php",
-                          E_USER_ERROR );
+                            "http://www.php.net/manual/en/ref.xml.php",
+                            E_USER_ERROR );
         }
 
 
@@ -445,9 +445,9 @@ 
     }
 
     /**
-    * return XML parser, and possibly re-encoded source
-    *
-    */
+     * return XML parser, and possibly re-encoded source
+     *
+     */
     function create_parser($source, $out_enc, $in_enc, $detect) {
         if ( substr(phpversion(),0,1) == 5) {
             $parser = $this->php5_create_parser($in_enc, $detect);
@@ -464,14 +464,14 @@ 
     }
 
     /**
-    * Instantiate an XML parser under PHP5
-    *
-    * PHP5 will do a fine job of detecting input encoding
-    * if passed an empty string as the encoding.
-    *
-    * All hail libxml2!
-    *
-    */
+     * Instantiate an XML parser under PHP5
+     *
+     * PHP5 will do a fine job of detecting input encoding
+     * if passed an empty string as the encoding.
+     *
+     * All hail libxml2!
+     *
+     */
     function php5_create_parser($in_enc, $detect) {
         // by default php5 does a fine job of detecting input encodings
         if(!$detect && $in_enc) {
@@ -483,20 +483,20 @@ 
     }
 
     /**
-    * Instaniate an XML parser under PHP4
-    *
-    * Unfortunately PHP4's support for character encodings
-    * and especially XML and character encodings sucks.  As
-    * long as the documents you parse only contain characters
-    * from the ISO-8859-1 character set (a superset of ASCII,
-    * and a subset of UTF-8) you're fine.  However once you
-    * step out of that comfy little world things get mad, bad,
-    * and dangerous to know.
-    *
-    * The following code is based on SJM's work with FoF
-    * @see http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
-    *
-    */
+     * Instaniate an XML parser under PHP4
+     *
+     * Unfortunately PHP4's support for character encodings
+     * and especially XML and character encodings sucks.  As
+     * long as the documents you parse only contain characters
+     * from the ISO-8859-1 character set (a superset of ASCII,
+     * and a subset of UTF-8) you're fine.  However once you
+     * step out of that comfy little world things get mad, bad,
+     * and dangerous to know.
+     *
+     * The following code is based on SJM's work with FoF
+     * @see http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
+     *
+     */
     function php4_create_parser($source, $in_enc, $detect) {
         if ( !$detect ) {
             return array(xml_parser_create($in_enc), $source);
@@ -540,8 +540,8 @@ 
 
         // else
         $this->error("Feed is in an unsupported character encoding. ($in_enc) " .
-                     "You may see strange artifacts, and mangled characters.",
-                     E_USER_NOTICE);
+                        "You may see strange artifacts, and mangled characters.",
+                        E_USER_NOTICE);
 
         return array(xml_parser_create(), $source);
     }
@@ -587,26 +587,26 @@ 
 // courtesy, Ryan Currie, ryan@digibliss.com
 
 if (!function_exists('array_change_key_case')) {
-	define('CASE_UPPER', 1);
-	define('CASE_LOWER', 0);
+    define('CASE_UPPER', 1);
+    define('CASE_LOWER', 0);
 
 
-	function array_change_key_case($array, $case=CASE_LOWER) {
+    function array_change_key_case($array, $case=CASE_LOWER) {
         $output = array();
         switch($case){
-           case CASE_LOWER:
+            case CASE_LOWER:
                $cmd='strtolower';
-               break;
-           case CASE_UPPER:
+                break;
+            case CASE_UPPER:
                $cmd='strtoupper';
-               break;
-           default:
+                break;
+            default:
                $cmd = '';
         }
         foreach($array as $key=>$value) {
             $output[empty($cmd) ? $key : $cmd($key)] = $value;
         }
         return $output;
-	}
+    }
 
 }

manager/actions/site_schedule.static.php

Indentation +38 added lines, -38 removed lines

@@ -1,9 +1,9 @@ 
 <?php

 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

 if(!$modx->hasPermission('view_eventlog')) {

-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);

+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 ?>

 <script type="text/javascript" src="media/script/tablesort.js"></script>

@@ -17,14 +17,14 @@ 
 		<div class="form-group" id="lyr1">

 			<b><?= $_lang["publish_events"] ?></b>

 			<?php

-			$rs = $modx->db->select('id, pagetitle, pub_date', $modx->getFullTableName('site_content'), "pub_date > " . time() . "", 'pub_date ASC');

-			$limit = $modx->db->getRecordCount($rs);

-			if($limit < 1) {

-				?>

+            $rs = $modx->db->select('id, pagetitle, pub_date', $modx->getFullTableName('site_content'), "pub_date > " . time() . "", 'pub_date ASC');

+            $limit = $modx->db->getRecordCount($rs);

+            if($limit < 1) {

+                ?>

 				<p><?= $_lang["no_docs_pending_publishing"] ?></p>

 				<?php

-			} else {

-				?>

+            } else {

+                ?>

 				<div class="table-responsive">

 					<table class="grid sortabletable" id="table-1">

 						<thead>

@@ -36,34 +36,34 @@ 
 						</thead>

 						<tbody>

 						<?php

-						while($row = $modx->db->getRow($rs)) {

-							?>

+                        while($row = $modx->db->getRow($rs)) {

+                            ?>

 							<tr>

 								<td class="text-right"><?= $row['id'] ?></td>

 								<td><a href="index.php?a=3&id=<?= $row['id'] ?>"><?= $row['pagetitle'] ?></a></td>

 								<td class="text-nowrap text-right"><?= $modx->toDateFormat($row['pub_date'] + $server_offset_time) ?></td>

 							</tr>

 							<?php

-						}

-						?>

+                        }

+                        ?>

 						</tbody>

 					</table>

 				</div>

 				<?php

-			}

-			?>

+            }

+            ?>

 		</div>

 		<div class="form-group" id="lyr2">

 			<b><?= $_lang["unpublish_events"] ?></b>

 			<?php

-			$rs = $modx->db->select('id, pagetitle, unpub_date', $modx->getFullTableName('site_content'), "unpub_date > " . time() . "", 'unpub_date ASC');

-			$limit = $modx->db->getRecordCount($rs);

-			if($limit < 1) {

-				?>

+            $rs = $modx->db->select('id, pagetitle, unpub_date', $modx->getFullTableName('site_content'), "unpub_date > " . time() . "", 'unpub_date ASC');

+            $limit = $modx->db->getRecordCount($rs);

+            if($limit < 1) {

+                ?>

 				<p><?= $_lang["no_docs_pending_unpublishing"] ?></p>

 				<?php

-			} else {

-				?>

+            } else {

+                ?>

 				<div class="table-responsive">

 					<table class="grid sortabletable" id="table-2">

 						<thead>

@@ -75,34 +75,34 @@ 
 						</thead>

 						<tbody>

 						<?php

-						while($row = $modx->db->getRow($rs)) {

-							?>

+                        while($row = $modx->db->getRow($rs)) {

+                            ?>

 							<tr>

 								<td class="text-right"><?= $row['id'] ?></td>

 								<td><a href="index.php?a=3&id=<?= $row['id'] ?>"><?= $row['pagetitle'] ?></a></td>

 								<td class="text-nowrap text-right"><?= $modx->toDateFormat($row['unpub_date'] + $server_offset_time) ?></td>

 							</tr>

 							<?php

-						}

-						?>

+                        }

+                        ?>

 						</tbody>

 					</table>

 				</div>

 				<?php

-			}

-			?>

+            }

+            ?>

 		</div>

 		<div class="form-group">

 			<b><?= $_lang["all_events"] ?></b>

 			<?php

-			$rs = $modx->db->select('id, pagetitle, pub_date, unpub_date', $modx->getFullTableName('site_content'), "pub_date > 0 OR unpub_date > 0", "pub_date DESC");

-			$limit = $modx->db->getRecordCount($rs);

-			if($limit < 1) {

-				?>

+            $rs = $modx->db->select('id, pagetitle, pub_date, unpub_date', $modx->getFullTableName('site_content'), "pub_date > 0 OR unpub_date > 0", "pub_date DESC");

+            $limit = $modx->db->getRecordCount($rs);

+            if($limit < 1) {

+                ?>

 				<p><?= $_lang["no_docs_pending_pubunpub"] ?></p>

 				<?php

-			} else {

-				?>

+            } else {

+                ?>

 				<div class="table-responsive">

 					<table class="grid sortabletable" id="table-3">

 						<thead>

@@ -115,8 +115,8 @@ 
 						</thead>

 						<tbody>

 						<?php

-						while($row = $modx->db->getRow($rs)) {

-							?>

+                        while($row = $modx->db->getRow($rs)) {

+                            ?>

 							<tr>

 								<td class="text-right"><?= $row['id'] ?></td>

 								<td><a href="index.php?a=3&id=<?= $row['id'] ?>"><?= $row['pagetitle'] ?></a></td>

@@ -124,14 +124,14 @@ 
 								<td class="text-nowrap text-right"><?= $row['unpub_date'] == 0 ? "" : $modx->toDateFormat($row['unpub_date'] + $server_offset_time) ?></td>

 							</tr>

 							<?php

-						}

-						?>

+                        }

+                        ?>

 						</tbody>

 					</table>

 				</div>

 				<?php

-			}

-			?>

+            }

+            ?>

 		</div>

 	</div>

 </div>

manager/actions/refresh_site.dynamic.php

Indentation +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
 // (un)publishing of documents, version 2!
@@ -32,9 +32,9 @@ 
 		<?php if($num_rows_pub)   printf('<p>' . $_lang["refresh_published"]   . '</p>', $num_rows_pub) ?>
 		<?php if($num_rows_unpub) printf('<p>' . $_lang["refresh_unpublished"] . '</p>', $num_rows_unpub) ?>
 		<?php
-		$modx->clearCache('full', true);
-		// invoke OnSiteRefresh event
-		$modx->invokeEvent("OnSiteRefresh");
-		?>
+        $modx->clearCache('full', true);
+        // invoke OnSiteRefresh event
+        $modx->invokeEvent("OnSiteRefresh");
+        ?>
 	</div>
 </div>

manager/actions/help.static.php

Indentation +31 added lines, -31 removed lines

@@ -1,6 +1,6 @@ 
 <?php

 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

 $helpBasePath = "actions/help/";

 ?>

@@ -16,36 +16,36 @@ 
 		</script>

 

 		<?php

-		if($handle = opendir('actions/help')) {

-			while(false !== ($file = readdir($handle))) {

-				if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {

-					$help[] = $file;

-				}

-			}

-			closedir($handle);

-		}

-

-		natcasesort($help);

-

-		foreach($help as $k => $v) {

-

-			$helpname = substr($v, 0, strrpos($v, '.'));

-

-			$prefix = substr($helpname, 0, 2);

-			if(is_numeric($prefix)) {

-				$helpname = substr($helpname, 2, strlen($helpname) - 1);

-			}

-

-			$hnLower = strtolower($helpname);

-			$helpname = isset($_lang[$hnLower]) ? $_lang[$hnLower] : str_replace('_', ' ', $helpname);

-

-			echo '<div class="tab-page" id="tab' . $k . 'Help">';

-			echo '<h2 class="tab">' . $helpname . '</h2>';

-			echo '<script type="text/javascript">tp.addTabPage( document.getElementById( "tab' . $k . 'Help" ) );</script>';

-			include_once($helpBasePath . "{$v}");

-			echo '</div>';

-		}

-		?>

+        if($handle = opendir('actions/help')) {

+            while(false !== ($file = readdir($handle))) {

+                if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {

+                    $help[] = $file;

+                }

+            }

+            closedir($handle);

+        }

+

+        natcasesort($help);

+

+        foreach($help as $k => $v) {

+

+            $helpname = substr($v, 0, strrpos($v, '.'));

+

+            $prefix = substr($helpname, 0, 2);

+            if(is_numeric($prefix)) {

+                $helpname = substr($helpname, 2, strlen($helpname) - 1);

+            }

+

+            $hnLower = strtolower($helpname);

+            $helpname = isset($_lang[$hnLower]) ? $_lang[$hnLower] : str_replace('_', ' ', $helpname);

+

+            echo '<div class="tab-page" id="tab' . $k . 'Help">';

+            echo '<h2 class="tab">' . $helpname . '</h2>';

+            echo '<script type="text/javascript">tp.addTabPage( document.getElementById( "tab' . $k . 'Help" ) );</script>';

+            include_once($helpBasePath . "{$v}");

+            echo '</div>';

+        }

+        ?>

 	</div>

 </div>

 <script>

manager/actions/mutate_tmplvars.dynamic.php

Indentation +117 added lines, -117 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('edit_template') && $modx->manager->action == '301') {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 if(!$modx->hasPermission('new_template') && $modx->manager->action == '300') {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
@@ -20,7 +20,7 @@ 
 
 // check to see the snippet editor isn't locked
 if($lockedEl = $modx->elementIsLocked(2, $id)) {
-	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['tmplvar']));
+    $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['tmplvar']));
 }
 // end check for lock
 
@@ -30,25 +30,25 @@ 
 global $content;
 $content = array();
 if(isset($_GET['id'])) {
-	$rs = $modx->db->select('*', $tbl_site_tmplvars, "id='{$id}'");
-	$content = $modx->db->getRow($rs);
-	if(!$content) {
-		header("Location: " . MODX_SITE_URL . "index.php?id={$site_start}");
-	}
-
-	$_SESSION['itemname'] = $content['caption'];
-	if($content['locked'] == 1 && $modx->hasPermission('save_role') != 1) {
-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-	}
+    $rs = $modx->db->select('*', $tbl_site_tmplvars, "id='{$id}'");
+    $content = $modx->db->getRow($rs);
+    if(!$content) {
+        header("Location: " . MODX_SITE_URL . "index.php?id={$site_start}");
+    }
+
+    $_SESSION['itemname'] = $content['caption'];
+    if($content['locked'] == 1 && $modx->hasPermission('save_role') != 1) {
+        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    }
 } else if(isset($_REQUEST['itemname'])) {
-	$content['name'] = $_REQUEST['itemname'];
+    $content['name'] = $_REQUEST['itemname'];
 } else {
-	$_SESSION['itemname'] = $_lang["new_tmplvars"];
-	$content['category'] = intval($_REQUEST['catid']);
+    $_SESSION['itemname'] = $_lang["new_tmplvars"];
+    $content['category'] = intval($_REQUEST['catid']);
 }
 
 if($modx->manager->hasFormValues()) {
-	$modx->manager->loadFormValues();
+    $modx->manager->loadFormValues();
 }
 
 $content = array_merge($content, $_POST);
@@ -62,7 +62,7 @@ 
 $RTEditors = '';
 $evtOut = $modx->invokeEvent('OnRichTextEditorRegister', array('forfrontend' => 1));
 if(is_array($evtOut)) {
-	$RTEditors = implode(',', $evtOut);
+    $RTEditors = implode(',', $evtOut);
 }
 
 ?>
@@ -277,12 +277,12 @@ 
 
 <form name="mutate" method="post" action="index.php" enctype="multipart/form-data">
 	<?php
-	// invoke OnTVFormPrerender event
-	$evtOut = $modx->invokeEvent('OnTVFormPrerender', array('id' => $id));
-	if(is_array($evtOut)) {
-		echo implode("", $evtOut);
-	}
-	?>
+    // invoke OnTVFormPrerender event
+    $evtOut = $modx->invokeEvent('OnTVFormPrerender', array('id' => $id));
+    if(is_array($evtOut)) {
+        echo implode("", $evtOut);
+    }
+    ?>
 	<input type="hidden" name="id" value="<?= $content['id'] ?>">
 	<input type="hidden" name="a" value="302">
 	<input type="hidden" name="or" value="<?= $origin ?>">
@@ -343,11 +343,11 @@ 
 						<select name="categoryid" class="form-control" onChange="documentDirty=true;">
 							<option>&nbsp;</option>
 							<?php
-							include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
-							foreach(getCategories() as $n => $v) {
-								echo "<option value='" . $v['id'] . "'" . ($content["category"] == $v["id"] ? " selected='selected'" : "") . ">" . $modx->htmlspecialchars($v["category"]) . "</option>";
-							}
-							?>
+                            include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+                            foreach(getCategories() as $n => $v) {
+                                echo "<option value='" . $v['id'] . "'" . ($content["category"] == $v["id"] ? " selected='selected'" : "") . ">" . $modx->htmlspecialchars($v["category"]) . "</option>";
+                            }
+                            ?>
 						</select>
 					</div>
 				</div>
@@ -383,14 +383,14 @@ 
 							<optgroup label="Custom Type">
 								<option value="custom_tv" <?= ($content['type'] == 'custom_tv' ? "selected='selected'" : "") ?>>Custom Input</option>
 								<?php
-								$custom_tvs = scandir(MODX_BASE_PATH . 'assets/tvs');
-								foreach($custom_tvs as $ctv) {
-									if(strpos($ctv, '.') !== 0 && $ctv != 'index.html') {
-										$selected = ($content['type'] == 'custom_tv:' . $ctv ? "selected='selected'" : "");
-										echo '<option value="custom_tv:' . $ctv . '"  ' . $selected . '>' . $ctv . '</option>';
-									}
-								}
-								?>
+                                $custom_tvs = scandir(MODX_BASE_PATH . 'assets/tvs');
+                                foreach($custom_tvs as $ctv) {
+                                    if(strpos($ctv, '.') !== 0 && $ctv != 'index.html') {
+                                        $selected = ($content['type'] == 'custom_tv:' . $ctv ? "selected='selected'" : "");
+                                        echo '<option value="custom_tv:' . $ctv . '"  ' . $selected . '>' . $ctv . '</option>';
+                                    }
+                                }
+                                ?>
 							</optgroup>
 						</select>
 					</div>
@@ -455,63 +455,63 @@ 
 					<a class="btn btn-secondary btn-sm" href="javascript:;" onClick="check_toggle(); return false;"><?= $_lang['check_toggle'] ?></a>
 				</div>
 				<?php
-				$rs = $modx->db->select(sprintf("tpl.id AS id, templatename, tpl.description AS tpldescription, tpl.locked AS tpllocked, tpl.selectable AS selectable, tmplvarid, if(isnull(cat.category),'%s',cat.category) AS category, cat.id AS catid", $_lang['no_category']), sprintf("%s as tpl
+                $rs = $modx->db->select(sprintf("tpl.id AS id, templatename, tpl.description AS tpldescription, tpl.locked AS tpllocked, tpl.selectable AS selectable, tmplvarid, if(isnull(cat.category),'%s',cat.category) AS category, cat.id AS catid", $_lang['no_category']), sprintf("%s as tpl
                     LEFT JOIN %s as stt ON stt.templateid=tpl.id AND stt.tmplvarid='%s'
                     LEFT JOIN %s as cat ON tpl.category=cat.id", $modx->getFullTableName('site_templates'), $modx->getFullTableName('site_tmplvar_templates'), $id, $modx->getFullTableName('categories')), '', "category, templatename");
 
-				$tplList = '<ul>';
-				$preCat = '';
-				$insideUl = 0;
-				while($row = $modx->db->getRow($rs)) {
-					$row['category'] = stripslashes($row['category']); //pixelchutes
-					if($preCat !== $row['category']) {
-						$tplList .= $insideUl ? '</ul>' : '';
-						$tplList .= '<li><strong>' . $row['category'] . ($row['catid'] != '' ? ' <small>(' . $row['catid'] . ')</small>' : '') . '</strong><ul>';
-						$insideUl = 1;
-					}
-
-					if($modx->manager->action == '300' && $modx->config['default_template'] == $row['id']) {
-						$checked = true;
-					} elseif(isset($_GET['tpl']) && $_GET['tpl'] == $row['id']) {
-						$checked = true;
-					} elseif($id == 0 && is_array($_POST['template'])) {
-						$checked = in_array($row['id'], $_POST['template']);
-					} else {
-						$checked = $row['tmplvarid'];
-					}
-					$selectable = !$row['selectable'] ? ' class="disabled"' : '';
-					$checked = $checked ? ' checked="checked"' : '';
-					$tplId = '&nbsp;<small>(' . $row['id'] . ')</small>';
-					$desc = !empty($row['tpldescription']) ? ' - ' . $row['tpldescription'] : '';
-
-					$tplInfo = array();
-					if($row['tpllocked']) {
-						$tplInfo[] = $_lang['locked'];
-					}
-					if($row['id'] == $modx->config['default_template']) {
-						$tplInfo[] = $_lang['defaulttemplate_title'];
-					}
-					$tplInfo = !empty($tplInfo) ? ' <em>(' . join(', ', $tplInfo) . ')</em>' : '';
-
-					$tplList .= sprintf('<li><label%s><input name="template[]" value="%s" type="checkbox" %s onchange="documentDirty=true;"> %s%s%s%s</label></li>', $selectable, $row['id'], $checked, $row['templatename'], $tplId, $desc, $tplInfo);
-					$tplList .= '</li>';
-
-					$preCat = $row['category'];
-				}
-				$tplList .= $insideUl ? '</ul>' : '';
-				$tplList .= '</ul>';
-				echo $tplList;
-
-				?>
+                $tplList = '<ul>';
+                $preCat = '';
+                $insideUl = 0;
+                while($row = $modx->db->getRow($rs)) {
+                    $row['category'] = stripslashes($row['category']); //pixelchutes
+                    if($preCat !== $row['category']) {
+                        $tplList .= $insideUl ? '</ul>' : '';
+                        $tplList .= '<li><strong>' . $row['category'] . ($row['catid'] != '' ? ' <small>(' . $row['catid'] . ')</small>' : '') . '</strong><ul>';
+                        $insideUl = 1;
+                    }
+
+                    if($modx->manager->action == '300' && $modx->config['default_template'] == $row['id']) {
+                        $checked = true;
+                    } elseif(isset($_GET['tpl']) && $_GET['tpl'] == $row['id']) {
+                        $checked = true;
+                    } elseif($id == 0 && is_array($_POST['template'])) {
+                        $checked = in_array($row['id'], $_POST['template']);
+                    } else {
+                        $checked = $row['tmplvarid'];
+                    }
+                    $selectable = !$row['selectable'] ? ' class="disabled"' : '';
+                    $checked = $checked ? ' checked="checked"' : '';
+                    $tplId = '&nbsp;<small>(' . $row['id'] . ')</small>';
+                    $desc = !empty($row['tpldescription']) ? ' - ' . $row['tpldescription'] : '';
+
+                    $tplInfo = array();
+                    if($row['tpllocked']) {
+                        $tplInfo[] = $_lang['locked'];
+                    }
+                    if($row['id'] == $modx->config['default_template']) {
+                        $tplInfo[] = $_lang['defaulttemplate_title'];
+                    }
+                    $tplInfo = !empty($tplInfo) ? ' <em>(' . join(', ', $tplInfo) . ')</em>' : '';
+
+                    $tplList .= sprintf('<li><label%s><input name="template[]" value="%s" type="checkbox" %s onchange="documentDirty=true;"> %s%s%s%s</label></li>', $selectable, $row['id'], $checked, $row['templatename'], $tplId, $desc, $tplInfo);
+                    $tplList .= '</li>';
+
+                    $preCat = $row['category'];
+                }
+                $tplList .= $insideUl ? '</ul>' : '';
+                $tplList .= '</ul>';
+                echo $tplList;
+
+                ?>
 
 				<!-- Access Permissions -->
 				<?php
-				if($use_udperms == 1) {
-					// fetch permissions for the variable
-					$rs = $modx->db->select('documentgroup', $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'");
-					$groupsarray = $modx->db->getColumn('documentgroup', $rs);
+                if($use_udperms == 1) {
+                    // fetch permissions for the variable
+                    $rs = $modx->db->select('documentgroup', $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'");
+                    $groupsarray = $modx->db->getColumn('documentgroup', $rs);
 
-					?>
+                    ?>
 					<?php if($modx->hasPermission('access_permissions')) { ?>
 						<script type="text/javascript">
 							function makePublic(b) {
@@ -539,29 +539,29 @@ 
 						<!--<b><?php /*echo $_lang['access_permissions']; */ ?></b>-->
 						<p><?= $_lang['tmplvar_access_msg'] ?></p>
 						<?php
-						$chk = '';
-						$rs = $modx->db->select('name, id', $tbl_documentgroup_names);
-						if(empty($groupsarray) && is_array($_POST['docgroups']) && empty($_POST['id'])) {
-							$groupsarray = $_POST['docgroups'];
-						}
-						while($row = $modx->db->getRow($rs)) {
-							$checked = in_array($row['id'], $groupsarray);
-							if($modx->hasPermission('access_permissions')) {
-								if($checked) {
-									$notPublic = true;
-								}
-								$chks .= "<li><label><input type='checkbox' name='docgroups[]' value='" . $row['id'] . "' " . ($checked ? "checked='checked'" : '') . " onclick=\"makePublic(false)\" /> " . $row['name'] . "</label></li>";
-							} else {
-								if($checked) {
-									echo "<input type='hidden' name='docgroups[]'  value='" . $row['id'] . "' />";
-								}
-							}
-						}
-						if($modx->hasPermission('access_permissions')) {
-							$chks = "<li><label><input type='checkbox' name='chkalldocs' " . (!$notPublic ? "checked='checked'" : '') . " onclick=\"makePublic(true)\" /> <span class='warning'>" . $_lang['all_doc_groups'] . "</span></label></li>" . $chks;
-						}
-						echo '<ul>' . $chks . '</ul>';
-						?>
+                        $chk = '';
+                        $rs = $modx->db->select('name, id', $tbl_documentgroup_names);
+                        if(empty($groupsarray) && is_array($_POST['docgroups']) && empty($_POST['id'])) {
+                            $groupsarray = $_POST['docgroups'];
+                        }
+                        while($row = $modx->db->getRow($rs)) {
+                            $checked = in_array($row['id'], $groupsarray);
+                            if($modx->hasPermission('access_permissions')) {
+                                if($checked) {
+                                    $notPublic = true;
+                                }
+                                $chks .= "<li><label><input type='checkbox' name='docgroups[]' value='" . $row['id'] . "' " . ($checked ? "checked='checked'" : '') . " onclick=\"makePublic(false)\" /> " . $row['name'] . "</label></li>";
+                            } else {
+                                if($checked) {
+                                    echo "<input type='hidden' name='docgroups[]'  value='" . $row['id'] . "' />";
+                                }
+                            }
+                        }
+                        if($modx->hasPermission('access_permissions')) {
+                            $chks = "<li><label><input type='checkbox' name='chkalldocs' " . (!$notPublic ? "checked='checked'" : '') . " onclick=\"makePublic(true)\" /> <span class='warning'>" . $_lang['all_doc_groups'] . "</span></label></li>" . $chks;
+                        }
+                        echo '<ul>' . $chks . '</ul>';
+                        ?>
 					<?php } ?>
 				<?php } ?>
 
@@ -571,12 +571,12 @@ 
 		<input type="submit" name="save" style="display:none">
 
 		<?php
-		// invoke OnTVFormRender event
-		$evtOut = $modx->invokeEvent('OnTVFormRender', array('id' => $id));
-		if(is_array($evtOut)) {
-			echo implode('', $evtOut);
-		}
-		?>
+        // invoke OnTVFormRender event
+        $evtOut = $modx->invokeEvent('OnTVFormRender', array('id' => $id));
+        if(is_array($evtOut)) {
+            echo implode('', $evtOut);
+        }
+        ?>
 	</div>
 </form>
 <script type="text/javascript">setTimeout('showParameters()', 10);</script>

manager/actions/web_user_management.static.php

Indentation +29 added lines, -29 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('edit_web_user')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 // initialize page view state - the $_PAGE object
@@ -11,12 +11,12 @@ 
 
 // get and save search string
 if($_REQUEST['op'] == 'reset') {
-	$query = '';
-	$_PAGE['vs']['search'] = '';
+    $query = '';
+    $_PAGE['vs']['search'] = '';
 } else {
-	$query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];
-	$sqlQuery = $modx->db->escape($query);
-	$_PAGE['vs']['search'] = $query;
+    $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];
+    $sqlQuery = $modx->db->escape($query);
+    $_PAGE['vs']['search'] = $query;
 }
 
 // get & save listmode
@@ -120,29 +120,29 @@ 
 			<div class="row">
 				<div class="table-responsive">
 					<?php
-					$ds = $modx->db->select("wu.id, wu.username, wua.fullname, wua.email, ELT(wua.gender, '{$_lang['user_male']}', '{$_lang['user_female']}', '{$_lang['user_other']}') AS gender, IF(wua.blocked,'{$_lang['yes']}','-') as 'blocked'", $modx->getFullTableName("web_users") . " wu 
+                    $ds = $modx->db->select("wu.id, wu.username, wua.fullname, wua.email, ELT(wua.gender, '{$_lang['user_male']}', '{$_lang['user_female']}', '{$_lang['user_other']}') AS gender, IF(wua.blocked,'{$_lang['yes']}','-') as 'blocked'", $modx->getFullTableName("web_users") . " wu 
 			INNER JOIN " . $modx->getFullTableName("web_user_attributes") . " wua ON wua.internalKey=wu.id", ($sqlQuery ? "(wu.username LIKE '{$sqlQuery}%') OR (wua.fullname LIKE '%{$sqlQuery}%') OR (wua.email LIKE '%{$sqlQuery}%')" : ""), 'username');
-					include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
-					$grd = new DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items
-					$grd->noRecordMsg = $_lang["no_records_found"];
-					$grd->cssClass = "table data";
-					$grd->columnHeaderClass = "tableHeader";
-					$grd->itemClass = "tableItem";
-					$grd->altItemClass = "tableAltItem";
-					$grd->fields = "id,username,fullname,email,gender,blocked";
-					$grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["user_full_name"] . " ," . $_lang["email"] . " ," . $_lang["user_gender"] . " ," . $_lang["user_block"];
-					$grd->colWidths = "1%,,,,1%,1%";
-					$grd->colAligns = "center,,,,center,right' nowrap='nowrap";
-					$grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang["click_to_context"] . "'><i class='" . $_style["icons_user"] . "'></i></a>||template:<a href='index.php?a=88&id=[+id+]' title='" . $_lang["click_to_edit_title"] . "'>[+value+]</a>";
-					if($listmode == '1') {
-						$grd->pageSize = 0;
-					}
-					if($_REQUEST['op'] == 'reset') {
-						$grd->pageNumber = 1;
-					}
-					// render grid
-					echo $grd->render();
-					?>
+                    include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+                    $grd = new DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items
+                    $grd->noRecordMsg = $_lang["no_records_found"];
+                    $grd->cssClass = "table data";
+                    $grd->columnHeaderClass = "tableHeader";
+                    $grd->itemClass = "tableItem";
+                    $grd->altItemClass = "tableAltItem";
+                    $grd->fields = "id,username,fullname,email,gender,blocked";
+                    $grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["user_full_name"] . " ," . $_lang["email"] . " ," . $_lang["user_gender"] . " ," . $_lang["user_block"];
+                    $grd->colWidths = "1%,,,,1%,1%";
+                    $grd->colAligns = "center,,,,center,right' nowrap='nowrap";
+                    $grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang["click_to_context"] . "'><i class='" . $_style["icons_user"] . "'></i></a>||template:<a href='index.php?a=88&id=[+id+]' title='" . $_lang["click_to_edit_title"] . "'>[+value+]</a>";
+                    if($listmode == '1') {
+                        $grd->pageSize = 0;
+                    }
+                    if($_REQUEST['op'] == 'reset') {
+                        $grd->pageNumber = 1;
+                    }
+                    // render grid
+                    echo $grd->render();
+                    ?>
 				</div>
 			</div>
 		</div>