7 files changed, 73 insertions, 17 deletions

diff --git a/app/DoctrineMigrations/Version20170501115751.php b/app/DoctrineMigrations/Version20170501115751.php
new file mode 100644
index 00000000..7f068eb8
--- /dev/null
+++ b/app/DoctrineMigrations/Version20170501115751.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Application\Migrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Add site credential table to store username & password for some website (behind authentication or paywall)
+ */
+class Version20170501115751 extends AbstractMigration implements ContainerAwareInterface
+{
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix').$tableName;
+    }
+
+    /**
+     * @param Schema $schema
+     */
+    public function up(Schema $schema)
+    {
+        $this->skipIf($schema->hasTable($this->getTable('site_credential')), 'It seems that you already played this migration.');
+
+        $table = $schema->createTable($this->getTable('site_credential'));
+        $table->addColumn('id', 'integer', ['autoincrement' => true]);
+        $table->addColumn('user_id', 'integer');
+        $table->addColumn('host', 'string', ['length' => 255]);
+        $table->addColumn('username', 'text');
+        $table->addColumn('password', 'text');
+        $table->addColumn('createdAt', 'datetime');
+        $table->addIndex(['user_id'], 'idx_user');
+        $table->setPrimaryKey(['id']);
+        $table->addForeignKeyConstraint($this->getTable('user'), ['user_id'], ['id'], [], 'fk_user');
+
+        if ('postgresql' === $this->connection->getDatabasePlatform()->getName()) {
+            $schema->dropSequence('site_credential_id_seq');
+            $schema->createSequence('site_credential_id_seq');
+        }
+    }
+
+    /**
+     * @param Schema $schema
+     */
+    public function down(Schema $schema)
+    {
+        $schema->dropTable($this->getTable('site_credential'));
+    }
+}
diff --git a/app/Resources/static/themes/baggy/index.js b/app/Resources/static/themes/baggy/index.js
index 5d448018..39ad49aa 100755
--- a/app/Resources/static/themes/baggy/index.js
+++ b/app/Resources/static/themes/baggy/index.js
@@ -256,8 +256,7 @@ $(document).ready(() => {
    ========================================================================== */
 
   $('article a[href^="http"]').after(
-      () => `<a href="${$(this).attr('href')}" class="add-to-wallabag-link-after" ` +
-      'title="add to wallabag"></a>',
+    () => `<a href="${$(this).attr('href')}" class="add-to-wallabag-link-after" title="add to wallabag"></a>`,
   );
 
   $('.add-to-wallabag-link-after').click((event) => {
diff --git a/app/Resources/static/themes/material/css/layout.scss b/app/Resources/static/themes/material/css/layout.scss
index ed32f125..cfdbf2b3 100755
--- a/app/Resources/static/themes/material/css/layout.scss
+++ b/app/Resources/static/themes/material/css/layout.scss
@@ -18,12 +18,6 @@ body {
   border-bottom: 1px solid #ddd;
 }
 
-nav,
-body:not(.entry) main,
-footer {
-  padding-left: 240px;
-}
-
 main,
 #content,
 .valign-wrapper {
diff --git a/app/Resources/static/themes/material/css/media_queries.scss b/app/Resources/static/themes/material/css/media_queries.scss
index 96f34494..08c2d8ab 100644
--- a/app/Resources/static/themes/material/css/media_queries.scss
+++ b/app/Resources/static/themes/material/css/media_queries.scss
@@ -2,16 +2,19 @@
    Media queries
    ========================================================================== */
 
-@media only screen and (max-width: 992px) {
-  header,
-  main,
+@media only screen and (min-width: 992px) {
+  nav,
+  body:not(.entry) main,
   footer {
-    padding-left: 0;
+    padding-left: 240px;
   }
+}
 
-  nav,
+@media only screen and (max-width: 992px) {
+  header,
   main,
-  footer {
+  footer,
+  nav {
     padding-left: 0;
   }
 
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 914fb1ef..b3fe11c8 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -60,6 +60,3 @@ parameters:
     redis_port: 6379
     redis_path: null
     redis_password: null
-
-    # sites credentials
-    sites_credentials: {}
diff --git a/app/config/security.yml b/app/config/security.yml
index ffb1d356..e14a0bd1 100644
--- a/app/config/security.yml
+++ b/app/config/security.yml
@@ -61,6 +61,7 @@ security:
         - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: /tags/(.*).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/share, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/settings, roles: ROLE_SUPER_ADMIN }
         - { path: ^/annotations, roles: ROLE_USER }
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
index 51b7e4e3..b45934e4 100644
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@@ -26,6 +26,7 @@ wallabag_core:
     fetching_error_message: |
         wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
     api_limit_mass_actions: 10
+    encryption_key_path: "%kernel.root_dir%/../data/site-credentials-secret-key.txt"
     default_internal_settings:
         -
             name: share_public