Version 1.9.16 rc1: Re-enabled logged in feature (#46)

cmllr · Dec 22, 2014 · 6163b31 · 6163b31
1 parent 77f0cbe
commit 6163b31
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/Includes/Kernel/Kernel.Program.class.php b/Includes/Kernel/Kernel.Program.class.php
@@ -66,7 +66,7 @@ class Kernel{
 			* The programs version
 			* Structurized in {1.9.X-codenameorbranch-state}
 			*/
-			public $Version = "1.9.15-Lenticularis-beta2-1";
+			public $Version = "1.9.16-Lenticularis-rc1-0";//"1.9.15-Lenticularis-rc1-0";
 			/**
 			* The programs release date
 			*/

diff --git a/Language/de.lng b/Language/de.lng
@@ -116,6 +116,7 @@ user_create_admin_fail = "Benutzer anlegen fehlgeschlagen.";
 enabled_user = "Benutzer aktiv";
 Source = "Quelle";
 Unstable = "Entwicklungs- oder Vorabversion.";
+RC ="Release Candidate Version"
 Stable = "Herzlichen Gl&uuml;wunsch, Sie benutzen eine stabile Redundancy - Version!";
 Lang = "Sprache";
 Search_Description= "Die Suche findet jede Datei und jedes Verzeichnis, welche den Suchbegriff beinhalten.";

diff --git a/Language/en.lng b/Language/en.lng
@@ -330,7 +330,7 @@ admin_admin = "Administrator";
 
 Unstable = "Development version";
 Stable = "Congratulations, you are using the latest version of Redundancy.";
-
+RC ="Release Candidate Version"
 Files_Name = "Name";
 Files_Uploaded ="Uploaded";
 Files_Size = "Size";

diff --git a/index.php b/index.php
@@ -10,7 +10,7 @@
 ob_start();
 
 //Set the cookies if needed
-//$router->CookieInteraction();
+$router->CookieInteraction();
 ?>
 <!DOCTYPE html>
 

diff --git a/nys/Nys.Router.php b/nys/Nys.Router.php
@@ -49,13 +49,15 @@ public function __construct(){
 		* Interacts with the cookies, creates or deletes them (if needed)
 		*/
 		public function CookieInteraction(){
+			//If the logged in feature is requested, set the cookie
 			if (isset($_SESSION["StayLoggedIn"])){
-				setcookie("SessionData", $_SESSION["Token"]);
-				setcookie("SessionDataLang", $_SESSION["Language"]);
+				setcookie("SessionData", $_SESSION["Token"]);//,time()+5);
+				setcookie("SessionDataLang", $_SESSION["Language"]);//,time()+5);
 				unset($_SESSION["StayLoggedIn"]);
 			}
-
+			//If the session cookie is not empty
 			if (!empty($_COOKIE["SessionData"])){
+				//If any route except logout is requested and the token is empty, fill it with the values from the cookie
 				if(!isset($_GET["logout"])){
 					//only set the token if it is not saved already.
 					if (!isset($_SESSION["Token"]) ||empty($_SESSION["Token"])){
@@ -64,6 +66,7 @@ public function CookieInteraction(){
 					}					
 				}
 				else{
+					//If logout is requested, kill the cookie (SESSION will be killed in Controller)
 					unset($_COOKIE["SessionData"]);
 					unset($_COOKIE["SessionDataLang"]);
 					// empty value and expiration one hour before

diff --git a/nys/Views/Info.php b/nys/Views/Info.php
@@ -34,9 +34,11 @@
 		<td>
 			<?php 
 				if (strpos($version,"eol") !== false)
-					echo "<span class=\"label label-danger\">".$GLOBALS["Language"]->EOL."</span>";
-				else if (strpos($version,"dev") !== false || strpos($version,"beta") !== false)
+					echo "<span  class=\"label label-danger\">".$GLOBALS["Language"]->EOL."</span>";
+				else  if (strpos($version,"beta") !== false)
 					echo "<span class=\"label label-warning\">".$GLOBALS["Language"]->Unstable."</span>";
+				else if (strpos($version,"rc") !== false)
+					echo "<span class=\"label label-warning\">".$GLOBALS["Language"]->RC."</span>";
 				else
 					echo "<span class=\"label label-success\">".$GLOBALS["Language"]->Stable."</span>";
 			?>

diff --git a/nys/Views/StartPage.php b/nys/Views/StartPage.php
@@ -9,8 +9,10 @@
 <?php 
 	if (strpos($version,"eol") !== false)
 		echo "<span  class=\"label label-danger\">".$GLOBALS["Language"]->EOL."</span>";
-	else if (strpos($version,"dev") !== false || strpos($version,"beta") !== false)
+	else  if (strpos($version,"beta") !== false)
 		echo "<span class=\"label label-warning\">".$GLOBALS["Language"]->Unstable."</span>";
+	else if (strpos($version,"rc") !== false)
+		echo "<span class=\"label label-warning\">".$GLOBALS["Language"]->RC."</span>";
 	else
 		echo "<span class=\"label label-success\">".$GLOBALS["Language"]->Stable."</span>";