X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_session.inc;h=0d543e689618ecda8c9549c41e1574e2696dbec5;hb=6e04f2e6bcdfe38a342086628aaa1249fb707047;hp=61154c79e042654eda35423f58a014941acc628c;hpb=c8a847260432e47919811ee23a49e4d9da15c367;p=gosa.git

diff --git a/gosa-core/include/class_session.inc b/gosa-core/include/class_session.inc
index 61154c79e..0d543e689 100644
--- a/gosa-core/include/class_session.inc
+++ b/gosa-core/include/class_session.inc
@@ -1,24 +1,25 @@
 <?php
 /*
-   This code is part of GOsa (https://oss.gonicus.de/labs/gosa/)
-   Copyright (C) 2007 Fabian Hickert
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This code is part of GOsa (http://www.gosa-project.org)
+ * Copyright (C) 2003-2008 GONICUS GmbH
+ *
+ * ID: $$Id$$
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-
 class session {
 
 	public static function get_session_size()
@@ -31,37 +32,135 @@ class session {
 	
 	}
 
+	public static function add_channel($name)
+	{
+		/* If there's already such kind of channel, skip... */
+		if (isset($_SESSION[$name])){
+			return (FALSE);
+		}
+
+		/* Allocate it... */
+		$_SESSION[$name]= array();
+		$_POST["_channel_"]= $name;
+		return (TRUE);
+	}
+
+	public static function remove_channel($name)
+	{
+		/* If there's already such kind of channel, skip... */
+		if (isset($_SESSION[$name])){
+			unset($_SESSION[$name]);
+			if (isset($_POST["_channel_"])){
+				unset($_POST["_channel_"]);
+			}
+			return (TRUE);
+		}
+
+		return (FALSE);
+	}
+
 	public static function is_set($name)
 	{
-		session::log("Checked if element '".$name."' exists. Returned (".isset($_SESSION[$name]).")");
+		$channel= "";
+		if (isset($_POST['_channel_'])){
+			$channel= $_POST['_channel_'];
+		}
+
+		/* Global fallback if not set */
+		if ($channel == ""){
+			return(isset($_SESSION[$name]));
+		}
+
+		/* Sanity check */
+		if (!session::channel_exists($channel)){
+			msg_dialog::display(_("Internal error"), _("Requested channel does not exist! Please contact your Administrator."), FATAL_ERROR_DIALOG);
+		}
+
+		$channel= "gch_".$channel;
+		return(isset($_SESSION[$channel][$name]));
+	}
+
+	public static function global_is_set($name)
+	{
 		return(isset($_SESSION[$name]));
 	}
 
 	public static function set($name,$value)
 	{
-		session::log("Set '".$name."' to '".gettype($value)."'.");
+		$channel= "";
+		if (isset($_POST['_channel_'])){
+			$channel= $_POST['_channel_'];
+		}
+
+		/* Global fallback if not set */
+		if ($channel == ""){
+			$_SESSION[$name] = $value;
+		} else {
+			/* Sanity check */
+			if (!session::channel_exists($channel)){
+				msg_dialog::display(_("Internal error"), _("Requested channel does not exist! Please contact your Administrator."), FATAL_ERROR_DIALOG);
+			}
+			$_SESSION[$channel][$name] = $value;
+		}
+	}
+
+	public static function global_set($name,$value)
+	{
 		$_SESSION[$name] = $value;
 	}
 
 	public static function &get($name)
 	{
-		$ret = FALSE;
-		if(session::is_set($name)){
-			$ret = $_SESSION[$name];
-			session::log("Returned '".gettype($ret)."' for '".$name."'.");
-		}else{
-			session::log("Returned FALSE for '".$name."'. Element wasn't set.");
+		$channel= "";
+		if (isset($_POST['_channel_'])){
+			$channel= $_POST['_channel_'];
 		}
+
+		/* Global fallback if not set */
+		if ($channel == ""){
+			$ret = &$_SESSION[$name];
+			return($ret);
+		}
+
+		/* Sanity check */
+		if (!session::channel_exists($channel)){
+			msg_dialog::display(_("Internal error"), _("Requested channel does not exist! Please contact your Administrator."), FATAL_ERROR_DIALOG);
+		}
+
+		$channel= "gch_".$channel;
+		$ret = &$_SESSION[$channel][$name];
+		return($ret);
+	}
+
+	public static function &global_get($name)
+	{
+		$ret = &$_SESSION[$name];
 		return($ret);
 	}
 
 	public static function delete($name)
 	{
-		if(session::is_set($name)){
+		$channel= "";
+		if (isset($_POST['_channel_'])){
+			$channel= $_POST['_channel_'];
+		}
+
+		/* Global fallback if not set */
+		if ($channel == ""){
+			if(isset($_SESSION[$name])){
+				unset($_SESSION[$name]);
+			}
+		} else {
+			if(isset($_SESSION[$channel][$name])){
+				unset($_SESSION[$channel][$name]);
+			}
+		}
+	}
+
+	public static function global_delete($name)
+	{
+		if($_SESSION[$name]){
 			unset($_SESSION[$name]);
-			session::log("Removed element '".$name."'.");
-		}else{
-			session::log("Tried to remove element '".$name."'. Element wasn't set.");
 		}
 	}
 
@@ -70,6 +169,11 @@ class session {
 		return(session::delete($name));
 	}
 
+	public static function global_un_set($name)
+	{
+		return(session::global_delete($name));
+	}
+
 	public static function start()
 	{
 		/* Set cookie lifetime to one day (The parameter is in seconds ) */
@@ -83,12 +187,28 @@ class session {
 		   the php.ini, so if you use debian, you must hardcode session.gc_maxlifetime in your php.ini */
 		ini_set("session.gc_maxlifetime",24*60*60);
 		session_start();
-		session::log("Session startet");
+
+		/* Check for changed browsers and bail out */
+		if (isset($_SESSION['HTTP_USER_AGENT']))
+		{
+			if ($_SESSION['HTTP_USER_AGENT'] !=  md5($_SERVER['HTTP_USER_AGENT'])) {
+				session_destroy();
+				session_start();
+			}
+		} else {
+			$_SESSION['HTTP_USER_AGENT'] = md5($_SERVER['HTTP_USER_AGENT']);
+		}
+
+		/* Regenerate ID to increase security */
+		if (!isset($_SESSION['started'])){
+			session_regenerate_id();
+			$_SESSION['started'] = true;
+		}
 	}
 
 	public static function destroy()
 	{
-		session_destroy();
+		@session_destroy();
 	}
 
 	public static function set_lifetime($seconds = -1)
@@ -96,16 +216,12 @@ class session {
 		echo "Not implemented yet";
 	}
 
-	private static function log($str)
-	{
-#		echo $str."<br>";
-	}
-
 	public static function &get_all()
 	{
-		session::log("Returned complete session.");
-		return($_SESSION);
+		$ret = &$_SESSION;
+		return($ret);
 	}
 }
 
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>