? bookmarks/fix_bookmarks.patch Index: bookmarks//create.php =================================================================== RCS file: /cvsroot/phpgroupware/bookmarks/create.php,v retrieving revision 1.32 diff -u -r1.32 create.php --- bookmarks//create.php 18 Mar 2002 02:38:18 -0000 1.32 +++ bookmarks//create.php 15 Oct 2002 19:02:05 -0000 @@ -179,7 +179,7 @@ $GLOBALS['phpgw']->template->set_var('input_access','<input type="checkbox" name="bookmark[access]" value="private"' . $checked . '>'); - $GLOBALS['phpgw']->template->set_var('cancel_button','<input type="image" name="cancel" title="' . lang('Done') . '" src="' + $GLOBALS['phpgw']->template->set_var('cancel_button','<input type="image" name="cancel" title="' . lang('Cancel') . '" src="' . $GLOBALS['phpgw']->common->image('bookmarks','cancel') . '" border="0">'); $GLOBALS['phpgw']->template->set_var('form_link','<input type="image" name="bk_create" title="' . lang('Save') . '" src="' Index: bookmarks//maintain.php =================================================================== RCS file: /cvsroot/phpgroupware/bookmarks/maintain.php,v retrieving revision 1.29 diff -u -r1.29 maintain.php --- bookmarks//maintain.php 30 Apr 2002 23:44:00 -0000 1.29 +++ bookmarks//maintain.php 15 Oct 2002 19:02:05 -0000 @@ -22,23 +22,13 @@ include('../header.inc.php'); $GLOBALS['phpgw']->bookmarks = createobject('bookmarks.bookmarks'); - - $edit_category_x = get_var('edit_category_x',Array('POST')); - $edit_category_y = get_var('edit_category_y',Array('POST')); - $delete_x = get_var('delete_x',Array('POST')); - $delete_y = get_var('delete_y',Array('POST')); - $cancel_x = get_var('cancel_x',Array('POST')); - $cancel_y = get_var('cancel_y',Array('POST')); - $bm_id = get_var('bm_id',Array('POST','GET')); - + if ($edit_category_x || $edit_category_y) { grab_form_values('maintain.php',True); $GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uicategories.index&cats_app=bookmarks&global_cats=True')); } - $location_info = $GLOBALS['phpgw']->bookmarks->read_session_data(); - if ($delete_x || $delete_y) { if (! $GLOBALS['phpgw']->bookmarks->check_perms($bm_id,PHPGW_ACL_DELETE)) @@ -54,7 +44,6 @@ if ($cancel_x || $cancel_y) { - // TODO: If they go to categorys, it will not redirect them properly. if ($location_info['returnto'] == 'maintain.php') { $location_info = array( @@ -70,7 +59,7 @@ $GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/bookmarks/' . $location_info['returnto'],$extravars)); } - if ($edit_x || $edit_y) + if ($save_x || $save_y) { if (! $GLOBALS['phpgw']->bookmarks->check_perms($bm_id,PHPGW_ACL_EDIT)) { @@ -110,7 +99,7 @@ $bookmark['category'] = $GLOBALS['phpgw']->db->f('bm_category') . '|' . $GLOBALS['phpgw']->db->f('bm_subcategory'); $bookmark['rating'] = $GLOBALS['phpgw']->db->f('bm_rating'); } - + $GLOBALS['phpgw']->template->set_file(array( 'common_' => 'common.tpl', 'form' => 'form.tpl' @@ -192,9 +181,9 @@ . $GLOBALS['phpgw']->common->image('bookmarks','delete') . '" border="0">'); } - $GLOBALS['phpgw']->template->set_var('cancel_button','<input type="image" name="cancel" title="' . lang('Done') . '" src="' + $GLOBALS['phpgw']->template->set_var('cancel_button','<input type="image" name="cancel" title="' . lang('Cancel') . '" src="' . $GLOBALS['phpgw']->common->image('bookmarks','cancel') . '" border="0">'); - $GLOBALS['phpgw']->template->set_var('form_link','<input type="image" name="edit" title="' . lang('Save') . '" src="' + $GLOBALS['phpgw']->template->set_var('form_link','<input type="image" name="save" title="' . lang('Save') . '" src="' . $GLOBALS['phpgw']->common->image('bookmarks','save') . '" border="0">'); } $GLOBALS['phpgw']->common->phpgw_footer(); Index: bookmarks//tree.php =================================================================== RCS file: /cvsroot/phpgroupware/bookmarks/tree.php,v retrieving revision 1.27 diff -u -r1.27 tree.php --- bookmarks//tree.php 18 Mar 2002 02:51:07 -0000 1.27 +++ bookmarks//tree.php 15 Oct 2002 19:02:05 -0000 @@ -91,6 +91,7 @@ /* Added to keep track of displayed items, so they do not repeat */ $shown = array(); + $tree= array(); $db2 = $GLOBALS['phpgw']->db; while ($cat = @each($categories)) { Index: bookmarks//view.php =================================================================== RCS file: /cvsroot/phpgroupware/bookmarks/view.php,v retrieving revision 1.20 diff -u -r1.20 view.php --- bookmarks//view.php 18 Jun 2002 01:02:09 -0000 1.20 +++ bookmarks//view.php 15 Oct 2002 19:02:05 -0000 @@ -105,7 +105,7 @@ } $GLOBALS['phpgw']->template->set_var('input_category',$category); - $GLOBALS['phpgw']->template->set_var('cancel_button','<input type="image" name="cancel" title="' . lang('Done') . '" src="' + $GLOBALS['phpgw']->template->set_var('cancel_button','<input type="image" name="cancel" title="' . lang('Cancel') . '" src="' . $GLOBALS['phpgw']->common->image('bookmarks','cancel') . '" border="0">'); if ($GLOBALS['phpgw']->bookmarks->check_perms($bm_id,PHPGW_ACL_EDIT)) Index: bookmarks//inc/class.plist.inc.php =================================================================== RCS file: /cvsroot/phpgroupware/bookmarks/inc/class.plist.inc.php,v retrieving revision 1.11 diff -u -r1.11 class.plist.inc.php --- bookmarks//inc/class.plist.inc.php 30 Apr 2002 23:44:00 -0000 1.11 +++ bookmarks//inc/class.plist.inc.php 15 Oct 2002 19:02:05 -0000 @@ -10,9 +10,8 @@ * Free Software Foundation; either version 2 of the License, or (at your * * option) any later version. * \**************************************************************************/ - /* $Id: class.plist.inc.php,v 1.11 2002/04/30 23:44:00 skeeter Exp $ */ - + // These functions will be slowly moved into its own class class plist { @@ -20,11 +19,11 @@ { } } - + function print_list_break (&$list_tpl, $category, $subcategory) { $massupdate_shown = $GLOBALS['massupdate_shown']; - + // construct URLs that include WHERE clauses for linking to the // search page. The Category link will show a search WHERE the // category matches. The sub-cat link will show a search WHERE @@ -67,12 +66,13 @@ function print_list ($where_clause, $start, $returnto, &$content, &$error_msg) { - $bm_cat = get_var('bm_cat',Array('GET')); - $bm_subcat = get_var('bm_subcat',Array('GET')); $page_header_shown = $GLOBALS['page_header_shown']; $list_tpl = $GLOBALS['phpgw']->template; - + + $bm_cat = $list_tpl->get_var('bm_cat',Array('GET')); + $bm_subcat = $list_tpl->get_var('bm_subcat',Array('GET')); + $list_tpl->set_file(array( 'list' => 'list.tpl' )); @@ -169,7 +169,7 @@ $list_tpl->set_var('bookmark_keywords',''); } - // Check owner + // Create an edit link if this user has edit rights if (($this->grants[$GLOBALS['phpgw']->db->f('bm_owner')] & PHPGW_ACL_EDIT) || ($GLOBALS['phpgw']->db->f('bm_owner') == $GLOBALS['phpgw_info']['user']['account_id'])) { $maintain_url = $GLOBALS['phpgw']->link("/bookmarks/maintain.php","bm_id=" . $GLOBALS['phpgw']->db->f("bm_id")); Index: bookmarks//inc/class.treemenu.inc.php =================================================================== RCS file: /cvsroot/phpgroupware/bookmarks/inc/class.treemenu.inc.php,v retrieving revision 1.9 diff -u -r1.9 class.treemenu.inc.php --- bookmarks//inc/class.treemenu.inc.php 30 Apr 2002 23:44:00 -0000 1.9 +++ bookmarks//inc/class.treemenu.inc.php 15 Oct 2002 19:02:05 -0000 @@ -5,7 +5,7 @@ { function showmenu($treeinfo) { - $p = get_var('p',Array('GET')); + $p = $GLOBALS['phpgw']->template->get_var('p',Array('GET')); $img_expand = $GLOBALS['phpgw']->common->image('bookmarks','plus'); $img_collapse = $GLOBALS['phpgw']->common->image('phpgwapi','tree_collapse');