Add a params to close auto htmlspecialchars() #7

Author: asika32764

README.md

@@ -41,7 +41,8 @@ Create with options.
 $options = array(
     'strip_scheme' => false,
     'text_limit' => false,
-    'auto_title' => false
+    'auto_title' => false,
+    'escape' => true
 );
 
 $schemes = array('http', 'https', 'skype', 'itunes');
@@ -188,6 +189,22 @@ Output
 <a href="http://www.google.com.tw" >www.google.com.tw</a>
 ```
 
+### `escape`
+
+Strip Scheme on link text:
+
+``` php
+$auitolink->autoEscape(true);
+
+$text = $autolink->convert($text);
+```
+
+Output
+
+``` html
+<a href="http://www.google.com.tw?foo=bar&yoo=baz" >http://www.google.com.tw?foo=bar&yoo=baz</a>
+```
+
 ## Scheme
 
 You can add new scheme to convert URL begin with it, for example: `vnc://example.com`

src/Autolink.php

@@ -25,7 +25,8 @@ class Autolink
     public $options = array(
         'strip_scheme' => false,
         'text_limit' => false,
-        'auto_title' => false
+        'auto_title' => false,
+        'escape' => true
     );
 
     /**
@@ -109,7 +110,9 @@ function ($matches) use ($self, $attribs) {
                 preg_match('/[a-zA-Z]*\=\"(.*)/', $matches[0], $inElements);
 
                 if (!$inElements) {
-                    $attribs['href'] = 'mailto:' . htmlspecialchars($matches[0]);
+                    $email = $self->autoEscape() ? htmlspecialchars($matches[0]) : $matches[0];
+
+                    $attribs['href'] = 'mailto:' . $email;
 
                     return $self->buildLink($matches[0], $attribs);
                 }
@@ -146,7 +149,7 @@ public function link($url, $attribs = array())
             }
         }
 
-        $attribs['href'] = htmlspecialchars($url);
+        $attribs['href'] = $this->autoEscape() ? htmlspecialchars($url) : $url;
 
         if ($this->autoTitle()) {
             $attribs['title'] = htmlspecialchars($url);
@@ -205,6 +208,20 @@ public function stripScheme($value = null)
         return $this->optionAccess('strip_scheme', $value);
     }
 
+    /**
+     * autoEscape
+     *
+     * @param mixed $value
+     *
+     * @return  mixed|static
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function autoEscape($value = null)
+    {
+        return $this->optionAccess('escape', $value);
+    }
+
     /**
      * textLimit
      *

test/AutolinkTest.php

@@ -243,6 +243,29 @@ public function testGetAndSetScheme()
         $this->assertEquals(array(), $autolink->getSchemes());
     }
 
+    public function testAutoEscape()
+    {
+        $autolink = new Autolink();
+
+        $url = 'https://example.com/?foo=bar&yoo=baz';
+
+        $this->assertEquals('<a href="' . htmlspecialchars($url) . '">' . htmlspecialchars($url) . '</a>', $autolink->convert($url));
+
+        $autolink->autoEscape(false);
+
+        $this->assertEquals('<a href="' . $url . '">' . htmlspecialchars($url) . '</a>', $autolink->convert($url));
+
+        $url = 'hello+admin&test@example.org';
+
+        $autolink->autoEscape(true);
+
+        $this->assertEquals('<a href="mailto:' . htmlspecialchars($url) . '">' . htmlspecialchars($url) . '</a>', $autolink->convertEmail($url));
+
+        $autolink->autoEscape(false);
+
+        $this->assertEquals('<a href="mailto:' . $url . '">' . htmlspecialchars($url) . '</a>', $autolink->convertEmail($url));
+    }
+
     public function testConvertEmail()
     {
         $text = <<<TEXT