[Fmsystem-commits] [12347] class.soadmin_location.inc

[Saul]

Revision: 12347
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12347
Author:   psaul
Date:     2014-11-20 23:01:43 +0000 (Thu, 20 Nov 2014)
Log Message:
-----------
class.soadmin_location.inc

Modified Paths:
--------------
    branches/dev-syncromind/property/inc/class.soadmin_location.inc.php

Modified: branches/dev-syncromind/property/inc/class.soadmin_location.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.soadmin_location.inc.php 
2014-11-20 19:46:41 UTC (rev 12346)
+++ branches/dev-syncromind/property/inc/class.soadmin_location.inc.php 
2014-11-20 23:01:43 UTC (rev 12347)
@@ -48,11 +48,13 @@
                }
 
                function read($data)
-               {
-                       $start  = isset($data['start']) && $data['start'] ? 
$data['start'] : 0;
-                       $query  = isset($data['query'])?$data['query']:'';
-                       $sort   = isset($data['sort']) && $data['sort'] ? 
$data['sort'] : 'DESC';
-                       $order  = isset($data['order'])?$data['order']:'';
+               {                               
+                       $start      = isset($data['start']) && $data['start'] ? 
$data['start'] : 0;
+                       $query      = isset($data['query'])?$data['query']:'';
+                       $sort       = isset($data['sort']) && $data['sort'] ? 
$data['sort'] : 'DESC';
+                       $order      = isset($data['order'])?$data['order']:'';
+                        $allrows    = isset($data['allrows']) ? 
$data['allrows']:'';
+                        $results    = isset($data['results'])  ? (int) 
$data['results'] : 0;
 
                        if ($order)
                        {
@@ -75,10 +77,19 @@
                        }
 
                        $sql = "SELECT * FROM $table $querymethod";
-
+                        
                        $this->db->query($sql,__LINE__,__FILE__);
                        $this->total_records = $this->db->num_rows();
-                       $this->db->limit_query($sql . 
$ordermethod,$start,__LINE__,__FILE__);
+                        
+                        if(!$allrows)
+                       {
+                               $this->db->limit_query($sql . 
$ordermethod,$start,__LINE__,__FILE__,$results);
+                       }
+                       else
+                       {
+                               $this->db->query($sql . 
$ordermethod,__LINE__,__FILE__);
+                       }
+                       #$this->db->limit_query($sql . 
$ordermethod,$start,__LINE__,__FILE__);
 
                        $standard = array();
                        while ($this->db->next_record())