[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: bookmarks create.php,1.30.2.1,1.30.2.1.2.1 maint
|
From: |
Michael Totschnig <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: bookmarks create.php,1.30.2.1,1.30.2.1.2.1 maintain.php,1.26.2.2,1.26.2.2.2.1 view.php,1.18.2.1,1.18.2.1.2.1 |
|
Date: |
Tue, 25 Mar 2003 17:55:30 -0500 |
Update of /cvsroot/phpgroupware/bookmarks
In directory subversions:/tmp/cvs-serv2342
Modified Files:
Tag: Version-0_9_16-branch
create.php maintain.php view.php
Log Message:
syncing as far as possible 0.9.16 and HEAD
Index: create.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/create.php,v
retrieving revision 1.30.2.1
retrieving revision 1.30.2.1.2.1
diff -C2 -r1.30.2.1 -r1.30.2.1.2.1
*** create.php 10 Feb 2002 19:28:36 -0000 1.30.2.1
--- create.php 25 Mar 2003 22:55:27 -0000 1.30.2.1.2.1
***************
*** 124,128 ****
$GLOBALS['phpgw']->template->set_var('input_category',$GLOBALS['phpgw']->bookmarks->categories_list($bookmark['category']));
! $GLOBALS['phpgw']->template->set_var('category_image','<input
type="image" name="edit_category" src="' . PHPGW_IMAGES . '/edit.gif"
border="0">');
$selected[$bookmark['rating']] = ' selected';
--- 124,129 ----
$GLOBALS['phpgw']->template->set_var('input_category',$GLOBALS['phpgw']->bookmarks->categories_list($bookmark['category']));
! $GLOBALS['phpgw']->template->set_var('category_image','<input
type="image" name="edit_category" title="' . lang('Edit category') . '" src="'
!
.
$GLOBALS['phpgw']->common->image('bookmarks','edit') . '" border="0">');
$selected[$bookmark['rating']] = ' selected';
***************
*** 179,185 ****
$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="' . PHPGW_IMAGES .
'/cancel.gif" border="0">');
! $GLOBALS['phpgw']->template->set_var('form_link','<input type="image"
name="bk_create" alt="'
! . lang('Create bookmark') . '" src="' .
PHPGW_IMAGES . '/save.gif" border="0">');
$GLOBALS['phpgw']->common->phpgw_footer();
?>
--- 180,189 ----
$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']->common->image('bookmarks','cancel') . '" border="0">');
!
! $GLOBALS['phpgw']->template->set_var('form_link','<input type="image"
name="bk_create" title="' . lang('Save') . '" src="'
! .
$GLOBALS['phpgw']->common->image('bookmarks','save') . '" border="0">');
!
$GLOBALS['phpgw']->common->phpgw_footer();
?>
Index: maintain.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/maintain.php,v
retrieving revision 1.26.2.2
retrieving revision 1.26.2.2.2.1
diff -C2 -r1.26.2.2 -r1.26.2.2.2.1
*** maintain.php 15 Nov 2002 10:34:23 -0000 1.26.2.2
--- maintain.php 25 Mar 2003 22:55:27 -0000 1.26.2.2.2.1
***************
*** 1,200 ****
! <?php
!
/**************************************************************************\
! * phpGroupWare - Bookmarks
*
! * http://www.phpgroupware.org
*
! * Based on Bookmarker Copyright (C) 1998 Padraic Renaghan
*
! * http://www.renaghan.com/bookmarker
*
! * --------------------------------------------
*
! * This program is free software; you can redistribute it and/or modify
it *
! * under the terms of the GNU General Public License as published by
the *
! * Free Software Foundation; either version 2 of the License, or (at
your *
! * option) any later version.
*
!
\**************************************************************************/
!
! /* $Id$ */
!
! $GLOBALS['phpgw_info']['flags'] = array(
! 'currentapp' => 'bookmarks',
! 'enable_nextmatchs_class' => True,
! 'enable_categories_class' => True,
! 'noheader' => True,
! 'nonavbar' => True
! );
! include('../header.inc.php');
!
! $GLOBALS['phpgw']->bookmarks = createobject('bookmarks.bookmarks');
!
! $edit_category_x = $GLOBALS['HTTP_POST_VARS']['edit_category_x'];
! $edit_category_y = $GLOBALS['HTTP_POST_VARS']['edit_category_y'];
! $delete_x = $GLOBALS['HTTP_POST_VARS']['delete_x'];
! $delete_y = $GLOBALS['HTTP_POST_VARS']['delete_y'];
! $cancel_x = $GLOBALS['HTTP_POST_VARS']['cancel_x'];
! $cancel_y = $GLOBALS['HTTP_POST_VARS']['cancel_y'];
! $bm_id = $GLOBALS['HTTP_GET_VARS']['bm_id'] ?
$GLOBALS['HTTP_GET_VARS']['bm_id'] : $GLOBALS['HTTP_POST_VARS']['bm_id'];
!
! 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))
! {
!
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/bookmarks/list.php'));
! }
! else
! {
! $GLOBALS['phpgw']->bookmarks->delete($bm_id);
!
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/bookmarks/' .
$location_info['returnto']));
! }
! }
!
! 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(
! 'start' => 0,
! 'returnto' => 'list.php'
! );
!
$GLOBALS['phpgw']->bookmarks->save_session_data($location_info);
! }
! if ($location_info['bm_id'])
! {
! $extravars = 'bm_id=' . $location_info['bm_id'];
! }
!
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/bookmarks/' .
$location_info['returnto'],$extravars));
! }
!
! if ($edit_x || $edit_y)
! {
! if (!
$GLOBALS['phpgw']->bookmarks->check_perms($bm_id,PHPGW_ACL_EDIT))
! {
!
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/bookmarks/list.php'));
! }
! else
! {
! $GLOBALS['phpgw']->bookmarks->update($bm_id,$bookmark);
!
! if ($location_info['bm_id'])
! {
! $extravars = 'bm_id=' . $bm_id;
! }
!
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/bookmarks/view.php',$extravars));
! }
! }
!
! $location_info = $GLOBALS['phpgw']->bookmarks->read_session_data();
! if ($location_info['returnto'] == 'maintain.php')
! {
! $bookmark['name'] = $location_info['bookmark_name'];
! $bookmark['url'] = $location_info['bookmark_url'];
! $bookmark['desc'] = $location_info['bookmark_desc'];
! $bookmark['keywords'] = $location_info['bookmark_keywords'];
! $bookmark['category'] = $location_info['bookmark_category'];
! $bookmark['rating'] = $location_info['bookmark_rating'];
! }
! else if (! $edit_x || ! $edit_y)
! {
! $GLOBALS['phpgw']->db->query("select * from phpgw_bookmarks
where bm_id='$bm_id'",__LINE__,__FILE__);
! $GLOBALS['phpgw']->db->next_record();
!
! $bookmark['name'] =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('bm_name'));
! $bookmark['url'] = $GLOBALS['phpgw']->db->f('bm_url');
! $bookmark['desc'] =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('bm_desc'));
! $bookmark['keywords'] =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('bm_keywords'));
! $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'
! ));
! $GLOBALS['phpgw']->template->set_block('form','body');
! $GLOBALS['phpgw']->template->set_block('form','form_info');
!
! $GLOBALS['phpgw']->common->phpgw_header();
! include(PHPGW_APP_INC . '/header.inc.php');
! echo parse_navbar();
!
! app_header(&$GLOBALS['phpgw']->template);
!
! if (empty($error_msg))
! {
!
date_information(&$GLOBALS['phpgw']->template,$GLOBALS['phpgw']->db->f('bm_info'));
!
! $rs[$bookmark['rating']] = ' selected';
! $rating_select = '<select name="bookmark[rating]">'
! . ' <option value="0">--</option>'
! . ' <option value="1"' . $rs[1] . '>1 - ' .
lang('Lowest') . '</option>'
! . ' <option value="2"' . $rs[2] . '>2</option>'
! . ' <option value="3"' . $rs[3] . '>3</option>'
! . ' <option value="4"' . $rs[4] . '>4</option>'
! . ' <option value="5"' . $rs[5] . '>5</option>'
! . ' <option value="6"' . $rs[6] . '>6</option>'
! . ' <option value="7"' . $rs[7] . '>7</option>'
! . ' <option value="8"' . $rs[8] . '>8</option>'
! . ' <option value="9"' . $rs[9] . '>9</option>'
! . ' <option value="10"' . $rs[10] . '>10 - ' .
lang('Highest') . '</option>'
! . '</select>';
!
! $GLOBALS['phpgw']->template->set_var('lang_header',lang('Edit
bookmark'));
!
$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
! $GLOBALS['phpgw']->template->set_var('updated',$f_ts[2]);
!
$GLOBALS['phpgw']->template->set_var('total_visits',$GLOBALS['phpgw']->db->f('bm_visits'));
!
! $GLOBALS['phpgw']->template->set_var('lang_owner',lang('Created
by'));
! $account =
createobject('phpgwapi.accounts',$GLOBALS['phpgw']->db->f('bm_owner'));
! $ad = $account->read_repository();
!
$GLOBALS['phpgw']->template->set_var('owner_value',$GLOBALS['phpgw']->common->display_fullname($ad['account_lid'],$ad['firstname'],$ad['lastname']));
!
! $GLOBALS['phpgw']->template->set_var('lang_added',lang('Date
added'));
! $GLOBALS['phpgw']->template->set_var('lang_updated',lang('Date
last updated'));
! $GLOBALS['phpgw']->template->set_var('lang_visited',lang('Date
last visited'));
! $GLOBALS['phpgw']->template->set_var('lang_visits',lang('Total
visits'));
!
! $GLOBALS['phpgw']->template->parse('info','form_info');
!
!
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/bookmarks/maintain.php','bm_id='
. $bm_id));
! $GLOBALS['phpgw']->template->set_var('lang_url',lang('URL'));
! $GLOBALS['phpgw']->template->set_var('lang_name',lang('Name'));
!
$GLOBALS['phpgw']->template->set_var('lang_desc',lang('Description'));
!
$GLOBALS['phpgw']->template->set_var('lang_keywords',lang('Keywords'));
!
!
$GLOBALS['phpgw']->template->set_var('lang_category',lang('Category'));
!
$GLOBALS['phpgw']->template->set_var('lang_subcategory',lang('Sub Category'));
!
$GLOBALS['phpgw']->template->set_var('lang_rating',lang('Rating'));
!
!
$GLOBALS['phpgw']->template->set_var('lang_access',lang('Private'));
! $GLOBALS['phpgw']->template->set_var('input_access','<input
type="checkbox" name="bookmark[access]" value="private"' .
($bookmark['access']=='private'?' checked':'') . '>');
!
!
$GLOBALS['phpgw']->template->set_var('input_rating',$rating_select);
!
!
$GLOBALS['phpgw']->template->set_var('input_category',$GLOBALS['phpgw']->bookmarks->categories_list($bookmark['category']));
! $GLOBALS['phpgw']->template->set_var('category_image','<input
type="image" name="edit_category" src="' . PHPGW_IMAGES . '/edit.gif"
border="0">');
!
!
! $GLOBALS['phpgw']->template->set_var('input_url','<input
name="bookmark[url]" size="60" maxlength="255" value="' . $bookmark['url'] .
'">');
! $GLOBALS['phpgw']->template->set_var('input_name','<input
name="bookmark[name]" size="60" maxlength="255" value="' . $bookmark['name'] .
'">');
! $GLOBALS['phpgw']->template->set_var('input_desc','<textarea
name="bookmark[desc]" rows="3" cols="60" wrap="virtual">' . $bookmark['desc'] .
'</textarea>');
! $GLOBALS['phpgw']->template->set_var('input_keywords','<input
type="text" name="bookmark[keywords]" size="60" maxlength="255" value="' .
$bookmark['keywords'] . '">');
!
! $GLOBALS['phpgw']->template->parse('BODY','body');
!
! if
($GLOBALS['phpgw']->bookmarks->check_perms($bm_id,PHPGW_ACL_DELETE))
! {
!
$GLOBALS['phpgw']->template->set_var('delete_button','<input type="image"
name="delete" title="' . lang('Delete') . '" src="' . PHPGW_IMAGES .
'/delete.gif" border="0">');
! }
!
! $GLOBALS['phpgw']->template->set_var('cancel_button','<input
type="image" name="cancel" title="' . lang('Done') . '" src="' . PHPGW_IMAGES .
'/cancel.gif" border="0">');
! $GLOBALS['phpgw']->template->set_var('form_link','<input
type="image" name="edit" title="' . lang('Change Bookmark') . '" src="'
! . PHPGW_IMAGES . '/save.gif"
border="0">');
! }
! $GLOBALS['phpgw']->common->phpgw_footer();
! ?>
--- 1,202 ----
! <?php
!
/**************************************************************************\
! * phpGroupWare - Bookmarks
*
! * http://www.phpgroupware.org
*
! * Based on Bookmarker Copyright (C) 1998 Padraic Renaghan
*
! * http://www.renaghan.com/bookmarker
*
! * --------------------------------------------
*
! * This program is free software; you can redistribute it and/or modify
it *
! * under the terms of the GNU General Public License as published by
the *
! * Free Software Foundation; either version 2 of the License, or (at
your *
! * option) any later version.
*
!
\**************************************************************************/
!
! /* $Id$ */
!
! $GLOBALS['phpgw_info']['flags'] = array(
! 'currentapp' => 'bookmarks',
! 'enable_nextmatchs_class' => True,
! 'enable_categories_class' => True,
! 'noheader' => True,
! 'nonavbar' => True
! );
! include('../header.inc.php');
!
! $GLOBALS['phpgw']->bookmarks = createobject('bookmarks.bookmarks');
!
! $edit_category_x = $GLOBALS['HTTP_POST_VARS']['edit_category_x'];
! $edit_category_y = $GLOBALS['HTTP_POST_VARS']['edit_category_y'];
! $delete_x = $GLOBALS['HTTP_POST_VARS']['delete_x'];
! $delete_y = $GLOBALS['HTTP_POST_VARS']['delete_y'];
! $cancel_x = $GLOBALS['HTTP_POST_VARS']['cancel_x'];
! $cancel_y = $GLOBALS['HTTP_POST_VARS']['cancel_y'];
! $bm_id = $GLOBALS['HTTP_GET_VARS']['bm_id'] ?
$GLOBALS['HTTP_GET_VARS']['bm_id'] : $GLOBALS['HTTP_POST_VARS']['bm_id'];
!
! 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))
! {
!
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/bookmarks/list.php'));
! }
! else
! {
! $GLOBALS['phpgw']->bookmarks->delete($bm_id);
!
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/bookmarks/' .
$location_info['returnto']));
! }
! }
!
! 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(
! 'start' => 0,
! 'returnto' => 'list.php'
! );
!
$GLOBALS['phpgw']->bookmarks->save_session_data($location_info);
! }
! if ($location_info['bm_id'])
! {
! $extravars = 'bm_id=' . $location_info['bm_id'];
! }
!
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/bookmarks/' .
$location_info['returnto'],$extravars));
! }
!
! if ($edit_x || $edit_y)
! {
! if (!
$GLOBALS['phpgw']->bookmarks->check_perms($bm_id,PHPGW_ACL_EDIT))
! {
!
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/bookmarks/list.php'));
! }
! else
! {
! $GLOBALS['phpgw']->bookmarks->update($bm_id,$bookmark);
!
! if ($location_info['bm_id'])
! {
! $extravars = 'bm_id=' . $bm_id;
! }
!
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/bookmarks/view.php',$extravars));
! }
! }
!
! $location_info = $GLOBALS['phpgw']->bookmarks->read_session_data();
! if ($location_info['returnto'] == 'maintain.php')
! {
! $bookmark['name'] = $location_info['bookmark_name'];
! $bookmark['url'] = $location_info['bookmark_url'];
! $bookmark['desc'] = $location_info['bookmark_desc'];
! $bookmark['keywords'] = $location_info['bookmark_keywords'];
! $bookmark['category'] = $location_info['bookmark_category'];
! $bookmark['rating'] = $location_info['bookmark_rating'];
! }
! else if (! $edit_x || ! $edit_y)
! {
! $GLOBALS['phpgw']->db->query("select * from phpgw_bookmarks
where bm_id='$bm_id'",__LINE__,__FILE__);
! $GLOBALS['phpgw']->db->next_record();
!
! $bookmark['name'] =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('bm_name'));
! $bookmark['url'] = $GLOBALS['phpgw']->db->f('bm_url');
! $bookmark['desc'] =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('bm_desc'));
! $bookmark['keywords'] =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('bm_keywords'));
! $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'
! ));
! $GLOBALS['phpgw']->template->set_block('form','body');
! $GLOBALS['phpgw']->template->set_block('form','form_info');
!
! $GLOBALS['phpgw']->common->phpgw_header();
! include(PHPGW_APP_INC . '/header.inc.php');
! echo parse_navbar();
!
! app_header(&$GLOBALS['phpgw']->template);
!
! if (empty($error_msg))
! {
!
date_information(&$GLOBALS['phpgw']->template,$GLOBALS['phpgw']->db->f('bm_info'));
!
! $rs[$bookmark['rating']] = ' selected';
! $rating_select = '<select name="bookmark[rating]">'
! . ' <option value="0">--</option>'
! . ' <option value="1"' . $rs[1] . '>1 - ' .
lang('Lowest') . '</option>'
! . ' <option value="2"' . $rs[2] . '>2</option>'
! . ' <option value="3"' . $rs[3] . '>3</option>'
! . ' <option value="4"' . $rs[4] . '>4</option>'
! . ' <option value="5"' . $rs[5] . '>5</option>'
! . ' <option value="6"' . $rs[6] . '>6</option>'
! . ' <option value="7"' . $rs[7] . '>7</option>'
! . ' <option value="8"' . $rs[8] . '>8</option>'
! . ' <option value="9"' . $rs[9] . '>9</option>'
! . ' <option value="10"' . $rs[10] . '>10 - ' .
lang('Highest') . '</option>'
! . '</select>';
!
! $GLOBALS['phpgw']->template->set_var('lang_header',lang('Edit
bookmark'));
!
$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
! $GLOBALS['phpgw']->template->set_var('updated',$f_ts[2]);
!
$GLOBALS['phpgw']->template->set_var('total_visits',$GLOBALS['phpgw']->db->f('bm_visits'));
!
! $GLOBALS['phpgw']->template->set_var('lang_owner',lang('Created
by'));
! $account =
createobject('phpgwapi.accounts',$GLOBALS['phpgw']->db->f('bm_owner'));
! $ad = $account->read_repository();
!
$GLOBALS['phpgw']->template->set_var('owner_value',$GLOBALS['phpgw']->common->display_fullname($ad['account_lid'],$ad['firstname'],$ad['lastname']));
!
! $GLOBALS['phpgw']->template->set_var('lang_added',lang('Date
added'));
! $GLOBALS['phpgw']->template->set_var('lang_updated',lang('Date
last updated'));
! $GLOBALS['phpgw']->template->set_var('lang_visited',lang('Date
last visited'));
! $GLOBALS['phpgw']->template->set_var('lang_visits',lang('Total
visits'));
!
! $GLOBALS['phpgw']->template->parse('info','form_info');
!
!
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/bookmarks/maintain.php','bm_id='
. $bm_id));
! $GLOBALS['phpgw']->template->set_var('lang_url',lang('URL'));
! $GLOBALS['phpgw']->template->set_var('lang_name',lang('Name'));
!
$GLOBALS['phpgw']->template->set_var('lang_desc',lang('Description'));
!
$GLOBALS['phpgw']->template->set_var('lang_keywords',lang('Keywords'));
!
!
$GLOBALS['phpgw']->template->set_var('lang_category',lang('Category'));
!
$GLOBALS['phpgw']->template->set_var('lang_subcategory',lang('Sub Category'));
!
$GLOBALS['phpgw']->template->set_var('lang_rating',lang('Rating'));
!
!
$GLOBALS['phpgw']->template->set_var('lang_access',lang('Private'));
! $GLOBALS['phpgw']->template->set_var('input_access','<input
type="checkbox" name="bookmark[access]" value="private"' .
($bookmark['access']=='private'?' checked':'') . '>');
!
!
$GLOBALS['phpgw']->template->set_var('input_rating',$rating_select);
!
!
$GLOBALS['phpgw']->template->set_var('input_category',$GLOBALS['phpgw']->bookmarks->categories_list($bookmark['category']));
! $GLOBALS['phpgw']->template->set_var('category_image','<input
type="image" name="edit_category" title="' . lang('Edit category') . '" src="'
!
.
$GLOBALS['phpgw']->common->image('bookmarks','edit') . '" border="0">');
!
! $GLOBALS['phpgw']->template->set_var('input_url','<input
name="bookmark[url]" size="60" maxlength="255" value="' . $bookmark['url'] .
'">');
! $GLOBALS['phpgw']->template->set_var('input_name','<input
name="bookmark[name]" size="60" maxlength="255" value="' . $bookmark['name'] .
'">');
! $GLOBALS['phpgw']->template->set_var('input_desc','<textarea
name="bookmark[desc]" rows="3" cols="60" wrap="virtual">' . $bookmark['desc'] .
'</textarea>');
! $GLOBALS['phpgw']->template->set_var('input_keywords','<input
type="text" name="bookmark[keywords]" size="60" maxlength="255" value="' .
$bookmark['keywords'] . '">');
!
! $GLOBALS['phpgw']->template->parse('BODY','body');
!
! if
($GLOBALS['phpgw']->bookmarks->check_perms($bm_id,PHPGW_ACL_DELETE))
! {
!
$GLOBALS['phpgw']->template->set_var('delete_button','<input type="image"
name="delete" title="' . lang('Delete') . '" src="'
!
.
$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']->common->image('bookmarks','cancel') . '" border="0">');
! $GLOBALS['phpgw']->template->set_var('form_link','<input
type="image" name="edit" title="' . lang('Save') . '" src="'
!
.
$GLOBALS['phpgw']->common->image('bookmarks','save') . '" border="0">');
! }
! $GLOBALS['phpgw']->common->phpgw_footer();
! ?>
Index: view.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/view.php,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.1.2.1
diff -C2 -r1.18.2.1 -r1.18.2.1.2.1
*** view.php 15 Nov 2002 10:34:23 -0000 1.18.2.1
--- view.php 25 Mar 2003 22:55:27 -0000 1.18.2.1.2.1
***************
*** 1,120 ****
! <?php
!
/**************************************************************************\
! * phpGroupWare - Bookmarks
*
! * http://www.phpgroupware.org
*
! * --------------------------------------------
*
! * This program is free software; you can redistribute it and/or modify
it *
! * under the terms of the GNU General Public License as published by
the *
! * Free Software Foundation; either version 2 of the License, or (at
your *
! * option) any later version.
*
!
\**************************************************************************/
!
! /* $Id$ */
!
! $GLOBALS['phpgw_info']['flags'] = array(
! 'currentapp' => 'bookmarks',
! 'enable_nextmatchs_class' => True,
! 'enable_categories_class' => True,
! 'noheader' => True,
! 'nonavbar' => True
! );
! include('../header.inc.php');
!
! $GLOBALS['phpgw']->bookmarks = createobject('bookmarks.bookmarks');
!
! $location_info = $GLOBALS['phpgw']->bookmarks->read_session_data();
! if ($cancel_x || $cancel_y)
! {
!
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/bookmarks/' .
$location_info['returnto'],'bm_cat=' . $location_info['bm_cat']));
! }
!
! if ($edit_x || $edit_y)
! {
! $location_info['returnto'] = 'view.php';
! $location_info['bm_id'] = $bm_id;
! $GLOBALS['phpgw']->bookmarks->save_session_data($location_info);
!
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/bookmarks/maintain.php','bm_id='
. $bm_id));
! }
!
! $GLOBALS['phpgw']->template->set_file(array(
! 'common_' => 'common.tpl',
! 'form' => 'form.tpl',
! 'standard' => 'common.standard.tpl'
! ));
! $GLOBALS['phpgw']->template->set_block('form','body');
! $GLOBALS['phpgw']->template->set_block('form','form_info');
!
! if (! $GLOBALS['phpgw']->bookmarks->check_perms($bm_id,PHPGW_ACL_READ))
! {
!
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/bookmarks/list.php','bm_cat='
. $location_info['bm_cat']));
! }
!
! $GLOBALS['phpgw']->common->phpgw_header();
! include(PHPGW_APP_INC . '/header.inc.php');
! echo parse_navbar();
!
! app_header(&$GLOBALS['phpgw']->template);
!
!
$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
!
! $GLOBALS['phpgw']->db->query("select * from phpgw_bookmarks where
bm_id='$bm_id'",__LINE__,__FILE__);
! $GLOBALS['phpgw']->db->next_record();
!
!
date_information(&$GLOBALS['phpgw']->template,$GLOBALS['phpgw']->db->f('bm_info'));
!
$GLOBALS['phpgw']->template->set_var('total_visits',$GLOBALS['phpgw']->db->f('bm_visits'));
!
! $GLOBALS['phpgw']->template->set_var('lang_owner',lang('Created by'));
!
! $account =
createobject('phpgwapi.accounts',$GLOBALS['phpgw']->db->f('bm_owner'));
! $ad = $account->read_repository();
!
$GLOBALS['phpgw']->template->set_var('owner_value',$GLOBALS['phpgw']->common->display_fullname($ad['account_lid'],$ad['firstname'],$ad['lastname']));
!
! $GLOBALS['phpgw']->template->set_var('lang_added',lang('Date added'));
! $GLOBALS['phpgw']->template->set_var('lang_updated',lang('Date last
updated'));
! $GLOBALS['phpgw']->template->set_var('lang_visited',lang('Date last
visited'));
! $GLOBALS['phpgw']->template->set_var('lang_visits',lang('Total
visits'));
!
! $GLOBALS['phpgw']->template->parse('info','form_info');
!
!
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/bookmarks/view.php','bm_id='
. $bm_id));
! $GLOBALS['phpgw']->template->set_var('lang_url',lang('URL'));
! $GLOBALS['phpgw']->template->set_var('lang_name',lang('Name'));
! $GLOBALS['phpgw']->template->set_var('lang_desc',lang('Description'));
! $GLOBALS['phpgw']->template->set_var('lang_keywords',lang('Keywords'));
!
! $GLOBALS['phpgw']->template->set_var('lang_category',lang('Category'));
! $GLOBALS['phpgw']->template->set_var('lang_rating',lang('Rating'));
!
! $GLOBALS['phpgw']->template->set_var('lang_access',lang('Access'));
!
$GLOBALS['phpgw']->template->set_var('input_access',lang($GLOBALS['phpgw']->db->f('bm_access')));
!
! $GLOBALS['phpgw']->template->set_var('lang_header',lang('View
bookmark'));
!
! $GLOBALS['phpgw']->template->set_var('input_url','<a href="' .
$GLOBALS['phpgw']->link('/bookmarks/redirect.php','bm_id=' .
$GLOBALS['phpgw']->db->f('bm_id')) . '" target="_new">' .
$GLOBALS['phpgw']->db->f('bm_url') . '</a>');
!
$GLOBALS['phpgw']->template->set_var('input_name',$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('bm_name')));
!
$GLOBALS['phpgw']->template->set_var('input_desc',$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('bm_desc')));
!
$GLOBALS['phpgw']->template->set_var('input_keywords',$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('bm_keywords')));
! $GLOBALS['phpgw']->template->set_var('input_rating','<img src="' .
$GLOBALS['phpgw']->common->get_image_path('bookmarks') . '/bar-' .
$GLOBALS['phpgw']->db->f('bm_rating') . '.jpg">');
!
! $category =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->categories->return_name($GLOBALS['phpgw']->db->f('bm_category')));
! $subcategory =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->categories->return_name($GLOBALS['phpgw']->db->f('bm_subcategory')));
! if ($subcategory)
! {
! $category .= ' :: ' . $subcategory;
! }
! $GLOBALS['phpgw']->template->set_var('input_category',$category);
!
! $GLOBALS['phpgw']->template->set_var('cancel_button','<input
type="image" name="cancel" title="' . lang('Done') . '" src="' . PHPGW_IMAGES .
'/cancel.gif" border="0">');
!
! if ($GLOBALS['phpgw']->bookmarks->check_perms($bm_id,PHPGW_ACL_EDIT))
! {
! $GLOBALS['phpgw']->template->set_var('edit_button','<input
type="image" name="edit" title="' . lang('Edit') . '" src="' . PHPGW_IMAGES .
'/edit.gif" border="0">');
! }
!
! if ($GLOBALS['phpgw']->bookmarks->check_perms($bm_id,PHPGW_ACL_DELETE))
! {
! $GLOBALS['phpgw']->template->set_var('delete_button','<input
type="image" name="delete" title="' . lang('Delete') . '" src="' . PHPGW_IMAGES
. '/delete.gif" border="0">');
! }
!
! $GLOBALS['phpgw']->common->phpgw_footer();
! ?>
--- 1,123 ----
! <?php
!
/**************************************************************************\
! * phpGroupWare - Bookmarks
*
! * http://www.phpgroupware.org
*
! * --------------------------------------------
*
! * This program is free software; you can redistribute it and/or modify
it *
! * under the terms of the GNU General Public License as published by
the *
! * Free Software Foundation; either version 2 of the License, or (at
your *
! * option) any later version.
*
!
\**************************************************************************/
!
! /* $Id$ */
!
! $GLOBALS['phpgw_info']['flags'] = array(
! 'currentapp' => 'bookmarks',
! 'enable_nextmatchs_class' => True,
! 'enable_categories_class' => True,
! 'noheader' => True,
! 'nonavbar' => True
! );
! include('../header.inc.php');
!
! $GLOBALS['phpgw']->bookmarks = createobject('bookmarks.bookmarks');
!
! $location_info = $GLOBALS['phpgw']->bookmarks->read_session_data();
! if ($cancel_x || $cancel_y)
! {
!
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/bookmarks/' .
$location_info['returnto'],'bm_cat=' . $location_info['bm_cat']));
! }
!
! if ($edit_x || $edit_y)
! {
! $location_info['returnto'] = 'view.php';
! $location_info['bm_id'] = $bm_id;
! $GLOBALS['phpgw']->bookmarks->save_session_data($location_info);
!
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/bookmarks/maintain.php','bm_id='
. $bm_id));
! }
!
! $GLOBALS['phpgw']->template->set_file(array(
! 'common_' => 'common.tpl',
! 'form' => 'form.tpl',
! 'standard' => 'common.standard.tpl'
! ));
! $GLOBALS['phpgw']->template->set_block('form','body');
! $GLOBALS['phpgw']->template->set_block('form','form_info');
!
! if (! $GLOBALS['phpgw']->bookmarks->check_perms($bm_id,PHPGW_ACL_READ))
! {
!
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/bookmarks/list.php','bm_cat='
. $location_info['bm_cat']));
! }
!
! $GLOBALS['phpgw']->common->phpgw_header();
! include(PHPGW_APP_INC . '/header.inc.php');
! echo parse_navbar();
!
! app_header(&$GLOBALS['phpgw']->template);
!
!
$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
!
! $GLOBALS['phpgw']->db->query("select * from phpgw_bookmarks where
bm_id='$bm_id'",__LINE__,__FILE__);
! $GLOBALS['phpgw']->db->next_record();
!
!
date_information(&$GLOBALS['phpgw']->template,$GLOBALS['phpgw']->db->f('bm_info'));
!
$GLOBALS['phpgw']->template->set_var('total_visits',$GLOBALS['phpgw']->db->f('bm_visits'));
!
! $GLOBALS['phpgw']->template->set_var('lang_owner',lang('Created by'));
!
! $account =
createobject('phpgwapi.accounts',$GLOBALS['phpgw']->db->f('bm_owner'));
! $ad = $account->read_repository();
!
$GLOBALS['phpgw']->template->set_var('owner_value',$GLOBALS['phpgw']->common->display_fullname($ad['account_lid'],$ad['firstname'],$ad['lastname']));
!
! $GLOBALS['phpgw']->template->set_var('lang_added',lang('Date added'));
! $GLOBALS['phpgw']->template->set_var('lang_updated',lang('Date last
updated'));
! $GLOBALS['phpgw']->template->set_var('lang_visited',lang('Date last
visited'));
! $GLOBALS['phpgw']->template->set_var('lang_visits',lang('Total
visits'));
!
! $GLOBALS['phpgw']->template->parse('info','form_info');
!
!
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/bookmarks/view.php','bm_id='
. $bm_id));
! $GLOBALS['phpgw']->template->set_var('lang_url',lang('URL'));
! $GLOBALS['phpgw']->template->set_var('lang_name',lang('Name'));
! $GLOBALS['phpgw']->template->set_var('lang_desc',lang('Description'));
! $GLOBALS['phpgw']->template->set_var('lang_keywords',lang('Keywords'));
!
! $GLOBALS['phpgw']->template->set_var('lang_category',lang('Category'));
! $GLOBALS['phpgw']->template->set_var('lang_rating',lang('Rating'));
!
! $GLOBALS['phpgw']->template->set_var('lang_access',lang('Access'));
!
$GLOBALS['phpgw']->template->set_var('input_access',lang($GLOBALS['phpgw']->db->f('bm_access')));
!
! $GLOBALS['phpgw']->template->set_var('lang_header',lang('View
bookmark'));
!
! $GLOBALS['phpgw']->template->set_var('input_url','<a href="' .
$GLOBALS['phpgw']->link('/bookmarks/redirect.php','bm_id=' .
$GLOBALS['phpgw']->db->f('bm_id')) . '" target="_new">' .
$GLOBALS['phpgw']->db->f('bm_url') . '</a>');
!
$GLOBALS['phpgw']->template->set_var('input_name',$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('bm_name')));
!
$GLOBALS['phpgw']->template->set_var('input_desc',$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('bm_desc')));
!
$GLOBALS['phpgw']->template->set_var('input_keywords',$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('bm_keywords')));
! $GLOBALS['phpgw']->template->set_var('input_rating','<img src="' .
$GLOBALS['phpgw']->common->get_image_path('bookmarks') . '/bar-' .
$GLOBALS['phpgw']->db->f('bm_rating') . '.jpg">');
!
! $category =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->categories->return_name($GLOBALS['phpgw']->db->f('bm_category')));
! $subcategory =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->categories->return_name($GLOBALS['phpgw']->db->f('bm_subcategory')));
! if ($subcategory)
! {
! $category .= ' :: ' . $subcategory;
! }
! $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']->common->image('bookmarks','cancel') . '"
border="0">');
!
! if ($GLOBALS['phpgw']->bookmarks->check_perms($bm_id,PHPGW_ACL_EDIT))
! {
! $GLOBALS['phpgw']->template->set_var('edit_button','<input
type="image" name="edit" title="' . lang('Edit') . '" src="'
! . $GLOBALS['phpgw']->common->image('bookmarks','edit')
. '" border="0">');
! }
!
! if ($GLOBALS['phpgw']->bookmarks->check_perms($bm_id,PHPGW_ACL_DELETE))
! {
! $GLOBALS['phpgw']->template->set_var('delete_button','<input
type="image" name="delete" title="' . lang('Delete') . '" src="'
! .
$GLOBALS['phpgw']->common->image('bookmarks','delete') . '" border="0">');
! }
!
! $GLOBALS['phpgw']->common->phpgw_footer();
! ?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: bookmarks create.php,1.30.2.1,1.30.2.1.2.1 maintain.php,1.26.2.2,1.26.2.2.2.1 view.php,1.18.2.1,1.18.2.1.2.1,
Michael Totschnig <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: bookmarks/inc class.plist.inc.php,1.10.2.1,1.10.2.1.2.1 class.treemenu.inc.php,1.6,1.6.4.1
- Next by Date:
[Phpgroupware-cvs] CVS: bookmarks/templates/default form.tpl,1.8,1.8.4.1 list.body_tree.tpl,1.3,1.3.4.1
- Previous by thread:
[Phpgroupware-cvs] CVS: bookmarks/inc class.plist.inc.php,1.10.2.1,1.10.2.1.2.1 class.treemenu.inc.php,1.6,1.6.4.1
- Next by thread:
[Phpgroupware-cvs] CVS: bookmarks/templates/default form.tpl,1.8,1.8.4.1 list.body_tree.tpl,1.3,1.3.4.1
- Index(es):