jacobemerick / web

controller/Error404Controller.class.inc.php

Indentation +31 added lines, -31 removed lines

@@ -25,37 +25,37 @@
 
 	private function get_sites()
 	{
-    return [
-      [
-        'url' => 'https://home.jacobemerick.com/',
-        'title' => "Jacob Emerick's Home",
-        'name' => 'Home'
-      ],
-      [
-        'url' => 'https://blog.jacobemerick.com/',
-        'title' => "Jacob Emerick's Blog",
-        'name' => 'Blog'
-      ],
-      [
-        'url' => 'https://lifestream.jacobemerick.com/',
-        'title' => "Jacob Emerick's Lifestream",
-        'name' => 'Lifestream'
-      ],
-      [
-        'url' => 'https://map.jacobemerick.com/',
-        'title' => "Jacob Emerick's Hiking Map",
-        'name' => 'Map'
-      ],
-      [
-        'url' => 'https://portfolio.jacobemerick.com/',
-        'title' => "Jacob Emerick's Portfolio",
-        'name' => 'Portfolio',
-      ],
-      [
-        'url' => 'https://www.waterfallsofthekeweenaw.com/',
-        'title' => 'Waterfalls of the Keweenaw',
-        'name' => 'Waterfalls'
-      ]
+	return [
+	  [
+		'url' => 'https://home.jacobemerick.com/',
+		'title' => "Jacob Emerick's Home",
+		'name' => 'Home'
+	  ],
+	  [
+		'url' => 'https://blog.jacobemerick.com/',
+		'title' => "Jacob Emerick's Blog",
+		'name' => 'Blog'
+	  ],
+	  [
+		'url' => 'https://lifestream.jacobemerick.com/',
+		'title' => "Jacob Emerick's Lifestream",
+		'name' => 'Lifestream'
+	  ],
+	  [
+		'url' => 'https://map.jacobemerick.com/',
+		'title' => "Jacob Emerick's Hiking Map",
+		'name' => 'Map'
+	  ],
+	  [
+		'url' => 'https://portfolio.jacobemerick.com/',
+		'title' => "Jacob Emerick's Portfolio",
+		'name' => 'Portfolio',
+	  ],
+	  [
+		'url' => 'https://www.waterfallsofthekeweenaw.com/',
+		'title' => 'Waterfalls of the Keweenaw',
+		'name' => 'Waterfalls'
+	  ]
   ];
 	}
 

router/Router.class.inc.php

Spacing +12 added lines, -12 removed lines

@@ -18,10 +18,10 @@ 
 
 	private static function get_router_name()
 	{
-		if(Request::isAJAX())
+		if (Request::isAJAX())
 			return 'AJAXRouter';
 		
-		switch(URLDecode::getSite())
+		switch (URLDecode::getSite())
 		{
 			case 'ajax' :
 				return 'AjaxRouter';
@@ -65,14 +65,14 @@ 
 
 	final protected function check_for_redirect($redirect_uri)
 	{
-		foreach($this->get_redirect_array() as $check)
+		foreach ($this->get_redirect_array() as $check)
 		{
 			$redirect_uri = preg_replace($check->pattern, $check->replace, $redirect_uri);
 		}
 		
 		$redirect_uri = $this->check_for_special_redirect($redirect_uri);
 		
-		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
+		if ($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
 			$redirect_uri .= '/';
 		
         if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
@@ -80,23 +80,23 @@ 
             $redirect_uri = $protocol . '://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
         }
         
-		if($redirect_uri == URLDecode::getURI())
+		if ($redirect_uri == URLDecode::getURI())
 			return;
 		
 		$controller_check = $redirect_uri;
-		if(substr($redirect_uri, 0, 4) == 'http') {
+		if (substr($redirect_uri, 0, 4) == 'http') {
       $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
 			$controller_check = preg_replace('@^' . $protocol . '://([a-z\.]+)@', '', $redirect_uri);
 		
 		$controller = $this->get_controller($controller_check);
-		if($controller == '/Error404Controller')
+		if ($controller == '/Error404Controller')
 		{
 			Loader::loadNew('controller', '/Error404Controller')
 				->activate();
 			exit;
 		}
 
-		if(substr($redirect_uri, 0, 4) != 'http')
+		if (substr($redirect_uri, 0, 4) != 'http')
 		{
 			$redirect_uri = substr($redirect_uri, 1);
 			$redirect_uri = URLDecode::getBase() . $redirect_uri;
@@ -113,12 +113,12 @@ 
 
 	final private function get_controller($uri)
 	{
-		foreach($this->get_direct_array() as $check)
+		foreach ($this->get_direct_array() as $check)
 		{
-			if($uri == $check->match)
+			if ($uri == $check->match)
 				return "{$this->get_primary_folder()}/{$check->controller}";
 			
-			if(preg_match("@^{$check->match}$@", $uri))
+			if (preg_match("@^{$check->match}$@", $uri))
 				return "{$this->get_primary_folder()}/{$check->controller}";
 		}
 		
@@ -127,7 +127,7 @@ 
 
 	final private function get_primary_folder()
 	{
-		if(Request::isAjax())
+		if (Request::isAjax())
 			return 'ajax';
 		
 		return URLDecode::getSite();

Braces +18 added lines, -12 removed lines

@@ -18,8 +18,9 @@ 
 
 	private static function get_router_name()
 	{
-		if(Request::isAJAX())
-			return 'AJAXRouter';
+		if(Request::isAJAX()) {

+					return 'AJAXRouter';

+		}

 		
 		switch(URLDecode::getSite())
 		{
@@ -72,16 +73,18 @@ 
 		
 		$redirect_uri = $this->check_for_special_redirect($redirect_uri);
 		
-		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
-			$redirect_uri .= '/';
+		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') {

+					$redirect_uri .= '/';

+		}

 		
         if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
             $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
             $redirect_uri = $protocol . '://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
         }
         
-		if($redirect_uri == URLDecode::getURI())
-			return;
+		if($redirect_uri == URLDecode::getURI()) {

+					return;

+		}

 		
 		$controller_check = $redirect_uri;
 		if(substr($redirect_uri, 0, 4) == 'http') {
@@ -115,11 +118,13 @@ 
 	{
 		foreach($this->get_direct_array() as $check)
 		{
-			if($uri == $check->match)
-				return "{$this->get_primary_folder()}/{$check->controller}";
+			if($uri == $check->match) {

+							return "{$this->get_primary_folder()}/{$check->controller}";

+			}

 			
-			if(preg_match("@^{$check->match}$@", $uri))
-				return "{$this->get_primary_folder()}/{$check->controller}";
+			if(preg_match("@^{$check->match}$@", $uri)) {

+							return "{$this->get_primary_folder()}/{$check->controller}";

+			}

 		}
 		
 		return '/Error404Controller';
@@ -127,8 +132,9 @@ 
 
 	final private function get_primary_folder()
 	{
-		if(Request::isAjax())
-			return 'ajax';
+		if(Request::isAjax()) {

+					return 'ajax';

+		}

 		
 		return URLDecode::getSite();
 	}

Indentation +7 added lines, -7 removed lines

@@ -75,19 +75,19 @@ 
 		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
 			$redirect_uri .= '/';
 		
-        if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
-            $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
-            $redirect_uri = $protocol . '://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
-        }
+		if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
+			$protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
+			$redirect_uri = $protocol . '://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
+		}
         
 		if($redirect_uri == URLDecode::getURI())
 			return;
 		
 		$controller_check = $redirect_uri;
 		if(substr($redirect_uri, 0, 4) == 'http') {
-      $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
+	  $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
 			$controller_check = preg_replace('@^' . $protocol . '://([a-z\.]+)@', '', $redirect_uri);
-    }
+	}
 		
 		$controller = $this->get_controller($controller_check);
 		if($controller == '/Error404Controller')
@@ -138,7 +138,7 @@ 
 	{
 		return (
 			URLDecode::getExtension() != 'json' &&
-            strstr(URLDecode::getURI(), '#') === false);
+			strstr(URLDecode::getURI(), '#') === false);
 	}
 
 }

src/Domain/Stream/Activity/MysqlActivityRepository.php

Indentation +75 added lines, -75 removed lines

@@ -7,108 +7,108 @@
 class MysqlActivityRepository implements ActivityRepositoryInterface
 {
 
-    /** @var  ConnectionLocator */
-    protected $connections;
+	/** @var  ConnectionLocator */
+	protected $connections;
 
-    /**
-     * @param ConnectonLocator $connections
-     */
-    public function __construct(ConnectionLocator $connections)
-    {
-        $this->connections = $connections;
-    }
+	/**
+	 * @param ConnectonLocator $connections
+	 */
+	public function __construct(ConnectionLocator $connections)
+	{
+		$this->connections = $connections;
+	}
 
-    /**
-     * @param integer $id
-     *
-     * @return array|false
-     */
-    public function getActivityById($id)
-    {
-        $query = "
+	/**
+	 * @param integer $id
+	 *
+	 * @return array|false
+	 */
+	public function getActivityById($id)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`activity`
             WHERE `id` = :id
             LIMIT 1";
-        $bindings = [
-            'id' => $id,
-        ];
+		$bindings = [
+			'id' => $id,
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchOne($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchOne($query, $bindings);
+	}
 
-    /**
-     * @param integer $limit
-     * @param integer $offset
-     *
-     * @return array|false
-     */
-    public function getActivities($limit = null, $offset = 0)
-    {
-        $query = "
+	/**
+	 * @param integer $limit
+	 * @param integer $offset
+	 *
+	 * @return array|false
+	 */
+	public function getActivities($limit = null, $offset = 0)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`activity`
             ORDER BY `datetime` DESC";
-        if (!is_null($limit)) {
-            $query .= "
+		if (!is_null($limit)) {
+			$query .= "
             LIMIT {$offset}, {$limit}";
-        }
+		}
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query);
+	}
 
-    public function getActivitiesCount()
-    {
-        $query = "
+	public function getActivitiesCount()
+	{
+		$query = "
             SELECT COUNT(1) AS `count`
             FROM `jpemeric_stream`.`activity`";
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchValue($query);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchValue($query);
+	}
 
-    public function getActivitiesByType($type, $limit = null, $offset = 0)
-    {
-        $query = "
+	public function getActivitiesByType($type, $limit = null, $offset = 0)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`activity`
             WHERE `type` = :type
             ORDER BY `datetime` DESC";
-        if (!is_null($limit)) {
-            $query .= "
+		if (!is_null($limit)) {
+			$query .= "
             LIMIT {$offset}, {$limit}";
-        }
-        $bindings = [
-            'type' => $type,
-        ];
+		}
+		$bindings = [
+			'type' => $type,
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query, $bindings);
+	}
 
-    public function getActivitiesByTypeCount($type)
-    {
-        $query = "
+	public function getActivitiesByTypeCount($type)
+	{
+		$query = "
             SELECT COUNT(1) AS `count`
             FROM `jpemeric_stream`.`activity`
             WHERE `type` = :type";
-        $bindings = [
-            'type' => $type,
-        ];
+		$bindings = [
+			'type' => $type,
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchValue($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchValue($query, $bindings);
+	}
 }

src/Domain/Stream/Changelog/MysqlChangelogRepository.php

Indentation +26 added lines, -26 removed lines

@@ -7,37 +7,37 @@
 class MysqlChangelogRepository implements ChangelogRepositoryInterface
 {
 
-    /** @var  ConnectionLocator */
-    protected $connections;
+	/** @var  ConnectionLocator */
+	protected $connections;
 
-    /**
-     * @param ConnectonLocator $connections
-     */
-    public function __construct(ConnectionLocator $connections)
-    {
-        $this->connections = $connections;
-    }
+	/**
+	 * @param ConnectonLocator $connections
+	 */
+	public function __construct(ConnectionLocator $connections)
+	{
+		$this->connections = $connections;
+	}
 
-    /**
-     * @param integer $limit
-     * @param integer $offset
-     *
-     * @return array|false
-     */
-    public function getChanges($limit = null, $offset = 0)
-    {
-        $query = "
+	/**
+	 * @param integer $limit
+	 * @param integer $offset
+	 *
+	 * @return array|false
+	 */
+	public function getChanges($limit = null, $offset = 0)
+	{
+		$query = "
             SELECT `message`, `message_short`, `datetime`, `commit_link`
             FROM `jpemeric_stream`.`changelog`
             ORDER BY `datetime` DESC";
-        if (!is_null($limit)) {
-            $query .= "
+		if (!is_null($limit)) {
+			$query .= "
             LIMIT {$offset}, {$limit}";
-        }
+		}
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query);
+	}
 }