From f7943365d5be5b34d008b808e8908074432526a4 Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Wed, 18 Sep 2019 11:28:47 +0100 Subject: [PATCH] Squash warnings from file_get_contents in the peppermint.json access check --- module_index.json | 28 ++++++++++++++-------------- modules/feature-firstrun.php | 3 ++- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/module_index.json b/module_index.json index 01c387f..f15e1b3 100755 --- a/module_index.json +++ b/module_index.json @@ -55,7 +55,7 @@ "version": "0.3.2", "author": "Starbeamrainbowlabs", "description": "Adds a sidebar to the left hand side of every page. Add '$settings->sidebar_show = true;' to your configuration, or append '&sidebar=yes' to the url to enable. Adding to the url sets a cookie to remember your setting.", - "lastupdate": 1567528758, + "lastupdate": 1568296731, "optional": false, "extra_data": [] }, @@ -75,7 +75,7 @@ "version": "0.1", "author": "Starbeamrainbowlabs", "description": "Displays a special page to aid in setting up a new wiki for the first time.", - "lastupdate": 1567107944, + "lastupdate": 1568296731, "optional": false, "extra_data": [] }, @@ -85,7 +85,7 @@ "version": "0.1.5", "author": "Starbeamrainbowlabs", "description": "The module everyone has been waiting for! Adds a web based gui that lets mods change the wiki settings.", - "lastupdate": 1567107944, + "lastupdate": 1568296731, "optional": false, "extra_data": [] }, @@ -95,7 +95,7 @@ "version": "0.4.2", "author": "Starbeamrainbowlabs", "description": "Adds the ability to keep unlimited page history, limited only by your disk space. Note that this doesn't store file history (yet). Currently depends on feature-recent-changes for rendering of the history page.", - "lastupdate": 1567107944, + "lastupdate": 1568296731, "optional": false, "extra_data": [] }, @@ -135,7 +135,7 @@ "version": "0.10.1", "author": "Starbeamrainbowlabs", "description": "Adds proper search functionality to Pepperminty Wiki using an inverted index to provide a full text search engine. If pages don't show up, then you might have hit a stop word. If not, try requesting the `invindex-rebuild` action to rebuild the inverted index from scratch.", - "lastupdate": 1567528763, + "lastupdate": 1568296731, "optional": false, "extra_data": [] }, @@ -145,7 +145,7 @@ "version": "0.2.2", "author": "Starbeamrainbowlabs", "description": "An extensible statistics calculation system. Comes with a range of built-in statistics, but can be extended by other modules too.", - "lastupdate": 1567528768, + "lastupdate": 1568296731, "optional": false, "extra_data": [] }, @@ -155,7 +155,7 @@ "version": "0.3", "author": "Starbeamrainbowlabs", "description": "Adds a theme gallery page and optional automatic theme updates. Contacts a remote server, where IP addresses are stored in automatic server logs for security and attack mitigation purposes.", - "lastupdate": 1567528753, + "lastupdate": 1568296832, "optional": false, "extra_data": [] }, @@ -165,7 +165,7 @@ "version": "0.6.1", "author": "Starbeamrainbowlabs", "description": "Adds the ability to upload files to Pepperminty Wiki. Uploaded files act as pages and have the special 'File\/' prefix.", - "lastupdate": 1567107944, + "lastupdate": 1568296731, "optional": false, "extra_data": [] }, @@ -205,7 +205,7 @@ "version": "0.2", "author": "Starbeamrainbowlabs", "description": "Adds a debug action for administrator use only that collects a load of useful information to make reporting bugs easier.", - "lastupdate": 1568229660, + "lastupdate": 1568296731, "optional": false, "extra_data": [] }, @@ -215,7 +215,7 @@ "version": "0.10.2", "author": "Starbeamrainbowlabs", "description": "Adds an action to allow administrators to delete pages.", - "lastupdate": 1567107944, + "lastupdate": 1568296731, "optional": false, "extra_data": [] }, @@ -225,7 +225,7 @@ "version": "0.17.5", "author": "Starbeamrainbowlabs", "description": "Allows you to edit pages by adding the edit and save actions. You should probably include this one.", - "lastupdate": 1567107944, + "lastupdate": 1568296731, "optional": false, "extra_data": { "diff.min.js": "https:\/\/cdnjs.cloudflare.com\/ajax\/libs\/jsdiff\/2.2.2\/diff.min.js" @@ -247,7 +247,7 @@ "version": "0.10", "author": "Starbeamrainbowlabs", "description": "Adds a rather useful help page. Access through the 'help' action. This module also exposes help content added to Pepperminty Wiki's inbuilt invisible help section system.", - "lastupdate": 1567107944, + "lastupdate": 1568296731, "optional": false, "extra_data": [] }, @@ -257,7 +257,7 @@ "version": "0.11.3", "author": "Starbeamrainbowlabs", "description": "Adds a page that lists all the pages in the index along with their metadata.", - "lastupdate": 1567530955, + "lastupdate": 1568296731, "optional": false, "extra_data": [] }, @@ -337,7 +337,7 @@ "version": "0.10", "author": "Emanuil Rusev & Starbeamrainbowlabs", "description": "An upgraded (now default!) parser based on Emanuil Rusev's Parsedown Extra PHP library (https:\/\/github.com\/erusev\/parsedown-extra), which is licensed MIT. Please be careful, as this module adds some weight to your installation.", - "lastupdate": 1567530862, + "lastupdate": 1568296731, "optional": false, "extra_data": { "Parsedown.php": "https:\/\/raw.githubusercontent.com\/erusev\/parsedown\/fe7a50eceb4a3c867cc9fa9c0aa906b1067d1955\/Parsedown.php", diff --git a/modules/feature-firstrun.php b/modules/feature-firstrun.php index 3ebb77b..e8cd60f 100644 --- a/modules/feature-firstrun.php +++ b/modules/feature-firstrun.php @@ -50,7 +50,8 @@ register_module([ php_sapi_name() !== "cli-server") { // The CLI server is single threaded, so it can't support loopback requests $request_url = full_url(); $request_url = preg_replace("/\/(index.php)?\?.*$/", "/peppermint.json", $request_url); - file_get_contents($request_url); + @file_get_contents($request_url); + // $http_response_header is a global reserved variable. More information: https://devdocs.io/php/reserved.variables.httpresponseheader $response_code = intval(explode(" ", $http_response_header[0])[1]); if($response_code >= 200 || $response_code < 300) { file_put_contents("$settingsFilename.compromised", "compromised");