From 125f9ee83842cd6ad6cfcbcbfcaa951ec0396733 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Saad-Dupuy Date: Mon, 7 Oct 2013 12:30:40 +0200 Subject: [PATCH 1/6] 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 8eb988f..6f2bc6e 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 +} From 93eed125058574ef407e2edede6740629f7f0a43 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Saad-Dupuy Date: Mon, 7 Oct 2013 12:31:46 +0200 Subject: [PATCH 2/6] 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 dfebd91..9745459 100644 --- a/themes/default/_head.twig +++ b/themes/default/_head.twig @@ -8,4 +8,4 @@ - + From 2916d24b209e1e36cf22cb902d7e6dc34113c7e5 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Saad-Dupuy Date: Mon, 7 Oct 2013 12:47:13 +0200 Subject: [PATCH 3/6] 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 6f2bc6e..1d09282 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 255b97e..902509e 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); From 1745ebc832ce9a1be4cb23e7a10e65fae3d96411 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Saad-Dupuy Date: Tue, 8 Oct 2013 12:56:32 +0200 Subject: [PATCH 4/6] Added Roboto font from https://themes.googleusercontent.com/static/fonts/roboto/v9/2UX7WLTfW3W8TclTUvlFyQ.woff --- themes/default/fonts/Roboto.woff | Bin 0 -> 22172 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 themes/default/fonts/Roboto.woff diff --git a/themes/default/fonts/Roboto.woff b/themes/default/fonts/Roboto.woff new file mode 100644 index 0000000000000000000000000000000000000000..1440b1be64111bc184959ad9669fc0497a80f827 GIT binary patch literal 22172 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 z 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 Ld?m Date: Tue, 8 Oct 2013 12:57:33 +0200 Subject: [PATCH 5/6] Removed google font link --- themes/default/_head.twig | 1 - 1 file changed, 1 deletion(-) diff --git a/themes/default/_head.twig b/themes/default/_head.twig index 247b929..d0cbd32 100644 --- a/themes/default/_head.twig +++ b/themes/default/_head.twig @@ -7,5 +7,4 @@ - From 2f3425dff699dee249bd223ad564395e254552f4 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Saad-Dupuy Date: Tue, 8 Oct 2013 13:00:43 +0200 Subject: [PATCH 6/6] Added font-face linked to local font --- themes/default/css/style.css | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/themes/default/css/style.css b/themes/default/css/style.css index 3ef9c82..670eb50 100644 --- a/themes/default/css/style.css +++ b/themes/default/css/style.css @@ -1,3 +1,12 @@ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto Regular'), local('Roboto-Regular'), url(../fonts/Roboto.woff) format('woff'); +} + + + body { margin: 10px; font-family: 'Roboto',Verdana,Geneva,sans-serif; @@ -318,4 +327,4 @@ a.link span, a.bad-display span, a.reading-time span { background-repeat: no-repeat; -} \ No newline at end of file +}