elkarte / Elkarte

sources/ext/cssmin/tubalmartin/Command.php

Indentation +166 added lines, -166 removed lines

@@ -4,188 +4,188 @@ 
 
 class Command
 {
-    const SUCCESS_EXIT = 0;
-    const FAILURE_EXIT = 1;
+	const SUCCESS_EXIT = 0;
+	const FAILURE_EXIT = 1;
     
-    protected $stats = array();
+	protected $stats = array();
     
-    public static function main()
-    {
-        $command = new self;
-        $command->run();
-    }
-
-    public function run()
-    {
-        $opts = getopt(
-            'hi:o:',
-            array(
-                'help',
-                'input:',
-                'output:',
-                'dry-run',
-                'keep-sourcemap',
-                'keep-sourcemap-comment',
-                'linebreak-position:',
-                'memory-limit:',
-                'pcre-backtrack-limit:',
-                'pcre-recursion-limit:',
-                'remove-important-comments'
-            )
-        );
-
-        $help = $this->getOpt(array('h', 'help'), $opts);
-        $input = $this->getOpt(array('i', 'input'), $opts);
-        $output = $this->getOpt(array('o', 'output'), $opts);
-        $dryrun = $this->getOpt('dry-run', $opts);
-        $keepSourceMapComment = $this->getOpt(array('keep-sourcemap', 'keep-sourcemap-comment'), $opts);
-        $linebreakPosition = $this->getOpt('linebreak-position', $opts);
-        $memoryLimit = $this->getOpt('memory-limit', $opts);
-        $backtrackLimit = $this->getOpt('pcre-backtrack-limit', $opts);
-        $recursionLimit = $this->getOpt('pcre-recursion-limit', $opts);
-        $removeImportantComments = $this->getOpt('remove-important-comments', $opts);
-
-        if (!is_null($help)) {
-            $this->showHelp();
-            die(self::SUCCESS_EXIT);
-        }
-
-        if (is_null($input)) {
-            fwrite(STDERR, '-i <file> argument is missing' . PHP_EOL);
-            $this->showHelp();
-            die(self::FAILURE_EXIT);
-        }
-
-        if (!is_readable($input)) {
-            fwrite(STDERR, 'Input file is not readable' . PHP_EOL);
-            die(self::FAILURE_EXIT);
-        }
-
-        $css = file_get_contents($input);
-
-        if ($css === false) {
-            fwrite(STDERR, 'Input CSS code could not be retrieved from input file' . PHP_EOL);
-            die(self::FAILURE_EXIT);
-        }
+	public static function main()
+	{
+		$command = new self;
+		$command->run();
+	}
+
+	public function run()
+	{
+		$opts = getopt(
+			'hi:o:',
+			array(
+				'help',
+				'input:',
+				'output:',
+				'dry-run',
+				'keep-sourcemap',
+				'keep-sourcemap-comment',
+				'linebreak-position:',
+				'memory-limit:',
+				'pcre-backtrack-limit:',
+				'pcre-recursion-limit:',
+				'remove-important-comments'
+			)
+		);
+
+		$help = $this->getOpt(array('h', 'help'), $opts);
+		$input = $this->getOpt(array('i', 'input'), $opts);
+		$output = $this->getOpt(array('o', 'output'), $opts);
+		$dryrun = $this->getOpt('dry-run', $opts);
+		$keepSourceMapComment = $this->getOpt(array('keep-sourcemap', 'keep-sourcemap-comment'), $opts);
+		$linebreakPosition = $this->getOpt('linebreak-position', $opts);
+		$memoryLimit = $this->getOpt('memory-limit', $opts);
+		$backtrackLimit = $this->getOpt('pcre-backtrack-limit', $opts);
+		$recursionLimit = $this->getOpt('pcre-recursion-limit', $opts);
+		$removeImportantComments = $this->getOpt('remove-important-comments', $opts);
+
+		if (!is_null($help)) {
+			$this->showHelp();
+			die(self::SUCCESS_EXIT);
+		}
+
+		if (is_null($input)) {
+			fwrite(STDERR, '-i <file> argument is missing' . PHP_EOL);
+			$this->showHelp();
+			die(self::FAILURE_EXIT);
+		}
+
+		if (!is_readable($input)) {
+			fwrite(STDERR, 'Input file is not readable' . PHP_EOL);
+			die(self::FAILURE_EXIT);
+		}
+
+		$css = file_get_contents($input);
+
+		if ($css === false) {
+			fwrite(STDERR, 'Input CSS code could not be retrieved from input file' . PHP_EOL);
+			die(self::FAILURE_EXIT);
+		}
         
-        $this->setStat('original-size', strlen($css));
+		$this->setStat('original-size', strlen($css));
         
-        $cssmin = new Minifier;
+		$cssmin = new Minifier;
 
-        if (!is_null($keepSourceMapComment)) {
-            $cssmin->keepSourceMapComment();
-        }
+		if (!is_null($keepSourceMapComment)) {
+			$cssmin->keepSourceMapComment();
+		}
 
-        if (!is_null($removeImportantComments)) {
-            $cssmin->removeImportantComments();
-        }
+		if (!is_null($removeImportantComments)) {
+			$cssmin->removeImportantComments();
+		}
 
-        if (!is_null($linebreakPosition)) {
-            $cssmin->setLineBreakPosition($linebreakPosition);
-        }
+		if (!is_null($linebreakPosition)) {
+			$cssmin->setLineBreakPosition($linebreakPosition);
+		}
         
-        if (!is_null($memoryLimit)) {
-            $cssmin->setMemoryLimit($memoryLimit);
-        }
+		if (!is_null($memoryLimit)) {
+			$cssmin->setMemoryLimit($memoryLimit);
+		}
 
-        if (!is_null($backtrackLimit)) {
-            $cssmin->setPcreBacktrackLimit($backtrackLimit);
-        }
+		if (!is_null($backtrackLimit)) {
+			$cssmin->setPcreBacktrackLimit($backtrackLimit);
+		}
 
-        if (!is_null($recursionLimit)) {
-            $cssmin->setPcreRecursionLimit($recursionLimit);
-        }
+		if (!is_null($recursionLimit)) {
+			$cssmin->setPcreRecursionLimit($recursionLimit);
+		}
         
-        $this->setStat('compression-time-start', microtime(true));
+		$this->setStat('compression-time-start', microtime(true));
         
-        $css = $cssmin->run($css);
+		$css = $cssmin->run($css);
 
-        $this->setStat('compression-time-end', microtime(true));
-        $this->setStat('peak-memory-usage', memory_get_peak_usage(true));
-        $this->setStat('compressed-size', strlen($css));
+		$this->setStat('compression-time-end', microtime(true));
+		$this->setStat('peak-memory-usage', memory_get_peak_usage(true));
+		$this->setStat('compressed-size', strlen($css));
         
-        if (!is_null($dryrun)) {
-            $this->showStats();
-            die(self::SUCCESS_EXIT);
-        }
-
-        if (is_null($output)) {
-            fwrite(STDOUT, $css . PHP_EOL);
-            $this->showStats();
-            die(self::SUCCESS_EXIT);
-        }
-
-        if (!is_writable(dirname($output))) {
-            fwrite(STDERR, 'Output file is not writable' . PHP_EOL);
-            die(self::FAILURE_EXIT);
-        }
-
-        if (file_put_contents($output, $css) === false) {
-            fwrite(STDERR, 'Compressed CSS code could not be saved to output file' . PHP_EOL);
-            die(self::FAILURE_EXIT);
-        }
-
-        $this->showStats();
-
-        die(self::SUCCESS_EXIT);
-    }
-
-    protected function getOpt($opts, $options)
-    {
-        $value = null;
-
-        if (is_string($opts)) {
-            $opts = array($opts);
-        }
-
-        foreach ($opts as $opt) {
-            if (array_key_exists($opt, $options)) {
-                $value = $options[$opt];
-                break;
-            }
-        }
-
-        return $value;
-    }
+		if (!is_null($dryrun)) {
+			$this->showStats();
+			die(self::SUCCESS_EXIT);
+		}
+
+		if (is_null($output)) {
+			fwrite(STDOUT, $css . PHP_EOL);
+			$this->showStats();
+			die(self::SUCCESS_EXIT);
+		}
+
+		if (!is_writable(dirname($output))) {
+			fwrite(STDERR, 'Output file is not writable' . PHP_EOL);
+			die(self::FAILURE_EXIT);
+		}
+
+		if (file_put_contents($output, $css) === false) {
+			fwrite(STDERR, 'Compressed CSS code could not be saved to output file' . PHP_EOL);
+			die(self::FAILURE_EXIT);
+		}
+
+		$this->showStats();
+
+		die(self::SUCCESS_EXIT);
+	}
+
+	protected function getOpt($opts, $options)
+	{
+		$value = null;
+
+		if (is_string($opts)) {
+			$opts = array($opts);
+		}
+
+		foreach ($opts as $opt) {
+			if (array_key_exists($opt, $options)) {
+				$value = $options[$opt];
+				break;
+			}
+		}
+
+		return $value;
+	}
     
-    protected function setStat($statName, $statValue)
-    {
-        $this->stats[$statName] = $statValue;
-    }
+	protected function setStat($statName, $statValue)
+	{
+		$this->stats[$statName] = $statValue;
+	}
     
-    protected function formatBytes($size, $precision = 2)
-    {
-        $base = log($size, 1024);
-        $suffixes = array('B', 'K', 'M', 'G', 'T');
-        return round(pow(1024, $base - floor($base)), $precision) .' '. $suffixes[floor($base)];
-    }
+	protected function formatBytes($size, $precision = 2)
+	{
+		$base = log($size, 1024);
+		$suffixes = array('B', 'K', 'M', 'G', 'T');
+		return round(pow(1024, $base - floor($base)), $precision) .' '. $suffixes[floor($base)];
+	}
     
-    protected function formatMicroSeconds($microSecs, $precision = 2)
-    {
-        // ms
-        $time = round($microSecs * 1000, $precision);
+	protected function formatMicroSeconds($microSecs, $precision = 2)
+	{
+		// ms
+		$time = round($microSecs * 1000, $precision);
         
-        if ($time >= 60 * 1000) {
-            $time = round($time / 60 * 1000, $precision) .' m'; // m
-        } elseif ($time >= 1000) {
-            $time = round($time / 1000, $precision) .' s'; // s
-        } else {
-            $time .= ' ms';
-        }
+		if ($time >= 60 * 1000) {
+			$time = round($time / 60 * 1000, $precision) .' m'; // m
+		} elseif ($time >= 1000) {
+			$time = round($time / 1000, $precision) .' s'; // s
+		} else {
+			$time .= ' ms';
+		}
         
-        return $time;
-    }
+		return $time;
+	}
     
-    protected function showStats()
-    {
-        $spaceSavings = round((1 - ($this->stats['compressed-size'] / $this->stats['original-size'])) * 100, 2);
-        $compressionRatio = round($this->stats['original-size'] / $this->stats['compressed-size'], 2);
-        $compressionTime = $this->formatMicroSeconds(
-            $this->stats['compression-time-end'] - $this->stats['compression-time-start']
-        );
-        $peakMemoryUsage = $this->formatBytes($this->stats['peak-memory-usage']);
+	protected function showStats()
+	{
+		$spaceSavings = round((1 - ($this->stats['compressed-size'] / $this->stats['original-size'])) * 100, 2);
+		$compressionRatio = round($this->stats['original-size'] / $this->stats['compressed-size'], 2);
+		$compressionTime = $this->formatMicroSeconds(
+			$this->stats['compression-time-end'] - $this->stats['compression-time-start']
+		);
+		$peakMemoryUsage = $this->formatBytes($this->stats['peak-memory-usage']);
         
-        print <<<EOT
+		print <<<EOT
         
 ------------------------------
 CSSMIN STATS        
@@ -197,11 +197,11 @@ 
 
 
 EOT;
-    }
+	}
 
-    protected function showHelp()
-    {
-        print <<<'EOT'
+	protected function showHelp()
+	{
+		print <<<'EOT'
 Usage: cssmin [options] -i <file> [-o <file>]
   
   -i|--input <file>              File containing uncompressed CSS code.
@@ -219,5 +219,5 @@ 
   --remove-important-comments    Removes !important comments from output.
 
 EOT;
-    }
+	}
 }

Braces +42 added lines, -20 removed lines

@@ -45,25 +45,29 @@ 
         $recursionLimit = $this->getOpt('pcre-recursion-limit', $opts);
         $removeImportantComments = $this->getOpt('remove-important-comments', $opts);
 
-        if (!is_null($help)) {
+        if (!is_null($help))
+        {
             $this->showHelp();
             die(self::SUCCESS_EXIT);
         }
 
-        if (is_null($input)) {
+        if (is_null($input))
+        {
             fwrite(STDERR, '-i <file> argument is missing' . PHP_EOL);
             $this->showHelp();
             die(self::FAILURE_EXIT);
         }
 
-        if (!is_readable($input)) {
+        if (!is_readable($input))
+        {
             fwrite(STDERR, 'Input file is not readable' . PHP_EOL);
             die(self::FAILURE_EXIT);
         }
 
         $css = file_get_contents($input);
 
-        if ($css === false) {
+        if ($css === false)
+        {
             fwrite(STDERR, 'Input CSS code could not be retrieved from input file' . PHP_EOL);
             die(self::FAILURE_EXIT);
         }
@@ -72,27 +76,33 @@ 
         
         $cssmin = new Minifier;
 
-        if (!is_null($keepSourceMapComment)) {
+        if (!is_null($keepSourceMapComment))
+        {
             $cssmin->keepSourceMapComment();
         }
 
-        if (!is_null($removeImportantComments)) {
+        if (!is_null($removeImportantComments))
+        {
             $cssmin->removeImportantComments();
         }
 
-        if (!is_null($linebreakPosition)) {
+        if (!is_null($linebreakPosition))
+        {
             $cssmin->setLineBreakPosition($linebreakPosition);
         }
         
-        if (!is_null($memoryLimit)) {
+        if (!is_null($memoryLimit))
+        {
             $cssmin->setMemoryLimit($memoryLimit);
         }
 
-        if (!is_null($backtrackLimit)) {
+        if (!is_null($backtrackLimit))
+        {
             $cssmin->setPcreBacktrackLimit($backtrackLimit);
         }
 
-        if (!is_null($recursionLimit)) {
+        if (!is_null($recursionLimit))
+        {
             $cssmin->setPcreRecursionLimit($recursionLimit);
         }
         
@@ -104,23 +114,27 @@ 
         $this->setStat('peak-memory-usage', memory_get_peak_usage(true));
         $this->setStat('compressed-size', strlen($css));
         
-        if (!is_null($dryrun)) {
+        if (!is_null($dryrun))
+        {
             $this->showStats();
             die(self::SUCCESS_EXIT);
         }
 
-        if (is_null($output)) {
+        if (is_null($output))
+        {
             fwrite(STDOUT, $css . PHP_EOL);
             $this->showStats();
             die(self::SUCCESS_EXIT);
         }
 
-        if (!is_writable(dirname($output))) {
+        if (!is_writable(dirname($output)))
+        {
             fwrite(STDERR, 'Output file is not writable' . PHP_EOL);
             die(self::FAILURE_EXIT);
         }
 
-        if (file_put_contents($output, $css) === false) {
+        if (file_put_contents($output, $css) === false)
+        {
             fwrite(STDERR, 'Compressed CSS code could not be saved to output file' . PHP_EOL);
             die(self::FAILURE_EXIT);
         }
@@ -134,12 +148,15 @@ 
     {
         $value = null;
 
-        if (is_string($opts)) {
+        if (is_string($opts))
+        {
             $opts = array($opts);
         }
 
-        foreach ($opts as $opt) {
-            if (array_key_exists($opt, $options)) {
+        foreach ($opts as $opt)
+        {
+            if (array_key_exists($opt, $options))
+            {
                 $value = $options[$opt];
                 break;
             }
@@ -165,11 +182,16 @@ 
         // ms
         $time = round($microSecs * 1000, $precision);
         
-        if ($time >= 60 * 1000) {
+        if ($time >= 60 * 1000)
+        {
             $time = round($time / 60 * 1000, $precision) .' m'; // m
-        } elseif ($time >= 1000) {
+        }
+        elseif ($time >= 1000)
+        {
             $time = round($time / 1000, $precision) .' s'; // s
-        } else {
+        }
+        else
+        {
             $time .= ' ms';
         }
         

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -196,7 +196,7 @@ 
 Peak memory usage:   $peakMemoryUsage
 
 
-EOT;
+eot;
     }
 
     protected function showHelp()
@@ -218,6 +218,6 @@ 
   --pcre-recursion-limit <limit> Sets the PCRE recursion limit for this script.
   --remove-important-comments    Removes !important comments from output.
 
-EOT;
+eot;
     }
 }

Spacing +3 added lines, -3 removed lines

@@ -157,7 +157,7 @@ 
     {
         $base = log($size, 1024);
         $suffixes = array('B', 'K', 'M', 'G', 'T');
-        return round(pow(1024, $base - floor($base)), $precision) .' '. $suffixes[floor($base)];
+        return round(pow(1024, $base - floor($base)), $precision) . ' ' . $suffixes[floor($base)];
     }
     
     protected function formatMicroSeconds($microSecs, $precision = 2)
@@ -166,9 +166,9 @@ 
         $time = round($microSecs * 1000, $precision);
         
         if ($time >= 60 * 1000) {
-            $time = round($time / 60 * 1000, $precision) .' m'; // m
+            $time = round($time / 60 * 1000, $precision) . ' m'; // m
         } elseif ($time >= 1000) {
-            $time = round($time / 1000, $precision) .' s'; // s
+            $time = round($time / 1000, $precision) . ' s'; // s
         } else {
             $time .= ' ms';
         }

sources/ext/cssmin/tubalmartin/Colors.php

Indentation +147 added lines, -147 removed lines

@@ -4,152 +4,152 @@
 
 class Colors
 {
-    public static function getHexToNamedMap()
-    {
-        // Hex colors longer than named counterpart
-        return array(
-            '#f0ffff' => 'azure',
-            '#f5f5dc' => 'beige',
-            '#ffe4c4' => 'bisque',
-            '#a52a2a' => 'brown',
-            '#ff7f50' => 'coral',
-            '#ffd700' => 'gold',
-            '#808080' => 'gray',
-            '#008000' => 'green',
-            '#4b0082' => 'indigo',
-            '#fffff0' => 'ivory',
-            '#f0e68c' => 'khaki',
-            '#faf0e6' => 'linen',
-            '#800000' => 'maroon',
-            '#000080' => 'navy',
-            '#fdf5e6' => 'oldlace',
-            '#808000' => 'olive',
-            '#ffa500' => 'orange',
-            '#da70d6' => 'orchid',
-            '#cd853f' => 'peru',
-            '#ffc0cb' => 'pink',
-            '#dda0dd' => 'plum',
-            '#800080' => 'purple',
-            '#f00'    => 'red',
-            '#fa8072' => 'salmon',
-            '#a0522d' => 'sienna',
-            '#c0c0c0' => 'silver',
-            '#fffafa' => 'snow',
-            '#d2b48c' => 'tan',
-            '#008080' => 'teal',
-            '#ff6347' => 'tomato',
-            '#ee82ee' => 'violet',
-            '#f5deb3' => 'wheat'
-        );
-    }
+	public static function getHexToNamedMap()
+	{
+		// Hex colors longer than named counterpart
+		return array(
+			'#f0ffff' => 'azure',
+			'#f5f5dc' => 'beige',
+			'#ffe4c4' => 'bisque',
+			'#a52a2a' => 'brown',
+			'#ff7f50' => 'coral',
+			'#ffd700' => 'gold',
+			'#808080' => 'gray',
+			'#008000' => 'green',
+			'#4b0082' => 'indigo',
+			'#fffff0' => 'ivory',
+			'#f0e68c' => 'khaki',
+			'#faf0e6' => 'linen',
+			'#800000' => 'maroon',
+			'#000080' => 'navy',
+			'#fdf5e6' => 'oldlace',
+			'#808000' => 'olive',
+			'#ffa500' => 'orange',
+			'#da70d6' => 'orchid',
+			'#cd853f' => 'peru',
+			'#ffc0cb' => 'pink',
+			'#dda0dd' => 'plum',
+			'#800080' => 'purple',
+			'#f00'    => 'red',
+			'#fa8072' => 'salmon',
+			'#a0522d' => 'sienna',
+			'#c0c0c0' => 'silver',
+			'#fffafa' => 'snow',
+			'#d2b48c' => 'tan',
+			'#008080' => 'teal',
+			'#ff6347' => 'tomato',
+			'#ee82ee' => 'violet',
+			'#f5deb3' => 'wheat'
+		);
+	}
 
-    public static function getNamedToHexMap()
-    {
-        // Named colors longer than hex counterpart
-        return array(
-            'aliceblue' => '#f0f8ff',
-            'antiquewhite' => '#faebd7',
-            'aquamarine' => '#7fffd4',
-            'black' => '#000',
-            'blanchedalmond' => '#ffebcd',
-            'blueviolet' => '#8a2be2',
-            'burlywood' => '#deb887',
-            'cadetblue' => '#5f9ea0',
-            'chartreuse' => '#7fff00',
-            'chocolate' => '#d2691e',
-            'cornflowerblue' => '#6495ed',
-            'cornsilk' => '#fff8dc',
-            'darkblue' => '#00008b',
-            'darkcyan' => '#008b8b',
-            'darkgoldenrod' => '#b8860b',
-            'darkgray' => '#a9a9a9',
-            'darkgreen' => '#006400',
-            'darkgrey' => '#a9a9a9',
-            'darkkhaki' => '#bdb76b',
-            'darkmagenta' => '#8b008b',
-            'darkolivegreen' => '#556b2f',
-            'darkorange' => '#ff8c00',
-            'darkorchid' => '#9932cc',
-            'darksalmon' => '#e9967a',
-            'darkseagreen' => '#8fbc8f',
-            'darkslateblue' => '#483d8b',
-            'darkslategray' => '#2f4f4f',
-            'darkslategrey' => '#2f4f4f',
-            'darkturquoise' => '#00ced1',
-            'darkviolet' => '#9400d3',
-            'deeppink' => '#ff1493',
-            'deepskyblue' => '#00bfff',
-            'dodgerblue' => '#1e90ff',
-            'firebrick' => '#b22222',
-            'floralwhite' => '#fffaf0',
-            'forestgreen' => '#228b22',
-            'fuchsia' => '#f0f',
-            'gainsboro' => '#dcdcdc',
-            'ghostwhite' => '#f8f8ff',
-            'goldenrod' => '#daa520',
-            'greenyellow' => '#adff2f',
-            'honeydew' => '#f0fff0',
-            'indianred' => '#cd5c5c',
-            'lavender' => '#e6e6fa',
-            'lavenderblush' => '#fff0f5',
-            'lawngreen' => '#7cfc00',
-            'lemonchiffon' => '#fffacd',
-            'lightblue' => '#add8e6',
-            'lightcoral' => '#f08080',
-            'lightcyan' => '#e0ffff',
-            'lightgoldenrodyellow' => '#fafad2',
-            'lightgray' => '#d3d3d3',
-            'lightgreen' => '#90ee90',
-            'lightgrey' => '#d3d3d3',
-            'lightpink' => '#ffb6c1',
-            'lightsalmon' => '#ffa07a',
-            'lightseagreen' => '#20b2aa',
-            'lightskyblue' => '#87cefa',
-            'lightslategray' => '#778899',
-            'lightslategrey' => '#778899',
-            'lightsteelblue' => '#b0c4de',
-            'lightyellow' => '#ffffe0',
-            'limegreen' => '#32cd32',
-            'mediumaquamarine' => '#66cdaa',
-            'mediumblue' => '#0000cd',
-            'mediumorchid' => '#ba55d3',
-            'mediumpurple' => '#9370db',
-            'mediumseagreen' => '#3cb371',
-            'mediumslateblue' => '#7b68ee',
-            'mediumspringgreen' => '#00fa9a',
-            'mediumturquoise' => '#48d1cc',
-            'mediumvioletred' => '#c71585',
-            'midnightblue' => '#191970',
-            'mintcream' => '#f5fffa',
-            'mistyrose' => '#ffe4e1',
-            'moccasin' => '#ffe4b5',
-            'navajowhite' => '#ffdead',
-            'olivedrab' => '#6b8e23',
-            'orangered' => '#ff4500',
-            'palegoldenrod' => '#eee8aa',
-            'palegreen' => '#98fb98',
-            'paleturquoise' => '#afeeee',
-            'palevioletred' => '#db7093',
-            'papayawhip' => '#ffefd5',
-            'peachpuff' => '#ffdab9',
-            'powderblue' => '#b0e0e6',
-            'rebeccapurple' => '#663399',
-            'rosybrown' => '#bc8f8f',
-            'royalblue' => '#4169e1',
-            'saddlebrown' => '#8b4513',
-            'sandybrown' => '#f4a460',
-            'seagreen' => '#2e8b57',
-            'seashell' => '#fff5ee',
-            'slateblue' => '#6a5acd',
-            'slategray' => '#708090',
-            'slategrey' => '#708090',
-            'springgreen' => '#00ff7f',
-            'steelblue' => '#4682b4',
-            'turquoise' => '#40e0d0',
-            'white' => '#fff',
-            'whitesmoke' => '#f5f5f5',
-            'yellow' => '#ff0',
-            'yellowgreen' => '#9acd32'
-        );
-    }
+	public static function getNamedToHexMap()
+	{
+		// Named colors longer than hex counterpart
+		return array(
+			'aliceblue' => '#f0f8ff',
+			'antiquewhite' => '#faebd7',
+			'aquamarine' => '#7fffd4',
+			'black' => '#000',
+			'blanchedalmond' => '#ffebcd',
+			'blueviolet' => '#8a2be2',
+			'burlywood' => '#deb887',
+			'cadetblue' => '#5f9ea0',
+			'chartreuse' => '#7fff00',
+			'chocolate' => '#d2691e',
+			'cornflowerblue' => '#6495ed',
+			'cornsilk' => '#fff8dc',
+			'darkblue' => '#00008b',
+			'darkcyan' => '#008b8b',
+			'darkgoldenrod' => '#b8860b',
+			'darkgray' => '#a9a9a9',
+			'darkgreen' => '#006400',
+			'darkgrey' => '#a9a9a9',
+			'darkkhaki' => '#bdb76b',
+			'darkmagenta' => '#8b008b',
+			'darkolivegreen' => '#556b2f',
+			'darkorange' => '#ff8c00',
+			'darkorchid' => '#9932cc',
+			'darksalmon' => '#e9967a',
+			'darkseagreen' => '#8fbc8f',
+			'darkslateblue' => '#483d8b',
+			'darkslategray' => '#2f4f4f',
+			'darkslategrey' => '#2f4f4f',
+			'darkturquoise' => '#00ced1',
+			'darkviolet' => '#9400d3',
+			'deeppink' => '#ff1493',
+			'deepskyblue' => '#00bfff',
+			'dodgerblue' => '#1e90ff',
+			'firebrick' => '#b22222',
+			'floralwhite' => '#fffaf0',
+			'forestgreen' => '#228b22',
+			'fuchsia' => '#f0f',
+			'gainsboro' => '#dcdcdc',
+			'ghostwhite' => '#f8f8ff',
+			'goldenrod' => '#daa520',
+			'greenyellow' => '#adff2f',
+			'honeydew' => '#f0fff0',
+			'indianred' => '#cd5c5c',
+			'lavender' => '#e6e6fa',
+			'lavenderblush' => '#fff0f5',
+			'lawngreen' => '#7cfc00',
+			'lemonchiffon' => '#fffacd',
+			'lightblue' => '#add8e6',
+			'lightcoral' => '#f08080',
+			'lightcyan' => '#e0ffff',
+			'lightgoldenrodyellow' => '#fafad2',
+			'lightgray' => '#d3d3d3',
+			'lightgreen' => '#90ee90',
+			'lightgrey' => '#d3d3d3',
+			'lightpink' => '#ffb6c1',
+			'lightsalmon' => '#ffa07a',
+			'lightseagreen' => '#20b2aa',
+			'lightskyblue' => '#87cefa',
+			'lightslategray' => '#778899',
+			'lightslategrey' => '#778899',
+			'lightsteelblue' => '#b0c4de',
+			'lightyellow' => '#ffffe0',
+			'limegreen' => '#32cd32',
+			'mediumaquamarine' => '#66cdaa',
+			'mediumblue' => '#0000cd',
+			'mediumorchid' => '#ba55d3',
+			'mediumpurple' => '#9370db',
+			'mediumseagreen' => '#3cb371',
+			'mediumslateblue' => '#7b68ee',
+			'mediumspringgreen' => '#00fa9a',
+			'mediumturquoise' => '#48d1cc',
+			'mediumvioletred' => '#c71585',
+			'midnightblue' => '#191970',
+			'mintcream' => '#f5fffa',
+			'mistyrose' => '#ffe4e1',
+			'moccasin' => '#ffe4b5',
+			'navajowhite' => '#ffdead',
+			'olivedrab' => '#6b8e23',
+			'orangered' => '#ff4500',
+			'palegoldenrod' => '#eee8aa',
+			'palegreen' => '#98fb98',
+			'paleturquoise' => '#afeeee',
+			'palevioletred' => '#db7093',
+			'papayawhip' => '#ffefd5',
+			'peachpuff' => '#ffdab9',
+			'powderblue' => '#b0e0e6',
+			'rebeccapurple' => '#663399',
+			'rosybrown' => '#bc8f8f',
+			'royalblue' => '#4169e1',
+			'saddlebrown' => '#8b4513',
+			'sandybrown' => '#f4a460',
+			'seagreen' => '#2e8b57',
+			'seashell' => '#fff5ee',
+			'slateblue' => '#6a5acd',
+			'slategray' => '#708090',
+			'slategrey' => '#708090',
+			'springgreen' => '#00ff7f',
+			'steelblue' => '#4682b4',
+			'turquoise' => '#40e0d0',
+			'white' => '#fff',
+			'whitesmoke' => '#f5f5f5',
+			'yellow' => '#ff0',
+			'yellowgreen' => '#9acd32'
+		);
+	}
 }

sources/ext/serialize.php

Braces +12 added lines, -5 removed lines

@@ -92,9 +92,12 @@ 
 		mb_internal_encoding('ASCII');
 	}
 
-	try {
+	try
+	{
 		$out = _safe_serialize($value);
-	} catch(Exception $e) {
+	}
+	catch(Exception $e)
+	{
 		$out = false;
 	}
 
@@ -215,7 +218,8 @@ 
 
 					// go to terminal state if we're at the end of the root array
 					array_pop($expected);
-					if(count($expected) == 0) {
+					if(count($expected) == 0)
+					{
 						$state = 1;
 					}
 					break;
@@ -287,9 +291,12 @@ 
 		mb_internal_encoding('ASCII');
 	}
 
-	try {
+	try
+	{
 		$out = _safe_unserialize($str);
-	} catch(Exception $e) {
+	}
+	catch(Exception $e)
+	{
 		$out = '';
 	}
 

Spacing +52 added lines, -52 removed lines

@@ -31,48 +31,48 @@ 
  * @return string
  * @throw Exception if $value is malformed or contains unsupported types (e.g., resources, objects)
  */
-function _safe_serialize( $value )
+function _safe_serialize($value)
 {
-	if(is_null($value))
+	if (is_null($value))
 	{
 		return 'N;';
 	}
-	if(is_bool($value))
+	if (is_bool($value))
 	{
-		return 'b:'.(int)$value.';';
+		return 'b:' . (int) $value . ';';
 	}
-	if(is_int($value))
+	if (is_int($value))
 	{
-		return 'i:'.$value.';';
+		return 'i:' . $value . ';';
 	}
-	if(is_float($value))
+	if (is_float($value))
 	{
-		return 'd:'.$value.';';
+		return 'd:' . $value . ';';
 	}
-	if(is_string($value))
+	if (is_string($value))
 	{
-		return 's:'.strlen($value).':"'.$value.'";';
+		return 's:' . strlen($value) . ':"' . $value . '";';
 	}
-	if(is_array($value))
+	if (is_array($value))
 	{
 		$out = '';
-		foreach($value as $k => $v)
+		foreach ($value as $k => $v)
 		{
 			$out .= _safe_serialize($k) . _safe_serialize($v);
 		}
 
-		return 'a:'.count($value).':{'.$out.'}';
+		return 'a:' . count($value) . ':{' . $out . '}';
 	}
-	if(is_resource($value))
+	if (is_resource($value))
 	{
 		// built-in returns 'i:0;'
 		throw new \Exception('safe_serialize: resources not supported');
 	}
-	if(is_object($value) || gettype($value) == 'object')
+	if (is_object($value) || gettype($value) == 'object')
 	{
 		throw new \Exception('safe_serialize: objects not supported');
 	}
-	throw new \Exception('safe_serialize cannot serialize: '.gettype($value));
+	throw new \Exception('safe_serialize cannot serialize: ' . gettype($value));
 }
 
 /**
@@ -82,7 +82,7 @@ 
  * @param mixed $value
  * @return string
  */
-function safe_serialize( $value )
+function safe_serialize($value)
 {
 	// ensure we use the byte count for strings even when strlen() is overloaded by mb_strlen()
 	if (function_exists('mb_internal_encoding') &&
@@ -94,7 +94,7 @@ 
 
 	try {
 		$out = _safe_serialize($value);
-	} catch(Exception $e) {
+	} catch (Exception $e) {
 		$out = false;
 	}
 
@@ -114,12 +114,12 @@ 
  */
 function _safe_unserialize($str)
 {
-	if(strlen($str) > MAX_SERIALIZED_INPUT_LENGTH)
+	if (strlen($str) > MAX_SERIALIZED_INPUT_LENGTH)
 	{
 		throw new \Exception('safe_unserialize: input exceeds ' . MAX_SERIALIZED_INPUT_LENGTH);
 	}
 
-	if(empty($str) || !is_string($str))
+	if (empty($str) || !is_string($str))
 	{
 		return false;
 	}
@@ -128,59 +128,59 @@ 
 	$expected = array();
 	$state = 0;
 
-	while($state != 1)
+	while ($state != 1)
 	{
 		$type = isset($str[0]) ? $str[0] : '';
 
-		if($type == '}')
+		if ($type == '}')
 		{
 			$str = substr($str, 1);
 		}
-		else if($type == 'N' && $str[1] == ';')
+		else if ($type == 'N' && $str[1] == ';')
 		{
 			$value = null;
 			$str = substr($str, 2);
 		}
-		else if($type == 'b' && preg_match('/^b:([01]);/', $str, $matches))
+		else if ($type == 'b' && preg_match('/^b:([01]);/', $str, $matches))
 		{
 			$value = $matches[1] == '1' ? true : false;
 			$str = substr($str, 4);
 		}
-		else if($type == 'i' && preg_match('/^i:(-?[0-9]+);(.*)/s', $str, $matches))
+		else if ($type == 'i' && preg_match('/^i:(-?[0-9]+);(.*)/s', $str, $matches))
 		{
-			$value = (int)$matches[1];
+			$value = (int) $matches[1];
 			$str = $matches[2];
 		}
-		else if($type == 'd' && preg_match('/^d:(-?[0-9]+\.?[0-9]*(E[+-][0-9]+)?);(.*)/s', $str, $matches))
+		else if ($type == 'd' && preg_match('/^d:(-?[0-9]+\.?[0-9]*(E[+-][0-9]+)?);(.*)/s', $str, $matches))
 		{
-			$value = (float)$matches[1];
+			$value = (float) $matches[1];
 			$str = $matches[3];
 		}
-		else if($type == 's' && preg_match('/^s:([0-9]+):"(.*)/s', $str, $matches) && substr($matches[2], (int)$matches[1], 2) == '";')
+		else if ($type == 's' && preg_match('/^s:([0-9]+):"(.*)/s', $str, $matches) && substr($matches[2], (int) $matches[1], 2) == '";')
 		{
-			$value = substr($matches[2], 0, (int)$matches[1]);
-			$str = substr($matches[2], (int)$matches[1] + 2);
+			$value = substr($matches[2], 0, (int) $matches[1]);
+			$str = substr($matches[2], (int) $matches[1] + 2);
 		}
-		else if($type == 'a' && preg_match('/^a:([0-9]+):{(.*)/s', $str, $matches) && $matches[1] < MAX_SERIALIZED_ARRAY_LENGTH)
+		else if ($type == 'a' && preg_match('/^a:([0-9]+):{(.*)/s', $str, $matches) && $matches[1] < MAX_SERIALIZED_ARRAY_LENGTH)
 		{
-			$expectedLength = (int)$matches[1];
+			$expectedLength = (int) $matches[1];
 			$str = $matches[2];
 		}
-		else if($type == 'O')
+		else if ($type == 'O')
 		{
 			throw new \Exception('safe_unserialize: objects not supported');
 		}
 		else
 		{
-			throw new \Exception('safe_unserialize: unknown/malformed type: '.$type);
+			throw new \Exception('safe_unserialize: unknown/malformed type: ' . $type);
 		}
 
-		switch($state)
+		switch ($state)
 		{
 			case 3: // in array, expecting value or another array
-				if($type == 'a')
+				if ($type == 'a')
 				{
-					if(count($stack) >= MAX_SERIALIZED_ARRAY_DEPTH)
+					if (count($stack) >= MAX_SERIALIZED_ARRAY_DEPTH)
 					{
 						throw new \Exception('safe_unserialize: array nesting exceeds ' . MAX_SERIALIZED_ARRAY_DEPTH);
 					}
@@ -192,7 +192,7 @@ 
 					$state = 2;
 					break;
 				}
-				if($type != '}')
+				if ($type != '}')
 				{
 					$list[$key] = $value;
 					$state = 2;
@@ -202,31 +202,31 @@ 
 				throw new \Exception('safe_unserialize: missing array value');
 
 			case 2: // in array, expecting end of array or a key
-				if($type == '}')
+				if ($type == '}')
 				{
-					if(count($list) < end($expected))
+					if (count($list) < end($expected))
 					{
 						throw new \Exception('safe_unserialize: array size less than expected ' . $expected[0]);
 					}
 
 					unset($list);
-					$list = &$stack[count($stack)-1];
+					$list = &$stack[count($stack) - 1];
 					array_pop($stack);
 
 					// go to terminal state if we're at the end of the root array
 					array_pop($expected);
-					if(count($expected) == 0) {
+					if (count($expected) == 0) {
 						$state = 1;
 					}
 					break;
 				}
-				if($type == 'i' || $type == 's')
+				if ($type == 'i' || $type == 's')
 				{
-					if(count($list) >= MAX_SERIALIZED_ARRAY_LENGTH)
+					if (count($list) >= MAX_SERIALIZED_ARRAY_LENGTH)
 					{
 						throw new \Exception('safe_unserialize: array size exceeds ' . MAX_SERIALIZED_ARRAY_LENGTH);
 					}
-					if(count($list) >= end($expected))
+					if (count($list) >= end($expected))
 					{
 						throw new \Exception('safe_unserialize: array size exceeds expected length');
 					}
@@ -239,9 +239,9 @@ 
 				throw new \Exception('safe_unserialize: illegal array index type');
 
 			case 0: // expecting array or value
-				if($type == 'a')
+				if ($type == 'a')
 				{
-					if(count($stack) >= MAX_SERIALIZED_ARRAY_DEPTH)
+					if (count($stack) >= MAX_SERIALIZED_ARRAY_DEPTH)
 					{
 						throw new \Exception('safe_unserialize: array nesting exceeds ' . MAX_SERIALIZED_ARRAY_DEPTH);
 					}
@@ -252,7 +252,7 @@ 
 					$state = 2;
 					break;
 				}
-				if($type != '}')
+				if ($type != '}')
 				{
 					$data = $value;
 					$state = 1;
@@ -263,7 +263,7 @@ 
 		}
 	}
 
-	if(!empty($str))
+	if (!empty($str))
 	{
 		throw new \Exception('safe_unserialize: trailing data in input');
 	}
@@ -277,7 +277,7 @@ 
  * @param string $str
  * @return mixed
  */
-function safe_unserialize( $str )
+function safe_unserialize($str)
 {
 	// ensure we use the byte count for strings even when strlen() is overloaded by mb_strlen()
 	if (function_exists('mb_internal_encoding') &&
@@ -289,7 +289,7 @@ 
 
 	try {
 		$out = _safe_unserialize($str);
-	} catch(Exception $e) {
+	} catch (Exception $e) {
 		$out = '';
 	}
 

sources/Server.class.php

Braces +6 added lines, -2 removed lines

@@ -58,7 +58,9 @@ 
 
 		// Should we account for how much is currently being used?
 		if ($in_use)
-			$memory_needed += memory_get_usage();
+		{
+					$memory_needed += memory_get_usage();
+		}
 
 		// If more is needed, request it
 		if ($memory_current < $memory_needed)
@@ -117,7 +119,9 @@ 
 
 		// Don't let apache close the connection
 		if ($server_reset && function_exists('apache_reset_timeout'))
-			@apache_reset_timeout();
+		{
+					@apache_reset_timeout();
+		}
 
 		return ini_get('max_execution_time');
 	}

sources/Session.php

Braces +15 added lines, -5 removed lines

@@ -37,14 +37,18 @@ 
 
 	// Secure PHPSESSIONID
 	if (parse_url($boardurl, PHP_URL_SCHEME) === 'https')
-		@ini_set('session.cookie_secure', true);
+	{
+			@ini_set('session.cookie_secure', true);
+	}
 
 	if (!empty($modSettings['globalCookies']))
 	{
 		$parsed_url = parse_url($boardurl);
 
 		if (preg_match('~^\d{1,3}(\.\d{1,3}){3}$~', $parsed_url['host']) == 0 && preg_match('~(?:[^\.]+\.)?([^\.]{2,}\..+)\z~i', $parsed_url['host'], $parts) == 1)
-			@ini_set('session.cookie_domain', '.' . $parts[1]);
+		{
+					@ini_set('session.cookie_domain', '.' . $parts[1]);
+		}
 	}
 
 	// @todo Set the session cookie path?
@@ -53,7 +57,9 @@ 
 	{
 		// Attempt to end the already-started session.
 		if (ini_get('session.auto_start') == 1)
-			session_write_close();
+		{
+					session_write_close();
+		}
 
 		// This is here to stop people from using bad junky PHPSESSIDs.
 		if (isset($_REQUEST[session_name()]) && preg_match('~^[A-Za-z0-9,-]{16,64}$~', $_REQUEST[session_name()]) == 0 && !isset($_COOKIE[session_name()]))
@@ -96,7 +102,9 @@ 
 			// APC destroys static class members before sessions can be written.  To work around this we
 			// explicitly call session_write_close on script end/exit bugs.php.net/bug.php?id=60657
 			if (extension_loaded('apc') && ini_get('apc.enabled') && !extension_loaded('apcu'))
-				register_shutdown_function('session_write_close');
+			{
+							register_shutdown_function('session_write_close');
+			}
 		}
 
 		// Start the session
@@ -104,7 +112,9 @@ 
 
 		// Change it so the cache settings are a little looser than default.
 		if (!empty($modSettings['databaseSession_loose']) || (isset($_REQUEST['action']) && $_REQUEST['action'] == 'search'))
-			header('Cache-Control: private');
+		{
+					header('Cache-Control: private');
+		}
 	}
 
 	// Set the randomly generated code.

sources/Theme.php

Braces +3 added lines, -1 removed lines

@@ -133,7 +133,9 @@
 		}
 
 		foreach ($vars as $key => $value)
-			$this->js_vars[$key] = !empty($escape) ? JavaScriptEscape($value) : $value;
+		{
+					$this->js_vars[$key] = !empty($escape) ? JavaScriptEscape($value) : $value;
+		}
 	}
 
 	/**

sources/admin/ManagePaid.controller.php

Braces +63 added lines, -22 removed lines

@@ -154,7 +154,9 @@ 
 				$validator->text_replacements(array('paid_email_to' => $txt['paid_email_to']));
 
 				if ($validator->validate($this->_req->post))
-					$this->_req->post->paid_email_to = $validator->validation_data('paid_email_to');
+				{
+									$this->_req->post->paid_email_to = $validator->validation_data('paid_email_to');
+				}
 				else
 				{
 					// That's not an email, lets set it back in the form to be fixed and let them know its wrong
@@ -162,7 +164,9 @@ 
 					$context['error_type'] = 'minor';
 					$context['settings_message'] = array();
 					foreach ($validator->validation_errors() as $id => $error)
-						$context['settings_message'][] = $error;
+					{
+											$context['settings_message'][] = $error;
+					}
 				}
 			}
 
@@ -201,7 +205,9 @@ 
 		// If the currency is set to something different then we need to set it to other for this to work and set it back shortly.
 		$modSettings['paid_currency'] = !empty($modSettings['paid_currency_code']) ? $modSettings['paid_currency_code'] : '';
 		if (!empty($modSettings['paid_currency_code']) && !in_array($modSettings['paid_currency_code'], array('usd', 'eur', 'gbp')))
-			$modSettings['paid_currency'] = 'other';
+		{
+					$modSettings['paid_currency'] = 'other';
+		}
 
 		// These are all the default settings.
 		$config_vars = array(
@@ -257,7 +263,9 @@ 
 
 		// Not made the settings yet?
 		if (empty($modSettings['paid_currency_symbol']))
-			throw new Elk_Exception('paid_not_set_currency', false, array($scripturl . '?action=admin;area=paidsubscribe;sa=settings'));
+		{
+					throw new Elk_Exception('paid_not_set_currency', false, array($scripturl . '?action=admin;area=paidsubscribe;sa=settings'));
+		}
 
 		// Some basic stuff.
 		$context['page_title'] = $txt['paid_subs_view'];
@@ -460,7 +468,9 @@ 
 
 				// There needs to be something.
 				if (empty($this->_req->post->span_value) || empty($this->_req->post->cost))
-					throw new Elk_Exception('paid_no_cost_value');
+				{
+									throw new Elk_Exception('paid_no_cost_value');
+				}
 			}
 			// Flexible is harder but more fun ;)
 			else
@@ -475,7 +485,9 @@ 
 				);
 
 				if (empty($this->_req->post->cost_day) && empty($this->_req->post->cost_week) && empty($this->_req->post->cost_month) && empty($this->_req->post->cost_year))
-					throw new Elk_Exception('paid_all_freq_blank');
+				{
+									throw new Elk_Exception('paid_all_freq_blank');
+				}
 			}
 
 			$cost = serialize($cost);
@@ -485,7 +497,9 @@ 
 			if (!empty($this->_req->post->addgroup))
 			{
 				foreach ($this->_req->post->addgroup as $id => $dummy)
-					$addGroups[] = (int) $id;
+				{
+									$addGroups[] = (int) $id;
+				}
 			}
 			$addGroups = implode(',', $addGroups);
 
@@ -813,16 +827,22 @@ 
 
 		// If we haven't been passed the subscription ID get it.
 		if ($context['log_id'] && !$context['sub_id'])
-			$context['sub_id'] = validateSubscriptionID($context['log_id']);
+		{
+					$context['sub_id'] = validateSubscriptionID($context['log_id']);
+		}
 
 		if (!isset($context['subscriptions'][$context['sub_id']]))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		$context['current_subscription'] = $context['subscriptions'][$context['sub_id']];
 
 		// Searching?
 		if (isset($this->_req->post->ssearch))
-			return $this->action_viewsub();
+		{
+					return $this->action_viewsub();
+		}
 		// Saving?
 		elseif (isset($this->_req->post->save_sub))
 		{
@@ -843,14 +863,20 @@ 
 				$member = getMemberByName($this->_req->post->name);
 
 				if (empty($member))
-					throw new Elk_Exception('error_member_not_found');
+				{
+									throw new Elk_Exception('error_member_not_found');
+				}
 
 				if (alreadySubscribed($context['sub_id'], $member['id_member']))
-					throw new Elk_Exception('member_already_subscribed');
+				{
+									throw new Elk_Exception('member_already_subscribed');
+				}
 
 				// Actually put the subscription in place.
 				if ($status == 1)
-					addSubscription($context['sub_id'], $member['id_member'], 0, $starttime, $endtime);
+				{
+									addSubscription($context['sub_id'], $member['id_member'], 0, $starttime, $endtime);
+				}
 				else
 				{
 					$details = array(
@@ -872,10 +898,14 @@ 
 
 				// Pick the right permission stuff depending on what the status is changing from/to.
 				if ($subscription_status['old_status'] == 1 && $status != 1)
-					removeSubscription($context['sub_id'], $subscription_status['id_member']);
+				{
+									removeSubscription($context['sub_id'], $subscription_status['id_member']);
+				}
 
 				elseif ($status == 1 && $subscription_status['old_status'] != 1)
-					addSubscription($context['sub_id'], $subscription_status['id_member'], 0, $starttime, $endtime);
+				{
+									addSubscription($context['sub_id'], $subscription_status['id_member'], 0, $starttime, $endtime);
+				}
 
 				else
 				{
@@ -902,12 +932,16 @@ 
 			{
 				$toDelete = array();
 				foreach ($this->_req->post->delsub as $id => $dummy)
-					$toDelete[] = (int) $id;
+				{
+									$toDelete[] = (int) $id;
+				}
 
 				$deletes = prepareDeleteSubscriptions($toDelete);
 
 				foreach ($deletes as $id_subscribe => $id_member)
-					removeSubscription($id_subscribe, $id_member, isset($this->_req->post->delete));
+				{
+									removeSubscription($id_subscribe, $id_member, isset($this->_req->post->delete));
+				}
 			}
 			redirectexit('action=admin;area=paidsubscribe;sa=viewsub;sid=' . $context['sub_id']);
 		}
@@ -946,15 +980,18 @@ 
 				$result = getBasicMemberData((int) $this->_req->query->uid);
 				$context['sub']['username'] = $result['real_name'];
 			}
-			else
-				$context['sub']['username'] = '';
+			else {
+							$context['sub']['username'] = '';
+			}
 		}
 		// Otherwise load the existing info.
 		else
 		{
 			$row = getPendingSubscriptions($context['log_id']);
 			if (empty($row))
-				throw new Elk_Exception('no_access', false);
+			{
+							throw new Elk_Exception('no_access', false);
+			}
 
 			// Any pending payments?
 			$context['pending_payments'] = array();
@@ -974,9 +1011,11 @@ 
 							foreach ($costs as $duration => $cost)
 							{
 								if ($cost != 0 && $cost == $pending[1] && $duration == $pending[2])
-									$context['pending_payments'][$id] = array(
+								{
+																	$context['pending_payments'][$id] = array(
 										'desc' => sprintf($modSettings['paid_currency_symbol'], $cost . '/' . $txt[$duration]),
 									);
+								}
 							}
 						}
 						elseif ($costs['fixed'] == $pending[1])
@@ -998,7 +1037,9 @@ 
 						{
 							// Flexible?
 							if (isset($this->_req->query->accept))
-								addSubscription($context['current_subscription']['id'], $row['id_member'], $context['current_subscription']['real_length'] === 'F' ? strtoupper(substr($pending[2], 0, 1)) : 0);
+							{
+															addSubscription($context['current_subscription']['id'], $row['id_member'], $context['current_subscription']['real_length'] === 'F' ? strtoupper(substr($pending[2], 0, 1)) : 0);
+							}
 							unset($pending_details[$id]);
 
 							$new_details = serialize($pending_details);

Spacing +11 added lines, -11 removed lines

@@ -270,13 +270,13 @@ 
 			'items_per_page' => 20,
 			'base_href' => $scripturl . '?action=admin;area=paidsubscribe;sa=view',
 			'get_items' => array(
-				'function' => function () {
+				'function' => function() {
 					global $context;
 					return $context['subscriptions'];
 				},
 			),
 			'get_count' => array(
-				'function' => function () {
+				'function' => function() {
 					global $context;
 					return count($context['subscriptions']);
 				},
@@ -289,7 +289,7 @@ 
 						'style' => 'width: 30%;',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $scripturl;
 
 							return sprintf('<a href="%1$s?action=admin;area=paidsubscribe;sa=viewsub;sid=%2$s">%3$s</a>', $scripturl, $rowData['id'], $rowData['name']);
@@ -301,7 +301,7 @@ 
 						'value' => $txt['paid_cost'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							return $rowData['flexible'] ? '<em>' . $txt['flexible'] . '</em>' : $rowData['cost'] . ' / ' . $rowData['length'];
@@ -338,7 +338,7 @@ 
 						'value' => $txt['paid_is_active'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							return '<span class="' . ($rowData['active'] ? 'success' : 'alert') . '">' . ($rowData['active'] ? $txt['yes'] : $txt['no']) . '</span>';
@@ -350,7 +350,7 @@ 
 						'value' => $txt['subscribers'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $scripturl, $txt;
 
 							return '<a href="' . $scripturl . '?action=admin;area=paidsubscribe;sa=viewsub;sid=' . $rowData['id'] . '"><i class="icon i-view" title="' . $txt['view'] . '"></i></a>';
@@ -363,7 +363,7 @@ 
 						'value' => $txt['modify'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt, $scripturl;
 
 							return '<a href="' . $scripturl . '?action=admin;area=paidsubscribe;sa=modify;sid=' . $rowData['id'] . '"><i class="icon i-modify" title="' . $txt['modify'] . '"></i></a>';
@@ -376,7 +376,7 @@ 
 						'value' => $txt['remove']
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt, $scripturl;
 
 							return '<a href="' . $scripturl . '?action=admin;area=paidsubscribe;sa=modify;delete;sid=' . $rowData['id'] . '"><i class="icon i-delete" title="' . $txt['delete'] . '"></i></a>';
@@ -636,7 +636,7 @@ 
 						'style' => 'width: 20%;',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt, $scripturl;
 
 							return $rowData['id_member'] == 0 ? $txt['guest'] : '<a href="' . $scripturl . '?action=profile;u=' . $rowData['id_member'] . '">' . $rowData['name'] . '</a>';
@@ -708,7 +708,7 @@ 
 						'value' => $txt['edit_subscriber'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt, $scripturl;
 
 							return '<a href="' . $scripturl . '?action=admin;area=paidsubscribe;sa=modifyuser;lid=' . $rowData['id'] . '">' . $txt['modify'] . '</a>';
@@ -722,7 +722,7 @@ 
 						'class' => 'centertext',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							return '<input type="checkbox" name="delsub[' . $rowData['id'] . ']" class="input_check" />';
 						},
 						'class' => 'centertext',

sources/admin/ManageRegistration.controller.php

Braces +6 added lines, -2 removed lines

@@ -137,8 +137,10 @@ 
 
 			// @todo move this to a filter/sanitation class
 			foreach ($this->_req->post as $key => $value)
-				if (!is_array($value))
+			{
+							if (!is_array($value))
 					$this->_req->post[$key] = htmltrim__recursive(str_replace(array("\n", "\r"), '', $value));
+			}
 
 			// Generate a password
 			if (empty($this->_req->post->password) || !is_string($this->_req->post->password) || trim($this->_req->post->password) === '')
@@ -472,7 +474,9 @@ 
 
 			// Are there some contacts missing?
 			if (!empty($this->_req->post->coppaAge) && !empty($this->_req->post->coppaType) && empty($this->_req->post->coppaPost) && empty($this->_req->post->coppaFax))
-				throw new Elk_Exception('admin_setting_coppa_require_contact');
+			{
+							throw new Elk_Exception('admin_setting_coppa_require_contact');
+			}
 
 			// Post needs to take into account line breaks.
 			$this->_req->post->coppaPost = str_replace("\n", '<br />', empty($this->_req->post->coppaPost) ? '' : $this->_req->post->coppaPost);

sources/admin/Reports.controller.php

Braces +177 added lines, -77 removed lines

@@ -81,13 +81,15 @@ 
 
 		$is_first = 0;
 		foreach ($context['report_types'] as $k => $temp)
-			$context['report_types'][$k] = array(
+		{
+					$context['report_types'][$k] = array(
 				'id' => $k,
 				'title' => isset($txt['gr_type_' . $k]) ? $txt['gr_type_' . $k] : $k,
 				'description' => isset($txt['gr_type_desc_' . $k]) ? $txt['gr_type_desc_' . $k] : null,
 				'function' => $temp,
 				'is_first' => $is_first++ == 0,
 			);
+		}
 
 		$report_type = !empty($this->_req->post->rt) ? $this->_req->post->rt : (!empty($this->_req->query->rt) ? $this->_req->query->rt : null);
 
@@ -123,7 +125,9 @@ 
 				$template_layers = Template_Layers::instance();
 				$template_layers->removeAll();
 				foreach ($reportTemplates[$set_template]['layers'] as $layer)
-					$template_layers->add($layer);
+				{
+									$template_layers->add($layer);
+				}
 			}
 		}
 
@@ -196,7 +200,9 @@ 
 		$all_groups = getBasicMembergroupData(array('all'), array(), null, false);
 		$groups = array(-1 => $txt['guest_title'], 0 => $txt['full_member']);
 		foreach ($all_groups as $row)
-			$groups[$row['id']] = empty($row['online_color']) ? $row['name'] : '<span style="color: ' . $row['online_color'] . '">' . $row['name'] . '</span>';
+		{
+					$groups[$row['id']] = empty($row['online_color']) ? $row['name'] : '<span style="color: ' . $row['online_color'] . '">' . $row['name'] . '</span>';
+		}
 
 		// All the fields we'll show.
 		$boardSettings = array(
@@ -213,7 +219,9 @@ 
 		);
 
 		if (!empty($modSettings['deny_boards_access']))
-			$boardSettings['disallowed_groups'] = $txt['board_disallowed_groups'];
+		{
+					$boardSettings['disallowed_groups'] = $txt['board_disallowed_groups'];
+		}
 
 		// Do it in columns, it's just easier.
 		setKeys('cols');
@@ -250,9 +258,12 @@ 
 			foreach ($allowedGroups as $key => $group)
 			{
 				if (isset($groups[$group]))
-					$allowedGroups[$key] = $groups[$group];
-				else
-					unset($allowedGroups[$key]);
+				{
+									$allowedGroups[$key] = $groups[$group];
+				}
+				else {
+									unset($allowedGroups[$key]);
+				}
 			}
 
 			$boardData['groups'] = implode(', ', $allowedGroups);
@@ -263,9 +274,12 @@ 
 				foreach ($disallowedGroups as $key => $group)
 				{
 					if (isset($groups[$group]))
-						$disallowedGroups[$key] = $groups[$group];
-					else
-						unset($disallowedGroups[$key]);
+					{
+											$disallowedGroups[$key] = $groups[$group];
+					}
+					else {
+											unset($disallowedGroups[$key]);
+					}
 				}
 
 				$boardData['disallowed_groups'] = implode(', ', $disallowedGroups);
@@ -302,42 +316,55 @@ 
 		if (isset($this->_req->post->boards))
 		{
 			if (!is_array($this->_req->post->boards))
-				$query_boards['boards'] = array_map('intval', explode(',', $this->_req->post->boards));
-			else
-				$query_boards['boards'] = array_map('intval', $this->_req->post->boards);
+			{
+							$query_boards['boards'] = array_map('intval', explode(',', $this->_req->post->boards));
+			}
+			else {
+							$query_boards['boards'] = array_map('intval', $this->_req->post->boards);
+			}
+		}
+		else {
+					$query_boards = 'all';
 		}
-		else
-			$query_boards = 'all';
 
 		// Fetch the board names and profiles.
 		// This returns id_board, name, id_profile keys
 		$boards = fetchBoardsInfo($query_boards, array('sort_by' => 'id_board', 'selects' => 'permissions'));
 		$profiles = array();
 		foreach ($boards as $b)
-			$profiles[] = $b['id_profile'];
+		{
+					$profiles[] = $b['id_profile'];
+		}
 
 		// Groups, next.
 		$query_groups = array();
 		if (isset($this->_req->post->groups))
 		{
 			if (!is_array($this->_req->post->groups))
-				$query_groups = array_map('intval', explode(',', $this->_req->post->groups));
-			else
-				$query_groups = array_map('intval', $this->_req->post->groups);
+			{
+							$query_groups = array_map('intval', explode(',', $this->_req->post->groups));
+			}
+			else {
+							$query_groups = array_map('intval', $this->_req->post->groups);
+			}
 
 			$group_clause = 'id_group IN ({array_int:groups})';
 		}
-		else
-			$group_clause = '1=1';
+		else {
+					$group_clause = '1=1';
+		}
 
 		// Get all the possible membergroups, except admin!
 		require_once(SUBSDIR . '/Reports.subs.php');
 		$all_groups = allMembergroups($group_clause, $query_groups);
 
 		if (empty($query_groups) || in_array(-1, $query_groups) || in_array(0, $query_groups))
-			$member_groups = array('col' => '', -1 => $txt['membergroups_guests'], 0 => $txt['membergroups_members']) + $all_groups;
-		else
-			$member_groups = array('col' => '') + $all_groups;
+		{
+					$member_groups = array('col' => '', -1 => $txt['membergroups_guests'], 0 => $txt['membergroups_members']) + $all_groups;
+		}
+		else {
+					$member_groups = array('col' => '') + $all_groups;
+		}
 
 		// Make sure that every group is represented - plus in rows!
 		setKeys('rows', $member_groups);
@@ -350,8 +377,10 @@ 
 		foreach ($boardPermissions as $row)
 		{
 			foreach ($boards as $id => $board)
-				if ($board['id_profile'] == $row['id_profile'])
+			{
+							if ($board['id_profile'] == $row['id_profile'])
 					$board_permissions[$id][$row['id_group']][$row['permission']] = $row['add_deny'];
+			}
 
 			// Make sure we get every permission.
 			if (!isset($permissions[$row['permission']]))
@@ -386,7 +415,9 @@ 
 				{
 					// Don't overwrite the key column!
 					if ($id_group === 'col')
-						continue;
+					{
+											continue;
+					}
 
 					$group_permissions = isset($groups[$id_group]) ? $groups[$id_group] : array();
 
@@ -397,16 +428,22 @@ 
 						$curData[$id_group] = $group_permissions[$ID_PERM];
 					}
 					// Otherwise means it's set to disallow..
-					else
-						$curData[$id_group] = 'x';
+					else {
+											$curData[$id_group] = 'x';
+					}
 
 					// Now actually make the data for the group look right.
 					if (empty($curData[$id_group]))
-						$curData[$id_group] = '<span class="alert">' . $txt['board_perms_deny'] . '</span>';
+					{
+											$curData[$id_group] = '<span class="alert">' . $txt['board_perms_deny'] . '</span>';
+					}
 					elseif ($curData[$id_group] == 1)
-						$curData[$id_group] = '<span class="success">' . $txt['board_perms_allow'] . '</span>';
-					else
-						$curData[$id_group] = 'x';
+					{
+											$curData[$id_group] = '<span class="success">' . $txt['board_perms_allow'] . '</span>';
+					}
+					else {
+											$curData[$id_group] = 'x';
+					}
 				}
 
 				// Now add the data for this permission.
@@ -435,14 +472,20 @@ 
 		foreach ($raw_boards as $row)
 		{
 			if (trim($row['member_groups']) == '')
-				$groups = array(1);
-			else
-				$groups = array_merge(array(1), explode(',', $row['member_groups']));
+			{
+							$groups = array(1);
+			}
+			else {
+							$groups = array_merge(array(1), explode(',', $row['member_groups']));
+			}
 
 			if (trim($row['deny_member_groups']) == '')
-				$denyGroups = array();
-			else
-				$denyGroups = explode(',', $row['deny_member_groups']);
+			{
+							$denyGroups = array();
+			}
+			else {
+							$denyGroups = explode(',', $row['deny_member_groups']);
+			}
 
 			$boards[$row['id_board']] = array(
 				'id' => $row['id_board'],
@@ -466,7 +509,9 @@ 
 
 		// Add on the boards!
 		foreach ($boards as $board)
-			$mgSettings['board_' . $board['id']] = $board['name'];
+		{
+					$mgSettings['board_' . $board['id']] = $board['name'];
+		}
 
 		// Add all the membergroup settings, plus we'll be adding in columns!
 		setKeys('cols', $mgSettings);
@@ -493,7 +538,9 @@ 
 
 			// Board permissions.
 			foreach ($boards as $board)
-				$group['board_' . $board['id']] = in_array($row['id_group'], $board['groups']) ? '<span class="success">' . $txt['board_perms_allow'] . '</span>' : (!empty($modSettings['deny_boards_access']) && in_array($row['id_group'], $board['deny_groups']) ? '<span class="error">' . $txt['board_perms_deny'] . '</span>' : 'x');
+			{
+							$group['board_' . $board['id']] = in_array($row['id_group'], $board['groups']) ? '<span class="success">' . $txt['board_perms_allow'] . '</span>' : (!empty($modSettings['deny_boards_access']) && in_array($row['id_group'], $board['deny_groups']) ? '<span class="error">' . $txt['board_perms_deny'] . '</span>' : 'x');
+			}
 
 			addData($group);
 		}
@@ -514,7 +561,9 @@ 
 		if (isset($this->_req->post->groups))
 		{
 			if (!is_array($this->_req->post->groups))
-				$this->_req->post->groups = explode(',', $this->_req->post->groups);
+			{
+							$this->_req->post->groups = explode(',', $this->_req->post->groups);
+			}
 
 			$query_groups = array_diff(array_map('intval', $this->_req->post->groups), array(3));
 			$group_clause = 'id_group IN ({array_int:groups})';
@@ -530,9 +579,12 @@ 
 		$all_groups = allMembergroups($group_clause, $query_groups);
 
 		if (!isset($this->_req->post->groups) || in_array(-1, $this->_req->post->groups) || in_array(0, $this->_req->post->groups))
-			$groups = array('col' => '', -1 => $txt['membergroups_guests'], 0 => $txt['membergroups_members']) + $all_groups;
-		else
-			$groups = array('col' => '') + $all_groups;
+		{
+					$groups = array('col' => '', -1 => $txt['membergroups_guests'], 0 => $txt['membergroups_members']) + $all_groups;
+		}
+		else {
+					$groups = array('col' => '') + $all_groups;
+		}
 
 		// Make sure that every group is represented!
 		setKeys('rows', $groups);
@@ -557,7 +609,9 @@ 
 			{
 				// Send the data!
 				if ($lastPermission !== null)
-					addData($curData);
+				{
+									addData($curData);
+				}
 
 				// Add the permission name in the left column.
 				$curData = array('col' => isset($txt['group_perms_name_' . $row['permission']]) ? $txt['group_perms_name_' . $row['permission']] : $row['permission']);
@@ -567,9 +621,12 @@ 
 
 			// Good stuff - add the permission to the list!
 			if ($row['add_deny'])
-				$curData[$row['id_group']] = '<span class="success">' . $txt['board_perms_allow'] . '</span>';
-			else
-				$curData[$row['id_group']] = '<span class="alert">' . $txt['board_perms_deny'] . '</span>';
+			{
+							$curData[$row['id_group']] = '<span class="success">' . $txt['board_perms_allow'] . '</span>';
+			}
+			else {
+							$curData[$row['id_group']] = '<span class="alert">' . $txt['board_perms_deny'] . '</span>';
+			}
 		}
 
 		// Flush the last data!
@@ -599,8 +656,10 @@ 
 		$boards_moderated = array();
 
 		foreach ($moderators as $id_member => $rows)
-			foreach ($rows as $row)
+		{
+					foreach ($rows as $row)
 				$boards_moderated[$id_member][] = $row['id_board'];
+		}
 
 		// Get a list of global moderators (i.e. members with moderation powers).
 		$global_mods = array_intersect(membersAllowedTo('moderate_board', 0), membersAllowedTo('approve_posts', 0), membersAllowedTo('remove_any', 0), membersAllowedTo('modify_any', 0));
@@ -613,13 +672,17 @@ 
 
 		// This is a bit of a cop out - but we're protecting their forum, really!
 		if (count($allStaff) > 300)
-			throw new Elk_Exception('report_error_too_many_staff');
+		{
+					throw new Elk_Exception('report_error_too_many_staff');
+		}
 
 		// Get all the possible membergroups!
 		$all_groups = getBasicMembergroupData(array('all'), array(), null, false);
 		$groups = array(0 => $txt['full_member']);
 		foreach ($all_groups as $row)
-			$groups[$row['id']] = empty($row['online_color']) ? $row['name'] : '<span style="color: ' . $row['online_color'] . '">' . $row['name'] . '</span>';
+		{
+					$groups[$row['id']] = empty($row['online_color']) ? $row['name'] : '<span style="color: ' . $row['online_color'] . '">' . $row['name'] . '</span>';
+		}
 
 		// All the fields we'll show.
 		$staffSettings = array(
@@ -652,18 +715,23 @@ 
 
 			// What do they moderate?
 			if (in_array($row['id_member'], $global_mods))
-				$staffData['moderates'] = '<em>' . $txt['report_staff_all_boards'] . '</em>';
+			{
+							$staffData['moderates'] = '<em>' . $txt['report_staff_all_boards'] . '</em>';
+			}
 			elseif (isset($boards_moderated[$row['id_member']]))
 			{
 				// Get the names
 				foreach ($boards_moderated[$row['id_member']] as $board)
-					if (isset($boards[$board]))
+				{
+									if (isset($boards[$board]))
 						$staffData['moderates'][] = $boards[$board]['name'];
+				}
 
 				$staffData['moderates'] = implode(', ', $staffData['moderates']);
 			}
-			else
-				$staffData['moderates'] = '<em>' . $txt['report_staff_no_boards'] . '</em>';
+			else {
+							$staffData['moderates'] = '<em>' . $txt['report_staff_no_boards'] . '</em>';
+			}
 
 			// Next add the main data.
 			addData($staffData);
@@ -695,7 +763,9 @@ 
 
 	// Set the table count if needed.
 	if (empty($context['table_count']))
-		$context['table_count'] = 0;
+	{
+			$context['table_count'] = 0;
+	}
 
 	// Create the table!
 	$context['tables'][$context['table_count']] = array(
@@ -746,15 +816,22 @@ 
 
 	// No tables? Create one even though we are probably already in a bad state!
 	if (empty($context['table_count']))
-		newTable();
+	{
+			newTable();
+	}
 
 	// Specific table?
 	if ($custom_table !== null && !isset($context['tables'][$custom_table]))
-		return false;
+	{
+			return false;
+	}
 	elseif ($custom_table !== null)
-		$table = $custom_table;
-	else
-		$table = $context['current_table'];
+	{
+			$table = $custom_table;
+	}
+	else {
+			$table = $context['current_table'];
+	}
 
 	// If we have keys, sanitise the data...
 	$data = array();
@@ -768,7 +845,9 @@ 
 			);
 			// Special "hack" the adding separators when doing data by column.
 			if (substr($key, 0, 5) === '#sep#')
-				$data[$key]['separator'] = true;
+			{
+							$data[$key]['separator'] = true;
+			}
 		}
 	}
 	else
@@ -781,7 +860,9 @@ 
 			);
 
 			if (substr($key, 0, 5) === '#sep#')
-				$data[$key]['separator'] = true;
+			{
+							$data[$key]['separator'] = true;
+			}
 		}
 	}
 
@@ -795,7 +876,9 @@ 
 	else
 	{
 		foreach ($data as $key => $item)
-			$context['tables'][$table]['data'][$key][] = $item;
+		{
+					$context['tables'][$table]['data'][$key][] = $item;
+		}
 	}
 }
 
@@ -813,15 +896,22 @@ 
 
 	// No tables - return?
 	if (empty($context['table_count']))
-		return false;
+	{
+			return false;
+	}
 
 	// Specific table?
 	if ($custom_table !== null && !isset($context['tables'][$custom_table]))
-		return false;
+	{
+			return false;
+	}
 	elseif ($custom_table !== null)
-		$table = $custom_table;
-	else
-		$table = $context['current_table'];
+	{
+			$table = $custom_table;
+	}
+	else {
+			$table = $context['current_table'];
+	}
 
 	// Plumb in the separator
 	$context['tables'][$table]['data'][] = array(
@@ -846,7 +936,9 @@ 
 	global $context;
 
 	if (empty($context['tables']))
-		return;
+	{
+			return;
+	}
 
 	// Loop through each table counting up some basic values, to help with the templating.
 	foreach ($context['tables'] as $id => $table)
@@ -858,11 +950,16 @@ 
 
 		// Work out the rough width - for templates like the print template. Without this we might get funny tables.
 		if ($table['shading']['left'] && $table['width']['shaded'] !== 'auto' && $table['width']['normal'] !== 'auto')
-			$context['tables'][$id]['max_width'] = $table['width']['shaded'] + ($context['tables'][$id]['column_count'] - 1) * $table['width']['normal'];
+		{
+					$context['tables'][$id]['max_width'] = $table['width']['shaded'] + ($context['tables'][$id]['column_count'] - 1) * $table['width']['normal'];
+		}
 		elseif ($table['width']['normal'] !== 'auto')
-			$context['tables'][$id]['max_width'] = $context['tables'][$id]['column_count'] * $table['width']['normal'];
-		else
-			$context['tables'][$id]['max_width'] = 'auto';
+		{
+					$context['tables'][$id]['max_width'] = $context['tables'][$id]['column_count'] * $table['width']['normal'];
+		}
+		else {
+					$context['tables'][$id]['max_width'] = 'auto';
+		}
 	}
 }
 
@@ -890,9 +987,12 @@ 
 
 	// Do we want to use the keys of the keys as the keys? :P
 	if ($reverse)
-		$context['keys'] = array_flip($keys);
-	else
-		$context['keys'] = $keys;
+	{
+			$context['keys'] = array_flip($keys);
+	}
+	else {
+			$context['keys'] = $keys;
+	}
 
 	// Rows or columns?
 	$context['key_method'] = $method === 'rows' ? 'rows' : 'cols';