Merge branch 'dev' into hebrew-i18n

13 files changed, 82 insertions, 110 deletions

diff --git a/data/.gitignore b/data/.gitignore
index 20364e266..76314fc12 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -1,9 +1,6 @@
-application.ini
 config.php
-*.sqlite
-touch.txt
-no-cache.txt
-*.bak.php
-*.lock.txt
+config.php.bak.php
+force-https.txt
 last_update.txt
+no-cache.txt
 update.php
diff --git a/data/PubSubHubbub/feeds/.gitignore b/data/PubSubHubbub/feeds/.gitignore
new file mode 100644
index 000000000..d8f9df042
--- /dev/null
+++ b/data/PubSubHubbub/feeds/.gitignore
@@ -0,0 +1,3 @@
+*/
+*/*.json
+*/*.txt
diff --git a/data/PubSubHubbub/feeds/README.md b/data/PubSubHubbub/feeds/README.md
new file mode 100644
index 000000000..a01a3197f
--- /dev/null
+++ b/data/PubSubHubbub/feeds/README.md
@@ -0,0 +1,7 @@
+List of canonical URLS of the various feeds users have subscribed to.
+Several users can have subscribed to the same feed.
+
+* ./base64url(canonicalUrl)/
+	* ./!hub.json
+	* ./user1.txt
+	* ./user2.txt
diff --git a/data/PubSubHubbub/keys/.gitignore b/data/PubSubHubbub/keys/.gitignore
new file mode 100644
index 000000000..2211df63d
--- /dev/null
+++ b/data/PubSubHubbub/keys/.gitignore
@@ -0,0 +1 @@
+*.txt
diff --git a/data/PubSubHubbub/keys/README.md b/data/PubSubHubbub/keys/README.md
new file mode 100644
index 000000000..bb1e57cd4
--- /dev/null
+++ b/data/PubSubHubbub/keys/README.md
@@ -0,0 +1,4 @@
+List of keys given to PubSubHubbub hubs
+
+* ./sha1(random + salt).txt
+	* base64url(canonicalUrl)
diff --git a/data/config.default.php b/data/config.default.php
deleted file mode 100644
index 97df3a299..000000000
--- a/data/config.default.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-return array(
-	'environment' => 'production',
-	'salt' => '',
-	'base_url' => '',
-	'language' => 'en',
-	'title' => 'FreshRSS',
-	'default_user' => '_',
-	'allow_anonymous' => false,
-	'allow_anonymous_refresh' => false,
-	'auth_type' => 'none',
-	'api_enabled' => false,
-	'unsafe_autologin_enabled' => false,
-	'limits' => array(
-		'cache_duration' => 800,
-		'timeout' => 10,
-		'max_inactivity' => PHP_INT_MAX,
-		'max_feeds' => 16384,
-		'max_categories' => 16384,
-	),
-	'db' => array(
-		'type' => 'sqlite',
-		'host' => '',
-		'user' => '',
-		'password' => '',
-		'base' => '',
-		'prefix' => '',
-	),
-	'extensions_enabled' => array(),
-);
diff --git a/data/extensions-data/.gitignore b/data/extensions-data/.gitignore
new file mode 100644
index 000000000..0a00d7014
--- /dev/null
+++ b/data/extensions-data/.gitignore
@@ -0,0 +1 @@
+*/
\ No newline at end of file
diff --git a/data/persona/index.html b/data/extensions-data/index.html
index 85faaa37e..85faaa37e 100644
--- a/data/persona/index.html
+++ b/data/extensions-data/index.html
diff --git a/data/persona/.gitignore b/data/persona/.gitignore
deleted file mode 100644
index 314f02b1b..000000000
--- a/data/persona/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.txt
\ No newline at end of file
diff --git a/data/shares.php b/data/shares.php
index 6e0e9ea0c..5403fd48c 100644
--- a/data/shares.php
+++ b/data/shares.php
@@ -4,7 +4,7 @@
  * This is a configuration file. You shouldn't modify it unless you know what
  * you are doing. If you want to add a share type, this is where you need to do
  * it.
- * 
+ *
  * For each share there is different configuration options. Here is the description
  * of those options:
  *   - url is a mandatory option. It is a string representing the share URL. It
@@ -14,6 +14,10 @@
  *     The ~TITLE~ placeholder represents the title of the shared article.
  *   - transform is an array of transformation to apply on links and titles
  *   - help is a URL to a help page
+ *   - form is the type of form to display during configuration. It's either
+ *     'simple' or 'advanced'. 'simple' is used when only the name is configurable,
+ *     'advanced' is used when the name and the location are configurable.
+ *   - method is the HTTP method (POST or GET) used to share a link.
  */
 
 return array(
@@ -22,12 +26,14 @@ return array(
 		'transform' => array('rawurlencode'),
 		'help' => 'http://sebsauvage.net/wiki/doku.php?id=php:shaarli',
 		'form' => 'advanced',
+		'method' => 'GET',
 	),
 	'blogotext' => array(
 		'url' => '~URL~/admin/links.php?url=~LINK~',
 		'transform' => array(),
 		'help' => 'http://lehollandaisvolant.net/blogotext/fr/',
 		'form' => 'advanced',
+		'method' => 'GET',
 	),
 	'wallabag' => array(
 		'url' => '~URL~?action=add&amp;url=~LINK~',
@@ -37,36 +43,87 @@ return array(
 		),
 		'help' => 'http://www.wallabag.org/',
 		'form' => 'advanced',
+		'method' => 'GET',
+	),
+	'wallabagv2' => array(
+		'url' => '~URL~/bookmarklet?url=~LINK~',
+		'transform' => array(
+			'link' => array('rawurlencode'),
+			'title' => array(),
+		),
+		'help' => 'http://www.wallabag.org/',
+		'form' => 'advanced',
+		'method' => 'GET',
 	),
 	'diaspora' => array(
 		'url' => '~URL~/bookmarklet?url=~LINK~&amp;title=~TITLE~',
 		'transform' => array('rawurlencode'),
 		'help' => 'https://diasporafoundation.org/',
 		'form' => 'advanced',
+		'method' => 'GET',
+	),
+	'movim' => array(
+		'url' => '~URL~/?share/~LINK~',
+		'transform' => array('rawurlencode', 'urlencode'),
+		'help' => 'https://github.com/edhelas/movim',
+		'form' => 'advanced',
+		'method' => 'GET',
 	),
 	'twitter' => array(
 		'url' => 'https://twitter.com/share?url=~LINK~&amp;text=~TITLE~',
 		'transform' => array('rawurlencode'),
 		'form' => 'simple',
+		'method' => 'GET',
 	),
 	'g+' => array(
 		'url' => 'https://plus.google.com/share?url=~LINK~',
 		'transform' => array('rawurlencode'),
 		'form' => 'simple',
+		'method' => 'GET',
 	),
 	'facebook' => array(
 		'url' => 'https://www.facebook.com/sharer.php?u=~LINK~&amp;t=~TITLE~',
 		'transform' => array('rawurlencode'),
 		'form' => 'simple',
+		'method' => 'GET',
 	),
 	'email' => array(
 		'url' => 'mailto:?subject=~TITLE~&amp;body=~LINK~',
 		'transform' => array('rawurlencode'),
 		'form' => 'simple',
+		'method' => 'GET',
 	),
 	'print' => array(
 		'url' => '#',
 		'transform' => array(),
 		'form' => 'simple',
+		'method' => 'GET',
+	),
+	'jdh' => array(
+		'url' => 'https://www.journalduhacker.net/stories/new?url=~LINK~&title=~TITLE~',
+		'transform' => array('rawurlencode'),
+		'form' => 'simple',
+		'method' => 'GET',
+	),
+	'Known' => array(
+		'url' => '~URL~/share?share_url=~LINK~&share_title=~TITLE~',
+		'transform' => array('rawurlencode'),
+		'help' => 'https://withknown.com/',
+		'form' => 'advanced',
+		'method' => 'GET',
+	),
+	'gnusocial' => array(
+		'url' => '~URL~/notice/new?content=~TITLE~%20~LINK~',
+		'transform' => array('urlencode'),
+		'help' => 'https://gnu.io/social/',
+		'form' => 'advanced',
+		'method' => 'GET',
+	),
+	'mastodon' => array(
+		'url' => '~URL~/api/v1/statuses',
+		'transform' => array(),
+		'form' => 'advanced',
+		'method' => 'POST',
+		'field' => 'status',
 	),
 );
diff --git a/data/users/.gitignore b/data/users/.gitignore
index a8b7cd60f..3705c06b7 100644
--- a/data/users/.gitignore
+++ b/data/users/.gitignore
@@ -1,4 +1,5 @@
-db.sqlite
-config.php
-log*.txt
-
+*/
+*/config.php
+*/db.sqlite
+!_/
+*/log*.txt
diff --git a/data/users/_/.gitignore b/data/users/_/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/users/_/.gitignore
diff --git a/data/users/_/config.default.php b/data/users/_/config.default.php
deleted file mode 100644
index 6d3f73a13..000000000
--- a/data/users/_/config.default.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-return array (
-	'language' => 'en',
-	'old_entries' => 3,
-	'keep_history_default' => 0,
-	'ttl_default' => 3600,
-	'mail_login' => '',
-	'token' => '',
-	'passwordHash' => '',
-	'apiPasswordHash' => '',
-	'posts_per_page' => 20,
-	'view_mode' => 'normal',
-	'default_view' => 'adaptive',
-	'default_state' => FreshRSS_Entry::STATE_NOT_READ,
-	'auto_load_more' => true,
-	'display_posts' => false,
-	'display_categories' => false,
-	'hide_read_feeds' => true,
-	'onread_jump_next' => true,
-	'lazyload' => true,
-	'sticky_post' => true,
-	'reading_confirm' => false,
-	'auto_remove_article' => false,
-	'sort_order' => 'DESC',
-	'anon_access' => false,
-	'mark_when' => array (
-		'article' => true,
-		'site' => true,
-		'scroll' => false,
-		'reception' => false,
-	),
-	'theme' => 'Origine',
-	'content_width' => 'thin',
-	'shortcuts' => array (
-		'mark_read' => 'r',
-		'mark_favorite' => 'f',
-		'go_website' => 'space',
-		'next_entry' => 'j',
-		'prev_entry' => 'k',
-		'first_entry' => 'home',
-		'last_entry' => 'end',
-		'collapse_entry' => 'c',
-		'load_more' => 'm',
-		'auto_share' => 's',
-		'focus_search' => 'a',
-		'user_filter' => 'u',
-		'help' => 'f1',
-		'close_dropdown' => 'escape',
-	),
-	'topline_read' => true,
-	'topline_favorite' => true,
-	'topline_date' => true,
-	'topline_link' => true,
-	'bottomline_read' => true,
-	'bottomline_favorite' => true,
-	'bottomline_sharing' => true,
-	'bottomline_tags' => true,
-	'bottomline_date' => true,
-	'bottomline_link' => true,
-	'sharing' => array (
-	),
-	'queries' => array (
-	),
-	'html5_notif_timeout' => 0,
-	'extensions_enabled' => array(),
-);