@@ -26,9 +26,9 @@ discard block |
||
26 | 26 | $tag = URLDecode::getPiece(2); |
27 | 27 | $tag = str_replace('-', ' ', $tag); |
28 | 28 | |
29 | - global $container; |
|
30 | - $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']); |
|
31 | - $tag_result = $repository->findTagByTitle($tag); |
|
29 | + global $container; |
|
30 | + $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']); |
|
31 | + $tag_result = $repository->findTagByTitle($tag); |
|
32 | 32 | |
33 | 33 | if($tag_result === false) |
34 | 34 | $this->eject(); |
@@ -64,9 +64,9 @@ discard block |
||
64 | 64 | |
65 | 65 | if($this->page == 1) |
66 | 66 | { |
67 | - global $container; |
|
68 | - $repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']); |
|
69 | - $introduction_result = $repository->findByType('tag', $this->tag['tag']); |
|
67 | + global $container; |
|
68 | + $repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']); |
|
69 | + $introduction_result = $repository->findByType('tag', $this->tag['tag']); |
|
70 | 70 | |
71 | 71 | if($introduction_result !== false) |
72 | 72 | { |
@@ -96,9 +96,9 @@ discard block |
||
96 | 96 | |
97 | 97 | protected function get_list_results() |
98 | 98 | { |
99 | - global $container; |
|
100 | - $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']); |
|
101 | - return $repository->getActivePostsByTag($this->tag['id'], self::$POSTS_PER_PAGE, $this->offset); |
|
99 | + global $container; |
|
100 | + $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']); |
|
101 | + return $repository->getActivePostsByTag($this->tag['id'], self::$POSTS_PER_PAGE, $this->offset); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | protected function get_list_description() |
@@ -129,10 +129,10 @@ discard block |
||
129 | 129 | protected function get_total_post_count() |
130 | 130 | { |
131 | 131 | if(!isset($this->total_post_count)) { |
132 | - global $container; |
|
133 | - $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']); |
|
134 | - $this->total_post_count = $repository->getActivePostsCountByTag($this->tag['id']); |
|
135 | - } |
|
132 | + global $container; |
|
133 | + $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']); |
|
134 | + $this->total_post_count = $repository->getActivePostsCountByTag($this->tag['id']); |
|
135 | + } |
|
136 | 136 | |
137 | 137 | return $this->total_post_count; |
138 | 138 | } |
@@ -30,8 +30,9 @@ discard block |
||
30 | 30 | $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']); |
31 | 31 | $tag_result = $repository->findTagByTitle($tag); |
32 | 32 | |
33 | - if($tag_result === false) |
|
34 | - $this->eject(); |
|
33 | + if($tag_result === false) { |
|
34 | + $this->eject(); |
|
35 | + } |
|
35 | 36 | |
36 | 37 | $this->tag = $tag_result; |
37 | 38 | |
@@ -46,8 +47,7 @@ discard block |
||
46 | 47 | { |
47 | 48 | $this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->tag['tag']))); |
48 | 49 | $this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->tag['tag']))); |
49 | - } |
|
50 | - else |
|
50 | + } else |
|
51 | 51 | { |
52 | 52 | $this->set_title(sprintf(self::$TITLE_PAGINATED, ucwords($this->tag['tag']), $this->page, $this->total_pages)); |
53 | 53 | $this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages, ucwords($this->tag['tag']))); |
@@ -89,8 +89,9 @@ discard block |
||
89 | 89 | protected function get_page_number() |
90 | 90 | { |
91 | 91 | $page = URLDecode::getPiece(3); |
92 | - if(isset($page) && is_numeric($page)) |
|
93 | - return $page; |
|
92 | + if(isset($page) && is_numeric($page)) { |
|
93 | + return $page; |
|
94 | + } |
|
94 | 95 | return 1; |
95 | 96 | } |
96 | 97 | |
@@ -111,17 +112,20 @@ discard block |
||
111 | 112 | |
112 | 113 | protected function get_list_next_link() |
113 | 114 | { |
114 | - if($this->page == 1) |
|
115 | - return; |
|
116 | - if($this->page == 2) |
|
117 | - return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/")->activate(); |
|
115 | + if($this->page == 1) { |
|
116 | + return; |
|
117 | + } |
|
118 | + if($this->page == 2) { |
|
119 | + return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/")->activate(); |
|
120 | + } |
|
118 | 121 | return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/" . ($this->page - 1) . '/')->activate(); |
119 | 122 | } |
120 | 123 | |
121 | 124 | protected function get_list_prev_link() |
122 | 125 | { |
123 | - if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) |
|
124 | - return; |
|
126 | + if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) { |
|
127 | + return; |
|
128 | + } |
|
125 | 129 | return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/" . ($this->page + 1) . '/')->activate(); |
126 | 130 | } |
127 | 131 |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']); |
31 | 31 | $tag_result = $repository->findTagByTitle($tag); |
32 | 32 | |
33 | - if($tag_result === false) |
|
33 | + if ($tag_result === false) |
|
34 | 34 | $this->eject(); |
35 | 35 | |
36 | 36 | $this->tag = $tag_result; |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | { |
43 | 43 | parent::set_head_data(); |
44 | 44 | |
45 | - if($this->page == 1) |
|
45 | + if ($this->page == 1) |
|
46 | 46 | { |
47 | 47 | $this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->tag['tag']))); |
48 | 48 | $this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->tag['tag']))); |
@@ -62,13 +62,13 @@ discard block |
||
62 | 62 | { |
63 | 63 | $tag = ucwords($this->tag['tag']); |
64 | 64 | |
65 | - if($this->page == 1) |
|
65 | + if ($this->page == 1) |
|
66 | 66 | { |
67 | 67 | global $container; |
68 | 68 | $repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']); |
69 | 69 | $introduction_result = $repository->findByType('tag', $this->tag['tag']); |
70 | 70 | |
71 | - if($introduction_result !== false) |
|
71 | + if ($introduction_result !== false) |
|
72 | 72 | { |
73 | 73 | $introduction = array(); |
74 | 74 | $introduction['title'] = $introduction_result['title']; |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | protected function get_page_number() |
90 | 90 | { |
91 | 91 | $page = URLDecode::getPiece(3); |
92 | - if(isset($page) && is_numeric($page)) |
|
92 | + if (isset($page) && is_numeric($page)) |
|
93 | 93 | return $page; |
94 | 94 | return 1; |
95 | 95 | } |
@@ -111,24 +111,24 @@ discard block |
||
111 | 111 | |
112 | 112 | protected function get_list_next_link() |
113 | 113 | { |
114 | - if($this->page == 1) |
|
114 | + if ($this->page == 1) |
|
115 | 115 | return; |
116 | - if($this->page == 2) |
|
116 | + if ($this->page == 2) |
|
117 | 117 | return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/")->activate(); |
118 | - return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/" . ($this->page - 1) . '/')->activate(); |
|
118 | + return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/".($this->page - 1).'/')->activate(); |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | protected function get_list_prev_link() |
122 | 122 | { |
123 | - if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) |
|
123 | + if (($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) |
|
124 | 124 | return; |
125 | - return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/" . ($this->page + 1) . '/')->activate(); |
|
125 | + return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/".($this->page + 1).'/')->activate(); |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | private $total_post_count; |
129 | 129 | protected function get_total_post_count() |
130 | 130 | { |
131 | - if(!isset($this->total_post_count)) { |
|
131 | + if (!isset($this->total_post_count)) { |
|
132 | 132 | global $container; |
133 | 133 | $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']); |
134 | 134 | $this->total_post_count = $repository->getActivePostsCountByTag($this->tag['id']); |
@@ -115,9 +115,9 @@ discard block |
||
115 | 115 | { |
116 | 116 | if($this->page == 1) |
117 | 117 | { |
118 | - global $container; |
|
119 | - $repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']); |
|
120 | - $introduction_result = $repository->findByType('category', $this->category->link); |
|
118 | + global $container; |
|
119 | + $repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']); |
|
120 | + $introduction_result = $repository->findByType('category', $this->category->link); |
|
121 | 121 | |
122 | 122 | $introduction = array(); |
123 | 123 | $introduction['title'] = $introduction_result['title']; |
@@ -141,9 +141,9 @@ discard block |
||
141 | 141 | |
142 | 142 | protected function get_list_results() |
143 | 143 | { |
144 | - global $container; |
|
145 | - $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']); |
|
146 | - return $repository->getActivePostsByCategory($this->category->link, self::$POSTS_PER_PAGE, $this->offset); |
|
144 | + global $container; |
|
145 | + $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']); |
|
146 | + return $repository->getActivePostsByCategory($this->category->link, self::$POSTS_PER_PAGE, $this->offset); |
|
147 | 147 | } |
148 | 148 | |
149 | 149 | protected function get_list_description() |
@@ -174,10 +174,10 @@ discard block |
||
174 | 174 | protected function get_total_post_count() |
175 | 175 | { |
176 | 176 | if(!isset($this->total_post_count)) { |
177 | - global $container; |
|
178 | - $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']); |
|
179 | - $this->total_post_count = $repository->getActivePostsCountByCategory($this->category->link); |
|
180 | - } |
|
177 | + global $container; |
|
178 | + $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']); |
|
179 | + $this->total_post_count = $repository->getActivePostsCountByCategory($this->category->link); |
|
180 | + } |
|
181 | 181 | return $this->total_post_count; |
182 | 182 | } |
183 | 183 |
@@ -74,8 +74,7 @@ discard block |
||
74 | 74 | { |
75 | 75 | $this->set_title(self::$TITLE_MAIN_HIKING); |
76 | 76 | $this->set_description(self::$DESCRIPTION_MAIN_HIKING); |
77 | - } |
|
78 | - else |
|
77 | + } else |
|
79 | 78 | { |
80 | 79 | $this->set_title(sprintf(self::$TITLE_PAGINATED_HIKING, $this->page, $this->total_pages)); |
81 | 80 | $this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_HIKING, $this->page, $this->total_pages)); |
@@ -87,8 +86,7 @@ discard block |
||
87 | 86 | { |
88 | 87 | $this->set_title(self::$TITLE_MAIN_PERSONAL); |
89 | 88 | $this->set_description(self::$DESCRIPTION_MAIN_PERSONAL); |
90 | - } |
|
91 | - else |
|
89 | + } else |
|
92 | 90 | { |
93 | 91 | $this->set_title(sprintf(self::$TITLE_PAGINATED_PERSONAL, $this->page, $this->total_pages)); |
94 | 92 | $this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_PERSONAL, $this->page, $this->total_pages)); |
@@ -100,8 +98,7 @@ discard block |
||
100 | 98 | { |
101 | 99 | $this->set_title(self::$TITLE_MAIN_WEBDEVELOPMENT); |
102 | 100 | $this->set_description(self::$DESCRIPTION_MAIN_WEBDEVELOPMENT); |
103 | - } |
|
104 | - else |
|
101 | + } else |
|
105 | 102 | { |
106 | 103 | $this->set_title(sprintf(self::$TITLE_PAGINATED_WEBDEVELOPMENT, $this->page, $this->total_pages)); |
107 | 104 | $this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_WEBDEVELOPMENT, $this->page, $this->total_pages)); |
@@ -134,8 +131,9 @@ discard block |
||
134 | 131 | protected function get_page_number() |
135 | 132 | { |
136 | 133 | $page = URLDecode::getPiece(2); |
137 | - if(isset($page) && is_numeric($page)) |
|
138 | - return $page; |
|
134 | + if(isset($page) && is_numeric($page)) { |
|
135 | + return $page; |
|
136 | + } |
|
139 | 137 | return 1; |
140 | 138 | } |
141 | 139 | |
@@ -156,17 +154,20 @@ discard block |
||
156 | 154 | |
157 | 155 | protected function get_list_next_link() |
158 | 156 | { |
159 | - if($this->page == 1) |
|
160 | - return; |
|
161 | - if($this->page == 2) |
|
162 | - return Content::instance('URLSafe', "/{$this->category->link}/")->activate(); |
|
157 | + if($this->page == 1) { |
|
158 | + return; |
|
159 | + } |
|
160 | + if($this->page == 2) { |
|
161 | + return Content::instance('URLSafe', "/{$this->category->link}/")->activate(); |
|
162 | + } |
|
163 | 163 | return Content::instance('URLSafe', "/{$this->category->link}/" . ($this->page - 1) . '/')->activate(); |
164 | 164 | } |
165 | 165 | |
166 | 166 | protected function get_list_prev_link() |
167 | 167 | { |
168 | - if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) |
|
169 | - return; |
|
168 | + if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) { |
|
169 | + return; |
|
170 | + } |
|
170 | 171 | return Content::instance('URLSafe', "/{$this->category->link}/" . ($this->page + 1) . '/')->activate(); |
171 | 172 | } |
172 | 173 |
@@ -67,10 +67,10 @@ discard block |
||
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 |
||
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 |
||
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 |
||
113 | 113 | |
114 | 114 | protected function get_introduction() |
115 | 115 | { |
116 | - if($this->page == 1) |
|
116 | + if ($this->page == 1) |
|
117 | 117 | { |
118 | 118 | global $container; |
119 | 119 | $repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']); |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | protected function get_page_number() |
135 | 135 | { |
136 | 136 | $page = URLDecode::getPiece(2); |
137 | - if(isset($page) && is_numeric($page)) |
|
137 | + if (isset($page) && is_numeric($page)) |
|
138 | 138 | return $page; |
139 | 139 | return 1; |
140 | 140 | } |
@@ -156,24 +156,24 @@ discard block |
||
156 | 156 | |
157 | 157 | protected function get_list_next_link() |
158 | 158 | { |
159 | - if($this->page == 1) |
|
159 | + if ($this->page == 1) |
|
160 | 160 | return; |
161 | - if($this->page == 2) |
|
161 | + if ($this->page == 2) |
|
162 | 162 | return Content::instance('URLSafe', "/{$this->category->link}/")->activate(); |
163 | - return Content::instance('URLSafe', "/{$this->category->link}/" . ($this->page - 1) . '/')->activate(); |
|
163 | + return Content::instance('URLSafe', "/{$this->category->link}/".($this->page - 1).'/')->activate(); |
|
164 | 164 | } |
165 | 165 | |
166 | 166 | protected function get_list_prev_link() |
167 | 167 | { |
168 | - if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) |
|
168 | + if (($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) |
|
169 | 169 | return; |
170 | - return Content::instance('URLSafe', "/{$this->category->link}/" . ($this->page + 1) . '/')->activate(); |
|
170 | + return Content::instance('URLSafe', "/{$this->category->link}/".($this->page + 1).'/')->activate(); |
|
171 | 171 | } |
172 | 172 | |
173 | 173 | private $total_post_count; |
174 | 174 | protected function get_total_post_count() |
175 | 175 | { |
176 | - if(!isset($this->total_post_count)) { |
|
176 | + if (!isset($this->total_post_count)) { |
|
177 | 177 | global $container; |
178 | 178 | $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']); |
179 | 179 | $this->total_post_count = $repository->getActivePostsCountByCategory($this->category->link); |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | ], |
27 | 27 | ]; |
28 | 28 | |
29 | - return array_map(function ($row) { |
|
29 | + return array_map(function($row) { |
|
30 | 30 | return (object) $row; |
31 | 31 | }, $paths); |
32 | 32 | } |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | ], |
49 | 49 | ]; |
50 | 50 | |
51 | - return array_map(function ($row) { |
|
51 | + return array_map(function($row) { |
|
52 | 52 | return (object) $row; |
53 | 53 | }, $paths); |
54 | 54 | } |
@@ -5,56 +5,56 @@ |
||
5 | 5 | class PortfolioRouter extends Router |
6 | 6 | { |
7 | 7 | |
8 | - protected function get_redirect_array() |
|
9 | - { |
|
10 | - $paths = [ |
|
11 | - [ |
|
12 | - 'pattern' => '@/index.(html|htm|php)$@', |
|
13 | - 'replace' => '/', |
|
14 | - ], |
|
15 | - [ |
|
16 | - 'pattern' => '@^/print(/?)$@', |
|
17 | - 'replace' => '/projects/', |
|
18 | - ], |
|
19 | - [ |
|
20 | - 'pattern' => '@^/web(/?)$@', |
|
21 | - 'replace' => '/projects/', |
|
22 | - ], |
|
23 | - [ |
|
24 | - 'pattern' => '@^/(web|print)/([a-z0-9-]+)(/?)$@', |
|
25 | - 'replace' => '/projects/', |
|
26 | - ], |
|
27 | - ]; |
|
8 | + protected function get_redirect_array() |
|
9 | + { |
|
10 | + $paths = [ |
|
11 | + [ |
|
12 | + 'pattern' => '@/index.(html|htm|php)$@', |
|
13 | + 'replace' => '/', |
|
14 | + ], |
|
15 | + [ |
|
16 | + 'pattern' => '@^/print(/?)$@', |
|
17 | + 'replace' => '/projects/', |
|
18 | + ], |
|
19 | + [ |
|
20 | + 'pattern' => '@^/web(/?)$@', |
|
21 | + 'replace' => '/projects/', |
|
22 | + ], |
|
23 | + [ |
|
24 | + 'pattern' => '@^/(web|print)/([a-z0-9-]+)(/?)$@', |
|
25 | + 'replace' => '/projects/', |
|
26 | + ], |
|
27 | + ]; |
|
28 | 28 | |
29 | - return array_map(function ($row) { |
|
30 | - return (object) $row; |
|
31 | - }, $paths); |
|
32 | - } |
|
29 | + return array_map(function ($row) { |
|
30 | + return (object) $row; |
|
31 | + }, $paths); |
|
32 | + } |
|
33 | 33 | |
34 | - protected function get_direct_array() |
|
35 | - { |
|
36 | - $paths = [ |
|
37 | - [ |
|
38 | - 'match' => '/', |
|
39 | - 'controller' => 'AboutController', |
|
40 | - ], |
|
41 | - [ |
|
42 | - 'match' => '/contact/', |
|
43 | - 'controller' => 'ContactController', |
|
44 | - ], |
|
45 | - [ |
|
46 | - 'match' => '/projects/', |
|
47 | - 'controller' => 'ProjectsController', |
|
48 | - ], |
|
49 | - [ |
|
50 | - 'match' => '/resume/', |
|
51 | - 'controller' => 'ResumeController', |
|
52 | - ], |
|
53 | - ]; |
|
34 | + protected function get_direct_array() |
|
35 | + { |
|
36 | + $paths = [ |
|
37 | + [ |
|
38 | + 'match' => '/', |
|
39 | + 'controller' => 'AboutController', |
|
40 | + ], |
|
41 | + [ |
|
42 | + 'match' => '/contact/', |
|
43 | + 'controller' => 'ContactController', |
|
44 | + ], |
|
45 | + [ |
|
46 | + 'match' => '/projects/', |
|
47 | + 'controller' => 'ProjectsController', |
|
48 | + ], |
|
49 | + [ |
|
50 | + 'match' => '/resume/', |
|
51 | + 'controller' => 'ResumeController', |
|
52 | + ], |
|
53 | + ]; |
|
54 | 54 | |
55 | - return array_map(function ($row) { |
|
56 | - return (object) $row; |
|
57 | - }, $paths); |
|
58 | - } |
|
55 | + return array_map(function ($row) { |
|
56 | + return (object) $row; |
|
57 | + }, $paths); |
|
58 | + } |
|
59 | 59 | |
60 | 60 | } |
@@ -5,92 +5,92 @@ |
||
5 | 5 | class ContactController extends DefaultPageController |
6 | 6 | { |
7 | 7 | |
8 | - protected function set_head_data() |
|
9 | - { |
|
10 | - $this->set_title("Contact Page | Jacob Emerick's Portfolio"); |
|
11 | - $this->set_description("Contact page for Jacob Emerick's Portfolio"); |
|
12 | - $this->set_keywords([ |
|
13 | - 'portfolio', |
|
14 | - 'programming portfolio', |
|
15 | - 'contact', |
|
16 | - 'Jacob Emerick', |
|
17 | - 'information', |
|
18 | - 'freelance', |
|
19 | - ]); |
|
20 | - } |
|
8 | + protected function set_head_data() |
|
9 | + { |
|
10 | + $this->set_title("Contact Page | Jacob Emerick's Portfolio"); |
|
11 | + $this->set_description("Contact page for Jacob Emerick's Portfolio"); |
|
12 | + $this->set_keywords([ |
|
13 | + 'portfolio', |
|
14 | + 'programming portfolio', |
|
15 | + 'contact', |
|
16 | + 'Jacob Emerick', |
|
17 | + 'information', |
|
18 | + 'freelance', |
|
19 | + ]); |
|
20 | + } |
|
21 | 21 | |
22 | - protected function set_body_data() |
|
23 | - { |
|
24 | - $this->set_body('body_view', 'Contact'); |
|
22 | + protected function set_body_data() |
|
23 | + { |
|
24 | + $this->set_body('body_view', 'Contact'); |
|
25 | 25 | |
26 | - $body_data = []; |
|
27 | - if (!empty($_POST)) { |
|
28 | - $body_data = $this->process_form_data(); |
|
29 | - } |
|
30 | - $body_data['domain_container'] = $this->get_domain_container(); |
|
31 | - $this->set_body('body_data', $body_data); |
|
26 | + $body_data = []; |
|
27 | + if (!empty($_POST)) { |
|
28 | + $body_data = $this->process_form_data(); |
|
29 | + } |
|
30 | + $body_data['domain_container'] = $this->get_domain_container(); |
|
31 | + $this->set_body('body_data', $body_data); |
|
32 | 32 | |
33 | - parent::set_body_data(); |
|
34 | - } |
|
33 | + parent::set_body_data(); |
|
34 | + } |
|
35 | 35 | |
36 | - private function process_form_data() |
|
37 | - { |
|
38 | - $errors = []; |
|
36 | + private function process_form_data() |
|
37 | + { |
|
38 | + $errors = []; |
|
39 | 39 | |
40 | - if ( |
|
41 | - empty($_POST['name']) || |
|
42 | - !is_string($_POST['name']) || |
|
43 | - strlen($_POST['name']) > 100 |
|
44 | - ) { |
|
45 | - $errors['name'] = 'Please enter a valid name.'; |
|
46 | - } |
|
40 | + if ( |
|
41 | + empty($_POST['name']) || |
|
42 | + !is_string($_POST['name']) || |
|
43 | + strlen($_POST['name']) > 100 |
|
44 | + ) { |
|
45 | + $errors['name'] = 'Please enter a valid name.'; |
|
46 | + } |
|
47 | 47 | |
48 | - if (!filter_var($_POST['email'], FILTER_VALIDATE_EMAIL)) { |
|
49 | - $errors['email'] = 'Please enter a valid email.'; |
|
50 | - } |
|
48 | + if (!filter_var($_POST['email'], FILTER_VALIDATE_EMAIL)) { |
|
49 | + $errors['email'] = 'Please enter a valid email.'; |
|
50 | + } |
|
51 | 51 | |
52 | - if ( |
|
53 | - empty($_POST['message']) || |
|
54 | - !is_string($_POST['message']) || |
|
55 | - strlen($_POST['message']) > 10000 |
|
56 | - ) { |
|
57 | - $errors['message'] = 'Please enter a valid message.'; |
|
58 | - } |
|
52 | + if ( |
|
53 | + empty($_POST['message']) || |
|
54 | + !is_string($_POST['message']) || |
|
55 | + strlen($_POST['message']) > 10000 |
|
56 | + ) { |
|
57 | + $errors['message'] = 'Please enter a valid message.'; |
|
58 | + } |
|
59 | 59 | |
60 | - if (!empty($errors)) { |
|
61 | - $values = $_POST; |
|
62 | - $values = array_intersect_key($values, array_flip([ |
|
63 | - 'name', |
|
64 | - 'email', |
|
65 | - 'message', |
|
66 | - ])); |
|
60 | + if (!empty($errors)) { |
|
61 | + $values = $_POST; |
|
62 | + $values = array_intersect_key($values, array_flip([ |
|
63 | + 'name', |
|
64 | + 'email', |
|
65 | + 'message', |
|
66 | + ])); |
|
67 | 67 | |
68 | - return [ |
|
69 | - 'errors' => $errors, |
|
70 | - 'values' => $values, |
|
71 | - ]; |
|
72 | - } |
|
68 | + return [ |
|
69 | + 'errors' => $errors, |
|
70 | + 'values' => $values, |
|
71 | + ]; |
|
72 | + } |
|
73 | 73 | |
74 | - $message = [ |
|
75 | - "Name: {$_POST['name']}", |
|
76 | - "Email: {$_POST['email']}", |
|
77 | - '', |
|
78 | - 'Message:', |
|
79 | - $_POST['message'], |
|
80 | - ]; |
|
81 | - $message = implode("\n", $message); |
|
74 | + $message = [ |
|
75 | + "Name: {$_POST['name']}", |
|
76 | + "Email: {$_POST['email']}", |
|
77 | + '', |
|
78 | + 'Message:', |
|
79 | + $_POST['message'], |
|
80 | + ]; |
|
81 | + $message = implode("\n", $message); |
|
82 | 82 | |
83 | - global $container; |
|
84 | - $container['mail'] |
|
85 | - ->addTo($container['config']->admin_email) |
|
86 | - ->setSubject('Portfolio Contact') |
|
87 | - ->setPlainMessage($message) |
|
88 | - ->send(); |
|
83 | + global $container; |
|
84 | + $container['mail'] |
|
85 | + ->addTo($container['config']->admin_email) |
|
86 | + ->setSubject('Portfolio Contact') |
|
87 | + ->setPlainMessage($message) |
|
88 | + ->send(); |
|
89 | 89 | |
90 | - return [ |
|
91 | - 'success' => |
|
92 | - "Thank you for your message, {$_POST['name']}! " . |
|
93 | - "I'll get back to you as soon as possible." |
|
94 | - ]; |
|
95 | - } |
|
90 | + return [ |
|
91 | + 'success' => |
|
92 | + "Thank you for your message, {$_POST['name']}! " . |
|
93 | + "I'll get back to you as soon as possible." |
|
94 | + ]; |
|
95 | + } |
|
96 | 96 | } |
@@ -89,7 +89,7 @@ |
||
89 | 89 | |
90 | 90 | return [ |
91 | 91 | 'success' => |
92 | - "Thank you for your message, {$_POST['name']}! " . |
|
92 | + "Thank you for your message, {$_POST['name']}! ". |
|
93 | 93 | "I'll get back to you as soon as possible." |
94 | 94 | ]; |
95 | 95 | } |
@@ -5,26 +5,26 @@ |
||
5 | 5 | class AboutController extends DefaultPageController |
6 | 6 | { |
7 | 7 | |
8 | - protected function set_head_data() |
|
9 | - { |
|
10 | - $this->set_title("Jacob Emerick's Portfolio"); |
|
11 | - $this->set_description("Jacob Emerick's Portfolio - collection of programming projects and resume"); |
|
12 | - $this->set_keywords([ |
|
13 | - 'portfolio', |
|
14 | - 'Jacob Emerick', |
|
15 | - 'web development', |
|
16 | - 'web programming', |
|
17 | - 'software development', |
|
18 | - 'agile', |
|
19 | - 'freelance', |
|
20 | - ]); |
|
21 | - } |
|
8 | + protected function set_head_data() |
|
9 | + { |
|
10 | + $this->set_title("Jacob Emerick's Portfolio"); |
|
11 | + $this->set_description("Jacob Emerick's Portfolio - collection of programming projects and resume"); |
|
12 | + $this->set_keywords([ |
|
13 | + 'portfolio', |
|
14 | + 'Jacob Emerick', |
|
15 | + 'web development', |
|
16 | + 'web programming', |
|
17 | + 'software development', |
|
18 | + 'agile', |
|
19 | + 'freelance', |
|
20 | + ]); |
|
21 | + } |
|
22 | 22 | |
23 | - protected function set_body_data() |
|
24 | - { |
|
25 | - $this->set_body('body_view', 'About'); |
|
26 | - $this->set_body('body_data', []); |
|
23 | + protected function set_body_data() |
|
24 | + { |
|
25 | + $this->set_body('body_view', 'About'); |
|
26 | + $this->set_body('body_data', []); |
|
27 | 27 | |
28 | - parent::set_body_data(); |
|
29 | - } |
|
28 | + parent::set_body_data(); |
|
29 | + } |
|
30 | 30 | } |
@@ -5,31 +5,31 @@ |
||
5 | 5 | class ResumeController extends DefaultPageController |
6 | 6 | { |
7 | 7 | |
8 | - protected $resume = 'resume-20160318.json'; |
|
8 | + protected $resume = 'resume-20160318.json'; |
|
9 | 9 | |
10 | - protected function set_head_data() |
|
11 | - { |
|
12 | - $this->set_title("Resume | Jacob Emerick's Portfolio"); |
|
13 | - $this->set_description("Resume for Jacob Emerick, a software engineer extraordinaire"); |
|
14 | - $this->set_keywords([ |
|
15 | - 'resume', |
|
16 | - 'programming resume', |
|
17 | - 'Jacob Emerick', |
|
18 | - 'software engineer', |
|
19 | - 'portfolio', |
|
20 | - 'shutterstock', |
|
21 | - ]); |
|
22 | - } |
|
10 | + protected function set_head_data() |
|
11 | + { |
|
12 | + $this->set_title("Resume | Jacob Emerick's Portfolio"); |
|
13 | + $this->set_description("Resume for Jacob Emerick, a software engineer extraordinaire"); |
|
14 | + $this->set_keywords([ |
|
15 | + 'resume', |
|
16 | + 'programming resume', |
|
17 | + 'Jacob Emerick', |
|
18 | + 'software engineer', |
|
19 | + 'portfolio', |
|
20 | + 'shutterstock', |
|
21 | + ]); |
|
22 | + } |
|
23 | 23 | |
24 | - protected function set_body_data() |
|
25 | - { |
|
26 | - $this->set_body('body_view', 'Resume'); |
|
24 | + protected function set_body_data() |
|
25 | + { |
|
26 | + $this->set_body('body_view', 'Resume'); |
|
27 | 27 | |
28 | - $resumePath = Loader::getRootURL('portfolio') . "/jsonresume/{$this->resume}"; |
|
29 | - $resume = file_get_contents($resumePath); |
|
30 | - $resume = json_decode($resume, true); |
|
31 | - $this->set_body('body_data', $resume); |
|
28 | + $resumePath = Loader::getRootURL('portfolio') . "/jsonresume/{$this->resume}"; |
|
29 | + $resume = file_get_contents($resumePath); |
|
30 | + $resume = json_decode($resume, true); |
|
31 | + $this->set_body('body_data', $resume); |
|
32 | 32 | |
33 | - parent::set_body_data(); |
|
34 | - } |
|
33 | + parent::set_body_data(); |
|
34 | + } |
|
35 | 35 | } |
@@ -25,7 +25,7 @@ |
||
25 | 25 | { |
26 | 26 | $this->set_body('body_view', 'Resume'); |
27 | 27 | |
28 | - $resumePath = Loader::getRootURL('portfolio') . "/jsonresume/{$this->resume}"; |
|
28 | + $resumePath = Loader::getRootURL('portfolio')."/jsonresume/{$this->resume}"; |
|
29 | 29 | $resume = file_get_contents($resumePath); |
30 | 30 | $resume = json_decode($resume, true); |
31 | 31 | $this->set_body('body_data', $resume); |
@@ -5,25 +5,25 @@ |
||
5 | 5 | class ProjectsController extends DefaultPageController |
6 | 6 | { |
7 | 7 | |
8 | - protected function set_head_data() |
|
9 | - { |
|
10 | - $this->set_title("Projects Page | Jacob Emerick's Portfolio"); |
|
11 | - $this->set_description("Collection of key open-source projects that Jacob has developed and maintained over the years."); |
|
12 | - $this->set_keywords([ |
|
13 | - 'projects', |
|
14 | - 'open source', |
|
15 | - 'example work', |
|
16 | - 'portfolio', |
|
17 | - 'Jacob Emerick', |
|
18 | - 'software development', |
|
19 | - ]); |
|
20 | - } |
|
8 | + protected function set_head_data() |
|
9 | + { |
|
10 | + $this->set_title("Projects Page | Jacob Emerick's Portfolio"); |
|
11 | + $this->set_description("Collection of key open-source projects that Jacob has developed and maintained over the years."); |
|
12 | + $this->set_keywords([ |
|
13 | + 'projects', |
|
14 | + 'open source', |
|
15 | + 'example work', |
|
16 | + 'portfolio', |
|
17 | + 'Jacob Emerick', |
|
18 | + 'software development', |
|
19 | + ]); |
|
20 | + } |
|
21 | 21 | |
22 | - protected function set_body_data() |
|
23 | - { |
|
24 | - $this->set_body('body_view', 'Projects'); |
|
25 | - $this->set_body('body_data', []); |
|
22 | + protected function set_body_data() |
|
23 | + { |
|
24 | + $this->set_body('body_view', 'Projects'); |
|
25 | + $this->set_body('body_data', []); |
|
26 | 26 | |
27 | - parent::set_body_data(); |
|
28 | - } |
|
27 | + parent::set_body_data(); |
|
28 | + } |
|
29 | 29 | } |
@@ -1,7 +1,7 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | $namespace = 'portfolio'; |
4 | -require_once __DIR__ . '/../../bootstrap.php'; |
|
4 | +require_once __DIR__.'/../../bootstrap.php'; |
|
5 | 5 | |
6 | 6 | // route |
7 | 7 | Loader::loadInstance('router', 'Router'); |
@@ -3,4 +3,4 @@ |
||
3 | 3 | error_reporting(E_ALL); |
4 | 4 | date_default_timezone_set('America/Chicago'); |
5 | 5 | |
6 | -require_once __DIR__ . '/../vendor/autoload.php'; |
|
6 | +require_once __DIR__.'/../vendor/autoload.php'; |