aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.gitignore9
-rw-r--r--[-rwxr-xr-x]TRANSLATION.md0
-rw-r--r--app/cache/.gitignore (renamed from cache/.gitignore)0
-rw-r--r--app/cache/.htaccess (renamed from cache/.htaccess)0
-rw-r--r--app/check_essentials.php (renamed from check_essentials.php)0
-rwxr-xr-xapp/check_setup.php9
-rwxr-xr-xapp/config/config.inc.default.php (renamed from inc/poche/config.inc.default.php)8
-rwxr-xr-xapp/config/global.inc.php25
-rw-r--r--[-rwxr-xr-x]app/db/.gitignore (renamed from assets/.gitignore)0
-rw-r--r--app/db/.htaccess (renamed from db/.htaccess)0
-rwxr-xr-xapp/db/poche.sqlitebin0 -> 491520 bytes
-rwxr-xr-xcheck_setup.php12
-rw-r--r--composer.json3
-rw-r--r--composer.lock2
-rw-r--r--db/.gitignore0
-rwxr-xr-xinc/poche/global.inc.php43
-rwxr-xr-xindex.php22
-rw-r--r--locale/.htaccess2
-rw-r--r--migrations/20150119171459_init_database.php27
-rw-r--r--phinx.yml17
-rwxr-xr-xsrc/Wallabag/Wallabag/Database.php (renamed from inc/poche/Database.class.php)4
-rw-r--r--src/Wallabag/Wallabag/Ebooks.php (renamed from inc/poche/WallabagEBooks.class.php)6
-rw-r--r--src/Wallabag/Wallabag/FlattrItem.php (renamed from inc/poche/FlattrItem.class.php)2
-rw-r--r--src/Wallabag/Wallabag/Language.php (renamed from inc/poche/Language.class.php)4
-rw-r--r--src/Wallabag/Wallabag/Picture.php (renamed from inc/poche/pochePictures.php)1
-rw-r--r--src/Wallabag/Wallabag/Resources/translations/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo (renamed from locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo)bin4823 -> 4823 bytes
-rw-r--r--src/Wallabag/Wallabag/Resources/translations/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po (renamed from locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po)0
-rw-r--r--src/Wallabag/Wallabag/Resources/translations/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo (renamed from locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo)bin10620 -> 10620 bytes
-rw-r--r--src/Wallabag/Wallabag/Resources/translations/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po (renamed from locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po)0
-rw-r--r--src/Wallabag/Wallabag/Resources/translations/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo (renamed from locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo)bin18368 -> 18368 bytes
-rw-r--r--src/Wallabag/Wallabag/Resources/translations/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po (renamed from locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po)0
-rw-r--r--src/Wallabag/Wallabag/Resources/translations/en_US.utf8/LC_MESSAGES/en_US.utf8.mo (renamed from locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo)bin15793 -> 15793 bytes
-rw-r--r--src/Wallabag/Wallabag/Resources/translations/en_US.utf8/LC_MESSAGES/en_US.utf8.po (renamed from locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po)0
-rw-r--r--src/Wallabag/Wallabag/Resources/translations/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo (renamed from locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo)bin4848 -> 4848 bytes
-rw-r--r--src/Wallabag/Wallabag/Resources/translations/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po (renamed from locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po)0
-rw-r--r--src/Wallabag/Wallabag/Resources/translations/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo (renamed from locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo)bin5632 -> 5632 bytes
-rw-r--r--src/Wallabag/Wallabag/Resources/translations/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po (renamed from locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po)0
-rw-r--r--src/Wallabag/Wallabag/Resources/translations/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo (renamed from locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo)bin21037 -> 21037 bytes
-rw-r--r--src/Wallabag/Wallabag/Resources/translations/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po (renamed from locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po)0
-rw-r--r--src/Wallabag/Wallabag/Resources/translations/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo (renamed from locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo)bin4897 -> 4897 bytes
-rw-r--r--src/Wallabag/Wallabag/Resources/translations/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po (renamed from locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po)0
-rw-r--r--src/Wallabag/Wallabag/Resources/translations/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo (renamed from locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo)bin12632 -> 12632 bytes
-rwxr-xr-xsrc/Wallabag/Wallabag/Resources/translations/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po (renamed from locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po)0
-rw-r--r--src/Wallabag/Wallabag/Resources/translations/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo (renamed from locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo)bin12451 -> 12451 bytes
-rw-r--r--src/Wallabag/Wallabag/Resources/translations/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.po (renamed from locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.po)0
-rwxr-xr-xsrc/Wallabag/Wallabag/Resources/translations/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo (renamed from locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo)bin13552 -> 13552 bytes
-rwxr-xr-xsrc/Wallabag/Wallabag/Resources/translations/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po (renamed from locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po)0
-rw-r--r--src/Wallabag/Wallabag/Resources/translations/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.mo (renamed from locale/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.mo)bin4927 -> 4927 bytes
-rw-r--r--src/Wallabag/Wallabag/Resources/translations/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.po (renamed from locale/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.po)0
-rwxr-xr-xsrc/Wallabag/Wallabag/Resources/translations/tools/fillCache.php (renamed from locale/tools/fillCache.php)0
-rwxr-xr-xsrc/Wallabag/Wallabag/Resources/translations/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo (renamed from locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo)bin15670 -> 15670 bytes
-rwxr-xr-xsrc/Wallabag/Wallabag/Resources/translations/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po (renamed from locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po)0
-rwxr-xr-xsrc/Wallabag/Wallabag/Routing.php (renamed from inc/poche/Routing.class.php)4
-rw-r--r--src/Wallabag/Wallabag/Template.php (renamed from inc/poche/Template.class.php)4
-rwxr-xr-xsrc/Wallabag/Wallabag/Tools.php (renamed from inc/poche/Tools.class.php)2
-rw-r--r--src/Wallabag/Wallabag/Url.php (renamed from inc/poche/Url.class.php)2
-rw-r--r--src/Wallabag/Wallabag/User.php (renamed from inc/poche/User.class.php)2
-rwxr-xr-xsrc/Wallabag/Wallabag/Wallabag.php (renamed from inc/poche/Poche.class.php)4
-rw-r--r--tests/Wallabag/Wallabag/Tests/EntryTest.php2
-rw-r--r--web/index.php27
-rw-r--r--web/robots.txt (renamed from robots.txt)0
61 files changed, 146 insertions, 97 deletions
diff --git a/.gitignore b/.gitignore
index 5b34c79f..e4979f31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,8 @@
1.DS_Store 1.DS_Store
2assets/* 2.vagrant
3cache/* 3app/assets/*
4app/cache/*
4vendor 5vendor
5composer.phar 6composer.phar
6db/poche.sqlite 7db/poche.sqlite
7inc/poche/config.inc.php 8app/config/config.inc.php \ No newline at end of file
8inc/3rdparty/htmlpurifier/HTMLPurifier/DefinitionCache/Serializer/
9.vagrant \ No newline at end of file
diff --git a/TRANSLATION.md b/TRANSLATION.md
index a033662c..a033662c 100755..100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
diff --git a/cache/.gitignore b/app/cache/.gitignore
index 35c8ca2e..35c8ca2e 100644
--- a/cache/.gitignore
+++ b/app/cache/.gitignore
diff --git a/cache/.htaccess b/app/cache/.htaccess
index 93169e4e..93169e4e 100644
--- a/cache/.htaccess
+++ b/app/cache/.htaccess
diff --git a/check_essentials.php b/app/check_essentials.php
index a47cd5a8..a47cd5a8 100644
--- a/check_essentials.php
+++ b/app/check_essentials.php
diff --git a/app/check_setup.php b/app/check_setup.php
new file mode 100755
index 00000000..57495f2c
--- /dev/null
+++ b/app/check_setup.php
@@ -0,0 +1,9 @@
1<?php
2
3
4
5// install folder still present, need to install wallabag
6// if (is_dir('install')) {
7// require('install/index.php');
8// exit;
9// } \ No newline at end of file
diff --git a/inc/poche/config.inc.default.php b/app/config/config.inc.default.php
index a159e713..09095235 100755
--- a/inc/poche/config.inc.default.php
+++ b/app/config/config.inc.default.php
@@ -13,7 +13,7 @@
13 13
14@define ('STORAGE', 'sqlite'); # postgres, mysql or sqlite 14@define ('STORAGE', 'sqlite'); # postgres, mysql or sqlite
15 15
16@define ('STORAGE_SQLITE', ROOT . '/db/poche.sqlite'); # if you are using sqlite, where the database file is located 16@define ('STORAGE_SQLITE', ROOT . '/app/db/poche.sqlite'); # if you are using sqlite, where the database file is located
17 17
18# only for postgres & mysql 18# only for postgres & mysql
19@define ('STORAGE_SERVER', 'localhost'); 19@define ('STORAGE_SERVER', 'localhost');
@@ -62,13 +62,13 @@
62@define ('SHOW_PRINTLINK', '1'); 62@define ('SHOW_PRINTLINK', '1');
63// display or not percent of read in article view. Affects only default theme. 63// display or not percent of read in article view. Affects only default theme.
64@define ('SHOW_READPERCENT', '1'); 64@define ('SHOW_READPERCENT', '1');
65@define ('ABS_PATH', 'assets/'); 65@define ('ABS_PATH', ROOT . '/app/assets/');
66 66
67@define ('DEFAULT_THEME', 'baggy'); 67@define ('DEFAULT_THEME', 'baggy');
68 68
69@define ('THEME', ROOT . '/themes'); 69@define ('THEME', ROOT . '/themes');
70@define ('LOCALE', ROOT . '/locale'); 70@define ('LOCALE', ROOT . '/src/Wallabag/Wallabag/Resources/translations/locale');
71@define ('CACHE', ROOT . '/cache'); 71@define ('CACHE', ROOT . '/app/cache');
72 72
73@define ('PAGINATION', '12'); 73@define ('PAGINATION', '12');
74 74
diff --git a/app/config/global.inc.php b/app/config/global.inc.php
new file mode 100755
index 00000000..4df68ea9
--- /dev/null
+++ b/app/config/global.inc.php
@@ -0,0 +1,25 @@
1<?php
2/**
3 * wallabag, self hostable application allowing you to not miss any content anymore
4 *
5 * @category wallabag
6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013
8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */
10
11define('ROOT', dirname(__FILE__) . '/../..');
12
13require_once ROOT . '/vendor/autoload.php';
14
15# system configuration; database credentials et caetera
16require_once dirname(__FILE__) . '/config.inc.php';
17require_once dirname(__FILE__) . '/config.inc.default.php';
18
19if (!ini_get('date.timezone') || !@date_default_timezone_set(ini_get('date.timezone'))) {
20 date_default_timezone_set('UTC');
21}
22
23if (defined('ERROR_REPORTING')) {
24 error_reporting(ERROR_REPORTING);
25} \ No newline at end of file
diff --git a/assets/.gitignore b/app/db/.gitignore
index e69de29b..e69de29b 100755..100644
--- a/assets/.gitignore
+++ b/app/db/.gitignore
diff --git a/db/.htaccess b/app/db/.htaccess
index 93169e4e..93169e4e 100644
--- a/db/.htaccess
+++ b/app/db/.htaccess
diff --git a/app/db/poche.sqlite b/app/db/poche.sqlite
new file mode 100755
index 00000000..3d1a8e43
--- /dev/null
+++ b/app/db/poche.sqlite
Binary files differ
diff --git a/check_setup.php b/check_setup.php
deleted file mode 100755
index cf02c34b..00000000
--- a/check_setup.php
+++ /dev/null
@@ -1,12 +0,0 @@
1<?php
2
3// Check if /cache is writeable
4if (! is_writable('cache')) {
5 die('The directory "cache" must be writeable by your web server user');
6}
7
8// install folder still present, need to install wallabag
9if (is_dir('install')) {
10 require('install/index.php');
11 exit;
12} \ No newline at end of file
diff --git a/composer.json b/composer.json
index fd4231b9..a1dee410 100644
--- a/composer.json
+++ b/composer.json
@@ -74,6 +74,9 @@
74 "require-dev": { 74 "require-dev": {
75 "phpunit/phpunit": "~3.7" 75 "phpunit/phpunit": "~3.7"
76 }, 76 },
77 "autoload": {
78 "psr-0": { "Wallabag\\Wallabag": "src/" }
79 },
77 "config": { 80 "config": {
78 "bin-dir": "bin" 81 "bin-dir": "bin"
79 } 82 }
diff --git a/composer.lock b/composer.lock
index 8275066f..9888e4c4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
4 "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", 4 "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
5 "This file is @generated automatically" 5 "This file is @generated automatically"
6 ], 6 ],
7 "hash": "93ca2016541bb1e9aaf52a82468ce04d", 7 "hash": "7915fd3c1343f447145fb167b0bb4d36",
8 "packages": [ 8 "packages": [
9 { 9 {
10 "name": "ezyang/htmlpurifier", 10 "name": "ezyang/htmlpurifier",
diff --git a/db/.gitignore b/db/.gitignore
deleted file mode 100644
index e69de29b..00000000
--- a/db/.gitignore
+++ /dev/null
diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php
deleted file mode 100755
index ff7ebf64..00000000
--- a/inc/poche/global.inc.php
+++ /dev/null
@@ -1,43 +0,0 @@
1<?php
2/**
3 * wallabag, self hostable application allowing you to not miss any content anymore
4 *
5 * @category wallabag
6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013
8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */
10
11# the poche system root directory (/inc)
12define('INCLUDES', dirname(__FILE__) . '/..');
13
14# the poche root directory
15define('ROOT', INCLUDES . '/..');
16
17require_once ROOT . '/vendor/autoload.php';
18require_once INCLUDES . '/poche/Tools.class.php';
19require_once INCLUDES . '/poche/User.class.php';
20require_once INCLUDES . '/poche/Url.class.php';
21require_once INCLUDES . '/poche/Template.class.php';
22require_once INCLUDES . '/poche/Language.class.php';
23require_once INCLUDES . '/poche/Routing.class.php';
24require_once INCLUDES . '/poche/WallabagEBooks.class.php';
25require_once INCLUDES . '/poche/Poche.class.php';
26require_once INCLUDES . '/poche/Database.class.php';
27require_once INCLUDES . '/poche/FlattrItem.class.php';
28
29# system configuration; database credentials et caetera
30require_once INCLUDES . '/poche/config.inc.php';
31require_once INCLUDES . '/poche/config.inc.default.php';
32
33if (DOWNLOAD_PICTURES) {
34 require_once INCLUDES . '/poche/pochePictures.php';
35}
36
37if (!ini_get('date.timezone') || !@date_default_timezone_set(ini_get('date.timezone'))) {
38 date_default_timezone_set('UTC');
39}
40
41if (defined('ERROR_REPORTING')) {
42 error_reporting(ERROR_REPORTING);
43} \ No newline at end of file
diff --git a/index.php b/index.php
deleted file mode 100755
index adfef71b..00000000
--- a/index.php
+++ /dev/null
@@ -1,22 +0,0 @@
1<?php
2/**
3 * wallabag, self hostable application allowing you to not miss any content anymore
4 *
5 * @category wallabag
6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013
8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */
10
11define ('POCHE', '1.8.1');
12require 'check_essentials.php';
13require 'check_setup.php';
14require_once 'inc/poche/global.inc.php';
15
16// Start session
17Session::$sessionName = 'wallabag';
18Session::init();
19
20// Let's rock !
21$wallabag = new Poche();
22$wallabag->run();
diff --git a/locale/.htaccess b/locale/.htaccess
deleted file mode 100644
index 93169e4e..00000000
--- a/locale/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
1Order deny,allow
2Deny from all
diff --git a/migrations/20150119171459_init_database.php b/migrations/20150119171459_init_database.php
new file mode 100644
index 00000000..48a7d4b6
--- /dev/null
+++ b/migrations/20150119171459_init_database.php
@@ -0,0 +1,27 @@
1<?php
2
3use Phinx\Migration\AbstractMigration;
4
5class InitDatabase extends AbstractMigration
6{
7 /**
8 * Migrate Up.
9 */
10 public function up()
11 {
12 $this->execute("CREATE TABLE IF NOT EXISTS `montest` (
13 `id` int(11) NOT NULL AUTO_INCREMENT,
14 `name` varchar(255) NOT NULL,
15 `value` varchar(255) NOT NULL,
16 PRIMARY KEY (`id`)
17) ENGINE=InnoDB DEFAULT CHARSET=utf8;");
18 }
19
20 /**
21 * Migrate Down.
22 */
23 public function down()
24 {
25 $this->execute("DROP DATABASE montest;");
26 }
27} \ No newline at end of file
diff --git a/phinx.yml b/phinx.yml
new file mode 100644
index 00000000..f6c6300f
--- /dev/null
+++ b/phinx.yml
@@ -0,0 +1,17 @@
1paths:
2 migrations: %%PHINX_CONFIG_DIR%%/migrations
3
4environments:
5 default_migration_table: phinxlog
6 default_database: development
7 production:
8 adapter: sqlite
9 name: db/poche
10
11 development:
12 adapter: sqlite
13 name: db/poche
14
15 testing:
16 adapter: sqlite
17 name: db/poche
diff --git a/inc/poche/Database.class.php b/src/Wallabag/Wallabag/Database.php
index f6ba4708..afda69de 100755
--- a/inc/poche/Database.class.php
+++ b/src/Wallabag/Wallabag/Database.php
@@ -8,6 +8,8 @@
8 * @license http://opensource.org/licenses/MIT see COPYING file 8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */ 9 */
10 10
11namespace Wallabag\Wallabag;
12
11class Database { 13class Database {
12 14
13 var $handle; 15 var $handle;
@@ -25,7 +27,7 @@ class Database {
25 case 'sqlite': 27 case 'sqlite':
26 // Check if /db is writeable 28 // Check if /db is writeable
27 if ( !is_writable(STORAGE_SQLITE) || !is_writable(dirname(STORAGE_SQLITE))) { 29 if ( !is_writable(STORAGE_SQLITE) || !is_writable(dirname(STORAGE_SQLITE))) {
28 die('An error occured: "db" directory must be writeable for your web server user!'); 30 die('An error occured: ' . STORAGE_SQLITE . ' directory must be writeable for your web server user!');
29 } 31 }
30 $db_path = 'sqlite:' . STORAGE_SQLITE; 32 $db_path = 'sqlite:' . STORAGE_SQLITE;
31 $this->handle = new PDO($db_path); 33 $this->handle = new PDO($db_path);
diff --git a/inc/poche/WallabagEBooks.class.php b/src/Wallabag/Wallabag/Ebooks.php
index a9c62af9..2ad89a1c 100644
--- a/inc/poche/WallabagEBooks.class.php
+++ b/src/Wallabag/Wallabag/Ebooks.php
@@ -8,7 +8,9 @@
8 * @license http://opensource.org/licenses/MIT see COPYING file 8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */ 9 */
10 10
11class WallabagEBooks 11namespace Wallabag\Wallabag;
12
13class Ebooks
12{ 14{
13 protected $wallabag; 15 protected $wallabag;
14 protected $method; 16 protected $method;
@@ -18,7 +20,7 @@ class WallabagEBooks
18 protected $bookFileName; 20 protected $bookFileName;
19 protected $author = 'wallabag'; 21 protected $author = 'wallabag';
20 22
21 public function __construct(Poche $wallabag, $method, $value) 23 public function __construct(Wallabag $wallabag, $method, $value)
22 { 24 {
23 $this->wallabag = $wallabag; 25 $this->wallabag = $wallabag;
24 $this->method = $method; 26 $this->method = $method;
diff --git a/inc/poche/FlattrItem.class.php b/src/Wallabag/Wallabag/FlattrItem.php
index ef8c62f7..17eccd3f 100644
--- a/inc/poche/FlattrItem.class.php
+++ b/src/Wallabag/Wallabag/FlattrItem.php
@@ -8,6 +8,8 @@
8 * @license http://opensource.org/licenses/MIT see COPYING file 8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */ 9 */
10 10
11namespace Wallabag\Wallabag;
12
11class FlattrItem 13class FlattrItem
12{ 14{
13 public $status; 15 public $status;
diff --git a/inc/poche/Language.class.php b/src/Wallabag/Wallabag/Language.php
index 420f2fb9..43411817 100644
--- a/inc/poche/Language.class.php
+++ b/src/Wallabag/Wallabag/Language.php
@@ -8,6 +8,8 @@
8 * @license http://opensource.org/licenses/MIT see COPYING file 8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */ 9 */
10 10
11namespace Wallabag\Wallabag;
12
11class Language 13class Language
12{ 14{
13 protected $wallabag; 15 protected $wallabag;
@@ -30,7 +32,7 @@ class Language
30 'uk_UA.utf8' => 'Українська', 32 'uk_UA.utf8' => 'Українська',
31 ); 33 );
32 34
33 public function __construct(Poche $wallabag) 35 public function __construct(Wallabag $wallabag)
34 { 36 {
35 $this->wallabag = $wallabag; 37 $this->wallabag = $wallabag;
36 $pocheUser = Session::getParam('poche_user'); 38 $pocheUser = Session::getParam('poche_user');
diff --git a/inc/poche/pochePictures.php b/src/Wallabag/Wallabag/Picture.php
index 52394c70..8a9cd764 100644
--- a/inc/poche/pochePictures.php
+++ b/src/Wallabag/Wallabag/Picture.php
@@ -8,6 +8,7 @@
8 * @license http://opensource.org/licenses/MIT see COPYING file 8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */ 9 */
10 10
11namespace Wallabag\Wallabag;
11 12
12final class Picture 13final class Picture
13{ 14{
diff --git a/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo b/src/Wallabag/Wallabag/Resources/translations/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo
index af0920d2..af0920d2 100644
--- a/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo
+++ b/src/Wallabag/Wallabag/Resources/translations/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo
Binary files differ
diff --git a/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po b/src/Wallabag/Wallabag/Resources/translations/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po
index cf727432..cf727432 100644
--- a/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po
+++ b/src/Wallabag/Wallabag/Resources/translations/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po
diff --git a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo b/src/Wallabag/Wallabag/Resources/translations/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo
index bd18817f..bd18817f 100644
--- a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo
+++ b/src/Wallabag/Wallabag/Resources/translations/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo
Binary files differ
diff --git a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po b/src/Wallabag/Wallabag/Resources/translations/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po
index 8b82721d..8b82721d 100644
--- a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po
+++ b/src/Wallabag/Wallabag/Resources/translations/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po
diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo b/src/Wallabag/Wallabag/Resources/translations/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
index c9105ee6..c9105ee6 100644
--- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
+++ b/src/Wallabag/Wallabag/Resources/translations/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
Binary files differ
diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po b/src/Wallabag/Wallabag/Resources/translations/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
index 81f87342..81f87342 100644
--- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
+++ b/src/Wallabag/Wallabag/Resources/translations/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo b/src/Wallabag/Wallabag/Resources/translations/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
index 77dee070..77dee070 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
+++ b/src/Wallabag/Wallabag/Resources/translations/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
Binary files differ
diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po b/src/Wallabag/Wallabag/Resources/translations/en_US.utf8/LC_MESSAGES/en_US.utf8.po
index 579d1aca..579d1aca 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
+++ b/src/Wallabag/Wallabag/Resources/translations/en_US.utf8/LC_MESSAGES/en_US.utf8.po
diff --git a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo b/src/Wallabag/Wallabag/Resources/translations/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo
index f4309896..f4309896 100644
--- a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo
+++ b/src/Wallabag/Wallabag/Resources/translations/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo
Binary files differ
diff --git a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po b/src/Wallabag/Wallabag/Resources/translations/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po
index c08decfe..c08decfe 100644
--- a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po
+++ b/src/Wallabag/Wallabag/Resources/translations/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po
diff --git a/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo b/src/Wallabag/Wallabag/Resources/translations/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo
index be6ebc57..be6ebc57 100644
--- a/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo
+++ b/src/Wallabag/Wallabag/Resources/translations/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo
Binary files differ
diff --git a/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po b/src/Wallabag/Wallabag/Resources/translations/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po
index f24814d5..f24814d5 100644
--- a/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po
+++ b/src/Wallabag/Wallabag/Resources/translations/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo b/src/Wallabag/Wallabag/Resources/translations/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
index 83f397a0..83f397a0 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
+++ b/src/Wallabag/Wallabag/Resources/translations/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
Binary files differ
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po b/src/Wallabag/Wallabag/Resources/translations/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
index fef31208..fef31208 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
+++ b/src/Wallabag/Wallabag/Resources/translations/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
diff --git a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo b/src/Wallabag/Wallabag/Resources/translations/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo
index 42e26ba0..42e26ba0 100644
--- a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo
+++ b/src/Wallabag/Wallabag/Resources/translations/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo
Binary files differ
diff --git a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po b/src/Wallabag/Wallabag/Resources/translations/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po
index 41cc01e0..41cc01e0 100644
--- a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po
+++ b/src/Wallabag/Wallabag/Resources/translations/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po
diff --git a/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo b/src/Wallabag/Wallabag/Resources/translations/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo
index 297516c0..297516c0 100644
--- a/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo
+++ b/src/Wallabag/Wallabag/Resources/translations/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo
Binary files differ
diff --git a/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po b/src/Wallabag/Wallabag/Resources/translations/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po
index e39156e6..e39156e6 100755
--- a/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po
+++ b/src/Wallabag/Wallabag/Resources/translations/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po
diff --git a/locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo b/src/Wallabag/Wallabag/Resources/translations/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo
index c1ce317f..c1ce317f 100644
--- a/locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo
+++ b/src/Wallabag/Wallabag/Resources/translations/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo
Binary files differ
diff --git a/locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.po b/src/Wallabag/Wallabag/Resources/translations/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.po
index e1453922..e1453922 100644
--- a/locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.po
+++ b/src/Wallabag/Wallabag/Resources/translations/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.po
diff --git a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo b/src/Wallabag/Wallabag/Resources/translations/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo
index 5cbfad16..5cbfad16 100755
--- a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo
+++ b/src/Wallabag/Wallabag/Resources/translations/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo
Binary files differ
diff --git a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po b/src/Wallabag/Wallabag/Resources/translations/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po
index 08f12b7c..08f12b7c 100755
--- a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po
+++ b/src/Wallabag/Wallabag/Resources/translations/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po
diff --git a/locale/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.mo b/src/Wallabag/Wallabag/Resources/translations/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.mo
index 5518fad1..5518fad1 100644
--- a/locale/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.mo
+++ b/src/Wallabag/Wallabag/Resources/translations/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.mo
Binary files differ
diff --git a/locale/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.po b/src/Wallabag/Wallabag/Resources/translations/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.po
index 8ad2eded..8ad2eded 100644
--- a/locale/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.po
+++ b/src/Wallabag/Wallabag/Resources/translations/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.po
diff --git a/locale/tools/fillCache.php b/src/Wallabag/Wallabag/Resources/translations/tools/fillCache.php
index bdd9cc58..bdd9cc58 100755
--- a/locale/tools/fillCache.php
+++ b/src/Wallabag/Wallabag/Resources/translations/tools/fillCache.php
diff --git a/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo b/src/Wallabag/Wallabag/Resources/translations/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo
index 4884abf5..4884abf5 100755
--- a/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo
+++ b/src/Wallabag/Wallabag/Resources/translations/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo
Binary files differ
diff --git a/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po b/src/Wallabag/Wallabag/Resources/translations/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po
index 08797705..08797705 100755
--- a/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po
+++ b/src/Wallabag/Wallabag/Resources/translations/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po
diff --git a/inc/poche/Routing.class.php b/src/Wallabag/Wallabag/Routing.php
index be06a433..85b6af1e 100755
--- a/inc/poche/Routing.class.php
+++ b/src/Wallabag/Wallabag/Routing.php
@@ -8,6 +8,8 @@
8 * @license http://opensource.org/licenses/MIT see COPYING file 8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */ 9 */
10 10
11namespace Wallabag\Wallabag;
12
11class Routing 13class Routing
12{ 14{
13 protected $wallabag; 15 protected $wallabag;
@@ -20,7 +22,7 @@ class Routing
20 protected $defaultVars = array(); 22 protected $defaultVars = array();
21 protected $vars = array(); 23 protected $vars = array();
22 24
23 public function __construct(Poche $wallabag) 25 public function __construct(Wallabag $wallabag)
24 { 26 {
25 $this->wallabag = $wallabag; 27 $this->wallabag = $wallabag;
26 $this->_init(); 28 $this->_init();
diff --git a/inc/poche/Template.class.php b/src/Wallabag/Wallabag/Template.php
index 4d0bfdbb..e8a6daa3 100644
--- a/inc/poche/Template.class.php
+++ b/src/Wallabag/Wallabag/Template.php
@@ -8,6 +8,8 @@
8 * @license http://opensource.org/licenses/MIT see COPYING file 8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */ 9 */
10 10
11namespace Wallabag\Wallabag;
12
11class Template extends Twig_Environment 13class Template extends Twig_Environment
12{ 14{
13 protected $wallabag; 15 protected $wallabag;
@@ -15,7 +17,7 @@ class Template extends Twig_Environment
15 private $canRenderTemplates = TRUE; 17 private $canRenderTemplates = TRUE;
16 private $currentTheme = ''; 18 private $currentTheme = '';
17 19
18 public function __construct(Poche $wallabag) 20 public function __construct(Wallabag $wallabag)
19 { 21 {
20 $this->wallabag = $wallabag; 22 $this->wallabag = $wallabag;
21 23
diff --git a/inc/poche/Tools.class.php b/src/Wallabag/Wallabag/Tools.php
index d625fc40..19d98614 100755
--- a/inc/poche/Tools.class.php
+++ b/src/Wallabag/Wallabag/Tools.php
@@ -8,6 +8,8 @@
8 * @license http://opensource.org/licenses/MIT see COPYING file 8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */ 9 */
10 10
11namespace Wallabag\Wallabag;
12
11final class Tools 13final class Tools
12{ 14{
13 /** 15 /**
diff --git a/inc/poche/Url.class.php b/src/Wallabag/Wallabag/Url.php
index d9172b7d..b18fe3d4 100644
--- a/inc/poche/Url.class.php
+++ b/src/Wallabag/Wallabag/Url.php
@@ -8,6 +8,8 @@
8 * @license http://opensource.org/licenses/MIT see COPYING file 8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */ 9 */
10 10
11namespace Wallabag\Wallabag;
12
11class Url 13class Url
12{ 14{
13 public $url; 15 public $url;
diff --git a/inc/poche/User.class.php b/src/Wallabag/Wallabag/User.php
index eaadd3e5..4a10c2ed 100644
--- a/inc/poche/User.class.php
+++ b/src/Wallabag/Wallabag/User.php
@@ -8,6 +8,8 @@
8 * @license http://opensource.org/licenses/MIT see COPYING file 8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */ 9 */
10 10
11namespace Wallabag\Wallabag;
12
11class User 13class User
12{ 14{
13 public $id; 15 public $id;
diff --git a/inc/poche/Poche.class.php b/src/Wallabag/Wallabag/Wallabag.php
index 8b0d3a19..c172a95d 100755
--- a/inc/poche/Poche.class.php
+++ b/src/Wallabag/Wallabag/Wallabag.php
@@ -8,7 +8,9 @@
8 * @license http://opensource.org/licenses/MIT see COPYING file 8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */ 9 */
10 10
11class Poche 11namespace Wallabag\Wallabag;
12
13class Wallabag
12{ 14{
13 /** 15 /**
14 * @var User 16 * @var User
diff --git a/tests/Wallabag/Wallabag/Tests/EntryTest.php b/tests/Wallabag/Wallabag/Tests/EntryTest.php
index 2c3bf2fc..dfff9fd4 100644
--- a/tests/Wallabag/Wallabag/Tests/EntryTest.php
+++ b/tests/Wallabag/Wallabag/Tests/EntryTest.php
@@ -12,7 +12,7 @@ namespace wallabag\wallabag\Tests;
12 12
13class EntryTest extends \PHPUnit_Framework_TestCase 13class EntryTest extends \PHPUnit_Framework_TestCase
14{ 14{
15 public function testFoo() 15 public function testCreateUser()
16 { 16 {
17 $this->assertTrue(true); 17 $this->assertTrue(true);
18 } 18 }
diff --git a/web/index.php b/web/index.php
new file mode 100644
index 00000000..05355727
--- /dev/null
+++ b/web/index.php
@@ -0,0 +1,27 @@
1<?php
2/**
3 * wallabag, self hostable application allowing you to not miss any content anymore
4 *
5 * @category wallabag
6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013
8 * @license http://opensource.org/licenses/MIT see COPYING file
9 */
10
11define ('WALLABAG', '2.0.0-alpha');
12
13require_once '../app/check_essentials.php';
14require_once '../app/check_setup.php';
15require_once '../app/config/global.inc.php';
16
17// Check if /cache is writeable
18if (! is_writable(CACHE)) {
19 die('The directory ' . CACHE . ' must be writeable by your web server user');
20}
21
22Session::$sessionName = 'wallabag';
23Session::init();
24
25// Let's rock !
26$wallabag = new Wallabag\Wallabag\Wallabag();
27$wallabag->run(); \ No newline at end of file
diff --git a/robots.txt b/web/robots.txt
index 77470cb3..77470cb3 100644
--- a/robots.txt
+++ b/web/robots.txt