DataObjects/I18n.php

[Pman.Core] / DataObjects / Projects.php

diff --git a/DataObjects/Projects.php b/DataObjects/Projects.php
index e7188f4..e29664d 100644 (file)
--- a/DataObjects/Projects.php
+++ b/DataObjects/Projects.php
@@ -112,11 +112,10 @@ class Pman_Core_DataObjects_Projects extends DB_DataObject
             
                
             $pf = empty($q['query']['project_filter']) ? 'P,N,U' : $q['query']['project_filter'];
-            $bits= explode(',' ,$pf);
-            foreach($bits as $i=>$k) {
-                $bits[$i] = $this->escape($k);
-            }
-            $this->whereAdd("Projects.type in ('". implode("','", $bits) . "')");
+        
+         
+        
+            $this->whereAddIn("Projects.type", explode(',', $pf), 'string');
         }
          // user projects!!!! - make sure they can only see project they are suppsed to..
          // only applies to document stuff..
@@ -167,16 +166,7 @@ class Pman_Core_DataObjects_Projects extends DB_DataObject
         
         
     }
-    function whereAddIn($key, $list, $type) {
-        $ar = array();
-        foreach($list as $k) {
-            $ar[] = $type =='int' ? (int)$k : $this->escape($k);
-        }
-        if (!$ar) {
-            return;
-        }
-        $this->whereAdd("$key IN (". implode(',', $ar). ')');
-    }
+ 
     function onInsert()
     {
         $oo = clone($this);
@@ -208,7 +198,7 @@ class Pman_Core_DataObjects_Projects extends DB_DataObject
         $olddir =  $opts['storedir'] . '/' . $old->code;
         $newdir =  $opts['storedir'] . '/' . $this->code;
         if ( file_exists($olddir)) {
-            move ($olddir, $newdir);
+            move($olddir, $newdir);
         }
          
         
@@ -308,12 +298,4 @@ class Pman_Core_DataObjects_Projects extends DB_DataObject
         return $au->hasPerm("Core.Projects_Member_Of",$lvl) || $au->hasPerm("Core.Projects_All",$lvl);
     }
     
-    function keywords()
-    {
-        $k = DB_DAtaObject::Factory('clipping_keywords');
-        $k->project_id = $this->id;
-        return $k->fetchAll();
-        
-        
-    }
 }