sbrl-github/Pepperminty-Wiki
sbrl-github/Pepperminty-Wiki
1
0
Fork 0
mirror of https://github.com/sbrl/Pepperminty-Wiki.git synced 2024-11-22 04:23:01 +00:00
Code Activity

Correct syntax error that broke travis CI

Browse source
This commit is contained in:
Starbeamrainbowlabs 2016-06-13 06:41:50 +01:00
parent d6bf5713e9
commit 2716a9e86a
3 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
build/index.php
View file

@ -27,7 +27,7 @@ if(!file_exists("peppermint.json"))
{ {
// Copy the default settings over to the main settings array // Copy the default settings over to the main settings array
foreach ($guiConfig as $key => $value) foreach ($guiConfig as $key => $value)
$settings->$key = $value->default $settings->$key = $value->default;
// Generate a random secret // Generate a random secret
$settings->secret = bin2hex(openssl_random_pseudo_bytes($bits)); $settings->secret = bin2hex(openssl_random_pseudo_bytes($bits));
file_put_contents("peppermint.json", json_encode($settings, JSON_PRETTY_PRINT)); file_put_contents("peppermint.json", json_encode($settings, JSON_PRETTY_PRINT));
@ -2400,18 +2400,24 @@ register_module([
* @api {get} ?action=upload Get a page to let you upload a file. * @api {get} ?action=upload Get a page to let you upload a file.
* @apiName UploadFilePage * @apiName UploadFilePage
* @apiGroup Upload * @apiGroup Upload
*/ */
/** /**
* @api {post} ?action=upload Upload a file * @api {post} ?action=upload Upload a file
* @apiName UploadFile * @apiName UploadFile
* @apiGroup Upload * @apiGroup Upload
* @apiPermission User * @apiPermission User
* *
* @apiParam {file} file The file to upload. * @apiParam {file} file The file to upload.
* *
* @apiUse UserNotLoggedInError * @apiUse UserNotLoggedInError
*/ * @apiError UploadsDisabledError Uploads are currently disabled in the wiki's settings.
* @apiError UnknownFileTypeError The type of the file you uploaded is not currently allowed in the wiki's settings.
* @apiError ImageDimensionsFiledError PeppermintyWiki couldn't obtain the dimensions of the image you uploaded.
* @apiError DangerousFileError The file uploaded appears to be dangerous.
* @apiError DuplicateFileError The filename specified is a duplicate of a file that already exists.
* @apiError FileTamperedError Pepperminty Wiki couldn't verify that the file wasn't tampered with during theupload process.
*/
/* /*
* ██ ██ ██████ ██ ██████ █████ ██████ * ██ ██ ██████ ██ ██████ █████ ██████

2
module_index.json
View file

@ -77,7 +77,7 @@
"author": "Starbeamrainbowlabs", "author": "Starbeamrainbowlabs",
"description": "Adds the ability to upload files to Pepperminty Wiki. Uploaded files act as pages and have the special 'File\/' prefix.", "description": "Adds the ability to upload files to Pepperminty Wiki. Uploaded files act as pages and have the special 'File\/' prefix.",
"id": "feature-upload", "id": "feature-upload",
"lastupdate": 1465761247, "lastupdate": 1465761892,
"optional": false "optional": false
}, },
{ {

2
settings.fragment.php
View file

@ -24,7 +24,7 @@ if(!file_exists("peppermint.json"))
{ {
// Copy the default settings over to the main settings array // Copy the default settings over to the main settings array
foreach ($guiConfig as $key => $value) foreach ($guiConfig as $key => $value)
$settings->$key = $value->default $settings->$key = $value->default;
// Generate a random secret // Generate a random secret
$settings->secret = bin2hex(openssl_random_pseudo_bytes($bits)); $settings->secret = bin2hex(openssl_random_pseudo_bytes($bits));
file_put_contents("peppermint.json", json_encode($settings, JSON_PRETTY_PRINT)); file_put_contents("peppermint.json", json_encode($settings, JSON_PRETTY_PRINT));