[5142] trunk/htdocs/system: Added "manage_dash_modules" token to default token list.

[s...@habariproject.org]

Revision

5142

Author

lildude

Date

2011-06-17 10:44:23 +0000 (Fri, 17 Jun 2011)

Log Message

Added "manage_dash_modules" token to default token list.  Bumped DB version and added an upgrade_db_post method to recall an older function that adds this token for those who have not upgraded from such an old version. Fixes #1460

Modified Paths

• trunk/htdocs/system/classes/acl.php
• trunk/htdocs/system/classes/version.php
• trunk/htdocs/system/handlers/installhandler.php

Diff

Modified: trunk/htdocs/system/classes/acl.php (5141 => 5142)

--- trunk/htdocs/system/classes/acl.php	2011-06-14 13:20:39 UTC (rev 5141)
+++ trunk/htdocs/system/classes/acl.php	2011-06-17 10:44:23 UTC (rev 5142)
@@ -773,6 +773,7 @@
 		self::create_token( 'manage_self', _t( 'Edit own profile' ), 'Administration' );
 		self::create_token( 'manage_groups', _t( 'Manage groups and permissions' ), 'Administration' );
 		self::create_token( 'manage_logs', _t( 'Manage logs' ), 'Administration' );
+		self::create_token( 'manage_dash_modules', _t( 'Manage dashboard modules' ), 'Administration' );
 
 		// content tokens
 		self::create_token( 'own_posts', _t( 'Permissions on one\'s own posts' ), _t( 'Content' ), true );

Modified: trunk/htdocs/system/classes/version.php (5141 => 5142)

--- trunk/htdocs/system/classes/version.php	2011-06-14 13:20:39 UTC (rev 5141)
+++ trunk/htdocs/system/classes/version.php	2011-06-17 10:44:23 UTC (rev 5142)
@@ -14,7 +14,7 @@
 {
 	// DB and API versions are aligned with the SVN revision
 	// number in which they last changed.
-	const DB_VERSION = 5096;
+	const DB_VERSION = 5097;
 	const API_VERSION = 4955;
 
 	const HABARI_VERSION = '0.8-alpha';

Modified: trunk/htdocs/system/handlers/installhandler.php (5141 => 5142)

--- trunk/htdocs/system/handlers/installhandler.php	2011-06-14 13:20:39 UTC (rev 5141)
+++ trunk/htdocs/system/handlers/installhandler.php	2011-06-17 10:44:23 UTC (rev 5142)
@@ -1693,10 +1693,20 @@
 		DB::exec( 'drop table {tags}' );
 		DB::exec( 'drop table {tag2post}' );
 		
-		// what about postgres and sqlite indexes?
-		
+		// what about postgres and sqlite indexes?	
 	}
 	
+	private function upgrade_db_post_5097()
+	{
+		/* Add the 'manage_dash_modules' token if it doesn't exist.  This is effectively 
+		   re-doing upgrade_db_post_3701() for those who didn't upgrade from a db_version 
+		   before 3701 or those who have performed a clean install as this token 
+		   wasn't set in the list of default tokens until r5142. */
+		if ( ! ACL::token_exists( 'manage_dash_modules' ) ) {
+			$this->upgrade_db_post_3701();
+		}
+	}
+	
 	/**
 	 * Validate database credentials for MySQL
 	 * Try to connect and verify if database name exists