|
| From: | nomail |
| Subject: | [Phpgroupware-cvs] property/inc/class.uialarm.inc.php, 1.4.2.7 |
| Date: | Sun, 12 Dec 2004 23:38:38 +0100 |
Update of /property/inc
Modified Files:
Branch: proposed-0_9_18-branch
class.uialarm.inc.php
date: 2004/12/12 22:38:38; author: sigurdne; state: Exp; lines: +42 -49
Log Message:
no message
=====================================================================
Index: property/inc/class.uialarm.inc.php
diff -u property/inc/class.uialarm.inc.php:1.4.2.6
property/inc/class.uialarm.inc.php:1.4.2.7
--- property/inc/class.uialarm.inc.php:1.4.2.6 Fri Nov 19 10:39:44 2004
+++ property/inc/class.uialarm.inc.php Sun Dec 12 22:38:38 2004
@@ -136,7 +136,7 @@
'times'
=> $times,
'data'
=> $data,
'enabled'
=> $alarm['enabled'],
- 'user'
=> $GLOBALS['phpgw']->accounts->id2name($alarm[account_id]),
+ 'user'
=> $alarm['user'],
'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uialarm.edit&async_id='
. urlencode($alarm['id'])),
'lang_view_statustext' =>
lang('view the alarm'),
'lang_edit_statustext' =>
lang('edit the alarm'),
@@ -161,6 +161,26 @@
'lang_edit' => lang('edit'),
'lang_alarm_id' => lang('alarm id'),
'lang_enabled' => lang('enabled'),
+ 'sort_user' =>
$this->nextmatchs->show_sort_order(array
+
(
+
'sort' => $this->sort,
+
'var' => 'account_lid',
+
'order' => $this->order,
+
'extra' => array('menuaction' =>
$this->currentapp.'.uialarm.index',
+
'cat_id' =>
$this->cat_id,
+
'query'
=>$this->query,
+
'allrows'
=>$this->allrows)
+
)),
+ 'sort_method' =>
$this->nextmatchs->show_sort_order(array
+
(
+
'sort' => $this->sort,
+
'var' => 'method',
+
'order' => $this->order,
+
'extra' => array('menuaction' =>
$this->currentapp.'.uialarm.index',
+
'cat_id' =>
$this->cat_id,
+
'query'
=>$this->query,
+
'allrows'
=>$this->allrows)
+
)),
'sort_next_run' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
@@ -174,7 +194,7 @@
'sort_alarm_id' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
-
'var' => 'alarm_id',
+
'var' => 'id',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uialarm.index',
'cat_id' =>
$this->cat_id,
@@ -254,49 +274,22 @@
$GLOBALS['phpgw']->xslttpl->pp();
}
- function initiate_ui_addr_lookup($data)
- {
-//_debug_array($data);
-
- if($data['type']=='view')
- {
-
$GLOBALS['phpgw']->xslttpl->add_file(array('abook_view'));
- }
- else
- {
-
$GLOBALS['phpgw']->xslttpl->add_file(array('abook_form'));
- }
-
- $owner['value_abid'] =
$data['abid'];
- $owner['value_contact_name'] =
$data['contact_name'];
-
- if($data['abid'] && !$data['contact_name'])
- {
- $contact_data
=
$this->contacts->read_single_entry($data['abid'],array('n_given'=>'n_given','n_family'=>'n_family','email'=>'email'));
- $owner['value_contact_name'] =
$contact_data[0]['n_family'] . ', ' . $contact_data[0]['n_given'];
- }
-
- $owner['abook_link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.addressbook');
- $owner['lang_contact']
= lang('contact');
- $owner['lang_select_contact_help'] =
lang('Klick this link to select owner from the addressbook');
- $owner['lang_contact_name']
= lang('Name');
-
-//_debug_array($owner);
- return $owner;
- }
-
-
function edit()
{
$method_id = get_var('method_id',array('POST'));
$async_id =
urldecode(get_var('async_id',array('POST','GET')));
$values = get_var('values',array('POST'));
+ if($async_id)
+ {
+ $async_id_elements = explode(':',$async_id);
+ $method_id = $async_id_elements[1];
+ }
+
$this->method_id =
($method_id?$method_id:$this->method_id);
$GLOBALS['phpgw']->xslttpl->add_file(array('alarm'));
-// _debug_array($async_id);
if ($values['save'] || $values['apply'])
{
@@ -329,10 +322,10 @@
$data_set['enabled'] = True;
$data_set['time'] =
$times;
$data_set['owner'] =
$this->account;
- $data_set['event_id'] =
$this->method_id;
+ $data_set['event_id'] =
$this->method_id;
- $receipt =
$this->bo->save_alarm($alarm_type='fm_async',$entity_id=$this->method_id,$alarm=$data_set,$async['name']);
+ $async_id =
$this->bo->save_alarm($alarm_type='fm_async',$entity_id=$this->method_id,$alarm=$data_set,$async['name']);
if ($values['save'])
{
@@ -357,7 +350,7 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uialarm.edit',
- 'alarm_id' => $alarm_id
+ 'async_id' => $async_id
);
$msgbox_data = $this->bocommon->msgbox_data($receipt);
@@ -367,15 +360,12 @@
'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'abook_data'
=> $abook_data,
'edit_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
- 'lang_alarm_id'
=> lang('ID'),
- 'value_alarm_id'
=> $alarm_id,
- 'lang_remark'
=> lang('remark'),
+ 'lang_async_id'
=> lang('ID'),
+ 'value_async_id'
=> $async_id,
'lang_method'
=> lang('method'),
'lang_save'
=> lang('save'),
'lang_cancel'
=> lang('cancel'),
'lang_apply'
=> lang('apply'),
- 'value_remark'
=> $alarm['remark'],
- 'value_cat'
=> $alarm['cat'],
'lang_apply_statustext' =>
lang('Apply the values'),
'lang_cancel_statustext' =>
lang('Leave the owner untouched and return back to the list'),
'lang_save_statustext' =>
lang('Save the owner and return back to the list'),
@@ -384,18 +374,21 @@
'method_list'
=> $this->bo->select_method_list($this->method_id),
'lang_timing'
=> lang('timing'),
'lang_year'
=> lang('year'),
+ 'value_year'
=> $alarm['times']['year'],
'lang_month'
=> lang('month'),
+ 'value_month'
=> $alarm['times']['month'],
'lang_day'
=> lang('day'),
+ 'value_day'
=> $alarm['times']['day'],
'lang_dow'
=> lang('Day of week (0-6, 0=Sun)'),
+ 'value_day'
=> $alarm['times']['dow'],
'lang_hour'
=> lang('hour'),
+ 'value_hour'
=> $alarm['times']['hour'],
'lang_minute'
=> lang('minute'),
+ 'value_minute'
=> $alarm['times']['minute'],
'lang_data'
=> lang('data'),
- 'lang_data_statustext' =>
lang('inputdata for the method'),
-
-
-
+ 'lang_data_statustext' =>
lang('inputdata for the method')
);
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('async') . ': ' . ($owner_id?lang('edit timer'):lang('add timer'));
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('async') . ': ' . ($async_id?lang('edit timer'):lang('add timer'));
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
$GLOBALS['phpgw']->xslttpl->pp();
| [Prev in Thread] | Current Thread | [Next in Thread] |