Completed
Push — master ( 72ee7f...4775c0 )
by Jacob
03:43
created
controller/portfolio/ProjectsController.class.inc.php 1 patch
Braces   +4 added lines, -6 removed lines patch added patch discarded remove patch
@@ -2,11 +2,10 @@  discard block
 block discarded – undo
2 2
 
3 3
 Loader::load('controller', 'portfolio/DefaultPageController');
4 4
 
5
-class ProjectsController extends DefaultPageController
6
-{
5
+class ProjectsController extends DefaultPageController
6
+{
7 7
 
8
-    protected function set_head_data()
9
-    {
8
+    protected function set_head_data() {
10 9
         $this->set_title("Projects Page | Jacob Emerick's Portfolio");
11 10
         $this->set_description("Collection of key open-source projects that Jacob has developed and maintained over the years.");
12 11
         $this->set_keywords([
@@ -19,8 +18,7 @@  discard block
 block discarded – undo
19 18
         ]);
20 19
     }
21 20
 
22
-    protected function set_body_data()
23
-    {
21
+    protected function set_body_data() {
24 22
         $this->set_body('body_view', 'Projects');
25 23
         $this->set_body('body_data', []);
26 24
 
Please login to merge, or discard this patch.
controller/portfolio/ResumeController.class.inc.php 1 patch
Braces   +4 added lines, -6 removed lines patch added patch discarded remove patch
@@ -2,13 +2,12 @@  discard block
 block discarded – undo
2 2
 
3 3
 Loader::load('controller', 'portfolio/DefaultPageController');
4 4
 
5
-class ResumeController extends DefaultPageController
6
-{
5
+class ResumeController extends DefaultPageController
6
+{
7 7
 
8 8
     protected $resume = 'resume-20160318.json';
9 9
 
10
-    protected function set_head_data()
11
-    {
10
+    protected function set_head_data() {
12 11
         $this->set_title("Resume | Jacob Emerick's Portfolio");
13 12
         $this->set_description("Resume for Jacob Emerick, a software engineer extraordinaire");
14 13
         $this->set_keywords([
@@ -21,8 +20,7 @@  discard block
 block discarded – undo
21 20
         ]);
22 21
     }
23 22
 
24
-    protected function set_body_data()
25
-    {
23
+    protected function set_body_data() {
26 24
         $this->set_body('body_view', 'Resume');
27 25
 
28 26
         $resumePath = Loader::getRootURL('portfolio') . "/jsonresume/{$this->resume}";
Please login to merge, or discard this patch.
controller/portfolio/DefaultPageController.class.inc.php 1 patch
Braces   +5 added lines, -8 removed lines patch added patch discarded remove patch
@@ -2,19 +2,17 @@  discard block
 block discarded – undo
2 2
 
3 3
 Loader::load('controller', '/PageController');
4 4
 
5
-abstract class DefaultPageController extends PageController
6
-{
5
+abstract class DefaultPageController extends PageController
6
+{
7 7
 
8
-    public function __construct()
9
-    {
8
+    public function __construct() {
10 9
         parent::__construct();
11 10
 
12 11
         $this->add_css('reset');
13 12
         $this->add_css('portfolio', 4);
14 13
     }
15 14
 
16
-    protected function set_body_data()
17
-    {
15
+    protected function set_body_data() {
18 16
         $this->set_body('header_data', [
19 17
             'menu' => $this->get_menu(),
20 18
             'home_link' => Loader::getRootURL(),
@@ -24,8 +22,7 @@  discard block
 block discarded – undo
24 22
         $this->set_body_view('Page');
25 23
     }
26 24
 
27
-    protected function get_menu()
28
-    {
25
+    protected function get_menu() {
29 26
         $menu = [
30 27
             [
31 28
                 'name' => 'About',
Please login to merge, or discard this patch.
controller/portfolio/AboutController.class.inc.php 1 patch
Braces   +4 added lines, -6 removed lines patch added patch discarded remove patch
@@ -2,11 +2,10 @@  discard block
 block discarded – undo
2 2
 
3 3
 Loader::load('controller', 'portfolio/DefaultPageController');
4 4
 
5
-class AboutController extends DefaultPageController
6
-{
5
+class AboutController extends DefaultPageController
6
+{
7 7
 
8
-    protected function set_head_data()
9
-    {
8
+    protected function set_head_data() {
10 9
         $this->set_title("Jacob Emerick's Portfolio");
11 10
         $this->set_description("Jacob Emerick's Portfolio - collection of programming projects and resume");
12 11
         $this->set_keywords([
@@ -20,8 +19,7 @@  discard block
 block discarded – undo
20 19
         ]);
21 20
     }
22 21
 
23
-    protected function set_body_data()
24
-    {
22
+    protected function set_body_data() {
25 23
         $this->set_body('body_view', 'About');
26 24
         $this->set_body('body_data', []);
27 25
 
Please login to merge, or discard this patch.
controller/portfolio/ContactController.class.inc.php 1 patch
Braces   +5 added lines, -8 removed lines patch added patch discarded remove patch
@@ -2,11 +2,10 @@  discard block
 block discarded – undo
2 2
 
3 3
 Loader::load('controller', 'portfolio/DefaultPageController');
4 4
 
5
-class ContactController extends DefaultPageController
6
-{
5
+class ContactController extends DefaultPageController
6
+{
7 7
 
8
-    protected function set_head_data()
9
-    {
8
+    protected function set_head_data() {
10 9
         $this->set_title("Contact Page | Jacob Emerick's Portfolio");
11 10
         $this->set_description("Contact page for Jacob Emerick's Portfolio");
12 11
         $this->set_keywords([
@@ -19,8 +18,7 @@  discard block
 block discarded – undo
19 18
         ]);
20 19
     }
21 20
 
22
-    protected function set_body_data()
23
-    {
21
+    protected function set_body_data() {
24 22
         $this->set_body('body_view', 'Contact');
25 23
 
26 24
         $body_data = [];
@@ -33,8 +31,7 @@  discard block
 block discarded – undo
33 31
         parent::set_body_data();
34 32
     }
35 33
 
36
-    private function process_form_data()
37
-    {
34
+    private function process_form_data() {
38 35
         $errors = [];
39 36
 
40 37
         if (
Please login to merge, or discard this patch.
controller/AJAXController.class.inc.php 1 patch
Braces   +7 added lines, -12 removed lines patch added patch discarded remove patch
@@ -4,8 +4,8 @@  discard block
 block discarded – undo
4 4
 	'Header',
5 5
 	'Request'));
6 6
 
7
-abstract class AJAXController
8
-{
7
+abstract class AJAXController
8
+{
9 9
 
10 10
 	private static $RESPONSE_HEADER = 'sendJSON';
11 11
 
@@ -15,16 +15,14 @@  discard block
 block discarded – undo
15 15
 
16 16
 	function __construct() {}
17 17
 
18
-	public function activate()
19
-	{
18
+	public function activate() {
20 19
 		call_user_func(array('Header', self::$RESPONSE_HEADER));
21 20
 		
22 21
 		$this->set_data();
23 22
 		echo $this->response_as_json();
24 23
 	}
25 24
 
26
-	protected function set_response($message, $type = 'internal')
27
-	{
25
+	protected function set_response($message, $type = 'internal') {
28 26
 		switch($type)
29 27
 		{
30 28
 			case 'internal' :
@@ -38,21 +36,18 @@  discard block
 block discarded – undo
38 36
 		}
39 37
 	}
40 38
 
41
-	protected function fail_response($message)
42
-	{
39
+	protected function fail_response($message) {
43 40
 		$this->set_response($message, 'error');
44 41
 		return false;
45 42
 	}
46 43
 
47
-	protected function eject($message)
48
-	{
44
+	protected function eject($message) {
49 45
 		$this->fail_response($message);
50 46
 		echo $this->response_as_json();
51 47
 		exit();
52 48
 	}
53 49
 
54
-	private function response_as_json()
55
-	{
50
+	private function response_as_json() {
56 51
 		return json_encode($this->response);
57 52
 	}
58 53
 
Please login to merge, or discard this patch.
controller/home/DefaultPageController.class.inc.php 1 patch
Braces   +4 added lines, -6 removed lines patch added patch discarded remove patch
@@ -2,17 +2,15 @@
 block discarded – undo
2 2
 
3 3
 Loader::load('controller', '/PageController');
4 4
 
5
-abstract class DefaultPageController extends PageController
6
-{
5
+abstract class DefaultPageController extends PageController
6
+{
7 7
 
8
-	protected function set_head_data()
9
-	{
8
+	protected function set_head_data() {
10 9
 		$this->add_css('normalize');
11 10
 		$this->add_css('home');
12 11
 	}
13 12
 
14
-	protected function set_body_data()
15
-	{
13
+	protected function set_body_data() {
16 14
 		$this->set_body('activity_array', $this->get_recent_activity());
17 15
 	}
18 16
 
Please login to merge, or discard this patch.
controller/home/AboutController.class.inc.php 1 patch
Braces   +4 added lines, -6 removed lines patch added patch discarded remove patch
@@ -2,8 +2,8 @@  discard block
 block discarded – undo
2 2
 
3 3
 Loader::load('controller', 'home/DefaultPageController');
4 4
 
5
-final class AboutController extends DefaultPageController
6
-{
5
+final class AboutController extends DefaultPageController
6
+{
7 7
 
8 8
 	private static $TITLE = 'About | Jacob Emerick';
9 9
 	private static $DESCRIPTION = 'Some basic information about Jacob Emerick and his past, web development, and hiking adventures';
@@ -17,8 +17,7 @@  discard block
 block discarded – undo
17 17
 		'web developer',
18 18
 		'hiker');
19 19
 
20
-	protected function set_head_data()
21
-	{
20
+	protected function set_head_data() {
22 21
 		$this->set_title(self::$TITLE);
23 22
 		$this->set_description(self::$DESCRIPTION);
24 23
 		$this->set_keywords(self::$KEYWORD_ARRAY);
@@ -26,8 +25,7 @@  discard block
 block discarded – undo
26 25
 		parent::set_head_data();
27 26
 	}
28 27
 
29
-	protected function set_body_data()
30
-	{
28
+	protected function set_body_data() {
31 29
 		$this->set_body_view('About');
32 30
 		
33 31
 		parent::set_body_data();
Please login to merge, or discard this patch.
controller/home/ContactController.class.inc.php 1 patch
Braces   +17 added lines, -16 removed lines patch added patch discarded remove patch
@@ -2,8 +2,8 @@  discard block
 block discarded – undo
2 2
 
3 3
 Loader::load('controller', 'home/DefaultPageController');
4 4
 
5
-final class ContactController extends DefaultPageController
6
-{
5
+final class ContactController extends DefaultPageController
6
+{
7 7
 
8 8
 	private static $TITLE = 'Contact | Jacob Emerick';
9 9
 	private static $DESCRIPTION = 'Contact page to reach Jacob Emerick by email or social networks';
@@ -16,8 +16,7 @@  discard block
 block discarded – undo
16 16
 		'email',
17 17
 		'connect');
18 18
 
19
-	protected function set_head_data()
20
-	{
19
+	protected function set_head_data() {
21 20
 		$this->set_title(self::$TITLE);
22 21
 		$this->set_description(self::$DESCRIPTION);
23 22
 		$this->set_keywords(self::$KEYWORD_ARRAY);
@@ -25,27 +24,29 @@  discard block
 block discarded – undo
25 24
 		parent::set_head_data();
26 25
 	}
27 26
 
28
-	protected function set_body_data()
29
-	{
27
+	protected function set_body_data() {
30 28
 		$this->set_body('form_container', $this->process_form());
31 29
 		$this->set_body_view('Contact');
32 30
 		
33 31
 		parent::set_body_data();
34 32
 	}
35 33
 
36
-	private function process_form()
37
-	{
38
-		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
39
-			return (object) array('display' => 'normal');
34
+	private function process_form() {
35
+		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!') {
36
+					return (object) array('display' => 'normal');
37
+		}
40 38
 		
41 39
 		Loader::load('utility', 'Validate');
42 40
 		$error_result = array();
43
-		if(!Validate::checkRequest('post', 'name', 'string'))
44
-			$error_result['name'] = 'please enter your name';
45
-		if(!Validate::checkRequest('post', 'email', 'string'))
46
-			$error_result['email'] = 'please enter a valid email';
47
-		if(!Validate::checkRequest('post', 'message', 'string'))
48
-			$error_result['message'] = 'please write a message';
41
+		if(!Validate::checkRequest('post', 'name', 'string')) {
42
+					$error_result['name'] = 'please enter your name';
43
+		}
44
+		if(!Validate::checkRequest('post', 'email', 'string')) {
45
+					$error_result['email'] = 'please enter a valid email';
46
+		}
47
+		if(!Validate::checkRequest('post', 'message', 'string')) {
48
+					$error_result['message'] = 'please write a message';
49
+		}
49 50
 		
50 51
 		$values = (object) array(
51 52
 			'name' => Request::getPost('name'),
Please login to merge, or discard this patch.