jacobemerick / web

router/PortfolioRouter.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
             ],
         ];
 
-        return array_map(function ($row) {
+        return array_map(function($row) {
             return (object) $row;
         }, $paths);
     }
@@ -48,7 +48,7 @@ 
             ],
         ];
 
-        return array_map(function ($row) {
+        return array_map(function($row) {
             return (object) $row;
         }, $paths);
     }

Indentation +48 added lines, -48 removed lines

@@ -5,56 +5,56 @@
 class PortfolioRouter extends Router
 {
 
-    protected function get_redirect_array()
-    {
-        $paths = [
-            [
-                'pattern' => '@/index.(html|htm|php)$@',
-                'replace' => '/',
-            ],
-            [
-                'pattern' => '@^/print(/?)$@',
-                'replace' => '/projects/',
-            ],
-            [
-                'pattern' => '@^/web(/?)$@',
-                'replace' => '/projects/',
-            ],
-            [
-                'pattern' => '@^/(web|print)/([a-z0-9-]+)(/?)$@',
-                'replace' => '/projects/',
-            ],
-        ];
+	protected function get_redirect_array()
+	{
+		$paths = [
+			[
+				'pattern' => '@/index.(html|htm|php)$@',
+				'replace' => '/',
+			],
+			[
+				'pattern' => '@^/print(/?)$@',
+				'replace' => '/projects/',
+			],
+			[
+				'pattern' => '@^/web(/?)$@',
+				'replace' => '/projects/',
+			],
+			[
+				'pattern' => '@^/(web|print)/([a-z0-9-]+)(/?)$@',
+				'replace' => '/projects/',
+			],
+		];
 
-        return array_map(function ($row) {
-            return (object) $row;
-        }, $paths);
-    }
+		return array_map(function ($row) {
+			return (object) $row;
+		}, $paths);
+	}
 
-    protected function get_direct_array()
-    {
-        $paths = [
-            [
-                'match' => '/',
-                'controller' => 'AboutController',
-            ],
-            [
-                'match' => '/contact/',
-                'controller' => 'ContactController',
-            ],
-            [
-                'match' => '/projects/',
-                'controller' => 'ProjectsController',
-            ],
-            [
-                'match' => '/resume/',
-                'controller' => 'ResumeController',
-            ],
-        ];
+	protected function get_direct_array()
+	{
+		$paths = [
+			[
+				'match' => '/',
+				'controller' => 'AboutController',
+			],
+			[
+				'match' => '/contact/',
+				'controller' => 'ContactController',
+			],
+			[
+				'match' => '/projects/',
+				'controller' => 'ProjectsController',
+			],
+			[
+				'match' => '/resume/',
+				'controller' => 'ResumeController',
+			],
+		];
 
-        return array_map(function ($row) {
-            return (object) $row;
-        }, $paths);
-    }
+		return array_map(function ($row) {
+			return (object) $row;
+		}, $paths);
+	}
 
 }

controller/portfolio/DefaultPageController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
             $active_page = ucfirst(URLDecode::getPiece(1));
         }
 
-        return array_map(function ($row) use ($active_page) {
+        return array_map(function($row) use ($active_page) {
             $row = (object) $row;
             $row->active = ($row->name == $active_page);
             return $row;

Indentation +52 added lines, -52 removed lines

@@ -5,56 +5,56 @@
 abstract class DefaultPageController extends PageController
 {
 
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->add_css('reset');
-        $this->add_css('portfolio');
-    }
-
-    protected function set_body_data()
-    {
-        $this->set_body('header_data', [
-            'menu' => $this->get_menu(),
-            'home_link' => Loader::getRootURL(),
-        ]);
-        $this->set_body('activity_array', $this->get_recent_activity());
-
-        $this->set_body_view('Page');
-    }
-
-    protected function get_menu()
-    {
-        $menu = [
-            [
-                'name' => 'About',
-                'link' => Loader::getRootURL(),
-            ],
-            [
-                'name' => 'Projects',
-                'link' => Loader::getRootURL() . 'projects/',
-            ],
-            [
-                'name' => 'Résumé',
-                'link' => Loader::getRootURL() . 'resume/',
-            ],
-            [
-                'name' => 'Contact',
-                'link' => Loader::getRootURL() . 'contact/',
-            ],
-        ];
-
-        if (!URLDecode::getPiece(1)) {
-            $active_page = 'About';
-        } else {
-            $active_page = ucfirst(URLDecode::getPiece(1));
-        }
-
-        return array_map(function ($row) use ($active_page) {
-            $row = (object) $row;
-            $row->active = ($row->name == $active_page);
-            return $row;
-        }, $menu);
-    }
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->add_css('reset');
+		$this->add_css('portfolio');
+	}
+
+	protected function set_body_data()
+	{
+		$this->set_body('header_data', [
+			'menu' => $this->get_menu(),
+			'home_link' => Loader::getRootURL(),
+		]);
+		$this->set_body('activity_array', $this->get_recent_activity());
+
+		$this->set_body_view('Page');
+	}
+
+	protected function get_menu()
+	{
+		$menu = [
+			[
+				'name' => 'About',
+				'link' => Loader::getRootURL(),
+			],
+			[
+				'name' => 'Projects',
+				'link' => Loader::getRootURL() . 'projects/',
+			],
+			[
+				'name' => 'Résumé',
+				'link' => Loader::getRootURL() . 'resume/',
+			],
+			[
+				'name' => 'Contact',
+				'link' => Loader::getRootURL() . 'contact/',
+			],
+		];
+
+		if (!URLDecode::getPiece(1)) {
+			$active_page = 'About';
+		} else {
+			$active_page = ucfirst(URLDecode::getPiece(1));
+		}
+
+		return array_map(function ($row) use ($active_page) {
+			$row = (object) $row;
+			$row->active = ($row->name == $active_page);
+			return $row;
+		}, $menu);
+	}
 }

utility/URLDecode.class.inc.php

Indentation +10 added lines, -10 removed lines

@@ -24,21 +24,21 @@
 		
 		self::$array['host'] = $host;
 		
-    if (
-      $host == 'www.waterfallsofthekeweenaw.com' ||
-      $host == 'waterfallsofthekeweenaw.com'
-    ) {
+	if (
+	  $host == 'www.waterfallsofthekeweenaw.com' ||
+	  $host == 'waterfallsofthekeweenaw.com'
+	) {
 			self::$array['site'] = 'waterfalls';
 		} else {
 			self::$array['site'] = substr($host, 0, strpos($host, '.'));
 		}
 
-    $base = '';
-    $base .= (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
-    $base .= '://';
-    $base .= (!Loader::isLive()) ? 'dev.' : '';
-    $base .= $host;
-    $base .= '/';
+	$base = '';
+	$base .= (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
+	$base .= '://';
+	$base .= (!Loader::isLive()) ? 'dev.' : '';
+	$base .= $host;
+	$base .= '/';
 
 		self::$array['base'] = $base;
 		self::$array['uri'] = '/' . implode('/', $uri_array);

controller/portfolio/ContactController.class.inc.php

Indentation +76 added lines, -76 removed lines

@@ -5,92 +5,92 @@
 class ContactController extends DefaultPageController
 {
 
-    protected function set_head_data()
-    {
-        $this->set_title("Contact Page | Jacob Emerick's Portfolio");
-        $this->set_description("Contact page for Jacob Emerick's Portfolio");
-        $this->set_keywords([
-            'portfolio',
-            'programming portfolio',
-            'contact',
-            'Jacob Emerick',
-            'information',
-            'freelance',
-        ]);
-    }
+	protected function set_head_data()
+	{
+		$this->set_title("Contact Page | Jacob Emerick's Portfolio");
+		$this->set_description("Contact page for Jacob Emerick's Portfolio");
+		$this->set_keywords([
+			'portfolio',
+			'programming portfolio',
+			'contact',
+			'Jacob Emerick',
+			'information',
+			'freelance',
+		]);
+	}
 
-    protected function set_body_data()
-    {
-        $this->set_body('body_view', 'Contact');
+	protected function set_body_data()
+	{
+		$this->set_body('body_view', 'Contact');
 
-        $body_data = [];
-        if (!empty($_POST)) {
-            $body_data = $this->process_form_data();
-        }
-        $body_data['domain_container'] = $this->get_domain_container();
-        $this->set_body('body_data', $body_data);
+		$body_data = [];
+		if (!empty($_POST)) {
+			$body_data = $this->process_form_data();
+		}
+		$body_data['domain_container'] = $this->get_domain_container();
+		$this->set_body('body_data', $body_data);
 
-        parent::set_body_data();
-    }
+		parent::set_body_data();
+	}
 
-    private function process_form_data()
-    {
-        $errors = [];
+	private function process_form_data()
+	{
+		$errors = [];
 
-        if (
-            empty($_POST['name']) ||
-            !is_string($_POST['name']) ||
-            strlen($_POST['name']) > 100
-        ) {
-            $errors['name'] = 'Please enter a valid name.';
-        }
+		if (
+			empty($_POST['name']) ||
+			!is_string($_POST['name']) ||
+			strlen($_POST['name']) > 100
+		) {
+			$errors['name'] = 'Please enter a valid name.';
+		}
 
-        if (!filter_var($_POST['email'], FILTER_VALIDATE_EMAIL)) {
-            $errors['email'] = 'Please enter a valid email.';
-        }
+		if (!filter_var($_POST['email'], FILTER_VALIDATE_EMAIL)) {
+			$errors['email'] = 'Please enter a valid email.';
+		}
 
-        if (
-            empty($_POST['message']) ||
-            !is_string($_POST['message']) ||
-            strlen($_POST['message']) > 10000
-        ) {
-            $errors['message'] = 'Please enter a valid message.';
-        }
+		if (
+			empty($_POST['message']) ||
+			!is_string($_POST['message']) ||
+			strlen($_POST['message']) > 10000
+		) {
+			$errors['message'] = 'Please enter a valid message.';
+		}
 
-        if (!empty($errors)) {
-            $values = $_POST;
-            $values = array_intersect_key($values, array_flip([
-                'name',
-                'email',
-                'message',
-            ]));
+		if (!empty($errors)) {
+			$values = $_POST;
+			$values = array_intersect_key($values, array_flip([
+				'name',
+				'email',
+				'message',
+			]));
 
-            return [
-                'errors' => $errors,
-                'values' => $values,
-            ];
-        }
+			return [
+				'errors' => $errors,
+				'values' => $values,
+			];
+		}
 
-        $message = [
-            "Name: {$_POST['name']}",
-            "Email: {$_POST['email']}",
-            '',
-            'Message:',
-            $_POST['message'],
-        ];
-        $message = implode("\n", $message);
+		$message = [
+			"Name: {$_POST['name']}",
+			"Email: {$_POST['email']}",
+			'',
+			'Message:',
+			$_POST['message'],
+		];
+		$message = implode("\n", $message);
 
-        global $container;
-        $container['mail']
-            ->addTo($container['config']->admin_email)
-            ->setSubject('Portfolio Contact')
-            ->setPlainMessage($message)
-            ->send();
+		global $container;
+		$container['mail']
+			->addTo($container['config']->admin_email)
+			->setSubject('Portfolio Contact')
+			->setPlainMessage($message)
+			->send();
 
-        return [
-            'success' =>
-                "Thank you for your message, {$_POST['name']}! " .
-                "I'll get back to you as soon as possible."
-        ];
-    }
+		return [
+			'success' =>
+				"Thank you for your message, {$_POST['name']}! " .
+				"I'll get back to you as soon as possible."
+		];
+	}
 }

controller/portfolio/AboutController.class.inc.php

Indentation +22 added lines, -22 removed lines

@@ -5,28 +5,28 @@
 class HomeController extends DefaultPageController
 {
 
-    protected function set_data()
-    {
-        $this->set_title("Jacob Emerick's Portfolio");
-        $this->set_description("Jacob Emerick's Portfolio - collection of programming projects and resume");
-        $this->set_keywords([
-            'portfolio',
-            'Jacob Emerick',
-            'web development',
-            'web programming',
-            'software development',
-            'agile',
-            'freelance',
-        ]);
+	protected function set_data()
+	{
+		$this->set_title("Jacob Emerick's Portfolio");
+		$this->set_description("Jacob Emerick's Portfolio - collection of programming projects and resume");
+		$this->set_keywords([
+			'portfolio',
+			'Jacob Emerick',
+			'web development',
+			'web programming',
+			'software development',
+			'agile',
+			'freelance',
+		]);
 
-        $this->set_body('body_view', 'About');
-        $this->set_body('header_data', [
-            'title' => "Jacob Emerick's Portfolio",
-            'menu' => $this->get_menu(),
-            'home_link' => Loader::getRootURL(),
-        ]);
-        $this->set_body('body_data', []);
+		$this->set_body('body_view', 'About');
+		$this->set_body('header_data', [
+			'title' => "Jacob Emerick's Portfolio",
+			'menu' => $this->get_menu(),
+			'home_link' => Loader::getRootURL(),
+		]);
+		$this->set_body('body_data', []);
 
-        $this->set_body_view('Page');
-    }
+		$this->set_body_view('Page');
+	}
 }

controller/portfolio/ProjectsController.class.inc.php

Indentation +18 added lines, -18 removed lines

@@ -5,24 +5,24 @@
 class ProjectsController extends DefaultPageController
 {
 
-    protected function set_head_data()
-    {
-        $this->set_title("Projects Page | Jacob Emerick's Portfolio");
-        $this->set_description("Collection of key open-source projects that Jacob has developed and maintained over the years.");
-        $this->set_keywords([
-            'projects',
-            'open source',
-            'example work',
-            'portfolio',
-            'Jacob Emerick',
-            'software development',
-        ]);
-    }
+	protected function set_head_data()
+	{
+		$this->set_title("Projects Page | Jacob Emerick's Portfolio");
+		$this->set_description("Collection of key open-source projects that Jacob has developed and maintained over the years.");
+		$this->set_keywords([
+			'projects',
+			'open source',
+			'example work',
+			'portfolio',
+			'Jacob Emerick',
+			'software development',
+		]);
+	}
 
-    protected function set_body_data()
-    {
-        $this->set_body('body_view', 'Projects');
+	protected function set_body_data()
+	{
+		$this->set_body('body_view', 'Projects');
 
-        parent::set_body_data();
-    }
+		parent::set_body_data();
+	}
 }

controller/portfolio/ResumeController.class.inc.php

Indentation +25 added lines, -25 removed lines

@@ -5,33 +5,33 @@
 class ResumeController extends DefaultPageController
 {
 
-    protected $resume = 'resume-20160318.json';
+	protected $resume = 'resume-20160318.json';
 
-    protected function set_data()
-    {
-        $this->set_title("Resume | Jacob Emerick's Portfolio");
-        $this->set_description("Resume for Jacob Emerick, a software engineer extraordinaire");
-        $this->set_keywords([
-            'resume',
-            'programming resume',
-            'Jacob Emerick',
-            'software engineer',
-            'portfolio',
-            'shutterstock',
-        ]);
+	protected function set_data()
+	{
+		$this->set_title("Resume | Jacob Emerick's Portfolio");
+		$this->set_description("Resume for Jacob Emerick, a software engineer extraordinaire");
+		$this->set_keywords([
+			'resume',
+			'programming resume',
+			'Jacob Emerick',
+			'software engineer',
+			'portfolio',
+			'shutterstock',
+		]);
 
-        $this->set_body('body_view', 'Resume');
-        $this->set_body('header_data', [
-            'title' => "Resume | Jacob Emerick's Portfolio",
-            'menu' => $this->get_menu(),
-            'home_link' => Loader::getRootURL(),
-        ]);
+		$this->set_body('body_view', 'Resume');
+		$this->set_body('header_data', [
+			'title' => "Resume | Jacob Emerick's Portfolio",
+			'menu' => $this->get_menu(),
+			'home_link' => Loader::getRootURL(),
+		]);
 
-        $resumePath = Loader::getRootURL('portfolio') . "/jsonresume/{$this->resume}";
-        $resume = file_get_contents($resumePath);
-        $resume = json_decode($resume, true);
-        $this->set_body('body_data', $resume);
+		$resumePath = Loader::getRootURL('portfolio') . "/jsonresume/{$this->resume}";
+		$resume = file_get_contents($resumePath);
+		$resume = json_decode($resume, true);
+		$this->set_body('body_data', $resume);
 
-        $this->set_body_view('Page');
-    }
+		$this->set_body_view('Page');
+	}
 }