Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
851 commits 8 branches 1 tag 9.7 MiB
Commit graph

167 commits

Author SHA1 Message Date
ArthurHoaro 52b503105d Improve datetime display 
Use php-intl extension to display datetimes a bit more nicely, depending on the locale.

What changes:

  * the day is no longer displayed
  * day number and month are ordered according to the locale
  * the timezone is more readable (UTC+1 instead of CET)
 2017-03-06 21:11:12 +01:00
ArthurHoaro 1255a42cfe Improve autoLocale() detection 
- Creates arrays_combination function to cover all cases
  - add the underscore separator in the regex
  - add `utf8` encoding in addition to `UTF-8`
 2017-03-06 20:32:17 +01:00
VirtualTam 3c66e56435 application: introduce the Shaarli\Config namespace 
Namespaces have been introduced with the REST API, and should be generalized
to the whole codebase to manage object scope and benefit from autoloading.

See:
- https://secure.php.net/manual/en/language.namespaces.php
- http://www.php-fig.org/psr/psr-4/

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2017-03-04 17:07:52 +01:00
ArthurHoaro e037610115 Add markdown_escape setting 
This setting allows to escape HTML in markdown rendering or not.
The goal behind it is to avoid XSS issue in shared instances.

More info:

  * the setting is set to true by default
  * it is set to false for anyone who already have the plugin enabled
  (avoid breaking existing entries)
  * improve the HTML sanitization when the setting is set to false - but don't consider it XSS proof
  * mention the setting in the plugin README
 2017-02-28 19:16:54 +01:00
ArthurHoaro 7dcbfde5ff Set the vintage theme by default for the time being 2017-02-27 20:20:53 +01:00
ArthurHoaro 16e3d006e9 REST API: implements getLink by ID service 
See http://shaarli.github.io/api-documentation/#links-link-get
 2017-02-19 16:45:59 +01:00
ArthurHoaro c37a6f820b REST API - getLinks: support the visibility parameter 2017-01-17 18:53:18 +01:00
ArthurHoaro 7f96d9ec21 Update LinkFilter to be able to filter only public links 
No update regarding the UI or the API for now

Fixes #758
 2017-01-16 13:57:11 +01:00
ArthurHoaro 053673cb71 Remove CSS call for addlink toolbar plugin 
Fixes #724
 2017-01-15 17:50:16 +01:00
ArthurHoaro 9977c418d6 Merge pull request #727 from ArthurHoaro/api/getlinks 
REST API: implement getLinks service
 2017-01-15 16:49:50 +01:00
ArthurHoaro c3b00963fe REST API: implement getLinks service 
See http://shaarli.github.io/api-documentation/#links-links-collection-get
 2017-01-15 13:55:22 +01:00
VirtualTam 63ef549749 API: expect JWT in the Authorization header 
Relates to https://github.com/shaarli/Shaarli/pull/731

Added:
- require the presence of the 'Authorization' header

Changed:
- use the HTTP Bearer Token authorization schema

See:
- https://jwt.io/introduction/#how-do-json-web-tokens-work-
- https://tools.ietf.org/html/rfc6750
- http://security.stackexchange.com/q/108662

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2017-01-15 13:41:04 +01:00
Arthur 7418f7cb60 Merge pull request #732 from ArthurHoaro/feature/theme-manager 
Theme manager: improvements
 2017-01-06 11:40:54 +01:00
VirtualTam 93b1fe54fb Cleanup: explicit method visibility 
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2017-01-05 19:52:04 +01:00
ArthurHoaro 04a0e8ea34 Updater: keep custom theme preference with the new theme setting 2017-01-05 16:16:27 +01:00
ArthurHoaro a0df06517b Minor improvements regarding #705 (coding style, unit tests, etc.) 2017-01-05 16:16:23 +01:00
Knah Tsaeb adc4aee80f Change templates set through administration UI 2017-01-05 12:04:02 +01:00
VirtualTam 7a9daac56d API: fix JWT signature verification 
Fixes https://github.com/shaarli/Shaarli/issues/737

Added:
- Base64Url utilities

Fixed:
- use URL-safe Base64 encoding/decoding functions
- use byte representations for HMAC digests
- all JWT parts are Base64Url-encoded

See:
- https://en.wikipedia.org/wiki/JSON_Web_Token
- https://tools.ietf.org/html/rfc7519
- https://scotch.io/tutorials/the-anatomy-of-a-json-web-token
- https://jwt.io/introduction/
- https://en.wikipedia.org/wiki/Base64#URL_applications
- https://secure.php.net/manual/en/function.base64-encode.php#103849

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2017-01-04 16:59:47 +01:00
Arthur 061f04fba0 Merge pull request #733 from ArthurHoaro/hotfix/reverse-proxy-port 
Hide default ports in local URL behind a reverse proxy
 2017-01-04 16:34:06 +01:00
VirtualTam eaf2524887 URL cleanup: add 'campaign_' to the annoying parameters 
Closes https://github.com/shaarli/Shaarli/issues/735

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2017-01-04 11:42:05 +01:00
ArthurHoaro 8e4be77368 Hide default port in local URL behind a reverse proxy 2017-01-03 14:17:05 +01:00
ArthurHoaro b3051a6aae Fixes presence of empty tags for private tags and in search results 
* Private tags: make sure empty tags are properly filtered
  * Search results:
    * Use preg_split instead of function combination
    * Add normalize_spaces to remove extra whitespaces displaying empty tags search
 2017-01-03 09:47:15 +01:00
ArthurHoaro db90dfcbbc Move PubSubHubbub code as a default plugin 2016-12-20 11:41:24 +01:00
ArthurHoaro 18e6796726 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.
 2016-12-15 10:36:00 +01:00
ArthurHoaro cbfdcff261 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.
 2016-12-12 03:54:10 +01:00
ArthurHoaro d592daea83 Add a persistent 'shorturl' key to all links 
All existing link will keep their permalinks.
New links will have smallhash generated with date+id.

The purpose of this is to avoid collision between links due to their creation date.
 2016-12-12 03:03:12 +01:00
ArthurHoaro c3dfd89959 Unit Test for the new ID system 2016-12-12 03:03:12 +01:00
Arthur 6781465fda Merge pull request #691 from ArthurHoaro/plugins/no-md-feed 
Markdown: fixes feed rendering with nomarkdown tag
 2016-12-01 11:13:04 +01:00
ArthurHoaro 266e3fe5c8 Markdown: fixes feed rendering with nomarkdown tag 
* make sure we match exactly `nomarkdown` tag
 * pass the whole link data to stripNoMarkdownTag() to:
   * strip the noMD tag in taglist (array)
   * strip the tag in tags (string)

Fixes #689

tmp
 2016-11-22 10:26:03 +01:00
ArthurHoaro 5ebc1d504b .htaccess files: support Apache 2.4+ syntax 
If `mod_version` is enabled, the previous syntax will apply for Apache <2.4.
If not, the new syntax is used by default.

Fixes #676

`mod_version` identifier is `version_module` across all Apache versions. See:

  * https://httpd.apache.org/docs/current/mod/mod_version.html
  * https://httpd.apache.org/docs/2.2/mod/mod_version.html
  * https://serverfault.com/questions/733910/how-do-i-load-mod-version-only-if-it-isnt-built-in-to-apache

Note that version_module comes built-in with Debian (and derivatives) Apache2 packages, see https://wiki.debian.org/Apache/PackagingFor24
 2016-11-08 11:38:14 +01:00
ArthurHoaro c5941f316a Fix an issue with links not being reversed in code blocks 
Fixes #672

+ Markdown to HTML unit test
 2016-10-22 11:13:48 +02:00
VirtualTam 3d5e0aede3 Merge pull request #673 from virtualtam/cleanup/linkdb 
LinkDB: code cleanup
 2016-10-21 11:04:52 +02:00
VirtualTam 954dc2446c Merge pull request #665 from ArthurHoaro/fix/feed-hashtags 
Fix hashtag links in Feeds
 2016-10-20 21:37:28 +02:00
VirtualTam 735ed4a94e LinkDB: explicit method visibility 
Relates to https://github.com/shaarli/Shaarli/issues/95

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2016-10-20 21:33:42 +02:00
VirtualTam f21abf3292 LinkDB: update datastore method names 
Relates to https://github.com/shaarli/Shaarli/issues/95

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2016-10-20 21:33:40 +02:00
VirtualTam 628b97cbdf LinkDB: do not prefix privates with an underscore 
Relates to #95

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2016-10-20 21:10:56 +02:00
ArthurHoaro fbc28ff1c8 Fix hashtags links in Feeds 
Make the hashtag link absolute in feeds to work properly in RSS syndication tools.
 2016-10-20 11:42:01 +02:00
ArthurHoaro 7af9a41881 Minor code cleanup: PHPDoc, spelling, unused variables, etc. 2016-10-20 11:36:11 +02:00
Arthur c1c2102850 Merge pull request #651 from ArthurHoaro/plugin-isso2 
Isso comments plugin
 2016-10-18 08:14:09 +02:00
VirtualTam 8406a4b670 Merge pull request #662 from virtualtam/fix/feed/self-link 
Fix: return the proper value for the "self" feed attribute
 2016-10-17 17:58:39 +02:00
ArthurHoaro bf26e7ebcb Isso comments plugin 
Use Isso client to let visitors comments on permalinks
 2016-10-17 09:23:14 +02:00
VirtualTam 44a718090d Fix: return the proper value for the "self" feed attribute 
Fixes https://github.com/shaarli/Shaarli/issues/629
Closes https://github.com/shaarli/Shaarli/pull/630

Note: you might need to empty the "pagecache" directory for the
fix to be taken into account

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2016-10-16 20:58:15 +02:00
ArthurHoaro 7fde6de121 New init function for plugins, supports errors reporting 
All plugins can optionally add an init function named `pluginname_init()` which is called when the plugin is loaded.

This function is aware of the config, and can return initialization errors, which are displayed in the header template.

Note that the previous error system hack no longer work.
 2016-10-14 13:22:58 +02:00
VirtualTam f63632a6fb Merge pull request #654 from teromene/archive-org-no-internal 
Archive.org plugin: do not propose archival of private notes

Fixes #637
 2016-10-13 18:12:55 +02:00
Teromene 5e148f8a52 Archive.org plugin: do not propose archival of private notes 
Fixes #637
 2016-10-13 16:37:43 +01:00
Arthur 0354257266 Merge pull request #622 from ArthurHoaro/update-date 
Save link update dates and render it in templates and feeds
 2016-10-12 14:51:37 +02:00
Arthur adcdac1dec Merge pull request #623 from ArthurHoaro/security/reverse-proxy-ban 
Add trusted IPs in config and try to ban forwarded IP on failed login
 2016-10-12 14:48:57 +02:00
VirtualTam 8758bb0ac8 Merge pull request #619 from ArthurHoaro/plugins/param-desc 
Add a description to plugin parameters
 2016-08-13 14:48:51 +02:00
VirtualTam db6dec0de1 Fix: add missing final newlines, untabify text 
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2016-08-13 14:22:22 +02:00
VirtualTam f4ad7bde56 Fix: ensure Internet Explorer bookmark dumps can be imported 
Relates to https://github.com/shaarli/Shaarli/issues/607

Modifications:
- [application][tests] NetscapeBookmarkUtils: more permissive doctype detection

The IE bookmark exports contain extra escape sequences, which can be observed
by binary comparison of the reference input data used in tests:

   $ cmp -b -l -n 8 netscape_basic.htm internet_explorer_encoding.htm

   1  74 <    357 M-o
   2  41 !    273 M-;
   3 104 D    277 M-?
   4 117 O     74 <
   5 103 C     41 !
   6 124 T    104 D
   7 131 Y    117 O
   8 120 P    103 C

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2016-08-12 23:22:15 +02:00