aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--README.md7
-rwxr-xr-xinc/poche/Tools.class.php13
-rwxr-xr-xinc/poche/config.inc.default.php3
-rwxr-xr-xinstall/index.php1
4 files changed, 21 insertions, 3 deletions
diff --git a/README.md b/README.md
index 4e8379a7..ea80cec4 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,11 @@
1# what is wallabag ? 1# what is wallabag ?
2
3## About development
4We are working on a technical rework, using Symfony 2. You can contribute to [this version here](https://github.com/wallabag/wallabag/tree/v2).
5
6wallabag 1.x is still maintained but we won't develop new features.
7
8## Description
2wallabag is a self hostable application allowing you to not miss any content anymore. Click, save, read it when you can. It extracts content so that you can read it when you have time. 9wallabag is a self hostable application allowing you to not miss any content anymore. Click, save, read it when you can. It extracts content so that you can read it when you have time.
3 10
4More informations on our website: [wallabag.org](http://wallabag.org) 11More informations on our website: [wallabag.org](http://wallabag.org)
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index f3d1013f..9c748391 100755
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -40,6 +40,8 @@ final class Tools
40 */ 40 */
41 public static function getPocheUrl() 41 public static function getPocheUrl()
42 { 42 {
43 $baseUrl = "";
44
43 $https = (!empty($_SERVER['HTTPS']) 45 $https = (!empty($_SERVER['HTTPS'])
44 && (strtolower($_SERVER['HTTPS']) == 'on')) 46 && (strtolower($_SERVER['HTTPS']) == 'on'))
45 || (isset($_SERVER["SERVER_PORT"]) 47 || (isset($_SERVER["SERVER_PORT"])
@@ -72,8 +74,15 @@ final class Tools
72 $serverport = ''; 74 $serverport = '';
73 } 75 }
74 76
75 return 'http' . ($https ? 's' : '') . '://' 77 // check if BASE_URL is configured
76 . $host . $serverport . $scriptname; 78 if(BASE_URL) {
79 $baseUrl = BASE_URL;
80 } else {
81 $baseUrl = 'http' . ($https ? 's' : '') . '://' . $host . $serverport;
82 }
83
84 return $baseUrl . $scriptname;
85
77 } 86 }
78 87
79 /** 88 /**
diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php
index 09d3aa9a..5d889ffd 100755
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -31,6 +31,9 @@
31// Change this if not using the standart port for SSL - i.e you server is behind sslh 31// Change this if not using the standart port for SSL - i.e you server is behind sslh
32@define ('SSL_PORT', 443); 32@define ('SSL_PORT', 443);
33 33
34// Define this only if you use wallabag behind a proxy and if you encounter problems
35@define ('BASE_URL', '');
36
34@define ('MODE_DEMO', FALSE); 37@define ('MODE_DEMO', FALSE);
35@define ('DEBUG_POCHE', FALSE); 38@define ('DEBUG_POCHE', FALSE);
36 39
diff --git a/install/index.php b/install/index.php
index ea5d7d47..f5bce50d 100755
--- a/install/index.php
+++ b/install/index.php
@@ -258,7 +258,6 @@ else if (isset($_POST['install'])) {
258 <link rel="apple-touch-icon-precomposed" sizes="144x144" href="themes/baggy/img/apple-touch-icon-144x144-precomposed.png"> 258 <link rel="apple-touch-icon-precomposed" sizes="144x144" href="themes/baggy/img/apple-touch-icon-144x144-precomposed.png">
259 <link rel="apple-touch-icon-precomposed" sizes="72x72" href="themes/baggy/img/apple-touch-icon-72x72-precomposed.png"> 259 <link rel="apple-touch-icon-precomposed" sizes="72x72" href="themes/baggy/img/apple-touch-icon-72x72-precomposed.png">
260 <link rel="apple-touch-icon-precomposed" href="themes/baggy/img/apple-touch-icon-precomposed.png"> 260 <link rel="apple-touch-icon-precomposed" href="themes/baggy/img/apple-touch-icon-precomposed.png">
261 <link href='//fonts.googleapis.com/css?family=PT+Sans:700' rel='stylesheet' type='text/css'>
262 <link rel="stylesheet" href="themes/baggy/css/ratatouille.css" media="all"> 261 <link rel="stylesheet" href="themes/baggy/css/ratatouille.css" media="all">
263 <link rel="stylesheet" href="themes/baggy/css/font.css" media="all"> 262 <link rel="stylesheet" href="themes/baggy/css/font.css" media="all">
264 <link rel="stylesheet" href="themes/baggy/css/main.css" media="all"> 263 <link rel="stylesheet" href="themes/baggy/css/main.css" media="all">