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: Meik S. <acy...@ph...> - 2009-08-31 09:39:12
|
Author: acydburn
Date: Mon Aug 31 10:38:53 2009
New Revision: 10072
Log:
ok, now we just define the modules we want to install on update and where they should appear.
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 Mon Aug 31 10:38:53 2009
***************
*** 575,580 ****
--- 575,701 ----
}
}
+ function _add_modules($modules_to_install)
+ {
+ global $phpbb_root_path, $phpEx, $db;
+
+ include_once($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);
+
+ $_module = new acp_modules();
+
+ foreach ($modules_to_install as $module_mode => $module_data)
+ {
+ $_module->module_class = $module_data['class'];
+
+ // Determine parent id first
+ $sql = 'SELECT module_id
+ FROM ' . MODULES_TABLE . "
+ WHERE module_class = '" . $db->sql_escape($module_data['class']) . "'
+ AND module_langname = '" . $db->sql_escape($module_data['cat']) . "'
+ AND module_mode = ''
+ AND module_basename = ''";
+ $result = $db->sql_query($sql);
+
+ // There may be more than one categories with the same name
+ $categories = array();
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $categories[] = (int) $row['module_id'];
+ }
+ $db->sql_freeresult($result);
+
+ if (!sizeof($categories))
+ {
+ continue;
+ }
+
+ // Add the module to all categories found
+ foreach ($categories as $parent_id)
+ {
+ // Check if the module already exists
+ $sql = 'SELECT *
+ FROM ' . MODULES_TABLE . "
+ WHERE module_basename = '" . $db->sql_escape($module_data['base']) . "'
+ AND module_class = '" . $db->sql_escape($module_data['class']) . "'
+ AND module_langname = '" . $db->sql_escape($module_data['title']) . "'
+ AND module_mode = '" . $db->sql_escape($module_mode) . "'
+ AND module_auth = '" . $db->sql_escape($module_data['auth']) . "'
+ AND parent_id = {$parent_id}";
+ $result = $db->sql_query($sql);
+ $row = $db->sql_fetchrow($result);
+ $db->sql_freeresult($result);
+
+ // If it exists, we simply continue with the next category
+ if ($row)
+ {
+ continue;
+ }
+
+ // Build the module sql row
+ $module_row = array(
+ 'module_basename' => $module_data['base'],
+ 'module_enabled' => (isset($module_data['enabled'])) ? (int) $module_data['enabled'] : 1,
+ 'module_display' => (isset($module_data['display'])) ? (int) $module_data['display'] : 1,
+ 'parent_id' => $parent_id,
+ 'module_class' => $module_data['class'],
+ 'module_langname' => $module_data['title'],
+ 'module_mode' => $module_mode,
+ 'module_auth' => $module_data['auth'],
+ );
+
+ $_module->update_module_data($module_row, true);
+
+ // Ok, do we need to re-order the module, move it up or down?
+ if (!isset($module_data['after']))
+ {
+ continue;
+ }
+
+ $after_mode = $module_data['after'][0];
+ $after_langname = $module_data['after'][1];
+
+ // First of all, get the module id for the module this one has to be placed after
+ $sql = 'SELECT left_id
+ FROM ' . MODULES_TABLE . "
+ WHERE module_class = '" . $db->sql_escape($module_data['class']) . "'
+ AND module_basename = '" . $db->sql_escape($module_data['base']) . "'
+ AND module_langname = '" . $db->sql_escape($after_langname) . "'
+ AND module_mode = '" . $db->sql_escape($after_mode) . "'
+ AND parent_id = '{$parent_id}'";
+ $result = $db->sql_query($sql);
+ $first_left_id = (int) $db->sql_fetchfield('left_id');
+ $db->sql_freeresult($result);
+
+ if (!$first_left_id)
+ {
+ continue;
+ }
+
+ // Ok, count the number of modules between $after_mode and the added module
+ $sql = 'SELECT COUNT(module_id) as num_modules
+ FROM ' . MODULES_TABLE . "
+ WHERE module_class = '" . $db->sql_escape($module_data['class']) . "'
+ AND parent_id = {$parent_id}
+ AND left_id BETWEEN {$first_left_id} AND {$module_row['left_id']}
+ ORDER BY left_id";
+ $result = $db->sql_query($sql);
+ $steps = (int) $db->sql_fetchfield('num_modules');
+ $db->sql_freeresult($result);
+
+ // We need to substract 2
+ $steps -= 2;
+
+ if ($steps <= 0)
+ {
+ continue;
+ }
+
+ // Ok, move module up $num_modules times. ;)
+ $_module->move_module_by($module_row, 'move_up', $steps);
+ }
+ }
+ }
+
/****************************************************************************
* ADD YOUR DATABASE SCHEMA CHANGES HERE *
*****************************************************************************/
***************
*** 1124,1353 ****
// Entry for reporting PMs
set_config('allow_pm_report', '1');
! include_once($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);
!
! $_module = new acp_modules();
!
! // Set the module class
! $_module->module_class = 'acp';
!
! $sql = 'SELECT module_id
! FROM ' . MODULES_TABLE . "
! WHERE module_class = 'acp'
! AND module_langname = 'ACP_BOARD_CONFIGURATION'
! AND module_mode = ''
! AND module_basename = ''";
! $result = $db->sql_query($sql);
! $category_id = (int) $db->sql_fetchfield('module_id');
! $db->sql_freeresult($result);
!
! if ($category_id)
! {
! // Check if we actually need to add the feed module or if it is already added. ;)
! $sql = 'SELECT *
! FROM ' . MODULES_TABLE . "
! WHERE module_basename = 'board'
! AND module_class = 'acp'
! AND module_langname = 'ACP_FEED_SETTINGS'
! AND module_mode = 'feed'
! AND module_auth = 'acl_a_board'
! AND parent_id = {$category_id}";
! $result = $db->sql_query($sql);
! $row = $db->sql_fetchrow($result);
! $db->sql_freeresult($result);
!
! if (!$row)
! {
! $module_data = array(
! 'module_basename' => 'board',
! 'module_enabled' => 1,
! 'module_display' => 1,
! 'parent_id' => $category_id,
! 'module_class' => 'acp',
! 'module_langname' => 'ACP_FEED_SETTINGS',
! 'module_mode' => 'feed',
! 'module_auth' => 'acl_a_board',
! );
!
! $_module->update_module_data($module_data, true);
! }
! }
!
! // Also install the "User Warning" module
! $sql = 'SELECT module_id
! FROM ' . MODULES_TABLE . "
! WHERE module_class = 'acp'
! AND module_langname = 'ACP_USER_MANAGEMENT'
! AND module_mode = ''
! AND module_basename = ''";
! $result = $db->sql_query($sql);
! $category_id = (int) $db->sql_fetchfield('module_id');
! $db->sql_freeresult($result);
!
! if ($category_id)
! {
! // Check if we actually need to add the module or if it is already added. ;)
! $sql = 'SELECT *
! FROM ' . MODULES_TABLE . "
! WHERE module_class = 'acp'
! AND module_langname = 'ACP_USER_WARNINGS'
! AND module_mode = 'warnings'
! AND module_auth = 'acl_a_user'
! AND parent_id = {$category_id}";
! $result = $db->sql_query($sql);
! $row = $db->sql_fetchrow($result);
! $db->sql_freeresult($result);
!
! if (!$row)
! {
! $module_data = array(
! 'module_basename' => 'users',
! 'module_enabled' => 1,
! 'module_display' => 0,
! 'parent_id' => $category_id,
! 'module_class' => 'acp',
! 'module_langname' => 'ACP_USER_WARNINGS',
! 'module_mode' => 'warnings',
! 'module_auth' => 'acl_a_user',
! );
!
! $_module->update_module_data($module_data, true);
! }
! }
!
! // Also install the "PM Reports" module
! $sql = 'SELECT module_id
! FROM ' . MODULES_TABLE . "
! WHERE module_class = 'mcp'
! AND module_langname = 'MCP_REPORTS'
! AND module_mode = ''
! AND module_basename = ''";
! $result = $db->sql_query($sql);
! $category_id = (int) $db->sql_fetchfield('module_id');
! $db->sql_freeresult($result);
!
! if ($category_id)
! {
! $modes = array(
! 'pm_reports' => array('title' => 'MCP_PM_REPORTS_OPEN', 'auth' => 'aclf_m_report'),
! 'pm_reports_closed' => array('title' => 'MCP_PM_REPORTS_CLOSED', 'auth' => 'aclf_m_report'),
! 'pm_report_details' => array('title' => 'MCP_PM_REPORT_DETAILS', 'auth' => 'aclf_m_report'),
! );
!
! foreach ($modes as $mode => $data)
! {
! // Check if we actually need to add the module or if it is already added. ;)
! $sql = 'SELECT *
! FROM ' . MODULES_TABLE . "
! WHERE module_class = 'mcp'
! AND module_langname = '{$data['title']}'
! AND module_mode = '$mode'
! AND parent_id = {$category_id}";
! $result = $db->sql_query($sql);
! $row = $db->sql_fetchrow($result);
! $db->sql_freeresult($result);
!
! if (!$row)
! {
! $module_data = array(
! 'module_basename' => 'pm_reports',
! 'module_enabled' => 1,
! 'module_display' => 1,
! 'parent_id' => $category_id,
! 'module_class' => 'mcp',
! 'module_langname' => $data['title'],
! 'module_mode' => $mode,
! 'module_auth' => $data['auth'],
! );
!
! $_module->update_module_data($module_data, true);
! }
! }
! }
!
! // Also install the "Copy forum permissions" module
! $sql = 'SELECT module_id
! FROM ' . MODULES_TABLE . "
! WHERE module_class = 'acp'
! AND module_langname = 'ACP_FORUM_BASED_PERMISSIONS'
! AND module_mode = ''
! AND module_basename = ''";
! $result = $db->sql_query($sql);
! $category_id = (int) $db->sql_fetchfield('module_id');
! $db->sql_freeresult($result);
!
! if ($category_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_FORUM_PERMISSIONS_COPY'
! AND module_mode = 'setting_forum_copy'
! AND module_auth = 'acl_a_fauth && acl_a_authusers && acl_a_authgroups && acl_a_mauth'
! AND parent_id = {$category_id}";
! $result = $db->sql_query($sql);
! $row = $db->sql_fetchrow($result);
! $db->sql_freeresult($result);
!
! if (!$row)
! {
! $module_data = array(
! 'module_basename' => 'permissions',
! 'module_enabled' => 1,
! 'module_display' => 1,
! 'parent_id' => $category_id,
! 'module_class' => 'acp',
! 'module_langname' => 'ACP_FORUM_PERMISSIONS_COPY',
! 'module_mode' => 'setting_forum_copy',
! 'module_auth' => 'acl_a_fauth && acl_a_authusers && acl_a_authgroups && acl_a_mauth',
! );
!
! $_module->update_module_data($module_data, true);
! }
! }
!
! // 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);
! $category_id = (int) $db->sql_fetchfield('module_id');
! $db->sql_freeresult($result);
!
! if ($category_id)
! {
! // Check if we need to add the module or if it is already there. ;)
! $sql = 'SELECT *
! FROM ' . MODULES_TABLE . "
! WHERE module_class = 'acp'
! AND module_langname = 'ACP_SEND_STATISTICS'
! AND module_mode = 'send_statistics'
! AND module_auth = 'acl_a_server'
! AND parent_id = {$category_id}";
! $result = $db->sql_query($sql);
! $row = $db->sql_fetchrow($result);
! $db->sql_freeresult($result);
!
! if (!$row)
! {
! $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);
! }
! }
$_module->remove_cache_file();
--- 1245,1308 ----
// Entry for reporting PMs
set_config('allow_pm_report', '1');
! // Install modules
! $modules_to_install = array(
! 'feed' => array(
! 'base' => 'board',
! 'class' => 'acp',
! 'title' => 'ACP_FEED_SETTINGS',
! 'auth' => 'acl_a_board',
! 'cat' => 'ACP_BOARD_CONFIGURATION',
! 'after' => array('signature', 'ACP_SIGNATURE_SETTINGS')
! ),
! 'warnings' => array(
! 'base' => 'users',
! 'class' => 'acp',
! 'title' => 'ACP_USER_WARNINGS',
! 'auth' => 'acl_a_user',
! 'display' => 0,
! 'cat' => 'ACP_CAT_USERS',
! 'after' => array('feedback', 'ACP_USER_FEEDBACK')
! ),
! 'send_statistics' => array(
! 'base' => 'send_statistics',
! 'class' => 'acp',
! 'title' => 'ACP_SEND_STATISTICS',
! 'auth' => 'acl_a_server',
! 'cat' => 'ACP_SERVER_CONFIGURATION'
! ),
! 'setting_forum_copy' => array(
! 'base' => 'permissions',
! 'class' => 'acp',
! 'title' => 'ACP_FORUM_PERMISSIONS_COPY',
! 'auth' => 'acl_a_fauth && acl_a_authusers && acl_a_authgroups && acl_a_mauth',
! 'cat' => 'ACP_FORUM_BASED_PERMISSIONS',
! 'after' => array('setting_forum_local', 'ACP_FORUM_PERMISSIONS')
! ),
! 'pm_reports' => array(
! 'base' => 'pm_reports',
! 'class' => 'mcp',
! 'title' => 'MCP_PM_REPORTS_OPEN',
! 'auth' => 'aclf_m_report',
! 'cat' => 'MCP_REPORTS'
! ),
! 'pm_reports_closed' => array(
! 'base' => 'pm_reports',
! 'class' => 'mcp',
! 'title' => 'MCP_PM_REPORTS_CLOSED',
! 'auth' => 'aclf_m_report',
! 'cat' => 'MCP_REPORTS'
! ),
! 'pm_report_details' => array(
! 'base' => 'pm_reports',
! 'class' => 'mcp',
! 'title' => 'MCP_PM_REPORT_DETAILS',
! 'auth' => 'aclf_m_report',
! 'cat' => 'MCP_REPORTS'
! ),
! );
! _add_modules($modules_to_install);
$_module->remove_cache_file();
|
|
From: Andreas F. <ba...@ph...> - 2009-08-31 09:31:47
|
Author: bantu
Date: Mon Aug 31 10:31:30 2009
New Revision: 10071
Log:
Addition to r10060: Add function documentation.
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 Mon Aug 31 10:31:30 2009
***************
*** 552,558 ****
}
/**
! * Hash email
*/
function phpbb_email_hash($email)
{
--- 552,562 ----
}
/**
! * Hashes an email address to a big integer
! *
! * @param string $email Email address
! *
! * @return string Big Integer
*/
function phpbb_email_hash($email)
{
|
|
From: Andreas F. <ba...@ph...> - 2009-08-31 08:59:30
|
Author: bantu
Date: Mon Aug 31 09:58:44 2009
New Revision: 10070
Log:
Addition to r9887: Correctly install 'Copy forum permissions' module.
Addition to r10068: Correct mode is send_statistics.
Modified:
branches/phpBB-3_0_0/phpBB/install/install_install.php
branches/phpBB-3_0_0/phpBB/language/en/install.php
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 Mon Aug 31 09:58:44 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, 'i=send_statistics&mode=questionnaire'),
));
}
--- 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=send_statistics'),
));
}
***************
*** 2231,2236 ****
--- 2231,2237 ----
),
'ACP_FORUM_BASED_PERMISSIONS' => array(
'ACP_FORUM_PERMISSIONS',
+ 'ACP_FORUM_PERMISSIONS_COPY',
'ACP_FORUM_MODERATORS',
'ACP_USERS_FORUM_PERMISSIONS',
'ACP_GROUPS_FORUM_PERMISSIONS',
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 Mon Aug 31 09:58:44 2009
***************
*** 368,374 ****
// 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',
--- 368,374 ----
// 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=send_statistics">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=send_statistics">Send statistics</a> module in your ACP.',
'ARCHIVE_FILE' => 'Source file within archive',
'BACK' => 'Back',
|
Author: acydburn Date: Sun Aug 30 18:50:11 2009 New Revision: 10069 Log: Style authors are now able to define the default submit button used for form submission on ENTER keypress on forms using more than one. Prosilver uses this for the posting page(s) and registration screen. (we further test this at phpbb.com) Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_compose.php branches/phpBB-3_0_0/phpBB/styles/prosilver/template/forum_fn.js branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.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 Sun Aug 30 18:50:11 2009 *************** *** 284,291 **** <li>[Feature] Separate PM Reply and PM Reply to all in prosilver.</li> <li>[Feature] Place debug notices during captcha rendering in the error log - useful for debugging output already started errors.</li> <li>[Feature] Ability to define constant PHPBB_USE_BOARD_URL_PATH to use board url for images/avatars/ranks/imageset...</li> ! <li>[Feature] Added function to generate email-hash. (Bug #49195)</li> ! </ul> <a name="v304"></a><h3>1.ii. Changes since 3.0.4</h3> --- 284,291 ---- <li>[Feature] Separate PM Reply and PM Reply to all in prosilver.</li> <li>[Feature] Place debug notices during captcha rendering in the error log - useful for debugging output already started errors.</li> <li>[Feature] Ability to define constant PHPBB_USE_BOARD_URL_PATH to use board url for images/avatars/ranks/imageset...</li> ! <li>[Feature] Added function to generate Email hash. (Bug #49195)</li> ! <li>[Feature] Style authors are now able to define the default submit button used for form submission on ENTER keypress on forms using more than one. Prosilver uses this for the posting page(s) and registration screen.</li> </ul> <a name="v304"></a><h3>1.ii. Changes since 3.0.4</h3> Modified: branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_compose.php ============================================================================== *** branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_compose.php (original) --- branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_compose.php Sun Aug 30 18:50:11 2009 *************** *** 1163,1170 **** global $refresh, $submit, $preview; ! $refresh = $preview = true; $submit = false; } // Add User/Group [TO] --- 1163,1176 ---- global $refresh, $submit, $preview; ! $refresh = true; $submit = false; + + // Preview is only true if there was also a message entered + if (request_var('message', '')) + { + $preview = true; + } } // Add User/Group [TO] Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/forum_fn.js ============================================================================== *** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/forum_fn.js (original) --- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/forum_fn.js Sun Aug 30 18:50:11 2009 *************** *** 268,270 **** --- 268,403 ---- obj.SetControllerVisible(true); obj.Play(); } + + /** + * Check if the nodeName of elem is name + * @author jQuery + */ + function is_node_name(elem, name) + { + return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase(); + } + + /** + * Check if elem is in array, return position + * @author jQuery + */ + function is_in_array(elem, array) + { + for (var i = 0, length = array.length; i < length; i++) + // === is correct (IE) + if (array[i] === elem) + return i; + + return -1; + } + + /** + * Find Element, type and class in tree + * Not used, but may come in handy for those not using JQuery + * @author jQuery.find, Meik Sievertsen + */ + function find_in_tree(node, tag, type, class_name) + { + var result, element, i = 0, length = node.childNodes.length; + + for (element = node.childNodes[0]; i < length; element = node.childNodes[++i]) + { + if (!element || element.nodeType != 1) continue; + + if ((!tag || is_node_name(element, tag)) && (!type || element.type == type) && (!class_name || is_in_array(class_name, (element.className || element).toString().split(/\s+/)) > -1)) + { + return element; + } + + if (element.childNodes.length) + result = find_in_tree(element, tag, type, class_name); + + if (result) return result; + } + } + + /** + * Usually used for onkeypress event, to submit a form on enter + */ + function submit_default_button(event, selector, class_name) + { + // Add which for key events + if (!event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode)) + event.which = event.charCode || event.keyCode; + + // Keycode is not return, then return. ;) + if (event.which != 13) + return true; + + var current = selector['parentNode']; + + // Search parent form element + while (current && (!current.nodeName || current.nodeType != 1 || !is_node_name(current, 'form')) && current != document) + current = current['parentNode']; + + // Find the input submit button with the class name + //current = find_in_tree(current, 'input', 'submit', class_name); + var input_tags = current.getElementsByTagName('input'); + current = false; + + for (var i = 0, element = input_tags[0]; i < input_tags.length; element = input_tags[++i]) + { + if (element.type == 'submit' && is_in_array(class_name, (element.className || element).toString().split(/\s+/)) > -1) + current = element; + } + + if (!current) + return true; + + // Submit form + current.focus(); + current.click(); + return false; + } + + /** + * Apply onkeypress event for forcing default submit button on ENTER key press + * The jQuery snippet used is based on http://greatwebguy.com/programming/dom/default-html-button-submit-on-enter-with-jquery/ + * The non-jQuery code is a mimick of the jQuery code ;) + */ + function apply_onkeypress_event() + { + // jQuery code in case jQuery is used + if (jquery_present) + { + $('form input').live('keypress', function (e) + { + var default_button = $(this).parents('form').find('input[type=submit].default-submit-action'); + + if (!default_button || default_button.length <= 0) + return true; + + if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13)) + { + default_button.click(); + return false; + } + + return true; + }); + + return; + } + + var input_tags = document.getElementsByTagName('input'); + + for (var i = 0, element = input_tags[0]; i < input_tags.length ; element = input_tags[++i]) + { + if (element.type == 'hidden') + continue; + + // onkeydown is possible too + element.onkeypress = function (evt) { submit_default_button((evt || window.event), this, 'default-submit-action'); }; + } + } + + /** + * Detect JQuery existance. We currently do not deliver it, but some styles do, so why not benefit from it. ;) + */ + var jquery_present = typeof jQuery == 'function'; Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html ============================================================================== *** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html (original) --- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html Sun Aug 30 18:50:11 2009 *************** *** 1,3 **** --- 1,9 ---- + <script type="text/javascript"> + // <![CDATA[ + onload_functions.push('apply_onkeypress_event()'); + // ]]> + </script> + <fieldset class="fields1"> <!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF --> *************** *** 184,190 **** <!-- IF S_HAS_DRAFTS --><input type="submit" accesskey="d" tabindex="8" name="load" value="{L_LOAD}" class="button2" onclick="load_draft = true;" /> <!-- ENDIF --> <!-- IF S_SAVE_ALLOWED --><input type="submit" accesskey="k" tabindex="7" name="save" value="{L_SAVE}" class="button2" /> <!-- ENDIF --> <input type="submit" tabindex="5" name="preview" value="{L_PREVIEW}" class="button1"<!-- IF not S_PRIVMSGS --> onclick="document.getElementById('postform').action += '#preview';"<!-- ENDIF --> /> ! <input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" /> </fieldset> --- 190,196 ---- <!-- IF S_HAS_DRAFTS --><input type="submit" accesskey="d" tabindex="8" name="load" value="{L_LOAD}" class="button2" onclick="load_draft = true;" /> <!-- ENDIF --> <!-- IF S_SAVE_ALLOWED --><input type="submit" accesskey="k" tabindex="7" name="save" value="{L_SAVE}" class="button2" /> <!-- ENDIF --> <input type="submit" tabindex="5" name="preview" value="{L_PREVIEW}" class="button1"<!-- IF not S_PRIVMSGS --> onclick="document.getElementById('postform').action += '#preview';"<!-- ENDIF --> /> ! <input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1 default-submit-action" /> </fieldset> Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html ============================================================================== *** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html (original) --- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html Sun Aug 30 18:50:11 2009 *************** *** 11,16 **** --- 11,20 ---- document.forms['register'].submit.click(); } + <!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_REFRESH --> + onload_functions.push('apply_onkeypress_event()'); + <!-- ENDIF --> + // ]]> </script> *************** *** 92,106 **** </div> <!-- ENDIF --> - - <div class="panel"> <div class="inner"><span class="corners-top"><span></span></span> <fieldset class="submit-buttons"> {S_HIDDEN_FIELDS} <input type="reset" value="{L_RESET}" name="reset" class="button2" /> ! <input type="submit" name="submit" id="submit" value="{L_SUBMIT}" class="button1" /> {S_FORM_TOKEN} </fieldset> --- 96,108 ---- </div> <!-- ENDIF --> <div class="panel"> <div class="inner"><span class="corners-top"><span></span></span> <fieldset class="submit-buttons"> {S_HIDDEN_FIELDS} <input type="reset" value="{L_RESET}" name="reset" class="button2" /> ! <input type="submit" name="submit" id="submit" value="{L_SUBMIT}" class="button1 default-submit-action" /> {S_FORM_TOKEN} </fieldset> |
|
From: Meik S. <acy...@ph...> - 2009-08-30 17:22:33
|
Author: acydburn
Date: Sun Aug 30 18:22:21 2009
New Revision: 10068
Log:
correct mode is send_statistics, else installs will differ from updates.
Modified:
branches/phpBB-3_0_0/phpBB/includes/acp/info/acp_send_statistics.php
branches/phpBB-3_0_0/phpBB/install/database_update.php
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/info/acp_send_statistics.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/info/acp_send_statistics.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/info/acp_send_statistics.php Sun Aug 30 18:22:21 2009
***************
*** 20,26 ****
'title' => 'ACP_SEND_STATISTICS',
'version' => '1.0.0',
'modes' => array(
! 'questionnaire' => array('title' => 'ACP_SEND_STATISTICS', 'auth' => 'acl_a_server', 'cat' => array('ACP_SERVER_CONFIGURATION')),
),
);
}
--- 20,26 ----
'title' => 'ACP_SEND_STATISTICS',
'version' => '1.0.0',
'modes' => array(
! 'send_statistics' => array('title' => 'ACP_SEND_STATISTICS', 'auth' => 'acl_a_server', 'cat' => array('ACP_SERVER_CONFIGURATION')),
),
);
}
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 Sun Aug 30 18:22:21 2009
***************
*** 1181,1191 ****
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 module or if it is already added. ;)
$sql = 'SELECT *
FROM ' . MODULES_TABLE . "
--- 1181,1191 ----
AND module_mode = ''
AND module_basename = ''";
$result = $db->sql_query($sql);
+ $category_id = (int) $db->sql_fetchfield('module_id');
+ $db->sql_freeresult($result);
! if ($category_id)
{
// Check if we actually need to add the module or if it is already added. ;)
$sql = 'SELECT *
FROM ' . MODULES_TABLE . "
***************
*** 1194,1204 ****
AND module_mode = 'warnings'
AND module_auth = 'acl_a_user'
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' => 'users',
--- 1194,1204 ----
AND module_mode = 'warnings'
AND module_auth = 'acl_a_user'
AND parent_id = {$category_id}";
! $result = $db->sql_query($sql);
! $row = $db->sql_fetchrow($result);
! $db->sql_freeresult($result);
! if (!$row)
{
$module_data = array(
'module_basename' => 'users',
***************
*** 1214,1221 ****
$_module->update_module_data($module_data, true);
}
}
- $db->sql_freeresult($result);
-
// Also install the "PM Reports" module
$sql = 'SELECT module_id
--- 1214,1219 ----
***************
*** 1225,1239 ****
AND module_mode = ''
AND module_basename = ''";
$result = $db->sql_query($sql);
! while ($row = $db->sql_fetchrow($result))
{
- $category_id = (int) $row['module_id'];
-
$modes = array(
'pm_reports' => array('title' => 'MCP_PM_REPORTS_OPEN', 'auth' => 'aclf_m_report'),
! 'pm_reports_closed' => array('title' => 'MCP_PM_REPORTS_CLOSED', 'auth' => 'aclf_m_report'),
! 'pm_report_details' => array('title' => 'MCP_PM_REPORT_DETAILS', 'auth' => 'aclf_m_report'),
);
foreach ($modes as $mode => $data)
--- 1223,1237 ----
AND module_mode = ''
AND module_basename = ''";
$result = $db->sql_query($sql);
+ $category_id = (int) $db->sql_fetchfield('module_id');
+ $db->sql_freeresult($result);
! if ($category_id)
{
$modes = array(
'pm_reports' => array('title' => 'MCP_PM_REPORTS_OPEN', 'auth' => 'aclf_m_report'),
! 'pm_reports_closed' => array('title' => 'MCP_PM_REPORTS_CLOSED', 'auth' => 'aclf_m_report'),
! 'pm_report_details' => array('title' => 'MCP_PM_REPORT_DETAILS', 'auth' => 'aclf_m_report'),
);
foreach ($modes as $mode => $data)
***************
*** 1245,1255 ****
AND module_langname = '{$data['title']}'
AND module_mode = '$mode'
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' => 'pm_reports',
--- 1243,1253 ----
AND module_langname = '{$data['title']}'
AND module_mode = '$mode'
AND parent_id = {$category_id}";
! $result = $db->sql_query($sql);
! $row = $db->sql_fetchrow($result);
! $db->sql_freeresult($result);
! if (!$row)
{
$module_data = array(
'module_basename' => 'pm_reports',
***************
*** 1266,1272 ****
}
}
}
- $db->sql_freeresult($result);
// Also install the "Copy forum permissions" module
$sql = 'SELECT module_id
--- 1264,1269 ----
***************
*** 1276,1286 ****
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 . "
--- 1273,1283 ----
AND module_mode = ''
AND module_basename = ''";
$result = $db->sql_query($sql);
+ $category_id = (int) $db->sql_fetchfield('module_id');
+ $db->sql_freeresult($result);
! if ($category_id)
{
// Check if we actually need to add the feed module or if it is already added. ;)
$sql = 'SELECT *
FROM ' . MODULES_TABLE . "
***************
*** 1289,1299 ****
AND module_mode = 'setting_forum_copy'
AND module_auth = 'acl_a_fauth && acl_a_authusers && acl_a_authgroups && acl_a_mauth'
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' => 'permissions',
--- 1286,1296 ----
AND module_mode = 'setting_forum_copy'
AND module_auth = 'acl_a_fauth && acl_a_authusers && acl_a_authgroups && acl_a_mauth'
AND parent_id = {$category_id}";
! $result = $db->sql_query($sql);
! $row = $db->sql_fetchrow($result);
! $db->sql_freeresult($result);
! if (!$row)
{
$module_data = array(
'module_basename' => 'permissions',
***************
*** 1309,1315 ****
$_module->update_module_data($module_data, true);
}
}
- $db->sql_freeresult($result);
// Also install the "Send statistics" module
$sql = 'SELECT module_id
--- 1306,1311 ----
***************
*** 1319,1329 ****
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 need to add the module or if it is already there. ;)
$sql = 'SELECT *
FROM ' . MODULES_TABLE . "
--- 1315,1325 ----
AND module_mode = ''
AND module_basename = ''";
$result = $db->sql_query($sql);
+ $category_id = (int) $db->sql_fetchfield('module_id');
+ $db->sql_freeresult($result);
! if ($category_id)
{
// Check if we need to add the module or if it is already there. ;)
$sql = 'SELECT *
FROM ' . MODULES_TABLE . "
***************
*** 1332,1342 ****
AND module_mode = 'send_statistics'
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',
--- 1328,1338 ----
AND module_mode = 'send_statistics'
AND module_auth = 'acl_a_server'
AND parent_id = {$category_id}";
! $result = $db->sql_query($sql);
! $row = $db->sql_fetchrow($result);
! $db->sql_freeresult($result);
! if (!$row)
{
$module_data = array(
'module_basename' => 'send_statistics',
***************
*** 1352,1358 ****
$_module->update_module_data($module_data, true);
}
}
- $db->sql_freeresult($result);
$_module->remove_cache_file();
--- 1348,1353 ----
|
|
From: Meik S. <acy...@ph...> - 2009-08-30 17:14:12
|
Author: acydburn
Date: Sun Aug 30 18:13:28 2009
New Revision: 10067
Log:
Simplified login_box() and redirection after login. S_LOGIN_ACTION can now be used on every page. (Bug #50285)
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/functions.php
branches/phpBB-3_0_0/phpBB/viewforum.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 Sun Aug 30 18:13:28 2009
***************
*** 230,235 ****
--- 230,236 ----
<li>[Change] Unapproved topics can no longer be replied to (Bug #44005)</li>
<li>[Change] Require user to be registered and logged in to search for unread posts if topic read tracking is disabled for guests (Bug #49525)</li>
<li>[Change] Allow three-digit hex notation in Color BBcode. (Bug #39965 - Patch by m0rpha)</li>
+ <li>[Change] Simplified login_box() and redirection after login. S_LOGIN_ACTION can now be used on every page. (Bug #50285)</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/includes/functions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Sun Aug 30 18:13:28 2009
***************
*** 2978,3005 ****
}
}
- if (!$redirect)
- {
- // We just use what the session code determined...
- // If we are not within the admin directory we use the page dir...
- $redirect = '';
-
- if (!$admin)
- {
- $redirect .= ($user->page['page_dir']) ? $user->page['page_dir'] . '/' : '';
- }
-
- $redirect .= $user->page['page_name'] . (($user->page['query_string']) ? '?' . htmlspecialchars($user->page['query_string']) : '');
- }
-
// Assign credential for username/password pair
$credential = ($admin) ? md5(unique_id()) : false;
$s_hidden_fields = array(
- 'redirect' => $redirect,
'sid' => $user->session_id,
);
if ($admin)
{
$s_hidden_fields['credential'] = $credential;
--- 2978,2995 ----
}
}
// Assign credential for username/password pair
$credential = ($admin) ? md5(unique_id()) : false;
$s_hidden_fields = array(
'sid' => $user->session_id,
);
+ if ($redirect)
+ {
+ $s_hidden_fields['redirect'] = $redirect;
+ }
+
if ($admin)
{
$s_hidden_fields['credential'] = $credential;
***************
*** 3017,3023 ****
'U_PRIVACY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'),
'S_DISPLAY_FULL_LOGIN' => ($s_display) ? true : false,
- 'S_LOGIN_ACTION' => (!$admin) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') : append_sid("index.$phpEx", false, true, $user->session_id), // Needs to stay index.$phpEx because we are within the admin directory
'S_HIDDEN_FIELDS' => $s_hidden_fields,
'S_ADMIN_AUTH' => $admin,
--- 3007,3012 ----
***************
*** 4195,4200 ****
--- 4184,4191 ----
'S_FORUM_ID' => $forum_id,
'S_TOPIC_ID' => $topic_id,
+ 'S_LOGIN_ACTION' => (!defined('ADMIN_START')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') . '&redirect=' . urlencode(str_replace('&', '&', build_url())) : append_sid("index.$phpEx", false, true, $user->session_id) . '&redirect=' . urlencode(str_replace('&', '&', build_url())),
+
'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,
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 Sun Aug 30 18:13:28 2009
***************
*** 166,173 ****
{
$template->assign_vars(array(
'S_NO_READ_ACCESS' => true,
- 'S_AUTOLOGIN_ENABLED' => ($config['allow_autologin']) ? true : false,
- 'S_LOGIN_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') . '&redirect=' . urlencode(str_replace('&', '&', build_url())),
));
page_footer();
--- 166,171 ----
|
|
From: Joas S. <nic...@ph...> - 2009-08-30 12:06:24
|
Author: nickvergessen
Date: Sun Aug 30 13:05:38 2009
New Revision: 10066
Log:
fix r10065 for #50475
Authorised by: bantu
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/memberlist_view.html
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/memberlist_view.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 Sun Aug 30 13:05:38 2009
***************
*** 200,206 ****
<li>[Fix] Correctly orientate Control-Panel-Navigation background-image on RTL languages. (Bug #49945)</li>
<li>[Fix] Sort private messages by message time and not message id. (Bug #50015)</li>
<li>[Fix] Make sure only logs for existing users are displayed and user-specific logs removed on user deletion. (Bug #49855)</li>
! <li>[Fix] Only show "Add friend" and "Add foe" links if the specific module is enabled. (Bug #50475)</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>
--- 200,206 ----
<li>[Fix] Correctly orientate Control-Panel-Navigation background-image on RTL languages. (Bug #49945)</li>
<li>[Fix] Sort private messages by message time and not message id. (Bug #50015)</li>
<li>[Fix] Make sure only logs for existing users are displayed and user-specific logs removed on user deletion. (Bug #49855)</li>
! <li>[Fix] Only show "Add friend" and "Add foe" links if the specific module is enabled. (Bug #50475)</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/styles/prosilver/template/memberlist_view.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/memberlist_view.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/memberlist_view.html Sun Aug 30 13:05:38 2009
***************
*** 39,48 ****
<!-- ELSEIF U_REMOVE_FOE -->
<dt> </dt> <dd><a href="{U_REMOVE_FOE}"><strong>{L_REMOVE_FOE}</strong></a></dd>
<!-- ELSE -->
! <!-- IF U_ADD_FRIEND-->
<dt> </dt> <dd><a href="{U_ADD_FRIEND}"><strong>{L_ADD_FRIEND}</strong></a></dd>
<!-- ENDIF -->
! <!-- IF U_ADD_FOE-->
<dt> </dt> <dd><a href="{U_ADD_FOE}"><strong>{L_ADD_FOE}</strong></a></dd>
<!-- ENDIF -->
<!-- ENDIF -->
--- 39,48 ----
<!-- ELSEIF U_REMOVE_FOE -->
<dt> </dt> <dd><a href="{U_REMOVE_FOE}"><strong>{L_REMOVE_FOE}</strong></a></dd>
<!-- ELSE -->
! <!-- IF U_ADD_FRIEND -->
<dt> </dt> <dd><a href="{U_ADD_FRIEND}"><strong>{L_ADD_FRIEND}</strong></a></dd>
<!-- ENDIF -->
! <!-- IF U_ADD_FOE -->
<dt> </dt> <dd><a href="{U_ADD_FOE}"><strong>{L_ADD_FOE}</strong></a></dd>
<!-- ENDIF -->
<!-- ENDIF -->
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/memberlist_view.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/memberlist_view.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/memberlist_view.html Sun Aug 30 13:05:38 2009
***************
*** 57,63 ****
<!-- ELSEIF U_REMOVE_FOE -->
<a href="{U_REMOVE_FOE}">{L_REMOVE_FOE}</a>
<!-- ELSE -->
! <!-- IF U_ADD_FRIEND--><a href="{U_ADD_FRIEND}">{L_ADD_FRIEND}</a><!-- ENDIF --><!-- IF U_ADD_FOE--><!-- IF U_ADD_FRIEND--> | <!-- ENDIF --><a href="{U_ADD_FOE}">{L_ADD_FOE}</a><!-- ENDIF -->
<!-- ENDIF -->
]</td>
</tr>
--- 57,63 ----
<!-- ELSEIF U_REMOVE_FOE -->
<a href="{U_REMOVE_FOE}">{L_REMOVE_FOE}</a>
<!-- ELSE -->
! <!-- IF U_ADD_FRIEND --><a href="{U_ADD_FRIEND}">{L_ADD_FRIEND}</a><!-- ENDIF --><!-- IF U_ADD_FOE --><!-- IF U_ADD_FRIEND --> | <!-- ENDIF --><a href="{U_ADD_FOE}">{L_ADD_FOE}</a><!-- ENDIF -->
<!-- ENDIF -->
]</td>
</tr>
|
|
From: Joas S. <nic...@ph...> - 2009-08-30 11:57:03
|
Author: nickvergessen
Date: Sun Aug 30 12:56:15 2009
New Revision: 10065
Log:
Fix Bug #50475 - Only show "Add friend" and "Add foe" links if the specific module is enabled.
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/memberlist.php
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/memberlist_view.html
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/memberlist_view.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 Sun Aug 30 12:56:15 2009
***************
*** 200,205 ****
--- 200,206 ----
<li>[Fix] Correctly orientate Control-Panel-Navigation background-image on RTL languages. (Bug #49945)</li>
<li>[Fix] Sort private messages by message time and not message id. (Bug #50015)</li>
<li>[Fix] Make sure only logs for existing users are displayed and user-specific logs removed on user deletion. (Bug #49855)</li>
+ <li>[Fix] Only show "Add friend" and "Add foe" links if the specific module is enabled. (Bug #50475)</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/memberlist.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/memberlist.php (original)
--- branches/phpBB-3_0_0/phpBB/memberlist.php Sun Aug 30 12:56:15 2009
***************
*** 500,507 ****
$poster_avatar = get_user_avatar($member['user_avatar'], $member['user_avatar_type'], $member['user_avatar_width'], $member['user_avatar_height']);
! // We need to check if the modules 'zebra', 'notes' ('user_notes' mode) and 'warn' ('warn_user' mode) are accessible to decide if we can display appropriate links
! $zebra_enabled = $user_notes_enabled = $warn_user_enabled = false;
// Only check if the user is logged in
if ($user->data['is_registered'])
--- 500,507 ----
$poster_avatar = get_user_avatar($member['user_avatar'], $member['user_avatar_type'], $member['user_avatar_width'], $member['user_avatar_height']);
! // We need to check if the modules 'zebra' ('friends' & 'foes' mode), 'notes' ('user_notes' mode) and 'warn' ('warn_user' mode) are accessible to decide if we can display appropriate links
! $zebra_enabled = $friends_enabled = $foes_enabled = $user_notes_enabled = $warn_user_enabled = false;
// Only check if the user is logged in
if ($user->data['is_registered'])
***************
*** 518,523 ****
--- 518,525 ----
$user_notes_enabled = ($module->loaded('notes', 'user_notes')) ? true : false;
$warn_user_enabled = ($module->loaded('warn', 'warn_user')) ? true : false;
$zebra_enabled = ($module->loaded('zebra')) ? true : false;
+ $friends_enabled = ($module->loaded('zebra', 'friends')) ? true : false;
+ $foes_enabled = ($module->loaded('zebra', 'foes')) ? true : false;
unset($module);
}
***************
*** 585,594 ****
'S_USER_NOTES' => ($user_notes_enabled) ? true : false,
'S_WARN_USER' => ($warn_user_enabled) ? true : false,
'S_ZEBRA' => ($user->data['user_id'] != $user_id && $user->data['is_registered'] && $zebra_enabled) ? true : false,
! 'U_ADD_FRIEND' => (!$friend) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=zebra&add=' . urlencode(htmlspecialchars_decode($member['username']))) : '',
! 'U_ADD_FOE' => (!$foe) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=zebra&mode=foes&add=' . urlencode(htmlspecialchars_decode($member['username']))) : '',
! 'U_REMOVE_FRIEND' => ($friend) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=zebra&remove=1&usernames[]=' . $user_id) : '',
! 'U_REMOVE_FOE' => ($foe) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=zebra&remove=1&mode=foes&usernames[]=' . $user_id) : '',
));
if (!empty($profile_fields['row']))
--- 587,596 ----
'S_USER_NOTES' => ($user_notes_enabled) ? true : false,
'S_WARN_USER' => ($warn_user_enabled) ? true : false,
'S_ZEBRA' => ($user->data['user_id'] != $user_id && $user->data['is_registered'] && $zebra_enabled) ? true : false,
! 'U_ADD_FRIEND' => (!$friend && !$foe && $friends_enabled) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=zebra&add=' . urlencode(htmlspecialchars_decode($member['username']))) : '',
! 'U_ADD_FOE' => (!$friend && !$foe && $foes_enabled) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=zebra&mode=foes&add=' . urlencode(htmlspecialchars_decode($member['username']))) : '',
! 'U_REMOVE_FRIEND' => ($friend && $friends_enabled) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=zebra&remove=1&usernames[]=' . $user_id) : '',
! 'U_REMOVE_FOE' => ($foe && $foes_enabled) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=zebra&remove=1&mode=foes&usernames[]=' . $user_id) : '',
));
if (!empty($profile_fields['row']))
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/memberlist_view.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/memberlist_view.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/memberlist_view.html Sun Aug 30 12:56:15 2009
***************
*** 34,47 ****
<!-- IF S_GROUP_OPTIONS --><dt>{L_USERGROUPS}:</dt> <dd><select name="g">{S_GROUP_OPTIONS}</select> <input type="submit" name="submit" value="{L_GO}" class="button2" /></dd><!-- ENDIF -->
<!-- BEGIN custom_fields --><dt>{custom_fields.PROFILE_FIELD_NAME}:</dt> <dd>{custom_fields.PROFILE_FIELD_VALUE}</dd><!-- END custom_fields -->
<!-- IF S_USER_LOGGED_IN and S_ZEBRA -->
! <!-- IF U_ADD_FRIEND and U_ADD_FOE-->
! <dt> </dt> <dd><a href="{U_ADD_FRIEND}"><strong>{L_ADD_FRIEND}</strong></a></dd>
! <dt> </dt> <dd><a href="{U_ADD_FOE}"><strong>{L_ADD_FOE}</strong></a></dd>
<!-- ELSE -->
! <!-- IF U_REMOVE_FRIEND -->
! <dt> </dt> <dd><a href="{U_REMOVE_FRIEND}"><strong>{L_REMOVE_FRIEND}</strong></a></dd>
! <!-- ELSE -->
! <dt> </dt> <dd><a href="{U_REMOVE_FOE}"><strong>{L_REMOVE_FOE}</strong></a></dd>
<!-- ENDIF -->
<!-- ENDIF -->
<!-- ENDIF -->
--- 34,49 ----
<!-- IF S_GROUP_OPTIONS --><dt>{L_USERGROUPS}:</dt> <dd><select name="g">{S_GROUP_OPTIONS}</select> <input type="submit" name="submit" value="{L_GO}" class="button2" /></dd><!-- ENDIF -->
<!-- BEGIN custom_fields --><dt>{custom_fields.PROFILE_FIELD_NAME}:</dt> <dd>{custom_fields.PROFILE_FIELD_VALUE}</dd><!-- END custom_fields -->
<!-- IF S_USER_LOGGED_IN and S_ZEBRA -->
! <!-- IF U_REMOVE_FRIEND -->
! <dt> </dt> <dd><a href="{U_REMOVE_FRIEND}"><strong>{L_REMOVE_FRIEND}</strong></a></dd>
! <!-- ELSEIF U_REMOVE_FOE -->
! <dt> </dt> <dd><a href="{U_REMOVE_FOE}"><strong>{L_REMOVE_FOE}</strong></a></dd>
<!-- ELSE -->
! <!-- IF U_ADD_FRIEND-->
! <dt> </dt> <dd><a href="{U_ADD_FRIEND}"><strong>{L_ADD_FRIEND}</strong></a></dd>
! <!-- ENDIF -->
! <!-- IF U_ADD_FOE-->
! <dt> </dt> <dd><a href="{U_ADD_FOE}"><strong>{L_ADD_FOE}</strong></a></dd>
<!-- ENDIF -->
<!-- ENDIF -->
<!-- ENDIF -->
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/memberlist_view.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/memberlist_view.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/memberlist_view.html Sun Aug 30 12:56:15 2009
***************
*** 51,57 ****
<!-- ENDIF -->
<!-- IF S_USER_LOGGED_IN and S_ZEBRA -->
<tr>
! <td class="genmed" align="center">[ <!-- IF U_ADD_FRIEND and U_ADD_FOE--><a href="{U_ADD_FRIEND}">{L_ADD_FRIEND}</a> | <a href="{U_ADD_FOE}">{L_ADD_FOE}</a><!-- ENDIF --><!-- IF U_REMOVE_FRIEND --><a href="{U_REMOVE_FRIEND}">{L_REMOVE_FRIEND}</a><!-- ENDIF --><!-- IF U_REMOVE_FOE --><a href="{U_REMOVE_FOE}">{L_REMOVE_FOE}</a><!-- ENDIF --> ]</td>
</tr>
<!-- ENDIF -->
</table>
--- 51,65 ----
<!-- ENDIF -->
<!-- IF S_USER_LOGGED_IN and S_ZEBRA -->
<tr>
! <td class="genmed" align="center">[
! <!-- IF U_REMOVE_FRIEND -->
! <a href="{U_REMOVE_FRIEND}">{L_REMOVE_FRIEND}</a>
! <!-- ELSEIF U_REMOVE_FOE -->
! <a href="{U_REMOVE_FOE}">{L_REMOVE_FOE}</a>
! <!-- ELSE -->
! <!-- IF U_ADD_FRIEND--><a href="{U_ADD_FRIEND}">{L_ADD_FRIEND}</a><!-- ENDIF --><!-- IF U_ADD_FOE--><!-- IF U_ADD_FRIEND--> | <!-- ENDIF --><a href="{U_ADD_FOE}">{L_ADD_FOE}</a><!-- ENDIF -->
! <!-- ENDIF -->
! ]</td>
</tr>
<!-- ENDIF -->
</table>
|
|
From: Meik S. <acy...@ph...> - 2009-08-30 11:15:41
|
Author: acydburn
Date: Sun Aug 30 12:15:24 2009
New Revision: 10064
Log:
Revert INC/DEC feature. It is not consistent with the other template variables - bad idea. ;) We will get to it though... but not now.
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/docs/coding-guidelines.html
branches/phpBB-3_0_0/phpBB/includes/functions_template.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 Sun Aug 30 12:15:24 2009
***************
*** 282,288 ****
<li>[Feature] Separate PM Reply and PM Reply to all in prosilver.</li>
<li>[Feature] Place debug notices during captcha rendering in the error log - useful for debugging output already started errors.</li>
<li>[Feature] Ability to define constant PHPBB_USE_BOARD_URL_PATH to use board url for images/avatars/ranks/imageset...</li>
- <li>[Feature] Added INC/DEC command to template syntax, applicable to DEFINES and normal template variables, including loops.</li>
<li>[Feature] Added function to generate email-hash. (Bug #49195)</li>
</ul>
--- 282,287 ----
Modified: branches/phpBB-3_0_0/phpBB/docs/coding-guidelines.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/coding-guidelines.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/coding-guidelines.html Sun Aug 30 12:15:24 2009
***************
*** 1176,1182 ****
<span class="comment"><!-- DEFINE $SOME_VAR = 'my_file.html' --></span>
<span class="comment"><!-- INCLUDE {$SOME_VAR} --></span>
</pre></div>
!
<p>Also added in <strong>3.0.6</strong> is the ability to increment or decrement a variable on use. This can be used for instances like tabindexes, where the amount of entries is not statically known.
The INC (for incrementing) and DEC (for decrementing) commands will print the <strong>current</strong> state of a defined var and then increment/decrement it by one (postincrement/postdecrement).</p>
--- 1176,1182 ----
<span class="comment"><!-- DEFINE $SOME_VAR = 'my_file.html' --></span>
<span class="comment"><!-- INCLUDE {$SOME_VAR} --></span>
</pre></div>
! <!-- no longer added in 3.0.6
<p>Also added in <strong>3.0.6</strong> is the ability to increment or decrement a variable on use. This can be used for instances like tabindexes, where the amount of entries is not statically known.
The INC (for incrementing) and DEC (for decrementing) commands will print the <strong>current</strong> state of a defined var and then increment/decrement it by one (postincrement/postdecrement).</p>
***************
*** 1187,1193 ****
<span class="comment">{$SOME_VAR}</span>
Result: 2<br />
</pre></div>
!
<h4>PHP</h4>
<p>A contentious decision has seen the ability to include PHP within the template introduced. This is achieved by enclosing the PHP within relevant tags:</p>
--- 1187,1193 ----
<span class="comment">{$SOME_VAR}</span>
Result: 2<br />
</pre></div>
! //-->
<h4>PHP</h4>
<p>A contentious decision has seen the ability to include PHP within the template introduced. This is achieved by enclosing the PHP within relevant tags:</p>
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_template.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_template.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_template.php Sun Aug 30 12:15:24 2009
***************
*** 191,204 ****
$compile_blocks[] = '<?php ' . $this->compile_tag_define($block_val[2], false) . ' ?>';
break;
- case 'INC':
- $compile_blocks[] = '<?php ' . $this->compile_tag_counter($block_val[2], '++') . ' ?>';
- break;
-
- case 'DEC':
- $compile_blocks[] = '<?php ' . $this->compile_tag_counter($block_val[2], '--') . ' ?>';
- break;
-
case 'INCLUDE':
$temp = array_shift($include_blocks);
--- 191,196 ----
***************
*** 634,661 ****
return (($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true) . '[\'' . $match[2] . '\']' : '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $match[2] . '\']') . ' = ' . $match[4] . ';';
}
-
- /**
- * Compile INC/DEC tags
- * INC/DEC tags support defined template variables as well as normal template variables
- * @access private
- */
- function compile_tag_counter($tag_args, $operation = '++')
- {
- preg_match('#^((?:[a-z0-9\-_]+\.)+)?(\$)?(?=[A-Z])([A-Z0-9\-_]+)#s', $tag_args, $varrefs);
-
- if (empty($varrefs[0]))
- {
- return '';
- }
-
- // Build token
- $token = (!empty($varrefs[1])) ? $this->generate_block_data_ref(substr($varrefs[1], 0, -1), true, $varrefs[2]) . '[\'' . $varrefs[3] . '\']' : (($varrefs[2]) ? '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $varrefs[3] . '\']' : '$this->_rootref[\'' . $varrefs[3] . '\']');
-
- // Increase or decrease token ;)
- return "echo {$token}{$operation};";
- }
-
/**
* Compile INCLUDE tag
* @access private
--- 626,631 ----
|
|
From: Meik S. <acy...@ph...> - 2009-08-30 11:10:59
|
Author: acydburn
Date: Sun Aug 30 12:10:12 2009
New Revision: 10063
Log:
script to update email hashes (they are not strings btw, but BINT)
Added:
branches/phpBB-3_0_0/phpBB/develop/update_email_hash.php
Added: branches/phpBB-3_0_0/phpBB/develop/update_email_hash.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/develop/update_email_hash.php (added)
--- branches/phpBB-3_0_0/phpBB/develop/update_email_hash.php Sun Aug 30 12:10:12 2009
***************
*** 0 ****
--- 1,57 ----
+ <?php
+ /**
+ * Corrects user_email_hash values if DB moved from 32-bit system to 64-bit system or vice versa.
+ * The CRC32 function in PHP generates different results for both systems.
+ * @PHP dev team: no, a hexdec() applied to it does not solve the issue. And please document it.
+ *
+ */
+ die("Please read the first lines of this script for instructions on how to enable it");
+
+ set_time_limit(0);
+
+ define('IN_PHPBB', true);
+ $phpbb_root_path = './../';
+ $phpEx = substr(strrchr(__FILE__, '.'), 1);
+ include($phpbb_root_path . 'common.' . $phpEx);
+
+ // Start session management
+ $user->session_begin();
+ $auth->acl($user->data);
+ $user->setup();
+
+ $start = request_var('start', 0);
+ $num_items = 1000;
+
+ echo '<br />Updating user email hashes' . "\n";
+
+ $sql = 'SELECT user_id, user_email
+ FROM ' . USERS_TABLE . '
+ ORDER BY user_id ASC';
+ $result = $db->sql_query($sql);
+
+ $echos = 0;
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $echos++;
+
+ $sql = 'UPDATE ' . USERS_TABLE . "
+ SET user_email_hash = '" . $db->sql_escape(phpbb_email_hash($row['user_email'])) . "'
+ WHERE user_id = " . (int) $row['user_id'];
+ $db->sql_query($sql);
+
+ if ($echos == 200)
+ {
+ echo '<br />';
+ $echos = 0;
+ }
+
+ echo '.';
+ flush();
+ }
+ $db->sql_freeresult($result);
+
+ echo 'FINISHED';
+
+ // Done
+ $db->sql_close();
+ ?>
\ No newline at end of file
|
|
From: Meik S. <acy...@ph...> - 2009-08-29 11:14:24
|
Author: acydburn
Date: Sat Aug 29 12:13:38 2009
New Revision: 10062
Log:
Use correct language key for mcp user notes for sorting entries - Bug #50385
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_notes_user.html
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_notes_user.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_notes_user.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_notes_user.html Sat Aug 29 12:13:38 2009
***************
*** 42,54 ****
</div>
<fieldset class="submit-buttons">
! {S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />
<input type="submit" name="action[add_feedback]" value="{L_SUBMIT}" class="button1" />
{S_FORM_TOKEN}
</fieldset>
<div class="panel">
! <div class="inner"><span class="corners-top"><span></span></span>
<ul class="linklist">
<li class="leftside">
--- 42,54 ----
</div>
<fieldset class="submit-buttons">
! {S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />
<input type="submit" name="action[add_feedback]" value="{L_SUBMIT}" class="button1" />
{S_FORM_TOKEN}
</fieldset>
<div class="panel">
! <div class="inner"><span class="corners-top"><span></span></span>
<ul class="linklist">
<li class="leftside">
***************
*** 93,100 ****
<fieldset class="display-options">
<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
! <label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label>
! <label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>
<input type="submit" name="sort" value="{L_GO}" class="button2" />
</fieldset>
--- 93,100 ----
<fieldset class="display-options">
<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
! <label>{L_DISPLAY_LOG}: {S_SELECT_SORT_DAYS}</label>
! <label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>
<input type="submit" name="sort" value="{L_GO}" class="button2" />
</fieldset>
***************
*** 108,114 ****
</ul>
<span class="corners-bottom"><span></span></span></div>
! </div>
<!-- IF S_CLEAR_ALLOWED -->
<fieldset class="display-actions">
--- 108,114 ----
</ul>
<span class="corners-bottom"><span></span></span></div>
! </div>
<!-- IF S_CLEAR_ALLOWED -->
<fieldset class="display-actions">
***************
*** 117,123 ****
</fieldset>
<fieldset class="display-actions">
! <div><a href="#" onclick="marklist('mcp', 'marknote', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('mcp', 'marknote', false); return false;">{L_UNMARK_ALL}</a></div>
</fieldset>
<!-- ENDIF -->
</form>
--- 117,123 ----
</fieldset>
<fieldset class="display-actions">
! <div><a href="#" onclick="marklist('mcp', 'marknote', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('mcp', 'marknote', false); return false;">{L_UNMARK_ALL}</a></div>
</fieldset>
<!-- ENDIF -->
</form>
|
|
From: Meik S. <acy...@ph...> - 2009-08-28 11:40:35
|
Author: acydburn
Date: Fri Aug 28 12:39:45 2009
New Revision: 10061
Log:
Send service unavailable response code for E_USER_ERROR
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 Fri Aug 28 12:39:45 2009
***************
*** 3595,3600 ****
--- 3595,3603 ----
$db->sql_return_on_error(false);
}
+ // Do not send 200 OK, but service unavailable on errors
+ header('HTTP/1.1 503 Service Unavailable');
+
garbage_collection();
// Try to not call the adm page data...
|
|
From: Joas S. <nic...@ph...> - 2009-08-28 09:27:31
|
Author: nickvergessen
Date: Fri Aug 28 10:26:43 2009
New Revision: 10060
Log:
Fix Bug #49195 - Queries on un-indexed column user_email
Added function to generate email-hash.
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php
branches/phpBB-3_0_0/phpBB/includes/functions.php
branches/phpBB-3_0_0/phpBB/includes/functions_user.php
branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_profile.php
branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_remind.php
branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_resend.php
branches/phpBB-3_0_0/phpBB/install/install_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 Fri Aug 28 10:26:43 2009
***************
*** 283,288 ****
--- 283,289 ----
<li>[Feature] Place debug notices during captcha rendering in the error log - useful for debugging output already started errors.</li>
<li>[Feature] Ability to define constant PHPBB_USE_BOARD_URL_PATH to use board url for images/avatars/ranks/imageset...</li>
<li>[Feature] Added INC/DEC command to template syntax, applicable to DEFINES and normal template variables, including loops.</li>
+ <li>[Feature] Added function to generate email-hash. (Bug #49195)</li>
</ul>
<a name="v304"></a><h3>1.ii. Changes since 3.0.4</h3>
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php Fri Aug 28 10:26:43 2009
***************
*** 847,853 ****
{
$sql_ary += array(
'user_email' => $update_email,
! 'user_email_hash' => crc32($update_email) . strlen($update_email)
);
add_log('user', $user_id, 'LOG_USER_UPDATE_EMAIL', $user_row['username'], $user_row['user_email'], $update_email);
--- 847,853 ----
{
$sql_ary += array(
'user_email' => $update_email,
! 'user_email_hash' => phpbb_email_hash($update_email),
);
add_log('user', $user_id, 'LOG_USER_UPDATE_EMAIL', $user_row['username'], $user_row['user_email'], $update_email);
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 Fri Aug 28 10:26:43 2009
***************
*** 552,557 ****
--- 552,565 ----
}
/**
+ * Hash email
+ */
+ function phpbb_email_hash($email)
+ {
+ return crc32(strtolower($email)) . strlen($email);
+ }
+
+ /**
* Global function for chmodding directories and files for internal use
*
* This function determines owner and group whom the file belongs to and user and group of PHP and then set safest possible file permissions.
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_user.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_user.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_user.php Fri Aug 28 10:26:43 2009
***************
*** 171,177 ****
'user_password' => (isset($user_row['user_password'])) ? $user_row['user_password'] : '',
'user_pass_convert' => 0,
'user_email' => strtolower($user_row['user_email']),
! 'user_email_hash' => crc32(strtolower($user_row['user_email'])) . strlen($user_row['user_email']),
'group_id' => $user_row['group_id'],
'user_type' => $user_row['user_type'],
);
--- 171,177 ----
'user_password' => (isset($user_row['user_password'])) ? $user_row['user_password'] : '',
'user_pass_convert' => 0,
'user_email' => strtolower($user_row['user_email']),
! 'user_email_hash' => phpbb_email_hash($user_row['user_email']),
'group_id' => $user_row['group_id'],
'user_type' => $user_row['user_type'],
);
***************
*** 1727,1733 ****
{
$sql = 'SELECT user_email_hash
FROM ' . USERS_TABLE . "
! WHERE user_email_hash = " . (crc32($email) . strlen($email));
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
--- 1727,1733 ----
{
$sql = 'SELECT user_email_hash
FROM ' . USERS_TABLE . "
! WHERE user_email_hash = " . $db->sql_escape(phpbb_email_hash($email));
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
Modified: branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_profile.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_profile.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_profile.php Fri Aug 28 10:26:43 2009
***************
*** 110,116 ****
'username' => ($auth->acl_get('u_chgname') && $config['allow_namechange']) ? $data['username'] : $user->data['username'],
'username_clean' => ($auth->acl_get('u_chgname') && $config['allow_namechange']) ? utf8_clean_string($data['username']) : $user->data['username_clean'],
'user_email' => ($auth->acl_get('u_chgemail')) ? $data['email'] : $user->data['user_email'],
! 'user_email_hash' => ($auth->acl_get('u_chgemail')) ? crc32($data['email']) . strlen($data['email']) : $user->data['user_email_hash'],
'user_password' => ($auth->acl_get('u_chgpasswd') && $data['new_password']) ? phpbb_hash($data['new_password']) : $user->data['user_password'],
'user_passchg' => ($auth->acl_get('u_chgpasswd') && $data['new_password']) ? time() : 0,
);
--- 110,116 ----
'username' => ($auth->acl_get('u_chgname') && $config['allow_namechange']) ? $data['username'] : $user->data['username'],
'username_clean' => ($auth->acl_get('u_chgname') && $config['allow_namechange']) ? utf8_clean_string($data['username']) : $user->data['username_clean'],
'user_email' => ($auth->acl_get('u_chgemail')) ? $data['email'] : $user->data['user_email'],
! 'user_email_hash' => ($auth->acl_get('u_chgemail')) ? phpbb_email_hash($data['email']) : $user->data['user_email_hash'],
'user_password' => ($auth->acl_get('u_chgpasswd') && $data['new_password']) ? phpbb_hash($data['new_password']) : $user->data['user_password'],
'user_passchg' => ($auth->acl_get('u_chgpasswd') && $data['new_password']) ? time() : 0,
);
Modified: branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_remind.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_remind.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_remind.php Fri Aug 28 10:26:43 2009
***************
*** 38,44 ****
{
$sql = 'SELECT user_id, username, user_permissions, user_email, user_jabber, user_notify_type, user_type, user_lang, user_inactive_reason
FROM ' . USERS_TABLE . "
! WHERE user_email = '" . $db->sql_escape($email) . "'
AND username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'";
$result = $db->sql_query($sql);
$user_row = $db->sql_fetchrow($result);
--- 38,44 ----
{
$sql = 'SELECT user_id, username, user_permissions, user_email, user_jabber, user_notify_type, user_type, user_lang, user_inactive_reason
FROM ' . USERS_TABLE . "
! WHERE user_email_hash = '" . $db->sql_escape(phpbb_email_hash($email)) . "'
AND username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'";
$result = $db->sql_query($sql);
$user_row = $db->sql_fetchrow($result);
Modified: branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_resend.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_resend.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_resend.php Fri Aug 28 10:26:43 2009
***************
*** 45,51 ****
$sql = 'SELECT user_id, group_id, username, user_email, user_type, user_lang, user_actkey, user_inactive_reason
FROM ' . USERS_TABLE . "
! WHERE user_email = '" . $db->sql_escape($email) . "'
AND username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'";
$result = $db->sql_query($sql);
$user_row = $db->sql_fetchrow($result);
--- 45,51 ----
$sql = 'SELECT user_id, group_id, username, user_email, user_type, user_lang, user_actkey, user_inactive_reason
FROM ' . USERS_TABLE . "
! WHERE user_email_hash = '" . $db->sql_escape(phpbb_email_hash($email)) . "'
AND username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'";
$result = $db->sql_query($sql);
$user_row = $db->sql_fetchrow($result);
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 Fri Aug 28 10:26:43 2009
***************
*** 1337,1343 ****
WHERE config_name = 'avatar_salt'",
'UPDATE ' . $data['table_prefix'] . "users
! SET username = '" . $db->sql_escape($data['admin_name']) . "', user_password='" . $db->sql_escape(md5($data['admin_pass1'])) . "', user_ip = '" . $db->sql_escape($user_ip) . "', user_lang = '" . $db->sql_escape($data['default_lang']) . "', user_email='" . $db->sql_escape($data['board_email1']) . "', user_dateformat='" . $db->sql_escape($lang['default_dateformat']) . "', user_email_hash = " . (crc32($data['board_email1']) . strlen($data['board_email1'])) . ", username_clean = '" . $db->sql_escape(utf8_clean_string($data['admin_name'])) . "'
WHERE username = 'Admin'",
'UPDATE ' . $data['table_prefix'] . "moderator_cache
--- 1337,1343 ----
WHERE config_name = 'avatar_salt'",
'UPDATE ' . $data['table_prefix'] . "users
! SET username = '" . $db->sql_escape($data['admin_name']) . "', user_password='" . $db->sql_escape(md5($data['admin_pass1'])) . "', user_ip = '" . $db->sql_escape($user_ip) . "', user_lang = '" . $db->sql_escape($data['default_lang']) . "', user_email='" . $db->sql_escape($data['board_email1']) . "', user_dateformat='" . $db->sql_escape($lang['default_dateformat']) . "', user_email_hash = " . $db->sql_escape(phpbb_email_hash($data['board_email1'])) . ", username_clean = '" . $db->sql_escape(utf8_clean_string($data['admin_name'])) . "'
WHERE username = 'Admin'",
'UPDATE ' . $data['table_prefix'] . "moderator_cache
|
|
From: Henry S. <kel...@ph...> - 2009-08-27 20:48:54
|
Author: Kellanved
Date: Thu Aug 27 21:48:09 2009
New Revision: 10059
Log:
forgot to ci this
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/acp_profile.html
Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_profile.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_profile.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_profile.html Thu Aug 27 21:48:09 2009
***************
*** 56,61 ****
--- 56,65 ----
<dd><input type="checkbox" class="radio" id="field_show_on_reg" name="field_show_on_reg" value="1"<!-- IF S_SHOW_ON_REG --> checked="checked"<!-- ENDIF --> /></dd>
</dl>
<dl>
+ <dt><label for="field_show_on_vt">{L_DISPLAY_ON_VT}:</label><br /><span>{L_DISPLAY_ON_VT_EXPLAIN}</span></dt>
+ <dd><input type="checkbox" class="radio" id="field_show_on_vt" name="field_show_on_vt" value="1"<!-- IF S_SHOW_ON_VT --> checked="checked"<!-- ENDIF --> /></dd>
+ </dl>
+ <dl>
<dt><label for="field_required">{L_REQUIRED_FIELD}:</label><br /><span>{L_REQUIRED_FIELD_EXPLAIN}</span></dt>
<dd><input type="checkbox" class="radio" id="field_required" name="field_required" value="1"<!-- IF S_FIELD_REQUIRED --> checked="checked"<!-- ENDIF --> /></dd>
</dl>
|
|
From: Meik S. <acy...@ph...> - 2009-08-27 09:11:16
|
Author: acydburn
Date: Thu Aug 27 10:10:28 2009
New Revision: 10058
Log:
Change of r10055, which itself was:
Adjustement for r10050, related to Bug #50185
Instead of S_TAB_INDEX we now use a method suggested by nickvergessen - we simply DEFINE the tabindex for the captcha depending on where it is included.
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions.php
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_default.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_recaptcha.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/login_body.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.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 Thu Aug 27 10:10:28 2009
***************
*** 4126,4133 ****
'S_USER_UNREAD_PRIVMSG' => $user->data['user_unread_privmsg'],
'S_USER_NEW' => $user->data['user_new'],
- 'S_TAB_INDEX' => 1,
-
'SID' => $SID,
'_SID' => $_SID,
'SESSION_ID' => $user->session_id,
--- 4126,4131 ----
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_default.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_default.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_default.html Thu Aug 27 10:10:28 2009
***************
*** 11,17 ****
<dl>
<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt>
<dd><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd>
! <dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="<!-- INC S_TAB_INDEX -->" class="inputbox narrow" title="{L_CONFIRM_CODE}" />
<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF -->
<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd>
<dd>{L_CONFIRM_CODE_EXPLAIN}</dd>
--- 11,17 ----
<dl>
<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt>
<dd><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd>
! <dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="{$CAPTCHA_TAB_INDEX}" class="inputbox narrow" title="{L_CONFIRM_CODE}" />
<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF -->
<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd>
<dd>{L_CONFIRM_CODE_EXPLAIN}</dd>
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html Thu Aug 27 10:10:28 2009
***************
*** 9,15 ****
<dl>
<dt><label>{QA_CONFIRM_QUESTION}</label>:<br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
<dd>
! <input type="text" tabindex="<!-- INC S_TAB_INDEX -->" name="qa_answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" />
<input type="hidden" name="qa_confirm_id" id="qa_confirm_id" value="{QA_CONFIRM_ID}" />
</dd>
</dl>
--- 9,15 ----
<dl>
<dt><label>{QA_CONFIRM_QUESTION}</label>:<br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
<dd>
! <input type="text" tabindex="{$CAPTCHA_TAB_INDEX}" name="qa_answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" />
<input type="hidden" name="qa_confirm_id" id="qa_confirm_id" value="{QA_CONFIRM_ID}" />
</dd>
</dl>
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_recaptcha.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_recaptcha.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_recaptcha.html Thu Aug 27 10:10:28 2009
***************
*** 16,23 ****
<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
// <![CDATA[
var RecaptchaOptions = {
! lang : {L_RECAPTCHA_LANG},
! tabindex : <!-- INC S_TAB_INDEX -->
};
// ]]>
</script>
--- 16,23 ----
<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
// <![CDATA[
var RecaptchaOptions = {
! lang : {L_RECAPTCHA_LANG},
! tabindex : <!-- IF $CAPTCHA_TAB_INDEX -->{$CAPTCHA_TAB_INDEX}<!-- ELSE -->10<!-- ENDIF -->
};
// ]]>
</script>
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/login_body.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/login_body.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/login_body.html Thu Aug 27 10:10:28 2009
***************
*** 11,39 ****
<!-- IF LOGIN_ERROR --><div class="error">{LOGIN_ERROR}</div><!-- ENDIF -->
<dl>
<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}:</label></dt>
! <dd><input type="text" tabindex="<!-- INC S_TAB_INDEX -->" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
</dl>
<dl>
<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}:</label></dt>
! <dd><input type="password" tabindex="<!-- INC S_TAB_INDEX -->" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd>
<!-- IF S_DISPLAY_FULL_LOGIN and (U_SEND_PASSWORD or U_RESEND_ACTIVATION) -->
<!-- IF U_SEND_PASSWORD --><dd><a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a></dd><!-- ENDIF -->
<!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF -->
<!-- ENDIF -->
</dl>
<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
! <!-- INCLUDE {CAPTCHA_TEMPLATE} -->
<!-- ENDIF -->
<!-- IF S_DISPLAY_FULL_LOGIN -->
<dl>
! <!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="<!-- INC S_TAB_INDEX -->" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->
! <dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="<!-- INC S_TAB_INDEX -->" /> {L_HIDE_ME}</label></dd>
</dl>
<!-- ENDIF -->
<dl>
<dt> </dt>
! <dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="<!-- INC S_TAB_INDEX -->" value="{L_LOGIN}" class="button1" /></dd>
</dl>
</fieldset>
--- 11,40 ----
<!-- IF LOGIN_ERROR --><div class="error">{LOGIN_ERROR}</div><!-- ENDIF -->
<dl>
<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}:</label></dt>
! <dd><input type="text" tabindex="1" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
</dl>
<dl>
<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}:</label></dt>
! <dd><input type="password" tabindex="2" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd>
<!-- IF S_DISPLAY_FULL_LOGIN and (U_SEND_PASSWORD or U_RESEND_ACTIVATION) -->
<!-- IF U_SEND_PASSWORD --><dd><a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a></dd><!-- ENDIF -->
<!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF -->
<!-- ENDIF -->
</dl>
<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
! <!-- DEFINE $CAPTCHA_TAB_INDEX = 3 -->
! <!-- INCLUDE {CAPTCHA_TEMPLATE} -->
<!-- ENDIF -->
<!-- IF S_DISPLAY_FULL_LOGIN -->
<dl>
! <!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="4" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->
! <dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="5" /> {L_HIDE_ME}</label></dd>
</dl>
<!-- ENDIF -->
<dl>
<dt> </dt>
! <dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="6" value="{L_LOGIN}" class="button1" /></dd>
</dl>
</fieldset>
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html Thu Aug 27 10:10:28 2009
***************
*** 90,107 ****
<!-- IF not S_PRIVMSGS and S_DISPLAY_USERNAME -->
<dl style="clear: left;">
<dt><label for="username">{L_USERNAME}:</label></dt>
! <dd><input type="text" tabindex="<!-- INC S_TAB_INDEX -->" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
</dl>
<!-- ENDIF -->
<!-- IF S_POST_ACTION or S_PRIVMSGS or S_EDIT_DRAFT -->
<dl style="clear: left;">
<dt><label for="subject">{L_SUBJECT}:</label></dt>
! <dd><input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->60<!-- ELSE -->64<!-- ENDIF -->" tabindex="<!-- INC S_TAB_INDEX -->" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" /></dd>
</dl>
! <!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
! <!-- ENDIF -->
<!-- ENDIF -->
<!-- INCLUDE posting_buttons.html -->
--- 90,108 ----
<!-- IF not S_PRIVMSGS and S_DISPLAY_USERNAME -->
<dl style="clear: left;">
<dt><label for="username">{L_USERNAME}:</label></dt>
! <dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
</dl>
<!-- ENDIF -->
<!-- IF S_POST_ACTION or S_PRIVMSGS or S_EDIT_DRAFT -->
<dl style="clear: left;">
<dt><label for="subject">{L_SUBJECT}:</label></dt>
! <dd><input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->60<!-- ELSE -->64<!-- ENDIF -->" tabindex="2" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" /></dd>
</dl>
! <!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
! <!-- DEFINE $CAPTCHA_TAB_INDEX = 3 -->
<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
! <!-- ENDIF -->
<!-- ENDIF -->
<!-- INCLUDE posting_buttons.html -->
***************
*** 135,141 ****
</div>
<div id="message-box">
! <textarea <!-- IF S_UCP_ACTION and not S_PRIVMSGS and not S_EDIT_DRAFT -->name="signature" id="signature" style="height: 9em;"<!-- ELSE -->name="message" id="message"<!-- ENDIF --> rows="15" cols="76" tabindex="<!-- INC S_TAB_INDEX -->" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" class="inputbox">{MESSAGE}{DRAFT_MESSAGE}{SIGNATURE}</textarea>
</div>
</fieldset>
--- 136,142 ----
</div>
<div id="message-box">
! <textarea <!-- IF S_UCP_ACTION and not S_PRIVMSGS and not S_EDIT_DRAFT -->name="signature" id="signature" style="height: 9em;"<!-- ELSE -->name="message" id="message"<!-- ENDIF --> rows="15" cols="76" tabindex="4" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" class="inputbox">{MESSAGE}{DRAFT_MESSAGE}{SIGNATURE}</textarea>
</div>
</fieldset>
***************
*** 180,189 ****
<fieldset class="submit-buttons">
{S_HIDDEN_ADDRESS_FIELD}
{S_HIDDEN_FIELDS}
! <!-- IF S_HAS_DRAFTS --><input type="submit" accesskey="d" tabindex="<!-- INC S_TAB_INDEX -->" name="load" value="{L_LOAD}" class="button2" onclick="load_draft = true;" /> <!-- ENDIF -->
! <!-- IF S_SAVE_ALLOWED --><input type="submit" accesskey="k" tabindex="<!-- INC S_TAB_INDEX -->" name="save" value="{L_SAVE}" class="button2" /> <!-- ENDIF -->
! <input type="submit" tabindex="<!-- INC S_TAB_INDEX -->" name="preview" value="{L_PREVIEW}" class="button1"<!-- IF not S_PRIVMSGS --> onclick="document.getElementById('postform').action += '#preview';"<!-- ENDIF --> />
! <input type="submit" accesskey="s" tabindex="<!-- INC S_TAB_INDEX -->" name="post" value="{L_SUBMIT}" class="button1" />
</fieldset>
--- 181,190 ----
<fieldset class="submit-buttons">
{S_HIDDEN_ADDRESS_FIELD}
{S_HIDDEN_FIELDS}
! <!-- IF S_HAS_DRAFTS --><input type="submit" accesskey="d" tabindex="8" name="load" value="{L_LOAD}" class="button2" onclick="load_draft = true;" /> <!-- ENDIF -->
! <!-- IF S_SAVE_ALLOWED --><input type="submit" accesskey="k" tabindex="7" name="save" value="{L_SAVE}" class="button2" /> <!-- ENDIF -->
! <input type="submit" tabindex="5" name="preview" value="{L_PREVIEW}" class="button1"<!-- IF not S_PRIVMSGS --> onclick="document.getElementById('postform').action += '#preview';"<!-- ENDIF --> />
! <input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />
</fieldset>
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html Thu Aug 27 10:10:28 2009
***************
*** 28,61 ****
<!-- ENDIF -->
<dl>
<dt><label for="username">{L_USERNAME}:</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt>
! <dd><input type="text" tabindex="<!-- INC S_TAB_INDEX -->" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" title="{L_USERNAME}" /></dd>
</dl>
<dl>
<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt>
! <dd><input type="text" tabindex="<!-- INC S_TAB_INDEX -->" name="email" id="email" size="25" maxlength="100" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" /></dd>
</dl>
<dl>
<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label></dt>
! <dd><input type="text" tabindex="<!-- INC S_TAB_INDEX -->" name="email_confirm" id="email_confirm" size="25" maxlength="100" value="{EMAIL_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_EMAIL}" /></dd>
</dl>
<dl>
<dt><label for="new_password">{L_PASSWORD}:</label><br /><span>{L_PASSWORD_EXPLAIN}</span></dt>
! <dd><input type="password" tabindex="<!-- INC S_TAB_INDEX -->" name="new_password" id="new_password" size="25" value="{PASSWORD}" class="inputbox autowidth" title="{L_NEW_PASSWORD}" /></dd>
</dl>
<dl>
<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label></dt>
! <dd><input type="password" tabindex="<!-- INC S_TAB_INDEX -->" name="password_confirm" id="password_confirm" size="25" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}" /></dd>
</dl>
<hr />
<dl>
<dt><label for="lang">{L_LANGUAGE}:</label></dt>
! <dd><select name="lang" id="lang" onchange="change_language(this.value); return false;" tabindex="<!-- INC S_TAB_INDEX -->" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select></dd>
</dl>
<dl>
<dt><label for="tz">{L_TIMEZONE}:</label></dt>
! <dd><select name="tz" id="tz" tabindex="<!-- INC S_TAB_INDEX -->" class="autowidth">{S_TZ_OPTIONS}</select></dd>
</dl>
<!-- IF .profile_fields -->
--- 28,61 ----
<!-- ENDIF -->
<dl>
<dt><label for="username">{L_USERNAME}:</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt>
! <dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" title="{L_USERNAME}" /></dd>
</dl>
<dl>
<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt>
! <dd><input type="text" tabindex="2" name="email" id="email" size="25" maxlength="100" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" /></dd>
</dl>
<dl>
<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label></dt>
! <dd><input type="text" tabindex="3" name="email_confirm" id="email_confirm" size="25" maxlength="100" value="{EMAIL_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_EMAIL}" /></dd>
</dl>
<dl>
<dt><label for="new_password">{L_PASSWORD}:</label><br /><span>{L_PASSWORD_EXPLAIN}</span></dt>
! <dd><input type="password" tabindex="4" name="new_password" id="new_password" size="25" value="{PASSWORD}" class="inputbox autowidth" title="{L_NEW_PASSWORD}" /></dd>
</dl>
<dl>
<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label></dt>
! <dd><input type="password" tabindex="5" name="password_confirm" id="password_confirm" size="25" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}" /></dd>
</dl>
<hr />
<dl>
<dt><label for="lang">{L_LANGUAGE}:</label></dt>
! <dd><select name="lang" id="lang" onchange="change_language(this.value); return false;" tabindex="6" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select></dd>
</dl>
<dl>
<dt><label for="tz">{L_TIMEZONE}:</label></dt>
! <dd><select name="tz" id="tz" tabindex="7" class="autowidth">{S_TZ_OPTIONS}</select></dd>
</dl>
<!-- IF .profile_fields -->
***************
*** 75,84 ****
<span class="corners-bottom"><span></span></span></div>
</div>
<!-- IF CAPTCHA_TEMPLATE -->
!
! <!-- INCLUDE {CAPTCHA_TEMPLATE} -->
!
<!-- ENDIF -->
<!-- IF S_COPPA -->
--- 75,84 ----
<span class="corners-bottom"><span></span></span></div>
</div>
<!-- IF CAPTCHA_TEMPLATE -->
! <!-- DEFINE $CAPTCHA_TAB_INDEX = 8 -->
! <!-- INCLUDE {CAPTCHA_TEMPLATE} -->
<!-- ENDIF -->
+
<!-- IF S_COPPA -->
|
|
From: Ruslan U. <rx...@ph...> - 2009-08-25 13:53:29
|
Author: rxu
Date: Tue Aug 25 14:52:35 2009
New Revision: 10057
Log:
One more unread posts search adjustment.
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions.php
branches/phpBB-3_0_0/phpBB/search.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 Tue Aug 25 14:52:35 2009
***************
*** 1649,1660 ****
*
* @param int $user_id User ID (or false for current user)
* @param string $sql_extra Extra WHERE SQL statement
! * @param string $sql_limit Limits the size of unread topics list
*
* @return array[int][int] Topic ids as keys, mark_time of topic as value
* @author rxu
*/
! function get_unread_topics_list($user_id = false, $sql_extra = '', $sql_limit = 1001)
{
global $config, $db, $user;
--- 1649,1661 ----
*
* @param int $user_id User ID (or false for current user)
* @param string $sql_extra Extra WHERE SQL statement
! * @param string $sql_sort ORDER BY SQL sorting statement
! * @param string $sql_limit Limits the size of unread topics list, 0 for unlimited query
*
* @return array[int][int] Topic ids as keys, mark_time of topic as value
* @author rxu
*/
! function get_unread_topics_list($user_id = false, $sql_extra = '', $sql_sort = '', $sql_limit = 1001)
{
global $config, $db, $user;
***************
*** 1663,1668 ****
--- 1664,1674 ----
$user_id = (int) $user->data['user_id'];
}
+ if (empty($sql_sort))
+ {
+ $sql_sort = 'ORDER BY t.topic_last_post_time DESC';
+ }
+
$tracked_topics_list = $unread_topics_list = $read_topics_list = array();
$tracked_forums_list = $mark_time = array();
***************
*** 1674,1680 ****
WHERE t.topic_id = tt.topic_id
AND tt.user_id = $user_id
$sql_extra
! ORDER BY t.topic_last_post_time DESC";
$result = $db->sql_query_limit($sql, $sql_limit);
while ($row = $db->sql_fetchrow($result))
--- 1680,1686 ----
WHERE t.topic_id = tt.topic_id
AND tt.user_id = $user_id
$sql_extra
! $sql_sort";
$result = $db->sql_query_limit($sql, $sql_limit);
while ($row = $db->sql_fetchrow($result))
***************
*** 1706,1712 ****
AND ' . $db->sql_in_set('t.topic_id', $tracked_topics_list, true, true) . "
AND ft.user_id = $user_id
$sql_extra
! ORDER BY t.topic_last_post_time DESC";
$result = $db->sql_query_limit($sql, ($sql_limit - $unread_list_count));
while ($row = $db->sql_fetchrow($result))
--- 1712,1718 ----
AND ' . $db->sql_in_set('t.topic_id', $tracked_topics_list, true, true) . "
AND ft.user_id = $user_id
$sql_extra
! $sql_sort";
$result = $db->sql_query_limit($sql, ($sql_limit - $unread_list_count));
while ($row = $db->sql_fetchrow($result))
***************
*** 1742,1748 ****
AND ' . $db->sql_in_set('t.topic_id', $tracked_topics_list, true, true) . '
AND ' . $db->sql_in_set('t.forum_id', $tracked_forums_list, true, true) . "
$sql_extra
! ORDER BY t.topic_last_post_time DESC";
$result = $db->sql_query_limit($sql, ($sql_limit - $unread_list_count));
while ($row = $db->sql_fetchrow($result))
--- 1748,1754 ----
AND ' . $db->sql_in_set('t.topic_id', $tracked_topics_list, true, true) . '
AND ' . $db->sql_in_set('t.forum_id', $tracked_forums_list, true, true) . "
$sql_extra
! $sql_sort";
$result = $db->sql_query_limit($sql, ($sql_limit - $unread_list_count));
while ($row = $db->sql_fetchrow($result))
***************
*** 1776,1784 ****
FROM ' . TOPICS_TABLE . ' t
WHERE t.topic_last_post_time > ' . $user_lastmark . "
$sql_extra
! ORDER BY t.topic_last_post_time DESC";
! $result = $db->sql_query_limit($sql, 1000);
while ($row = $db->sql_fetchrow($result))
{
--- 1782,1790 ----
FROM ' . TOPICS_TABLE . ' t
WHERE t.topic_last_post_time > ' . $user_lastmark . "
$sql_extra
! $sql_sort";
! $result = $db->sql_query_limit($sql, $sql_limit);
while ($row = $db->sql_fetchrow($result))
{
Modified: branches/phpBB-3_0_0/phpBB/search.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/search.php (original)
--- branches/phpBB-3_0_0/phpBB/search.php Tue Aug 25 14:52:35 2009
***************
*** 376,399 ****
// force sorting
$show_results = 'topics';
$sort_key = 't';
- $sort_dir = 'd';
$sort_by_sql['t'] = 't.topic_last_post_time';
$sql_sort = 'ORDER BY ' . $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
$s_sort_key = $s_sort_dir = $u_sort_param = $s_limit_days = '';
$unread_list = array();
! $unread_list = get_unread_topics_list();
if (!empty($unread_list))
{
$sql = 'SELECT t.topic_id
FROM ' . TOPICS_TABLE . ' t
! WHERE ' . $db->sql_in_set('t.topic_id', array_keys($unread_list)) . '
! AND t.topic_moved_id = 0
! ' . str_replace(array('p.', 'post_'), array('t.', 'topic_'), $m_approve_fid_sql) . '
! ' . ((sizeof($ex_fid_ary)) ? 'AND ' . $db->sql_in_set('t.forum_id', $ex_fid_ary, true) : '') . "
$sql_sort";
$field = 'topic_id';
}
--- 376,398 ----
// force sorting
$show_results = 'topics';
$sort_key = 't';
$sort_by_sql['t'] = 't.topic_last_post_time';
$sql_sort = 'ORDER BY ' . $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
+ $sql_where = 'AND t.topic_moved_id = 0
+ ' . str_replace(array('p.', 'post_'), array('t.', 'topic_'), $m_approve_fid_sql) . '
+ ' . ((sizeof($ex_fid_ary)) ? 'AND ' . $db->sql_in_set('t.forum_id', $ex_fid_ary, true) : '');
gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
$s_sort_key = $s_sort_dir = $u_sort_param = $s_limit_days = '';
$unread_list = array();
! $unread_list = get_unread_topics_list($user->data['user_id'], $sql_where, $sql_sort);
if (!empty($unread_list))
{
$sql = 'SELECT t.topic_id
FROM ' . TOPICS_TABLE . ' t
! WHERE ' . $db->sql_in_set('t.topic_id', array_keys($unread_list)) . "
$sql_sort";
$field = 'topic_id';
}
|
|
From: Meik S. <acy...@ph...> - 2009-08-25 13:41:29
|
Author: acydburn
Date: Tue Aug 25 13:19:57 2009
New Revision: 10056
Log:
Fix style recompilation now we do not force the SID to be passed anymore. This also fixes the problems users see after updates, where styles are not always instantly updated, as well as helping style authors a lot. ;)
Modified:
branches/phpBB-3_0_0/phpBB/style.php
Modified: branches/phpBB-3_0_0/phpBB/style.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/style.php (original)
--- branches/phpBB-3_0_0/phpBB/style.php Tue Aug 25 13:19:57 2009
***************
*** 92,98 ****
if (!$user)
{
$id = ($id) ? $id : $config['default_style'];
! $recompile = false;
$user = array('user_id' => ANONYMOUS);
}
--- 92,99 ----
if (!$user)
{
$id = ($id) ? $id : $config['default_style'];
! // Commented out because calls do not always include the SID anymore
! // $recompile = false;
$user = array('user_id' => ANONYMOUS);
}
|
|
From: Meik S. <acy...@ph...> - 2009-08-25 10:02:41
|
Author: acydburn
Date: Tue Aug 25 11:02:24 2009
New Revision: 10055
Log:
Adjustement for r10050, related to Bug #50185
Use internal S_TAB_INDEX instead of DEFINE
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions.php
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_default.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_recaptcha.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/index_body.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/login_body.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.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 Tue Aug 25 11:02:24 2009
***************
*** 4120,4125 ****
--- 4120,4127 ----
'S_USER_UNREAD_PRIVMSG' => $user->data['user_unread_privmsg'],
'S_USER_NEW' => $user->data['user_new'],
+ 'S_TAB_INDEX' => 1,
+
'SID' => $SID,
'_SID' => $_SID,
'SESSION_ID' => $user->session_id,
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_default.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_default.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_default.html Tue Aug 25 11:02:24 2009
***************
*** 11,17 ****
<dl>
<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt>
<dd><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd>
! <dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="<!-- INC $TAB_INDEX -->" class="inputbox narrow" title="{L_CONFIRM_CODE}" />
<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF -->
<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd>
<dd>{L_CONFIRM_CODE_EXPLAIN}</dd>
--- 11,17 ----
<dl>
<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt>
<dd><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd>
! <dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="<!-- INC S_TAB_INDEX -->" class="inputbox narrow" title="{L_CONFIRM_CODE}" />
<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF -->
<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd>
<dd>{L_CONFIRM_CODE_EXPLAIN}</dd>
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html Tue Aug 25 11:02:24 2009
***************
*** 9,15 ****
<dl>
<dt><label>{QA_CONFIRM_QUESTION}</label>:<br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
<dd>
! <input type="text" tabindex="<!-- INC $TAB_INDEX -->" name="qa_answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" />
<input type="hidden" name="qa_confirm_id" id="qa_confirm_id" value="{QA_CONFIRM_ID}" />
</dd>
</dl>
--- 9,15 ----
<dl>
<dt><label>{QA_CONFIRM_QUESTION}</label>:<br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
<dd>
! <input type="text" tabindex="<!-- INC S_TAB_INDEX -->" name="qa_answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" />
<input type="hidden" name="qa_confirm_id" id="qa_confirm_id" value="{QA_CONFIRM_ID}" />
</dd>
</dl>
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_recaptcha.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_recaptcha.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_recaptcha.html Tue Aug 25 11:02:24 2009
***************
*** 17,23 ****
// <![CDATA[
var RecaptchaOptions = {
lang : {L_RECAPTCHA_LANG},
! tabindex : <!-- INC $TAB_INDEX -->
};
// ]]>
</script>
--- 17,23 ----
// <![CDATA[
var RecaptchaOptions = {
lang : {L_RECAPTCHA_LANG},
! tabindex : <!-- INC S_TAB_INDEX -->
};
// ]]>
</script>
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/index_body.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/index_body.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/index_body.html Tue Aug 25 11:02:24 2009
***************
*** 18,24 ****
<form method="post" action="{S_LOGIN_ACTION}" class="headerspace">
<h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED --> • <a href="{U_REGISTER}">{L_REGISTER}</a><!-- ENDIF --></h3>
<fieldset class="quick-login">
! <label for="username">{L_USERNAME}:</label> <input type="text" name="username" id="username" size="10" class="inputbox" title="{L_USERNAME}" />
<label for="password">{L_PASSWORD}:</label> <input type="password" name="password" id="password" size="10" class="inputbox" title="{L_PASSWORD}" />
<!-- IF S_AUTOLOGIN_ENABLED -->
| <label for="autologin">{L_LOG_ME_IN} <input type="checkbox" name="autologin" id="autologin" /></label>
--- 18,24 ----
<form method="post" action="{S_LOGIN_ACTION}" class="headerspace">
<h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED --> • <a href="{U_REGISTER}">{L_REGISTER}</a><!-- ENDIF --></h3>
<fieldset class="quick-login">
! <label for="username">{L_USERNAME}:</label> <input type="text" name="username" id="username" size="10" class="inputbox" title="{L_USERNAME}" />
<label for="password">{L_PASSWORD}:</label> <input type="password" name="password" id="password" size="10" class="inputbox" title="{L_PASSWORD}" />
<!-- IF S_AUTOLOGIN_ENABLED -->
| <label for="autologin">{L_LOG_ME_IN} <input type="checkbox" name="autologin" id="autologin" /></label>
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/login_body.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/login_body.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/login_body.html Tue Aug 25 11:02:24 2009
***************
*** 6,21 ****
<div class="content">
<h2><!-- IF LOGIN_EXPLAIN -->{LOGIN_EXPLAIN}<!-- ELSE -->{L_LOGIN}<!-- ENDIF --></h2>
!
<fieldset <!-- IF not S_CONFIRM_CODE -->class="fields1"<!-- ELSE -->class="fields2"<!-- ENDIF -->>
<!-- IF LOGIN_ERROR --><div class="error">{LOGIN_ERROR}</div><!-- ENDIF -->
<dl>
<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}:</label></dt>
! <dd><input type="text" tabindex="<!-- INC $TAB_INDEX -->" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
</dl>
<dl>
<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}:</label></dt>
! <dd><input type="password" tabindex="<!-- INC $TAB_INDEX -->" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd>
<!-- IF S_DISPLAY_FULL_LOGIN and (U_SEND_PASSWORD or U_RESEND_ACTIVATION) -->
<!-- IF U_SEND_PASSWORD --><dd><a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a></dd><!-- ENDIF -->
<!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF -->
--- 6,21 ----
<div class="content">
<h2><!-- IF LOGIN_EXPLAIN -->{LOGIN_EXPLAIN}<!-- ELSE -->{L_LOGIN}<!-- ENDIF --></h2>
!
<fieldset <!-- IF not S_CONFIRM_CODE -->class="fields1"<!-- ELSE -->class="fields2"<!-- ENDIF -->>
<!-- IF LOGIN_ERROR --><div class="error">{LOGIN_ERROR}</div><!-- ENDIF -->
<dl>
<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}:</label></dt>
! <dd><input type="text" tabindex="<!-- INC S_TAB_INDEX -->" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
</dl>
<dl>
<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}:</label></dt>
! <dd><input type="password" tabindex="<!-- INC S_TAB_INDEX -->" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd>
<!-- IF S_DISPLAY_FULL_LOGIN and (U_SEND_PASSWORD or U_RESEND_ACTIVATION) -->
<!-- IF U_SEND_PASSWORD --><dd><a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a></dd><!-- ENDIF -->
<!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF -->
***************
*** 26,41 ****
<!-- ENDIF -->
<!-- IF S_DISPLAY_FULL_LOGIN -->
<dl>
! <!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="<!-- INC $TAB_INDEX -->" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->
! <dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="<!-- INC $TAB_INDEX -->" /> {L_HIDE_ME}</label></dd>
</dl>
<!-- ENDIF -->
<dl>
<dt> </dt>
! <dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="<!-- INC $TAB_INDEX -->" value="{L_LOGIN}" class="button1" /></dd>
</dl>
!
</fieldset>
</div>
<span class="corners-bottom"><span></span></span></div>
--- 26,41 ----
<!-- ENDIF -->
<!-- IF S_DISPLAY_FULL_LOGIN -->
<dl>
! <!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="<!-- INC S_TAB_INDEX -->" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->
! <dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="<!-- INC S_TAB_INDEX -->" /> {L_HIDE_ME}</label></dd>
</dl>
<!-- ENDIF -->
<dl>
<dt> </dt>
! <dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="<!-- INC S_TAB_INDEX -->" value="{L_LOGIN}" class="button1" /></dd>
</dl>
!
</fieldset>
</div>
<span class="corners-bottom"><span></span></span></div>
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 Tue Aug 25 11:02:24 2009
***************
*** 97,103 ****
<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
<link href="{T_THEME_PATH}/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
<!-- ENDIF -->
! <!-- DEFINE $TAB_INDEX = 1 -->
</head>
<body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
--- 97,103 ----
<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
<link href="{T_THEME_PATH}/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
<!-- ENDIF -->
!
</head>
<body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html Tue Aug 25 11:02:24 2009
***************
*** 90,103 ****
<!-- IF not S_PRIVMSGS and S_DISPLAY_USERNAME -->
<dl style="clear: left;">
<dt><label for="username">{L_USERNAME}:</label></dt>
! <dd><input type="text" tabindex="<!-- INC $TAB_INDEX -->" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
</dl>
<!-- ENDIF -->
<!-- IF S_POST_ACTION or S_PRIVMSGS or S_EDIT_DRAFT -->
<dl style="clear: left;">
<dt><label for="subject">{L_SUBJECT}:</label></dt>
! <dd><input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->60<!-- ELSE -->64<!-- ENDIF -->" tabindex="<!-- INC $TAB_INDEX -->" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" /></dd>
</dl>
<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
--- 90,103 ----
<!-- IF not S_PRIVMSGS and S_DISPLAY_USERNAME -->
<dl style="clear: left;">
<dt><label for="username">{L_USERNAME}:</label></dt>
! <dd><input type="text" tabindex="<!-- INC S_TAB_INDEX -->" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
</dl>
<!-- ENDIF -->
<!-- IF S_POST_ACTION or S_PRIVMSGS or S_EDIT_DRAFT -->
<dl style="clear: left;">
<dt><label for="subject">{L_SUBJECT}:</label></dt>
! <dd><input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->60<!-- ELSE -->64<!-- ENDIF -->" tabindex="<!-- INC S_TAB_INDEX -->" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" /></dd>
</dl>
<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
***************
*** 135,141 ****
</div>
<div id="message-box">
! <textarea <!-- IF S_UCP_ACTION and not S_PRIVMSGS and not S_EDIT_DRAFT -->name="signature" id="signature" style="height: 9em;"<!-- ELSE -->name="message" id="message"<!-- ENDIF --> rows="15" cols="76" tabindex="<!-- INC $TAB_INDEX -->" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" class="inputbox">{MESSAGE}{DRAFT_MESSAGE}{SIGNATURE}</textarea>
</div>
</fieldset>
--- 135,141 ----
</div>
<div id="message-box">
! <textarea <!-- IF S_UCP_ACTION and not S_PRIVMSGS and not S_EDIT_DRAFT -->name="signature" id="signature" style="height: 9em;"<!-- ELSE -->name="message" id="message"<!-- ENDIF --> rows="15" cols="76" tabindex="<!-- INC S_TAB_INDEX -->" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" class="inputbox">{MESSAGE}{DRAFT_MESSAGE}{SIGNATURE}</textarea>
</div>
</fieldset>
***************
*** 180,189 ****
<fieldset class="submit-buttons">
{S_HIDDEN_ADDRESS_FIELD}
{S_HIDDEN_FIELDS}
! <!-- IF S_HAS_DRAFTS --><input type="submit" accesskey="d" tabindex="<!-- INC $TAB_INDEX -->" name="load" value="{L_LOAD}" class="button2" onclick="load_draft = true;" /> <!-- ENDIF -->
! <!-- IF S_SAVE_ALLOWED --><input type="submit" accesskey="k" tabindex="<!-- INC $TAB_INDEX -->" name="save" value="{L_SAVE}" class="button2" /> <!-- ENDIF -->
! <input type="submit" tabindex="<!-- INC $TAB_INDEX -->" name="preview" value="{L_PREVIEW}" class="button1"<!-- IF not S_PRIVMSGS --> onclick="document.getElementById('postform').action += '#preview';"<!-- ENDIF --> />
! <input type="submit" accesskey="s" tabindex="<!-- INC $TAB_INDEX -->" name="post" value="{L_SUBMIT}" class="button1" />
</fieldset>
--- 180,189 ----
<fieldset class="submit-buttons">
{S_HIDDEN_ADDRESS_FIELD}
{S_HIDDEN_FIELDS}
! <!-- IF S_HAS_DRAFTS --><input type="submit" accesskey="d" tabindex="<!-- INC S_TAB_INDEX -->" name="load" value="{L_LOAD}" class="button2" onclick="load_draft = true;" /> <!-- ENDIF -->
! <!-- IF S_SAVE_ALLOWED --><input type="submit" accesskey="k" tabindex="<!-- INC S_TAB_INDEX -->" name="save" value="{L_SAVE}" class="button2" /> <!-- ENDIF -->
! <input type="submit" tabindex="<!-- INC S_TAB_INDEX -->" name="preview" value="{L_PREVIEW}" class="button1"<!-- IF not S_PRIVMSGS --> onclick="document.getElementById('postform').action += '#preview';"<!-- ENDIF --> />
! <input type="submit" accesskey="s" tabindex="<!-- INC S_TAB_INDEX -->" name="post" value="{L_SUBMIT}" class="button1" />
</fieldset>
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html Tue Aug 25 11:02:24 2009
***************
*** 26,63 ****
<!-- IF L_REG_COND -->
<dl><dd><strong>{L_REG_COND}</strong></dd></dl>
<!-- ENDIF -->
- <!-- DEFINE $TAB_INDEX = 1 -->
-
<dl>
<dt><label for="username">{L_USERNAME}:</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt>
! <dd><input type="text" tabindex="<!-- INC $TAB_INDEX -->" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" title="{L_USERNAME}" /></dd>
</dl>
<dl>
<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt>
! <dd><input type="text" tabindex="<!-- INC $TAB_INDEX -->" name="email" id="email" size="25" maxlength="100" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" /></dd>
</dl>
<dl>
<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label></dt>
! <dd><input type="text" tabindex="<!-- INC $TAB_INDEX -->" name="email_confirm" id="email_confirm" size="25" maxlength="100" value="{EMAIL_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_EMAIL}" /></dd>
</dl>
<dl>
<dt><label for="new_password">{L_PASSWORD}:</label><br /><span>{L_PASSWORD_EXPLAIN}</span></dt>
! <dd><input type="password" tabindex="<!-- INC $TAB_INDEX -->" name="new_password" id="new_password" size="25" value="{PASSWORD}" class="inputbox autowidth" title="{L_NEW_PASSWORD}" /></dd>
</dl>
<dl>
<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label></dt>
! <dd><input type="password" tabindex="<!-- INC $TAB_INDEX -->" name="password_confirm" id="password_confirm" size="25" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}" /></dd>
</dl>
<hr />
<dl>
<dt><label for="lang">{L_LANGUAGE}:</label></dt>
! <dd><select name="lang" id="lang" onchange="change_language(this.value); return false;" tabindex="<!-- INC $TAB_INDEX -->" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select></dd>
</dl>
<dl>
<dt><label for="tz">{L_TIMEZONE}:</label></dt>
! <dd><select name="tz" id="tz" tabindex="<!-- INC $TAB_INDEX -->" class="autowidth">{S_TZ_OPTIONS}</select></dd>
</dl>
<!-- IF .profile_fields -->
--- 26,61 ----
<!-- IF L_REG_COND -->
<dl><dd><strong>{L_REG_COND}</strong></dd></dl>
<!-- ENDIF -->
<dl>
<dt><label for="username">{L_USERNAME}:</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt>
! <dd><input type="text" tabindex="<!-- INC S_TAB_INDEX -->" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" title="{L_USERNAME}" /></dd>
</dl>
<dl>
<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt>
! <dd><input type="text" tabindex="<!-- INC S_TAB_INDEX -->" name="email" id="email" size="25" maxlength="100" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" /></dd>
</dl>
<dl>
<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label></dt>
! <dd><input type="text" tabindex="<!-- INC S_TAB_INDEX -->" name="email_confirm" id="email_confirm" size="25" maxlength="100" value="{EMAIL_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_EMAIL}" /></dd>
</dl>
<dl>
<dt><label for="new_password">{L_PASSWORD}:</label><br /><span>{L_PASSWORD_EXPLAIN}</span></dt>
! <dd><input type="password" tabindex="<!-- INC S_TAB_INDEX -->" name="new_password" id="new_password" size="25" value="{PASSWORD}" class="inputbox autowidth" title="{L_NEW_PASSWORD}" /></dd>
</dl>
<dl>
<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label></dt>
! <dd><input type="password" tabindex="<!-- INC S_TAB_INDEX -->" name="password_confirm" id="password_confirm" size="25" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}" /></dd>
</dl>
<hr />
<dl>
<dt><label for="lang">{L_LANGUAGE}:</label></dt>
! <dd><select name="lang" id="lang" onchange="change_language(this.value); return false;" tabindex="<!-- INC S_TAB_INDEX -->" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select></dd>
</dl>
<dl>
<dt><label for="tz">{L_TIMEZONE}:</label></dt>
! <dd><select name="tz" id="tz" tabindex="<!-- INC S_TAB_INDEX -->" class="autowidth">{S_TZ_OPTIONS}</select></dd>
</dl>
<!-- IF .profile_fields -->
***************
*** 79,85 ****
<!-- IF CAPTCHA_TEMPLATE -->
<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
!
<!-- ENDIF -->
<!-- IF S_COPPA -->
--- 77,83 ----
<!-- IF CAPTCHA_TEMPLATE -->
<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
!
<!-- ENDIF -->
<!-- IF S_COPPA -->
|
|
From: Meik S. <acy...@ph...> - 2009-08-25 09:49:29
|
Author: acydburn
Date: Tue Aug 25 10:48:44 2009
New Revision: 10054
Log:
This is an enhancement for revision r10051 (INC template variable)
Within the mentioned revision INC was only able to be applied to defined template variables.
I extended it now to work on all supported variables (template vars, defines, loops, defines in loops)
I also added a DEC template variable to logically complete this.
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/docs/coding-guidelines.html
branches/phpBB-3_0_0/phpBB/includes/functions_template.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 25 10:48:44 2009
***************
*** 282,288 ****
<li>[Feature] Separate PM Reply and PM Reply to all in prosilver.</li>
<li>[Feature] Place debug notices during captcha rendering in the error log - useful for debugging output already started errors.</li>
<li>[Feature] Ability to define constant PHPBB_USE_BOARD_URL_PATH to use board url for images/avatars/ranks/imageset...</li>
! <li>[Feature] Added INC command to template syntax.</li>
</ul>
<a name="v304"></a><h3>1.ii. Changes since 3.0.4</h3>
--- 282,288 ----
<li>[Feature] Separate PM Reply and PM Reply to all in prosilver.</li>
<li>[Feature] Place debug notices during captcha rendering in the error log - useful for debugging output already started errors.</li>
<li>[Feature] Ability to define constant PHPBB_USE_BOARD_URL_PATH to use board url for images/avatars/ranks/imageset...</li>
! <li>[Feature] Added INC/DEC command to template syntax, applicable to DEFINES and normal template variables, including loops.</li>
</ul>
<a name="v304"></a><h3>1.ii. Changes since 3.0.4</h3>
Modified: branches/phpBB-3_0_0/phpBB/docs/coding-guidelines.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/coding-guidelines.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/coding-guidelines.html Tue Aug 25 10:48:44 2009
***************
*** 1169,1185 ****
<div class="codebox"><pre>
<span class="comment"><!-- INCLUDE {FILE_VAR} --></span>
</pre></div>
<p>Template defined variables can also be utilised.
<div class="codebox"><pre>
<span class="comment"><!-- DEFINE $SOME_VAR = 'my_file.html' --></span>
<span class="comment"><!-- INCLUDE {$SOME_VAR} --></span>
</pre></div>
! <p>Also added in <strong>3.0.6</strong> is the ability to increment an variable on use. This can be used for instances like tabindexes, where the amount of entries is not statically known.
! The INC command will print the current state of a defined var and then increment it by one (postincrement).</p>
<div class="codebox"><pre>
<span class="comment"><!-- DEFINE $SOME_VAR = 1 --></span>
<span class="comment"><!-- INC $SOME_VAR --></span>
</pre></div>
<h4>PHP</h4>
<p>A contentious decision has seen the ability to include PHP within the template introduced. This is achieved by enclosing the PHP within relevant tags:</p>
--- 1169,1193 ----
<div class="codebox"><pre>
<span class="comment"><!-- INCLUDE {FILE_VAR} --></span>
</pre></div>
+
<p>Template defined variables can also be utilised.
+
<div class="codebox"><pre>
<span class="comment"><!-- DEFINE $SOME_VAR = 'my_file.html' --></span>
<span class="comment"><!-- INCLUDE {$SOME_VAR} --></span>
</pre></div>
!
! <p>Also added in <strong>3.0.6</strong> is the ability to increment or decrement a variable on use. This can be used for instances like tabindexes, where the amount of entries is not statically known.
! The INC (for incrementing) and DEC (for decrementing) commands will print the <strong>current</strong> state of a defined var and then increment/decrement it by one (postincrement/postdecrement).</p>
!
<div class="codebox"><pre>
<span class="comment"><!-- DEFINE $SOME_VAR = 1 --></span>
<span class="comment"><!-- INC $SOME_VAR --></span>
+ Result: 1<br />
+ <span class="comment">{$SOME_VAR}</span>
+ Result: 2<br />
</pre></div>
+
<h4>PHP</h4>
<p>A contentious decision has seen the ability to include PHP within the template introduced. This is achieved by enclosing the PHP within relevant tags:</p>
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_template.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_template.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_template.php Tue Aug 25 10:48:44 2009
***************
*** 192,200 ****
break;
case 'INC':
! $compile_blocks[] = '<?php ' . $this->compile_tag_counter($block_val[2], true) . ' ?>';
break;
!
case 'INCLUDE':
$temp = array_shift($include_blocks);
--- 192,204 ----
break;
case 'INC':
! $compile_blocks[] = '<?php ' . $this->compile_tag_counter($block_val[2], '++') . ' ?>';
break;
!
! case 'DEC':
! $compile_blocks[] = '<?php ' . $this->compile_tag_counter($block_val[2], '--') . ' ?>';
! break;
!
case 'INCLUDE':
$temp = array_shift($include_blocks);
***************
*** 632,651 ****
/**
! * Compile INC tags
* @access private
*/
! function compile_tag_counter($tag_args)
{
! preg_match('#^\$(?=[A-Z])([A-Z0-9_\-]*)$#', $tag_args, $match);
! if (empty($match[1]))
{
return '';
}
!
! return 'echo $this->_tpldata[\'DEFINE\'][\'.\'][\'' . $match[1] . '\']++';
}
!
/**
* Compile INCLUDE tag
* @access private
--- 636,661 ----
/**
! * Compile INC/DEC tags
! * INC/DEC tags support defined template variables as well as normal template variables
* @access private
*/
! function compile_tag_counter($tag_args, $operation = '++')
{
! preg_match('#^((?:[a-z0-9\-_]+\.)+)?(\$)?(?=[A-Z])([A-Z0-9\-_]+)#s', $tag_args, $varrefs);
!
! if (empty($varrefs[0]))
{
return '';
}
!
! // Build token
! $token = (!empty($varrefs[1])) ? $this->generate_block_data_ref(substr($varrefs[1], 0, -1), true, $varrefs[2]) . '[\'' . $varrefs[3] . '\']' : (($varrefs[2]) ? '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $varrefs[3] . '\']' : '$this->_rootref[\'' . $varrefs[3] . '\']');
!
! // Increase or decrease token ;)
! return "echo {$token}{$operation};";
}
!
/**
* Compile INCLUDE tag
* @access private
|
|
From: Meik S. <acy...@ph...> - 2009-08-25 09:08:11
|
Author: acydburn
Date: Tue Aug 25 10:07:26 2009
New Revision: 10053
Log:
Make sure only logs for existing users are displayed and user-specific logs removed on user deletion. (Bug #49855)
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
branches/phpBB-3_0_0/phpBB/includes/functions_user.php
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_queue.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 25 10:07:26 2009
***************
*** 199,204 ****
--- 199,205 ----
<li>[Fix] Fix email problems on servers with PHP installations not accepting RFC-compliant subject string passed to the the mail()-function. (Bug #46725)</li>
<li>[Fix] Correctly orientate Control-Panel-Navigation background-image on RTL languages. (Bug #49945)</li>
<li>[Fix] Sort private messages by message time and not message id. (Bug #50015)</li>
+ <li>[Fix] Make sure only logs for existing users are displayed and user-specific logs removed on user deletion. (Bug #49855)</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/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 Tue Aug 25 10:07:26 2009
***************
*** 2744,2751 ****
}
$sql = 'SELECT COUNT(l.log_id) AS total_entries
! FROM ' . LOG_TABLE . " l
WHERE l.log_type = $log_type
AND l.log_time >= $limit_days
$sql_keywords
$sql_forum";
--- 2744,2752 ----
}
$sql = 'SELECT COUNT(l.log_id) AS total_entries
! FROM ' . LOG_TABLE . ' l, ' . USERS_TABLE . " u
WHERE l.log_type = $log_type
+ AND l.user_id = u.user_id
AND l.log_time >= $limit_days
$sql_keywords
$sql_forum";
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_user.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_user.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_user.php Tue Aug 25 10:07:26 2009
***************
*** 538,543 ****
--- 538,554 ----
$cache->destroy('sql', MODERATOR_CACHE_TABLE);
+ // Delete user log entries about this user
+ $sql = 'DELETE FROM ' . LOG_TABLE . '
+ WHERE reportee_id = ' . $user_id;
+ $db->sql_query($sql);
+
+ // Change user_id to anonymous for this users triggered events
+ $sql = 'UPDATE ' . LOG_TABLE . '
+ SET user_id = ' . ANONYMOUS . '
+ WHERE user_id = ' . $user_id;
+ $db->sql_query($sql);
+
// Delete the user_id from the zebra table
$sql = 'DELETE FROM ' . ZEBRA_TABLE . '
WHERE user_id = ' . $user_id . '
Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_queue.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_queue.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_queue.php Tue Aug 25 10:07:26 2009
***************
*** 556,561 ****
--- 556,562 ----
$post_approve_sql[] = $post_id;
}
+
$post_id_list = array_values(array_diff($post_id_list, $post_approved_list));
for ($i = 0, $size = sizeof($post_approved_list); $i < $size; $i++)
{
***************
*** 834,840 ****
'post_subject' => $post_info[$post_id]['post_subject'],
'forum_id' => $post_info[$post_id]['forum_id'],
'topic_id' => $post_info[$post_id]['topic_id'],
! );
}
}
--- 835,841 ----
'post_subject' => $post_info[$post_id]['post_subject'],
'forum_id' => $post_info[$post_id]['forum_id'],
'topic_id' => $post_info[$post_id]['topic_id'],
! );
}
}
|
|
From: Meik S. <acy...@ph...> - 2009-08-25 09:05:26
|
Author: acydburn
Date: Tue Aug 25 10:04:38 2009
New Revision: 10052
Log:
Fix possible wrong encodings in email template files in messenger. Related to bug #46725
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 25 10:04:38 2009
***************
*** 268,273 ****
--- 268,276 ----
// Parse message through template
$this->msg = trim($this->tpl_obj->assign_display('body'));
+ // Because we use \n for newlines in the body message we need to fix line encoding errors for those admins who uploaded email template files in the wrong encoding
+ $this->msg = str_replace("\r\n", "\n", $this->msg);
+
// We now try and pull a subject from the email body ... if it exists,
// do this here because the subject may contain a variable
$drop_header = '';
|
|
From: Henry S. <kel...@ph...> - 2009-08-24 15:13:01
|
Author: Kellanved
Date: Mon Aug 24 16:12:40 2009
New Revision: 10051
Log:
Add INC (working name) to template syntax
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/docs/coding-guidelines.html
branches/phpBB-3_0_0/phpBB/includes/functions_template.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 24 16:12:40 2009
***************
*** 281,286 ****
--- 281,288 ----
<li>[Feature] Separate PM Reply and PM Reply to all in prosilver.</li>
<li>[Feature] Place debug notices during captcha rendering in the error log - useful for debugging output already started errors.</li>
<li>[Feature] Ability to define constant PHPBB_USE_BOARD_URL_PATH to use board url for images/avatars/ranks/imageset...</li>
+ <li>[Feature] Added INC command to template syntax.</li>
+
</ul>
<a name="v304"></a><h3>1.ii. Changes since 3.0.4</h3>
Modified: branches/phpBB-3_0_0/phpBB/docs/coding-guidelines.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/coding-guidelines.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/coding-guidelines.html Mon Aug 24 16:12:40 2009
***************
*** 1174,1180 ****
<span class="comment"><!-- DEFINE $SOME_VAR = 'my_file.html' --></span>
<span class="comment"><!-- INCLUDE {$SOME_VAR} --></span>
</pre></div>
!
<h4>PHP</h4>
<p>A contentious decision has seen the ability to include PHP within the template introduced. This is achieved by enclosing the PHP within relevant tags:</p>
--- 1174,1185 ----
<span class="comment"><!-- DEFINE $SOME_VAR = 'my_file.html' --></span>
<span class="comment"><!-- INCLUDE {$SOME_VAR} --></span>
</pre></div>
! <p>Also added in <strong>3.0.6</strong> is the ability to increment an variable on use. This can be used for instances like tabindexes, where the amount of entries is not statically known.
! The INC command will print the current state of a defined var and then increment it by one (postincrement).</p>
! <div class="codebox"><pre>
! <span class="comment"><!-- DEFINE $SOME_VAR = 1 --></span>
! <span class="comment"><!-- INC $SOME_VAR --></span>
! </pre></div>
<h4>PHP</h4>
<p>A contentious decision has seen the ability to include PHP within the template introduced. This is achieved by enclosing the PHP within relevant tags:</p>
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_template.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_template.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_template.php Mon Aug 24 16:12:40 2009
***************
*** 191,196 ****
--- 191,200 ----
$compile_blocks[] = '<?php ' . $this->compile_tag_define($block_val[2], false) . ' ?>';
break;
+ case 'INC':
+ $compile_blocks[] = '<?php ' . $this->compile_tag_counter($block_val[2], true) . ' ?>';
+ break;
+
case 'INCLUDE':
$temp = array_shift($include_blocks);
***************
*** 626,631 ****
--- 630,651 ----
return (($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true) . '[\'' . $match[2] . '\']' : '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $match[2] . '\']') . ' = ' . $match[4] . ';';
}
+
+ /**
+ * Compile INC tags
+ * @access private
+ */
+ function compile_tag_counter($tag_args)
+ {
+ preg_match('#^\$(?=[A-Z])([A-Z0-9_\-]*)$#', $tag_args, $match);
+ if (empty($match[1]))
+ {
+ return '';
+ }
+
+ return 'echo $this->_tpldata[\'DEFINE\'][\'.\'][\'' . $match[1] . '\']++';
+ }
+
/**
* Compile INCLUDE tag
* @access private
|
Author: Kellanved
Date: Mon Aug 24 15:22:30 2009
New Revision: 10050
Log:
new tabindex handling, #50185; subsilver doesn't use tabindexes
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_default.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_recaptcha.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/login_body.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_default.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_default.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_default.html Mon Aug 24 15:22:30 2009
***************
*** 11,17 ****
<dl>
<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt>
<dd><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd>
! <dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" class="inputbox narrow" title="{L_CONFIRM_CODE}" />
<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF -->
<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd>
<dd>{L_CONFIRM_CODE_EXPLAIN}</dd>
--- 11,17 ----
<dl>
<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt>
<dd><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd>
! <dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="<!-- INC $TAB_INDEX -->" class="inputbox narrow" title="{L_CONFIRM_CODE}" />
<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF -->
<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd>
<dd>{L_CONFIRM_CODE_EXPLAIN}</dd>
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html Mon Aug 24 15:22:30 2009
***************
*** 9,15 ****
<dl>
<dt><label>{QA_CONFIRM_QUESTION}</label>:<br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
<dd>
! <input type="text" tabindex="10" name="qa_answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" />
<input type="hidden" name="qa_confirm_id" id="qa_confirm_id" value="{QA_CONFIRM_ID}" />
</dd>
</dl>
--- 9,15 ----
<dl>
<dt><label>{QA_CONFIRM_QUESTION}</label>:<br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
<dd>
! <input type="text" tabindex="<!-- INC $TAB_INDEX -->" name="qa_answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" />
<input type="hidden" name="qa_confirm_id" id="qa_confirm_id" value="{QA_CONFIRM_ID}" />
</dd>
</dl>
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_recaptcha.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_recaptcha.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_recaptcha.html Mon Aug 24 15:22:30 2009
***************
*** 16,22 ****
<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
// <![CDATA[
var RecaptchaOptions = {
! lang : {L_RECAPTCHA_LANG}
};
// ]]>
</script>
--- 16,23 ----
<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
// <![CDATA[
var RecaptchaOptions = {
! lang : {L_RECAPTCHA_LANG},
! tabindex : <!-- INC $TAB_INDEX -->
};
// ]]>
</script>
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/login_body.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/login_body.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/login_body.html Mon Aug 24 15:22:30 2009
***************
*** 11,21 ****
<!-- IF LOGIN_ERROR --><div class="error">{LOGIN_ERROR}</div><!-- ENDIF -->
<dl>
<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}:</label></dt>
! <dd><input type="text" tabindex="1" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
</dl>
<dl>
<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}:</label></dt>
! <dd><input type="password" tabindex="2" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd>
<!-- IF S_DISPLAY_FULL_LOGIN and (U_SEND_PASSWORD or U_RESEND_ACTIVATION) -->
<!-- IF U_SEND_PASSWORD --><dd><a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a></dd><!-- ENDIF -->
<!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF -->
--- 11,21 ----
<!-- IF LOGIN_ERROR --><div class="error">{LOGIN_ERROR}</div><!-- ENDIF -->
<dl>
<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}:</label></dt>
! <dd><input type="text" tabindex="<!-- INC $TAB_INDEX -->" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
</dl>
<dl>
<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}:</label></dt>
! <dd><input type="password" tabindex="<!-- INC $TAB_INDEX -->" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd>
<!-- IF S_DISPLAY_FULL_LOGIN and (U_SEND_PASSWORD or U_RESEND_ACTIVATION) -->
<!-- IF U_SEND_PASSWORD --><dd><a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a></dd><!-- ENDIF -->
<!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF -->
***************
*** 26,39 ****
<!-- ENDIF -->
<!-- IF S_DISPLAY_FULL_LOGIN -->
<dl>
! <!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="4" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->
! <dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="5" /> {L_HIDE_ME}</label></dd>
</dl>
<!-- ENDIF -->
<dl>
<dt> </dt>
! <dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="6" value="{L_LOGIN}" class="button1" /></dd>
</dl>
</fieldset>
--- 26,39 ----
<!-- ENDIF -->
<!-- IF S_DISPLAY_FULL_LOGIN -->
<dl>
! <!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="<!-- INC $TAB_INDEX -->" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->
! <dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="<!-- INC $TAB_INDEX -->" /> {L_HIDE_ME}</label></dd>
</dl>
<!-- ENDIF -->
<dl>
<dt> </dt>
! <dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="<!-- INC $TAB_INDEX -->" value="{L_LOGIN}" class="button1" /></dd>
</dl>
</fieldset>
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 24 15:22:30 2009
***************
*** 97,103 ****
<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
<link href="{T_THEME_PATH}/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
<!-- ENDIF -->
!
</head>
<body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
--- 97,103 ----
<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
<link href="{T_THEME_PATH}/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
<!-- ENDIF -->
! <!-- DEFINE $TAB_INDEX = 1 -->
</head>
<body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html Mon Aug 24 15:22:30 2009
***************
*** 90,103 ****
<!-- IF not S_PRIVMSGS and S_DISPLAY_USERNAME -->
<dl style="clear: left;">
<dt><label for="username">{L_USERNAME}:</label></dt>
! <dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
</dl>
<!-- ENDIF -->
<!-- IF S_POST_ACTION or S_PRIVMSGS or S_EDIT_DRAFT -->
<dl style="clear: left;">
<dt><label for="subject">{L_SUBJECT}:</label></dt>
! <dd><input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->60<!-- ELSE -->64<!-- ENDIF -->" tabindex="2" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" /></dd>
</dl>
<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
--- 90,103 ----
<!-- IF not S_PRIVMSGS and S_DISPLAY_USERNAME -->
<dl style="clear: left;">
<dt><label for="username">{L_USERNAME}:</label></dt>
! <dd><input type="text" tabindex="<!-- INC $TAB_INDEX -->" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
</dl>
<!-- ENDIF -->
<!-- IF S_POST_ACTION or S_PRIVMSGS or S_EDIT_DRAFT -->
<dl style="clear: left;">
<dt><label for="subject">{L_SUBJECT}:</label></dt>
! <dd><input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->60<!-- ELSE -->64<!-- ENDIF -->" tabindex="<!-- INC $TAB_INDEX -->" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" /></dd>
</dl>
<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
***************
*** 135,141 ****
</div>
<div id="message-box">
! <textarea <!-- IF S_UCP_ACTION and not S_PRIVMSGS and not S_EDIT_DRAFT -->name="signature" id="signature" style="height: 9em;"<!-- ELSE -->name="message" id="message"<!-- ENDIF --> rows="15" cols="76" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" class="inputbox">{MESSAGE}{DRAFT_MESSAGE}{SIGNATURE}</textarea>
</div>
</fieldset>
--- 135,141 ----
</div>
<div id="message-box">
! <textarea <!-- IF S_UCP_ACTION and not S_PRIVMSGS and not S_EDIT_DRAFT -->name="signature" id="signature" style="height: 9em;"<!-- ELSE -->name="message" id="message"<!-- ENDIF --> rows="15" cols="76" tabindex="<!-- INC $TAB_INDEX -->" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" class="inputbox">{MESSAGE}{DRAFT_MESSAGE}{SIGNATURE}</textarea>
</div>
</fieldset>
***************
*** 180,189 ****
<fieldset class="submit-buttons">
{S_HIDDEN_ADDRESS_FIELD}
{S_HIDDEN_FIELDS}
! <!-- IF S_HAS_DRAFTS --><input type="submit" accesskey="d" tabindex="9" name="load" value="{L_LOAD}" class="button2" onclick="load_draft = true;" /> <!-- ENDIF -->
! <!-- IF S_SAVE_ALLOWED --><input type="submit" accesskey="k" tabindex="8" name="save" value="{L_SAVE}" class="button2" /> <!-- ENDIF -->
! <input type="submit" tabindex="5" name="preview" value="{L_PREVIEW}" class="button1"<!-- IF not S_PRIVMSGS --> onclick="document.getElementById('postform').action += '#preview';"<!-- ENDIF --> />
! <input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />
</fieldset>
--- 180,189 ----
<fieldset class="submit-buttons">
{S_HIDDEN_ADDRESS_FIELD}
{S_HIDDEN_FIELDS}
! <!-- IF S_HAS_DRAFTS --><input type="submit" accesskey="d" tabindex="<!-- INC $TAB_INDEX -->" name="load" value="{L_LOAD}" class="button2" onclick="load_draft = true;" /> <!-- ENDIF -->
! <!-- IF S_SAVE_ALLOWED --><input type="submit" accesskey="k" tabindex="<!-- INC $TAB_INDEX -->" name="save" value="{L_SAVE}" class="button2" /> <!-- ENDIF -->
! <input type="submit" tabindex="<!-- INC $TAB_INDEX -->" name="preview" value="{L_PREVIEW}" class="button1"<!-- IF not S_PRIVMSGS --> onclick="document.getElementById('postform').action += '#preview';"<!-- ENDIF --> />
! <input type="submit" accesskey="s" tabindex="<!-- INC $TAB_INDEX -->" name="post" value="{L_SUBMIT}" class="button1" />
</fieldset>
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html Mon Aug 24 15:22:30 2009
***************
*** 26,62 ****
<!-- IF L_REG_COND -->
<dl><dd><strong>{L_REG_COND}</strong></dd></dl>
<!-- ENDIF -->
<dl>
<dt><label for="username">{L_USERNAME}:</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt>
! <dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" title="{L_USERNAME}" /></dd>
</dl>
<dl>
<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt>
! <dd><input type="text" tabindex="2" name="email" id="email" size="25" maxlength="100" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" /></dd>
</dl>
<dl>
<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label></dt>
! <dd><input type="text" tabindex="3" name="email_confirm" id="email_confirm" size="25" maxlength="100" value="{EMAIL_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_EMAIL}" /></dd>
</dl>
<dl>
<dt><label for="new_password">{L_PASSWORD}:</label><br /><span>{L_PASSWORD_EXPLAIN}</span></dt>
! <dd><input type="password" tabindex="4" name="new_password" id="new_password" size="25" value="{PASSWORD}" class="inputbox autowidth" title="{L_NEW_PASSWORD}" /></dd>
</dl>
<dl>
<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label></dt>
! <dd><input type="password" tabindex="5" name="password_confirm" id="password_confirm" size="25" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}" /></dd>
</dl>
<hr />
<dl>
<dt><label for="lang">{L_LANGUAGE}:</label></dt>
! <dd><select name="lang" id="lang" onchange="change_language(this.value); return false;" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select></dd>
</dl>
<dl>
<dt><label for="tz">{L_TIMEZONE}:</label></dt>
! <dd><select name="tz" id="tz" class="autowidth">{S_TZ_OPTIONS}</select></dd>
</dl>
<!-- IF .profile_fields -->
--- 26,63 ----
<!-- IF L_REG_COND -->
<dl><dd><strong>{L_REG_COND}</strong></dd></dl>
<!-- ENDIF -->
+ <!-- DEFINE $TAB_INDEX = 1 -->
<dl>
<dt><label for="username">{L_USERNAME}:</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt>
! <dd><input type="text" tabindex="<!-- INC $TAB_INDEX -->" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" title="{L_USERNAME}" /></dd>
</dl>
<dl>
<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt>
! <dd><input type="text" tabindex="<!-- INC $TAB_INDEX -->" name="email" id="email" size="25" maxlength="100" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" /></dd>
</dl>
<dl>
<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label></dt>
! <dd><input type="text" tabindex="<!-- INC $TAB_INDEX -->" name="email_confirm" id="email_confirm" size="25" maxlength="100" value="{EMAIL_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_EMAIL}" /></dd>
</dl>
<dl>
<dt><label for="new_password">{L_PASSWORD}:</label><br /><span>{L_PASSWORD_EXPLAIN}</span></dt>
! <dd><input type="password" tabindex="<!-- INC $TAB_INDEX -->" name="new_password" id="new_password" size="25" value="{PASSWORD}" class="inputbox autowidth" title="{L_NEW_PASSWORD}" /></dd>
</dl>
<dl>
<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label></dt>
! <dd><input type="password" tabindex="<!-- INC $TAB_INDEX -->" name="password_confirm" id="password_confirm" size="25" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}" /></dd>
</dl>
<hr />
<dl>
<dt><label for="lang">{L_LANGUAGE}:</label></dt>
! <dd><select name="lang" id="lang" onchange="change_language(this.value); return false;" tabindex="<!-- INC $TAB_INDEX -->" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select></dd>
</dl>
<dl>
<dt><label for="tz">{L_TIMEZONE}:</label></dt>
! <dd><select name="tz" id="tz" tabindex="<!-- INC $TAB_INDEX -->" class="autowidth">{S_TZ_OPTIONS}</select></dd>
</dl>
<!-- IF .profile_fields -->
|
|
From: Andreas F. <ba...@ph...> - 2009-08-24 00:30:26
|
Author: bantu
Date: Mon Aug 24 01:29:23 2009
New Revision: 10049
Log:
Fix bug #50245 - Check for correct module name when installing the "Send statistics" module.
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 Mon Aug 24 01:29:23 2009
***************
*** 1324,1335 ****
{
$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);
--- 1324,1335 ----
{
$category_id = (int) $row['module_id'];
! // Check if we need to add the module or if it is already there. ;)
$sql = 'SELECT *
FROM ' . MODULES_TABLE . "
WHERE module_class = 'acp'
AND module_langname = 'ACP_SEND_STATISTICS'
! AND module_mode = 'send_statistics'
AND module_auth = 'acl_a_server'
AND parent_id = {$category_id}";
$result2 = $db->sql_query($sql);
|
|
From: Andreas F. <ba...@ph...> - 2009-08-23 15:12:30
|
Author: bantu
Date: Sun Aug 23 16:11:43 2009
New Revision: 10048
Log:
Missed one file.
Modified:
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_default.html
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_default.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_default.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_default.html Sun Aug 23 16:11:43 2009
***************
*** 9,16 ****
<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></td>
</tr>
<tr>
! <td class="row1"><b class="genmed">{L_CONFIRM_CODE}: </b><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}
! </span></td>
<td class="row2"><input class="post" type="text" name="confirm_code" size="8" maxlength="8" />
<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF --></td>
</tr>
--- 9,15 ----
<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></td>
</tr>
<tr>
! <td class="row1"><b class="genmed">{L_CONFIRM_CODE}:</b><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}</span></td>
<td class="row2"><input class="post" type="text" name="confirm_code" size="8" maxlength="8" />
<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF --></td>
</tr>
|
7 messages has been excluded from this view by a project administrator.
