[Phpbbproject-svn] SF.net SVN: phpbbproject:[285] trunk/phpbb3/root/project_install

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

Revision: 285
          http://phpbbproject.svn.sourceforge.net/phpbbproject/?rev=285&view=rev
Author:   lord_le_brand
Date:     2008-07-30 20:36:15 +0000 (Wed, 30 Jul 2008)

Log Message:
-----------
Moved config to install_install.php

Modified Paths:
--------------
    trunk/phpbb3/root/project_install/install_install.php
    trunk/phpbb3/root/project_install/schemas/schema_data.sql

Modified: trunk/phpbb3/root/project_install/install_install.php
===================================================================
--- trunk/phpbb3/root/project_install/install_install.php	2008-07-29 23:25:46 UTC (rev 284)
+++ trunk/phpbb3/root/project_install/install_install.php	2008-07-30 20:36:15 UTC (rev 285)
@@ -172,10 +172,6 @@
 				$cc_by_text = file_get_contents('licenses/cc_by.txt');
 				$cc_by_text = $db->sql_escape($cc_by_text);
 
-				set_config('project_install_date', $current_time);
-				set_config('phpbbproject_version', PROJECT_CURRENT_VERSION);
-				set_config('project_autopost_user_id', $bot_user_id);
-
 				$team_group_id = 0;
 				$error_message_ary = group_create($team_group_id, GROUP_SPECIAL, 'PROJECT_TEAM', '', array('group_colour' => 'E67300', 'group_receive_pm' => 1, 'group_legend' => 1));
 
@@ -225,6 +221,17 @@
 
 				$error_message = group_user_add($team_group_id, array($user->data['user_id']), false, false, false, 1);
 
+				$this->default_config = array_merge($this->default_config, array(
+					array('project_install_date', $current_time, 0),
+					array('phpbbproject_version', PROJECT_CURRENT_VERSION, 0),
+					array('project_autopost_user_id', $bot_user_id, 0),
+				));
+
+				foreach($this->default_config as $config_row)
+				{
+					set_config($config_row[0], $config_row[1], $config_row[2]);
+				}
+
 				if ($error_message)
 				{
 					$db->sql_transaction('rollback');
@@ -395,4 +402,54 @@
 		'PROJECT_CAT_MARX'			=> null,
 		'PROJECT_CAT_SEARCH'		=> null,
 	);
+
+	protected $default_config = array(
+		array('project_autopost_enable', '0', 0),
+		array('project_autopost_forum_id', '0', 0),
+		array('project_autopost_forum_per_category', '0', 0),
+		array('project_topic_title', '', 0),
+		array('project_topic_layout', '', 0),
+		array('project_history_layout', '', 0),
+		array('project_update_post_title', '', 0),
+		array('project_update_post_layout', '', 0),
+
+		array('project_docs_enabled', '1', 0),
+		array('project_docs_allow_bbcode', '1', 0),
+		array('project_docs_allow_smilies', '1', 0),
+		array('project_docs_per_page', '25', 0),
+
+		array('project_allow_logo_remote', '0', 0),
+		array('project_allow_logo_upload', '0', 0),
+		array('project_logo_filesize', '20480', 0),
+		array('project_logo_max_height', '90', 0),
+		array('project_logo_max_width', '200', 0),
+		array('project_logo_min_height', '20', 0),
+		array('project_logo_min_width', '20', 0),
+		array('project_logo_path', 'images/project_logos/upload', 0),
+		array('project_logo_salt', 'project_logo', 0),
+
+		array('projects_per_page', '25', 0),
+
+		array('project_title_min_chars', '6', 0),
+		array('project_title_max_chars', '60', 0),
+
+		array('project_allow_bookmarks', '1', 0),
+		array('project_allow_project_import', '1', 0),
+		array('project_allow_subscriptions', '1', 0),
+		array('project_approve_creation', '1', 0),
+		array('project_default_target_version', '3.0', 0),
+		array('project_display_subcats', '0', 0),
+		array('project_enable_diff', '1', 0),
+		array('project_enable_files_only', '0', 0),
+		array('project_enable_send_moddb', '0', 0),
+		array('project_enable_trackers', '1', 0),
+
+		array('project_display_stats', '1', 0),
+		array('project_display_top_ten', '1', 0),
+
+		array('project_num_projects', '0', 1),
+		array('project_num_downloads', '0', 1),
+		array('newest_project_id', '0', 1),
+		array('newest_project_title', '', 1),
+	);
 }
\ No newline at end of file

Modified: trunk/phpbb3/root/project_install/schemas/schema_data.sql
===================================================================
--- trunk/phpbb3/root/project_install/schemas/schema_data.sql	2008-07-29 23:25:46 UTC (rev 284)
+++ trunk/phpbb3/root/project_install/schemas/schema_data.sql	2008-07-30 20:36:15 UTC (rev 285)
@@ -7,65 +7,6 @@
 #------------------------------------------
 
 #
-# Configuration
-#
-
-# Autoposting - See autopost.txt for layout options
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_autopost_enable', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_autopost_forum_id', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_autopost_forum_per_category', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_topic_title', '');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_topic_layout', '');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_history_layout', '');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_update_post_title', '');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_update_post_layout', '');
-
-# Docs
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_docs_enabled', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_docs_allow_bbcode', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_docs_allow_smilies', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_docs_per_page', '25');
-
-# Logos
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_allow_logo_remote', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_allow_logo_upload', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_logo_filesize', '20480');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_logo_max_height', '90');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_logo_max_width', '200');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_logo_min_height', '20');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_logo_min_width', '20');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_logo_path', 'images/project_logos/upload');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_logo_salt', 'project_logo');
-
-# Random stuff
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('projects_per_page', '25');
-
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_title_min_chars', '6');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_title_max_chars', '60');
-
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_allow_bookmarks', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_allow_project_import', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_allow_subscriptions', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_approve_creation', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_default_target_version', '3.0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_display_subcats', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_enable_diff', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_enable_files_only', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_enable_send_moddb', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_enable_trackers', '1');
-
-# Statistics
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_display_stats', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('project_display_top_ten', '1');
-
-INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('project_num_projects', '0', 1);
-INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('project_num_downloads', '0', 1);
-INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('newest_project_id', '0', 1);
-INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('newest_project_title', '', 1);
-
-#------------------------------------------
-
-#
 # Auth options
 #
 


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