aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc
diff options
context:
space:
mode:
Diffstat (limited to 'inc')
-rw-r--r--inc/poche/Database.class.php8
-rw-r--r--inc/poche/Poche.class.php13
-rw-r--r--inc/poche/Tools.class.php6
-rw-r--r--inc/poche/Url.class.php6
-rw-r--r--inc/poche/User.class.php6
-rwxr-xr-xinc/poche/config.inc.php.new6
-rw-r--r--inc/poche/global.inc.php6
-rw-r--r--inc/poche/pochePictures.php6
8 files changed, 29 insertions, 28 deletions
diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index 04731821..3b0f455e 100644
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
@@ -1,9 +1,9 @@
1<?php 1<?php
2/** 2/**
3 * poche, a read it later open source system 3 * wallabag, self hostable application allowing you to not miss any content anymore
4 * 4 *
5 * @category poche 5 * @category wallabag
6 * @author Nicolas Lœuillet <support@inthepoche.com> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
@@ -193,7 +193,7 @@ class Database {
193 public function updateUserConfig($userId, $key, $value) { 193 public function updateUserConfig($userId, $key, $value) {
194 $config = $this->getConfigUser($userId); 194 $config = $this->getConfigUser($userId);
195 195
196 if (!isset ($user_config[$key])) { 196 if (! isset($config[$key])) {
197 $sql = "INSERT INTO users_config (value, user_id, name) VALUES (?, ?, ?)"; 197 $sql = "INSERT INTO users_config (value, user_id, name) VALUES (?, ?, ?)";
198 } 198 }
199 else { 199 else {
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 004cca8e..0be1668d 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -1,9 +1,9 @@
1<?php 1<?php
2/** 2/**
3 * poche, a read it later open source system 3 * wallabag, self hostable application allowing you to not miss any content anymore
4 * 4 *
5 * @category poche 5 * @category wallabag
6 * @author Nicolas Lœuillet <support@inthepoche.com> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
@@ -29,7 +29,8 @@ class Poche
29 'dark' => array('requires' => array('default')), 29 'dark' => array('requires' => array('default')),
30 'dmagenta' => array('requires' => array('default')), 30 'dmagenta' => array('requires' => array('default')),
31 'solarized' => array('requires' => array('default')), 31 'solarized' => array('requires' => array('default')),
32 'solarized-dark' => array('requires' => array('default')) 32 'solarized-dark' => array('requires' => array('default')),
33 'courgette' => array('requires' => array())
33 ); 34 );
34 35
35 public function __construct() 36 public function __construct()
@@ -110,7 +111,7 @@ class Poche
110 $passTheme = TRUE; 111 $passTheme = TRUE;
111 # Twig is an absolute requirement for Poche to function. Abort immediately if the Composer installer hasn't been run yet 112 # Twig is an absolute requirement for Poche to function. Abort immediately if the Composer installer hasn't been run yet
112 if (! self::$canRenderTemplates) { 113 if (! self::$canRenderTemplates) {
113 $this->notInstalledMessage[] = 'Twig does not seem to be installed. Please initialize the Composer installation to automatically fetch dependencies. Have a look at <a href="http://doc.inthepoche.com/doku.php?id=users:begin:install">the documentation.</a>'; 114 $this->notInstalledMessage[] = 'Twig does not seem to be installed. Please initialize the Composer installation to automatically fetch dependencies. Have a look at <a href="http://doc.wallabag.org/doku.php?id=users:begin:install">the documentation.</a>';
114 $passTheme = FALSE; 115 $passTheme = FALSE;
115 } 116 }
116 117
@@ -968,7 +969,7 @@ class Poche
968 if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 86400 ))) { 969 if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 86400 ))) {
969 $version = file_get_contents($cache_file); 970 $version = file_get_contents($cache_file);
970 } else { 971 } else {
971 $version = file_get_contents('http://static.inthepoche.com/versions/' . $which); 972 $version = file_get_contents('http://static.wallabag.org/versions/' . $which);
972 file_put_contents($cache_file, $version, LOCK_EX); 973 file_put_contents($cache_file, $version, LOCK_EX);
973 } 974 }
974 return $version; 975 return $version;
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 63916582..248a44d7 100644
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -1,9 +1,9 @@
1<?php 1<?php
2/** 2/**
3 * poche, a read it later open source system 3 * wallabag, self hostable application allowing you to not miss any content anymore
4 * 4 *
5 * @category poche 5 * @category wallabag
6 * @author Nicolas Lœuillet <support@inthepoche.com> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
diff --git a/inc/poche/Url.class.php b/inc/poche/Url.class.php
index 8b3468c3..aba236fa 100644
--- a/inc/poche/Url.class.php
+++ b/inc/poche/Url.class.php
@@ -1,9 +1,9 @@
1<?php 1<?php
2/** 2/**
3 * poche, a read it later open source system 3 * wallabag, self hostable application allowing you to not miss any content anymore
4 * 4 *
5 * @category poche 5 * @category wallabag
6 * @author Nicolas Lœuillet <support@inthepoche.com> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
diff --git a/inc/poche/User.class.php b/inc/poche/User.class.php
index 6dac7839..cc8bec65 100644
--- a/inc/poche/User.class.php
+++ b/inc/poche/User.class.php
@@ -1,9 +1,9 @@
1<?php 1<?php
2/** 2/**
3 * poche, a read it later open source system 3 * wallabag, self hostable application allowing you to not miss any content anymore
4 * 4 *
5 * @category poche 5 * @category wallabag
6 * @author Nicolas Lœuillet <support@inthepoche.com> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
diff --git a/inc/poche/config.inc.php.new b/inc/poche/config.inc.php.new
index 1c93be07..39cb2f2f 100755
--- a/inc/poche/config.inc.php.new
+++ b/inc/poche/config.inc.php.new
@@ -1,9 +1,9 @@
1<?php 1<?php
2/** 2/**
3 * poche, a read it later open source system 3 * wallabag, self hostable application allowing you to not miss any content anymore
4 * 4 *
5 * @category poche 5 * @category wallabag
6 * @author Nicolas Lœuillet <support@inthepoche.com> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php
index 846699d3..e2beade1 100644
--- a/inc/poche/global.inc.php
+++ b/inc/poche/global.inc.php
@@ -1,9 +1,9 @@
1<?php 1<?php
2/** 2/**
3 * poche, a read it later open source system 3 * wallabag, self hostable application allowing you to not miss any content anymore
4 * 4 *
5 * @category poche 5 * @category wallabag
6 * @author Nicolas Lœuillet <support@inthepoche.com> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
diff --git a/inc/poche/pochePictures.php b/inc/poche/pochePictures.php
index b0cfb9df..e4b0b160 100644
--- a/inc/poche/pochePictures.php
+++ b/inc/poche/pochePictures.php
@@ -1,9 +1,9 @@
1<?php 1<?php
2/** 2/**
3 * poche, a read it later open source system 3 * wallabag, self hostable application allowing you to not miss any content anymore
4 * 4 *
5 * @category poche 5 * @category wallabag
6 * @author Nicolas Lœuillet <support@inthepoche.com> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 02:14:13 +0000