From 5cc7f2219f3a0268e7bcb6d621b50a97918ea5a0 Mon Sep 17 00:00:00 2001
From: Michael Neves
Date: Mon, 25 Jun 2012 17:59:25 +0200
Subject: https check in ipxe

---
 application/modules/ipxe/controllers/AuthController.php     | 11 +++++------
 application/modules/ipxe/controllers/ResourceController.php |  9 ++++-----
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php
index ba10e5c..5b2de3a 100644
--- a/application/modules/ipxe/controllers/AuthController.php
+++ b/application/modules/ipxe/controllers/AuthController.php
@@ -37,13 +37,12 @@ class Ipxe_AuthController extends Zend_Controller_Action {
       }
     }
     
-    if(isset($_SERVER['HTTPS']))
+    if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on')
     {
-    	if ($_SERVER['HTTPS'] == 'on')
-    		$this->httpmode = 'https';
-    	else
-    		$this->httpmode = 'http';
-    }
+    	$this->httpmode = 'https';
+  	}else{
+  		$this->httpmode = 'http';
+  	}
   }
 
   public function serialAction() {
diff --git a/application/modules/ipxe/controllers/ResourceController.php b/application/modules/ipxe/controllers/ResourceController.php
index 0c96a36..8a03dca 100644
--- a/application/modules/ipxe/controllers/ResourceController.php
+++ b/application/modules/ipxe/controllers/ResourceController.php
@@ -61,12 +61,11 @@ class Ipxe_ResourceController extends Zend_Controller_Action {
     $vesamenuView->host = $_SERVER['HTTP_HOST'];
     $vesamenuView->error = $this->_request->getParam('error');
 
-    if(isset($_SERVER['HTTPS']))
+    if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on')
     {
-    	if ($_SERVER['HTTPS'] == 'on')
-    		$vesamenuView->httpmode = 'https';
-    	else
-    		$vesamenuView->httpmode = 'http';
+    	$vesamenuView->httpmode = 'https';
+    }else{
+    	$vesamenuView->httpmode = 'http';
     }
         
     if (isset($this->session)) {
-- 
cgit v1.2.3-55-g7522