SimpleMachines / SMF2.1

Sources/tasks/MsgReport-Notify.php

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 class MsgReport_Notify_Background extends SMF_BackgroundTask
 {
 	/**
-     * This executes the task - loads up the information, puts the email in the queue and inserts alerts as needed.
+	 * This executes the task - loads up the information, puts the email in the queue and inserts alerts as needed.
 	 * @return bool Always returns true.
 	 */
 	public function execute()

Sources/tasks/UpdateTldRegex.php

Indentation +4 added lines, -4 removed lines

@@ -18,10 +18,10 @@
  */
 class Update_TLD_Regex extends SMF_BackgroundTask
 {
-    /**
-     * This executes the task. It just calls set_tld_regex() in Subs.php
-     * @return bool Always returns true
-     */
+	/**
+	 * This executes the task. It just calls set_tld_regex() in Subs.php
+	 * @return bool Always returns true
+	 */
 	public function execute()
  	{
 		global $sourcedir;

Sources/tasks/MemberReportReply-Notify.php

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 class MemberReportReply_Notify_Background extends SMF_BackgroundTask
 {
 	/**
-     * This executes the task - loads up the information, puts the email in the queue and inserts alerts as needed.
+	 * This executes the task - loads up the information, puts the email in the queue and inserts alerts as needed.
 	 * @return bool Always returns true.
 	 */
 	public function execute()

Sources/tasks/ApproveReply-Notify.php

Indentation +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 class ApproveReply_Notify_Background extends SMF_BackgroundTask
 {
 	/**
-     * This executes the task - loads up the information, puts the email in the queue and inserts alerts.
+	 * This executes the task - loads up the information, puts the email in the queue and inserts alerts.
 	 * @return bool Always returns true.
 	 */
 	public function execute()

Sources/tasks/Likes-Notify.php

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 class Likes_Notify_Background extends SMF_BackgroundTask
 {
 	/**
-     * This executes the task - loads up the information, puts the email in the queue and inserts alerts as needed.
+	 * This executes the task - loads up the information, puts the email in the queue and inserts alerts as needed.
 	 * @return bool Always returns true
 	 */
 	public function execute()

Sources/tasks/GroupReq-Notify.php

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 class GroupReq_Notify_Background extends SMF_BackgroundTask
 {
 	/**
-     * This executes the task - loads up the information, puts the email in the queue and inserts any alerts as needed.
+	 * This executes the task - loads up the information, puts the email in the queue and inserts any alerts as needed.
 	 * @return bool Always returns true.
 	 */
 	public function execute()

Sources/ManageBans.php

Indentation +3 added lines, -3 removed lines

@@ -784,7 +784,7 @@ 
 		)
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
-	    $error_ips[] = inet_dtop($row['ip']);
+		$error_ips[] = inet_dtop($row['ip']);
 	$smcFunc['db_free_result']($request);
 
 	return $error_ips;
@@ -2168,9 +2168,9 @@ 
 
 	if ($low == '255.255.255.255') return 'unknown';
 	if ($low == $high)
-	    return $low;
+		return $low;
 	else
-	    return $low . '-' . $high;
+		return $low . '-' . $high;
 }
 
 /**

Sources/Who.php

Indentation +1 added lines, -1 removed lines

@@ -673,7 +673,7 @@
 						'Nikola "Dzonny" Novaković',
 						// Localizers
 						'Dr. Deejay',
-                        			'd3vcho',
+									'd3vcho',
 						// Former Localizers
 						'Relyana',
 					),

Sources/minify/path-converter/src/Converter.php

Indentation +169 added lines, -169 removed lines

@@ -18,178 +18,178 @@
  */
 class Converter
 {
-    /**
-     * @var string
-     */
-    protected $from;
-
-    /**
-     * @var string
-     */
-    protected $to;
-
-    /**
-     * @param string $from The original base path (directory, not file!)
-     * @param string $to   The new base path (directory, not file!)
-     */
-    public function __construct($from, $to)
-    {
-        $shared = $this->shared($from, $to);
-        if ($shared === '') {
-            // when both paths have nothing in common, one of them is probably
-            // absolute while the other is relative
-            $cwd = getcwd();
-            $from = strpos($from, $cwd) === 0 ? $from : $cwd.'/'.$from;
-            $to = strpos($to, $cwd) === 0 ? $to : $cwd.'/'.$to;
-
-            // or traveling the tree via `..`
-            // attempt to resolve path, or assume it's fine if it doesn't exist
-            $from = realpath($from) ?: $from;
-            $to = realpath($to) ?: $to;
-        }
-
-        $from = $this->dirname($from);
-        $to = $this->dirname($to);
-
-        $from = $this->normalize($from);
-        $to = $this->normalize($to);
-
-        $this->from = $from;
-        $this->to = $to;
-    }
-
-    /**
-     * Normalize path.
-     *
-     * @param string $path
-     *
-     * @return string
-     */
-    protected function normalize($path)
-    {
-        // deal with different operating systems' directory structure
-        $path = rtrim(str_replace(DIRECTORY_SEPARATOR, '/', $path), '/');
-
-        /*
+	/**
+	 * @var string
+	 */
+	protected $from;
+
+	/**
+	 * @var string
+	 */
+	protected $to;
+
+	/**
+	 * @param string $from The original base path (directory, not file!)
+	 * @param string $to   The new base path (directory, not file!)
+	 */
+	public function __construct($from, $to)
+	{
+		$shared = $this->shared($from, $to);
+		if ($shared === '') {
+			// when both paths have nothing in common, one of them is probably
+			// absolute while the other is relative
+			$cwd = getcwd();
+			$from = strpos($from, $cwd) === 0 ? $from : $cwd.'/'.$from;
+			$to = strpos($to, $cwd) === 0 ? $to : $cwd.'/'.$to;
+
+			// or traveling the tree via `..`
+			// attempt to resolve path, or assume it's fine if it doesn't exist
+			$from = realpath($from) ?: $from;
+			$to = realpath($to) ?: $to;
+		}
+
+		$from = $this->dirname($from);
+		$to = $this->dirname($to);
+
+		$from = $this->normalize($from);
+		$to = $this->normalize($to);
+
+		$this->from = $from;
+		$this->to = $to;
+	}
+
+	/**
+	 * Normalize path.
+	 *
+	 * @param string $path
+	 *
+	 * @return string
+	 */
+	protected function normalize($path)
+	{
+		// deal with different operating systems' directory structure
+		$path = rtrim(str_replace(DIRECTORY_SEPARATOR, '/', $path), '/');
+
+		/*
          * Example:
          *     /home/forkcms/frontend/cache/compiled_templates/../../core/layout/css/../images/img.gif
          * to
          *     /home/forkcms/frontend/core/layout/images/img.gif
          */
-        do {
-            $path = preg_replace('/[^\/]+(?<!\.\.)\/\.\.\//', '', $path, -1, $count);
-        } while ($count);
-
-        return $path;
-    }
-
-    /**
-     * Figure out the shared path of 2 locations.
-     *
-     * Example:
-     *     /home/forkcms/frontend/core/layout/images/img.gif
-     * and
-     *     /home/forkcms/frontend/cache/minified_css
-     * share
-     *     /home/forkcms/frontend
-     *
-     * @param string $path1
-     * @param string $path2
-     *
-     * @return string
-     */
-    protected function shared($path1, $path2)
-    {
-        // $path could theoretically be empty (e.g. no path is given), in which
-        // case it shouldn't expand to array(''), which would compare to one's
-        // root /
-        $path1 = $path1 ? explode('/', $path1) : array();
-        $path2 = $path2 ? explode('/', $path2) : array();
-
-        $shared = array();
-
-        // compare paths & strip identical ancestors
-        foreach ($path1 as $i => $chunk) {
-            if (isset($path2[$i]) && $path1[$i] == $path2[$i]) {
-                $shared[] = $chunk;
-            } else {
-                break;
-            }
-        }
-
-        return implode('/', $shared);
-    }
-
-    /**
-     * Convert paths relative from 1 file to another.
-     *
-     * E.g.
-     *     ../images/img.gif relative to /home/forkcms/frontend/core/layout/css
-     * should become:
-     *     ../../core/layout/images/img.gif relative to
-     *     /home/forkcms/frontend/cache/minified_css
-     *
-     * @param string $path The relative path that needs to be converted.
-     *
-     * @return string The new relative path.
-     */
-    public function convert($path)
-    {
-        // quit early if conversion makes no sense
-        if ($this->from === $this->to) {
-            return $path;
-        }
-
-        $path = $this->normalize($path);
-        // if we're not dealing with a relative path, just return absolute
-        if (strpos($path, '/') === 0) {
-            return $path;
-        }
-
-        // normalize paths
-        $path = $this->normalize($this->from.'/'.$path);
-
-        // strip shared ancestor paths
-        $shared = $this->shared($path, $this->to);
-        $path = mb_substr($path, mb_strlen($shared));
-        $to = mb_substr($this->to, mb_strlen($shared));
-
-        // add .. for every directory that needs to be traversed to new path
-        $to = str_repeat('../', mb_substr_count($to, '/'));
-
-        return $to.ltrim($path, '/');
-    }
-
-    /**
-     * Attempt to get the directory name from a path.
-     *
-     * @param string $path
-     *
-     * @return string
-     */
-    public function dirname($path)
-    {
-        if (is_file($path)) {
-            return dirname($path);
-        }
-
-        if (is_dir($path)) {
-            return rtrim($path, '/');
-        }
-
-        // no known file/dir, start making assumptions
-
-        // ends in / = dir
-        if (mb_substr($path, -1) === '/') {
-            return rtrim($path, '/');
-        }
-
-        // has a dot in the name, likely a file
-        if (preg_match('/.*\..*$/', basename($path)) !== 0) {
-            return dirname($path);
-        }
-
-        // you're on your own here!
-        return $path;
-    }
+		do {
+			$path = preg_replace('/[^\/]+(?<!\.\.)\/\.\.\//', '', $path, -1, $count);
+		} while ($count);
+
+		return $path;
+	}
+
+	/**
+	 * Figure out the shared path of 2 locations.
+	 *
+	 * Example:
+	 *     /home/forkcms/frontend/core/layout/images/img.gif
+	 * and
+	 *     /home/forkcms/frontend/cache/minified_css
+	 * share
+	 *     /home/forkcms/frontend
+	 *
+	 * @param string $path1
+	 * @param string $path2
+	 *
+	 * @return string
+	 */
+	protected function shared($path1, $path2)
+	{
+		// $path could theoretically be empty (e.g. no path is given), in which
+		// case it shouldn't expand to array(''), which would compare to one's
+		// root /
+		$path1 = $path1 ? explode('/', $path1) : array();
+		$path2 = $path2 ? explode('/', $path2) : array();
+
+		$shared = array();
+
+		// compare paths & strip identical ancestors
+		foreach ($path1 as $i => $chunk) {
+			if (isset($path2[$i]) && $path1[$i] == $path2[$i]) {
+				$shared[] = $chunk;
+			} else {
+				break;
+			}
+		}
+
+		return implode('/', $shared);
+	}
+
+	/**
+	 * Convert paths relative from 1 file to another.
+	 *
+	 * E.g.
+	 *     ../images/img.gif relative to /home/forkcms/frontend/core/layout/css
+	 * should become:
+	 *     ../../core/layout/images/img.gif relative to
+	 *     /home/forkcms/frontend/cache/minified_css
+	 *
+	 * @param string $path The relative path that needs to be converted.
+	 *
+	 * @return string The new relative path.
+	 */
+	public function convert($path)
+	{
+		// quit early if conversion makes no sense
+		if ($this->from === $this->to) {
+			return $path;
+		}
+
+		$path = $this->normalize($path);
+		// if we're not dealing with a relative path, just return absolute
+		if (strpos($path, '/') === 0) {
+			return $path;
+		}
+
+		// normalize paths
+		$path = $this->normalize($this->from.'/'.$path);
+
+		// strip shared ancestor paths
+		$shared = $this->shared($path, $this->to);
+		$path = mb_substr($path, mb_strlen($shared));
+		$to = mb_substr($this->to, mb_strlen($shared));
+
+		// add .. for every directory that needs to be traversed to new path
+		$to = str_repeat('../', mb_substr_count($to, '/'));
+
+		return $to.ltrim($path, '/');
+	}
+
+	/**
+	 * Attempt to get the directory name from a path.
+	 *
+	 * @param string $path
+	 *
+	 * @return string
+	 */
+	public function dirname($path)
+	{
+		if (is_file($path)) {
+			return dirname($path);
+		}
+
+		if (is_dir($path)) {
+			return rtrim($path, '/');
+		}
+
+		// no known file/dir, start making assumptions
+
+		// ends in / = dir
+		if (mb_substr($path, -1) === '/') {
+			return rtrim($path, '/');
+		}
+
+		// has a dot in the name, likely a file
+		if (preg_match('/.*\..*$/', basename($path)) !== 0) {
+			return dirname($path);
+		}
+
+		// you're on your own here!
+		return $path;
+	}
 }