[Phpgroupware-cvs] property/inc class.bocommon.inc.php class.boloc...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   07/02/19 21:02:41

Modified files:
        inc            : class.bocommon.inc.php class.bolocation.inc.php 
                         class.soproject.inc.php class.uiproject.inc.php 

Log message:
        notice

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.bocommon.inc.php?cvsroot=phpgroupware&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.bolocation.inc.php?cvsroot=phpgroupware&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soproject.inc.php?cvsroot=phpgroupware&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiproject.inc.php?cvsroot=phpgroupware&r1=1.49&r2=1.50

Patches:
Index: class.bocommon.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- class.bocommon.inc.php      19 Feb 2007 18:46:09 -0000      1.61
+++ class.bocommon.inc.php      19 Feb 2007 21:02:41 -0000      1.62
@@ -24,7 +24,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage core
-       * @version $Id: class.bocommon.inc.php,v 1.61 2007/02/19 18:46:09 
sigurdne Exp $
+       * @version $Id: class.bocommon.inc.php,v 1.62 2007/02/19 21:02:41 
sigurdne Exp $
        */
 
        /**
@@ -962,6 +962,8 @@
                        $location_level         = 
(isset($data['location_level'])?$data['location_level']:'');
                        $no_address             = 
(isset($data['no_address'])?$data['no_address']:'');
                        $force_location         = 
(isset($data['force_location'])?$data['force_location']:'');
+                       $cols_extra             = array();
+                       $cols_return_lookup     = array();
 
                        $soadmin_location       = 
CreateObject($this->currentapp.'.soadmin_location');
                        $location_types = 
$soadmin_location->select_location_type();
@@ -1111,7 +1113,7 @@
                        $this->cols_extra               = $cols_extra;
                        $this->cols_return_lookup       = $cols_return_lookup;
 
-                       $from .= " FROM $paranthesis $entity_table ";
+                       $from = " FROM $paranthesis $entity_table ";
 
                        $sql = "SELECT $cols $from $joinmethod";
 

Index: class.bolocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.bolocation.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- class.bolocation.inc.php    26 Jan 2007 14:53:46 -0000      1.30
+++ class.bolocation.inc.php    19 Feb 2007 21:02:41 -0000      1.31
@@ -24,7 +24,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage location
-       * @version $Id: class.bolocation.inc.php,v 1.30 2007/01/26 14:53:46 
sigurdne Exp $
+       * @version $Id: class.bolocation.inc.php,v 1.31 2007/02/19 21:02:41 
sigurdne Exp $
        */
 
        /**
@@ -344,7 +344,7 @@
                                        
$location['location'][$i]['lookup_link']                        = True;
                                        $location['location'][$i]['readonly']   
                        = True;
                                        $location['location'][$i]['name']       
                        = $fm_location_cols[$j]['input_text'];
-                                       $location['location'][$i]['value']      
                        = $data['values'][$fm_location_cols[$j]['column_name']];
+                                       $location['location'][$i]['value']      
                        = 
isset($data['values'][$fm_location_cols[$j]['column_name']]) ? 
$data['values'][$fm_location_cols[$j]['column_name']] : '';
                                        $location['location'][$i]['statustext'] 
                        = lang('Klick this link to select') . ' ' . 
$location_types[($fm_location_cols[$j]['location_type']-1)]['name'];
                                        $i++;
 

Index: class.soproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- class.soproject.inc.php     26 Jan 2007 14:53:47 -0000      1.39
+++ class.soproject.inc.php     19 Feb 2007 21:02:41 -0000      1.40
@@ -24,7 +24,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage project
-       * @version $Id: class.soproject.inc.php,v 1.39 2007/01/26 14:53:47 
sigurdne Exp $
+       * @version $Id: class.soproject.inc.php,v 1.40 2007/02/19 21:02:41 
sigurdne Exp $
        */
 
        /**
@@ -138,7 +138,7 @@
                        {
                                $entity_table = 'fm_project';
 
-                               $cols .= $entity_table . '.location_code';
+                               $cols = $entity_table . '.location_code';
                                $cols_return[] = 'location_code';
 
                                $cols .= ",$entity_table.id as project_id";
@@ -171,8 +171,8 @@
 
                                $cols.= ",$entity_table.user_id";
 
-                               $joinmethod .= " $this->join  phpgw_accounts ON 
($entity_table.coordinator = phpgw_accounts.account_id))";
-                               $paranthesis .='(';
+                               $joinmethod = " $this->join  phpgw_accounts ON 
($entity_table.coordinator = phpgw_accounts.account_id))";
+                               $paranthesis ='(';
 
                                //----- wo_hour_status
 

Index: class.uiproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- class.uiproject.inc.php     26 Jan 2007 14:53:47 -0000      1.49
+++ class.uiproject.inc.php     19 Feb 2007 21:02:41 -0000      1.50
@@ -24,7 +24,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage project
-       * @version $Id: class.uiproject.inc.php,v 1.49 2007/01/26 14:53:47 
sigurdne Exp $
+       * @version $Id: class.uiproject.inc.php,v 1.50 2007/02/19 21:02:41 
sigurdne Exp $
        */
 
        /**
@@ -146,8 +146,7 @@
                                        {
                                                
if($uicols['input_type'][$k]=='text')
                                                {
-
-                                                       
if($project_entry['query_location'][$uicols['name'][$k]])
+                                                       
if(isset($project_entry['query_location'][$uicols['name'][$k]]) && 
$project_entry['query_location'][$uicols['name'][$k]])
                                                        {
                                                                
$content[$j]['row'][]= array(
                                                                        
'statustext' => lang('search'),
@@ -585,7 +584,7 @@
                                $origin_id      = $values['origin_id'];
                        }
 
-                       if($origin)
+                       if(isset($origin) && $origin)
                        {
                                unset($values['origin']);
                                unset($values['origin_id']);
@@ -892,7 +891,7 @@
                                $supervisor_email = $prefs['email'];
                        }
 
-                       if(!$values['start_date'])
+                       if(!isset($values['start_date']) || 
!$values['start_date'])
                        {
                                $values['start_date'] = 
$GLOBALS['phpgw']->common->show_date(mktime(0,0,0,date("m"),date("d"),date("Y")),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
                        }
@@ -949,7 +948,7 @@
                        (
                                'msgbox_data'                                   
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
 
-                               'value_origin'                                  
=> $values['origin'],
+                               'value_origin'                                  
=> isset($values['origin']) ? $values['origin'] : '',
                                'value_origin_type'                             
=> (isset($origin)?$origin:''),
                                'value_origin_id'                               
=> (isset($origin_id)?$origin_id:''),
                                'selected_request'                              
=> (isset($selected_request)?$selected_request:''),
@@ -982,7 +981,7 @@
 
                                'lang_end_date_statustext'                      
=> lang('Select the estimated end date for the Project'),
                                'lang_end_date'                                 
=> lang('Project end date'),
-                               'value_end_date'                                
=> $values['end_date'],
+                               'value_end_date'                                
=> isset($values['end_date']) ? $values['end_date'] : '' ,
 
                                'lang_copy_project'                             
=> lang('Copy project ?'),
                                'lang_copy_project_statustext'                  
=> lang('Choose Copy Project to copy this project to a new project'),