elkarte / Elkarte

themes/default/ProfileOptions.template.php

Braces +2 added lines, -1 removed lines

@@ -367,7 +367,8 @@
 /**
  * All of the profile options as defined in profile.subs or via an addon
  */
-function template_profile_options() {
+function template_profile_options()
+{
 	global $context;
 
 	if (empty($context['profile_fields']))

Spacing +24 added lines, -24 removed lines

@@ -15,7 +15,7 @@ 
 /**
  * We need this template in order to look at ignored boards
  */
-function template_ProfileOptions_init()
+function template_ProfileOptions_init ()
 {
 	global $context, $txt;
 
@@ -33,7 +33,7 @@ 
 /**
  * Template for showing all the buddies of the current user.
  */
-function template_editBuddies()
+function template_editBuddies ()
 {
 	global $context, $txt;
 
@@ -157,7 +157,7 @@ 
 /**
  * Template for showing the ignore list of the current user.
  */
-function template_editIgnoreList()
+function template_editIgnoreList ()
 {
 	global $context, $txt;
 
@@ -265,7 +265,7 @@ 
  *
  * @uses ParseError
  */
-function template_edit_options()
+function template_edit_options ()
 {
 	global $context, $txt;
 
@@ -357,7 +357,7 @@ 
 /**
  * All of the profile options as defined in profile.subs or via an addon
  */
-function template_profile_options() {
+function template_profile_options () {
 	global $context;
 
 	if (empty($context['profile_fields']))
@@ -502,7 +502,7 @@ 
  *
  * @param string $lastItem
  */
-function template_custom_profile_options($lastItem = '')
+function template_custom_profile_options ($lastItem = '')
 {
 	global $context;
 
@@ -540,7 +540,7 @@ 
 /**
  * Personal Message settings.
  */
-function template_profile_pm_settings()
+function template_profile_pm_settings ()
 {
 	global $context, $modSettings, $txt;
 
@@ -602,7 +602,7 @@ 
 /**
  * Template for showing theme settings. Note: template_options() actually adds the theme specific options.
  */
-function template_profile_theme_settings()
+function template_profile_theme_settings ()
 {
 	global $context, $modSettings, $txt;
 
@@ -764,7 +764,7 @@ 
 /**
  * Template for setting up how and what you want to be notified about
  */
-function template_action_notification()
+function template_action_notification ()
 {
 	global $context, $txt, $modSettings;
 
@@ -893,7 +893,7 @@ 
  * Template for showing which boards you have subscribed to
  * and allowing for modification.
  */
-function template_board_notification_list()
+function template_board_notification_list ()
 {
 	template_show_list('board_notification_list');
 }
@@ -902,7 +902,7 @@ 
  * Template for showing which topics you have subscribed to
  * and allowing for modification.
  */
-function template_topic_notification_list()
+function template_topic_notification_list ()
 {
 	template_show_list('topic_notification_list');
 }
@@ -910,7 +910,7 @@ 
 /**
  * Template for choosing group membership.
  */
-function template_groupMembership()
+function template_groupMembership ()
 {
 	global $context, $txt;
 
@@ -1089,7 +1089,7 @@ 
 /**
  * Display a list of boards so a user can choose to ignore some
  */
-function template_ignoreboards()
+function template_ignoreboards ()
 {
 	global $txt;
 
@@ -1117,7 +1117,7 @@ 
 /**
  * Display a load of drop down selectors for allowing the user to change group.
  */
-function template_profile_group_manage()
+function template_profile_group_manage ()
 {
 	global $context, $txt;
 
@@ -1174,7 +1174,7 @@ 
 /**
  * Callback function for entering a birth date!
  */
-function template_profile_birthdate()
+function template_profile_birthdate ()
 {
 	global $txt, $context;
 
@@ -1194,7 +1194,7 @@ 
 /**
  * Show the signature editing box.
  */
-function template_profile_signature_modify()
+function template_profile_signature_modify ()
 {
 	global $txt, $context;
 
@@ -1256,7 +1256,7 @@ 
 /**
  * Interface to select an avatar in profile.
  */
-function template_profile_avatar_select()
+function template_profile_avatar_select ()
 {
 	global $context, $txt, $modSettings;
 
@@ -1385,7 +1385,7 @@ 
 /**
  * Callback for modifying karma.
  */
-function template_profile_karma_modify()
+function template_profile_karma_modify ()
 {
 	global $context, $modSettings, $txt;
 
@@ -1403,7 +1403,7 @@ 
 /**
  * Select the time format!.
  */
-function template_profile_timeformat_modify()
+function template_profile_timeformat_modify ()
 {
 	global $context, $txt;
 
@@ -1435,7 +1435,7 @@ 
 /**
  * Time offset.
  */
-function template_profile_timeoffset_modify()
+function template_profile_timeoffset_modify ()
 {
 	global $txt, $context;
 
@@ -1452,7 +1452,7 @@ 
 /**
  * Button to allow the member to pick a theme.
  */
-function template_profile_theme_pick()
+function template_profile_theme_pick ()
 {
 	global $txt, $context;
 
@@ -1468,7 +1468,7 @@ 
 /**
  * Smiley set picker.
  */
-function template_profile_smiley_pick()
+function template_profile_smiley_pick ()
 {
 	global $txt, $context, $modSettings, $settings;
 
@@ -1494,7 +1494,7 @@ 
 /**
  * Interface to allow the member to change the way they login to the forum.
  */
-function template_authentication_method()
+function template_authentication_method ()
 {
 	global $context, $modSettings, $txt;
 
@@ -1562,7 +1562,7 @@ 
 /**
  * This template allows for the selection of different themes.
  */
-function template_pick()
+function template_pick ()
 {
 	global $context, $scripturl, $txt;
 

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;
 }

Spacing +24 added lines, -24 removed lines

@@ -57,7 +57,7 @@ 
     private $missingClasses = array();
     private $apcuPrefix;
 
-    public function getPrefixes()
+    public function getPrefixes ()
     {
         if (!empty($this->prefixesPsr0)) {
             return call_user_func_array('array_merge', $this->prefixesPsr0);
@@ -66,22 +66,22 @@ 
         return array();
     }
 
-    public function getPrefixesPsr4()
+    public function getPrefixesPsr4 ()
     {
         return $this->prefixDirsPsr4;
     }
 
-    public function getFallbackDirs()
+    public function getFallbackDirs ()
     {
         return $this->fallbackDirsPsr0;
     }
 
-    public function getFallbackDirsPsr4()
+    public function getFallbackDirsPsr4 ()
     {
         return $this->fallbackDirsPsr4;
     }
 
-    public function getClassMap()
+    public function getClassMap ()
     {
         return $this->classMap;
     }
@@ -89,7 +89,7 @@ 
     /**
      * @param array $classMap Class to filename map
      */
-    public function addClassMap(array $classMap)
+    public function addClassMap (array $classMap)
     {
         if ($this->classMap) {
             $this->classMap = array_merge($this->classMap, $classMap);
@@ -106,7 +106,7 @@ 
      * @param array|string $paths   The PSR-0 root directories
      * @param bool         $prepend Whether to prepend the directories
      */
-    public function add($prefix, $paths, $prepend = false)
+    public function add ($prefix, $paths, $prepend = false)
     {
         if (!$prefix) {
             if ($prepend) {
@@ -153,7 +153,7 @@ 
      *
      * @throws \InvalidArgumentException
      */
-    public function addPsr4($prefix, $paths, $prepend = false)
+    public function addPsr4 ($prefix, $paths, $prepend = false)
     {
         if (!$prefix) {
             // Register directories for the root namespace.
@@ -198,7 +198,7 @@ 
      * @param string       $prefix The prefix
      * @param array|string $paths  The PSR-0 base directories
      */
-    public function set($prefix, $paths)
+    public function set ($prefix, $paths)
     {
         if (!$prefix) {
             $this->fallbackDirsPsr0 = (array) $paths;
@@ -216,7 +216,7 @@ 
      *
      * @throws \InvalidArgumentException
      */
-    public function setPsr4($prefix, $paths)
+    public function setPsr4 ($prefix, $paths)
     {
         if (!$prefix) {
             $this->fallbackDirsPsr4 = (array) $paths;
@@ -235,7 +235,7 @@ 
      *
      * @param bool $useIncludePath
      */
-    public function setUseIncludePath($useIncludePath)
+    public function setUseIncludePath ($useIncludePath)
     {
         $this->useIncludePath = $useIncludePath;
     }
@@ -246,7 +246,7 @@ 
      *
      * @return bool
      */
-    public function getUseIncludePath()
+    public function getUseIncludePath ()
     {
         return $this->useIncludePath;
     }
@@ -257,7 +257,7 @@ 
      *
      * @param bool $classMapAuthoritative
      */
-    public function setClassMapAuthoritative($classMapAuthoritative)
+    public function setClassMapAuthoritative ($classMapAuthoritative)
     {
         $this->classMapAuthoritative = $classMapAuthoritative;
     }
@@ -267,7 +267,7 @@ 
      *
      * @return bool
      */
-    public function isClassMapAuthoritative()
+    public function isClassMapAuthoritative ()
     {
         return $this->classMapAuthoritative;
     }
@@ -277,7 +277,7 @@ 
      *
      * @param string|null $apcuPrefix
      */
-    public function setApcuPrefix($apcuPrefix)
+    public function setApcuPrefix ($apcuPrefix)
     {
         $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
     }
@@ -287,7 +287,7 @@ 
      *
      * @return string|null
      */
-    public function getApcuPrefix()
+    public function getApcuPrefix ()
     {
         return $this->apcuPrefix;
     }
@@ -297,7 +297,7 @@ 
      *
      * @param bool $prepend Whether to prepend the autoloader or not
      */
-    public function register($prepend = false)
+    public function register ($prepend = false)
     {
         spl_autoload_register(array($this, 'loadClass'), true, $prepend);
     }
@@ -305,7 +305,7 @@ 
     /**
      * Unregisters this instance as an autoloader.
      */
-    public function unregister()
+    public function unregister ()
     {
         spl_autoload_unregister(array($this, 'loadClass'));
     }
@@ -316,7 +316,7 @@ 
      * @param  string    $class The name of the class
      * @return bool|null True if loaded, null otherwise
      */
-    public function loadClass($class)
+    public function loadClass ($class)
     {
         if ($file = $this->findFile($class)) {
             includeFile($file);
@@ -332,7 +332,7 @@ 
      *
      * @return string|false The path if found, false otherwise
      */
-    public function findFile($class)
+    public function findFile ($class)
     {
         // class map lookup
         if (isset($this->classMap[$class])) {
@@ -342,7 +342,7 @@ 
             return false;
         }
         if (null !== $this->apcuPrefix) {
-            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
+            $file = apcu_fetch($this->apcuPrefix . $class, $hit);
             if ($hit) {
                 return $file;
             }
@@ -356,7 +356,7 @@ 
         }
 
         if (null !== $this->apcuPrefix) {
-            apcu_add($this->apcuPrefix.$class, $file);
+            apcu_add($this->apcuPrefix . $class, $file);
         }
 
         if (false === $file) {
@@ -367,7 +367,7 @@ 
         return $file;
     }
 
-    private function findFileWithExtension($class, $ext)
+    private function findFileWithExtension ($class, $ext)
     {
         // PSR-4 lookup
         $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
@@ -439,7 +439,7 @@ 
  *
  * Prevents access to $this/self from included files.
  */
-function includeFile($file)
+function includeFile ($file)
 {
     include $file;
 }

Braces +102 added lines, -46 removed lines

@@ -59,7 +59,8 @@ 
 
     public function getPrefixes()
     {
-        if (!empty($this->prefixesPsr0)) {
+        if (!empty($this->prefixesPsr0))
+        {
             return call_user_func_array('array_merge', $this->prefixesPsr0);
         }
 
@@ -91,9 +92,12 @@ 
      */
     public function addClassMap(array $classMap)
     {
-        if ($this->classMap) {
+        if ($this->classMap)
+        {
             $this->classMap = array_merge($this->classMap, $classMap);
-        } else {
+        }
+        else
+        {
             $this->classMap = $classMap;
         }
     }
@@ -108,13 +112,17 @@ 
      */
     public function add($prefix, $paths, $prepend = false)
     {
-        if (!$prefix) {
-            if ($prepend) {
+        if (!$prefix)
+        {
+            if ($prepend)
+            {
                 $this->fallbackDirsPsr0 = array_merge(
                     (array) $paths,
                     $this->fallbackDirsPsr0
                 );
-            } else {
+            }
+            else
+            {
                 $this->fallbackDirsPsr0 = array_merge(
                     $this->fallbackDirsPsr0,
                     (array) $paths
@@ -125,17 +133,21 @@ 
         }
 
         $first = $prefix[0];
-        if (!isset($this->prefixesPsr0[$first][$prefix])) {
+        if (!isset($this->prefixesPsr0[$first][$prefix]))
+        {
             $this->prefixesPsr0[$first][$prefix] = (array) $paths;
 
             return;
         }
-        if ($prepend) {
+        if ($prepend)
+        {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
                 (array) $paths,
                 $this->prefixesPsr0[$first][$prefix]
             );
-        } else {
+        }
+        else
+        {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
                 $this->prefixesPsr0[$first][$prefix],
                 (array) $paths
@@ -155,34 +167,45 @@ 
      */
     public function addPsr4($prefix, $paths, $prepend = false)
     {
-        if (!$prefix) {
+        if (!$prefix)
+        {
             // Register directories for the root namespace.
-            if ($prepend) {
+            if ($prepend)
+            {
                 $this->fallbackDirsPsr4 = array_merge(
                     (array) $paths,
                     $this->fallbackDirsPsr4
                 );
-            } else {
+            }
+            else
+            {
                 $this->fallbackDirsPsr4 = array_merge(
                     $this->fallbackDirsPsr4,
                     (array) $paths
                 );
             }
-        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+        }
+        elseif (!isset($this->prefixDirsPsr4[$prefix]))
+        {
             // Register directories for a new namespace.
             $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
+            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) {
+        }
+        elseif ($prepend)
+        {
             // Prepend directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
                 (array) $paths,
                 $this->prefixDirsPsr4[$prefix]
             );
-        } else {
+        }
+        else
+        {
             // Append directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
                 $this->prefixDirsPsr4[$prefix],
@@ -200,9 +223,12 @@ 
      */
     public function set($prefix, $paths)
     {
-        if (!$prefix) {
+        if (!$prefix)
+        {
             $this->fallbackDirsPsr0 = (array) $paths;
-        } else {
+        }
+        else
+        {
             $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
         }
     }
@@ -218,11 +244,15 @@ 
      */
     public function setPsr4($prefix, $paths)
     {
-        if (!$prefix) {
+        if (!$prefix)
+        {
             $this->fallbackDirsPsr4 = (array) $paths;
-        } else {
+        }
+        else
+        {
             $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
+            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;
@@ -318,7 +348,8 @@ 
      */
     public function loadClass($class)
     {
-        if ($file = $this->findFile($class)) {
+        if ($file = $this->findFile($class))
+        {
             includeFile($file);
 
             return true;
@@ -335,15 +366,19 @@ 
     public function findFile($class)
     {
         // class map lookup
-        if (isset($this->classMap[$class])) {
+        if (isset($this->classMap[$class]))
+        {
             return $this->classMap[$class];
         }
-        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
+        if ($this->classMapAuthoritative || isset($this->missingClasses[$class]))
+        {
             return false;
         }
-        if (null !== $this->apcuPrefix) {
+        if (null !== $this->apcuPrefix)
+        {
             $file = apcu_fetch($this->apcuPrefix.$class, $hit);
-            if ($hit) {
+            if ($hit)
+            {
                 return $file;
             }
         }
@@ -351,15 +386,18 @@ 
         $file = $this->findFileWithExtension($class, '.php');
 
         // Search for Hack files if we are running on HHVM
-        if (false === $file && defined('HHVM_VERSION')) {
+        if (false === $file && defined('HHVM_VERSION'))
+        {
             $file = $this->findFileWithExtension($class, '.hh');
         }
 
-        if (null !== $this->apcuPrefix) {
+        if (null !== $this->apcuPrefix)
+        {
             apcu_add($this->apcuPrefix.$class, $file);
         }
 
-        if (false === $file) {
+        if (false === $file)
+        {
             // Remember that this class does not exist.
             $this->missingClasses[$class] = true;
         }
@@ -373,15 +411,20 @@ 
         $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
 
         $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
+        if (isset($this->prefixLengthsPsr4[$first]))
+        {
             $subPath = $class;
-            while (false !== $lastPos = strrpos($subPath, '\\')) {
+            while (false !== $lastPos = strrpos($subPath, '\\'))
+            {
                 $subPath = substr($subPath, 0, $lastPos);
                 $search = $subPath . '\\';
-                if (isset($this->prefixDirsPsr4[$search])) {
+                if (isset($this->prefixDirsPsr4[$search]))
+                {
                     $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
-                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                    foreach ($this->prefixDirsPsr4[$search] as $dir)
+                    {
+                        if (file_exists($file = $dir . $pathEnd))
+                        {
                             return $file;
                         }
                     }
@@ -390,27 +433,37 @@ 
         }
 
         // PSR-4 fallback dirs
-        foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+        foreach ($this->fallbackDirsPsr4 as $dir)
+        {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4))
+            {
                 return $file;
             }
         }
 
         // PSR-0 lookup
-        if (false !== $pos = strrpos($class, '\\')) {
+        if (false !== $pos = strrpos($class, '\\'))
+        {
             // namespaced class name
             $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
                 . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
-        } else {
+        }
+        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)) {
+        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;
                         }
                     }
@@ -419,14 +472,17 @@ 
         }
 
         // PSR-0 fallback dirs
-        foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+        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)) {
+        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0))
+        {
             return $file;
         }
 

sources/QueryString.php

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
  *   - Makes sure, regardless of php.ini, everything has slashes.
  * - Uses Request parseRequest() to clean and set up variables like $board or $_REQUEST'start'].
  */
-function cleanRequest()
+function cleanRequest ()
 {
 	// Make sure REMOTE_ADDR, other IPs, and the like are parsed
 	$req = Request::instance();
@@ -52,7 +52,7 @@ 
  *
  * @return string The escaped string
  */
-function JavaScriptEscape($string)
+function JavaScriptEscape ($string)
 {
 	global $scripturl;
 
@@ -85,7 +85,7 @@ 
  *
  * @return string The modified output buffer
  */
-function ob_sessrewrite($buffer)
+function ob_sessrewrite ($buffer)
 {
 	global $scripturl;
 

sources/Security.php

Braces +4 added lines, -1 removed lines

@@ -1730,10 +1730,13 @@
 		if ($result[0] === 127 // Valid Response
 			&& ($result[3] & 3 || $result[3] & 5) // Listed as Suspicious + Harvester || Suspicious + Comment Spammer
 			&& $result[2] >= $modSettings['badbehavior_httpbl_threat'] // Level
-			&& $result[1] <= $modSettings['badbehavior_httpbl_maxage']) // Age
+			&& $result[1] <= $modSettings['badbehavior_httpbl_maxage'])
+		{
+			// Age
 		{
 			return true;
 		}
+		}
 	}
 
 	return false;

Spacing +32 added lines, -32 removed lines

@@ -42,7 +42,7 @@ 
  *
  * @return bool|string
  */
-function validateSession($type = 'admin')
+function validateSession ($type = 'admin')
 {
 	global $modSettings;
 
@@ -157,7 +157,7 @@ 
  *
  * @return bool
  */
-function checkPassword($type, $hash = false)
+function checkPassword ($type, $hash = false)
 {
 	$password = $_POST[$type . ($hash ? '_hash_pass' : '_pass')];
 
@@ -190,7 +190,7 @@ 
  * @return bool
  * @throws \ElkArte\Exceptions\Exception
  */
-function is_not_guest($message = '', $is_fatal = true)
+function is_not_guest ($message = '', $is_fatal = true)
 {
 	global $txt, $context, $scripturl;
 
@@ -270,7 +270,7 @@ 
  *
  * @throws \ElkArte\Exceptions\Exception
  */
-function is_not_banned($forceCheck = false)
+function is_not_banned ($forceCheck = false)
 {
 	global $txt, $modSettings, $cookiename;
 
@@ -353,7 +353,7 @@ 
 					(' . implode(' OR ', $ban_query) . ')',
 				$ban_query_vars
 			)->fetch_callback(
-				function ($row) use ($restrictions, &$flag_is_activated) {
+				function($row) use ($restrictions, &$flag_is_activated) {
 					// Store every type of ban that applies to you in your session.
 					foreach ($restrictions as $restriction)
 					{
@@ -415,7 +415,7 @@ 
 				'current_time' => time(),
 			)
 		)->fetch_callback(
-			function ($row) {
+			function($row) {
 				$_SESSION['ban']['cannot_access']['ids'][] = $row['id_ban'];
 				$_SESSION['ban']['cannot_access']['reason'] = $row['reason'];
 			}
@@ -506,7 +506,7 @@ 
  * @event integrate_warn_permissions Allows changing of permissions for users on warning moderate
  * @package Bans
  */
-function banPermissions()
+function banPermissions ()
 {
 	global $modSettings, $context;
 
@@ -614,7 +614,7 @@ 
  * @param string|null $email = null
  * @package Bans
  */
-function log_ban($ban_ids = array(), $email = null)
+function log_ban ($ban_ids = array(), $email = null)
 {
 	$db = database();
 
@@ -670,7 +670,7 @@ 
  * @throws \ElkArte\Exceptions\Exception
  * @package Bans
  */
-function isBannedEmail($email, $restriction, $error)
+function isBannedEmail ($email, $restriction, $error)
 {
 	global $txt;
 
@@ -701,7 +701,7 @@ 
 			'now' => time(),
 		)
 	)->fetch_callback(
-		function ($row) use (&$ban_ids, &$ban_reason, $restriction) {
+		function($row) use (&$ban_ids, &$ban_reason, $restriction) {
 			if (!empty($row['cannot_access']))
 			{
 				$_SESSION['ban']['cannot_access']['ids'][] = $row['id_ban'];
@@ -750,7 +750,7 @@ 
  *
  * @return string the error message if is_fatal is false.
  */
-function checkSession($type = 'post', $from_action = '', $is_fatal = true)
+function checkSession ($type = 'post', $from_action = '', $is_fatal = true)
 {
 	global $modSettings, $boardurl;
 
@@ -893,7 +893,7 @@ 
  *
  * @return string[] array of token var, time, csrf, token
  */
-function createToken($action, $type = 'post')
+function createToken ($action, $type = 'post')
 {
 	global $context;
 
@@ -934,7 +934,7 @@ 
  * @return bool|string except for $action == 'login' where the token is returned
  * @throws \ElkArte\Exceptions\Exception token_verify_fail
  */
-function validateToken($action, $type = 'post', $reset = true, $fatal = true)
+function validateToken ($action, $type = 'post', $reset = true, $fatal = true)
 {
 	$type = ($type === 'get' || $type === 'request') ? $type : 'post';
 	$token_index = $type . '-' . $action;
@@ -1013,7 +1013,7 @@ 
  * @param bool $complete = false
  * @param string $suffix = false
  */
-function cleanTokens($complete = false, $suffix = '')
+function cleanTokens ($complete = false, $suffix = '')
 {
 	// We appreciate cleaning up after yourselves.
 	if (!isset($_SESSION['token']))
@@ -1057,7 +1057,7 @@ 
  * @return bool
  * @throws \ElkArte\Exceptions\Exception error_form_already_submitted
  */
-function checkSubmitOnce($action, $is_fatal = false)
+function checkSubmitOnce ($action, $is_fatal = false)
 {
 	global $context;
 
@@ -1123,7 +1123,7 @@ 
  *
  * @return bool if the user can do the permission
  */
-function allowedTo($permission, $boards = null)
+function allowedTo ($permission, $boards = null)
 {
 	$db = database();
 
@@ -1225,7 +1225,7 @@ 
  *
  * @throws \ElkArte\Exceptions\Exception cannot_xyz where xyz is the permission
  */
-function isAllowedTo($permission, $boards = null)
+function isAllowedTo ($permission, $boards = null)
 {
 	global $txt;
 
@@ -1294,7 +1294,7 @@ 
  * @return array
  * @throws \ElkArte\Exceptions\Exception
  */
-function boardsAllowedTo($permissions, $check_access = true, $simple = true)
+function boardsAllowedTo ($permissions, $check_access = true, $simple = true)
 {
 	$db = database();
 
@@ -1345,7 +1345,7 @@ 
 			'permissions' => $permissions,
 		)
 	)->fetch_callback(
-		function ($row) use ($simple, &$deny_boards, &$boards) {
+		function($row) use ($simple, &$deny_boards, &$boards) {
 			if ($simple)
 			{
 				if (empty($row['add_deny']))
@@ -1411,7 +1411,7 @@ 
  *
  * @return string (yes, yes_permission_override, no_through_forum, no)
  */
-function showEmailAddress($userProfile_hideEmail, $userProfile_id)
+function showEmailAddress ($userProfile_hideEmail, $userProfile_id)
 {
 	// Should this user's email address be shown?
 	// If you're guest: no.
@@ -1459,7 +1459,7 @@ 
  * @return bool|int|mixed
  * @throws \ElkArte\Exceptions\Exception
  */
-function spamProtection($error_type, $fatal = true)
+function spamProtection ($error_type, $fatal = true)
 {
 	global $modSettings;
 
@@ -1534,7 +1534,7 @@ 
  *
  * @return string[]|string|bool on success error string if anything fails
  */
-function secureDirectory($path, $allow_localhost = false, $files = '*')
+function secureDirectory ($path, $allow_localhost = false, $files = '*')
 {
 	if (empty($path))
 	{
@@ -1550,7 +1550,7 @@ 
 
 	// How deep is this from our boarddir
 	$tree = explode(DIRECTORY_SEPARATOR, $path);
-	$root = explode(DIRECTORY_SEPARATOR,BOARDDIR);
+	$root = explode(DIRECTORY_SEPARATOR, BOARDDIR);
 	$count = max(count($tree) - count($root), 0);
 
 	$errors = array();
@@ -1649,7 +1649,7 @@ 
  *
  * @return string A SQL condition
  */
-function constructBanQueryIP($fullip)
+function constructBanQueryIP ($fullip)
 {
 	// First attempt a IPv6 address.
 	if (isValidIPv6($fullip))
@@ -1696,7 +1696,7 @@ 
  *
  * @return bool true if bad, false otherwise
  */
-function runBadBehavior()
+function runBadBehavior ()
 {
 	global $modSettings;
 
@@ -1757,7 +1757,7 @@ 
  *
  * @throws \ElkArte\Exceptions\Exception no_access
  */
-function validatePasswordFlood($id_member, $password_flood_value = false, $was_correct = false)
+function validatePasswordFlood ($id_member, $password_flood_value = false, $was_correct = false)
 {
 	global $cookiename;
 
@@ -1818,7 +1818,7 @@ 
  *
  * @param string|null $override the frame option, defaults to deny.
  */
-function frameOptionsHeader($override = null)
+function frameOptionsHeader ($override = null)
 {
 	global $modSettings;
 
@@ -1857,7 +1857,7 @@ 
  *
  * @param bool|null $override
  */
-function securityOptionsHeader($override = null)
+function securityOptionsHeader ($override = null)
 {
 	if ($override !== true)
 	{
@@ -1870,7 +1870,7 @@ 
 /**
  * Stop some browsers pre fetching activity to reduce server load
  */
-function stop_prefetching()
+function stop_prefetching ()
 {
 	if ((isset($_SERVER['HTTP_PURPOSE']) && $_SERVER['HTTP_PURPOSE'] === 'prefetch')
 		|| (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] === 'prefetch'))
@@ -1889,7 +1889,7 @@ 
  *
  * @return bool
  */
-function isAdminSessionActive()
+function isAdminSessionActive ()
 {
 	global $modSettings;
 
@@ -1907,7 +1907,7 @@ 
  *
  * @return bool
  */
-function checkSecurityFiles()
+function checkSecurityFiles ()
 {
 	global $txt, $context;
 
@@ -1943,7 +1943,7 @@ 
  * @param bool $match_board - If true tries to match board|topic in the URL as well
  * @return bool
  */
-function validLoginUrl($url, $match_board = false)
+function validLoginUrl ($url, $match_board = false)
 {
 	if (empty($url))
 	{

sources/database/Database.subs.php

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
  *
  * @return \ElkArte\Database\QueryInterface
  */
-function elk_db_initiate($db_server, $db_name, $db_user, $db_passwd, $db_prefix, $db_options = array(), $db_type = 'mysql')
+function elk_db_initiate ($db_server, $db_name, $db_user, $db_passwd, $db_prefix, $db_options = array(), $db_type = 'mysql')
 {
 	return database(false);
 }
@@ -41,7 +41,7 @@ 
  * @return \ElkArte\Database\QueryInterface
  * @throws \Exception
  */
-function database($fatal = true, $force = false)
+function database ($fatal = true, $force = false)
 {
 	static $db = null;
 
@@ -90,7 +90,7 @@ 
  *
  * @return \ElkArte\Database\AbstractTable
  */
-function db_table($db = null, $fatal = false)
+function db_table ($db = null, $fatal = false)
 {
 	global $db_prefix, $db_type;
 	static $db_table = null;
@@ -130,7 +130,7 @@ 
  *
  * @return \ElkArte\Database\AbstractSearch
  */
-function db_search()
+function db_search ()
 {
 	global $db_type;
 	static $db_search = null;

sources/Session.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 /**
  * Attempt to start the session, unless it already has been.
  */
-function loadSession()
+function loadSession ()
 {
 	global $modSettings, $boardurl, $context;
 

sources/Logging.php

Spacing +5 added lines, -5 removed lines

@@ -23,7 +23,7 @@ 
  *
  * @param bool $force = false
  */
-function writeLog($force = false)
+function writeLog ($force = false)
 {
 	global $context, $modSettings, $settings, $topic, $board;
 
@@ -152,7 +152,7 @@ 
  * - Attempts to use the backup file first, to store the last database error
  * - only updates db_last_error.txt if the first was successful.
  */
-function logLastDatabaseError()
+function logLastDatabaseError ()
 {
 	// Make a note of the last modified time in case someone does this before us
 	$last_db_error_change = @filemtime(BOARDDIR . '/db_last_error.txt');
@@ -199,7 +199,7 @@ 
  *
  * @return bool|array
  */
-function trackStats($stats = array())
+function trackStats ($stats = array())
 {
 	global $modSettings;
 	static $cache_stats = array();
@@ -266,7 +266,7 @@ 
  * @example logAction('remove', array('starter' => $id_member_started));
  *
  */
-function logAction($action, $extra = array(), $log_type = 'moderate')
+function logAction ($action, $extra = array(), $log_type = 'moderate')
 {
 	// Set up the array and pass through to logActions
 	return logActions(array(
@@ -295,7 +295,7 @@ 
  *
  * @return int the last logged ID
  */
-function logActions($logs)
+function logActions ($logs)
 {
 	global $modSettings;
 

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);
 	}
 }
 

Spacing +39 added lines, -39 removed lines

@@ -20,7 +20,7 @@ 
  * @return int
  * @package Maintenance
  */
-function countMessages()
+function countMessages ()
 {
 	$db = database();
 
@@ -41,7 +41,7 @@ 
  *
  * @package Maintenance
  */
-function flushLogTables()
+function flushLogTables ()
 {
 	$db = database();
 
@@ -77,7 +77,7 @@ 
  * @return array
  * @package Maintenance
  */
-function getMessageTableColumns()
+function getMessageTableColumns ()
 {
 	$table = db_table();
 
@@ -90,7 +90,7 @@ 
  *
  * @package Maintenance
  */
-function fetchBodyType()
+function fetchBodyType ()
 {
 	$table = db_table();
 
@@ -112,7 +112,7 @@ 
  * @param string $type
  * @package Maintenance
  */
-function resizeMessageTableBody($type)
+function resizeMessageTableBody ($type)
 {
 	$table = db_table();
 	$table->change_column('{db_prefix}messages', 'body', array('type' => $type));
@@ -128,7 +128,7 @@ 
  * @package Maintenance
  *
  */
-function detectExceedingMessages($start, $increment)
+function detectExceedingMessages ($start, $increment)
 {
 	$db = database();
 
@@ -143,7 +143,7 @@ 
 			'increment' => $increment - 1,
 		)
 	)->fetch_callback(
-		function ($row) {
+		function($row) {
 			return $row['id_msg'];
 		}
 	);
@@ -159,7 +159,7 @@ 
  * @return array
  * @package Maintenance
  */
-function getExceedingMessages($msg)
+function getExceedingMessages ($msg)
 {
 	global $scripturl;
 
@@ -174,7 +174,7 @@ 
 			'messages' => $msg,
 		)
 	)->fetch_callback(
-		function ($row) use ($scripturl) {
+		function($row) use ($scripturl) {
 			return '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
 		}
 	);
@@ -188,7 +188,7 @@ 
  * @return array
  * @package Maintenance
  */
-function getElkTables()
+function getElkTables ()
 {
 	global $db_prefix;
 
@@ -215,7 +215,7 @@ 
  * @return int
  * @package Maintenance
  */
-function getMaxTopicID()
+function getMaxTopicID ()
 {
 	$db = database();
 
@@ -238,7 +238,7 @@ 
  * @param int $increment
  * @package Maintenance
  */
-function recountApprovedMessages($start, $increment)
+function recountApprovedMessages ($start, $increment)
 {
 	$db = database();
 
@@ -259,7 +259,7 @@ 
 			'max_id' => $start + $increment,
 		)
 	)->fetch_callback(
-		function ($row) {
+		function($row) {
 			setTopicAttribute($row['id_topic'], array('num_replies' => $row['real_num_replies']));
 		}
 	);
@@ -272,7 +272,7 @@ 
  * @param int $increment
  * @package Maintenance
  */
-function recountUnapprovedMessages($start, $increment)
+function recountUnapprovedMessages ($start, $increment)
 {
 	$db = database();
 
@@ -293,7 +293,7 @@ 
 			'max_id' => $start + $increment,
 		)
 	)->fetch_callback(
-		function ($row) {
+		function($row) {
 			setTopicAttribute($row['id_topic'], array('unapproved_posts' => $row['real_unapproved_posts']));
 		}
 	);
@@ -311,7 +311,7 @@ 
  * @package Maintenance
  *
  */
-function resetBoardsCounter($column)
+function resetBoardsCounter ($column)
 {
 	$db = database();
 
@@ -342,7 +342,7 @@ 
  * @param int $increment
  * @package Maintenance
  */
-function updateBoardsCounter($type, $start, $increment)
+function updateBoardsCounter ($type, $start, $increment)
 {
 	$db = database();
 
@@ -363,7 +363,7 @@ 
 					'is_approved' => 1,
 				)
 			)->fetch_callback(
-				function ($row) use ($db) {
+				function($row) use ($db) {
 					$db->query('', '
 					UPDATE {db_prefix}boards
 					SET 
@@ -393,7 +393,7 @@ 
 					'id_topic_max' => $start + $increment,
 				)
 			)->fetch_callback(
-				function ($row) use ($db) {
+				function($row) use ($db) {
 					$db->query('', '
 					UPDATE {db_prefix}boards
 					SET 
@@ -423,7 +423,7 @@ 
 					'is_approved' => 0,
 				)
 			)->fetch_callback(
-				function ($row) use ($db) {
+				function($row) use ($db) {
 					$db->query('', '
 					UPDATE {db_prefix}boards
 					SET unapproved_posts = unapproved_posts + {int:unapproved_posts}
@@ -452,7 +452,7 @@ 
 					'id_topic_max' => $start + $increment,
 				)
 			)->fetch_callback(
-				function ($row) use ($db) {
+				function($row) use ($db) {
 					$db->query('', '
 					UPDATE {db_prefix}boards
 					SET unapproved_topics = unapproved_topics + {int:real_unapproved_topics}
@@ -476,7 +476,7 @@ 
  *
  * @package Maintenance
  */
-function updatePersonalMessagesCounter()
+function updatePersonalMessagesCounter ()
 {
 	$db = database();
 
@@ -494,7 +494,7 @@ 
 			'is_not_deleted' => 0,
 		)
 	)->fetch_callback(
-		function ($row) {
+		function($row) {
 			updateMemberData($row['id_member'], array('personal_messages' => $row['real_num']));
 		}
 	);
@@ -512,7 +512,7 @@ 
 			'is_not_read' => 0,
 		)
 	)->fetch_callback(
-		function ($row) {
+		function($row) {
 			updateMemberData($row['id_member'], array('unread_messages' => $row['real_num']));
 		}
 	);
@@ -525,7 +525,7 @@ 
  * @param int $increment
  * @package Maintenance
  */
-function updateMessagesBoardID($start, $increment)
+function updateMessagesBoardID ($start, $increment)
 {
 	$db = database();
 
@@ -542,7 +542,7 @@ 
 			'id_msg_max' => $start + $increment,
 		)
 	)->fetch_callback(
-		function ($row) use (&$boards) {
+		function($row) use (&$boards) {
 			$boards[$row['id_board']][] = $row['id_msg'];
 		}
 	);
@@ -566,7 +566,7 @@ 
  *
  * @package Maintenance
  */
-function updateBoardsLastMessage()
+function updateBoardsLastMessage ()
 {
 	$db = database();
 
@@ -582,7 +582,7 @@ 
 			'is_approved' => 1,
 		)
 	)->fetch_callback(
-		function ($row) use (&$realBoardCounts) {
+		function($row) use (&$realBoardCounts) {
 			$realBoardCounts[$row['id_board']] = $row['local_last_msg'];
 		}
 	);
@@ -594,7 +594,7 @@ 
 		FROM {db_prefix}boards',
 		array()
 	)->fetch_callback(
-		function ($row) use (&$resort_me, $realBoardCounts) {
+		function($row) use (&$resort_me, $realBoardCounts) {
 			$row['local_last_msg'] = $realBoardCounts[$row['id_board']] ?? 0;
 			$resort_me[$row['child_level']][] = $row;
 		}
@@ -651,7 +651,7 @@ 
  * @return int
  * @package Maintenance
  */
-function countTopicsFromBoard($id_board)
+function countTopicsFromBoard ($id_board)
 {
 	$db = database();
 
@@ -678,7 +678,7 @@ 
  * @return int[]
  * @package Maintenance
  */
-function getTopicsToMove($id_board)
+function getTopicsToMove ($id_board)
 {
 	$db = database();
 
@@ -693,7 +693,7 @@ 
 			'id_board' => $id_board,
 		)
 	)->fetch_callback(
-		function ($row) {
+		function($row) {
 			return $row['id_topic'];
 		}
 	);
@@ -705,7 +705,7 @@ 
  * @return int
  * @package Maintenance
  */
-function countContributors()
+function countContributors ()
 {
 	$db = database();
 
@@ -734,7 +734,7 @@ 
  * @return int
  * @package Maintenance
  */
-function updateMembersPostCount($start, $increment)
+function updateMembersPostCount ($start, $increment)
 {
 	global $modSettings;
 
@@ -774,7 +774,7 @@ 
  *
  * @package Maintenance
  */
-function updateZeroPostMembers()
+function updateZeroPostMembers ()
 {
 	global $modSettings;
 
@@ -804,7 +804,7 @@ 
 			'recycle' => $modSettings['recycle_board']
 		)
 	)->fetch_callback(
-		function ($row) {
+		function($row) {
 			// Set the post count to zero for any delinquents we may have found
 			return $row['id_member'];
 		}
@@ -826,7 +826,7 @@ 
  * @return array
  * @package Maintenance
  */
-function purgeMembers($type, $groups, $time_limit)
+function purgeMembers ($type, $groups, $time_limit)
 {
 	$db = database();
 
@@ -850,7 +850,7 @@ 
 		FROM {db_prefix}membergroups',
 		array()
 	)->fetch_callback(
-		function ($row) use (&$where, &$where_vars, $groups) {
+		function($row) use (&$where, &$where_vars, $groups) {
 			// Avoid this one?
 			if (!in_array($row['id_group'], $groups))
 			{
@@ -886,7 +886,7 @@ 
 		WHERE ' . $where,
 		$where_vars
 	)->fetch_callback(
-		function ($row) use (&$members, $groups) {
+		function($row) use (&$members, $groups) {
 			if (!$row['is_mod'] || !in_array(3, $groups))
 			{
 				$members[] = $row['id_member'];

sources/subs/Charset.subs.php

Spacing +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
  * @param string $string
  * @return string
  */
-function utf8_strtolower($string)
+function utf8_strtolower ($string)
 {
 	static $case_folding = array(
 		'A' => 'a', 'B' => 'b', 'C' => 'c', 'D' => 'd',
@@ -289,7 +289,7 @@ 
  * @param string $string
  * @return string
  */
-function utf8_strtoupper($string)
+function utf8_strtoupper ($string)
 {
 	static $case_folding = array(
 		'a' => 'A', 'b' => 'B', 'c' => 'C', 'd' => 'D',
@@ -553,7 +553,7 @@ 
 /**
  * Fixes corrupted serialized strings after a character set conversion.
  */
-function fix_serialized_columns()
+function fix_serialized_columns ()
 {
 	$db = database();