X-Git-Url: https://dev.renevier.net/?a=blobdiff_plain;f=application%2Fcontrollers%2FAccountController.php;h=c9c986ecba33ff6741ae1526acfb6c5344f892b1;hb=db98e1f62272cff0b425133aa3b909c5cfa6183d;hp=97f9fbc649d6a1250981ec3f502c1f50b7a49d6b;hpb=190fd621df4920c56a422c03663874cddaa67d64;p=syj.git

diff --git a/application/controllers/AccountController.php b/application/controllers/AccountController.php
index 97f9fbc..c9c986e 100644
--- a/application/controllers/AccountController.php
+++ b/application/controllers/AccountController.php
@@ -6,32 +6,20 @@ class AccountController extends Zend_Controller_Action
 {
 
     public function init() {
+        $this->_helper->SyjSession->needsLogin();
+
         $this->view->headScript()->appendFile('js/prototype.js');
-        $this->view->headScript()->appendFile('js/forms.js');
+        $this->view->headScript()->appendFile('js/utils.js');
         $this->view->headScript()->appendFile('js/account.js');
-        $this->view->headLink()->appendStylesheet('css/generic.css');
-        $this->view->headLink()->appendStylesheet('css/account.css');
+        $this->view->headLink()->appendStylesheet('css/generic.css', 'all');
+        $this->view->headLink()->appendStylesheet('css/account.css', 'all');
         $this->view->headTitle($this->view->translate("my account"));
     }
 
     public function indexAction() {
-        $user = $this->view->loggedUser();
+        $user = $this->_helper->SyjSession->user();
         $request = $this->getRequest();
 
-        if ($user === null) {
-            $encodeduri = implode('/', array_map('urlencode', explode('/', $request->getRequestUri())));
-            $loginurl = $this->view->addParamToUrl($this->view->baseUrl() . '/' . 'login', 'redirect', $encodeduri);
-            $translator = Zend_Registry::get('Zend_Translate');
-            $lang = Zend_Controller_Front::getInstance()->getRequest()->getQuery('lang');
-            if ($lang) {
-                $adapter = $translator->getAdapter();
-                if ($adapter->isAvailable($lang)) {
-                    $loginurl = $this->view->addParamToUrl($loginurl, 'lang', $lang);
-                }
-            }
-            $this->_helper->Redirector->gotoURL($loginurl, array('prependBase' => false));
-        }
-
         $form = new Syj_Form_Account(array('name' => 'accountform'));
         $formData = $request->getPost();
 
@@ -80,7 +68,7 @@ class AccountController extends Zend_Controller_Action
 
     protected function _jsLocaleStrings() {
         $this->view->jslocales = array(
-            'notEmptyField' => __("Value is required and can't be empty"),
+            'notEmptyField' => __("Value is required"),
             'passwordNoMatchWarn' => __("Password do not match"),
             'passwordLenghtWarn' => array(__("At least %d characters"), 6),
             'nochangeWarn' => __("You have made no change"),