[GNUnet-SVN] r2170 - Extractor-docs/WWW doodle-docs/WWW i18nHTML i18nHTML/src i18nHTML-docs/WWW

[grothoff]

Author: grothoff
Date: 2005-10-06 02:21:56 -0700 (Thu, 06 Oct 2005)
New Revision: 2170

Modified:
   Extractor-docs/WWW/i18nhtml.inc.php
   doodle-docs/WWW/i18nhtml.inc.php
   i18nHTML-docs/WWW/i18nhtml.inc.php
   i18nHTML/ChangeLog
   i18nHTML/src/i18nhtml.inc.php
Log:
fix

Modified: Extractor-docs/WWW/i18nhtml.inc.php
===================================================================
--- Extractor-docs/WWW/i18nhtml.inc.php 2005-10-06 09:20:11 UTC (rev 2169)
+++ Extractor-docs/WWW/i18nhtml.inc.php 2005-10-06 09:21:56 UTC (rev 2170)
@@ -184,8 +184,9 @@
     $hasTranslation = $i18nHTMLhasTranslation;
   if ( ($editor) || ($i18nHTMLhasTranslation == 0) ) {
     $protocol = "http";
-    if ($_SERVER['HTTPS'] == 'on')
-       $secure = "https"; // switch to https
+    if ($HTTP_SERVER_VARS["HTTPS"] == "on") {
+       $protocol = "https"; // switch to https
+    }
     $back = $protocol . "://" . $HTTP_SERVER_VARS["HTTP_HOST"] . 
$HTTP_SERVER_VARS["REQUEST_URI"];
     return "<a href=\"" . $i18nHTMLbase . "translate.php?xlang="
       . $lang
@@ -905,5 +906,4 @@
 function IMG($src, $alt, $align="CENTER", $width, $height, $border=0, 
$hspace=0, $vspace=0) {
   echo IMG_($src, $alt, $align, $width, $height, $border, $hspace, $vspace);
 }
-
-?>
+?>

Modified: doodle-docs/WWW/i18nhtml.inc.php
===================================================================
--- doodle-docs/WWW/i18nhtml.inc.php    2005-10-06 09:20:11 UTC (rev 2169)
+++ doodle-docs/WWW/i18nhtml.inc.php    2005-10-06 09:21:56 UTC (rev 2170)
@@ -184,8 +184,9 @@
     $hasTranslation = $i18nHTMLhasTranslation;
   if ( ($editor) || ($i18nHTMLhasTranslation == 0) ) {
     $protocol = "http";
-    if ($_SERVER['HTTPS'] == 'on')
-       $secure = "https"; // switch to https
+    if ($HTTP_SERVER_VARS["HTTPS"] == "on") {
+       $protocol = "https"; // switch to https
+    }
     $back = $protocol . "://" . $HTTP_SERVER_VARS["HTTP_HOST"] . 
$HTTP_SERVER_VARS["REQUEST_URI"];
     return "<a href=\"" . $i18nHTMLbase . "translate.php?xlang="
       . $lang
@@ -905,5 +906,4 @@
 function IMG($src, $alt, $align="CENTER", $width, $height, $border=0, 
$hspace=0, $vspace=0) {
   echo IMG_($src, $alt, $align, $width, $height, $border, $hspace, $vspace);
 }
-
-?>
+?>

Modified: i18nHTML/ChangeLog
===================================================================
--- i18nHTML/ChangeLog  2005-10-06 09:20:11 UTC (rev 2169)
+++ i18nHTML/ChangeLog  2005-10-06 09:21:56 UTC (rev 2170)
@@ -1,3 +1,7 @@
+Thu Oct  6 02:21:24 PDT 2005
+       Fixed bug with https pages using i18nHTML linking back using
+       http (and not https) in translation page.
+
 Mon Aug  8 23:24:42 PDT 2005   CG
        Fixed bug in editor / mass translation page where the
        next set of sentences displayed was computed incorrectly.

Modified: i18nHTML/src/i18nhtml.inc.php
===================================================================
--- i18nHTML/src/i18nhtml.inc.php       2005-10-06 09:20:11 UTC (rev 2169)
+++ i18nHTML/src/i18nhtml.inc.php       2005-10-06 09:21:56 UTC (rev 2170)
@@ -184,8 +184,9 @@
     $hasTranslation = $i18nHTMLhasTranslation;
   if ( ($editor) || ($i18nHTMLhasTranslation == 0) ) {
     $protocol = "http";
-    if ($_SERVER['HTTPS'] == 'on')
-       $secure = "https"; // switch to https
+    if ($HTTP_SERVER_VARS["HTTPS"] == "on") {
+       $protocol = "https"; // switch to https
+    }
     $back = $protocol . "://" . $HTTP_SERVER_VARS["HTTP_HOST"] . 
$HTTP_SERVER_VARS["REQUEST_URI"];
     return "<a href=\"" . $i18nHTMLbase . "translate.php?xlang="
       . $lang
@@ -905,5 +906,4 @@
 function IMG($src, $alt, $align="CENTER", $width, $height, $border=0, 
$hspace=0, $vspace=0) {
   echo IMG_($src, $alt, $align, $width, $height, $border, $hspace, $vspace);
 }
-
-?>
+?>

Modified: i18nHTML-docs/WWW/i18nhtml.inc.php
===================================================================
--- i18nHTML-docs/WWW/i18nhtml.inc.php  2005-10-06 09:20:11 UTC (rev 2169)
+++ i18nHTML-docs/WWW/i18nhtml.inc.php  2005-10-06 09:21:56 UTC (rev 2170)
@@ -184,8 +184,9 @@
     $hasTranslation = $i18nHTMLhasTranslation;
   if ( ($editor) || ($i18nHTMLhasTranslation == 0) ) {
     $protocol = "http";
-    if ($_SERVER['HTTPS'] == 'on')
-       $secure = "https"; // switch to https
+    if ($HTTP_SERVER_VARS["HTTPS"] == "on") {
+       $protocol = "https"; // switch to https
+    }
     $back = $protocol . "://" . $HTTP_SERVER_VARS["HTTP_HOST"] . 
$HTTP_SERVER_VARS["REQUEST_URI"];
     return "<a href=\"" . $i18nHTMLbase . "translate.php?xlang="
       . $lang
@@ -905,5 +906,4 @@
 function IMG($src, $alt, $align="CENTER", $width, $height, $border=0, 
$hspace=0, $vspace=0) {
   echo IMG_($src, $alt, $align, $width, $height, $border, $hspace, $vspace);
 }
-
-?>
+?>