X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FI18n.php;h=ef145a12b1a426842d005a8006cd7bb9f8e3f49b;hb=c623872838420a0cfb76596d7b09a694a1ee5f26;hp=366143306879b3c34b7a27daa116048cded4d11b;hpb=750b54e82dd8dd021d19a8e5a3ea04e788689fd8;p=Pman.Core

diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php
index 36614330..ef145a12 100644
--- a/DataObjects/I18n.php
+++ b/DataObjects/I18n.php
@@ -127,10 +127,24 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
             $this->buildDB(); // ensure we have the full database...
             
             $this->selectAdd("
+                id as id,
                 i18n_translate(ltype, lkey, 'en') as lval_en
-                
             ");
         }
+        
+        if (!empty($q['_as_code_and_title'])) {
+            $tn = $this->tableName();
+            
+            $this->selectAdd();
+            $this->selectAdd("
+                    {$tn}.lval as title,
+                    {$tn}.lkey as code
+            ");
+            $this->is_active = 1;
+            if (!empty($q['_title'])) {
+                $this->whereAdd("{$tn}.lval like '{$this->escape($_REQUEST['_title'])}%'");
+            }
+        }
          
         if (!empty($q['!code'])) {
             $this->whereAddIn('!lkey', explode(',', $q['!code']), 'string'); 
@@ -141,6 +155,10 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
             $this->whereAdd("upper(lval) LIKE '%{$v}%'");
         }
         
+         if (!empty($q['query']['name_starts'])) {
+            $this->whereAdd("lval LIKE '". $this->escape($q['query']['name_starts']). "%'");
+        }
+        
         if (!empty($q['_filtered']) && !empty($this->ltype)) {
             $cfg = $this->cfg();
             $filter = $cfg[$this->ltype];
@@ -170,7 +188,19 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
                             geoip_city.country = i18n.lkey
                 ) AS no_of_city
             ");
-            
+        }
+        
+        if(!empty($q['_hide_unused'])) {
+            $this->whereAdd("
+                (
+                    SELECT
+                            COUNT(geoip_division.id)
+                    FROM
+                            geoip_division
+                    WHERE
+                            geoip_division.country = i18n.lkey
+                ) > 0
+            ");
         }
     }