Merge pull request #3 from TuxSoftLimited/v-0.0.1-rc-1

Update for Release Candidate 1, Version 0.0.1.

Author: JamesPhillipsUK

updater/update.php

@@ -1,53 +1,49 @@
 <?php
+/**
+ * Update Script for Updating BlogDraw to v0.0.1-rc-1
+ **/
+////Development error reporting.  Should usually be turned off in production systems.
 //error_reporting(E_ALL);
 //ini_set('display_errors', 'On');
-//Update Script for Updating BlogDraw to v0.0.1-beta-2.1
+
 echo '<h1>Starting Update...</h1>';
 echo '<p>Thank you for your patience.</p>';
 
-file_put_contents("BlogDrawSrc.tar.gz", fopen("https://github.com/TuxSoftLimited/BlogDraw/archive/v0.0.1-beta-2.1.tar.gz", 'r'));// Get the release from GitHub.
+file_put_contents("BlogDrawSrc.tar.gz", fopen("https://github.com/TuxSoftLimited/BlogDraw/archive/v0.0.1-rc-1.tar.gz", 'r'));// Get the release from GitHub.
 exec('tar -xf BlogDrawSrc.tar.gz');// Unpack it.
 
 //Alter the functions file
 $functionsFile = file_get_contents('../functions.php');
 $functionsFileData = explode('?><?php', $functionsFile);// Split the client data from the primary functions.
-$functionsFile = $functionsFileData[0] . "?>" . file_get_contents('./BlogDraw-0.0.1-beta-2.1/functions.php');
+$functionsFile = $functionsFileData[0] . "?>" . file_get_contents('./BlogDraw-0.0.1-rc-1/functions.php');
 file_put_contents('../functions.php', $functionsFile);// replace the functions.
 
 //Alter the .htaccess file
 $htaccessFile = file_get_contents('../.htaccess');
-if (!(strpos($htaccessFile, 'RewriteRule ^(Back/functions) - [F,L,NC]') !== false))// If they don't have the new rewrite rule:
-{
-  $htaccessFileData = explode('RewriteRule ^(functions\.php) - [F,L,NC]', $htaccessFile);
-  $htaccessFile = $htaccessFileData[0] . "RewriteRule ^(functions\.php) - [F,L,NC]
-RewriteRule ^(Back/functions) - [F,L,NC]" . $htaccessFileData[1];
-  file_put_contents('../.htaccess', $htaccessFile);// Write it in.
-}
+$htaccessFile = str_replace("Back/", "control/", $htaccessFile);
+file_put_contents('../.htaccess', $htaccessFile);// Write it in.
 
-//Remove old analytics table from database
-$dBServerLocation = explode("DBSERVER', '", $functionsFileData[0]);
-$DBSERVER = explode("')", $dBServerLocation[1])[0];
-$dBUserLocation = explode("DBUSER', '", $functionsFileData[0]);
-$DBUSER = explode("')", $dBUserLocation[1])[0];
-$dBPassLocation = explode("DBPASS', '", $functionsFileData[0]);
-$DBPASS = explode("')", $dBPassLocation[1])[0];
-$dBNameLocation = explode("DBNAME', '", $functionsFileData[0]);
-$DBNAME = explode("')", $dBNameLocation[1])[0];
-$dBPrefixLocation = explode("DBPREFIX', '", $functionsFileData[0]);
-$DBPREFIX = explode("')", $dBPrefixLocation[1])[0];
-$dBConnection = mysqli_connect($DBSERVER,$DBUSER,$DBPASS,$DBNAME);
-if (!$dBConnection)
-  die('Could not connect to database.  Please try again later.');
-$dBQuery = "CREATE TABLE ". $DBPREFIX . "_AnalyticsTable IF NOT EXISTS;";
-mysqli_query($dBConnection,$dBQuery);// To ensure we're not deleting a non-existent table.
-$dBQuery = "DROP TABLE ". $DBPREFIX . "_AnalyticsTable;";
-mysqli_query($dBConnection,$dBQuery);// Get rid of the table.
-mysqli_close($dBConnection);
+//Alter the robots.txt file
+$robotsFile = file_get_contents('../robots.txt');
+$robotsFile = str_replace("/Back", "/control", $robotsFile);
+file_put_contents('../robots.txt', $robotsFile);// Write it in.
 
 //Change files
-$rootDir = "BlogDraw-0.0.1-beta-2.1";// The root node containing new files.
+$rootDir = "BlogDraw-0.0.1-rc-1";// The root node containing new files.
 scan_folder($rootDir);// Replaces old BlogDraw files with new ones from the root node.
 
+//Update Database
+require_once('../functions.php');
+$DBConnection = mysqli_connect(DBSERVER,DBUSER,DBPASS,DBNAME);
+if (!$DBConnection)
+  die('Failed to update Database.');
+$DBQuery = "ALTER TABLE ". DBPREFIX . "_LoginTable ADD COLUMN DisplayName VARCHAR(25) NOT NULL;";// Add the rc-1 DisplayName feature.
+mysqli_query($DBConnection,$DBQuery);
+mysqli_close($DBConnection);
+
+echo "<p>Done!  You can now close this window and delete the &quot;updater&quot; directory.</p>";
+echo "<p><strong>NEXT STEPS: </strong> For your previous uploads to appear in future versions of BlogDraw, please copy and paste them from the \"Uploads\"directory to the \"uploads\" directory.  To ensure better system security, please delete the \"Back\" directory.  New versions of those files are now available in the \"control\" directory.</p>";
+
 /**
  * This recursively reads a directory and all of it's subdirectories given a relative filepath, then replaces the old files with the new ones.
  * Essentially filesystem traversal.
@@ -68,11 +64,12 @@ function scan_folder($dir)
       if ($file != ".htaccess" && $file != "functions.php" && $file != "install.php" )// Files we don't want to deal with.
       {
         $from = explode("updater", realpath($dir) . '/' . $file);
-        $to = explode("BlogDraw-0.0.1-beta-2.1", realpath($dir) . '/' . $file);
+        $to = explode("BlogDraw-0.0.1-rc-1", realpath($dir) . '/' . $file);
         if (!file_put_contents($_SERVER['DOCUMENT_ROOT'] . $to[1], file_get_contents('.' . $from[1])))
         {
           $copyToDir = implode('/', explode('/', ($_SERVER['DOCUMENT_ROOT'] . $to[1]), -1));
-          mkdir($copyToDir, 0755);
+          if (! mkdir($copyToDir, 0755, TRUE))
+            echo '<br />Failed to create directory ' . $copyToDir . '!';
           $newFile = fopen($_SERVER['DOCUMENT_ROOT'] . $to[1], "w");
           fwrite($newFile, file_get_contents('.' . $from[1]));
           fclose($newFile);
@@ -81,6 +78,4 @@ function scan_folder($dir)
     }
   }
 }
-
-echo "<p>Done!  You can now close this window and delete the &quot;updater&quot; directory.</p>";
-?>
+?>