X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_person.php;h=a31a60a6704cad556aa74db1a011360278ec7837;hb=14bff917b1d1497e8934dc0ed125ed7bb9a87176;hp=8dcbedfcd07e0c7407e1154aa7a077bff2d36654;hpb=6bc9c02235f634a873bac158f8e627c6bfe21bc0;p=Pman.Core diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php index 8dcbedfc..a31a60a6 100644 --- a/DataObjects/Core_person.php +++ b/DataObjects/Core_person.php @@ -327,7 +327,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject } - if (empty($_SERVER['PATH_INFO']) || $_SERVER['PATH_INFO'] == '/Login') { + if (empty($_SERVER['PATH_INFO']) || preg_match('#^(/Login$|/PasswordReset)#', $_SERVER['PATH_INFO'])) { $auto_auth_allow = false; } //var_dump($auto_auth_allow); @@ -1494,15 +1494,16 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject static function test_ADMIN_PASSWORD_RESET($pg, $to) { + $ff = HTML_FlexyFramework::get(); + $person = DB_DataObject::Factory('core_person'); + $person->id = -1; - - $content = array( + return array( + 'HTTP_HOST' => $_SERVER['SERVER_NAME'], 'person' => $person, - 'user_data' => (object) array( - 'in_firstname' => $to->name - ), - 'baseURL' => $ff->baseURL, - 'serverName' => $_SERVER['SERVER_NAME'], + 'authFrom' => 'FAKE_LINK', + 'authKey' => 'FAKE_KEY', + 'rcpts' => $to->email, );