X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_company.php;h=efd3631a5989816c36dcbd9b417c5b0f3f9efc5a;hb=fc42950eceafe3813f50440d5a983b046c620280;hp=34380bc59ac2a45a5b5d1f2fea96c659c3b188ed;hpb=0d518266db263d291ef44ac364b33d70cecb5bdd;p=Pman.Core

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index 34380bc5..efd3631a 100644
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -40,7 +40,8 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     
     function applyFilters($q, $au)
     {
-       $tn = $this->tableName();
+        
+        $tn = $this->tableName();
         $this->selectAdd("i18n_translate('c' , {$tn}.country, 'en') as country_display_name ");
       
         $tn = $this->tableName();
@@ -48,7 +49,7 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
         $x = DB_DataObject::factory('core_company');
         $x->comptype= 'OWNER';
         $x->find(true);
-        
+
         if (!empty($q['query']['company_project_id'])) {
             $add = '';
             if (!empty($q['query']['company_include_self'])) {
@@ -57,6 +58,7 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
             if (!empty($q['query']['company_not_self'])) {
                 $add = " AND {$tn}.id != {$x->id}";
             }
+            
             $pids = array();
             $pid = $q['query']['company_project_id'];
             if (strpos($pid, ',')) {
@@ -80,7 +82,10 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
             $this->whereAddIn('comptype', explode(',', $q['query']['comptype']), 'string');
             
         }
-        
+        /*if (!empty($q['query']['deleted_by'])) {
+            $deleted_by = $this->escape($q['query']['deleted_by']);
+            $this->whereAdd("deleted_by = '$deleted_by'");
+        }*/
         // depricated - should be moved to module specific (texon afair)
         
          if (!empty($q['query']['province'])) {
@@ -102,8 +107,8 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
                 ) as comptype_display_name
         ");
         
-        if(!empty($q['search']['name'])){
-            $s = $this->escape($q['search']['name']);
+        if(!empty($q['query']['name'])){
+            $s = $this->escape($q['query']['name']);
             $this->whereAdd("
                 {$tn}.name LIKE '%$s%'
             ");
@@ -121,7 +126,9 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     }
     
     // ---------- AUTHENTICATION
-     function isAuth()
+    // not sure where authetnication via company is used?? posibly media-outreach
+    
+    function isAuth()
     {
         $db = $this->getDatabaseConnection();
         $sesPrefix = $db->dsn['database'];
@@ -276,20 +283,32 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     
     function beforeDelete($req, $roo)
     {
+        
         // should check for members....
         if(!empty($this->is_system) && 
             ($old->code != $this->code || $old->name != $this->name)
         ){
             $roo->jerr('This company is not allow to delete');
         }
-        $img = DB_DataObject::factory('Images');
+        
+        
+    }
+    function onDelete($req, $roo)
+    {   
+        /*if(!empty($req['_flag_delete']) && $req['_flag_delete'] * 1 == 1){
+            $delete_dt = date('Y-m-d H:i:s');
+            $this->query("UPDATE {$x->tableName()} SET deleted_by = {$this->getAuthUser()} , deleted_dt = {$delete_dt} WHERE id = {$req['_delete']}");
+            //$this->addEvent("UPDATE", false, "update core_company record");
+            $this->jok("Updated");
+        }*/
+        /*$img = DB_DataObject::factory('Images');
         $img->ontable = $this->tableName();
         $img->onid = $this->id;
         $img->find();
         while ($img->fetch()) {
             $img->beforeDelete();
             $img->delete();
-        }
+        }*/
         return true;
         
          
@@ -446,7 +465,7 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     {
         $affects  = array();
         
-        $all_links = $GLOBALS['_DB_DATAOBJECT']['LINKS'][$this->_database];
+        $all_links = $this->databaseLinks();
         
         foreach($all_links as $tbl => $links) {
             foreach($links as $col => $totbl_col) {