[Phpgroupware-cvs] CVS: bookmarks/inc class.bo.inc.php,1.5,1.6 class.ui.inc.php,1.8,1.9

[Michael Totschnig <address@hidden>]

Update of /cvsroot/phpgroupware/bookmarks/inc
In directory subversions:/tmp/cvs-serv31398

Modified Files:
        class.bo.inc.php class.ui.inc.php 
Log Message:
strip_html to remove backslashes


Index: class.bo.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/inc/class.bo.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.bo.inc.php    16 May 2003 20:57:45 -0000      1.5
--- class.bo.inc.php    9 Jun 2003 20:27:22 -0000       1.6
***************
*** 426,430 ****
  
                        $t->set_var(array(
!                               'catname' => 
iconv("ISO-8859-1","UTF-8",$this->categories->id2name($catid)),
                                'catid' => $catid,
                                'folded' => (in_array($catid,$this->expanded) ? 
'no' : 'yes')
--- 426,430 ----
  
                        $t->set_var(array(
!                               'catname' => 
iconv("ISO-8859-1","UTF-8",$GLOBALS['phpgw']->strip_html($this->categories->id2name($catid))),
                                'catid' => $catid,
                                'folded' => (in_array($catid,$this->expanded) ? 
'no' : 'yes')

Index: class.ui.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/inc/class.ui.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.ui.inc.php    16 May 2003 20:57:45 -0000      1.8
--- class.ui.inc.php    9 Jun 2003 20:27:22 -0000       1.9
***************
*** 449,453 ****
                        {
                                $total_matchs .= ' ' . 
!                                       lang('from category 
%1',$GLOBALS['phpgw']->strip_html($this->bo->categories->return_name($bm_cat))) 
.
                                        ' - <a href="' . 
                                        
$GLOBALS['phpgw']->link('/index.php','menuaction=bookmarks.ui._list&bm_cat=0&start=0')
 .
--- 449,453 ----
                        {
                                $total_matchs .= ' ' . 
!                                       lang('from category 
%1',$GLOBALS['phpgw']->strip_html($this->bo->categories->id2name($bm_cat))) .
                                        ' - <a href="' . 
                                        
$GLOBALS['phpgw']->link('/index.php','menuaction=bookmarks.ui._list&bm_cat=0&start=0')
 .
***************
*** 589,593 ****
                function print_list_break ($category_id)
                {
!                       $category = 
$this->bo->categories->return_name($category_id);
  
                        $massupdate_shown = $GLOBALS['massupdate_shown'];
--- 589,593 ----
                function print_list_break ($category_id)
                {
!                       $category = 
$GLOBALS['phpgw']->strip_html($this->bo->categories->id2name($category_id));
  
                        $massupdate_shown = $GLOBALS['massupdate_shown'];
***************
*** 817,825 ****
                                        $cat_id . 
                                        '\')"></td><td><a 
style="font-weight:bold" title="' .
!                                       $cat['description'] .
                                        '" href="' .
                                        
$GLOBALS['phpgw']->link('/index.php','menuaction=bookmarks.ui._list&start=0&bm_cat='
 . $cat_id) .
                                        '">' .
!                                       $cat['name'] . 
                                        '</a></td></tr>' . 
                                        "\n";
--- 817,825 ----
                                        $cat_id . 
                                        '\')"></td><td><a 
style="font-weight:bold" title="' .
!                                       
$GLOBALS['phpgw']->strip_html($cat['description']) .
                                        '" href="' .
                                        
$GLOBALS['phpgw']->link('/index.php','menuaction=bookmarks.ui._list&start=0&bm_cat='
 . $cat_id) .
                                        '">' .
!                                       
$GLOBALS['phpgw']->strip_html($cat['name']) . 
                                        '</a></td></tr>' . 
                                        "\n";
***************
*** 942,946 ****
                        $account = 
createobject('phpgwapi.accounts',$bookmark['owner']);
                        $ad      = $account->read_repository();
!                       $category  = 
$GLOBALS['phpgw']->strip_html($this->bo->categories->return_name($bookmark['category']));
  
                        $this->t->set_var(array(
--- 942,946 ----
                        $account = 
createobject('phpgwapi.accounts',$bookmark['owner']);
                        $ad      = $account->read_repository();
!                       $category  = 
$GLOBALS['phpgw']->strip_html($this->bo->categories->id2name($bookmark['category']));
  
                        $this->t->set_var(array(