summaryrefslogtreecommitdiffstats
path: root/application/controllers
AgeCommit message (Collapse)AuthorFilesLines
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>
2016-11-05Drop file_plaintext viewsFlorian Pritz1-5/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-01Fix missing / in redirect after creating multipaste via webuiFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-01Allow creation of multipastes from upload historyFlorian Pritz1-0/+34
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-01Add multipaste queueFlorian Pritz1-0/+113
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-10-31Copy api/v1/user to api/v2/userFlorian Pritz1-2/+65
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-10-31Remove call to undefined function File_default->client()Florian Pritz1-3/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-09-19Improve plaintext API deprecation warningFlorian Pritz1-1/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-09-19Extract tooltip function into \service\filesFlorian Pritz1-28/+2
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-09-19Move file controller into subdirFlorian Pritz1-1/+1
This allows to more easily split the controller into smaller parts in the future. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-08-25Move client documentation to fron pageFlorian Pritz1-26/+7
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-08-21Display deprecation warning for files uploaded via plain text APIFlorian Pritz1-0/+7
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-08-21Allow users to delete their accountsFlorian Pritz1-0/+61
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-08-21mfile->add_file: Take userid via argumentFlorian Pritz3-6/+12
This allows for easier testing. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-08-20tests: Use one webserver per testcaseFlorian Pritz1-3/+1
This allows the tests to run somewhat parallel (still limited by the database) and simplifies running single testcases without the ./run-tests.sh wrapper. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-08-20Decouple output_cache from CI for easier testingFlorian Pritz1-14/+14
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-08-01Create Clover coverage reportFlorian Pritz1-3/+3
Also don't print the return data of the writer. In the case of clover it's the XML content, with the HTML writer it's nothing. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-07-31Add code coverage outputFlorian Pritz1-0/+17
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-07-29Return 403 instead of 401 for missing authenticationFlorian Pritz1-1/+1
According to the RFC this is only useful for services that use HTTP's built in authentication schemes. We don't so we can't use this code. References: https://tools.ietf.org/html/rfc7235 Signed-off-by: Florian Pritz <bluewind@xinu.at>