[Phpgroupware-cvs] property/inc class.bolocation.inc.php class.uil...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/04/11 14:17:14

Modified files:
        inc            : class.bolocation.inc.php 
                         class.uilocation.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.bolocation.inc.php.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.uilocation.inc.php.diff?tr1=1.23&tr2=1.24&r1=text&r2=text

Patches:
Index: property/inc/class.bolocation.inc.php
diff -u property/inc/class.bolocation.inc.php:1.12 
property/inc/class.bolocation.inc.php:1.13
--- property/inc/class.bolocation.inc.php:1.12  Fri Mar  3 09:13:42 2006
+++ property/inc/class.bolocation.inc.php       Tue Apr 11 14:17:14 2006
@@ -8,7 +8,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.12 2006/03/03 09:13:42 
sigurdne Exp $
+       * @version $Id: class.bolocation.inc.php,v 1.13 2006/04/11 14:17:14 
sigurdne Exp $
        */
 
        /**
@@ -331,7 +331,8 @@
                                $location['location'][$i]['lookup_link']        
                        = True;
                                $location['location'][$i]['readonly']           
                        = True;
                                $lookup_functions[$i]['name']                   
                        = 'lookup_loc' . ($i+1) . '()';
-                               $lookup_functions[$i]['action']                 
                        = 'Window1=window.open('."'" . $location_link 
.'&type_id=' . ($i+1) . '&lookup_name=' . $i . "'" 
.',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
+                               $lookup_functions[$i]['link']                   
                        =  $location_link .'&type_id=' . ($i+1) . 
'&lookup_name=' . $i;
+                               $lookup_functions[$i]['action']                 
                        = 
'Window1=window.open(link,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
 
                                if($data['no_link']>=($i+3))
                                {
@@ -554,6 +555,8 @@
                        {
                                $location['lookup_functions'] .= 'function ' . 
$lookup_functions[$j]['name'] ."\r\n";
                                $location['lookup_functions'] .= '{'."\r\n";
+                               $location['lookup_functions'] .= "var link = '" 
. $lookup_functions[$j]['link'] ."';" . "\r\n";
+                               $location['lookup_functions'] .= 'link = 
link.split("amp;").join("");' ."\r\n";
                                $location['lookup_functions'] .= 
$lookup_functions[$j]['action'] ."\r\n";
                                $location['lookup_functions'] .= '}'."\r\n";
                        }
Index: property/inc/class.uilocation.inc.php
diff -u property/inc/class.uilocation.inc.php:1.23 
property/inc/class.uilocation.inc.php:1.24
--- property/inc/class.uilocation.inc.php:1.23  Thu Mar  9 13:07:12 2006
+++ property/inc/class.uilocation.inc.php       Tue Apr 11 14:17:14 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage location
-       * @version $Id: class.uilocation.inc.php,v 1.23 2006/03/09 13:07:12 
sigurdne Exp $
+       * @version $Id: class.uilocation.inc.php,v 1.24 2006/04/11 14:17:14 
sigurdne Exp $
        */
 
        /**
@@ -656,21 +656,21 @@
                        $j=0;
                        $additional_fields[$j]['input_text']    = 
$location_types[($type_id-1)]['name'];
                        $additional_fields[$j]['statustext']    = 
$location_types[($type_id-1)]['descr'];
-                       $additional_fields[$j]['datatype']              = 
'varchar';
+                       $additional_fields[$j]['datatype']      = 'varchar';
                        $additional_fields[$j]['input_name']    = 'loc' . 
$type_id;
-                       $additional_fields[$j]['name']  = 'loc' . $type_id;
-                       $additional_fields[$j]['value']                 = 
$values[$additional_fields[$j]['input_name']];
-                       $additional_fields[$j]['class']                 = 
'th_text';
-                       $insert_record['extra'][]                               
                = $additional_fields[$j]['input_name'];
+                       $additional_fields[$j]['name']          = 'loc' . 
$type_id;
+                       $additional_fields[$j]['value']         = 
$values[$additional_fields[$j]['input_name']];
+                       $additional_fields[$j]['class']         = 'th_text';
+                       $insert_record['extra'][]               = 
$additional_fields[$j]['input_name'];
 
                        $j++;
                        $additional_fields[$j]['input_text']    = lang('name');
                        $additional_fields[$j]['statustext']    = lang('enter 
the name for this location');
-                       $additional_fields[$j]['datatype']              = 
'varchar';
+                       $additional_fields[$j]['datatype']      = 'varchar';
                        $additional_fields[$j]['input_name']    = 'loc' . 
$type_id . '_name';
-                       $additional_fields[$j]['name']  = 'loc' . $type_id . 
'_name';
-                       $additional_fields[$j]['value']                 = 
$values[$additional_fields[$j]['input_name']];
-                       $insert_record['extra'][]                               
                = $additional_fields[$j]['input_name'];
+                       $additional_fields[$j]['name']          = 'loc' . 
$type_id . '_name';
+                       $additional_fields[$j]['value']         = 
$values[$additional_fields[$j]['input_name']];
+                       $insert_record['extra'][]               = 
$additional_fields[$j]['input_name'];
                        $j++;
 
 
@@ -698,17 +698,18 @@
                        $m=0;
                        while (is_array($custom_fields) && list(,$custom) = 
each($custom_fields))
                        {
-                               $location_datatype[]= array('input_name'        
        => $custom['column_name'],
-                                       'datatype'              => 
$custom['datatype']
+                               $location_datatype[]= array(
+                                       'input_name'    => 
$custom['column_name'],
+                                       'datatype'      => $custom['datatype']
                                        );
 
-                               $attributes_values[$r]['id']    = $custom['id'];
+                               $attributes_values[$r]['id']            = 
$custom['id'];
                                $attributes_values[$r]['input_text']    = 
$custom['input_text'];
                                $attributes_values[$r]['statustext']    = 
$custom['statustext'];
-                               $attributes_values[$r]['datatype']              
= $custom['datatype'];
-                               $attributes_values[$r]['name']  = 
$custom['column_name'];
+                               $attributes_values[$r]['datatype']      = 
$custom['datatype'];
+                               $attributes_values[$r]['name']          = 
$custom['column_name'];
                                $attributes_values[$r]['input_name']    = 
$custom['column_name'];
-                               $attributes_values[$r]['value']                 
= $values[$custom['column_name']];
+                               $attributes_values[$r]['value']         = 
$values[$custom['column_name']];
                                if($attributes_values[$r]['datatype']=='D' && 
$attributes_values[$r]['value'])
                                {
                                        $timestamp_date= 
mktime(0,0,0,date(m,strtotime($attributes_values[$r]['value'])),date(d,strtotime($attributes_values[$r]['value'])),date(y,strtotime($attributes_values[$r]['value'])));
@@ -781,11 +782,13 @@
                                $attributes_values[$r]['counter']       = $r;
                                $attributes_values[$r]['type_id']       = 
$type_id;
                                $r++;
-
+//FIX !!!
                                for ($j=0;$j<count($functions);$j++)
                                {
                                        $lookup_functions .= 'function ' . 
$functions[$j]['name'] ."\r\n";
                                        $lookup_functions .= '{'."\r\n";
+                                       $lookup_functions .= 'var link = ' . 
$functions[$i]['link'] ."\r\n";
+                                       $lookup_functions .= 'link = 
link.split("&amp;").join("&")' ."\r\n";
                                        $lookup_functions .= 
$functions[$j]['action'] ."\r\n";
                                        $lookup_functions .= '}'."\r\n";
                                }