From 1854075a62c6ca0422040b4e5ebf89088b0d02b2 Mon Sep 17 00:00:00 2001
From: Antonio Gallo <tonicucoz@gmail.com>
Date: Tue, 15 Feb 2011 00:32:19 +0000
Subject: added wiki - part 1

---
 .../Application/Controllers/GenericController.php   | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'h-source/Application/Controllers/GenericController.php')

diff --git a/h-source/Application/Controllers/GenericController.php b/h-source/Application/Controllers/GenericController.php
index 49685f3..884f915 100644
--- a/h-source/Application/Controllers/GenericController.php
+++ b/h-source/Application/Controllers/GenericController.php
@@ -117,7 +117,7 @@ class GenericController extends BaseController
 		}
 		else
 		{
-			$this->redirect('users/login/'.$this->lang.'/'.$this->controller.'/catalogue',0);
+			$this->redirect("users/login/".$this->lang."?redirect=".$this->controller."/catalogue/".$this->lang,0);
 		}
 	}
 	
@@ -252,7 +252,7 @@ class GenericController extends BaseController
 			}
 			else
 			{
-				$this->redirect('users/login/'.$this->lang.'/'.$this->controller.'/view/'.$clean['id_hard'],0);
+				$this->redirect("users/login/".$this->lang."?redirect=".$this->controller."/view/".$this->lang."/".$clean['id_hard'],0);
 			}
 		}
 		else
@@ -468,6 +468,7 @@ class GenericController extends BaseController
 		$data['ne_name'] = null;
 		$data['tree'] = null;
 		$data['isDeleted'] = 'no';
+		$data['title'] = 'revision - '.Website::$generalName;
 		
 		if (count($data['table']) > 0)
 		{
@@ -476,8 +477,6 @@ class GenericController extends BaseController
 			$data['name'] = encodeUrl($data['ne_name']);
 			$data['tree'] = $this->getSpecHardLink() . " &raquo;  " . $this->getViewLink($data['id_hard'],$data['ne_name'])." &raquo; " . $this->getHistoryLink($data['id_hard']) . " &raquo; <span class='last_tree_element'>revision</span>";
 			
-			$data['title'] = 'revision - '.Website::$generalName;
-			
 			$data['updated_by'] = $data['table'][0]['revisions']['updated_by'];
 			$data['update_date'] = $data['table'][0]['revisions']['update_date'];
 		}
@@ -611,7 +610,7 @@ class GenericController extends BaseController
 			}
 			else
 			{
-				$this->redirect('users/login/'.$this->lang.'/'.$this->controller.'/view/'.$clean['id_hard'],0);
+				$this->redirect("users/login/".$this->lang."?redirect=".$this->controller."/view/".$this->lang."/".$clean['id_hard'],0);
 			}
 		}
 	}
@@ -675,4 +674,16 @@ class GenericController extends BaseController
 		return "<a href='".$this->baseUrl.'/'.$this->controller.'/catalogue/'.$this->lang.$this->viewStatus."'>".$this->controller."</a>";
 	}
 
+	protected function goToLoginForm()
+	{
+		if ($this->querySanitized)
+		{
+			$this->redirect("users/login/".$this->lang."?redirect=".$this->controller."/".$this->action.Url::createUrl($this->_queryString));
+		}
+		else
+		{
+			$this->redirect("users/login/".$this->lang."?redirect=home/index".Url::createUrl($this->_queryString));
+		}
+	}
+
 }
\ No newline at end of file
-- 
cgit v1.2.3