Added support for custom SSL port

diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 6f2bc6e7208d2f678e272a19735d0718d5961e5b..1d092823fd1cad93b6c342676656ae5abe36e111 100644 (file)
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -42,13 +42,13 @@ class Tools
                     && (strtolower($_SERVER['HTTPS']) == 'on'))
             || (isset($_SERVER["SERVER_PORT"])
                     && $_SERVER["SERVER_PORT"] == '443') // HTTPS detection.
-            || (isset($_SERVER["SERVER_PORT"]) && isset($SSL_PORT) //Custom HTTPS port detection 
-                    && $_SERVER["SERVER_PORT"] == $SSL_PORT);
+            || (isset($_SERVER["SERVER_PORT"]) //Custom HTTPS port detection 
+                    && $_SERVER["SERVER_PORT"] == SSL_PORT);
 
         $serverport = (!isset($_SERVER["SERVER_PORT"])
             || $_SERVER["SERVER_PORT"] == '80'
             || ($https && $_SERVER["SERVER_PORT"] == '443')
-            || ($https && $_SERVER["SERVER_PORT"]==$SSL_PORT) //Custom HTTPS port detection
+            || ($https && $_SERVER["SERVER_PORT"]==SSL_PORT) //Custom HTTPS port detection
             ? '' : ':' . $_SERVER["SERVER_PORT"]);
 
         $scriptname = str_replace('/index.php', '/', $_SERVER["SCRIPT_NAME"]);

diff --git a/inc/poche/config.inc.php.new b/inc/poche/config.inc.php.new
index 255b97e6cdfb614171c1143de5edc5b78efa968c..902509e3df0a94fc5a8361bcfb5cb20d40eacf7c 100755 (executable)
--- a/inc/poche/config.inc.php.new
+++ b/inc/poche/config.inc.php.new
@@ -25,6 +25,9 @@ define ('STORAGE_PASSWORD', 'poche');
 # Do not trespass unless you know what you are doing
 #################################################################################
 
+// Change this if not using the standart port for SSL - i.e you server is behind sslh
+define ('SSL_PORT', 443); 
+
 define ('MODE_DEMO', FALSE);
 define ('DEBUG_POCHE', FALSE);
 define ('DOWNLOAD_PICTURES', FALSE);
@@ -57,4 +60,4 @@ define ('INSTAPAPER_FILE', '/instapaper-export.html');
 
 define ('IMPORT_POCKET_FILE', ROOT . POCKET_FILE);
 define ('IMPORT_READABILITY_FILE', ROOT . READABILITY_FILE);
-define ('IMPORT_INSTAPAPER_FILE', ROOT . INSTAPAPER_FILE);
\ No newline at end of file
+define ('IMPORT_INSTAPAPER_FILE', ROOT . INSTAPAPER_FILE);