[Fmsystem-commits] [15623] validation

[sigurdne]

Revision: 15623
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15623
Author:   sigurdne
Date:     2016-09-08 12:11:22 +0000 (Thu, 08 Sep 2016)
Log Message:
-----------
validation

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.log_message.inc.php
    trunk/rental/inc/class.soprice_item.inc.php

Modified: trunk/phpgwapi/inc/class.log_message.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.log_message.inc.php        2016-09-08 10:56:17 UTC 
(rev 15622)
+++ trunk/phpgwapi/inc/class.log_message.inc.php        2016-09-08 12:11:22 UTC 
(rev 15623)
@@ -61,6 +61,8 @@
                                $this->severity = $parms['severity'];
                                $this->msg = trim($etext);
                        }
+
+                       $this->severity = $this->severity ? $this->severity : 
'E';
                        
                        foreach ( $parray as $key => $val )
                        {

Modified: trunk/rental/inc/class.soprice_item.inc.php
===================================================================
--- trunk/rental/inc/class.soprice_item.inc.php 2016-09-08 10:56:17 UTC (rev 
15622)
+++ trunk/rental/inc/class.soprice_item.inc.php 2016-09-08 12:11:22 UTC (rev 
15623)
@@ -365,6 +365,9 @@
                 */
                function add_price_item( $contract_id, $price_item_id )
                {
+                       $location_factor = 1;
+                       $standard_factor = 1;
+                       $custom_factor = 1;
                        $contract = 
rental_socontract::get_instance()->get_single($contract_id);
                        $composites = $contract->get_composites();
                        foreach ($composites as $composite_id => $composite)
@@ -373,19 +376,29 @@
                                break;
                        }
 
-                       $custom_factor = 
$composite_obj->get_custom_prize_factor();
-                       $custom_factor = $custom_factor ? (float)$custom_factor 
: 1;
+                       if(!$composite_obj)
+                       {
+                               $GLOBALS['phpgw']->log->message(array(
+                                       'text' => 
"rental_soprice_item::add_price_item() : Contract %1 is missing composite ",
+                                       'p1'   => $contract_id,
+                                       'line' => __LINE__,
+                                       'file' => __FILE__
+                               ));
+                       }
+                       else
+                       {
+                               $custom_factor = 
$composite_obj->get_custom_prize_factor();
+                               $custom_factor = $custom_factor ? 
(float)$custom_factor : 1;
+                               $location_info = 
ExecMethod('property.bogeneric.read', array(
+                                       'location_info'=> array('type' => 
'location_factor'),
+                                       'custom_filter' => 
array('part_of_town_id = ' . (int)$composite_obj->get_part_of_town_id())
+                                       )
+                               );
+                               $location_factor = 
(float)abs($location_info[0]['factor']) > 0 ? 
(float)$location_info[0]['factor'] : 1;
+                               $standard_info = 
ExecMethod('property.bogeneric.read_single', array('type' => 
'composite_standard', 'id' => $composite_obj->get_standard_id()));
+                               $standard_factor = 
(float)abs($standard_info['factor']) > 0 ? (float)$standard_info['factor'] : 1;
+                       }
 
-                       $location_info = ExecMethod('property.bogeneric.read', 
array(
-                               'location_info'=> array('type' => 
'location_factor'),
-                               'custom_filter' => array('part_of_town_id = ' . 
(int)$composite_obj->get_part_of_town_id())
-                               )
-                       );
-                       $location_factor = 
(float)abs($location_info[0]['factor']) > 0 ? 
(float)$location_info[0]['factor'] : 1;
-
-                       $standard_info = 
ExecMethod('property.bogeneric.read_single', array('type' => 
'composite_standard', 'id' => $composite_obj->get_standard_id()));
-                       $standard_factor = (float)abs($standard_info['factor']) 
> 0 ? (float)$standard_info['factor'] : 1;
-
                        $factor = $location_factor * $standard_factor * 
$custom_factor;
                        $factor = $factor ? (float)$factor : 1;
                        $price_item = $this->get_single($price_item_id);