From 6ad93dff69d7c2beb2196e73f641e6484fccbeb7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 20 Jan 2015 07:40:39 +0100 Subject: [PATCH 1/1] new folders --- .gitignore | 9 ++-- TRANSLATION.md | 0 {cache => app/cache}/.gitignore | 0 {cache => app/cache}/.htaccess | 0 .../check_essentials.php | 0 app/check_setup.php | 9 ++++ .../config}/config.inc.default.php | 8 ++-- app/config/global.inc.php | 25 ++++++++++ {assets => app/db}/.gitignore | 0 {db => app/db}/.htaccess | 0 app/db/poche.sqlite | Bin 0 -> 491520 bytes check_setup.php | 12 ----- composer.json | 3 ++ composer.lock | 2 +- db/.gitignore | 0 inc/poche/global.inc.php | 43 ------------------ index.php | 22 --------- locale/.htaccess | 2 - migrations/20150119171459_init_database.php | 27 +++++++++++ phinx.yml | 17 +++++++ .../Wallabag/Wallabag/Database.php | 4 +- .../Wallabag/Wallabag/Ebooks.php | 6 ++- .../Wallabag/Wallabag/FlattrItem.php | 2 + .../Wallabag/Wallabag/Language.php | 4 +- .../Wallabag/Wallabag/Picture.php | 1 + .../cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo | Bin .../cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po | 0 .../de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo | Bin .../de_DE.utf8/LC_MESSAGES/de_DE.utf8.po | 0 .../en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo | Bin .../en_EN.utf8/LC_MESSAGES/en_EN.utf8.po | 0 .../en_US.utf8/LC_MESSAGES/en_US.utf8.mo | Bin .../en_US.utf8/LC_MESSAGES/en_US.utf8.po | 0 .../es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo | Bin .../es_ES.utf8/LC_MESSAGES/es_ES.utf8.po | 0 .../fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo | Bin .../fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po | 0 .../fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo | Bin .../fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po | 0 .../it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo | Bin .../it_IT.utf8/LC_MESSAGES/it_IT.utf8.po | 0 .../pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo | Bin .../pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po | 0 .../pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo | Bin .../pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.po | 0 .../ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo | Bin .../ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po | 0 .../sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.mo | Bin .../sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.po | 0 .../translations}/tools/fillCache.php | 0 .../uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo | Bin .../uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po | 0 .../Wallabag/Wallabag/Routing.php | 4 +- .../Wallabag/Wallabag/Template.php | 4 +- .../Wallabag/Wallabag/Tools.php | 2 + .../Wallabag/Wallabag/Url.php | 2 + .../Wallabag/Wallabag/User.php | 2 + .../Wallabag/Wallabag/Wallabag.php | 4 +- tests/Wallabag/Wallabag/Tests/EntryTest.php | 2 +- web/index.php | 27 +++++++++++ robots.txt => web/robots.txt | 0 61 files changed, 146 insertions(+), 97 deletions(-) mode change 100755 => 100644 TRANSLATION.md rename {cache => app/cache}/.gitignore (100%) rename {cache => app/cache}/.htaccess (100%) rename check_essentials.php => app/check_essentials.php (100%) create mode 100755 app/check_setup.php rename {inc/poche => app/config}/config.inc.default.php (89%) create mode 100755 app/config/global.inc.php rename {assets => app/db}/.gitignore (100%) mode change 100755 => 100644 rename {db => app/db}/.htaccess (100%) create mode 100755 app/db/poche.sqlite delete mode 100755 check_setup.php delete mode 100644 db/.gitignore delete mode 100755 inc/poche/global.inc.php delete mode 100755 index.php delete mode 100644 locale/.htaccess create mode 100644 migrations/20150119171459_init_database.php create mode 100644 phinx.yml rename inc/poche/Database.class.php => src/Wallabag/Wallabag/Database.php (99%) rename inc/poche/WallabagEBooks.class.php => src/Wallabag/Wallabag/Ebooks.php (99%) rename inc/poche/FlattrItem.class.php => src/Wallabag/Wallabag/FlattrItem.php (98%) rename inc/poche/Language.class.php => src/Wallabag/Wallabag/Language.php (97%) rename inc/poche/pochePictures.php => src/Wallabag/Wallabag/Picture.php (99%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/en_US.utf8/LC_MESSAGES/en_US.utf8.mo (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/en_US.utf8/LC_MESSAGES/en_US.utf8.po (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.po (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.mo (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.po (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/tools/fillCache.php (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo (100%) rename {locale => src/Wallabag/Wallabag/Resources/translations}/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po (100%) rename inc/poche/Routing.class.php => src/Wallabag/Wallabag/Routing.php (98%) rename inc/poche/Template.class.php => src/Wallabag/Wallabag/Template.php (98%) rename inc/poche/Tools.class.php => src/Wallabag/Wallabag/Tools.php (99%) rename inc/poche/Url.class.php => src/Wallabag/Wallabag/Url.php (95%) rename inc/poche/User.class.php => src/Wallabag/Wallabag/User.php (97%) rename inc/poche/Poche.class.php => src/Wallabag/Wallabag/Wallabag.php (99%) create mode 100644 web/index.php rename robots.txt => web/robots.txt (100%) diff --git a/.gitignore b/.gitignore index 5b34c79f..e4979f31 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,8 @@ .DS_Store -assets/* -cache/* +.vagrant +app/assets/* +app/cache/* vendor composer.phar db/poche.sqlite -inc/poche/config.inc.php -inc/3rdparty/htmlpurifier/HTMLPurifier/DefinitionCache/Serializer/ -.vagrant \ No newline at end of file +app/config/config.inc.php \ No newline at end of file diff --git a/TRANSLATION.md b/TRANSLATION.md old mode 100755 new mode 100644 diff --git a/cache/.gitignore b/app/cache/.gitignore similarity index 100% rename from cache/.gitignore rename to app/cache/.gitignore diff --git a/cache/.htaccess b/app/cache/.htaccess similarity index 100% rename from cache/.htaccess rename to app/cache/.htaccess diff --git a/check_essentials.php b/app/check_essentials.php similarity index 100% rename from check_essentials.php rename to 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 @@ + + * @copyright 2013 + * @license http://opensource.org/licenses/MIT see COPYING file + */ + +define('ROOT', dirname(__FILE__) . '/../..'); + +require_once ROOT . '/vendor/autoload.php'; + +# system configuration; database credentials et caetera +require_once dirname(__FILE__) . '/config.inc.php'; +require_once dirname(__FILE__) . '/config.inc.default.php'; + +if (!ini_get('date.timezone') || !@date_default_timezone_set(ini_get('date.timezone'))) { + date_default_timezone_set('UTC'); +} + +if (defined('ERROR_REPORTING')) { + error_reporting(ERROR_REPORTING); +} \ No newline at end of file diff --git a/assets/.gitignore b/app/db/.gitignore old mode 100755 new mode 100644 similarity index 100% rename from assets/.gitignore rename to app/db/.gitignore diff --git a/db/.htaccess b/app/db/.htaccess similarity index 100% rename from db/.htaccess rename to app/db/.htaccess diff --git a/app/db/poche.sqlite b/app/db/poche.sqlite new file mode 100755 index 0000000000000000000000000000000000000000..3d1a8e43b3b169bd9762171e8a92cd52cf9da782 GIT binary patch literal 491520 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 literal 0 HcmV?d00001 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 @@ - - * @copyright 2013 - * @license http://opensource.org/licenses/MIT see COPYING file - */ - -# the poche system root directory (/inc) -define('INCLUDES', dirname(__FILE__) . '/..'); - -# the poche root directory -define('ROOT', INCLUDES . '/..'); - -require_once ROOT . '/vendor/autoload.php'; -require_once INCLUDES . '/poche/Tools.class.php'; -require_once INCLUDES . '/poche/User.class.php'; -require_once INCLUDES . '/poche/Url.class.php'; -require_once INCLUDES . '/poche/Template.class.php'; -require_once INCLUDES . '/poche/Language.class.php'; -require_once INCLUDES . '/poche/Routing.class.php'; -require_once INCLUDES . '/poche/WallabagEBooks.class.php'; -require_once INCLUDES . '/poche/Poche.class.php'; -require_once INCLUDES . '/poche/Database.class.php'; -require_once INCLUDES . '/poche/FlattrItem.class.php'; - -# system configuration; database credentials et caetera -require_once INCLUDES . '/poche/config.inc.php'; -require_once INCLUDES . '/poche/config.inc.default.php'; - -if (DOWNLOAD_PICTURES) { - require_once INCLUDES . '/poche/pochePictures.php'; -} - -if (!ini_get('date.timezone') || !@date_default_timezone_set(ini_get('date.timezone'))) { - date_default_timezone_set('UTC'); -} - -if (defined('ERROR_REPORTING')) { - error_reporting(ERROR_REPORTING); -} \ 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 @@ - - * @copyright 2013 - * @license http://opensource.org/licenses/MIT see COPYING file - */ - -define ('POCHE', '1.8.1'); -require 'check_essentials.php'; -require 'check_setup.php'; -require_once 'inc/poche/global.inc.php'; - -// Start session -Session::$sessionName = 'wallabag'; -Session::init(); - -// Let's rock ! -$wallabag = new Poche(); -$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 @@ -Order deny,allow -Deny 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 @@ +execute("CREATE TABLE IF NOT EXISTS `montest` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL, + `value` varchar(255) NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8;"); + } + + /** + * Migrate Down. + */ + public function down() + { + $this->execute("DROP DATABASE montest;"); + } +} \ 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 @@ +paths: + migrations: %%PHINX_CONFIG_DIR%%/migrations + +environments: + default_migration_table: phinxlog + default_database: development + production: + adapter: sqlite + name: db/poche + + development: + adapter: sqlite + name: db/poche + + testing: + adapter: sqlite + name: db/poche diff --git a/inc/poche/Database.class.php b/src/Wallabag/Wallabag/Database.php similarity index 99% rename from inc/poche/Database.class.php rename to 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 @@ * @license http://opensource.org/licenses/MIT see COPYING file */ +namespace Wallabag\Wallabag; + class Database { var $handle; @@ -25,7 +27,7 @@ class Database { case 'sqlite': // Check if /db is writeable if ( !is_writable(STORAGE_SQLITE) || !is_writable(dirname(STORAGE_SQLITE))) { - die('An error occured: "db" directory must be writeable for your web server user!'); + die('An error occured: ' . STORAGE_SQLITE . ' directory must be writeable for your web server user!'); } $db_path = 'sqlite:' . STORAGE_SQLITE; $this->handle = new PDO($db_path); diff --git a/inc/poche/WallabagEBooks.class.php b/src/Wallabag/Wallabag/Ebooks.php similarity index 99% rename from inc/poche/WallabagEBooks.class.php rename to 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 @@ * @license http://opensource.org/licenses/MIT see COPYING file */ -class WallabagEBooks +namespace Wallabag\Wallabag; + +class Ebooks { protected $wallabag; protected $method; @@ -18,7 +20,7 @@ class WallabagEBooks protected $bookFileName; protected $author = 'wallabag'; - public function __construct(Poche $wallabag, $method, $value) + public function __construct(Wallabag $wallabag, $method, $value) { $this->wallabag = $wallabag; $this->method = $method; diff --git a/inc/poche/FlattrItem.class.php b/src/Wallabag/Wallabag/FlattrItem.php similarity index 98% rename from inc/poche/FlattrItem.class.php rename to 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 @@ * @license http://opensource.org/licenses/MIT see COPYING file */ +namespace Wallabag\Wallabag; + class FlattrItem { public $status; diff --git a/inc/poche/Language.class.php b/src/Wallabag/Wallabag/Language.php similarity index 97% rename from inc/poche/Language.class.php rename to 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 @@ * @license http://opensource.org/licenses/MIT see COPYING file */ +namespace Wallabag\Wallabag; + class Language { protected $wallabag; @@ -30,7 +32,7 @@ class Language 'uk_UA.utf8' => 'Українська', ); - public function __construct(Poche $wallabag) + public function __construct(Wallabag $wallabag) { $this->wallabag = $wallabag; $pocheUser = Session::getParam('poche_user'); diff --git a/inc/poche/pochePictures.php b/src/Wallabag/Wallabag/Picture.php similarity index 99% rename from inc/poche/pochePictures.php rename to src/Wallabag/Wallabag/Picture.php index 52394c70..8a9cd764 100644 --- a/inc/poche/pochePictures.php +++ b/src/Wallabag/Wallabag/Picture.php @@ -8,6 +8,7 @@ * @license http://opensource.org/licenses/MIT see COPYING file */ +namespace Wallabag\Wallabag; final class Picture { 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 similarity index 100% rename from locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo rename to src/Wallabag/Wallabag/Resources/translations/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo 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 similarity index 100% rename from locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po rename to 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 similarity index 100% rename from locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo rename to src/Wallabag/Wallabag/Resources/translations/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo 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 similarity index 100% rename from locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po rename to 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 similarity index 100% rename from locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo rename to src/Wallabag/Wallabag/Resources/translations/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo 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 similarity index 100% rename from locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po rename to 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 similarity index 100% rename from locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo rename to src/Wallabag/Wallabag/Resources/translations/en_US.utf8/LC_MESSAGES/en_US.utf8.mo 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 similarity index 100% rename from locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po rename to 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 similarity index 100% rename from locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo rename to src/Wallabag/Wallabag/Resources/translations/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo 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 similarity index 100% rename from locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po rename to 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 similarity index 100% rename from locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo rename to src/Wallabag/Wallabag/Resources/translations/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo 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 similarity index 100% rename from locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po rename to 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 similarity index 100% rename from locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo rename to src/Wallabag/Wallabag/Resources/translations/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo 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 similarity index 100% rename from locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po rename to 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 similarity index 100% rename from locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo rename to src/Wallabag/Wallabag/Resources/translations/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo 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 similarity index 100% rename from locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po rename to 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 similarity index 100% rename from locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo rename to src/Wallabag/Wallabag/Resources/translations/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo 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 similarity index 100% rename from locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po rename to 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 similarity index 100% rename from locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo rename to src/Wallabag/Wallabag/Resources/translations/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo 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 similarity index 100% rename from locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.po rename to 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 similarity index 100% rename from locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo rename to src/Wallabag/Wallabag/Resources/translations/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo 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 similarity index 100% rename from locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po rename to 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 similarity index 100% rename from locale/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.mo rename to src/Wallabag/Wallabag/Resources/translations/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.mo 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 similarity index 100% rename from locale/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.po rename to 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 similarity index 100% rename from locale/tools/fillCache.php rename to 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 similarity index 100% rename from locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo rename to src/Wallabag/Wallabag/Resources/translations/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo 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 similarity index 100% rename from locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po rename to 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 similarity index 98% rename from inc/poche/Routing.class.php rename to 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 @@ * @license http://opensource.org/licenses/MIT see COPYING file */ +namespace Wallabag\Wallabag; + class Routing { protected $wallabag; @@ -20,7 +22,7 @@ class Routing protected $defaultVars = array(); protected $vars = array(); - public function __construct(Poche $wallabag) + public function __construct(Wallabag $wallabag) { $this->wallabag = $wallabag; $this->_init(); diff --git a/inc/poche/Template.class.php b/src/Wallabag/Wallabag/Template.php similarity index 98% rename from inc/poche/Template.class.php rename to 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 @@ * @license http://opensource.org/licenses/MIT see COPYING file */ +namespace Wallabag\Wallabag; + class Template extends Twig_Environment { protected $wallabag; @@ -15,7 +17,7 @@ class Template extends Twig_Environment private $canRenderTemplates = TRUE; private $currentTheme = ''; - public function __construct(Poche $wallabag) + public function __construct(Wallabag $wallabag) { $this->wallabag = $wallabag; diff --git a/inc/poche/Tools.class.php b/src/Wallabag/Wallabag/Tools.php similarity index 99% rename from inc/poche/Tools.class.php rename to 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 @@ * @license http://opensource.org/licenses/MIT see COPYING file */ +namespace Wallabag\Wallabag; + final class Tools { /** diff --git a/inc/poche/Url.class.php b/src/Wallabag/Wallabag/Url.php similarity index 95% rename from inc/poche/Url.class.php rename to 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 @@ * @license http://opensource.org/licenses/MIT see COPYING file */ +namespace Wallabag\Wallabag; + class Url { public $url; diff --git a/inc/poche/User.class.php b/src/Wallabag/Wallabag/User.php similarity index 97% rename from inc/poche/User.class.php rename to 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 @@ * @license http://opensource.org/licenses/MIT see COPYING file */ +namespace Wallabag\Wallabag; + class User { public $id; diff --git a/inc/poche/Poche.class.php b/src/Wallabag/Wallabag/Wallabag.php similarity index 99% rename from inc/poche/Poche.class.php rename to 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 @@ * @license http://opensource.org/licenses/MIT see COPYING file */ -class Poche +namespace Wallabag\Wallabag; + +class Wallabag { /** * @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; class EntryTest extends \PHPUnit_Framework_TestCase { - public function testFoo() + public function testCreateUser() { $this->assertTrue(true); } 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 @@ + + * @copyright 2013 + * @license http://opensource.org/licenses/MIT see COPYING file + */ + +define ('WALLABAG', '2.0.0-alpha'); + +require_once '../app/check_essentials.php'; +require_once '../app/check_setup.php'; +require_once '../app/config/global.inc.php'; + +// Check if /cache is writeable +if (! is_writable(CACHE)) { + die('The directory ' . CACHE . ' must be writeable by your web server user'); +} + +Session::$sessionName = 'wallabag'; +Session::init(); + +// Let's rock ! +$wallabag = new Wallabag\Wallabag\Wallabag(); +$wallabag->run(); \ No newline at end of file diff --git a/robots.txt b/web/robots.txt similarity index 100% rename from robots.txt rename to web/robots.txt -- 2.41.0