Inspection of "Updates to use most recent iteration of comment-se..." - jacobemerick/web - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 68e9dc...5e9262 )

by Jacob

created 2016-08-05 20:46 UTC

Status

Doc Comments +6 added lines patch added patch discarded remove patch

@@ -34,6 +34,9 @@  discard block
 block discarded – undo
 		return self::run_query($query);
 	}
 
+    /**
+     * @param integer $total
+     */
     public static function getRecentList($total)
     {
         $query = "
@@ -178,6 +181,9 @@  discard block
 block discarded – undo
 		return self::run_row_query($query);
 	}
 
+    /**
+     * @param string $date
+     */
     public static function getByDate($date)
     {
         $date = self::escape($date);

Please login to merge, or discard this patch.

Braces +26 added lines, -26 removed lines patch added patch discarded remove patch

@@ -2,11 +2,11 @@  discard block
 block discarded – undo
 
 Loader::load('collector', 'Collector');
 
-final class LogCollector extends Collector
-{
+final class LogCollector extends Collector
+{
 
-	public static function getList($total, $offset = 0)
-	{
+	public static function getList($total, $offset = 0)
+	{
 		$query = "
 			SELECT
 				`log`.`id`,
@@ -34,8 +34,8 @@  discard block
 block discarded – undo
 		return self::run_query($query);
 	}
 
-    public static function getRecentList($total)
-    {
+    public static function getRecentList($total)
+    {
         $query = "
             SELECT
                 `log`.`title`,
@@ -62,8 +62,8 @@  discard block
 block discarded – undo
         return self::run_query($query);
     }
 
-	public static function getListCount()
-	{
+	public static function getListCount()
+	{
 		$query = "
 			SELECT
 				COUNT(1) AS `count`
@@ -74,8 +74,8 @@  discard block
 block discarded – undo
 		return self::get_count($query);
 	}
 
-	public static function getCompanionListForLog($log)
-	{
+	public static function getCompanionListForLog($log)
+	{
 		$query = "
 			SELECT
 				`companion`.`name`,
@@ -90,8 +90,8 @@  discard block
 block discarded – undo
 		return self::run_query($query);
 	}
 
-	public static function getWaterfallListForLog($log)
-	{
+	public static function getWaterfallListForLog($log)
+	{
 		$query = "
 			SELECT
 				`waterfall`.`name`,
@@ -113,8 +113,8 @@  discard block
 block discarded – undo
 		return self::run_query($query);
 	}
 
-	public static function getLogListForWaterfall($waterfall)
-	{
+	public static function getLogListForWaterfall($waterfall)
+	{
 		$query = "
 			SELECT
 				`log`.`title`,
@@ -133,8 +133,8 @@  discard block
 block discarded – undo
 		return self::run_query($query);
 	}
 
-	public static function getTagListForLog($log)
-	{
+	public static function getTagListForLog($log)
+	{
 		$query = "
 			SELECT
 				`tag`.`name`,
@@ -147,8 +147,8 @@  discard block
 block discarded – undo
 		return self::run_query($query);
 	}
 
-	public static function getByAlias($alias)
-	{
+	public static function getByAlias($alias)
+	{
 		$alias = self::escape($alias);
 		
 		$query = "
@@ -178,8 +178,8 @@  discard block
 block discarded – undo
 		return self::run_row_query($query);
 	}
 
-    public static function getByDate($date)
-    {
+    public static function getByDate($date)
+    {
         $date = self::escape($date);
         
         $query = "
@@ -195,8 +195,8 @@  discard block
 block discarded – undo
         return self::run_row_query($query);
     }
 	
-	public static function getById($log)
-	{
+	public static function getById($log)
+	{
 		$query = "
 			SELECT
 				`title`,
@@ -211,8 +211,8 @@  discard block
 block discarded – undo
 		return self::run_row_query($query);
 	}
 
-	public static function getPreviousLog($log)
-	{
+	public static function getPreviousLog($log)
+	{
 		$query = "
 			SELECT
 				`title`,
@@ -236,8 +236,8 @@  discard block
 block discarded – undo
 		return self::run_row_query($query);
 	}
 
-	public static function getNextLog($log)
-	{
+	public static function getNextLog($log)
+	{
 		$query = "
 			SELECT
 				`title`,

Please login to merge, or discard this patch.

collector/waterfall/WaterfallCollector.class.inc.php 2 patches

Doc Comments +3 added lines patch added patch discarded remove patch

@@ -117,6 +117,9 @@
 block discarded – undo
         return self::run_query($query);
     }
 
+    /**
+     * @param string $alias
+     */
     public static function getByOldAlias($alias)
     {
         $alias = self::escape($alias);

Please login to merge, or discard this patch.

Braces +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -2,11 +2,11 @@  discard block
 block discarded – undo
 
 Loader::load('collector', 'Collector');
 
-final class WaterfallCollector extends Collector
-{
+final class WaterfallCollector extends Collector
+{
 
-	public static function getList($total, $offset = 0)
-	{
+	public static function getList($total, $offset = 0)
+	{
 		$query = "
 			SELECT
 				`waterfall`.`id`,
@@ -43,8 +43,8 @@  discard block
 block discarded – undo
 		return self::run_query($query);
 	}
 
-    public static function getMapList()
-    {
+    public static function getMapList()
+    {
         $query = "
             SELECT
                 `waterfall`.`name`,
@@ -74,8 +74,8 @@  discard block
 block discarded – undo
         return self::run_query($query);
     }
 
-	public static function getListCount()
-	{
+	public static function getListCount()
+	{
 		$query = "
 			SELECT
 				COUNT(1) AS `count`
@@ -92,8 +92,8 @@  discard block
 block discarded – undo
 		return self::get_count($query);
 	}
 
-    public static function getNearbyList($waterfall)
-    {
+    public static function getNearbyList($waterfall)
+    {
         $query = "
             SELECT
                 `waterfall`.`name`,
@@ -117,8 +117,8 @@  discard block
 block discarded – undo
         return self::run_query($query);
     }
 
-    public static function getByOldAlias($alias)
-    {
+    public static function getByOldAlias($alias)
+    {
         $alias = self::escape($alias);
         
         $query = "
@@ -137,8 +137,8 @@  discard block
 block discarded – undo
         return self::run_row_query($query);
     }
 
-	public static function getByAlias($watercourse, $waterfall)
-	{
+	public static function getByAlias($watercourse, $waterfall)
+	{
 		$watercourse = self::escape($watercourse);
 		$waterfall = self::escape($waterfall);
 		

Please login to merge, or discard this patch.

controller/blog/DefaultPageController.class.inc.php 2 patches

Doc Comments +3 added lines patch added patch discarded remove patch

@@ -97,6 +97,9 @@
 block discarded – undo
 		return $tag_array;
 	}
 
+	/**
+	 * @param boolean $trim
+	 */
 	final private function get_body_for_post($post, $trim)
 	{
 		$body = $post->body;

Please login to merge, or discard this patch.

Braces +36 added lines, -32 removed lines patch added patch discarded remove patch

@@ -3,8 +3,8 @@  discard block
 block discarded – undo
 Loader::load('controller', '/PageController');
 Loader::load('utility', 'Content');
 
-abstract class DefaultPageController extends PageController
-{
+abstract class DefaultPageController extends PageController
+{
 
 	private static $RECENT_COMMENT_COUNT = 10;
 	private static $MINIMUM_TAG_COUNT = 10;
@@ -14,8 +14,8 @@  discard block
 block discarded – undo
 
 	private static $INTRODUCTION_IMAGE_PATTERN = '<img src="/photo/%s/%s-size-%s.jpg" height="%d" width="%d" alt="%s" />';
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()
+	{
     $this->set_head('rss_link', [
       'title' => 'Jacob Emerick Blog Feed',
       'url' => '/rss.xml'
@@ -29,18 +29,19 @@  discard block
 block discarded – undo
 		$this->add_css('blog');
 	}
 
-	protected function get_introduction()
-	{
+	protected function get_introduction()
+	{
 		return;
 	}
 
-	protected function get_introduction_image($id)
-	{
+	protected function get_introduction_image($id)
+	{
 		Loader::load('collector', 'image/PhotoCollector');
 		$photo_result = PhotoCollector::getRow($id);
 		
-		if($photo_result == null)
-			return;
+		if($photo_result == null) {
+					return;
+		}
 		
 		$name = $photo_result->name;
 		$category = $photo_result->category;
@@ -52,8 +53,8 @@  discard block
 block discarded – undo
 		return sprintf(self::$INTRODUCTION_IMAGE_PATTERN, $category, $name, $size, $height, $width, $description);
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()
+	{
 		$this->set_body('introduction', $this->get_introduction());
 		$this->set_body('right_side', $this->get_right_side());
 		$this->set_body('activity_array', $this->get_recent_activity());
@@ -61,8 +62,8 @@  discard block
 block discarded – undo
 		$this->set_body_view('Page');
 	}
 
-	final protected function format_post($post, $trim = false)
-	{
+	final protected function format_post($post, $trim = false)
+	{
 		$post_object = new stdclass();
 		
 		$post_object->title = $post['title'];
@@ -77,8 +78,8 @@  discard block
 block discarded – undo
 		return $post_object;
 	}
 
-	final private function get_tags_for_post($post)
-	{
+	final private function get_tags_for_post($post)
+	{
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
         $tag_result = $repository->getTagsForPost($post['id']);
@@ -94,12 +95,13 @@  discard block
 block discarded – undo
 		return $tag_array;
 	}
 
-	final private function get_body_for_post($post, $trim)
-	{
+	final private function get_body_for_post($post, $trim)
+	{
 		$body = $post['body'];
 		
-		if($trim)
-			$body = Content::instance('SmartTrim', $body)->activate(self::$LENGTH_OF_TRIMMED_POST);
+		if($trim) {
+					$body = Content::instance('SmartTrim', $body)->activate(self::$LENGTH_OF_TRIMMED_POST);
+		}
 		
 		$body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
 		$body = Content::instance('MarkupCode', $body)->activate();
@@ -107,16 +109,16 @@  discard block
 block discarded – undo
 		return $body;
 	}
 
-	final protected function get_right_side()
-	{
+	final protected function get_right_side()
+	{
 		$side_array = array();
 		$side_array['tags'] = $this->get_tag_cloud();
 		$side_array['comments'] = $this->get_comments();
 		return $side_array;
 	}
 
-	final private function get_tag_cloud()
-	{
+	final private function get_tag_cloud()
+	{
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
         $tag_result = $repository->getTagCloud();
@@ -126,8 +128,9 @@  discard block
 block discarded – undo
 		$cloud_array = array();
 		foreach($tag_result as $tag)
 		{
-			if($tag['count'] < self::$MINIMUM_TAG_COUNT)
-				continue;
+			if($tag['count'] < self::$MINIMUM_TAG_COUNT) {
+							continue;
+			}
 			
 			$tag_object = new stdclass();
 			$tag_object->name = $tag['tag'];
@@ -139,20 +142,21 @@  discard block
 block discarded – undo
 		return $cloud_array;
 	}
 
-	final private function get_maximum_tag_count($tag_result)
-	{
+	final private function get_maximum_tag_count($tag_result)
+	{
 		$maximum = 1;
 		
 		foreach($tag_result as $tag)
 		{
-			if($tag['count'] > $maximum)
-				$maximum = $tag['count'];
+			if($tag['count'] > $maximum) {
+							$maximum = $tag['count'];
+			}
 		}
 		return $maximum;
 	}
 
-    final private function get_comments()
-    {
+    final private function get_comments()
+    {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Comment\Comment\ServiceCommentRepository($container['comment_service_api']);
         $start = microtime(true);

Please login to merge, or discard this patch.

utility/content/MarkupCodeContent.class.inc.php 2 patches

Doc Comments +6 added lines patch added patch discarded remove patch

@@ -25,6 +25,9 @@  discard block
 block discarded – undo
 		return;
 	}
 
+	/**
+	 * @param string $content
+	 */
 	private function wrap_in_list($content)
 	{
 		$content_array = explode("\n", $content);
@@ -44,6 +47,9 @@  discard block
 block discarded – undo
 		return $content;
 	}
 
+	/**
+	 * @param string $type
+	 */
 	private function highlight_code($content, $type)
 	{
 		switch($type)

Please login to merge, or discard this patch.

Braces +11 added lines, -10 removed lines patch added patch discarded remove patch

@@ -2,16 +2,17 @@  discard block
 block discarded – undo
 
 Loader::load('utility', 'Content');
 
-final class MarkupCodeContent extends Content
-{
+final class MarkupCodeContent extends Content
+{
 
 	private static $MARKUP_DELIMITER = '@<pre( rel="(.*?)")?>(.*?)</pre>@s';
 
-	protected function execute($title = '')
-	{
+	protected function execute($title = '')
+	{
 		preg_match_all(self::$MARKUP_DELIMITER, $this->content, $matches);
-		if(count($matches[1]) == 0)
-			return;
+		if(count($matches[1]) == 0) {
+					return;
+		}
 		
 		foreach($matches[3] as $key => $match)
 		{
@@ -25,8 +26,8 @@  discard block
 block discarded – undo
 		return;
 	}
 
-	private function wrap_in_list($content)
-	{
+	private function wrap_in_list($content)
+	{
 		$content_array = explode("\n", $content);
 		
 		foreach($content_array as $key => $row)
@@ -44,8 +45,8 @@  discard block
 block discarded – undo
 		return $content;
 	}
 
-	private function highlight_code($content, $type)
-	{
+	private function highlight_code($content, $type)
+	{
 		switch($type)
 		{
 			default :

Please login to merge, or discard this patch.

utility/content/SmartTrimContent.class.inc.php 2 patches

Doc Comments +3 added lines patch added patch discarded remove patch

@@ -62,6 +62,9 @@
 block discarded – undo
 		$this->is_trimmed = true;
 	}
 
+	/**
+	 * @param string $content
+	 */
 	private function trim_html_string($content, $length)
 	{
 		$content = preg_replace(self::$PHOTO_PLACEHOLDER_MATCH, '', $content);

Please login to merge, or discard this patch.

Braces +42 added lines, -36 removed lines patch added patch discarded remove patch

@@ -2,8 +2,8 @@  discard block
 block discarded – undo
 
 Loader::load('utility', 'Content');
 
-class SmartTrimContent extends Content
-{
+class SmartTrimContent extends Content
+{
 
 	private static $EXCLUDE_TAGS = array(
 		'a',
@@ -24,8 +24,8 @@  discard block
 block discarded – undo
 
 	private $is_trimmed;
 
-	protected function execute()
-	{
+	protected function execute()
+	{
 		$args = func_get_args();
 		if(count($args) < 1)
 		{
@@ -33,37 +33,40 @@  discard block
 block discarded – undo
 			return;
 		}
 		
-		if(count($args) == 2)
-			$etc = $args[1];
-		else
-			$etc = self::$ETC;
+		if(count($args) == 2) {
+					$etc = $args[1];
+		} else {
+					$etc = self::$ETC;
+		}
 		
 		$length = $args[0];
 		
-		if($length < strlen($this->content))
-			$this->trim_string($length);
-        else
-            $etc = '';
+		if($length < strlen($this->content)) {
+					$this->trim_string($length);
+		} else {
+                    $etc = '';
+        }
 		$this->check_exclude_tags();
 		$this->close_tags($etc);
 	}
 
-	private function trim_string($length)
-	{
+	private function trim_string($length)
+	{
 		$content = $this->trim_html_string($this->content, $length);
 		
 		$last_right_bracket_position = strripos($content, self::$RIGHT_BRACKET);
 		$last_left_bracket_position = strripos($content, self::$LEFT_BRACKET);
-		if($last_left_bracket_position > $last_right_bracket_position)
-			$content = substr($content, 0, $last_left_bracket_position);
+		if($last_left_bracket_position > $last_right_bracket_position) {
+					$content = substr($content, 0, $last_left_bracket_position);
+		}
 		$content = trim($content);
 		
 		$this->content = $content;
 		$this->is_trimmed = true;
 	}
 
-	private function trim_html_string($content, $length)
-	{
+	private function trim_html_string($content, $length)
+	{
 		$content = preg_replace(self::$PHOTO_PLACEHOLDER_MATCH, '', $content);
 		preg_match_all(self::$HTML_TAG_PATTERN, $content, $matches, PREG_OFFSET_CAPTURE);
 		$content = strip_tags($content);
@@ -76,20 +79,22 @@  discard block
 block discarded – undo
 		foreach($matches[0] as $match)
 		{
 			$max_length += strlen($match[0]);
-			if($max_length <= $match[1])
-				break;
+			if($max_length <= $match[1]) {
+							break;
+			}
 			
 			$content = substr($content, 0, $match[1]) . $match[0] . substr($content, $match[1]);
 		}
 		
-		if(substr($content, -7) == '</p><p>')
-			$content = substr($content, 0, -7);
+		if(substr($content, -7) == '</p><p>') {
+					$content = substr($content, 0, -7);
+		}
 		
 		return $content;
 	}
 
-	private function check_exclude_tags()
-	{
+	private function check_exclude_tags()
+	{
 		$content = $this->content;
 		$tags_preg = $this->get_tags_preg(self::$EXCLUDE_TAGS);
 		preg_match_all($tags_preg, $content, $matches, PREG_OFFSET_CAPTURE);
@@ -105,8 +110,8 @@  discard block
 block discarded – undo
 		$this->content = $content;
 	}
 
-	private function close_tags($etc)
-	{
+	private function close_tags($etc)
+	{
 		$content = $this->content;
 		$tags_preg = $this->get_tags_preg(self::$INCLUDE_TAGS);
 		preg_match_all($tags_preg, $content, $matches);
@@ -118,9 +123,9 @@  discard block
 block discarded – undo
 			{
 				$key = array_search($tag, $open_tags);
 				unset($open_tags[$key]);
-			}
-			else
-				$open_tags[] = $tag;
+			} else {
+							$open_tags[] = $tag;
+			}
 		}
 		
 		$open_tags = array_reverse($open_tags);
@@ -128,19 +133,20 @@  discard block
 block discarded – undo
 		{
 			foreach($open_tags as $key => $open_tag)
 			{
-				if($key == count($open_tags) - 1)
-					$content .= $etc;
+				if($key == count($open_tags) - 1) {
+									$content .= $etc;
+				}
 				$content .= "</{$open_tag}>";
 			}
-		}
-		else
-			$content .= $etc;
+		} else {
+					$content .= $etc;
+		}
 		
 		$this->content = $content;
 	}
 
-	private function get_tags_preg($tag_array)
-	{
+	private function get_tags_preg($tag_array)
+	{
 		return '@</?(' . implode('|', $tag_array) . ')@';
 	}
 

Please login to merge, or discard this patch.

utility/Request.class.inc.php 2 patches

Doc Comments +3 added lines patch added patch discarded remove patch

@@ -34,6 +34,9 @@
 block discarded – undo
 		return false;
 	}
 
+	/**
+	 * @param string $key
+	 */
 	static function getGet($key = null)
 	{
 		if($key)

Please login to merge, or discard this patch.

Braces +32 added lines, -28 removed lines patch added patch discarded remove patch

@@ -1,7 +1,7 @@  discard block
 block discarded – undo
 <?php
 
-class Request
-{
+class Request
+{
 
 	private static $server = array();
 	private static $get = array();
@@ -9,70 +9,74 @@  discard block
 block discarded – undo
 
 	private static $AJAX_REQUEST = 'HTTP_X_REQUESTED_WITH';
 
-	static function init()
-	{
+	static function init()
+	{
 		self::make_server();
 		self::make_get();
 		self::make_post();
 	}
 
-	static function getServer($key = null)
-	{
+	static function getServer($key = null)
+	{
 		if($key)
 		{
-			if(isset(self::$server[$key]))
-				return self::$server[$key];
+			if(isset(self::$server[$key])) {
+							return self::$server[$key];
+			}
 			return false;
 		}
 		return self::$server;
 	}
 
-	static function isAjax()
-	{
-		if(self::getServer(self::$AJAX_REQUEST))
-			return true;
+	static function isAjax()
+	{
+		if(self::getServer(self::$AJAX_REQUEST)) {
+					return true;
+		}
 		return false;
 	}
 
-	static function getGet($key = null)
-	{
+	static function getGet($key = null)
+	{
 		if($key)
 		{
-			if(isset(self::$get[$key]))
-				return self::$get[$key];
+			if(isset(self::$get[$key])) {
+							return self::$get[$key];
+			}
 			return false;
 		}
 		return self::$get;
 	}
 
-	static function getPost($key = null)
-	{
+	static function getPost($key = null)
+	{
 		if($key)
 		{
-			if(isset(self::$post[$key]))
-				return self::$post[$key];
+			if(isset(self::$post[$key])) {
+							return self::$post[$key];
+			}
 			return false;
 		}
 		return self::$post;
 	}
 
-	public static function hasPost()
-	{
+	public static function hasPost()
+	{
 		return is_array(self::$post) && !empty(self::$post);
 	}
 
-	static function make_server()
-	{
+	static function make_server()
+	{
 		self::$server = $_SERVER;
 	}
 
-	static function make_get()
-	{
+	static function make_get()
+	{
 		self::$get = $_GET;
 	}
 
-	static function make_post()
-	{
+	static function make_post()
+	{
 		self::$post = $_POST;
 	}
 

Please login to merge, or discard this patch.

utility/URLDecode.class.inc.php 2 patches

Doc Comments +6 added lines patch added patch discarded remove patch

@@ -38,6 +38,9 @@  discard block
 block discarded – undo
 		self::$array['pieces'] = (array) $uri_array;
 	}
 
+	/**
+	 * @return string
+	 */
 	static function getSite()
 	{
 		return self::$array['site'];
@@ -66,6 +69,9 @@  discard block
 block discarded – undo
 		return substr($file, strrpos($file, '.') + 1);;
 	}
 
+	/**
+	 * @param integer $piece
+	 */
 	static function getPiece($piece = null)
 	{
 		if(!$piece)

Please login to merge, or discard this patch.

Braces +39 added lines, -32 removed lines patch added patch discarded remove patch

@@ -1,26 +1,28 @@  discard block
 block discarded – undo
 <?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 +45,55 @@  discard block
 block discarded – undo
 		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;
 	}
 

Please login to merge, or discard this patch.

utility/Validate.class.inc.php 2 patches

Doc Comments +5 added lines patch added patch discarded remove patch

@@ -72,6 +72,11 @@
 block discarded – undo
 		return $matches[0] == $string;
 	}
 
+	/**
+	 * @param string $type
+	 * @param string $key
+	 * @param string $validation
+	 */
 	public static function checkRequest($type, $key, $validation, $strict = false)
 	{
 		switch($type)

Please login to merge, or discard this patch.

Braces +49 added lines, -40 removed lines patch added patch discarded remove patch

@@ -2,78 +2,86 @@  discard block
 block discarded – undo
 
 Loader::load('utility', 'Request');
 
-class Validate
-{
+class Validate
+{
 
 	private static $NAME_REGEX = '@[a-z\s\'-]+@i';
 	private static $EMAIL_REGEX = '@(?:[a-z0-9!#$%&\'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")\@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])@i';
 	private static $URL_REGEX = '@((https?|ftp)\:\/\/)?([a-z0-9-.]*)\.([a-z]{2,3})(\/([a-z0-9+\$_-]\.?)+)*\/?(\?[a-z+&\$_.-][a-z0-9;:\@&%=+\/\$_.-]*)?(#[a-z_.-][a-z0-9+\$_.-]*)?@i';
 
-	public static function isBoolean($value, $strict = false)
-	{
-		if($strict && ($value === true || $value === false))
-			return true;
-		if(!$strict && ((bool) $value === true || (bool) $value === false))
-			return true;
+	public static function isBoolean($value, $strict = false)
+	{
+		if($strict && ($value === true || $value === false)) {
+					return true;
+		}
+		if(!$strict && ((bool) $value === true || (bool) $value === false)) {
+					return true;
+		}
 		return false;
 	}
 
-	public static function isDate($value)
-	{
-		if(strtotime($value) !== -1)
-			return true;
-		if(date('y', $value) !== false)
-			return true;
+	public static function isDate($value)
+	{
+		if(strtotime($value) !== -1) {
+					return true;
+		}
+		if(date('y', $value) !== false) {
+					return true;
+		}
 		return false;
 	}
 
-	public static function isInteger($value, $strict = false)
-	{
-		if($strict)
-			return is_int($value);
+	public static function isInteger($value, $strict = false)
+	{
+		if($strict) {
+					return is_int($value);
+		}
 		return (int) $value == $value;
 	}
 
-	public static function isIP($value)
-	{
-		if(self::isInteger(ip2long($value)))
-			return true;
+	public static function isIP($value)
+	{
+		if(self::isInteger(ip2long($value))) {
+					return true;
+		}
 		return false;
 	}
 
-	public static function isString($value, $strict = false)
-	{
-		if($strict)
-			return is_string($value);
+	public static function isString($value, $strict = false)
+	{
+		if($strict) {
+					return is_string($value);
+		}
 		return (string) $value == $value;
 	}
 
-	public static function isURL($value)
-	{
+	public static function isURL($value)
+	{
 		return true;
 		return self::check_value(self::$URL_REGEX, $value);
 	}
 
-	public static function isName($value)
-	{
+	public static function isName($value)
+	{
 		return self::check_value(self::$NAME_REGEX, $value);
 	}
 
-	public static function isEmail($value)
-	{
+	public static function isEmail($value)
+	{
 		return self::check_value(self::$EMAIL_REGEX, $value);
 	}
 
-	private static function check_value($pattern, $string)
-	{
+	private static function check_value($pattern, $string)
+	{
 		preg_match($pattern, $string, $matches);
-		if(empty($matches))
-			return false;
+		if(empty($matches)) {
+					return false;
+		}
 		return $matches[0] == $string;
 	}
 
-	public static function checkRequest($type, $key, $validation, $strict = false)
-	{
+	public static function checkRequest($type, $key, $validation, $strict = false)
+	{
 		switch($type)
 		{
 			case 'server':
@@ -84,8 +92,9 @@  discard block
 block discarded – undo
 			break;
 		}
 		
-		if($value == false)
-			return false;
+		if($value == false) {
+					return false;
+		}
 		
 		switch($validation)
 		{

Please login to merge, or discard this patch.

utility/content/CleanCommentContent.class.inc.php 2 patches

Doc Comments +8 added lines patch added patch discarded remove patch

@@ -36,6 +36,10 @@  discard block
 block discarded – undo
 		$this->replace_element_patterns();
 	}
 
+	/**
+	 * @param string $pattern
+	 * @param string $replace
+	 */
 	private function process_element($pattern, $replace)
 	{
 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
@@ -75,6 +79,10 @@  discard block
 block discarded – undo
 		$this->content = strip_tags($this->content);
 	}
 
+	/**
+	 * @param string $pattern
+	 * @param string $replace
+	 */
 	private function link_unlinked_urls($pattern, $replace)
 	{
 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);

Please login to merge, or discard this patch.

Braces +24 added lines, -22 removed lines patch added patch discarded remove patch

@@ -2,8 +2,8 @@  discard block
 block discarded – undo
 
 Loader::load('utility', 'Content');
 
-final class CleanCommentContent extends Content
-{
+final class CleanCommentContent extends Content
+{
 
 	private static $LINK_PATTERN = '@<a.*href=["\']([^"\']*)["\'].*>(.*)</a>@i';
 	private static $BOLD_PATTERN = '@<b.*>(.*)</b>@i';
@@ -22,8 +22,8 @@  discard block
 block discarded – undo
 
 	private $replacement_array = array();
 
-	protected function execute()
-	{
+	protected function execute()
+	{
 		$this->process_element(self::$CODE_PATTERN, self::$CODE_REPLACE);
 		$this->process_element(self::$LINK_PATTERN, self::$LINK_REPLACE);
 		$this->process_element(self::$ITALIC_PATTERN, self::$ITALIC_REPLACE);
@@ -36,12 +36,13 @@  discard block
 block discarded – undo
 		$this->replace_element_patterns();
 	}
 
-	private function process_element($pattern, $replace)
-	{
+	private function process_element($pattern, $replace)
+	{
 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
-			return;
+		if($match_count < 1) {
+					return;
+		}
 		
 		foreach($matches as $match)
 		{
@@ -54,13 +55,13 @@  discard block
 block discarded – undo
 		}
 	}
 
-	private function create_placeholder($text)
-	{
+	private function create_placeholder($text)
+	{
 		return md5($text . rand());
 	}
 
-	private function create_full_match_pattern($text)
-	{
+	private function create_full_match_pattern($text)
+	{
 		$pattern = '';
 		$pattern .= '@';
 		$pattern .= preg_quote($text, '@');
@@ -70,17 +71,18 @@  discard block
 block discarded – undo
 		return $pattern;
 	}
 
-	private function strip_extra_tags()
-	{
+	private function strip_extra_tags()
+	{
 		$this->content = strip_tags($this->content);
 	}
 
-	private function link_unlinked_urls($pattern, $replace)
-	{
+	private function link_unlinked_urls($pattern, $replace)
+	{
 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
-			return;
+		if($match_count < 1) {
+					return;
+		}
 		
 		foreach($matches as $match)
 		{
@@ -92,13 +94,13 @@  discard block
 block discarded – undo
 		}
 	}
 
-	private function add_line_breaks()
-	{
+	private function add_line_breaks()
+	{
 		$this->content = preg_replace(self::$LINE_BREAK_PATTERN, self::$LINE_BREAK_REPLACE, $this->content);
 	}
 
-	private function replace_element_patterns()
-	{
+	private function replace_element_patterns()
+	{
 		foreach($this->replacement_array as $key => $replace)
 		{
 			$this->content = str_replace($key, $replace, $this->content);

Please login to merge, or discard this patch.

		@@ -97,6 +97,9 @@
		block discarded – undo
97	97	return $tag_array;
98	98	}
99	99
	100	+ /**
	101	+ * @param boolean $trim
	102	+ */
100	103	final private function get_body_for_post($post, $trim)
101	104	{
102	105	$body = $post->body;

		@@ -34,6 +34,9 @@ discard block
		block discarded – undo
34	34	return self::run_query($query);
35	35	}
36	36
	37	+ /**
	38	+ * @param integer $total
	39	+ */
37	40	public static function getRecentList($total)
38	41	{
39	42	$query = "
		@@ -178,6 +181,9 @@ discard block
		block discarded – undo
178	181	return self::run_row_query($query);
179	182	}
180	183
	184	+ /**
	185	+ * @param string $date
	186	+ */
181	187	public static function getByDate($date)
182	188	{
183	189	$date = self::escape($date);

		@@ -2,11 +2,11 @@ discard block
		block discarded – undo
2	2
3	3	Loader::load('collector', 'Collector');
4	4
5		-final class LogCollector extends Collector
6		-{
	5	+final class LogCollector extends Collector
	6	+{
7	7
8		- public static function getList($total, $offset = 0)
9		- {
	8	+ public static function getList($total, $offset = 0)
	9	+ {
10	10	$query = "
11	11	SELECT
12	12	`log`.`id`,
		@@ -34,8 +34,8 @@ discard block
		block discarded – undo
34	34	return self::run_query($query);
35	35	}
36	36
37		- public static function getRecentList($total)
38		- {
	37	+ public static function getRecentList($total)
	38	+ {
39	39	$query = "
40	40	SELECT
41	41	`log`.`title`,
		@@ -62,8 +62,8 @@ discard block
		block discarded – undo
62	62	return self::run_query($query);
63	63	}
64	64
65		- public static function getListCount()
66		- {
	65	+ public static function getListCount()
	66	+ {
67	67	$query = "
68	68	SELECT
69	69	COUNT(1) AS `count`
		@@ -74,8 +74,8 @@ discard block
		block discarded – undo
74	74	return self::get_count($query);
75	75	}
76	76
77		- public static function getCompanionListForLog($log)
78		- {
	77	+ public static function getCompanionListForLog($log)
	78	+ {
79	79	$query = "
80	80	SELECT
81	81	`companion`.`name`,
		@@ -90,8 +90,8 @@ discard block
		block discarded – undo
90	90	return self::run_query($query);
91	91	}
92	92
93		- public static function getWaterfallListForLog($log)
94		- {
	93	+ public static function getWaterfallListForLog($log)
	94	+ {
95	95	$query = "
96	96	SELECT
97	97	`waterfall`.`name`,
		@@ -113,8 +113,8 @@ discard block
		block discarded – undo
113	113	return self::run_query($query);
114	114	}
115	115
116		- public static function getLogListForWaterfall($waterfall)
117		- {
	116	+ public static function getLogListForWaterfall($waterfall)
	117	+ {
118	118	$query = "
119	119	SELECT
120	120	`log`.`title`,
		@@ -133,8 +133,8 @@ discard block
		block discarded – undo
133	133	return self::run_query($query);
134	134	}
135	135
136		- public static function getTagListForLog($log)
137		- {
	136	+ public static function getTagListForLog($log)
	137	+ {
138	138	$query = "
139	139	SELECT
140	140	`tag`.`name`,
		@@ -147,8 +147,8 @@ discard block
		block discarded – undo
147	147	return self::run_query($query);
148	148	}
149	149
150		- public static function getByAlias($alias)
151		- {
	150	+ public static function getByAlias($alias)
	151	+ {
152	152	$alias = self::escape($alias);
153	153
154	154	$query = "
		@@ -178,8 +178,8 @@ discard block
		block discarded – undo
178	178	return self::run_row_query($query);
179	179	}
180	180
181		- public static function getByDate($date)
182		- {
	181	+ public static function getByDate($date)
	182	+ {
183	183	$date = self::escape($date);
184	184
185	185	$query = "
		@@ -195,8 +195,8 @@ discard block
		block discarded – undo
195	195	return self::run_row_query($query);
196	196	}
197	197
198		- public static function getById($log)
199		- {
	198	+ public static function getById($log)
	199	+ {
200	200	$query = "
201	201	SELECT
202	202	`title`,
		@@ -211,8 +211,8 @@ discard block
		block discarded – undo
211	211	return self::run_row_query($query);
212	212	}
213	213
214		- public static function getPreviousLog($log)
215		- {
	214	+ public static function getPreviousLog($log)
	215	+ {
216	216	$query = "
217	217	SELECT
218	218	`title`,
		@@ -236,8 +236,8 @@ discard block
		block discarded – undo
236	236	return self::run_row_query($query);
237	237	}
238	238
239		- public static function getNextLog($log)
240		- {
	239	+ public static function getNextLog($log)
	240	+ {
241	241	$query = "
242	242	SELECT
243	243	`title`,

		@@ -117,6 +117,9 @@
		block discarded – undo
117	117	return self::run_query($query);
118	118	}
119	119
	120	+ /**
	121	+ * @param string $alias
	122	+ */
120	123	public static function getByOldAlias($alias)
121	124	{
122	125	$alias = self::escape($alias);

		@@ -3,8 +3,8 @@ discard block
		block discarded – undo
3	3	Loader::load('controller', '/PageController');
4	4	Loader::load('utility', 'Content');
5	5
6		-abstract class DefaultPageController extends PageController
7		-{
	6	+abstract class DefaultPageController extends PageController
	7	+{
8	8
9	9	private static $RECENT_COMMENT_COUNT = 10;
10	10	private static $MINIMUM_TAG_COUNT = 10;
		@@ -14,8 +14,8 @@ discard block
		block discarded – undo
14	14
15	15	private static $INTRODUCTION_IMAGE_PATTERN = '<img src="/photo/%s/%s-size-%s.jpg" height="%d" width="%d" alt="%s" />';
16	16
17		- protected function set_head_data()
18		- {
	17	+ protected function set_head_data()
	18	+ {
19	19	$this->set_head('rss_link', [
20	20	'title' => 'Jacob Emerick Blog Feed',
21	21	'url' => '/rss.xml'
		@@ -29,18 +29,19 @@ discard block
		block discarded – undo
29	29	$this->add_css('blog');
30	30	}
31	31
32		- protected function get_introduction()
33		- {
	32	+ protected function get_introduction()
	33	+ {
34	34	return;
35	35	}
36	36
37		- protected function get_introduction_image($id)
38		- {
	37	+ protected function get_introduction_image($id)
	38	+ {
39	39	Loader::load('collector', 'image/PhotoCollector');
40	40	$photo_result = PhotoCollector::getRow($id);
41	41
42		- if($photo_result == null)
43		- return;
	42	+ if($photo_result == null) {
	43	+ return;
	44	+ }
44	45
45	46	$name = $photo_result->name;
46	47	$category = $photo_result->category;
		@@ -52,8 +53,8 @@ discard block
		block discarded – undo
52	53	return sprintf(self::$INTRODUCTION_IMAGE_PATTERN, $category, $name, $size, $height, $width, $description);
53	54	}
54	55
55		- protected function set_body_data()
56		- {
	56	+ protected function set_body_data()
	57	+ {
57	58	$this->set_body('introduction', $this->get_introduction());
58	59	$this->set_body('right_side', $this->get_right_side());
59	60	$this->set_body('activity_array', $this->get_recent_activity());
		@@ -61,8 +62,8 @@ discard block
		block discarded – undo
61	62	$this->set_body_view('Page');
62	63	}
63	64
64		- final protected function format_post($post, $trim = false)
65		- {
	65	+ final protected function format_post($post, $trim = false)
	66	+ {
66	67	$post_object = new stdclass();
67	68
68	69	$post_object->title = $post['title'];
		@@ -77,8 +78,8 @@ discard block
		block discarded – undo
77	78	return $post_object;
78	79	}
79	80
80		- final private function get_tags_for_post($post)
81		- {
	81	+ final private function get_tags_for_post($post)
	82	+ {
82	83	global $container;
83	84	$repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
84	85	$tag_result = $repository->getTagsForPost($post['id']);
		@@ -94,12 +95,13 @@ discard block
		block discarded – undo
94	95	return $tag_array;
95	96	}
96	97
97		- final private function get_body_for_post($post, $trim)
98		- {
	98	+ final private function get_body_for_post($post, $trim)
	99	+ {
99	100	$body = $post['body'];
100	101
101		- if($trim)
102		- $body = Content::instance('SmartTrim', $body)->activate(self::$LENGTH_OF_TRIMMED_POST);
	102	+ if($trim) {
	103	+ $body = Content::instance('SmartTrim', $body)->activate(self::$LENGTH_OF_TRIMMED_POST);
	104	+ }
103	105
104	106	$body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
105	107	$body = Content::instance('MarkupCode', $body)->activate();
		@@ -107,16 +109,16 @@ discard block
		block discarded – undo
107	109	return $body;
108	110	}
109	111
110		- final protected function get_right_side()
111		- {
	112	+ final protected function get_right_side()
	113	+ {
112	114	$side_array = array();
113	115	$side_array['tags'] = $this->get_tag_cloud();
114	116	$side_array['comments'] = $this->get_comments();
115	117	return $side_array;
116	118	}
117	119
118		- final private function get_tag_cloud()
119		- {
	120	+ final private function get_tag_cloud()
	121	+ {
120	122	global $container;
121	123	$repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
122	124	$tag_result = $repository->getTagCloud();
		@@ -126,8 +128,9 @@ discard block
		block discarded – undo
126	128	$cloud_array = array();
127	129	foreach($tag_result as $tag)
128	130	{
129		- if($tag['count'] < self::$MINIMUM_TAG_COUNT)
130		- continue;
	131	+ if($tag['count'] < self::$MINIMUM_TAG_COUNT) {
	132	+ continue;
	133	+ }
131	134
132	135	$tag_object = new stdclass();
133	136	$tag_object->name = $tag['tag'];
		@@ -139,20 +142,21 @@ discard block
		block discarded – undo
139	142	return $cloud_array;
140	143	}
141	144
142		- final private function get_maximum_tag_count($tag_result)
143		- {
	145	+ final private function get_maximum_tag_count($tag_result)
	146	+ {
144	147	$maximum = 1;
145	148
146	149	foreach($tag_result as $tag)
147	150	{
148		- if($tag['count'] > $maximum)
149		- $maximum = $tag['count'];
	151	+ if($tag['count'] > $maximum) {
	152	+ $maximum = $tag['count'];
	153	+ }
150	154	}
151	155	return $maximum;
152	156	}
153	157
154		- final private function get_comments()
155		- {
	158	+ final private function get_comments()
	159	+ {
156	160	global $container;
157	161	$repository = new Jacobemerick\Web\Domain\Comment\Comment\ServiceCommentRepository($container['comment_service_api']);
158	162	$start = microtime(true);

		@@ -25,6 +25,9 @@ discard block
		block discarded – undo
25	25	return;
26	26	}
27	27
	28	+ /**
	29	+ * @param string $content
	30	+ */
28	31	private function wrap_in_list($content)
29	32	{
30	33	$content_array = explode("\n", $content);
		@@ -44,6 +47,9 @@ discard block
		block discarded – undo
44	47	return $content;
45	48	}
46	49
	50	+ /**
	51	+ * @param string $type
	52	+ */
47	53	private function highlight_code($content, $type)
48	54	{
49	55	switch($type)

		@@ -2,16 +2,17 @@ discard block
		block discarded – undo
2	2
3	3	Loader::load('utility', 'Content');
4	4
5		-final class MarkupCodeContent extends Content
6		-{
	5	+final class MarkupCodeContent extends Content
	6	+{
7	7
8	8	private static $MARKUP_DELIMITER = '@<pre( rel="(.?)")?>(.?)</pre>@s';
9	9
10		- protected function execute($title = '')
11		- {
	10	+ protected function execute($title = '')
	11	+ {
12	12	preg_match_all(self::$MARKUP_DELIMITER, $this->content, $matches);
13		- if(count($matches[1]) == 0)
14		- return;
	13	+ if(count($matches[1]) == 0) {
	14	+ return;
	15	+ }
15	16
16	17	foreach($matches[3] as $key => $match)
17	18	{
		@@ -25,8 +26,8 @@ discard block
		block discarded – undo
25	26	return;
26	27	}
27	28
28		- private function wrap_in_list($content)
29		- {
	29	+ private function wrap_in_list($content)
	30	+ {
30	31	$content_array = explode("\n", $content);
31	32
32	33	foreach($content_array as $key => $row)
		@@ -44,8 +45,8 @@ discard block
		block discarded – undo
44	45	return $content;
45	46	}
46	47
47		- private function highlight_code($content, $type)
48		- {
	48	+ private function highlight_code($content, $type)
	49	+ {
49	50	switch($type)
50	51	{
51	52	default :

		@@ -62,6 +62,9 @@
		block discarded – undo
62	62	$this->is_trimmed = true;
63	63	}
64	64
	65	+ /**
	66	+ * @param string $content
	67	+ */
65	68	private function trim_html_string($content, $length)
66	69	{
67	70	$content = preg_replace(self::$PHOTO_PLACEHOLDER_MATCH, '', $content);

		@@ -2,8 +2,8 @@ discard block
		block discarded – undo
2	2
3	3	Loader::load('utility', 'Content');
4	4
5		-class SmartTrimContent extends Content
6		-{
	5	+class SmartTrimContent extends Content
	6	+{
7	7
8	8	private static $EXCLUDE_TAGS = array(
9	9	'a',
		@@ -24,8 +24,8 @@ discard block
		block discarded – undo
24	24
25	25	private $is_trimmed;
26	26
27		- protected function execute()
28		- {
	27	+ protected function execute()
	28	+ {
29	29	$args = func_get_args();
30	30	if(count($args) < 1)
31	31	{
		@@ -33,37 +33,40 @@ discard block
		block discarded – undo
33	33	return;
34	34	}
35	35
36		- if(count($args) == 2)
37		- $etc = $args[1];
38		- else
39		- $etc = self::$ETC;
	36	+ if(count($args) == 2) {
	37	+ $etc = $args[1];
	38	+ } else {
	39	+ $etc = self::$ETC;
	40	+ }
40	41
41	42	$length = $args[0];
42	43
43		- if($length < strlen($this->content))
44		- $this->trim_string($length);
45		- else
46		- $etc = '';
	44	+ if($length < strlen($this->content)) {
	45	+ $this->trim_string($length);
	46	+ } else {
	47	+ $etc = '';
	48	+ }
47	49	$this->check_exclude_tags();
48	50	$this->close_tags($etc);
49	51	}
50	52
51		- private function trim_string($length)
52		- {
	53	+ private function trim_string($length)
	54	+ {
53	55	$content = $this->trim_html_string($this->content, $length);
54	56
55	57	$last_right_bracket_position = strripos($content, self::$RIGHT_BRACKET);
56	58	$last_left_bracket_position = strripos($content, self::$LEFT_BRACKET);
57		- if($last_left_bracket_position > $last_right_bracket_position)
58		- $content = substr($content, 0, $last_left_bracket_position);
	59	+ if($last_left_bracket_position > $last_right_bracket_position) {
	60	+ $content = substr($content, 0, $last_left_bracket_position);
	61	+ }
59	62	$content = trim($content);
60	63
61	64	$this->content = $content;
62	65	$this->is_trimmed = true;
63	66	}
64	67
65		- private function trim_html_string($content, $length)
66		- {
	68	+ private function trim_html_string($content, $length)
	69	+ {
67	70	$content = preg_replace(self::$PHOTO_PLACEHOLDER_MATCH, '', $content);
68	71	preg_match_all(self::$HTML_TAG_PATTERN, $content, $matches, PREG_OFFSET_CAPTURE);
69	72	$content = strip_tags($content);
		@@ -76,20 +79,22 @@ discard block
		block discarded – undo
76	79	foreach($matches[0] as $match)
77	80	{
78	81	$max_length += strlen($match[0]);
79		- if($max_length <= $match[1])
80		- break;
	82	+ if($max_length <= $match[1]) {
	83	+ break;
	84	+ }
81	85
82	86	$content = substr($content, 0, $match[1]) . $match[0] . substr($content, $match[1]);
83	87	}
84	88
85		- if(substr($content, -7) == '</p><p>')
86		- $content = substr($content, 0, -7);
	89	+ if(substr($content, -7) == '</p><p>') {
	90	+ $content = substr($content, 0, -7);
	91	+ }
87	92
88	93	return $content;
89	94	}
90	95
91		- private function check_exclude_tags()
92		- {
	96	+ private function check_exclude_tags()
	97	+ {
93	98	$content = $this->content;
94	99	$tags_preg = $this->get_tags_preg(self::$EXCLUDE_TAGS);
95	100	preg_match_all($tags_preg, $content, $matches, PREG_OFFSET_CAPTURE);
		@@ -105,8 +110,8 @@ discard block
		block discarded – undo
105	110	$this->content = $content;
106	111	}
107	112
108		- private function close_tags($etc)
109		- {
	113	+ private function close_tags($etc)
	114	+ {
110	115	$content = $this->content;
111	116	$tags_preg = $this->get_tags_preg(self::$INCLUDE_TAGS);
112	117	preg_match_all($tags_preg, $content, $matches);
		@@ -118,9 +123,9 @@ discard block
		block discarded – undo
118	123	{
119	124	$key = array_search($tag, $open_tags);
120	125	unset($open_tags[$key]);
121		- }
122		- else
123		- $open_tags[] = $tag;
	126	+ } else {
	127	+ $open_tags[] = $tag;
	128	+ }
124	129	}
125	130
126	131	$open_tags = array_reverse($open_tags);
		@@ -128,19 +133,20 @@ discard block
		block discarded – undo
128	133	{
129	134	foreach($open_tags as $key => $open_tag)
130	135	{
131		- if($key == count($open_tags) - 1)
132		- $content .= $etc;
	136	+ if($key == count($open_tags) - 1) {
	137	+ $content .= $etc;
	138	+ }
133	139	$content .= "</{$open_tag}>";
134	140	}
135		- }
136		- else
137		- $content .= $etc;
	141	+ } else {
	142	+ $content .= $etc;
	143	+ }
138	144
139	145	$this->content = $content;
140	146	}
141	147
142		- private function get_tags_preg($tag_array)
143		- {
	148	+ private function get_tags_preg($tag_array)
	149	+ {
144	150	return '@</?(' . implode('\|', $tag_array) . ')@';
145	151	}
146	152

		@@ -34,6 +34,9 @@
		block discarded – undo
34	34	return false;
35	35	}
36	36
	37	+ /**
	38	+ * @param string $key
	39	+ */
37	40	static function getGet($key = null)
38	41	{
39	42	if($key)

		@@ -1,7 +1,7 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-class Request
4		-{
	3	+class Request
	4	+{
5	5
6	6	private static $server = array();
7	7	private static $get = array();
		@@ -9,70 +9,74 @@ discard block
		block discarded – undo
9	9
10	10	private static $AJAX_REQUEST = 'HTTP_X_REQUESTED_WITH';
11	11
12		- static function init()
13		- {
	12	+ static function init()
	13	+ {
14	14	self::make_server();
15	15	self::make_get();
16	16	self::make_post();
17	17	}
18	18
19		- static function getServer($key = null)
20		- {
	19	+ static function getServer($key = null)
	20	+ {
21	21	if($key)
22	22	{
23		- if(isset(self::$server[$key]))
24		- return self::$server[$key];
	23	+ if(isset(self::$server[$key])) {
	24	+ return self::$server[$key];
	25	+ }
25	26	return false;
26	27	}
27	28	return self::$server;
28	29	}
29	30
30		- static function isAjax()
31		- {
32		- if(self::getServer(self::$AJAX_REQUEST))
33		- return true;
	31	+ static function isAjax()
	32	+ {
	33	+ if(self::getServer(self::$AJAX_REQUEST)) {
	34	+ return true;
	35	+ }
34	36	return false;
35	37	}
36	38
37		- static function getGet($key = null)
38		- {
	39	+ static function getGet($key = null)
	40	+ {
39	41	if($key)
40	42	{
41		- if(isset(self::$get[$key]))
42		- return self::$get[$key];
	43	+ if(isset(self::$get[$key])) {
	44	+ return self::$get[$key];
	45	+ }
43	46	return false;
44	47	}
45	48	return self::$get;
46	49	}
47	50
48		- static function getPost($key = null)
49		- {
	51	+ static function getPost($key = null)
	52	+ {
50	53	if($key)
51	54	{
52		- if(isset(self::$post[$key]))
53		- return self::$post[$key];
	55	+ if(isset(self::$post[$key])) {
	56	+ return self::$post[$key];
	57	+ }
54	58	return false;
55	59	}
56	60	return self::$post;
57	61	}
58	62
59		- public static function hasPost()
60		- {
	63	+ public static function hasPost()
	64	+ {
61	65	return is_array(self::$post) && !empty(self::$post);
62	66	}
63	67
64		- static function make_server()
65		- {
	68	+ static function make_server()
	69	+ {
66	70	self::$server = $_SERVER;
67	71	}
68	72
69		- static function make_get()
70		- {
	73	+ static function make_get()
	74	+ {
71	75	self::$get = $_GET;
72	76	}
73	77
74		- static function make_post()
75		- {
	78	+ static function make_post()
	79	+ {
76	80	self::$post = $_POST;
77	81	}
78	82

		@@ -38,6 +38,9 @@ discard block
		block discarded – undo
38	38	self::$array['pieces'] = (array) $uri_array;
39	39	}
40	40
	41	+ /**
	42	+ * @return string
	43	+ */
41	44	static function getSite()
42	45	{
43	46	return self::$array['site'];
		@@ -66,6 +69,9 @@ discard block
		block discarded – undo
66	69	return substr($file, strrpos($file, '.') + 1);;
67	70	}
68	71
	72	+ /**
	73	+ * @param integer $piece
	74	+ */
69	75	static function getPiece($piece = null)
70	76	{
71	77	if(!$piece)

		@@ -1,26 +1,28 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-class URLDecode
4		-{
	3	+class URLDecode
	4	+{
5	5
6	6	private static $array = array();
7	7
8		- static function init()
9		- {
	8	+ static function init()
	9	+ {
10	10	$host = $_SERVER['HTTP_HOST'];
11	11	$uri = $_SERVER['REQUEST_URI'];
12	12	self::form_url_array($host, $uri);
13	13	}
14	14
15		- static private function form_url_array($host, $uri)
16		- {
	15	+ static private function form_url_array($host, $uri)
	16	+ {
17	17	$uri = substr($uri, 1);
18		- if(strpos($uri, '?'))
19		- $uri = substr($uri, 0, strpos($uri, '?'));
	18	+ if(strpos($uri, '?')) {
	19	+ $uri = substr($uri, 0, strpos($uri, '?'));
	20	+ }
20	21	$uri_array = explode('/', $uri);
21	22
22		- if(!Loader::isLive())
23		- $host = substr($host, strpos($host, '.') + 1);
	23	+ if(!Loader::isLive()) {
	24	+ $host = substr($host, strpos($host, '.') + 1);
	25	+ }
24	26
25	27	self::$array['host'] = $host;
26	28
		@@ -43,50 +45,55 @@ discard block
		block discarded – undo
43	45	self::$array['base'] = $base;
44	46	self::$array['uri'] = '/' . implode('/', $uri_array);
45	47
46		- if(end($uri_array) == '')
47		- $uri_array = array_slice($uri_array, 0, count($uri_array) - 1);
	48	+ if(end($uri_array) == '') {
	49	+ $uri_array = array_slice($uri_array, 0, count($uri_array) - 1);
	50	+ }
48	51	self::$array['pieces'] = (array) $uri_array;
49	52	}
50	53
51		- static function getSite()
52		- {
	54	+ static function getSite()
	55	+ {
53	56	return self::$array['site'];
54	57	}
55	58
56		- static function getHost()
57		- {
	59	+ static function getHost()
	60	+ {
58	61	return self::$array['host'];
59	62	}
60	63
61		- static function getBase()
62		- {
	64	+ static function getBase()
	65	+ {
63	66	return self::$array['base'];
64	67	}
65	68
66		- static function getURI()
67		- {
	69	+ static function getURI()
	70	+ {
68	71	return self::$array['uri'];
69	72	}
70	73
71		- static function getExtension()
72		- {
	74	+ static function getExtension()
	75	+ {
73	76	$file = self::getPiece(-1);
74		- if(substr($file, -1) == '/')
75		- return false;
	77	+ if(substr($file, -1) == '/') {
	78	+ return false;
	79	+ }
76	80	return substr($file, strrpos($file, '.') + 1);;
77	81	}
78	82
79		- static function getPiece($piece = null)
80		- {
81		- if(!$piece)
82		- return self::$array['pieces'];
	83	+ static function getPiece($piece = null)
	84	+ {
	85	+ if(!$piece) {
	86	+ return self::$array['pieces'];
	87	+ }
83	88
84		- if($piece == -1)
85		- return end(self::$array['pieces']);
	89	+ if($piece == -1) {
	90	+ return end(self::$array['pieces']);
	91	+ }
86	92
87	93	$piece = $piece - 1;
88		- if(array_key_exists($piece, self::$array['pieces']))
89		- return self::$array['pieces'][$piece];
	94	+ if(array_key_exists($piece, self::$array['pieces'])) {
	95	+ return self::$array['pieces'][$piece];
	96	+ }
90	97	return;
91	98	}
92	99

		@@ -72,6 +72,11 @@
		block discarded – undo
72	72	return $matches[0] == $string;
73	73	}
74	74
	75	+ /**
	76	+ * @param string $type
	77	+ * @param string $key
	78	+ * @param string $validation
	79	+ */
75	80	public static function checkRequest($type, $key, $validation, $strict = false)
76	81	{
77	82	switch($type)

		@@ -2,78 +2,86 @@ discard block
		block discarded – undo
2	2
3	3	Loader::load('utility', 'Request');
4	4
5		-class Validate
6		-{
	5	+class Validate
	6	+{
7	7
8	8	private static $NAME_REGEX = '@[a-z\s\'-]+@i';
9	9	private static $EMAIL_REGEX = '@(?:[a-z0-9!#$%&\'+/=?^_`{\|}~-]+(?:\.[a-z0-9!#$%&\'+/=?^_`{\|}~-]+)\|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]\|\\[\x01-\x09\x0b\x0c\x0e-\x7f])")\@(?:(?:[a-z0-9](?:[a-z0-9-][a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-][a-z0-9])?\|\[(?:(?:25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?\|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]\|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])@i';
10	10	private static $URL_REGEX = '@((https?\|ftp)\:\/\/)?([a-z0-9-.])\.([a-z]{2,3})(\/([a-z0-9+\$_-]\.?)+)\/?(\?[a-z+&\$_.-][a-z0-9;:\@&%=+\/\$_.-])?(#[a-z_.-][a-z0-9+\$_.-])?@i';
11	11
12		- public static function isBoolean($value, $strict = false)
13		- {
14		- if($strict && ($value === true \|\| $value === false))
15		- return true;
16		- if(!$strict && ((bool) $value === true \|\| (bool) $value === false))
17		- return true;
	12	+ public static function isBoolean($value, $strict = false)
	13	+ {
	14	+ if($strict && ($value === true \|\| $value === false)) {
	15	+ return true;
	16	+ }
	17	+ if(!$strict && ((bool) $value === true \|\| (bool) $value === false)) {
	18	+ return true;
	19	+ }
18	20	return false;
19	21	}
20	22
21		- public static function isDate($value)
22		- {
23		- if(strtotime($value) !== -1)
24		- return true;
25		- if(date('y', $value) !== false)
26		- return true;
	23	+ public static function isDate($value)
	24	+ {
	25	+ if(strtotime($value) !== -1) {
	26	+ return true;
	27	+ }
	28	+ if(date('y', $value) !== false) {
	29	+ return true;
	30	+ }
27	31	return false;
28	32	}
29	33
30		- public static function isInteger($value, $strict = false)
31		- {
32		- if($strict)
33		- return is_int($value);
	34	+ public static function isInteger($value, $strict = false)
	35	+ {
	36	+ if($strict) {
	37	+ return is_int($value);
	38	+ }
34	39	return (int) $value == $value;
35	40	}
36	41
37		- public static function isIP($value)
38		- {
39		- if(self::isInteger(ip2long($value)))
40		- return true;
	42	+ public static function isIP($value)
	43	+ {
	44	+ if(self::isInteger(ip2long($value))) {
	45	+ return true;
	46	+ }
41	47	return false;
42	48	}
43	49
44		- public static function isString($value, $strict = false)
45		- {
46		- if($strict)
47		- return is_string($value);
	50	+ public static function isString($value, $strict = false)
	51	+ {
	52	+ if($strict) {
	53	+ return is_string($value);
	54	+ }
48	55	return (string) $value == $value;
49	56	}
50	57
51		- public static function isURL($value)
52		- {
	58	+ public static function isURL($value)
	59	+ {
53	60	return true;
54	61	return self::check_value(self::$URL_REGEX, $value);
55	62	}
56	63
57		- public static function isName($value)
58		- {
	64	+ public static function isName($value)
	65	+ {
59	66	return self::check_value(self::$NAME_REGEX, $value);
60	67	}
61	68
62		- public static function isEmail($value)
63		- {
	69	+ public static function isEmail($value)
	70	+ {
64	71	return self::check_value(self::$EMAIL_REGEX, $value);
65	72	}
66	73
67		- private static function check_value($pattern, $string)
68		- {
	74	+ private static function check_value($pattern, $string)
	75	+ {
69	76	preg_match($pattern, $string, $matches);
70		- if(empty($matches))
71		- return false;
	77	+ if(empty($matches)) {
	78	+ return false;
	79	+ }
72	80	return $matches[0] == $string;
73	81	}
74	82
75		- public static function checkRequest($type, $key, $validation, $strict = false)
76		- {
	83	+ public static function checkRequest($type, $key, $validation, $strict = false)
	84	+ {
77	85	switch($type)
78	86	{
79	87	case 'server':
		@@ -84,8 +92,9 @@ discard block
		block discarded – undo
84	92	break;
85	93	}
86	94
87		- if($value == false)
88		- return false;
	95	+ if($value == false) {
	96	+ return false;
	97	+ }
89	98
90	99	switch($validation)
91	100	{

		@@ -36,6 +36,10 @@ discard block
		block discarded – undo
36	36	$this->replace_element_patterns();
37	37	}
38	38
	39	+ /**
	40	+ * @param string $pattern
	41	+ * @param string $replace
	42	+ */
39	43	private function process_element($pattern, $replace)
40	44	{
41	45	$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
		@@ -75,6 +79,10 @@ discard block
		block discarded – undo
75	79	$this->content = strip_tags($this->content);
76	80	}
77	81
	82	+ /**
	83	+ * @param string $pattern
	84	+ * @param string $replace
	85	+ */
78	86	private function link_unlinked_urls($pattern, $replace)
79	87	{
80	88	$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);

jacobemerick / web

Push — master ( 68e9dc...5e9262 )

Status

Category

Doc Comments +6 added lines patch added patch discarded remove patch

Braces +26 added lines, -26 removed lines patch added patch discarded remove patch

Doc Comments +3 added lines patch added patch discarded remove patch

Braces +14 added lines, -14 removed lines patch added patch discarded remove patch

Doc Comments +3 added lines patch added patch discarded remove patch

Braces +36 added lines, -32 removed lines patch added patch discarded remove patch

Doc Comments +6 added lines patch added patch discarded remove patch

Braces +11 added lines, -10 removed lines patch added patch discarded remove patch

Doc Comments +3 added lines patch added patch discarded remove patch

Braces +42 added lines, -36 removed lines patch added patch discarded remove patch

Doc Comments +3 added lines patch added patch discarded remove patch

Braces +32 added lines, -28 removed lines patch added patch discarded remove patch

Doc Comments +6 added lines patch added patch discarded remove patch

Braces +39 added lines, -32 removed lines patch added patch discarded remove patch

Doc Comments +5 added lines patch added patch discarded remove patch

Braces +49 added lines, -40 removed lines patch added patch discarded remove patch

Doc Comments +8 added lines patch added patch discarded remove patch

Braces +24 added lines, -22 removed lines patch added patch discarded remove patch