summaryrefslogtreecommitdiffstats
path: root/application
AgeCommit message (Collapse)AuthorFilesLines
2017-09-18Fix some routesFlorian Pritz1-3/+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-16Remove old error templateFlorian Pritz1-11/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-16Update negativ return check of session userdata for CI3Florian Pritz2-3/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-16Update ci_session table for CI3Florian Pritz2-1/+43
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-09WIP: CI3 migrationFlorian Pritz15-11/+10
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-09-09Merge tag '3.1.5' into dev-ci3Florian Pritz44-520/+1169
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-11Test inserting bigint values in DBFlorian Pritz1-0/+38
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-07-11Merge branch 'bugfix/filesizeType' of https://github.com/hashworks/filebin ↵Florian Pritz2-1/+52
into dev
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-10Fix chunk update for filesizeshashworks1-1/+2
This includes the where limitation of the update query in the total limit of the chunk for loop.
2017-07-10Update filesizes after changing filesize db typehashworks1-0/+23
This updates all wrong filesizes after db migration 19 (`filesize` type change to `bigint`). It will only update files with a filesize of 2147483647 byte since the database set the max integer value as the filesize if the file was > 2147483647 byte.
2017-07-10Use bigint for filesize in databasehashworks2-1/+28
The current type, integer, only stores numerics up to 2147483647. Since filebin stores the size in byte MySQL will only write up to 2GB in there, PostgreSQL failes by default for files >2GB. The new type bigint allows file sizes up to ~9223 petabyte.
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 Pritz2-1/+20
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-07-04Create function for ensuring that json keys contain objectsFlorian Pritz2-5/+10
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-07-04API: Fix return type of empty values in file/historyFlorian Pritz4-3/+24
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-06-17Fix broken lineendings when rendering ascii colorsFlorian Pritz1-1/+1
Without -m ansi2html may not close the span tags at the end of the line. Since we wrap the output lines in our own tags those left-open tags break the rendering. Fix it by letting ansi2html wrap lines into tags on it's own. This adds superflous tags in the HTML, but it works nicely. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-05-22Fix markdown rendering not finding ParsedownFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-05-15Fix error handling in MY_Input->post_array()Florian Pritz1-1/+7
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-05-12Catch incorrect POST parameters (array vs string)Florian Pritz4-10/+44
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-05-12Fix uncaught exception in error pageFlorian Pritz1-1/+1
Can be triggered by accessing an unknown page like /file/foobar Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-04-18Unify look of client installation instructionsFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-04-18Add FreeBSD client installation instructionsFlorian Pritz1-0/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-04-18Use === for some equality checksFlorian Pritz2-5/+5
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-04-06Add filename extensions for some SQL dialectsFlorian Pritz1-0/+5
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-03-26s/renderer: Extract json reformater methodFlorian Pritz1-16/+28
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-03-26s/renderer: Pass output_cache in constructorFlorian Pritz2-13/+16
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-03-26Extract render code into dedicated classFlorian Pritz2-144/+168
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-24Allow alternative colors in alert templateFlorian Pritz1-1/+1
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>
2017-02-01return_bytes(): Throw exception on unhandled unit typeFlorian Pritz2-3/+13
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-02-01Test-More: Improve debug outputFlorian Pritz1-5/+14
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-02-01tests: Expect string instead of intFlorian Pritz1-4/+4
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2017-01-31config: Add exmple for database port settingFlorian Pritz1-0/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-12-14[ci skip] Deprecate 'allow_get_array', 'standardize_newlines'Andrey Andreev1-6/+16
2016-11-10filebin_helper: Fix tabsReikion1-7/+7
Changes by Florian Pritz: - Split off from "Make sure that return_bytes function returns int value" Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-10Make sure that return_bytes function returns int valueReikion2-1/+2
php_admin_value[post_max_size] in PHP fpm pool config set to big integer (i.e. 106954752) causes fb-client to crash if file is bigger than 10485760 bytes with traceback Traceback (most recent call last): [...] File "/usr/bin/fb", line 138, in upload_files if self.serverConfig is not None and (currentChunkSize + filesize > self.serverConfig["request_max_size"] \ TypeError: unorderable types: int() > str() because api/v2.1.0/file/get_config returns "request_max_size" as string Changes by Florian Pritz: - Add test - Add github PR body as commit message - Split off indentation change Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05test_file_upload: Ensure we compare the correct contentdev-2.xFlorian Pritz1-0/+4
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Parallelize remaining API testsFlorian Pritz9-420/+532
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Parallelize some API testsFlorian Pritz3-137/+190
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05muser: Rename login_cli_client to login_api_clientFlorian Pritz1-10/+10
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Remove API v1 compatability codeFlorian Pritz2-6/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05API: Drop v1Florian Pritz4-666/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05Test calling endpoints with unsupported authentication methodFlorian Pritz1-0/+26
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2016-11-05MY_Controller: Extract CSRF code into methodFlorian Pritz1-28/+37
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>