DataObjects/I18n.php

[Pman.Core] / DataObjects / Core_enum.php

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 90badb2..56253fb 100644 (file)
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -23,45 +23,45 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
     
     function applyFilters($q, $au)
     {
-//        
-////        DB_DataObject::debugLevel(1);
-//        if (!empty($q['query']['empty_etype'])) {
-//            $this->whereAdd("etype = ''");
-//        }
-//        
-//        // this should be handled by roo... using '!name[0]' ....
-//        if(!empty($q['!name'])){
-//            $names = is_array($q['!name']) ? $q['!name'] : explode(',', $q['!name']);
-//            foreach($names as $name){
-//                $name  = $this->escape($name);
-//                $this->whereAdd("
-//                    core_enum.name NOT IN ('$name')
-//                ");
-//            }
-//        }
-//        if(!empty($q['search']['display_name'])) {
-//            $name = $this->escape($q['search']['display_name']);
-//            // ilike on postgres?!?
-//            $this->whereAdd("
-//                core_enum.display_name LIKE '{$name}%'
-//            ");
-//            
-//        }
-//        
-//        if(!empty($q['query']['name'])) {
-//            $name = $this->escape($q['query']['name']);
-//            // 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'];
-//        }
+        
+//        DB_DataObject::debugLevel(1);
+        if (!empty($q['query']['empty_etype'])) {
+            $this->whereAdd("etype = ''");
+        }
+        
+        // this should be handled by roo... using '!name[0]' ....
+        if(!empty($q['!name'])){
+            $names = is_array($q['!name']) ? $q['!name'] : explode(',', $q['!name']);
+            foreach($names as $name){
+                $name  = $this->escape($name);
+                $this->whereAdd("
+                    core_enum.name NOT IN ('$name')
+                ");
+            }
+        }
+        if(!empty($q['search']['display_name'])) {
+            $name = $this->escape($q['search']['display_name']);
+            // ilike on postgres?!?
+            $this->whereAdd("
+                core_enum.display_name LIKE '{$name}%'
+            ");
+            
+        }
+        
+        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'];
+        }
         
     }
     
@@ -119,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');
@@ -140,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');
@@ -161,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)."'");
+        }
     }
     
     /**