[Phpgroupware-cvs] CVS: property/inc class.sorequest.inc.php, 1.17, 1.18

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv21485/inc

Modified Files:
        class.sorequest.inc.php 
Log Message:
no message

Index: class.sorequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sorequest.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** class.sorequest.inc.php     26 Aug 2003 19:16:30 -0000      1.17
--- class.sorequest.inc.php     26 Aug 2003 20:34:26 -0000      1.18
***************
*** 9,13 ****
        class sorequest
        {
- 
                function sorequest()
                {
--- 9,12 ----
***************
*** 24,28 ****
                }
  
- 
                function select_category_workorder_list()
                {
--- 23,26 ----
***************
*** 56,60 ****
                }
  
- 
                function update_priority_key($values)
                {
--- 54,57 ----
***************
*** 376,385 ****
                        }
  
- 
  //_debug_array($request);
                                return $request;
                }
  
- 
                function request_workorder_data($request_id = '')
                {
--- 373,380 ----
***************
*** 442,445 ****
--- 437,441 ----
                function add($request)
                {
+ //_debug_array($request);
                        while (is_array($request['location']) && 
list($input_name,$value) = each($request['location']))
                        {
***************
*** 451,455 ****
                        }
  
- 
                        while (is_array($request['extra']) && 
list($input_name,$value) = each($request['extra']))
                        {
--- 447,450 ----
***************
*** 483,487 ****
                        $request['title'] = 
$this->db->db_addslashes($request['title']);
  
- 
                        $values= array(
                                $request['request_id'],
--- 478,481 ----
***************
*** 570,593 ****
                function edit($request)
                {
-                       $this->db->query("SELECT status,category,coordinator 
FROM fm_request where id='" .$request['request_id']."'",__LINE__,__FILE__);
- 
-                       $this->db->next_record();
- 
-                       $old_status = $this->db->f('status');
-                       $old_categroy = $this->db->f('category');
-                       $old_coordinator = $this->db->f('coordinator');
-                       if ($old_status != $request['status'])
-                       {
-                               
$this->historylog->add('S',$request['request_id'],$request['status']);
-                       }
-                       if ($old_categroy != $request['cat_id'])
-                       {
-                               
$this->historylog->add('T',$request['request_id'],$request['cat_id']);
-                       }
-                       if ($old_coordinator != $request['coordinator'])
-                       {
-                               
$this->historylog->add('C',$request['request_id'],$request['coordinator']);
-                       }
- 
                        while (is_array($request['location']) && 
list($input_name,$value) = each($request['location']))
                        {
--- 564,567 ----
***************
*** 623,662 ****
  //_debug_array($request);
  
!                       $this->db->query("UPDATE fm_request set
!                               status                  ='" . 
$request['status'] . "',
!                               category                ='" . 
$request['cat_id'] . "',
!                               coordinator             ='" . 
$request['coordinator'] . "',
!                               descr                   ='" . $request['descr'] 
. "',
!                               title                   ='"     . 
$request['title'] . "',
!                               budget                  ='" . 
(int)$request['budget'] . "',
!                               tenant_id               ='" . 
$request['tenant_id'] . "',
!                               location_code   ='" . $request['location_code'] 
. "',
!                               floor                   ='" . $request['floor'] 
. "',
!                               equipment_id    ='" . $request['equipment_id'] 
. "',
!                               branch_id       ='" . $request['branch_id'] . 
"',
!                               d_safety        ='" . $request['d_safety'] . "',
!                               d_aesthetics    ='" . $request['d_aesthetics'] 
. "',
!                               d_indoor_climate        ='" . 
$request['d_indoor_climate'] . "',
!                               d_consequential_damage  ='" . 
$request['d_consequential_damage'] . "',
!                               d_user_gratification    ='" . 
$request['d_user_gratification'] . "',
!                               d_residential_environment       ='" . 
$request['d_residential_environment'] . "',
! 
!                               c_safety        ='" . $request['c_safety'] . "',
!                               c_aesthetics    ='" . $request['c_aesthetics'] 
. "',
!                               c_indoor_climate        ='" . 
$request['c_indoor_climate'] . "',
!                               c_consequential_damage  ='" . 
$request['c_consequential_damage'] . "',
!                               c_user_gratification    ='" . 
$request['c_user_gratification'] . "',
!                               c_residential_environment       ='" . 
$request['c_residential_environment'] . "',
! 
!                               p_safety        ='" . $request['p_safety'] . "',
!                               p_aesthetics    ='" . $request['p_aesthetics'] 
. "',
!                               p_indoor_climate        ='" . 
$request['p_indoor_climate'] . "',
!                               p_consequential_damage  ='" . 
$request['p_consequential_damage'] . "',
!                               p_user_gratification    ='" . 
$request['p_user_gratification'] . "',
!                               p_residential_environment       ='" . 
$request['p_residential_environment'] . "',
! 
!                               authorities_demands     ='" . 
$request['authorities_demands'] . "',
!                               address                 ='" . $address
!                               . "' $vals WHERE id= '" . 
$request['request_id'] ."'",__LINE__,__FILE__);
  
                        $this->update_score('',$request['request_id']);
--- 597,639 ----
  //_debug_array($request);
  
!                       $value_set=array(
!                               'status'                                => 
$request['status'],
!                               'category'                              => 
$request['cat_id'],
!                               'coordinator'                   => 
$request['coordinator'],
!                               'descr'                                 => 
$request['descr'],
!                               'title'                                 => 
$request['title'],
!                               'budget'                                => 
(int)$request['budget'],
!                               'tenant_id'                             => 
$request['tenant_id'],
!                               'location_code'                 => 
$request['location_code'],
!                               'floor'                                 => 
$request['floor'],
!                               'equipment_id'                  => 
$request['equipment_id'],
!                               'branch_id'                             => 
$request['branch_id'],
!                               'd_safety'                              => 
$request['d_safety'],
!                               'd_aesthetics'                  => 
$request['d_aesthetics'],
!                               'd_indoor_climate'              => 
$request['d_indoor_climate'],
!                               'd_consequential_damage'=> 
$request['d_consequential_damage'],
!                               'd_user_gratification'  => 
$request['d_user_gratification'],
!                               'd_residential_environment'     => 
$request['d_residential_environment'],
!                               'c_safety'                              => 
$request['c_safety'],
!                               'c_aesthetics'                  => 
$request['c_aesthetics'],
!                               'c_indoor_climate'              => 
$request['c_indoor_climate'],
!                               'c_consequential_damage'=> 
$request['c_consequential_damage'],
!                               'c_user_gratification'  => 
$request['c_user_gratification'],
!                               'c_residential_environment'     => 
$request['c_residential_environment'],
!                               'p_safety'                              => 
$request['p_safety'],
!                               'p_aesthetics'                  => 
$request['p_aesthetics'],
!                               'p_indoor_climate'              => 
$request['p_indoor_climate'],
!                               'p_consequential_damage'=> 
$request['p_consequential_damage'],
!                               'p_user_gratification'  => 
$request['p_user_gratification'],
!                               'p_residential_environment'     => 
$request['p_residential_environment'],
!                               'authorities_demands'   => 
$request['authorities_demands'],
!                               'address'                               => 
$address
!                               );
! 
!                       $value_set      = 
$this->bocommon->validate_db_update($value_set);
! 
!                       $this->db->transaction_begin();
! 
!                       $this->db->query("UPDATE fm_request set $value_set 
$vals WHERE id= '" . $request['request_id'] ."'",__LINE__,__FILE__);
  
                        $this->update_score('',$request['request_id']);
***************
*** 672,676 ****
                        }
  
!                       $receipt['message'][] = array('msg'=>lang('request %1 
has been edited',$request['request_id']));
                        return $receipt;
  
--- 649,679 ----
                        }
  
!                       if($this->db->transaction_commit())
!                       {
!                               $this->db->query("SELECT 
status,category,coordinator FROM fm_request where id='" 
.$request['request_id']."'",__LINE__,__FILE__);
!                               $this->db->next_record();
! 
!                               $old_status = $this->db->f('status');
!                               $old_categroy = $this->db->f('category');
!                               $old_coordinator = $this->db->f('coordinator');
!                               if ($old_status != $request['status'])
!                               {
!                                       
$this->historylog->add('S',$request['request_id'],$request['status']);
!                               }
!                               if ($old_categroy != $request['cat_id'])
!                               {
!                                       
$this->historylog->add('T',$request['request_id'],$request['cat_id']);
!                               }
!                               if ($old_coordinator != $request['coordinator'])
!                               {
!                                       
$this->historylog->add('C',$request['request_id'],$request['coordinator']);
!                               }
! 
!                               $receipt['message'][] = 
array('msg'=>lang('request %1 has been edited',$request['request_id']));
!                       }
!                       else
!                       {
!                               $receipt['message'][] = 
array('msg'=>lang('request %1 has not been edited',$request['request_id']));
!                       }
                        return $receipt;