[Phpgroupware-cvs] property/inc/class.soactor.inc.php, 1.1.2.4

[nomail]

Update of /property/inc
Modified Files:
        Branch: sigurd-2
          class.soactor.inc.php

date: 2004/05/31 18:36:36;  author: sigurdne;  state: Exp;  lines: +39 -4

Log Message:
no message
=====================================================================
Index: property/inc/class.soactor.inc.php
diff -u property/inc/class.soactor.inc.php:1.1.2.3 
property/inc/class.soactor.inc.php:1.1.2.4
--- property/inc/class.soactor.inc.php:1.1.2.3  Sun May 30 12:28:42 2004
+++ property/inc/class.soactor.inc.php  Mon May 31 18:36:36 2004
@@ -111,7 +111,25 @@
                                        $admin_entity   = 
CreateObject($this->currentapp.'_soadmin_entity');
                                        $category = 
$admin_entity->read_single_category($entity_id,$cat_id);
                                }
+                       }
+
+                       $i      = count($uicols['name']);
 
+                       $this->db->query("SELECT * FROM $attribute_table WHERE 
list=1");
+                       while ($this->db->next_record())
+                       {
+                               $uicols['input_type'][]         = 'text';
+                               $uicols['name'][]                       = 
$this->db->f('column_name');
+                               $uicols['descr'][]                      = 
$this->db->f('input_text');
+                               $uicols['statustext'][]         = 
$this->db->f('statustext');
+                               $uicols['datatype'][$i]         = 
$this->db->f('datatype');
+                               $cols_return_extra[]= array(
+                                       'name'  => $this->db->f('column_name'),
+                                       'datatype'      => 
$this->db->f('datatype'),
+                                       'attrib_id'     => $this->db->f('id')
+                               );
+
+                               $i++;
                        }
 
                        
$user_columns=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['actor_columns_'
 . $this->role];
@@ -120,7 +138,6 @@
 
                        if (isset($user_columns) AND is_array($user_columns) 
AND $user_columns[0])
                        {
-                               $i      = count($uicols['name']);
                                foreach($user_columns as $column_id)
                                {
                                        $this->db->query("SELECT * FROM 
$attribute_table WHERE id= $column_id");
@@ -230,7 +247,7 @@
 
                        $j=0;
                        $n=count($cols_return);
-//html_print_r($cols_return);
+//_debug_array($cols_return);
                        while ($this->db->next_record())
                        {
                                for ($i=0;$i<$n;$i++)
@@ -448,8 +465,16 @@
                                $sort = 
(isset($data['sort'])?$data['sort']:'DESC');
                                $order = 
(isset($data['order'])?$data['order']:'');
                                $allrows = 
(isset($data['allrows'])?$data['allrows']:'');
+                               $column_list = 
(isset($data['column_list'])?$data['column_list']:'');
                        }
 
+                       $where = 'WHERE';
+                       if ($column_list)
+                       {
+                               $filtermethod = " $where list !=1 or list is 
null";
+                               $where = 'AND';
+
+                       }
                        if ($order)
                        {
                                $ordermethod = " order by $order $sort";
@@ -465,12 +490,12 @@
                                $query = ereg_replace("'",'',$query);
                                $query = ereg_replace('"','',$query);
 
-                               $querymethod = " WHERE 
($attribute_table.input_text LIKE '%$query%' or $attribute_table.column_name 
LIKE '%$query%')";
+                               $querymethod = " $where 
($attribute_table.input_text LIKE '%$query%' or $attribute_table.column_name 
LIKE '%$query%')";
                        }
 
                        $sql = "SELECT * FROM $attribute_table $filtermethod 
$querymethod";
 
-
+//echo $sql;
                        $this->db2->query($sql,__LINE__,__FILE__);
                        $this->total_records = $this->db2->num_rows();
                        if(!$allrows)
@@ -593,6 +618,11 @@
 
                        $receipt['id']= $attrib['id'];
 
+                       if($attrib['column_info']['type']=='email' && 
!$attrib['column_info']['precision'])
+                       {
+                               $attrib['column_info']['precision']=64;
+                       }
+
                        $attrib['column_info']['type']  = 
$this->bocommon->translate_datatype_insert($attrib['column_info']['type']);
 
                        if($attrib['column_info']['type']=='int' && 
!$attrib['column_info']['precision'])
@@ -676,6 +706,11 @@
                                $value_set      = 
$this->bocommon->validate_db_update($value_set);
 
                                $this->db->query("UPDATE $attribute_table set 
$value_set WHERE id=" . $attrib['id']);
+
+                               if($attrib['column_info']['type']=='email' && 
!$attrib['column_info']['precision'])
+                               {
+                                       $attrib['column_info']['precision']=64;
+                               }
 
                                $attrib['column_info']['type']  = 
$this->bocommon->translate_datatype_insert($attrib['column_info']['type']);