summaryrefslogtreecommitdiffstats
path: root/application/controllers
AgeCommit message (Collapse)AuthorFilesLines
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>
2016-07-14muser: Add add_user functionFlorian Pritz1-14/+2
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-07-14controller/user: Use our function for email verifcationFlorian Pritz1-2/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-07-14Move username/email validation functions to muserFlorian Pritz1-29/+4
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-07-14Fix incorrect username validation0.9.17Florian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-07-13Fix missing empty lines in chromium when copying codeFlorian Pritz1-2/+6
Chromium apparently requires a <br> or some text to be present for a line to be copied to the clipboard. Firefox interprets the \n at the end as line break and copies that if there is no content. Adding an explicit <br> makes chromium work correctly, but firefox still converts the \n. Fix this by putting the \n in an HTML comment. That way the output is still somewhat readable, but both browsers do the correct thing. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-07-13Fix double linebreaks when copying code in firefoxFlorian Pritz1-3/+3
Apparently firefox doesn't like html code in <pre> and adds incorrect linebreaks when copying the code. This does not happen with chromium. Fix it by switching to <code> instead of <pre>. Also change the CSS to refer to the element by class instead of by type so future changes are simpler. Not sure why, but in chroium changing the container element type breaks the ordering of the lines. Adding display: table to the .code-container fixes this. References: http://stackoverflow.com/questions/24851173/why-does-text-copied-from-a-set-of-pre-tags-have-double-line-breaks#comment41552816_26408656 Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-07-13Throw public exception when accessing CLI only functionsFlorian Pritz3-9/+7
We actually don't need to hide this from the user. The error should be shown rather than a blank page being returned. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-07-13controllers/user: Deduplicate email verificationFlorian Pritz1-5/+14
Signed-off-by: Florian Pritz <bluewind@xinu.at>
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-23 15:44:50 +0100