Fix #5774 - City / Province...

[Pman.Core] / DataObjects / I18n.php

diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php
index 7a833b9..9711cb6 100644 (file)
--- a/DataObjects/I18n.php
+++ b/DataObjects/I18n.php
@@ -121,7 +121,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
     function applyFilters($q, $au)
     {
         $this->buildDB();
-        DB_DataObject::debugLevel(1);
+        //DB_DataObject::debugLevel(1);
         if (!empty($q['query']['_with_en'])) {
             
             $this->buildDB(); // ensure we have the full database...
@@ -149,8 +149,61 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
             }
             
         }
+        
+        if(!empty($q['_with_geoip_count'])) {
+            
+            $this->selectAdd("
+                (
+                    SELECT
+                            COUNT(geoip_division.id)
+                    FROM
+                            geoip_division
+                    WHERE
+                            geoip_division.country = i18n.lkey
+                ) AS no_of_division,
+                (
+                    SELECT
+                            COUNT(geoip_city.id)
+                    FROM
+                            geoip_city
+                    WHERE
+                            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
+                ");
+            }
+            
+        }
     }
     
+    function lookupCode($inlang,$ltype,$name)
+    {
+        $x = DB_DataObject::factory('i18n');
+        $x->ltype = $ltype;
+        $x->lval = $name;
+        $x->inlang= $inlang;
+        
+        $x->limit(1);
+        if ($x->find(true) && !empty($x->lkey)) {
+            return $x->lkey;
+        }
+        return '';
+        
+        
+    }
+    
+    
     function translate($inlang,$ltype,$kval)
     {