Schlaefer / Saito

app/Plugin/Stopwatch/View/Helper/StopwatchHelper.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 	}
 
 	public function getResult() {
-		return "<pre>" . Stopwatch::getString() . "</pre>";
+		return "<pre>".Stopwatch::getString()."</pre>";
 	}
 
 }

Indentation +20 added lines, -20 removed lines

@@ -5,21 +5,21 @@ 
 
 class StopwatchHelper extends AppHelper {
 
-	public $helpers = array(
-		'Html'
-	);
+    public $helpers = array(
+        'Html'
+    );
 
-	public function plot() {
-		$stopwatchData = Stopwatch::getJs();
-		$out = $this->Html->script(
-			array(
-				'Stopwatch.jquery.flot.min.js',
-				'Stopwatch.jquery.flot.stack.min.js'
-			)
-		);
-		$out .= '<div id="stopwatch-plot" style="width:300px;height:600px;"></div>';
-		$out .= '<div style="width: 300px;"><div id="stopwatch-exp">---</div><div id="stopwatch-legend"></div></div>';
-		$out .= $this->Html->scriptBlock(<<<EOF
+    public function plot() {
+        $stopwatchData = Stopwatch::getJs();
+        $out = $this->Html->script(
+            array(
+                'Stopwatch.jquery.flot.min.js',
+                'Stopwatch.jquery.flot.stack.min.js'
+            )
+        );
+        $out .= '<div id="stopwatch-plot" style="width:300px;height:600px;"></div>';
+        $out .= '<div style="width: 300px;"><div id="stopwatch-exp">---</div><div id="stopwatch-legend"></div></div>';
+        $out .= $this->Html->scriptBlock(<<<EOF
 		$.plot($("#stopwatch-plot"), {$stopwatchData}, {
 				series: {
 						stack: true,
@@ -54,13 +54,13 @@ 
         }
     });
 EOF
-		);
-		return $out;
-	}
+        );
+        return $out;
+    }
 
-	public function getResult() {
-		return "<pre>" . Stopwatch::getString() . "</pre>";
-	}
+    public function getResult() {
+        return "<pre>" . Stopwatch::getString() . "</pre>";
+    }
 
 }
 

app/Plugin/MailObfuscator/View/Helper/MailObfuscatorHelper.php

Spacing +2 added lines, -2 removed lines

@@ -13,11 +13,11 @@
 			if (empty($title) === false) {
 				$hasTitle = 1;
 			}
-			$rand = "moh_" . md5(mt_rand(1, 10000) . $addr);
+			$rand = "moh_".md5(mt_rand(1, 10000).$addr);
 			list($ttl, $dom) = explode('@', $addr);
 
 			// missing  style='unicode-bidi:bidi-override;direction:rtl;'
-			$mailto = '<a id="' . $rand . '" href="#" data-ttl="' . $ttl . '" data-dom="' . $dom . '">' . $title . '</a>';
+			$mailto = '<a id="'.$rand.'" href="#" data-ttl="'.$ttl.'" data-dom="'.$dom.'">'.$title.'</a>';
 			$mailto .= '<noscript><p>[You need to have Javascript enabled to see this mail address.]</p></noscript>';
 			$mailto .= $this->Html->scriptBlock(
 				"$(function(){

Indentation +24 added lines, -24 removed lines

@@ -1,26 +1,26 @@ 
 <?php
 
-	App::uses('AppHelper', 'View/Helper');
-
-	class MailObfuscatorHelper extends AppHelper {
-
-		public $helpers = [
-			'Html'
-		];
-
-		public function link($addr, $title = '') {
-			$hasTitle = 0;
-			if (empty($title) === false) {
-				$hasTitle = 1;
-			}
-			$rand = "moh_" . md5(mt_rand(1, 10000) . $addr);
-			list($ttl, $dom) = explode('@', $addr);
-
-			// missing  style='unicode-bidi:bidi-override;direction:rtl;'
-			$mailto = '<a id="' . $rand . '" href="#" data-ttl="' . $ttl . '" data-dom="' . $dom . '">' . $title . '</a>';
-			$mailto .= '<noscript><p>[You need to have Javascript enabled to see this mail address.]</p></noscript>';
-			$mailto .= $this->Html->scriptBlock(
-				"$(function(){
+    App::uses('AppHelper', 'View/Helper');
+
+    class MailObfuscatorHelper extends AppHelper {
+
+        public $helpers = [
+            'Html'
+        ];
+
+        public function link($addr, $title = '') {
+            $hasTitle = 0;
+            if (empty($title) === false) {
+                $hasTitle = 1;
+            }
+            $rand = "moh_" . md5(mt_rand(1, 10000) . $addr);
+            list($ttl, $dom) = explode('@', $addr);
+
+            // missing  style='unicode-bidi:bidi-override;direction:rtl;'
+            $mailto = '<a id="' . $rand . '" href="#" data-ttl="' . $ttl . '" data-dom="' . $dom . '">' . $title . '</a>';
+            $mailto .= '<noscript><p>[You need to have Javascript enabled to see this mail address.]</p></noscript>';
+            $mailto .= $this->Html->scriptBlock(
+                "$(function(){
 						var el = $('#$rand'),
 								mt = el.data('ttl') + '@' + el.data('dom');
 						el.attr('href', 'mai' + 'lto:' + mt);
@@ -28,8 +28,8 @@ 
 					})
 			");
 
-			return $mailto;
-		}
+            return $mailto;
+        }
 
-	}
+    }
 

app/Plugin/M/Lib/MCacheSupportCachelet.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 	class MCacheSupportCachelet extends CacheSupportCachelet {
 
 		public function clear($id = null) {
-			touch(CakePlugin::path('M') . 'webroot/touch.txt');
+			touch(CakePlugin::path('M').'webroot/touch.txt');
 		}
 
 	}
\ No newline at end of file

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 
-	use Saito\Cache\CacheSupportCachelet;
+    use Saito\Cache\CacheSupportCachelet;
 
-	class MCacheSupportCachelet extends CacheSupportCachelet {
+    class MCacheSupportCachelet extends CacheSupportCachelet {
 
-		public function clear($id = null) {
-			touch(CakePlugin::path('M') . 'webroot/touch.txt');
-		}
+        public function clear($id = null) {
+            touch(CakePlugin::path('M') . 'webroot/touch.txt');
+        }
 
-	}
\ No newline at end of file
+    }
\ No newline at end of file

app/Plugin/Detectors/Controller/Component/DetectorsComponent.php

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 			if ($this->_isBot === null) {
 				$agent = env('HTTP_USER_AGENT');
 				$imploded = implode('|', $this->_bots);
-				$this->_isBot = (bool)preg_match('/' . $imploded . '/i', $agent);
+				$this->_isBot = (bool) preg_match('/'.$imploded.'/i', $agent);
 			}
 			return $this->_isBot;
 		}

Indentation +113 added lines, -113 removed lines

@@ -1,123 +1,123 @@
 <?php
 
-	App::uses('Component', 'Controller');
+    App::uses('Component', 'Controller');
 
-	/**
-	 * CakePHP Detectors
-	 *
-	 * @copyright     Copyright 2012, Saito (http://saito.siezi.org/)
-	 * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
-	 * @package 			Saito.Lib
-	 */
-	class DetectorsComponent extends Component {
+    /**
+     * CakePHP Detectors
+     *
+     * @copyright     Copyright 2012, Saito (http://saito.siezi.org/)
+     * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+     * @package 			Saito.Lib
+     */
+    class DetectorsComponent extends Component {
 
-		/**
-		 * User agent snippets for bots
-		 *
-		 * @var array
-		 */
-		protected $_bots = [
-			'bot',
-			'crawl',
-			'spider',
-			'slurp',
-			'archive',
-			'baidu',
-			'yandex',
-			'search',
-			'Mediapartners',
-			'java',
-			'wget',
-			'curl',
-			'Commons-HttpClient',
-			'Python-urllib',
-			'libwww',
-			'httpunit',
-			'nutch',
-			'teoma',
-			'webmon ',
-			'httrack',
-			'convera',
-			'biglotron',
-			'grub.org',
-			'speedy',
-			'fluffy',
-			'bibnum.bnf',
-			'findlink',
-			'panscient',
-			'IOI',
-			'ips-agent',
-			'yanga',
-			'Voyager',
-			'CyberPatrol',
-			'postrank',
-			'page2rss',
-			'linkdex',
-			'ezooms',
-			'mail.ru',
-			'heritrix',
-			'findthatfile',
-			'Aboundex',
-			'summify',
-			'ec2linkfinder',
-			'facebook',
-			'yeti',
-			'RetrevoPageAnalyzer',
-			'sogou',
-			'wotbox',
-			'ichiro',
-			'drupact',
-			'coccoc',
-			'integromedb',
-			'siteexplorer.info',
-			'proximic',
-			'changedetection'
-		];
+        /**
+         * User agent snippets for bots
+         *
+         * @var array
+         */
+        protected $_bots = [
+            'bot',
+            'crawl',
+            'spider',
+            'slurp',
+            'archive',
+            'baidu',
+            'yandex',
+            'search',
+            'Mediapartners',
+            'java',
+            'wget',
+            'curl',
+            'Commons-HttpClient',
+            'Python-urllib',
+            'libwww',
+            'httpunit',
+            'nutch',
+            'teoma',
+            'webmon ',
+            'httrack',
+            'convera',
+            'biglotron',
+            'grub.org',
+            'speedy',
+            'fluffy',
+            'bibnum.bnf',
+            'findlink',
+            'panscient',
+            'IOI',
+            'ips-agent',
+            'yanga',
+            'Voyager',
+            'CyberPatrol',
+            'postrank',
+            'page2rss',
+            'linkdex',
+            'ezooms',
+            'mail.ru',
+            'heritrix',
+            'findthatfile',
+            'Aboundex',
+            'summify',
+            'ec2linkfinder',
+            'facebook',
+            'yeti',
+            'RetrevoPageAnalyzer',
+            'sogou',
+            'wotbox',
+            'ichiro',
+            'drupact',
+            'coccoc',
+            'integromedb',
+            'siteexplorer.info',
+            'proximic',
+            'changedetection'
+        ];
 
-		protected $_isBot = null;
+        protected $_isBot = null;
 
-		public function initialize(Controller $Controller) {
-			$Controller->request->addDetector('bot',
-				['callback' => [$this, 'isBot']]
-			);
+        public function initialize(Controller $Controller) {
+            $Controller->request->addDetector('bot',
+                ['callback' => [$this, 'isBot']]
+            );
 
-			$Controller->request->addDetector('preview',
-				['callback' => ['DetectorsComponent', 'isPreview']]
-			);
-		}
+            $Controller->request->addDetector('preview',
+                ['callback' => ['DetectorsComponent', 'isPreview']]
+            );
+        }
 
-		/**
-		 * Detects if a request is made by a spider/crawler
-		 *
-		 * @return bool
-		 */
-		public function isBot() {
-			if ($this->_isBot === null) {
-				$agent = env('HTTP_USER_AGENT');
-				$imploded = implode('|', $this->_bots);
-				$this->_isBot = (bool)preg_match('/' . $imploded . '/i', $agent);
-			}
-			return $this->_isBot;
-		}
+        /**
+         * Detects if a request is made by a spider/crawler
+         *
+         * @return bool
+         */
+        public function isBot() {
+            if ($this->_isBot === null) {
+                $agent = env('HTTP_USER_AGENT');
+                $imploded = implode('|', $this->_bots);
+                $this->_isBot = (bool)preg_match('/' . $imploded . '/i', $agent);
+            }
+            return $this->_isBot;
+        }
 
-		/**
-		 * Detect if a request was made by a browser preview feature
-		 *
-		 * Adds the isPreview() method to the controllers request object.
-		 *
-		 * Supports:
-		 *
-		 * - Safari top sites
-		 * - Firefox prefetch
-		 *
-		 * @return bool
-		 */
-		public static function isPreview() {
-			$_isPreview = (
-					(env('HTTP_X_PURPOSE') === 'preview') // Safari
-					|| (env('HTTP_X_MOZ') === 'prefetch') // Firefox
-			);
-			return $_isPreview;
-		}
+        /**
+         * Detect if a request was made by a browser preview feature
+         *
+         * Adds the isPreview() method to the controllers request object.
+         *
+         * Supports:
+         *
+         * - Safari top sites
+         * - Firefox prefetch
+         *
+         * @return bool
+         */
+        public static function isPreview() {
+            $_isPreview = (
+                    (env('HTTP_X_PURPOSE') === 'preview') // Safari
+                    || (env('HTTP_X_MOZ') === 'prefetch') // Firefox
+            );
+            return $_isPreview;
+        }
 
-	}
\ No newline at end of file
+    }
\ No newline at end of file

app/Plugin/Sitemap/Test/Case/Controller/SitemapsControllerTest.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 			$result = $this->testAction('/sitemaps/index.xml',
 					['method' => 'GET', 'return' => 'contents']);
 			$baseUrl = $this->controller->base;
-			$this->assertContains($baseUrl . '/sitemaps/file/sitemap-entries-1-20000.xml',
+			$this->assertContains($baseUrl.'/sitemaps/file/sitemap-entries-1-20000.xml',
 					$result);
 		}
 

Indentation +57 added lines, -57 removed lines

@@ -1,64 +1,64 @@
 <?php
-	App::uses('SitemapsController', 'Sitemap.Controller');
+    App::uses('SitemapsController', 'Sitemap.Controller');
 
-	/**
-	 * SitemapsController Test Case
-	 *
-	 */
-	class SitemapsControllerTest extends ControllerTestCase {
+    /**
+     * SitemapsController Test Case
+     *
+     */
+    class SitemapsControllerTest extends ControllerTestCase {
 
-		/**
-		 * Fixtures
-		 *
-		 * @var array
-		 */
-		public $fixtures = array(
-				'setting',
-				'user',
-				'user_online',
-				'bookmark',
-				'entry',
-				'category',
-				'esevent',
-				'esnotification',
-				'user_read',
-				'upload'
-		);
+        /**
+         * Fixtures
+         *
+         * @var array
+         */
+        public $fixtures = array(
+                'setting',
+                'user',
+                'user_online',
+                'bookmark',
+                'entry',
+                'category',
+                'esevent',
+                'esnotification',
+                'user_read',
+                'upload'
+        );
 
-		/**
-		 * testIndex method
-		 *
-		 * basic test that at least something is in the output
-		 *
-		 * @return void
-		 */
-		public function testIndex() {
-			$result = $this->testAction('/sitemaps/index.xml',
-					['method' => 'GET', 'return' => 'contents']);
-			$baseUrl = $this->controller->base;
-			$this->assertContains($baseUrl . '/sitemaps/file/sitemap-entries-1-20000.xml',
-					$result);
-		}
+        /**
+         * testIndex method
+         *
+         * basic test that at least something is in the output
+         *
+         * @return void
+         */
+        public function testIndex() {
+            $result = $this->testAction('/sitemaps/index.xml',
+                    ['method' => 'GET', 'return' => 'contents']);
+            $baseUrl = $this->controller->base;
+            $this->assertContains($baseUrl . '/sitemaps/file/sitemap-entries-1-20000.xml',
+                    $result);
+        }
 
-		/**
-		 * testFile method
-		 *
-		 * basic test that at least something is in the output
-		 *
-		 * @return void
-		 */
-		public function testFile() {
-			$result = $this->testAction('/sitemaps/file/sitemap-entries-1-20000.xml',
-					['method' => 'GET', 'return' => 'contents']);
-			$baseUrl = $this->controller->base;
-			$this->assertContains("{$baseUrl}/entries/view/1</loc>", $result);
-			$this->assertNotContains("{$baseUrl}/entries/view/4</loc>", $result);
-			$this->assertNotContains("{$baseUrl}/entries/view/6</loc>", $result);
-		}
+        /**
+         * testFile method
+         *
+         * basic test that at least something is in the output
+         *
+         * @return void
+         */
+        public function testFile() {
+            $result = $this->testAction('/sitemaps/file/sitemap-entries-1-20000.xml',
+                    ['method' => 'GET', 'return' => 'contents']);
+            $baseUrl = $this->controller->base;
+            $this->assertContains("{$baseUrl}/entries/view/1</loc>", $result);
+            $this->assertNotContains("{$baseUrl}/entries/view/4</loc>", $result);
+            $this->assertNotContains("{$baseUrl}/entries/view/6</loc>", $result);
+        }
 
-		public function setUp() {
-			Cache::clear(false, 'sitemap');
-			parent::setUp();
-		}
+        public function setUp() {
+            Cache::clear(false, 'sitemap');
+            parent::setUp();
+        }
 
-	}
+    }

app/Plugin/Sitemap/View/Helper/SitemapHelper.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 	class SitemapHelper extends AppHelper {
 
 		public function sitemapUrl() {
-			return $this->baseUrl() . 'sitemap.xml';
+			return $this->baseUrl().'sitemap.xml';
 		}
 
 		public function baseUrl() {

Indentation +9 added lines, -9 removed lines

@@ -1,15 +1,15 @@
 <?php
 
-	App::uses('AppHelper', 'View/Helper');
+    App::uses('AppHelper', 'View/Helper');
 
-	class SitemapHelper extends AppHelper {
+    class SitemapHelper extends AppHelper {
 
-		public function sitemapUrl() {
-			return $this->baseUrl() . 'sitemap.xml';
-		}
+        public function sitemapUrl() {
+            return $this->baseUrl() . 'sitemap.xml';
+        }
 
-		public function baseUrl() {
-			return $this->url('/', true);
-		}
+        public function baseUrl() {
+            return $this->url('/', true);
+        }
 
-	}
+    }

app/Plugin/Sitemap/Lib/SitemapEntries.php

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
 					$changefreq = 'hourly';
 				}
 				$urls[] = [
-						'loc' => 'entries/view/' . $entry['Entry']['id'],
+						'loc' => 'entries/view/'.$entry['Entry']['id'],
 						'lastmod' => Date('c', $lastmod),
 						'changefreq' => $changefreq
 				];

Indentation +89 added lines, -89 removed lines

@@ -1,101 +1,101 @@
 <?php
 
-	App::uses('SitemapGenerator', 'Sitemap.Lib');
+    App::uses('SitemapGenerator', 'Sitemap.Lib');
 
-	class SitemapEntries extends SitemapGenerator {
+    class SitemapEntries extends SitemapGenerator {
 
-		protected $_type = 'entries';
+        protected $_type = 'entries';
 
-		public function files() {
-			$this->_Controller->loadModel('Entry');
-			$entry = $this->_Controller->Entry->find('first',
-					[
-							'contain' => ['Category'],
-							'conditions' => ['Category.accession' => 0],
-							'order' => ['Entry.id' => 'DESC']
-					]
-			);
+        public function files() {
+            $this->_Controller->loadModel('Entry');
+            $entry = $this->_Controller->Entry->find('first',
+                    [
+                            'contain' => ['Category'],
+                            'conditions' => ['Category.accession' => 0],
+                            'order' => ['Entry.id' => 'DESC']
+                    ]
+            );
 
-			$count = (empty($entry)) ? 0 : $entry['Entry']['id'];
-			$count = intval($count / $this->_divider) + 1;
-			$files = [];
-			for ($i = 0; $i < $count; $i++) {
-				$start = $i * $this->_divider + 1;
-				$end = ($i + 1) * $this->_divider;
-				$files[] = ['url' => $this->_filename([$start, $end])];
-			}
-			return $files;
-		}
+            $count = (empty($entry)) ? 0 : $entry['Entry']['id'];
+            $count = intval($count / $this->_divider) + 1;
+            $files = [];
+            for ($i = 0; $i < $count; $i++) {
+                $start = $i * $this->_divider + 1;
+                $end = ($i + 1) * $this->_divider;
+                $files[] = ['url' => $this->_filename([$start, $end])];
+            }
+            return $files;
+        }
 
-		/**
-		 *
-		 * @param $params
-		 * @return array|mixed
-		 * @throws InvalidArgumentException
-		 */
-		protected function _parseParams($params) {
-			$start = filter_var($params[0], FILTER_VALIDATE_INT);
-			$end = filter_var($params[1], FILTER_VALIDATE_INT);
-			if (!$start || !$end || ($end - $start) > $this->_divider ||
-					// entries must be in even divider range
-					// prevents maliciously spamming the server with new cache files
-					($start - 1) % $this->_divider !== 0 ||
-					($end) % $this->_divider !== 0
+        /**
+         *
+         * @param $params
+         * @return array|mixed
+         * @throws InvalidArgumentException
+         */
+        protected function _parseParams($params) {
+            $start = filter_var($params[0], FILTER_VALIDATE_INT);
+            $end = filter_var($params[1], FILTER_VALIDATE_INT);
+            if (!$start || !$end || ($end - $start) > $this->_divider ||
+                    // entries must be in even divider range
+                    // prevents maliciously spamming the server with new cache files
+                    ($start - 1) % $this->_divider !== 0 ||
+                    ($end) % $this->_divider !== 0
 
-			) {
-				throw new InvalidArgumentException;
-			}
-			return ['start' => $start, 'end' => $end];
-		}
+            ) {
+                throw new InvalidArgumentException;
+            }
+            return ['start' => $start, 'end' => $end];
+        }
 
-		protected function _content($params) {
-			$now = time();
-			$filename = $this->_filename([$params['start'], $params['end']]);
-			$cache = Cache::read($filename, 'sitemap');
-			if ($cache) {
-				return $cache;
-			}
+        protected function _content($params) {
+            $now = time();
+            $filename = $this->_filename([$params['start'], $params['end']]);
+            $cache = Cache::read($filename, 'sitemap');
+            if ($cache) {
+                return $cache;
+            }
 
-			$this->_Controller->loadModel('Entry');
-			$entries = $this->_Controller->Entry->find('all',
-					[
-							'contain' => ['Category'],
-							'conditions' =>
-									[
-											'Category.accession' => 0,
-											'Entry.id >=' => $params['start'],
-											'Entry.id <=' => $params['end'],
-									],
-							'fields' => ['Entry.id', 'Entry.time', 'Entry.edited']
-					]
-			);
-			$urls = [];
-			if (empty($entries)) {
-				return $urls;
-			}
-			foreach ($entries as $key => $entry) {
-				unset($entries[$key]);
-				if (!empty($entry['Entry']['edited'])) {
-					$lastmod = strtotime($entry['Entry']['edited']);
-				} else {
-					$lastmod = strtotime($entry['Entry']['time']);
-				}
-				if ($now > ($lastmod + (3 * DAY))) { // old entries
-					$changefreq = 'monthly';
-				} elseif ($now > ($lastmod + DAY)) { // recently active entries
-					$changefreq = 'daily';
-				} else { // currently active entries
-					$changefreq = 'hourly';
-				}
-				$urls[] = [
-						'loc' => 'entries/view/' . $entry['Entry']['id'],
-						'lastmod' => Date('c', $lastmod),
-						'changefreq' => $changefreq
-				];
-			}
+            $this->_Controller->loadModel('Entry');
+            $entries = $this->_Controller->Entry->find('all',
+                    [
+                            'contain' => ['Category'],
+                            'conditions' =>
+                                    [
+                                            'Category.accession' => 0,
+                                            'Entry.id >=' => $params['start'],
+                                            'Entry.id <=' => $params['end'],
+                                    ],
+                            'fields' => ['Entry.id', 'Entry.time', 'Entry.edited']
+                    ]
+            );
+            $urls = [];
+            if (empty($entries)) {
+                return $urls;
+            }
+            foreach ($entries as $key => $entry) {
+                unset($entries[$key]);
+                if (!empty($entry['Entry']['edited'])) {
+                    $lastmod = strtotime($entry['Entry']['edited']);
+                } else {
+                    $lastmod = strtotime($entry['Entry']['time']);
+                }
+                if ($now > ($lastmod + (3 * DAY))) { // old entries
+                    $changefreq = 'monthly';
+                } elseif ($now > ($lastmod + DAY)) { // recently active entries
+                    $changefreq = 'daily';
+                } else { // currently active entries
+                    $changefreq = 'hourly';
+                }
+                $urls[] = [
+                        'loc' => 'entries/view/' . $entry['Entry']['id'],
+                        'lastmod' => Date('c', $lastmod),
+                        'changefreq' => $changefreq
+                ];
+            }
 
-			Cache::write($filename, $urls, 'sitemap');
-			return $urls;
-		}
+            Cache::write($filename, $urls, 'sitemap');
+            return $urls;
+        }
 
-	}
\ No newline at end of file
+    }
\ No newline at end of file

app/Plugin/Sitemap/Lib/SitemapGenerator.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 		protected function _filename($params = []) {
 			$filename = "sitemap-{$this->_type}";
 			if ($params) {
-				$filename .= '-' . implode('-', $params);
+				$filename .= '-'.implode('-', $params);
 			}
 			return $filename;
 		}

Indentation +72 added lines, -72 removed lines

@@ -1,85 +1,85 @@
 <?php
 
-	abstract class SitemapGenerator {
+    abstract class SitemapGenerator {
 
-		/**
-		 * Number of URLs per sitemap file.
-		 *
-		 * Mostly bound by memory available to PHP on server
-		 *
-		 * @var int
-		 */
-		protected $_divider = 20000;
+        /**
+         * Number of URLs per sitemap file.
+         *
+         * Mostly bound by memory available to PHP on server
+         *
+         * @var int
+         */
+        protected $_divider = 20000;
 
-		protected $_Controller;
+        protected $_Controller;
 
-		protected $_type = null;
+        protected $_type = null;
 
-		/**
-		 * @param Controller $Controller
-		 * @throws Exception
-		 */
-		public function __construct(Controller $Controller) {
-			$this->_Controller = $Controller;
-			if ($this->_type === null) {
-				throw new Exception('SitemapGenerator type not set.');
-			}
-			return $this;
-		}
+        /**
+         * @param Controller $Controller
+         * @throws Exception
+         */
+        public function __construct(Controller $Controller) {
+            $this->_Controller = $Controller;
+            if ($this->_type === null) {
+                throw new Exception('SitemapGenerator type not set.');
+            }
+            return $this;
+        }
 
-		/**
-		 * Returns sitemap file
-		 *
-		 * @return array keys: 'url'
-		 */
-		abstract public function files();
+        /**
+         * Returns sitemap file
+         *
+         * @return array keys: 'url'
+         */
+        abstract public function files();
 
-		public function content($file) {
-			list($type, $params) = $this->_parseFilename($file);
-			if ($type !== $this->_type) {
-				return false;
-			}
-			return $this->_content($this->_parseParams($params));
-		}
+        public function content($file) {
+            list($type, $params) = $this->_parseFilename($file);
+            if ($type !== $this->_type) {
+                return false;
+            }
+            return $this->_content($this->_parseParams($params));
+        }
 
-		/**
-		 *
-		 * @param $name
-		 * @return array
-		 * @throws InvalidArgumentException
-		 */
-		protected function _parseFilename($name) {
-			preg_match('/sitemap-(?P<type>\w*)(-(?P<params>.*))?(\.(\w*))?$/',
-					$name,
-					$matches);
-			if (empty($matches['type'])) {
-				throw new InvalidArgumentException;
-			}
-			return [$matches['type'], explode('-', $matches['params'])];
-		}
+        /**
+         *
+         * @param $name
+         * @return array
+         * @throws InvalidArgumentException
+         */
+        protected function _parseFilename($name) {
+            preg_match('/sitemap-(?P<type>\w*)(-(?P<params>.*))?(\.(\w*))?$/',
+                    $name,
+                    $matches);
+            if (empty($matches['type'])) {
+                throw new InvalidArgumentException;
+            }
+            return [$matches['type'], explode('-', $matches['params'])];
+        }
 
-		/**
-		 * Parse and validate params. Should throw exception if params are not valid.
-		 *
-		 * @param $params
-		 * @return mixed processed params
-		 */
-		abstract protected function _parseParams($params);
+        /**
+         * Parse and validate params. Should throw exception if params are not valid.
+         *
+         * @param $params
+         * @return mixed processed params
+         */
+        abstract protected function _parseParams($params);
 
-		/**
-		 * Generate urls
-		 *
-		 * @param $params
-		 * @return string urls
-		 */
-		abstract protected function _content($params);
+        /**
+         * Generate urls
+         *
+         * @param $params
+         * @return string urls
+         */
+        abstract protected function _content($params);
 
-		protected function _filename($params = []) {
-			$filename = "sitemap-{$this->_type}";
-			if ($params) {
-				$filename .= '-' . implode('-', $params);
-			}
-			return $filename;
-		}
+        protected function _filename($params = []) {
+            $filename = "sitemap-{$this->_type}";
+            if ($params) {
+                $filename .= '-' . implode('-', $params);
+            }
+            return $filename;
+        }
 
-	}
\ No newline at end of file
+    }
\ No newline at end of file

app/Plugin/Api/Controller/ApiUsersController.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 				throw new BadRequestException('User id is missing.');
 			}
 			$_userId = $this->request->data['id'];
-			if ((int)$_userId !== $this->CurrentUser->getId()) {
+			if ((int) $_userId !== $this->CurrentUser->getId()) {
 				throw new ForbiddenException(sprintf(
 					'Not allowed to logout user with id `%s`.',
 					$_userId

Indentation +84 added lines, -84 removed lines

@@ -1,112 +1,112 @@
 <?php
 
-	App::uses('ApiAppController', 'Api.Controller');
+    App::uses('ApiAppController', 'Api.Controller');
 
-	class ApiUsersController extends ApiAppController {
+    class ApiUsersController extends ApiAppController {
 
-		public $uses = [
-			'User'
-		];
+        public $uses = [
+            'User'
+        ];
 
-		public $helpers = [
-			'Api.Api'
-		];
+        public $helpers = [
+            'Api.Api'
+        ];
 
-		public $saveKeysToOutput = [];
+        public $saveKeysToOutput = [];
 
 /**
  * @throws UnauthorizedException
  * @throws BadRequestException
  */
-		public function login() {
-			$this->CurrentUser->logout();
+        public function login() {
+            $this->CurrentUser->logout();
 
-			if (isset($this->request->data['username']) === false) {
-				throw new BadRequestException('Field `username` is missing.');
-			}
+            if (isset($this->request->data['username']) === false) {
+                throw new BadRequestException('Field `username` is missing.');
+            }
 
-			if (isset($this->request->data['password']) === false) {
-				throw new BadRequestException('Field `password` is missing.');
-			}
+            if (isset($this->request->data['password']) === false) {
+                throw new BadRequestException('Field `password` is missing.');
+            }
 
-			$this->request->data = [
-				'User' => [
-					'username' => $this->request->data['username'],
-					'password' => $this->request->data['password'],
-					'remember_me' => empty($this->request->data['remember_me']) ? false : true
-				]
-			];
+            $this->request->data = [
+                'User' => [
+                    'username' => $this->request->data['username'],
+                    'password' => $this->request->data['password'],
+                    'remember_me' => empty($this->request->data['remember_me']) ? false : true
+                ]
+            ];
 
-			$this->CurrentUser->login();
+            $this->CurrentUser->login();
 
-			if ($this->CurrentUser->isLoggedIn() !== true) {
-				throw new UnauthorizedException(
-					'Login failed. Check your username and password.'
-				);
-			}
-		}
+            if ($this->CurrentUser->isLoggedIn() !== true) {
+                throw new UnauthorizedException(
+                    'Login failed. Check your username and password.'
+                );
+            }
+        }
 
 /**
  * @throws BadRequestException
  * @throws ForbiddenException
  */
-		public function logout() {
-			if (!$this->CurrentUser->isLoggedIn()) {
-				throw new ForbiddenException('You are not logged in.');
-			}
-			if (!isset($this->request->data['id'])) {
-				throw new BadRequestException('User id is missing.');
-			}
-			$_userId = $this->request->data['id'];
-			if ((int)$_userId !== $this->CurrentUser->getId()) {
-				throw new ForbiddenException(sprintf(
-					'Not allowed to logout user with id `%s`.',
-					$_userId
-				));
-			}
-			$this->CurrentUser->logout();
-		}
+        public function logout() {
+            if (!$this->CurrentUser->isLoggedIn()) {
+                throw new ForbiddenException('You are not logged in.');
+            }
+            if (!isset($this->request->data['id'])) {
+                throw new BadRequestException('User id is missing.');
+            }
+            $_userId = $this->request->data['id'];
+            if ((int)$_userId !== $this->CurrentUser->getId()) {
+                throw new ForbiddenException(sprintf(
+                    'Not allowed to logout user with id `%s`.',
+                    $_userId
+                ));
+            }
+            $this->CurrentUser->logout();
+        }
 
 /**
  * @throws InvalidArgumentException
  * @throws ForbiddenException
  */
-		public function markasread() {
-			if (!isset($this->request->data['id'])) {
-				throw new InvalidArgumentException('User id is missing.');
-			}
-			$_userId = $this->request->data['id'];
-			if (!$this->CurrentUser->isLoggedIn() ||
-					$this->CurrentUser->getId() != $_userId
-			) {
-				throw new ForbiddenException(sprintf(
-					'You are not authorized for user id `%s`.',
-					$_userId
-				));
-			}
-			if (isset($this->request->data['last_refresh'])) {
-				$timestamp = strtotime($this->request->data['last_refresh']);
-				if ($timestamp === false) {
-					throw new InvalidArgumentException(sprintf(
-						'`%s` is not a valid timestamp string.',
-						$timestamp
-					));
-				}
-				$isServerTimestampNewer =
-						strtotime($this->CurrentUser['last_refresh']) > $timestamp;
-				if ($isServerTimestampNewer === false) {
-					$this->CurrentUser->LastRefresh->set(date("Y-m-d H:i:s", $timestamp));
-				}
-			} else {
-				$this->CurrentUser->LastRefresh->set('now');
-			}
-			$this->set('id', $_userId);
-			$this->set('last_refresh', $this->CurrentUser['last_refresh']);
-		}
+        public function markasread() {
+            if (!isset($this->request->data['id'])) {
+                throw new InvalidArgumentException('User id is missing.');
+            }
+            $_userId = $this->request->data['id'];
+            if (!$this->CurrentUser->isLoggedIn() ||
+                    $this->CurrentUser->getId() != $_userId
+            ) {
+                throw new ForbiddenException(sprintf(
+                    'You are not authorized for user id `%s`.',
+                    $_userId
+                ));
+            }
+            if (isset($this->request->data['last_refresh'])) {
+                $timestamp = strtotime($this->request->data['last_refresh']);
+                if ($timestamp === false) {
+                    throw new InvalidArgumentException(sprintf(
+                        '`%s` is not a valid timestamp string.',
+                        $timestamp
+                    ));
+                }
+                $isServerTimestampNewer =
+                        strtotime($this->CurrentUser['last_refresh']) > $timestamp;
+                if ($isServerTimestampNewer === false) {
+                    $this->CurrentUser->LastRefresh->set(date("Y-m-d H:i:s", $timestamp));
+                }
+            } else {
+                $this->CurrentUser->LastRefresh->set('now');
+            }
+            $this->set('id', $_userId);
+            $this->set('last_refresh', $this->CurrentUser['last_refresh']);
+        }
 
-		public function beforeFilter() {
-			parent::beforeFilter();
-			$this->Auth->allow('login', 'logout');
-		}
+        public function beforeFilter() {
+            parent::beforeFilter();
+            $this->Auth->allow('login', 'logout');
+        }
 
-	}
+    }