cache js, css and png files

[syj.git] / application / controllers / NewpwdController.php

diff --git a/application/controllers/NewpwdController.php b/application/controllers/NewpwdController.php
index 329b4e9cc23a14a4ab650b512024e8e4995232d7..17b16cae391391837a8615bbdbae5eedccf5aab2 100644 (file)
--- a/application/controllers/NewpwdController.php
+++ b/application/controllers/NewpwdController.php
@@ -7,9 +7,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');
+        $this->_helper->SyjMedias->addStyleSheets('newpwd');
     }
 
     public function indexAction() {
@@ -24,7 +22,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');
@@ -44,7 +42,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();
             }