Completed
Push — master ( 67df75...25777a )
by Jacob
09:40 queued 05:17
created
controller/blog/DefaultPageController.class.inc.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@
 block discarded – undo
86 86
 		Loader::load('collector', 'blog/TagCollector');
87 87
 		
88 88
 		$tag_result = TagCollector::getTagsForPost($post->id);
89
-        $tag_array = array();
89
+		$tag_array = array();
90 90
 		foreach($tag_result as $tag)
91 91
 		{
92 92
 			$tag_object = new stdclass();
Please login to merge, or discard this patch.
controller/site/ContactController.class.inc.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 				'value' => Request::getPost());
47 47
 		}
48 48
 		
49
-        global $config;
49
+		global $config;
50 50
 		$mail = new Mail();
51 51
 		$mail->setToAddress($config->admin_email, 'Jacob Emerick');
52 52
 		$mail->setSubject('Site Contact');
Please login to merge, or discard this patch.
controller/robot/WaterfallsRobotController.class.inc.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -5,9 +5,9 @@
 block discarded – undo
5 5
 class WaterfallsRobotController extends RobotController
6 6
 {
7 7
 
8
-    protected function set_data()
9
-    {
10
-        $this->disallow_for_all_robots('/search/');
11
-    }
8
+	protected function set_data()
9
+	{
10
+		$this->disallow_for_all_robots('/search/');
11
+	}
12 12
 
13 13
 }
Please login to merge, or discard this patch.
controller/portfolio/ContactController.class.inc.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
 		
48 48
 		else
49 49
 		{
50
-            global $config;
50
+			global $config;
51 51
 			$mail = new Mail();
52 52
 			$mail->setToAddress($config->admin_email, 'Jacob Emerick');
53 53
 			$mail->setSubject('Portfolio Contact');
Please login to merge, or discard this patch.
module/form/CommentSubmitModule.class.inc.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -172,24 +172,24 @@
 block discarded – undo
172 172
 			}
173 173
 		}
174 174
         
175
-        $site = URLDecode::getSite();
175
+		$site = URLDecode::getSite();
176 176
         
177
-        if ($site == 'blog') {
178
-            $message = "Hello!\nThere has been a new comment on the post '{$this->page_title}' at Jacob Emerick's Blog. You have chosen to be notified of it - please reply to [email protected] if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";
179
-        } else if ($site == 'waterfalls') {
180
-            $message = "Hello!\nThere has been a new comment on the page '{$this->page_title}' at Waterfalls of the Keweenaw. You have chosen to be notified of it - please reply to [email protected] if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";
181
-        }
177
+		if ($site == 'blog') {
178
+			$message = "Hello!\nThere has been a new comment on the post '{$this->page_title}' at Jacob Emerick's Blog. You have chosen to be notified of it - please reply to [email protected] if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";
179
+		} else if ($site == 'waterfalls') {
180
+			$message = "Hello!\nThere has been a new comment on the page '{$this->page_title}' at Waterfalls of the Keweenaw. You have chosen to be notified of it - please reply to [email protected] if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";
181
+		}
182 182
         
183 183
 		foreach($email_recipient_array as $email_recipient)
184 184
 		{
185 185
 			$mail = new Mail();
186 186
 			$mail->setToAddress($email_recipient['email'], $email_recipient['name']);
187 187
             
188
-            if ($site == 'blog') {
189
-                $mail->setSubject("New Comment on Jacob Emerick's Blog");
190
-            } else if ($site == 'waterfalls') {
191
-                $mail->setSubject("New Comment on Waterfalls of the Keweenaw");
192
-            }
188
+			if ($site == 'blog') {
189
+				$mail->setSubject("New Comment on Jacob Emerick's Blog");
190
+			} else if ($site == 'waterfalls') {
191
+				$mail->setSubject("New Comment on Waterfalls of the Keweenaw");
192
+			}
193 193
             
194 194
 			$mail->setMessage($message);
195 195
 			$mail->send();
Please login to merge, or discard this patch.
utility/Database.class.inc.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -16,17 +16,17 @@  discard block
 block discarded – undo
16 16
 
17 17
 	private function __construct($write_params, $read_params)
18 18
 	{
19
-        $this->write_connection = $this->connect(
20
-            $write_params->host,
21
-            $write_params->user,
22
-            $write_params->password
23
-        );
24
-
25
-        $this->read_connection = $this->connect(
26
-            $read_params->host,
27
-            $read_params->user,
28
-            $read_params->password
29
-        );
19
+		$this->write_connection = $this->connect(
20
+			$write_params->host,
21
+			$write_params->user,
22
+			$write_params->password
23
+		);
24
+
25
+		$this->read_connection = $this->connect(
26
+			$read_params->host,
27
+			$read_params->user,
28
+			$read_params->password
29
+		);
30 30
 
31 31
 		return $this;
32 32
 	}
@@ -45,12 +45,12 @@  discard block
 block discarded – undo
45 45
 	public static function instance()
46 46
 	{
47 47
 		if(!isset(self::$instance)) {
48
-            global $config;
49
-            self::$instance = new Database(
50
-                $config->database->master,
51
-                $config->database->slave
52
-            );
53
-        }
48
+			global $config;
49
+			self::$instance = new Database(
50
+				$config->database->master,
51
+				$config->database->slave
52
+			);
53
+		}
54 54
 
55 55
 		return self::$instance;
56 56
 	}
Please login to merge, or discard this patch.
utility/cookie/CommenterCookie.class.inc.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -22,10 +22,10 @@
 block discarded – undo
22 22
 
23 23
 	protected function getDomain()
24 24
 	{
25
-        $site = URLDecode::getSite();
26
-        if ($site == 'waterfalls' && Loader::isLive()) {
27
-            return 'waterfallsofthekeweenaw.com';
28
-        }
25
+		$site = URLDecode::getSite();
26
+		if ($site == 'waterfalls' && Loader::isLive()) {
27
+			return 'waterfallsofthekeweenaw.com';
28
+		}
29 29
 		return self::$COOKIE_DOMAIN;
30 30
 	}
31 31
 
Please login to merge, or discard this patch.
utility/Loader.class.inc.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -179,16 +179,16 @@
 block discarded – undo
179 179
 		return self::instance()->is_live;
180 180
 	}
181 181
 
182
-    public static function getRootURL($site = '')
183
-    {
184
-        if (strlen($site) > 0) {
185
-            if ($site == 'waterfalls' && self::instance()->is_live) {
186
-                return 'http://www.waterfallsofthekeweenaw.com/';
187
-            } else {
188
-                return 'http://' . (self::instance()->is_live ? '' : 'dev.') . $site . '.jacobemerick.com/';
189
-            }
190
-        }
191
-        return '/';
192
-    }
182
+	public static function getRootURL($site = '')
183
+	{
184
+		if (strlen($site) > 0) {
185
+			if ($site == 'waterfalls' && self::instance()->is_live) {
186
+				return 'http://www.waterfallsofthekeweenaw.com/';
187
+			} else {
188
+				return 'http://' . (self::instance()->is_live ? '' : 'dev.') . $site . '.jacobemerick.com/';
189
+			}
190
+		}
191
+		return '/';
192
+	}
193 193
 
194 194
 }
Please login to merge, or discard this patch.
utility/content/FixInternalLinkContent.class.inc.php 1 patch
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -72,38 +72,38 @@
 block discarded – undo
72 72
 				
73 73
 				break;
74 74
 			case 'falls' :
75
-                $pieces = explode('/', $uri);
76
-                if (count($pieces) == 1) {
77
-                    Loader::load('collector', 'waterfall/WatercourseCollector');
78
-                    list ($watercourse_alias) = $pieces;
79
-                    $watercourse = WatercourseCollector::getByAlias($watercourse_alias);
75
+				$pieces = explode('/', $uri);
76
+				if (count($pieces) == 1) {
77
+					Loader::load('collector', 'waterfall/WatercourseCollector');
78
+					list ($watercourse_alias) = $pieces;
79
+					$watercourse = WatercourseCollector::getByAlias($watercourse_alias);
80 80
                     
81
-                    if ($watercourse == null) {
82
-                        return;
83
-                    }
81
+					if ($watercourse == null) {
82
+						return;
83
+					}
84 84
                     
85
-                    $link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';
86
-                    $link .= "{$watercourse->alias}/";
85
+					$link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';
86
+					$link .= "{$watercourse->alias}/";
87 87
                     
88
-                    if ($anchor == '') {
89
-                        $anchor = $watercourse->name;
90
-                    }
91
-                } else if (count($pieces) == 2) {
92
-                    Loader::load('collector', 'waterfall/WaterfallCollector');
93
-                    list ($watercourse_alias, $waterfall_alias) = $pieces;
94
-                    $waterfall = WaterfallCollector::getByAlias($watercourse_alias, $waterfall_alias);
88
+					if ($anchor == '') {
89
+						$anchor = $watercourse->name;
90
+					}
91
+				} else if (count($pieces) == 2) {
92
+					Loader::load('collector', 'waterfall/WaterfallCollector');
93
+					list ($watercourse_alias, $waterfall_alias) = $pieces;
94
+					$waterfall = WaterfallCollector::getByAlias($watercourse_alias, $waterfall_alias);
95 95
                     
96
-                    if ($waterfall == null) {
97
-                        return;
98
-                    }
96
+					if ($waterfall == null) {
97
+						return;
98
+					}
99 99
                     
100
-                    $link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';
101
-                    $link .= "{$waterfall->watercourse_alias}/{$waterfall->alias}/";
100
+					$link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';
101
+					$link .= "{$waterfall->watercourse_alias}/{$waterfall->alias}/";
102 102
                     
103
-                    if ($anchor == '') {
104
-                        $anchor = $waterfall->name;
105
-                    }
106
-                }
103
+					if ($anchor == '') {
104
+						$anchor = $waterfall->name;
105
+					}
106
+				}
107 107
 				break;
108 108
 			default :
109 109
 				break;
Please login to merge, or discard this patch.