[Phpgroupware-cvs] property/class.boentity.php, 1.1.1.11

[nomail]

Update of /property
Modified Files:
        Branch: 
          class.boentity.php

date: 2004/05/02 12:47:34;  author: sigurdne;  state: Exp;  lines: +12 -12

Log Message:
no message
=====================================================================
Index: property/class.boentity.php
diff -u property/class.boentity.php:1.1.1.10 
property/class.boentity.php:1.1.1.11
--- property/class.boentity.php:1.1.1.10        Sat May  1 20:00:27 2004
+++ property/class.boentity.php Sun May  2 12:47:34 2004
@@ -281,7 +281,7 @@
                        $contacts                       = 
CreateObject($this->currentapp.'_contacts');
 
                        $entity = $this->so->read_single($data);
-                       $dateformat = 
$GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat'];
+                       $dateformat = 
$GLOBALS['phpgw_data']['prefs'][$this->currentapp . '.dateformat'];
                        $entity['date']  = 
$this->bocommon->show_date($entity['date'],$dateformat);
 
                        if($entity['location_code'])
@@ -322,6 +322,7 @@
 
                        $dateformat= (implode($sep,$dlarr));
 
+//html_print_r($entity);
                        $m=0;
                        for ($i=0;$i<count($entity['attributes']);$i++)
                        {
@@ -382,17 +383,16 @@
                                $entity['lookup_functions'] .= '}'."\r\n";
                        }
 
-                       if($entity['files'][0]['file_id'])
-                       {
-                               $this->vfs->override_acl = 1;
+                       $this->vfs->override_acl = 1;
 
-                               $entity['files'] = $this->vfs->ls (array(
-                                    'string' => $this->fakebase. '/' . 
$this->category_name . '/' . $entity['location_data']['loc1'] .  '/' . 
$data['id'],
-                                    'relatives' => array(RELATIVE_NONE)));
+                       $entity['files'] = $this->vfs->ls (array(
+                            'string' => $this->fakebase. '/' . 
$this->category_name . '/' . $entity['location_data']['loc1'] .  '/' . 
$data['id'],
+                            'relatives' => array(RELATIVE_NONE)));
 
-                               $this->vfs->override_acl = 0;
-                       }
-                       else
+                       $this->vfs->override_acl = 0;
+
+//html_print_r($entity['files']);
+                       if(!$entity['files'][0]['file_id'])
                        {
                                unset($entity['files']);
                        }
@@ -400,7 +400,6 @@
 
                        
$this->fm_session->appsession('insert_record_entity',$this->currentapp,$insert_record_entity);
 
-//html_print_r($entity);
                        return $entity;
                }
 
@@ -517,7 +516,8 @@
                                if($values_attribute[$i]['datatype']=='D' && 
$values_attribute[$i]['value'])
                                {
 
-                                       $values_attribute[$i]['value'] = 
date($this->bocommon->dateformat,$this->bocommon->date_to_timestamp($values_attribute[$i]['value']));
+//                                     $values_attribute[$i]['value'] = 
date($this->bocommon->dateformat,$this->bocommon->date_to_timestamp($values_attribute[$i]['value']));
+                                       $values_attribute[$i]['value'] = 
$this->bocommon->date_to_timestamp($values_attribute[$i]['value']);
                                }
                        }