Completed
Push — master ( 881d4b...b9d18d )
by Jacob
06:59
created
controller/waterfalls/ContactController.class.inc.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -33,16 +33,16 @@  discard block
 block discarded – undo
33 33
 
34 34
 	private function process_form()
35 35
 	{
36
-		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
36
+		if (!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
37 37
 			return (object) array('display' => 'normal');
38 38
 		
39 39
 		Loader::load('utility', 'Validate');
40 40
 		$error_result = array();
41
-		if(!Validate::checkRequest('post', 'name', 'string'))
41
+		if (!Validate::checkRequest('post', 'name', 'string'))
42 42
 			$error_result['name'] = 'please enter your name';
43
-		if(!Validate::checkRequest('post', 'email', 'string'))
43
+		if (!Validate::checkRequest('post', 'email', 'string'))
44 44
 			$error_result['email'] = 'please enter a valid email';
45
-		if(!Validate::checkRequest('post', 'message', 'string'))
45
+		if (!Validate::checkRequest('post', 'message', 'string'))
46 46
 			$error_result['message'] = 'please write a message';
47 47
 		
48 48
 		$values = (object) array(
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 			'email' => Request::getPost('email'),
51 51
 			'message' => Request::getPost('message'));
52 52
 		
53
-		if(count($error_result) > 0)
53
+		if (count($error_result) > 0)
54 54
 		{
55 55
 			return (object) array(
56 56
 				'display' => 'error',
Please login to merge, or discard this patch.
controller/waterfalls/LogTagListController.class.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 		$alias = URLDecode::getPiece(3);
28 28
 		$this->tag = LogTagCollector::getTag($alias);
29 29
 		
30
-		if(!$this->tag)
30
+		if (!$this->tag)
31 31
 			$this->eject();
32 32
 		
33 33
 		parent::__construct();
Please login to merge, or discard this patch.
controller/waterfalls/WatercourseListController.class.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 		$path = URLDecode::getPiece(1);
30 30
 		$this->watercourse = WatercourseCollector::getByAlias($path);
31 31
 		
32
-		if(!$this->watercourse)
32
+		if (!$this->watercourse)
33 33
 			$this->eject();
34 34
 	
35 35
 		parent::__construct();
Please login to merge, or discard this patch.
controller/waterfalls/DefaultListController.class.inc.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -20,14 +20,14 @@  discard block
 block discarded – undo
20 20
 		$this->offset = ($this->page - 1) * $this->get_item_count_per_page();
21 21
 		
22 22
 		$items = $this->get_items();
23
-		if(count($items) < 1)
23
+		if (count($items) < 1)
24 24
 			$this->eject();
25 25
 	}
26 26
 
27 27
 	final protected function get_page_number()
28 28
 	{
29 29
 		$page = $this->get_page_number_piece();
30
-		if(isset($page) && is_numeric($page))
30
+		if (isset($page) && is_numeric($page))
31 31
 			return $page;
32 32
 		return 1;
33 33
 	}
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 
42 42
 	final private function get_introduction()
43 43
 	{
44
-		if($this->page == 1)
44
+		if ($this->page == 1)
45 45
 			return $this->get_initial_introduction();
46 46
 		
47 47
 		return $this->get_subsequent_introduction();
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 	private $items;
54 54
 	protected function get_items()
55 55
 	{
56
-		if(!isset($this->items))
56
+		if (!isset($this->items))
57 57
 		{
58 58
 			$total = $this->get_item_count_per_page();
59 59
 			$offset = ($this->page - 1) * $this->get_item_count_per_page();
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 	private $item_count;
69 69
 	final private function get_item_count()
70 70
 	{
71
-		if(!isset($this->item_count))
71
+		if (!isset($this->item_count))
72 72
 			$this->item_count = $this->get_item_count_result();
73 73
 		return $this->item_count;
74 74
 	}
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 		$this->set_head('next_link', $this->get_list_next_link());
83 83
 		$this->set_head('previous_link', $this->get_list_prev_link());
84 84
 		
85
-		if($this->page == 1)
85
+		if ($this->page == 1)
86 86
 			$meta_array = $this->get_initial_meta();
87 87
 		else
88 88
 			$meta_array = $this->get_subsequent_meta();
@@ -119,16 +119,16 @@  discard block
 block discarded – undo
119 119
 
120 120
 	final private function get_list_prev_link()
121 121
 	{
122
-		if($this->page == 1)
122
+		if ($this->page == 1)
123 123
 			return;
124
-		if($this->page == 2)
124
+		if ($this->page == 2)
125 125
 			return $this->get_list_link_root();
126 126
 		return $this->get_list_link_root() . ($this->page - 1) . '/';
127 127
 	}
128 128
 
129 129
 	final private function get_list_next_link()
130 130
 	{
131
-		if(($this->page * $this->get_item_count_per_page()) >= $this->get_item_count())
131
+		if (($this->page * $this->get_item_count_per_page()) >= $this->get_item_count())
132 132
 			return;
133 133
 		return $this->get_list_link_root() . ($this->page + 1) . '/';
134 134
 	}
@@ -139,27 +139,27 @@  discard block
 block discarded – undo
139 139
 	{
140 140
 		$link_array = array();
141 141
 		
142
-		if($this->get_item_count_per_page() >= $this->get_item_count())
142
+		if ($this->get_item_count_per_page() >= $this->get_item_count())
143 143
 			return $link_array;
144 144
 		
145 145
 		$link = new stdclass();
146 146
 		$link->anchor = '&laquo; previous';
147
-		if($this->get_list_prev_link() !== null)
147
+		if ($this->get_list_prev_link() !== null)
148 148
 			$link->uri = $this->get_list_prev_link();
149 149
 		else
150 150
 			$link->class = 'inactive';
151 151
 		$link_array[] = $link;
152 152
 		
153
-		for($i = 1; $i <= ceil($this->get_item_count() / $this->get_item_count_per_page()); $i++)
153
+		for ($i = 1; $i <= ceil($this->get_item_count() / $this->get_item_count_per_page()); $i++)
154 154
 		{
155 155
 			$link = new stdclass();
156 156
 			$link->anchor = $i;
157 157
 			
158
-			if($i == $this->page)
158
+			if ($i == $this->page)
159 159
 				$link->class = 'current';
160 160
 			else
161 161
 			{
162
-				if($i == 1)
162
+				if ($i == 1)
163 163
 					$link->uri = $this->get_list_link_root();
164 164
 				else
165 165
 					$link->uri = $this->get_list_link_root() . $i . '/';
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 		
171 171
 		$link = new stdclass();
172 172
 		$link->anchor = 'next &raquo;';
173
-		if($this->get_list_next_link() !== null)
173
+		if ($this->get_list_next_link() !== null)
174 174
 			$link->uri = $this->get_list_next_link();
175 175
 		else
176 176
 			$link->class = 'inactive';
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 
193 193
 	final protected function get_image_element($category, $path, $description, $size = 'small')
194 194
 	{
195
-		switch($size)
195
+		switch ($size)
196 196
 		{
197 197
 			case 'medium' :
198 198
 				$height = 375;
Please login to merge, or discard this patch.
controller/waterfalls/CompanionListController.class.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 		$alias = URLDecode::getPiece(2);
28 28
 		$this->companion = CompanionCollector::getByAlias($alias);
29 29
 		
30
-		if(!$this->companion)
30
+		if (!$this->companion)
31 31
 			$this->eject();
32 32
 		
33 33
 		parent::__construct();
Please login to merge, or discard this patch.
controller/blog/PostController.class.inc.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 		parent::__construct();
28 28
 		
29 29
 		$this->post = PostCollector::getPostByURI(URLDecode::getPiece(2));
30
-		if($this->post == null)
30
+		if ($this->post == null)
31 31
 			$this->eject();
32 32
 		
33 33
 		$this->handle_comment_submit(
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 		$keyword_array = array();
90 90
 		$keywords = $this->tags;
91 91
 		
92
-		foreach($keywords as $keyword)
92
+		foreach ($keywords as $keyword)
93 93
 		{
94 94
 			$keyword_array[] = $keyword->tag;
95 95
 		}
@@ -103,16 +103,16 @@  discard block
 block discarded – undo
103 103
 	private function get_series_posts()
104 104
 	{
105 105
 		$series_posts = $this->fetch_series_posts();
106
-		if(count($series_posts) < 1)
106
+		if (count($series_posts) < 1)
107 107
 			return array();
108 108
 		
109 109
 		$previous_post = new stdclass();
110 110
 		$next_post = new stdclass();
111 111
 		
112 112
 		$found_current_post = false;
113
-		foreach($series_posts as $post_row)
113
+		foreach ($series_posts as $post_row)
114 114
 		{
115
-			if($post_row->post == $this->post->id)
115
+			if ($post_row->post == $this->post->id)
116 116
 			{
117 117
 				$found_current_post = true;
118 118
 				continue;
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 
133 133
 			$post->url = Loader::getRootUrl('blog') . "{$post_row->category}/{$post_row->path}/";
134 134
 			
135
-			if(!$found_current_post)
135
+			if (!$found_current_post)
136 136
 				$previous_post = $post;
137 137
 			else
138 138
 			{
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 	private $series_posts;
152 152
 	private function fetch_series_posts()
153 153
 	{
154
-		if(!isset($this->series_posts))
154
+		if (!isset($this->series_posts))
155 155
 			$this->series_posts = SeriesCollector::getSeriesForPost($this->post->id);
156 156
 		return $this->series_posts;
157 157
 	}
@@ -159,14 +159,14 @@  discard block
 block discarded – undo
159 159
 	private function get_related_posts()
160 160
 	{
161 161
 		$tag_array = array();
162
-		foreach($this->tags as $tag)
162
+		foreach ($this->tags as $tag)
163 163
 		{
164 164
 			$tag_array[] = $tag->id;
165 165
 		}
166 166
 		
167 167
 		$series_posts = $this->fetch_series_posts();
168 168
 		$exclude_post_array = array();
169
-		foreach($series_posts as $series_post)
169
+		foreach ($series_posts as $series_post)
170 170
 		{
171 171
 			$exclude_post_array[] = $series_post->post;
172 172
 		}
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
 		$post_array = array();
175 175
 		$post_result = PostCollector::getRelatedPosts($this->post->id, $tag_array, $exclude_post_array);
176 176
 		
177
-		foreach($post_result as $post_row)
177
+		foreach ($post_result as $post_row)
178 178
 		{
179 179
 			$post = new stdclass();
180 180
 			$post->title = $post_row->title;
Please login to merge, or discard this patch.
controller/blog/AboutController.class.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
 		Loader::load('collector', 'blog/IntroductionCollector');
37 37
 		$introduction_result = IntroductionCollector::getRow('about');
38 38
 		
39
-		if($introduction_result !== null)
39
+		if ($introduction_result !== null)
40 40
 		{
41 41
 			$introduction = array();
42 42
 			$introduction['title'] = $introduction_result->title;
Please login to merge, or discard this patch.
controller/blog/SearchController.class.inc.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 	{
46 46
 		parent::set_head_data();
47 47
 		
48
-		if($this->page == 1)
48
+		if ($this->page == 1)
49 49
 		{
50 50
 			$this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->query)));
51 51
 			$this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->query)));
@@ -63,10 +63,10 @@  discard block
 block discarded – undo
63 63
 
64 64
 	protected function get_introduction()
65 65
 	{
66
-		if($this->total_pages > 1)
66
+		if ($this->total_pages > 1)
67 67
 			return array(
68 68
 				'title' => "Posts from search '{$this->query}', page {$this->page} of {$this->total_pages}.");
69
-		else if($this->total_pages == 1)
69
+		else if ($this->total_pages == 1)
70 70
 			return array(
71 71
 				'title' => "Posts from search '{$this->query}'.");
72 72
 		else
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 	protected function get_page_number()
78 78
 	{
79 79
 		$page = URLDecode::getPiece(3);
80
-		if(isset($page) && is_numeric($page))
80
+		if (isset($page) && is_numeric($page))
81 81
 			return $page;
82 82
 		return 1;
83 83
 	}
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 	private $search_result;
86 86
 	private function get_search_result()
87 87
 	{
88
-		if(!isset($this->search_result))
88
+		if (!isset($this->search_result))
89 89
 		{
90 90
 			$posts = PostCollector::getMainList(self::$MAXIMUM_SEARCH_POSTS);
91 91
 			
@@ -113,16 +113,16 @@  discard block
 block discarded – undo
113 113
 
114 114
 	protected function get_list_next_link()
115 115
 	{
116
-		if($this->page == 1)
116
+		if ($this->page == 1)
117 117
 			return;
118
-		if($this->page == 2)
118
+		if ($this->page == 2)
119 119
 			return Content::instance('URLSafe', "/search/{$this->query}/")->activate();
120 120
 		return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page - 1) . '/')->activate();
121 121
 	}
122 122
 
123 123
 	protected function get_list_prev_link()
124 124
 	{
125
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
125
+		if (($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
126 126
 			return;
127 127
 		return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page + 1) . '/')->activate();
128 128
 	}
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 	private $total_post_count;
131 131
 	protected function get_total_post_count()
132 132
 	{
133
-		if(!isset($this->total_post_count))
133
+		if (!isset($this->total_post_count))
134 134
 			$this->total_post_count = count($this->get_search_result());
135 135
 		return $this->total_post_count;
136 136
 	}
Please login to merge, or discard this patch.
controller/blog/CategoryController.class.inc.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -67,10 +67,10 @@  discard block
 block discarded – undo
67 67
 	{
68 68
 		parent::set_head_data();
69 69
 		
70
-		switch($this->category->display)
70
+		switch ($this->category->display)
71 71
 		{
72 72
 			case 'Hiking' :
73
-				if($this->page == 1)
73
+				if ($this->page == 1)
74 74
 				{
75 75
 					$this->set_title(self::$TITLE_MAIN_HIKING);
76 76
 					$this->set_description(self::$DESCRIPTION_MAIN_HIKING);
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 				$this->set_keywords(self::$KEYWORD_ARRAY_HIKING);
84 84
 			break;
85 85
 			case 'Personal' :
86
-				if($this->page == 1)
86
+				if ($this->page == 1)
87 87
 				{
88 88
 					$this->set_title(self::$TITLE_MAIN_PERSONAL);
89 89
 					$this->set_description(self::$DESCRIPTION_MAIN_PERSONAL);
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 				$this->set_keywords(self::$KEYWORD_ARRAY_PERSONAL);
97 97
 			break;
98 98
 			case 'Web Development' :
99
-				if($this->page == 1)
99
+				if ($this->page == 1)
100 100
 				{
101 101
 					$this->set_title(self::$TITLE_MAIN_WEBDEVELOPMENT);
102 102
 					$this->set_description(self::$DESCRIPTION_MAIN_WEBDEVELOPMENT);
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 
114 114
 	protected function get_introduction()
115 115
 	{
116
-		if($this->page == 1)
116
+		if ($this->page == 1)
117 117
 		{
118 118
 			Loader::load('collector', 'blog/IntroductionCollector');
119 119
 			$introduction_result = IntroductionCollector::getRow('category', $this->category->link);
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 	protected function get_page_number()
134 134
 	{
135 135
 		$page = URLDecode::getPiece(2);
136
-		if(isset($page) && is_numeric($page))
136
+		if (isset($page) && is_numeric($page))
137 137
 			return $page;
138 138
 		return 1;
139 139
 	}
@@ -153,16 +153,16 @@  discard block
 block discarded – undo
153 153
 
154 154
 	protected function get_list_next_link()
155 155
 	{
156
-		if($this->page == 1)
156
+		if ($this->page == 1)
157 157
 			return;
158
-		if($this->page == 2)
158
+		if ($this->page == 2)
159 159
 			return Content::instance('URLSafe', "/{$this->category->link}/")->activate();
160 160
 		return Content::instance('URLSafe', "/{$this->category->link}/" . ($this->page - 1) . '/')->activate();
161 161
 	}
162 162
 
163 163
 	protected function get_list_prev_link()
164 164
 	{
165
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
165
+		if (($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
166 166
 			return;
167 167
 		return Content::instance('URLSafe', "/{$this->category->link}/" . ($this->page + 1) . '/')->activate();
168 168
 	}
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 	private $total_post_count;
171 171
 	protected function get_total_post_count()
172 172
 	{
173
-		if(!isset($this->total_post_count))
173
+		if (!isset($this->total_post_count))
174 174
 			$this->total_post_count = PostCollector::getPostCountForCategory($this->category->link);
175 175
 		return $this->total_post_count;
176 176
 	}
Please login to merge, or discard this patch.