[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.soactor.inc.php class.soadmi...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc class.soactor.inc.php class.soadmi... |
|
Date: |
Mon, 18 Sep 2006 08:22:32 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/09/18 08:22:32
Modified files:
inc : class.soactor.inc.php
class.soadmin_entity.inc.php
class.soadmin_location.inc.php
class.soagreement.inc.php
class.solocation.inc.php
class.sor_agreement.inc.php
class.sos_agreement.inc.php
inc/custom : oppdater_utgaatt_objekt.php
Log message:
Altered metadata for adodb
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soactor.inc.php?cvsroot=phpgroupware&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soadmin_entity.inc.php?cvsroot=phpgroupware&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soadmin_location.inc.php?cvsroot=phpgroupware&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soagreement.inc.php?cvsroot=phpgroupware&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.solocation.inc.php?cvsroot=phpgroupware&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.sor_agreement.inc.php?cvsroot=phpgroupware&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.sos_agreement.inc.php?cvsroot=phpgroupware&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/property/inc/custom/oppdater_utgaatt_objekt.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
Patches:
Index: class.soactor.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soactor.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- class.soactor.inc.php 17 Apr 2006 11:36:05 -0000 1.15
+++ class.soactor.inc.php 18 Sep 2006 08:22:32 -0000 1.16
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage admin
- * @version $Id: class.soactor.inc.php,v 1.15 2006/04/17 11:36:05
sigurdne Exp $
+ * @version $Id: class.soactor.inc.php,v 1.16 2006/09/18 08:22:32
sigurdne Exp $
*/
/**
@@ -712,6 +712,18 @@
$metadata = $this->db->metadata($table);
+ if(isset($this->db->adodb))
+ {
+ $i = 0;
+ foreach($metadata as $key => $val)
+ {
+ $metadata_temp[$i]['name'] = $key;
+ $i++;
+ }
+ $metadata = $metadata_temp;
+ unset ($metadata_temp);
+ }
+
$fd = $this->get_default_column_def();
for ($i=0; $i<count($metadata); $i++)
Index: class.soadmin_entity.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soadmin_entity.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- class.soadmin_entity.inc.php 6 Sep 2006 07:18:36 -0000 1.20
+++ class.soadmin_entity.inc.php 18 Sep 2006 08:22:32 -0000 1.21
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage admin
- * @version $Id: class.soadmin_entity.inc.php,v 1.20 2006/09/06 07:18:36
sigurdne Exp $
+ * @version $Id: class.soadmin_entity.inc.php,v 1.21 2006/09/18 08:22:32
sigurdne Exp $
*/
/**
@@ -691,6 +691,18 @@
$table = 'fm_entity_' . $entity_id . '_' . $cat_id;
$metadata = $this->db->metadata($table);
+ if(isset($this->db->adodb))
+ {
+ $i = 0;
+ foreach($metadata as $key => $val)
+ {
+ $metadata_temp[$i]['name'] = $key;
+ $i++;
+ }
+ $metadata = $metadata_temp;
+ unset ($metadata_temp);
+ }
+
$fd = $this->get_default_column_def();
for ($i=0; $i<count($metadata); $i++)
Index: class.soadmin_location.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soadmin_location.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- class.soadmin_location.inc.php 17 Sep 2006 19:30:43 -0000 1.24
+++ class.soadmin_location.inc.php 18 Sep 2006 08:22:32 -0000 1.25
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage admin
- * @version $Id: class.soadmin_location.inc.php,v 1.24 2006/09/17
19:30:43 sigurdne Exp $
+ * @version $Id: class.soadmin_location.inc.php,v 1.25 2006/09/18
08:22:32 sigurdne Exp $
*/
/**
@@ -889,6 +889,19 @@
{
$metadata = $this->db->metadata('fm_location'.$id);
+
+ if(isset($this->db->adodb))
+ {
+ $i = 0;
+ foreach($metadata as $key => $val)
+ {
+ $metadata_temp[$i]['name'] = $key;
+ $i++;
+ }
+ $metadata = $metadata_temp;
+ unset ($metadata_temp);
+ }
+
// _debug_array($metadata);
for ($i=0; $i<count($metadata); $i++)
Index: class.soagreement.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soagreement.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- class.soagreement.inc.php 17 Apr 2006 11:36:05 -0000 1.15
+++ class.soagreement.inc.php 18 Sep 2006 08:22:32 -0000 1.16
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage agreement
- * @version $Id: class.soagreement.inc.php,v 1.15 2006/04/17 11:36:05
sigurdne Exp $
+ * @version $Id: class.soagreement.inc.php,v 1.16 2006/09/18 08:22:32
sigurdne Exp $
*/
/**
@@ -1267,6 +1267,18 @@
{
$metadata = $this->db->metadata($table);
+ if(isset($this->db->adodb))
+ {
+ $i = 0;
+ foreach($metadata as $key => $val)
+ {
+ $metadata_temp[$i]['name'] = $key;
+ $i++;
+ }
+ $metadata = $metadata_temp;
+ unset ($metadata_temp);
+ }
+
if($this->role=='detail')
{
$filtermethod= ' AND attrib_detail=2';
Index: class.solocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- class.solocation.inc.php 14 Sep 2006 06:21:40 -0000 1.33
+++ class.solocation.inc.php 18 Sep 2006 08:22:32 -0000 1.34
@@ -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.solocation.inc.php,v 1.33 2006/09/14 06:21:40
sigurdne Exp $
+ * @version $Id: class.solocation.inc.php,v 1.34 2006/09/18 08:22:32
sigurdne Exp $
*/
/**
@@ -950,6 +950,17 @@
$this->db->next_record();
$metadata = $this->db->metadata('fm_location'.$type_id);
+ if(isset($this->db->adodb))
+ {
+ $i = 0;
+ foreach($metadata as $key => $val)
+ {
+ $metadata_temp[$i]['name'] = $key;
+ $i++;
+ }
+ $metadata = $metadata_temp;
+ unset ($metadata_temp);
+ }
for ($i=0; $i<count($metadata); $i++)
{
Index: class.sor_agreement.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.sor_agreement.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- class.sor_agreement.inc.php 17 Apr 2006 11:36:05 -0000 1.14
+++ class.sor_agreement.inc.php 18 Sep 2006 08:22:32 -0000 1.15
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage agreement
- * @version $Id: class.sor_agreement.inc.php,v 1.14 2006/04/17 11:36:05
sigurdne Exp $
+ * @version $Id: class.sor_agreement.inc.php,v 1.15 2006/09/18 08:22:32
sigurdne Exp $
*/
/**
@@ -1394,6 +1394,18 @@
{
$metadata = $this->db->metadata($table);
+ if(isset($this->db->adodb))
+ {
+ $i = 0;
+ foreach($metadata as $key => $val)
+ {
+ $metadata_temp[$i]['name'] = $key;
+ $i++;
+ }
+ $metadata = $metadata_temp;
+ unset ($metadata_temp);
+ }
+
if($this->role=='detail')
{
$filtermethod= ' AND attrib_detail=2';
Index: class.sos_agreement.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.sos_agreement.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- class.sos_agreement.inc.php 17 Apr 2006 11:36:05 -0000 1.21
+++ class.sos_agreement.inc.php 18 Sep 2006 08:22:32 -0000 1.22
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage agreement
- * @version $Id: class.sos_agreement.inc.php,v 1.21 2006/04/17 11:36:05
sigurdne Exp $
+ * @version $Id: class.sos_agreement.inc.php,v 1.22 2006/09/18 08:22:32
sigurdne Exp $
*/
/**
@@ -1270,6 +1270,18 @@
{
$metadata = $this->db->metadata($table);
+ if(isset($this->db->adodb))
+ {
+ $i = 0;
+ foreach($metadata as $key => $val)
+ {
+ $metadata_temp[$i]['name'] = $key;
+ $i++;
+ }
+ $metadata = $metadata_temp;
+ unset ($metadata_temp);
+ }
+
if($this->role=='detail')
{
$filtermethod= ' AND attrib_detail=2';
Index: custom/oppdater_utgaatt_objekt.php
===================================================================
RCS file:
/sources/phpgroupware/property/inc/custom/oppdater_utgaatt_objekt.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- custom/oppdater_utgaatt_objekt.php 8 Feb 2006 09:21:48 -0000 1.8
+++ custom/oppdater_utgaatt_objekt.php 18 Sep 2006 08:22:32 -0000 1.9
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage custom
- * @version $Id: oppdater_utgaatt_objekt.php,v 1.8 2006/02/08 09:21:48
sigurdne Exp $
+ * @version $Id: oppdater_utgaatt_objekt.php,v 1.9 2006/09/18 08:22:32
sigurdne Exp $
*/
/**
@@ -147,6 +147,19 @@
}
$metadata =
$this->db->metadata('fm_location'.($type_id-1));
+
+ if(isset($this->db->adodb))
+ {
+ $i = 0;
+ foreach($metadata as $key => $val)
+ {
+ $metadata_temp[$i]['name'] =
$key;
+ $i++;
+ }
+ $metadata = $metadata_temp;
+ unset ($metadata_temp);
+ }
+
$j=0;
for ($i=0; $i<count($update); $i++)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.soactor.inc.php class.soadmi...,
Sigurd Nes <=