Release version 0.3.1

Release version 0.3.1 and also add upgrade instructions to admin upgrade
page

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.

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

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"
+	));
+}
 ?>

pages/admin/index.php

@@ -109,7 +109,7 @@
 			<div class="alert alert-warning">
 			A new update is available. Latest version: <?php echo htmlspecialchars($need_update); ?><br />
 			Download from <a class="white-text" style="text-decoration: underline;" href="https://github.com/samerton/NamelessMC/archive/master.zip" target="_blank">GitHub</a><br />
-			<a class="white-text" style="text-decoration: underline;" href="http://www.spigotmc.org/threads/nameless-minecraft-website-software.34810/">Update guide</a>
+			<a class="white-text" style="text-decoration: underline;" href="/admin/upgrade">Instructions</a>
 			</div>
 			<?php
 			}

pages/admin/upgrade.php

@@ -41,6 +41,7 @@
 			"value" => 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);
+}
+
 ?>
 <!DOCTYPE html>
 <html lang="en">
@@ -90,11 +108,13 @@
 				?>
 				<div class="well">
 				  <h2>Upgrade</h2>
-				  <p>Click "Start" to upgrade your installation from version <?php echo $version; ?> to version <?php echo htmlspecialchars($need_update); ?>.</p>
+				  <p>Follow the instructions below to upgrade your installation from version <?php echo $version; ?> to version <?php echo htmlspecialchars($need_update); ?>.</p>
 				  <p>Please create a backup of your database and files before proceeding.</p>
-				  <p><strong>Notice: files need replacing manually.</strong> <a href="http://www.spigotmc.org/threads/nameless-minecraft-website-software.34810/">Please see this post for a guide.</a></p>
-				  <p><a target="_blank" href="https://raw.githubusercontent.com/samerton/NamelessMC/master/changelog.txt">Changelog</a></p>
+				  <strong>Instructions</strong>
+				  <p><?php echo $instructions; ?></p>
+				  <p>Once this has been completed, please click "Start" below.</p>
 				  <a href="/admin/upgrade/?go" class="btn btn-primary">Start</a>
+				  <p><a target="_blank" href="https://raw.githubusercontent.com/samerton/NamelessMC/master/changelog.txt">Changelog</a></p>
 				</div>
 				<?php
 				} else {