aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* HTTP: move server URL functions to `HttpUtils.php`VirtualTam2015-09-146-53/+388
| | | | | | | | | | | | | Relates to #333 Modifications: - refactor server URL utility functions - do not access global `$_SERVER` variables - add test coverage - improve readability - apply coding conventions Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* SSL detection: add support for `X-Forwarded-Proto`Fanch2015-09-131-1/+1
| | | | | | | | | | | | Duplicates #332 See: - RFC 7239 - Forwarded HTTP Extension http://www.ietf.org/rfc/rfc7239.txt - RFC 6238 - Deprecating the "X-" Prefix and Similar Constructs in Application Protocols http://www.ietf.org/rfc/rfc6648.txt - StackOverflow - Custom HTTP headers: naming conventions http://stackoverflow.com/a/3561399
* Merge pull request #337 from doc75/doublon_urlVirtualTam2015-09-087-34/+179
|\ | | | | #325 small enhancement to fix the GetLinkFromUrl method
| * Url: introduce global helper functions for cleanup and scheme detectionGuillaume Virlet2015-09-087-34/+179
|/ | | | | | | | | | | | Relates to #314 & #326 Additions: - add global `cleanup_url()` and `get_url_scheme()` functions Modifications: - replace `Url` usage in `index.php` by calls to global functions - fix `Url` tests not being run: PHPUnit expects a single test class per file - move classes to separate files
* Merge pull request #334 from virtualtam/refactor/http-utilsVirtualTam2015-09-063-78/+122
|\ | | | | HTTP: move utils to a proper file, add tests
| * HTTP: move utils to a proper file, add testsVirtualTam2015-09-063-78/+122
|/ | | | | | | | | | | | | | Relates to #333 Modifications: - move HTTP utils to 'application/HttpUtils.php' - simplify logic - replace 'http_parse_headers_shaarli' by built-in 'get_headers()' - remove superfluous '$status' parameter (provided by the HTTP headers) - apply coding conventions - add test coverage (unitary only) Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #338 from virtualtam/fix/unique-uniqidVirtualTam2015-09-064-9/+119
|\ | | | | Session ID: extend the regex to match possible hash representations
| * Session ID: extend the regex to match possible hash representationsVirtualTam2015-09-064-9/+119
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves #306 Relates to #335 & #336 Duplicated by #339 Issues: - PHP regenerates the session ID if it is not compliant - the regex checking the session ID does not cover all cases - different algorithms: md5, sha1, sha256, etc. - bit representations: 4, 5, 6 Fix: - `index.php`: - remove `uniqid()` usage - call `session_regenerate_id()` if an invalid cookie is detected - regex: support all possible characters - '[a-zA-Z,-]{2,128}' - tests: add coverage for all algorithms & bit representations See: - http://php.net/manual/en/session.configuration.php#ini.session.hash-function - https://secure.php.net/manual/en/session.configuration.php#ini.session.hash-bits-per-character - http://php.net/manual/en/function.session-id.php - http://php.net/manual/en/function.session-regenerate-id.php - http://php.net/manual/en/function.hash-algos.php Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #344 from virtualtam/copyingVirtualTam2015-09-061-1/+7
|\ | | | | COPYING: update contributor list
| * COPYING: update contributor listVirtualTam2015-09-061-1/+7
|/ | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Update README.mdVirtualTam2015-09-061-6/+4
|
* Merge pull request #343 from virtualtam/readmeVirtualTam2015-09-061-75/+100
|\ | | | | Rewrite README.md
| * Rewrite README.mdVirtualTam2015-09-061-75/+100
|/ | | | | | | | | | | | | | Modifications: - group content in sections - homogenize formatting - replace installation instructions by links to the corresponding wiki pages - update badges - use http://shields.io/ to generate SVGs with custom labels - master branch: update Travis label - stable branch: add Travis status - GitHub release: display the latest released version Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #340 from virtualtam/doc/updateVirtualTam2015-09-0438-45/+289
|\ | | | | Doc: sync from Wiki, generate HTML
| * Doc: sync from Wiki, generate HTMLVirtualTam2015-09-0438-45/+289
|/ | | | | | | | | | | | | Additions: - Installation/Download: how to get Shaarli - Community software: ShaarliOS app Modifications: - Installation/Server requirements: PHP 5.4 EOL, PHP 7 announcements - Installation/Server configuration: improve Nginx security - Troubleshooting: PHP sessions on `free.fr` Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Bump version to v0.5.3v0.5.3ArthurHoaro2015-09-022-3/+3
| | | | Fixes a bug that could prevent user to login.
* Merge pull request #336 from ArthurHoaro/login-hotfix0.5.3Arthur2015-09-022-2/+2
|\ | | | | Allow uppercase letters in PHP sessionid format
| * Allow uppercase letters in PHP sessionid formatArthurHoaro2015-09-022-2/+2
|/ | | | | | Fixes shaarli/Shaarli#335 - Wrong login/password since v0.5.2 Regression introduced in 06b6660a7e8891c6e1c47815cf50ee5b2ef5f270
* Bump version to 0.5.2v0.5.2VirtualTam2015-08-312-3/+3
| | | | | | | | | | Minor changes - fix Full Path Disclosure upon cookie forgery - fix regression preventing to load LinkDB info when adding an existing link - also extract HTTPS page metadata (title) - add PHP 7 to Travis platforms Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #326 from ArthurHoaro/bug-urlVirtualTam2015-08-313-38/+76
|\ | | | | Fixes #325 - Shaarli does not recognize saved links
| * Add HTTPS support for title extracting featureArthurHoaro2015-08-311-2/+2
| |
| * Fixes #325 - Shaarli does not recognize saved linksArthurHoaro2015-08-313-37/+75
| | | | | | | | | | | | PHP doesn't seem to autoconvert objects to strings when they're use as array indexes. Fixes regression introduced in d9d776af19fd0a191f82525991dafbb56e1bcfcb
* | Merge pull request #306 from ArthurHoaro/fpdVirtualTam2015-08-243-15/+71
|\ \ | | | | | | Avoid Full Path Disclosure error on session error.
| * | Avoid Full Path Disclosure error on session error.ArthurHoaro2015-08-223-15/+71
| |/ | | | | | | | | * Add a function to validate session ID. * Generate a new session ID if an invalid token is passed.
* | Merge pull request #327 from virtualtam/travis/php7VirtualTam2015-08-241-0/+1
|\ \ | |/ |/| travis: add PHP 7 to the tested environments
| * travis: add PHP 7 to the tested environmentsVirtualTam2015-08-221-0/+1
|/ | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Bump version to 0.5.1v0.5.1VirtualTam2015-08-182-3/+3
| | | | | | | | | | | | Minor changes - fix 404 after editing a link while being logged out - update local documentation - improve timezone detection at installation - improve feed cache handling - improve URL cleanup for new links - add a link to the shaarli/shaarli DockerHub repository Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Doc: sync from Wiki, generate HTMLVirtualTam2015-08-1831-3/+128
| | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #314 from shaarli/clean-utm_termVirtualTam2015-08-164-23/+309
|\ | | | | clean utm_term url parameter
| * Links: refactor & improve URL cleanupVirtualTam2015-08-154-23/+309
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to #141 Relates to #133 Modifications - move URL cleanup to `application/Url.php` - rework the cleanup function - fragments: `#stuff` - GET parameters: `?var1=val1&var2=val2` - add documentation (APIs the params belong to) - add test coverage Reference - http://php.net/parse_url - http://php.net/manual/en/language.oop5.magic.php#language.oop5.magic.tostring Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | README: add DockerHub badgeVirtualTam2015-08-161-4/+5
|/ | | See [docker-shaarli](https://github.com/shaarli/docker-shaarli) for Dockerfiles and documentation
* Merge pull request #309 from virtualtam/refactor/PageCacheVirtualTam2015-08-138-88/+342
|\ | | | | CachedPage: move to a proper file, add tests
| * Cache: simplify cached content cleanup, improve testsVirtualTam2015-08-132-15/+23
| | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * CachedPage: move to a proper file, add testsVirtualTam2015-08-138-88/+334
|/ | | | | | | | | | | | Modifications - rename `pageCache` to `CachedPage` - move utilities to `Cache` - do not access globals - apply coding rules - update LinkDB and test code - add test coverage Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #301 from ArthurHoaro/edit-link-redirectVirtualTam2015-08-131-7/+36
|\ | | | | Fixes #299: prevent 404 on '?edit_link' while logged out
| * Fixes #299: prevent 404 on '?edit_link' while logged outArthurHoaro2015-08-071-7/+36
|/ | | | | - add a use case for edit_link in logged out part. - *really* prevent loops on login screen.
* Merge pull request #313 from virtualtam/install/timezoneVirtualTam2015-08-053-35/+38
|\ | | | | Installation: default to the server's timezone
| * Installation: default to the server's timezoneVirtualTam2015-08-043-35/+38
|/ | | | | | | | | | | | | Modifications - attempt to use the server's timezone - if none is set, use UTC - TimeZone: apply coding conventions - variable naming - no closing PHP tag Relates to #274 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #294 from virtualtam/doc/updateVirtualTam2015-08-0461-1201/+5504
|\ | | | | Doc: sync from Wiki, generate HTML
| * Doc: sync from Wiki, generate HTMLVirtualTam2015-08-0461-1201/+5504
|/ | | | | | | | | | | | | | | | Closes #291 Fixes #227 Modifications - HTML content: match the new Wiki structure - Makefile - generate a custom HTML sidebar - include the sidebar on all pages - infer and prepend page titles - handle relative links - add title metadata, e.g. Shaarli - <Page Name> Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #276 from virtualtam/tools/phpcsVirtualTam2015-07-311-0/+4
|\ | | | | Add a generic rule to run PHPCS against different coding standards
| * Makefile: add a generic rule to run PHPCS against different coding standardsVirtualTam2015-07-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to #95 Usage - list available standards $ ./vendor/bin/phpcs -i - run PHPCS against a given standard $ make PHPCS_<standard> Examples $ make PHPCS_PSR1 $ make PHPCS_Zend Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #303 from virtualtam/v0.5.0v0.5.0VirtualTam2015-07-302-3/+3
|\ \ | | | | | | Bump version to 0.5.0
| * | Bump version to 0.5.0VirtualTam2015-07-302-3/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Major changes - fix locale handling - fix note URLs - fix page redirections - fix daily RSS browsing - fix title display - fix links not being hidden when `HIDE_PUBLIC_LINKS` is set - restore compatibility with PHP 5.3 - remove duplicate tags in links - remove annoying URL patterns - add Firefox Social API - Search/Filter by tag fieds can now be accessed quickly with the `Tab` key - update documentation - start code refactoring - move all settings to `data/config.php` - refactor Config, LinkDB, TimeZone, Utils - add unit test coverage - add Travis integration Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Add Requirements section in README (link to wiki).ArthurHoaro2015-07-241-2/+4
| | | | | | | | Fixes #297
* | Merge pull request #295 from Knah-Tsaeb/patch-1Arthur2015-07-231-2/+4
|\ \ | | | | | | [fix] #293 - Black thumbnails on picture wall after upgrade
| * | [fix] #293Knah Tsaeb2015-07-221-2/+4
| | | | | | | | | Black thumbnails on picture wall after upgrade #293
* | | Merge pull request #289 from virtualtam/make-cleanVirtualTam2015-07-232-5/+6
|\ \ \ | |/ / |/| | Makefile: do not call `clean` before `test`
| * | Makefile: do not call `clean` before `test`VirtualTam2015-07-182-5/+6
|/ / | | | | | | | | | | | | | | | | | | Fixes #288 Modifications: - call `make clean` explicitely to clean the workspace - add `make clean` to Travis instructions Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #290 from virtualtam/travis-containerVirtualTam2015-07-181-0/+1
|\ \ | | | | | | Travis: use the container-based infrastructure