DataObjects/I18n.php

[Pman.Core] / DataObjects / Core_enum.php

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 34aea72..56253fb 100644 (file)
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -24,7 +24,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
     function applyFilters($q, $au)
     {
         
-        //DB_DataObject::debugLevel(1);
+//        DB_DataObject::debugLevel(1);
         if (!empty($q['query']['empty_etype'])) {
             $this->whereAdd("etype = ''");
         }
@@ -48,22 +48,50 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             
         }
         
+        if(!empty($q['query']['search'])) {
+            $name = $this->escape($q['query']['search']);
+            // ilike on postgres?!?
+            $this->whereAdd("
+                    core_enum.name LIKE '%{$name}%'
+                OR
+                    core_enum.display_name LIKE '%{$name}%'
+            ");
+        }
+        
+//        print_r($this);
+        if(!empty($q['id'])){
+            $this->id = $q['id'];
+        }
+        
     }
     
     function autoJoinCmsTranslate($lang)
     {
-        $this->join .= "
-            LEFT JOIN cms_templatestr ON 
-                
-        ";
         $l = $this->escape($lang);
+        
+        $this->_join .= "
+            LEFT JOIN 
+                cms_templatestr 
+            ON
+                cms_templatestr.lang = '$l'
+            AND
+                cms_templatestr.on_table = 'core_enum'
+            AND
+                cms_templatestr.on_id = core_enum.id
+            AND
+                cms_templatestr.on_col = 'display_name'
+        ";
+        
         $this->selectAdd("
             CASE WHEN 
-                '$lang' = 'en' THEN display_name 
+                '$l' = 'en' THEN display_name 
             ELSE
-                cms_templatestr.txt
+                CASE WHEN cms_templatestr.txt IS NOT NULL AND cms_templatestr.txt != '' THEN
+                    cms_templatestr.txt
+                ELSE
+                    display_name
+                END
             END as  display_name_tr 
-
         ");
         
     }
@@ -91,11 +119,11 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
     
     
     function beforeUpdate($old, $request,$roo)
-    {
+    {   
         $tn = $this->tableName();
         $x = $this->factory($tn);
         if(!($old->etype == $request['etype'] && $old->name == $request['name'])){
-            $x->whereAdd("etype = '{$request['etype']}' AND name = '{$request['name']}'");
+            $x->whereAdd("etype = '{$this->escape($request['etype'])}' AND name = '{$this->escape($request['name'])}'");
             $x->find(true);
             if($x->count() > 0){
                 $roo->jerr('is exsiting');
@@ -112,7 +140,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
                 $roo->jerr('name is exsiting');
             }
         }else{
-            $x->whereAdd("etype = '{$req['etype']}' AND name = '{$req['name']}'");
+            $x->whereAdd("etype = '{$this->escape($req['etype'])}' AND name = '{$this->escape($req['name'])}'");
             $x->find(true);
             if($x->count() > 0){
                 $roo->jerr('is exsiting');
@@ -133,6 +161,10 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         if ($old->etype != $this->etype) {
             $x->query("SELECT core_enum_seqmax_update('". $this->escape($old->etype) ."')");
         }
+        if($this->name != $old->name && empty($old->etype) && empty($this->etype)){
+            $x->query("UPDATE core_enum SET etype = '". $this->escape($this->name) 
+                ."' WHERE etype = '". $this->escape($old->name)."'");
+        }
     }
     
     /**
@@ -164,10 +196,10 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
      * @return array ID of core_enum 
      */
     
-    function lookupAllByName($etype,$name) {
+    function lookupAllByName($etype,$names) {
         $ce = DB_DataObject::Factory('core_enum');
         $ce->etype = $etype;
-        $ce->whereAddIn('name', $name, 'string');
+        $ce->whereAddIn('name', $names, 'string');
         
         if ($ce->count() > 0) {
             return $ce->fetchAll('id');