Completed
Pull Request — master (#5)
by Jacob
03:16
created
router/PortfolioRouter.class.inc.php 2 patches
Indentation   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -5,52 +5,52 @@
 block discarded – undo
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' => '/',
18
-            ],
19
-            [
20
-                'pattern' => '@^/web(/?)$@',
21
-                'replace' => '/',
22
-            ],
23
-            [
24
-                'pattern' => '@^/(web|print)/([a-z0-9-]+)(/?)$@',
25
-                'replace' => '/',
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' => '/',
18
+			],
19
+			[
20
+				'pattern' => '@^/web(/?)$@',
21
+				'replace' => '/',
22
+			],
23
+			[
24
+				'pattern' => '@^/(web|print)/([a-z0-9-]+)(/?)$@',
25
+				'replace' => '/',
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' => 'HomeController',
40
-            ],
41
-            [
42
-                'match' => '/contact/',
43
-                'controller' => 'ContactController',
44
-            ],
45
-            [
46
-                'match' => '/resume/',
47
-                'controller' => 'ResumeController',
48
-            ],
49
-        ];
34
+	protected function get_direct_array()
35
+	{
36
+		$paths = [
37
+			[
38
+				'match' => '/',
39
+				'controller' => 'HomeController',
40
+			],
41
+			[
42
+				'match' => '/contact/',
43
+				'controller' => 'ContactController',
44
+			],
45
+			[
46
+				'match' => '/resume/',
47
+				'controller' => 'ResumeController',
48
+			],
49
+		];
50 50
 
51
-        return array_map(function ($row) {
52
-            return (object) $row;
53
-        }, $paths);
54
-    }
51
+		return array_map(function ($row) {
52
+			return (object) $row;
53
+		}, $paths);
54
+	}
55 55
 
56 56
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
controller/portfolio/DefaultPageController.class.inc.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
             $active_page = ucfirst(URLDecode::getPiece(1));
37 37
         }
38 38
 
39
-        return array_map(function ($row) use ($active_page) {
39
+        return array_map(function($row) use ($active_page) {
40 40
             $row = (object) $row;
41 41
             $row->active = ($row->name == $active_page);
42 42
             return $row;
Please login to merge, or discard this patch.
Indentation   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -5,54 +5,54 @@
 block discarded – undo
5 5
 abstract class DefaultPageController extends PageController
6 6
 {
7 7
 
8
-    public function __construct()
9
-    {
10
-        parent::__construct();
11
-
12
-        $this->add_css('reset');
13
-        $this->add_css('portfolio');
14
-    }
15
-
16
-    protected function set_body_data()
17
-    {
18
-        $this->set_body('header_data', [
19
-            'menu' => $this->get_menu(),
20
-            'home_link' => Loader::getRootURL(),
21
-        ]);
22
-        $this->set_body('activity_array', $this->get_recent_activity());
23
-    }
24
-
25
-    protected function get_menu()
26
-    {
27
-        $menu = [
28
-            [
29
-                'name' => 'About',
30
-                'link' => Loader::getRootURL(),
31
-            ],
32
-            [
33
-                'name' => 'Projects',
34
-                'link' => Loader::getRootURL() . 'projects/',
35
-            ],
36
-            [
37
-                'name' => 'Resume',
38
-                'link' => Loader::getRootURL() . 'resume/',
39
-            ],
40
-            [
41
-                'name' => 'Contact',
42
-                'link' => Loader::getRootURL() . 'contact/',
43
-            ],
44
-        ];
45
-
46
-        if (!URLDecode::getPiece(1)) {
47
-            $active_page = 'About';
48
-        } else {
49
-            $active_page = ucfirst(URLDecode::getPiece(1));
50
-        }
51
-
52
-        return array_map(function ($row) use ($active_page) {
53
-            $row = (object) $row;
54
-            $row->active = ($row->name == $active_page);
55
-            return $row;
56
-        }, $menu);
57
-    }
8
+	public function __construct()
9
+	{
10
+		parent::__construct();
11
+
12
+		$this->add_css('reset');
13
+		$this->add_css('portfolio');
14
+	}
15
+
16
+	protected function set_body_data()
17
+	{
18
+		$this->set_body('header_data', [
19
+			'menu' => $this->get_menu(),
20
+			'home_link' => Loader::getRootURL(),
21
+		]);
22
+		$this->set_body('activity_array', $this->get_recent_activity());
23
+	}
24
+
25
+	protected function get_menu()
26
+	{
27
+		$menu = [
28
+			[
29
+				'name' => 'About',
30
+				'link' => Loader::getRootURL(),
31
+			],
32
+			[
33
+				'name' => 'Projects',
34
+				'link' => Loader::getRootURL() . 'projects/',
35
+			],
36
+			[
37
+				'name' => 'Resume',
38
+				'link' => Loader::getRootURL() . 'resume/',
39
+			],
40
+			[
41
+				'name' => 'Contact',
42
+				'link' => Loader::getRootURL() . 'contact/',
43
+			],
44
+		];
45
+
46
+		if (!URLDecode::getPiece(1)) {
47
+			$active_page = 'About';
48
+		} else {
49
+			$active_page = ucfirst(URLDecode::getPiece(1));
50
+		}
51
+
52
+		return array_map(function ($row) use ($active_page) {
53
+			$row = (object) $row;
54
+			$row->active = ($row->name == $active_page);
55
+			return $row;
56
+		}, $menu);
57
+	}
58 58
 }
Please login to merge, or discard this patch.
utility/URLDecode.class.inc.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -24,21 +24,21 @@
 block discarded – undo
24 24
 		
25 25
 		self::$array['host'] = $host;
26 26
 		
27
-    if (
28
-      $host == 'www.waterfallsofthekeweenaw.com' ||
29
-      $host == 'waterfallsofthekeweenaw.com'
30
-    ) {
27
+	if (
28
+	  $host == 'www.waterfallsofthekeweenaw.com' ||
29
+	  $host == 'waterfallsofthekeweenaw.com'
30
+	) {
31 31
 			self::$array['site'] = 'waterfalls';
32 32
 		} else {
33 33
 			self::$array['site'] = substr($host, 0, strpos($host, '.'));
34 34
 		}
35 35
 
36
-    $base = '';
37
-    $base .= (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
38
-    $base .= '://';
39
-    $base .= (!Loader::isLive()) ? 'dev.' : '';
40
-    $base .= $host;
41
-    $base .= '/';
36
+	$base = '';
37
+	$base .= (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
38
+	$base .= '://';
39
+	$base .= (!Loader::isLive()) ? 'dev.' : '';
40
+	$base .= $host;
41
+	$base .= '/';
42 42
 
43 43
 		self::$array['base'] = $base;
44 44
 		self::$array['uri'] = '/' . implode('/', $uri_array);
Please login to merge, or discard this patch.
controller/portfolio/ResumeController.class.inc.php 1 patch
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -5,33 +5,33 @@
 block discarded – undo
5 5
 class ResumeController extends DefaultPageController
6 6
 {
7 7
 
8
-    protected $resume = 'resume-20160312.json';
8
+	protected $resume = 'resume-20160312.json';
9 9
 
10
-    protected function set_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
-        ]);
10
+	protected function set_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 22
 
23
-        $this->set_body('body_view', 'Resume');
24
-        $this->set_body('header_data', [
25
-            'title' => "Resume | Jacob Emerick's Portfolio",
26
-            'menu' => $this->get_menu(),
27
-            'home_link' => Loader::getRootURL(),
28
-        ]);
23
+		$this->set_body('body_view', 'Resume');
24
+		$this->set_body('header_data', [
25
+			'title' => "Resume | Jacob Emerick's Portfolio",
26
+			'menu' => $this->get_menu(),
27
+			'home_link' => Loader::getRootURL(),
28
+		]);
29 29
 
30
-        $resumePath = Loader::getRootURL('portfolio') . "/jsonresume/{$this->resume}";
31
-        $resume = file_get_contents($resumePath);
32
-        $resume = json_decode($resume, true);
33
-        $this->set_body('body_data', $resume);
30
+		$resumePath = Loader::getRootURL('portfolio') . "/jsonresume/{$this->resume}";
31
+		$resume = file_get_contents($resumePath);
32
+		$resume = json_decode($resume, true);
33
+		$this->set_body('body_data', $resume);
34 34
 
35
-        $this->set_body_view('Page');
36
-    }
35
+		$this->set_body_view('Page');
36
+	}
37 37
 }
Please login to merge, or discard this patch.
controller/portfolio/HomeController.class.inc.php 1 patch
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -5,28 +5,28 @@
 block discarded – undo
5 5
 class HomeController extends DefaultPageController
6 6
 {
7 7
 
8
-    protected function set_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
-        ]);
8
+	protected function set_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 21
 
22
-        $this->set_body('body_view', 'About');
23
-        $this->set_body('header_data', [
24
-            'title' => "Jacob Emerick's Portfolio",
25
-            'menu' => $this->get_menu(),
26
-            'home_link' => Loader::getRootURL(),
27
-        ]);
28
-        $this->set_body('body_data', []);
22
+		$this->set_body('body_view', 'About');
23
+		$this->set_body('header_data', [
24
+			'title' => "Jacob Emerick's Portfolio",
25
+			'menu' => $this->get_menu(),
26
+			'home_link' => Loader::getRootURL(),
27
+		]);
28
+		$this->set_body('body_data', []);
29 29
 
30
-        $this->set_body_view('Page');
31
-    }
30
+		$this->set_body_view('Page');
31
+	}
32 32
 }
Please login to merge, or discard this patch.
controller/portfolio/ContactController.class.inc.php 1 patch
Indentation   +90 added lines, -90 removed lines patch added patch discarded remove patch
@@ -5,94 +5,94 @@
 block discarded – undo
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
-    }
21
-
22
-    protected function set_body_data()
23
-    {
24
-        $this->set_body('body_view', 'Contact');
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);
32
-
33
-        $this->set_body_view('Page');
34
-
35
-        parent::set_body_data();
36
-    }
37
-
38
-    private function process_form_data()
39
-    {
40
-        $errors = [];
41
-
42
-        if (
43
-            empty($_POST['name']) ||
44
-            !is_string($_POST['name']) ||
45
-            strlen($_POST['name']) > 100
46
-        ) {
47
-            $errors['name'] = 'Please enter a valid name.';
48
-        }
49
-
50
-        if (!filter_var($_POST['email'], FILTER_VALIDATE_EMAIL)) {
51
-            $errors['email'] = 'Please enter a valid email.';
52
-        }
53
-
54
-        if (
55
-            empty($_POST['message']) ||
56
-            !is_string($_POST['message']) ||
57
-            strlen($_POST['message']) > 10000
58
-        ) {
59
-            $errors['message'] = 'Please enter a valid message.';
60
-        }
61
-
62
-        if (!empty($errors)) {
63
-            $values = $_POST;
64
-            $values = array_intersect_key($values, array_flip([
65
-                'name',
66
-                'email',
67
-                'message',
68
-            ]));
69
-
70
-            return [
71
-                'errors' => $errors,
72
-                'values' => $values,
73
-            ];
74
-        }
75
-
76
-        $message = [
77
-            "Name: {$_POST['name']}",
78
-            "Email: {$_POST['email']}",
79
-            '',
80
-            'Message:',
81
-            $_POST['message'],
82
-        ];
83
-        $message = implode("\n", $message);
84
-
85
-        global $container;
86
-        $container['mail']
87
-            ->addTo($container['config']->admin_email)
88
-            ->setSubject('Portfolio Contact')
89
-            ->setPlainMessage($message)
90
-            ->send();
91
-
92
-        return [
93
-            'success' =>
94
-                "Thank you for your message, {$_POST['name']}! " .
95
-                "I'll get back to you as soon as possible."
96
-        ];
97
-    }
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
+
22
+	protected function set_body_data()
23
+	{
24
+		$this->set_body('body_view', 'Contact');
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);
32
+
33
+		$this->set_body_view('Page');
34
+
35
+		parent::set_body_data();
36
+	}
37
+
38
+	private function process_form_data()
39
+	{
40
+		$errors = [];
41
+
42
+		if (
43
+			empty($_POST['name']) ||
44
+			!is_string($_POST['name']) ||
45
+			strlen($_POST['name']) > 100
46
+		) {
47
+			$errors['name'] = 'Please enter a valid name.';
48
+		}
49
+
50
+		if (!filter_var($_POST['email'], FILTER_VALIDATE_EMAIL)) {
51
+			$errors['email'] = 'Please enter a valid email.';
52
+		}
53
+
54
+		if (
55
+			empty($_POST['message']) ||
56
+			!is_string($_POST['message']) ||
57
+			strlen($_POST['message']) > 10000
58
+		) {
59
+			$errors['message'] = 'Please enter a valid message.';
60
+		}
61
+
62
+		if (!empty($errors)) {
63
+			$values = $_POST;
64
+			$values = array_intersect_key($values, array_flip([
65
+				'name',
66
+				'email',
67
+				'message',
68
+			]));
69
+
70
+			return [
71
+				'errors' => $errors,
72
+				'values' => $values,
73
+			];
74
+		}
75
+
76
+		$message = [
77
+			"Name: {$_POST['name']}",
78
+			"Email: {$_POST['email']}",
79
+			'',
80
+			'Message:',
81
+			$_POST['message'],
82
+		];
83
+		$message = implode("\n", $message);
84
+
85
+		global $container;
86
+		$container['mail']
87
+			->addTo($container['config']->admin_email)
88
+			->setSubject('Portfolio Contact')
89
+			->setPlainMessage($message)
90
+			->send();
91
+
92
+		return [
93
+			'success' =>
94
+				"Thank you for your message, {$_POST['name']}! " .
95
+				"I'll get back to you as soon as possible."
96
+		];
97
+	}
98 98
 }
Please login to merge, or discard this patch.