Changeset 1647 in ExiteCMS for trunk/includes/core_functions.php

Timestamp:

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

Author:

hverton

Message:

fixed incorrectly parsing [img] tags

File:

• trunk/includes/core_functions.php (modified) (3 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