DataObjects/Core_group_member.php

[Pman.Core] / DataObjects / Person.php

diff --git a/DataObjects/Person.php b/DataObjects/Person.php
index ee4e10f..d2c61b0 100644 (file)
--- a/DataObjects/Person.php
+++ b/DataObjects/Person.php
@@ -274,8 +274,26 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
             }
             
             unset($_SESSION[get_class($this)][$sesPrefix .'-auth']);
+            unset($_SESSION[get_class($this)][$sesPrefix .'-timeout']);
+            setcookie('Pman.timeout', -1, time() + (30*60), '/');
             
         }
+        
+        // http basic auth..
+        $u = DB_DataObject::factory($this->tableName());
+        
+        if (!empty($_SERVER['PHP_AUTH_USER']) 
+            &&
+            !empty($_SERVER['PHP_AUTH_PW'])
+            &&
+            $u->get('email', $_SERVER['PHP_AUTH_USER'])
+            &&
+            $u->checkPassword($_SERVER['PHP_AUTH_PW'])
+           ) {
+            $_SESSION[get_class($this)][$sesPrefix .'-auth'] = serialize($u);
+            return true; 
+        }
+        
         if (!$this->canInitializeSystem()) {
             return false;
         }
@@ -309,6 +327,7 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
         //var_dump($ff->Pman['local_autoauth']);         var_dump($_SERVER); exit;
         $u = DB_DataObject::factory($this->tableName());
         $ff = HTML_FlexyFramework::get();
+        
         if (!empty($ff->Pman['local_autoauth']) && 
             (!empty($_SERVER['SERVER_ADDR'])) &&
             ($_SERVER['SERVER_ADDR'] == '127.0.0.1') &&
@@ -318,21 +337,7 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
             $_SESSION[get_class($this)][$sesPrefix .'-auth'] = serialize($default_admin ? $default_admin : $u);
             return true;
         }
-           
-        // http basic auth..
-        $u = DB_DataObject::factory($this->tableName());
-
-        if (!empty($_SERVER['PHP_AUTH_USER']) 
-            &&
-            !empty($_SERVER['PHP_AUTH_PW'])
-            &&
-            $u->get('email', $_SERVER['PHP_AUTH_USER'])
-            &&
-            $u->checkPassword($_SERVER['PHP_AUTH_PW'])
-           ) {
-            $_SESSION[get_class($this)][$sesPrefix .'-auth'] = serialize($u);
-            return true; 
-        }
+        
         //var_dump(session_id());
         //var_dump($_SESSION[__CLASS__]);
         
@@ -385,7 +390,6 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
                 setcookie('Pman.timeout', time() + (30*60), time() + (30*60), '/');
                 
                 $user = clone ($u);
-                
                 return clone($user);
             
             }
@@ -517,10 +521,10 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
        
     }      
     
-    function generatePassword() // genearte a password (add set 'rawPasswd' to it's value)
+    function generatePassword($length = 5) // genearte a password (add set 'rawPasswd' to it's value)
     {
         require_once 'Text/Password.php';
-        $this->rawPasswd = strtr(ucfirst(Text_Password::create(5)).ucfirst(Text_Password::create(5)), array(
+        $this->rawPasswd = strtr(ucfirst(Text_Password::create($length)).ucfirst(Text_Password::create($length)), array(
         "a"=>"4", "e"=>"3",  "i"=>"1",  "o"=>"0", "s"=>"5",  "t"=>"7"));
         $this->setPassword($this->rawPasswd);
         return $this->rawPasswd;
@@ -689,6 +693,7 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
         if (!isset($pcache[$this->id])) {
             $pcache[$this->id] = $this->getPerms();
         }
+        
        // echo "<PRE>";print_r($pcache[$au->id]);
        // var_dump($pcache[$au->id]);
         if (empty($pcache[$this->id][$name])) {
@@ -852,6 +857,11 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
                 {$this->tableName()}.name LIKE '%{$this->escape($q['query']['name'])}%'
             ");
         }
+         if(!empty($q['query']['name_starts'])){
+            $this->whereAdd("
+                {$this->tableName()}.name LIKE '{$this->escape($q['query']['name_starts'])}%'
+            ");
+        }
         
         if (!empty($q['query']['search'])) {