[Fmsystem-commits] [14889] update solocation

[Sigurd Nes]

Revision: 14889
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14889
Author:   sigurdne
Date:     2016-04-02 17:54:09 +0000 (Sat, 02 Apr 2016)
Log Message:
-----------
update solocation

Modified Paths:
--------------
    trunk/property/inc/class.solocation.inc.php

Modified: trunk/property/inc/class.solocation.inc.php
===================================================================
--- trunk/property/inc/class.solocation.inc.php 2016-04-02 15:12:11 UTC (rev 
14888)
+++ trunk/property/inc/class.solocation.inc.php 2016-04-02 17:54:09 UTC (rev 
14889)
@@ -238,7 +238,7 @@
                                $status[] = array
                                        (
                                        'id' => $this->db->f('id'),
-                                       'name' => 
stripslashes($this->db->f('value'))
+                                       'name' => $this->db->f('value',true)
                                );
                        }
 
@@ -249,26 +249,27 @@
                {
                        $this->db->query("SELECT id,descr FROM 
fm_owner_category  ORDER BY descr ");
 
-                       $i = 0;
+                       $owner_type = array();
                        while ($this->db->next_record())
                        {
-                               $owner_type[$i]['id'] = $this->db->f('id');
-                               $owner_type[$i]['name'] = 
stripslashes($this->db->f('descr'));
-                               $i++;
+                               $owner_type[] = array(
+                                       'id' => $this->db->f('id'),
+                                       'name' => $this->db->f('descr',true)
+                               );
                        }
                        return $owner_type;
                }
 
                function get_owner_list()
                {
-//                     $this->db->query("SELECT fm_owner.* 
,fm_owner_category.descr as category FROM fm_owner $this->join 
fm_owner_category on fm_owner.category=fm_owner_category.id  ORDER BY descr ");
                        $this->db->query("SELECT *  FROM fm_owner ORDER BY 
org_name ");
-                       $i = 0;
+                       $owners = array();
                        while ($this->db->next_record())
                        {
-                               $owners[$i]['id'] = $this->db->f('id');
-                               $owners[$i]['name'] = 
stripslashes($this->db->f('org_name')); // . ' ['. $this->db->f('category') . 
']';
-                               $i++;
+                               $owners[] = array(
+                                       'id' => $this->db->f('id'),
+                                       'name' => $this->db->f('org_name',true)
+                               );
                        }
                        return $owners;
                }