diff --git a/README.md b/README.md index 4b2c74cc..518386d6 100644 --- a/README.md +++ b/README.md @@ -16,21 +16,21 @@ a community but scares off 90% is a bug, rather than a feature. ## Homepage -The hypha homepage can be found at [hypha.net](http://hypha.net). +The hypha homepage can be found at [hypha.net](https://hypha.net). ## Prerequisites -Hypha needs Apache running, with php version 5.6 or above. +Hypha needs Apache running, with php version 7.2 or above. ## Basic Installation The easiest way to install hypha is probably to follow the instructions on -(http://hypha.net/hypha.php)[http://hypha.net/hypha.php]. This script packages a fully self-contained copy of hypha +(https://hypha.net/hypha.php)[https://hypha.net/hypha.php]. This script packages a fully self-contained copy of hypha in a single monolithic php file. If you drop this file on a server and call it from a browser it will extract all necessary files and configure your site according to a few settings to have to enter. The script guides you through the installation process step by step. -Your url should look like this `http:///index.php` +Your url should look like this `https:///index.php` ## Advanced Install Though Git @@ -39,4 +39,4 @@ Your url should look like this `http:///index.php` issuing a `git clone https://github.com/PlanBCode/hypha.git .` from the commandline in that folder. 2. Set write permissions to the folder `data/`, e.g. by issuing a `chmod -R 777 .` 3. Navigate to your web-folder in a browser to open `index.php` provided by hypha, and follow instructions from there. - Your url should look like this `http:///index.php`. + Your url should look like this `https:///index.php`. diff --git a/documentation.txt b/documentation.txt index 4e5ee87c..88ff0f24 100644 --- a/documentation.txt +++ b/documentation.txt @@ -26,7 +26,7 @@ Simple installation: Uploading one fully self contained file is the goal. Open source: -All code is available under a at +All code is available under a at No content license: Your data is not owned by some big company but by you (or by your webhosting provider, depending on your contract with them) diff --git a/hypha.php b/hypha.php index 4540faf2..afa6619c 100644 --- a/hypha.php +++ b/hypha.php @@ -1,7 +1,7 @@ createElement('header', $_POST['setupTitle']); $hypha->appendChild($header); $footer = $xml->createElement('footer', ''); - setNodeHtml($footer, 'Creative Commons License This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License. Website powered by hypha.'); + setNodeHtml($footer, 'Creative Commons License This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License. Website powered by hypha.'); $hypha->appendChild($footer); $menu = $xml->createElement('menu', ''); setNodeHtml($menu, ''); diff --git a/index.php b/index.php index 6c840a3a..9083bbdf 100644 --- a/index.php +++ b/index.php @@ -48,7 +48,7 @@ /* Group: Stage 3 - Get query and handle direct file requests - Here we extract our page query from the php $_SERVER data. Page requests should be formatted in a directory like structure, e.g. http://www.dom.ain/en/home/edit, the first level usually being a language id, the second level begin a page id, and the third level being an optional view. + Here we extract our page query from the php $_SERVER data. Page requests should be formatted in a directory like structure, e.g. https://www.dom.ain/en/home/edit, the first level usually being a language id, the second level begin a page id, and the third level being an optional view. Some requests don't need the whole script to run. Certain file requests (css, javascript) can be handled directly here. */ diff --git a/system/core/HyphaRequest.php b/system/core/HyphaRequest.php index ad556205..de4c47cc 100644 --- a/system/core/HyphaRequest.php +++ b/system/core/HyphaRequest.php @@ -52,7 +52,7 @@ public function __construct($rootUrlPath = null, $relativeUrlPath = null) { /** * in case of hypha instance in the root - * request uri: http://www.my-org.net/en/my-page?foo=bar + * request uri: https://www.my-org.net/en/my-page?foo=bar * $_SERVER['SCRIPT_NAME'] is expected to be "/index.php" * $_SERVER['REQUEST_URI'] is expected to be "/en/my-page?foo=bar" * $rootUrlPath will be "/" @@ -60,7 +60,7 @@ public function __construct($rootUrlPath = null, $relativeUrlPath = null) { */ /** * in case of hypha instance in sub directory - * request uri: http://www.my-org.net/my-hypha/en/my-page?foo=bar + * request uri: https://www.my-org.net/my-hypha/en/my-page?foo=bar * $_SERVER['SCRIPT_NAME'] is expected to be "/my-hypha/index.php" * $_SERVER['REQUEST_URI'] is expected to be "/my-hypha/en/my-page?foo=bar" * $rootUrlPath will be "/my-hypha/"