Bug 547932 - Link to https resource redirected to http mirror

Remove support for new http mirrors.

Change-Id: Ib889c78fa885db025f8ef8c5904a49e4957c75c7
Signed-off-by: droy <denis.roy@eclipse-foundation.org>

2 files changed, 7 insertions, 7 deletions

diff --git a/content/en_mir_request.php b/content/en_mir_request.php
index 339c2db6..45ceeef6 100644
--- a/content/en_mir_request.php
+++ b/content/en_mir_request.php
@@ -89,7 +89,6 @@ software downloads. You may also mirror the download site on your internal netwo
                 <td>Organization/affiliation name (required)</td>
                 <td>
                   <input type="text" name="organization" size="35" maxlength="50" /><br />
-                  <small>Internal mirrors should prefix [INTERNAL] to the Organization name</small>
                 </td>
               </tr>
                   <tr>
@@ -125,11 +124,12 @@ EOHTML;
                 <td colspan="2">&#160;</td>
               </tr>
                   <tr>
-                          <td>HTTP URL (required)</td>
+                          <td>HTTPS URL (required)</td>
                           <td><input type="text" name="http_browserlink" size="35" maxlength="50" /></td>
                   </tr>
                   <tr>
-                          <td colspan="2"><font class="indexsub">Base URL to the mirror. (http://www.yourdomain.com/eclipse)</font></td>
+                          <td colspan="2"><font class="indexsub">Base URL to the mirror. (https://www.yourdomain.com/eclipse)<br />
+                          https required. Unencrypted http not supported.</font></td>
                   </tr>
                   <tr>
                           <td colspan="2">&#160;</td>
@@ -243,7 +243,7 @@ EOHTML;
       return false;
     }
 
-    urltest = /^http:\/\/\w+\.[\w\/]+/;
+    urltest = /^https:\/\/\w+\.[\w\/]+/;
     if(document.form1.http_browserlink.value != "" && !urltest.test(document.form1.http_browserlink.value)) {
       alert("Please enter a valid http URL.");
       document.form1.http_browserlink.focus();
diff --git a/mir_request.php b/mir_request.php
index de033f8f..7b93a44e 100755
--- a/mir_request.php
+++ b/mir_request.php
@@ -66,7 +66,7 @@ if ($_status == "save") {
       $valid = false;
     }
 
-    if (!eregi("^(http|https):\/\/", $_POST['http_browserlink']) && $_POST['http_browserlink'] != "") {
+    if (!eregi("^https:\/\/", $_POST['http_browserlink']) && $_POST['http_browserlink'] != "") {
       $errorfield .= " HTTP URL";
       $valid = false;
     }
@@ -111,7 +111,7 @@ if ($_status == "save") {
                     base_path)
                   VALUES (
                     " . $mirror_id . ",
-                    " . $App->returnQuotedString("http") . ",
+                    " . $App->returnQuotedString("https") . ",
                     " . $App->returnQuotedString($_POST['http_browserlink']) . ")
           ";
         mysql_query($sql, $dbh);
@@ -126,7 +126,7 @@ if ($_status == "save") {
                     VALUES (
                       " . $mirror_id . ",
                       " . $App->returnQuotedString("EclipseFull") . ",
-                      " . $App->returnQuotedString("http") . ")";
+                      " . $App->returnQuotedString("https") . ")";
           mysql_query($sql, $dbh);
         }
       }