[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: bookmarks/inc class.bo.inc.php,1.1.2.4,1.1.2.5 c
From: |
Michael Totschnig <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: bookmarks/inc class.bo.inc.php,1.1.2.4,1.1.2.5 class.ui.inc.php,1.1.2.7,1.1.2.8 |
Date: |
Mon, 09 Jun 2003 16:22:20 -0400 |
Update of /cvsroot/phpgroupware/bookmarks/inc
In directory subversions:/tmp/cvs-serv25460/inc
Modified Files:
Tag: Version-0_9_16-branch
class.bo.inc.php class.ui.inc.php
Log Message:
strip_html to remove backslahes
Index: class.bo.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/inc/class.bo.inc.php,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** class.bo.inc.php 16 May 2003 20:55:24 -0000 1.1.2.4
--- class.bo.inc.php 9 Jun 2003 20:22:18 -0000 1.1.2.5
***************
*** 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.1.2.7
retrieving revision 1.1.2.8
diff -C2 -r1.1.2.7 -r1.1.2.8
*** class.ui.inc.php 16 May 2003 20:55:24 -0000 1.1.2.7
--- class.ui.inc.php 9 Jun 2003 20:22:18 -0000 1.1.2.8
***************
*** 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(
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: bookmarks/inc class.bo.inc.php,1.1.2.4,1.1.2.5 class.ui.inc.php,1.1.2.7,1.1.2.8,
Michael Totschnig <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: news_admin/setup phpgw_de.lang,1.1.2.1,1.1.2.2
- Next by Date:
[Phpgroupware-cvs] CVS: sitemgr/doc sitemgr.html,1.2,1.3 sitemgr.lyx,1.2,1.3 sitemgr.pdf,1.2,1.3 sitemgr.sgml,1.2,1.3
- Previous by thread:
[Phpgroupware-cvs] CVS: news_admin/setup phpgw_de.lang,1.1.2.1,1.1.2.2
- Next by thread:
[Phpgroupware-cvs] CVS: sitemgr/doc sitemgr.html,1.2,1.3 sitemgr.lyx,1.2,1.3 sitemgr.pdf,1.2,1.3 sitemgr.sgml,1.2,1.3
- Index(es):