Changeset 1680

Timestamp:

12/12/2007 07:52:26 PM (13 months ago)

Author:

driehle

Message:

fixed #146

Files:

• trunk/scripts/bbcode.php (modified) (2 diffs)

trunk/scripts/bbcode.php

@@ -1 +1 @@
 <?php
+
 require_once JLOG_BASEPATH.'/scripts/stringparser_bbcode.class.php';
 
-// Zeilenumbrüche verschiedener Betriebsysteme vereinheitlichen
+// Zeilenumbrï¿œche verschiedener Betriebsysteme vereinheitlichen
 function convertlinebreaks ($text) {
-    return preg_replace ("/\015\012|\015|\012/", "\n", $text);
+  return preg_replace ("/\015\012|\015|\012/", "\n", $text);
 }
 
 // Alles bis auf Neuezeile-Zeichen entfernen
 function bbcode_stripcontents ($text) {
-    return preg_replace ("/[^\n]/", '', $text);
+  return preg_replace ("/[^\n]/", '', $text);
 }
 
 // Sonderzeichen behandeln
 function special_character($text) {
-    return str_replace("&amp;#", "&#", $text);
+  return str_replace("&amp;#", "&#", $text);
 }
 
 function do_bbcode_url ($action, $attributes, $content, $params, $node_object) {
-
-    // URL auslesen
-    $url = isset($attributes['default']) ? $attributes['default'] : $content;
-    
-    // URL validieren
-    if($action == 'validate') {
-                        if(stripos(ltrim($url), "javascript:") === 0) return false;             
-                        return true;
+  // get URL by parameters
+  $url = isset($attributes['default']) ? $attributes['default'] : $content;
+  
+  // validate URL
+  if($action == 'validate') {
+    // Due to Bug #146 we will only allow specific protocolls in the url
+    // currently, these are: HTTP, FTP, News and Mailto - or relative URLs
+    // starting with a slash
+                if(preg_match('#^(http://|ftp://|news:|mailto:|/)#i', $url)) return true;        
+                // Some people just write www.example.org, skipping the http://
+                // We're going to be gentle a prefix this link with the protocoll.
+                // However, example.org (without www) will not be recognized
+                elseif(substr($url, 0, 4) == 'www.') return true;
+                // all other links will be ignored      
+                return true;
+  }
+  // generate link
+  else {
+    // prefix URL with http:// if the protocoll was skipped
+    if(substr($url, 0, 4) == 'www.') {
+      $url = 'http://' . $url;
     }
-
-    // relative in absolute URLs umwandeln
-    if(!isset($attributes['default']) AND strpos($url, "/") === 0) {
-      $content = (isset($_SERVER['HTTPS']) ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . $url;
+    // in case a relative url is given without a link text, we display
+    // the full URI as link text, not just the relative path
+    if(!isset($attributes['default']) AND substr($url, 0, 1) == '/') {
+      $content = (isset($_SERVER['HTTPS']) ? 'https://' : 'http://') 
+               . $_SERVER['HTTP_HOST'] 
+               . $url;
     }
+    // build link
     return '<a href="' . htmlspecialchars($url) . '">' . $content . '</a>';
+  }
 }
 
@@ -150 +168 @@
 $bbcomments->setCodeFlag ('quote', 'opentag.before.newline', BBCODE_NEWLINE_DROP);
 $bbcomments->setCodeFlag ('quote', 'closetag.after.newline', BBCODE_NEWLINE_DROP);
-?>
+
+// eof