Menu
▾
▴
phpbb-checkins — If you subscribed to this list, please update: code.phpbb.com
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(193) |
Nov
(393) |
Dec
(347) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(401) |
Feb
(232) |
Mar
(343) |
Apr
(129) |
May
(129) |
Jun
(116) |
Jul
(189) |
Aug
(129) |
Sep
(68) |
Oct
(172) |
Nov
(298) |
Dec
(148) |
| 2003 |
Jan
(264) |
Feb
(210) |
Mar
(322) |
Apr
(309) |
May
(234) |
Jun
(188) |
Jul
(215) |
Aug
(161) |
Sep
(234) |
Oct
(163) |
Nov
(110) |
Dec
(7) |
| 2004 |
Jan
(95) |
Feb
(107) |
Mar
(55) |
Apr
(3) |
May
(49) |
Jun
(35) |
Jul
(57) |
Aug
(43) |
Sep
(56) |
Oct
(40) |
Nov
(25) |
Dec
(21) |
| 2005 |
Jan
(93) |
Feb
(25) |
Mar
(22) |
Apr
(72) |
May
(45) |
Jun
(24) |
Jul
(29) |
Aug
(20) |
Sep
(50) |
Oct
(93) |
Nov
(69) |
Dec
(183) |
| 2006 |
Jan
(185) |
Feb
(143) |
Mar
(402) |
Apr
(260) |
May
(322) |
Jun
(367) |
Jul
(234) |
Aug
(299) |
Sep
(206) |
Oct
(288) |
Nov
(338) |
Dec
(307) |
| 2007 |
Jan
(296) |
Feb
(250) |
Mar
(261) |
Apr
(434) |
May
(539) |
Jun
(274) |
Jul
(440) |
Aug
(190) |
Sep
(128) |
Oct
(249) |
Nov
(86) |
Dec
(51) |
| 2008 |
Jan
(177) |
Feb
(67) |
Mar
(61) |
Apr
(48) |
May
(56) |
Jun
(97) |
Jul
(60) |
Aug
(64) |
Sep
(151) |
Oct
(79) |
Nov
(109) |
Dec
(123) |
| 2009 |
Jan
(70) |
Feb
(70) |
Mar
(73) |
Apr
(80) |
May
(22) |
Jun
(193) |
Jul
(191) |
Aug
(181) |
Sep
(120) |
Oct
(48) |
Nov
(24) |
Dec
|
|
From: Henry S. <kel...@ph...> - 2009-08-14 08:43:31
|
Author: Kellanved
Date: Fri Aug 14 09:42:46 2009
New Revision: 9972
Log:
fix QR flicker
Modified:
branches/phpBB-3_0_0/phpBB/language/en/viewtopic.php
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/quickreply_editor.html
Modified: branches/phpBB-3_0_0/phpBB/language/en/viewtopic.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/viewtopic.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/viewtopic.php Fri Aug 14 09:42:46 2009
***************
*** 48,53 ****
--- 48,54 ----
'BUMP_TOPIC' => 'Bump topic',
'CODE' => 'Code',
+ 'COLLAPSE_QR' => 'Hide Quick Reply',
'DELETE_TOPIC' => 'Delete topic',
'DOWNLOAD_NOTICE' => 'You do not have the required permissions to view the files attached to this post.',
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/quickreply_editor.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/quickreply_editor.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/quickreply_editor.html Fri Aug 14 09:42:46 2009
***************
*** 6,17 ****
dE('qr_showeditor_div');
return true;
}
! onload_functions.push('hide_qr();');
// ]]>
</script>
<form method="post" action="{U_QR_ACTION}">
! <div class="panel" id="qr_editor_div">
<div class="inner"><span class="corners-top"><span></span></span>
<div class="content">
<h2>{L_QUICKREPLY}</h2>
--- 6,49 ----
dE('qr_showeditor_div');
return true;
}
+
! function init_qr()
! {
! dE('qr_showeditor_div');
! return true;
! }
! onload_functions.push('init_qr();');
// ]]>
</script>
+ <noscript>
+ <form method="post" action="{U_QR_ACTION}">
+ <div class="panel" id="qr_ns_editor_div">
+ <div class="inner"><span class="corners-top"><span></span></span>
+ <div class="content">
+ <h2>{L_QUICKREPLY}</h2>
+ <fieldset class="fields1">
+ <dl style="clear: left;">
+ <dt><label for="subject">{L_SUBJECT}:</label></dt>
+ <dd><input type="text" name="subject" id="subject-ns" size="45" maxlength="64" tabindex="2" value="{SUBJECT}" class="inputbox autowidth" /></dd>
+ </dl>
+ <div id="message-box-ns">
+ <textarea style="height: 9em;" name="message" rows="7" cols="76" tabindex="3" class="inputbox"></textarea>
+ </div>
+ </fieldset>
+ <fieldset class="submit-buttons">
+ {S_FORM_TOKEN}
+ {QR_HIDDEN_FIELDS}
+ <input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />
+ <input type="submit" accesskey="f" tabindex="7" name="full_editor" value="{L_FULL_EDITOR}" class="button2" />
+ </fieldset>
+ </div>
+ <span class="corners-bottom"><span></span></span></div>
+ </div>
+ </form>
+ </noscript>
<form method="post" action="{U_QR_ACTION}">
! <div class="panel" style="display: none" id="qr_editor_div">
<div class="inner"><span class="corners-top"><span></span></span>
<div class="content">
<h2>{L_QUICKREPLY}</h2>
***************
*** 30,35 ****
--- 62,68 ----
<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />
<input type="submit" accesskey="f" tabindex="6" name="full_editor" value="{L_FULL_EDITOR}" class="button2" />
</fieldset>
+ <a href="" class="top" onclick="hide_qr(); return false;" title="{L_COLLAPSE_QR}">{L_COLLAPSE_QR}</a>
</div>
<span class="corners-bottom"><span></span></span></div>
</div>
|
|
From: Jim W. <ter...@ph...> - 2009-08-13 21:18:02
|
Author: terrafrost
Date: Thu Aug 13 22:17:16 2009
New Revision: 9971
Log:
- Unapproved topics can no longer be replied to (Bug #44005)
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/posting.php
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Thu Aug 13 22:17:16 2009
***************
*** 220,225 ****
--- 220,226 ----
<li>[Change] Parse multiline url title for [url] BBCode tag. (Bug #1309)</li>
<li>[Change] Introduce new parameter to page_header() for forum specific who is online listings.</li>
<li>[Change] Lifted minimum requirement for Firebird DBMS from 2.0+ to 2.1+.</li>
+ <li>[Change] Unapproved topics can no longer be replied to (Bug #44005)</li>
<li>[Feature] Add language selection on the registration terms page (Bug #15085 - Patch by leviatan21)</li>
<li>[Feature] Backported 3.2 captcha plugins.
<ul>
Modified: branches/phpBB-3_0_0/phpBB/posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/posting.php (original)
--- branches/phpBB-3_0_0/phpBB/posting.php Thu Aug 13 22:17:16 2009
***************
*** 95,101 ****
FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f
WHERE t.topic_id = $topic_id
AND (f.forum_id = t.forum_id
! OR f.forum_id = $forum_id)";
break;
case 'quote':
--- 95,102 ----
FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f
WHERE t.topic_id = $topic_id
AND (f.forum_id = t.forum_id
! OR f.forum_id = $forum_id)
! AND t.topic_approved = 1";
break;
case 'quote':
***************
*** 124,130 ****
AND u.user_id = p.poster_id
AND (f.forum_id = t.forum_id
OR f.forum_id = $forum_id)" .
! (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND p.post_approved = 1');
break;
case 'smilies':
--- 125,131 ----
AND u.user_id = p.poster_id
AND (f.forum_id = t.forum_id
OR f.forum_id = $forum_id)" .
! (($auth->acl_get('m_approve', $forum_id) && $mode != 'quote') ? '' : 'AND p.post_approved = 1');
break;
case 'smilies':
|
|
From: Meik S. <acy...@ph...> - 2009-08-13 15:26:05
|
Author: acydburn
Date: Thu Aug 13 16:25:20 2009
New Revision: 9970
Log:
Lifted minimum requirement for Firebird DBMS from 2.0+ to 2.1+.
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/docs/INSTALL.html
branches/phpBB-3_0_0/phpBB/includes/db/firebird.php
branches/phpBB-3_0_0/phpBB/includes/functions_install.php
branches/phpBB-3_0_0/phpBB/install/database_update.php
branches/phpBB-3_0_0/phpBB/language/en/install.php
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Thu Aug 13 16:25:20 2009
***************
*** 219,224 ****
--- 219,225 ----
<li>[Change] When creating a new forum without copying permissions, ask again.</li>
<li>[Change] Parse multiline url title for [url] BBCode tag. (Bug #1309)</li>
<li>[Change] Introduce new parameter to page_header() for forum specific who is online listings.</li>
+ <li>[Change] Lifted minimum requirement for Firebird DBMS from 2.0+ to 2.1+.</li>
<li>[Feature] Add language selection on the registration terms page (Bug #15085 - Patch by leviatan21)</li>
<li>[Feature] Backported 3.2 captcha plugins.
<ul>
Modified: branches/phpBB-3_0_0/phpBB/docs/INSTALL.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/INSTALL.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/INSTALL.html Thu Aug 13 16:25:20 2009
***************
*** 139,145 ****
<li>MySQL 3.23 or above (MySQLi supported)</li>
<li>PostgreSQL 7.3+</li>
<li>SQLite 2.8.2+</li>
! <li>Firebird 2.0+</li>
<li>MS SQL Server 2000 or above (directly or via ODBC)</li>
<li>Oracle</li>
</ul>
--- 139,145 ----
<li>MySQL 3.23 or above (MySQLi supported)</li>
<li>PostgreSQL 7.3+</li>
<li>SQLite 2.8.2+</li>
! <li>Firebird 2.1+</li>
<li>MS SQL Server 2000 or above (directly or via ODBC)</li>
<li>Oracle</li>
</ul>
Modified: branches/phpBB-3_0_0/phpBB/includes/db/firebird.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/db/firebird.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/db/firebird.php Thu Aug 13 16:25:20 2009
***************
*** 20,26 ****
/**
* Firebird/Interbase Database Abstraction Layer
! * Minimum Requirement is Firebird 2.0
* @package dbal
*/
class dbal_firebird extends dbal
--- 20,26 ----
/**
* Firebird/Interbase Database Abstraction Layer
! * Minimum Requirement is Firebird 2.1
* @package dbal
*/
class dbal_firebird extends dbal
***************
*** 72,78 ****
return @ibase_server_info($this->service_handle, IBASE_SVC_SERVER_VERSION);
}
! return ($raw) ? '2.0' : 'Firebird/Interbase';
}
/**
--- 72,78 ----
return @ibase_server_info($this->service_handle, IBASE_SVC_SERVER_VERSION);
}
! return ($raw) ? '2.1' : 'Firebird/Interbase';
}
/**
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_install.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_install.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_install.php Thu Aug 13 16:25:20 2009
***************
*** 181,187 ****
function dbms_select($default = '', $only_20x_options = false)
{
global $lang;
!
$available_dbms = get_available_dbms(false, false, $only_20x_options);
$dbms_options = '';
foreach ($available_dbms as $dbms_name => $details)
--- 181,187 ----
function dbms_select($default = '', $only_20x_options = false)
{
global $lang;
!
$available_dbms = get_available_dbms(false, false, $only_20x_options);
$dbms_options = '';
foreach ($available_dbms as $dbms_name => $details)
***************
*** 402,411 ****
}
else
{
! $sql = "SELECT FIRST 0 char_length('')
! FROM RDB\$DATABASE";
$result = $db->sql_query($sql);
! if (!$result) // This can only fail if char_length is not defined
{
$error[] = $lang['INST_ERR_DB_NO_FIREBIRD'];
}
--- 402,411 ----
}
else
{
! $sql = 'SELECT 1 FROM RDB$DATABASE
! WHERE BIN_AND(10, 1) = 0';
$result = $db->sql_query($sql);
! if (!$result) // This can only fail if BIN_AND is not defined
{
$error[] = $lang['INST_ERR_DB_NO_FIREBIRD'];
}
***************
*** 446,452 ****
unset($final);
}
break;
!
case 'oracle':
if ($unicode_check)
{
--- 446,452 ----
unset($final);
}
break;
!
case 'oracle':
if ($unicode_check)
{
***************
*** 468,474 ****
}
}
break;
!
case 'postgres':
if ($unicode_check)
{
--- 468,474 ----
}
}
break;
!
case 'postgres':
if ($unicode_check)
{
Modified: branches/phpBB-3_0_0/phpBB/install/database_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/database_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/database_update.php Thu Aug 13 16:25:20 2009
***************
*** 222,227 ****
--- 222,254 ----
set_config('dbms_version', $db->sql_server_info(true));
}
+ // Firebird update from Firebord 2.0 to 2.1+ required?
+ if ($db->sql_layer == 'firebird')
+ {
+ // We do not trust any PHP5 function enabled, we will simply test for a function new in 2.1
+ $db->sql_return_on_error(true);
+
+ $sql = 'SELECT 1 FROM RDB$DATABASE
+ WHERE BIN_AND(10, 1) = 0';
+ $result = $db->sql_query($sql);
+
+ if (!$result || $db->sql_error_triggered)
+ {
+ echo '<br /><br />';
+ echo '<h1>' . $lang['ERROR'] . '</h1><br />';
+
+ echo '<p>' . $lang['FIREBIRD_DBMS_UPDATE_REQUIRED'] . '</p>';
+
+ _print_footer();
+
+ exit_handler();
+ exit;
+ }
+
+ $db->sql_freeresult($result);
+ $db->sql_return_on_error(false);
+ }
+
// MySQL update from MySQL 3.x/4.x to > 4.1.x required?
if ($db->sql_layer == 'mysql' || $db->sql_layer == 'mysql4' || $db->sql_layer == 'mysqli')
{
Modified: branches/phpBB-3_0_0/phpBB/language/en/install.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/install.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/install.php Thu Aug 13 16:25:20 2009
***************
*** 167,172 ****
--- 167,175 ----
'FILES_REQUIRED_EXPLAIN' => '<strong>Required</strong> - In order to function correctly phpBB needs to be able to access or write to certain files or directories. If you see âNot Foundâ you need to create the relevant file or directory. If you see âUnwritableâ you need to change the permissions on the file or directory to allow phpBB to write to it.',
'FILLING_TABLE' => 'Filling table <strong>%s</strong>',
'FILLING_TABLES' => 'Filling tables',
+
+ 'FIREBIRD_DBMS_UPDATE_REQUIRED' => 'phpBB no longer supports Firebird/Interbase prior to Version 2.1. Please update your Firebird installation to at least 2.1.0 before proceeding with the update.',
+
'FINAL_STEP' => 'Process final step',
'FORUM_ADDRESS' => 'Board address',
'FORUM_ADDRESS_EXPLAIN' => 'This is the URL of your former board, for example <samp>http://www.example.com/phpBB2/</samp>. If an address is entered here and not left empty every instance of this address will be replaced by your new board address within messages, private messages and signatures.',
***************
*** 209,215 ****
<li>MySQL 3.23 or above (MySQLi supported)</li>
<li>PostgreSQL 7.3+</li>
<li>SQLite 2.8.2+</li>
! <li>Firebird 2.0+</li>
<li>MS SQL Server 2000 or above (directly or via ODBC)</li>
<li>Oracle</li>
</ul>
--- 212,218 ----
<li>MySQL 3.23 or above (MySQLi supported)</li>
<li>PostgreSQL 7.3+</li>
<li>SQLite 2.8.2+</li>
! <li>Firebird 2.1+</li>
<li>MS SQL Server 2000 or above (directly or via ODBC)</li>
<li>Oracle</li>
</ul>
***************
*** 231,237 ****
'INST_ERR_DB_NO_MYSQLI' => 'The version of MySQL installed on this machine is incompatible with the âMySQL with MySQLi Extensionâ option you have selected. Please try the âMySQLâ option instead.',
'INST_ERR_DB_NO_SQLITE' => 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 2.8.2.',
'INST_ERR_DB_NO_ORACLE' => 'The version of Oracle installed on this machine requires you to set the <var>NLS_CHARACTERSET</var> parameter to <var>UTF8</var>. Either upgrade your installation to 9.2+ or change the parameter.',
! 'INST_ERR_DB_NO_FIREBIRD' => 'The version of Firebird installed on this machine is older than 2.0, please upgrade to a newer version.',
'INST_ERR_DB_NO_FIREBIRD_PS'=> 'The database you selected for Firebird has a page size less than 8192, it must be at least 8192.',
'INST_ERR_DB_NO_POSTGRES' => 'The database you have selected was not created in <var>UNICODE</var> or <var>UTF8</var> encoding. Try installing with a database in <var>UNICODE</var> or <var>UTF8</var> encoding.',
'INST_ERR_DB_NO_NAME' => 'No database name specified.',
--- 234,240 ----
'INST_ERR_DB_NO_MYSQLI' => 'The version of MySQL installed on this machine is incompatible with the âMySQL with MySQLi Extensionâ option you have selected. Please try the âMySQLâ option instead.',
'INST_ERR_DB_NO_SQLITE' => 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 2.8.2.',
'INST_ERR_DB_NO_ORACLE' => 'The version of Oracle installed on this machine requires you to set the <var>NLS_CHARACTERSET</var> parameter to <var>UTF8</var>. Either upgrade your installation to 9.2+ or change the parameter.',
! 'INST_ERR_DB_NO_FIREBIRD' => 'The version of Firebird installed on this machine is older than 2.1, please upgrade to a newer version.',
'INST_ERR_DB_NO_FIREBIRD_PS'=> 'The database you selected for Firebird has a page size less than 8192, it must be at least 8192.',
'INST_ERR_DB_NO_POSTGRES' => 'The database you have selected was not created in <var>UNICODE</var> or <var>UTF8</var> encoding. Try installing with a database in <var>UNICODE</var> or <var>UTF8</var> encoding.',
'INST_ERR_DB_NO_NAME' => 'No database name specified.',
|
|
From: Nils A. <nad...@ph...> - 2009-08-13 15:00:22
|
Author: naderman
Date: Thu Aug 13 15:51:47 2009
New Revision: 9969
Log:
- links to send statistics after install and update
- link back to ACP main from send statistics
- improved language / better explanation (incl. Bug #48555)
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/acp_send_statistics.html
branches/phpBB-3_0_0/phpBB/includes/acp/acp_send_statistics.php
branches/phpBB-3_0_0/phpBB/includes/questionnaire/questionnaire.php
branches/phpBB-3_0_0/phpBB/install/database_update.php
branches/phpBB-3_0_0/phpBB/install/install_install.php
branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
branches/phpBB-3_0_0/phpBB/language/en/install.php
Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_send_statistics.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_send_statistics.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_send_statistics.html Thu Aug 13 15:51:47 2009
***************
*** 23,32 ****
//]]>
</script>
! <iframe onload="iframe_updated();" name="questionaire_result" style="display: none;"></iframe>
<form action="{U_COLLECT_STATS}" method="post" target="questionaire_result" id="questionnaire-form">
<p id="show-button"><input type="button" class="button2" onclick="dE('configlist', 1); dE('show-button', -1);" value="{L_SHOW_STATISTICS}" /></p>
<div id="configlist">
--- 23,36 ----
//]]>
</script>
! <iframe onload="iframe_updated();" name="questionaire_result" style="display:none;"></iframe>
<form action="{U_COLLECT_STATS}" method="post" target="questionaire_result" id="questionnaire-form">
+ <p><a href="{U_ACP_MAIN}">{L_DONT_SEND_STATISTICS}</a></p>
+
+ <p>{L_EXPLAIN_SHOW_STATISTICS}</p>
+
<p id="show-button"><input type="button" class="button2" onclick="dE('configlist', 1); dE('show-button', -1);" value="{L_SHOW_STATISTICS}" /></p>
<div id="configlist">
***************
*** 53,60 ****
</p>
</form>
! <div id="questionnaire-thanks">
! <p><strong>{L_THANKS_SEND_STATISTICS}</strong></p>
</div>
<script type="text/javascript">
--- 57,64 ----
</p>
</form>
! <div id="questionnaire-thanks" class="successbox">
! <p><strong>{L_THANKS_SEND_STATISTICS}</strong><br /><br /><a href="{U_ACP_MAIN}">« {L_GO_ACP_MAIN}</a></p>
</div>
<script type="text/javascript">
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_send_statistics.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_send_statistics.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_send_statistics.php Thu Aug 13 15:51:47 2009
***************
*** 27,33 ****
function main($id, $mode)
{
! global $config, $template;
$collect_url = "http://www.phpbb.com/stats/receive_stats.php";
--- 27,33 ----
function main($id, $mode)
{
! global $config, $template, $phpbb_admin_path, $phpEx;
$collect_url = "http://www.phpbb.com/stats/receive_stats.php";
***************
*** 55,60 ****
--- 55,61 ----
$template->assign_vars(array(
'U_COLLECT_STATS' => $collect_url,
'RAW_DATA' => $collector->get_data_for_form(),
+ 'U_ACP_MAIN' => append_sid("{$phpbb_admin_path}index.$phpEx"),
));
$raw = $collector->get_data_raw();
Modified: branches/phpBB-3_0_0/phpBB/includes/questionnaire/questionnaire.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/questionnaire/questionnaire.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/questionnaire/questionnaire.php Thu Aug 13 15:51:47 2009
***************
*** 440,446 ****
{
if (isset($this->config[$name]))
{
! $result['config.' . $name] = $this->config[$name];
}
}
--- 440,446 ----
{
if (isset($this->config[$name]))
{
! $result['config_' . $name] = $this->config[$name];
}
}
Modified: branches/phpBB-3_0_0/phpBB/install/database_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/database_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/database_update.php Thu Aug 13 15:51:47 2009
***************
*** 1284,1289 ****
--- 1284,1332 ----
}
$db->sql_freeresult($result);
+ // Also install the "Send statistics" module
+ $sql = 'SELECT module_id
+ FROM ' . MODULES_TABLE . "
+ WHERE module_class = 'acp'
+ AND module_langname = 'ACP_SERVER_CONFIGURATION'
+ AND module_mode = ''
+ AND module_basename = ''";
+ $result = $db->sql_query($sql);
+
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $category_id = (int) $row['module_id'];
+
+ // Check if we actually need to add the feed module or if it is already added. ;)
+ $sql = 'SELECT *
+ FROM ' . MODULES_TABLE . "
+ WHERE module_class = 'acp'
+ AND module_langname = 'ACP_SEND_STATISTICS'
+ AND module_mode = 'questionnaire'
+ AND module_auth = 'acl_a_server'
+ AND parent_id = {$category_id}";
+ $result2 = $db->sql_query($sql);
+ $row2 = $db->sql_fetchrow($result2);
+ $db->sql_freeresult($result2);
+
+ if (!$row2)
+ {
+ $module_data = array(
+ 'module_basename' => 'send_statistics',
+ 'module_enabled' => 1,
+ 'module_display' => 1,
+ 'parent_id' => $category_id,
+ 'module_class' => 'acp',
+ 'module_langname' => 'ACP_SEND_STATISTICS',
+ 'module_mode' => 'send_statistics',
+ 'module_auth' => 'acl_a_server',
+ );
+
+ $_module->update_module_data($module_data, true);
+ }
+ }
+ $db->sql_freeresult($result);
+
$_module->remove_cache_file();
// Add newly_registered group... but check if it already exists (we always supported running the updater on any schema)
Modified: branches/phpBB-3_0_0/phpBB/install/install_install.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/install_install.php (original)
--- branches/phpBB-3_0_0/phpBB/install/install_install.php Thu Aug 13 15:51:47 2009
***************
*** 1958,1964 ****
'TITLE' => $lang['INSTALL_CONGRATS'],
'BODY' => sprintf($lang['INSTALL_CONGRATS_EXPLAIN'], $config['version'], append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=convert&language=' . $data['language']), '../docs/README.html'),
'L_SUBMIT' => $lang['INSTALL_LOGIN'],
! 'U_ACTION' => append_sid($phpbb_root_path . 'adm/index.' . $phpEx),
));
}
--- 1958,1964 ----
'TITLE' => $lang['INSTALL_CONGRATS'],
'BODY' => sprintf($lang['INSTALL_CONGRATS_EXPLAIN'], $config['version'], append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=convert&language=' . $data['language']), '../docs/README.html'),
'L_SUBMIT' => $lang['INSTALL_LOGIN'],
! 'U_ACTION' => append_sid($phpbb_root_path . 'adm/index.' . $phpEx, 'i=send_statistics&mode=questionnaire'),
));
}
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/common.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/common.php Thu Aug 13 15:51:47 2009
***************
*** 157,162 ****
--- 157,163 ----
'ACP_SEARCH_SETTINGS' => 'Search settings',
'ACP_SECURITY_SETTINGS' => 'Security settings',
+ 'ACP_SEND_STATISTICS' => 'Send statistical information',
'ACP_SERVER_CONFIGURATION' => 'Server configuration',
'ACP_SERVER_SETTINGS' => 'Server settings',
'ACP_SIGNATURE_SETTINGS' => 'Signature settings',
***************
*** 414,420 ****
// Send statistics page
$lang = array_merge($lang, array(
! 'EXPLAIN_SEND_STATISTICS' => 'Please send some statistical information about your server and forum configuration to phpBB. All information that could identify you has been removed - the data is entirely anonymous. We will base decisions about future phpBB versions on this information. Below you can display all variables that will be transmitted.',
'HIDE_STATISTICS' => 'Hide details',
'SEND_STATISTICS' => 'Send statistical information',
'SHOW_STATISTICS' => 'Show details',
--- 415,424 ----
// Send statistics page
$lang = array_merge($lang, array(
! 'EXPLAIN_SEND_STATISTICS' => 'Please send information about your server and board configurations to phpBB for statistical analysis. All information that could identify you or your website has been removed - the data is entirely <strong>anonymous</strong>. We base decisions about future phpBB versions on this information. The statistics are made available publically. We also share this data with the PHP project, the programming language phpBB is made with.',
! 'EXPLAIN_SHOW_STATISTICS' => 'Using the button below you can preview all variables that will be transmitted.',
! 'DONT_SEND_STATISTICS' => 'Return to the ACP if you do not wish to send statistical information to phpBB.',
! 'GO_ACP_MAIN' => 'Go to the ACP start page',
'HIDE_STATISTICS' => 'Hide details',
'SEND_STATISTICS' => 'Send statistical information',
'SHOW_STATISTICS' => 'Show details',
Modified: branches/phpBB-3_0_0/phpBB/language/en/install.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/install.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/install.php Thu Aug 13 15:51:47 2009
***************
*** 189,195 ****
<h2>Convert an existing board to phpBB3</h2>
<p>The phpBB Unified Convertor Framework supports the conversion of phpBB 2.0.x and other board systems to phpBB3. If you have an existing board that you wish to convert, please <a href="%2$s">proceed to the convertor</a>.</p>
<h2>Go live with your phpBB3!</h2>
! <p>Clicking the button below will take you to your Administration Control Panel (ACP). Take some time to examine the options available to you. Remember that help is available online via the <a href="http://www.phpbb.com/support/documentation/3.0/">Documentation</a>, <a href="%3$s">README</a> and the <a href="http://www.phpbb.com/community/viewforum.php?f=46">Support Forums</a>.</p><p><strong>Please delete, move or rename the install directory before using your board. While this directory exists, only the Administration Control Panel (ACP) will be accessible.</strong>',
'INSTALL_INTRO' => 'Welcome to Installation',
'INSTALL_INTRO_BODY' => 'With this option, it is possible to install phpBB3 onto your server.</p><p>In order to proceed, you will need your database settings. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. You need:</p>
--- 189,195 ----
<h2>Convert an existing board to phpBB3</h2>
<p>The phpBB Unified Convertor Framework supports the conversion of phpBB 2.0.x and other board systems to phpBB3. If you have an existing board that you wish to convert, please <a href="%2$s">proceed to the convertor</a>.</p>
<h2>Go live with your phpBB3!</h2>
! <p>Clicking the button below will take you to a form for submitting statistical data to phpBB in your Administration Control Panel (ACP). We would appreciate it if you could help us by sending that information. Afterwards you should take some time to examine the options available to you. Remember that help is available online via the <a href="http://www.phpbb.com/support/documentation/3.0/">Documentation</a>, <a href="%3$s">README</a> and the <a href="http://www.phpbb.com/community/viewforum.php?f=46">Support Forums</a>.</p><p><strong>Please delete, move or rename the install directory before using your board. While this directory exists, only the Administration Control Panel (ACP) will be accessible.</strong>',
'INSTALL_INTRO' => 'Welcome to Installation',
'INSTALL_INTRO_BODY' => 'With this option, it is possible to install phpBB3 onto your server.</p><p>In order to proceed, you will need your database settings. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. You need:</p>
***************
*** 365,371 ****
// Updater
$lang = array_merge($lang, array(
! 'ALL_FILES_UP_TO_DATE' => 'All files are up to date with the latest phpBB version. You should now <a href="../ucp.php?mode=login">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory!',
'ARCHIVE_FILE' => 'Source file within archive',
'BACK' => 'Back',
--- 365,371 ----
// Updater
$lang = array_merge($lang, array(
! 'ALL_FILES_UP_TO_DATE' => 'All files are up to date with the latest phpBB version. You should now <a href="../ucp.php?mode=login&redirect=adm/index.php%3Fi=send_statistics%26mode=questionnaire">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory! Please send us updated information about your server and board configurations from the <a href="../ucp.php?mode=login&redirect=adm/index.php%3Fi=send_statistics%26mode=questionnaire">Send statistics</a> module in your ACP.',
'ARCHIVE_FILE' => 'Source file within archive',
'BACK' => 'Back',
|
|
From: Henry S. <kel...@ph...> - 2009-08-12 22:03:32
|
Author: Kellanved
Date: Wed Aug 12 23:03:14 2009
New Revision: 9968
Log:
some fixes
Modified:
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php Wed Aug 12 23:03:14 2009
***************
*** 272,278 ****
'question_id' => array('UINT', Null, 'auto_increment'),
'strict' => array('BOOL', 0),
'lang_id' => array('UINT', 0),
! 'lang_iso' => array('VCHAR:30', 0),
'question_text' => array('TEXT_UNI', ''),
),
'PRIMARY_KEY' => 'question_id',
--- 272,278 ----
'question_id' => array('UINT', Null, 'auto_increment'),
'strict' => array('BOOL', 0),
'lang_id' => array('UINT', 0),
! 'lang_iso' => array('VCHAR:30', ''),
'question_text' => array('TEXT_UNI', ''),
),
'PRIMARY_KEY' => 'question_id',
***************
*** 293,299 ****
'COLUMNS' => array(
'session_id' => array('CHAR:32', ''),
'confirm_id' => array('CHAR:32', ''),
! 'lang_iso' => array('VCHAR:30', 0),
'question_id' => array('UINT', 0),
'attempts' => array('UINT', 0),
'confirm_type' => array('USINT', 0),
--- 293,299 ----
'COLUMNS' => array(
'session_id' => array('CHAR:32', ''),
'confirm_id' => array('CHAR:32', ''),
! 'lang_iso' => array('VCHAR:30', ''),
'question_id' => array('UINT', 0),
'attempts' => array('UINT', 0),
'confirm_type' => array('USINT', 0),
|
|
From: Henry S. <kel...@ph...> - 2009-08-12 19:58:14
|
Author: Kellanved
Date: Wed Aug 12 20:57:34 2009
New Revision: 9967
Log:
some fixes
Modified:
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php Wed Aug 12 20:57:34 2009
***************
*** 121,127 ****
// load language file for pretty display in the ACP dropdown
$user->add_lang('captcha_qa');
! if (!self::is_installed())
{
return false;
}
--- 121,127 ----
// load language file for pretty display in the ACP dropdown
$user->add_lang('captcha_qa');
! if (!phpbb_captcha_qa::is_installed())
{
return false;
}
***************
*** 273,279 ****
'strict' => array('BOOL', 0),
'lang_id' => array('UINT', 0),
'lang_iso' => array('VCHAR:30', 0),
! 'question_text' => array('TEXT', 0),
),
'PRIMARY_KEY' => 'question_id',
'KEYS' => array(
--- 273,279 ----
'strict' => array('BOOL', 0),
'lang_id' => array('UINT', 0),
'lang_iso' => array('VCHAR:30', 0),
! 'question_text' => array('TEXT_UNI', ''),
),
'PRIMARY_KEY' => 'question_id',
'KEYS' => array(
***************
*** 283,289 ****
ANSWERS_TABLE => array (
'COLUMNS' => array(
'question_id' => array('UINT', 0),
! 'answer_text' => array('TEXT', 0),
),
'KEYS' => array(
'question_id' => array('INDEX', 'question_id'),
--- 283,289 ----
ANSWERS_TABLE => array (
'COLUMNS' => array(
'question_id' => array('UINT', 0),
! 'answer_text' => array('STEXT_UNI', ''),
),
'KEYS' => array(
'question_id' => array('INDEX', 'question_id'),
|
|
From: Henry S. <kel...@ph...> - 2009-08-12 15:12:51
|
Author: Kellanved
Date: Wed Aug 12 16:12:03 2009
New Revision: 9966
Log:
filename
Modified:
branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php
Modified: branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php Wed Aug 12 16:12:03 2009
***************
*** 1,7 ****
<?php
/**
*
! * recaptcha [English]
*
* @package language
* @version $Id$
--- 1,7 ----
<?php
/**
*
! * captcha_qa [English]
*
* @package language
* @version $Id$
|
|
From: Meik S. <acy...@ph...> - 2009-08-12 15:01:07
|
Author: acydburn
Date: Wed Aug 12 16:00:47 2009
New Revision: 9965
Log:
ok, i am very sorry, but this needs to be fixed.
Generally, our config table is not really suited for holding large datasets. Because feed settings for the forums to enable news feeds and excluded forums rely on the forums itself we have decided to introduce a forum_options table where custom options can be stored.
Additionally, for this to work across all DBMS we support, we added a new method to the DBAL for the bitwise AND operator.
Also moved the forum/topic feed template variable to the location where they belong to (forum and topic view)
Modified:
branches/phpBB-3_0_0/phpBB/adm/index.php
branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php
branches/phpBB-3_0_0/phpBB/develop/mysql_upgrader.php
branches/phpBB-3_0_0/phpBB/feed.php
branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php
branches/phpBB-3_0_0/phpBB/includes/constants.php
branches/phpBB-3_0_0/phpBB/includes/db/dbal.php
branches/phpBB-3_0_0/phpBB/includes/db/firebird.php
branches/phpBB-3_0_0/phpBB/includes/db/oracle.php
branches/phpBB-3_0_0/phpBB/includes/functions.php
branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
branches/phpBB-3_0_0/phpBB/install/database_update.php
branches/phpBB-3_0_0/phpBB/install/schemas/firebird_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/mssql_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/mysql_40_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/mysql_41_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/oracle_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/postgres_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql
branches/phpBB-3_0_0/phpBB/install/schemas/sqlite_schema.sql
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html
branches/phpBB-3_0_0/phpBB/viewforum.php
branches/phpBB-3_0_0/phpBB/viewtopic.php
Modified: branches/phpBB-3_0_0/phpBB/adm/index.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/index.php (original)
--- branches/phpBB-3_0_0/phpBB/adm/index.php Wed Aug 12 16:00:47 2009
***************
*** 263,268 ****
--- 263,274 ----
$tpl = '';
$name = 'config[' . $config_key . ']';
+ // Make sure there is no notice printed out for non-existent config options (we simply set them)
+ if (!isset($new[$config_key]))
+ {
+ $new[$config_key] = '';
+ }
+
switch ($tpl_type[0])
{
case 'text':
***************
*** 301,307 ****
break;
case 'select':
- case 'select_multiple':
case 'custom':
$return = '';
--- 307,312 ----
***************
*** 340,360 ****
}
else
{
- if ($tpl_type[0] == 'select_multiple')
- {
- $new[$config_key] = @unserialize(trim($new[$config_key]));
- }
-
$args = array($new[$config_key], $key);
}
$return = call_user_func_array($call, $args);
! if ($tpl_type[0] == 'select_multiple')
! {
! $tpl = '<select id="' . $key . '" name="' . $name . '[]" multiple="multiple">' . $return . '</select>';
! }
! else if ($tpl_type[0] == 'select')
{
$tpl = '<select id="' . $key . '" name="' . $name . '">' . $return . '</select>';
}
--- 345,356 ----
}
else
{
$args = array($new[$config_key], $key);
}
$return = call_user_func_array($call, $args);
! if ($tpl_type[0] == 'select')
{
$tpl = '<select id="' . $key . '" name="' . $name . '">' . $return . '</select>';
}
Modified: branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php (original)
--- branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php Wed Aug 12 16:00:47 2009
***************
*** 1073,1078 ****
--- 1073,1079 ----
'forum_last_poster_name'=> array('VCHAR_UNI', ''),
'forum_last_poster_colour'=> array('VCHAR:6', ''),
'forum_flags' => array('TINT:4', 32),
+ 'forum_options' => array('UINT:20', 0),
'display_subforum_list' => array('BOOL', 1),
'display_on_index' => array('BOOL', 1),
'enable_indexing' => array('BOOL', 1),
Modified: branches/phpBB-3_0_0/phpBB/develop/mysql_upgrader.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/develop/mysql_upgrader.php (original)
--- branches/phpBB-3_0_0/phpBB/develop/mysql_upgrader.php Wed Aug 12 16:00:47 2009
***************
*** 563,568 ****
--- 563,569 ----
'forum_last_poster_name'=> array('VCHAR_UNI', ''),
'forum_last_poster_colour'=> array('VCHAR:6', ''),
'forum_flags' => array('TINT:4', 32),
+ 'forum_options' => array('UINT:20', 0),
'display_subforum_list' => array('BOOL', 1),
'display_on_index' => array('BOOL', 1),
'enable_indexing' => array('BOOL', 1),
Modified: branches/phpBB-3_0_0/phpBB/feed.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/feed.php (original)
--- branches/phpBB-3_0_0/phpBB/feed.php Wed Aug 12 16:00:47 2009
***************
*** 339,345 ****
break;
case 'news':
! if (empty($config['feed_news_id']))
{
return false;
}
--- 339,355 ----
break;
case 'news':
! global $db;
!
! // Get at least one news forum
! $sql = 'SELECT forum_id
! FROM ' . FORUMS_TABLE . '
! WHERE ' . $db->sql_bit_and('forum_options', FORUM_OPTION_FEED_NEWS, '<> 0');
! $result = $db->sql_query_limit($sql, 1, 0, 600);
! $s_feed_news = (int) $db->sql_fetchfield('forum_id');
! $db->sql_freeresult($result);
!
! if (!$s_feed_news)
{
return false;
}
***************
*** 534,540 ****
global $auth, $db, $config, $phpbb_root_path, $phpEx, $user;
// Which forums should not be searched ?
! $exclude_forums = (!empty($config['feed_exclude_id'])) ? unserialize(trim($config['feed_exclude_id'])) : array();
// Exclude forums the user is not able to read
$this->excluded_forums_ary = array_keys($auth->acl_getf('!f_read', true));
--- 544,561 ----
global $auth, $db, $config, $phpbb_root_path, $phpEx, $user;
// Which forums should not be searched ?
! $exclude_forums = array();
!
! $sql = 'SELECT forum_id
! FROM ' . FORUMS_TABLE . '
! WHERE ' . $db->sql_bit_and('forum_options', FORUM_OPTION_FEED_EXCLUDE, '<> 0');
! $result = $db->sql_query($sql);
!
! while ($row = $db->sql_fetchrow($result))
! {
! $exclude_forums[] = (int) $row['forum_id'];
! }
! $db->sql_freeresult($result);
// Exclude forums the user is not able to read
$this->excluded_forums_ary = array_keys($auth->acl_getf('!f_read', true));
***************
*** 883,889 ****
{
global $db, $config;
! $in_fid_ary = unserialize(trim($config['feed_news_id']));
if (!sizeof($in_fid_ary))
{
--- 904,921 ----
{
global $db, $config;
! // Get news forums...
! $sql = 'SELECT forum_id
! FROM ' . FORUMS_TABLE . '
! WHERE ' . $db->sql_bit_and('forum_options', FORUM_OPTION_FEED_NEWS, '<> 0');
! $result = $db->sql_query($sql);
!
! $in_fid_ary = array();
! while ($row = $db->sql_fetchrow($result))
! {
! $in_fid_ary[] = (int) $row['forum_id'];
! }
! $db->sql_freeresult($result);
if (!sizeof($in_fid_ary))
{
***************
*** 905,911 ****
'WHERE' => $db->sql_in_set('t.forum_id', $in_fid_ary) . '
AND f.forum_id = t.forum_id
AND p.post_id = t.topic_first_post_id
! AND t.topic_poster = u.user_id',
'ORDER_BY' => 't.topic_time DESC',
);
--- 937,944 ----
'WHERE' => $db->sql_in_set('t.forum_id', $in_fid_ary) . '
AND f.forum_id = t.forum_id
AND p.post_id = t.topic_first_post_id
! AND t.topic_poster = u.user_id
! AND t.topic_moved_id = 0',
'ORDER_BY' => 't.topic_time DESC',
);
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_board.php Wed Aug 12 16:00:47 2009
***************
*** 272,279 ****
'feed_overall_topics_limit' => array('lang' => 'ACP_FEED_OVERALL_TOPIC_LIMIT', 'validate' => 'int:5', 'type' => 'text:3:4', 'explain' => false),
'feed_forum' => array('lang' => 'ACP_FEED_FORUM', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true ),
'feed_topic' => array('lang' => 'ACP_FEED_TOPIC', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true ),
! 'feed_news_id' => array('lang' => 'ACP_FEED_NEWS', 'validate' => 'string', 'type' => 'select_multiple', 'method' => 'select_news_forums', 'explain' => true ),
! 'feed_exclude_id' => array('lang' => 'ACP_FEED_EXCLUDE_ID', 'validate' => 'string', 'type' => 'select_multiple', 'method' => 'select_exclude_forums', 'explain' => true),
)
);
break;
--- 272,279 ----
'feed_overall_topics_limit' => array('lang' => 'ACP_FEED_OVERALL_TOPIC_LIMIT', 'validate' => 'int:5', 'type' => 'text:3:4', 'explain' => false),
'feed_forum' => array('lang' => 'ACP_FEED_FORUM', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true ),
'feed_topic' => array('lang' => 'ACP_FEED_TOPIC', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true ),
! 'feed_news_id' => array('lang' => 'ACP_FEED_NEWS', 'validate' => 'string', 'type' => 'custom', 'method' => 'select_news_forums', 'explain' => true),
! 'feed_exclude_id' => array('lang' => 'ACP_FEED_EXCLUDE_ID', 'validate' => 'string', 'type' => 'custom', 'method' => 'select_exclude_forums', 'explain' => true),
)
);
break;
***************
*** 440,474 ****
// We go through the display_vars to make sure no one is trying to set variables he/she is not allowed to...
foreach ($display_vars['vars'] as $config_name => $null)
{
! if (strpos($config_name, 'legend') !== false)
{
continue;
}
! if ($config_name == 'auth_method')
{
continue;
}
- // It could happen that the cfg array is not set. This happens within feed settings if unselecting all forums in the multiple select fields for example (it is the same as checkbox handling)
- if (!isset($cfg_array[$config_name]))
- {
- $cfg_array[$config_name] = '';
- }
-
- // Erm, we spotted an array
- if ($null['type'] == 'select_multiple' && $submit && isset($_REQUEST['config'][$config_name]))
- {
- // Get config *array*
- $cfg_ = utf8_normalize_nfc(request_var('config', array('' => array('')), true));
-
- // Check if the variable is set and an array
- if (isset($cfg_[$config_name]) && is_array($cfg_[$config_name]))
- {
- $cfg_array[$config_name] = trim(serialize($cfg_[$config_name]));
- }
- }
-
$this->new_config[$config_name] = $config_value = $cfg_array[$config_name];
if ($config_name == 'email_function_name')
--- 440,455 ----
// We go through the display_vars to make sure no one is trying to set variables he/she is not allowed to...
foreach ($display_vars['vars'] as $config_name => $null)
{
! if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false)
{
continue;
}
! if ($config_name == 'auth_method' || $config_name == 'feed_news_id' || $config_name == 'feed_exclude_id')
{
continue;
}
$this->new_config[$config_name] = $config_value = $cfg_array[$config_name];
if ($config_name == 'email_function_name')
***************
*** 484,489 ****
--- 465,477 ----
}
}
+ // Store news and exclude ids
+ if ($mode == 'feed' && $submit)
+ {
+ $this->store_feed_forums(FORUM_OPTION_FEED_NEWS, 'feed_news_id');
+ $this->store_feed_forums(FORUM_OPTION_FEED_EXCLUDE, 'feed_exclude_id');
+ }
+
if ($mode == 'auth')
{
// Retrieve a list of auth plugins and check their config values
***************
*** 902,918 ****
{
global $user, $config;
! // Determine ids to be selected
! $select_ids = (sizeof($value)) ? $value : false;
!
! $forum_list = make_forum_select($select_ids, false, true, true, true, false, true);
// Build forum options
! $s_forum_options = '';
foreach ($forum_list as $f_id => $f_row)
{
$s_forum_options .= '<option value="' . $f_id . '"' . (($f_row['selected']) ? ' selected="selected"' : '') . (($f_row['disabled']) ? ' disabled="disabled" class="disabled-option"' : '') . '>' . $f_row['padding'] . $f_row['forum_name'] . '</option>';
}
return $s_forum_options;
}
--- 890,906 ----
{
global $user, $config;
! $forum_list = make_forum_select(false, false, true, true, true, false, true);
// Build forum options
! $s_forum_options = '<select id="' . $key . '" name="' . $key . '[]" multiple="multiple">';
foreach ($forum_list as $f_id => $f_row)
{
+ $f_row['selected'] = phpbb_optionget(FORUM_OPTION_FEED_NEWS, $f_row['forum_options']);
+
$s_forum_options .= '<option value="' . $f_id . '"' . (($f_row['selected']) ? ' selected="selected"' : '') . (($f_row['disabled']) ? ' disabled="disabled" class="disabled-option"' : '') . '>' . $f_row['padding'] . $f_row['forum_name'] . '</option>';
}
+ $s_forum_options .= '</select>';
return $s_forum_options;
}
***************
*** 921,940 ****
{
global $user, $config;
! // Determine ids to be selected
! $select_ids = (sizeof($value)) ? $value : false;
!
! $forum_list = make_forum_select($select_ids, false, true, false, false, false, true);
// Build forum options
! $s_forum_options = '';
foreach ($forum_list as $f_id => $f_row)
{
$s_forum_options .= '<option value="' . $f_id . '"' . (($f_row['selected']) ? ' selected="selected"' : '') . (($f_row['disabled']) ? ' disabled="disabled" class="disabled-option"' : '') . '>' . $f_row['padding'] . $f_row['forum_name'] . '</option>';
}
return $s_forum_options;
}
}
?>
\ No newline at end of file
--- 909,956 ----
{
global $user, $config;
! $forum_list = make_forum_select(false, false, true, false, false, false, true);
// Build forum options
! $s_forum_options = '<select id="' . $key . '" name="' . $key . '[]" multiple="multiple">';
foreach ($forum_list as $f_id => $f_row)
{
+ $f_row['selected'] = phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $f_row['forum_options']);
+
$s_forum_options .= '<option value="' . $f_id . '"' . (($f_row['selected']) ? ' selected="selected"' : '') . (($f_row['disabled']) ? ' disabled="disabled" class="disabled-option"' : '') . '>' . $f_row['padding'] . $f_row['forum_name'] . '</option>';
}
+ $s_forum_options .= '</select>';
return $s_forum_options;
}
+
+ function store_feed_forums($option, $key)
+ {
+ global $db, $cache;
+
+ // Get key
+ $values = request_var($key, array(0 => 0));
+
+ // Empty option bit for all forums
+ $sql = 'UPDATE ' . FORUMS_TABLE . '
+ SET forum_options = forum_options - ' . (1 << $option) . '
+ WHERE ' . $db->sql_bit_and('forum_options', $option, '<> 0');
+ $db->sql_query($sql);
+
+ // Already emptied for all...
+ if (sizeof($values))
+ {
+ // Set for selected forums
+ $sql = 'UPDATE ' . FORUMS_TABLE . '
+ SET forum_options = forum_options + ' . (1 << $option) . '
+ WHERE ' . $db->sql_in_set('forum_id', $values);
+ $db->sql_query($sql);
+ }
+
+ // Empty sql cache for forums table because options changed
+ $cache->destroy('sql', FORUMS_TABLE);
+ }
+
}
?>
\ No newline at end of file
Modified: branches/phpBB-3_0_0/phpBB/includes/constants.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/constants.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/constants.php Wed Aug 12 16:00:47 2009
***************
*** 93,98 ****
--- 93,102 ----
define('FORUM_FLAG_POST_REVIEW', 32);
define('FORUM_FLAG_QUICK_REPLY', 64);
+ // Forum Options... sequential order. Modifications should begin at number 10 (number 29 is maximum)
+ define('FORUM_OPTION_FEED_NEWS', 1);
+ define('FORUM_OPTION_FEED_EXCLUDE', 2);
+
// Optional text flags
define('OPTION_FLAG_BBCODE', 1);
define('OPTION_FLAG_SMILIES', 2);
Modified: branches/phpBB-3_0_0/phpBB/includes/db/dbal.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/db/dbal.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/db/dbal.php Wed Aug 12 16:00:47 2009
***************
*** 412,417 ****
--- 412,435 ----
}
/**
+ * Run binary AND operator on DB column.
+ * Results in sql statement: "{$column_name} & (1 << {$bit}) {$compare}"
+ *
+ * @param string $column_name The column name to use
+ * @param int $bit The value to use for the AND operator, will be converted to (1 << $bit). Is used by options, using the number schema... 0, 1, 2...29
+ * @param string $compare Any custom SQL code after the check (for example "= 0")
+ */
+ function sql_bit_and($column_name, $bit, $compare = '')
+ {
+ if (method_exists($this, '_sql_bit_and'))
+ {
+ return $this->_sql_bit_and($column_name, $bit, $compare);
+ }
+
+ return $column_name . ' & ' . (1 << $bit) . (($compare) ? ' ' . $compare : '');
+ }
+
+ /**
* Run more than one insert statement.
*
* @param string $table table name to run the statements on
Modified: branches/phpBB-3_0_0/phpBB/includes/db/firebird.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/db/firebird.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/db/firebird.php Wed Aug 12 16:00:47 2009
***************
*** 446,451 ****
--- 446,456 ----
return $data;
}
+ function _sql_bit_and($column_name, $bit, $compare = '')
+ {
+ return 'BIN_AND(' . $column_name . ', ' . (1 << $bit) . ')' . (($compare) ? ' ' . $compare : '');
+ }
+
/**
* return sql error array
* @access private
Modified: branches/phpBB-3_0_0/phpBB/includes/db/oracle.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/db/oracle.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/db/oracle.php Wed Aug 12 16:00:47 2009
***************
*** 568,573 ****
--- 568,578 ----
return $data;
}
+ function _sql_bit_and($column_name, $bit, $compare = '')
+ {
+ return 'BITAND(' . $column_name . ', ' . (1 << $bit) . ')' . (($compare) ? ' ' . $compare : '');
+ }
+
/**
* return sql error array
* @access private
Modified: branches/phpBB-3_0_0/phpBB/includes/functions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Wed Aug 12 16:00:47 2009
***************
*** 3505,3511 ****
$l_notify = '<p>Please notify the board administrator or webmaster: <a href="mailto:' . $config['board_contact'] . '">' . $config['board_contact'] . '</a></p>';
}
}
!
if (defined('DEBUG') || defined('IN_CRON') || defined('IMAGE_OUTPUT'))
{
// let's avoid loops
--- 3505,3511 ----
$l_notify = '<p>Please notify the board administrator or webmaster: <a href="mailto:' . $config['board_contact'] . '">' . $config['board_contact'] . '</a></p>';
}
}
!
if (defined('DEBUG') || defined('IN_CRON') || defined('IMAGE_OUTPUT'))
{
// let's avoid loops
***************
*** 3857,3862 ****
--- 3857,3896 ----
);
}
+ /**
+ * Get option bitfield from custom data
+ *
+ * @param int $bit The bit/value to get
+ * @param int $data Current bitfield to check
+ * @return bool Returns true if value of constant is set in bitfield, else false
+ */
+ function phpbb_optionget($bit, $data)
+ {
+ return ($data & 1 << (int) $bit) ? true : false;
+ }
+
+ /**
+ * Set option bitfield
+ *
+ * @param int $bit The bit/value to set/unset
+ * @param bool $set True if option should be set, false if option should be unset.
+ * @param int $data Current bitfield to change
+ *
+ * @return int The new bitfield
+ */
+ function phpbb_optionset($bit, $set, $data)
+ {
+ if ($set && !($data & 1 << $bit))
+ {
+ $data += 1 << $bit;
+ }
+ else if (!$set && ($data & 1 << $bit))
+ {
+ $data -= 1 << $bit;
+ }
+
+ return $data;
+ }
/**
* Generate page header
***************
*** 3917,3923 ****
* }
* </code>
*/
!
if ($forum_id)
{
$item_id = max($forum_id, 0);
--- 3951,3957 ----
* }
* </code>
*/
!
if ($forum_id)
{
$item_id = max($forum_id, 0);
***************
*** 3926,3932 ****
{
$item_id = 0;
}
!
// workaround legacy code
$item = 'forum';
$online_users = obtain_users_online($item_id, $item);
--- 3960,3966 ----
{
$item_id = 0;
}
!
// workaround legacy code
$item = 'forum';
$online_users = obtain_users_online($item_id, $item);
***************
*** 4005,4010 ****
--- 4039,4057 ----
$forum_id = request_var('f', 0);
$topic_id = request_var('t', 0);
+ $s_feed_news = false;
+
+ // Get option for news
+ if ($config['feed_enable'])
+ {
+ $sql = 'SELECT forum_id
+ FROM ' . FORUMS_TABLE . '
+ WHERE ' . $db->sql_bit_and('forum_options', FORUM_OPTION_FEED_NEWS, '<> 0');
+ $result = $db->sql_query_limit($sql, 1, 0, 600);
+ $s_feed_news = (int) $db->sql_fetchfield('forum_id');
+ $db->sql_freeresult($result);
+ }
+
// The following assigns all _common_ variables that may be used at any point in a template.
$template->assign_vars(array(
'SITENAME' => $config['sitename'],
***************
*** 4082,4092 ****
'S_TOPIC_ID' => $topic_id,
'S_ENABLE_FEEDS' => ($config['feed_enable']) ? true : false,
- 'S_ENABLE_FEEDS_NEWS' => ($config['feed_news_id'] != '') ? true : false,
'S_ENABLE_FEEDS_FORUMS' => ($config['feed_overall_forums']) ? true : false,
'S_ENABLE_FEEDS_TOPICS' => ($config['feed_overall_topics']) ? true : false,
! 'S_ENABLE_FEEDS_FORUM' => ($config['feed_forum'] && $forum_id && strpos($user->page['page_name'], 'viewforum') !== false) ? true : false,
! 'S_ENABLE_FEEDS_TOPIC' => ($config['feed_topic'] && $topic_id && strpos($user->page['page_name'], 'viewtopic') !== false) ? true : false,
'T_THEME_PATH' => "{$phpbb_root_path}styles/" . $user->theme['theme_path'] . '/theme',
'T_TEMPLATE_PATH' => "{$phpbb_root_path}styles/" . $user->theme['template_path'] . '/template',
--- 4129,4137 ----
'S_TOPIC_ID' => $topic_id,
'S_ENABLE_FEEDS' => ($config['feed_enable']) ? true : false,
'S_ENABLE_FEEDS_FORUMS' => ($config['feed_overall_forums']) ? true : false,
'S_ENABLE_FEEDS_TOPICS' => ($config['feed_overall_topics']) ? true : false,
! 'S_ENABLE_FEEDS_NEWS' => ($s_feed_news) ? true : false,
'T_THEME_PATH' => "{$phpbb_root_path}styles/" . $user->theme['theme_path'] . '/theme',
'T_TEMPLATE_PATH' => "{$phpbb_root_path}styles/" . $user->theme['template_path'] . '/template',
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_admin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_admin.php Wed Aug 12 16:00:47 2009
***************
*** 69,75 ****
$acl = ($ignore_acl) ? '' : (($only_acl_post) ? 'f_post' : array('f_list', 'a_forum', 'a_forumadd', 'a_forumdel'));
// This query is identical to the jumpbox one
! $sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id
FROM ' . FORUMS_TABLE . '
ORDER BY left_id ASC';
$result = $db->sql_query($sql, 600);
--- 69,75 ----
$acl = ($ignore_acl) ? '' : (($only_acl_post) ? 'f_post' : array('f_list', 'a_forum', 'a_forumadd', 'a_forumdel'));
// This query is identical to the jumpbox one
! $sql = 'SELECT forum_id, forum_name, parent_id, forum_type, forum_flags, forum_options, left_id, right_id
FROM ' . FORUMS_TABLE . '
ORDER BY left_id ASC';
$result = $db->sql_query($sql, 600);
***************
*** 1364,1378 ****
$sql = 'DELETE FROM ' . TOPICS_TABLE . '
WHERE ' . $db->sql_in_set('topic_id', $topic_id_ary);
$db->sql_query($sql);
!
break;
}
!
$db->sql_transaction('commit');
break;
case 'topic_approved':
!
$db->sql_transaction('begin');
switch ($db->sql_layer)
{
--- 1364,1378 ----
$sql = 'DELETE FROM ' . TOPICS_TABLE . '
WHERE ' . $db->sql_in_set('topic_id', $topic_id_ary);
$db->sql_query($sql);
!
break;
}
!
$db->sql_transaction('commit');
break;
case 'topic_approved':
!
$db->sql_transaction('begin');
switch ($db->sql_layer)
{
***************
*** 1409,1423 ****
$db->sql_query($sql);
break;
}
!
$db->sql_transaction('commit');
break;
case 'post_reported':
$post_ids = $post_reported = array();
!
$db->sql_transaction('begin');
!
$sql = 'SELECT p.post_id, p.post_reported
FROM ' . POSTS_TABLE . " p
$where_sql
--- 1409,1423 ----
$db->sql_query($sql);
break;
}
!
$db->sql_transaction('commit');
break;
case 'post_reported':
$post_ids = $post_reported = array();
!
$db->sql_transaction('begin');
!
$sql = 'SELECT p.post_id, p.post_reported
FROM ' . POSTS_TABLE . " p
$where_sql
***************
*** 1468,1474 ****
WHERE ' . $db->sql_in_set('post_id', $post_ids);
$db->sql_query($sql);
}
!
$db->sql_transaction('commit');
break;
--- 1468,1474 ----
WHERE ' . $db->sql_in_set('post_id', $post_ids);
$db->sql_query($sql);
}
!
$db->sql_transaction('commit');
break;
***************
*** 1481,1487 ****
$topic_ids = $topic_reported = array();
$db->sql_transaction('begin');
!
$sql = 'SELECT DISTINCT(t.topic_id)
FROM ' . POSTS_TABLE . " t
$where_sql_and t.post_reported = 1";
--- 1481,1487 ----
$topic_ids = $topic_reported = array();
$db->sql_transaction('begin');
!
$sql = 'SELECT DISTINCT(t.topic_id)
FROM ' . POSTS_TABLE . " t
$where_sql_and t.post_reported = 1";
***************
*** 1514,1520 ****
WHERE ' . $db->sql_in_set('topic_id', $topic_ids);
$db->sql_query($sql);
}
!
$db->sql_transaction('commit');
break;
--- 1514,1520 ----
WHERE ' . $db->sql_in_set('topic_id', $topic_ids);
$db->sql_query($sql);
}
!
$db->sql_transaction('commit');
break;
***************
*** 1522,1528 ****
$post_ids = $post_attachment = array();
$db->sql_transaction('begin');
!
$sql = 'SELECT p.post_id, p.post_attachment
FROM ' . POSTS_TABLE . " p
$where_sql
--- 1522,1528 ----
$post_ids = $post_attachment = array();
$db->sql_transaction('begin');
!
$sql = 'SELECT p.post_id, p.post_attachment
FROM ' . POSTS_TABLE . " p
$where_sql
***************
*** 1573,1579 ****
WHERE ' . $db->sql_in_set('post_id', $post_ids);
$db->sql_query($sql);
}
!
$db->sql_transaction('commit');
break;
--- 1573,1579 ----
WHERE ' . $db->sql_in_set('post_id', $post_ids);
$db->sql_query($sql);
}
!
$db->sql_transaction('commit');
break;
***************
*** 1619,1633 ****
WHERE ' . $db->sql_in_set('topic_id', $topic_ids);
$db->sql_query($sql);
}
!
$db->sql_transaction('commit');
!
break;
case 'forum':
$db->sql_transaction('begin');
!
// 1: Get the list of all forums
$sql = 'SELECT f.*
FROM ' . FORUMS_TABLE . " f
--- 1619,1633 ----
WHERE ' . $db->sql_in_set('topic_id', $topic_ids);
$db->sql_query($sql);
}
!
$db->sql_transaction('commit');
!
break;
case 'forum':
$db->sql_transaction('begin');
!
// 1: Get the list of all forums
$sql = 'SELECT f.*
FROM ' . FORUMS_TABLE . " f
***************
*** 1828,1834 ****
$db->sql_query($sql);
}
}
!
$db->sql_transaction('commit');
break;
--- 1828,1834 ----
$db->sql_query($sql);
}
}
!
$db->sql_transaction('commit');
break;
***************
*** 1836,1842 ****
$topic_data = $post_ids = $approved_unapproved_ids = $resync_forums = $delete_topics = $delete_posts = $moved_topics = array();
$db->sql_transaction('begin');
!
$sql = 'SELECT t.topic_id, t.forum_id, t.topic_moved_id, t.topic_approved, ' . (($sync_extra) ? 't.topic_attachment, t.topic_reported, ' : '') . 't.topic_poster, t.topic_time, t.topic_replies, t.topic_replies_real, t.topic_first_post_id, t.topic_first_poster_name, t.topic_first_poster_colour, t.topic_last_post_id, t.topic_last_post_subject, t.topic_last_poster_id, t.topic_last_poster_name, t.topic_last_poster_colour, t.topic_last_post_time
FROM ' . TOPICS_TABLE . " t
$where_sql";
--- 1836,1842 ----
$topic_data = $post_ids = $approved_unapproved_ids = $resync_forums = $delete_topics = $delete_posts = $moved_topics = array();
$db->sql_transaction('begin');
!
$sql = 'SELECT t.topic_id, t.forum_id, t.topic_moved_id, t.topic_approved, ' . (($sync_extra) ? 't.topic_attachment, t.topic_reported, ' : '') . 't.topic_poster, t.topic_time, t.topic_replies, t.topic_replies_real, t.topic_first_post_id, t.topic_first_poster_name, t.topic_first_poster_colour, t.topic_last_post_id, t.topic_last_post_subject, t.topic_last_poster_id, t.topic_last_poster_name, t.topic_last_poster_colour, t.topic_last_post_time
FROM ' . TOPICS_TABLE . " t
$where_sql";
***************
*** 2160,2166 ****
unset($topic_data);
$db->sql_transaction('commit');
!
// if some topics have been resync'ed then resync parent forums
// except when we're only syncing a range, we don't want to sync forums during
// batch processing.
--- 2160,2166 ----
unset($topic_data);
$db->sql_transaction('commit');
!
// if some topics have been resync'ed then resync parent forums
// except when we're only syncing a range, we don't want to sync forums during
// batch processing.
Modified: branches/phpBB-3_0_0/phpBB/install/database_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/database_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/database_update.php Wed Aug 12 16:00:47 2009
***************
*** 707,712 ****
--- 707,715 ----
PROFILE_FIELDS_TABLE => array(
'field_show_on_vt' => array('BOOL', 0),
),
+ FORUMS_TABLE => array(
+ 'forum_options' => array('UINT:20', 0),
+ ),
),
'change_columns' => array(
USERS_TABLE => array(
***************
*** 1086,1095 ****
set_config('feed_forum', '1');
set_config('feed_topic', '1');
- set_config('feed_news_id', '');
-
set_config('feed_item_statistics', '1');
- set_config('feed_exclude_id', '');
// Entries for smiley pagination
set_config('smilies_per_page', '50');
--- 1089,1095 ----
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/firebird_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/firebird_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/firebird_schema.sql Wed Aug 12 16:00:47 2009
***************
*** 363,368 ****
--- 363,369 ----
forum_last_poster_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
forum_last_poster_colour VARCHAR(6) CHARACTER SET NONE DEFAULT '' NOT NULL,
forum_flags INTEGER DEFAULT 32 NOT NULL,
+ forum_options INTEGER DEFAULT 0 NOT NULL,
display_subforum_list INTEGER DEFAULT 1 NOT NULL,
display_on_index INTEGER DEFAULT 1 NOT NULL,
enable_indexing INTEGER DEFAULT 1 NOT NULL,
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/mssql_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/mssql_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/mssql_schema.sql Wed Aug 12 16:00:47 2009
***************
*** 439,444 ****
--- 439,445 ----
[forum_last_poster_name] [varchar] (255) DEFAULT ('') NOT NULL ,
[forum_last_poster_colour] [varchar] (6) DEFAULT ('') NOT NULL ,
[forum_flags] [int] DEFAULT (32) NOT NULL ,
+ [forum_options] [int] DEFAULT (0) NOT NULL ,
[display_subforum_list] [int] DEFAULT (1) NOT NULL ,
[display_on_index] [int] DEFAULT (1) NOT NULL ,
[enable_indexing] [int] DEFAULT (1) NOT NULL ,
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/mysql_40_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/mysql_40_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/mysql_40_schema.sql Wed Aug 12 16:00:47 2009
***************
*** 249,254 ****
--- 249,255 ----
forum_last_poster_name blob NOT NULL,
forum_last_poster_colour varbinary(6) DEFAULT '' NOT NULL,
forum_flags tinyint(4) DEFAULT '32' NOT NULL,
+ forum_options int(20) UNSIGNED DEFAULT '0' NOT NULL,
display_subforum_list tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
display_on_index tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
enable_indexing tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/mysql_41_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/mysql_41_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/mysql_41_schema.sql Wed Aug 12 16:00:47 2009
***************
*** 249,254 ****
--- 249,255 ----
forum_last_poster_name varchar(255) DEFAULT '' NOT NULL,
forum_last_poster_colour varchar(6) DEFAULT '' NOT NULL,
forum_flags tinyint(4) DEFAULT '32' NOT NULL,
+ forum_options int(20) UNSIGNED DEFAULT '0' NOT NULL,
display_subforum_list tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
display_on_index tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
enable_indexing tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/oracle_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/oracle_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/oracle_schema.sql Wed Aug 12 16:00:47 2009
***************
*** 505,510 ****
--- 505,511 ----
forum_last_poster_name varchar2(765) DEFAULT '' ,
forum_last_poster_colour varchar2(6) DEFAULT '' ,
forum_flags number(4) DEFAULT '32' NOT NULL,
+ forum_options number(20) DEFAULT '0' NOT NULL,
display_subforum_list number(1) DEFAULT '1' NOT NULL,
display_on_index number(1) DEFAULT '1' NOT NULL,
enable_indexing number(1) DEFAULT '1' NOT NULL,
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/postgres_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/postgres_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/postgres_schema.sql Wed Aug 12 16:00:47 2009
***************
*** 382,387 ****
--- 382,388 ----
forum_last_poster_name varchar(255) DEFAULT '' NOT NULL,
forum_last_poster_colour varchar(6) DEFAULT '' NOT NULL,
forum_flags INT2 DEFAULT '32' NOT NULL,
+ forum_options INT4 DEFAULT '0' NOT NULL CHECK (forum_options >= 0),
display_subforum_list INT2 DEFAULT '1' NOT NULL CHECK (display_subforum_list >= 0),
display_on_index INT2 DEFAULT '1' NOT NULL CHECK (display_on_index >= 0),
enable_indexing INT2 DEFAULT '1' NOT NULL CHECK (enable_indexing >= 0),
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql Wed Aug 12 16:00:47 2009
***************
*** 105,113 ****
INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_overall_topics_limit', '15');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_forum', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_topic', '1');
- INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_news_id', '');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_item_statistics', '1');
- INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_exclude_id', '');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('flood_interval', '15');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('force_server_vars', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('form_token_lifetime', '7200');
--- 105,111 ----
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/sqlite_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/sqlite_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/sqlite_schema.sql Wed Aug 12 16:00:47 2009
***************
*** 242,247 ****
--- 242,248 ----
forum_last_poster_name varchar(255) NOT NULL DEFAULT '',
forum_last_poster_colour varchar(6) NOT NULL DEFAULT '',
forum_flags tinyint(4) NOT NULL DEFAULT '32',
+ forum_options INTEGER UNSIGNED NOT NULL DEFAULT '0',
display_subforum_list INTEGER UNSIGNED NOT NULL DEFAULT '1',
display_on_index INTEGER UNSIGNED NOT NULL DEFAULT '1',
enable_indexing INTEGER UNSIGNED NOT NULL DEFAULT '1',
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html Wed Aug 12 16:00:47 2009
***************
*** 20,27 ****
<!-- IF S_ENABLE_FEEDS_NEWS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FEED_NEWS}" href="{U_FEED}?mode=news" /><!-- ENDIF -->
<!-- IF S_ENABLE_FEEDS_FORUMS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_ALL_FORUMS}" href="{U_FEED}?mode=forums" /><!-- ENDIF -->
<!-- IF S_ENABLE_FEEDS_TOPICS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_ALL_TOPICS}" href="{U_FEED}?mode=topics" /><!-- ENDIF -->
! <!-- IF S_ENABLE_FEEDS_FORUM and S_FORUM_ID --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FORUM} {FORUM_NAME}" href="{U_FEED}?f={S_FORUM_ID}" /><!-- ENDIF -->
! <!-- IF S_ENABLE_FEEDS_TOPIC and S_TOPIC_ID --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_TOPIC} {TOPIC_TITLE}" href="{U_FEED}?f={S_FORUM_ID}&t={S_TOPIC_ID}" /><!-- ENDIF -->
<!-- ENDIF -->
<!--
--- 20,27 ----
<!-- IF S_ENABLE_FEEDS_NEWS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FEED_NEWS}" href="{U_FEED}?mode=news" /><!-- ENDIF -->
<!-- IF S_ENABLE_FEEDS_FORUMS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_ALL_FORUMS}" href="{U_FEED}?mode=forums" /><!-- ENDIF -->
<!-- IF S_ENABLE_FEEDS_TOPICS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_ALL_TOPICS}" href="{U_FEED}?mode=topics" /><!-- ENDIF -->
! <!-- IF S_ENABLE_FEEDS_FORUM and S_FORUM_ID --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FORUM} - {FORUM_NAME}" href="{U_FEED}?f={S_FORUM_ID}" /><!-- ENDIF -->
! <!-- IF S_ENABLE_FEEDS_TOPIC and S_TOPIC_ID --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_TOPIC} - {TOPIC_TITLE}" href="{U_FEED}?f={S_FORUM_ID}&t={S_TOPIC_ID}" /><!-- ENDIF -->
<!-- ENDIF -->
<!--
Modified: branches/phpBB-3_0_0/phpBB/viewforum.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/viewforum.php (original)
--- branches/phpBB-3_0_0/phpBB/viewforum.php Wed Aug 12 16:00:47 2009
***************
*** 310,315 ****
--- 310,316 ----
'S_SINGLE_MODERATOR' => (!empty($moderators[$forum_id]) && sizeof($moderators[$forum_id]) > 1) ? false : true,
'S_IS_LOCKED' => ($forum_data['forum_status'] == ITEM_LOCKED) ? true : false,
'S_VIEWFORUM' => true,
+ 'S_ENABLE_FEEDS_FORUM' => ($config['feed_forum'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $forum_data['forum_options'])) ? true : false,
'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "f=$forum_id&i=main&mode=forum_view", true, $user->session_id) : '',
'U_POST_NEW_TOPIC' => ($auth->acl_get('f_post', $forum_id) || $user->data['user_id'] == ANONYMOUS) ? append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=post&f=' . $forum_id) : '',
Modified: branches/phpBB-3_0_0/phpBB/viewtopic.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/viewtopic.php (original)
--- branches/phpBB-3_0_0/phpBB/viewtopic.php Wed Aug 12 16:00:47 2009
***************
*** 620,625 ****
--- 620,626 ----
'S_DISPLAY_POST_INFO' => ($topic_data['forum_type'] == FORUM_POST && ($auth->acl_get('f_post', $forum_id) || $user->data['user_id'] == ANONYMOUS)) ? true : false,
'S_DISPLAY_REPLY_INFO' => ($topic_data['forum_type'] == FORUM_POST && ($auth->acl_get('f_reply', $forum_id) || $user->data['user_id'] == ANONYMOUS)) ? true : false,
+ 'S_ENABLE_FEEDS_TOPIC' => ($config['feed_topic'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $topic_data['forum_options'])) ? true : false,
'U_TOPIC' => "{$server_path}viewtopic.$phpEx?f=$forum_id&t=$topic_id",
'U_FORUM' => $server_path,
***************
*** 1180,1186 ****
// Grab all profile fields from users in id cache for later use - similar to the poster cache
$profile_fields_tmp = $cp->generate_profile_fields_template('grab', $id_cache);
!
// filter out fields not to be displayed on viewtopic. Yes, it's a hack, but this shouldn't break any MODs.
$profile_fields_cache = array();
foreach ($profile_fields_tmp as $profile_user_id => $profile_fields)
--- 1181,1187 ----
// Grab all profile fields from users in id cache for later use - similar to the poster cache
$profile_fields_tmp = $cp->generate_profile_fields_template('grab', $id_cache);
!
// filter out fields not to be displayed on viewtopic. Yes, it's a hack, but this shouldn't break any MODs.
$profile_fields_cache = array();
foreach ($profile_fields_tmp as $profile_user_id => $profile_fields)
|
|
From: Andreas F. <ba...@ph...> - 2009-08-12 12:34:59
|
Author: bantu
Date: Wed Aug 12 13:34:12 2009
New Revision: 9964
Log:
Typo in r9963.
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Wed Aug 12 13:34:12 2009
***************
*** 193,199 ****
<li>[Fix] Allow updater to work correctly with PHP filename extensions other than ".php". (Bugs #15809, #49215)</li>
<li>[Fix] Update search index if only post subject changed. (Bug #49435)</li>
<li>[Fix] Fix who is online displaying incorrect data. (Bug #49485, thanks Brainy)</li>
- <li>[Change] Introduce new parametwer to page_header for forum specific who is online listings. </li>
<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
--- 193,198 ----
***************
*** 219,224 ****
--- 218,224 ----
<li>[Change] Cache version check.</li>
<li>[Change] When creating a new forum without copying permissions, ask again.</li>
<li>[Change] Parse multiline url title for [url] BBCode tag. (Bug #1309)</li>
+ <li>[Change] Introduce new parameter to page_header() for forum specific who is online listings.</li>
<li>[Feature] Add language selection on the registration terms page (Bug #15085 - Patch by leviatan21)</li>
<li>[Feature] Backported 3.2 captcha plugins.
<ul>
|
|
From: Henry S. <kel...@ph...> - 2009-08-12 12:10:36
|
Author: Kellanved
Date: Wed Aug 12 13:10:23 2009
New Revision: 9963
Log:
entries
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Wed Aug 12 13:10:23 2009
***************
*** 192,197 ****
--- 192,199 ----
<li>[Fix] Correctly extract column default value when exporting PostgreSQL tables. (Bug #48955)</li>
<li>[Fix] Allow updater to work correctly with PHP filename extensions other than ".php". (Bugs #15809, #49215)</li>
<li>[Fix] Update search index if only post subject changed. (Bug #49435)</li>
+ <li>[Fix] Fix who is online displaying incorrect data. (Bug #49485, thanks Brainy)</li>
+ <li>[Change] Introduce new parametwer to page_header for forum specific who is online listings. </li>
<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
|
|
From: Henry S. <kel...@ph...> - 2009-08-12 12:08:35
|
Author: Kellanved
Date: Wed Aug 12 13:07:49 2009
New Revision: 9962
Log:
wording
Modified:
branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php
Modified: branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/captcha_qa.php Wed Aug 12 13:07:49 2009
***************
*** 37,43 ****
$lang = array_merge($lang, array(
'CAPTCHA_QA' => 'Q&A CAPTCHA',
! 'CONFIRM_QUESTION_EXPLAIN' => 'The following question is a means of identifying and preventing automated submissions.',
'CONFIRM_QUESTION_WRONG' => 'You have provided an invalid answer to the confirmation question.',
'QUESTION_ANSWERS' => 'Answers',
--- 37,43 ----
$lang = array_merge($lang, array(
'CAPTCHA_QA' => 'Q&A CAPTCHA',
! 'CONFIRM_QUESTION_EXPLAIN' => 'This question is a means of identifying and preventing automated submissions.',
'CONFIRM_QUESTION_WRONG' => 'You have provided an invalid answer to the confirmation question.',
'QUESTION_ANSWERS' => 'Answers',
|
|
From: Henry S. <kel...@ph...> - 2009-08-12 10:31:22
|
Author: Kellanved
Date: Wed Aug 12 11:30:37 2009
New Revision: 9961
Log:
populate who is online only where required
Modified:
branches/phpBB-3_0_0/phpBB/faq.php
branches/phpBB-3_0_0/phpBB/includes/functions.php
branches/phpBB-3_0_0/phpBB/memberlist.php
branches/phpBB-3_0_0/phpBB/posting.php
branches/phpBB-3_0_0/phpBB/viewforum.php
branches/phpBB-3_0_0/phpBB/viewtopic.php
Modified: branches/phpBB-3_0_0/phpBB/faq.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/faq.php (original)
--- branches/phpBB-3_0_0/phpBB/faq.php Wed Aug 12 11:30:37 2009
***************
*** 77,83 ****
'SWITCH_COLUMN_MANUALLY' => (!$found_switch) ? true : false,
));
! page_header($l_title);
$template->set_filenames(array(
'body' => 'faq_body.html')
--- 77,83 ----
'SWITCH_COLUMN_MANUALLY' => (!$found_switch) ? true : false,
));
! page_header($l_title, false);
$template->set_filenames(array(
'body' => 'faq_body.html')
Modified: branches/phpBB-3_0_0/phpBB/includes/functions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Wed Aug 12 11:30:37 2009
***************
*** 3861,3867 ****
/**
* Generate page header
*/
! function page_header($page_title = '', $display_online_list = true)
{
global $db, $config, $template, $SID, $_SID, $user, $auth, $phpEx, $phpbb_root_path;
--- 3861,3867 ----
/**
* Generate page header
*/
! function page_header($page_title = '', $display_online_list = true, $forum_id = 0)
{
global $db, $config, $template, $SID, $_SID, $user, $auth, $phpEx, $phpbb_root_path;
***************
*** 3917,3926 ****
* }
* </code>
*/
!
! $item_id = max(request_var('f', 0), 0);
$item = 'forum';
-
$online_users = obtain_users_online($item_id, $item);
$user_online_strings = obtain_users_online_string($online_users, $item_id, $item);
--- 3917,3934 ----
* }
* </code>
*/
!
! if ($forum_id)
! {
! $item_id = max($forum_id, 0);
! }
! else
! {
! $item_id = 0;
! }
!
! // workaround legacy code
$item = 'forum';
$online_users = obtain_users_online($item_id, $item);
$user_online_strings = obtain_users_online_string($online_users, $item_id, $item);
Modified: branches/phpBB-3_0_0/phpBB/memberlist.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/memberlist.php (original)
--- branches/phpBB-3_0_0/phpBB/memberlist.php Wed Aug 12 11:30:37 2009
***************
*** 1531,1537 ****
}
// Output the page
! page_header($page_title);
$template->set_filenames(array(
'body' => $template_html)
--- 1531,1537 ----
}
// Output the page
! page_header($page_title, false);
$template->set_filenames(array(
'body' => $template_html)
Modified: branches/phpBB-3_0_0/phpBB/posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/posting.php (original)
--- branches/phpBB-3_0_0/phpBB/posting.php Wed Aug 12 11:30:37 2009
***************
*** 1492,1498 ****
posting_gen_attachment_entry($attachment_data, $filename_data, $allowed);
// Output page ...
! page_header($page_title);
$template->set_filenames(array(
'body' => 'posting_body.html')
--- 1492,1498 ----
posting_gen_attachment_entry($attachment_data, $filename_data, $allowed);
// Output page ...
! page_header($page_title, false);
$template->set_filenames(array(
'body' => 'posting_body.html')
***************
*** 1520,1526 ****
($forum_style) ? $user->setup('posting', $forum_style) : $user->setup('posting');
! page_header($user->lang['PROGRESS_BAR']);
$template->set_filenames(array(
'popup' => 'posting_progress_bar.html')
--- 1520,1526 ----
($forum_style) ? $user->setup('posting', $forum_style) : $user->setup('posting');
! page_header($user->lang['PROGRESS_BAR'], false);
$template->set_filenames(array(
'popup' => 'posting_progress_bar.html')
Modified: branches/phpBB-3_0_0/phpBB/viewforum.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/viewforum.php (original)
--- branches/phpBB-3_0_0/phpBB/viewforum.php Wed Aug 12 11:30:37 2009
***************
*** 142,148 ****
}
// Dump out the page header and load viewforum template
! page_header($user->lang['VIEW_FORUM'] . ' - ' . $forum_data['forum_name']);
$template->set_filenames(array(
'body' => 'viewforum_body.html')
--- 142,148 ----
}
// Dump out the page header and load viewforum template
! page_header($user->lang['VIEW_FORUM'] . ' - ' . $forum_data['forum_name'], true, $forum_id);
$template->set_filenames(array(
'body' => 'viewforum_body.html')
Modified: branches/phpBB-3_0_0/phpBB/viewtopic.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/viewtopic.php (original)
--- branches/phpBB-3_0_0/phpBB/viewtopic.php Wed Aug 12 11:30:37 2009
***************
*** 1675,1681 ****
}
// Output the page
! page_header($user->lang['VIEW_TOPIC'] . ' - ' . $topic_data['topic_title']);
$template->set_filenames(array(
'body' => ($view == 'print') ? 'viewtopic_print.html' : 'viewtopic_body.html')
--- 1675,1681 ----
}
// Output the page
! page_header($user->lang['VIEW_TOPIC'] . ' - ' . $topic_data['topic_title'], true, $forum_id);
$template->set_filenames(array(
'body' => ($view == 'print') ? 'viewtopic_print.html' : 'viewtopic_body.html')
|
|
From: Henry S. <kel...@ph...> - 2009-08-12 09:26:16
|
Author: Kellanved
Date: Wed Aug 12 10:25:57 2009
New Revision: 9960
Log:
#49465
Modified:
branches/phpBB-3_0_0/phpBB/posting.php
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/quickreply_editor.html
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/quickreply_editor.html
Modified: branches/phpBB-3_0_0/phpBB/posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/posting.php (original)
--- branches/phpBB-3_0_0/phpBB/posting.php Wed Aug 12 10:25:57 2009
***************
*** 39,45 ****
$delete = (isset($_POST['delete'])) ? true : false;
$cancel = (isset($_POST['cancel']) && !isset($_POST['save'])) ? true : false;
! $refresh = (isset($_POST['add_file']) || isset($_POST['delete_file']) || isset($_POST['cancel_unglobalise']) || $save || $load) ? true : false;
$mode = ($delete && !$preview && !$refresh && $submit) ? 'delete' : request_var('mode', '');
$error = $post_data = array();
--- 39,45 ----
$delete = (isset($_POST['delete'])) ? true : false;
$cancel = (isset($_POST['cancel']) && !isset($_POST['save'])) ? true : false;
! $refresh = (isset($_POST['add_file']) || isset($_POST['delete_file']) || isset($_POST['full_editor']) ||isset($_POST['cancel_unglobalise']) || $save || $load) ? true : false;
$mode = ($delete && !$preview && !$refresh && $submit) ? 'delete' : request_var('mode', '');
$error = $post_data = array();
***************
*** 1365,1370 ****
--- 1365,1371 ----
// Build Forum Rules
generate_forum_rules($post_data);
+ // Posting uses is_solved for legacy reasons. Plugins have to use is_solved to force themselves to be displayed.
if ($config['enable_post_confirm'] && !$user->data['is_registered'] && (isset($captcha) && $captcha->is_solved() === false) && ($mode == 'post' || $mode == 'reply' || $mode == 'quote'))
{
$captcha->reset();
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/quickreply_editor.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/quickreply_editor.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/quickreply_editor.html Wed Aug 12 10:25:57 2009
***************
*** 28,34 ****
{S_FORM_TOKEN}
{QR_HIDDEN_FIELDS}
<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />
! <input type="submit" accesskey="f" tabindex="6" name="preview" value="{L_FULL_EDITOR}" class="button2" />
</fieldset>
</div>
<span class="corners-bottom"><span></span></span></div>
--- 28,34 ----
{S_FORM_TOKEN}
{QR_HIDDEN_FIELDS}
<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />
! <input type="submit" accesskey="f" tabindex="6" name="full_editor" value="{L_FULL_EDITOR}" class="button2" />
</fieldset>
</div>
<span class="corners-bottom"><span></span></span></div>
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/quickreply_editor.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/quickreply_editor.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/quickreply_editor.html Wed Aug 12 10:25:57 2009
***************
*** 15,21 ****
<tr>
<td class="cat" colspan="2" align="center">
<input class="btnmain" type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" />
! <input class="btnlite" type="submit" accesskey="f" tabindex="7" name="preview" value="{L_FULL_EDITOR}" />
{S_FORM_TOKEN}
{QR_HIDDEN_FIELDS}
--- 15,21 ----
<tr>
<td class="cat" colspan="2" align="center">
<input class="btnmain" type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" />
! <input class="btnlite" type="submit" accesskey="f" tabindex="7" name="full_editor" value="{L_FULL_EDITOR}" />
{S_FORM_TOKEN}
{QR_HIDDEN_FIELDS}
|
|
From: Meik S. <acy...@ph...> - 2009-08-12 09:22:50
|
Author: acydburn
Date: Wed Aug 12 10:22:04 2009
New Revision: 9959
Log:
Fix r9955 for Bug #49435
(Since $update_message was true in submit_post() the non-parsed text had been entered into the db [because $update_message was false before])
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions_posting.php
branches/phpBB-3_0_0/phpBB/posting.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_posting.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_posting.php Wed Aug 12 10:22:04 2009
***************
*** 1621,1628 ****
/**
* Submit Post
*/
! function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $update_message = true)
{
global $db, $auth, $user, $config, $phpEx, $template, $phpbb_root_path;
--- 1621,1629 ----
/**
* Submit Post
+ * @todo Split up and create lightweight, simple API for this.
*/
! function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $update_message = true, $update_search_index = true)
{
global $db, $auth, $user, $config, $phpEx, $template, $phpbb_root_path;
***************
*** 2487,2493 ****
}
// Index message contents
! if ($update_message && $data['enable_indexing'])
{
// Select the search method and do some additional checks to ensure it can actually be utilised
$search_type = basename($config['search_type']);
--- 2488,2494 ----
}
// Index message contents
! if ($update_search_index && $data['enable_indexing'])
{
// Select the search method and do some additional checks to ensure it can actually be utilised
$search_type = basename($config['search_type']);
Modified: branches/phpBB-3_0_0/phpBB/posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/posting.php (original)
--- branches/phpBB-3_0_0/phpBB/posting.php Wed Aug 12 10:22:04 2009
***************
*** 1117,1124 ****
$data['topic_replies'] = $post_data['topic_replies'];
}
! // $update_message indicates two things: 1) update post_text in table 2) update search index
! $redirect_url = submit_post($mode, $post_data['post_subject'], $post_data['username'], $post_data['topic_type'], $poll, $data, $update_message || $update_subject);
if ($config['enable_post_confirm'] && !$user->data['is_registered'] && in_array($mode, array('quote', 'post', 'reply')))
{
--- 1117,1124 ----
$data['topic_replies'] = $post_data['topic_replies'];
}
! // The last parameter tells submit_post if search indexer has to be run
! $redirect_url = submit_post($mode, $post_data['post_subject'], $post_data['username'], $post_data['topic_type'], $poll, $data, $update_message, ($update_message || $update_subject) ? true : false);
if ($config['enable_post_confirm'] && !$user->data['is_registered'] && in_array($mode, array('quote', 'post', 'reply')))
{
|
|
From: Henry S. <kel...@ph...> - 2009-08-12 09:20:31
|
Author: Kellanved
Date: Wed Aug 12 10:19:47 2009
New Revision: 9958
Log:
change item to item_id; related to #49485
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Wed Aug 12 10:19:47 2009
***************
*** 3692,3698 ****
global $db, $config, $user;
$reading_sql = '';
! if ($item !== 0)
{
$reading_sql = ' AND s.session_' . $item . '_id = ' . (int) $item_id;
}
--- 3692,3698 ----
global $db, $config, $user;
$reading_sql = '';
! if ($item_id !== 0)
{
$reading_sql = ' AND s.session_' . $item . '_id = ' . (int) $item_id;
}
|
|
From: Meik S. <acy...@ph...> - 2009-08-11 16:25:04
|
Author: acydburn
Date: Tue Aug 11 17:24:18 2009
New Revision: 9957
Log:
allow custom template path for email files
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php Tue Aug 11 17:24:18 2009
***************
*** 173,179 ****
/**
* Set email template to use
*/
! function template($template_file, $template_lang = '')
{
global $config, $phpbb_root_path, $user;
--- 173,179 ----
/**
* Set email template to use
*/
! function template($template_file, $template_lang = '', $template_path = '')
{
global $config, $phpbb_root_path, $user;
***************
*** 193,200 ****
$this->tpl_msg[$template_lang . $template_file] = new template();
$tpl = &$this->tpl_msg[$template_lang . $template_file];
! $template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/';
! $template_path .= $template_lang . '/email';
$tpl->set_custom_template($template_path, $template_lang . '_email');
--- 193,203 ----
$this->tpl_msg[$template_lang . $template_file] = new template();
$tpl = &$this->tpl_msg[$template_lang . $template_file];
! if (!$template_path)
! {
! $template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/';
! $template_path .= $template_lang . '/email';
! }
$tpl->set_custom_template($template_path, $template_lang . '_email');
|
|
From: Meik S. <acy...@ph...> - 2009-08-11 14:50:50
|
Author: acydburn
Date: Tue Aug 11 15:49:58 2009
New Revision: 9956
Log:
do not change column if column already exists.
Modified:
branches/phpBB-3_0_0/phpBB/install/database_update.php
Modified: branches/phpBB-3_0_0/phpBB/install/database_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/database_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/database_update.php Tue Aug 11 15:49:58 2009
***************
*** 1860,1869 ****
{
foreach ($columns as $column_name => $column_data)
{
! // Only add the column if it does not exist yet, else change it (to be consistent)
if ($column_exists = $this->sql_column_exists($table, $column_name))
{
! $result = $this->sql_column_change($table, $column_name, $column_data, true);
}
else
{
--- 1860,1871 ----
{
foreach ($columns as $column_name => $column_data)
{
! // Only add the column if it does not exist yet
if ($column_exists = $this->sql_column_exists($table, $column_name))
{
! continue;
! // This is commented out here because it can take tremendous time on updates
! // $result = $this->sql_column_change($table, $column_name, $column_data, true);
}
else
{
|
|
From: Meik S. <acy...@ph...> - 2009-08-11 13:54:59
|
Author: acydburn
Date: Tue Aug 11 14:35:15 2009
New Revision: 9955
Log:
Update search index if only post subject changed. (Bug #49435)
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/posting.php
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Tue Aug 11 14:35:15 2009
***************
*** 191,196 ****
--- 191,197 ----
<li>[Fix] Fix general error while registration, through undefined variable $config in validate_referer (Bug #49035 - Patch by wjvriend)</li>
<li>[Fix] Correctly extract column default value when exporting PostgreSQL tables. (Bug #48955)</li>
<li>[Fix] Allow updater to work correctly with PHP filename extensions other than ".php". (Bugs #15809, #49215)</li>
+ <li>[Fix] Update search index if only post subject changed. (Bug #49435)</li>
<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
Modified: branches/phpBB-3_0_0/phpBB/posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/posting.php (original)
--- branches/phpBB-3_0_0/phpBB/posting.php Tue Aug 11 14:35:15 2009
***************
*** 802,807 ****
--- 802,810 ----
// Check checksum ... don't re-parse message if the same
$update_message = ($mode != 'edit' || $message_md5 != $post_data['post_checksum'] || $status_switch || strlen($post_data['bbcode_uid']) < BBCODE_UID_LEN) ? true : false;
+ // Also check if subject got updated...
+ $update_subject = $mode != 'edit' || ($post_data['post_subject_md5'] && $post_data['post_subject_md5'] != md5($post_data['post_subject']));
+
// Parse message
if ($update_message)
{
***************
*** 1114,1120 ****
$data['topic_replies'] = $post_data['topic_replies'];
}
! $redirect_url = submit_post($mode, $post_data['post_subject'], $post_data['username'], $post_data['topic_type'], $poll, $data, $update_message);
if ($config['enable_post_confirm'] && !$user->data['is_registered'] && in_array($mode, array('quote', 'post', 'reply')))
{
--- 1117,1124 ----
$data['topic_replies'] = $post_data['topic_replies'];
}
! // $update_message indicates two things: 1) update post_text in table 2) update search index
! $redirect_url = submit_post($mode, $post_data['post_subject'], $post_data['username'], $post_data['topic_type'], $poll, $data, $update_message || $update_subject);
if ($config['enable_post_confirm'] && !$user->data['is_registered'] && in_array($mode, array('quote', 'post', 'reply')))
{
|
|
From: Meik S. <acy...@ph...> - 2009-08-11 13:08:28
|
Author: acydburn
Date: Tue Aug 11 14:07:40 2009
New Revision: 9954
Log:
let the link wrap for tiny resolutions
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html
Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html Tue Aug 11 14:07:40 2009
***************
*** 99,105 ****
<tr>
<td>{L_BOARD_VERSION}: </td>
<td>
! <strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822"<!-- ELSE -->style="color: #BC2A4D"<!-- ENDIF --> title="{L_MORE_INFORMATION}" href="{U_VERSIONCHECK}">{BOARD_VERSION}</a></strong> [ <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> ]
</td>
<!-- IF S_TOTAL_ORPHAN -->
<td>{L_NUMBER_ORPHAN}: </td>
--- 99,105 ----
<tr>
<td>{L_BOARD_VERSION}: </td>
<td>
! <strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822"<!-- ELSE -->style="color: #BC2A4D"<!-- ENDIF --> title="{L_MORE_INFORMATION}" href="{U_VERSIONCHECK}">{BOARD_VERSION}</a></strong> [ <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> ]
</td>
<!-- IF S_TOTAL_ORPHAN -->
<td>{L_NUMBER_ORPHAN}: </td>
|
|
From: Meik S. <acy...@ph...> - 2009-08-11 12:58:43
|
Author: acydburn
Date: Tue Aug 11 13:58:00 2009
New Revision: 9953
Log:
use [] style we use for links occurring after text in acp_main too. ;)
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html
Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html Tue Aug 11 13:58:00 2009
***************
*** 19,25 ****
<p>{L_VERSIONCHECK_FAIL}</p>
<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> · <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
</div>
! <!-- ELSEIF ! S_VERSION_UP_TO_DATE -->
<div class="errorbox">
<p>{L_VERSION_NOT_UP_TO_DATE_TITLE}</p>
<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> · <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
--- 19,25 ----
<p>{L_VERSIONCHECK_FAIL}</p>
<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> · <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
</div>
! <!-- ELSEIF not S_VERSION_UP_TO_DATE -->
<div class="errorbox">
<p>{L_VERSION_NOT_UP_TO_DATE_TITLE}</p>
<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> · <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
***************
*** 98,105 ****
</tr>
<tr>
<td>{L_BOARD_VERSION}: </td>
! <td>
! <strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822"<!-- ELSE -->style="color: #BC2A4D"<!-- ENDIF --> title="{L_MORE_INFORMATION}" href="{U_VERSIONCHECK}">{BOARD_VERSION}</a></strong> <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>
</td>
<!-- IF S_TOTAL_ORPHAN -->
<td>{L_NUMBER_ORPHAN}: </td>
--- 98,105 ----
</tr>
<tr>
<td>{L_BOARD_VERSION}: </td>
! <td>
! <strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822"<!-- ELSE -->style="color: #BC2A4D"<!-- ENDIF --> title="{L_MORE_INFORMATION}" href="{U_VERSIONCHECK}">{BOARD_VERSION}</a></strong> [ <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> ]
</td>
<!-- IF S_TOTAL_ORPHAN -->
<td>{L_NUMBER_ORPHAN}: </td>
|
|
From: Henry S. <kel...@ph...> - 2009-08-11 12:50:26
|
Author: Kellanved
Date: Tue Aug 11 13:49:38 2009
New Revision: 9952
Log:
less obstrusive version info
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html
Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html Tue Aug 11 13:49:38 2009
***************
*** 17,33 ****
<!-- IF S_VERSIONCHECK_FAIL -->
<div class="errorbox notice">
<p>{L_VERSIONCHECK_FAIL}</p>
- <!-- ELSE -->
- <!-- IF S_VERSION_UP_TO_DATE -->
- <div class="successbox">
- <p>{L_VERSION_UP_TO_DATE_ACP}</p>
- <!-- ELSE -->
- <div class="errorbox">
- <p>{L_VERSION_NOT_UP_TO_DATE_TITLE}</p>
- <!-- ENDIF -->
- <!-- ENDIF -->
<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> · <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
</div>
<!-- IF S_REMOVE_INSTALL -->
<div class="errorbox">
--- 17,31 ----
<!-- IF S_VERSIONCHECK_FAIL -->
<div class="errorbox notice">
<p>{L_VERSIONCHECK_FAIL}</p>
<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> · <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
</div>
+ <!-- ELSEIF ! S_VERSION_UP_TO_DATE -->
+ <div class="errorbox">
+ <p>{L_VERSION_NOT_UP_TO_DATE_TITLE}</p>
+ <p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> · <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
+ </div>
+ <!-- ENDIF -->
+
<!-- IF S_REMOVE_INSTALL -->
<div class="errorbox">
***************
*** 100,106 ****
</tr>
<tr>
<td>{L_BOARD_VERSION}: </td>
! <td><strong>{BOARD_VERSION}</strong></td>
<!-- IF S_TOTAL_ORPHAN -->
<td>{L_NUMBER_ORPHAN}: </td>
<td><strong>{TOTAL_ORPHAN}</strong></td>
--- 98,106 ----
</tr>
<tr>
<td>{L_BOARD_VERSION}: </td>
! <td>
! <strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822"<!-- ELSE -->style="color: #BC2A4D"<!-- ENDIF --> title="{L_MORE_INFORMATION}" href="{U_VERSIONCHECK}">{BOARD_VERSION}</a></strong> <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>
! </td>
<!-- IF S_TOTAL_ORPHAN -->
<td>{L_NUMBER_ORPHAN}: </td>
<td><strong>{TOTAL_ORPHAN}</strong></td>
|
Author: terrafrost
Date: Mon Aug 10 23:09:10 2009
New Revision: 9951
Log:
fixed bug 44805 - extra initInsertions() calls needed
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/acp_users_signature.html
branches/phpBB-3_0_0/phpBB/adm/style/editor.js
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_main_drafts.html
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_profile_signature.html
Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_users_signature.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_users_signature.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_users_signature.html Mon Aug 10 23:09:10 2009
***************
*** 93,99 ****
// ]]>
</script>
</dt>
! <dd style="margin-left: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{SIGNATURE}</textarea></dd>
<dd style="margin-left: 90px; margin-top: 5px;">
<!-- IF S_BBCODE_ALLOWED -->
<label><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label>
--- 93,99 ----
// ]]>
</script>
</dt>
! <dd style="margin-left: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();">{SIGNATURE}</textarea></dd>
<dd style="margin-left: 90px; margin-top: 5px;">
<!-- IF S_BBCODE_ALLOWED -->
<label><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label>
Modified: branches/phpBB-3_0_0/phpBB/adm/style/editor.js
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/editor.js (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/editor.js Mon Aug 10 23:09:10 2009
***************
*** 16,22 ****
var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));
var baseHeight;
- window.onload = initInsertions;
/**
* Shows the help messages in the helpline window
--- 16,21 ----
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_main_drafts.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_main_drafts.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_main_drafts.html Mon Aug 10 23:09:10 2009
***************
*** 69,75 ****
<table cellspacing="0" cellpadding="2" border="0">
<!-- INCLUDE posting_buttons.html -->
<tr>
! <td colspan="9"><textarea class="post" name="message" rows="10" cols="70" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{DRAFT_MESSAGE}</textarea></td>
</tr>
<tr>
<td colspan="9">
--- 69,75 ----
<table cellspacing="0" cellpadding="2" border="0">
<!-- INCLUDE posting_buttons.html -->
<tr>
! <td colspan="9"><textarea class="post" name="message" rows="10" cols="70" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();">{DRAFT_MESSAGE}</textarea></td>
</tr>
<tr>
<td colspan="9">
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_profile_signature.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_profile_signature.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_profile_signature.html Mon Aug 10 23:09:10 2009
***************
*** 27,33 ****
<table cellspacing="0" cellpadding="2" border="0" width="99%">
<!-- INCLUDE posting_buttons.html -->
<tr>
! <td colspan="2"><textarea class="post" name="signature" rows="10" cols="76" style="width: 90%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{SIGNATURE}</textarea></td>
</tr>
<!-- IF S_BBCODE_ALLOWED -->
<tr>
--- 27,33 ----
<table cellspacing="0" cellpadding="2" border="0" width="99%">
<!-- INCLUDE posting_buttons.html -->
<tr>
! <td colspan="2"><textarea class="post" name="signature" rows="10" cols="76" style="width: 90%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();">{SIGNATURE}</textarea></td>
</tr>
<!-- IF S_BBCODE_ALLOWED -->
<tr>
|
|
From: Jim W. <ter...@ph...> - 2009-08-10 16:05:29
|
Author: terrafrost
Date: Mon Aug 10 17:04:44 2009
New Revision: 9950
Log:
- filtered logs weren't correctly paginated
Modified:
branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_notes.php
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php Mon Aug 10 17:04:44 2009
***************
*** 106,111 ****
--- 106,112 ----
$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
$log_operation = request_var('log_operation', '');
+ $log_operation_param = !empty($log_operation) ? '&log_operation=' . urlencode(htmlspecialchars_decode($log_operation)) : '';
$s_lang_keys = '<option value="">' . $user->lang['SHOW_ALL_OPERATIONS'] . '</option>';
switch ($mode)
***************
*** 213,219 ****
'U_ACTION' => $this->u_action,
'S_ON_PAGE' => on_page($log_count, $config['topics_per_page'], $start),
! 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param", $log_count, $config['topics_per_page'], $start, true),
'S_LIMIT_DAYS' => $s_limit_days,
'S_SORT_KEY' => $s_sort_key,
--- 214,220 ----
'U_ACTION' => $this->u_action,
'S_ON_PAGE' => on_page($log_count, $config['topics_per_page'], $start),
! 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param$log_operation_param", $log_count, $config['topics_per_page'], $start, true),
'S_LIMIT_DAYS' => $s_limit_days,
'S_SORT_KEY' => $s_sort_key,
Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php Mon Aug 10 17:04:44 2009
***************
*** 165,170 ****
--- 165,171 ----
$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
$log_operation = request_var('log_operation', '');
+ $log_operation_param = !empty($log_operation) ? '&log_operation=' . urlencode(htmlspecialchars_decode($log_operation)) : '';
$s_lang_keys = '<option value="">' . $user->lang['SHOW_ALL_OPERATIONS'] . '</option>';
if ($topic_id)
***************
*** 223,229 ****
$template->assign_vars(array(
'PAGE_NUMBER' => on_page($log_count, $config['topics_per_page'], $start),
'TOTAL' => ($log_count == 1) ? $user->lang['TOTAL_LOG'] : sprintf($user->lang['TOTAL_LOGS'], $log_count),
! 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param", $log_count, $config['topics_per_page'], $start),
'L_TITLE' => $user->lang['MCP_LOGS'],
--- 224,230 ----
$template->assign_vars(array(
'PAGE_NUMBER' => on_page($log_count, $config['topics_per_page'], $start),
'TOTAL' => ($log_count == 1) ? $user->lang['TOTAL_LOG'] : sprintf($user->lang['TOTAL_LOGS'], $log_count),
! 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param$log_operation_param", $log_count, $config['topics_per_page'], $start),
'L_TITLE' => $user->lang['MCP_LOGS'],
Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_notes.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_notes.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_notes.php Mon Aug 10 17:04:44 2009
***************
*** 194,199 ****
--- 194,200 ----
$sql_sort = $sort_by_sql[$sk] . ' ' . (($sd == 'd') ? 'DESC' : 'ASC');
$log_operation = request_var('log_operation', '');
+ $log_operation_param = !empty($log_operation) ? '&log_operation=' . urlencode(htmlspecialchars_decode($log_operation)) : '';
$s_lang_keys = '<option value="">' . $user->lang['SHOW_ALL_OPERATIONS'] . '</option>';
$sql = "SELECT DISTINCT log_operation
***************
*** 243,249 ****
'L_TITLE' => $user->lang['MCP_NOTES_USER'],
'PAGE_NUMBER' => on_page($log_count, $config['posts_per_page'], $start),
! 'PAGINATION' => generate_pagination($this->u_action . "&st=$st&sk=$sk&sd=$sd", $log_count, $config['posts_per_page'], $start),
'TOTAL_REPORTS' => ($log_count == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $log_count),
'RANK_TITLE' => $rank_title,
--- 244,250 ----
'L_TITLE' => $user->lang['MCP_NOTES_USER'],
'PAGE_NUMBER' => on_page($log_count, $config['posts_per_page'], $start),
! 'PAGINATION' => generate_pagination($this->u_action . "&st=$st&sk=$sk&sd=$sd$log_operation_param", $log_count, $config['posts_per_page'], $start),
'TOTAL_REPORTS' => ($log_count == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $log_count),
'RANK_TITLE' => $rank_title,
|
|
From: Joas S. <nic...@ph...> - 2009-08-10 15:33:21
|
Author: nickvergessen
Date: Mon Aug 10 16:32:37 2009
New Revision: 9949
Log:
Fix Bug #49385 introduced with r9666 for #15085
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/overall_header.html
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html Mon Aug 10 16:32:37 2009
***************
*** 162,168 ****
<!-- IF not S_IS_BOT -->
<!-- IF S_DISPLAY_MEMBERLIST --><li class="icon-members"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF -->
<!-- IF not S_USER_LOGGED_IN and S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) --><li class="icon-register"><a href="{U_REGISTER}">{L_REGISTER}</a></li><!-- ENDIF -->
! <!-- IF not (S_SHOW_COPPA or S_REGISTRATION) --><li class="icon-logout"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x">{L_LOGIN_LOGOUT}</a></li><!-- ENDIF -->
<!-- ENDIF -->
</ul>
--- 162,168 ----
<!-- IF not S_IS_BOT -->
<!-- IF S_DISPLAY_MEMBERLIST --><li class="icon-members"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF -->
<!-- IF not S_USER_LOGGED_IN and S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) --><li class="icon-register"><a href="{U_REGISTER}">{L_REGISTER}</a></li><!-- ENDIF -->
! <li class="icon-logout"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x">{L_LOGIN_LOGOUT}</a></li>
<!-- ENDIF -->
</ul>
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/overall_header.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/overall_header.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/overall_header.html Mon Aug 10 16:32:37 2009
***************
*** 162,168 ****
<table width="100%" cellspacing="0">
<tr>
<td class="genmed">
! <!-- IF not S_IS_BOT and not (S_SHOW_COPPA or S_REGISTRATION) --><a href="{U_LOGIN_LOGOUT}"><img src="{T_THEME_PATH}/images/icon_mini_login.gif" width="12" height="13" alt="*" /> {L_LOGIN_LOGOUT}</a> <!-- ENDIF -->
<!-- IF U_RESTORE_PERMISSIONS --> <a href="{U_RESTORE_PERMISSIONS}"><img src="{T_THEME_PATH}/images/icon_mini_login.gif" width="12" height="13" alt="*" /> {L_RESTORE_PERMISSIONS}</a><!-- ENDIF -->
<!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN --> <span style="color: red;">{L_BOARD_DISABLED}</span><!-- ENDIF -->
<!-- IF not S_IS_BOT -->
--- 162,168 ----
<table width="100%" cellspacing="0">
<tr>
<td class="genmed">
! <!-- IF not S_IS_BOT --><a href="{U_LOGIN_LOGOUT}"><img src="{T_THEME_PATH}/images/icon_mini_login.gif" width="12" height="13" alt="*" /> {L_LOGIN_LOGOUT}</a> <!-- ENDIF -->
<!-- IF U_RESTORE_PERMISSIONS --> <a href="{U_RESTORE_PERMISSIONS}"><img src="{T_THEME_PATH}/images/icon_mini_login.gif" width="12" height="13" alt="*" /> {L_RESTORE_PERMISSIONS}</a><!-- ENDIF -->
<!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN --> <span style="color: red;">{L_BOARD_DISABLED}</span><!-- ENDIF -->
<!-- IF not S_IS_BOT -->
|
|
From: Andreas F. <ba...@ph...> - 2009-08-10 12:21:28
|
Author: bantu
Date: Mon Aug 10 13:12:45 2009
New Revision: 9948
Log:
Bugs #15809, #49215 - Allow updater to work correctly with PHP filename extensions other than .php.
Related revisions: r9935, r9936
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/install/install_update.php
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Mon Aug 10 13:12:45 2009
***************
*** 190,195 ****
--- 190,196 ----
<li>[Fix] Do not mark global announcements as read if all topics in a forum become read (Bug #15729).</li>
<li>[Fix] Fix general error while registration, through undefined variable $config in validate_referer (Bug #49035 - Patch by wjvriend)</li>
<li>[Fix] Correctly extract column default value when exporting PostgreSQL tables. (Bug #48955)</li>
+ <li>[Fix] Allow updater to work correctly with PHP filename extensions other than ".php". (Bugs #15809, #49215)</li>
<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
Modified: branches/phpBB-3_0_0/phpBB/install/install_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/install_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/install_update.php Mon Aug 10 13:12:45 2009
***************
*** 203,209 ****
}
// What about the language file? Got it updated?
! if (in_array('language/en/install.php', $this->update_info['files']))
{
$lang = array();
include($this->new_location . 'language/en/install.' . $phpEx);
--- 203,209 ----
}
// What about the language file? Got it updated?
! if (in_array('language/en/install.' . $phpEx, $this->update_info['files']))
{
$lang = array();
include($this->new_location . 'language/en/install.' . $phpEx);
***************
*** 1577,1582 ****
--- 1577,1588 ----
if ($info !== false)
{
+ // We assume that all file extensions have been renamed to .$phpEx,
+ // if someone is using a non .php file extension for php files.
+ // However, in $update_info['files'] we use hardcoded .php.
+ // We therefore replace .php with .$phpEx.
+ $info['files'] = preg_replace('/\.php$/i', ".$phpEx", $info['files']);
+
// Adjust the update info file to hold some specific style-related information
$info['custom'] = array();
/*
|
7 messages has been excluded from this view by a project administrator.
