diff options
| author | Antonio Gallo <tonicucoz@gmail.com> | 2012-09-27 20:47:44 +0000 |
|---|---|---|
| committer | Antonio Gallo <tonicucoz@gmail.com> | 2012-09-27 20:47:44 +0000 |
| commit | 1ac426c97e6b117e9507ad5effbf7ec62590930e (patch) | |
| tree | 7962285efee869511260e233117d69156f81d56d | |
| parent | 8195face3431f385bb61b9e02261f6dfbeb7e916 (diff) | |
improved the regular expression to find the URLs - lammi87 issue
| -rw-r--r-- | h-source/Application/Controllers/UsersController.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Include/wikiFormatting.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/h-source/Application/Controllers/UsersController.php b/h-source/Application/Controllers/UsersController.php index b641899..ea94ffb 100644 --- a/h-source/Application/Controllers/UsersController.php +++ b/h-source/Application/Controllers/UsersController.php @@ -97,7 +97,7 @@ class UsersController extends BaseController if ($res === 'not-logged') { - $data['notice'] = "<div class='alert'>You can't logout because you are not logged..</div>\n"; + $data['notice'] = "<div class='alert'>You can't logout because you are not logged...</div>\n"; } else if ($res === 'was-logged') { diff --git a/h-source/Application/Include/wikiFormatting.php b/h-source/Application/Include/wikiFormatting.php index 0c599f5..2a8ba21 100644 --- a/h-source/Application/Include/wikiFormatting.php +++ b/h-source/Application/Include/wikiFormatting.php @@ -133,7 +133,7 @@ class Tabs function checkUrl($url) { - $match = '/^http(s)?\:\/\/(www\.)?[a-zA-Z0-9\-\_]+(\.[a-zA-Z0-9\-\_]+)*\.([a-z]{2,4})((\/[a-zA-Z0-9\_\.\-\:\+]+)*(\/([a-zA-Z0-9\_\:\-\.\+]+\.(php|html|htm|asp|aspx|jsp|cgi))?)?)?(\?([a-zA-Z0-9\_\-\+\s]+\=[a-zA-Z0-9\_\-\s\+\&]+)+)?(#[a-zA-Z0-9\_\-\+\s]+)?([\s]*)?$/'; + $match = '/^http(s)?\:\/\/(www\.)?[a-zA-Z0-9\-\_]+(\.[a-zA-Z0-9\-\_]+)*\.([a-z]{2,4})((\/[a-zA-Z0-9\_\.\-\:\%\+]+)*(\/([a-zA-Z0-9\_\:\-\.\+]+\.(php|html|htm|asp|aspx|jsp|cgi))?)?)?(\?([a-zA-Z0-9\_\-\+\s]+\=[a-zA-Z0-9\_\-\s\%\+\&]+)+)?(#[a-zA-Z0-9\_\-\+\s\%]+)?([\s]*)?$/'; if (preg_match($match,$url)) { |