[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php, 1.72, 1.73
From: |
Sigurd Nes <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php, 1.72, 1.73 class.botts.inc.php, 1.18, 1.19 class.socommon.inc.php, 1.34, 1.35 class.soproject.inc.php, 1.34, 1.35 class.sotts2.inc.php, 1.4, 1.5 class.uiproject.inc.php, 1.40, 1.41 class.uirequest.inc.php, 1.26, 1.27 class.uiwo_hour.inc.php, 1.34, 1.35 class.uiworkorder.inc.php, 1.34, 1.35 hook_settings.inc.php, 1.9, 1.10 |
Date: |
Sun, 07 Sep 2003 15:49:54 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv21064/inc
Modified Files:
class.bocommon.inc.php class.botts.inc.php
class.socommon.inc.php class.soproject.inc.php
class.sotts2.inc.php class.uiproject.inc.php
class.uirequest.inc.php class.uiwo_hour.inc.php
class.uiworkorder.inc.php hook_settings.inc.php
Log Message:
no message
Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -r1.72 -r1.73
*** class.bocommon.inc.php 4 Sep 2003 17:27:27 -0000 1.72
--- class.bocommon.inc.php 7 Sep 2003 19:49:51 -0000 1.73
***************
*** 71,75 ****
--- 71,79 ----
// return (!!($rights & $required) == True);
return ($rights & $required);
+ }
+ function create_preferences($app='',$user_id='')
+ {
+ return
$this->socommon->create_preferences($app,$user_id);
}
Index: class.botts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.botts.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** class.botts.inc.php 2 Sep 2003 17:44:38 -0000 1.18
--- class.botts.inc.php 7 Sep 2003 19:49:51 -0000 1.19
***************
*** 524,532 ****
if($ticket['status']=='X')
{
-
$history_values =
$this->historylog->return_array(array(),array('X'),'history_timestamp','DESC',$id);
$timestampclosed =
$GLOBALS['phpgw']->common->show_date($history_values[0]['datetime'],$dateformat);
}
$stat = $ticket['status'];
--- 524,534 ----
if($ticket['status']=='X')
{
$history_values =
$this->historylog->return_array(array(),array('X'),'history_timestamp','DESC',$id);
$timestampclosed =
$GLOBALS['phpgw']->common->show_date($history_values[0]['datetime'],$dateformat);
}
+ $history_2 =
$this->historylog->return_array(array('C','O'),array(),'','',$id);
+ $m=count($history_2)-1;
+ $ticket['status']=$history_2[$m]['status'];
$stat = $ticket['status'];
***************
*** 550,556 ****
! $prefs_user =
$GLOBALS['phpgw']->preferences->create_email_preferences($ticket['user_id']);
! $from_address=$prefs_user['email']['address'];
//-----------from--------
--- 552,559 ----
! // $prefs_user =
$GLOBALS['phpgw']->preferences->create_email_preferences($ticket['user_id']);
! $prefs_user =
$this->bocommon->create_preferences($this->currentapp,$ticket['user_id']);
! $from_address=$prefs_user['email'];
//-----------from--------
***************
*** 564,572 ****
$current_user_name= $user_firstname . " "
.$user_lastname ;
! $current_prefs_user =
$GLOBALS['phpgw']->preferences->create_email_preferences($current_user_id);
!
$current_user_address=$current_prefs_user['email']['address'];
!
! $headers = "Return-Path: <". $coordinator_email
.">\r\n";
$headers .= "From: " . $current_user_name . "<" .
$current_user_address .">\r\n";
$headers .= "Bcc: " . $current_user_name . "<" .
$current_user_address .">\r\n";
--- 567,575 ----
$current_user_name= $user_firstname . " "
.$user_lastname ;
! // $current_prefs_user =
$GLOBALS['phpgw']->preferences->create_email_preferences($current_user_id);
! $current_prefs_user =
$this->bocommon->create_preferences($this->currentapp,$current_user_id);
! $current_user_address=$current_prefs_user['email'];
! $headers = "Return-Path: <". $current_user_address
.">\r\n";
$headers .= "From: " . $current_user_name . "<" .
$current_user_address .">\r\n";
$headers .= "Bcc: " . $current_user_name . "<" .
$current_user_address .">\r\n";
***************
*** 601,605 ****
{
$body .= lang('Date') . ':
'.$GLOBALS['phpgw']->common->show_date($value['datetime'])."\n";
! $body .= lang('User') . ':
'.$user_name."\n";
$body .=lang('Note').': '.
nl2br(stripslashes($value['new_value']))."\n\n";
$i++;
--- 604,608 ----
{
$body .= lang('Date') . ':
'.$GLOBALS['phpgw']->common->show_date($value['datetime'])."\n";
! $body .= lang('User') . ':
'.$value['owner']."\n";
$body .=lang('Note').': '.
nl2br(stripslashes($value['new_value']))."\n\n";
$i++;
***************
*** 644,651 ****
if ($members[$i]['account_id'])
{
! $prefs =
$GLOBALS['phpgw']->preferences->create_email_preferences($members[$i]['account_id']);
! if (strlen($prefs['email']['address'])>
(strlen($members[$i]['account_name'])+1))
{
!
$toarray[$prefs['email']['address']] = $prefs['email']['address'];
}
else
--- 647,655 ----
if ($members[$i]['account_id'])
{
! // $prefs =
$GLOBALS['phpgw']->preferences->create_email_preferences($members[$i]['account_id']);
! $prefs =
$this->bocommon->create_preferences($this->currentapp,$members[$i]['account_id']);
! if (strlen($prefs['email'])>
(strlen($members[$i]['account_name'])+1))
{
! $toarray[$prefs['email']] =
$prefs['email'];
}
else
Index: class.socommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.socommon.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** class.socommon.inc.php 27 Aug 2003 16:35:12 -0000 1.34
--- class.socommon.inc.php 7 Sep 2003 19:49:51 -0000 1.35
***************
*** 34,38 ****
}
-
function fm_cache($name='',$value='')
{
--- 34,37 ----
***************
*** 47,55 ****
$this->db->next_record();
$value= unserialize($this->db->f('value'));
- // _debug_array($value);
return $value;
}
}
function get_user_list_right($right='',$acl_location='')
--- 46,62 ----
$this->db->next_record();
$value= unserialize($this->db->f('value'));
return $value;
}
}
+
+ 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'));
+ return $value;
+ }
+
function get_user_list_right($right='',$acl_location='')
Index: class.soproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** class.soproject.inc.php 4 Sep 2003 17:27:27 -0000 1.34
--- class.soproject.inc.php 7 Sep 2003 19:49:51 -0000 1.35
***************
*** 575,579 ****
$prefix = 'meter';
$pos = strlen($prefix);
! $this->db->query("select max(id) from fm_meter where id
like ('$prefix%')");
$this->db->next_record();
--- 575,579 ----
$prefix = 'meter';
$pos = strlen($prefix);
! $this->db->query("select max(num) from fm_meter where
num like ('$prefix%')");
$this->db->next_record();
Index: class.sotts2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotts2.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.sotts2.inc.php 21 Jun 2003 19:27:35 -0000 1.4
--- class.sotts2.inc.php 7 Sep 2003 19:49:51 -0000 1.5
***************
*** 127,141 ****
$fields_updated = True;
$this->historylog->add('C',$id,$this->db->db_addslashes($ticket['note']),$old_note);
-
- // Do this before we go into mail_ticket()
$this->db->transaction_commit();
-
- $this->config->read_repository();
-
- if
($this->config->config_data['mailnotification'])
- {
-
$receipt=$this->bo->mail_ticket($id,$fields_updated,'');
-
- }
}
else
--- 127,131 ----
***************
*** 147,151 ****
if ($fields_updated)
{
! $receipt['message'][0]= array('msg' =>
lang('Ticket has been updated'));
}
--- 137,149 ----
if ($fields_updated)
{
! $this->config->read_repository();
!
! if
($this->config->config_data['mailnotification'])
! {
!
$receipt=$this->bo->mail_ticket($id,$fields_updated,'');
!
! }
!
! $receipt['message'][]= array('msg' =>
lang('Ticket has been updated'));
}
Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** class.uiproject.inc.php 29 Aug 2003 16:17:55 -0000 1.40
--- class.uiproject.inc.php 7 Sep 2003 19:49:51 -0000 1.41
***************
*** 576,579 ****
--- 576,580 ----
));
+
$link_data = array
(
***************
*** 603,610 ****
$need_approval =
$this->config->config_data['workorder_approval'];
! if ($supervisor_id && ($need_approval=='yes'))
{
! $prefs =
$GLOBALS['phpgw']->preferences->create_email_preferences($supervisor_id);
! $supervisor_email = $prefs['email']['address'];
}
--- 604,613 ----
$need_approval =
$this->config->config_data['workorder_approval'];
! if ($supervisor_id && $need_approval=='yes')
{
! // $prefs =
$GLOBALS['phpgw']->preferences->create_email_preferences($supervisor_id);
! $prefs =
$this->bocommon->create_preferences($this->currentapp,$supervisor_id);
! // $supervisor_email = $prefs['email']['address'];
! $supervisor_email = $prefs['email'];
}
Index: class.uirequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uirequest.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** class.uirequest.inc.php 26 Aug 2003 19:16:30 -0000 1.26
--- class.uirequest.inc.php 7 Sep 2003 19:49:51 -0000 1.27
***************
*** 645,650 ****
if ($supervisor_id && ($notify=='yes'))
{
! $prefs =
$GLOBALS['phpgw']->preferences->create_email_preferences($supervisor_id);
! $supervisor_email = $prefs['email']['address'];
}
--- 645,651 ----
if ($supervisor_id && ($notify=='yes'))
{
! // $prefs =
$GLOBALS['phpgw']->preferences->create_email_preferences($supervisor_id);
! $prefs =
$this->bocommon->create_preferences($this->currentapp,$supervisor_id);
! $supervisor_email = $prefs['email'];
}
Index: class.uiwo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiwo_hour.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** class.uiwo_hour.inc.php 26 Aug 2003 19:16:30 -0000 1.34
--- class.uiwo_hour.inc.php 7 Sep 2003 19:49:52 -0000 1.35
***************
*** 544,549 ****
$subject = lang('Workorder').": ".$workorder_id;
- // $this->config->read_repository();
-
$mail_method=
$this->config->config_data['fmwrkorder_mail'];
// echo 'mail_method: '.$mail_method .'<BR>';
--- 544,547 ----
***************
*** 730,733 ****
--- 728,732 ----
lang('bill per
unit')=>array('justification'=>'right','width'=>50)
,lang('quantity')=>array('justification'=>'right','width'=>50)
+
,lang('cost')=>array('justification'=>'right','width'=>50)
,lang('unit')=>array('width'=>40)
,lang('descr')=>array('width'=>120))
***************
*** 735,739 ****
}
! $this->pdf->ezStream();
}
--- 734,745 ----
}
! // $this->pdf->ezStream();
! $document= $this->pdf->ezOutput();
! $size=strlen($document);
!
! $browser = CreateObject('phpgwapi.browser');
!
$browser->content_header('Template.pdf','application/pdf',$size);
!
! echo $document;
}
Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** class.uiworkorder.inc.php 29 Aug 2003 16:17:55 -0000 1.34
--- class.uiworkorder.inc.php 7 Sep 2003 19:49:52 -0000 1.35
***************
*** 552,557 ****
if ($supervisor_id && ($need_approval=='yes'))
{
! $prefs =
$GLOBALS['phpgw']->preferences->create_email_preferences($supervisor_id);
! $supervisor_email = $prefs['email']['address'];
}
--- 552,558 ----
if ($supervisor_id && ($need_approval=='yes'))
{
! // $prefs =
$GLOBALS['phpgw']->preferences->create_email_preferences($supervisor_id);
! $prefs =
$this->bocommon->create_preferences($this->currentapp,$supervisor_id);
! $supervisor_email = $prefs['email'];
}
Index: hook_settings.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_settings.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** hook_settings.inc.php 2 Sep 2003 17:44:38 -0000 1.9
--- hook_settings.inc.php 7 Sep 2003 19:49:52 -0000 1.10
***************
*** 74,87 ****
create_select_box('Workorder Approval
From','workorder_approval_from',$_accounts,'If you need approval from your
supervisor for projects/workorders');
-
$email_property=$GLOBALS['phpgw_info']['user']['preferences']['property']['email'];
- $GLOBALS['phpgw']->preferences->add("email","address",$email_property);
- $GLOBALS['phpgw']->preferences->save_repository();
-
- // echo 'email: '.$email .'<BR>';
-
if(!$email_org)
{
create_input_box('Your Email','email','Insert your email
address');
}
--- 74,85 ----
create_select_box('Workorder Approval
From','workorder_approval_from',$_accounts,'If you need approval from your
supervisor for projects/workorders');
if(!$email_org)
{
create_input_box('Your Email','email','Insert your email
address');
}
+
+
$email_property=$GLOBALS['phpgw_info']['user']['preferences']['property']['email'];
+ $GLOBALS['phpgw']->preferences->add("email","address",$email_property);
+ $GLOBALS['phpgw']->preferences->save_repository();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php, 1.72, 1.73 class.botts.inc.php, 1.18, 1.19 class.socommon.inc.php, 1.34, 1.35 class.soproject.inc.php, 1.34, 1.35 class.sotts2.inc.php, 1.4, 1.5 class.uiproject.inc.php, 1.40, 1.41 class.uirequest.inc.php, 1.26, 1.27 class.uiwo_hour.inc.php, 1.34, 1.35 class.uiworkorder.inc.php, 1.34, 1.35 hook_settings.inc.php, 1.9, 1.10,
Sigurd Nes <address@hidden> <=