[wolfcms] r357 committed - Updating upgrade information

4 views
Skip to first unread message

wol...@googlecode.com

unread,
Dec 24, 2010, 8:24:38 PM12/24/10
to wolfcms...@googlegroups.com
Revision: 357
Author: martij...@gmail.com
Date: Fri Dec 24 17:23:28 2010
Log: Updating upgrade information
http://code.google.com/p/wolfcms/source/detail?r=357

Modified:
/trunk/docs/updating.txt
/trunk/security.php
/trunk/wolf/install/do-upgrade.php

=======================================
--- /trunk/docs/updating.txt Sun Nov 21 16:20:08 2010
+++ /trunk/docs/updating.txt Fri Dec 24 17:23:28 2010
@@ -14,21 +14,28 @@

1. Create a backup of your files AND database. Save your config.php file!

-2. Delete everything from your old Wolf installation. (Make sure you did
step 1!)
-
-3. Extract the 0.7.0 download as if you would install it normally.
-
-4. Make sure to rename the "_.htaccess" file if desired and check its
settings.
-
-5. Copy your OLD config.php into your 0.7.0 installation, overwriting the
empty default.
-
-6. Visit http://www.example.com/wolf/install/index.php and follow the
instructions to upgrade your database.
-
-7. Visit http://www.example.com/security.php to view the security advisory.
-
-8. Test your new installation.
-
-9. Clean up by removing the wolf/install & docs directories as well as
readme.txt and security.php
+2. Login to your old installation and disable all of your plugins.
+
+3. Delete everything from your old Wolf installation. (Make sure you did
step 1!)
+ - You can leave your public directory in place.
+
+4. Extract the 0.7.0 download as if you would install it normally.
+
+5. Make sure to rename the "_.htaccess" file if desired and check its
settings against your backup.
+
+6. Copy your OLD config.php into your 0.7.0 installation, overwriting the
empty default.
+
+7. Visit http://www.example.com/wolf/install/index.php and follow the
instructions to upgrade your database.
+
+8. Visit http://www.example.com/security.php to view the security advisory.
+
+9. Test your new installation.
+
+10. Copy back your third party plugins.
+
+11. Enable and test each third party plugin one by one.
+
+12. Clean up by removing the wolf/install & docs directories as well as
readme.txt and security.php


### Upgrading from 0.5.5 => 0.6.0 ###
=======================================
--- /trunk/security.php Mon Dec 20 06:52:30 2010
+++ /trunk/security.php Fri Dec 24 17:23:28 2010
@@ -327,6 +327,9 @@
?>
</tbody>
</table>
+ <p>
+ Go to your site's <a href="index.php">front page</a> or the <a
href="<?php echo (USE_MOD_REWRITE)?'':'?/'; echo
ADMIN_DIR;?>">administrative interface</a>.
+ </p>
<hr/>
<p><small>DISCLAIMER - neither the Wolf CMS project nor any of its
contributors provide any warranty, for details, please see
/docs/license.txt in the download package.</small></p>

=======================================
--- /trunk/wolf/install/do-upgrade.php Sun Nov 21 15:40:56 2010
+++ /trunk/wolf/install/do-upgrade.php Fri Dec 24 17:23:28 2010
@@ -13,8 +13,6 @@
*
* ALWAY MAKE A BACKUP OF THE DB BEFORE UPGRADING!
*
- * @todo STILL NEED TO TEST THIS!
- *
* @version 0.7.0
* @since 0.7.0
* @author Martijn van der Kleijn <martij...@gmail.com>
@@ -30,7 +28,6 @@
}
?>

-<!--p>Thank you for your interest. This script is still unfinished. It
will be finished before Wolf CMS 0.7.0 RC1 is released.</p-->
<p>
Upgrading:
</p>
@@ -40,7 +37,7 @@
// Check passwords
$data = $_POST['upgrade'];
if ($data['pwd'] != $data['pwd_check']) {
- die('Passwords do not match each other.');
+ die('<strong>Upgrade failed!</strong> Passwords do not match each
other.');
}

// SETUP BASIC WOLF ENVIRONMENT
@@ -48,7 +45,7 @@
$__CMS_CONN__ = new PDO(DB_DSN, DB_USER, DB_PASS);
}
catch (PDOException $error) {
- die('DB Connection failed: '.$error->getMessage());
+ die('<strong>Upgrade failed!</strong> DB Connection
failed: '.$error->getMessage());
}

echo '<li>Connection to current database made...</li>';
@@ -72,11 +69,13 @@
Record::connection($__CMS_CONN__);
Record::getConnection()->exec("set names 'utf8'");

+// START PRE-UPGRADE STUFF
+
// Get the user from the DB
$user = Record::findOneFrom('User', 'username=?',
array($data['username']));

if (!$user) {
- die('Administrative user not correct...');
+ die('<strong>Upgrade failed!</strong> Administrative user not
correct...');
}

echo '<li>Administrative user found.</li>';
@@ -94,21 +93,18 @@
$perms[] = $perm->name;

if (!in_array('administrator', $perms)) {
- die('Administrative permissions not correct.');
+ die('<strong>Upgrade failed!</strong> Administrative permissions not
correct.');
}

echo '<li>Administrative user has appropriate permissions...</li>';

// Check administrative user's password
if ($user->password != sha1($data['pwd'])) {
- die('Administrative password not correct.');
+ die('<strong>Upgrade failed!</strong> Administrative password not
correct.');
}

echo '<li>Administrative password correct...</li>';

-// SCRIPT UNFINISHED, exiting...
-//exit();
-

/***** SAFETY CHECKS DONE, CONTINUE WITH ACTUAL UPGRADE ******/
echo '<li>Starting database upgrade...<ul>';
@@ -240,6 +236,12 @@
$PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (1, 17)");
$PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (1, 18)");
$PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (1, 19)");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (1, 20)");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (1, 21)");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (1, 22)");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (1, 23)");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (1, 24)");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (1, 25)");

// Role 2 = developer
$PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (2, 1)");
@@ -256,6 +258,12 @@
$PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (2, 17)");
$PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (2, 18)");
$PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (2, 19)");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (2, 20)");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (2, 21)");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (2, 22)");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (2, 23)");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (2, 24)");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (2, 25)");

// Role 2 = editor
$PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (3, 1)");
@@ -264,6 +272,12 @@
$PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (3, 17)");
$PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (3, 18)");
$PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (3, 19)");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (3, 20)");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (3, 21)");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (3, 22)");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (3, 23)");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (3, 24)");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."role_permission (role_id,
permission_id) VALUES (3, 25)");
echo '<li>Added default role permission mappings...</li>';

// Updating permissions table
@@ -287,6 +301,13 @@
$PDO->exec("INSERT INTO ".TABLE_PREFIX."permission (id, name) VALUES
(17, 'page_edit')");
$PDO->exec("INSERT INTO ".TABLE_PREFIX."permission (id, name) VALUES
(18, 'page_delete')");
$PDO->exec("INSERT INTO ".TABLE_PREFIX."permission (id, name) VALUES
(19, 'file_manager_view')");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."permission (id, name) VALUES
(20, 'file_manager_upload')");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."permission (id, name) VALUES
(21, 'file_manager_mkdir')");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."permission (id, name) VALUES
(22, 'file_manager_mkfile')");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."permission (id, name) VALUES
(23, 'file_manager_rename')");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."permission (id, name) VALUES
(24, 'file_manager_chmod')");
+ $PDO->exec("INSERT INTO ".TABLE_PREFIX."permission (id, name) VALUES
(25, 'file_manager_delete')");
+
echo '<li>Emptied permission table and added default
permissions...</li>';

// DELETING TABLES
@@ -469,6 +490,12 @@
$PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (1, 17)");
$PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (1, 18)");
$PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (1, 19)");
+ $PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (1, 20)");
+ $PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (1, 21)");
+ $PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (1, 22)");
+ $PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (1, 23)");
+ $PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (1, 24)");
+ $PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (1, 25)");

// Role 2 = developer
$PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (2, 1)");
@@ -485,6 +512,12 @@
$PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (2, 17)");
$PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (2, 18)");
$PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (2, 19)");
+ $PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (2, 20)");
+ $PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (2, 21)");
+ $PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (2, 22)");
+ $PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (2, 23)");
+ $PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (2, 24)");
+ $PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (2, 25)");

// Role 2 = editor
$PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (3, 1)");
@@ -493,6 +526,12 @@
$PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (3, 17)");
$PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (3, 18)");
$PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (3, 19)");
+ $PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (3, 20)");
+ $PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (3, 21)");
+ $PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (3, 22)");
+ $PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (3, 23)");
+ $PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (3, 24)");
+ $PDO->exec("INSERT INTO role_permission (role_id, permission_id)
VALUES (3, 25)");
echo '<li>Added default role permission mappings...</li>';

// Updating permissions table
@@ -518,6 +557,13 @@
$PDO->exec("INSERT INTO permission (id, name) VALUES
(17, 'page_edit')");
$PDO->exec("INSERT INTO permission (id, name) VALUES
(18, 'page_delete')");
$PDO->exec("INSERT INTO permission (id, name) VALUES
(19, 'file_manager_view')");
+ $PDO->exec("INSERT INTO permission (id, name) VALUES
(20, 'file_manager_upload')");
+ $PDO->exec("INSERT INTO permission (id, name) VALUES
(21, 'file_manager_mkdir')");
+ $PDO->exec("INSERT INTO permission (id, name) VALUES
(22, 'file_manager_mkfile')");
+ $PDO->exec("INSERT INTO permission (id, name) VALUES
(23, 'file_manager_rename')");
+ $PDO->exec("INSERT INTO permission (id, name) VALUES
(24, 'file_manager_chmod')");
+ $PDO->exec("INSERT INTO permission (id, name) VALUES
(25, 'file_manager_delete')");
+
echo '<li>Emptied permission table and added default
permissions...</li>';

// DELETING TABLES
@@ -535,4 +581,10 @@
}

?>
-</ul></li></ul>
+</ul>
+</li>
+<li><strong>Upgrade finished!</strong></li>
+</ul>
+<p>
+ Please check the <a href="../../security.php">security advisory</a>
next.
+</p>

Reply all
Reply to author
Forward
0 new messages