Schlaefer / Saito

app/Plugin/BbcodeParser/Lib/jBBCode/Definitions/JbbCodeDefinitions.php

Doc Comments +3 added lines

@@ -306,6 +306,9 @@
 
 		/**
 		 * @see http://www.php.net/manual/en/function.str-pad.php#111147
+		 * @param string $str
+		 * @param integer $padLen
+		 * @param integer $dir
 		 */
 		protected function _mbStrpad($str, $padLen, $padStr = ' ', $dir = STR_PAD_RIGHT) {
 			$strLen = mb_strlen($str);

Spacing +13 added lines, -13 removed lines

@@ -123,7 +123,7 @@ 
 
 			// @todo should be done in Setting model
 			$ad = explode('|', $this->_sOptions['video_domains_allowed']);
-			$trim = function ($v) {
+			$trim = function($v) {
 				return trim($v);
 			};
 			$this->_allowedVideoDomains = array_fill_keys(array_map($trim, $ad), 1);
@@ -193,9 +193,9 @@ 
 				}
 			}
 
-			$out = '<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="' . $width . '" height="' . $height . '">
-									<param name="movie" value="' . $url . '"></param>
-									<embed src="' . $url . '" width="' . $width . '" height="' . $height . '" type="application/x-shockwave-flash" wmode="opaque" style="width:' . $width . 'px; height:' . $height . 'px;" id="VideoPlayback" flashvars=""> </embed> </object>';
+			$out = '<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="'.$width.'" height="'.$height.'">
+									<param name="movie" value="' . $url.'"></param>
+									<embed src="' . $url.'" width="'.$width.'" height="'.$height.'" type="application/x-shockwave-flash" wmode="opaque" style="width:'.$width.'px; height:'.$height.'px;" id="VideoPlayback" flashvars=""> </embed> </object>';
 			return $out;
 		}
 
@@ -258,12 +258,12 @@ 
 		protected function _parse($content, $attributes) {
 			$listPieces = explode('[*]', $content);
 			unset($listPieces[0]);
-			$listPieceProcessor = function ($li) {
-				return '<li>' . $li . '</li>' . "\n";
+			$listPieceProcessor = function($li) {
+				return '<li>'.$li.'</li>'."\n";
 			};
 			$listPieces = array_map($listPieceProcessor, $listPieces);
 
-			return '<ul>' . implode('', $listPieces) . '</ul>';
+			return '<ul>'.implode('', $listPieces).'</ul>';
 		}
 
 	}
@@ -280,14 +280,14 @@ 
 			}
 
 			$title = $this->_mbStrpad(
-				' ' . __('Spoiler') . ' ',
+				' '.__('Spoiler').' ',
 				$length,
 				'▇',
 				STR_PAD_BOTH
 			);
 
 			$json = json_encode(['string' => $content]);
-			$id = 'spoiler_' . rand(0, 9999999999999);
+			$id = 'spoiler_'.rand(0, 9999999999999);
 
 			$out = <<<EOF
 <div class="richtext-spoiler" style="display: inline;">
@@ -320,19 +320,19 @@ 
 			$result = null;
 			$repeat = ceil($strLen - $padStrLen + $padLen);
 			if ($dir == STR_PAD_RIGHT) {
-				$result = $str . str_repeat($padStr, $repeat);
+				$result = $str.str_repeat($padStr, $repeat);
 				$result = mb_substr($result, 0, $padLen);
 			} else {
 				if ($dir == STR_PAD_LEFT) {
-					$result = str_repeat($padStr, $repeat) . $str;
+					$result = str_repeat($padStr, $repeat).$str;
 					$result = mb_substr($result, -$padLen);
 				} else {
 					if ($dir == STR_PAD_BOTH) {
 						$length = ($padLen - $strLen) / 2;
 						$repeat = ceil($length / $padStrLen);
 						$result = mb_substr(str_repeat($padStr, $repeat), 0,
-								floor($length)) .
-							$str .
+								floor($length)).
+							$str.
 							mb_substr(str_repeat($padStr, $repeat), 0, ceil($length));
 					}
 				}

Indentation +395 added lines, -395 removed lines

@@ -1,295 +1,295 @@ 
 <?php
 
-	namespace Plugin\BbcodeParser\Lib\jBBCode\Definitions;
+    namespace Plugin\BbcodeParser\Lib\jBBCode\Definitions;
 
-	use Plugin\BbcodeParser\Lib\Helper\Message;
-	use Plugin\BbcodeParser\Lib\Helper\UrlParserTrait;
-	use Saito\DomainParser;
+    use Plugin\BbcodeParser\Lib\Helper\Message;
+    use Plugin\BbcodeParser\Lib\Helper\UrlParserTrait;
+    use Saito\DomainParser;
 
-	include 'CodeDefinition.php';
-	include 'JbbHtml5MediaCodeDefinition.php';
-	include 'JbbCodeCodeDefinition.php';
+    include 'CodeDefinition.php';
+    include 'JbbHtml5MediaCodeDefinition.php';
+    include 'JbbCodeCodeDefinition.php';
 
-	/**
-	 * Class Email handles [email]foo@bar.com[/email]
-	 *
-	 * @package Saito\Jbb\CodeDefinition
-	 */
-	class Email extends CodeDefinition {
+    /**
+     * Class Email handles [email]foo@bar.com[/email]
+     *
+     * @package Saito\Jbb\CodeDefinition
+     */
+    class Email extends CodeDefinition {
 
-		use UrlParserTrait;
+        use UrlParserTrait;
 
-		protected $_sParseContent = false;
+        protected $_sParseContent = false;
 
-		protected $_sTagName = 'email';
+        protected $_sTagName = 'email';
 
-		protected function _parse($url, $attributes) {
-			return $this->_email($url);
-		}
+        protected function _parse($url, $attributes) {
+            return $this->_email($url);
+        }
 
-	}
+    }
 
-	/**
-	 * Class EmailWithAttributes handles [email=foo@bar.com]foobar[/email]
-	 *
-	 * @package Saito\Jbb\CodeDefinition
-	 */
-	class EmailWithAttributes extends Email {
+    /**
+     * Class EmailWithAttributes handles [email=foo@bar.com]foobar[/email]
+     *
+     * @package Saito\Jbb\CodeDefinition
+     */
+    class EmailWithAttributes extends Email {
 
-		protected $_sUseOptions = true;
+        protected $_sUseOptions = true;
 
-		protected function _parse($content, $attributes) {
-			return $this->_email($attributes['email'], $content);
-		}
+        protected function _parse($content, $attributes) {
+            return $this->_email($attributes['email'], $content);
+        }
 
-	}
+    }
 
 
-	class Embed extends CodeDefinition {
+    class Embed extends CodeDefinition {
 
-		protected $_sTagName = 'embed';
+        protected $_sTagName = 'embed';
 
-		protected $_sParseContent = false;
+        protected $_sParseContent = false;
 
-		protected function _parse($content, $attributes) {
-			if (empty($this->_sOptions['embedly_enabled'])) {
-				return $this->_sHelper->Html->link($content, $content);
-			}
+        protected function _parse($content, $attributes) {
+            if (empty($this->_sOptions['embedly_enabled'])) {
+                return $this->_sHelper->Html->link($content, $content);
+            }
 
-			$this->Embedly->setApiKey($this->_sOptions['embedly_key']);
-			$embedly = $this->Embedly->embedly($content);
-			if ($embedly !== false) {
-				return $embedly;
-			}
+            $this->Embedly->setApiKey($this->_sOptions['embedly_key']);
+            $embedly = $this->Embedly->embedly($content);
+            if ($embedly !== false) {
+                return $embedly;
+            }
 
-			return __('Embedding failed.');
-		}
+            return __('Embedding failed.');
+        }
 
-	}
+    }
 
-	class Iframe extends CodeDefinition {
+    class Iframe extends CodeDefinition {
 
-		protected $_sTagName = 'iframe';
+        protected $_sTagName = 'iframe';
 
-		protected $_sParseContent = false;
+        protected $_sParseContent = false;
 
-		protected $_sUseOptions = true;
+        protected $_sUseOptions = true;
 
-		/**
-		 * Array with domains from which embedding video is allowed
-		 *
-		 * array(
-		 *  'youtube' => 1,
-		 *  'vimeo' => 1,
-		 * );
-		 *
-		 * array('*' => 1) means every domain allowed
-		 *
-		 * @var array
-		 */
-		protected $_allowedVideoDomains = null;
+        /**
+         * Array with domains from which embedding video is allowed
+         *
+         * array(
+         *  'youtube' => 1,
+         *  'vimeo' => 1,
+         * );
+         *
+         * array('*' => 1) means every domain allowed
+         *
+         * @var array
+         */
+        protected $_allowedVideoDomains = null;
 
-		protected function _parse($content, $attributes) {
-			if (empty($attributes['src'])) {
-				return false;
-			}
+        protected function _parse($content, $attributes) {
+            if (empty($attributes['src'])) {
+                return false;
+            }
 
-			unset($attributes['iframe']);
+            unset($attributes['iframe']);
 
-			$allowed = $this->_checkHostAllowed($attributes['src']);
-			if ($allowed !== true) {
-				return $allowed;
-			}
+            $allowed = $this->_checkHostAllowed($attributes['src']);
+            if ($allowed !== true) {
+                return $allowed;
+            }
 
-			if (strpos($attributes['src'], '?') === false) {
-				$attributes['src'] .= '?';
-			}
-			// @todo @bogus unescaped & in html attribute?
-			$attributes['src'] .= '&wmode=Opaque';
+            if (strpos($attributes['src'], '?') === false) {
+                $attributes['src'] .= '?';
+            }
+            // @todo @bogus unescaped & in html attribute?
+            $attributes['src'] .= '&wmode=Opaque';
 
-			$atrStr = '';
-			foreach ($attributes as $attributeName => $attributeValue) {
-				$atrStr .= "$attributeName=\"$attributeValue\" ";
-			}
-			$atrStr = rtrim($atrStr);
+            $atrStr = '';
+            foreach ($attributes as $attributeName => $attributeValue) {
+                $atrStr .= "$attributeName=\"$attributeValue\" ";
+            }
+            $atrStr = rtrim($atrStr);
 
-			return "<iframe {$atrStr}></iframe>";
-		}
+            return "<iframe {$atrStr}></iframe>";
+        }
 
-		protected function _allowedDomains() {
-			if ($this->_allowedVideoDomains !== null) {
-				return $this->_allowedVideoDomains;
-			}
+        protected function _allowedDomains() {
+            if ($this->_allowedVideoDomains !== null) {
+                return $this->_allowedVideoDomains;
+            }
 
-			// @todo should be done in Setting model
-			$ad = explode('|', $this->_sOptions['video_domains_allowed']);
-			$trim = function ($v) {
-				return trim($v);
-			};
-			$this->_allowedVideoDomains = array_fill_keys(array_map($trim, $ad), 1);
+            // @todo should be done in Setting model
+            $ad = explode('|', $this->_sOptions['video_domains_allowed']);
+            $trim = function ($v) {
+                return trim($v);
+            };
+            $this->_allowedVideoDomains = array_fill_keys(array_map($trim, $ad), 1);
 
-			return $this->_allowedVideoDomains;
-		}
-
-		protected function _checkHostAllowed($url) {
-			$allowedDomains = $this->_allowedDomains();
-			if (empty($allowedDomains)) {
-				return false;
-			}
+            return $this->_allowedVideoDomains;
+        }
+
+        protected function _checkHostAllowed($url) {
+            $allowedDomains = $this->_allowedDomains();
+            if (empty($allowedDomains)) {
+                return false;
+            }
 
-			if ($allowedDomains === ['*' => 1]) {
-				return true;
-			}
+            if ($allowedDomains === ['*' => 1]) {
+                return true;
+            }
 
-			$host = DomainParser::domain($url);
-			if ($host && isset($allowedDomains[$host])) {
-				return true;
-			}
-
-			$message = sprintf(
-				__('Domain <strong>%s</strong> not allowed for embedding video.'),
-				$host
-			);
-			return Message::format($message);
-		}
-
-	}
-
-	class Flash extends Iframe {
-
-		protected $_sTagName = 'flash_video';
-
-		protected $_sParseContent = false;
-
-		protected $_sUseOptions = false;
-
-		protected static $_flashVideoDomainsWithHttps = [
-			'vimeo' => 1,
-			'youtube' => 1
-		];
-
-		protected function _parse($content, $attributes) {
-			$match = preg_match(
-				"#(?P<url>.+?)\|(?P<width>.+?)\|(?<height>\d+)#is",
-				$content,
-				$matches);
-			if (!$match) {
-				return Message::format(__('No Flash detected.'));
-			}
-
-			$height = $matches['height'];
-			$url = $matches['url'];
-			$width = $matches['width'];
-
-			$allowed = $this->_checkHostAllowed($url);
-			if ($allowed !== true) {
-				return $allowed;
-			}
-
-			if (env('HTTPS')) {
-				$host = DomainParser::domain($url);
-				if (isset(self::$_flashVideoDomainsWithHttps[$host])) {
-					$url = str_ireplace('http://', 'https://', $url);
-				}
-			}
-
-			$out = '<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="' . $width . '" height="' . $height . '">
+            $host = DomainParser::domain($url);
+            if ($host && isset($allowedDomains[$host])) {
+                return true;
+            }
+
+            $message = sprintf(
+                __('Domain <strong>%s</strong> not allowed for embedding video.'),
+                $host
+            );
+            return Message::format($message);
+        }
+
+    }
+
+    class Flash extends Iframe {
+
+        protected $_sTagName = 'flash_video';
+
+        protected $_sParseContent = false;
+
+        protected $_sUseOptions = false;
+
+        protected static $_flashVideoDomainsWithHttps = [
+            'vimeo' => 1,
+            'youtube' => 1
+        ];
+
+        protected function _parse($content, $attributes) {
+            $match = preg_match(
+                "#(?P<url>.+?)\|(?P<width>.+?)\|(?<height>\d+)#is",
+                $content,
+                $matches);
+            if (!$match) {
+                return Message::format(__('No Flash detected.'));
+            }
+
+            $height = $matches['height'];
+            $url = $matches['url'];
+            $width = $matches['width'];
+
+            $allowed = $this->_checkHostAllowed($url);
+            if ($allowed !== true) {
+                return $allowed;
+            }
+
+            if (env('HTTPS')) {
+                $host = DomainParser::domain($url);
+                if (isset(self::$_flashVideoDomainsWithHttps[$host])) {
+                    $url = str_ireplace('http://', 'https://', $url);
+                }
+            }
+
+            $out = '<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="' . $width . '" height="' . $height . '">
 									<param name="movie" value="' . $url . '"></param>
 									<embed src="' . $url . '" width="' . $width . '" height="' . $height . '" type="application/x-shockwave-flash" wmode="opaque" style="width:' . $width . 'px; height:' . $height . 'px;" id="VideoPlayback" flashvars=""> </embed> </object>';
-			return $out;
-		}
-
-	}
-
-	class Image extends CodeDefinition {
-
-		protected $_sTagName = 'img';
-
-		protected $_sParseContent = false;
-
-		protected function _parse($url, $attributes) {
-			// process [img=(parameters)]
-			$options = [];
-			if (!empty($attributes['img'])) {
-				$default = trim($attributes['img']);
-				switch ($default) {
-					case 'left':
-						$options['style'] = 'float: left;';
-						break;
-					case 'right':
-						$options['style'] = 'float: right;';
-						break;
-					default:
-						preg_match('/(\d{0,3})(?:x(\d{0,3}))?/i', $default, $dimension);
-						// $dimension for [img=50] or [img=50x100]
-						// [0] (50) or (50x100)
-						// [1] (50)
-						// [2] (100)
-						if (!empty($dimension[1])) {
-							$options['width'] = $dimension[1];
-							if (!empty($dimension[2])) {
-								$options['height'] = $dimension[2];
-							}
-						}
-				}
-			}
-
-			return $this->Html->image($url, $options);
-		}
-
-	}
-
-	class ImageWithAttributes extends Image {
-
-		protected $_sUseOptions = true;
-
-	}
-
-	/**
-	 * Class UlList handles [list][*]…[/list]
-	 *
-	 * @see https://gist.github.com/jbowens/5646994
-	 * @package Saito\Jbb\CodeDefinition
-	 */
-	class UlList extends CodeDefinition {
-
-		protected $_sTagName = 'list';
-
-		protected function _parse($content, $attributes) {
-			$listPieces = explode('[*]', $content);
-			unset($listPieces[0]);
-			$listPieceProcessor = function ($li) {
-				return '<li>' . $li . '</li>' . "\n";
-			};
-			$listPieces = array_map($listPieceProcessor, $listPieces);
-
-			return '<ul>' . implode('', $listPieces) . '</ul>';
-		}
-
-	}
-
-	class Spoiler extends CodeDefinition {
-
-		protected $_sTagName = 'spoiler';
-
-		protected function _parse($content, $attributes) {
-			$length = mb_strlen(strip_tags($content));
-			$minLenght = mb_strlen(__('Spoiler')) + 4;
-			if ($length < $minLenght) {
-				$length = $minLenght;
-			}
-
-			$title = $this->_mbStrpad(
-				' ' . __('Spoiler') . ' ',
-				$length,
-				'▇',
-				STR_PAD_BOTH
-			);
-
-			$json = json_encode(['string' => $content]);
-			$id = 'spoiler_' . rand(0, 9999999999999);
-
-			$out = <<<EOF
+            return $out;
+        }
+
+    }
+
+    class Image extends CodeDefinition {
+
+        protected $_sTagName = 'img';
+
+        protected $_sParseContent = false;
+
+        protected function _parse($url, $attributes) {
+            // process [img=(parameters)]
+            $options = [];
+            if (!empty($attributes['img'])) {
+                $default = trim($attributes['img']);
+                switch ($default) {
+                    case 'left':
+                        $options['style'] = 'float: left;';
+                        break;
+                    case 'right':
+                        $options['style'] = 'float: right;';
+                        break;
+                    default:
+                        preg_match('/(\d{0,3})(?:x(\d{0,3}))?/i', $default, $dimension);
+                        // $dimension for [img=50] or [img=50x100]
+                        // [0] (50) or (50x100)
+                        // [1] (50)
+                        // [2] (100)
+                        if (!empty($dimension[1])) {
+                            $options['width'] = $dimension[1];
+                            if (!empty($dimension[2])) {
+                                $options['height'] = $dimension[2];
+                            }
+                        }
+                }
+            }
+
+            return $this->Html->image($url, $options);
+        }
+
+    }
+
+    class ImageWithAttributes extends Image {
+
+        protected $_sUseOptions = true;
+
+    }
+
+    /**
+     * Class UlList handles [list][*]…[/list]
+     *
+     * @see https://gist.github.com/jbowens/5646994
+     * @package Saito\Jbb\CodeDefinition
+     */
+    class UlList extends CodeDefinition {
+
+        protected $_sTagName = 'list';
+
+        protected function _parse($content, $attributes) {
+            $listPieces = explode('[*]', $content);
+            unset($listPieces[0]);
+            $listPieceProcessor = function ($li) {
+                return '<li>' . $li . '</li>' . "\n";
+            };
+            $listPieces = array_map($listPieceProcessor, $listPieces);
+
+            return '<ul>' . implode('', $listPieces) . '</ul>';
+        }
+
+    }
+
+    class Spoiler extends CodeDefinition {
+
+        protected $_sTagName = 'spoiler';
+
+        protected function _parse($content, $attributes) {
+            $length = mb_strlen(strip_tags($content));
+            $minLenght = mb_strlen(__('Spoiler')) + 4;
+            if ($length < $minLenght) {
+                $length = $minLenght;
+            }
+
+            $title = $this->_mbStrpad(
+                ' ' . __('Spoiler') . ' ',
+                $length,
+                '▇',
+                STR_PAD_BOTH
+            );
+
+            $json = json_encode(['string' => $content]);
+            $id = 'spoiler_' . rand(0, 9999999999999);
+
+            $out = <<<EOF
 <div class="richtext-spoiler" style="display: inline;">
 	<script>
 		window.$id = $json;
@@ -301,153 +301,153 @@ 
 	</a>
 </div>
 EOF;
-			return $out;
-		}
-
-		/**
-		 * @see http://www.php.net/manual/en/function.str-pad.php#111147
-		 */
-		protected function _mbStrpad($str, $padLen, $padStr = ' ', $dir = STR_PAD_RIGHT) {
-			$strLen = mb_strlen($str);
-			$padStrLen = mb_strlen($padStr);
-			if (!$strLen && ($dir == STR_PAD_RIGHT || $dir == STR_PAD_LEFT)) {
-				$strLen = 1; // @debug
-			}
-			if (!$padLen || !$padStrLen || $padLen <= $strLen) {
-				return $str;
-			}
-
-			$result = null;
-			$repeat = ceil($strLen - $padStrLen + $padLen);
-			if ($dir == STR_PAD_RIGHT) {
-				$result = $str . str_repeat($padStr, $repeat);
-				$result = mb_substr($result, 0, $padLen);
-			} else {
-				if ($dir == STR_PAD_LEFT) {
-					$result = str_repeat($padStr, $repeat) . $str;
-					$result = mb_substr($result, -$padLen);
-				} else {
-					if ($dir == STR_PAD_BOTH) {
-						$length = ($padLen - $strLen) / 2;
-						$repeat = ceil($length / $padStrLen);
-						$result = mb_substr(str_repeat($padStr, $repeat), 0,
-								floor($length)) .
-							$str .
-							mb_substr(str_repeat($padStr, $repeat), 0, ceil($length));
-					}
-				}
-			}
-
-			return $result;
-		}
-
-	}
-
-	class Upload extends CodeDefinition {
-
-		protected $_sTagName = 'upload';
-
-		protected $_sParseContent = false;
-
-		protected function _parse($content, $attributes) {
-			$this->FileUpload->reset();
-			$params = $this->_getUploadParams($attributes);
-			return $this->FileUpload->image($content, $params);
-		}
-
-		protected function _getUploadParams($attributes) {
-			return [];
-		}
-
-	}
-
-	class UploadWithAttributes extends Upload {
-
-		protected $_sUseOptions = true;
-
-		protected function _getUploadParams($attributes) {
-			if (empty($attributes)) {
-				return [];
-			}
-
-			$_allowedKeys = array_fill_keys(['width', 'height'], false);
-			$_allowedAttributes = array_intersect_key($attributes, $_allowedKeys);
-			$params = [
-					'autoResize' => false,
-					'resizeThumbOnly' => false,
-				] + $_allowedAttributes;
-			return $params;
-		}
-
-	}
-
-	/**
-	 * Class Url handles [url]http://example.com[/url]
-	 *
-	 * @package Saito\Jbb\CodeDefinition
-	 */
-	class Url extends CodeDefinition {
-
-		use UrlParserTrait;
-
-		protected $_sParseContent = false;
-
-		protected $_sTagName = 'url';
-
-		protected function _parse($url, $attributes) {
-			$defaults = ['label' => true];
-			// parser may return $attributes = null
-			if (empty($attributes)) {
-				$attributes = [];
-			}
-			$attributes = $attributes + $defaults;
-			return $this->_getUrl($url, $attributes);
-		}
-
-		protected function _getUrl($content, $attributes) {
-			$shortTag = true;
-			return $this->_url($content, $content, $attributes['label'], $shortTag);
-		}
-
-	}
-
-	/**
-	 * Class Link handles [link]http://example.com[/link]
-	 *
-	 * @package Saito\Jbb\CodeDefinition
-	 */
-	class Link extends Url {
-
-		protected $_sTagName = 'link';
-
-	}
-
-	/**
-	 * Class UrlWithAttributes handles [url=http://example.com]foo[/url]
-	 *
-	 * @package Saito\Jbb\CodeDefinition
-	 */
-	class UrlWithAttributes extends Url {
+            return $out;
+        }
+
+        /**
+         * @see http://www.php.net/manual/en/function.str-pad.php#111147
+         */
+        protected function _mbStrpad($str, $padLen, $padStr = ' ', $dir = STR_PAD_RIGHT) {
+            $strLen = mb_strlen($str);
+            $padStrLen = mb_strlen($padStr);
+            if (!$strLen && ($dir == STR_PAD_RIGHT || $dir == STR_PAD_LEFT)) {
+                $strLen = 1; // @debug
+            }
+            if (!$padLen || !$padStrLen || $padLen <= $strLen) {
+                return $str;
+            }
+
+            $result = null;
+            $repeat = ceil($strLen - $padStrLen + $padLen);
+            if ($dir == STR_PAD_RIGHT) {
+                $result = $str . str_repeat($padStr, $repeat);
+                $result = mb_substr($result, 0, $padLen);
+            } else {
+                if ($dir == STR_PAD_LEFT) {
+                    $result = str_repeat($padStr, $repeat) . $str;
+                    $result = mb_substr($result, -$padLen);
+                } else {
+                    if ($dir == STR_PAD_BOTH) {
+                        $length = ($padLen - $strLen) / 2;
+                        $repeat = ceil($length / $padStrLen);
+                        $result = mb_substr(str_repeat($padStr, $repeat), 0,
+                                floor($length)) .
+                            $str .
+                            mb_substr(str_repeat($padStr, $repeat), 0, ceil($length));
+                    }
+                }
+            }
+
+            return $result;
+        }
+
+    }
+
+    class Upload extends CodeDefinition {
+
+        protected $_sTagName = 'upload';
+
+        protected $_sParseContent = false;
+
+        protected function _parse($content, $attributes) {
+            $this->FileUpload->reset();
+            $params = $this->_getUploadParams($attributes);
+            return $this->FileUpload->image($content, $params);
+        }
+
+        protected function _getUploadParams($attributes) {
+            return [];
+        }
+
+    }
+
+    class UploadWithAttributes extends Upload {
+
+        protected $_sUseOptions = true;
+
+        protected function _getUploadParams($attributes) {
+            if (empty($attributes)) {
+                return [];
+            }
+
+            $_allowedKeys = array_fill_keys(['width', 'height'], false);
+            $_allowedAttributes = array_intersect_key($attributes, $_allowedKeys);
+            $params = [
+                    'autoResize' => false,
+                    'resizeThumbOnly' => false,
+                ] + $_allowedAttributes;
+            return $params;
+        }
+
+    }
+
+    /**
+     * Class Url handles [url]http://example.com[/url]
+     *
+     * @package Saito\Jbb\CodeDefinition
+     */
+    class Url extends CodeDefinition {
+
+        use UrlParserTrait;
+
+        protected $_sParseContent = false;
+
+        protected $_sTagName = 'url';
+
+        protected function _parse($url, $attributes) {
+            $defaults = ['label' => true];
+            // parser may return $attributes = null
+            if (empty($attributes)) {
+                $attributes = [];
+            }
+            $attributes = $attributes + $defaults;
+            return $this->_getUrl($url, $attributes);
+        }
+
+        protected function _getUrl($content, $attributes) {
+            $shortTag = true;
+            return $this->_url($content, $content, $attributes['label'], $shortTag);
+        }
+
+    }
+
+    /**
+     * Class Link handles [link]http://example.com[/link]
+     *
+     * @package Saito\Jbb\CodeDefinition
+     */
+    class Link extends Url {
+
+        protected $_sTagName = 'link';
+
+    }
+
+    /**
+     * Class UrlWithAttributes handles [url=http://example.com]foo[/url]
+     *
+     * @package Saito\Jbb\CodeDefinition
+     */
+    class UrlWithAttributes extends Url {
 
-		protected $_sParseContent = true;
+        protected $_sParseContent = true;
 
-		protected $_sUseOptions = true;
+        protected $_sUseOptions = true;
 
-		protected function _getUrl($content, $attributes) {
-			$shortTag = false;
-			$url = $attributes[$this->_sTagName];
-			return $this->_url($url, $content, $attributes['label'], $shortTag);
-		}
+        protected function _getUrl($content, $attributes) {
+            $shortTag = false;
+            $url = $attributes[$this->_sTagName];
+            return $this->_url($url, $content, $attributes['label'], $shortTag);
+        }
 
-	}
+    }
 
-	/**
-	 * Class LinkWithAttributes handles [link=http://example.com]foo[/link]
-	 *
-	 * @package Saito\Jbb\CodeDefinition
-	 */
-	class LinkWithAttributes extends UrlWithAttributes {
+    /**
+     * Class LinkWithAttributes handles [link=http://example.com]foo[/link]
+     *
+     * @package Saito\Jbb\CodeDefinition
+     */
+    class LinkWithAttributes extends UrlWithAttributes {
 
-		protected $_sTagName = 'link';
+        protected $_sTagName = 'link';
 
-	}
+    }

app/Plugin/Cron/Lib/Cron.php

Doc Comments +3 added lines

@@ -102,6 +102,9 @@
 			return $this->_lastRuns;
 		}
 
+		/**
+		 * @param string $msg
+		 */
 		protected function _log($msg) {
 			if (Configure::read('Saito.Globals.logInfo')) {
 				return CakeLog::write('saito.info', $msg);

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 				}
 				$jobsExecuted++;
 				$job->execute();
-				$this->_log('Run cron-job ' . $job->uid);
+				$this->_log('Run cron-job '.$job->uid);
 				$this->_lastRuns[$job->due][$job->uid] = $this->_now;
 			}
 			if ($jobsExecuted === 0) {

Indentation +109 added lines, -109 removed lines

@@ -1,111 +1,111 @@
 <?php
 
-	App::uses('CronJob', 'Cron.Lib');
-	App::uses('CakeLog', 'Log');
-
-	class Cron {
-
-		private static $__instance = null;
-
-		protected $_jobs = [];
-
-		protected $_lastRuns = null;
-
-		protected $_now;
-
-		/**
-		 * defines time intervals in seconds
-		 *
-		 * @var array
-		 */
-		protected $_dues = [
-			// a little shorter than a Cake's default cache-config invalidation hour
-			'hourly' => 3300,
-			// if no cron job was triggered in one hour then Cake's default cache file is
-			// invalidated and hourly is also triggered
-			'daily' => 86400
-		];
-
-		protected function __construct() {
-			$this->_now = time();
-		}
-
-		protected function __clone() {
-		}
-
-		public static function getInstance() {
-			if (self::$__instance === null) {
-				$name = get_called_class();
-				self::$__instance = new $name;
-			}
-			return self::$__instance;
-		}
-
-		public function addCronJob($id, $due, callable $func) {
-			$this->_jobs[$id] = new CronJob($id, $due, $func);
-		}
-
-		public function execute() {
-			$lastRuns = $this->_getLastRuns();
-			$jobsExecuted = 0;
-			foreach ($this->_jobs as $job) {
-				if (!empty($lastRuns[$job->due][$job->uid])) {
-					if (isset($this->_dues[$job->due])) {
-						$due = $lastRuns[$job->due][$job->uid] + $this->_dues[$job->due];
-					} else {
-						$due = strtotime($job->due, $lastRuns[$job->due][$job->uid]);
-					}
-					if ($this->_now < $due) {
-						continue;
-					}
-				}
-				$jobsExecuted++;
-				$job->execute();
-				$this->_log('Run cron-job ' . $job->uid);
-				$this->_lastRuns[$job->due][$job->uid] = $this->_now;
-			}
-			if ($jobsExecuted === 0) {
-				return;
-			}
-			Cache::write('Plugin.Cron.lastRuns', $this->_lastRuns);
-		}
-
-		public function clearHistory() {
-			$this->_lastRuns = [];
-			$this->_now = time();
-			Cache::write('Plugin.Cron.lastRuns', $this->_getNewCacheData());
-		}
-
-		protected function _getNewCacheData() {
-			return ['meta' => ['lastDailyReset' => $this->_now]];
-		}
-
-		protected function _getLastRuns() {
-			if ($this->_lastRuns) {
-				return $this->_lastRuns;
-			}
-			$cache = Cache::read('Plugin.Cron.lastRuns');
-
-			if (// cache file is not created yet
-					!isset($cache['meta']['lastDailyReset']) ||
-					// cache is outdated
-					$cache['meta']['lastDailyReset'] + $this->_dues['daily'] < $this->_now
-			) {
-				$cache = $this->_getNewCacheData();
-				// This request may trigger many jobs and take some time.
-				// Update cache immediately and not after all jobs are done (at the
-				// end of this request), so that following requests arriving in that
-				// time-frame don't assume they have to run the same jobs too.
-				Cache::write('Plugin.Cron.lastRuns', $cache);
-			}
-			$this->_lastRuns = $cache;
-			return $this->_lastRuns;
-		}
-
-		protected function _log($msg) {
-			if (Configure::read('Saito.Globals.logInfo')) {
-				return CakeLog::write('saito.info', $msg);
-			}
-		}
-
-	}
+    App::uses('CronJob', 'Cron.Lib');
+    App::uses('CakeLog', 'Log');
+
+    class Cron {
+
+        private static $__instance = null;
+
+        protected $_jobs = [];
+
+        protected $_lastRuns = null;
+
+        protected $_now;
+
+        /**
+         * defines time intervals in seconds
+         *
+         * @var array
+         */
+        protected $_dues = [
+            // a little shorter than a Cake's default cache-config invalidation hour
+            'hourly' => 3300,
+            // if no cron job was triggered in one hour then Cake's default cache file is
+            // invalidated and hourly is also triggered
+            'daily' => 86400
+        ];
+
+        protected function __construct() {
+            $this->_now = time();
+        }
+
+        protected function __clone() {
+        }
+
+        public static function getInstance() {
+            if (self::$__instance === null) {
+                $name = get_called_class();
+                self::$__instance = new $name;
+            }
+            return self::$__instance;
+        }
+
+        public function addCronJob($id, $due, callable $func) {
+            $this->_jobs[$id] = new CronJob($id, $due, $func);
+        }
+
+        public function execute() {
+            $lastRuns = $this->_getLastRuns();
+            $jobsExecuted = 0;
+            foreach ($this->_jobs as $job) {
+                if (!empty($lastRuns[$job->due][$job->uid])) {
+                    if (isset($this->_dues[$job->due])) {
+                        $due = $lastRuns[$job->due][$job->uid] + $this->_dues[$job->due];
+                    } else {
+                        $due = strtotime($job->due, $lastRuns[$job->due][$job->uid]);
+                    }
+                    if ($this->_now < $due) {
+                        continue;
+                    }
+                }
+                $jobsExecuted++;
+                $job->execute();
+                $this->_log('Run cron-job ' . $job->uid);
+                $this->_lastRuns[$job->due][$job->uid] = $this->_now;
+            }
+            if ($jobsExecuted === 0) {
+                return;
+            }
+            Cache::write('Plugin.Cron.lastRuns', $this->_lastRuns);
+        }
+
+        public function clearHistory() {
+            $this->_lastRuns = [];
+            $this->_now = time();
+            Cache::write('Plugin.Cron.lastRuns', $this->_getNewCacheData());
+        }
+
+        protected function _getNewCacheData() {
+            return ['meta' => ['lastDailyReset' => $this->_now]];
+        }
+
+        protected function _getLastRuns() {
+            if ($this->_lastRuns) {
+                return $this->_lastRuns;
+            }
+            $cache = Cache::read('Plugin.Cron.lastRuns');
+
+            if (// cache file is not created yet
+                    !isset($cache['meta']['lastDailyReset']) ||
+                    // cache is outdated
+                    $cache['meta']['lastDailyReset'] + $this->_dues['daily'] < $this->_now
+            ) {
+                $cache = $this->_getNewCacheData();
+                // This request may trigger many jobs and take some time.
+                // Update cache immediately and not after all jobs are done (at the
+                // end of this request), so that following requests arriving in that
+                // time-frame don't assume they have to run the same jobs too.
+                Cache::write('Plugin.Cron.lastRuns', $cache);
+            }
+            $this->_lastRuns = $cache;
+            return $this->_lastRuns;
+        }
+
+        protected function _log($msg) {
+            if (Configure::read('Saito.Globals.logInfo')) {
+                return CakeLog::write('saito.info', $msg);
+            }
+        }
+
+    }

app/Plugin/SaitoHelp/Model/Datasource/SaitoHelpSource.php

Doc Comments +3 added lines

@@ -30,6 +30,9 @@
 			return $this->_schema;
 		}
 
+		/**
+		 * @param string $key
+		 */
 		public function resolveKey(Model $model, $key) {
 			if (strpos('.', $key) === false) {
 				return $model->alias . '.' . $key;

Spacing +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
 
 		public function resolveKey(Model $model, $key) {
 			if (strpos('.', $key) === false) {
-				return $model->alias . '.' . $key;
+				return $model->alias.'.'.$key;
 			}
 			return $key;
 		}
@@ -60,9 +60,9 @@ 
 			if ($plugin) {
 				$folderPath = CakePlugin::path($plugin);
 			} else {
-				$folderPath = ROOT . DS;
+				$folderPath = ROOT.DS;
 			}
-			$folderPath .= 'docs' . DS . 'help' . DS . $lang;
+			$folderPath .= 'docs'.DS.'help'.DS.$lang;
 
 			$folder = new Folder($folderPath);
 			$files = $folder->find("$id(-.*?)?\.md");
@@ -70,7 +70,7 @@ 
 				return false;
 			}
 			$name = $files[0];
-			$file = new File($folderPath . DS . $name, false, 0444);
+			$file = new File($folderPath.DS.$name, false, 0444);
 			$text = $file->read();
 			$file->close();
 			$result = [

Indentation +75 added lines, -75 removed lines

@@ -1,90 +1,90 @@
 <?php
 
-	App::uses('DataSource', 'Model/Datasource');
-	App::uses('File', 'Utility');
-	App::uses('Folder', 'Utility');
+    App::uses('DataSource', 'Model/Datasource');
+    App::uses('File', 'Utility');
+    App::uses('Folder', 'Utility');
 
-	class SaitoHelpSource extends DataSource {
+    class SaitoHelpSource extends DataSource {
 
-		protected $_schema = [
-				'id' => [
-						'type' => 'string',
-						'null' => false,
-						'key' => 'primary',
-						'length' => 255
-				],
-				'text' => [
-						'type' => 'text',
-				]
-		];
+        protected $_schema = [
+                'id' => [
+                        'type' => 'string',
+                        'null' => false,
+                        'key' => 'primary',
+                        'length' => 255
+                ],
+                'text' => [
+                        'type' => 'text',
+                ]
+        ];
 
-		public function calculate($model, $func, $params) {
-			return 'COUNT';
-		}
+        public function calculate($model, $func, $params) {
+            return 'COUNT';
+        }
 
-		public function listSources($data = null) {
-			return null;
-		}
+        public function listSources($data = null) {
+            return null;
+        }
 
-		public function describe($model) {
-			return $this->_schema;
-		}
+        public function describe($model) {
+            return $this->_schema;
+        }
 
-		public function resolveKey(Model $model, $key) {
-			if (strpos('.', $key) === false) {
-				return $model->alias . '.' . $key;
-			}
-			return $key;
-		}
+        public function resolveKey(Model $model, $key) {
+            if (strpos('.', $key) === false) {
+                return $model->alias . '.' . $key;
+            }
+            return $key;
+        }
 
-		public function read(Model $model, $queryData = [], $recursive = null) {
-			// normalize conditions to `Model.field`
-			if ($queryData['conditions']) {
-				foreach ($queryData['conditions'] as $key => $value) {
-					if (is_string($key)) {
-						$queryData['conditions'][$this->resolveKey($model, $key)] = $value;
-						unset($queryData['conditions'][$key]);
-					}
-				}
-			}
+        public function read(Model $model, $queryData = [], $recursive = null) {
+            // normalize conditions to `Model.field`
+            if ($queryData['conditions']) {
+                foreach ($queryData['conditions'] as $key => $value) {
+                    if (is_string($key)) {
+                        $queryData['conditions'][$this->resolveKey($model, $key)] = $value;
+                        unset($queryData['conditions'][$key]);
+                    }
+                }
+            }
 
-			$queryData['conditions'] += [
-					$this->resolveKey($model, 'language') => 'eng'
-			];
+            $queryData['conditions'] += [
+                    $this->resolveKey($model, 'language') => 'eng'
+            ];
 
-			$id = $queryData['conditions'][$this->resolveKey($model, 'id')];
-			list($plugin, $id) = pluginSplit($id);
+            $id = $queryData['conditions'][$this->resolveKey($model, 'id')];
+            list($plugin, $id) = pluginSplit($id);
 
-			$lang = $queryData['conditions'][$this->resolveKey($model, 'language')];
+            $lang = $queryData['conditions'][$this->resolveKey($model, 'language')];
 
-			if ($plugin) {
-				$folderPath = CakePlugin::path($plugin);
-			} else {
-				$folderPath = ROOT . DS;
-			}
-			$folderPath .= 'docs' . DS . 'help' . DS . $lang;
+            if ($plugin) {
+                $folderPath = CakePlugin::path($plugin);
+            } else {
+                $folderPath = ROOT . DS;
+            }
+            $folderPath .= 'docs' . DS . 'help' . DS . $lang;
 
-			$folder = new Folder($folderPath);
-			$files = $folder->find("$id(-.*?)?\.md");
-			if (!$files) {
-				return false;
-			}
-			$name = $files[0];
-			$file = new File($folderPath . DS . $name, false, 0444);
-			$text = $file->read();
-			$file->close();
-			$result = [
-				$model->alias => [
-					'file' => $name,
-					'id' => $id,
-					'lang' => $lang,
-					'text' => $text
-				]
-			];
-			if (!empty($queryData['limit'])) {
-				$result = [0 => $result];
-			}
-			return $result;
-		}
+            $folder = new Folder($folderPath);
+            $files = $folder->find("$id(-.*?)?\.md");
+            if (!$files) {
+                return false;
+            }
+            $name = $files[0];
+            $file = new File($folderPath . DS . $name, false, 0444);
+            $text = $file->read();
+            $file->close();
+            $result = [
+                $model->alias => [
+                    'file' => $name,
+                    'id' => $id,
+                    'lang' => $lang,
+                    'text' => $text
+                ]
+            ];
+            if (!empty($queryData['limit'])) {
+                $result = [0 => $result];
+            }
+            return $result;
+        }
 
-	}
\ No newline at end of file
+    }
\ No newline at end of file

app/Plugin/SimpleCaptcha/Model/Behavior/SimpleCaptchaBehavior.php

Doc Comments +3 added lines, -1 removed lines

@@ -37,7 +37,7 @@ 
 	/**
 	 * Setup instance
 	 *
-	 * @param type $Model
+	 * @param Model $Model
 	 * @param type $settings
 	 */
 	public function setup(Model $Model, $settings = array()) {
@@ -183,6 +183,8 @@ 
 	/**
 	 * build and log error message
 	 * 2009-12-18 ms
+	 * @param string $msg
+	 * @param string $internalMsg
 	 */
 	private function error($msg = null, $internalMsg = null) {
 		if (!empty($msg)) {

Spacing +7 added lines, -7 removed lines

@@ -91,7 +91,7 @@ 
 		$dummyField = $this->settings[$this->Model->alias]['dummyField'];
 		if (!empty($data[$dummyField])) {
 			# dummy field not empty - SPAM!
-			return $this->error('Illegal content', 'DummyField = \'' . $data[$dummyField] . '\'');
+			return $this->error('Illegal content', 'DummyField = \''.$data[$dummyField].'\'');
 		}
 		return true;
 	}
@@ -108,7 +108,7 @@ 
 		}
 
 		if (isSet($data['captcha_hash']) && isSet($data['captcha_time'])
-				&& ( $data['captcha_time'] < time() - $this->settings[$this->Model->alias]['minTime'] )
+				&& ($data['captcha_time'] < time() - $this->settings[$this->Model->alias]['minTime'])
 		) {
 			return true;
 		}
@@ -127,7 +127,7 @@ 
 			return true;
 		}
 		if (isSet($data['captcha_hash']) && isSet($data['captcha_time'])
-				&& ( $data['captcha_time'] + $this->settings[$this->Model->alias]['maxTime'] > time() )
+				&& ($data['captcha_time'] + $this->settings[$this->Model->alias]['maxTime'] > time())
 		) {
 			return true;
 		}
@@ -161,7 +161,7 @@ 
 			return true;
 		}
 		# wrong captcha content or session expired
-		return $this->error('Captcha incorrect', 'SubmittedResult = \'' . $data['captcha'] . '\'');
+		return $this->error('Captcha incorrect', 'SubmittedResult = \''.$data['captcha'].'\'');
 	}
 
 	/**
@@ -210,12 +210,12 @@ 
 		}
 
 		App::import('Component', 'RequestHandler');
-		$msg = 'Ip \'' . RequestHandlerComponent::getClientIP() . '\', Agent \'' . env('HTTP_USER_AGENT') . '\', Referer \'' . env('HTTP_REFERER') . '\', Host-Referer \'' . RequestHandlerComponent::getReferer() . '\'';
+		$msg = 'Ip \''.RequestHandlerComponent::getClientIP().'\', Agent \''.env('HTTP_USER_AGENT').'\', Referer \''.env('HTTP_REFERER').'\', Host-Referer \''.RequestHandlerComponent::getReferer().'\'';
 		if (!empty($this->error)) {
-			$msg .= ', ' . $this->error;
+			$msg .= ', '.$this->error;
 		}
 		if (!empty($this->internalError)) {
-			$msg .= ' (' . $this->internalError . ')';
+			$msg .= ' ('.$this->internalError.')';
 		}
 		$this->log($msg, 'captcha');
 		return true;

Indentation +211 added lines, -211 removed lines

@@ -9,217 +9,217 @@
  */
 class SimpleCaptchaBehavior extends ModelBehavior {
 
-	private $defaults = array(
-			/**
-			 * Minimum time in seconds which is considered necessary for a human to fill the form
-			 *
-			 * We assume that only a bot is able to fill and answer the form faster.
-			 */
-			'minTime' => 6,
-			/**
-			 * Maximum time in seconds the form is valid.
-			 *
-			 * Prevents harvesting hashs for later use.
-			 */
-			'maxTime' => 1200,
-			'log' => false,
-	);
-
-	private $methods = array('hash', 'db', 'session');
-	private $method = 'hash';
-	private $log = false;
-	private $error = '';
-	private $internalError = '';
-
-	//private $types = array('passive','active','both');
-	//private $useSession = false;
-
-	/**
-	 * Setup instance
-	 *
-	 * @param type $Model
-	 * @param type $settings
-	 */
-	public function setup(Model $Model, $settings = array()) {
-		$this->defaults = array_merge(SimpleCaptcha::$defaults, $this->defaults);
-
-		# bootstrap configs
-		$configs = (array) Configure::read('Captcha');
-		if (!empty($configs)) {
-			$this->settings = array_merge($this->settings, $configs);
-		}
-
-		if (!isset($this->settings[$Model->alias])) {
-			$this->settings[$Model->alias] = $this->defaults;
-		}
-		$this->settings[$Model->alias] = array_merge($this->settings[$Model->alias], (array) $settings);
-	}
-
-	/**
-	 * Callback which initializes all the captcha related checking
-	 *
-	 * @param Model $Model
-	 * @return bool
-	 */
-	public function beforeValidate(Model $Model, $options = array()) {
-		$this->Model = &$Model;
-
-		if (!$this->_validateCaptchaMinTime($this->Model->data[$this->Model->name])) {
-			$this->Model->invalidate('captcha', 'captchaResultTooFast', true);
-		} elseif (!$this->_validateCaptchaMaxTime($this->Model->data[$this->Model->name])) {
-			$this->Model->invalidate('captcha', 'captchaResultTooLate', true);
-		} elseif (!$this->_validateDummyField($this->Model->data[$this->Model->name])) {
-			$this->Model->invalidate('captcha', 'captchaIllegalContent', true);
-		} elseif ($this->settings[$this->Model->alias]['type'] == 'active' && !$this->_validateCaptcha($this->Model->data[$this->Model->name])) {
-			$this->Model->invalidate('captcha', 'captchaResultIncorrect', true);
-		}
-
-		unset($this->Model->data[$this->Model->name]['captcha']);
-		unset($this->Model->data[$this->Model->name]['captcha_hash']);
-		unset($this->Model->data[$this->Model->name]['captcha_time']);
-
-		return true;
-	}
-
-	/**
-	 * Validates the dummy field
-	 *
-	 * @param array $data
-	 * @return bool
-	 */
-	protected function _validateDummyField($data) {
-		$dummyField = $this->settings[$this->Model->alias]['dummyField'];
-		if (!empty($data[$dummyField])) {
-			# dummy field not empty - SPAM!
-			return $this->error('Illegal content', 'DummyField = \'' . $data[$dummyField] . '\'');
-		}
-		return true;
-	}
-
-	/**
-	 * Validates the minimum time
-	 *
-	 * @param array $data
-	 * @return bool
-	 */
-	protected function _validateCaptchaMinTime($data) {
-		if ($this->settings[$this->Model->alias]['minTime'] <= 0) {
-			return true;
-		}
-
-		if (isSet($data['captcha_hash']) && isSet($data['captcha_time'])
-				&& ( $data['captcha_time'] < time() - $this->settings[$this->Model->alias]['minTime'] )
-		) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * validates maximum time
-	 *
-	 * @param array $data
-	 * @return bool
-	 */
-	protected function _validateCaptchaMaxTime($data) {
-		if ($this->settings[$this->Model->alias]['maxTime'] <= 0) {
-			return true;
-		}
-		if (isSet($data['captcha_hash']) && isSet($data['captcha_time'])
-				&& ( $data['captcha_time'] + $this->settings[$this->Model->alias]['maxTime'] > time() )
-		) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Validates captcha calculation
-	 *
-	 * flood protection by false fields and math code
-	 * TODO: build in floodProtection (max Trials etc)
-	 * TODO: SESSION based one as alternative
-	 *
-	 * @param array $data
-	 * @return bool
-	 */
-	protected function _validateCaptcha($data) {
-		if (!isset($data['captcha'])) {
-			# form inputs missing? SPAM!
-			return $this->error('Captcha content missing');
-		}
-
-		$captcha_params = array(
-				'timestamp' => $data['captcha_time'],
-				'result' => $data['captcha'],
-		);
-		$hash = SimpleCaptcha::buildHash($captcha_params, $this->settings[$this->Model->alias]);
-
-		if ($data['captcha_hash'] == $hash) {
-			return true;
-		}
-		# wrong captcha content or session expired
-		return $this->error('Captcha incorrect', 'SubmittedResult = \'' . $data['captcha'] . '\'');
-	}
-
-	/**
-	 * return error message (or empty string if none)
-	 * @return string
-	 */
-	public function errors() {
-		return $this->error;
-	}
-
-	/**
-	 * only neccessary if there is more than one request per model
-	 * 2009-12-18 ms
-	 */
-	public function reset() {
-		$this->error = '';
-	}
-
-	/**
-	 * build and log error message
-	 * 2009-12-18 ms
-	 */
-	private function error($msg = null, $internalMsg = null) {
-		if (!empty($msg)) {
-			$this->error = $msg;
-		}
-		if (!empty($internalMsg)) {
-			$this->internalError = $internalMsg;
-		}
-
-		if ($this->log) {
-			$this->logAttempt();
-		}
-		return false;
-	}
-
-	/**
-	 * logs attempts
-	 * @param bool errorsOnly (only if error occured, otherwise always)
-	 * @returns null if not logged, true otherwise
-	 * 2009-12-18 ms
-	 */
-	private function logAttempt($errorsOnly = true) {
-		if ($errorsOnly === true && empty($this->error) && empty($this->internalError)) {
-			return null;
-		}
-
-		App::import('Component', 'RequestHandler');
-		$msg = 'Ip \'' . RequestHandlerComponent::getClientIP() . '\', Agent \'' . env('HTTP_USER_AGENT') . '\', Referer \'' . env('HTTP_REFERER') . '\', Host-Referer \'' . RequestHandlerComponent::getReferer() . '\'';
-		if (!empty($this->error)) {
-			$msg .= ', ' . $this->error;
-		}
-		if (!empty($this->internalError)) {
-			$msg .= ' (' . $this->internalError . ')';
-		}
-		$this->log($msg, 'captcha');
-		return true;
-	}
+    private $defaults = array(
+            /**
+             * Minimum time in seconds which is considered necessary for a human to fill the form
+             *
+             * We assume that only a bot is able to fill and answer the form faster.
+             */
+            'minTime' => 6,
+            /**
+             * Maximum time in seconds the form is valid.
+             *
+             * Prevents harvesting hashs for later use.
+             */
+            'maxTime' => 1200,
+            'log' => false,
+    );
+
+    private $methods = array('hash', 'db', 'session');
+    private $method = 'hash';
+    private $log = false;
+    private $error = '';
+    private $internalError = '';
+
+    //private $types = array('passive','active','both');
+    //private $useSession = false;
+
+    /**
+     * Setup instance
+     *
+     * @param type $Model
+     * @param type $settings
+     */
+    public function setup(Model $Model, $settings = array()) {
+        $this->defaults = array_merge(SimpleCaptcha::$defaults, $this->defaults);
+
+        # bootstrap configs
+        $configs = (array) Configure::read('Captcha');
+        if (!empty($configs)) {
+            $this->settings = array_merge($this->settings, $configs);
+        }
+
+        if (!isset($this->settings[$Model->alias])) {
+            $this->settings[$Model->alias] = $this->defaults;
+        }
+        $this->settings[$Model->alias] = array_merge($this->settings[$Model->alias], (array) $settings);
+    }
+
+    /**
+     * Callback which initializes all the captcha related checking
+     *
+     * @param Model $Model
+     * @return bool
+     */
+    public function beforeValidate(Model $Model, $options = array()) {
+        $this->Model = &$Model;
+
+        if (!$this->_validateCaptchaMinTime($this->Model->data[$this->Model->name])) {
+            $this->Model->invalidate('captcha', 'captchaResultTooFast', true);
+        } elseif (!$this->_validateCaptchaMaxTime($this->Model->data[$this->Model->name])) {
+            $this->Model->invalidate('captcha', 'captchaResultTooLate', true);
+        } elseif (!$this->_validateDummyField($this->Model->data[$this->Model->name])) {
+            $this->Model->invalidate('captcha', 'captchaIllegalContent', true);
+        } elseif ($this->settings[$this->Model->alias]['type'] == 'active' && !$this->_validateCaptcha($this->Model->data[$this->Model->name])) {
+            $this->Model->invalidate('captcha', 'captchaResultIncorrect', true);
+        }
+
+        unset($this->Model->data[$this->Model->name]['captcha']);
+        unset($this->Model->data[$this->Model->name]['captcha_hash']);
+        unset($this->Model->data[$this->Model->name]['captcha_time']);
+
+        return true;
+    }
+
+    /**
+     * Validates the dummy field
+     *
+     * @param array $data
+     * @return bool
+     */
+    protected function _validateDummyField($data) {
+        $dummyField = $this->settings[$this->Model->alias]['dummyField'];
+        if (!empty($data[$dummyField])) {
+            # dummy field not empty - SPAM!
+            return $this->error('Illegal content', 'DummyField = \'' . $data[$dummyField] . '\'');
+        }
+        return true;
+    }
+
+    /**
+     * Validates the minimum time
+     *
+     * @param array $data
+     * @return bool
+     */
+    protected function _validateCaptchaMinTime($data) {
+        if ($this->settings[$this->Model->alias]['minTime'] <= 0) {
+            return true;
+        }
+
+        if (isSet($data['captcha_hash']) && isSet($data['captcha_time'])
+                && ( $data['captcha_time'] < time() - $this->settings[$this->Model->alias]['minTime'] )
+        ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * validates maximum time
+     *
+     * @param array $data
+     * @return bool
+     */
+    protected function _validateCaptchaMaxTime($data) {
+        if ($this->settings[$this->Model->alias]['maxTime'] <= 0) {
+            return true;
+        }
+        if (isSet($data['captcha_hash']) && isSet($data['captcha_time'])
+                && ( $data['captcha_time'] + $this->settings[$this->Model->alias]['maxTime'] > time() )
+        ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Validates captcha calculation
+     *
+     * flood protection by false fields and math code
+     * TODO: build in floodProtection (max Trials etc)
+     * TODO: SESSION based one as alternative
+     *
+     * @param array $data
+     * @return bool
+     */
+    protected function _validateCaptcha($data) {
+        if (!isset($data['captcha'])) {
+            # form inputs missing? SPAM!
+            return $this->error('Captcha content missing');
+        }
+
+        $captcha_params = array(
+                'timestamp' => $data['captcha_time'],
+                'result' => $data['captcha'],
+        );
+        $hash = SimpleCaptcha::buildHash($captcha_params, $this->settings[$this->Model->alias]);
+
+        if ($data['captcha_hash'] == $hash) {
+            return true;
+        }
+        # wrong captcha content or session expired
+        return $this->error('Captcha incorrect', 'SubmittedResult = \'' . $data['captcha'] . '\'');
+    }
+
+    /**
+     * return error message (or empty string if none)
+     * @return string
+     */
+    public function errors() {
+        return $this->error;
+    }
+
+    /**
+     * only neccessary if there is more than one request per model
+     * 2009-12-18 ms
+     */
+    public function reset() {
+        $this->error = '';
+    }
+
+    /**
+     * build and log error message
+     * 2009-12-18 ms
+     */
+    private function error($msg = null, $internalMsg = null) {
+        if (!empty($msg)) {
+            $this->error = $msg;
+        }
+        if (!empty($internalMsg)) {
+            $this->internalError = $internalMsg;
+        }
+
+        if ($this->log) {
+            $this->logAttempt();
+        }
+        return false;
+    }
+
+    /**
+     * logs attempts
+     * @param bool errorsOnly (only if error occured, otherwise always)
+     * @returns null if not logged, true otherwise
+     * 2009-12-18 ms
+     */
+    private function logAttempt($errorsOnly = true) {
+        if ($errorsOnly === true && empty($this->error) && empty($this->internalError)) {
+            return null;
+        }
+
+        App::import('Component', 'RequestHandler');
+        $msg = 'Ip \'' . RequestHandlerComponent::getClientIP() . '\', Agent \'' . env('HTTP_USER_AGENT') . '\', Referer \'' . env('HTTP_REFERER') . '\', Host-Referer \'' . RequestHandlerComponent::getReferer() . '\'';
+        if (!empty($this->error)) {
+            $msg .= ', ' . $this->error;
+        }
+        if (!empty($this->internalError)) {
+            $msg .= ' (' . $this->internalError . ')';
+        }
+        $this->log($msg, 'captcha');
+        return true;
+    }
 
 }
 ?>
\ No newline at end of file

app/Plugin/Stopwatch/Lib/Stopwatch.php

Doc Comments +4 added lines, -1 removed lines

@@ -54,6 +54,9 @@ 
 		self::$_stopwatchCalls = 0;
 	}
 
+	/**
+	 * @param string $event
+	 */
 	static protected function _addEvent($x, $event = null) {
 		if (self::$_enableTimer === false) {
 			return;
@@ -264,7 +267,7 @@ 
 /**
  * Alias for self::stop
  *
- * @param type $text
+ * @param string $text
  */
 	public static function end($text) {
 		self::stop($text);

Spacing +8 added lines, -8 removed lines

@@ -100,10 +100,10 @@ 
 
 		switch ($event) {
 			case 'start':
-				$x = '* ' . $x;
+				$x = '* '.$x;
 				break;
 			case 'stop':
-				$x = '† ' . $x;
+				$x = '† '.$x;
 				break;
 		}
 
@@ -143,13 +143,13 @@ 
 		self::start('now');
 
 		$out = "";
-		$out .= 'Time to Cake: ' . sprintf('%05.3f', self::_timeToCake()) . " s\n";
-		$out .= 'Cake bootstrap: ' . sprintf('%05.3f', self::_timeFromCakeToStopwatch()) . " s\n";
+		$out .= 'Time to Cake: '.sprintf('%05.3f', self::_timeToCake())." s\n";
+		$out .= 'Cake bootstrap: '.sprintf('%05.3f', self::_timeFromCakeToStopwatch())." s\n";
 
 		$out .= "W\tU\tW_delta\tU_delta\tMem [MB]\n";
 		$_seriesIndex = 1;
 		foreach (self::$_events as $k => $v) {
-			$out .= '<span id="stopwatch-' . $_seriesIndex++ . '" class="stopwatch-row">';
+			$out .= '<span id="stopwatch-'.$_seriesIndex++.'" class="stopwatch-row">';
 			$out .= sprintf("%05.3f\t%05.3f\t%05.3f\t%05.3f\t%5.1f\t%s\n",
 				$v['wtime'],
 				$v['utime'],
@@ -196,7 +196,7 @@ 
 				$k);
 		}
 
-		$out .= "\n\n" . self::printStatistic();
+		$out .= "\n\n".self::printStatistic();
 
 		return $out;
 	}
@@ -238,7 +238,7 @@ 
 	}
 
 	public static function printStatistic() {
-		return self::$_stopwatchCalls . " calls with ca " . sprintf("%05.3f", self::$_stopwatchTime) . ' sec overhead.';
+		return self::$_stopwatchCalls." calls with ca ".sprintf("%05.3f", self::$_stopwatchTime).' sec overhead.';
 	}
 
 	public static function getWallTime($divider = null) {
@@ -258,7 +258,7 @@ 
 		self::end('getWallTime()');
 		$time = self::$_events[count(self::$_events) - 1]['wtime'] +
 			self::_timeToStopwatch();
-		return number_format( $time, 3, $decimal, $thousand);
+		return number_format($time, 3, $decimal, $thousand);
 	}
 
 /**

Indentation +261 added lines, -261 removed lines

@@ -2,272 +2,272 @@
 
 class Stopwatch {
 
-	protected static $_startupTime = 0;
-
-	protected static $_instance = null;
-
-	protected static $_enableTimer = false;
-
-	protected static $_wallStart = 0;
-
-	protected static $_userStart = 0;
-
-	protected static $_wallLast = 0;
-
-	protected static $_userLast = 0;
-
-	protected static $_events;
-
-	protected static $_sums = array();
-
-	protected static $_starts = array();
-
-	protected static $_stopwatchTime = 0;
-
-	protected static $_stopwatchCalls = 0;
-
-	public static function getInstance() {
-		if (self::$_instance === null) {
-			self::$_instance = new Stopwatch();
-		}
-		return self::$_instance;
-	}
-
-	protected function __construct() {
-	}
-
-	private function __clone() {
-	}
-
-	static public function reset() {
-		self::$_startupTime = 0;
-		self::$_instance = null;
-		self::$_enableTimer = false;
-		self::$_wallStart = 0;
-		self::$_userStart = 0;
-		self::$_wallLast = 0;
-		self::$_userLast = 0;
-		self::$_events = [];
-		self::$_sums = array();
-		self::$_starts = array();
-		self::$_stopwatchTime = 0;
-		self::$_stopwatchCalls = 0;
-	}
-
-	static protected function _addEvent($x, $event = null) {
-		if (self::$_enableTimer === false) {
-			return;
-		}
-
-		list($usec, $sec) = explode(' ', microtime());
-		$wtime = ($sec + $usec);
-		if (!self::$_wallStart) {
-			self::$_wallStart = $wtime;
-		}
-
-		$dat = @getrusage();
-		if ($dat === null) {
-			// some hosters disable getrusage() while hardening their PHP
-			$utime = 0;
-		} else {
-			$utime = ($dat['ru_utime.tv_sec'] + $dat['ru_utime.tv_usec'] / 1000000);
-		}
-
-		if (!self::$_userStart) {
-			self::$_userStart = $utime;
-		}
-
-		$udiff = ($wtime - self::$_wallStart == 0) ? 0 : $utime - self::$_userLast;
-		self::$_userLast = $utime;
-
-		$wdiff = ($wtime - self::$_wallStart == 0) ? 0 : $wtime - self::$_wallLast;
-		self::$_wallLast = $wtime;
-
-		if (!isset(self::$_starts[$x])) {
-			self::$_starts[$x]['wtime'] = $wtime;
-			self::$_starts[$x]['utime'] = $utime;
-		} else {
-			if (!isset(self::$_sums[$x]['wtime'])) {
-				self::$_sums[$x]['wtime'] = 0;
-				self::$_sums[$x]['utime'] = 0;
-				self::$_sums[$x]['times'] = 0;
-			}
-			self::$_sums[$x]['wtime'] = self::$_sums[$x]['wtime'] + $wtime - self::$_starts[$x]['wtime'];
-			self::$_sums[$x]['utime'] = self::$_sums[$x]['utime'] + $utime - self::$_starts[$x]['utime'];
-			self::$_sums[$x]['times'] = self::$_sums[$x]['times'] + 1;
-			unset(self::$_starts[$x]);
-		}
-
-		switch ($event) {
-			case 'start':
-				$x = '* ' . $x;
-				break;
-			case 'stop':
-				$x = '† ' . $x;
-				break;
-		}
-
-		self::$_events[] = array(
-			'title' => $x,
-			'wtime' => $wtime - self::$_wallStart,
-			'utime' => $utime - self::$_userStart,
-			'wdiff' => $wdiff,
-			'udiff' => $udiff,
-			'mem' => memory_get_usage()
-		);
-
-		// endtime
-		list($eusec, $esec) = explode(' ', microtime());
-		$ewtime = ($esec + $eusec);
-		self::$_stopwatchTime += ($ewtime - $wtime);
-		self::$_stopwatchCalls++;
-	}
-
-	static protected function _timeToCake() {
-		return TIME_START - $_SERVER['REQUEST_TIME_FLOAT'];
-	}
-
-	static protected function _timeFromCakeToStopwatch() {
-		return self::$_startupTime - TIME_START;
-	}
-
-	static protected function _timeToStopwatch() {
-		return self::$_startupTime - $_SERVER['REQUEST_TIME_FLOAT'];
-	}
-
-	public static function getString() {
-		if (self::$_enableTimer === false) {
-			return;
-		}
-
-		self::start('now');
-
-		$out = "";
-		$out .= 'Time to Cake: ' . sprintf('%05.3f', self::_timeToCake()) . " s\n";
-		$out .= 'Cake bootstrap: ' . sprintf('%05.3f', self::_timeFromCakeToStopwatch()) . " s\n";
-
-		$out .= "W\tU\tW_delta\tU_delta\tMem [MB]\n";
-		$_seriesIndex = 1;
-		foreach (self::$_events as $k => $v) {
-			$out .= '<span id="stopwatch-' . $_seriesIndex++ . '" class="stopwatch-row">';
-			$out .= sprintf("%05.3f\t%05.3f\t%05.3f\t%05.3f\t%5.1f\t%s\n",
-				$v['wtime'],
-				$v['utime'],
-				$v['wdiff'],
-				$v['udiff'],
-				$v['mem'] / 1048576,
-				$v['title']);
-			$out .= '</span>';
-		}
-
-		$out .= "\n\n";
-
-		for ($i = 0; $i < 100; $i++) {
-			Stopwatch::start('e');
-			Stopwatch::stop('e');
-		}
-		$_e = array_pop(self::$_sums);
-		$_eW = $_e['wtime'] / 100;
-		$_eU = $_e['utime'] / 100;
-
-		self::$_events = array_slice(self::$_events, 0, -200);
-
-		$out .= "W_sum\tU_sum\tW_%\tU_%\t#\tW_ø\n";
-
-		$_lastTimestamp = end(self::$_events);
-		$wlast = $_lastTimestamp['wtime'] / 100;
-		$ulast = $_lastTimestamp['utime'] / 100;
-		foreach (self::$_sums as $k => $v) {
-			// on vagrant $ulast may be 0 for unknown reason when running test cases
-			// ugly hack to suppress output in test-cases, where it isn't read anyway
-			if (empty($ulast)) {
-				break;
-			}
-			$v['wtime'] = $v['wtime'] - ($_eW * $v['times']);
-			$v['utime'] = $v['utime'] - ($_eW * $v['times']);
-
-			$out .= sprintf("%05.3f\t%05.3f\t%04.1f\t%04.1f\t%u\t%05.3f\t%s\n",
-				$v['wtime'],
-				$v['utime'],
-					$v['wtime'] / $wlast,
-					$v['utime'] / $ulast,
-				$v['times'],
-					$v['wtime'] / $v['times'],
-				$k);
-		}
-
-		$out .= "\n\n" . self::printStatistic();
-
-		return $out;
-	}
-
-	public static function getJs() {
-		if (self::$_enableTimer === false) {
-			return;
-		}
-		$data = array();
-		foreach (self::$_events as $v) {
-			$data[] = array(
-				'label' => $v['title'],
-				'data' => [[1, $v['wdiff']], [2, $v['udiff']]]
-			);
-		}
-		$out = json_encode($data);
-		return $out;
-	}
-
-	public static function init() {
-			self::reset();
-			self::$_startupTime = microtime(true);
-	}
-
-	public static function enable() {
-		self::$_enableTimer = true;
-	}
-
-	public static function disable() {
-		self::$_enableTimer = false;
-	}
-
-	public static function start($text) {
-		self::_addEvent($text, 'start');
-	}
-
-	public static function stop($text) {
-		self::_addEvent($text, 'stop');
-	}
-
-	public static function printStatistic() {
-		return self::$_stopwatchCalls . " calls with ca " . sprintf("%05.3f", self::$_stopwatchTime) . ' sec overhead.';
-	}
-
-	public static function getWallTime($divider = null) {
-		$thousand = '';
-
-		if ($divider === 'eng') {
-			$divider = '.';
-		}
-
-		if (strlen($divider) < 2) {
-			$decimal = $divider;
-		} else {
-			$decimal = ',';
-		}
-
-		self::start('getWallTime()');
-		self::end('getWallTime()');
-		$time = self::$_events[count(self::$_events) - 1]['wtime'] +
-			self::_timeToStopwatch();
-		return number_format( $time, 3, $decimal, $thousand);
-	}
+    protected static $_startupTime = 0;
+
+    protected static $_instance = null;
+
+    protected static $_enableTimer = false;
+
+    protected static $_wallStart = 0;
+
+    protected static $_userStart = 0;
+
+    protected static $_wallLast = 0;
+
+    protected static $_userLast = 0;
+
+    protected static $_events;
+
+    protected static $_sums = array();
+
+    protected static $_starts = array();
+
+    protected static $_stopwatchTime = 0;
+
+    protected static $_stopwatchCalls = 0;
+
+    public static function getInstance() {
+        if (self::$_instance === null) {
+            self::$_instance = new Stopwatch();
+        }
+        return self::$_instance;
+    }
+
+    protected function __construct() {
+    }
+
+    private function __clone() {
+    }
+
+    static public function reset() {
+        self::$_startupTime = 0;
+        self::$_instance = null;
+        self::$_enableTimer = false;
+        self::$_wallStart = 0;
+        self::$_userStart = 0;
+        self::$_wallLast = 0;
+        self::$_userLast = 0;
+        self::$_events = [];
+        self::$_sums = array();
+        self::$_starts = array();
+        self::$_stopwatchTime = 0;
+        self::$_stopwatchCalls = 0;
+    }
+
+    static protected function _addEvent($x, $event = null) {
+        if (self::$_enableTimer === false) {
+            return;
+        }
+
+        list($usec, $sec) = explode(' ', microtime());
+        $wtime = ($sec + $usec);
+        if (!self::$_wallStart) {
+            self::$_wallStart = $wtime;
+        }
+
+        $dat = @getrusage();
+        if ($dat === null) {
+            // some hosters disable getrusage() while hardening their PHP
+            $utime = 0;
+        } else {
+            $utime = ($dat['ru_utime.tv_sec'] + $dat['ru_utime.tv_usec'] / 1000000);
+        }
+
+        if (!self::$_userStart) {
+            self::$_userStart = $utime;
+        }
+
+        $udiff = ($wtime - self::$_wallStart == 0) ? 0 : $utime - self::$_userLast;
+        self::$_userLast = $utime;
+
+        $wdiff = ($wtime - self::$_wallStart == 0) ? 0 : $wtime - self::$_wallLast;
+        self::$_wallLast = $wtime;
+
+        if (!isset(self::$_starts[$x])) {
+            self::$_starts[$x]['wtime'] = $wtime;
+            self::$_starts[$x]['utime'] = $utime;
+        } else {
+            if (!isset(self::$_sums[$x]['wtime'])) {
+                self::$_sums[$x]['wtime'] = 0;
+                self::$_sums[$x]['utime'] = 0;
+                self::$_sums[$x]['times'] = 0;
+            }
+            self::$_sums[$x]['wtime'] = self::$_sums[$x]['wtime'] + $wtime - self::$_starts[$x]['wtime'];
+            self::$_sums[$x]['utime'] = self::$_sums[$x]['utime'] + $utime - self::$_starts[$x]['utime'];
+            self::$_sums[$x]['times'] = self::$_sums[$x]['times'] + 1;
+            unset(self::$_starts[$x]);
+        }
+
+        switch ($event) {
+            case 'start':
+                $x = '* ' . $x;
+                break;
+            case 'stop':
+                $x = '† ' . $x;
+                break;
+        }
+
+        self::$_events[] = array(
+            'title' => $x,
+            'wtime' => $wtime - self::$_wallStart,
+            'utime' => $utime - self::$_userStart,
+            'wdiff' => $wdiff,
+            'udiff' => $udiff,
+            'mem' => memory_get_usage()
+        );
+
+        // endtime
+        list($eusec, $esec) = explode(' ', microtime());
+        $ewtime = ($esec + $eusec);
+        self::$_stopwatchTime += ($ewtime - $wtime);
+        self::$_stopwatchCalls++;
+    }
+
+    static protected function _timeToCake() {
+        return TIME_START - $_SERVER['REQUEST_TIME_FLOAT'];
+    }
+
+    static protected function _timeFromCakeToStopwatch() {
+        return self::$_startupTime - TIME_START;
+    }
+
+    static protected function _timeToStopwatch() {
+        return self::$_startupTime - $_SERVER['REQUEST_TIME_FLOAT'];
+    }
+
+    public static function getString() {
+        if (self::$_enableTimer === false) {
+            return;
+        }
+
+        self::start('now');
+
+        $out = "";
+        $out .= 'Time to Cake: ' . sprintf('%05.3f', self::_timeToCake()) . " s\n";
+        $out .= 'Cake bootstrap: ' . sprintf('%05.3f', self::_timeFromCakeToStopwatch()) . " s\n";
+
+        $out .= "W\tU\tW_delta\tU_delta\tMem [MB]\n";
+        $_seriesIndex = 1;
+        foreach (self::$_events as $k => $v) {
+            $out .= '<span id="stopwatch-' . $_seriesIndex++ . '" class="stopwatch-row">';
+            $out .= sprintf("%05.3f\t%05.3f\t%05.3f\t%05.3f\t%5.1f\t%s\n",
+                $v['wtime'],
+                $v['utime'],
+                $v['wdiff'],
+                $v['udiff'],
+                $v['mem'] / 1048576,
+                $v['title']);
+            $out .= '</span>';
+        }
+
+        $out .= "\n\n";
+
+        for ($i = 0; $i < 100; $i++) {
+            Stopwatch::start('e');
+            Stopwatch::stop('e');
+        }
+        $_e = array_pop(self::$_sums);
+        $_eW = $_e['wtime'] / 100;
+        $_eU = $_e['utime'] / 100;
+
+        self::$_events = array_slice(self::$_events, 0, -200);
+
+        $out .= "W_sum\tU_sum\tW_%\tU_%\t#\tW_ø\n";
+
+        $_lastTimestamp = end(self::$_events);
+        $wlast = $_lastTimestamp['wtime'] / 100;
+        $ulast = $_lastTimestamp['utime'] / 100;
+        foreach (self::$_sums as $k => $v) {
+            // on vagrant $ulast may be 0 for unknown reason when running test cases
+            // ugly hack to suppress output in test-cases, where it isn't read anyway
+            if (empty($ulast)) {
+                break;
+            }
+            $v['wtime'] = $v['wtime'] - ($_eW * $v['times']);
+            $v['utime'] = $v['utime'] - ($_eW * $v['times']);
+
+            $out .= sprintf("%05.3f\t%05.3f\t%04.1f\t%04.1f\t%u\t%05.3f\t%s\n",
+                $v['wtime'],
+                $v['utime'],
+                    $v['wtime'] / $wlast,
+                    $v['utime'] / $ulast,
+                $v['times'],
+                    $v['wtime'] / $v['times'],
+                $k);
+        }
+
+        $out .= "\n\n" . self::printStatistic();
+
+        return $out;
+    }
+
+    public static function getJs() {
+        if (self::$_enableTimer === false) {
+            return;
+        }
+        $data = array();
+        foreach (self::$_events as $v) {
+            $data[] = array(
+                'label' => $v['title'],
+                'data' => [[1, $v['wdiff']], [2, $v['udiff']]]
+            );
+        }
+        $out = json_encode($data);
+        return $out;
+    }
+
+    public static function init() {
+            self::reset();
+            self::$_startupTime = microtime(true);
+    }
+
+    public static function enable() {
+        self::$_enableTimer = true;
+    }
+
+    public static function disable() {
+        self::$_enableTimer = false;
+    }
+
+    public static function start($text) {
+        self::_addEvent($text, 'start');
+    }
+
+    public static function stop($text) {
+        self::_addEvent($text, 'stop');
+    }
+
+    public static function printStatistic() {
+        return self::$_stopwatchCalls . " calls with ca " . sprintf("%05.3f", self::$_stopwatchTime) . ' sec overhead.';
+    }
+
+    public static function getWallTime($divider = null) {
+        $thousand = '';
+
+        if ($divider === 'eng') {
+            $divider = '.';
+        }
+
+        if (strlen($divider) < 2) {
+            $decimal = $divider;
+        } else {
+            $decimal = ',';
+        }
+
+        self::start('getWallTime()');
+        self::end('getWallTime()');
+        $time = self::$_events[count(self::$_events) - 1]['wtime'] +
+            self::_timeToStopwatch();
+        return number_format( $time, 3, $decimal, $thousand);
+    }
 
 /**
  * Alias for self::stop
  *
  * @param type $text
  */
-	public static function end($text) {
-		self::stop($text);
-	}
+    public static function end($text) {
+        self::stop($text);
+    }
 
 }

app/View/Helper/LayoutHelper.php

Doc Comments +3 added lines

@@ -151,6 +151,9 @@
 			return $this->Html->tag('span', $content, ['class' => 'infoText']);
 		}
 
+		/**
+		 * @param string $icon
+		 */
 		public function textWithIcon($text, $icon) {
 			return <<<EOF
 				<i class="saito-icon fa fa-$icon"></i>

Spacing +10 added lines, -10 removed lines

@@ -13,8 +13,8 @@ 
 		protected $_themeImgUrl = null;
 
 		public function beforeRender($viewFile) {
-			$this->_themeImgUrl = $this->request->webroot . 'theme' . DS . $this->theme .
-					DS . Configure::read('App.imageBaseUrl');
+			$this->_themeImgUrl = $this->request->webroot.'theme'.DS.$this->theme.
+					DS.Configure::read('App.imageBaseUrl');
 		}
 
 		public function beforeLayout($layoutFile) {
@@ -29,10 +29,10 @@ 
 		public function jQueryTag() {
 			$url = 'dist/';
 			$name = 'jquery';
-			if ((int)Configure::read('debug') === 0) {
-				$name = $name . '.min';
+			if ((int) Configure::read('debug') === 0) {
+				$name = $name.'.min';
 			}
-			return $this->Html->script($this->Html->assetUrl($url . $name,
+			return $this->Html->script($this->Html->assetUrl($url.$name,
 					['ext' => '.js', 'fullBase' => true]));
 		}
 
@@ -69,14 +69,14 @@ 
 				'title' => Configure::read('Saito.Settings.forum_name')
 			];
 			$html = [];
-			$html[] = '<meta name="application-name" content="' . h($options['title']) . '"/>';
+			$html[] = '<meta name="application-name" content="'.h($options['title']).'"/>';
 			if (isset($options['color'])) {
-				$html[] = '<meta name="msapplication-TileColor" content="' . $options['color'] . '"/>';
+				$html[] = '<meta name="msapplication-TileColor" content="'.$options['color'].'"/>';
 			}
 
 			$_basename = $options['baseName'];
 			$url = "{$this->_themeImgUrl}{$_basename}.png";
-			$html[] = '<meta name="msapplication-TileImage" content="' . $url . '"/>';
+			$html[] = '<meta name="msapplication-TileImage" content="'.$url.'"/>';
 			return implode("\n", $html);
 		}
 
@@ -225,7 +225,7 @@ 
 			$_content += ['first' => '', 'middle' => '', 'last' => ''];
 			$out = '';
 			foreach (['first', 'middle', 'last'] as $key) {
-				$out .= '<div class="heading-3-' . $key . '">';
+				$out .= '<div class="heading-3-'.$key.'">';
 				$out .= $options['escape'] ? h($_content[$key]) : $_content[$key];
 				$out .= '</div>';
 			}
@@ -235,7 +235,7 @@ 
 		public function linkToUserProfile($user, ForumsUserInterface $CurrentUser) {
 			if ($CurrentUser->isLoggedIn()) {
 				return $this->Html->link($user['username'],
-						'/users/view/' . $user['id']);
+						'/users/view/'.$user['id']);
 			} else {
 				return h($user['username']);
 			}

Indentation +278 added lines, -278 removed lines

@@ -1,183 +1,183 @@ 
 <?php
 
-	use Saito\User\ForumsUserInterface;
-
-	App::uses('AppHelper', 'View/Helper');
-
-	class LayoutHelper extends AppHelper {
-
-		public $helpers = [
-				'Html'
-		];
-
-		protected $_themeImgUrl = null;
-
-		public function beforeRender($viewFile) {
-			$this->_themeImgUrl = $this->request->webroot . 'theme' . DS . $this->theme .
-					DS . Configure::read('App.imageBaseUrl');
-		}
-
-		public function beforeLayout($layoutFile) {
-			if (Configure::read('debug')) {
-				$stylesheets[] = 'stylesheets/cake.css';
-			}
-			if (!empty($stylesheets)) {
-				$this->Html->css($stylesheets, null, ['inline' => false]);
-			}
-		}
-
-		public function jQueryTag() {
-			$url = 'dist/';
-			$name = 'jquery';
-			if ((int)Configure::read('debug') === 0) {
-				$name = $name . '.min';
-			}
-			return $this->Html->script($this->Html->assetUrl($url . $name,
-					['ext' => '.js', 'fullBase' => true]));
-		}
-
-		/**
-		 * Output link to Android touch icon
-		 */
-		public function androidTouchIcon($size, array $options = []) {
-			return $this->_touchIcon($size,
-					$options + ['rel' => 'shortcut icon']);
-		}
-
-		/**
-		 * Output link to iOS touch icon
-		 */
-		public function appleTouchIcon($size, array $options = []) {
-			return $this->_touchIcon($size, $options);
-		}
-
-		/**
-		 * Output tile info for Windows 8.
-		 *
-		 * @param array $size unused
-		 * @param array $options
-		 * - 'basename' (default: app-icon)
-		 * - 'color' Background color for tile.
-		 * - 'title' Title displayed on tile.
-		 *
-		 * @return string
-		 */
-		public function msTouchIcon(array $size = [], array $options = []) {
-			$options += [
-				'baseName' => 'app-icon',
-				'color' => null,
-				'title' => Configure::read('Saito.Settings.forum_name')
-			];
-			$html = [];
-			$html[] = '<meta name="application-name" content="' . h($options['title']) . '"/>';
-			if (isset($options['color'])) {
-				$html[] = '<meta name="msapplication-TileColor" content="' . $options['color'] . '"/>';
-			}
-
-			$_basename = $options['baseName'];
-			$url = "{$this->_themeImgUrl}{$_basename}.png";
-			$html[] = '<meta name="msapplication-TileImage" content="' . $url . '"/>';
-			return implode("\n", $html);
-		}
-
-		/**
-		 * Output link to touch icon
-		 *
-		 * Files must be placed in <theme>/webroot/img/<baseName>-<size>x<size>.png
-		 *
-		 * @param mixed $size integer or array with integer
-		 * @param array $options
-		 *  `baseName` (default: 'app-icon')
-		 *  `precomposed` adds '-precomposed' to baseName (default: false)
-		 *  `rel` (default: 'apple-touch-icon')
-		 *  `size` outputs "size"-attribute (default: true)
-		 * @return string
-		 */
-		protected function _touchIcon($size, array $options = []) {
-			if (is_array($size)) {
-				$_out = '';
-				foreach ($size as $s) {
-					$_out .= $this->appleTouchIcon($s, $options);
-				}
-				return $_out;
-			}
-
-			$_defaults = [
-					'baseName' => 'app-icon',
-					'precomposed' => false,
-					'rel' => 'apple-touch-icon',
-					'size' => true
-			];
-			$options += $_defaults;
-
-			$_xSize = "{$size}x{$size}";
-
-			$_basename = $options['baseName'];
-			if ($options['precomposed']) {
-				$_basename .= '-precomposed';
-			}
-			$_filename = "{$_basename}-{$_xSize}.png";
-
-			$url = "{$this->_themeImgUrl}{$_filename}";
-
-			$_out = "<link rel=\"{$options['rel']}\" ";
-			if ($options['size']) {
-				$_out .= "size=\"{$_xSize}\" ";
-			}
-			$_out .= "href=\"{$url}\">";
-			return $_out;
-		}
-
-		/**
-		 * Generates page heading html
-		 *
-		 * @param string $heading
-		 * @param string $tag
-		 * @return string
-		 */
-		public function pageHeading($heading, $tag = 'h1') {
-			return $this->Html->tag($tag,
-					$heading,
-					['class' => 'pageHeading', 'escape' => true]);
-		}
-
-		/**
-		 * Generates intoText tag
-		 *
-		 * @param string $content
-		 * @return string
-		 */
-		public function infoText($content) {
-			return $this->Html->tag('span', $content, ['class' => 'infoText']);
-		}
-
-		public function textWithIcon($text, $icon) {
-			return <<<EOF
+    use Saito\User\ForumsUserInterface;
+
+    App::uses('AppHelper', 'View/Helper');
+
+    class LayoutHelper extends AppHelper {
+
+        public $helpers = [
+                'Html'
+        ];
+
+        protected $_themeImgUrl = null;
+
+        public function beforeRender($viewFile) {
+            $this->_themeImgUrl = $this->request->webroot . 'theme' . DS . $this->theme .
+                    DS . Configure::read('App.imageBaseUrl');
+        }
+
+        public function beforeLayout($layoutFile) {
+            if (Configure::read('debug')) {
+                $stylesheets[] = 'stylesheets/cake.css';
+            }
+            if (!empty($stylesheets)) {
+                $this->Html->css($stylesheets, null, ['inline' => false]);
+            }
+        }
+
+        public function jQueryTag() {
+            $url = 'dist/';
+            $name = 'jquery';
+            if ((int)Configure::read('debug') === 0) {
+                $name = $name . '.min';
+            }
+            return $this->Html->script($this->Html->assetUrl($url . $name,
+                    ['ext' => '.js', 'fullBase' => true]));
+        }
+
+        /**
+         * Output link to Android touch icon
+         */
+        public function androidTouchIcon($size, array $options = []) {
+            return $this->_touchIcon($size,
+                    $options + ['rel' => 'shortcut icon']);
+        }
+
+        /**
+         * Output link to iOS touch icon
+         */
+        public function appleTouchIcon($size, array $options = []) {
+            return $this->_touchIcon($size, $options);
+        }
+
+        /**
+         * Output tile info for Windows 8.
+         *
+         * @param array $size unused
+         * @param array $options
+         * - 'basename' (default: app-icon)
+         * - 'color' Background color for tile.
+         * - 'title' Title displayed on tile.
+         *
+         * @return string
+         */
+        public function msTouchIcon(array $size = [], array $options = []) {
+            $options += [
+                'baseName' => 'app-icon',
+                'color' => null,
+                'title' => Configure::read('Saito.Settings.forum_name')
+            ];
+            $html = [];
+            $html[] = '<meta name="application-name" content="' . h($options['title']) . '"/>';
+            if (isset($options['color'])) {
+                $html[] = '<meta name="msapplication-TileColor" content="' . $options['color'] . '"/>';
+            }
+
+            $_basename = $options['baseName'];
+            $url = "{$this->_themeImgUrl}{$_basename}.png";
+            $html[] = '<meta name="msapplication-TileImage" content="' . $url . '"/>';
+            return implode("\n", $html);
+        }
+
+        /**
+         * Output link to touch icon
+         *
+         * Files must be placed in <theme>/webroot/img/<baseName>-<size>x<size>.png
+         *
+         * @param mixed $size integer or array with integer
+         * @param array $options
+         *  `baseName` (default: 'app-icon')
+         *  `precomposed` adds '-precomposed' to baseName (default: false)
+         *  `rel` (default: 'apple-touch-icon')
+         *  `size` outputs "size"-attribute (default: true)
+         * @return string
+         */
+        protected function _touchIcon($size, array $options = []) {
+            if (is_array($size)) {
+                $_out = '';
+                foreach ($size as $s) {
+                    $_out .= $this->appleTouchIcon($s, $options);
+                }
+                return $_out;
+            }
+
+            $_defaults = [
+                    'baseName' => 'app-icon',
+                    'precomposed' => false,
+                    'rel' => 'apple-touch-icon',
+                    'size' => true
+            ];
+            $options += $_defaults;
+
+            $_xSize = "{$size}x{$size}";
+
+            $_basename = $options['baseName'];
+            if ($options['precomposed']) {
+                $_basename .= '-precomposed';
+            }
+            $_filename = "{$_basename}-{$_xSize}.png";
+
+            $url = "{$this->_themeImgUrl}{$_filename}";
+
+            $_out = "<link rel=\"{$options['rel']}\" ";
+            if ($options['size']) {
+                $_out .= "size=\"{$_xSize}\" ";
+            }
+            $_out .= "href=\"{$url}\">";
+            return $_out;
+        }
+
+        /**
+         * Generates page heading html
+         *
+         * @param string $heading
+         * @param string $tag
+         * @return string
+         */
+        public function pageHeading($heading, $tag = 'h1') {
+            return $this->Html->tag($tag,
+                    $heading,
+                    ['class' => 'pageHeading', 'escape' => true]);
+        }
+
+        /**
+         * Generates intoText tag
+         *
+         * @param string $content
+         * @return string
+         */
+        public function infoText($content) {
+            return $this->Html->tag('span', $content, ['class' => 'infoText']);
+        }
+
+        public function textWithIcon($text, $icon) {
+            return <<<EOF
 				<i class="saito-icon fa fa-$icon"></i>
 				<span class="saito-icon-text">$text</span>
 EOF;
-		}
-
-		public function dropdownMenuButton(array $menuItems, array $options = []) {
-			$options += ['class' => ''];
-			$_divider = '<li class="dropdown-divider"></li>';
-			$_menu = '';
-			foreach ($menuItems as $_menuItem) {
-				if ($_menuItem === 'divider') {
-					$_menu .= $_divider;
-				} else {
-					$_menu .= "<li>$_menuItem</li>";
-				}
-			}
-			$_id = AppHelper::tagId();
-			$_button = $this->Html->tag(
-					'button',
-					'<i class="fa fa-wrench"></i>&nbsp;<i class="fa fa-caret-down"></i>',
-					$options + [
-							'escape' => false,
-							'onclick' => "$(this).dropdown('attach', '#d$_id');"
-					]);
-			$_out = <<<EOF
+        }
+
+        public function dropdownMenuButton(array $menuItems, array $options = []) {
+            $options += ['class' => ''];
+            $_divider = '<li class="dropdown-divider"></li>';
+            $_menu = '';
+            foreach ($menuItems as $_menuItem) {
+                if ($_menuItem === 'divider') {
+                    $_menu .= $_divider;
+                } else {
+                    $_menu .= "<li>$_menuItem</li>";
+                }
+            }
+            $_id = AppHelper::tagId();
+            $_button = $this->Html->tag(
+                    'button',
+                    '<i class="fa fa-wrench"></i>&nbsp;<i class="fa fa-caret-down"></i>',
+                    $options + [
+                            'escape' => false,
+                            'onclick' => "$(this).dropdown('attach', '#d$_id');"
+                    ]);
+            $_out = <<<EOF
 				$_button
 				<div id="d$_id" class="dropdown-relative dropdown dropdown-tip">
 					<ul class="dropdown-menu">
@@ -185,106 +185,106 @@ 
 					</ul>
 				</div>
 EOF;
-			return $_out;
-		}
-
-		public function panelHeading($content, array $options = []) {
-			$options += [
-					'class' => 'panel-heading',
-					'escape' => true,
-					'pageHeading' => false,
-					'tag' => 'h2'
-			];
-			if ($options['pageHeading']) {
-				$options['class'] .= ' pageTitle';
-				$options['tag'] = 'h1';
-			}
-			if (is_string($content)) {
-				$content = ['middle' => $content];
-			}
-
-			if ($options['escape']) {
-				foreach ($content as $k => $v) {
-					$content[$k] = h($v);
-				}
-			}
-
-			$content['middle'] = "<{$options['tag']}>{$content['middle']}</{$options['tag']}>";
-
-			$options['escape'] = false;
-			return $this->heading($content, $options);
-		}
-
-		public function heading($content, array $options = []) {
-			$options += ['class' => '', 'escape' => true];
-			if (is_string($content)) {
-				$_content = ['middle' => $content];
-			} else {
-				$_content = $content;
-			}
-			$_content += ['first' => '', 'middle' => '', 'last' => ''];
-			$out = '';
-			foreach (['first', 'middle', 'last'] as $key) {
-				$out .= '<div class="heading-3-' . $key . '">';
-				$out .= $options['escape'] ? h($_content[$key]) : $_content[$key];
-				$out .= '</div>';
-			}
-			return "<div class=\"{$options['class']} heading-3\">$out</div>";
-		}
-
-		public function linkToUserProfile($user, ForumsUserInterface $CurrentUser) {
-			if ($CurrentUser->isLoggedIn()) {
-				return $this->Html->link($user['username'],
-						'/users/view/' . $user['id']);
-			} else {
-				return h($user['username']);
-			}
-		}
-
-		/**
-		 * creates a navigation link for the navigation bar
-		 *
-		 * @param $content link content
-		 * @param $url link url
-		 * @param array $options allows options as HtmlHelper::link
-		 * 	- 'class' a CSS class to apply to the navbar item
-		 * 	- 'position' [left]|center|right
-		 * @return string navigation link
-		 */
-		public function navbarItem($content, $url, array $options = []) {
-			$defaults = [
-				'class' => 'navbar-item',
-				'position' => 'left'
-			];
-			$class = '';
-			if (isset($options['class'])) {
-				$class = $options['class'];
-				unset($options['class']);
-			}
-			$options += $defaults;
-
-			$options['class'] .= " {$options['position']} $class";
-			unset($class, $options['position']);
-
-			return $this->Html->link($content, $url, $options);
-		}
-
-		public function navbarBack($url = null, $title = null, $options = []) {
-			if ($title === null) {
-				if ($url === null) {
-					$title = __('back_to_forum_linkname');
-				} else {
-					$title = __('Back');
-				}
-			}
-
-			if ($url === null) {
-				$url = '/';
-			}
-			$options += ['escape' => false];
-			$content = $this->textWithIcon(h($title), 'arrow-left');
-
-			return $this->navbarItem($content, $url, $options);
-		}
-
-	}
+            return $_out;
+        }
+
+        public function panelHeading($content, array $options = []) {
+            $options += [
+                    'class' => 'panel-heading',
+                    'escape' => true,
+                    'pageHeading' => false,
+                    'tag' => 'h2'
+            ];
+            if ($options['pageHeading']) {
+                $options['class'] .= ' pageTitle';
+                $options['tag'] = 'h1';
+            }
+            if (is_string($content)) {
+                $content = ['middle' => $content];
+            }
+
+            if ($options['escape']) {
+                foreach ($content as $k => $v) {
+                    $content[$k] = h($v);
+                }
+            }
+
+            $content['middle'] = "<{$options['tag']}>{$content['middle']}</{$options['tag']}>";
+
+            $options['escape'] = false;
+            return $this->heading($content, $options);
+        }
+
+        public function heading($content, array $options = []) {
+            $options += ['class' => '', 'escape' => true];
+            if (is_string($content)) {
+                $_content = ['middle' => $content];
+            } else {
+                $_content = $content;
+            }
+            $_content += ['first' => '', 'middle' => '', 'last' => ''];
+            $out = '';
+            foreach (['first', 'middle', 'last'] as $key) {
+                $out .= '<div class="heading-3-' . $key . '">';
+                $out .= $options['escape'] ? h($_content[$key]) : $_content[$key];
+                $out .= '</div>';
+            }
+            return "<div class=\"{$options['class']} heading-3\">$out</div>";
+        }
+
+        public function linkToUserProfile($user, ForumsUserInterface $CurrentUser) {
+            if ($CurrentUser->isLoggedIn()) {
+                return $this->Html->link($user['username'],
+                        '/users/view/' . $user['id']);
+            } else {
+                return h($user['username']);
+            }
+        }
+
+        /**
+         * creates a navigation link for the navigation bar
+         *
+         * @param $content link content
+         * @param $url link url
+         * @param array $options allows options as HtmlHelper::link
+         * 	- 'class' a CSS class to apply to the navbar item
+         * 	- 'position' [left]|center|right
+         * @return string navigation link
+         */
+        public function navbarItem($content, $url, array $options = []) {
+            $defaults = [
+                'class' => 'navbar-item',
+                'position' => 'left'
+            ];
+            $class = '';
+            if (isset($options['class'])) {
+                $class = $options['class'];
+                unset($options['class']);
+            }
+            $options += $defaults;
+
+            $options['class'] .= " {$options['position']} $class";
+            unset($class, $options['position']);
+
+            return $this->Html->link($content, $url, $options);
+        }
+
+        public function navbarBack($url = null, $title = null, $options = []) {
+            if ($title === null) {
+                if ($url === null) {
+                    $title = __('back_to_forum_linkname');
+                } else {
+                    $title = __('Back');
+                }
+            }
+
+            if ($url === null) {
+                $url = '/';
+            }
+            $options += ['escape' => false];
+            $content = $this->textWithIcon(h($title), 'arrow-left');
+
+            return $this->navbarItem($content, $url, $options);
+        }
+
+    }

app/View/Helper/ShoutsHelper.php

Doc Comments +3 added lines

@@ -40,6 +40,9 @@
 			return $prepared;
 		}
 
+		/**
+		 * @param integer $lastId
+		 */
 		protected function _readCache($lastId) {
 			$cache = Cache::read($this->_cacheKey);
 			if ($cache && $cache['lastId'] === $lastId) {

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
 			if (empty($shouts)) {
 				return [];
 			}
-			$lastId = (int)$shouts[0]['Shout']['id'];
+			$lastId = (int) $shouts[0]['Shout']['id'];
 			$cache = $this->_readCache($lastId);
 			if ($cache) {
 				return $cache;
@@ -24,14 +24,14 @@ 
 			$prepared = [];
 			foreach ($shouts as $shout) {
 				$prepared[] = [
-					'id' => (int)$shout['Shout']['id'],
+					'id' => (int) $shout['Shout']['id'],
 					'time' => $this->Api->mysqlTimestampToIso($shout['Shout']['time']),
 					'text' => $shout['Shout']['text'],
 					'html' => $this->Parser->parse(
 						$shout['Shout']['text'],
 						['multimedia' => false, 'wrap' => false]
 					),
-					'user_id' => (int)$shout['Shout']['user_id'],
+					'user_id' => (int) $shout['Shout']['user_id'],
 					'user_name' => $shout['Shout']['username']
 				];
 			}

Indentation +60 added lines, -60 removed lines

@@ -1,62 +1,62 @@
 <?php
 
-	App::uses('AppHelper', 'View/Helper');
-
-	class ShoutsHelper extends AppHelper {
-
-		public $helpers = [
-			'Api.Api',
-			'Parser'
-		];
-
-		protected $_cacheKey = 'Saito.Shouts.prepared';
-
-		public function prepare($shouts) {
-			if (empty($shouts)) {
-				return [];
-			}
-			$lastId = (int)$shouts[0]['Shout']['id'];
-			$cache = $this->_readCache($lastId);
-			if ($cache) {
-				return $cache;
-			}
-
-			$prepared = [];
-			foreach ($shouts as $shout) {
-				$prepared[] = [
-					'id' => (int)$shout['Shout']['id'],
-					'time' => $this->Api->mysqlTimestampToIso($shout['Shout']['time']),
-					'text' => $shout['Shout']['text'],
-					'html' => $this->Parser->parse(
-						$shout['Shout']['text'],
-						['multimedia' => false, 'wrap' => false]
-					),
-					'user_id' => (int)$shout['Shout']['user_id'],
-					'user_name' => $shout['Shout']['username']
-				];
-			}
-
-			$this->_writeCache($prepared);
-			return $prepared;
-		}
-
-		protected function _readCache($lastId) {
-			$cache = Cache::read($this->_cacheKey);
-			if ($cache && $cache['lastId'] === $lastId) {
-				return $cache['data'];
-			}
-			return false;
-		}
-
-		protected function _writeCache($prepared) {
-			$lastId = $prepared[0]['id'];
-			Cache::write(
-				$this->_cacheKey,
-				[
-					'lastId' => $lastId,
-					'data' => $prepared
-				]
-			);
-		}
-
-	}
\ No newline at end of file
+    App::uses('AppHelper', 'View/Helper');
+
+    class ShoutsHelper extends AppHelper {
+
+        public $helpers = [
+            'Api.Api',
+            'Parser'
+        ];
+
+        protected $_cacheKey = 'Saito.Shouts.prepared';
+
+        public function prepare($shouts) {
+            if (empty($shouts)) {
+                return [];
+            }
+            $lastId = (int)$shouts[0]['Shout']['id'];
+            $cache = $this->_readCache($lastId);
+            if ($cache) {
+                return $cache;
+            }
+
+            $prepared = [];
+            foreach ($shouts as $shout) {
+                $prepared[] = [
+                    'id' => (int)$shout['Shout']['id'],
+                    'time' => $this->Api->mysqlTimestampToIso($shout['Shout']['time']),
+                    'text' => $shout['Shout']['text'],
+                    'html' => $this->Parser->parse(
+                        $shout['Shout']['text'],
+                        ['multimedia' => false, 'wrap' => false]
+                    ),
+                    'user_id' => (int)$shout['Shout']['user_id'],
+                    'user_name' => $shout['Shout']['username']
+                ];
+            }
+
+            $this->_writeCache($prepared);
+            return $prepared;
+        }
+
+        protected function _readCache($lastId) {
+            $cache = Cache::read($this->_cacheKey);
+            if ($cache && $cache['lastId'] === $lastId) {
+                return $cache['data'];
+            }
+            return false;
+        }
+
+        protected function _writeCache($prepared) {
+            $lastId = $prepared[0]['id'];
+            Cache::write(
+                $this->_cacheKey,
+                [
+                    'lastId' => $lastId,
+                    'data' => $prepared
+                ]
+            );
+        }
+
+    }
\ No newline at end of file

app/View/Helper/TimeHHelper.php

Doc Comments +3 added lines

@@ -112,6 +112,9 @@
 			return $_timeString;
 		}
 
+		/**
+		 * @param integer $timestamp
+		 */
 		protected function _normal($timestamp) {
 			if ($timestamp > $this->_today || $timestamp > ($this->_now - 21600)) {
 				// today or in the last 6 hours

Spacing +4 added lines, -4 removed lines

@@ -56,9 +56,9 @@ 
 					$timeInTimezone = new DateTime('now', $timezone);
 					$timeDiffToUtc = $timeInTimezone->getOffset() / 3600;
 					$options[$groupTitle][$timeZoneTitle] =
-							$timeZoneTitle .
-							' (' . $timeInTimezone->format('H:m') .
-							'; ' . $timeDiffToUtc . ')';
+							$timeZoneTitle.
+							' ('.$timeInTimezone->format('H:m').
+							'; '.$timeDiffToUtc.')';
 				endforeach;
 			endforeach;
 
@@ -118,7 +118,7 @@ 
 				$time = strftime("%H:%M", $timestamp);
 			} elseif ($timestamp > ($this->_today - 64800)) {
 				// yesterday but in the last 18 hours
-				$time = __('yesterday') . ' ' . strftime("%H:%M", $timestamp);
+				$time = __('yesterday').' '.strftime("%H:%M", $timestamp);
 			} else {
 				// yesterday and 18 hours and older
 				$time = strftime("%d.%m.%Y", $timestamp);

Indentation +139 added lines, -139 removed lines

@@ -1,141 +1,141 @@
 <?php
 
-	App::uses('AppHelper', 'View/Helper');
-
-	class TimeHHelper extends AppHelper {
-
-		public $helpers = array(
-			'Time'
-		);
-
-		protected static $_timezoneGroups = array(
-			'UTC' => DateTimeZone::UTC,
-			'Africa' => DateTimeZone::AFRICA,
-			'America' => DateTimeZone::AMERICA,
-			'Antarctica' => DateTimeZone::ANTARCTICA,
-			'Asia' => DateTimeZone::ASIA,
-			'Atlantic' => DateTimeZone::ATLANTIC,
-			'Europe' => DateTimeZone::EUROPE,
-			'Indian' => DateTimeZone::INDIAN,
-			'Pacific' => DateTimeZone::PACIFIC,
-		);
-
-		protected $_now = false;
-
-		protected $_today = false;
-
-		protected $_start = false;
-
-		protected $_timeDiffToUtc = 0;
-
-		public function beforeRender($viewFile) {
-			parent::beforeRender($viewFile);
-			$this->_now = time();
-			$this->_today = mktime(0, 0, 0);
-
-			// @td reimplement unsing Cake 2.2 CakeTime (?)
-			$_timezoneSettings = Configure::read('Saito.Settings.timezone');
-			if (empty($_timezoneSettings)) {
-				$_timezoneSettings = 'UTC';
-			}
-			$timezone = new DateTimeZone($_timezoneSettings);
-			$timeInTimezone = new DateTime('now', $timezone);
-			$timeOnServer = new DateTime('now');
-			$this->_timeDiffToUtc = $timeOnServer->getOffset() - $timeInTimezone->getOffset();
-		}
-
-		public function timezoneOptions() {
-			$options = array( );
-
-			$allTimeZonesValues = DateTimeZone::listIdentifiers(DateTimeZone::ALL);
-
-			foreach (self::$_timezoneGroups as $groupTitle => $groupId) :
-				$timeZones = DateTimeZone::listIdentifiers($groupId);
-				foreach ($timeZones as $timeZoneTitle) :
-					$timezone = new DateTimeZone($timeZoneTitle);
-					$timeInTimezone = new DateTime('now', $timezone);
-					$timeDiffToUtc = $timeInTimezone->getOffset() / 3600;
-					$options[$groupTitle][$timeZoneTitle] =
-							$timeZoneTitle .
-							' (' . $timeInTimezone->format('H:m') .
-							'; ' . $timeDiffToUtc . ')';
-				endforeach;
-			endforeach;
-
-			return $options;
-		}
-
-		/**
-		 * outputs a formatted time string
-		 *
-		 * #@td user/admin time zone diff and admin format settings
-		 *
-		 * @param $timestamp
-		 * @param string $format
-		 * @param array $options
-		 * @return string
-		 */
-		public function formatTime($timestamp, $format = 'normal', array $options = []) {
-			// Stopwatch::start('formatTime');
-			$options += [
-				'wrap' => true
-			];
-
-			$timestamp = strtotime($timestamp) - $this->_timeDiffToUtc;
-
-			if ($format === 'normal' || empty($format)) {
-				$_timeString = $this->_normal($timestamp);
-			} elseif ($format === 'short') {
-				$_timeString = date('d.m.', $timestamp);
-			} elseif ($format === 'eng') {
-				$_timeString = strftime('%F %T', $timestamp);
-			} else {
-				$_timeString = strftime($format, $timestamp);
-			}
-
-			if ($options['wrap']) {
-				$attributes = [
-					'datetime' => date(DATE_RFC3339, $timestamp),
-					'title' => strftime("%F %T", $timestamp)
-				];
-				if (is_array($options['wrap'])) {
-					$attributes += $options['wrap'];
-				}
-				foreach ($attributes as $attribute => $value) {
-					$attributes[$attribute] = "$attribute=\"$value\"";
-				}
-				$attributes = implode(' ', $attributes);
-				$_timeString = "<time $attributes>$_timeString</time>";
-			}
-
-			// Stopwatch::stop('formatTime');
-			return $_timeString;
-		}
-
-		protected function _normal($timestamp) {
-			if ($timestamp > $this->_today || $timestamp > ($this->_now - 21600)) {
-				// today or in the last 6 hours
-				$time = strftime("%H:%M", $timestamp);
-			} elseif ($timestamp > ($this->_today - 64800)) {
-				// yesterday but in the last 18 hours
-				$time = __('yesterday') . ' ' . strftime("%H:%M", $timestamp);
-			} else {
-				// yesterday and 18 hours and older
-				$time = strftime("%d.%m.%Y", $timestamp);
-			}
-
-			return $time;
-		}
-
-		public function mysqlTimestampToIso($date) {
-			if ($date === null) {
-				return null;
-			}
-			$unixTimeStamp = strtotime($date);
-			if ($unixTimeStamp < 0) {
-				$unixTimeStamp = 0;
-			}
-			return date('c', $unixTimeStamp);
-		}
-
-	}
+    App::uses('AppHelper', 'View/Helper');
+
+    class TimeHHelper extends AppHelper {
+
+        public $helpers = array(
+            'Time'
+        );
+
+        protected static $_timezoneGroups = array(
+            'UTC' => DateTimeZone::UTC,
+            'Africa' => DateTimeZone::AFRICA,
+            'America' => DateTimeZone::AMERICA,
+            'Antarctica' => DateTimeZone::ANTARCTICA,
+            'Asia' => DateTimeZone::ASIA,
+            'Atlantic' => DateTimeZone::ATLANTIC,
+            'Europe' => DateTimeZone::EUROPE,
+            'Indian' => DateTimeZone::INDIAN,
+            'Pacific' => DateTimeZone::PACIFIC,
+        );
+
+        protected $_now = false;
+
+        protected $_today = false;
+
+        protected $_start = false;
+
+        protected $_timeDiffToUtc = 0;
+
+        public function beforeRender($viewFile) {
+            parent::beforeRender($viewFile);
+            $this->_now = time();
+            $this->_today = mktime(0, 0, 0);
+
+            // @td reimplement unsing Cake 2.2 CakeTime (?)
+            $_timezoneSettings = Configure::read('Saito.Settings.timezone');
+            if (empty($_timezoneSettings)) {
+                $_timezoneSettings = 'UTC';
+            }
+            $timezone = new DateTimeZone($_timezoneSettings);
+            $timeInTimezone = new DateTime('now', $timezone);
+            $timeOnServer = new DateTime('now');
+            $this->_timeDiffToUtc = $timeOnServer->getOffset() - $timeInTimezone->getOffset();
+        }
+
+        public function timezoneOptions() {
+            $options = array( );
+
+            $allTimeZonesValues = DateTimeZone::listIdentifiers(DateTimeZone::ALL);
+
+            foreach (self::$_timezoneGroups as $groupTitle => $groupId) :
+                $timeZones = DateTimeZone::listIdentifiers($groupId);
+                foreach ($timeZones as $timeZoneTitle) :
+                    $timezone = new DateTimeZone($timeZoneTitle);
+                    $timeInTimezone = new DateTime('now', $timezone);
+                    $timeDiffToUtc = $timeInTimezone->getOffset() / 3600;
+                    $options[$groupTitle][$timeZoneTitle] =
+                            $timeZoneTitle .
+                            ' (' . $timeInTimezone->format('H:m') .
+                            '; ' . $timeDiffToUtc . ')';
+                endforeach;
+            endforeach;
+
+            return $options;
+        }
+
+        /**
+         * outputs a formatted time string
+         *
+         * #@td user/admin time zone diff and admin format settings
+         *
+         * @param $timestamp
+         * @param string $format
+         * @param array $options
+         * @return string
+         */
+        public function formatTime($timestamp, $format = 'normal', array $options = []) {
+            // Stopwatch::start('formatTime');
+            $options += [
+                'wrap' => true
+            ];
+
+            $timestamp = strtotime($timestamp) - $this->_timeDiffToUtc;
+
+            if ($format === 'normal' || empty($format)) {
+                $_timeString = $this->_normal($timestamp);
+            } elseif ($format === 'short') {
+                $_timeString = date('d.m.', $timestamp);
+            } elseif ($format === 'eng') {
+                $_timeString = strftime('%F %T', $timestamp);
+            } else {
+                $_timeString = strftime($format, $timestamp);
+            }
+
+            if ($options['wrap']) {
+                $attributes = [
+                    'datetime' => date(DATE_RFC3339, $timestamp),
+                    'title' => strftime("%F %T", $timestamp)
+                ];
+                if (is_array($options['wrap'])) {
+                    $attributes += $options['wrap'];
+                }
+                foreach ($attributes as $attribute => $value) {
+                    $attributes[$attribute] = "$attribute=\"$value\"";
+                }
+                $attributes = implode(' ', $attributes);
+                $_timeString = "<time $attributes>$_timeString</time>";
+            }
+
+            // Stopwatch::stop('formatTime');
+            return $_timeString;
+        }
+
+        protected function _normal($timestamp) {
+            if ($timestamp > $this->_today || $timestamp > ($this->_now - 21600)) {
+                // today or in the last 6 hours
+                $time = strftime("%H:%M", $timestamp);
+            } elseif ($timestamp > ($this->_today - 64800)) {
+                // yesterday but in the last 18 hours
+                $time = __('yesterday') . ' ' . strftime("%H:%M", $timestamp);
+            } else {
+                // yesterday and 18 hours and older
+                $time = strftime("%d.%m.%Y", $timestamp);
+            }
+
+            return $time;
+        }
+
+        public function mysqlTimestampToIso($date) {
+            if ($date === null) {
+                return null;
+            }
+            $unixTimeStamp = strtotime($date);
+            if ($unixTimeStamp < 0) {
+                $unixTimeStamp = 0;
+            }
+            return date('c', $unixTimeStamp);
+        }
+
+    }

app/View/Helper/UserHHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
  * Translates user types
  *
  * @param $type
- * @return mixed
+ * @return null|string
  */
 		public function type($type) {
 			// write out all __() strings for l10n

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
 				}
 			}
 
-			return '<style type="text/css">' . implode(" ", $_styles) . '</style>';
+			return '<style type="text/css">'.implode(" ", $_styles).'</style>';
 		}
 
 /**
@@ -100,7 +100,7 @@ 
 			$out = $url;
 			if (is_string($url)) {
 				if (substr($url, 0, 4) == 'www.') {
-					$url = 'http://' . $url;
+					$url = 'http://'.$url;
 				}
 				if (substr($url, 0, 4) == 'http') {
 					$out = $this->Html->link(

Indentation +112 added lines, -112 removed lines

@@ -1,60 +1,60 @@ 
 <?php
 
-	use Saito\User\SaitoUser;
-
-	App::uses('AppHelper', 'View/Helper');
-
-	class UserHHelper extends AppHelper {
-
-		protected $_SaitoUser = null;
-
-		public $helpers = array(
-			'Html',
-			'Session',
-		);
-
-		public function beforeRender($viewFile) {
-			parent::beforeRender($viewFile);
-			$this->_SaitoUser = new SaitoUser();
-		}
-
-		public function banned($isBanned) {
-			$out = '';
-			if ($isBanned) :
-				$out = '<i class="fa fa-ban fa-lg"></i>';
-			endif;
-			return $out;
-		}
-
-		/**
-		 * generates CSS from user-preferences
-		 *
-		 * @param array $User
-		 * @return string
-		 */
-		public function generateCss(array $User) {
-			$_styles = [];
-
-			// colors
-			$_cNew = $User['user_color_new_postings'];
-			$_cOld = $User['user_color_old_postings'];
-			$_cAct = $User['user_color_actual_posting'];
-
-			$_aMetatags = ['', ':link', ':visited', ':hover', ':active'];
-			foreach ($_aMetatags as $_aMetatag) {
-				if (!empty($_cOld) && $_cOld !== '#') {
-					$_styles[] = ".et-root .et$_aMetatag, .et-reply .et$_aMetatag	{ color: $_cOld; }";
-				}
-				if (!empty($_cNew) && $_cNew !== '#') {
-					$_styles[] = ".et-new .et$_aMetatag { color: $_cNew; }";
-				}
-				if (!empty($_cAct) && $_cAct !== '#') {
-					$_styles[] = ".et-current .et$_aMetatag { color: $_cAct; }";
-				}
-			}
-
-			return '<style type="text/css">' . implode(" ", $_styles) . '</style>';
-		}
+    use Saito\User\SaitoUser;
+
+    App::uses('AppHelper', 'View/Helper');
+
+    class UserHHelper extends AppHelper {
+
+        protected $_SaitoUser = null;
+
+        public $helpers = array(
+            'Html',
+            'Session',
+        );
+
+        public function beforeRender($viewFile) {
+            parent::beforeRender($viewFile);
+            $this->_SaitoUser = new SaitoUser();
+        }
+
+        public function banned($isBanned) {
+            $out = '';
+            if ($isBanned) :
+                $out = '<i class="fa fa-ban fa-lg"></i>';
+            endif;
+            return $out;
+        }
+
+        /**
+         * generates CSS from user-preferences
+         *
+         * @param array $User
+         * @return string
+         */
+        public function generateCss(array $User) {
+            $_styles = [];
+
+            // colors
+            $_cNew = $User['user_color_new_postings'];
+            $_cOld = $User['user_color_old_postings'];
+            $_cAct = $User['user_color_actual_posting'];
+
+            $_aMetatags = ['', ':link', ':visited', ':hover', ':active'];
+            foreach ($_aMetatags as $_aMetatag) {
+                if (!empty($_cOld) && $_cOld !== '#') {
+                    $_styles[] = ".et-root .et$_aMetatag, .et-reply .et$_aMetatag	{ color: $_cOld; }";
+                }
+                if (!empty($_cNew) && $_cNew !== '#') {
+                    $_styles[] = ".et-new .et$_aMetatag { color: $_cNew; }";
+                }
+                if (!empty($_cAct) && $_cAct !== '#') {
+                    $_styles[] = ".et-current .et$_aMetatag { color: $_cAct; }";
+                }
+            }
+
+            return '<style type="text/css">' . implode(" ", $_styles) . '</style>';
+        }
 
 /**
  * Translates user types
@@ -62,66 +62,66 @@ 
  * @param $type
  * @return mixed
  */
-		public function type($type) {
-			// write out all __() strings for l10n
-			switch ($type):
-				case 'user':
-					return __('user.type.user');
-				case 'mod':
-					return __('user.type.mod');
-				case 'admin':
-					return __('user.type.admin');
-			endswitch;
-		}
-
-		/**
-		 * Creates link to user contact page with image
-		 *
-		 * @param $user
-		 * @return string
-		 */
-		public function contact($user) {
-			$out = '';
-			if ($user['personal_messages'] && is_string($user['user_email'])) {
-				$out = $this->Html->link(
-					'<i class="fa fa-envelope-o fa-lg"></i>',
-					['controller' => 'contacts', 'action' => 'user', $user['id']],
-					['escape' => false]);
-			}
-			return $out;
-		}
+        public function type($type) {
+            // write out all __() strings for l10n
+            switch ($type):
+                case 'user':
+                    return __('user.type.user');
+                case 'mod':
+                    return __('user.type.mod');
+                case 'admin':
+                    return __('user.type.admin');
+            endswitch;
+        }
+
+        /**
+         * Creates link to user contact page with image
+         *
+         * @param $user
+         * @return string
+         */
+        public function contact($user) {
+            $out = '';
+            if ($user['personal_messages'] && is_string($user['user_email'])) {
+                $out = $this->Html->link(
+                    '<i class="fa fa-envelope-o fa-lg"></i>',
+                    ['controller' => 'contacts', 'action' => 'user', $user['id']],
+                    ['escape' => false]);
+            }
+            return $out;
+        }
 
 /**
  * Creates Homepage Links with Image from Url
  * @param <type> $url
  * @return <type>
  */
-		public function homepage($url) {
-			$out = $url;
-			if (is_string($url)) {
-				if (substr($url, 0, 4) == 'www.') {
-					$url = 'http://' . $url;
-				}
-				if (substr($url, 0, 4) == 'http') {
-					$out = $this->Html->link(
-						'<i class="fa fa-home fa-lg"></i>',
-						$url,
-						array('escape' => false));
-				} else {
-					$out = h($url);
-				}
-			}
-			return $out;
-		}
-
-		public function isMod($user) {
-			$this->_SaitoUser->setSettings($user);
-			return $this->_SaitoUser->isMod($user);
-		}
-
-		public function isAdmin($user) {
-			$this->_SaitoUser->setSettings($user);
-			return $this->_SaitoUser->isAdmin($user);
-		}
-
-	}
+        public function homepage($url) {
+            $out = $url;
+            if (is_string($url)) {
+                if (substr($url, 0, 4) == 'www.') {
+                    $url = 'http://' . $url;
+                }
+                if (substr($url, 0, 4) == 'http') {
+                    $out = $this->Html->link(
+                        '<i class="fa fa-home fa-lg"></i>',
+                        $url,
+                        array('escape' => false));
+                } else {
+                    $out = h($url);
+                }
+            }
+            return $out;
+        }
+
+        public function isMod($user) {
+            $this->_SaitoUser->setSettings($user);
+            return $this->_SaitoUser->isMod($user);
+        }
+
+        public function isAdmin($user) {
+            $this->_SaitoUser->setSettings($user);
+            return $this->_SaitoUser->isAdmin($user);
+        }
+
+    }