[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] addressbook/inc class.uiaddressbook.inc.php
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] addressbook/inc class.uiaddressbook.inc.php |
|
Date: |
Wed, 29 Nov 2006 14:26:31 +0000 |
CVSROOT: /sources/phpgroupware
Module name: addressbook
Changes by: Sigurd Nes <sigurdne> 06/11/29 14:26:31
Modified files:
inc : class.uiaddressbook.inc.php
Log message:
Notices and fixes
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/addressbook/inc/class.uiaddressbook.inc.php?cvsroot=phpgroupware&r1=1.75&r2=1.76
Patches:
Index: class.uiaddressbook.inc.php
===================================================================
RCS file: /sources/phpgroupware/addressbook/inc/class.uiaddressbook.inc.php,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- class.uiaddressbook.inc.php 10 Nov 2006 13:34:16 -0000 1.75
+++ class.uiaddressbook.inc.php 29 Nov 2006 14:26:31 -0000 1.76
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
-/* $Id: class.uiaddressbook.inc.php,v 1.75 2006/11/10 13:34:16 sigurdne Exp $
*/
+/* $Id: class.uiaddressbook.inc.php,v 1.76 2006/11/29 14:26:31 sigurdne Exp $
*/
class uiaddressbook
@@ -311,7 +311,7 @@
$count_function = 'get_count_orgs';
$get_data_function = 'get_orgs';
-
$this->template->set_var('add_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.add_org'));
+
$this->template->set_var('add_url',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'addressbook.uiaddressbook.add_org')));
$search_obj=array('query' => $this->query,
'search_obj' => array(
@@ -502,9 +502,8 @@
$org_data =
$this->bo->get_orgs_person_data($myid);
if ( is_array($org_data) &&
count($org_data) )
{
- $ref = '<a href="' .
$GLOBALS['phpgw']->link("/index.php",
-
"menuaction=addressbook.uiaddressbook.view_org") .
-
"&ab_id=" . $org_data[0]['my_org_id'] . '">' ;
+ $ref = '<a href="' .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'addressbook.uiaddressbook.view_org',
+
'ab_id'=>$org_data[0]['my_org_id'])) . '">' ;
}
else
{
@@ -513,9 +512,8 @@
}
else
{
- $ref = '<a href="' .
$GLOBALS['phpgw']->link("/index.php",
-
"menuaction=addressbook.uiaddressbook.view_org") .
- "&ab_id=" .
$myid . '">' ;
+ $ref = '<a href="' .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'addressbook.uiaddressbook.view_org',
+
'ab_id'=>
$myid)) . '">' ;
}
$data =
htmlspecialchars($coldata) . '</a>';
}
@@ -527,10 +525,7 @@
{
if
($GLOBALS['phpgw_info']['user']['apps']['email'])
{
- $ref='<a
href="'.$GLOBALS['phpgw']->link(
-
"/email/compose.php","to="
- .
urlencode($data))
- .'"
target="_new">';
+ $ref='<a
href="'.$GLOBALS['phpgw']->link('/email/compose.php',array('to'=>
urlencode($data)) . '" target="_new">');
}
else
{
@@ -903,8 +898,8 @@
//set some variables which will be used
$this->mode = 'edit';
$this->section = $this->tab_main_organizations;
- $this->form_action =
'menuaction=addressbook.uiaddressbook.edit_org';
- $this->form_index =
'menuaction=addressbook.uiaddressbook.index§ion='.$this->section;
+ $this->form_action =
array('menuaction'=>'addressbook.uiaddressbook.edit_org');
+ $this->form_index =
array('menuaction'=>'addressbook.uiaddressbook.index','section'=>$this->section);
//get all vars which was send in post or get
$this->get_vars();
@@ -1046,6 +1041,7 @@
//print 'fields:<br />';
$js_submit = '';
+ $delete = '';
$fields['owner'] = isset($fields['owner']) ? $fields['owner'] :
$this->owner;
if ($this->bo->check_delete($this->contact_id))
{
@@ -2149,7 +2145,7 @@
$userformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
if($userformat != $this->bo->bday_internformat)
{
- $datetime =
CreateObject("phpgwapi.datetime");
+ $datetime =
CreateObject('phpgwapi.datetimefunctions');
$entry['per_birthday'] =
$datetime->convertDate($entry['per_birthday'], $userformat,
$this->bo->bday_internformat);
}
@@ -2738,8 +2734,7 @@
$this->template->set_var('lang_reason',lang('reason'));
$this->template->set_var('lang_go_back',lang('Go
back'));
$this->template->set_var('link_go_back',
- $GLOBALS['phpgw']->link('/index.php',
-
'menuaction=addressbook.uiaddressbook.index§ion='.$contact_type));
+
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'addressbook.uiaddressbook.index','section'=>$contact_type)));
$this->template->set_block('cant_delete_apps',
'apps',
'apps_l');
@@ -2763,12 +2758,11 @@
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
$this->template->set_var('lang_sure',lang('Are you sure
you want to delete this entry ?'));
-
$this->template->set_var('no_link',$GLOBALS['phpgw']->link('/index.php',
-
'menuaction=addressbook.uiaddressbook.index§ion='.$contact_type));
+
$this->template->set_var('no_link',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'addressbook.uiaddressbook.index','section'=>$contact_type)));
$this->template->set_var('lang_no',lang('NO'));
-
$this->template->set_var('yes_link',$GLOBALS['phpgw']->link('/index.php',
-
'menuaction=addressbook.uiaddressbook.delete_' . $type . '&ab_id='
- . $contact_id .
'&confirm=true'));
+
$this->template->set_var('yes_link',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'addressbook.uiaddressbook.delete_'
. $type,
+
'ab_id'=> $contact_id,
+
'confirm'=>'true')));
$this->template->set_var('lang_yes',lang('YES'));
$this->template->pparse('out','delete');
}
@@ -2799,7 +2793,7 @@
$userformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
if($userformat != $this->bo->bday_internformat)
{
- $datetime = CreateObject("phpgwapi.datetime");
+ $datetime =
CreateObject('phpgwapi.datetimefunctions');
$contacts['org_name'] = '<a href="' .
$contacts['org_link'] . '">'
. htmlentities($contacts['org_name']) .
'</a>';
@@ -2940,10 +2934,7 @@
{
if
($GLOBALS['phpgw_info']['user']['apps']['email'])
{
- $ref='<a
href="'.$GLOBALS['phpgw']->link(
-
"/email/compose.php","to="
- .
urlencode($data))
- .'"
target="_new">';
+ $ref='<a
href="'.$GLOBALS['phpgw']->link('/email/compose.php',array('to'=>
urlencode($data))) .'" target="_new">';
}
else
{