From f0a264891f94f745fba37de6f3bf8602310433e7 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Mon, 7 Oct 2013 17:44:46 -0500
Subject: [PATCH 1/2] Avoid notice in installer

---
 main/install/index.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/main/install/index.php b/main/install/index.php
index e0f26911dc..f9e921fb7c 100644
--- a/main/install/index.php
+++ b/main/install/index.php
@@ -227,7 +227,10 @@ if (!isset($_GET['running'])) {
   	$urlForm 		= api_get_path(WEB_PATH);
 	$pathForm 		= api_get_path(SYS_PATH);
 
-	$emailForm      = $_SERVER['SERVER_ADMIN'];
+        $emailForm = 'webmaster@localhost';
+        if (!empty($_SERVER['SERVER_ADMIN'])) {
+            $emailForm      = $_SERVER['SERVER_ADMIN'];
+        }
 	$email_parts = explode('@', $emailForm);
 	if (isset($email_parts[1]) && $email_parts[1] == 'localhost') {
 		$emailForm .= '.localdomain';

From 2e7a124ab650f41ff0e2124398c47c911e40147b Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Mon, 7 Oct 2013 18:12:41 -0500
Subject: [PATCH 2/2] Fixed install issue preventing the right check on
 directories creation

---
 main/install/install.lib.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/main/install/install.lib.php b/main/install/install.lib.php
index 0d4e1f150f..cbab65d690 100755
--- a/main/install/install.lib.php
+++ b/main/install/install.lib.php
@@ -2162,11 +2162,11 @@ function check_course_script_interpretation($course_dir, $course_attempt_name, $
     $content = '<?php echo "123"; exit;';
 
     if (is_writable($file_name)) {
-        if ($handler = @fopen($file_name, "w")) {
-            //write content
-            if (fwrite($handler , $content)) {
+        if ($handler = @fopen($file_name, "w")) {
+            //write content
+            if (fwrite($handler, $content)) {
                 $sock_errno = ''; $sock_errmsg = '';
-                $url = api_get_path(WEB_COURSE_PATH).'/'.$course_attempt_name.'/'.$file;
+                $url = api_get_path(WEB_COURSE_PATH).$course_attempt_name.'/'.$file;
 
                 $parsed_url = parse_url($url);
                 //$scheme = isset($parsedUrl['scheme']) ? $parsedUrl['scheme'] : ''; //http
@@ -2174,7 +2174,7 @@ function check_course_script_interpretation($course_dir, $course_attempt_name, $
                 $path = isset($parsed_url['path']) ? $parsed_url['path'] : '/';
                 $port = isset($parsed_url['port']) ? $parsed_url['port'] : '80';
 
-                //Check fsockopen
+                //Check fsockopen (doesn't work with https)
                 if ($fp = @fsockopen(str_replace('http://', '', $url), -1, $sock_errno, $sock_errmsg, 60)) {
                     $out  = "GET $path HTTP/1.1\r\n";
                     $out .= "Host: $host\r\n";
@@ -2217,4 +2217,4 @@ function check_course_script_interpretation($course_dir, $course_attempt_name, $
     }
 
     return $output;
-}
\ No newline at end of file
+}