Changeset 1770

Timestamp:

11/17/2008 11:20:56 PM (7 weeks ago)

Author:

driehle

Message:

fixed #205

Files:

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

trunk/scripts/bbcode.php

@@ -3 +3 @@
 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);
@@ -66 +66 @@
         else return true;
     }
-                $title = empty($attributes["title"]) ? "" : " title='".$attributes["title"]."'";
+                $title = empty($attributes["title"]) ? "" : " title='".htmlspecialchars($attributes["title"])."'";
 
-    if (isset($attributes['class']) AND isset($attributes['caption'])) $class_caption = " class='img ".htmlspecialchars($attributes['class'])."'";
+    if (isset($attributes['class']) AND isset($attributes['caption'])) $class = " class='img ".htmlspecialchars($attributes['class'])."'";
     elseif (isset($attributes['class'])) $class = " class='".htmlspecialchars($attributes['class'])."'";
 
-    if (strpos($content, "http://") === 0) return "<img src='".htmlspecialchars($content)."'".$class." alt='".$attributes['alt']."'".$title." />";
+    if (strpos($content, "http://") === 0) return "<img src='".htmlspecialchars($content)."'".$class." alt='".htmlspecialchars($attributes['alt'])."'".$title." />";
     else {
         list($img_width, $img_height, $img_type, $img_attr) = @getimagesize(JLOG_BASEPATH.'/img'.DIRECTORY_SEPARATOR.htmlspecialchars($content));
-        $img = "<img src='".JLOG_PATH."/img/".htmlspecialchars($content)."'".$class." alt='".$attributes['alt']."' style='width: ".$img_width."px;'".$title." />";
+        $img = "<img src='".JLOG_PATH."/img/".htmlspecialchars($content)."'".$class." alt='".htmlspecialchars($attributes['alt'])."' style='width: ".$img_width."px;'".$title." />";
     }
 
      if(isset($attributes['caption'])) {
-        return "\n<dl".$class_caption." style='width: ".$img_width."px;'>\n <dt>".$img."</dt>\n  <dd>".$attributes['caption']."</dd>\n</dl>\n";
+        return "\n<dl".$class." style='width: ".$img_width."px;'>\n <dt>".$img."</dt>\n  <dd>".htmlspecialchars(attributes['caption'])."</dd>\n</dl>\n";
      }
      else return $img;