Schlaefer / Saito

app/Plugin/SimpleCaptcha/View/Helper/SimpleCaptchaHelper.php

Spacing +7 added lines, -7 removed lines

@@ -17,16 +17,16 @@ 
 
 	private $captcha_text	 	= null;
 	private $captcha_result = null;
-	private $captcha_hash		= null;
+	private $captcha_hash = null;
 	private $captcha_generated = false;
 
 	function __construct(View $View, $settings = array()) {
 		$this->options = SimpleCaptcha::$defaults;
 
 		# Set up an array with the operators that we want to use. With difficulty=1 it is only subtraction and addition.
-		$this->captcha_operator_convert = array( '-' );
+		$this->captcha_operator_convert = array('-');
 
-		$configs = (array)Configure::read('Captcha');
+		$configs = (array) Configure::read('Captcha');
 		if (!empty($configs)) {
 			$this->options = array_merge($this->options, $configs);
 		}
@@ -50,7 +50,7 @@ 
   	$captchaOperator = $this->captcha_operator_convert[mt_rand(0, count($this->captcha_operator_convert) - 1)];
 
   	# Get the equation in textual form to show to the user.
-  	$this->captcha_text =  $numberOne . ' ' . $captchaOperator . ' ' . $numberTwo;
+  	$this->captcha_text = $numberOne.' '.$captchaOperator.' '.$numberTwo;
 
   	# Evaluate the equation and get the result.
 		$this->captcha_result = $numberOne - $numberTwo;
@@ -78,7 +78,7 @@ 
 	 * @return string
 	 */
 	public function input($model = null, $options = array()) {
-		return $this->active($model, $options) . $this->passive($model, $options);
+		return $this->active($model, $options).$this->passive($model, $options);
 		return $out;
 	}
 
@@ -95,7 +95,7 @@ 
 		$out = '<div style="display:none">'.
             $this->Form->input($field.'_hash', array('value'=>$this->captcha_hash)).
             $this->Form->input($field.'_time', array('value'=>time())).
-            $this->Form->input((!empty($model)?$model.'.':'').$this->options['dummyField'], array('value'=>'')).
+            $this->Form->input((!empty($model) ? $model.'.' : '').$this->options['dummyField'], array('value'=>'')).
         '</div>';
 
 		return $out;
@@ -117,7 +117,7 @@ 
 				'class'=>'captcha',
 				'value'=>'',
 				'maxlength'=>3,
-				'label'=>__('Captcha',true),
+				'label'=>__('Captcha', true),
 				'combined'=>true, 'autocomplete'=>'off'
 			);
 		$options = array_merge($defaultOptions, $options);

Indentation +113 added lines, -113 removed lines

@@ -8,54 +8,54 @@ 
  * Output of form data for the captcha
  */
 class SimpleCaptchaHelper extends AppHelper {
-	var $helpers = array('Form');
+    var $helpers = array('Form');
 
-	private $options = null; 
-  private $methods = array('hash', 'db', 'session');
+    private $options = null; 
+    private $methods = array('hash', 'db', 'session');
 
-	private $captcha_operator_convert = null;
+    private $captcha_operator_convert = null;
 
-	private $captcha_text	 	= null;
-	private $captcha_result = null;
-	private $captcha_hash		= null;
-	private $captcha_generated = false;
+    private $captcha_text	 	= null;
+    private $captcha_result = null;
+    private $captcha_hash		= null;
+    private $captcha_generated = false;
 
-	function __construct(View $View, $settings = array()) {
-		$this->options = SimpleCaptcha::$defaults;
+    function __construct(View $View, $settings = array()) {
+        $this->options = SimpleCaptcha::$defaults;
 
-		# Set up an array with the operators that we want to use. With difficulty=1 it is only subtraction and addition.
-		$this->captcha_operator_convert = array( '-' );
+        # Set up an array with the operators that we want to use. With difficulty=1 it is only subtraction and addition.
+        $this->captcha_operator_convert = array( '-' );
 
-		$configs = (array)Configure::read('Captcha');
-		if (!empty($configs)) {
-			$this->options = array_merge($this->options, $configs);
-		}
+        $configs = (array)Configure::read('Captcha');
+        if (!empty($configs)) {
+            $this->options = array_merge($this->options, $configs);
+        }
 
-		parent::__construct($View, $settings);
-	}
+        parent::__construct($View, $settings);
+    }
 
 
-	/**
-	 * Generates the captcha values 
-	 * 
-	 * @return array 
-	 */
-  protected function _generate() {
-		if ($this->captcha_generated === TRUE) return;
-  	# Choose the first number randomly between 6 and 10. This is to stop the answer being negative.
-		$numberOne = mt_rand(6, 9);
-  	# Choose the second number randomly between 0 and 5.
-  	$numberTwo = mt_rand(1, 5);
-		# Choose the operator randomly from the array.
-  	$captchaOperator = $this->captcha_operator_convert[mt_rand(0, count($this->captcha_operator_convert) - 1)];
+    /**
+     * Generates the captcha values 
+     * 
+     * @return array 
+     */
+    protected function _generate() {
+        if ($this->captcha_generated === TRUE) return;
+        # Choose the first number randomly between 6 and 10. This is to stop the answer being negative.
+        $numberOne = mt_rand(6, 9);
+        # Choose the second number randomly between 0 and 5.
+        $numberTwo = mt_rand(1, 5);
+        # Choose the operator randomly from the array.
+        $captchaOperator = $this->captcha_operator_convert[mt_rand(0, count($this->captcha_operator_convert) - 1)];
 
-  	# Get the equation in textual form to show to the user.
-  	$this->captcha_text =  $numberOne . ' ' . $captchaOperator . ' ' . $numberTwo;
+        # Get the equation in textual form to show to the user.
+        $this->captcha_text =  $numberOne . ' ' . $captchaOperator . ' ' . $numberTwo;
 
-  	# Evaluate the equation and get the result.
-		$this->captcha_result = $numberOne - $numberTwo;
+        # Evaluate the equation and get the result.
+        $this->captcha_result = $numberOne - $numberTwo;
 
-		# Session-Way (only one form at a time) - must be a component then
+        # Session-Way (only one form at a time) - must be a component then
     //$this->Session->write('Captcha.result', $result);
 
     # DB-Way (several forms possible, high security via IP-Based max limits)
@@ -63,89 +63,89 @@ 
     // $Captcha = ClassRegistry::init('Captcha');
     // $Captcha->new(); $Captcha->update(); etc
 
-  	# Timestamp-SessionID-Hash-Way (several forms possible, not as secure)
-  	$this->captcha_hash = SimpleCaptcha::buildHash(array('timestamp' => time(), 'result' => $this->captcha_result), $this->options);
-
-		$this->captcha_generated = TRUE;
-  	return;
-  }
-
-	/**
-	 * active + passive captcha
-	 * 
-	 * @param type $model
-	 * @param type $options
-	 * @return string
-	 */
-	public function input($model = null, $options = array()) {
-		return $this->active($model, $options) . $this->passive($model, $options);
-		return $out;
-	}
-
-	/**
-	 * passive captcha
-	 * 2010-01-08 ms
-	 */
-	public function passive($model = null, $options = array()) {
-		$this->_generate();
-
-		$field = $this->__fieldName($model);
-
-		# add passive part on active forms as well
-		$out = '<div style="display:none">'.
+        # Timestamp-SessionID-Hash-Way (several forms possible, not as secure)
+        $this->captcha_hash = SimpleCaptcha::buildHash(array('timestamp' => time(), 'result' => $this->captcha_result), $this->options);
+
+        $this->captcha_generated = TRUE;
+        return;
+    }
+
+    /**
+     * active + passive captcha
+     * 
+     * @param type $model
+     * @param type $options
+     * @return string
+     */
+    public function input($model = null, $options = array()) {
+        return $this->active($model, $options) . $this->passive($model, $options);
+        return $out;
+    }
+
+    /**
+     * passive captcha
+     * 2010-01-08 ms
+     */
+    public function passive($model = null, $options = array()) {
+        $this->_generate();
+
+        $field = $this->__fieldName($model);
+
+        # add passive part on active forms as well
+        $out = '<div style="display:none">'.
             $this->Form->input($field.'_hash', array('value'=>$this->captcha_hash)).
             $this->Form->input($field.'_time', array('value'=>time())).
             $this->Form->input((!empty($model)?$model.'.':'').$this->options['dummyField'], array('value'=>'')).
         '</div>';
 
-		return $out;
-	}
-
-	/**
-	 * active math captcha
-	 * either combined with between=true (all in this one funtion)
-	 * or seperated by =false (needs input(false) and captcha() calls then)
-	 * @param bool between: [default: true]
-	 * 2010-01-08 ms
-	 */
-	public function active($model = null, $options = array()) {
-		$this->_generate();
-
-		// @todo refactor into __construct
-		$defaultOptions = array(
-				'type'=>'text',
-				'class'=>'captcha',
-				'value'=>'',
-				'maxlength'=>3,
-				'label'=>__('Captcha',true),
-				'combined'=>true, 'autocomplete'=>'off'
-			);
-		$options = array_merge($defaultOptions, $options);
-
-		$out = '';
-		if ($this->options['type'] == 'active') {
-			// obvuscate operation for bots by reversing the code in source but reverse effect with CSS
-			$out .= '<span id="captchaCode" style="unicode-bidi: bidi-override; direction: rtl;">'.strrev($this->captcha_text);
-			// let's go nuts here
-			$out .= '<span style="display: none;"> - '.mt_rand(10, 20).'</span>';
-			$out .= '</span>';
-		}
-
-
-		if ($options['combined'] === true) {
+        return $out;
+    }
+
+    /**
+     * active math captcha
+     * either combined with between=true (all in this one funtion)
+     * or seperated by =false (needs input(false) and captcha() calls then)
+     * @param bool between: [default: true]
+     * 2010-01-08 ms
+     */
+    public function active($model = null, $options = array()) {
+        $this->_generate();
+
+        // @todo refactor into __construct
+        $defaultOptions = array(
+                'type'=>'text',
+                'class'=>'captcha',
+                'value'=>'',
+                'maxlength'=>3,
+                'label'=>__('Captcha',true),
+                'combined'=>true, 'autocomplete'=>'off'
+            );
+        $options = array_merge($defaultOptions, $options);
+
+        $out = '';
+        if ($this->options['type'] == 'active') {
+            // obvuscate operation for bots by reversing the code in source but reverse effect with CSS
+            $out .= '<span id="captchaCode" style="unicode-bidi: bidi-override; direction: rtl;">'.strrev($this->captcha_text);
+            // let's go nuts here
+            $out .= '<span style="display: none;"> - '.mt_rand(10, 20).'</span>';
+            $out .= '</span>';
+        }
+
+
+        if ($options['combined'] === true) {
             $options['between'] = $out.' = ';
         }
-		unset($options['combined']);
-
-		return $this->Form->input($this->__fieldName($model), $options); 
-	}
-
-	private function __fieldName($model_name = null) {
-		$field_name = 'captcha';
-		if (isSet($model_name)) {
-			$field_name = $model_name.'.'.$field_name;
-		}
-		return $field_name;
-	}
+        unset($options['combined']);
+
+        return $this->Form->input($this->__fieldName($model), $options); 
+    }
+
+    private function __fieldName($model_name = null) {
+        $field_name = 'captcha';
+        if (isSet($model_name)) {
+            $field_name = $model_name.'.'.$field_name;
+        }
+        return $field_name;
+    }
 }
 ?>
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -41,7 +41,9 @@
 	 * @return array 
 	 */
   protected function _generate() {
-		if ($this->captcha_generated === TRUE) return;
+		if ($this->captcha_generated === TRUE) {
+		    return;
+		}
   	# Choose the first number randomly between 6 and 10. This is to stop the answer being negative.
 		$numberOne = mt_rand(6, 9);
   	# Choose the second number randomly between 0 and 5.

app/Plugin/SimpleCaptcha/Lib/SimpleCaptcha.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 class SimpleCaptcha extends Object {
-	static public $defaults = array (
+	static public $defaults = array(
 			'dummyField' => 'homepage',
 			'method' => 'hash',
 			'checkSession' => false,

Indentation +16 added lines, -16 removed lines

@@ -1,22 +1,22 @@
 <?php
 
 class SimpleCaptcha extends Object {
-	static public $defaults = array (
-			'dummyField' => 'homepage',
-			'method' => 'hash',
-			'checkSession' => false,
-			'checkIp' => false,
-			'salt' => '',
-			'type' => 'active',
-	);
+    static public $defaults = array (
+            'dummyField' => 'homepage',
+            'method' => 'hash',
+            'checkSession' => false,
+            'checkIp' => false,
+            'salt' => '',
+            'type' => 'active',
+    );
 
-	public static function buildHash($params, $options) {
-		$hashValue = date('c', $params['timestamp']).'_';
-		$hashValue .= ($options['checkSession']) ? session_id().'_' : '';
-		$hashValue .= ($options['checkIp']) ? env('REMOTE_ADDR').'_' : '';
-		$hashValue .= $params['result'].'_'.$options['salt'];
-		$hashValue = Security::hash($hashValue);
-		return $hashValue;
-	}
+    public static function buildHash($params, $options) {
+        $hashValue = date('c', $params['timestamp']).'_';
+        $hashValue .= ($options['checkSession']) ? session_id().'_' : '';
+        $hashValue .= ($options['checkIp']) ? env('REMOTE_ADDR').'_' : '';
+        $hashValue .= $params['result'].'_'.$options['salt'];
+        $hashValue = Security::hash($hashValue);
+        return $hashValue;
+    }
 }
 ?>
\ No newline at end of file

app/Plugin/BbcodeParser/Test/Case/Lib/BbcodeParserTest.php

Spacing +18 added lines, -18 removed lines

@@ -284,10 +284,10 @@ 
 		public function testAtLinkKnownUsers() {
 			$input = '@Alice @Bob @Bobby Junior @Bobby Tables @Dr. No';
 			$expected =
-				"<a href='/at/Alice'>@Alice</a>" .
-				" @Bob " .
-				"<a href='/at/Bobby+Junior'>@Bobby Junior</a>" .
-				" @Bobby Tables " .
+				"<a href='/at/Alice'>@Alice</a>".
+				" @Bob ".
+				"<a href='/at/Bobby+Junior'>@Bobby Junior</a>".
+				" @Bobby Tables ".
 				"<a href='/at/Dr.+No'>@Dr. No</a>";
 
 			$result = $this->_Parser->parse($input);
@@ -580,8 +580,8 @@ 
 
 		public function testIframe() {
 			//* test allowed domain
-			$input = '[iframe height=349 width=560 ' .
-				'src=http://www.youtube.com/embed/HdoW3t_WorU ' .
+			$input = '[iframe height=349 width=560 '.
+				'src=http://www.youtube.com/embed/HdoW3t_WorU '.
 				'frameborder=0][/iframe]';
 			$expected = [
 				['iframe' => [
@@ -596,8 +596,8 @@ 
 			$this->assertTags($result, $expected);
 
 			//* test forbidden domains
-			$input = '[iframe height=349 width=560 ' .
-				'src=http://www.youtubescam.com/embed/HdoW3t_WorU ' .
+			$input = '[iframe height=349 width=560 '.
+				'src=http://www.youtubescam.com/embed/HdoW3t_WorU '.
 				'frameborder=0][/iframe]';
 			$expected = '/src/i';
 			$result = $this->_Parser->parse($input, ['video_domains_allowed' => 'youtube | vimeo']);
@@ -605,8 +605,8 @@ 
 		}
 
 		public function testIframeAllDomainsAllowed() {
-			$input = '[iframe height=349 width=560 ' .
-				'src=http://www.youtubescam.com/embed/HdoW3t_WorU ' .
+			$input = '[iframe height=349 width=560 '.
+				'src=http://www.youtubescam.com/embed/HdoW3t_WorU '.
 				'][/iframe]';
 			$expected = 'src="http://www.youtubescam.com/embed/HdoW3t_WorU';
 			$result = $this->_Parser->parse($input, ['video_domains_allowed' => '*']);
@@ -614,8 +614,8 @@ 
 		}
 
 		public function testIframeNoDomainAllowed() {
-			$input = '[iframe height=349 width=560 ' .
-				'src=http://www.youtubescam.com/embed/HdoW3t_WorU ' .
+			$input = '[iframe height=349 width=560 '.
+				'src=http://www.youtubescam.com/embed/HdoW3t_WorU '.
 				'][/iframe]';
 			$expected = '/src/i';
 			$result = $this->_Parser->parse($input, ['video_domains_allowed' => '']);
@@ -634,7 +634,7 @@ 
 
 			// test for URIs without protocol
 			$input = '[img]/somewhere/macnemo.png[/img]';
-			$expected = '<img src="' . $this->_Helper->webroot . 'somewhere/macnemo.png" alt=""/>';
+			$expected = '<img src="'.$this->_Helper->webroot.'somewhere/macnemo.png" alt=""/>';
 			$result = $this->_Parser->parse($input);
 			$this->assertEquals($expected, $result);
 
@@ -817,7 +817,7 @@ 
 		public function testCodeNoCitationMark() {
 			// [code]<citation mark>[/code] should not be cited
 			$input = h(
-				"[code]\n" . $this->_Helper->settings['quote_symbol'] . "\n[/code]"
+				"[code]\n".$this->_Helper->settings['quote_symbol']."\n[/code]"
 			);
 			$expected = '`span class=.*?richtext-citation`';
 			$result = $this->_Parser->parse($input);
@@ -832,11 +832,11 @@ 
 
 		public function testQuote() {
 			$_qs = h($this->_Helper->settings['quote_symbol']);
-			$input = $_qs . ' fo [b]test[/b] ba';
+			$input = $_qs.' fo [b]test[/b] ba';
 			$result = $this->_Parser->parse($input);
 			$expected = [
 				'span' => ['class' => 'richtext-citation'],
-				$_qs . ' fo ',
+				$_qs.' fo ',
 				'strong' => [],
 				'test',
 				'/strong',
@@ -864,7 +864,7 @@ 
 			//* test autoconversion for audio files
 			$html5AudioExtensions = array('m4a', 'ogg', 'mp3', 'wav', 'opus');
 			foreach ($html5AudioExtensions as $extension) {
-				$url = 'http://example.com/audio.' . $extension;
+				$url = 'http://example.com/audio.'.$extension;
 				$input = "[video]{$url}[/video]";
 				$result = $this->_Parser->parse($input);
 				$expected = array(
@@ -927,7 +927,7 @@ 
 			$input = "[audio]{$url}[/audio]";
 			$result = $this->_Parser->parse($input);
 			$expected = array(
-					'audio' => array( 'src' => $url, 'controls' => 'controls' ),
+					'audio' => array('src' => $url, 'controls' => 'controls'),
 			);
 			$this->assertTags($result, $expected);
 

Indentation +1015 added lines, -1015 removed lines

@@ -1,337 +1,337 @@ 
 <?php
 
-	use Plugin\BbcodeParser\Lib;
-	use Saito\User\Userlist;
-
-	App::import('Lib', 'Stopwatch.Stopwatch');
-	App::import('Helper',
-		array(
-			'FileUpload.FileUpload',
-			'CakephpGeshi.Geshi',
-		));
-	App::import('Helper', 'MailObfuscator.MailObfuscator');
-
-	App::uses('Controller', 'Controller');
-	App::uses('View', 'View');
-	App::uses('ParserHelper', 'View/Helper');
-	App::uses('HtmlHelper', 'View/Helper');
-	App::uses('CakeRequest', 'Network');
-
-	class BbcodeParserTest extends CakeTestCase {
-
-		protected $_Parser = null;
-
-		public function testBold() {
-			$input = '[b]bold[/b]';
-			$expected = array('strong' => array(), 'bold', '/strong');
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-		}
-
-		public function testQuoteblock() {
-			$input = '[quote]foo bar[/quote]';
-			$expected = array('blockquote' => array(), 'foo bar', '/blockquote');
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-		}
-
-		public function testEmphasis() {
-			$input = '[i]italic[/i]';
-			$expected = array('em' => array(), 'italic', '/em');
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-		}
-
-		public function testStrike() {
-			$expected = ['del' => [], 'text', '/del'];
-
-			// [strike]
-			$input = '[strike]text[/strike]';
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-
-			// [s]
-			$input = '[s]text[/s]';
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-		}
-
-		public function testSpoiler() {
-			$input = 'pre [spoiler] te "\' xt[/spoiler]';
-			$expected = [
-				'pre',
-				[
-					'div' => [
-						'class' => 'richtext-spoiler',
-						'style' => 'display: inline;'
-					]
-				],
-				['script' => true],
-				'preg:/(.*?)"string":" te &quot;&#039; xt"(.*?)(?=<)/',
-				'/script',
-				[
-					'a' => [
-						'href' => '#',
-						'class' => 'richtext-spoiler-link',
-						'onclick'
-					]
-				],
-				'preg:/.*▇ Spoiler ▇.*?(?=<)/',
-				'/a',
-				'/div'
-			];
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected, true);
-		}
-
-		public function testList() {
-			$input = "[list]\n[*]fooo\n[*]bar\n[/list]";
-			$expected = [
-				['ul' => []],
-				['li' => []],
-				'fooo',
-				['br' => []],
-				'/li',
-				['li' => []],
-				'bar',
-				['br' => []],
-				'/li',
-				'/ul'
-			];
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-		}
-
-		public function testMaskLinkWithoutProtocol() {
-			$input = '[url=thetempe.st/station]purge[/url]';
-			$expected = [
-				'a' => [
-					'href' => 'http://thetempe.st/station',
-					'rel' => 'external',
-					'target' => '_blank'
-				],
-				'purge',
-				'/a'
-			];
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-		}
-
-		public function testParserEngineCaching() {
-			$input = '[img=]foo.png[/img]';
-			$result = $this->_Parser->parse($input, ['multimedia' => true]);
-			$this->assertContains('<img src', $result);
-			$result = $this->_Parser->parse($input, ['multimedia' => false]);
-			$this->assertNotContains('<img src', $result);
-		}
-
-		public function testLink() {
-			$input = '[url=http://cgi.ebay.de/ws/eBayISAPI.dll?ViewItem&item=250678480561&ssPageName=ADME:X:RTQ:DE:1123]test[/url]';
-			$expected = "<a href='http://cgi.ebay.de/ws/eBayISAPI.dll?ViewItem&amp;item=250678480561&amp;ssPageName=ADME:X:RTQ:DE:1123' rel='external' target='_blank'>test</a> <span class='richtext-linkInfo'>[ebay.de]</span>";
-			$result = $this->_Parser->parse($input);
-			$this->assertEquals($expected, $result);
-
-			/**
-			 * external server
-			 */
-			$input = '[url]http://heise.de/foobar[/url]';
-			$expected = array(
-				'a' => array(
-					'href' => 'http://heise.de/foobar',
-					'rel' => 'external',
-					'target' => '_blank'
-				),
-				'http://heise.de/foobar',
-				'/a'
-			);
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-
-			$input = '[link]http://heise.de/foobar[/link]';
-			$expected = array(
-				'a' => array(
-					'href' => 'http://heise.de/foobar',
-					'rel' => 'external',
-					'target' => '_blank'
-				),
-				'http://heise.de/foobar',
-				'/a'
-			);
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-
-			// masked link
-			$input = '[url=http://heise.de/foobar]foobar[/url]';
-			$expected = array(
-				'a' => array(
-					'href' => 'http://heise.de/foobar',
-					'rel' => 'external',
-					'target' => '_blank'
-				),
-				'foobar',
-				'/a',
-				'span' => array('class' => 'richtext-linkInfo'), '[heise.de]', '/span'
-			);
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-
-			// masked link with no label
-			$input = '[url=http://heise.de/foobar  label=none ]foobar[/url]';
-			$expected = array(
-				'a' => array(
-					'href' => 'http://heise.de/foobar',
-					'rel' => 'external',
-					'target' => '_blank',
-				),
-				'foobar',
-				'/a',
-			);
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-
-			/**
-			 * local server
-			 */
-			$input = '[url=http://macnemo.de/foobar]foobar[/url]';
-			$expected = "<a href='http://macnemo.de/foobar'>foobar</a>";
-			$result = $this->_Parser->parse($input);
-			$this->assertEquals($expected, $result);
-
-			$input = '[url]/foobar[/url]';
-			$expected = array(
-				'a' => array(
-					'href' => '/foobar',
-				),
-				'preg:/\/foobar/',
-				'/a',
-			);
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-
-			// test lokaler server with absolute url
-			$input = '[url=/foobar]foobar[/url]';
-			$expected = "<a href='/foobar'>foobar</a>";
-			$result = $this->_Parser->parse($input);
-			$this->assertEquals($expected, $result);
-
-			// test 'http://' only
-			$input = '[url=http://]foobar[/url]';
-			$expected = "<a href='http://'>foobar</a>";
-			$result = $this->_Parser->parse($input);
-			$this->assertEquals($expected, $result);
-
-			// test for co.uk
-			$input = '[url=http://heise.co.uk/foobar]foobar[/url]';
-			$expected = array(
-				'a' => array(
-					'href' => 'http://heise.co.uk/foobar',
-					'rel' => 'external',
-					'target' => '_blank'
-				),
-				'foobar',
-				'/a',
-				'span' => array('class' => 'richtext-linkInfo'), '[heise.co.uk]',
-				'/span'
-			);
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-		}
-
-		public function testHashLinkSuccess() {
-			// inline content ([i])
-			$input = "[i]#2234[/i]";
-			$expected = [
-				'em' => [],
-				'a' => [
-					'href' => '/hash/2234'
-				],
-				'#2234',
-				'/a',
-				'/em'
-			];
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-
-			// lists
-			$input = "[list][*]#2234[/list]";
-			$expected = [
-				'ul' => true,
-				'li' => true,
-				'a' => [
-					'href' => '/hash/2234'
-				],
-				'#2234',
-				'/a',
-				'/li',
-				'/ul'
-			];
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-		}
-
-		public function testHashLinkFailure() {
-			// don't hash code
-			$input = '[code]#2234[/code]';
-			$result = $this->_Parser->parse($input);
-			$this->assertNotContains('>#2234</a>', $result);
-
-			// not a valid hash
-			$input = '#2234t';
-			$result = $this->_Parser->parse($input);
-			$this->assertEquals('#2234t', $result);
-		}
-
-		public function testAtLinkKnownUsers() {
-			$input = '@Alice @Bob @Bobby Junior @Bobby Tables @Dr. No';
-			$expected =
-				"<a href='/at/Alice'>@Alice</a>" .
-				" @Bob " .
-				"<a href='/at/Bobby+Junior'>@Bobby Junior</a>" .
-				" @Bobby Tables " .
-				"<a href='/at/Dr.+No'>@Dr. No</a>";
-
-			$result = $this->_Parser->parse($input);
-			$this->assertEquals($expected, $result, '@User string is not replaced with link to user profile.');
-
-			$input = '[code]@Alice[/code]';
-			$result = $this->_Parser->parse($input);
-			$this->assertNotContains('>@Alice</a>', $result);
-		}
-
-		public function testAtLinkKnownUsersLinebreak() {
-			$input = "@Alice\nfoo";
-			$result = $this->_Parser->parse($input);
-			$expected = [
-				'a' => ['href' => '/at/Alice'],
-				'@Alice',
-				'/a',
-				'br' => true
-			];
-			$this->assertTags($result, $expected);
-		}
-
-		public function testLinkEmptyUrl() {
-			$input = '[url=][/url]';
-			$expected = "<a href=''></a>";
-			$result = $this->_Parser->parse($input);
-			$this->assertEquals($expected, $result);
-		}
-
-		public function testEditMarker() {
-			$input = 'pre [e] post';
-			$expected = [
-				'pre ',
-				'span' => [
-					'class' => 'richtext-editMark'
-				],
-				'/span',
-				' post'
-			];
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-		}
-
-		/*
+    use Plugin\BbcodeParser\Lib;
+    use Saito\User\Userlist;
+
+    App::import('Lib', 'Stopwatch.Stopwatch');
+    App::import('Helper',
+        array(
+            'FileUpload.FileUpload',
+            'CakephpGeshi.Geshi',
+        ));
+    App::import('Helper', 'MailObfuscator.MailObfuscator');
+
+    App::uses('Controller', 'Controller');
+    App::uses('View', 'View');
+    App::uses('ParserHelper', 'View/Helper');
+    App::uses('HtmlHelper', 'View/Helper');
+    App::uses('CakeRequest', 'Network');
+
+    class BbcodeParserTest extends CakeTestCase {
+
+        protected $_Parser = null;
+
+        public function testBold() {
+            $input = '[b]bold[/b]';
+            $expected = array('strong' => array(), 'bold', '/strong');
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+        }
+
+        public function testQuoteblock() {
+            $input = '[quote]foo bar[/quote]';
+            $expected = array('blockquote' => array(), 'foo bar', '/blockquote');
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+        }
+
+        public function testEmphasis() {
+            $input = '[i]italic[/i]';
+            $expected = array('em' => array(), 'italic', '/em');
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+        }
+
+        public function testStrike() {
+            $expected = ['del' => [], 'text', '/del'];
+
+            // [strike]
+            $input = '[strike]text[/strike]';
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+
+            // [s]
+            $input = '[s]text[/s]';
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+        }
+
+        public function testSpoiler() {
+            $input = 'pre [spoiler] te "\' xt[/spoiler]';
+            $expected = [
+                'pre',
+                [
+                    'div' => [
+                        'class' => 'richtext-spoiler',
+                        'style' => 'display: inline;'
+                    ]
+                ],
+                ['script' => true],
+                'preg:/(.*?)"string":" te &quot;&#039; xt"(.*?)(?=<)/',
+                '/script',
+                [
+                    'a' => [
+                        'href' => '#',
+                        'class' => 'richtext-spoiler-link',
+                        'onclick'
+                    ]
+                ],
+                'preg:/.*▇ Spoiler ▇.*?(?=<)/',
+                '/a',
+                '/div'
+            ];
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected, true);
+        }
+
+        public function testList() {
+            $input = "[list]\n[*]fooo\n[*]bar\n[/list]";
+            $expected = [
+                ['ul' => []],
+                ['li' => []],
+                'fooo',
+                ['br' => []],
+                '/li',
+                ['li' => []],
+                'bar',
+                ['br' => []],
+                '/li',
+                '/ul'
+            ];
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+        }
+
+        public function testMaskLinkWithoutProtocol() {
+            $input = '[url=thetempe.st/station]purge[/url]';
+            $expected = [
+                'a' => [
+                    'href' => 'http://thetempe.st/station',
+                    'rel' => 'external',
+                    'target' => '_blank'
+                ],
+                'purge',
+                '/a'
+            ];
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+        }
+
+        public function testParserEngineCaching() {
+            $input = '[img=]foo.png[/img]';
+            $result = $this->_Parser->parse($input, ['multimedia' => true]);
+            $this->assertContains('<img src', $result);
+            $result = $this->_Parser->parse($input, ['multimedia' => false]);
+            $this->assertNotContains('<img src', $result);
+        }
+
+        public function testLink() {
+            $input = '[url=http://cgi.ebay.de/ws/eBayISAPI.dll?ViewItem&item=250678480561&ssPageName=ADME:X:RTQ:DE:1123]test[/url]';
+            $expected = "<a href='http://cgi.ebay.de/ws/eBayISAPI.dll?ViewItem&amp;item=250678480561&amp;ssPageName=ADME:X:RTQ:DE:1123' rel='external' target='_blank'>test</a> <span class='richtext-linkInfo'>[ebay.de]</span>";
+            $result = $this->_Parser->parse($input);
+            $this->assertEquals($expected, $result);
+
+            /**
+             * external server
+             */
+            $input = '[url]http://heise.de/foobar[/url]';
+            $expected = array(
+                'a' => array(
+                    'href' => 'http://heise.de/foobar',
+                    'rel' => 'external',
+                    'target' => '_blank'
+                ),
+                'http://heise.de/foobar',
+                '/a'
+            );
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+
+            $input = '[link]http://heise.de/foobar[/link]';
+            $expected = array(
+                'a' => array(
+                    'href' => 'http://heise.de/foobar',
+                    'rel' => 'external',
+                    'target' => '_blank'
+                ),
+                'http://heise.de/foobar',
+                '/a'
+            );
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+
+            // masked link
+            $input = '[url=http://heise.de/foobar]foobar[/url]';
+            $expected = array(
+                'a' => array(
+                    'href' => 'http://heise.de/foobar',
+                    'rel' => 'external',
+                    'target' => '_blank'
+                ),
+                'foobar',
+                '/a',
+                'span' => array('class' => 'richtext-linkInfo'), '[heise.de]', '/span'
+            );
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+
+            // masked link with no label
+            $input = '[url=http://heise.de/foobar  label=none ]foobar[/url]';
+            $expected = array(
+                'a' => array(
+                    'href' => 'http://heise.de/foobar',
+                    'rel' => 'external',
+                    'target' => '_blank',
+                ),
+                'foobar',
+                '/a',
+            );
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+
+            /**
+             * local server
+             */
+            $input = '[url=http://macnemo.de/foobar]foobar[/url]';
+            $expected = "<a href='http://macnemo.de/foobar'>foobar</a>";
+            $result = $this->_Parser->parse($input);
+            $this->assertEquals($expected, $result);
+
+            $input = '[url]/foobar[/url]';
+            $expected = array(
+                'a' => array(
+                    'href' => '/foobar',
+                ),
+                'preg:/\/foobar/',
+                '/a',
+            );
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+
+            // test lokaler server with absolute url
+            $input = '[url=/foobar]foobar[/url]';
+            $expected = "<a href='/foobar'>foobar</a>";
+            $result = $this->_Parser->parse($input);
+            $this->assertEquals($expected, $result);
+
+            // test 'http://' only
+            $input = '[url=http://]foobar[/url]';
+            $expected = "<a href='http://'>foobar</a>";
+            $result = $this->_Parser->parse($input);
+            $this->assertEquals($expected, $result);
+
+            // test for co.uk
+            $input = '[url=http://heise.co.uk/foobar]foobar[/url]';
+            $expected = array(
+                'a' => array(
+                    'href' => 'http://heise.co.uk/foobar',
+                    'rel' => 'external',
+                    'target' => '_blank'
+                ),
+                'foobar',
+                '/a',
+                'span' => array('class' => 'richtext-linkInfo'), '[heise.co.uk]',
+                '/span'
+            );
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+        }
+
+        public function testHashLinkSuccess() {
+            // inline content ([i])
+            $input = "[i]#2234[/i]";
+            $expected = [
+                'em' => [],
+                'a' => [
+                    'href' => '/hash/2234'
+                ],
+                '#2234',
+                '/a',
+                '/em'
+            ];
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+
+            // lists
+            $input = "[list][*]#2234[/list]";
+            $expected = [
+                'ul' => true,
+                'li' => true,
+                'a' => [
+                    'href' => '/hash/2234'
+                ],
+                '#2234',
+                '/a',
+                '/li',
+                '/ul'
+            ];
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+        }
+
+        public function testHashLinkFailure() {
+            // don't hash code
+            $input = '[code]#2234[/code]';
+            $result = $this->_Parser->parse($input);
+            $this->assertNotContains('>#2234</a>', $result);
+
+            // not a valid hash
+            $input = '#2234t';
+            $result = $this->_Parser->parse($input);
+            $this->assertEquals('#2234t', $result);
+        }
+
+        public function testAtLinkKnownUsers() {
+            $input = '@Alice @Bob @Bobby Junior @Bobby Tables @Dr. No';
+            $expected =
+                "<a href='/at/Alice'>@Alice</a>" .
+                " @Bob " .
+                "<a href='/at/Bobby+Junior'>@Bobby Junior</a>" .
+                " @Bobby Tables " .
+                "<a href='/at/Dr.+No'>@Dr. No</a>";
+
+            $result = $this->_Parser->parse($input);
+            $this->assertEquals($expected, $result, '@User string is not replaced with link to user profile.');
+
+            $input = '[code]@Alice[/code]';
+            $result = $this->_Parser->parse($input);
+            $this->assertNotContains('>@Alice</a>', $result);
+        }
+
+        public function testAtLinkKnownUsersLinebreak() {
+            $input = "@Alice\nfoo";
+            $result = $this->_Parser->parse($input);
+            $expected = [
+                'a' => ['href' => '/at/Alice'],
+                '@Alice',
+                '/a',
+                'br' => true
+            ];
+            $this->assertTags($result, $expected);
+        }
+
+        public function testLinkEmptyUrl() {
+            $input = '[url=][/url]';
+            $expected = "<a href=''></a>";
+            $result = $this->_Parser->parse($input);
+            $this->assertEquals($expected, $result);
+        }
+
+        public function testEditMarker() {
+            $input = 'pre [e] post';
+            $expected = [
+                'pre ',
+                'span' => [
+                    'class' => 'richtext-editMark'
+                ],
+                '/span',
+                ' post'
+            ];
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+        }
+
+        /*
 		 * without obfuscator
 		 *
 		public function testEmail() {
@@ -362,697 +362,697 @@ 
 		}
 				*/
 
-		public function testEmailMailto() {
-			$MO = $this->getMock('MailObfuscator', array('link'));
-			$MO->expects($this->once(4))
-				->method('link')
-				->with('mail@tosomeone.com', null);
-			$this->_Helper->MailObfuscator = $MO;
-
-			$input = '[email]mailto:mail@tosomeone.com[/email]';
-			$this->_Parser->parse($input);
-		}
-
-		public function testEmailMailtoMask() {
-			$MO = $this->getMock('MailObfuscator', array('link'));
-			$MO->expects($this->once(4))
-				->method('link')
-				->with('mail@tosomeone.com', 'Mail');
-			$this->_Helper->MailObfuscator = $MO;
-
-			$input = '[email=mailto:mail@tosomeone.com]Mail[/email]';
-			$this->_Parser->parse($input);
-		}
-
-		public function testEmailNoMailto() {
-			$MO = $this->getMock('MailObfuscator', array('link'));
-			$MO->expects($this->once(4))
-				->method('link')
-				->with('mail@tosomeone.com', null);
-			$this->_Helper->MailObfuscator = $MO;
-
-			$input = '[email]mail@tosomeone.com[/email]';
-			$this->_Parser->parse($input);
-		}
-
-		public function testEmailNoMailtoMask() {
-			$MO = $this->getMock('MailObfuscator', array('link'));
-			$MO->expects($this->once(4))
-				->method('link')
-				->with('mail@tosomeone.com', 'Mail');
-			$this->_Helper->MailObfuscator = $MO;
-
-			$input = '[email=mail@tosomeone.com]Mail[/email]';
-			$this->_Parser->parse($input);
-		}
-
-		public function testFlash() {
-			$bbcode = '[flash_video]//www.youtube.com/v/MrBRPYlrGF8?version=3&amp;hl=en_US|560|315[/flash_video]';
-			$expected = <<<EOF
+        public function testEmailMailto() {
+            $MO = $this->getMock('MailObfuscator', array('link'));
+            $MO->expects($this->once(4))
+                ->method('link')
+                ->with('mail@tosomeone.com', null);
+            $this->_Helper->MailObfuscator = $MO;
+
+            $input = '[email]mailto:mail@tosomeone.com[/email]';
+            $this->_Parser->parse($input);
+        }
+
+        public function testEmailMailtoMask() {
+            $MO = $this->getMock('MailObfuscator', array('link'));
+            $MO->expects($this->once(4))
+                ->method('link')
+                ->with('mail@tosomeone.com', 'Mail');
+            $this->_Helper->MailObfuscator = $MO;
+
+            $input = '[email=mailto:mail@tosomeone.com]Mail[/email]';
+            $this->_Parser->parse($input);
+        }
+
+        public function testEmailNoMailto() {
+            $MO = $this->getMock('MailObfuscator', array('link'));
+            $MO->expects($this->once(4))
+                ->method('link')
+                ->with('mail@tosomeone.com', null);
+            $this->_Helper->MailObfuscator = $MO;
+
+            $input = '[email]mail@tosomeone.com[/email]';
+            $this->_Parser->parse($input);
+        }
+
+        public function testEmailNoMailtoMask() {
+            $MO = $this->getMock('MailObfuscator', array('link'));
+            $MO->expects($this->once(4))
+                ->method('link')
+                ->with('mail@tosomeone.com', 'Mail');
+            $this->_Helper->MailObfuscator = $MO;
+
+            $input = '[email=mail@tosomeone.com]Mail[/email]';
+            $this->_Parser->parse($input);
+        }
+
+        public function testFlash() {
+            $bbcode = '[flash_video]//www.youtube.com/v/MrBRPYlrGF8?version=3&amp;hl=en_US|560|315[/flash_video]';
+            $expected = <<<EOF
 			<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="560" height="315">
 									<param name="movie" value="//www.youtube.com/v/MrBRPYlrGF8?version=3&amp;amp;hl=en_US"></param>
 									<embed src="//www.youtube.com/v/MrBRPYlrGF8?version=3&amp;amp;hl=en_US" width="560" height="315" type="application/x-shockwave-flash" wmode="opaque" style="width:560px; height:315px;" id="VideoPlayback" flashvars=""> </embed> </object>
 EOF;
-			$actual = $this->_Parser->parse($bbcode, ['video_domains_allowed' => 'youtube']);
-			$this->assertEquals(trim($expected), trim($actual));
-		}
-
-		public function testFloat() {
-			$expected = [
-				['div' => ['class' => 'clearfix']],
-				'/div',
-				['div' => ['class' => 'richtext-float']],
-				'text',
-				'/div',
-				'more'
-			];
-
-			$input = '[float]text[/float]more';
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-		}
-
-		public function testLinkAuto() {
-			$input = 'http://heise.de/foobar';
-			$expected = "<a href='http://heise.de/foobar' rel='external' target='_blank'>http://heise.de/foobar</a>";
-			$result = $this->_Parser->parse($input);
-			$this->assertEquals($expected, $result);
-
-			// autolink surrounded by text
-			$input = 'some http://heise.de/foobar text';
-			$expected = "some <a href='http://heise.de/foobar' rel='external' target='_blank'>http://heise.de/foobar</a> text";
-			$result = $this->_Parser->parse($input);
-			$this->assertEquals($expected, $result);
-
-			// no autolink in [code]
-			$input = '[code]http://heise.de/foobar[/code]';
-			$needle = 'heise.de/foobar</a>';
-			$result = $this->_Parser->parse($input);
-			$this->assertNotContains($result, $needle);
-
-			// no autolink in [url]
-			$input = '[url=http://a.com/]http://b.de/[/url]';
-			$result = $this->_Parser->parse($input);
-			$this->assertRegExp('#href=["\']http://a.com/["\'][^>]*?>http://b.de/#', $result);
-
-			// email autolink
-			$input = 'text mail@tosomeone.com test';
-			// $expected = "text <a href='mailto:mail@tosomeone.com'>mail@tosomeone.com</a> test";
-			$result = $this->_Parser->parse($input);
-			// $this->assertEquals($expected, $result);
-			// @bogus weak test
-			$this->assertRegExp('/^text .*href=".* test$/sm', $result);
-
-			//# in list
-			$input = <<<EOF
+            $actual = $this->_Parser->parse($bbcode, ['video_domains_allowed' => 'youtube']);
+            $this->assertEquals(trim($expected), trim($actual));
+        }
+
+        public function testFloat() {
+            $expected = [
+                ['div' => ['class' => 'clearfix']],
+                '/div',
+                ['div' => ['class' => 'richtext-float']],
+                'text',
+                '/div',
+                'more'
+            ];
+
+            $input = '[float]text[/float]more';
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+        }
+
+        public function testLinkAuto() {
+            $input = 'http://heise.de/foobar';
+            $expected = "<a href='http://heise.de/foobar' rel='external' target='_blank'>http://heise.de/foobar</a>";
+            $result = $this->_Parser->parse($input);
+            $this->assertEquals($expected, $result);
+
+            // autolink surrounded by text
+            $input = 'some http://heise.de/foobar text';
+            $expected = "some <a href='http://heise.de/foobar' rel='external' target='_blank'>http://heise.de/foobar</a> text";
+            $result = $this->_Parser->parse($input);
+            $this->assertEquals($expected, $result);
+
+            // no autolink in [code]
+            $input = '[code]http://heise.de/foobar[/code]';
+            $needle = 'heise.de/foobar</a>';
+            $result = $this->_Parser->parse($input);
+            $this->assertNotContains($result, $needle);
+
+            // no autolink in [url]
+            $input = '[url=http://a.com/]http://b.de/[/url]';
+            $result = $this->_Parser->parse($input);
+            $this->assertRegExp('#href=["\']http://a.com/["\'][^>]*?>http://b.de/#', $result);
+
+            // email autolink
+            $input = 'text mail@tosomeone.com test';
+            // $expected = "text <a href='mailto:mail@tosomeone.com'>mail@tosomeone.com</a> test";
+            $result = $this->_Parser->parse($input);
+            // $this->assertEquals($expected, $result);
+            // @bogus weak test
+            $this->assertRegExp('/^text .*href=".* test$/sm', $result);
+
+            //# in list
+            $input = <<<EOF
 [list]
 [*] http://heise.de
 [/list]
 EOF;
-			$result = $this->_Parser->parse($input);
-			$expected = "<a href='http://heise.de";
-			$this->assertTextContains($expected, $result);
-		}
-
-		public function testLinkAutoWithoutHttpPrefix() {
-			$input = 'some www.example.com/foobar text';
-			$expected = [
-				'some ',
-				'a' => [
-					'href' => 'http://www.example.com/foobar',
-					'rel' => 'external',
-					'target' => '_blank',
-				],
-				'http://www.example.com/foobar',
-				'/a',
-				' text'
-			];
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-		}
-
-		public function testLinkAutoUrlWithinParentheses() {
-			$input = 'some (www.example.com/foobar) text';
-			$expected = [
-				'some (',
-				'a' => [
-					'href' => 'http://www.example.com/foobar',
-					'rel' => 'external',
-					'target' => '_blank',
-				],
-				'http://www.example.com/foobar',
-				'/a',
-				') text'
-			];
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-		}
-
-		public function testLinkAutoSurroundingChars() {
-			$input = 'text http://example.com/?foo,,, text';
-			$result = $this->_Parser->parse($input);
-			$expected = [
-				'text ',
-				'a' => [
-					'href' => 'http://example.com/?foo,,',
-					'rel' => 'external',
-					'target' => '_blank',
-				],
-				'http://example.com/?foo,,',
-				'/a',
-				', text'
-			];
-			$this->assertTags($result, $expected);
-
-			// Question mark
-			$input = 'question http://example.com/? Text';
-			$result = $this->_Parser->parse($input);
-			$expected = [
-				'question ',
-				'a' => [
-					'href' => 'http://example.com/',
-					'rel' => 'external',
-					'target' => '_blank',
-				],
-				'http://example.com/',
-				'/a',
-				'? Text'
-			];
-			$this->assertTags($result, $expected);
-
-			// No Question mark but url
-			$input = 'no question http://example.com/?foo=bar text';
-			$result = $this->_Parser->parse($input);
-			$expected = [
-				'no question ',
-				'a' => [
-					'href' => 'http://example.com/?foo=bar',
-					'rel' => 'external',
-					'target' => '_blank',
-				],
-				'http://example.com/?foo=bar',
-				'/a',
-				' text'
-			];
-			$this->assertTags($result, $expected);
-		}
-
-		public function testReturnText() {
-			$in = 'test [b]test[b] test';
-			$expected = 'test test test';
-			$actual = $this->_Parser->parse($in, ['return' => 'text']);
-			$this->assertEquals($expected, $actual);
-		}
-
-		public function testShortenLink() {
-			$maxLength = 15;
-
-			$input = '[url]http://this/url/is/32/chars/long[/url]';
-			$expected = "<a href='http://this/url/is/32/chars/long' rel='external' target='_blank'>http:// … /long</a>";
-			$result = $this->_Parser->parse($input, ['text_word_maxlength' => $maxLength]);
-			$this->assertEquals($expected, $result);
-
-			$input = 'http://this/url/is/32/chars/long';
-			$expected = "<a href='http://this/url/is/32/chars/long' rel='external' target='_blank'>http:// … /long</a>";
-			$result = $this->_Parser->parse($input, ['text_word_maxlength' => $maxLength]);
-			$this->assertEquals($expected, $result);
-		}
-
-		public function testIframe() {
-			//* test allowed domain
-			$input = '[iframe height=349 width=560 ' .
-				'src=http://www.youtube.com/embed/HdoW3t_WorU ' .
-				'frameborder=0][/iframe]';
-			$expected = [
-				['iframe' => [
-					'src' => 'http://www.youtube.com/embed/HdoW3t_WorU?&wmode=Opaque',
-					'height' => '349',
-					'width' => '560',
-					'frameborder' => '0']
-				],
-				'/iframe',
-			];
-			$result = $this->_Parser->parse($input, ['video_domains_allowed' => 'youtube | vimeo']);
-			$this->assertTags($result, $expected);
-
-			//* test forbidden domains
-			$input = '[iframe height=349 width=560 ' .
-				'src=http://www.youtubescam.com/embed/HdoW3t_WorU ' .
-				'frameborder=0][/iframe]';
-			$expected = '/src/i';
-			$result = $this->_Parser->parse($input, ['video_domains_allowed' => 'youtube | vimeo']);
-			$this->assertNoPattern($expected, $result);
-		}
-
-		public function testIframeAllDomainsAllowed() {
-			$input = '[iframe height=349 width=560 ' .
-				'src=http://www.youtubescam.com/embed/HdoW3t_WorU ' .
-				'][/iframe]';
-			$expected = 'src="http://www.youtubescam.com/embed/HdoW3t_WorU';
-			$result = $this->_Parser->parse($input, ['video_domains_allowed' => '*']);
-			$this->assertContains($expected, $result);
-		}
-
-		public function testIframeNoDomainAllowed() {
-			$input = '[iframe height=349 width=560 ' .
-				'src=http://www.youtubescam.com/embed/HdoW3t_WorU ' .
-				'][/iframe]';
-			$expected = '/src/i';
-			$result = $this->_Parser->parse($input, ['video_domains_allowed' => '']);
-			$this->assertNotRegExp($expected, $result);
-		}
-
-		public function testExternalImage() {
-			$bbcodeImg = Configure::read('Saito.Settings.bbcode_img');
-			Configure::write('Saito.Settings.bbcode_img', true);
-
-			// test for standard URIs
-			$input = '[img]http://localhost/img/macnemo.png[/img]';
-			$expected = '<img src="http://localhost/img/macnemo.png" alt=""/>';
-			$result = $this->_Parser->parse($input);
-			$this->assertEquals($expected, $result);
-
-			// test for URIs without protocol
-			$input = '[img]/somewhere/macnemo.png[/img]';
-			$expected = '<img src="' . $this->_Helper->webroot . 'somewhere/macnemo.png" alt=""/>';
-			$result = $this->_Parser->parse($input);
-			$this->assertEquals($expected, $result);
-
-			// test scaling with 1 parameter
-			$input = '[img=50]http://localhost/img/macnemo.png[/img]';
-			$expected = '<img src="http://localhost/img/macnemo.png" width="50" alt=""/>';
-			$result = $this->_Parser->parse($input);
-			$this->assertEquals($expected, $result);
-
-			// test scaling with 2 parameters
-			$input = '[img=50x100]http://localhost/img/macnemo.png[/img]';
-			$expected = '<img src="http://localhost/img/macnemo.png" width="50" height="100" alt=""/>';
-			$result = $this->_Parser->parse($input);
-			$this->assertEquals($expected, $result);
-
-			// float left
-			$input = '[img=left]http://localhost/img/macnemo.png[/img]';
-			$expected = array(
-				array('img' => array(
-					'src' => 'http://localhost/img/macnemo.png',
-					'style' => "float: left;",
-					'alt' => "",
-				))
-			);
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-
-			// float right
-			$input = '[img=right]http://localhost/img/macnemo.png[/img]';
-			$expected = array(
-				array('img' => array(
-					'src' => 'http://localhost/img/macnemo.png',
-					'style' => "float: right;",
-					'alt' => "",
-				))
-			);
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-
-			Configure::write('Saito.Settings.bbcode_img', $bbcodeImg);
-		}
-
-		public function testImageNestedInExternalLink() {
-			$bbcodeImg = Configure::read('Saito.Settings.bbcode_img');
-			Configure::write('Saito.Settings.bbcode_img', true);
-
-			$input = '[url=http://heise.de][img]http://heise.de/img.png[/img][/url]';
-
-			/*
+            $result = $this->_Parser->parse($input);
+            $expected = "<a href='http://heise.de";
+            $this->assertTextContains($expected, $result);
+        }
+
+        public function testLinkAutoWithoutHttpPrefix() {
+            $input = 'some www.example.com/foobar text';
+            $expected = [
+                'some ',
+                'a' => [
+                    'href' => 'http://www.example.com/foobar',
+                    'rel' => 'external',
+                    'target' => '_blank',
+                ],
+                'http://www.example.com/foobar',
+                '/a',
+                ' text'
+            ];
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+        }
+
+        public function testLinkAutoUrlWithinParentheses() {
+            $input = 'some (www.example.com/foobar) text';
+            $expected = [
+                'some (',
+                'a' => [
+                    'href' => 'http://www.example.com/foobar',
+                    'rel' => 'external',
+                    'target' => '_blank',
+                ],
+                'http://www.example.com/foobar',
+                '/a',
+                ') text'
+            ];
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+        }
+
+        public function testLinkAutoSurroundingChars() {
+            $input = 'text http://example.com/?foo,,, text';
+            $result = $this->_Parser->parse($input);
+            $expected = [
+                'text ',
+                'a' => [
+                    'href' => 'http://example.com/?foo,,',
+                    'rel' => 'external',
+                    'target' => '_blank',
+                ],
+                'http://example.com/?foo,,',
+                '/a',
+                ', text'
+            ];
+            $this->assertTags($result, $expected);
+
+            // Question mark
+            $input = 'question http://example.com/? Text';
+            $result = $this->_Parser->parse($input);
+            $expected = [
+                'question ',
+                'a' => [
+                    'href' => 'http://example.com/',
+                    'rel' => 'external',
+                    'target' => '_blank',
+                ],
+                'http://example.com/',
+                '/a',
+                '? Text'
+            ];
+            $this->assertTags($result, $expected);
+
+            // No Question mark but url
+            $input = 'no question http://example.com/?foo=bar text';
+            $result = $this->_Parser->parse($input);
+            $expected = [
+                'no question ',
+                'a' => [
+                    'href' => 'http://example.com/?foo=bar',
+                    'rel' => 'external',
+                    'target' => '_blank',
+                ],
+                'http://example.com/?foo=bar',
+                '/a',
+                ' text'
+            ];
+            $this->assertTags($result, $expected);
+        }
+
+        public function testReturnText() {
+            $in = 'test [b]test[b] test';
+            $expected = 'test test test';
+            $actual = $this->_Parser->parse($in, ['return' => 'text']);
+            $this->assertEquals($expected, $actual);
+        }
+
+        public function testShortenLink() {
+            $maxLength = 15;
+
+            $input = '[url]http://this/url/is/32/chars/long[/url]';
+            $expected = "<a href='http://this/url/is/32/chars/long' rel='external' target='_blank'>http:// … /long</a>";
+            $result = $this->_Parser->parse($input, ['text_word_maxlength' => $maxLength]);
+            $this->assertEquals($expected, $result);
+
+            $input = 'http://this/url/is/32/chars/long';
+            $expected = "<a href='http://this/url/is/32/chars/long' rel='external' target='_blank'>http:// … /long</a>";
+            $result = $this->_Parser->parse($input, ['text_word_maxlength' => $maxLength]);
+            $this->assertEquals($expected, $result);
+        }
+
+        public function testIframe() {
+            //* test allowed domain
+            $input = '[iframe height=349 width=560 ' .
+                'src=http://www.youtube.com/embed/HdoW3t_WorU ' .
+                'frameborder=0][/iframe]';
+            $expected = [
+                ['iframe' => [
+                    'src' => 'http://www.youtube.com/embed/HdoW3t_WorU?&wmode=Opaque',
+                    'height' => '349',
+                    'width' => '560',
+                    'frameborder' => '0']
+                ],
+                '/iframe',
+            ];
+            $result = $this->_Parser->parse($input, ['video_domains_allowed' => 'youtube | vimeo']);
+            $this->assertTags($result, $expected);
+
+            //* test forbidden domains
+            $input = '[iframe height=349 width=560 ' .
+                'src=http://www.youtubescam.com/embed/HdoW3t_WorU ' .
+                'frameborder=0][/iframe]';
+            $expected = '/src/i';
+            $result = $this->_Parser->parse($input, ['video_domains_allowed' => 'youtube | vimeo']);
+            $this->assertNoPattern($expected, $result);
+        }
+
+        public function testIframeAllDomainsAllowed() {
+            $input = '[iframe height=349 width=560 ' .
+                'src=http://www.youtubescam.com/embed/HdoW3t_WorU ' .
+                '][/iframe]';
+            $expected = 'src="http://www.youtubescam.com/embed/HdoW3t_WorU';
+            $result = $this->_Parser->parse($input, ['video_domains_allowed' => '*']);
+            $this->assertContains($expected, $result);
+        }
+
+        public function testIframeNoDomainAllowed() {
+            $input = '[iframe height=349 width=560 ' .
+                'src=http://www.youtubescam.com/embed/HdoW3t_WorU ' .
+                '][/iframe]';
+            $expected = '/src/i';
+            $result = $this->_Parser->parse($input, ['video_domains_allowed' => '']);
+            $this->assertNotRegExp($expected, $result);
+        }
+
+        public function testExternalImage() {
+            $bbcodeImg = Configure::read('Saito.Settings.bbcode_img');
+            Configure::write('Saito.Settings.bbcode_img', true);
+
+            // test for standard URIs
+            $input = '[img]http://localhost/img/macnemo.png[/img]';
+            $expected = '<img src="http://localhost/img/macnemo.png" alt=""/>';
+            $result = $this->_Parser->parse($input);
+            $this->assertEquals($expected, $result);
+
+            // test for URIs without protocol
+            $input = '[img]/somewhere/macnemo.png[/img]';
+            $expected = '<img src="' . $this->_Helper->webroot . 'somewhere/macnemo.png" alt=""/>';
+            $result = $this->_Parser->parse($input);
+            $this->assertEquals($expected, $result);
+
+            // test scaling with 1 parameter
+            $input = '[img=50]http://localhost/img/macnemo.png[/img]';
+            $expected = '<img src="http://localhost/img/macnemo.png" width="50" alt=""/>';
+            $result = $this->_Parser->parse($input);
+            $this->assertEquals($expected, $result);
+
+            // test scaling with 2 parameters
+            $input = '[img=50x100]http://localhost/img/macnemo.png[/img]';
+            $expected = '<img src="http://localhost/img/macnemo.png" width="50" height="100" alt=""/>';
+            $result = $this->_Parser->parse($input);
+            $this->assertEquals($expected, $result);
+
+            // float left
+            $input = '[img=left]http://localhost/img/macnemo.png[/img]';
+            $expected = array(
+                array('img' => array(
+                    'src' => 'http://localhost/img/macnemo.png',
+                    'style' => "float: left;",
+                    'alt' => "",
+                ))
+            );
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+
+            // float right
+            $input = '[img=right]http://localhost/img/macnemo.png[/img]';
+            $expected = array(
+                array('img' => array(
+                    'src' => 'http://localhost/img/macnemo.png',
+                    'style' => "float: right;",
+                    'alt' => "",
+                ))
+            );
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+
+            Configure::write('Saito.Settings.bbcode_img', $bbcodeImg);
+        }
+
+        public function testImageNestedInExternalLink() {
+            $bbcodeImg = Configure::read('Saito.Settings.bbcode_img');
+            Configure::write('Saito.Settings.bbcode_img', true);
+
+            $input = '[url=http://heise.de][img]http://heise.de/img.png[/img][/url]';
+
+            /*
 			$expected = "<a href='http://heise.de' rel='external' target='_blank'><img src=\"http://heise.de/img.png\" class=\"external_image\" style=\"\" width=\"auto\" height=\"auto\" alt=\"\" /></a>";
 			*/
-			$expected = [
-				[
-					'a' => [
-						'href' => 'http://heise.de',
-						'rel' => 'external',
-						'target' => '_blank',
-					]
-				],
-				[
-					'img' => [
-						'src' => 'http://heise.de/img.png',
-						'alt' => '',
-					]
-				],
-				'/a'
-			];
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-
-			Configure::write('Saito.Settings.bbcode_img', $bbcodeImg);
-		}
-
-		public function testInternalImage() {
-			// Create a map of arguments to return values.
-			$map = [
-				['test.png', [], '<img src="test.png" />'],
-				[
-					'test.png',
-					[
-						'autoResize' => false,
-						'resizeThumbOnly' => false,
-						'width' => '50',
-						'height' => '60',
-					],
-					'<img src="test.png" width="50" height="60" alt="">'
-				]
-			];
-			$FileUploader = $this->getMock('FileUploaderHelper', ['image', 'reset']);
-			$FileUploader->expects($this->atLeastOnce())
-				->method('image')
-				->will($this->returnValueMap($map));
-			$this->_Helper->FileUpload = $FileUploader;
-
-			// internal image
-			$input = '[upload]test.png[/upload]';
-			$expected = [
-				['img' => ['src' => 'test.png']],
-			];
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-
-			// internal image with attributes
-			$input = '[upload width=50 height=60]test.png[/upload]';
-			$expected = array(
-				['img' =>
-					[
-						'src' => 'test.png',
-						'width' => '50',
-						'height' => '60',
-						'alt' => ''
-					]
-				]
-			);
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-
-			// internal image legacy [img#] tag
-			$input = '[img#]test.png[/img]';
-			$expected = [
-				[
-					'img' => [
-						'src' => 'test.png',
-					]
-				]
-			];
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-
-			// nested image does not have [domain.info]
-			$input = '[url=http://heise.de][upload]test.png[/upload][/url]';
-			$expected = "/richtext-linkInfo/";
-			$result = $this->_Parser->parse($input);
-			$this->assertNotRegExp($expected, $result);
-		}
-
-		public function testSmiliesNoSmiliesInCodeTag() {
-			$input = '[code text]:)[/code]';
-			$needle = '<img';
-			$result = $this->_Parser->parse($input, array('cache' => false));
-			$this->assertNotContains($needle, $result);
-		}
-
-		public function testCodeNestedTags() {
-			$input = '[code][b]text[b][/code]';
-			$expected = [
-				[
-					'div' => ['class' => 'geshi-wrapper']
-				],
-				'preg:/.*?\[b\]text\[b\].*/',
-			];
-			$result = $this->_Parser->parse($input);
-			$this->assertTags($result, $expected);
-		}
-
-		public function testCodeWhitespace() {
-			$input = "[code]\ntest\n[/code]";
-			$expected = "/>test</";
-			$result = $this->_Parser->parse($input);
-			$this->assertRegExp($expected, $result);
-		}
-
-		public function testCodeSimple() {
-			$input = '[code]text[/code]';
-			$result = $this->_Parser->parse($input);
-			$expected = 'lang="text"';
-			$this->assertContains($expected, $result);
-		}
-
-		public function testCodeLangAttribute() {
-			$input = '[code=php]text[/code]';
-			$result = $this->_Parser->parse($input);
-			$expected = 'lang="php"';
-			$this->assertContains($expected, $result);
-		}
-
-		/**
-		 * tests that citation marks are not replaced in code-blocks
-		 */
-		public function testCodeNoCitationMark() {
-			// [code]<citation mark>[/code] should not be cited
-			$input = h(
-				"[code]\n" . $this->_Helper->settings['quote_symbol'] . "\n[/code]"
-			);
-			$expected = '`span class=.*?richtext-citation`';
-			$result = $this->_Parser->parse($input);
-			$this->assertNotRegExp($expected, $result);
-		}
-
-		public function testCodeDetaginize() {
-			$input = '[code bash]pre http://example.com post[/code]';
-			$result = $this->_Parser->parse($input);
-			$this->assertNotContains('autoLink', $result);
-		}
-
-		public function testQuote() {
-			$_qs = h($this->_Helper->settings['quote_symbol']);
-			$input = $_qs . ' fo [b]test[/b] ba';
-			$result = $this->_Parser->parse($input);
-			$expected = [
-				'span' => ['class' => 'richtext-citation'],
-				$_qs . ' fo ',
-				'strong' => [],
-				'test',
-				'/strong',
-				' ba',
-				'/span'
-			];
-			$this->assertTags($result, $expected);
-		}
-
-		public function testHtml5Video() {
-			//* setup
-			$bbcodeImg = Configure::read('Saito.Settings.bbcode_img');
-			Configure::write('Saito.Settings.bbcode_img', true);
-
-			//* @td write video tests
-			$url = 'http://example.com/audio.mp4';
-			$input = "[video]{$url}[/video]";
-			$result = $this->_Parser->parse($input);
-			$expected = array(
-				'video' => array('src' => $url, 'controls' => 'controls',
-					'x-webkit-airplay' => 'allow'),
-			);
-			$this->assertTags($result, $expected);
-
-			//* test autoconversion for audio files
-			$html5AudioExtensions = array('m4a', 'ogg', 'mp3', 'wav', 'opus');
-			foreach ($html5AudioExtensions as $extension) {
-				$url = 'http://example.com/audio.' . $extension;
-				$input = "[video]{$url}[/video]";
-				$result = $this->_Parser->parse($input);
-				$expected = array(
-					'audio' => array('src' => $url, 'controls' => 'controls'),
-				);
-				$this->assertTags($result, $expected);
-			}
-
-			//* teardown
-			Configure::write('Saito.Settings.bbcode_img', $bbcodeImg);
-		}
-
-		public function testHr() {
-			$input = '[hr][hr]';
-			$expected = '<hr><hr>';
-			$result = $this->_Parser->parse($input);
-			$this->assertEquals($result, $expected);
-		}
-
-		public function testHrShort() {
-			$input = '[---][---]';
-			$expected = '<hr><hr>';
-			$result = $this->_Parser->parse($input);
-			$this->assertEquals($result, $expected);
-		}
-
-		public function testEmbedlyDisabled() {
-			$observer = $this->getMock('Embedly', array('setApiKey', 'embedly'));
-			$observer->expects($this->never())
-				->method('setApiKey');
-			$this->_Helper->Embedly = $observer;
-			$input = '[embed]foo[/embed]';
-			$this->_Parser->parse($input);
-		}
-
-		public function testEmbedlyEnabled() {
-			$observer = $this->getMock('Embedly', array('setApiKey', 'embedly'));
-			$observer->expects($this->once())
-				->method('setApiKey')
-				->with($this->equalTo('abc123'));
-			$observer->expects($this->once())
-				->method('embedly')
-				->with($this->equalTo('foo'));
-			$this->_Helper->Embedly = $observer;
-			$input = '[embed]foo[/embed]';
-
-			$this->_Parser->parse($input, [
-				'embedly_enabled' => true,
-				'embedly_key' => 'abc123'
-			]);
-		}
-
-		public function testHtml5Audio() {
-			//* setup
-			$bbcodeImg = Configure::read('Saito.Settings.bbcode_img');
-			Configure::write('Saito.Settings.bbcode_img', true);
-
-			//* simple test
-			$url = 'http://example.com/audio3.m4a';
-			$input = "[audio]{$url}[/audio]";
-			$result = $this->_Parser->parse($input);
-			$expected = array(
-					'audio' => array( 'src' => $url, 'controls' => 'controls' ),
-			);
-			$this->assertTags($result, $expected);
-
-			//* teardown
-			Configure::write('Saito.Settings.bbcode_img', $bbcodeImg);
-		}
-
-		/*		 * ******************** Setup ********************** */
-
-		public function setUp() {
-			Cache::clear();
-
-			Configure::write('Asset.timestamp', false);
-
-			if (isset($_SERVER['SERVER_NAME'])) {
-				$this->server_name = $_SERVER['SERVER_NAME'];
-			} else {
-				$this->server_name = false;
-			}
-
-			if (isset($_SERVER['SERVER_PORT'])) {
-				$this->server_port = $_SERVER['SERVER_PORT'];
-			} else {
-				$this->server_port = false;
-			}
-
-			$this->asset_timestamp = Configure::read('Asset.timestamp');
-
-			$this->text_word_maxlength = Configure::read('Saito.Settings.text_word_maxlength');
-			Configure::write('Saito.Settings.text_word_maxlength', 10000);
-
-			$this->autolink = Configure::read('Saito.Settings.autolink');
-			Configure::write('Saito.Settings.autolink', true);
-
-			$_SERVER['SERVER_NAME'] = 'macnemo.de';
-			$_SERVER['SERVER_PORT'] = '80';
-
-			parent::setUp();
-
-			$Request = new CakeRequest('/');
-			$Controller = new Controller($Request);
-			$View = new View($Controller);
-
-			//= smiley fixture
-			$smiliesFixture = [
-				[
-					'order' => 1,
-					'icon' => 'wink.png',
-					'image' => 'wink.png',
-					'title' => 'Wink',
-					'code' => ';)',
-					'type' => 'image'
-				],
-				[
-					'order' => 2,
-					'icon' => 'smile_icon.svg',
-					'image' => 'smile_image.svg',
-					'title' => 'Smile',
-					'code' => ':-)',
-					'type' => 'image'
-				],
-				[
-					'order' => 3,
-					'icon' => 'coffee',
-					'image' => 'coffee',
-					'title' => 'Coffee',
-					'code' => '[_]P',
-					'type' => 'font'
-				],
-			];
-			Cache::write('Saito.Smilies.data', $smiliesFixture);
-			$SmileyCache = new \Saito\Smiley\Cache($Controller);
-
-			//= userlist fixture
-			$Userlist = new Userlist\UserlistArray();
-			$Userlist->set(['Alice', 'Bobby Junior', 'Dr. No']);
-
-			//= ParserHelper
-			$settings = [
-				'autolink' => true,
-				'bbcode_img' => true,
-				'multimedia' => true,
-				'quote_symbol' => '»',
-				'hashBaseUrl' => '/hash/',
-				'atBaseUrl' => '/at/',
-				'return' => 'html',
-				'smilies' => true,
-				'smiliesData' => $SmileyCache,
-				'text_word_maxlength' => 120,
-				'UserList' => $Userlist,
-				'webroot' => ''
-			];
-			$this->_Helper = $ParserHelper = new ParserHelper($View, $settings);
-			$ParserHelper->beforeRender(null);
-
-			//= Smiley Renderer
-			$SmileyRenderer = new \Saito\Smiley\Renderer($SmileyCache);
-			$SmileyRenderer->setHelper($this->_Helper);
-			$this->_Helper->SmileyRenderer = $SmileyRenderer;
-
-			//= Parser
-			$this->_Parser = new Lib\Parser($ParserHelper, $settings);
-		}
-
-		public function tearDown() {
-			parent::tearDown();
-			if ($this->server_name) {
-				$_SERVER['SERVER_NAME'] = $this->server_name;
-			}
-
-			if ($this->server_name) {
-				$_SERVER['SERVER_PORT'] = $this->server_port;
-			}
-
-			Configure::write('Asset.timestamp', $this->asset_timestamp);
-
-			Configure::write('Saito.Settings.text_word_maxlength',
-					$this->text_word_maxlength);
-
-			Configure::write('Saito.Settings.autolink', $this->autolink);
-
-			Cache::clear();
-			ClassRegistry::flush();
-			unset($this->_Parser);
-		}
-
-	}
+            $expected = [
+                [
+                    'a' => [
+                        'href' => 'http://heise.de',
+                        'rel' => 'external',
+                        'target' => '_blank',
+                    ]
+                ],
+                [
+                    'img' => [
+                        'src' => 'http://heise.de/img.png',
+                        'alt' => '',
+                    ]
+                ],
+                '/a'
+            ];
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+
+            Configure::write('Saito.Settings.bbcode_img', $bbcodeImg);
+        }
+
+        public function testInternalImage() {
+            // Create a map of arguments to return values.
+            $map = [
+                ['test.png', [], '<img src="test.png" />'],
+                [
+                    'test.png',
+                    [
+                        'autoResize' => false,
+                        'resizeThumbOnly' => false,
+                        'width' => '50',
+                        'height' => '60',
+                    ],
+                    '<img src="test.png" width="50" height="60" alt="">'
+                ]
+            ];
+            $FileUploader = $this->getMock('FileUploaderHelper', ['image', 'reset']);
+            $FileUploader->expects($this->atLeastOnce())
+                ->method('image')
+                ->will($this->returnValueMap($map));
+            $this->_Helper->FileUpload = $FileUploader;
+
+            // internal image
+            $input = '[upload]test.png[/upload]';
+            $expected = [
+                ['img' => ['src' => 'test.png']],
+            ];
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+
+            // internal image with attributes
+            $input = '[upload width=50 height=60]test.png[/upload]';
+            $expected = array(
+                ['img' =>
+                    [
+                        'src' => 'test.png',
+                        'width' => '50',
+                        'height' => '60',
+                        'alt' => ''
+                    ]
+                ]
+            );
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+
+            // internal image legacy [img#] tag
+            $input = '[img#]test.png[/img]';
+            $expected = [
+                [
+                    'img' => [
+                        'src' => 'test.png',
+                    ]
+                ]
+            ];
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+
+            // nested image does not have [domain.info]
+            $input = '[url=http://heise.de][upload]test.png[/upload][/url]';
+            $expected = "/richtext-linkInfo/";
+            $result = $this->_Parser->parse($input);
+            $this->assertNotRegExp($expected, $result);
+        }
+
+        public function testSmiliesNoSmiliesInCodeTag() {
+            $input = '[code text]:)[/code]';
+            $needle = '<img';
+            $result = $this->_Parser->parse($input, array('cache' => false));
+            $this->assertNotContains($needle, $result);
+        }
+
+        public function testCodeNestedTags() {
+            $input = '[code][b]text[b][/code]';
+            $expected = [
+                [
+                    'div' => ['class' => 'geshi-wrapper']
+                ],
+                'preg:/.*?\[b\]text\[b\].*/',
+            ];
+            $result = $this->_Parser->parse($input);
+            $this->assertTags($result, $expected);
+        }
+
+        public function testCodeWhitespace() {
+            $input = "[code]\ntest\n[/code]";
+            $expected = "/>test</";
+            $result = $this->_Parser->parse($input);
+            $this->assertRegExp($expected, $result);
+        }
+
+        public function testCodeSimple() {
+            $input = '[code]text[/code]';
+            $result = $this->_Parser->parse($input);
+            $expected = 'lang="text"';
+            $this->assertContains($expected, $result);
+        }
+
+        public function testCodeLangAttribute() {
+            $input = '[code=php]text[/code]';
+            $result = $this->_Parser->parse($input);
+            $expected = 'lang="php"';
+            $this->assertContains($expected, $result);
+        }
+
+        /**
+         * tests that citation marks are not replaced in code-blocks
+         */
+        public function testCodeNoCitationMark() {
+            // [code]<citation mark>[/code] should not be cited
+            $input = h(
+                "[code]\n" . $this->_Helper->settings['quote_symbol'] . "\n[/code]"
+            );
+            $expected = '`span class=.*?richtext-citation`';
+            $result = $this->_Parser->parse($input);
+            $this->assertNotRegExp($expected, $result);
+        }
+
+        public function testCodeDetaginize() {
+            $input = '[code bash]pre http://example.com post[/code]';
+            $result = $this->_Parser->parse($input);
+            $this->assertNotContains('autoLink', $result);
+        }
+
+        public function testQuote() {
+            $_qs = h($this->_Helper->settings['quote_symbol']);
+            $input = $_qs . ' fo [b]test[/b] ba';
+            $result = $this->_Parser->parse($input);
+            $expected = [
+                'span' => ['class' => 'richtext-citation'],
+                $_qs . ' fo ',
+                'strong' => [],
+                'test',
+                '/strong',
+                ' ba',
+                '/span'
+            ];
+            $this->assertTags($result, $expected);
+        }
+
+        public function testHtml5Video() {
+            //* setup
+            $bbcodeImg = Configure::read('Saito.Settings.bbcode_img');
+            Configure::write('Saito.Settings.bbcode_img', true);
+
+            //* @td write video tests
+            $url = 'http://example.com/audio.mp4';
+            $input = "[video]{$url}[/video]";
+            $result = $this->_Parser->parse($input);
+            $expected = array(
+                'video' => array('src' => $url, 'controls' => 'controls',
+                    'x-webkit-airplay' => 'allow'),
+            );
+            $this->assertTags($result, $expected);
+
+            //* test autoconversion for audio files
+            $html5AudioExtensions = array('m4a', 'ogg', 'mp3', 'wav', 'opus');
+            foreach ($html5AudioExtensions as $extension) {
+                $url = 'http://example.com/audio.' . $extension;
+                $input = "[video]{$url}[/video]";
+                $result = $this->_Parser->parse($input);
+                $expected = array(
+                    'audio' => array('src' => $url, 'controls' => 'controls'),
+                );
+                $this->assertTags($result, $expected);
+            }
+
+            //* teardown
+            Configure::write('Saito.Settings.bbcode_img', $bbcodeImg);
+        }
+
+        public function testHr() {
+            $input = '[hr][hr]';
+            $expected = '<hr><hr>';
+            $result = $this->_Parser->parse($input);
+            $this->assertEquals($result, $expected);
+        }
+
+        public function testHrShort() {
+            $input = '[---][---]';
+            $expected = '<hr><hr>';
+            $result = $this->_Parser->parse($input);
+            $this->assertEquals($result, $expected);
+        }
+
+        public function testEmbedlyDisabled() {
+            $observer = $this->getMock('Embedly', array('setApiKey', 'embedly'));
+            $observer->expects($this->never())
+                ->method('setApiKey');
+            $this->_Helper->Embedly = $observer;
+            $input = '[embed]foo[/embed]';
+            $this->_Parser->parse($input);
+        }
+
+        public function testEmbedlyEnabled() {
+            $observer = $this->getMock('Embedly', array('setApiKey', 'embedly'));
+            $observer->expects($this->once())
+                ->method('setApiKey')
+                ->with($this->equalTo('abc123'));
+            $observer->expects($this->once())
+                ->method('embedly')
+                ->with($this->equalTo('foo'));
+            $this->_Helper->Embedly = $observer;
+            $input = '[embed]foo[/embed]';
+
+            $this->_Parser->parse($input, [
+                'embedly_enabled' => true,
+                'embedly_key' => 'abc123'
+            ]);
+        }
+
+        public function testHtml5Audio() {
+            //* setup
+            $bbcodeImg = Configure::read('Saito.Settings.bbcode_img');
+            Configure::write('Saito.Settings.bbcode_img', true);
+
+            //* simple test
+            $url = 'http://example.com/audio3.m4a';
+            $input = "[audio]{$url}[/audio]";
+            $result = $this->_Parser->parse($input);
+            $expected = array(
+                    'audio' => array( 'src' => $url, 'controls' => 'controls' ),
+            );
+            $this->assertTags($result, $expected);
+
+            //* teardown
+            Configure::write('Saito.Settings.bbcode_img', $bbcodeImg);
+        }
+
+        /*		 * ******************** Setup ********************** */
+
+        public function setUp() {
+            Cache::clear();
+
+            Configure::write('Asset.timestamp', false);
+
+            if (isset($_SERVER['SERVER_NAME'])) {
+                $this->server_name = $_SERVER['SERVER_NAME'];
+            } else {
+                $this->server_name = false;
+            }
+
+            if (isset($_SERVER['SERVER_PORT'])) {
+                $this->server_port = $_SERVER['SERVER_PORT'];
+            } else {
+                $this->server_port = false;
+            }
+
+            $this->asset_timestamp = Configure::read('Asset.timestamp');
+
+            $this->text_word_maxlength = Configure::read('Saito.Settings.text_word_maxlength');
+            Configure::write('Saito.Settings.text_word_maxlength', 10000);
+
+            $this->autolink = Configure::read('Saito.Settings.autolink');
+            Configure::write('Saito.Settings.autolink', true);
+
+            $_SERVER['SERVER_NAME'] = 'macnemo.de';
+            $_SERVER['SERVER_PORT'] = '80';
+
+            parent::setUp();
+
+            $Request = new CakeRequest('/');
+            $Controller = new Controller($Request);
+            $View = new View($Controller);
+
+            //= smiley fixture
+            $smiliesFixture = [
+                [
+                    'order' => 1,
+                    'icon' => 'wink.png',
+                    'image' => 'wink.png',
+                    'title' => 'Wink',
+                    'code' => ';)',
+                    'type' => 'image'
+                ],
+                [
+                    'order' => 2,
+                    'icon' => 'smile_icon.svg',
+                    'image' => 'smile_image.svg',
+                    'title' => 'Smile',
+                    'code' => ':-)',
+                    'type' => 'image'
+                ],
+                [
+                    'order' => 3,
+                    'icon' => 'coffee',
+                    'image' => 'coffee',
+                    'title' => 'Coffee',
+                    'code' => '[_]P',
+                    'type' => 'font'
+                ],
+            ];
+            Cache::write('Saito.Smilies.data', $smiliesFixture);
+            $SmileyCache = new \Saito\Smiley\Cache($Controller);
+
+            //= userlist fixture
+            $Userlist = new Userlist\UserlistArray();
+            $Userlist->set(['Alice', 'Bobby Junior', 'Dr. No']);
+
+            //= ParserHelper
+            $settings = [
+                'autolink' => true,
+                'bbcode_img' => true,
+                'multimedia' => true,
+                'quote_symbol' => '»',
+                'hashBaseUrl' => '/hash/',
+                'atBaseUrl' => '/at/',
+                'return' => 'html',
+                'smilies' => true,
+                'smiliesData' => $SmileyCache,
+                'text_word_maxlength' => 120,
+                'UserList' => $Userlist,
+                'webroot' => ''
+            ];
+            $this->_Helper = $ParserHelper = new ParserHelper($View, $settings);
+            $ParserHelper->beforeRender(null);
+
+            //= Smiley Renderer
+            $SmileyRenderer = new \Saito\Smiley\Renderer($SmileyCache);
+            $SmileyRenderer->setHelper($this->_Helper);
+            $this->_Helper->SmileyRenderer = $SmileyRenderer;
+
+            //= Parser
+            $this->_Parser = new Lib\Parser($ParserHelper, $settings);
+        }
+
+        public function tearDown() {
+            parent::tearDown();
+            if ($this->server_name) {
+                $_SERVER['SERVER_NAME'] = $this->server_name;
+            }
+
+            if ($this->server_name) {
+                $_SERVER['SERVER_PORT'] = $this->server_port;
+            }
+
+            Configure::write('Asset.timestamp', $this->asset_timestamp);
+
+            Configure::write('Saito.Settings.text_word_maxlength',
+                    $this->text_word_maxlength);
+
+            Configure::write('Saito.Settings.autolink', $this->autolink);
+
+            Cache::clear();
+            ClassRegistry::flush();
+            unset($this->_Parser);
+        }
+
+    }
 

app/Plugin/BbcodeParser/Lib/Parser.php

Spacing +3 added lines, -3 removed lines

@@ -217,7 +217,7 @@ 
 			$options = array_merge($this->_cSettings, $options);
 
 			// serializing complex objects kills PHP
-			$serializable = array_filter($options, function ($value) {
+			$serializable = array_filter($options, function($value) {
 				return !is_object($value);
 			});
 			$parserId = md5(serialize($serializable));
@@ -258,8 +258,8 @@ 
 						$this->_Parser->addCodeDefinition($builder->build());
 						break;
 					case 'class':
-						require_once (\CakePlugin::path('BbcodeParser') . DS . 'Lib' . DS . 'jBBCode' . DS . 'Definitions' . DS . 'JbbCodeDefinitions.php');
-						$class = '\Plugin\BbcodeParser\Lib\jBBCode\Definitions\\' . ucfirst($title);
+						require_once (\CakePlugin::path('BbcodeParser').DS.'Lib'.DS.'jBBCode'.DS.'Definitions'.DS.'JbbCodeDefinitions.php');
+						$class = '\Plugin\BbcodeParser\Lib\jBBCode\Definitions\\'.ucfirst($title);
 						$this->_Parser->addCodeDefinition(new $class($this->_Helper, $options));
 						break;
 					default:

Indentation +247 added lines, -247 removed lines

@@ -1,272 +1,272 @@
 <?php
 
-	namespace Plugin\BbcodeParser\Lib;
+    namespace Plugin\BbcodeParser\Lib;
 
-	use Plugin\BbcodeParser\Lib\jBBCode\Definitions;
-	use Plugin\BbcodeParser\Lib\jBBCode\Visitors;
-	use Plugin\BbcodeParser\Lib\Processors;
+    use Plugin\BbcodeParser\Lib\jBBCode\Definitions;
+    use Plugin\BbcodeParser\Lib\jBBCode\Visitors;
+    use Plugin\BbcodeParser\Lib\Processors;
 
-	class Parser extends \Saito\Markup\Parser {
+    class Parser extends \Saito\Markup\Parser {
 
-		/**
-		 * @var \JBBCode\Parser
-		 */
-		protected $_Parser;
+        /**
+         * @var \JBBCode\Parser
+         */
+        protected $_Parser;
 
-		protected $_Preprocessors;
+        protected $_Preprocessors;
 
-		protected $_Postprocessors;
+        protected $_Postprocessors;
 
-		/**
-		 * @var array
-		 *
-		 * [
-		 *    <set title> => [
-		 *      <arbitrary definition title> => [ <definition> ]
-		 *    ]
-		 * ]
-		 *
-		 */
-		protected $_tags = [
-			'basic' => [
-				// strong
-				'b' => [
-					'type' => 'replacement',
-					'title' => 'b',
-					'replacement' => '<strong>{param}</strong>'
-				],
-				// code
-				'codeWithAttributes' => [
-					'type' => 'class',
-					'title' => 'CodeWithAttributes'
-				],
-				'codeWithoutAttributes' => [
-					'type' => 'class',
-					'title' => 'CodeWithoutAttributes'
-				],
-				// edit marker
-				'e' => [
-					'type' => 'replacement',
-					'title' => 'e',
-					'replacement' => '<span class="richtext-editMark"></span>{param}'
-				],
-				// float
-				'float' => [
-					'type' => 'replacement',
-					'title' => 'float',
-					'replacement' => '<div class="clearfix"></div><div class="richtext-float">{param}</div>'
-				],
-				// email
-				'email' => [
-					'type' => 'class',
-					'title' => 'email'
-				],
-				'emailWithAttributes' => [
-					'type' => 'class',
-					'title' => 'emailWithAttributes'
-				],
-				// hr
-				'hr' => [
-					'type' => 'replacement',
-					'title' => 'hr',
-					'replacement' => '<hr>{param}'
-				],
-				'---' => [
-					'type' => 'replacement',
-					'title' => '---',
-					'replacement' => '<hr>{param}'
-				],
-				// emphasis
-				'i' => [
-					'type' => 'replacement',
-					'title' => 'i',
-					'replacement' => '<em>{param}</em>'
-				],
-				// list
-				'list' => [
-					'type' => 'class',
-					'title' => 'ulList'
-				],
-				// spoiler
-				'spoiler' => [
-					'type' => 'class',
-					'title' => 'spoiler'
-				],
-				// strike
-				's' => [
-					'type' => 'replacement',
-					'title' => 's',
-					'replacement' => '<del>{param}</del>',
-				],
-				'strike' => [
-					'type' => 'replacement',
-					'title' => 'strike',
-					'replacement' => '<del>{param}</del>',
-				],
-				// url
-				'link' => [
-					'type' => 'class',
-					'title' => 'link'
-				],
-				'linkWithAttributes' => [
-					'type' => 'class',
-					'title' => 'linkWithAttributes'
-				],
-				'url' => [
-					'type' => 'class',
-					'title' => 'url'
-				],
-				'urlWithAttributes' => [
-					'type' => 'class',
-					'title' => 'urlWithAttributes'
-				],
-				// quotes
-				'quote' => [
-					'type' => 'replacement',
-					'title' => 'quote',
-					'replacement' => '<blockquote>{param}</blockquote>'
-				]
-			],
-			'multimedia' => [
-				'embed' => [
-					'type' => 'class',
-					'title' => 'Embed'
-				],
-				'flash' => [
-					'type' => 'class',
-					'title' => 'Flash'
-				],
-				'iframe' => [
-					'type' => 'class',
-					'title' => 'Iframe'
-				],
-				'image' => [
-					'type' => 'class',
-					'title' => 'Image'
-				],
-				'imageWithAttributes' => [
-					'type' => 'class',
-					'title' => 'ImageWithAttributes'
-				],
-				'html5audio' => [
-					'type' => 'class',
-					'title' => 'Html5Audio'
-				],
-				'html5video' => [
-					'type' => 'class',
-					'title' => 'Html5Video'
-				],
-				'upload' => [
-					'type' => 'class',
-					'title' => 'Upload'
-				],
-				'uploadWithAttributes' => [
-					'type' => 'class',
-					'title' => 'UploadWithAttributes'
-				]
-			]
-		];
+        /**
+         * @var array
+         *
+         * [
+         *    <set title> => [
+         *      <arbitrary definition title> => [ <definition> ]
+         *    ]
+         * ]
+         *
+         */
+        protected $_tags = [
+            'basic' => [
+                // strong
+                'b' => [
+                    'type' => 'replacement',
+                    'title' => 'b',
+                    'replacement' => '<strong>{param}</strong>'
+                ],
+                // code
+                'codeWithAttributes' => [
+                    'type' => 'class',
+                    'title' => 'CodeWithAttributes'
+                ],
+                'codeWithoutAttributes' => [
+                    'type' => 'class',
+                    'title' => 'CodeWithoutAttributes'
+                ],
+                // edit marker
+                'e' => [
+                    'type' => 'replacement',
+                    'title' => 'e',
+                    'replacement' => '<span class="richtext-editMark"></span>{param}'
+                ],
+                // float
+                'float' => [
+                    'type' => 'replacement',
+                    'title' => 'float',
+                    'replacement' => '<div class="clearfix"></div><div class="richtext-float">{param}</div>'
+                ],
+                // email
+                'email' => [
+                    'type' => 'class',
+                    'title' => 'email'
+                ],
+                'emailWithAttributes' => [
+                    'type' => 'class',
+                    'title' => 'emailWithAttributes'
+                ],
+                // hr
+                'hr' => [
+                    'type' => 'replacement',
+                    'title' => 'hr',
+                    'replacement' => '<hr>{param}'
+                ],
+                '---' => [
+                    'type' => 'replacement',
+                    'title' => '---',
+                    'replacement' => '<hr>{param}'
+                ],
+                // emphasis
+                'i' => [
+                    'type' => 'replacement',
+                    'title' => 'i',
+                    'replacement' => '<em>{param}</em>'
+                ],
+                // list
+                'list' => [
+                    'type' => 'class',
+                    'title' => 'ulList'
+                ],
+                // spoiler
+                'spoiler' => [
+                    'type' => 'class',
+                    'title' => 'spoiler'
+                ],
+                // strike
+                's' => [
+                    'type' => 'replacement',
+                    'title' => 's',
+                    'replacement' => '<del>{param}</del>',
+                ],
+                'strike' => [
+                    'type' => 'replacement',
+                    'title' => 'strike',
+                    'replacement' => '<del>{param}</del>',
+                ],
+                // url
+                'link' => [
+                    'type' => 'class',
+                    'title' => 'link'
+                ],
+                'linkWithAttributes' => [
+                    'type' => 'class',
+                    'title' => 'linkWithAttributes'
+                ],
+                'url' => [
+                    'type' => 'class',
+                    'title' => 'url'
+                ],
+                'urlWithAttributes' => [
+                    'type' => 'class',
+                    'title' => 'urlWithAttributes'
+                ],
+                // quotes
+                'quote' => [
+                    'type' => 'replacement',
+                    'title' => 'quote',
+                    'replacement' => '<blockquote>{param}</blockquote>'
+                ]
+            ],
+            'multimedia' => [
+                'embed' => [
+                    'type' => 'class',
+                    'title' => 'Embed'
+                ],
+                'flash' => [
+                    'type' => 'class',
+                    'title' => 'Flash'
+                ],
+                'iframe' => [
+                    'type' => 'class',
+                    'title' => 'Iframe'
+                ],
+                'image' => [
+                    'type' => 'class',
+                    'title' => 'Image'
+                ],
+                'imageWithAttributes' => [
+                    'type' => 'class',
+                    'title' => 'ImageWithAttributes'
+                ],
+                'html5audio' => [
+                    'type' => 'class',
+                    'title' => 'Html5Audio'
+                ],
+                'html5video' => [
+                    'type' => 'class',
+                    'title' => 'Html5Video'
+                ],
+                'upload' => [
+                    'type' => 'class',
+                    'title' => 'Upload'
+                ],
+                'uploadWithAttributes' => [
+                    'type' => 'class',
+                    'title' => 'UploadWithAttributes'
+                ]
+            ]
+        ];
 
-		/**
-		 * Initialized parsers
-		 *
-		 * @var array
-		 */
-		protected $_initializedParsers = array();
+        /**
+         * Initialized parsers
+         *
+         * @var array
+         */
+        protected $_initializedParsers = array();
 
-		/**
-		 * Parses BBCode
-		 *
-		 * ### Options
-		 *
-		 * - `return` string "html"|"text" result type
-		 * - `multimedia` bool true|false parse or ignore multimedia content
-		 *
-		 * @param $string
-		 * @param array $options
-		 * @return mixed|string
-		 */
-		public function parse($string, array $options = []) {
-			$this->_initParser($options);
+        /**
+         * Parses BBCode
+         *
+         * ### Options
+         *
+         * - `return` string "html"|"text" result type
+         * - `multimedia` bool true|false parse or ignore multimedia content
+         *
+         * @param $string
+         * @param array $options
+         * @return mixed|string
+         */
+        public function parse($string, array $options = []) {
+            $this->_initParser($options);
 
-			$string = $this->_Preprocessors->process($string);
+            $string = $this->_Preprocessors->process($string);
 
-			$this->_Parser->parse($string);
+            $this->_Parser->parse($string);
 
-			$this->_Parser->accept(new Visitors\JbbCodeNl2BrVisitor($this->_Helper, $options));
-			if ($this->_cSettings['autolink']) {
-				$this->_Parser->accept(new Visitors\JbbCodeAutolinkVisitor($this->_Helper, $options));
-			}
-			if ($this->_cSettings['smilies']) {
-				$this->_Parser->accept(new Visitors\JbbCodeSmileyVisitor($this->_Helper, $options));
-			}
+            $this->_Parser->accept(new Visitors\JbbCodeNl2BrVisitor($this->_Helper, $options));
+            if ($this->_cSettings['autolink']) {
+                $this->_Parser->accept(new Visitors\JbbCodeAutolinkVisitor($this->_Helper, $options));
+            }
+            if ($this->_cSettings['smilies']) {
+                $this->_Parser->accept(new Visitors\JbbCodeSmileyVisitor($this->_Helper, $options));
+            }
 
-			switch ($options['return']) {
-				case 'text':
-					$html = $this->_Parser->getAsText();
-					break;
-				default:
-					$html = $this->_Parser->getAsHtml();
-			}
+            switch ($options['return']) {
+                case 'text':
+                    $html = $this->_Parser->getAsText();
+                    break;
+                default:
+                    $html = $this->_Parser->getAsHtml();
+            }
 
-			$html = $this->_Postprocessors->process($html);
-			return $html;
-		}
+            $html = $this->_Postprocessors->process($html);
+            return $html;
+        }
 
-		protected function _initParser(&$options) {
-			$options = array_merge($this->_cSettings, $options);
+        protected function _initParser(&$options) {
+            $options = array_merge($this->_cSettings, $options);
 
-			// serializing complex objects kills PHP
-			$serializable = array_filter($options, function ($value) {
-				return !is_object($value);
-			});
-			$parserId = md5(serialize($serializable));
-			if (isset($this->_initializedParsers[$parserId])) {
-				$this->_Parser = $this->_initializedParsers[$parserId];
-				return;
-			}
+            // serializing complex objects kills PHP
+            $serializable = array_filter($options, function ($value) {
+                return !is_object($value);
+            });
+            $parserId = md5(serialize($serializable));
+            if (isset($this->_initializedParsers[$parserId])) {
+                $this->_Parser = $this->_initializedParsers[$parserId];
+                return;
+            }
 
-			$this->_Parser = new \JBBCode\Parser();
-			$this->_addDefinitionSet('basic', $options);
+            $this->_Parser = new \JBBCode\Parser();
+            $this->_addDefinitionSet('basic', $options);
 
-			if (!empty($this->_cSettings['bbcode_img']) && $options['multimedia']) {
-				$this->_addDefinitionSet('multimedia', $options);
-			}
+            if (!empty($this->_cSettings['bbcode_img']) && $options['multimedia']) {
+                $this->_addDefinitionSet('multimedia', $options);
+            }
 
-			$this->_Preprocessors = new Processors\BbcodeProcessorCollection();
-			$this->_Preprocessors->add(new Processors\BbcodeImageUploadLegacyPreprocessor());
-			$this->_Preprocessors->add(new Processors\BbcodePreparePreprocessor());
+            $this->_Preprocessors = new Processors\BbcodeProcessorCollection();
+            $this->_Preprocessors->add(new Processors\BbcodeImageUploadLegacyPreprocessor());
+            $this->_Preprocessors->add(new Processors\BbcodePreparePreprocessor());
 
-			$this->_Postprocessors = new Processors\BbcodeProcessorCollection();
-			$this->_Postprocessors->add(new Processors\BbcodeQuotePostprocessor($options));
+            $this->_Postprocessors = new Processors\BbcodeProcessorCollection();
+            $this->_Postprocessors->add(new Processors\BbcodeQuotePostprocessor($options));
 
-			$this->_initializedParsers[$parserId] = $this->_Parser;
-		}
+            $this->_initializedParsers[$parserId] = $this->_Parser;
+        }
 
-		/**
-		 * @param $set
-		 * @param $options
-		 * @throws \Exception
-		 */
-		protected function _addDefinitionSet($set, $options) {
-			foreach ($this->_tags[$set] as $definition) {
-				$title = $definition['title'];
-				switch ($definition['type']) {
-					case 'replacement':
-						$builder = new \JBBCode\CodeDefinitionBuilder($title,
-							$definition['replacement']);
-						$this->_Parser->addCodeDefinition($builder->build());
-						break;
-					case 'class':
-						require_once (\CakePlugin::path('BbcodeParser') . DS . 'Lib' . DS . 'jBBCode' . DS . 'Definitions' . DS . 'JbbCodeDefinitions.php');
-						$class = '\Plugin\BbcodeParser\Lib\jBBCode\Definitions\\' . ucfirst($title);
-						$this->_Parser->addCodeDefinition(new $class($this->_Helper, $options));
-						break;
-					default:
-						throw new \Exception();
-				}
-			}
-		}
+        /**
+         * @param $set
+         * @param $options
+         * @throws \Exception
+         */
+        protected function _addDefinitionSet($set, $options) {
+            foreach ($this->_tags[$set] as $definition) {
+                $title = $definition['title'];
+                switch ($definition['type']) {
+                    case 'replacement':
+                        $builder = new \JBBCode\CodeDefinitionBuilder($title,
+                            $definition['replacement']);
+                        $this->_Parser->addCodeDefinition($builder->build());
+                        break;
+                    case 'class':
+                        require_once (\CakePlugin::path('BbcodeParser') . DS . 'Lib' . DS . 'jBBCode' . DS . 'Definitions' . DS . 'JbbCodeDefinitions.php');
+                        $class = '\Plugin\BbcodeParser\Lib\jBBCode\Definitions\\' . ucfirst($title);
+                        $this->_Parser->addCodeDefinition(new $class($this->_Helper, $options));
+                        break;
+                    default:
+                        throw new \Exception();
+                }
+            }
+        }
 
-	}
+    }
 

app/Plugin/BbcodeParser/Lib/Helper/UrlParserTrait.php

Spacing +8 added lines, -8 removed lines

@@ -20,7 +20,7 @@ 
 				// use Cakes Validation class to detect valid URL
 				\App::uses('Validation', 'Utility');
 				if (\Validation::url($url)) {
-					$url = 'http://' . $url;
+					$url = 'http://'.$url;
 				}
 			}
 
@@ -36,7 +36,7 @@ 
 				if (!empty($url) && preg_match('/\<img\s*?src=/', $text) !== 1) {
 					$host = DomainParser::domainAndTld($url);
 					if ($host !== false && $host !== env('SERVER_NAME')) {
-						$out .= ' <span class=\'richtext-linkInfo\'>[' . $host . ']</span>';
+						$out .= ' <span class=\'richtext-linkInfo\'>['.$host.']</span>';
 					}
 				}
 			}
@@ -64,10 +64,10 @@ 
 			}
 
 			$_placeholder = ' … ';
-			$leftMargin = (int)floor($_textWordMaxLength / 2);
-			$rightMargin = (int)(-1 * ($_textWordMaxLength - $leftMargin - mb_strlen($_placeholder)));
+			$leftMargin = (int) floor($_textWordMaxLength / 2);
+			$rightMargin = (int) (-1 * ($_textWordMaxLength - $leftMargin - mb_strlen($_placeholder)));
 
-			$string = mb_substr($string, 0, $leftMargin) . $_placeholder .
+			$string = mb_substr($string, 0, $leftMargin).$_placeholder.
 				mb_substr($string, $rightMargin);
 			return $string;
 		}
@@ -79,7 +79,7 @@ 
 		 * @return string
 		 */
 		protected function _decorateTarget($string) {
-			$decorator = function ($matches) {
+			$decorator = function($matches) {
 				$out = '';
 				$url = $matches[1];
 
@@ -90,11 +90,11 @@ 
 				$parsedUrl = @parse_url($url);
 
 				if (isset($parsedUrl['host'])) {
-					if ($parsedUrl['host'] !== env('SERVER_NAME') && $parsedUrl['host'] !== "www." . env('SERVER_NAME')) {
+					if ($parsedUrl['host'] !== env('SERVER_NAME') && $parsedUrl['host'] !== "www.".env('SERVER_NAME')) {
 						$out = " rel='external' target='_blank'";
 					}
 				}
-				return $matches[0] . $out;
+				return $matches[0].$out;
 			};
 
 			return preg_replace_callback('#href=["\'](.*?)["\']#is',

Indentation +102 added lines, -102 removed lines

@@ -1,104 +1,104 @@
 <?php
 
-	namespace Plugin\BbcodeParser\Lib\Helper;
-
-	use Saito\DomainParser;
-
-	trait UrlParserTrait {
-
-		protected function _email($url, $text = null) {
-			if (empty($text)) {
-				$text = null;
-			}
-			$url = str_replace('mailto:', '', $url);
-			return $this->MailObfuscator->link($url, $text);
-		}
-
-		protected function _url($url, $text, $label = false, $truncate = false) {
-			// add http:// to URLs without protocol
-			if (strpos($url, '://') === false) {
-				// use Cakes Validation class to detect valid URL
-				\App::uses('Validation', 'Utility');
-				if (\Validation::url($url)) {
-					$url = 'http://' . $url;
-				}
-			}
-
-			if ($truncate === true) {
-				$text = $this->_truncate($text);
-			}
-			$out = "<a href='$url'>$text</a>";
-
-			$out = $this->_decorateTarget($out);
-
-			// add domain info: `[url=domain.info]my link[/url]` -> `my link [domain.info]`
-			if ($label !== false && $label !== 'none' && $label !== 'false') {
-				if (!empty($url) && preg_match('/\<img\s*?src=/', $text) !== 1) {
-					$host = DomainParser::domainAndTld($url);
-					if ($host !== false && $host !== env('SERVER_NAME')) {
-						$out .= ' <span class=\'richtext-linkInfo\'>[' . $host . ']</span>';
-					}
-				}
-			}
-			return $out;
-		}
-
-		/**
-		 * Truncates long links
-		 *
-		 * @bogus does this truncate strings or the longest word in the string or what?
-		 * @bogus what about [url=][img]...[/img][url]. Is the [img] url truncated too?
-		 *
-		 * @param type $string
-		 * @throws \Exception
-		 * @return string
-		 */
-		protected function _truncate($string) {
-			if (!isset($this->_sOptions['text_word_maxlength'])) {
-				throw new \Exception('Text word maxlength not set.');
-			}
-			$_textWordMaxLength = $this->_sOptions['text_word_maxlength'];
-
-			if (mb_strlen($string) <= $_textWordMaxLength) {
-				return $string;
-			}
-
-			$_placeholder = ' … ';
-			$leftMargin = (int)floor($_textWordMaxLength / 2);
-			$rightMargin = (int)(-1 * ($_textWordMaxLength - $leftMargin - mb_strlen($_placeholder)));
-
-			$string = mb_substr($string, 0, $leftMargin) . $_placeholder .
-				mb_substr($string, $rightMargin);
-			return $string;
-		}
-
-		/**
-		 * Adds target="_blank" to *all* external links in arbitrary string $string
-		 *
-		 * @param $string
-		 * @return string
-		 */
-		protected function _decorateTarget($string) {
-			$decorator = function ($matches) {
-				$out = '';
-				$url = $matches[1];
-
-				// preventing error message for parse_url('http://');
-				if (substr($url, -3) === '://') {
-					return $matches[0];
-				}
-				$parsedUrl = @parse_url($url);
-
-				if (isset($parsedUrl['host'])) {
-					if ($parsedUrl['host'] !== env('SERVER_NAME') && $parsedUrl['host'] !== "www." . env('SERVER_NAME')) {
-						$out = " rel='external' target='_blank'";
-					}
-				}
-				return $matches[0] . $out;
-			};
-
-			return preg_replace_callback('#href=["\'](.*?)["\']#is',
-				$decorator, $string);
-		}
-
-	}
\ No newline at end of file
+    namespace Plugin\BbcodeParser\Lib\Helper;
+
+    use Saito\DomainParser;
+
+    trait UrlParserTrait {
+
+        protected function _email($url, $text = null) {
+            if (empty($text)) {
+                $text = null;
+            }
+            $url = str_replace('mailto:', '', $url);
+            return $this->MailObfuscator->link($url, $text);
+        }
+
+        protected function _url($url, $text, $label = false, $truncate = false) {
+            // add http:// to URLs without protocol
+            if (strpos($url, '://') === false) {
+                // use Cakes Validation class to detect valid URL
+                \App::uses('Validation', 'Utility');
+                if (\Validation::url($url)) {
+                    $url = 'http://' . $url;
+                }
+            }
+
+            if ($truncate === true) {
+                $text = $this->_truncate($text);
+            }
+            $out = "<a href='$url'>$text</a>";
+
+            $out = $this->_decorateTarget($out);
+
+            // add domain info: `[url=domain.info]my link[/url]` -> `my link [domain.info]`
+            if ($label !== false && $label !== 'none' && $label !== 'false') {
+                if (!empty($url) && preg_match('/\<img\s*?src=/', $text) !== 1) {
+                    $host = DomainParser::domainAndTld($url);
+                    if ($host !== false && $host !== env('SERVER_NAME')) {
+                        $out .= ' <span class=\'richtext-linkInfo\'>[' . $host . ']</span>';
+                    }
+                }
+            }
+            return $out;
+        }
+
+        /**
+         * Truncates long links
+         *
+         * @bogus does this truncate strings or the longest word in the string or what?
+         * @bogus what about [url=][img]...[/img][url]. Is the [img] url truncated too?
+         *
+         * @param type $string
+         * @throws \Exception
+         * @return string
+         */
+        protected function _truncate($string) {
+            if (!isset($this->_sOptions['text_word_maxlength'])) {
+                throw new \Exception('Text word maxlength not set.');
+            }
+            $_textWordMaxLength = $this->_sOptions['text_word_maxlength'];
+
+            if (mb_strlen($string) <= $_textWordMaxLength) {
+                return $string;
+            }
+
+            $_placeholder = ' … ';
+            $leftMargin = (int)floor($_textWordMaxLength / 2);
+            $rightMargin = (int)(-1 * ($_textWordMaxLength - $leftMargin - mb_strlen($_placeholder)));
+
+            $string = mb_substr($string, 0, $leftMargin) . $_placeholder .
+                mb_substr($string, $rightMargin);
+            return $string;
+        }
+
+        /**
+         * Adds target="_blank" to *all* external links in arbitrary string $string
+         *
+         * @param $string
+         * @return string
+         */
+        protected function _decorateTarget($string) {
+            $decorator = function ($matches) {
+                $out = '';
+                $url = $matches[1];
+
+                // preventing error message for parse_url('http://');
+                if (substr($url, -3) === '://') {
+                    return $matches[0];
+                }
+                $parsedUrl = @parse_url($url);
+
+                if (isset($parsedUrl['host'])) {
+                    if ($parsedUrl['host'] !== env('SERVER_NAME') && $parsedUrl['host'] !== "www." . env('SERVER_NAME')) {
+                        $out = " rel='external' target='_blank'";
+                    }
+                }
+                return $matches[0] . $out;
+            };
+
+            return preg_replace_callback('#href=["\'](.*?)["\']#is',
+                $decorator, $string);
+        }
+
+    }
\ No newline at end of file

app/Plugin/BbcodeParser/Lib/jBBCode/Visitors/JbbCodeAutolinkVisitor.php

Spacing +10 added lines, -10 removed lines

@@ -60,10 +60,10 @@ 
 				}
 			}
 			krsort($names);
-			$baseUrl = $this->_sOptions['webroot'] . $this->_sOptions['atBaseUrl'];
+			$baseUrl = $this->_sOptions['webroot'].$this->_sOptions['atBaseUrl'];
 			foreach ($names as $name => $v) {
 				$title = urlencode($name);
-				$link = $this->_url($baseUrl . $title, "@$name",
+				$link = $this->_url($baseUrl.$title, "@$name",
 					false);
 				$string = str_replace("@$name", $link, $string);
 			}
@@ -72,11 +72,11 @@ 
 		}
 
 		protected function _autolink($string) {
-			$replace = function ($matches) {
+			$replace = function($matches) {
 				// exclude punctuation at end of sentence from URLs
 				$ignoredEndChars = implode('|', [',', '\?', ',', '\.', '\)', '!']);
 				preg_match(
-					'/(?P<element>.*?)(?P<suffix>' . $ignoredEndChars . ')?$/',
+					'/(?P<element>.*?)(?P<suffix>'.$ignoredEndChars.')?$/',
 					$matches['element'],
 					$m
 				);
@@ -84,7 +84,7 @@ 
 				$matches = $m + $matches;
 
 				if (strpos($matches['element'], '://') === false) {
-					$matches['element'] = 'http://' . $matches['element'];
+					$matches['element'] = 'http://'.$matches['element'];
 				}
 				$matches += [
 					'prefix' => '',
@@ -93,7 +93,7 @@ 
 
 				$url = $this->_url($matches['element'], $matches['element'], false,
 					true);
-				return $matches['prefix'] . $url . $matches['suffix'];
+				return $matches['prefix'].$url.$matches['suffix'];
 			};
 
 			//# autolink http://urls
@@ -113,7 +113,7 @@ 
 			//# autolink email
 			$string = preg_replace_callback(
 				"#(?<=^|[\n ])(?P<content>([a-z0-9&\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+))#i",
-				function ($matches) {
+				function($matches) {
 					return $this->_email($matches['content']);
 				}, $string
 			);
@@ -122,12 +122,12 @@ 
 		}
 
 		protected function _hashLink($string) {
-			$baseUrl = $this->_sOptions['webroot'] . $this->_sOptions['hashBaseUrl'];
+			$baseUrl = $this->_sOptions['webroot'].$this->_sOptions['hashBaseUrl'];
 			$string = preg_replace_callback(
 				'/(?<=\s|^|])(?<tag>#)(?<element>\d+)(?!\w)/',
-				function ($m) use ($baseUrl) {
+				function($m) use ($baseUrl) {
 					$hash = $m['element'];
-					return $this->_url($baseUrl . $hash, '#' . $hash);
+					return $this->_url($baseUrl.$hash, '#'.$hash);
 				},
 				$string
 			);

Indentation +125 added lines, -125 removed lines

@@ -1,137 +1,137 @@
 <?php
 
-	namespace Plugin\BbcodeParser\Lib\jBBCode\Visitors;
+    namespace Plugin\BbcodeParser\Lib\jBBCode\Visitors;
 
-	use Plugin\BbcodeParser\Lib\Helper\UrlParserTrait;
+    use Plugin\BbcodeParser\Lib\Helper\UrlParserTrait;
 
-	class JbbCodeAutolinkVisitor extends JbbCodeTextVisitor {
+    class JbbCodeAutolinkVisitor extends JbbCodeTextVisitor {
 
-		use UrlParserTrait;
+        use UrlParserTrait;
 
-		protected $_disallowedTags = ['code'];
+        protected $_disallowedTags = ['code'];
 
-		protected function _processTextNode($string, $node) {
-			// don't auto-link in url tags; problem is that 'urlWithAttributes' definition
-			// reuses 'url' tag with ParseContent = true
-			if ($node->getParent()->getTagName() === 'url') {
-				return $string;
-			}
-			$string = $this->_hashLink($string);
-			$string = $this->_atUserLink($string);
-			return $this->_autolink($string);
-		}
+        protected function _processTextNode($string, $node) {
+            // don't auto-link in url tags; problem is that 'urlWithAttributes' definition
+            // reuses 'url' tag with ParseContent = true
+            if ($node->getParent()->getTagName() === 'url') {
+                return $string;
+            }
+            $string = $this->_hashLink($string);
+            $string = $this->_atUserLink($string);
+            return $this->_autolink($string);
+        }
 
-		protected function _atUserLink($string) {
-			$tags = array();
+        protected function _atUserLink($string) {
+            $tags = array();
 
-			/*
+            /*
 			 * - '\pP' all unicode punctuation marks
 			 * - '<' if nl2br has taken place whatchout for <br /> linebreaks
 			 */
-			$hasTags = preg_match_all('/(\s|^)@([^\s\pP<]+)/m', $string, $tags);
-			if (!$hasTags) {
-				return $string;
-			}
-
-			// would be cleaner to pass userlist by value, but for performance reasons
-			// we only query the db if we actually have any @ tags
-			$users = $this->_sOptions['UserList']->get();
-			sort($users);
-			$names = array();
-			if (empty($tags[2]) === false) {
-				$tags = $tags[2];
-				foreach ($tags as $tag) {
-					if (in_array($tag, $users)) {
-						$names[$tag] = 1;
-					} else {
-						$continue = 0;
-						foreach ($users as $user) {
-							if (mb_strpos($user, $tag) === 0) {
-								$names[$user] = 1;
-								$continue = true;
-							}
-							if ($continue === false) {
-								break;
-							} elseif ($continue !== 0) {
-								$continue = false;
-							}
-						}
-					}
-				}
-			}
-			krsort($names);
-			$baseUrl = $this->_sOptions['webroot'] . $this->_sOptions['atBaseUrl'];
-			foreach ($names as $name => $v) {
-				$title = urlencode($name);
-				$link = $this->_url($baseUrl . $title, "@$name",
-					false);
-				$string = str_replace("@$name", $link, $string);
-			}
-
-			return $string;
-		}
-
-		protected function _autolink($string) {
-			$replace = function ($matches) {
-				// exclude punctuation at end of sentence from URLs
-				$ignoredEndChars = implode('|', [',', '\?', ',', '\.', '\)', '!']);
-				preg_match(
-					'/(?P<element>.*?)(?P<suffix>' . $ignoredEndChars . ')?$/',
-					$matches['element'],
-					$m
-				);
-				// keep ['element'] and ['suffix'] and include ['prefix']
-				$matches = $m + $matches;
-
-				if (strpos($matches['element'], '://') === false) {
-					$matches['element'] = 'http://' . $matches['element'];
-				}
-				$matches += [
-					'prefix' => '',
-					'suffix' => ''
-				];
-
-				$url = $this->_url($matches['element'], $matches['element'], false,
-					true);
-				return $matches['prefix'] . $url . $matches['suffix'];
-			};
-
-			//# autolink http://urls
-			$string = preg_replace_callback(
-				"#(?<=^|[\n (])(?P<element>[\w]+?://.*?[^ \"\n\r\t<]*)#is",
-				$replace,
-				$string
-			);
-
-			//# autolink without http://, i.e. www.foo.bar/baz
-			$string = preg_replace_callback(
-				"#(?P<prefix>^|[\n (])(?P<element>(www|ftp)\.[\w\-]+\.[\w\-.\~]+(?:/[^ \"\t\n\r<]*)?)#is",
-				$replace,
-				$string
-			);
-
-			//# autolink email
-			$string = preg_replace_callback(
-				"#(?<=^|[\n ])(?P<content>([a-z0-9&\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+))#i",
-				function ($matches) {
-					return $this->_email($matches['content']);
-				}, $string
-			);
-
-			return $string;
-		}
-
-		protected function _hashLink($string) {
-			$baseUrl = $this->_sOptions['webroot'] . $this->_sOptions['hashBaseUrl'];
-			$string = preg_replace_callback(
-				'/(?<=\s|^|])(?<tag>#)(?<element>\d+)(?!\w)/',
-				function ($m) use ($baseUrl) {
-					$hash = $m['element'];
-					return $this->_url($baseUrl . $hash, '#' . $hash);
-				},
-				$string
-			);
-			return $string;
-		}
-
-	}
+            $hasTags = preg_match_all('/(\s|^)@([^\s\pP<]+)/m', $string, $tags);
+            if (!$hasTags) {
+                return $string;
+            }
+
+            // would be cleaner to pass userlist by value, but for performance reasons
+            // we only query the db if we actually have any @ tags
+            $users = $this->_sOptions['UserList']->get();
+            sort($users);
+            $names = array();
+            if (empty($tags[2]) === false) {
+                $tags = $tags[2];
+                foreach ($tags as $tag) {
+                    if (in_array($tag, $users)) {
+                        $names[$tag] = 1;
+                    } else {
+                        $continue = 0;
+                        foreach ($users as $user) {
+                            if (mb_strpos($user, $tag) === 0) {
+                                $names[$user] = 1;
+                                $continue = true;
+                            }
+                            if ($continue === false) {
+                                break;
+                            } elseif ($continue !== 0) {
+                                $continue = false;
+                            }
+                        }
+                    }
+                }
+            }
+            krsort($names);
+            $baseUrl = $this->_sOptions['webroot'] . $this->_sOptions['atBaseUrl'];
+            foreach ($names as $name => $v) {
+                $title = urlencode($name);
+                $link = $this->_url($baseUrl . $title, "@$name",
+                    false);
+                $string = str_replace("@$name", $link, $string);
+            }
+
+            return $string;
+        }
+
+        protected function _autolink($string) {
+            $replace = function ($matches) {
+                // exclude punctuation at end of sentence from URLs
+                $ignoredEndChars = implode('|', [',', '\?', ',', '\.', '\)', '!']);
+                preg_match(
+                    '/(?P<element>.*?)(?P<suffix>' . $ignoredEndChars . ')?$/',
+                    $matches['element'],
+                    $m
+                );
+                // keep ['element'] and ['suffix'] and include ['prefix']
+                $matches = $m + $matches;
+
+                if (strpos($matches['element'], '://') === false) {
+                    $matches['element'] = 'http://' . $matches['element'];
+                }
+                $matches += [
+                    'prefix' => '',
+                    'suffix' => ''
+                ];
+
+                $url = $this->_url($matches['element'], $matches['element'], false,
+                    true);
+                return $matches['prefix'] . $url . $matches['suffix'];
+            };
+
+            //# autolink http://urls
+            $string = preg_replace_callback(
+                "#(?<=^|[\n (])(?P<element>[\w]+?://.*?[^ \"\n\r\t<]*)#is",
+                $replace,
+                $string
+            );
+
+            //# autolink without http://, i.e. www.foo.bar/baz
+            $string = preg_replace_callback(
+                "#(?P<prefix>^|[\n (])(?P<element>(www|ftp)\.[\w\-]+\.[\w\-.\~]+(?:/[^ \"\t\n\r<]*)?)#is",
+                $replace,
+                $string
+            );
+
+            //# autolink email
+            $string = preg_replace_callback(
+                "#(?<=^|[\n ])(?P<content>([a-z0-9&\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+))#i",
+                function ($matches) {
+                    return $this->_email($matches['content']);
+                }, $string
+            );
+
+            return $string;
+        }
+
+        protected function _hashLink($string) {
+            $baseUrl = $this->_sOptions['webroot'] . $this->_sOptions['hashBaseUrl'];
+            $string = preg_replace_callback(
+                '/(?<=\s|^|])(?<tag>#)(?<element>\d+)(?!\w)/',
+                function ($m) use ($baseUrl) {
+                    $hash = $m['element'];
+                    return $this->_url($baseUrl . $hash, '#' . $hash);
+                },
+                $string
+            );
+            return $string;
+        }
+
+    }

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

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
 		protected function _audio($content) {
 			$out = "<audio src='$content' controls='controls'>";
 			$out .= Message::format(__(
-				'Your browser does not support HTML5 audio. Please updgrade to a modern ' .
+				'Your browser does not support HTML5 audio. Please updgrade to a modern '.
 				'browser. In order to watch this stream you need an HTML5 capable browser.',
 				true));
 			$out .= "</audio>";
@@ -28,7 +28,7 @@ 
 
 		protected function _video($content) {
 			// fix audio files mistakenly wrapped into an [video] tag
-			if (preg_match('/(' . implode('|', self::$_html5AudioExtensions) . ')$/i',
+			if (preg_match('/('.implode('|', self::$_html5AudioExtensions).')$/i',
 					$content) === 1
 			) {
 				return $this->_audio($content);
@@ -36,7 +36,7 @@ 
 
 			$out = "<video src='$content' controls='controls' x-webkit-airplay='allow'>";
 			$out .= Message::format(__(
-				'Your browser does not support HTML5 video. Please updgrade to a modern ' .
+				'Your browser does not support HTML5 video. Please updgrade to a modern '.
 				'browser. In order to watch this stream you need an HTML5 capable browser.',
 				true));
 			$out .= '</video>';

Indentation +48 added lines, -48 removed lines

@@ -1,67 +1,67 @@
 <?php
 
-	namespace Plugin\BbcodeParser\Lib\jBBCode\Definitions;
+    namespace Plugin\BbcodeParser\Lib\jBBCode\Definitions;
 
-	use Plugin\BbcodeParser\Lib\Helper\Message;
+    use Plugin\BbcodeParser\Lib\Helper\Message;
 
-	abstract class Html5Media extends CodeDefinition {
+    abstract class Html5Media extends CodeDefinition {
 
-		protected $_sParseContent = false;
+        protected $_sParseContent = false;
 
-		protected static $_html5AudioExtensions = array(
-			'm4a',
-			'ogg',
-			'opus',
-			'mp3',
-			'wav',
-		);
+        protected static $_html5AudioExtensions = array(
+            'm4a',
+            'ogg',
+            'opus',
+            'mp3',
+            'wav',
+        );
 
-		protected function _audio($content) {
-			$out = "<audio src='$content' controls='controls'>";
-			$out .= Message::format(__(
-				'Your browser does not support HTML5 audio. Please updgrade to a modern ' .
-				'browser. In order to watch this stream you need an HTML5 capable browser.',
-				true));
-			$out .= "</audio>";
-			return $out;
-		}
+        protected function _audio($content) {
+            $out = "<audio src='$content' controls='controls'>";
+            $out .= Message::format(__(
+                'Your browser does not support HTML5 audio. Please updgrade to a modern ' .
+                'browser. In order to watch this stream you need an HTML5 capable browser.',
+                true));
+            $out .= "</audio>";
+            return $out;
+        }
 
-		protected function _video($content) {
-			// fix audio files mistakenly wrapped into an [video] tag
-			if (preg_match('/(' . implode('|', self::$_html5AudioExtensions) . ')$/i',
-					$content) === 1
-			) {
-				return $this->_audio($content);
-			}
+        protected function _video($content) {
+            // fix audio files mistakenly wrapped into an [video] tag
+            if (preg_match('/(' . implode('|', self::$_html5AudioExtensions) . ')$/i',
+                    $content) === 1
+            ) {
+                return $this->_audio($content);
+            }
 
-			$out = "<video src='$content' controls='controls' x-webkit-airplay='allow'>";
-			$out .= Message::format(__(
-				'Your browser does not support HTML5 video. Please updgrade to a modern ' .
-				'browser. In order to watch this stream you need an HTML5 capable browser.',
-				true));
-			$out .= '</video>';
-			return $out;
-		}
+            $out = "<video src='$content' controls='controls' x-webkit-airplay='allow'>";
+            $out .= Message::format(__(
+                'Your browser does not support HTML5 video. Please updgrade to a modern ' .
+                'browser. In order to watch this stream you need an HTML5 capable browser.',
+                true));
+            $out .= '</video>';
+            return $out;
+        }
 
-	}
+    }
 
-	class Html5Audio extends Html5Media {
+    class Html5Audio extends Html5Media {
 
-		protected $_sTagName = 'audio';
+        protected $_sTagName = 'audio';
 
-		protected function _parse($content, $attributes) {
-			return $this->_audio($content);
-		}
+        protected function _parse($content, $attributes) {
+            return $this->_audio($content);
+        }
 
-	}
+    }
 
-	class Html5Video extends Html5Media {
+    class Html5Video extends Html5Media {
 
-		protected $_sTagName = 'video';
+        protected $_sTagName = 'video';
 
-		protected function _parse($content, $attributes) {
-			return $this->_video($content);
-		}
+        protected function _parse($content, $attributes) {
+            return $this->_video($content);
+        }
 
-	}
+    }
 

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

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 			// load config from app/Config/geshi.php
 			$this->Geshi->features = false;
 
-			$string = '<div class="geshi-wrapper"><pre lang="' . $type . '">' . $content . '</pre></div>';
+			$string = '<div class="geshi-wrapper"><pre lang="'.$type.'">'.$content.'</pre></div>';
 
 			$string = $this->Geshi->highlight($string);
 			return $string;

Indentation +22 added lines, -22 removed lines

@@ -1,36 +1,36 @@
 <?php
 
-	namespace Plugin\BbcodeParser\Lib\jBBCode\Definitions;
+    namespace Plugin\BbcodeParser\Lib\jBBCode\Definitions;
 
-	class CodeWithoutAttributes extends CodeDefinition {
+    class CodeWithoutAttributes extends CodeDefinition {
 
-		protected $_sTagName = 'code';
+        protected $_sTagName = 'code';
 
-		protected $_sParseContent = false;
+        protected $_sParseContent = false;
 
-		protected function _parse($content, $attributes) {
-			$type = 'text';
-			if (!empty($attributes['code'])) {
-				$type = $attributes['code'];
-			}
+        protected function _parse($content, $attributes) {
+            $type = 'text';
+            if (!empty($attributes['code'])) {
+                $type = $attributes['code'];
+            }
 
-			$this->Geshi->defaultLanguage = 'text';
-			// allow all languages
-			$this->Geshi->validLanguages = [true];
-			// load config from app/Config/geshi.php
-			$this->Geshi->features = false;
+            $this->Geshi->defaultLanguage = 'text';
+            // allow all languages
+            $this->Geshi->validLanguages = [true];
+            // load config from app/Config/geshi.php
+            $this->Geshi->features = false;
 
-			$string = '<div class="geshi-wrapper"><pre lang="' . $type . '">' . $content . '</pre></div>';
+            $string = '<div class="geshi-wrapper"><pre lang="' . $type . '">' . $content . '</pre></div>';
 
-			$string = $this->Geshi->highlight($string);
-			return $string;
-		}
+            $string = $this->Geshi->highlight($string);
+            return $string;
+        }
 
-	}
+    }
 
-	class CodeWithAttributes extends CodeWithoutAttributes {
+    class CodeWithAttributes extends CodeWithoutAttributes {
 
-		protected $_sUseOptions = true;
+        protected $_sUseOptions = true;
 
-	}
+    }
 

app/Plugin/BbcodeParser/Lib/Editor.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 					'className' => 'btn-markItUp-Link',
 					'key' => 'L',
 					'openWith' =>
-						'[url=[![' . __('geshi_link_popup') . ']!]]',
+						'[url=[!['.__('geshi_link_popup').']!]]',
 					'closeWith' => '[/url]',
 					'placeHolder' => __('geshi_link_placeholder'),
 				),

Indentation +86 added lines, -86 removed lines

@@ -1,92 +1,92 @@
 <?php
 
-	namespace Plugin\BbcodeParser\Lib;
+    namespace Plugin\BbcodeParser\Lib;
 
-	class Editor extends \Saito\Markup\Editor {
+    class Editor extends \Saito\Markup\Editor {
 
-		public function getEditorHelp() {
-			return $this->_Helper->SaitoHelp->icon('BbcodeParser.1', [
-				'label' => __d('bbcode_parser', 'parsedAsBbcode')
-			]);
-		}
+        public function getEditorHelp() {
+            return $this->_Helper->SaitoHelp->icon('BbcodeParser.1', [
+                'label' => __d('bbcode_parser', 'parsedAsBbcode')
+            ]);
+        }
 
-		public function getMarkupSet() {
-			return array(
-				'Bold' => array(
-					'name' => "<i class='fa fa-bold'></i>",
-					'title' => __('Bold'),
-					'className' => 'btn-markItUp-Bold',
-					'key' => 'B',
-					'openWith' => '[b]',
-					'closeWith' => '[/b]'
-				),
-				'Italic' => array(
-					'name' => "<i class='fa fa-italic'></i>",
-					'title' => __('Italic'),
-					'className' => 'btn-markItUp-Italic',
-					'key' => 'I',
-					'openWith' => '[i]',
-					'closeWith' => '[/i]'
-				),
-				'Stroke' => array(
-					'name' => "<i class='fa fa-strikethrough'></i>",
-					'title' => __('Strike Through'),
-					'className' => 'btn-markItUp-Stroke',
-					'openWith' => '[strike]',
-					'closeWith' => '[/strike]'
-				),
-				'Code' => array(
-					'name' => "<i class='fa fa-s-code'></i>",
-					'title' => __('Code'),
-					'className' => 'btn-markItUp-Code',
-					'openWith' => '[code=text]\n',
-					'closeWith' => '\n[/code]'
-				),
-				'Bulleted list' => array(
-					'name' => "<i class='fa fa-list-ul'></i>",
-					'title' => __('Bullet List'),
-					'className' => 'btn-markItUp-List',
-					'openWith' => '[list]\n[*] ',
-					'closeWith' => '\n[*]\n[/list]'
-				),
-				'Spoiler' => [
-					'name' => "<i class='fa fa-stop'></i>",
-					'className' => 'btn-markItUp-Spoiler',
-					'title' => __('Spoiler'),
-					'openWith' => '[spoiler]',
-					'closeWith' => '[/spoiler]'
-				],
-				'Quote' => [
-					'name' => "<i class='fa fa-quote-left'></i>",
-					'className' => 'btn-markItUp-Quote',
-					'title' => __('Cite'),
-					'openWith' => '[quote]',
-					'closeWith' => '[/quote]'
-				],
-				'separator',
-				'Link' => array(
-					'name' => "<i class='fa fa-link'></i>",
-					'title' => __('Link'),
-					'className' => 'btn-markItUp-Link',
-					'key' => 'L',
-					'openWith' =>
-						'[url=[![' . __('geshi_link_popup') . ']!]]',
-					'closeWith' => '[/url]',
-					'placeHolder' => __('geshi_link_placeholder'),
-				),
-				'Media' => array(
-					'name' => "<i class='fa fa-multimedia'></i>",
-					'className' => 'btn-markItUp-Media',
-					'title' => __('Media'),
-					'key' => 'P',
-				),
-				'Upload' => array(
-					'name' => '<i class=\'fa fa-upload\'></i>',
-					'title' => __('Upload'),
-					'className' => 'btn-markItUp-Upload'
-				),
-				'separator'
-			);
-		}
+        public function getMarkupSet() {
+            return array(
+                'Bold' => array(
+                    'name' => "<i class='fa fa-bold'></i>",
+                    'title' => __('Bold'),
+                    'className' => 'btn-markItUp-Bold',
+                    'key' => 'B',
+                    'openWith' => '[b]',
+                    'closeWith' => '[/b]'
+                ),
+                'Italic' => array(
+                    'name' => "<i class='fa fa-italic'></i>",
+                    'title' => __('Italic'),
+                    'className' => 'btn-markItUp-Italic',
+                    'key' => 'I',
+                    'openWith' => '[i]',
+                    'closeWith' => '[/i]'
+                ),
+                'Stroke' => array(
+                    'name' => "<i class='fa fa-strikethrough'></i>",
+                    'title' => __('Strike Through'),
+                    'className' => 'btn-markItUp-Stroke',
+                    'openWith' => '[strike]',
+                    'closeWith' => '[/strike]'
+                ),
+                'Code' => array(
+                    'name' => "<i class='fa fa-s-code'></i>",
+                    'title' => __('Code'),
+                    'className' => 'btn-markItUp-Code',
+                    'openWith' => '[code=text]\n',
+                    'closeWith' => '\n[/code]'
+                ),
+                'Bulleted list' => array(
+                    'name' => "<i class='fa fa-list-ul'></i>",
+                    'title' => __('Bullet List'),
+                    'className' => 'btn-markItUp-List',
+                    'openWith' => '[list]\n[*] ',
+                    'closeWith' => '\n[*]\n[/list]'
+                ),
+                'Spoiler' => [
+                    'name' => "<i class='fa fa-stop'></i>",
+                    'className' => 'btn-markItUp-Spoiler',
+                    'title' => __('Spoiler'),
+                    'openWith' => '[spoiler]',
+                    'closeWith' => '[/spoiler]'
+                ],
+                'Quote' => [
+                    'name' => "<i class='fa fa-quote-left'></i>",
+                    'className' => 'btn-markItUp-Quote',
+                    'title' => __('Cite'),
+                    'openWith' => '[quote]',
+                    'closeWith' => '[/quote]'
+                ],
+                'separator',
+                'Link' => array(
+                    'name' => "<i class='fa fa-link'></i>",
+                    'title' => __('Link'),
+                    'className' => 'btn-markItUp-Link',
+                    'key' => 'L',
+                    'openWith' =>
+                        '[url=[![' . __('geshi_link_popup') . ']!]]',
+                    'closeWith' => '[/url]',
+                    'placeHolder' => __('geshi_link_placeholder'),
+                ),
+                'Media' => array(
+                    'name' => "<i class='fa fa-multimedia'></i>",
+                    'className' => 'btn-markItUp-Media',
+                    'title' => __('Media'),
+                    'key' => 'P',
+                ),
+                'Upload' => array(
+                    'name' => '<i class=\'fa fa-upload\'></i>',
+                    'title' => __('Upload'),
+                    'className' => 'btn-markItUp-Upload'
+                ),
+                'separator'
+            );
+        }
 
-	}
\ No newline at end of file
+    }
\ No newline at end of file