From 1cec17a4419d4ba1f56f7734cc99f75bcb8e4722 Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Sat, 20 Oct 2018 16:43:30 +0100 Subject: [PATCH] It's time for v0.17! :smiley_cat: :fireworks: --- Changelog.md | 5 +++++ README.md | 2 +- build/index.php | 18 +++++++++--------- module_index.json | 2 +- modules/page-login.php | 6 +++--- version | 2 +- 6 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Changelog.md b/Changelog.md index 81a554e..f70f22c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,11 @@ # Changelog This file holds the changelog for Pepperminty Wiki. This is the master list of things that have changed (second only to the commit history!) - though the information for any particular release can also be found in the description of it's page for every release made on GitHub too. +## v0.17 + +### Fixed + - Removed stray debugging output + ## v0.17-beta2 ### Fixed diff --git a/README.md b/README.md index d36476f..25042d0 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Pepperminty Wiki is a complete wiki contained in a single file, inspired by @am2 Developed by Starbeamrainbowlabs (though contributions from others are welcome!), Pepperminty Wiki has a variety of useful (and cool!) features - such as file upload, a dynamic help page, page revision history, page tags, and more! Other amazing features are in the works too (like a theme gallery, autoupdate, and user watchlists), so check the release notes to see what's been added recently. -**Latest Version:** v0.16 (stable) v0.17-dev (development) ([Changelog](https://github.com/sbrl/Pepperminty-Wiki/blob/master/Changelog.md)) +**Latest Version:** v0.17 (stable) v0.18-dev (development) ([Changelog](https://github.com/sbrl/Pepperminty-Wiki/blob/master/Changelog.md)) ## Table of Contents - [Screenshots and Demo](#screenshots-and-demo) diff --git a/build/index.php b/build/index.php index e31d004..b1296d2 100644 --- a/build/index.php +++ b/build/index.php @@ -406,8 +406,8 @@ if($settings->sessionprefix == "auto") ////// Do not edit below this line unless you know what you are doing! ////// ///////////////////////////////////////////////////////////////////////////// /** The version of Pepperminty Wiki currently running. */ -$version = "v0.17-beta2"; -$commit = "197d065266983f43e4bca2602407f365982cdb2a"; +$version = "v0.17"; +$commit = "3e6f374b72396995053d7b696005db2bf658850d"; /// Environment /// /** Holds information about the current request environment. */ $env = new stdClass(); @@ -1446,7 +1446,7 @@ class page_renderer {title} - + {header-html} @@ -1470,7 +1470,7 @@ class page_renderer {extra} @@ -1488,7 +1488,7 @@ class page_renderer

From {sitename}, which is managed by {admin-details-name}.

{footer-message}

Timed at {generation-date}

-

Powered by Pepperminty Wiki v0.17-beta2.

+

Powered by Pepperminty Wiki v0.17.

"; /** @@ -1577,7 +1577,7 @@ class page_renderer "{body}" => $body_template, "{sitename}" => $logo_html, - "v0.17-beta2" => $version, + "v0.17" => $version, "{favicon-url}" => $settings->favicon, "{header-html}" => self::get_header_html(), @@ -8027,7 +8027,7 @@ register_module([ } $time_compute = microtime(true); - $cost = hash_password_compute_cost(); + $cost = hash_password_compute_cost(true); $time_compute = (microtime(true) - $time_compute)*1000; $time_cost = microtime(true); @@ -8139,7 +8139,7 @@ function hash_password_update($pass, $hash) { * found that's greater than the target - or 10x the target time elapses. * @return integer The automatically calculated password hashing cost. */ -function hash_password_compute_cost() { +function hash_password_compute_cost($verbose = false) { global $settings; $props = hash_password_properties(); if($props["algorithm"] == PASSWORD_ARGON2I) @@ -8153,7 +8153,7 @@ function hash_password_compute_cost() { $start_i = microtime(true); password_hash("testing", $props["algorithm"], $props["options"]); $end_i = microtime(true); - echo("Attempt | cost = {$props["options"]["cost"]}, time = " . ($end_i - $start_i)*1000 . "ms\n"); + if($verbose) echo("Attempt | cost = {$props["options"]["cost"]}, time = " . ($end_i - $start_i)*1000 . "ms\n"); // Iterate until we find a cost high enough // ....but don't keep going forever - try for at most 10x the target // time in total (in case the specified algorithm doesn't take a diff --git a/module_index.json b/module_index.json index 1bab8cb..3b4347a 100755 --- a/module_index.json +++ b/module_index.json @@ -212,7 +212,7 @@ "author": "Starbeamrainbowlabs", "description": "Adds a pair of actions (login and checklogin) that allow users to login. You need this one if you want your users to be able to login.", "id": "page-login", - "lastupdate": 1538315378, + "lastupdate": 1540050129, "optional": false }, { diff --git a/modules/page-login.php b/modules/page-login.php index 0931e12..c7c8d19 100644 --- a/modules/page-login.php +++ b/modules/page-login.php @@ -161,7 +161,7 @@ register_module([ } $time_compute = microtime(true); - $cost = hash_password_compute_cost(); + $cost = hash_password_compute_cost(true); $time_compute = (microtime(true) - $time_compute)*1000; $time_cost = microtime(true); @@ -273,7 +273,7 @@ function hash_password_update($pass, $hash) { * found that's greater than the target - or 10x the target time elapses. * @return integer The automatically calculated password hashing cost. */ -function hash_password_compute_cost() { +function hash_password_compute_cost($verbose = false) { global $settings; $props = hash_password_properties(); if($props["algorithm"] == PASSWORD_ARGON2I) @@ -287,7 +287,7 @@ function hash_password_compute_cost() { $start_i = microtime(true); password_hash("testing", $props["algorithm"], $props["options"]); $end_i = microtime(true); - echo("Attempt | cost = {$props["options"]["cost"]}, time = " . ($end_i - $start_i)*1000 . "ms\n"); + if($verbose) echo("Attempt | cost = {$props["options"]["cost"]}, time = " . ($end_i - $start_i)*1000 . "ms\n"); // Iterate until we find a cost high enough // ....but don't keep going forever - try for at most 10x the target // time in total (in case the specified algorithm doesn't take a diff --git a/version b/version index 0d9cad9..2b8bac3 100644 --- a/version +++ b/version @@ -1 +1 @@ -v0.17-beta2 +v0.17