[Phpbbproject-svn] SF.net SVN: phpbbproject:[288] trunk

[<lor...@us...>]

Revision: 288
          http://phpbbproject.svn.sourceforge.net/phpbbproject/?rev=288&view=rev
Author:   lord_le_brand
Date:     2008-07-31 14:31:40 +0000 (Thu, 31 Jul 2008)

Log Message:
-----------
Even better...

Modified Paths:
--------------
    trunk/develop/create_schema_files_phpbb3.php
    trunk/phpbb3/root/project_install/install_install.php
    trunk/phpbb3/root/project_install/schemas/mysql_41_schema.sql

Modified: trunk/develop/create_schema_files_phpbb3.php
===================================================================
--- trunk/develop/create_schema_files_phpbb3.php	2008-07-31 12:00:51 UTC (rev 287)
+++ trunk/develop/create_schema_files_phpbb3.php	2008-07-31 14:31:40 UTC (rev 288)
@@ -979,6 +979,7 @@
 		'COLUMNS'		=> array(
 			'tracker_id'	=> array('UINT:11', NULL, 'auto_increment'),
 			'project_id'	=> array('UINT', '0'),
+			'tracker_title'	=> array('XSTEXT_UNI', ''),
 			'tracker_type'	=> array('TINT:3', '0'),
 		),
 		'PRIMARY_KEY'	=> 'tracker_id',

Modified: trunk/phpbb3/root/project_install/install_install.php
===================================================================
--- trunk/phpbb3/root/project_install/install_install.php	2008-07-31 12:00:51 UTC (rev 287)
+++ trunk/phpbb3/root/project_install/install_install.php	2008-07-31 14:31:40 UTC (rev 288)
@@ -152,15 +152,16 @@
 				$db->sql_transaction('begin');
 
 				// Add auth options
-				foreach ($this->acl_options_local as $location => $options)
+				foreach ($this->acl_options_local as $location => $location_row)
 				{
-					$sql = 'SELECT location_id
-						FROM ' . ACL_LOCATIONS_TABLE . "
-						WHERE location_table = '$location'";
-					$result = $db->sql_query($sql);
-					$location_id = $db->sql_fetchfield('location_id', 0, $result);
-					$db->sql_freeresult($result);
+					$options = $location_row['location_options'];
+					unset($location_row['location_options']);
 
+					$sql = 'INSERT INTO ' . ACL_LOCATIONS_TABLE . ' ' . $db->sql_build_array('INSERT', $location_row);
+					$db->sql_query($sql);
+
+					$location_id = $db->sql_nextid();
+
 					$options = array('local' => $options);
 					$auth_admin->acl_add_option($options);
 				}
@@ -481,27 +482,45 @@
 
 	protected $acl_options_local = array(
 		'PROJECT_PROJECTS_TABLE' => array(
-			'p_view_project',
-			'p_edit_project',
-			'p_delete_project',
-			'p_download_project',
+			'location_identifier'	=> 'project',
+			'location_primary'		=> 'project_id',
+			'location_title'		=> 'project_title',
+			'is_nestable'			=> 0,
+			'location_options'		=> array(
+				'p_view_project',
+				'p_edit_project',
+				'p_delete_project',
+				'p_download_project',
 
-			'p_view_docs',
-			'p_manage_docs',
+				'p_view_docs',
+				'p_manage_docs',
 
-			'p_add_author',
-			'p_remove_author',
-			'p_assign_role',
-			'p_assign_auth',
+				'p_add_author',
+				'p_remove_author',
+				'p_assign_role',
+				'p_assign_auth',
+			),
 		),
 		'PROJECT_TRACKERS_TABLE' => array(
-			'p_post_tickets',
-			'p_comment_tickets',
-			'p_manage_tickets',
+			'location_identifier'	=> 'tracker',
+			'location_primary'		=> 'tracker_id',
+			'location_title'		=> 'tracker_title',
+			'is_nestable'			=> 0,
+			'location_options'		=> array(
+				'p_post_tickets',
+				'p_comment_tickets',
+				'p_manage_tickets',
+			),
 		),
 		'PROJECT_CATEGORIES_TABLE' => array(
-			'p_view_category',
-			'p_category_add_project',
+			'location_identifier'	=> 'category',
+			'location_primary'		=> 'category_id',
+			'location_title'		=> 'category_title',
+			'is_nestable'			=> 0,
+			'location_options'		=> array(
+				'p_view_category',
+				'p_category_add_project',
+			),
 		),
 	);
 

Modified: trunk/phpbb3/root/project_install/schemas/mysql_41_schema.sql
===================================================================
--- trunk/phpbb3/root/project_install/schemas/mysql_41_schema.sql	2008-07-31 12:00:51 UTC (rev 287)
+++ trunk/phpbb3/root/project_install/schemas/mysql_41_schema.sql	2008-07-31 14:31:40 UTC (rev 288)
@@ -134,6 +134,7 @@
 CREATE TABLE phpbb_project_trackers (
 	tracker_id int(11) UNSIGNED NOT NULL auto_increment,
 	project_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	tracker_title varchar(100) DEFAULT '' NOT NULL,
 	tracker_type tinyint(3) DEFAULT '0' NOT NULL,
 	PRIMARY KEY (tracker_id),
 	KEY project_id (project_id)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.