[Phpgroupware-cvs] bookmarks/inc class.ui.inc.php, 1.1.2.16 class.so.inc.php, 1.1.2.9 class.bo.inc.php, 1.1.2.11

[skwashd]

Update of bookmarks/inc

Modified Files:
     Branch: Version-0_9_16-branch
            class.ui.inc.php lines: +4 -4
            class.so.inc.php lines: +23 -12
            class.bo.inc.php lines: +4 -4

Log Message:
fix bug #8372 and some other things which needed to be done

====================================================
Index: bookmarks/inc/class.ui.inc.php
diff -u bookmarks/inc/class.ui.inc.php:1.1.2.15 
bookmarks/inc/class.ui.inc.php:1.1.2.16
--- bookmarks/inc/class.ui.inc.php:1.1.2.15     Thu Jun  2 23:50:06 2005
+++ bookmarks/inc/class.ui.inc.php      Tue Dec  6 13:28:40 2005
@@ -964,7 +964,7 @@
                        $this->t->set_block('form','body');
                        $this->t->set_block('form','form_info');

-                       
$this->bo->date_information(&$this->t,$bookmark['info']);
+                       $this->bo->date_information($this->t, 
$bookmark['info']);
                        $this->app_template();

                        $account = 
createobject('phpgwapi.accounts',$bookmark['owner']);
@@ -1161,8 +1161,8 @@
                        $bm_id = $_GET['bm_id'];
                        $bookmark = $this->bo->read($bm_id);
                        $ts = explode(",",$bookmark['info']);
-                       $newtimestamp = 
sprintf("%s,%s,%s",$ts[0],time(),$ts[2]);
-                       $this->bo->updatetimestamp($bm_id,$newtimestamp);
+                       $newtimestamp = sprintf("%s,%s,%s", $ts[0], 
$GLOBALS['phpgw']->datetime->gmtnow, $ts[2]);
+                       $this->bo->updatetimestamp($bm_id, $newtimestamp);
                        
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->safe_redirect($bookmark['url']));
                }


====================================================
Index: bookmarks/inc/class.so.inc.php
diff -u bookmarks/inc/class.so.inc.php:1.1.2.8 
bookmarks/inc/class.so.inc.php:1.1.2.9
--- bookmarks/inc/class.so.inc.php:1.1.2.8      Tue Jun 21 15:07:59 2005
+++ bookmarks/inc/class.so.inc.php      Tue Dec  6 13:28:40 2005
@@ -121,15 +121,21 @@

                        if (! $values['timestamps'])
                        {
-                               $values['timestamps'] = time() . ',0,0';
+                               $values['timestamps'] = 
"{$GLOBALS['phpgw']->datetime->gmtnow},0,0";
                        }

                        $query = sprintf("insert into phpgw_bookmarks (bm_url, 
bm_name, bm_desc, bm_keywords, bm_category,"
                                . "bm_rating, bm_owner, bm_access, bm_info, 
bm_visits) "
                                . "values 
('%s','%s','%s','%s',%s,%s,'%s','%s','%s',0)",
-                               $values['url'], addslashes($values['name']), 
addslashes($values['desc']), addslashes($values['keywords']),
-                               $values['category'], $values['rating'], 
$GLOBALS['phpgw_info']['user']['account_id'], $values['access'],
-                               $values['timestamps']);
+                               $this->db->db_addslashes($values['url']),
+                               $this->db->db_addslashes($values['name']),
+                               $this->db->db_addslashes($values['desc']),
+                               $this->db->db_addslashes($values['keywords']),
+                               intval($values['category']),
+                               intval($values['rating']),
+                               $GLOBALS['phpgw_info']['user']['account_id'],
+                               $values['access'],
+                               
$this->db->db_addslashes($values['timestamps']));

                        if ($this->db->query($query,__LINE__,__FILE__))
                        {
@@ -152,16 +158,21 @@
                        $this->db->next_record();
                        $ts = explode(',',$this->db->f('bm_info'));

-                       $timestamps = sprintf('%s,%s,%s',$ts[0],$ts[1],time());
+                       $timestamps = sprintf('%s,%s,%s', $ts[0], $ts[1], 
$GLOBALS['phpgw']->datetime->gmtnow);

                        // Update bookmark information.
                        $query = sprintf("update phpgw_bookmarks set 
bm_url='%s', bm_name='%s', bm_desc='%s', "
-//                             . "bm_keywords='%s', bm_category='%s', 
bm_subcategory='%s', bm_rating='%s',"
                                . "bm_keywords='%s', bm_category=%s, 
bm_rating='%s',"
                                . "bm_info='%s', bm_access='%s' where 
bm_id='%s'",
-                                       $values['url'], 
addslashes($values['name']), addslashes($values['desc']), 
addslashes($values['keywords']),
-//                                     $category, $subcategory, 
$values['rating'], $timestamps, $values['access'], $id);
-                                       $values['category'],$values['rating'], 
$timestamps, $values['access'], intval($id));
+                                       
$this->db->db_addslashes($values['url']),
+                                       
$this->db->db_addslashes($values['name']),
+                                       
$this->db->db_addslashes($values['desc']),
+                                       
$this->db->db_addslashes($values['keywords']),
+                                       intval($values['category']),
+                                       intval($values['rating']),
+                                       $this->db->db_addslashes($timestamps),
+                                       $values['access'],
+                                       intval($id));

                        if ($this->db->query($query,__LINE__,__FILE__))
                        {
@@ -176,8 +187,8 @@
                function updatetimestamp($id,$timestamp)
                {
                        $query = 'UPDATE phpgw_bookmarks'
-                               . ' SET bm_info=' . intval($timestamp)
-                               . ' , bm_visits=bm_visits+1 WHERE bm_id=' 
.intval($id);
+                               . " SET bm_info='" . 
$this->db->db_addslashes($timestamp) . "', "
+                               . 'bm_visits = (bm_visits + 1) WHERE bm_id=' 
.intval($id);
                        $this->db->query($query,__LINE__,__FILE__);
                }


====================================================
Index: bookmarks/inc/class.bo.inc.php
diff -u bookmarks/inc/class.bo.inc.php:1.1.2.10 
bookmarks/inc/class.bo.inc.php:1.1.2.11
--- bookmarks/inc/class.bo.inc.php:1.1.2.10     Sat Nov  6 16:13:48 2004
+++ bookmarks/inc/class.bo.inc.php      Tue Dec  6 13:28:40 2005
@@ -64,9 +64,9 @@
                {
                        $ts = explode(',',$raw_string);

-                       
$tpl->set_var('added_value',$GLOBALS['phpgw']->common->show_date($ts[0]));
-                       
$tpl->set_var('visited_value',($ts[1]?$GLOBALS['phpgw']->common->show_date($ts[1]):lang('Never')));
-                       
$tpl->set_var('updated_value',($ts[2]?$GLOBALS['phpgw']->common->show_date($ts[2]):lang('Never')));
+                       $tpl->set_var('added_value', 
$GLOBALS['phpgw']->common->show_date($ts[0]) );
+                       $tpl->set_var('visited_value', ($ts[1] ? 
$GLOBALS['phpgw']->common->show_date($ts[1]) : lang('Never') ) );
+                       $tpl->set_var('updated_value', ($ts[2] ? 
$GLOBALS['phpgw']->common->show_date($ts[2]) : lang('Never') ) );
                }

                function 
_list($cat_id,$start=False,$where_clause=False,$subcatsalso=True)