Merge branch 'dev' of https://github.com/inthepoche/poche into dev

diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 8eb988f46223c08cff1645fe80030f6b935a1640..1d092823fd1cad93b6c342676656ae5abe36e111 100644 (file)
--- 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"]) //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
+}

diff --git a/inc/poche/config.inc.php.new b/inc/poche/config.inc.php.new
index 99223c78524543e18f32eb385671a22878fed4db..c60d4f80040f2872309345080aee40d75a7ed43c 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);
@@ -55,4 +58,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);

diff --git a/themes/default/_head.twig b/themes/default/_head.twig
index 247b929eb390f3be02cc3b926f723482e79bd609..d0cbd320be6688ef509893eace178bbc15486ab5 100644 (file)
--- a/themes/default/_head.twig
+++ b/themes/default/_head.twig
@@ -7,5 +7,4 @@
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{ theme }}/css/style-{{ theme }}.css" media="all" title="{{ theme }} theme">
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/messages.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/print.css" media="print">
-        <link href='//fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
         <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/jquery-2.0.3.min.js"></script>

diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index 3ef9c8236d43d2110c2d6f3f7371a23e38ad44d8..670eb50f4966581e6d0ffca4110343a11ce639e5 100644 (file)
--- 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
+}

diff --git a/themes/default/fonts/Roboto.woff b/themes/default/fonts/Roboto.woff
new file mode 100644 (file)
index 0000000..1440b1b
Binary files /dev/null and b/themes/default/fonts/Roboto.woff differ