X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FI18n.php;h=d59015fa2979483366baa5c8c305e849b349c498;hb=eee01eed2776c31e6b3562ba2ffc20f0cba58d17;hp=a0724b7abf2118fba215d1caa53e8c466ea81d26;hpb=1670064865c4ebe9c0ed4b45eae71ba7eb5f71ec;p=Pman.Core

diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php
index a0724b7a..d59015fa 100644
--- a/DataObjects/I18n.php
+++ b/DataObjects/I18n.php
@@ -46,9 +46,9 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
           //  'ta', // tamil
           //  '**', // other
         ),
-        'c' => array(
-             'AU', 'CN', 'HK', 'IN', 'ID', 'JP', 'MY', 'NZ', 'TW', 'SG', 'TH', 'KR', 'US', 'PH', 'VN','**'
-        ),
+        'c' => '*', // array(
+             //'AU', 'CN', 'HK', 'IN', 'ID', 'JP', 'MY', 'NZ', 'TW', 'SG', 'TH', 'KR', 'US', 'PH', 'VN','**'
+        //),
         'm' => array(
             'USD', 'HKD', 'GBP', 'CNY', 'SGD', 'JPY'
         ),
@@ -68,25 +68,46 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         if ($loaded) {
             return self::$cfg;
         }
+         
         $loaded =true;
         $ff= HTML_FlexyFramework::get();
-         
-        // since our opts array changed alot..
-        $opts = empty($ff->Pman_Core_I18N) ? (empty($ff->Pman_I18N) ? array() : $ff->Pman_I18N)  : $ff->Pman_Core_I18N;
+        
+        // BC compatible.. if any of these are set, then we use them as the settings..
+        $opts = array();
+        foreach(array('Pman_Core_I18n', 'Pman_Core_I18N', 'Pman_I18N','Pman_I18n') as $pk) {
+            if (isset($ff->$pk)) {
+                //var_dump($pk);
+                $opts =  $ff->$pk;
+                break;
+            }
+        }
+        //echo '<PRE>';print_R($opts);//exit;
         
          
-       //  var_dump($opts);exit;
+        // var_dump($opts);exit;
         
         $i = DB_DataObject::Factory('I18n');
         // load the cofiguration
         foreach($opts as $k=>$v) {
             
             if ($v == '*') { // everything..
-                self::$cfg[$k] = $i->availableCodes($k, false);
+               // self::$cfg[$k] = $i->availableCodes($k, false);
                 continue;
             }
+             
             self::$cfg[$k] = is_array($v) ? $v  : explode(',', $v);
         }
+        // available codes recursively calls this... -- so the above has to be set first..
+        foreach($opts as $k=>$v) {
+            
+            if ($v == '*') { // everything..
+                self::$cfg[$k] = '*'; //$i->availableCodes($k, false);
+                continue;
+            }
+           
+        }
+        
+        
         return self::$cfg;
         
         
@@ -110,8 +131,16 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         }
         if (!empty($q['query']['name'])) {
             //DB_DAtaObject::debugLevel(1);
+            $v = strtoupper($this->escape($q['query']['name']));
+            $this->whereAdd("upper(lval) LIKE '%{$v}%'");
+        }
         
-            $this->whereAdd("lval LIKE '". $this->escape($q['query']['name']). "%'");
+        if (!empty($q['_filtered']) && !empty($this->ltype)) {
+            $cfg = $this->cfg();
+            $filter = $cfg[$this->ltype];
+            $this->whereAddIn('lkey', $filter, 'string'); 
+            
+            
         }
     }
     
@@ -170,7 +199,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
     {
         $ret = array();
         $cfg = $this->cfg();
-
+        //echo '<PRE>';print_r($cfg);
         switch ($t) {
             case 'c':
                 require_once 'I18Nv2/Country.php';
@@ -181,9 +210,11 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
                     $ret = array_merge($ret, array_keys($cfg['add_c']));
                 }
                 
+                
                  
                 
                 $ret[] = '**';
+                //echo '<PRE>';print_R($cfg); print_r($ret); exit;
                 break;
             
             case 'l':
@@ -276,7 +307,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         $complete = $x->fetchAll('lkey');
         
         $list =  $this->availableCodes($ltype);
-        // echo '<PRE>'; print_r($list); 
+        //echo '<PRE>'; print_r($list); 
         
         foreach($list as $lkey) {
             // skip ones we know we have done...