[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

[Michael Totschnig <address@hidden>]

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

Modified Files:
        class.bo.inc.php class.so.inc.php class.ui.inc.php 
Log Message:
bug in error reporting
strip_html from URLS so that they are valid in HTML/XML


Index: class.bo.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/inc/class.bo.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.bo.inc.php    8 Apr 2003 18:44:24 -0000       1.3
--- class.bo.inc.php    8 Apr 2003 21:58:12 -0000       1.4
***************
*** 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.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.so.inc.php    8 Apr 2003 05:00:59 -0000       1.2
--- class.so.inc.php    8 Apr 2003 21:58:12 -0000       1.3
***************
*** 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.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.ui.inc.php    8 Apr 2003 20:09:04 -0000       1.5
--- class.ui.inc.php    8 Apr 2003 21:58:12 -0000       1.6
***************
*** 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();