[Phpgroupware-cvs] CVS: infolog/inc class.bolink.inc.php, 1.20.2.1, 1.20.2.2

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/infolog/inc
In directory subversions:/tmp/cvs-serv19838

Modified Files:
      Tag: Version-0_9_16-branch
        class.bolink.inc.php 
Log Message:
fixed calendar-title, & and " have been displayed as & or "
(cal is transmitting its data with entities and they get coded twice)


Index: class.bolink.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.bolink.inc.php,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -C2 -r1.20.2.1 -r1.20.2.2
*** class.bolink.inc.php        11 Aug 2003 22:32:55 -0000      1.20.2.1
--- class.bolink.inc.php        19 Aug 2003 10:26:03 -0000      1.20.2.2
***************
*** 796,799 ****
--- 796,810 ----
  
                /*!
+               @function decode_htmlspecialchars
+               @syntax decode_htmlspecialchars( $str )
+               @author ralfbecker
+               @abstract reverse function of htmlspecialchars()
+               */
+               function decode_htmlspecialchars($str)
+               {
+                       return 
str_replace(array('&amp;','&quot;','&lt;','&gt;'),array('&','"','<','>'),$str);
+               }
+ 
+               /*!
                @function calendar_title
                @syntax calendar_title(  $id  )
***************
*** 819,823 ****
                        
                        $name = 
$GLOBALS['phpgw']->common->show_date($this->bocal->maketime($event['start']) - 
$this->bocal->datetime->tz_offset,$format);
!                       $name .= ': ' . $event['title'];
  
                        return $name;
--- 830,834 ----
                        
                        $name = 
$GLOBALS['phpgw']->common->show_date($this->bocal->maketime($event['start']) - 
$this->bocal->datetime->tz_offset,$format);
!                       $name .= ': ' . 
$this->decode_htmlspecialchars($event['title']);        // cal returns entities
  
                        return $name;