From 13b165fd88ced38c4ba9d1053745975abdffb11c Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Wed, 8 Jul 2009 18:03:28 +0000
Subject: [PATCH] support memcache

---
 lam/HISTORY                          |  1 +
 lam/lib/security.inc                 |  6 ++--
 lam/templates/config/conflogin.php   |  4 ++-
 lam/templates/config/confmain.php    | 46 +++++++++++++++++++++++++++-
 lam/templates/config/confmodules.php |  4 ++-
 lam/templates/config/conftypes.php   |  4 ++-
 lam/templates/config/index.php       |  4 ++-
 lam/templates/config/mainlogin.php   |  4 ++-
 lam/templates/config/mainmanage.php  |  4 ++-
 lam/templates/config/profmanage.php  |  4 ++-
 lam/templates/help.php               |  4 ++-
 lam/templates/login.php              |  5 ++-
 12 files changed, 78 insertions(+), 12 deletions(-)

diff --git a/lam/HISTORY b/lam/HISTORY
index a76ec3b6..c262c7b5 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -5,6 +5,7 @@ July 2009 2.7.0
   - DHCP: added description field and reordered fixed IP input fields
   - fixed bugs:
     * added additional check for creating home directories (2798489)
+		* support memcache for session storage (2811505)
 
 
 08.04.2009 2.6.0
diff --git a/lam/lib/security.inc b/lam/lib/security.inc
index bcdd1fb9..7ef600c0 100644
--- a/lam/lib/security.inc
+++ b/lam/lib/security.inc
@@ -43,8 +43,10 @@ checkClientIP();
 function startSecureSession() {
 	// start session
 	if (isset($_SESSION)) unset($_SESSION);
-	$sessionDir = substr(__FILE__, 0, strlen(__FILE__) - 17) . "/sess";
-	session_save_path($sessionDir);
+	if (strtolower(session_module_name()) == 'files') {
+		$sessionDir = substr(__FILE__, 0, strlen(__FILE__) - 17) . "/sess";
+		session_save_path($sessionDir);
+	}
 	@session_start();
 	// check session id
 	if (! isset($_SESSION["sec_session_id"]) || ($_SESSION["sec_session_id"] != session_id())) {
diff --git a/lam/templates/config/conflogin.php b/lam/templates/config/conflogin.php
index 85b75cf2..da1a34cf 100644
--- a/lam/templates/config/conflogin.php
+++ b/lam/templates/config/conflogin.php
@@ -36,7 +36,9 @@ include_once('../../lib/config.inc');
 include_once('../../lib/status.inc');
 
 // start session
-session_save_path("../../sess");
+if (strtolower(session_module_name()) == 'files') {
+	session_save_path("../../sess");
+}
 @session_start();
 
 setlanguage();
diff --git a/lam/templates/config/confmain.php b/lam/templates/config/confmain.php
index f09d8371..1a69f2a9 100644
--- a/lam/templates/config/confmain.php
+++ b/lam/templates/config/confmain.php
@@ -38,7 +38,9 @@ include_once("../../lib/config.inc");
 include_once("../../lib/modules.inc");
 
 // start session
-session_save_path("../../sess");
+if (strtolower(session_module_name()) == 'files') {
+	session_save_path("../../sess");
+}
 @session_start();
 
 setlanguage();
@@ -142,7 +144,48 @@ if (isset($_SESSION['conf_errors'])) {
 
 // display formular
 echo ("<form action=\"confmain.php\" method=\"post\">\n");
+echo "<table border=0 width=\"100%\" style=\"border-collapse: collapse;\">\n";
+echo "<tr valign=\"top\"><td style=\"border-bottom: 1px solid;padding:0px;\" colspan=2>";
+// show tabs
+echo "<table width=\"100%\" border=0 style=\"border-collapse: collapse;\">";
+echo "<tr>\n";
+	$buttonWidth = 15;
+	$buttonSpace = '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+	// general settings
+	echo "<td width=\"$buttonWidth\" style=\"padding-bottom:0px;padding-right:5px;padding-left:5px;padding-top:10px;\">\n";
+	echo "<table class=\"settingsTab\" width=\"100%\">\n";
+	echo "<tr><td class=\"settingsActiveTab\" onclick=\"document.getElementsByName('generalSettingsButton')[0].click();\"";
+	echo " align=\"center\">\n";
+	$buttonStyle = 'background-image: url(../../graphics/modules.png);width:' . $buttonWidth . 'em;';
+	echo "<input style=\"" . $buttonStyle . "\" name=\"generalSettingsButton\" type=\"submit\" value=\"" . $buttonSpace . _('General settings') . "\"";
+	echo ">\n";
+	echo "</td></tr></table>\n";
+	echo '</td>';
+	// account types
+	echo "<td width=\"$buttonWidth\" style=\"padding-bottom:0px;padding-right:5px;padding-left:5px;padding-top:10px;\">\n";
+	echo "<table class=\"settingsTab\" width=\"100%\">\n";
+	echo "<tr><td onclick=\"document.getElementsByName('accountTypesButton')[0].click();\"";
+	echo " align=\"center\">\n";
+	$buttonStyle = 'background-image: url(../../graphics/modules.png);width:' . $buttonWidth . 'em;';
+	echo "<input style=\"" . $buttonStyle . "\" name=\"accountTypesButton\" type=\"submit\" value=\"" . $buttonSpace . _('Account types') . "\"";
+	echo ">\n";
+	echo "</td></tr></table>\n";
+	echo '</td>';
+	// module selection
+	echo "<td width=\"$buttonWidth\" style=\"padding-bottom:0px;padding-right:5px;padding-left:5px;padding-top:10px;\">\n";
+	echo "<table class=\"settingsTab\" width=\"100%\">\n";
+	echo "<tr><td onclick=\"document.getElementsByName('modulesButton')[0].click();\"";
+	echo " align=\"center\">\n";
+	$buttonStyle = 'background-image: url(../../graphics/modules.png);width:' . $buttonWidth . 'em;';
+	echo "<input style=\"" . $buttonStyle . "\" name=\"modulesButton\" type=\"submit\" value=\"" . $buttonSpace . _('Modules') . "\"";
+	echo ">\n";
+	echo "</td></tr></table>\n";
+	echo '</td>';
+	echo "<td width=\"100%\">&nbsp;</td></tr></table>\n";		
+// end tabs
+echo "</td></tr>\n";
 
+echo "<tr><td><br><br>\n";
 echo ("<fieldset><legend><img align=\"middle\" src=\"../../graphics/profiles.png\" alt=\"profiles.png\"> <b>" . _("Server settings") . "</b></legend><br>\n");
 echo ("<table border=0>");
 // serverURL
@@ -503,6 +546,7 @@ echo ("<p>&nbsp;</p>");
 
 echo ("<p>* = ". _("required") . "</p>");
 
+echo '</td></tr></table>';
 echo ("</form>\n");
 echo ("</body>\n");
 echo ("</html>\n");
diff --git a/lam/templates/config/confmodules.php b/lam/templates/config/confmodules.php
index b69a4bce..53bf6e09 100644
--- a/lam/templates/config/confmodules.php
+++ b/lam/templates/config/confmodules.php
@@ -36,7 +36,9 @@ include_once('../../lib/config.inc');
 include_once('../../lib/modules.inc');
 
 // start session
-session_save_path("../../sess");
+if (strtolower(session_module_name()) == 'files') {
+	session_save_path("../../sess");
+}
 @session_start();
 
 setlanguage();
diff --git a/lam/templates/config/conftypes.php b/lam/templates/config/conftypes.php
index d479cbed..cd3659ca 100644
--- a/lam/templates/config/conftypes.php
+++ b/lam/templates/config/conftypes.php
@@ -36,7 +36,9 @@ include_once('../../lib/config.inc');
 include_once('../../lib/types.inc');
 
 // start session
-session_save_path("../../sess");
+if (strtolower(session_module_name()) == 'files') {
+	session_save_path("../../sess");
+}
 @session_start();
 
 setlanguage();
diff --git a/lam/templates/config/index.php b/lam/templates/config/index.php
index 97a5a219..a2662dff 100644
--- a/lam/templates/config/index.php
+++ b/lam/templates/config/index.php
@@ -34,7 +34,9 @@ $Id$
 include_once('../../lib/config.inc');
 
 // start session
-session_save_path("../../sess");
+if (strtolower(session_module_name()) == 'files') {
+	session_save_path("../../sess");
+}
 @session_start();
 
 setlanguage();
diff --git a/lam/templates/config/mainlogin.php b/lam/templates/config/mainlogin.php
index 938e43c1..a6745ed7 100644
--- a/lam/templates/config/mainlogin.php
+++ b/lam/templates/config/mainlogin.php
@@ -36,7 +36,9 @@ include_once('../../lib/config.inc');
 include_once('../../lib/status.inc');
 
 // start session
-session_save_path("../../sess");
+if (strtolower(session_module_name()) == 'files') {
+	session_save_path("../../sess");
+}
 @session_start();
 
 setlanguage();
diff --git a/lam/templates/config/mainmanage.php b/lam/templates/config/mainmanage.php
index af56d874..0eda9c91 100644
--- a/lam/templates/config/mainmanage.php
+++ b/lam/templates/config/mainmanage.php
@@ -36,7 +36,9 @@ include_once('../../lib/config.inc');
 include_once('../../lib/status.inc');
 
 // start session
-session_save_path("../../sess");
+if (strtolower(session_module_name()) == 'files') {
+	session_save_path("../../sess");
+}
 @session_start();
 
 setlanguage();
diff --git a/lam/templates/config/profmanage.php b/lam/templates/config/profmanage.php
index 2d1f3745..83ccdbb6 100644
--- a/lam/templates/config/profmanage.php
+++ b/lam/templates/config/profmanage.php
@@ -36,7 +36,9 @@ include_once('../../lib/config.inc');
 include_once('../../lib/status.inc');
 
 // start session
-session_save_path("../../sess");
+if (strtolower(session_module_name()) == 'files') {
+	session_save_path("../../sess");
+}
 @session_start();
 
 setlanguage();
diff --git a/lam/templates/help.php b/lam/templates/help.php
index 2c4169f9..2cc163e6 100644
--- a/lam/templates/help.php
+++ b/lam/templates/help.php
@@ -38,7 +38,9 @@ include_once("../lib/ldap.inc");
 /** configuration */
 include_once("../lib/config.inc");
 
-session_save_path("../sess");
+if (strtolower(session_module_name()) == 'files') {
+	session_save_path("../sess");
+}
 @session_start();
 
 /** status messages */
diff --git a/lam/templates/login.php b/lam/templates/login.php
index d117c1f6..9a17f453 100644
--- a/lam/templates/login.php
+++ b/lam/templates/login.php
@@ -112,7 +112,10 @@ if (sizeof($criticalErrors) > 0) {
 /** access to configuration options */
 include_once("../lib/config.inc"); // Include config.inc which provides Config class
 
-session_save_path("../sess"); // Set session save path
+// set session save path
+if (strtolower(session_module_name()) == 'files') {
+	session_save_path("../sess");
+}
 session_start(); // Start LDAP Account Manager session
 
 // save last selected login profile