elkarte / Elkarte

sources/ext/ClassLoader.php

Indentation +391 added lines, -391 removed lines

@@ -42,396 +42,396 @@ 
  */
 class ClassLoader
 {
-    // PSR-4
-    private $prefixLengthsPsr4 = array();
-    private $prefixDirsPsr4 = array();
-    private $fallbackDirsPsr4 = array();
-
-    // PSR-0
-    private $prefixesPsr0 = array();
-    private $fallbackDirsPsr0 = array();
-
-    private $useIncludePath = false;
-    private $classMap = array();
-    private $classMapAuthoritative = false;
-    private $missingClasses = array();
-    private $apcuPrefix;
-
-    public function getPrefixes()
-    {
-        if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', $this->prefixesPsr0);
-        }
-
-        return array();
-    }
-
-    public function getPrefixesPsr4()
-    {
-        return $this->prefixDirsPsr4;
-    }
-
-    public function getFallbackDirs()
-    {
-        return $this->fallbackDirsPsr0;
-    }
-
-    public function getFallbackDirsPsr4()
-    {
-        return $this->fallbackDirsPsr4;
-    }
-
-    public function getClassMap()
-    {
-        return $this->classMap;
-    }
-
-    /**
-     * @param array $classMap Class to filename map
-     */
-    public function addClassMap(array $classMap)
-    {
-        if ($this->classMap) {
-            $this->classMap = array_merge($this->classMap, $classMap);
-        } else {
-            $this->classMap = $classMap;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix, either
-     * appending or prepending to the ones previously set for this prefix.
-     *
-     * @param string       $prefix  The prefix
-     * @param array|string $paths   The PSR-0 root directories
-     * @param bool         $prepend Whether to prepend the directories
-     */
-    public function add($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            if ($prepend) {
-                $this->fallbackDirsPsr0 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr0
-                );
-            } else {
-                $this->fallbackDirsPsr0 = array_merge(
-                    $this->fallbackDirsPsr0,
-                    (array) $paths
-                );
-            }
-
-            return;
-        }
-
-        $first = $prefix[0];
-        if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
-
-            return;
-        }
-        if ($prepend) {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixesPsr0[$first][$prefix]
-            );
-        } else {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                $this->prefixesPsr0[$first][$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace, either
-     * appending or prepending to the ones previously set for this namespace.
-     *
-     * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-4 base directories
-     * @param bool         $prepend Whether to prepend the directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function addPsr4($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            // Register directories for the root namespace.
-            if ($prepend) {
-                $this->fallbackDirsPsr4 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr4
-                );
-            } else {
-                $this->fallbackDirsPsr4 = array_merge(
-                    $this->fallbackDirsPsr4,
-                    (array) $paths
-                );
-            }
-        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
-            // Register directories for a new namespace.
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        } elseif ($prepend) {
-            // Prepend directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixDirsPsr4[$prefix]
-            );
-        } else {
-            // Append directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                $this->prefixDirsPsr4[$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix,
-     * replacing any others previously set for this prefix.
-     *
-     * @param string       $prefix The prefix
-     * @param array|string $paths  The PSR-0 base directories
-     */
-    public function set($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr0 = (array) $paths;
-        } else {
-            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace,
-     * replacing any others previously set for this namespace.
-     *
-     * @param string       $prefix The prefix/namespace, with trailing '\\'
-     * @param array|string $paths  The PSR-4 base directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setPsr4($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr4 = (array) $paths;
-        } else {
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Turns on searching the include path for class files.
-     *
-     * @param bool $useIncludePath
-     */
-    public function setUseIncludePath($useIncludePath)
-    {
-        $this->useIncludePath = $useIncludePath;
-    }
-
-    /**
-     * Can be used to check if the autoloader uses the include path to check
-     * for classes.
-     *
-     * @return bool
-     */
-    public function getUseIncludePath()
-    {
-        return $this->useIncludePath;
-    }
-
-    /**
-     * Turns off searching the prefix and fallback directories for classes
-     * that have not been registered with the class map.
-     *
-     * @param bool $classMapAuthoritative
-     */
-    public function setClassMapAuthoritative($classMapAuthoritative)
-    {
-        $this->classMapAuthoritative = $classMapAuthoritative;
-    }
-
-    /**
-     * Should class lookup fail if not found in the current class map?
-     *
-     * @return bool
-     */
-    public function isClassMapAuthoritative()
-    {
-        return $this->classMapAuthoritative;
-    }
-
-    /**
-     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
-     *
-     * @param string|null $apcuPrefix
-     */
-    public function setApcuPrefix($apcuPrefix)
-    {
-        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
-    }
-
-    /**
-     * The APCu prefix in use, or null if APCu caching is not enabled.
-     *
-     * @return string|null
-     */
-    public function getApcuPrefix()
-    {
-        return $this->apcuPrefix;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param  string    $class The name of the class
-     * @return bool|null True if loaded, null otherwise
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            includeFile($file);
-
-            return true;
-        }
-    }
-
-    /**
-     * Finds the path to the file where the class is defined.
-     *
-     * @param string $class The name of the class
-     *
-     * @return string|false The path if found, false otherwise
-     */
-    public function findFile($class)
-    {
-        // class map lookup
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
-        }
-        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
-            return false;
-        }
-        if (null !== $this->apcuPrefix) {
-            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
-            if ($hit) {
-                return $file;
-            }
-        }
-
-        $file = $this->findFileWithExtension($class, '.php');
-
-        // Search for Hack files if we are running on HHVM
-        if (false === $file && defined('HHVM_VERSION')) {
-            $file = $this->findFileWithExtension($class, '.hh');
-        }
-
-        if (null !== $this->apcuPrefix) {
-            apcu_add($this->apcuPrefix.$class, $file);
-        }
-
-        if (false === $file) {
-            // Remember that this class does not exist.
-            $this->missingClasses[$class] = true;
-        }
-
-        return $file;
-    }
-
-    private function findFileWithExtension($class, $ext)
-    {
-        // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
-
-        $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
-            $subPath = $class;
-            while (false !== $lastPos = strrpos($subPath, '\\')) {
-                $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
-                if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
-                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-4 fallback dirs
-        foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 lookup
-        if (false !== $pos = strrpos($class, '\\')) {
-            // namespaced class name
-            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
-                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
-        } else {
-            // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
-        }
-
-        if (isset($this->prefixesPsr0[$first])) {
-            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-0 fallback dirs
-        foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 include paths.
-        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
-            return $file;
-        }
-
-        return false;
-    }
+	// PSR-4
+	private $prefixLengthsPsr4 = array();
+	private $prefixDirsPsr4 = array();
+	private $fallbackDirsPsr4 = array();
+
+	// PSR-0
+	private $prefixesPsr0 = array();
+	private $fallbackDirsPsr0 = array();
+
+	private $useIncludePath = false;
+	private $classMap = array();
+	private $classMapAuthoritative = false;
+	private $missingClasses = array();
+	private $apcuPrefix;
+
+	public function getPrefixes()
+	{
+		if (!empty($this->prefixesPsr0)) {
+			return call_user_func_array('array_merge', $this->prefixesPsr0);
+		}
+
+		return array();
+	}
+
+	public function getPrefixesPsr4()
+	{
+		return $this->prefixDirsPsr4;
+	}
+
+	public function getFallbackDirs()
+	{
+		return $this->fallbackDirsPsr0;
+	}
+
+	public function getFallbackDirsPsr4()
+	{
+		return $this->fallbackDirsPsr4;
+	}
+
+	public function getClassMap()
+	{
+		return $this->classMap;
+	}
+
+	/**
+	 * @param array $classMap Class to filename map
+	 */
+	public function addClassMap(array $classMap)
+	{
+		if ($this->classMap) {
+			$this->classMap = array_merge($this->classMap, $classMap);
+		} else {
+			$this->classMap = $classMap;
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-0 directories for a given prefix, either
+	 * appending or prepending to the ones previously set for this prefix.
+	 *
+	 * @param string       $prefix  The prefix
+	 * @param array|string $paths   The PSR-0 root directories
+	 * @param bool         $prepend Whether to prepend the directories
+	 */
+	public function add($prefix, $paths, $prepend = false)
+	{
+		if (!$prefix) {
+			if ($prepend) {
+				$this->fallbackDirsPsr0 = array_merge(
+					(array) $paths,
+					$this->fallbackDirsPsr0
+				);
+			} else {
+				$this->fallbackDirsPsr0 = array_merge(
+					$this->fallbackDirsPsr0,
+					(array) $paths
+				);
+			}
+
+			return;
+		}
+
+		$first = $prefix[0];
+		if (!isset($this->prefixesPsr0[$first][$prefix])) {
+			$this->prefixesPsr0[$first][$prefix] = (array) $paths;
+
+			return;
+		}
+		if ($prepend) {
+			$this->prefixesPsr0[$first][$prefix] = array_merge(
+				(array) $paths,
+				$this->prefixesPsr0[$first][$prefix]
+			);
+		} else {
+			$this->prefixesPsr0[$first][$prefix] = array_merge(
+				$this->prefixesPsr0[$first][$prefix],
+				(array) $paths
+			);
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-4 directories for a given namespace, either
+	 * appending or prepending to the ones previously set for this namespace.
+	 *
+	 * @param string       $prefix  The prefix/namespace, with trailing '\\'
+	 * @param array|string $paths   The PSR-4 base directories
+	 * @param bool         $prepend Whether to prepend the directories
+	 *
+	 * @throws \InvalidArgumentException
+	 */
+	public function addPsr4($prefix, $paths, $prepend = false)
+	{
+		if (!$prefix) {
+			// Register directories for the root namespace.
+			if ($prepend) {
+				$this->fallbackDirsPsr4 = array_merge(
+					(array) $paths,
+					$this->fallbackDirsPsr4
+				);
+			} else {
+				$this->fallbackDirsPsr4 = array_merge(
+					$this->fallbackDirsPsr4,
+					(array) $paths
+				);
+			}
+		} elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+			// Register directories for a new namespace.
+			$length = strlen($prefix);
+			if ('\\' !== $prefix[$length - 1]) {
+				throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+			}
+			$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+			$this->prefixDirsPsr4[$prefix] = (array) $paths;
+		} elseif ($prepend) {
+			// Prepend directories for an already registered namespace.
+			$this->prefixDirsPsr4[$prefix] = array_merge(
+				(array) $paths,
+				$this->prefixDirsPsr4[$prefix]
+			);
+		} else {
+			// Append directories for an already registered namespace.
+			$this->prefixDirsPsr4[$prefix] = array_merge(
+				$this->prefixDirsPsr4[$prefix],
+				(array) $paths
+			);
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-0 directories for a given prefix,
+	 * replacing any others previously set for this prefix.
+	 *
+	 * @param string       $prefix The prefix
+	 * @param array|string $paths  The PSR-0 base directories
+	 */
+	public function set($prefix, $paths)
+	{
+		if (!$prefix) {
+			$this->fallbackDirsPsr0 = (array) $paths;
+		} else {
+			$this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-4 directories for a given namespace,
+	 * replacing any others previously set for this namespace.
+	 *
+	 * @param string       $prefix The prefix/namespace, with trailing '\\'
+	 * @param array|string $paths  The PSR-4 base directories
+	 *
+	 * @throws \InvalidArgumentException
+	 */
+	public function setPsr4($prefix, $paths)
+	{
+		if (!$prefix) {
+			$this->fallbackDirsPsr4 = (array) $paths;
+		} else {
+			$length = strlen($prefix);
+			if ('\\' !== $prefix[$length - 1]) {
+				throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+			}
+			$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+			$this->prefixDirsPsr4[$prefix] = (array) $paths;
+		}
+	}
+
+	/**
+	 * Turns on searching the include path for class files.
+	 *
+	 * @param bool $useIncludePath
+	 */
+	public function setUseIncludePath($useIncludePath)
+	{
+		$this->useIncludePath = $useIncludePath;
+	}
+
+	/**
+	 * Can be used to check if the autoloader uses the include path to check
+	 * for classes.
+	 *
+	 * @return bool
+	 */
+	public function getUseIncludePath()
+	{
+		return $this->useIncludePath;
+	}
+
+	/**
+	 * Turns off searching the prefix and fallback directories for classes
+	 * that have not been registered with the class map.
+	 *
+	 * @param bool $classMapAuthoritative
+	 */
+	public function setClassMapAuthoritative($classMapAuthoritative)
+	{
+		$this->classMapAuthoritative = $classMapAuthoritative;
+	}
+
+	/**
+	 * Should class lookup fail if not found in the current class map?
+	 *
+	 * @return bool
+	 */
+	public function isClassMapAuthoritative()
+	{
+		return $this->classMapAuthoritative;
+	}
+
+	/**
+	 * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+	 *
+	 * @param string|null $apcuPrefix
+	 */
+	public function setApcuPrefix($apcuPrefix)
+	{
+		$this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+	}
+
+	/**
+	 * The APCu prefix in use, or null if APCu caching is not enabled.
+	 *
+	 * @return string|null
+	 */
+	public function getApcuPrefix()
+	{
+		return $this->apcuPrefix;
+	}
+
+	/**
+	 * Registers this instance as an autoloader.
+	 *
+	 * @param bool $prepend Whether to prepend the autoloader or not
+	 */
+	public function register($prepend = false)
+	{
+		spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+	}
+
+	/**
+	 * Unregisters this instance as an autoloader.
+	 */
+	public function unregister()
+	{
+		spl_autoload_unregister(array($this, 'loadClass'));
+	}
+
+	/**
+	 * Loads the given class or interface.
+	 *
+	 * @param  string    $class The name of the class
+	 * @return bool|null True if loaded, null otherwise
+	 */
+	public function loadClass($class)
+	{
+		if ($file = $this->findFile($class)) {
+			includeFile($file);
+
+			return true;
+		}
+	}
+
+	/**
+	 * Finds the path to the file where the class is defined.
+	 *
+	 * @param string $class The name of the class
+	 *
+	 * @return string|false The path if found, false otherwise
+	 */
+	public function findFile($class)
+	{
+		// class map lookup
+		if (isset($this->classMap[$class])) {
+			return $this->classMap[$class];
+		}
+		if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
+			return false;
+		}
+		if (null !== $this->apcuPrefix) {
+			$file = apcu_fetch($this->apcuPrefix.$class, $hit);
+			if ($hit) {
+				return $file;
+			}
+		}
+
+		$file = $this->findFileWithExtension($class, '.php');
+
+		// Search for Hack files if we are running on HHVM
+		if (false === $file && defined('HHVM_VERSION')) {
+			$file = $this->findFileWithExtension($class, '.hh');
+		}
+
+		if (null !== $this->apcuPrefix) {
+			apcu_add($this->apcuPrefix.$class, $file);
+		}
+
+		if (false === $file) {
+			// Remember that this class does not exist.
+			$this->missingClasses[$class] = true;
+		}
+
+		return $file;
+	}
+
+	private function findFileWithExtension($class, $ext)
+	{
+		// PSR-4 lookup
+		$logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+		$first = $class[0];
+		if (isset($this->prefixLengthsPsr4[$first])) {
+			$subPath = $class;
+			while (false !== $lastPos = strrpos($subPath, '\\')) {
+				$subPath = substr($subPath, 0, $lastPos);
+				$search = $subPath . '\\';
+				if (isset($this->prefixDirsPsr4[$search])) {
+					$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+					foreach ($this->prefixDirsPsr4[$search] as $dir) {
+						if (file_exists($file = $dir . $pathEnd)) {
+							return $file;
+						}
+					}
+				}
+			}
+		}
+
+		// PSR-4 fallback dirs
+		foreach ($this->fallbackDirsPsr4 as $dir) {
+			if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+				return $file;
+			}
+		}
+
+		// PSR-0 lookup
+		if (false !== $pos = strrpos($class, '\\')) {
+			// namespaced class name
+			$logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+				. strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
+		} else {
+			// PEAR-like class name
+			$logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+		}
+
+		if (isset($this->prefixesPsr0[$first])) {
+			foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
+				if (0 === strpos($class, $prefix)) {
+					foreach ($dirs as $dir) {
+						if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+							return $file;
+						}
+					}
+				}
+			}
+		}
+
+		// PSR-0 fallback dirs
+		foreach ($this->fallbackDirsPsr0 as $dir) {
+			if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+				return $file;
+			}
+		}
+
+		// PSR-0 include paths.
+		if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+			return $file;
+		}
+
+		return false;
+	}
 }
 
 /**
@@ -441,5 +441,5 @@ 
  */
 function includeFile($file)
 {
-    include $file;
+	include $file;
 }

sources/subs/Maintenance.subs.php

Switch Indentation +74 added lines, -74 removed lines

@@ -348,8 +348,8 @@ 
 
 	switch ($type)
 	{
-		case 'posts':
-			$db->fetchQuery('
+	case 'posts':
+		$db->fetchQuery('
 				SELECT 
 					/*!40001 SQL_NO_CACHE */ m.id_board, COUNT(*) AS real_num_posts
 				FROM {db_prefix}messages AS m
@@ -357,29 +357,29 @@ 
 					AND m.id_topic <= {int:id_topic_max}
 					AND m.approved = {int:is_approved}
 				GROUP BY m.id_board',
-				array(
-					'id_topic_min' => $start,
-					'id_topic_max' => $start + $increment,
-					'is_approved' => 1,
-				)
-			)->fetch_callback(
-				function ($row) use ($db) {
-					$db->query('', '
+			array(
+				'id_topic_min' => $start,
+				'id_topic_max' => $start + $increment,
+				'is_approved' => 1,
+			)
+		)->fetch_callback(
+			function ($row) use ($db) {
+				$db->query('', '
 					UPDATE {db_prefix}boards
 					SET 
 						num_posts = num_posts + {int:real_num_posts}
 					WHERE id_board = {int:id_board}',
-						array(
-							'id_board' => $row['id_board'],
-							'real_num_posts' => $row['real_num_posts'],
-						)
-					);
-				}
-			);
-			break;
+					array(
+						'id_board' => $row['id_board'],
+						'real_num_posts' => $row['real_num_posts'],
+					)
+				);
+			}
+		);
+		break;
 
-		case 'topics':
-			$db->fetchQuery('
+	case 'topics':
+		$db->fetchQuery('
 				SELECT 
 					/*!40001 SQL_NO_CACHE */ t.id_board, COUNT(*) AS real_num_topics
 				FROM {db_prefix}topics AS t
@@ -387,29 +387,29 @@ 
 					AND t.id_topic > {int:id_topic_min}
 					AND t.id_topic <= {int:id_topic_max}
 				GROUP BY t.id_board',
-				array(
-					'is_approved' => 1,
-					'id_topic_min' => $start,
-					'id_topic_max' => $start + $increment,
-				)
-			)->fetch_callback(
-				function ($row) use ($db) {
-					$db->query('', '
+			array(
+				'is_approved' => 1,
+				'id_topic_min' => $start,
+				'id_topic_max' => $start + $increment,
+			)
+		)->fetch_callback(
+			function ($row) use ($db) {
+				$db->query('', '
 					UPDATE {db_prefix}boards
 					SET 
 						num_topics = num_topics + {int:real_num_topics}
 					WHERE id_board = {int:id_board}',
-						array(
-							'id_board' => $row['id_board'],
-							'real_num_topics' => $row['real_num_topics'],
-						)
-					);
-				}
-			);
-			break;
+					array(
+						'id_board' => $row['id_board'],
+						'real_num_topics' => $row['real_num_topics'],
+					)
+				);
+			}
+		);
+		break;
 
-		case 'unapproved_posts':
-			$db->fetchQuery('
+	case 'unapproved_posts':
+		$db->fetchQuery('
 				SELECT 
 					/*!40001 SQL_NO_CACHE */ m.id_board, COUNT(*) AS real_unapproved_posts
 				FROM {db_prefix}messages AS m
@@ -417,28 +417,28 @@ 
 					AND m.id_topic <= {int:id_topic_max}
 					AND m.approved = {int:is_approved}
 				GROUP BY m.id_board',
-				array(
-					'id_topic_min' => $start,
-					'id_topic_max' => $start + $increment,
-					'is_approved' => 0,
-				)
-			)->fetch_callback(
-				function ($row) use ($db) {
-					$db->query('', '
+			array(
+				'id_topic_min' => $start,
+				'id_topic_max' => $start + $increment,
+				'is_approved' => 0,
+			)
+		)->fetch_callback(
+			function ($row) use ($db) {
+				$db->query('', '
 					UPDATE {db_prefix}boards
 					SET unapproved_posts = unapproved_posts + {int:unapproved_posts}
 					WHERE id_board = {int:id_board}',
-						array(
-							'id_board' => $row['id_board'],
-							'unapproved_posts' => $row['real_unapproved_posts'],
-						)
-					);
-				}
-			);
-			break;
+					array(
+						'id_board' => $row['id_board'],
+						'unapproved_posts' => $row['real_unapproved_posts'],
+					)
+				);
+			}
+		);
+		break;
 
-		case 'unapproved_topics':
-			$db->fetchQuery('
+	case 'unapproved_topics':
+		$db->fetchQuery('
 				SELECT 
 					/*!40001 SQL_NO_CACHE */ t.id_board, COUNT(*) AS real_unapproved_topics
 				FROM {db_prefix}topics AS t
@@ -446,28 +446,28 @@ 
 					AND t.id_topic > {int:id_topic_min}
 					AND t.id_topic <= {int:id_topic_max}
 				GROUP BY t.id_board',
-				array(
-					'is_approved' => 0,
-					'id_topic_min' => $start,
-					'id_topic_max' => $start + $increment,
-				)
-			)->fetch_callback(
-				function ($row) use ($db) {
-					$db->query('', '
+			array(
+				'is_approved' => 0,
+				'id_topic_min' => $start,
+				'id_topic_max' => $start + $increment,
+			)
+		)->fetch_callback(
+			function ($row) use ($db) {
+				$db->query('', '
 					UPDATE {db_prefix}boards
 					SET unapproved_topics = unapproved_topics + {int:real_unapproved_topics}
 					WHERE id_board = {int:id_board}',
-						array(
-							'id_board' => $row['id_board'],
-							'real_unapproved_topics' => $row['real_unapproved_topics'],
-						)
-					);
-				}
-			);
-			break;
+					array(
+						'id_board' => $row['id_board'],
+						'real_unapproved_topics' => $row['real_unapproved_topics'],
+					)
+				);
+			}
+		);
+		break;
 
-		default:
-			trigger_error('updateBoardsCounter(): Invalid counter type \'' . $type . '\'', E_USER_NOTICE);
+	default:
+		trigger_error('updateBoardsCounter(): Invalid counter type \'' . $type . '\'', E_USER_NOTICE);
 	}
 }
 

sources/subs/Profile.subs.php

Switch Indentation +7 added lines, -7 removed lines

@@ -1843,13 +1843,13 @@
 			{
 				switch ($is_valid)
 				{
-					case 'custom_field_too_long':
-						$value = Util::substr($value, 0, $row['field_length']);
-						break;
-					case 'custom_field_invalid_email':
-					case 'custom_field_inproper_format':
-						$value = $row['default_value'];
-						break;
+				case 'custom_field_too_long':
+					$value = Util::substr($value, 0, $row['field_length']);
+					break;
+				case 'custom_field_invalid_email':
+				case 'custom_field_inproper_format':
+					$value = $row['default_value'];
+					break;
 				}
 			}
 

sources/subs/Membergroups.subs.php

Switch Indentation +5 added lines, -5 removed lines

@@ -1525,11 +1525,11 @@
 			$updates[] = $name . '={' . $known_properties[$name]['type'] . ':subs_' . $name . '}';
 			switch ($known_properties[$name]['type'])
 			{
-				case 'string':
-					$values['subs_' . $name] = Util::htmlspecialchars((string) $value);
-					break;
-				default:
-					$values['subs_' . $name] = (int) $value;
+			case 'string':
+				$values['subs_' . $name] = Util::htmlspecialchars((string) $value);
+				break;
+			default:
+				$values['subs_' . $name] = (int) $value;
 			}
 		}
 	}

sources/subs/PaidSubscriptions.subs.php

Switch Indentation +32 added lines, -32 removed lines

@@ -220,20 +220,20 @@ 
 	{
 		switch ($renewal)
 		{
-			case 'D':
-				$duration = 86400;
-				break;
-			case 'W':
-				$duration = 604800;
-				break;
-			case 'M':
-				$duration = 2629743;
-				break;
-			case 'Y':
-				$duration = 31556926;
-				break;
-			default:
-				break;
+		case 'D':
+			$duration = 86400;
+			break;
+		case 'W':
+			$duration = 604800;
+			break;
+		case 'M':
+			$duration = 2629743;
+			break;
+		case 'Y':
+			$duration = 31556926;
+			break;
+		default:
+			break;
 		}
 	}
 
@@ -505,24 +505,24 @@ 
 				$length = $match[1] . ' ';
 				switch ($match[2])
 				{
-					case 'D':
-						$length .= $txt['paid_mod_span_days'];
-						$num_length *= 86400;
-						break;
-					case 'W':
-						$length .= $txt['paid_mod_span_weeks'];
-						$num_length *= 604800;
-						break;
-					case 'M':
-						$length .= $txt['paid_mod_span_months'];
-						$num_length *= 2629743;
-						break;
-					case 'Y':
-						$length .= $txt['paid_mod_span_years'];
-						$num_length *= 31556926;
-						break;
-					default:
-						$length = '??';
+				case 'D':
+					$length .= $txt['paid_mod_span_days'];
+					$num_length *= 86400;
+					break;
+				case 'W':
+					$length .= $txt['paid_mod_span_weeks'];
+					$num_length *= 604800;
+					break;
+				case 'M':
+					$length .= $txt['paid_mod_span_months'];
+					$num_length *= 2629743;
+					break;
+				case 'Y':
+					$length .= $txt['paid_mod_span_years'];
+					$num_length *= 31556926;
+					break;
+				default:
+					$length = '??';
 				}
 			}
 

sources/subs/Maillist.subs.php

Switch Indentation +9 added lines, -9 removed lines

@@ -105,15 +105,15 @@
 			// Build a link to the topic or message in case someone wants to take a look at that thread
 			switch ($row['message_type'])
 			{
-				case 't':
-					$postemail[$i]['link'] = $boardurl . '?topic=' . $row['message_id'];
-					break;
-				case 'm':
-					$postemail[$i]['link'] = $boardurl . '?msg=' . $row['message_id'];
-					break;
-				case 'p':
-					$postemail[$i]['subject'] = $txt['private'];
-					break;
+			case 't':
+				$postemail[$i]['link'] = $boardurl . '?topic=' . $row['message_id'];
+				break;
+			case 'm':
+				$postemail[$i]['link'] = $boardurl . '?msg=' . $row['message_id'];
+				break;
+			case 'p':
+				$postemail[$i]['subject'] = $txt['private'];
+				break;
 			}
 
 			$i++;

sources/subs/Post.subs.php

Switch Indentation +64 added lines, -64 removed lines

@@ -1152,32 +1152,32 @@ 
 	switch ($editing)
 	{
 		// Modifying an existing message
-		case 1:
-			require_once(SUBSDIR . '/Messages.subs.php');
+	case 1:
+		require_once(SUBSDIR . '/Messages.subs.php');
 
-			// Get the existing message.
-			$message = messageDetails((int) $msg_id, (int) $topic);
+		// Get the existing message.
+		$message = messageDetails((int) $msg_id, (int) $topic);
 
-			// The message they were trying to edit was most likely deleted.
-			if ($message === false)
-			{
-				return false;
-			}
+		// The message they were trying to edit was most likely deleted.
+		if ($message === false)
+		{
+			return false;
+		}
 
-			$errors = checkMessagePermissions($message['message']);
+		$errors = checkMessagePermissions($message['message']);
 
-			prepareMessageContext($message);
+		prepareMessageContext($message);
 
-			if (!empty($errors))
-			{
-				$message['errors'] = $errors;
-			}
+		if (!empty($errors))
+		{
+			$message['errors'] = $errors;
+		}
 
-			return $message;
-		// Posting a quoted reply?
-		case 2:
-			// Make sure they _can_ quote this post, and if so get it.
-			$request = $db->query('', '
+		return $message;
+	// Posting a quoted reply?
+	case 2:
+		// Make sure they _can_ quote this post, and if so get it.
+		$request = $db->query('', '
 				SELECT
 					m.subject, COALESCE(mem.real_name, m.poster_name) AS poster_name, m.poster_time, m.body
 				FROM {db_prefix}messages AS m
@@ -1186,60 +1186,60 @@ 
 				WHERE m.id_msg = {int:id_msg}' . (!$modSettings['postmod_active'] || allowedTo('approve_posts') ? '' : '
 					AND m.approved = {int:is_approved}') . '
 				LIMIT 1',
-				array(
-					'id_msg' => $msg_id,
-					'is_approved' => 1,
-				)
-			);
-			if ($request->num_rows() == 0)
-			{
-				throw new \ElkArte\Exceptions\Exception('quoted_post_deleted', false);
-			}
-			list ($form_subject, $mname, $mdate, $form_message) = $request->fetch_row();
-			$request->free_result();
+			array(
+				'id_msg' => $msg_id,
+				'is_approved' => 1,
+			)
+		);
+		if ($request->num_rows() == 0)
+		{
+			throw new \ElkArte\Exceptions\Exception('quoted_post_deleted', false);
+		}
+		list ($form_subject, $mname, $mdate, $form_message) = $request->fetch_row();
+		$request->free_result();
 
-			// Add 'Re: ' to the front of the quoted subject.
-			$response_prefix = response_prefix();
-			if (trim($response_prefix) != '' && Util::strpos($form_subject, trim($response_prefix)) !== 0)
-			{
-				$form_subject = $response_prefix . $form_subject;
-			}
+		// Add 'Re: ' to the front of the quoted subject.
+		$response_prefix = response_prefix();
+		if (trim($response_prefix) != '' && Util::strpos($form_subject, trim($response_prefix)) !== 0)
+		{
+			$form_subject = $response_prefix . $form_subject;
+		}
 
-			// Censor the message and subject.
-			$form_message = censor($form_message);
-			$form_subject = censor($form_subject);
+		// Censor the message and subject.
+		$form_message = censor($form_message);
+		$form_subject = censor($form_subject);
 
-			$form_message = un_preparsecode($form_message);
-			$form_message = removeNestedQuotes($form_message);
+		$form_message = un_preparsecode($form_message);
+		$form_message = removeNestedQuotes($form_message);
 
-			// Add a quote string on the front and end.
-			$form_message = '[quote author=' . $mname . ' link=msg=' . (int) $msg_id . ' date=' . $mdate . ']' . "\n" . rtrim($form_message) . "\n" . '[/quote]';
+		// Add a quote string on the front and end.
+		$form_message = '[quote author=' . $mname . ' link=msg=' . (int) $msg_id . ' date=' . $mdate . ']' . "\n" . rtrim($form_message) . "\n" . '[/quote]';
 
-			break;
-		// Posting a reply without a quote?
-		case 3:
-			// Get the first message's subject.
-			$form_subject = $first_subject;
+		break;
+	// Posting a reply without a quote?
+	case 3:
+		// Get the first message's subject.
+		$form_subject = $first_subject;
 
-			// Add 'Re: ' to the front of the subject.
-			$response_prefix = response_prefix();
-			if (trim($response_prefix) != '' && $form_subject != '' && Util::strpos($form_subject, trim($response_prefix)) !== 0)
-			{
-				$form_subject = $response_prefix . $form_subject;
-			}
+		// Add 'Re: ' to the front of the subject.
+		$response_prefix = response_prefix();
+		if (trim($response_prefix) != '' && $form_subject != '' && Util::strpos($form_subject, trim($response_prefix)) !== 0)
+		{
+			$form_subject = $response_prefix . $form_subject;
+		}
 
-			// Censor the subject.
-			$form_subject = censor($form_subject);
+		// Censor the subject.
+		$form_subject = censor($form_subject);
 
-			$form_message = '';
+		$form_message = '';
 
-			break;
-		case 4:
-		default:
-			$form_subject = $first_subject;
-			$form_message = '';
+		break;
+	case 4:
+	default:
+		$form_subject = $first_subject;
+		$form_message = '';
 
-			break;
+		break;
 	}
 
 	return array($form_subject, $form_message);

sources/subs/Sound.subs.php

Switch Indentation +24 added lines, -24 removed lines

@@ -80,36 +80,36 @@
 		$sound_letter = substr($sound_letter, strpos($sound_letter, 'data') + 8);
 		switch ($word[$i] === 's' ? 0 : mt_rand(0, 2))
 		{
-			case 0:
-				for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++)
+		case 0:
+			for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++)
+			{
+				for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++)
 				{
-					for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++)
-					{
-						$sound_word .= $word[$i] === 's' ? $sound_letter[$j] : chr(mt_rand(max(ord($sound_letter[$j]) - 1, 0x00), min(ord($sound_letter[$j]) + 1, 0xFF)));
-					}
+					$sound_word .= $word[$i] === 's' ? $sound_letter[$j] : chr(mt_rand(max(ord($sound_letter[$j]) - 1, 0x00), min(ord($sound_letter[$j]) + 1, 0xFF)));
 				}
-				break;
-			case 1:
-				for ($j = 0, $n = strlen($sound_letter) - 1; $j < $n; $j += 2)
+			}
+			break;
+		case 1:
+			for ($j = 0, $n = strlen($sound_letter) - 1; $j < $n; $j += 2)
+			{
+				$sound_word .= (mt_rand(0, 3) == 0 ? '' : $sound_letter[$j]) . (mt_rand(0, 3) === 0 ? $sound_letter[$j + 1] : $sound_letter[$j]) . (mt_rand(0, 3) === 0 ? $sound_letter[$j] : $sound_letter[$j + 1]) . $sound_letter[$j + 1] . (mt_rand(0, 3) == 0 ? $sound_letter[$j + 1] : '');
+			}
+			$sound_word .= str_repeat($sound_letter[$n], 2);
+			break;
+		case 2:
+			$shift = 0;
+			for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++)
+			{
+				if (mt_rand(0, 10) === 0)
 				{
-					$sound_word .= (mt_rand(0, 3) == 0 ? '' : $sound_letter[$j]) . (mt_rand(0, 3) === 0 ? $sound_letter[$j + 1] : $sound_letter[$j]) . (mt_rand(0, 3) === 0 ? $sound_letter[$j] : $sound_letter[$j + 1]) . $sound_letter[$j + 1] . (mt_rand(0, 3) == 0 ? $sound_letter[$j + 1] : '');
+					$shift += mt_rand(-3, 3);
 				}
-				$sound_word .= str_repeat($sound_letter[$n], 2);
-				break;
-			case 2:
-				$shift = 0;
-				for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++)
+				for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++)
 				{
-					if (mt_rand(0, 10) === 0)
-					{
-						$shift += mt_rand(-3, 3);
-					}
-					for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++)
-					{
-						$sound_word .= chr(min(max(ord($sound_letter[$j]) + $shift, 0x00), 0xFF));
-					}
+					$sound_word .= chr(min(max(ord($sound_letter[$j]) + $shift, 0x00), 0xFF));
 				}
-				break;
+			}
+			break;
 		}
 
 		$sound_word .= str_repeat(chr(0x80), mt_rand(10000, 10500));

sources/subs/ManageAttachments.subs.php

Switch Indentation +28 added lines, -28 removed lines

@@ -155,34 +155,34 @@
 
 			switch ($type)
 			{
-				case 'id_member':
-				case 'id_attach':
-				case 'id_msg':
-					// @todo the !empty($restriction) is a trick to override the checks on $_POST['attach_del'] in Post.controller
-					// In theory it should not be necessary
-					if (!empty($restriction))
-					{
-						$new_condition[] = 'a.' . $type . ($is_not ? ' NOT' : '') . ' IN (' . (is_array($restriction) ? '{array_int:' . $real_type . '}' : '{int:' . $real_type . '}') . ')';
-					}
-					break;
-				case 'attachment_type':
-					$new_condition[] = 'a.attachment_type = {int:' . $real_type . '}';
-					break;
-				case 'poster_time':
-					$new_condition[] = 'm.poster_time < {int:' . $real_type . '}';
-					break;
-				case 'last_login':
-					$new_condition[] = 'mem.last_login < {int:' . $real_type . '}';
-					break;
-				case 'size':
-					$new_condition[] = 'a.size > {int:' . $real_type . '}';
-					break;
-				case 'id_topic':
-					$new_condition[] = 'm.id_topic IN (' . (is_array($restriction) ? '{array_int:' . $real_type . '}' : '{int:' . $real_type . '}') . ')';
-					break;
-				case 'do_logging':
-					$do_logging = $condition['id_attach'];
-					break;
+			case 'id_member':
+			case 'id_attach':
+			case 'id_msg':
+				// @todo the !empty($restriction) is a trick to override the checks on $_POST['attach_del'] in Post.controller
+				// In theory it should not be necessary
+				if (!empty($restriction))
+				{
+					$new_condition[] = 'a.' . $type . ($is_not ? ' NOT' : '') . ' IN (' . (is_array($restriction) ? '{array_int:' . $real_type . '}' : '{int:' . $real_type . '}') . ')';
+				}
+				break;
+			case 'attachment_type':
+				$new_condition[] = 'a.attachment_type = {int:' . $real_type . '}';
+				break;
+			case 'poster_time':
+				$new_condition[] = 'm.poster_time < {int:' . $real_type . '}';
+				break;
+			case 'last_login':
+				$new_condition[] = 'mem.last_login < {int:' . $real_type . '}';
+				break;
+			case 'size':
+				$new_condition[] = 'a.size > {int:' . $real_type . '}';
+				break;
+			case 'id_topic':
+				$new_condition[] = 'm.id_topic IN (' . (is_array($restriction) ? '{array_int:' . $real_type . '}' : '{int:' . $real_type . '}') . ')';
+				break;
+			case 'do_logging':
+				$do_logging = $condition['id_attach'];
+				break;
 			}
 
 			// Add the parameter!