jacobemerick / web

utility/Search.class.inc.php

Spacing +6 added lines, -6 removed lines

@@ -39,20 +39,20 @@ 
 	public function perform()
 	{
 		$weighted_array = array();
-		foreach($this->result as $row)
+		foreach ($this->result as $row)
 		{
 			$weight = $this->get_search_weight($row);
-			if($weight > 0)
+			if ($weight > 0)
 				$weighted_array[$row['id']] = $weight;
 		}
 		arsort($weighted_array);
 		
 		$final_array = array();
-		foreach($weighted_array as $id => $weight)
+		foreach ($weighted_array as $id => $weight)
 		{
-			foreach($this->result as $row)
+			foreach ($this->result as $row)
 			{
-				if($row['id'] == $id)
+				if ($row['id'] == $id)
 					$final_array[] = $row;
 			}
 		}
@@ -62,7 +62,7 @@ 
 	private function get_search_weight($row)
 	{
 		$weight = 0;
-		foreach($this->weight as $weight_array)
+		foreach ($this->weight as $weight_array)
 		{
 			$text = $row[$weight_array['field']];
 			$weight += $weight_array['weight'] * substr_count(strtolower($text), strtolower($this->query));

Braces +6 added lines, -4 removed lines

@@ -42,8 +42,9 @@ 
 		foreach($this->result as $row)
 		{
 			$weight = $this->get_search_weight($row);
-			if($weight > 0)
-				$weighted_array[$row['id']] = $weight;
+			if($weight > 0) {

+							$weighted_array[$row['id']] = $weight;

+			}

 		}
 		arsort($weighted_array);
 		
@@ -52,8 +53,9 @@ 
 		{
 			foreach($this->result as $row)
 			{
-				if($row['id'] == $id)
-					$final_array[] = $row;
+				if($row['id'] == $id) {

+									$final_array[] = $row;

+				}

 			}
 		}
 		return $final_array;

controller/blog/HomeController.class.inc.php

Indentation +11 added lines, -11 removed lines

@@ -49,9 +49,9 @@ 
 	{
 		if($this->page == 1)
 		{
-        global $container;
-        $repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']);
-        $introduction_result = $repository->findByType('home');
+		global $container;
+		$repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']);
+		$introduction_result = $repository->findByType('home');
 			
 			$introduction = array();
 			$introduction['title'] = $introduction_result['title'];
@@ -75,9 +75,9 @@ 
 
 	protected function get_list_results()
 	{
-        global $container;
-        $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
-        return $repository->getActivePosts(self::$POSTS_PER_PAGE, $this->offset);
+		global $container;
+		$repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
+		return $repository->getActivePosts(self::$POSTS_PER_PAGE, $this->offset);
 	}
 
 	protected function get_list_description()
@@ -107,11 +107,11 @@ 
 	private $total_post_count;
 	protected function get_total_post_count()
 	{
-      if(!isset($this->total_post_count)) {
-          global $container;
-          $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
-          $this->total_post_count = $repository->getActivePostsCount();
-      }
+	  if(!isset($this->total_post_count)) {
+		  global $container;
+		  $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
+		  $this->total_post_count = $repository->getActivePostsCount();
+	  }
 
 		return $this->total_post_count;
 	}

Spacing +8 added lines, -8 removed lines

@@ -32,12 +32,12 @@ 
 	{
 		parent::set_head_data();
 		
-		if($this->page == 1)
+		if ($this->page == 1)
 			$this->set_title(self::$TITLE_MAIN);
 		else
 			$this->set_title(sprintf(self::$TITLE_PAGINATED, $this->page, $this->total_pages));
 		
-		if($this->page == 1)
+		if ($this->page == 1)
 			$this->set_description(self::$DESCRIPTION_MAIN);
 		else
 			$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages));
@@ -47,7 +47,7 @@ 
 
 	protected function get_introduction()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 		{
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']);
@@ -68,7 +68,7 @@ 
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(1);
-		if(isset($page) && is_numeric($page))
+		if (isset($page) && is_numeric($page))
 			return $page;
 		return 1;
 	}
@@ -90,16 +90,16 @@ 
 
 	protected function get_list_next_link()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 			return;
-		if($this->page == 2)
+		if ($this->page == 2)
 			return '/';
 		return '/' . ($this->page - 1) . '/';
 	}
 
 	protected function get_list_prev_link()
 	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
+		if (($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
 			return;
 		return '/' . ($this->page + 1) . '/';
 	}
@@ -107,7 +107,7 @@ 
 	private $total_post_count;
 	protected function get_total_post_count()
 	{
-      if(!isset($this->total_post_count)) {
+      if (!isset($this->total_post_count)) {
           global $container;
           $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
           $this->total_post_count = $repository->getActivePostsCount();

Braces +22 added lines, -16 removed lines

@@ -32,15 +32,17 @@ 
 	{
 		parent::set_head_data();
 		
-		if($this->page == 1)
-			$this->set_title(self::$TITLE_MAIN);
-		else
-			$this->set_title(sprintf(self::$TITLE_PAGINATED, $this->page, $this->total_pages));
+		if($this->page == 1) {

+					$this->set_title(self::$TITLE_MAIN);

+		} else {

+					$this->set_title(sprintf(self::$TITLE_PAGINATED, $this->page, $this->total_pages));

+		}

 		
-		if($this->page == 1)
-			$this->set_description(self::$DESCRIPTION_MAIN);
-		else
-			$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages));
+		if($this->page == 1) {

+					$this->set_description(self::$DESCRIPTION_MAIN);

+		} else {

+					$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages));

+		}

 		
 		$this->set_keywords(self::$KEYWORD_ARRAY);
 	}
@@ -68,8 +70,9 @@ 
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(1);
-		if(isset($page) && is_numeric($page))
-			return $page;
+		if(isset($page) && is_numeric($page)) {

+					return $page;

+		}

 		return 1;
 	}
 
@@ -90,17 +93,20 @@ 
 
 	protected function get_list_next_link()
 	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return '/';
+		if($this->page == 1) {

+					return;

+		}

+		if($this->page == 2) {

+					return '/';

+		}

 		return '/' . ($this->page - 1) . '/';
 	}
 
 	protected function get_list_prev_link()
 	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
-			return;
+		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) {

+					return;

+		}

 		return '/' . ($this->page + 1) . '/';
 	}
 

controller/blog/TagController.class.inc.php

Indentation +13 added lines, -13 removed lines

@@ -26,9 +26,9 @@ 
 		$tag = URLDecode::getPiece(2);
 		$tag = str_replace('-', ' ', $tag);
 
-        global $container;
-        $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
-        $tag_result = $repository->findTagByTitle($tag);
+		global $container;
+		$repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
+		$tag_result = $repository->findTagByTitle($tag);
 
 		if($tag_result === false)
 			$this->eject();
@@ -64,9 +64,9 @@ 
 		
 		if($this->page == 1)
 		{
-        global $container;
-        $repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']);
-        $introduction_result = $repository->findByType('tag', $this->tag['tag']);
+		global $container;
+		$repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']);
+		$introduction_result = $repository->findByType('tag', $this->tag['tag']);
 			
 			if($introduction_result !== false)
 			{
@@ -96,9 +96,9 @@ 
 
 	protected function get_list_results()
 	{
-        global $container;
-        $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
-        return $repository->getActivePostsByTag($this->tag['id'], self::$POSTS_PER_PAGE, $this->offset);
+		global $container;
+		$repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
+		return $repository->getActivePostsByTag($this->tag['id'], self::$POSTS_PER_PAGE, $this->offset);
 	}
 
 	protected function get_list_description()
@@ -129,10 +129,10 @@ 
 	protected function get_total_post_count()
 	{
 		if(!isset($this->total_post_count)) {
-        global $container;
-        $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
-        $this->total_post_count = $repository->getActivePostsCountByTag($this->tag['id']);
-    }
+		global $container;
+		$repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
+		$this->total_post_count = $repository->getActivePostsCountByTag($this->tag['id']);
+	}
 
 		return $this->total_post_count;
 	}

Spacing +9 added lines, -9 removed lines

@@ -30,7 +30,7 @@ 
         $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
         $tag_result = $repository->findTagByTitle($tag);
 
-		if($tag_result === false)
+		if ($tag_result === false)
 			$this->eject();
 		
 		$this->tag = $tag_result;
@@ -42,7 +42,7 @@ 
 	{
 		parent::set_head_data();
 		
-		if($this->page == 1)
+		if ($this->page == 1)
 		{
 			$this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->tag['tag'])));
 			$this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->tag['tag'])));
@@ -62,13 +62,13 @@ 
 	{
 		$tag = ucwords($this->tag['tag']);
 		
-		if($this->page == 1)
+		if ($this->page == 1)
 		{
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']);
         $introduction_result = $repository->findByType('tag', $this->tag['tag']);
 			
-			if($introduction_result !== false)
+			if ($introduction_result !== false)
 			{
 				$introduction = array();
 				$introduction['title'] = $introduction_result['title'];
@@ -89,7 +89,7 @@ 
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(3);
-		if(isset($page) && is_numeric($page))
+		if (isset($page) && is_numeric($page))
 			return $page;
 		return 1;
 	}
@@ -111,16 +111,16 @@ 
 
 	protected function get_list_next_link()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 			return;
-		if($this->page == 2)
+		if ($this->page == 2)
 			return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/")->activate();
 		return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/" . ($this->page - 1) . '/')->activate();
 	}
 
 	protected function get_list_prev_link()
 	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
+		if (($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
 			return;
 		return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/" . ($this->page + 1) . '/')->activate();
 	}
@@ -128,7 +128,7 @@ 
 	private $total_post_count;
 	protected function get_total_post_count()
 	{
-		if(!isset($this->total_post_count)) {
+		if (!isset($this->total_post_count)) {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         $this->total_post_count = $repository->getActivePostsCountByTag($this->tag['id']);

Braces +16 added lines, -12 removed lines

@@ -30,8 +30,9 @@ 
         $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
         $tag_result = $repository->findTagByTitle($tag);
 
-		if($tag_result === false)
-			$this->eject();
+		if($tag_result === false) {

+					$this->eject();

+		}

 		
 		$this->tag = $tag_result;
 		
@@ -46,8 +47,7 @@ 
 		{
 			$this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->tag['tag'])));
 			$this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->tag['tag'])));
-		}
-		else
+		} else
 		{
 			$this->set_title(sprintf(self::$TITLE_PAGINATED, ucwords($this->tag['tag']), $this->page, $this->total_pages));
 			$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages, ucwords($this->tag['tag'])));
@@ -89,8 +89,9 @@ 
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(3);
-		if(isset($page) && is_numeric($page))
-			return $page;
+		if(isset($page) && is_numeric($page)) {

+					return $page;

+		}

 		return 1;
 	}
 
@@ -111,17 +112,20 @@ 
 
 	protected function get_list_next_link()
 	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/")->activate();
+		if($this->page == 1) {

+					return;

+		}

+		if($this->page == 2) {

+					return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/")->activate();

+		}

 		return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/" . ($this->page - 1) . '/')->activate();
 	}
 
 	protected function get_list_prev_link()
 	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
-			return;
+		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) {

+					return;

+		}

 		return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/" . ($this->page + 1) . '/')->activate();
 	}
 

controller/blog/CategoryController.class.inc.php

Indentation +10 added lines, -10 removed lines

@@ -115,9 +115,9 @@ 
 	{
 		if($this->page == 1)
 		{
-        global $container;
-        $repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']);
-        $introduction_result = $repository->findByType('category', $this->category->link);
+		global $container;
+		$repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']);
+		$introduction_result = $repository->findByType('category', $this->category->link);
 			
 			$introduction = array();
 			$introduction['title'] = $introduction_result['title'];
@@ -141,9 +141,9 @@ 
 
 	protected function get_list_results()
 	{
-        global $container;
-        $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
-        return $repository->getActivePostsByCategory($this->category->link, self::$POSTS_PER_PAGE, $this->offset);
+		global $container;
+		$repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
+		return $repository->getActivePostsByCategory($this->category->link, self::$POSTS_PER_PAGE, $this->offset);
 	}
 
 	protected function get_list_description()
@@ -174,10 +174,10 @@ 
 	protected function get_total_post_count()
 	{
 		if(!isset($this->total_post_count)) {
-        global $container;
-        $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
-        $this->total_post_count = $repository->getActivePostsCountByCategory($this->category->link);
-    }
+		global $container;
+		$repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
+		$this->total_post_count = $repository->getActivePostsCountByCategory($this->category->link);
+	}
 		return $this->total_post_count;
 	}
 

Spacing +10 added lines, -10 removed lines

@@ -67,10 +67,10 @@ 
 	{
 		parent::set_head_data();
 		
-		switch($this->category->display)
+		switch ($this->category->display)
 		{
 			case 'Hiking' :
-				if($this->page == 1)
+				if ($this->page == 1)
 				{
 					$this->set_title(self::$TITLE_MAIN_HIKING);
 					$this->set_description(self::$DESCRIPTION_MAIN_HIKING);
@@ -83,7 +83,7 @@ 
 				$this->set_keywords(self::$KEYWORD_ARRAY_HIKING);
 			break;
 			case 'Personal' :
-				if($this->page == 1)
+				if ($this->page == 1)
 				{
 					$this->set_title(self::$TITLE_MAIN_PERSONAL);
 					$this->set_description(self::$DESCRIPTION_MAIN_PERSONAL);
@@ -96,7 +96,7 @@ 
 				$this->set_keywords(self::$KEYWORD_ARRAY_PERSONAL);
 			break;
 			case 'Web Development' :
-				if($this->page == 1)
+				if ($this->page == 1)
 				{
 					$this->set_title(self::$TITLE_MAIN_WEBDEVELOPMENT);
 					$this->set_description(self::$DESCRIPTION_MAIN_WEBDEVELOPMENT);
@@ -113,7 +113,7 @@ 
 
 	protected function get_introduction()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 		{
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']);
@@ -134,7 +134,7 @@ 
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(2);
-		if(isset($page) && is_numeric($page))
+		if (isset($page) && is_numeric($page))
 			return $page;
 		return 1;
 	}
@@ -156,16 +156,16 @@ 
 
 	protected function get_list_next_link()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 			return;
-		if($this->page == 2)
+		if ($this->page == 2)
 			return Content::instance('URLSafe', "/{$this->category->link}/")->activate();
 		return Content::instance('URLSafe', "/{$this->category->link}/" . ($this->page - 1) . '/')->activate();
 	}
 
 	protected function get_list_prev_link()
 	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
+		if (($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
 			return;
 		return Content::instance('URLSafe', "/{$this->category->link}/" . ($this->page + 1) . '/')->activate();
 	}
@@ -173,7 +173,7 @@ 
 	private $total_post_count;
 	protected function get_total_post_count()
 	{
-		if(!isset($this->total_post_count)) {
+		if (!isset($this->total_post_count)) {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         $this->total_post_count = $repository->getActivePostsCountByCategory($this->category->link);

Braces +15 added lines, -14 removed lines

@@ -74,8 +74,7 @@ 
 				{
 					$this->set_title(self::$TITLE_MAIN_HIKING);
 					$this->set_description(self::$DESCRIPTION_MAIN_HIKING);
-				}
-				else
+				} else
 				{
 					$this->set_title(sprintf(self::$TITLE_PAGINATED_HIKING, $this->page, $this->total_pages));
 					$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_HIKING, $this->page, $this->total_pages));
@@ -87,8 +86,7 @@ 
 				{
 					$this->set_title(self::$TITLE_MAIN_PERSONAL);
 					$this->set_description(self::$DESCRIPTION_MAIN_PERSONAL);
-				}
-				else
+				} else
 				{
 					$this->set_title(sprintf(self::$TITLE_PAGINATED_PERSONAL, $this->page, $this->total_pages));
 					$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_PERSONAL, $this->page, $this->total_pages));
@@ -100,8 +98,7 @@ 
 				{
 					$this->set_title(self::$TITLE_MAIN_WEBDEVELOPMENT);
 					$this->set_description(self::$DESCRIPTION_MAIN_WEBDEVELOPMENT);
-				}
-				else
+				} else
 				{
 					$this->set_title(sprintf(self::$TITLE_PAGINATED_WEBDEVELOPMENT, $this->page, $this->total_pages));
 					$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_WEBDEVELOPMENT, $this->page, $this->total_pages));
@@ -134,8 +131,9 @@ 
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(2);
-		if(isset($page) && is_numeric($page))
-			return $page;
+		if(isset($page) && is_numeric($page)) {

+					return $page;

+		}

 		return 1;
 	}
 
@@ -156,17 +154,20 @@ 
 
 	protected function get_list_next_link()
 	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Content::instance('URLSafe', "/{$this->category->link}/")->activate();
+		if($this->page == 1) {

+					return;

+		}

+		if($this->page == 2) {

+					return Content::instance('URLSafe', "/{$this->category->link}/")->activate();

+		}

 		return Content::instance('URLSafe', "/{$this->category->link}/" . ($this->page - 1) . '/')->activate();
 	}
 
 	protected function get_list_prev_link()
 	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
-			return;
+		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) {

+					return;

+		}

 		return Content::instance('URLSafe', "/{$this->category->link}/" . ($this->page + 1) . '/')->activate();
 	}