From 125f9ee83842cd6ad6cfcbcbfcaa951ec0396733 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Saad-Dupuy Date: Mon, 7 Oct 2013 12:30:40 +0200 Subject: Added support for custom ssl port --- inc/poche/Tools.class.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index 8eb988f4..6f2bc6e7 100644 --- a/inc/poche/Tools.class.php +++ b/inc/poche/Tools.class.php @@ -41,10 +41,14 @@ class Tools $https = (!empty($_SERVER['HTTPS']) && (strtolower($_SERVER['HTTPS']) == 'on')) || (isset($_SERVER["SERVER_PORT"]) - && $_SERVER["SERVER_PORT"] == '443'); // HTTPS detection. + && $_SERVER["SERVER_PORT"] == '443') // HTTPS detection. + || (isset($_SERVER["SERVER_PORT"]) && isset($SSL_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 ? '' : ':' . $_SERVER["SERVER_PORT"]); $scriptname = str_replace('/index.php', '/', $_SERVER["SCRIPT_NAME"]); @@ -243,4 +247,4 @@ class Tools $lang = explode('.', $userlanguage); return str_replace('_', '-', $lang[0]); } -} \ No newline at end of file +} -- cgit v1.2.3 From 93eed125058574ef407e2edede6740629f7f0a43 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Saad-Dupuy Date: Mon, 7 Oct 2013 12:31:46 +0200 Subject: Fixed typo --- themes/default/_head.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/default/_head.twig b/themes/default/_head.twig index dfebd91d..9745459c 100644 --- a/themes/default/_head.twig +++ b/themes/default/_head.twig @@ -8,4 +8,4 @@ - + -- cgit v1.2.3 From 2916d24b209e1e36cf22cb902d7e6dc34113c7e5 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Saad-Dupuy Date: Mon, 7 Oct 2013 12:47:13 +0200 Subject: Added support for custom SSL port --- inc/poche/Tools.class.php | 6 +++--- inc/poche/config.inc.php.new | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index 6f2bc6e7..1d092823 100644 --- 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 255b97e6..902509e3 100755 --- 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); -- cgit v1.2.3