[phpBB] svn: r374 - in trunk/phpbb3: patches po

kink at wolffelaar.nl kink at wolffelaar.nl
Thu May 31 17:00:49 CEST 2007


Author: kink
Date: 2007-05-31 17:00:48 +0200 (Thu, 31 May 2007)
New Revision: 374

Modified:
   trunk/phpbb3/patches/010_board_configuration.diff
   trunk/phpbb3/patches/012_fix_version_display.diff
   trunk/phpbb3/patches/015_disable_version_check.diff
   trunk/phpbb3/po/templates.pot
Log:
update and unfuzzy patches


Modified: trunk/phpbb3/patches/010_board_configuration.diff
===================================================================
--- trunk/phpbb3/patches/010_board_configuration.diff	2007-05-31 14:36:03 UTC (rev 373)
+++ trunk/phpbb3/patches/010_board_configuration.diff	2007-05-31 15:00:48 UTC (rev 374)
@@ -1,10 +1,9 @@
-diff -Nur phpBB3.orig/install/schemas/schema_data.sql phpBB3/install/schemas/schema_data.sql
---- phpBB3.orig/install/schemas/schema_data.sql	2007-01-28 18:08:13.000000000 +0100
-+++ phpBB3/install/schemas/schema_data.sql	2007-02-06 14:53:04.000000000 +0100
-@@ -46,11 +46,11 @@
- INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_min_height', '20');
+--- phpBB3/install/schemas/schema_data.sql.orig	2007-05-20 17:06:55.000000000 +0200
++++ phpBB3/install/schemas/schema_data.sql	2007-05-31 16:39:35.000000000 +0200
+@@ -45,11 +45,11 @@
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_min_width', '20');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_path', 'images/avatars/upload');
+ INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_salt', 'phpbb_avatar');
 -INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_contact', 'contact at yourdomain.tld');
 -INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_disable', '0');
 +INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_contact', '');
@@ -14,9 +13,9 @@
 -INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email', 'address at yourdomain.tld');
 +INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email', '');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_form', '0');
- INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_sig', 'Thanks, The Management');
+ INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_sig', '{L_CONFIG_BOARD_EMAIL_SIG}');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_hide_emails', '1');
-@@ -72,6 +72,7 @@
+@@ -73,6 +73,7 @@
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_mail', '');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('database_gc', '604800');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat', 'D M d, Y g:i a');
@@ -24,7 +23,7 @@
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style', '1');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('display_last_edited', '1');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('display_order', '0');
-@@ -174,7 +175,7 @@
+@@ -175,7 +176,7 @@
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('queue_interval', '600');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('ranks_path', 'images/ranks');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('require_activation', '0');
@@ -33,20 +32,9 @@
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_block_size', '250');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_gc', '7200');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_indexing_state', '');
-@@ -190,8 +191,8 @@
- INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_protocol', '');
- INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_gc', '3600');
- INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_length', '3600');
--INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_desc', 'A _little_ text to describe your forum');
--INSERT INTO phpbb_config (config_name, config_value) VALUES ('sitename', 'yourdomain.com');
-+INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_desc', 'Powered by Debian');
-+INSERT INTO phpbb_config (config_name, config_value) VALUES ('sitename', 'Your new phpBB3 forum');
- INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path', 'images/smilies');
- INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_auth_method', 'PLAIN');
- INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_delivery', '0');
-@@ -395,11 +396,8 @@
+@@ -467,11 +468,8 @@
  
- INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts, forum_topics, forum_topics_real, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_poster_colour, forum_last_post_subject, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_uid, forum_desc_uid, prune_days, prune_viewed, forum_parents) VALUES ('Test Forum 1', 'This is just a test forum.', 2, 3, 1, 1, 1, 1, 1, 1, 2, 'Admin', 'AA0000', 'Welcome to phpBB 3', 972086460, '', '', '', '', '', '', '', 0, 0, '');
+ INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts, forum_topics, forum_topics_real, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_poster_colour, forum_last_post_subject, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_uid, forum_desc_uid, prune_days, prune_viewed, forum_parents) VALUES ('{L_FORUMS_TEST_FORUM_TITLE}', '{L_FORUMS_TEST_FORUM_DESC}', 2, 3, 1, 1, 1, 1, 1, 1, 2, 'Admin', 'AA0000', '{L_TOPICS_TOPIC_TITLE}', 972086460, '', '', '', '', '', '', '', 0, 0, '');
  
 -# -- Users / Anonymous user
 -INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd, user_allow_massemail) VALUES (2, 1, 'Anonymous', 'anonymous', 0, '', '', 'en', 1, 0, '', 0, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 0);
@@ -57,7 +45,7 @@
  
  # -- Groups
  INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('GUESTS', 3, 0, '', 0, '', '', '');
-@@ -410,10 +408,7 @@
+@@ -482,10 +480,7 @@
  INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('BOTS', 3, 0, '9E8DA7', 0, '', '', '');
  
  # -- User -> Group
@@ -68,8 +56,8 @@
 +INSERT INTO `phpbb_user_group` (`group_id`, `user_id`, `group_leader`, `user_pending`) VALUES (1,1,0,0),(2,2,0,0),(4,2,0,0),(5,2,1,0),(6,3,0,0),(6,4,0,0),(6,5,0,0),(6,6,0,0),(6,7,0,0),(6,8,0,0),(6,9,0,0),(6,10,0,0),(6,11,0,0),(6,12,0,0),(6,13,0,0),(6,14,0,0),(6,15,0,0),(6,16,0,0),(6,17,0,0),(6,18,0,0),(6,19,0,0),(6,20,0,0),(6,21,0,0),(6,22,0,0),(6,23,0,0),(6,24,0,0),(6,25,0,0),(6,26,0,0),(6,27,0,0),(6,28,0,0),(6,29,0,0),(6,30,0,0),(6,31,0,0),(6,32,0,0),(6,33,0,0),(6,34,0,0),(6,35,0,0),(6,36,0,0),(6,37,0,0),(6,38,0,0),(6,39,0,0),(6,40,0,0),(6,41,0,0),(6,42,0,0),(6,43,0,0),(6,44,0,0),(6,45,0,0),(6,46,0,0),(6,47,0,0),(6,48,0,0),(6,49,0,0),(6,50,0,0),(6,51,0,0),(6,52,0,0);
  
  # -- Ranks
- INSERT INTO phpbb_ranks (rank_title, rank_min, rank_special, rank_image) VALUES ('Site Admin', 0, 1, '');
-@@ -725,4 +720,12 @@
+ INSERT INTO phpbb_ranks (rank_title, rank_min, rank_special, rank_image) VALUES ('{L_RANKS_SITE_ADMIN_TITLE}', 0, 1, '');
+@@ -770,4 +765,12 @@
  INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'ogg');
  INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'ogm');
  

Modified: trunk/phpbb3/patches/012_fix_version_display.diff
===================================================================
--- trunk/phpbb3/patches/012_fix_version_display.diff	2007-05-31 14:36:03 UTC (rev 373)
+++ trunk/phpbb3/patches/012_fix_version_display.diff	2007-05-31 15:00:48 UTC (rev 374)
@@ -1,18 +1,16 @@
-diff -ur phpBB3.orig/adm/index.php phpBB3/adm/index.php
---- phpBB3.orig/adm/index.php	2006-11-12 20:49:04.000000000 +0100
-+++ phpBB3/adm/index.php	2006-11-14 01:56:51.000000000 +0100
-@@ -207,7 +207,7 @@
- 	$template->assign_vars(array(
+--- phpBB3/adm/index.php.orig	2007-05-20 17:06:53.000000000 +0200
++++ phpBB3/adm/index.php	2007-05-31 16:49:31.000000000 +0200
+@@ -202,7 +202,7 @@
  		'DEBUG_OUTPUT'		=> (defined('DEBUG')) ? $debug_output : '',
+ 		'TRANSLATION_INFO'	=> (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '',
  		'S_COPYRIGHT_HTML'	=> $copyright_html,
 -		'VERSION'			=> $config['version'])
 +		'VERSION'			=> PHPBB_VERSION)
  	);
  
  	$template->display('body');
-diff -ur phpBB3.orig/common.php phpBB3/common.php
---- phpBB3.orig/common.php	2006-11-12 20:49:07.000000000 +0100
-+++ phpBB3/common.php	2006-11-14 01:56:09.000000000 +0100
+--- phpBB3/common.php.orig	2007-05-20 17:06:58.000000000 +0200
++++ phpBB3/common.php	2007-05-31 16:49:31.000000000 +0200
 @@ -75,6 +75,8 @@
  	unset($input);
  }
@@ -20,21 +18,20 @@
 +define('PHPBB_VERSION', '@VERSION@');
 +
  // If we are on PHP >= 6.0.0 we do not need some code
- if (version_compare(phpversion(), '6.0.0-dev', '>='))
+ if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
  {
-diff -ur phpBB3.orig/includes/acp/acp_styles.php phpBB3/includes/acp/acp_styles.php
---- phpBB3.orig/includes/acp/acp_styles.php	2006-11-12 20:49:04.000000000 +0100
-+++ phpBB3/includes/acp/acp_styles.php	2006-11-14 02:00:07.000000000 +0100
-@@ -1744,7 +1744,7 @@
+--- phpBB3/includes/acp/acp_styles.php.orig	2007-05-20 17:06:53.000000000 +0200
++++ phpBB3/includes/acp/acp_styles.php	2007-05-31 16:49:31.000000000 +0200
+@@ -1698,7 +1698,7 @@
  
  			if ($mode == 'style')
  			{
 -				$style_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['style_name'], $style_row['style_copyright'], $config['version']), $this->style_cfg);
 +				$style_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['style_name'], $style_row['style_copyright'], PHPBB_VERSION), $this->style_cfg);
  
- 				$style_cfg .= (!$inc_template) ? "\ntemplate = {$style_row['template_name']}" : '';
- 				$style_cfg .= (!$inc_theme) ? "\ntheme = {$style_row['theme_name']}" : '';
-@@ -1761,7 +1761,7 @@
+ 				$style_cfg .= (!$inc_template) ? "\nrequired_template = {$style_row['template_name']}" : '';
+ 				$style_cfg .= (!$inc_theme) ? "\nrequired_theme = {$style_row['theme_name']}" : '';
+@@ -1715,7 +1715,7 @@
  			// Export template core code
  			if ($mode == 'template' || $inc_template)
  			{
@@ -43,7 +40,7 @@
  				$template_cfg .= "\nbbcode_bitfield = {$style_row['bbcode_bitfield']}";
  
  				$data[] = array(
-@@ -1801,7 +1801,7 @@
+@@ -1755,7 +1755,7 @@
  			// Export theme core code
  			if ($mode == 'theme' || $inc_theme)
  			{
@@ -52,12 +49,12 @@
  
  				// Read old cfg file
  				$items = $cache->obtain_cfg_items($style_row);
-@@ -1845,7 +1845,7 @@
+@@ -1794,7 +1794,7 @@
  			// Export imageset core code
  			if ($mode == 'imageset' || $inc_imageset)
  			{
 -				$imageset_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['imageset_name'], $style_row['imageset_copyright'], $config['version']), $this->imageset_cfg);
 +				$imageset_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['imageset_name'], $style_row['imageset_copyright'], PHPBB_VERSION), $this->imageset_cfg);
  
- 				foreach ($this->imageset_keys as $topic => $key_array)
- 				{
+ 				$imageset_main = array();
+ 

Modified: trunk/phpbb3/patches/015_disable_version_check.diff
===================================================================
--- trunk/phpbb3/patches/015_disable_version_check.diff	2007-05-31 14:36:03 UTC (rev 373)
+++ trunk/phpbb3/patches/015_disable_version_check.diff	2007-05-31 15:00:48 UTC (rev 374)
@@ -1,6 +1,5 @@
-diff -Nur phpBB3.orig/includes/acp/acp_update.php phpBB3/includes/acp/acp_update.php
---- phpBB3.orig/includes/acp/acp_update.php	2007-01-28 18:08:12.000000000 +0100
-+++ phpBB3/includes/acp/acp_update.php	2007-02-06 15:10:15.000000000 +0100
+--- phpBB3/includes/acp/acp_update.php.orig	2007-05-20 17:06:53.000000000 +0200
++++ phpBB3/includes/acp/acp_update.php	2007-05-31 16:58:33.000000000 +0200
 @@ -25,7 +25,7 @@
  		$this->tpl_name = 'acp_update';
  		$this->page_title = 'ACP_VERSION_CHECK';
@@ -10,12 +9,12 @@
  		$errstr = '';
  		$errno = 0;
  
-@@ -44,18 +44,18 @@
+@@ -43,18 +43,19 @@
  		$update_link = append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=update');
  
- 		$up_to_date = (version_compare(strtolower($config['version']), strtolower($latest_version), '<')) ? false : true;
--
+ 		$up_to_date = (version_compare(str_replace('rc', 'RC', strtolower($config['version'])), str_replace('rc', 'RC', strtolower($latest_version)), '<')) ? false : true;
 +*/
+ 
  		$template->assign_vars(array(
 -			'S_UP_TO_DATE'		=> $up_to_date,
 +			'S_UP_TO_DATE'		=> true,

Modified: trunk/phpbb3/po/templates.pot
===================================================================
--- trunk/phpbb3/po/templates.pot	2007-05-31 14:36:03 UTC (rev 373)
+++ trunk/phpbb3/po/templates.pot	2007-05-31 15:00:48 UTC (rev 374)
@@ -6,7 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: phpbb3 3.0.0~B5\n"
+"Project-Id-Version: phpbb3 3.0.0~RC1\n"
 "Report-Msgid-Bugs-To: Jeroen van Wolffelaar <jeroen at wolffelaar.nl>\n"
 "POT-Creation-Date: 2006-11-14 00:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"





More information about the phpBB-l mailing list