[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.boadmin.inc.php, 1.15, 1.16 c
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.boadmin.inc.php, 1.15, 1.16 class.socommon.inc.php, 1.35, 1.36 class.solocation.inc.php, 1.32, 1.33 class.uiadmin.inc.php, 1.18, 1.19 class.uiproject.inc.php, 1.41, 1.42 class.uirequest.inc.php, 1.27, 1.28 class.uiworkorder.inc.php, 1.35, 1.36 hook_admin.inc.php, 1.41, 1.42 hook_settings.inc.php, 1.10, 1.11 |
|
Date: |
Mon, 08 Sep 2003 13:36:39 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv22936/inc
Modified Files:
class.boadmin.inc.php class.socommon.inc.php
class.solocation.inc.php class.uiadmin.inc.php
class.uiproject.inc.php class.uirequest.inc.php
class.uiworkorder.inc.php hook_admin.inc.php
hook_settings.inc.php
Log Message:
no message
Index: class.boadmin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boadmin.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.boadmin.inc.php 6 Aug 2003 01:39:05 -0000 1.15
--- class.boadmin.inc.php 8 Sep 2003 17:36:37 -0000 1.16
***************
*** 56,60 ****
$this->query = $query;
}
! if(!empty($filter))
{
$this->filter = $filter;
--- 56,60 ----
$this->query = $query;
}
! if(isset($filter))
{
$this->filter = $filter;
Index: class.socommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.socommon.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** class.socommon.inc.php 7 Sep 2003 19:49:51 -0000 1.35
--- class.socommon.inc.php 8 Sep 2003 17:36:37 -0000 1.36
***************
*** 53,57 ****
function create_preferences($app='',$user_id='')
{
! $this->db->query("SELECT preference_value FROM
phpgw_preferences where preference_app = '$app' AND preference_owner=$user_id");
$this->db->next_record();
$value=
unserialize($this->db->f('preference_value'));
--- 53,57 ----
function create_preferences($app='',$user_id='')
{
! $this->db->query("SELECT preference_value FROM
phpgw_preferences where preference_app = '$app' AND
preference_owner=".(int)$user_id );
$this->db->next_record();
$value=
unserialize($this->db->f('preference_value'));
Index: class.solocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** class.solocation.inc.php 4 Sep 2003 17:27:27 -0000 1.32
--- class.solocation.inc.php 8 Sep 2003 17:36:37 -0000 1.33
***************
*** 351,355 ****
if($sub_query_tenant)
{
! $sub_query = "OR fm_tenant.last_name
LIKE '%$query%' OR fm_tenant.first_name LIKE '%$query%'";
}
--- 351,355 ----
if($sub_query_tenant)
{
! $sub_query = "OR fm_tenant.last_name
LIKE '%$query%' OR fm_tenant.first_name LIKE '%$query%' OR
fm_tenant.contact_phone LIKE '%$query%'";
}
Index: class.uiadmin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiadmin.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** class.uiadmin.inc.php 1 Sep 2003 19:26:55 -0000 1.18
--- class.uiadmin.inc.php 8 Sep 2003 17:36:37 -0000 1.19
***************
*** 25,29 ****
'list_acl2' => True,
'aclprefs' => True,
! 'edit_id' => True
);
--- 25,30 ----
'list_acl2' => True,
'aclprefs' => True,
! 'edit_id' => True,
! 'contact_info' => True
);
***************
*** 557,560 ****
--- 558,640 ----
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit_id' => $data));
+ $this->save_sessiondata();
+ }
+
+ function contact_info()
+ {
+ $GLOBALS['phpgw']->xslttpl->add_file(array('admin'));
+
+ $values = get_var('values',array('POST'));
+
+ if ($values['save'])
+ {
+
$GLOBALS['phpgw']->preferences->account_id=$this->filter;
+
$GLOBALS['phpgw']->preferences->read_repository();
+
+ if ($values['old_email'] != $values['email'])
+ {
+
$GLOBALS['phpgw']->preferences->add($this->currentapp,"email",$values['email'],'user');
+ $receipt['message'][] = array('msg' =>
lang('Users email is updated'));
+ }
+ if ($values['old_phone'] != $values['phone'])
+ {
+
$GLOBALS['phpgw']->preferences->add($this->currentapp,"cellphone",$values['phone'],'user');
+ $receipt['message'][] = array('msg' =>
lang('Users phone is updated'));
+ }
+ if ($values['old_approval_from'] !=
$values['approval_from'])
+ {
+
$GLOBALS['phpgw']->preferences->add($this->currentapp,"approval_from",$values['approval_from'],'user');
+ $receipt['message'][] = array('msg' =>
lang('Approval from is updated'));
+ }
+
$GLOBALS['phpgw']->preferences->save_repository();
+ }
+
+ if($this->filter)
+ {
+ $prefs =
$this->bocommon->create_preferences($this->currentapp,$this->filter);
+ }
+
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
+ $data = array
+ (
+ 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
+ 'form_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin.contact_info'),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/admin/index.php'),
+ 'lang_submit' =>
lang('submit'),
+ 'lang_save' =>
lang('Edit'),
+ 'lang_add_statustext' => lang('Edit ID'),
+ 'lang_done' =>
lang('done'),
+ 'lang_done_statustext' => lang('Back to
Admin'),
+
+ 'lang_email_statustext' => lang('Enter the
email-address for this user'),
+
+ 'lang_user' =>
lang('User'),
+ 'lang_email' =>
lang('Email'),
+ 'value_old_email' =>
$prefs['email'],
+ 'value_email' =>
$prefs['email'],
+
+ 'lang_phone' =>
lang('Phone'),
+ 'value_old_phone' =>
$prefs['cellphone'],
+ 'value_phone' =>
$prefs['cellphone'],
+
+ 'lang_approval_from' =>
lang('Approval from'),
+ 'value_old_approval_from' =>
$prefs['approval_from'],
+ 'approval_from' =>
$this->bocommon->get_user_list('select',$prefs['approval_from']),
+ 'select_user_name' =>
'approval_from',
+ 'lang_approval_from_statustext' => lang('Select
the users supervisor'),
+
+ 'lang_user_statustext' => lang('Select the
user to edit email'),
+ 'select_user_name' => 'filter',
+ 'lang_no_user' => lang('No
user'),
+ 'value_user_id' =>
$this->filter,
+ 'user_list' =>
$this->bocommon->get_user_list('filter',$this->filter)
+ );
+
+ $appname
= lang('User contact info');
+ $function_msg =
lang('edit info');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
+
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('contact_info' => $data));
$this->save_sessiondata();
}
Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** class.uiproject.inc.php 7 Sep 2003 19:49:51 -0000 1.41
--- class.uiproject.inc.php 8 Sep 2003 17:36:37 -0000 1.42
***************
*** 600,604 ****
!
$supervisor_id=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['workorder_approval_from'];
$need_approval =
$this->config->config_data['workorder_approval'];
--- 600,604 ----
!
$supervisor_id=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['approval_from'];
$need_approval =
$this->config->config_data['workorder_approval'];
Index: class.uirequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uirequest.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** class.uirequest.inc.php 7 Sep 2003 19:49:51 -0000 1.27
--- class.uirequest.inc.php 8 Sep 2003 17:36:37 -0000 1.28
***************
*** 639,643 ****
!
$supervisor_id=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['workorder_approval_from'];
$notify =
$this->config->config_data['workorder_approval'];
--- 639,643 ----
!
$supervisor_id=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['approval_from'];
$notify =
$this->config->config_data['workorder_approval'];
Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** class.uiworkorder.inc.php 7 Sep 2003 19:49:52 -0000 1.35
--- class.uiworkorder.inc.php 8 Sep 2003 17:36:37 -0000 1.36
***************
*** 546,550 ****
!
$supervisor_id=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['workorder_approval_from'];
$need_approval =
$this->config->config_data['workorder_approval'];
--- 546,550 ----
!
$supervisor_id=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['approval_from'];
$need_approval =
$this->config->config_data['workorder_approval'];
Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_admin.inc.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** hook_admin.inc.php 16 Jul 2003 10:38:31 -0000 1.41
--- hook_admin.inc.php 8 Sep 2003 17:36:37 -0000 1.42
***************
*** 36,39 ****
--- 36,40 ----
'ID Controle'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiadmin.edit_id'),
'Permissions'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiadmin.list_acl2'),
+ 'User contact info'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiadmin.contact_info'),
'Report status'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=report_status'),
'Request status'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=request_status'),
Index: hook_settings.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_settings.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** hook_settings.inc.php 7 Sep 2003 19:49:52 -0000 1.10
--- hook_settings.inc.php 8 Sep 2003 17:36:37 -0000 1.11
***************
*** 72,76 ****
create_input_box('Yout Cellphone','cellphone');
! create_select_box('Workorder Approval
From','workorder_approval_from',$_accounts,'If you need approval from your
supervisor for projects/workorders');
if(!$email_org)
--- 72,76 ----
create_input_box('Yout Cellphone','cellphone');
! create_select_box('Workorder Approval
From','approval_from',$_accounts,'If you need approval from your supervisor for
projects/workorders');
if(!$email_org)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.boadmin.inc.php, 1.15, 1.16 class.socommon.inc.php, 1.35, 1.36 class.solocation.inc.php, 1.32, 1.33 class.uiadmin.inc.php, 1.18, 1.19 class.uiproject.inc.php, 1.41, 1.42 class.uirequest.inc.php, 1.27, 1.28 class.uiworkorder.inc.php, 1.35, 1.36 hook_admin.inc.php, 1.41, 1.42 hook_settings.inc.php, 1.10, 1.11,
Sigurd Nes <address@hidden> <=