[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.solocation.inc.php, 1.6 class.soad
|
From: |
sigurdne |
|
Subject: |
[Phpgroupware-cvs] property/inc class.solocation.inc.php, 1.6 class.soadmin_location.inc.php, 1.5 |
|
Date: |
Mon, 2 May 2005 10:42:00 +0200 |
Update of property/inc
Modified Files:
Branch: MAIN
class.solocation.inc.php lines: +65 -61
class.soadmin_location.inc.php lines: +15 -7
Log Message:
no message
====================================================
Index: property/inc/class.solocation.inc.php
diff -u property/inc/class.solocation.inc.php:1.5
property/inc/class.solocation.inc.php:1.6
--- property/inc/class.solocation.inc.php:1.5 Tue Apr 19 08:15:29 2005
+++ property/inc/class.solocation.inc.php Mon May 2 08:42:06 2005
@@ -203,32 +203,6 @@
$cols_return[] = 'loc' .
$location_types[$i]['id'];
}
- $fm_location_cols =
$this->soadmin_location->read_attrib(array('type_id'=>$type_id,'lookup_type'=>$type_id));
-
-//_debug_array($fm_location_cols);
- $location_cols_count =
count($fm_location_cols);
-
- for ($i=0;$i<$location_cols_count;$i++)
- {
- if($fm_location_cols[$i]['list']==1)
- {
- $cols .= ",fm_location" .
$fm_location_cols[$i]['location_type']
.".".$fm_location_cols[$i]['column_name'];
- $cols_return[]
= $fm_location_cols[$i]['column_name'];
- $uicols['input_type'][]
= 'text';
- $uicols['name'][]
= $fm_location_cols[$i]['column_name'];
- $uicols['descr'][]
= $fm_location_cols[$i]['input_text'];
- $uicols['statustext'][]
= $fm_location_cols[$i]['statustext'];
-
-
if($fm_location_cols[$i]['lookup_form']==1)
- {
- $uicols['exchange'][]
= True;
- }
- else
- {
- $uicols['exchange'][]
= False;
- }
- }
- }
$street_level =
$this->soadmin_location->read_config_single('street_id');
if ($street_level > $type_id)
@@ -386,6 +360,34 @@
}
}
+ $fm_location_cols =
$this->soadmin_location->read_attrib(array('type_id'=>$type_id,'lookup_type'=>$type_id));
+
+//_debug_array($fm_location_cols);
+ $location_cols_count =
count($fm_location_cols);
+
+ for ($i=0;$i<$location_cols_count;$i++)
+ {
+ if($fm_location_cols[$i]['list']==1)
+ {
+ $cols .= ",fm_location" .
$fm_location_cols[$i]['location_type']
.".".$fm_location_cols[$i]['column_name'];
+ $cols_return[]
= $fm_location_cols[$i]['column_name'];
+ $uicols['input_type'][]
= 'text';
+ $uicols['name'][]
= $fm_location_cols[$i]['column_name'];
+ $uicols['descr'][]
= $fm_location_cols[$i]['input_text'];
+ $uicols['statustext'][]
= $fm_location_cols[$i]['statustext'];
+
+
if($fm_location_cols[$i]['lookup_form']==1)
+ {
+ $uicols['exchange'][]
= True;
+ }
+ else
+ {
+ $uicols['exchange'][]
= False;
+ }
+ }
+ }
+
+
$from .= " FROM $paranthesis
fm_location$type_id ";
$sql = "SELECT $cols $from $joinmethod";
@@ -544,40 +546,6 @@
$cols_return[] = 'loc' .
$location_types[$i]['id'];
}
- $fm_location_cols =
$this->soadmin_location->read_attrib(array('type_id'=>$type_id,'lookup_type'=>$type_id,'allrows'=>True));
-//_debug_array($fm_location_cols);
-
- $location_cols_count = count($fm_location_cols);
-
- for ($i=0;$i<$location_cols_count;$i++)
- {
-
- if($read_single)
- {
- $cols .= ",fm_location" .
$fm_location_cols[$i]['location_type']
.".".$fm_location_cols[$i]['column_name'];
- $cols_return[]
= $fm_location_cols[$i]['column_name'];
- $uicols['input_type'][] =
'text';
- $uicols['name'][]
= $fm_location_cols[$i]['column_name'];
- $uicols['descr'][]
= $fm_location_cols[$i]['input_text'];
- $uicols['statustext'][] =
$fm_location_cols[$i]['statustext'];
-
- $cols .= ",fm_location" . ($type_id)
.".category as cat_id";
- $cols_return[]
= 'cat_id';
-
- }
- else
- {
- if($fm_location_cols[$i]['list']==1)
- {
- $cols .= ",fm_location" .
($type_id) .".".$fm_location_cols[$i]['column_name'];
- $cols_return[]
= $fm_location_cols[$i]['column_name'];
- $uicols['input_type'][]
= 'text';
- $uicols['name'][]
= $fm_location_cols[$i]['column_name'];
- $uicols['descr'][]
= $fm_location_cols[$i]['input_text'];
- $uicols['statustext'][]
= $fm_location_cols[$i]['statustext'];
- }
- }
- }
if($type!=1)
{
@@ -701,6 +669,42 @@
}
}
+ $fm_location_cols =
$this->soadmin_location->read_attrib(array('type_id'=>$type_id,'lookup_type'=>$type_id,'allrows'=>True));
+//_debug_array($fm_location_cols);
+
+ $location_cols_count = count($fm_location_cols);
+
+ for ($i=0;$i<$location_cols_count;$i++)
+ {
+
+ if($read_single)
+ {
+ $cols .= ",fm_location" .
$fm_location_cols[$i]['location_type']
.".".$fm_location_cols[$i]['column_name'];
+ $cols_return[]
= $fm_location_cols[$i]['column_name'];
+ $uicols['input_type'][] =
'text';
+ $uicols['name'][]
= $fm_location_cols[$i]['column_name'];
+ $uicols['descr'][]
= $fm_location_cols[$i]['input_text'];
+ $uicols['statustext'][] =
$fm_location_cols[$i]['statustext'];
+
+ $cols .= ",fm_location" . ($type_id)
.".category as cat_id";
+ $cols_return[]
= 'cat_id';
+
+ }
+ else
+ {
+ if($fm_location_cols[$i]['list']==1)
+ {
+ $cols .= ",fm_location" .
($type_id) .".".$fm_location_cols[$i]['column_name'];
+ $cols_return[]
= $fm_location_cols[$i]['column_name'];
+ $uicols['input_type'][]
= 'text';
+ $uicols['name'][]
= $fm_location_cols[$i]['column_name'];
+ $uicols['descr'][]
= $fm_location_cols[$i]['input_text'];
+ $uicols['statustext'][]
= $fm_location_cols[$i]['statustext'];
+ }
+ }
+ }
+
+
$cols.= ',district_id';
$cols_return[] = 'district_id';
====================================================
Index: property/inc/class.soadmin_location.inc.php
diff -u property/inc/class.soadmin_location.inc.php:1.4
property/inc/class.soadmin_location.inc.php:1.5
--- property/inc/class.soadmin_location.inc.php:1.4 Sat Jan 29 13:23:26 2005
+++ property/inc/class.soadmin_location.inc.php Mon May 2 08:42:06 2005
@@ -637,7 +637,6 @@
function edit_attrib($attrib)
{
-
$attrib['column_name'] =
$this->db->db_addslashes($attrib['column_name']);
$attrib['input_text'] =
$this->db->db_addslashes($attrib['input_text']);
$attrib['statustext'] =
$this->db->db_addslashes($attrib['statustext']);
@@ -649,15 +648,24 @@
$this->db->transaction_begin();
+
+ $value_set=array(
+ 'input_text' => $attrib['input_text'],
+ 'statustext' => $attrib['statustext'],
+ 'list' => $attrib['list'],
+ 'lookup_form' => $attrib['lookup_form'],
+ );
+
+ $value_set =
$this->bocommon->validate_db_update($value_set);
+
+ $this->db->query("UPDATE fm_location_attrib set
$value_set WHERE type_id = " . $attrib['type_id'] ." AND id=" .
$attrib['id'],__LINE__,__FILE__);
+
+
if($OldColumnName !=$attrib['column_name'])
{
$value_set=array(
'column_name' =>
$attrib['column_name'],
- 'input_text' =>
$attrib['input_text'],
- 'statustext' =>
$attrib['statustext'],
'type_id' =>
$attrib['type_id'],
- 'lookup_form' =>
$attrib['lookup_form'],
- 'list' =>
$attrib['list'],
'datatype' =>
$attrib['column_info']['type'],
'precision_' =>
$attrib['column_info']['precision'],
'scale' =>
$attrib['column_info']['scale'],
@@ -667,7 +675,7 @@
$value_set =
$this->bocommon->validate_db_update($value_set);
- $this->db->query("UPDATE fm_location_attrib set
$value_set WHERE id=" . $attrib['id'],__LINE__,__FILE__);
+ $this->db->query("UPDATE fm_location_attrib set
$value_set WHERE type_id = " . $attrib['type_id'] ." AND id=" .
$attrib['id'],__LINE__,__FILE__);
if($attrib['column_info']['type']=='email' &&
!$attrib['column_info']['precision'])
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.solocation.inc.php, 1.6 class.soadmin_location.inc.php, 1.5,
sigurdne <=