jacobemerick / web

controller/site/TermsController.class.inc.php

Braces +4 added lines, -6 removed lines

@@ -2,11 +2,10 @@ 
 
 Loader::load('controller', 'site/DefaultPageController');
 
-final class TermsController extends DefaultPageController
-{
+final class TermsController extends DefaultPageController

+{

 
-	protected function set_head_data()
-	{
+	protected function set_head_data() {

 		$this->set_title("Terms of Use for Jacob Emerick's Sites");
 		$this->set_description("Some basic (and boring) legal jargon and perferred usage of the content on Jacob Emerick's sites. Includes re-use terms and advice on retracing hikes.");
 		$this->set_keywords(array('terms of use', 'legal', 'accountability', 'trespassing', 'Jacob Emerick'));
@@ -14,8 +13,7 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data() {

 		$this->set_body('top_data', array('title' => 'Terms of Use'));
 		
 		$this->set_body('body_view', 'Terms');

controller/site/ChangelogController.class.inc.php

Braces +5 added lines, -8 removed lines

@@ -4,11 +4,10 @@ 
 
 Loader::load('controller', 'site/DefaultPageController');
 
-final class ChangelogController extends DefaultPageController
-{
+final class ChangelogController extends DefaultPageController

+{

 
-	protected function set_head_data()
-	{
+	protected function set_head_data() {

 		$this->set_title("Changelog for Jacob Emerick's Sites");
 		$this->set_description("Listing of the last changes done on the framework behind Jacob Emerick's websites. Yeah, he's down with that version control.");
 		$this->set_keywords(array('changelog', 'version control', 'code', 'comments', 'Jacob Emerick'));
@@ -16,8 +15,7 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data() {

 		parent::set_body_data();
 		
 		$this->set_body('top_data', array('title' => 'Change Log'));
@@ -26,8 +24,7 @@ 
 		$this->set_body('body_view', 'Changelog');
 	}
 
-	private function get_changelog()
-	{
+	private function get_changelog() {

     global $container;
     $changelogRepository = new MysqlChangelogRepository($container['db_connection_locator']);
     $changelog_result = $changelogRepository->getChanges(40);

controller/site/DefaultPageController.class.inc.php

Braces +12 added lines, -14 removed lines

@@ -2,8 +2,8 @@ 
 
 Loader::load('controller', '/PageController');
 
-abstract class DefaultPageController extends PageController
-{
+abstract class DefaultPageController extends PageController

+{

 
 	private static $MENU = array(
 		array(
@@ -19,14 +19,12 @@ 
 			'name' => 'Contact',
 			'uri' => 'contact'));
 
-	protected function set_head_data()
-	{
+	protected function set_head_data() {

 		$this->add_css('reset');
 		$this->add_css('site');
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data() {

 		$this->set_body('top_data', array());
 		$this->set_body('body_data', array());
 		
@@ -36,8 +34,7 @@ 
 		$this->set_body_view('Page');
 	}
 
-	private function get_menu()
-	{
+	private function get_menu() {

 		$active_page = $this->get_active_page();
 		
 		$menu = array();
@@ -52,18 +49,19 @@ 
 		return $menu;
 	}
 
-	private function get_active_page()
-	{
+	private function get_active_page() {

 		$current_uri = URLDecode::getPiece(1);
 		
-		if(!isset($current_uri))
-			return 'About';
+		if(!isset($current_uri)) {

+					return 'About';

+		}

 		
 		$menu = self::$MENU;
 		foreach($menu as $link)
 		{
-			if($link['uri'] == $current_uri)
-				return $link['name'];
+			if($link['uri'] == $current_uri) {

+							return $link['name'];

+			}

 		}
 		
 		return 'About';

controller/site/ContactController.class.inc.php

Braces +17 added lines, -16 removed lines

@@ -4,11 +4,10 @@ 
 Loader::load('utility', array(
 	'Validate'));
 
-final class ContactController extends DefaultPageController
-{
+final class ContactController extends DefaultPageController

+{

 
-	protected function set_head_data()
-	{
+	protected function set_head_data() {

 		$this->set_title("Contact Form for Jacob Emerick's Sites");
 		$this->set_description("Want to reach out to Jacob Emerick with questions or concerns? Well, then here's a handy contact form for you that will connect you with the man himself.");
 		$this->set_keywords(array('contact', 'webmaster', 'support', 'help', 'Jacob Emerick'));
@@ -16,8 +15,7 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data() {

 		parent::set_body_data();
 		
 		$this->set_body('top_data', array('title' => 'Contact Me'));
@@ -26,17 +24,20 @@ 
 		$this->set_body('body_view', 'Contact');
 	}
 
-	private function get_form_results()
-	{
-		if(!Request::hasPost())
-			return array();
+	private function get_form_results() {

+		if(!Request::hasPost()) {

+					return array();

+		}

 		
-		if(!Validate::checkRequest('post', 'name', 'string'))
-			$error_message['name'] = 'Please enter a value for your name.';
-		if(!Validate::checkRequest('post', 'email', 'string'))
-			$error_message['email'] = 'Please enter a valid email address.';
-		if(!Validate::checkRequest('post', 'message', 'string'))
-			$error_message['message'] = 'Please enter a message.';
+		if(!Validate::checkRequest('post', 'name', 'string')) {

+					$error_message['name'] = 'Please enter a value for your name.';

+		}

+		if(!Validate::checkRequest('post', 'email', 'string')) {

+					$error_message['email'] = 'Please enter a valid email address.';

+		}

+		if(!Validate::checkRequest('post', 'message', 'string')) {

+					$error_message['message'] = 'Please enter a message.';

+		}

 		
 		if(!empty($error_message))
 		{

controller/site/HomeController.class.inc.php

Braces +4 added lines, -6 removed lines

@@ -2,11 +2,10 @@ 
 
 Loader::load('controller', 'site/DefaultPageController');
 
-final class HomeController extends DefaultPageController
-{
+final class HomeController extends DefaultPageController

+{

 
-	protected function set_head_data()
-	{
+	protected function set_head_data() {

 		$this->set_title("Jacob Emerick's Site Information | General and Technical Information");
 		$this->set_description("Meta information about Jacob Emerick's websites and content. Introduces the man behind the code, discusses the reasons behind the sites, and goes into some technical background of the custom framework.");
 		$this->set_keywords(array('site', 'technical', 'support', 'help', 'information', 'Jacob Emerick'));
@@ -14,8 +13,7 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data() {

 		$this->set_body('body_view', 'Home');
 		
 		parent::set_body_data();

controller/Error303Controller.class.inc.php

Braces +3 added lines, -4 removed lines

@@ -2,11 +2,10 @@
 
 Loader::load('controller', '/PageController');
 
-class Error303Controller extends PageController
-{
+class Error303Controller extends PageController

+{

 
-	public function __construct($uri)
-	{
+	public function __construct($uri) {

 		Header::redirect($uri, 303);
 		exit;
 	}

controller/Error404Controller.class.inc.php

Braces +5 added lines, -8 removed lines

@@ -2,11 +2,10 @@ 
 
 Loader::load('controller', '/PageController');
 
-class Error404Controller extends PageController
-{
+class Error404Controller extends PageController

+{

 
-	protected function set_head_data()
-	{
+	protected function set_head_data() {

 		$this->set_header_method('send404');
 		$this->add_css('normalize');
 		$this->add_css('404');
@@ -16,15 +15,13 @@ 
 		$this->set_head('keywords', '');
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data() {

 		$this->set_body('site_list', $this->get_sites());
 		
 		$this->set_body_view('/404');
 	}
 
-	private function get_sites()
-	{
+	private function get_sites() {

     return [
       [
         'url' => 'https://home.jacobemerick.com/',

utility/URLDecode.class.inc.php

Braces +31 added lines, -32 removed lines

@@ -1,26 +1,26 @@ 
 <?php
 
-class URLDecode
-{
+class URLDecode

+{

 
 	private static $array = array();
 
-	static function init()
-	{
+	static function init() {

 		$host = $_SERVER['HTTP_HOST'];
 		$uri = $_SERVER['REQUEST_URI'];
 		self::form_url_array($host, $uri);
 	}
 
-	static private function form_url_array($host, $uri)
-	{
+	static private function form_url_array($host, $uri) {

 		$uri = substr($uri, 1);
-		if(strpos($uri, '?'))
-			$uri = substr($uri, 0, strpos($uri, '?'));
+		if(strpos($uri, '?')) {

+					$uri = substr($uri, 0, strpos($uri, '?'));

+		}

 		$uri_array = explode('/', $uri);
 		
-		if(!Loader::isLive())
-			$host = substr($host, strpos($host, '.') + 1);
+		if(!Loader::isLive()) {

+					$host = substr($host, strpos($host, '.') + 1);

+		}

 		
 		self::$array['host'] = $host;
 		
@@ -43,50 +43,49 @@ 
 		self::$array['base'] = $base;
 		self::$array['uri'] = '/' . implode('/', $uri_array);
 		
-		if(end($uri_array) == '')
-			$uri_array = array_slice($uri_array, 0, count($uri_array) - 1);
+		if(end($uri_array) == '') {

+					$uri_array = array_slice($uri_array, 0, count($uri_array) - 1);

+		}

 		self::$array['pieces'] = (array) $uri_array;
 	}
 
-	static function getSite()
-	{
+	static function getSite() {

 		return self::$array['site'];
 	}
 
-	static function getHost()
-	{
+	static function getHost() {

 		return self::$array['host'];
 	}
 
-	static function getBase()
-	{
+	static function getBase() {

 		return self::$array['base'];
 	}
 
-	static function getURI()
-	{
+	static function getURI() {

 		return self::$array['uri'];
 	}
 
-	static function getExtension()
-	{
+	static function getExtension() {

 		$file = self::getPiece(-1);
-		if(substr($file, -1) == '/')
-			return false;
+		if(substr($file, -1) == '/') {

+					return false;

+		}

 		return substr($file, strrpos($file, '.') + 1);;
 	}
 
-	static function getPiece($piece = null)
-	{
-		if(!$piece)
-			return self::$array['pieces'];
+	static function getPiece($piece = null) {

+		if(!$piece) {

+					return self::$array['pieces'];

+		}

 		
-		if($piece == -1)
-			return end(self::$array['pieces']);
+		if($piece == -1) {

+					return end(self::$array['pieces']);

+		}

 		
 		$piece = $piece - 1;
-		if(array_key_exists($piece, self::$array['pieces']))
-			return self::$array['pieces'][$piece];
+		if(array_key_exists($piece, self::$array['pieces'])) {

+					return self::$array['pieces'][$piece];

+		}

 		return;
 	}
 

utility/Database.class.inc.php

Braces +28 added lines, -38 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-final class Database
-{
+final class Database

+{

 
 	private $read_connection;
 	private $write_connection;
@@ -14,8 +14,7 @@ 
 
 	private static $instance;
 
-	private function __construct($write_params, $read_params)
-	{
+	private function __construct($write_params, $read_params) {

         $this->write_connection = $this->connect(
             $write_params->host,
             $write_params->user,
@@ -31,19 +30,18 @@ 
 		return $this;
 	}
 
-	private function connect($host, $username, $password)
-	{
+	private function connect($host, $username, $password) {

 		$mysqli = new mysqli($host, $username, $password);
 		
 		$has_connection_error = $mysqli->connect_error;
-		if(isset($has_connection_error))
-			$this->has_connection_error = true;
+		if(isset($has_connection_error)) {

+					$this->has_connection_error = true;

+		}

 		
 		return $mysqli;
 	}
 
-	public static function instance()
-	{
+	public static function instance() {

 		if(!isset(self::$instance)) {
             global $config;
             self::$instance = new Database(
@@ -55,20 +53,19 @@ 
 		return self::$instance;
 	}
 
-	public static function escape($string)
-	{
+	public static function escape($string) {

 		return self::instance()->read_connection->real_escape_string($string);
 	}
 
-	public static function select($query)
-	{
+	public static function select($query) {

 		$start = microtime(true);
 		if($result = self::instance()->read_connection->query($query))
 		{
 			self::instance()->log_query($query, $start);
 			$array = array();
-			while($row = $result->fetch_object())
-				$array[] = $row;
+			while($row = $result->fetch_object()) {

+							$array[] = $row;

+			}

 			$result->close();
 			return $array;
 		}
@@ -76,16 +73,15 @@ 
 		return false;
 	}
 
-	public static function selectRow($query)
-	{
+	public static function selectRow($query) {

 		$result = self::select($query);
-		if(is_array($result))
-			return array_pop($result);
+		if(is_array($result)) {

+					return array_pop($result);

+		}

 		return false;
 	}
 
-	public static function execute($query)
-	{
+	public static function execute($query) {

 		$start = microtime(true);
 		if(self::instance()->write_connection->query($query))
 		{
@@ -96,16 +92,15 @@ 
 		return false;
 	}
 
-	public static function lastInsertID()
-	{
+	public static function lastInsertID() {

 		$id = self::instance()->write_connection->insert_id;
-		if($id == 0)
-			return false;
+		if($id == 0) {

+					return false;

+		}

 		return $id;
 	}
 
-	private function log_query($query, $start)
-	{
+	private function log_query($query, $start) {

 		$time = (microtime(true) - $start) * 1000;
 		$query = array(
 			'sql' => $query,
@@ -116,8 +111,7 @@ 
 		$this->query_total['time'] += $time;
 	}
 
-	private function gather_query_data()
-	{
+	private function gather_query_data() {

 		$query_data = array();
 		foreach($this->query_log as $query)
 		{
@@ -127,8 +121,7 @@ 
 		return $query_data;
 	}
 
-	public static function explain($query)
-	{
+	public static function explain($query) {

 		$sql = 'EXPLAIN ' . $query['sql'];
 		
 		if($result = self::instance()->read_connection->query($sql))
@@ -140,18 +133,15 @@ 
 		return $query;
 	}
 
-	public static function getQueryLog()
-	{
+	public static function getQueryLog() {

 		return self::instance()->gather_query_data();
 	}
 
-	public static function getQueryTotals()
-	{
+	public static function getQueryTotals() {

 		return self::instance()->query_total;
 	}
 
-	public static function isConnected()
-	{
+	public static function isConnected() {

 		return !self::instance()->has_connection_error;
 	}