DataObjects/Events.php

[Pman.Core] / DataObjects / Core_person.php

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index bbe4a17..cdd4fdd 100644 (file)
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -304,8 +304,17 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         if (!empty($ff->Pman['local_autoauth']) && 
             ($ff->Pman['local_autoauth'] === true) &&
             (!empty($_SERVER['SERVER_ADDR'])) &&
-            ($_SERVER['SERVER_ADDR'] == '127.0.0.1') &&
-            ($_SERVER['REMOTE_ADDR'] == '127.0.0.1')  
+            (
+                (
+                    $_SERVER['SERVER_ADDR'] == '127.0.0.1' &&
+                    $_SERVER['REMOTE_ADDR'] == '127.0.0.1'
+                )
+                ||
+                (
+                    $_SERVER['SERVER_ADDR'] == '::1' &&
+                    $_SERVER['REMOTE_ADDR'] == '::1'
+                )
+            )
         ) {
             $group = DB_DataObject::factory('core_group');
             $group->get('name', 'Administrators');
@@ -330,8 +339,17 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         
         if (!empty($ff->Pman['local_autoauth']) && 
             (!empty($_SERVER['SERVER_ADDR'])) &&
-            ($_SERVER['SERVER_ADDR'] == '127.0.0.1') &&
-            ($_SERVER['REMOTE_ADDR'] == '127.0.0.1')  &&
+            (
+                (
+                    $_SERVER['SERVER_ADDR'] == '127.0.0.1' &&
+                    $_SERVER['REMOTE_ADDR'] == '127.0.0.1'
+                )
+                ||
+                (
+                    $_SERVER['SERVER_ADDR'] == '::1' &&
+                    $_SERVER['REMOTE_ADDR'] == '::1'
+                )
+            ) &&
             ($default_admin ||  $u->get('email', $ff->Pman['local_autoauth']))
         ) {
             $_SESSION[get_class($this)][$sesPrefix .'-auth'] = serialize($default_admin ? $default_admin : $u);
@@ -798,6 +816,24 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             
         }
         
+        if(!empty($q['in_group_name'])){
+            
+            $v = $this->escape($q['in_group_name']);
+            
+            $this->whereAdd("
+                $tn_p.id IN (
+                    SELECT 
+                        DISTINCT(user_id) FROM $tn_gm
+                    LEFT JOIN
+                        $tn_g
+                    ON
+                        $tn_g.id = $tn_gm.group_id
+                    WHERE 
+                        $tn_g.name = '{$v}'
+                )"
+            );
+        }
+        
         // #2307 Search Country!!
         if (!empty($q['query']['in_country'])) {
             // DB_DataObject::debugLevel(1);
@@ -1012,7 +1048,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
      * this is called after checkPerm..
      */
     
-    function beforeDelete()
+    function beforeDelete($dependants_array, $roo)
     {
         
         $e = DB_DataObject::Factory('Events');