From bbd913e6e6c3e46edd41af511192c9096e45fd97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@anarcat.ath.cx>
Date: Wed, 26 Apr 2006 22:13:55 +0000
Subject: [PATCH] completely revert [1025] since we rely on apache config to
 enable/disable ssl/non-ssl now

---
 bureau/class/config.php    | 10 +---------
 install/upgrades/0.9.5.sql |  3 ---
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/bureau/class/config.php b/bureau/class/config.php
index 21be9594..0bb36d6b 100644
--- a/bureau/class/config.php
+++ b/bureau/class/config.php
@@ -37,7 +37,7 @@
   et mettez votre ip dans le IF pour que seule votre ip puisse accéder au bureau : 
 */
 
-/* // Uncomment the following lines and put your IP between the "" to put the dekstop in maintenance mode : 
+/*
 if (getenv("REMOTE_ADDR")!="81.56.98.108") {
   echo "Le bureau AlternC est en vacances jusqu'a minuit pour maintenance.<br>
 Merci de revenir plus tard.";
@@ -45,8 +45,6 @@ Merci de revenir plus tard.";
 }
 */
 
-
-
 // 1. Get a semaphore id for the alternc magic number (18577)
 $alternc_sem = sem_get ( 18577 );
 // 2. Declare the shutdown function, that release the semaphore
@@ -106,12 +104,6 @@ $db= new DB_system();
 // Current User ID = the user whose commands are made on behalf of.
 $cuid=0;
 
-if (!$_SERVER["HTTPS"]) {
-  $conf=variable_init();
-  if ($conf["force_https"]) {
-    header("Location: https://".$_SERVER["HTTP_HOST"].$_SERVER["REQUEST_URI"]);
-  }
-}
 
 $classes=array();
 /* CLASSES PHP4 : automatic include : */
diff --git a/install/upgrades/0.9.5.sql b/install/upgrades/0.9.5.sql
index 8606e34b..b2093b1e 100644
--- a/install/upgrades/0.9.5.sql
+++ b/install/upgrades/0.9.5.sql
@@ -7,9 +7,6 @@ ALTER IGNORE TABLE membres ADD COLUMN duration int(4) default NULL AFTER renewed
 ALTER IGNORE TABLE ftpusers ADD COLUMN encrypted_password VARCHAR(32) default NULL AFTER password;
 UPDATE ftpusers SET encrypted_password=ENCRYPT(password) WHERE password!='';
 
--- Force le bureau https si voulu : 
-INSERT INTO variable SET name='force_https', value='0', comment='Shall we force the users to access the managment desktop through HTTPS only ? If this value is true, HTTPS access will be forced. ';
-
 -- --------------------------------------------------------
 -- TABLES de mémorisation de la taille des dossiers web/mail/db