Changeset 1647 in ExiteCMS

Timestamp:

08/17/08 14:48:04 (3 years ago)

Author:

hverton

Message:

fixed incorrectly parsing [img] tags

Location:

trunk/includes

Files:

• core_functions.php (modified) (3 diffs)
• forum_functions_include.php (modified) (2 diffs)

trunk/includes/core_functions.php

@@ -374 +374 @@
 
 // validate an URL
-function isURL($value, $onlyhttp=false) {
+function isURL($value, $onlyhttp=false, $schemereq=false) {
 
     // Build the regex to check the URL
@@ -382 +382 @@
         $scheme = "(https?|s?ftp|mailto|svn|cvs|callto|mms|skype)\:\/\/";       // ALL SCHEMES supported
     }
-    $urlregex = "^(".$scheme.")?";                                              // make the scheme optional
+    if ($schemereq) {
+        $urlregex = "^(".$scheme.")";                                           // scheme
+    } else {
+        $urlregex = "^(".$scheme.")?";                                          // scheme (optional)
+    }
     $urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)?";   // USERID + PASSWORD (optional)
     $urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)*";                           // HOSTNAME or IP
@@ -711 +715 @@
 function verify_image($file) {
     $image_safe = true;
-    if (file_exists($file)) {
+    if (isURL($file, false, true) || file_exists($file)) {
         $er = error_reporting(0);
         // get info about the image

trunk/includes/forum_functions_include.php

@@ -447 +447 @@
     $rawmsg = preg_replace_callback('#\[url(=.*?)\](.*?)([\r\n]*)\[/url\]#si', '_parseubb_urlblock', $rawmsg);
 
+    // strip IMG bbcode
+    $rawmsg = preg_replace_callback('#\[img\](.*?)([\r\n]*)\[/img\]#si', '_parseubb_imgblock', $rawmsg);
+
     // find other URL's in the text, strip them and add them to $urlblocks for conversion to [URL] bbcodes
     $rawmsg = preg_replace_callback('#(http|https|ftp)\://([a-zA-Z0-9\.\-]+(\:[a-zA-Z0-9\.&%\$\-]+)*@)?((25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])|(localhost)|([a-zA-Z0-9\-]+\.)*[a-zA-Z0-9\-]+\.[a-zA-Z]{2,4})(\:[0-9]+)?(/[^/][a-zA-Z0-9\.\,\?\'\\/\+&%\$\#\:\*\=~_\-@]*)*#si', '_parseubb_texturls', $rawmsg);
@@ -452 +455 @@
     // convert any newlines to html <br>
     $rawmsg = nl2br($rawmsg);
-
-    // strip IMG bbcode
-    $rawmsg = preg_replace_callback('#\[img\](.*?)([\r\n]*)\[/img\]#si', '_parseubb_imgblock', $rawmsg);
 
     // detect and convert wikitags to wiki bbcodes if needed