Completed
Push — master ( 7e42fe...9ab714 )
by Jacob
04:00
created
utility/content/SmartTrimContent.class.inc.php 1 patch
Braces   +28 added lines, -22 removed lines patch added patch discarded remove patch
@@ -33,17 +33,19 @@  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
 	}
@@ -54,8 +56,9 @@  discard block
 block discarded – undo
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;
@@ -76,14 +79,16 @@  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
 	}
@@ -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,13 +133,14 @@  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
 	}
Please login to merge, or discard this patch.
utility/content/FixUnacceptableCharacterContent.class.inc.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,8 +13,9 @@
 block discarded – undo
13 13
 	{
14 14
 		foreach(self::$UNACCEPTABLE_CHARACTER_ARRAY as $match => $replace)
15 15
 		{
16
-			if(stristr($this->content, $match))
17
-				$this->content = str_replace($match, $replace, $this->content);
16
+			if(stristr($this->content, $match)) {
17
+							$this->content = str_replace($match, $replace, $this->content);
18
+			}
18 19
 		}
19 20
 		return;
20 21
 	}
Please login to merge, or discard this patch.
utility/content/AutolinkTwitterURLContent.class.inc.php 1 patch
Braces   +12 added lines, -8 removed lines patch added patch discarded remove patch
@@ -10,8 +10,9 @@  discard block
 block discarded – undo
10 10
 
11 11
 	protected function execute()
12 12
 	{
13
-		if(stristr($this->content, 'http') === false)
14
-			return;
13
+		if(stristr($this->content, 'http') === false) {
14
+					return;
15
+		}
15 16
 		
16 17
 		$parameters = func_get_args();
17 18
 		if(count($parameters) > 1 || (count($parameters) == 1 && !is_array($parameters[0])))
@@ -22,8 +23,9 @@  discard block
 block discarded – undo
22 23
 		$parameters = array_shift($parameters);
23 24
 		
24 25
 		$found_link = preg_match_all(self::$LINK_PATTERN, $this->content, $matches, PREG_SET_ORDER);
25
-		if($found_link === false || $found_link === 0)
26
-			return;
26
+		if($found_link === false || $found_link === 0) {
27
+					return;
28
+		}
27 29
 		
28 30
 		foreach($matches as $match)
29 31
 		{
@@ -70,15 +72,17 @@  discard block
 block discarded – undo
70 72
 	private function check_for_redirect($url)
71 73
 	{
72 74
 		$headers = @get_headers($url);
73
-		if($headers === false)
74
-			$headers = $this->get_headers($url);
75
+		if($headers === false) {
76
+					$headers = $this->get_headers($url);
77
+		}
75 78
 		
76 79
 		if(stristr($headers[0], '301') !== false || stristr($headers[0], '302') !== false)
77 80
 		{
78 81
 			foreach($headers as $header)
79 82
 			{
80
-				if(substr($header, 0, 9) == 'Location:')
81
-					break;
83
+				if(substr($header, 0, 9) == 'Location:') {
84
+									break;
85
+				}
82 86
 			}
83 87
 			
84 88
 			$url = substr($header, 10);
Please login to merge, or discard this patch.
utility/content/AutolinkTwitterHashContent.class.inc.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -10,8 +10,9 @@  discard block
 block discarded – undo
10 10
 
11 11
 	protected function execute()
12 12
 	{
13
-		if(stristr($this->content, '#') === false)
14
-			return;
13
+		if(stristr($this->content, '#') === false) {
14
+					return;
15
+		}
15 16
 		
16 17
 		// yeah yeah, i'm currently ignoring the link, whatevs
17 18
 		$parameters = func_get_args();
@@ -23,8 +24,9 @@  discard block
 block discarded – undo
23 24
 		$parameters = array_shift($parameters);
24 25
 		
25 26
 		$found_hash = preg_match_all(self::$HASH_PATTERN, $this->content, $matches, PREG_SET_ORDER);
26
-		if($found_hash === false || $found_hash === 0)
27
-			return;
27
+		if($found_hash === false || $found_hash === 0) {
28
+					return;
29
+		}
28 30
 		
29 31
 		foreach($matches as $match)
30 32
 		{
Please login to merge, or discard this patch.
utility/content/FixPhotoContent.class.inc.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -37,8 +37,9 @@  discard block
 block discarded – undo
37 37
 		
38 38
 		Loader::load('collector', 'image/PhotoCollector');
39 39
 		$photo_result = PhotoCollector::fetchRow($category, $photo);
40
-		if($photo_result == false)
41
-			return '';
40
+		if($photo_result == false) {
41
+					return '';
42
+		}
42 43
 		
43 44
 		$height = $file_size[1];
44 45
 		$width = $file_size[0];
@@ -49,8 +50,9 @@  discard block
 block discarded – undo
49 50
         }
50 51
 		
51 52
 		$domain = '/';
52
-		if($is_absolute)
53
-			$domain = Loader::getRootUrl('blog');
53
+		if($is_absolute) {
54
+					$domain = Loader::getRootUrl('blog');
55
+		}
54 56
 		
55 57
 		return sprintf(self::$PHOTO_CONTENT, $domain, $category, $photo, $size, $height, $width, $description, $description);
56 58
 	}
Please login to merge, or discard this patch.
utility/content/ElapsedTimeContent.class.inc.php 1 patch
Braces   +59 added lines, -58 removed lines patch added patch discarded remove patch
@@ -10,64 +10,65 @@
 block discarded – undo
10 10
 		$previous_time = strtotime($this->content);
11 11
 		$current_time = time();
12 12
 		
13
-		if($current_time <= $previous_time)
14
-			$this->content = 'few seconds ago';
15
-		else if(($current_time - $previous_time) < 30)
16
-			$this->content = 'few seconds ago';
17
-		else if(($current_time - $previous_time) < 1.5 * 60)
18
-			$this->content = 'a minute ago';
19
-		else if(($current_time - $previous_time) < 4 * 60)
20
-			$this->content = 'few minutes ago';
21
-		else if(($current_time - $previous_time) < 7 * 60)
22
-			$this->content = 'five minutes ago';
23
-		else if(($current_time - $previous_time) < 12 * 60)
24
-			$this->content = 'ten minutes ago';
25
-		else if(($current_time - $previous_time) < 17 * 60)
26
-			$this->content = 'fifteen minutes ago';
27
-		else if(($current_time - $previous_time) < 22 * 60)
28
-			$this->content = 'twenty minutes ago';
29
-		else if(($current_time - $previous_time) < 37 * 60)
30
-			$this->content = 'half hour ago';
31
-		else if(($current_time - $previous_time) < 52 * 60)
32
-			$this->content = 'forty-five minutes ago';
33
-		else if(($current_time - $previous_time) < 1.5 * 60 * 60)
34
-			$this->content = 'an hour ago';
35
-		else if(($current_time - $previous_time) < 2.5 * 60 * 60)
36
-			$this->content = 'two hours ago';
37
-		else if(($current_time - $previous_time) < 3.5 * 60 * 60)
38
-			$this->content = 'three hours ago';
39
-		else if(($current_time - $previous_time) < 4.5 * 60 * 60)
40
-			$this->content = 'few hours ago';
41
-		else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'pm')
42
-			$this->content = 'this afternoon';
43
-		else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'am')
44
-			$this->content = 'this morning';
45
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm' && date('G', $previous_time) >= 17)
46
-			$this->content = 'yesterday evening';
47
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm')
48
-			$this->content = 'yesterday afternoon';
49
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'am')
50
-			$this->content = 'yesterday morning';
51
-		else if(($current_time - $previous_time) < 3 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 2)
52
-			$this->content = 'two days ago';
53
-		else if(($current_time - $previous_time) < 4 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 3)
54
-			$this->content = 'three days ago';
55
-		else if(($current_time - $previous_time) < 1 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time))
56
-			$this->content = 'earlier this week';
57
-		else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1 && date('w', $previous_time) >= 3)
58
-			$this->content = 'late last week';
59
-		else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1)
60
-			$this->content = 'early last week';
61
-		else if(($current_time - $previous_time) < 3 * 7 * 24 * 60 * 60)
62
-			$this->content = 'few weeks ago';
63
-		else if(($current_time - $previous_time) < 1.25* 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time))
64
-			$this->content = 'earlier this month';
65
-		else if(($current_time - $previous_time) < 2 * 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time) + 1)
66
-			$this->content = 'last month';
67
-		else if(($current_time - $previous_time) < 4 * 4 * 7 * 24 * 60 * 60)
68
-			$this->content = 'several months ago';
69
-		else
70
-			$this->content = 'long ago';
13
+		if($current_time <= $previous_time) {
14
+					$this->content = 'few seconds ago';
15
+		} else if(($current_time - $previous_time) < 30) {
16
+					$this->content = 'few seconds ago';
17
+		} else if(($current_time - $previous_time) < 1.5 * 60) {
18
+					$this->content = 'a minute ago';
19
+		} else if(($current_time - $previous_time) < 4 * 60) {
20
+					$this->content = 'few minutes ago';
21
+		} else if(($current_time - $previous_time) < 7 * 60) {
22
+					$this->content = 'five minutes ago';
23
+		} else if(($current_time - $previous_time) < 12 * 60) {
24
+					$this->content = 'ten minutes ago';
25
+		} else if(($current_time - $previous_time) < 17 * 60) {
26
+					$this->content = 'fifteen minutes ago';
27
+		} else if(($current_time - $previous_time) < 22 * 60) {
28
+					$this->content = 'twenty minutes ago';
29
+		} else if(($current_time - $previous_time) < 37 * 60) {
30
+					$this->content = 'half hour ago';
31
+		} else if(($current_time - $previous_time) < 52 * 60) {
32
+					$this->content = 'forty-five minutes ago';
33
+		} else if(($current_time - $previous_time) < 1.5 * 60 * 60) {
34
+					$this->content = 'an hour ago';
35
+		} else if(($current_time - $previous_time) < 2.5 * 60 * 60) {
36
+					$this->content = 'two hours ago';
37
+		} else if(($current_time - $previous_time) < 3.5 * 60 * 60) {
38
+					$this->content = 'three hours ago';
39
+		} else if(($current_time - $previous_time) < 4.5 * 60 * 60) {
40
+					$this->content = 'few hours ago';
41
+		} else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'pm') {
42
+					$this->content = 'this afternoon';
43
+		} else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'am') {
44
+					$this->content = 'this morning';
45
+		} else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm' && date('G', $previous_time) >= 17) {
46
+					$this->content = 'yesterday evening';
47
+		} else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm') {
48
+					$this->content = 'yesterday afternoon';
49
+		} else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'am') {
50
+					$this->content = 'yesterday morning';
51
+		} else if(($current_time - $previous_time) < 3 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 2) {
52
+					$this->content = 'two days ago';
53
+		} else if(($current_time - $previous_time) < 4 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 3) {
54
+					$this->content = 'three days ago';
55
+		} else if(($current_time - $previous_time) < 1 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time)) {
56
+					$this->content = 'earlier this week';
57
+		} else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1 && date('w', $previous_time) >= 3) {
58
+					$this->content = 'late last week';
59
+		} else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1) {
60
+					$this->content = 'early last week';
61
+		} else if(($current_time - $previous_time) < 3 * 7 * 24 * 60 * 60) {
62
+					$this->content = 'few weeks ago';
63
+		} else if(($current_time - $previous_time) < 1.25* 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time)) {
64
+					$this->content = 'earlier this month';
65
+		} else if(($current_time - $previous_time) < 2 * 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time) + 1) {
66
+					$this->content = 'last month';
67
+		} else if(($current_time - $previous_time) < 4 * 4 * 7 * 24 * 60 * 60) {
68
+					$this->content = 'several months ago';
69
+		} else {
70
+					$this->content = 'long ago';
71
+		}
71 72
 	}
72 73
 
73 74
 }
74 75
\ No newline at end of file
Please login to merge, or discard this patch.
utility/content/FetchFirstPhotoContent.class.inc.php 1 patch
Braces   +11 added lines, -8 removed lines patch added patch discarded remove patch
@@ -11,10 +11,11 @@  discard block
 block discarded – undo
11 11
 
12 12
 	protected function execute($is_absolute = false, $size = 'thumb')
13 13
 	{
14
-		if(preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1)
15
-			$this->content = $this->get_thumb($match[1], $is_absolute, $size);
16
-		else
17
-			$this->content = self::$DEFAULT_RETURN;
14
+		if(preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1) {
15
+					$this->content = $this->get_thumb($match[1], $is_absolute, $size);
16
+		} else {
17
+					$this->content = self::$DEFAULT_RETURN;
18
+		}
18 19
 		return;
19 20
 	}
20 21
 
@@ -34,16 +35,18 @@  discard block
 block discarded – undo
34 35
 		
35 36
 		Loader::load('collector', 'image/PhotoCollector');
36 37
 		$photo_result = PhotoCollector::fetchRow($category, $photo);
37
-		if($photo_result == false)
38
-			return '';
38
+		if($photo_result == false) {
39
+					return '';
40
+		}
39 41
 		
40 42
 		$height = $file_size[1];
41 43
 		$width = $file_size[0];
42 44
 		$description = $photo_result->description;
43 45
 		
44 46
 		$domain = '/';
45
-		if($is_absolute)
46
-			$domain = Loader::getRootUrl();
47
+		if($is_absolute) {
48
+					$domain = Loader::getRootUrl();
49
+		}
47 50
 		
48 51
 		return sprintf(self::$IMAGE_NODE, $domain, $category, $photo, $size, $extension, $height, $width, $description);
49 52
 	}
Please login to merge, or discard this patch.
utility/content/CleanCommentContent.class.inc.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -40,8 +40,9 @@  discard block
 block discarded – undo
40 40
 	{
41 41
 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
42 42
 		
43
-		if($match_count < 1)
44
-			return;
43
+		if($match_count < 1) {
44
+					return;
45
+		}
45 46
 		
46 47
 		foreach($matches as $match)
47 48
 		{
@@ -79,8 +80,9 @@  discard block
 block discarded – undo
79 80
 	{
80 81
 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
81 82
 		
82
-		if($match_count < 1)
83
-			return;
83
+		if($match_count < 1) {
84
+					return;
85
+		}
84 86
 		
85 87
 		foreach($matches as $match)
86 88
 		{
Please login to merge, or discard this patch.
utility/content/AutolinkTwitterUserContent.class.inc.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -10,8 +10,9 @@  discard block
 block discarded – undo
10 10
 
11 11
 	protected function execute()
12 12
 	{
13
-		if(stristr($this->content, '@') === false)
14
-			return;
13
+		if(stristr($this->content, '@') === false) {
14
+					return;
15
+		}
15 16
 		
16 17
 		// yeah yeah, i'm currently ignoring the link, whatevs
17 18
 		$parameters = func_get_args();
@@ -23,8 +24,9 @@  discard block
 block discarded – undo
23 24
 		$parameters = array_shift($parameters);
24 25
 		
25 26
 		$found_user = preg_match_all(self::$USER_PATTERN, $this->content, $matches, PREG_SET_ORDER);
26
-		if($found_user === false || $found_user === 0)
27
-			return;
27
+		if($found_user === false || $found_user === 0) {
28
+					return;
29
+		}
28 30
 		
29 31
 		foreach($matches as $match)
30 32
 		{
Please login to merge, or discard this patch.