From e21fe48faa5f992382b772e0afa5ee83b8295857 Mon Sep 17 00:00:00 2001 From: Samerton Date: Thu, 21 May 2015 20:38:07 +0100 Subject: [PATCH] Release version 0.3.1 Release version 0.3.1 and also add upgrade instructions to admin upgrade page --- README.md | 2 +- changelog.txt | 21 +++++++++++++++++++++ inc/includes/update.php | 11 +++++++++++ pages/admin/index.php | 2 +- pages/admin/upgrade.php | 26 +++++++++++++++++++++++--- 5 files changed, 57 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index eaf1151..e0f92d2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -**Version 0.3.0 released. Please report bugs ether in the Spigot thread or the Issue Tracker.** +**Version 0.3.1 released. Please report bugs ether in the Spigot thread or the Issue Tracker.** **Upgrade guide found in the [OP of the Spigot thread](http://www.spigotmc.org/threads/nameless-minecraft-website-software.34810/) ** NamelessMC is a free, easy to use & powerful website software for your Minecraft server, which includes a large range of features. diff --git a/changelog.txt b/changelog.txt index 4249703..b7ed5d5 100644 --- a/changelog.txt +++ b/changelog.txt @@ -22,3 +22,24 @@ - Add support for Ban Management and MaxBans - Fix issue with sticky thread not showing in forum table view - Add notice about replacing files manually whilst upgrading + +0.3.1 +- Fix missing link to Infractions from admin sidebar +- Add option to disable infractions from Pages page +- Fix 404 on Help page +- Fix plain white page on Donate page if web server is running PHP < 5.5 and user is not logged in +- Fix issue where donation currency always shows as GBP in latest donors list +- Fix issue where post editor occasionally doesn't show up in Edit Post +- Add ability to edit the post title in Edit Post if the post is OP +- Fix plain white page whilst moving threads if web server is running PHP < 5.5 +- Make images responsive +- Add ability to delete a user from the admin panel +- Prevent users signing up with an already used email address +- Update CKEditor to include Bootstrap theme and Youtube button +- Update post editor to include Youtube button and changing text's colour, plus a slight button reshuffle +- Fix issues relating to having custom display names disabled +- Fix updating UUID and Minecraft usernames of users from the Admin panel +- Add user's avatar to navbar +- Change the UUID integration class to use cURL instead of file_get_contents +- Add time to when user registered on profile pages +- Add upgrade instructions to admin upgrade page instead of linking to Spigot \ No newline at end of file diff --git a/inc/includes/update.php b/inc/includes/update.php index 71db45c..ec52cc6 100644 --- a/inc/includes/update.php +++ b/inc/includes/update.php @@ -99,4 +99,15 @@ "value" => "false" )); } + +if($version == '0.3.0'){ + // No database changes needed + // Update version name + $queries->update("settings", 30, array( + "value" => "0.3.1" + )); + $queries->update("settings", 32, array( + "value" => "false" + )); +} ?> \ No newline at end of file diff --git a/pages/admin/index.php b/pages/admin/index.php index 7289fd9..dad9236 100644 --- a/pages/admin/index.php +++ b/pages/admin/index.php @@ -109,7 +109,7 @@
A new update is available. Latest version:
Download from GitHub
- Update guide + Instructions
htmlspecialchars($latest_version) )); $need_update = htmlspecialchars($latest_version); + $instructions = file_get_contents("https://worldscapemc.co.uk/nl_core/update.php?version=" . $version); } } @@ -51,6 +52,23 @@ * End version check */ +// Get update instructions +if(isset($instructions)){ + // HTMLPurifier + require('inc/includes/html/library/HTMLPurifier.auto.php'); + + $config = HTMLPurifier_Config::createDefault(); + $config->set('HTML.Doctype', 'XHTML 1.0 Transitional'); + $config->set('URI.DisableExternalResources', false); + $config->set('URI.DisableResources', false); + $config->set('HTML.Allowed', 'u,p,b,i,small,blockquote,span[style],span[class],p,strong,em,li,ul,ol,div[align],br,img'); + $config->set('CSS.AllowedProperties', array('float', 'color','background-color', 'background', 'font-size', 'font-family', 'text-decoration', 'font-weight', 'font-style', 'font-size')); + $config->set('HTML.AllowedAttributes', 'src, height, width, alt, class, *.style'); + $purifier = new HTMLPurifier($config); + + $instructions = $purifier->purify($instructions); +} + ?> @@ -90,11 +108,13 @@ ?>

Upgrade

-

Click "Start" to upgrade your installation from version to version .

+

Follow the instructions below to upgrade your installation from version to version .

Please create a backup of your database and files before proceeding.

-

Notice: files need replacing manually. Please see this post for a guide.

-

Changelog

+ Instructions +

+

Once this has been completed, please click "Start" below.

Start +

Changelog