summaryrefslogtreecommitdiffstats
path: root/application/controllers
AgeCommit message (Collapse)AuthorFilesLines
2019-05-21Allow data URLs in CSP headerFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-09-24Move JSON code to API classFlorian Pritz1-3/+30
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-09-24Move etag handling to Main classFlorian Pritz1-4/+26
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-09-24Remove unused length field when passing upload history to viewFlorian Pritz1-4/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-09-24Remove unused get_max_size endpointFlorian Pritz1-7/+0
This should be have been removed in v2.0.0 with the removal of the plain text API. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-06-14Add cli user deletionFlorian Pritz1-0/+18
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-06-01file/cron: Fix call to undefined method clean_multipaste_tarballsFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-05-18Add invitation key deletionFlorian Pritz1-0/+12
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-05-18Extract invitation key creation to \service\userFlorian Pritz1-19/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-05-03Move cleanup code from controller to \service\filesFlorian Pritz1-95/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-05-03file/clean_stale_files: Refactor into multiple methodsFlorian Pritz1-2/+10
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-05-03file/clean_stale_files: Remove multipaste tarballsFlorian Pritz1-2/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-05-03file/clean_stale_files: Remove database entries without filesFlorian Pritz1-0/+19
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-05-03file/cron: Refactor multipaste tarball clean code into new methodFlorian Pritz1-17/+22
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2018-01-31Proper display of expiration duration for less than a dayHrvoje Hodak1-1/+1
2017-12-20Prevent asciinema from being affected by file size limitFlorian Pritz1-8/+9
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-10-16Fix database upgrade success messageFlorian Pritz1-3/+2
The function actually returns something that's not an int. Exceptions are caught so at this point it's fine to just output without a check. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-21Remove usage of deprecated is_cli_request()Florian Pritz2-2/+2
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-21Fix return checks for CI3Florian Pritz1-3/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-21Close session in long running methodsFlorian Pritz1-0/+2
These do not write to the session but may run for some time. There is no need to keep the session locked while they perform their work. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-21Fix detection of URL ending in slashFlorian Pritz1-1/+1
CI trims tailing slashes from the URL and this should work just fine too. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-18Migrate return code checks for CI3Florian Pritz4-13/+13
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-18Remove secondary controller for CLI usage outputFlorian Pritz2-13/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-18Remove unsupported secondary controllerFlorian Pritz3-31/+35
Having more than one controller per request doesn't work with CI3. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-16Update negativ return check of session userdata for CI3Florian Pritz1-2/+2
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-09WIP: CI3 migrationFlorian Pritz5-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-09Merge tag '3.1.5' into dev-ci3Florian Pritz1-1/+2
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-08-15tools/update_database: Output status after upgradeFlorian Pritz1-1/+10
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-07-11Actually update filesize with update_file_metadatahashworks1-1/+4
According to `application/controllers/tools.php#L32` the `update_file_metadata` tool should update the mimetype AND the filesize, but the latter never got implemented.
2017-07-04API: Update version to 2.1.1Florian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-07-04API: Fix return type of empty values in file/deleteFlorian Pritz1-1/+5
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-07-04Create function for ensuring that json keys contain objectsFlorian Pritz1-5/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-07-04API: Fix return type of empty values in file/historyFlorian Pritz1-0/+7
If the array is not casted to a object, json_encode will encode it as [] if empty, but {} if it contains data. Always return an object by casting the array to an object if it is empty. Fixes #15 Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-05-12Catch incorrect POST parameters (array vs string)Florian Pritz3-10/+10
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-04-18Use === for some equality checksFlorian Pritz1-3/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-03-26s/renderer: Pass output_cache in constructorFlorian Pritz1-2/+2
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-03-26Extract render code into dedicated classFlorian Pritz1-144/+2
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-03-24Improve error handling in json reformaterFlorian Pritz1-4/+17
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-03-22Reformat single-line JSON when renderingFlorian Pritz1-0/+5
Be conservative and only apply the reformating for single line pastes. This should cover the most common cases and protect against trying to reformat non-json content. Fixes #14 Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-03-22Pass file content to lexer via stdinFlorian Pritz1-2/+5
This allows to easily modify the content before rendering it. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Remove API v1 compatability codeFlorian Pritz1-4/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05API: Drop v1Florian Pritz3-182/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05api/user/create_apikey: Directly log in with username/pwFlorian Pritz1-0/+9
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Remove cli client upload handlerFlorian Pritz1-52/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05c/file: Remove upload detectionFlorian Pritz1-3/+1
This only existed for curl based uploading which is no longer supported Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05c/user: Drop $this->view_dirFlorian Pritz1-17/+15
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05c/file_default: Drop $this->view_dirFlorian Pritz1-14/+12
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Remove plaintext API deprecation warningFlorian Pritz1-9/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Remove cli client only functionsFlorian Pritz1-32/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Remove special handling of cli clientsFlorian Pritz2-26/+2
Signed-off-by: Florian Pritz <bluewind@xinu.at>