From cbfdcff2615e901bdc434d06f38a3da8eecbdf8b Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sun, 31 Jul 2016 10:46:17 +0200 Subject: Prepare settings for the API in the admin page and during the install API settings: - api.enabled - api.secret The API settings will be initialized (and the secret generated) with an update method. --- tpl/configure.html | 14 ++++++++++++++ tpl/install.html | 12 ++++++++++++ 2 files changed, 26 insertions(+) (limited to 'tpl') diff --git a/tpl/configure.html b/tpl/configure.html index 983bcd08..a015770e 100644 --- a/tpl/configure.html +++ b/tpl/configure.html @@ -80,6 +80,20 @@ + + Enable API + + + + + + + API secret + + + + diff --git a/tpl/install.html b/tpl/install.html index 88eb540e..eda4c54d 100644 --- a/tpl/install.html +++ b/tpl/install.html @@ -14,6 +14,18 @@ Update: + + + API: + + + + + + -- cgit v1.2.3 From 18e6796726d73d7dc90ecdd16c181493941f5487 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Thu, 15 Dec 2016 10:13:00 +0100 Subject: REST API structure using Slim framework * REST API routes are handle by Slim. * Every API controller go through ApiMiddleware which handles security. * First service implemented `/info`, for tests purpose. --- tpl/configure.html | 2 +- tpl/install.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tpl') diff --git a/tpl/configure.html b/tpl/configure.html index a015770e..b4197bf9 100644 --- a/tpl/configure.html +++ b/tpl/configure.html @@ -81,7 +81,7 @@ - Enable API + Enable REST API diff --git a/tpl/install.html b/tpl/install.html index eda4c54d..42874dcd 100644 --- a/tpl/install.html +++ b/tpl/install.html @@ -21,7 +21,7 @@ -- cgit v1.2.3 From 4cfe8d330319d83c3024a4149afeca0138922fda Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Thu, 15 Dec 2016 10:57:11 +0100 Subject: Fixes can login function call in loginform.html Fixes #711 --- tpl/loginform.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tpl') diff --git a/tpl/loginform.html b/tpl/loginform.html index a49b42d3..84176385 100644 --- a/tpl/loginform.html +++ b/tpl/loginform.html @@ -2,7 +2,7 @@ {include="includes"} - {if="!ban_canLogin()"} + {if="!ban_canLogin($conf)"} You have been banned from login after too many failed attempts. Try later. {else}
-- cgit v1.2.3 From f4ebd5fed20b29c4fb580983b4be7bd0a52151b9 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 5 Nov 2016 14:13:18 +0100 Subject: Bugfixes on link deletion, and use a GET form Use a GET form to delete links: harmonize with edit_link and preparation for #585 Bug fixes: * LinkDB element can't be passed as reference, fix error: PHP Notice: Indirect modification of overloaded element of LinkDB has no effect * Resource cache folder setting wasn't set correctly --- tpl/linklist.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tpl') diff --git a/tpl/linklist.html b/tpl/linklist.html index 0f1a5e8c..d4232342 100644 --- a/tpl/linklist.html +++ b/tpl/linklist.html @@ -84,7 +84,7 @@
-
+ -- cgit v1.2.3 From 085efc33cc0cadaed0c01d926604e219e1d44365 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 2 Aug 2016 11:55:11 +0200 Subject: Add plugin placeholders in RSS and ATOM feeds templates --- tpl/feed.atom.html | 11 ++++++----- tpl/feed.rss.html | 10 ++++++---- 2 files changed, 12 insertions(+), 9 deletions(-) (limited to 'tpl') diff --git a/tpl/feed.atom.html b/tpl/feed.atom.html index aead0459..29187505 100644 --- a/tpl/feed.atom.html +++ b/tpl/feed.atom.html @@ -6,11 +6,9 @@ {$last_update} {/if} - {if="!empty($pubsubhub_url)"} - - - - {/if} + {loop="$plugins_feed_header"} + {$value} + {/loop} {$index_url} {$index_url} @@ -34,6 +32,9 @@ {loop="$value.taglist"} {/loop} + {loop="$value.feed_plugins"} + {$value} + {/loop} {/loop} diff --git a/tpl/feed.rss.html b/tpl/feed.rss.html index e18dbf9b..66d9a869 100644 --- a/tpl/feed.rss.html +++ b/tpl/feed.rss.html @@ -8,10 +8,9 @@ {$index_url} Shaarli - {if="!empty($pubsubhub_url)"} - - - {/if} + {loop="$plugins_feed_header"} + {$value} + {/loop} {loop="$links"} {$value.title} @@ -29,6 +28,9 @@ {loop="$value.taglist"} {$value} {/loop} + {loop="$value.feed_plugins"} + {$value} + {/loop} {/loop} -- cgit v1.2.3 From db90dfcbbc406b50381f17a72f24095fee91bb09 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 2 Aug 2016 11:55:49 +0200 Subject: Move PubSubHubbub code as a default plugin --- tpl/feed.atom.html | 2 +- tpl/feed.rss.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tpl') diff --git a/tpl/feed.atom.html b/tpl/feed.atom.html index 29187505..ad7dd935 100644 --- a/tpl/feed.atom.html +++ b/tpl/feed.atom.html @@ -6,7 +6,7 @@ {$last_update} {/if} - {loop="$plugins_feed_header"} + {loop="$feed_plugins_header"} {$value} {/loop} diff --git a/tpl/feed.rss.html b/tpl/feed.rss.html index 66d9a869..73791f63 100644 --- a/tpl/feed.rss.html +++ b/tpl/feed.rss.html @@ -8,7 +8,7 @@ {$index_url} Shaarli - {loop="$plugins_feed_header"} + {loop="$feed_plugins_header"} {$value} {/loop} {loop="$links"} -- cgit v1.2.3 From af815f771cbed43c3dd30436f23061c66e92e5a3 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 16 Dec 2016 14:03:42 +0100 Subject: Add opensearch to RSS and ATOM feeds Fixes #709 --- tpl/feed.atom.html | 2 ++ tpl/feed.rss.html | 2 ++ 2 files changed, 4 insertions(+) (limited to 'tpl') diff --git a/tpl/feed.atom.html b/tpl/feed.atom.html index ad7dd935..49798e85 100644 --- a/tpl/feed.atom.html +++ b/tpl/feed.atom.html @@ -6,6 +6,8 @@ {$last_update} {/if} + {loop="$feed_plugins_header"} {$value} {/loop} diff --git a/tpl/feed.rss.html b/tpl/feed.rss.html index 73791f63..ee3fef88 100644 --- a/tpl/feed.rss.html +++ b/tpl/feed.rss.html @@ -8,6 +8,8 @@ {$index_url} Shaarli +