Completed
Pull Request — master (#1)
by Jacob
03:28
created
utility/Loader.class.inc.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -17,14 +17,14 @@  discard block
 block discarded – undo
17 17
 
18 18
 	public static function instance()
19 19
 	{
20
-		if(!isset(self::$instance))
20
+		if (!isset(self::$instance))
21 21
 			self::$instance = new Loader();
22 22
 		return self::$instance;
23 23
 	}
24 24
 
25 25
 	private function get_root()
26 26
 	{
27
-		if(!isset($this->root))
27
+		if (!isset($this->root))
28 28
 		{
29 29
 			$current_directory = dirname(__FILE__);
30 30
 			$current_directory = substr($current_directory, 0, -7);
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 
53 53
 	private static function get_extension($type)
54 54
 	{
55
-		switch($type)
55
+		switch ($type)
56 56
 		{
57 57
 			case 'collector' :
58 58
 			case 'controller' :
@@ -104,18 +104,18 @@  discard block
 block discarded – undo
104 104
 
105 105
 	public static function load($type, $files, $data = array())
106 106
 	{
107
-		foreach((array) $files as $file)
107
+		foreach ((array) $files as $file)
108 108
 		{
109 109
 			$file_path = self::instance()->get_path($type, $file);
110
-			if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
110
+			if (in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
111 111
 				continue;
112 112
 			
113
-			if(!file_exists($file_path))
113
+			if (!file_exists($file_path))
114 114
 				Debugger::logMessage("Requested file does not exist: {$type}, {$file}");
115 115
 			
116 116
 			self::instance()->add_included_file($file_path);
117 117
 			
118
-			switch($type)
118
+			switch ($type)
119 119
 			{
120 120
 				case 'images' :
121 121
 				case 'scripts' :
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 		
146 146
 		$reflectionObject = self::create_reflection_class($file);
147 147
 		
148
-		if(
148
+		if (
149 149
 			$reflectionObject->hasMethod('instance') &&
150 150
 			$reflectionObject->getMethod('instance')->isStatic())
151 151
 		{
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
 		
161 161
 		$reflectionObject = self::create_reflection_class($file);
162 162
 		
163
-		if($reflectionObject->hasMethod('__construct'))
163
+		if ($reflectionObject->hasMethod('__construct'))
164 164
 			return $reflectionObject->newInstanceArgs($data);
165 165
 		else
166 166
 			return $reflectionObject->newInstance();
Please login to merge, or discard this patch.
router/Router.class.inc.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -18,10 +18,10 @@  discard block
 block discarded – undo
18 18
 
19 19
 	private static function get_router_name()
20 20
 	{
21
-		if(Request::isAJAX())
21
+		if (Request::isAJAX())
22 22
 			return 'AJAXRouter';
23 23
 		
24
-		switch(URLDecode::getSite())
24
+		switch (URLDecode::getSite())
25 25
 		{
26 26
 			case 'ajax' :
27 27
 				return 'AjaxRouter';
@@ -66,36 +66,36 @@  discard block
 block discarded – undo
66 66
 
67 67
 	final protected function check_for_redirect($redirect_uri)
68 68
 	{
69
-		foreach($this->get_redirect_array() as $check)
69
+		foreach ($this->get_redirect_array() as $check)
70 70
 		{
71 71
 			$redirect_uri = preg_replace($check->pattern, $check->replace, $redirect_uri);
72 72
 		}
73 73
 		
74 74
 		$redirect_uri = $this->check_for_special_redirect($redirect_uri);
75 75
 		
76
-		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
76
+		if ($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
77 77
 			$redirect_uri .= '/';
78 78
 		
79 79
         if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
80 80
             $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
81 81
         }
82 82
         
83
-		if($redirect_uri == URLDecode::getURI())
83
+		if ($redirect_uri == URLDecode::getURI())
84 84
 			return;
85 85
 		
86 86
 		$controller_check = $redirect_uri;
87
-		if(substr($redirect_uri, 0, 4) == 'http')
87
+		if (substr($redirect_uri, 0, 4) == 'http')
88 88
 			$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);
89 89
 		
90 90
 		$controller = $this->get_controller($controller_check);
91
-		if($controller == '/Error404Controller')
91
+		if ($controller == '/Error404Controller')
92 92
 		{
93 93
 			Loader::loadNew('controller', '/Error404Controller')
94 94
 				->activate();
95 95
 			exit;
96 96
 		}
97 97
 
98
-		if(substr($redirect_uri, 0, 4) != 'http')
98
+		if (substr($redirect_uri, 0, 4) != 'http')
99 99
 		{
100 100
 			$redirect_uri = substr($redirect_uri, 1);
101 101
 			$redirect_uri = URLDecode::getBase() . $redirect_uri;
@@ -112,12 +112,12 @@  discard block
 block discarded – undo
112 112
 
113 113
 	final private function get_controller($uri)
114 114
 	{
115
-		foreach($this->get_direct_array() as $check)
115
+		foreach ($this->get_direct_array() as $check)
116 116
 		{
117
-			if($uri == $check->match)
117
+			if ($uri == $check->match)
118 118
 				return "{$this->get_primary_folder()}/{$check->controller}";
119 119
 			
120
-			if(preg_match("@^{$check->match}$@", $uri))
120
+			if (preg_match("@^{$check->match}$@", $uri))
121 121
 				return "{$this->get_primary_folder()}/{$check->controller}";
122 122
 		}
123 123
 		
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 
127 127
 	final private function get_primary_folder()
128 128
 	{
129
-		if(Request::isAjax())
129
+		if (Request::isAjax())
130 130
 			return 'ajax';
131 131
 		
132 132
 		return URLDecode::getSite();
Please login to merge, or discard this patch.
src/Domain/Portfolio/Piece/PieceRepositoryInterface.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,5 +4,5 @@
 block discarded – undo
4 4
 
5 5
 interface PieceRepositoryInterface
6 6
 {
7
-    public function getPieces($limit = null, $offset= 0);
7
+    public function getPieces($limit = null, $offset = 0);
8 8
 }
Please login to merge, or discard this patch.
src/Domain/Waterfall/Log/LogRepositoryInterface.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,5 +4,5 @@
 block discarded – undo
4 4
 
5 5
 interface LogRepositoryInterface
6 6
 {
7
-    public function getActiveLogs($limit = null, $offset= 0);
7
+    public function getActiveLogs($limit = null, $offset = 0);
8 8
 }
Please login to merge, or discard this patch.
src/Domain/Waterfall/Waterfall/WaterfallRepositoryInterface.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,5 +4,5 @@
 block discarded – undo
4 4
 
5 5
 interface WaterfallRepositoryInterface
6 6
 {
7
-    public function getWaterfalls($limit = null, $offset= 0);
7
+    public function getWaterfalls($limit = null, $offset = 0);
8 8
 }
Please login to merge, or discard this patch.
src/Domain/Comment/Comment/CommentRepositoryInterface.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,5 +4,5 @@
 block discarded – undo
4 4
 
5 5
 interface CommentRepositoryInterface
6 6
 {
7
-    public function getActiveCommentsBySite($site, $limit = null, $offset= 0);
7
+    public function getActiveCommentsBySite($site, $limit = null, $offset = 0);
8 8
 }
Please login to merge, or discard this patch.
script/cron/generate-rss-feeds.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
  * @param string $folder
17 17
  * @return boolean
18 18
  */
19
-$buildFeed = function (Feed $feed, $folder, $name = 'rss') {
19
+$buildFeed = function(Feed $feed, $folder, $name = 'rss') {
20 20
     $tempFeed = __DIR__ . "/../../public/{$folder}/{$name}-new.xml";
21 21
     $finalFeed = __DIR__ . "/../../public/{$folder}/{$name}.xml";
22 22
 
Please login to merge, or discard this patch.
script/cron/build-activity-stream.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -406,7 +406,7 @@
 block discarded – undo
406 406
 
407 407
     $messageLong = $twitterData['text'];
408 408
     krsort($entityHolder);
409
-    foreach($entityHolder as $entity)
409
+    foreach ($entityHolder as $entity)
410 410
     {
411 411
         $messageLong = substr_replace(
412 412
             $messageLong,
Please login to merge, or discard this patch.
controller/PageController.class.inc.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 			'date' => date('Y')));
39 39
 		
40 40
 		Loader::loadInstance('utility', 'Database');
41
-		if(Database::isConnected() === false)
41
+		if (Database::isConnected() === false)
42 42
 			$this->unavailable();
43 43
 	}
44 44
 
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
         $post_result = $activityRepository->getActivities(5);
64 64
 
65 65
         $post_array = array();
66
-        foreach($post_result as $row) {
66
+        foreach ($post_result as $row) {
67 67
             array_push($post_array, $this->expand_post($row));
68 68
         }
69 69
 
@@ -99,9 +99,9 @@  discard block
 block discarded – undo
99 99
 		$headers = $this->headers;
100 100
 		Header::$headers();
101 101
 		Loader::load('view', '/Head', $this->data_array['head']);
102
-		foreach($this->body_view_array as $view)
102
+		foreach ($this->body_view_array as $view)
103 103
 		{
104
-			if(substr($view, 0, 1) == '/')
104
+			if (substr($view, 0, 1) == '/')
105 105
 				Loader::load('view', $view, $this->data_array['body']);
106 106
 			else
107 107
 				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
             Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
114 114
         }
115 115
 		
116
-		if($view == '/404' || $view == '/503')
116
+		if ($view == '/404' || $view == '/503')
117 117
 			exit;
118 118
 	}
119 119
 
@@ -169,10 +169,10 @@  discard block
 block discarded – undo
169 169
 
170 170
 	private function load_assets()
171 171
 	{
172
-    $css_array = array_map(function ($stylesheet) {
172
+    $css_array = array_map(function($stylesheet) {
173 173
       return "/css/{$stylesheet}.css";
174 174
     }, $this->css_array);
175
-    $js_array = array_map(function ($script) {
175
+    $js_array = array_map(function($script) {
176 176
       if (substr($script, 0, 4) == 'http') {
177 177
         return $script;
178 178
       }
@@ -190,26 +190,26 @@  discard block
 block discarded – undo
190 190
 
191 191
 	protected function eject()
192 192
 	{
193
-		if(get_class($this) !== 'Error404Controller')
193
+		if (get_class($this) !== 'Error404Controller')
194 194
 			Loader::loadNew('controller', '/Error404Controller')->activate();
195 195
 	}
196 196
 
197 197
 	protected function unavailable()
198 198
 	{
199
-		if(get_class($this) !== 'Error503Controller')
199
+		if (get_class($this) !== 'Error503Controller')
200 200
 			Loader::loadNew('controller', '/Error503Controller')->activate();
201 201
 	}
202 202
 
203 203
 	protected function redirect($uri, $method = 301)
204 204
 	{
205
-		switch($method)
205
+		switch ($method)
206 206
 		{
207 207
 			case 301 :
208
-				if(get_class($this) !== 'Error301Controller')
208
+				if (get_class($this) !== 'Error301Controller')
209 209
 					Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();
210 210
 				break;
211 211
 			case 303 :
212
-				if(get_class($this) !== 'Error303Controller')
212
+				if (get_class($this) !== 'Error303Controller')
213 213
 					Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();
214 214
 				break;
215 215
 		}
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
 	private $comment_errors;
230 230
 	protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)
231 231
 	{
232
-		if(Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
232
+		if (Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
233 233
 		{
234 234
 			$parameters = array($site_id, $path, $redirect_url, $page_title);
235 235
 			$this->comment_errors = Loader::loadNew('module', 'form/CommentSubmitModule', $parameters)->activate();
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 		$comment_array = array();
248 248
 		$comment_result = CommentCollector::getCommentsForURL($site, $path, $commenter->id);
249 249
 		
250
-		foreach($comment_result as $comment)
250
+		foreach ($comment_result as $comment)
251 251
 		{
252 252
 			$comment_object = new stdclass();
253 253
 			$comment_object->id = $comment->id;
@@ -257,12 +257,12 @@  discard block
 block discarded – undo
257 257
 			$comment_object->url = $comment->url;
258 258
 			$comment_object->trusted = $comment->trusted;
259 259
 			
260
-			if($comment->reply == 0 && Request::getPost('type') == $comment->id)
260
+			if ($comment->reply == 0 && Request::getPost('type') == $comment->id)
261 261
 				$comment_object->errors = $this->comment_errors;
262 262
 			else
263 263
 				$comment_object->errors = array();
264 264
 			
265
-			if($comment->reply == 0)
265
+			if ($comment->reply == 0)
266 266
 			{
267 267
 				$comment_object->replies = array();
268 268
 				$comment_array[$comment->id] = $comment_object;
@@ -293,21 +293,21 @@  discard block
 block discarded – undo
293 293
 		$commenter->website = '';
294 294
 		
295 295
 		$commenter_cookie = Cookie::instance('Commenter');
296
-		if(!$commenter_cookie->exists())
296
+		if (!$commenter_cookie->exists())
297 297
 			return $commenter;
298 298
 		
299 299
 		$commenter_cookie_value = $commenter_cookie->getValue();
300 300
 		$commenter_cookie_value = json_decode($commenter_cookie_value);
301 301
 		
302
-		if($commenter_cookie_value === NULL)
302
+		if ($commenter_cookie_value === NULL)
303 303
 			return $commenter;
304 304
 		
305
-		if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email))
305
+		if (!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email))
306 306
 			return $commenter;
307 307
 		
308 308
 		$commenter_object = CommentCollector::getCommenterByFields($commenter_cookie_value->name, $commenter_cookie_value->email, (isset($commenter_cookie_value->website) ? $commenter_cookie_value->website : ''));
309 309
 		
310
-		if($commenter_object === NULL)
310
+		if ($commenter_object === NULL)
311 311
 			return $commenter;
312 312
 		
313 313
 		$commenter->id = $commenter_object->id;
Please login to merge, or discard this patch.