From 9595d8b7134bd616b9326d24ee245bfacd106354 Mon Sep 17 00:00:00 2001
From: arno <arno@renevier.net>
Date: Thu, 14 Apr 2011 11:46:48 +0200
Subject: [PATCH] fixes: my account links did not appear after login from a
 path url

---
 application/controllers/LoginController.php |  2 +-
 application/layouts/scripts/footer.phtml    | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/application/controllers/LoginController.php b/application/controllers/LoginController.php
index 4c8aca0..490ca67 100644
--- a/application/controllers/LoginController.php
+++ b/application/controllers/LoginController.php
@@ -56,7 +56,7 @@ class LoginController extends Zend_Controller_Action
                 if (!$pathMapper->find((int)$login_geom_id, $path)) {
                     throw new Syj_Exception_Request();
                 }
-                $data['iscreator'] = ($path->creator->id === $userid);
+                $data['iscreator'] = ($path->creator->id === $user->id);
             } else {
                 $data['iscreator'] = true;
             }
diff --git a/application/layouts/scripts/footer.phtml b/application/layouts/scripts/footer.phtml
index fa0450b..c2b90b6 100644
--- a/application/layouts/scripts/footer.phtml
+++ b/application/layouts/scripts/footer.phtml
@@ -10,11 +10,8 @@ echo '<div id="footer-padding"></div>' . PHP_EOL;
 
 $front = Zend_Controller_Front::getInstance();
 $reqParams = $front->getRequest()->getParams();
-if ($reqParams['controller'] == 'idx' and (!isset($reqParams['url']))) {
-    $mainpage = true;
-} else {
-    $mainpage = false;
-}
+
+$mainpage = ($reqParams['controller'] === 'idx') and (!isset($reqParams['url']));
 
 $content = $this->translate("create a route");
 $link = ($mainpage) ? $this->escape($content) : $this->anchor($this->baseUrl(), $content, array('class' => 'footer-anchor'));
@@ -33,7 +30,7 @@ echo $this->footerLink(array(
 /*
  * account link
  */
-if ($mainpage or $this->loggedUser) {
+if ($this->loginform or $this->loggedUser) {
     echo $this->footerLink(array(
             'route' => 'account',
             'action'     => 'index',
@@ -47,7 +44,7 @@ if ($mainpage or $this->loggedUser) {
 /*
  * list link
  */
-if ($mainpage or $this->loggedUser) {
+if ($this->loginform or $this->loggedUser) {
     echo $this->footerLink(array(
             'route' => 'list',
             'action'     => 'index',
@@ -59,7 +56,7 @@ if ($mainpage or $this->loggedUser) {
 /*
  * login or logout links
  */
-if (!$mainpage) {
+if (!$this->loginform) {
     if ($this->loggedUser) {
 
         echo $this->footerLink(array(
-- 
2.39.2