jacobemerick / web

controller/waterfalls/DefaultPageController.class.inc.php

Indentation +36 added lines, -36 removed lines

@@ -10,7 +10,7 @@ 
 
 	protected static $WATERFALL_SITE_ID = 5;
 
-    protected $parent_navigation_item = '';
+	protected $parent_navigation_item = '';
 
 	protected function set_head_data()
 	{
@@ -19,45 +19,45 @@ 
 		$this->add_css('waterfalls');
 	}
 
-    protected function add_waterfall_js()
-    {
-        $this->add_js('jquery');
-        $this->add_js('imagelightbox');
-        $this->add_js('waterfalls');
-    }
+	protected function add_waterfall_js()
+	{
+		$this->add_js('jquery');
+		$this->add_js('imagelightbox');
+		$this->add_js('waterfalls');
+	}
 
 	protected function set_body_data($page_type = 'normal')
 	{
 		$this->set_body('activity_array', $this->get_recent_activity());
 
-        $this->set_body('main_navigation', array(
-                (object) array(
-                    'uri' => '/falls/',
-                    'anchor' => 'Falls',
-                    'is_active' => $this->parent_navigation_item === 'falls',
-                ),
-                (object) array(
-                    'uri' => '/map/',
-                    'anchor' => 'Map',
-                    'is_active' => $this->parent_navigation_item === 'map',
-                ),
-                (object) array(
-                    'uri' => '/journal/',
-                    'anchor' => 'Journal',
-                    'is_active' => $this->parent_navigation_item === 'journal',
-                ),
-                (object) array(
-                    'uri' => '/about/',
-                    'anchor' => 'About',
-                    'is_active' => $this->parent_navigation_item === 'about',
-                )
-        ));
-
-        if ($page_type == 'wide') {
-            $this->set_body_view('WidePage');
-        } else {
-            $this->set_body_view('Page');
-        }
-    }
+		$this->set_body('main_navigation', array(
+				(object) array(
+					'uri' => '/falls/',
+					'anchor' => 'Falls',
+					'is_active' => $this->parent_navigation_item === 'falls',
+				),
+				(object) array(
+					'uri' => '/map/',
+					'anchor' => 'Map',
+					'is_active' => $this->parent_navigation_item === 'map',
+				),
+				(object) array(
+					'uri' => '/journal/',
+					'anchor' => 'Journal',
+					'is_active' => $this->parent_navigation_item === 'journal',
+				),
+				(object) array(
+					'uri' => '/about/',
+					'anchor' => 'About',
+					'is_active' => $this->parent_navigation_item === 'about',
+				)
+		));
+
+		if ($page_type == 'wide') {
+			$this->set_body_view('WidePage');
+		} else {
+			$this->set_body_view('Page');
+		}
+	}
 
 }

controller/ajax/GetPortfolioImageController.class.inc.php

Indentation +3 added lines, -3 removed lines

@@ -12,9 +12,9 @@
 		
 		$portfolio_result = PortfolioCollector::getImageById($id);
 
-    $image_path = "portfolio/{$portfolio_result->name}";
-    $image_path = Loader::getImagePath('image', $image_path);
-    $image_size = getimagesize($image_path);
+	$image_path = "portfolio/{$portfolio_result->name}";
+	$image_path = Loader::getImagePath('image', $image_path);
+	$image_size = getimagesize($image_path);
 
 		$main_image = new stdclass();
 		$main_image->id = $portfolio_result->id;

router/Router.class.inc.php

Indentation +4 added lines, -4 removed lines

@@ -80,9 +80,9 @@ 
 		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
 			$redirect_uri .= '/';
 		
-        if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
-            $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
-        }
+		if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
+			$redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
+		}
         
 		if($redirect_uri == URLDecode::getURI())
 			return;
@@ -147,7 +147,7 @@ 
 			URLDecode::getExtension() != 'json' &&
 			URLDecode::getExtension() != 'jpg' &&
 			URLDecode::getExtension() != 'png' &&
-            strstr(URLDecode::getURI(), '#') === false);
+			strstr(URLDecode::getURI(), '#') === false);
 	}
 
 }

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';
@@ -66,36 +66,36 @@ 
 
 	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') {
             $redirect_uri = 'http://' . (!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')
 			$controller_check = preg_replace('@^http://([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;
@@ -112,12 +112,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}";
 		}
 		
@@ -126,7 +126,7 @@ 
 
 	final private function get_primary_folder()
 	{
-		if(Request::isAjax())
+		if (Request::isAjax())
 			return 'ajax';
 		
 		return URLDecode::getSite();

Braces +21 added lines, -14 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())
 		{
@@ -73,19 +74,22 @@ 
 		
 		$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') {
             $redirect_uri = 'http://' . (!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')
-			$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);
+		if(substr($redirect_uri, 0, 4) == 'http') {

+					$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);

+		}

 		
 		$controller = $this->get_controller($controller_check);
 		if($controller == '/Error404Controller')
@@ -114,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';
@@ -126,8 +132,9 @@ 
 
 	final private function get_primary_folder()
 	{
-		if(Request::isAjax())
-			return 'ajax';
+		if(Request::isAjax()) {

+					return 'ajax';

+		}

 		
 		return URLDecode::getSite();
 	}

public/site/index.php

Indentation +2 added lines, -2 removed lines

@@ -12,8 +12,8 @@
 $formatter = new LineFormatter('[%datetime%] %channel%.%level_name%: %message%');
 
 $handler = new StreamHandler(
-    __DIR__ . '/../../logs/site.log',
-    Logger::DEBUG
+	__DIR__ . '/../../logs/site.log',
+	Logger::DEBUG
 );
 $handler->setFormatter($formatter);
 

src/Domain/Waterfall/Waterfall/MysqlWaterfallRepository.php

Doc Comments +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
     protected $connections;
 
     /**
-     * @param Aura\Sql\ConnectionLocator $connections
+     * @param ConnectionLocator $connections
      */
     public function __construct(ConnectionLocator $connections)
     {

Indentation +25 added lines, -25 removed lines

@@ -7,38 +7,38 @@
 class MysqlWaterfallRepository implements WaterfallRepositoryInterface
 {
 
-    /** @var  Aura\Sql\ConnectionLocator */
-    protected $connections;
-
-    /**
-     * @param Aura\Sql\ConnectionLocator $connections
-     */
-    public function __construct(ConnectionLocator $connections)
-    {
-        $this->connections = $connections;
-    }
-
-    public function getWaterfalls($limit = null, $offset = 0)
-    {
-        $query = "
+	/** @var  Aura\Sql\ConnectionLocator */
+	protected $connections;
+
+	/**
+	 * @param Aura\Sql\ConnectionLocator $connections
+	 */
+	public function __construct(ConnectionLocator $connections)
+	{
+		$this->connections = $connections;
+	}
+
+	public function getWaterfalls($limit = null, $offset = 0)
+	{
+		$query = "
             SELECT `waterfall`.`id`, `waterfall`.`name`, `waterfall`.`alias`,
                    `watercourse`.`name` AS `watercourse`, `watercourse`.`alias` AS `watercourse_alias`
             FROM `jpemeric_waterfall`.`waterfall`
             INNER JOIN `jpemeric_waterfall`.`watercourse` ON `waterfall`.`watercourse` = `watercourse`.`id`
             WHERE `is_public` = :public
             ORDER BY `name`, `watercourse`";
-        if ($limit != null) {
-            $query .= "
+		if ($limit != null) {
+			$query .= "
             LIMIT {$offset}, {$limit}";
-        }
+		}
 
-        $bindings = [
-            'public' => 1,
-        ];
+		$bindings = [
+			'public' => 1,
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query, $bindings);
+	}
 }

src/Domain/Portfolio/Piece/MysqlPieceRepository.php

Indentation +25 added lines, -25 removed lines

@@ -7,36 +7,36 @@
 class MysqlPieceRepository implements PieceRepositoryInterface
 {
 
-    /** @var  Aura\Sql\ConnectionLocator */
-    protected $connections;
-
-    /**
-     * @param Aura\Sql\ConnectionLocator $connections
-     */
-    public function __construct(ConnectionLocator $connections)
-    {
-        $this->connections = $connections;
-    }
-
-    public function getPieces($limit = null, $offset = 0)
-    {
-        $query = "
+	/** @var  Aura\Sql\ConnectionLocator */
+	protected $connections;
+
+	/**
+	 * @param Aura\Sql\ConnectionLocator $connections
+	 */
+	public function __construct(ConnectionLocator $connections)
+	{
+		$this->connections = $connections;
+	}
+
+	public function getPieces($limit = null, $offset = 0)
+	{
+		$query = "
             SELECT `id`, `title`, `title_url`, `category`
             FROM `jpemeric_portfolio`.`piece`
             WHERE `display` = :is_active
             ORDER BY `date` DESC";
-        if ($limit != null) {
-            $query .= "
+		if ($limit != null) {
+			$query .= "
             LIMIT {$offset}, {$limit}";
-        }
+		}
 
-        $bindings = [
-            'is_active' => 1,
-        ];
+		$bindings = [
+			'is_active' => 1,
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query, $bindings);
+	}
 }

Doc Comments +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
     protected $connections;
 
     /**
-     * @param Aura\Sql\ConnectionLocator $connections
+     * @param ConnectionLocator $connections
      */
     public function __construct(ConnectionLocator $connections)
     {

src/Domain/Portfolio/Piece/PieceRepositoryInterface.php

Indentation +1 added lines, -1 removed lines

@@ -4,5 +4,5 @@
 
 interface PieceRepositoryInterface
 {
-    public function getPieces($limit = null, $offset= 0);
+	public function getPieces($limit = null, $offset= 0);
 }

Spacing +1 added lines, -1 removed lines

@@ -4,5 +4,5 @@
 
 interface PieceRepositoryInterface
 {
-    public function getPieces($limit = null, $offset= 0);
+    public function getPieces($limit = null, $offset = 0);
 }

src/Domain/Waterfall/Companion/CompanionRepositoryInterface.php

Indentation +1 added lines, -1 removed lines

@@ -4,5 +4,5 @@
 
 interface CompanionRepositoryInterface
 {
-    public function getCompanionList();
+	public function getCompanionList();
 }

src/Domain/Waterfall/Companion/MysqlCompanionRepository.php

Indentation +22 added lines, -22 removed lines

@@ -7,20 +7,20 @@ 
 class MysqlCompanionRepository implements CompanionRepositoryInterface
 {
 
-    /** @var  Aura\Sql\ConnectionLocator */
-    protected $connections;
-
-    /**
-     * @param Aura\Sql\ConnectionLocator $connections
-     */
-    public function __construct(ConnectionLocator $connections)
-    {
-        $this->connections = $connections;
-    }
-
-    public function getCompanionList()
-    {
-        $query = "
+	/** @var  Aura\Sql\ConnectionLocator */
+	protected $connections;
+
+	/**
+	 * @param Aura\Sql\ConnectionLocator $connections
+	 */
+	public function __construct(ConnectionLocator $connections)
+	{
+		$this->connections = $connections;
+	}
+
+	public function getCompanionList()
+	{
+		$query = "
             SELECT `companion`.`name`, `companion`.`alias`, COUNT(1) AS `count`
             FROM `jpemeric_waterfall`.`companion`
             INNER JOIN `jpemeric_waterfall`.`log_companion_map` ON `log_companion_map`.`companion` = `companion`.`id`
@@ -29,13 +29,13 @@ 
             GROUP BY `alias`
             ORDER BY `name`";
 
-        $bindings = [
-            'public' => 1,
-        ];
+		$bindings = [
+			'public' => 1,
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query, $bindings);
+	}
 }

Doc Comments +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
     protected $connections;
 
     /**
-     * @param Aura\Sql\ConnectionLocator $connections
+     * @param ConnectionLocator $connections
      */
     public function __construct(ConnectionLocator $connections)
     {