Changeset 1671

Timestamp:

09/04/2007 06:36:09 PM (16 months ago)

Author:

jeena

Message:

fixed #144

Location:

trunk/scripts

Files:

• bbcode.php (modified) (3 diffs)
• general.func.php (modified) (1 diff)

trunk/scripts/bbcode.php

@@ -18 +18 @@
 
 function do_bbcode_url ($action, $attributes, $content, $params, $node_object) {
+
     // URL auslesen
     $url = isset($attributes['default']) ? $attributes['default'] : $content;
     
-    // URL validieren (Fix #137)
+    // URL validieren
     if($action == 'validate') {
-        if('javascript:' == substr($url, 0, 11)) return false;
-        return true;
+                        if (isset($params["no_js"]) AND (stripos(trim($url), "javascript:")) === 0) return false;               
+                        return true;
     }
 
-    // Optik bei relativen URLs verbessern
+    // relative in absolute URLs umwandeln
     if(!isset($attributes['default']) AND strpos($url, "/") === 0) {
       $content = (isset($_SERVER['HTTPS']) ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . $url;
     }
-    return '<a href="' . htmlspecialchars($url) . '">' . htmlspecialchars($content) . '</a>';
+    return '<a href="' . htmlspecialchars($url) . '">' . $content . '</a>';
 }
 
@@ -120 +121 @@
 $bbcode->setCodeFlag ('headline', 'opentag.before.newline', BBCODE_NEWLINE_DROP);
 $bbcode->setCodeFlag ('headline', 'closetag.after.newline', BBCODE_NEWLINE_DROP);
-# $bbcode->setCodeFlag ('html', 'paragraph_type', BBCODE_PARAGRAPH_BLOCK_ELEMENT);
 $bbcode->setCodeFlag ('html', 'opentag.before.newline', BBCODE_NEWLINE_DROP);
 $bbcode->setCodeFlag ('html', 'closetag.after.newline', BBCODE_NEWLINE_DROP);
@@ -141 +141 @@
 $bbcomments->addCode ('i', 'simple_replace', null, array ('start_tag' => '<em>', 'end_tag' => '</em>'),
                   'inline', array ('block', 'inline', 'link'), array ());
-$bbcomments->addCode ('url', 'usecontent?', 'do_bbcode_url', array ('usecontent_param' => 'default'),
+$bbcomments->addCode ('url', 'usecontent?', 'do_bbcode_url', array ('usecontent_param' => 'default', 'no_js' => true),
                   'link', array ('block', 'inline'), array ('link'));
 $bbcomments->addCode ('quote', 'simple_replace', null, array('start_tag' => '<blockquote>', 'end_tag' => '</blockquote>'),

trunk/scripts/general.func.php

@@ -230 +230 @@
 }
 
+if (!function_exists("stripos")) {
+  function stripos($str,$needle,$offset=0) {
+      return strpos( strtolower($str), strtolower($needle), $offset );
+  }
+}
+
+if(!function_exists('str_ireplace')){
+    function str_ireplace($search, $replace, $subject){
+        if(is_array($search)){
+            array_walk($search, create_function('&$pat, $key', '"/".preg_quote($pat, "/")."/i"'));
+        }
+        else{
+            $search = '/'.preg_quote($search, '/').'/i';
+        }
+        return preg_replace($search, $replace, $subject);
+    }
+}
+
 // output the administration menu
 function output_admin_menu() {