extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-27 05:11:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

GLOBALS and formatting work

Browse Source
This commit is contained in:
Miles Lott 2001-09-20 03:55:57 +00:00
parent 1f88e43cda
commit 70ecf36bfe
1 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
addressbook/inc/class.uiaddressbook.inc.php
View File

@ -44,7 +44,7 @@
'preferences' => True 'preferences' => True
); );
var $extrafields = array( var $extrafields = array(
'ophone' => 'ophone', 'ophone' => 'ophone',
'address2' => 'address2', 'address2' => 'address2',
'address3' => 'address3' 'address3' => 'address3'
@ -358,7 +358,7 @@
$this->limit = 30; $this->limit = 30;
} }
// global $filter; /*global $filter; */
if (empty($this->filter) || !isset($this->filter)) if (empty($this->filter) || !isset($this->filter))
{ {
if($this->prefs['default_filter']) if($this->prefs['default_filter'])
@ -385,7 +385,7 @@
case 'none': case 'none':
break; break;
case 'private': case 'private':
$qfilter .= ',access=private'; /* fall through */ $qfilter .= ',access=private'; /* fall through */
case 'yours': case 'yours':
$qfilter .= ',owner=' . $GLOBALS['phpgw_info']['user']['account_id']; $qfilter .= ',owner=' . $GLOBALS['phpgw_info']['user']['account_id'];
break; break;
@ -556,8 +556,9 @@
function add_email() function add_email()
{ {
global $name,$referer,$add_email; $name = $GLOBALS['HTTP_POST_VARS']['name'] ? $GLOBALS['HTTP_POST_VARS']['name'] : $GLOBALS['HTTP_GET_VARS']['name'];
$referer = $GLOBALS['HTTP_POST_VARS']['referer'] ? $GLOBALS['HTTP_POST_VARS']['referer'] : $GLOBALS['HTTP_GET_VARS']['referer'];
$add_email = $GLOBALS['HTTP_POST_VARS']['add_email'] ? $GLOBALS['HTTP_POST_VARS']['add_email'] : $GLOBALS['HTTP_GET_VARS']['add_email'];
$named = explode(' ', $name); $named = explode(' ', $name);
for ($i=count($named);$i>=0;$i--) { $names[$i] = $named[$i]; } for ($i=count($named);$i>=0;$i--) { $names[$i] = $named[$i]; }
@ -614,7 +615,7 @@
$ab_id = $this->bo->get_lastid(); $ab_id = $this->bo->get_lastid();
Header('Location: ' Header('Location: '
. $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id=' . $ab_id . '&referer=' . $referer)); . $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id=' . $ab_id . '&referer=' . $referer));
$GLOBALS['phpgw']->common->phpgw_exit(); $GLOBALS['phpgw']->common->phpgw_exit();
} }
@ -707,12 +708,9 @@
function delete() function delete()
{ {
global $entry,$ab_id,$confirm; $ab_id = $GLOBALS['HTTP_POST_VARS']['entry']['ab_id'] ? $GLOBALS['HTTP_POST_VARS']['entry']['ab_id'] : $GLOBALS['HTTP_POST_VARS']['ab_id'];
$confirm = $GLOBALS['HTTP_GET_VARS']['confirm'] ? $GLOBALS['HTTP_GET_VARS']['confirm'] :$GLOBALS['HTTP_POST_VARS']['confirm'];
if (!$ab_id)
{
$ab_id = $entry['ab_id'];
}
if (!$ab_id) if (!$ab_id)
{ {
Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.get_list')); Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.get_list'));
@ -744,7 +742,6 @@
else else
{ {
$this->bo->delete_entry(array('id' => $ab_id)); $this->bo->delete_entry(array('id' => $ab_id));
@Header('Location: ' . $GLOBALS['phpgw']->link('/addressbook/index.php','menuaction=addressbook.uiaddressbook.get_list')); @Header('Location: ' . $GLOBALS['phpgw']->link('/addressbook/index.php','menuaction=addressbook.uiaddressbook.get_list'));
} }
} }
@ -755,7 +752,6 @@
$submit = $GLOBALS['HTTP_POST_VARS']['submit']; $submit = $GLOBALS['HTTP_POST_VARS']['submit'];
$referer = $GLOBALS['HTTP_GET_VARS']['referer']; $referer = $GLOBALS['HTTP_GET_VARS']['referer'];
/* First, make sure they have permission to this entry */ /* First, make sure they have permission to this entry */
$check = $this->bo->read_entry(array('id' => $ab_id, 'fields' => array('owner' => 'owner','tid' => 'tid'))); $check = $this->bo->read_entry(array('id' => $ab_id, 'fields' => array('owner' => 'owner','tid' => 'tid')));
@ -985,12 +981,6 @@
$this->template->set_var('vcard_button',lang('no vcard')); $this->template->set_var('vcard_button',lang('no vcard'));
} }
# it's better to use $GLOBALS['phpgw_info']['server']['webserver_url'] instead of '/phpgroupware'
# right?
# and why do we replace /phpgroupware from the url, we already have a perfect url?
# $this->template->set_var('done_button',$this->html_1button_form('DoneForm','Done',
# $referer ? ereg_replace('/phpgroupware','',$referer) : $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.get_list')));
$this->template->set_var('done_button',$this->html_1button_form('DoneForm','Done', $this->template->set_var('done_button',$this->html_1button_form('DoneForm','Done',
$referer ? $referer : $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.get_list'))); $referer ? $referer : $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.get_list')));
$this->template->set_var('access_link',$access_link); $this->template->set_var('access_link',$access_link);
@ -1293,7 +1283,7 @@
/* Following used for add/edit */ /* Following used for add/edit */
function addressbook_form($format,$action,$title='',$fields='',$customfields='',$cat_id='') function addressbook_form($format,$action,$title='',$fields='',$customfields='',$cat_id='')
{ {
global $referer; $referer = $GLOBALS['HTTP_GET_VARS']['referer'] ? $GLOBALS['HTTP_GET_VARS']['referer'] : $GLOBALS['HTTP_POST_VARS']['referer'];
$this->template->set_file(array('form' => 'form.tpl')); $this->template->set_file(array('form' => 'form.tpl'));
@ -1525,7 +1515,7 @@
else else
{ {
$notes = '<form><TEXTAREA cols="60" name="entry[notes]" rows="4">' $notes = '<form><TEXTAREA cols="60" name="entry[notes]" rows="4">'
. $notes . '</TEXTAREA></form>'; . $notes . '</TEXTAREA></form>';
if ($bday == '//') if ($bday == '//')
{ {
$bday = ''; $bday = '';