Completed
Push — master ( d9eba8...4988a4 )
by Jacob
03:52
created
controller/waterfalls/WaterfallController.class.inc.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
         $this->handle_comment_submit(
34 34
             self::$WATERFALL_SITE_ID,
35 35
             "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}",
36
-            Loader::getRootUrl('waterfalls') . "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}/",
36
+            Loader::getRootUrl('waterfalls')."{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}/",
37 37
             $this->waterfall->name);
38 38
         
39 39
         $this->add_waterfall_js();
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
     {
44 44
         parent::set_head_data();
45 45
 
46
-        $this->set_title("{$this->waterfall->name} on {$this->waterfall->watercourse} | " . self::$WEBSITE_TITLE);
46
+        $this->set_title("{$this->waterfall->name} on {$this->waterfall->watercourse} | ".self::$WEBSITE_TITLE);
47 47
         $this->set_description($this->waterfall->description);
48 48
         $this->set_keywords((array) $this->waterfall->name);
49 49
     }
@@ -112,17 +112,17 @@  discard block
 block discarded – undo
112 112
     {
113 113
         $album = array();
114 114
         
115
-        if($this->waterfall->album == 0)
115
+        if ($this->waterfall->album == 0)
116 116
             return $album;
117 117
         
118 118
         $photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album);
119
-        foreach($photo_list as $photo)
119
+        foreach ($photo_list as $photo)
120 120
         {
121 121
             $photo_array = array();
122 122
             $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
123 123
             $photo_array['description'] = $photo->description;
124 124
             
125
-            if($photo->height < $photo->width)
125
+            if ($photo->height < $photo->width)
126 126
                 list($height, $width) = array(75, 100);
127 127
             else
128 128
                 list($height, $width) = array(100, 75);
@@ -147,14 +147,14 @@  discard block
 block discarded – undo
147 147
 		$sidebar_data['name'] = $waterfall->name;
148 148
 		$sidebar_data['watercourse'] = $waterfall->watercourse;
149 149
         $sidebar_data['main_watercourse'] = $this->get_main_watercourse($waterfall->watercourse_alias);
150
-		$sidebar_data['rating_display'] = ($waterfall->rating / 2) . '/5';
150
+		$sidebar_data['rating_display'] = ($waterfall->rating / 2).'/5';
151 151
         $sidebar_data['rating'] = $waterfall->rating;
152 152
 		$sidebar_data['height'] = Content::instance('ImperialUnit', $waterfall->height)->activate('inches');
153 153
 		$sidebar_data['width'] = Content::instance('ImperialUnit', $waterfall->width)->activate('inches');
154 154
 		$sidebar_data['drop_height'] = Content::instance('ImperialUnit', $waterfall->drop_height)->activate('inches');
155 155
 		$sidebar_data['drop_count'] = $waterfall->drop_count;
156 156
 		
157
-        $sidebar_data['county'] = (object) array (
157
+        $sidebar_data['county'] = (object) array(
158 158
             'name' => $waterfall->county,
159 159
             'alias' => $waterfall->county_alias,
160 160
             'title' => $waterfall->county_title,
Please login to merge, or discard this patch.
controller/waterfalls/CountyListController.class.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 		$path = URLDecode::getPiece(1);
29 29
 		$this->county = CountyCollector::getByAlias($path);
30 30
 		
31
-		if(!$this->county)
31
+		if (!$this->county)
32 32
 			$this->eject();
33 33
 		
34 34
 		parent::__construct();
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 	{
39 39
 		$meta_array = array();
40 40
 		
41
-		$meta_array['title'] = "{$this->county->name} Waterfalls | " . self::$WEBSITE_TITLE;
41
+		$meta_array['title'] = "{$this->county->name} Waterfalls | ".self::$WEBSITE_TITLE;
42 42
 		$meta_array['description'] = $this->county->description;
43 43
 		$meta_array['keywords'] = $this->get_keyword_array();
44 44
 		
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	{
50 50
 		$meta_array = array();
51 51
 		
52
-		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->county->name, $this->page, $this->page_count);
52
+		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE.' | '.self::$WEBSITE_TITLE, $this->county->name, $this->page, $this->page_count);
53 53
 		$meta_array['description'] = sprintf(self::$DEFAULT_DESCRIPTION, $this->page, $this->page_count, $this->county->name);
54 54
 		$meta_array['keywords'] = $this->get_keyword_array();
55 55
 		
Please login to merge, or discard this patch.
controller/waterfalls/LogTagListController.class.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 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();
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 	{
38 38
 		$meta_array = array();
39 39
 		
40
-		$meta_array['title'] = "{$this->tag->name} | " . self::$WEBSITE_TITLE;
40
+		$meta_array['title'] = "{$this->tag->name} | ".self::$WEBSITE_TITLE;
41 41
 		$meta_array['description'] = $this->tag->name;
42 42
 		$meta_array['keywords'] = $this->get_keyword_array();
43 43
 		
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 	{
49 49
 		$meta_array = array();
50 50
 		
51
-		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->companion->name, $this->page, $this->page_count);
51
+		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE.' | '.self::$WEBSITE_TITLE, $this->companion->name, $this->page, $this->page_count);
52 52
 		$meta_array['description'] = sprintf(self::$DEFAULT_DESCRIPTION, $this->page, $this->page_count, $this->tag->name);
53 53
 		$meta_array['keywords'] = $this->get_keyword_array();
54 54
 		
Please login to merge, or discard this patch.
controller/waterfalls/PeriodListController.class.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 		$alias = URLDecode::getPiece(2);
27 27
 		$this->period = PeriodCollector::getByAlias($alias);
28 28
 		
29
-		if(!$this->period)
29
+		if (!$this->period)
30 30
 			$this->eject();
31 31
 		
32 32
 		parent::__construct();
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 	{
37 37
 		$meta_array = array();
38 38
 		
39
-		$meta_array['title'] = "Hiking Stories - {$this->period->name} | " . self::$WEBSITE_TITLE;
39
+		$meta_array['title'] = "Hiking Stories - {$this->period->name} | ".self::$WEBSITE_TITLE;
40 40
 		$meta_array['description'] = $this->period->description;
41 41
 		$meta_array['keywords'] = $this->get_keyword_array();
42 42
 		
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 	{
48 48
 		$meta_array = array();
49 49
 		
50
-		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->period->name, $this->page, $this->page_count);
50
+		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE.' | '.self::$WEBSITE_TITLE, $this->period->name, $this->page, $this->page_count);
51 51
 		$meta_array['description'] = sprintf(self::$DEFAULT_DESCRIPTION, $this->page, $this->page_count, $this->period->name);
52 52
 		$meta_array['keywords'] = $this->get_keyword_array();
53 53
 		
Please login to merge, or discard this patch.
controller/waterfalls/CompanionListController.class.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 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();
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 	{
38 38
 		$meta_array = array();
39 39
 		
40
-		$meta_array['title'] = "Hiking Stories with {$this->companion->name} | " . self::$WEBSITE_TITLE;
40
+		$meta_array['title'] = "Hiking Stories with {$this->companion->name} | ".self::$WEBSITE_TITLE;
41 41
 		$meta_array['description'] = $this->companion->description;
42 42
 		$meta_array['keywords'] = $this->get_keyword_array();
43 43
 		
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 	{
49 49
 		$meta_array = array();
50 50
 		
51
-		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->companion->name, $this->page, $this->page_count);
51
+		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE.' | '.self::$WEBSITE_TITLE, $this->companion->name, $this->page, $this->page_count);
52 52
 		$meta_array['description'] = sprintf(self::$DEFAULT_DESCRIPTION, $this->page, $this->page_count, $this->companion->name);
53 53
 		$meta_array['keywords'] = $this->get_keyword_array();
54 54
 		
Please login to merge, or discard this patch.
controller/waterfalls/HomeController.class.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
         $recent_comments = CommentCollector::getRecentWaterfallComments();
60 60
         
61 61
         $recent_comment_container = array();
62
-        foreach($recent_comments as $comment) {
62
+        foreach ($recent_comments as $comment) {
63 63
             $body = $comment->body;
64 64
             $body = strip_tags($body);
65 65
             
@@ -67,10 +67,10 @@  discard block
 block discarded – undo
67 67
             $comment_obj->description = Content::instance('SmartTrim', $body)->activate(50);
68 68
             $comment_obj->commenter = $comment->name;
69 69
             if (!empty($comment->log_path)) {
70
-                $comment_obj->link = Loader::getRootURL() . "{$comment->log_path}/#comment-{$comment->id}";
70
+                $comment_obj->link = Loader::getRootURL()."{$comment->log_path}/#comment-{$comment->id}";
71 71
                 $comment_obj->location = $comment->log_title;
72 72
             } else {
73
-                $comment_obj->link = Loader::getRootURL() . "{$comment->waterfall_path}/#comment-{$comment->id}";
73
+                $comment_obj->link = Loader::getRootURL()."{$comment->waterfall_path}/#comment-{$comment->id}";
74 74
                 $comment_obj->location = $comment->waterfall_title;
75 75
             }
76 76
             
Please login to merge, or discard this patch.
controller/waterfalls/WaterfallListController.class.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 	{
33 33
 		$meta_array = array();
34 34
 		
35
-		$meta_array['title'] = self::$PRIMARY_TITLE . ' | ' . self::$WEBSITE_TITLE;
35
+		$meta_array['title'] = self::$PRIMARY_TITLE.' | '.self::$WEBSITE_TITLE;
36 36
 		$meta_array['description'] = self::$PRIMARY_DESCRIPTION;
37 37
 		$meta_array['keywords'] = self::$KEYWORD_ARRAY;
38 38
 		
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 	{
44 44
 		$meta_array = array();
45 45
 		
46
-		$meta_array['title'] = sprintf(self::$SECONDARY_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->page, $this->page_count);
46
+		$meta_array['title'] = sprintf(self::$SECONDARY_TITLE.' | '.self::$WEBSITE_TITLE, $this->page, $this->page_count);
47 47
 		$meta_array['description'] = sprintf(self::$SECONDARY_DESCRIPTION, $this->page, $this->page_count);
48 48
 		$meta_array['keywords'] = self::$KEYWORD_ARRAY;
49 49
 		
Please login to merge, or discard this patch.
controller/waterfalls/LogListController.class.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 	{
33 33
 		$meta_array = array();
34 34
 		
35
-		$meta_array['title'] = self::$PRIMARY_TITLE . ' | ' . self::$WEBSITE_TITLE;
35
+		$meta_array['title'] = self::$PRIMARY_TITLE.' | '.self::$WEBSITE_TITLE;
36 36
 		$meta_array['description'] = self::$PRIMARY_DESCRIPTION;
37 37
 		$meta_array['keywords'] = self::$KEYWORD_ARRAY;
38 38
 		
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 	{
44 44
 		$meta_array = array();
45 45
 		
46
-		$meta_array['title'] = sprintf(self::$SECONDARY_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->page);
46
+		$meta_array['title'] = sprintf(self::$SECONDARY_TITLE.' | '.self::$WEBSITE_TITLE, $this->page);
47 47
 		$meta_array['description'] = sprintf(self::$SECONDARY_DESCRIPTION, $this->page, $this->page_count);
48 48
 		$meta_array['keywords'] = self::$KEYWORD_ARRAY;
49 49
 		
Please login to merge, or discard this patch.
controller/waterfalls/WatercourseListController.class.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 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();
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 	{
40 40
 		$meta_array = array();
41 41
 		
42
-		$meta_array['title'] = "{$this->watercourse->name} | " . self::$WEBSITE_TITLE;
42
+		$meta_array['title'] = "{$this->watercourse->name} | ".self::$WEBSITE_TITLE;
43 43
 		$meta_array['description'] = $this->watercourse->description;
44 44
 		$meta_array['keywords'] = $this->get_keyword_array();
45 45
 		
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 	{
51 51
 		$meta_array = array();
52 52
 		
53
-		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->watercourse->name, $this->page, $this->page_count);
53
+		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE.' | '.self::$WEBSITE_TITLE, $this->watercourse->name, $this->page, $this->page_count);
54 54
 		$meta_array['description'] = sprintf(self::$DEFAULT_DESCRIPTION, $this->page, $this->page_count, $this->watercourse->name);
55 55
 		$meta_array['keywords'] = $this->get_keyword_array();
56 56
 		
Please login to merge, or discard this patch.