[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.2,1.1.2.3 c
From: |
Michael Totschnig <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: bookmarks/inc class.bo.inc.php,1.1.2.2,1.1.2.3 class.so.inc.php,1.1.2.1,1.1.2.2 class.ui.inc.php,1.1.2.4,1.1.2.5 |
Date: |
Tue, 08 Apr 2003 17:56:21 -0400 |
Update of /cvsroot/phpgroupware/bookmarks/inc
In directory subversions:/tmp/cvs-serv3855/inc
Modified Files:
Tag: Version-0_9_16-branch
class.bo.inc.php class.so.inc.php class.ui.inc.php
Log Message:
bug in error reporting
do strip_html in URLS too, since they are not valid in HTML otherwise
Index: class.bo.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/inc/class.bo.inc.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** class.bo.inc.php 8 Apr 2003 18:43:38 -0000 1.1.2.2
--- class.bo.inc.php 8 Apr 2003 21:56:19 -0000 1.1.2.3
***************
*** 202,207 ****
global $error_msg, $msg;
! unset($error_msg);
!
// Do we have all necessary data?
if (! $values['url'] || $values['url'] == 'http://')
--- 202,206 ----
global $error_msg, $msg;
! $error_msg = '';
// Do we have all necessary data?
if (! $values['url'] || $values['url'] == 'http://')
***************
*** 242,247 ****
}
}
! }
!
if ($error_msg)
{
--- 241,245 ----
}
}
! }
if ($error_msg)
{
Index: class.so.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/inc/class.so.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** class.so.inc.php 8 Apr 2003 04:46:15 -0000 1.1.2.1
--- class.so.inc.php 8 Apr 2003 21:56:19 -0000 1.1.2.2
***************
*** 63,67 ****
{
$bookmark['name'] =
$GLOBALS['phpgw']->strip_html($this->db->f('bm_name'));
! $bookmark['url'] = $this->db->f('bm_url');
$bookmark['desc'] =
$GLOBALS['phpgw']->strip_html($this->db->f('bm_desc'));
$bookmark['keywords'] =
$GLOBALS['phpgw']->strip_html($this->db->f('bm_keywords'));
--- 63,67 ----
{
$bookmark['name'] =
$GLOBALS['phpgw']->strip_html($this->db->f('bm_name'));
! $bookmark['url'] =
$GLOBALS['phpgw']->strip_html($this->db->f('bm_url'));
$bookmark['desc'] =
$GLOBALS['phpgw']->strip_html($this->db->f('bm_desc'));
$bookmark['keywords'] =
$GLOBALS['phpgw']->strip_html($this->db->f('bm_keywords'));
***************
*** 84,88 ****
{
$bookmark['name'] =
$GLOBALS['phpgw']->strip_html($this->db->f('bm_name'));
! $bookmark['url'] = $this->db->f('bm_url');
$bookmark['desc'] =
$GLOBALS['phpgw']->strip_html($this->db->f('bm_desc'));
$bookmark['keywords'] =
$GLOBALS['phpgw']->strip_html($this->db->f('bm_keywords'));
--- 84,88 ----
{
$bookmark['name'] =
$GLOBALS['phpgw']->strip_html($this->db->f('bm_name'));
! $bookmark['url'] =
$GLOBALS['phpgw']->strip_html($this->db->f('bm_url'));
$bookmark['desc'] =
$GLOBALS['phpgw']->strip_html($this->db->f('bm_desc'));
$bookmark['keywords'] =
$GLOBALS['phpgw']->strip_html($this->db->f('bm_keywords'));
Index: class.ui.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/inc/class.ui.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.ui.inc.php 8 Apr 2003 20:07:57 -0000 1.1.2.4
--- class.ui.inc.php 8 Apr 2003 21:56:19 -0000 1.1.2.5
***************
*** 281,285 ****
$this->bo->update($bm_id,$bookmark);
}
-
$bookmark = $this->bo->read($bm_id);
--- 281,284 ----
***************
*** 375,378 ****
--- 374,378 ----
),
));
+
$this->t->fp('body','form');
$this->app_messages();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: bookmarks/inc class.bo.inc.php,1.1.2.2,1.1.2.3 class.so.inc.php,1.1.2.1,1.1.2.2 class.ui.inc.php,1.1.2.4,1.1.2.5,
Michael Totschnig <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/setup phpgw_en.lang,1.1.1.1.2.5,1.1.1.1.2.6 phpgw_fr.lang,1.1.2.5,1.1.2.6
- Next by Date:
[Phpgroupware-cvs] CVS: bookmarks/inc class.bo.inc.php,1.3,1.4 class.so.inc.php,1.2,1.3 class.ui.inc.php,1.5,1.6
- Previous by thread:
[Phpgroupware-cvs] CVS: property/setup phpgw_en.lang,1.1.1.1.2.5,1.1.1.1.2.6 phpgw_fr.lang,1.1.2.5,1.1.2.6
- Next by thread:
[Phpgroupware-cvs] CVS: bookmarks/inc class.bo.inc.php,1.3,1.4 class.so.inc.php,1.2,1.3 class.ui.inc.php,1.5,1.6
- Index(es):