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

diff --git a/application/controllers/NewpwdController.php b/application/controllers/NewpwdController.php
index 1a4ab07..25a3862 100644
--- a/application/controllers/NewpwdController.php
+++ b/application/controllers/NewpwdController.php
@@ -1,15 +1,14 @@
 <?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
 {
 
     public function init() {
-        $this->view->headScript()->appendFile('js/prototype.js');
-        $this->view->headScript()->appendFile('js/newpwd.js');
-        $this->view->headScript()->appendFile('js/utils.js');
+        $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');
     }
 
@@ -25,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');
@@ -45,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();
             }
@@ -66,7 +65,7 @@ class NewpwdController extends Zend_Controller_Action
 
     protected function _jsLocaleStrings() {
         $this->view->jslocales = array(
-            'notEmptyField' => __("Value is required and can't be empty"),
+            'notEmptyField' => __("Value is required"),
             );
     }
 }