X-Git-Url: https://dev.renevier.net/?a=blobdiff_plain;f=application%2Fcontrollers%2FNewpwdController.php;h=25a386217298c01bdbd63c7fcb84c7bb3fe921de;hb=0722c496ca63f30937427e3bf8fbdd5cfee2c83d;hp=dc9ff5d46a11d263bcb5e80ada45d94c8989b06e;hpb=d6940ce6e0ae4424d32efd66edc743d337dc3cf8;p=syj.git

diff --git a/application/controllers/NewpwdController.php b/application/controllers/NewpwdController.php
index dc9ff5d..25a3862 100644
--- a/application/controllers/NewpwdController.php
+++ b/application/controllers/NewpwdController.php
@@ -1,5 +1,5 @@
 <?php
-/*  This file is part of Syj, Copyright (c) 2010 Arnaud Renevier,
+/*  This file is part of Syj, Copyright (c) 2010-2011 Arnaud Renevier,
     and is published under the AGPL license. */
 
 class NewpwdController extends Zend_Controller_Action
@@ -8,6 +8,7 @@ class NewpwdController extends Zend_Controller_Action
     public function init() {
         $this->_helper->SyjMedias->addScripts('newpwd');
         $this->view->headLink()->appendStylesheet('css/generic.css', 'all');
+        $this->view->headLink()->appendStylesheet('css/form.css', 'all');
         $this->view->headLink()->appendStylesheet('css/newpwd.css', 'all');
     }
 
@@ -23,7 +24,7 @@ class NewpwdController extends Zend_Controller_Action
         }
 
         if (empty($formData)) {
-            $loggeduser = $this->_helper->SyjSession->user();
+            $loggeduser = $this->_helper->SyjUserManager->current();
             if ($loggeduser) {
                 $form->newpwd_email->setValue($loggeduser->email)
                                     ->setAttrib('readonly', 'true');
@@ -43,7 +44,7 @@ class NewpwdController extends Zend_Controller_Action
         $user = new Syj_Model_User();
         if ($userMapper->findByEmail($formData['newpwd_email'], $user)) {
             // if no user exist with posted email, pretend everything went correct
-            $loggeduser = isset($loggeduser) ? $loggeduser: $this->_helper->SyjSession->user();
+            $loggeduser = isset($loggeduser) ? $loggeduser: $this->_helper->SyjUserManager->current();
             if ($loggeduser and ($loggeduser != $user)) {
                 throw new Syj_Exception_Request();
             }