X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_group.php;h=613a77d07a69dedf225aab179d9e214e172ade47;hp=e57c10e4d4d1753e4f0cbd280cf5626c8aa5d45c;hb=HEAD;hpb=521df1ea8b12c1e00aeb9481cdda8823a7b667c5

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index e57c10e4..54f83f55 100644
--- a/DataObjects/Core_group.php
+++ b/DataObjects/Core_group.php
@@ -40,10 +40,15 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
     // group types??
     function applyFilters($q, $au, $roo)
     {
+
         if (!empty($q['query']['name_starts'])) {
             $v = $this->escape($q['query']['name_starts']);
             $this->whereAdd("{$this->tableName()}.name like '{$v}%'");
         }
+        if (!empty($q['query']['name_contains'])) {
+            $v = $this->escape($q['query']['name_contains']);
+            $this->whereAdd("{$this->tableName()}.name like '%{$v}%'");
+        }
         
         if(!empty($q['_count_member_by_name'])){
             
@@ -53,27 +58,42 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
                 $roo->jok($core_group->memberCount());
             }
         }
-        echo "sql checking:"."\n";
-        DB_DataObject::debugLevel(5);
         
-        /*$cgmDBObj = DB_DataObject::Factory('core_group_member');
-        $cpObj = DB_DataObject::Factory('core_person');
+        if(!empty($q['_is_in_group'])){
+            $this->selectAdd("
+                COALESCE((
+                    SELECT 
+                            COUNT(id) 
+                    FROM 
+                            core_group_member
+                        WHERE 
+                            user_id = {$q['_is_in_group']}
+                        AND
+                            group_id = {$this->tableName()}.id
+                    ), 0) AS is_in_group
+            ");
+        }
+        
+        
+        $cp = DB_DataObject::Factory('core_person')->tableName();
         $cgm = DB_DataObject::Factory('core_group_member')->tableName();
-        $cpObj->active = 1; // set the where condition with active = 1*/
+        
         $this->selectAdd("
            (
-            SELECT 
-                count(user_id) 
-            FROM 
-                {$cgm}
-            WHERE 
-                {$this->tableName()}.id = {$cgm}.group_id
-            ) 
-            AS group_member_count            
+            SELECT COUNT({$cgm}.user_id) 
+                FROM 
+                    {$cgm}
+                LEFT JOIN
+                    {$cp}
+                ON
+                    {$cp}.id = {$cgm}.user_id
+                WHERE
+                    {$cgm}.group_id = {$this->tableName()}.id
+                AND
+                    {$cp}.active = 1
+                ) AS group_member_count            
         ");
-        /*$cgmDBObj->joinAdd($cpObj);
-        $this->joinAdd($cgmDBObj);
-        DB_DataObject::debugLevel();*/
+        
     }
 
     function toEventString() {
@@ -89,13 +109,18 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
                 $roo->jerr("missing group id");
 
             }
-             foreach(explode(',', $q['user_ids']) as $uid) {
+            
+            $user_ids = explode(',', $q['user_ids']);
+            
+            foreach($user_ids as $uid) {
+                
                 switch($q['_action']) {
                     case 'add':
                         $g->addMember($uid,$roo);
                         break;
                     case 'sub':
-                        $g->removeMember($uid);
+                        
+                        $g->removeMember($uid, $roo);
                         break;
                     default:
                         $roo->jerr('invalid action');
@@ -104,8 +129,18 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
             $roo->jok('updated');
 
         }
+        if (isset($q['display_name']) && !isset($q['name']) && !$this->is_system) {
+            $this->name = $q['display_name'];
+        }
 
     }
+    
+    function beforeUpdate($old, $q,$roo)
+    {
+        if (isset($q['display_name']) && empty($q['name']) && !$this->is_system) {
+            $this->name = $q['display_name'];
+        }
+    }
 
 
     function beforeDelete()
@@ -190,17 +225,22 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
         $gm = DB_Dataobject::factory('core_group_member');
         $gm->group_id = $this->id;
         $gm->user_id = is_object($person) ? $person->id : $person;
+        
         if (!$gm->count()) {
             $gm->insert();
         }
     }
 
-    function removeMember($person)
+    function removeMember($person, $roo)
     {
         $gm = DB_Dataobject::factory('core_group_member');
         $gm->group_id = $this->id;
         $gm->user_id = is_object($person) ? $person->id : $person;
-
+        $au = $roo->getAuthUser();
+        if ($gm->group()->name == 'Administrators' && $gm->user_id = $au->id) {
+            $roo->jerr("You can not remove yourself from the admin group");
+        }
+        
         if ($gm->find(true)) {
             $gm->delete();
         }
@@ -306,11 +346,24 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
 
         foreach($data as $gi) {
             $g = DB_DataObject::factory($this->tableName());
+            
+            $o = false;
+            
+            if($g->get('name', $gi['name'])){
+                $o = clone($g);
+            }
+            
+            $display_name = (isset($gi['display_name'])) ? $gi['display_name'] : '';
+            
+            unset($gi['display_name']);
+            
             $g->setFrom($gi);
-
-            if(!$g->find(true)){
-                $g->insert();
+            
+            if(empty($o) || empty($o->display_name)){
+                $g->display_name = $display_name;
             }
+            
+            (empty($o)) ? $g->insert() : $g->update($o);
 
             if(count($g->members()) || empty($gi['members'])){
                 continue;