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: Chris S. <too...@ph...> - 2009-07-25 13:44:48
|
Author: toonarmy
Date: Sat Jul 25 11:16:13 2009
New Revision: 9847
Log:
Small change to r9839
Modified:
branches/phpBB-3_0_0/phpBB/includes/template.php
Modified: branches/phpBB-3_0_0/phpBB/includes/template.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/template.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/template.php Sat Jul 25 11:16:13 2009
***************
*** 39,46 ****
var $files_inherit = array();
var $files_template = array();
var $inherit_root = '';
! var $orig_tpl_storedb = 'undefined';
! var $orig_tpl_inherits_id = 'undefined';
// this will hash handle names to the compiled/uncompiled code for that handle.
var $compiled_code = array();
--- 39,46 ----
var $files_inherit = array();
var $files_template = array();
var $inherit_root = '';
! var $orig_tpl_storedb;
! var $orig_tpl_inherits_id;
// this will hash handle names to the compiled/uncompiled code for that handle.
var $compiled_code = array();
***************
*** 57,70 ****
{
$this->root = $phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template';
$this->cachepath = $phpbb_root_path . 'cache/tpl_' . str_replace('_', '-', $user->theme['template_path']) . '_';
! if ($this->orig_tpl_storedb == 'undefined')
{
$this->orig_tpl_storedb = $user->theme['template_storedb'];
}
! if ($this->orig_tpl_inherits_id == 'undefined')
{
$this->orig_tpl_inherits_id = $user->theme['template_inherits_id'];
}
$user->theme['template_storedb'] = $this->orig_tpl_storedb;
$user->theme['template_inherits_id'] = $this->orig_tpl_inherits_id;
--- 57,73 ----
{
$this->root = $phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template';
$this->cachepath = $phpbb_root_path . 'cache/tpl_' . str_replace('_', '-', $user->theme['template_path']) . '_';
!
! if ($this->orig_tpl_storedb === null)
{
$this->orig_tpl_storedb = $user->theme['template_storedb'];
}
!
! if ($this->orig_tpl_inherits_id === null)
{
$this->orig_tpl_inherits_id = $user->theme['template_inherits_id'];
}
+
$user->theme['template_storedb'] = $this->orig_tpl_storedb;
$user->theme['template_inherits_id'] = $this->orig_tpl_inherits_id;
|
|
From: Henry S. <kel...@ph...> - 2009-07-25 13:44:47
|
Author: Kellanved
Date: Sat Jul 25 12:49:14 2009
New Revision: 9849
Log:
details
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Sat Jul 25 12:49:14 2009
***************
*** 199,204 ****
--- 199,210 ----
<li>[Change] Cache get_username_string() function calls on viewtopic.</li>
<li>[Feature] Add language selection on the registration terms page (Bug #15085 - Patch by leviatan21)</li>
<li>[Feature] Backported 3.2 captcha plugins.</li>
+ <ul>
+ <li>Classic and GD CAPTCHA</li>
+ <li>reCaptcha (based on API from recaptcha.net by Mike Crawford and Ben Maurer)</li>
+ <li>Q&A CAPTCHA</li>
+ <li>3D Wave (by Robert "e;Xore& Hetzler)/li>
+ </ul>
<li>[Feature] Introduced new ACM plugins:
<ul>
<li>null</li>
|
|
From: Ruslan U. <rx...@ph...> - 2009-07-24 12:05:52
|
Author: rxu
Date: Fri Jul 24 12:05:17 2009
New Revision: 9846
Log:
Fix bug #38055 - Post reply button shown in locked forum
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/viewtopic.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 Jul 24 12:05:17 2009
***************
*** 175,180 ****
--- 175,181 ----
<li>[Fix] Do not add style-parameter to URL again, after admin re-authentification (Bug #18005 - Patch by leviatan21)</li>
<li>[Fix] Do not cut post-message in between HTML-Entities on search.php (Bug #31505 - Patch by leviatan21)</li>
<li>[Fix] Correctly set attachment flag for topics, posts and pms after deleting attachments (Bug #48265 - Patch by WorldWar and nickvergessen)</li>
+ <li>[Fix] Display "Locked" button instead of "Reply" one for locked forum in viewtopic (prosilver). (Bug #38055 - Patch by Raimon)</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>
<li>[Change] Template engine now permits to a limited extent variable includes.</li>
Modified: branches/phpBB-3_0_0/phpBB/viewtopic.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/viewtopic.php (original)
--- branches/phpBB-3_0_0/phpBB/viewtopic.php Fri Jul 24 12:05:17 2009
***************
*** 605,611 ****
'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'POST_UNAPPROVED'),
'WARN_IMG' => $user->img('icon_user_warn', 'WARN_USER'),
! 'S_IS_LOCKED' =>($topic_data['topic_status'] == ITEM_UNLOCKED) ? false : true,
'S_SELECT_SORT_DIR' => $s_sort_dir,
'S_SELECT_SORT_KEY' => $s_sort_key,
'S_SELECT_SORT_DAYS' => $s_limit_days,
--- 605,611 ----
'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'POST_UNAPPROVED'),
'WARN_IMG' => $user->img('icon_user_warn', 'WARN_USER'),
! 'S_IS_LOCKED' => ($topic_data['topic_status'] == ITEM_UNLOCKED && $topic_data['forum_status'] == ITEM_UNLOCKED) ? false : true,
'S_SELECT_SORT_DIR' => $s_sort_dir,
'S_SELECT_SORT_KEY' => $s_sort_key,
'S_SELECT_SORT_DAYS' => $s_limit_days,
|
|
From: Meik S. <acy...@ph...> - 2009-07-24 11:14:49
|
Author: acydburn
Date: Fri Jul 24 11:13:32 2009
New Revision: 9845
Log:
[Feature] Added new functionality to inactive users module:
- Ability to set users per page.
- Ability to sort by posts/number of reminders/last reminded date.
- Show number of posts and ability to search posts.
- Show number of reminders sent to user.
- Show date of last reminder sent to user.
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/acp_inactive.html
branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/acp/acp_inactive.php
branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
branches/phpBB-3_0_0/phpBB/install/database_update.php
branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
branches/phpBB-3_0_0/phpBB/language/en/common.php
branches/phpBB-3_0_0/phpBB/language/en/memberlist.php
Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_inactive.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_inactive.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_inactive.html Fri Jul 24 11:13:32 2009
***************
*** 12,18 ****
<!-- IF PAGINATION -->
<div class="pagination">
! <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span>
</div>
<!-- ENDIF -->
--- 12,18 ----
<!-- IF PAGINATION -->
<div class="pagination">
! <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span>
</div>
<!-- ENDIF -->
***************
*** 22,29 ****
<th>{L_USERNAME}</th>
<th>{L_JOINED}</th>
<th>{L_INACTIVE_DATE}</th>
- <th>{L_INACTIVE_REASON}</th>
<th>{L_LAST_VISIT}</th>
<th>{L_MARK}</th>
</tr>
</thead>
--- 22,29 ----
<th>{L_USERNAME}</th>
<th>{L_JOINED}</th>
<th>{L_INACTIVE_DATE}</th>
<th>{L_LAST_VISIT}</th>
+ <th>{L_INACTIVE_REASON}</th>
<th>{L_MARK}</th>
</tr>
</thead>
***************
*** 31,41 ****
<!-- BEGIN inactive -->
<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
! <td><a href="{inactive.U_USER_ADMIN}">{inactive.USERNAME}</a></td>
! <td>{inactive.JOINED}</td>
! <td>{inactive.INACTIVE_DATE}</td>
! <td>{inactive.REASON}</td>
! <td>{inactive.LAST_VISIT}</td>
<td> <input type="checkbox" class="radio" name="mark[]" value="{inactive.USER_ID}" /> </td>
</tr>
<!-- BEGINELSE -->
--- 31,46 ----
<!-- BEGIN inactive -->
<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
! <td style="vertical-align: top;">
! {inactive.USERNAME_FULL}
! <!-- IF inactive.POSTS --><br />{L_POSTS}: <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
! </td>
! <td style="vertical-align: top;">{inactive.JOINED}</td>
! <td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td>
! <td style="vertical-align: top;">{inactive.LAST_VISIT}</td>
! <td style="vertical-align: top;">
! {inactive.REASON}
! <!-- IF inactive.REMINDED --><br />{inactive.REMINDED_EXPLAIN}<!-- ENDIF -->
<td> <input type="checkbox" class="radio" name="mark[]" value="{inactive.USER_ID}" /> </td>
</tr>
<!-- BEGINELSE -->
***************
*** 46,70 ****
</tbody>
</table>
! <fieldset class="display-options">
! {L_DISPLAY_LOG}: {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
! <input class="button2" type="submit" value="{L_GO}" name="sort" />
! </fieldset>
! <hr />
! <!-- IF PAGINATION -->
! <div class="pagination">
! <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span>
! </div>
! <!-- ENDIF -->
! <fieldset class="quick">
! <select name="action">{S_INACTIVE_OPTIONS}</select>
! <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
! <p class="small"><a href="#" onclick="marklist('inactive', 'mark', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('inactive', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>
! {S_FORM_TOKEN}
! </fieldset>
</form>
--- 51,75 ----
</tbody>
</table>
! <fieldset class="display-options">
! {L_DISPLAY_LOG}: {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}<!-- IF PAGINATION --> Users per page: <input class="inputbox autowidth" type="text" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF -->
! <input class="button2" type="submit" value="{L_GO}" name="sort" />
! </fieldset>
! <hr />
+ <!-- IF PAGINATION -->
+ <div class="pagination">
+ <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span>
+ </div>
+ <!-- ENDIF -->
+ <fieldset class="quick">
+ <select name="action">{S_INACTIVE_OPTIONS}</select>
+ <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
+ <p class="small"><a href="#" onclick="marklist('inactive', 'mark', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('inactive', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>
+ {S_FORM_TOKEN}
+ </fieldset>
</form>
Modified: branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php (original)
--- branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php Fri Jul 24 11:13:32 2009
***************
*** 1860,1865 ****
--- 1860,1867 ----
'user_newpasswd' => array('VCHAR_UNI:40', ''),
'user_form_salt' => array('VCHAR_UNI:32', ''),
'user_new' => array('BOOL', 1),
+ 'user_reminded' => array('TINT:4', 0),
+ 'user_reminded_time' => array('TIMESTAMP', 0),
),
'PRIMARY_KEY' => 'user_id',
'KEYS' => array(
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 Jul 24 11:13:32 2009
***************
*** 226,231 ****
--- 226,240 ----
<li>[Feature] Users can report PMs to moderators which are then visible in a new MCP module</li>
<li>[Feature] Parse email text files with the template engine.</li>
<li>[Feature] Use email-style quoting when bbcodes are disabled.</li>
+ <li>[Feature] Added new functionality to inactive users module:
+ <ul>
+ <li>Ability to set users per page.</li>
+ <li>Ability to sort by posts/number of reminders/last reminded date.</li>
+ <li>Show number of posts and ability to search posts.</li>
+ <li>Show number of reminders sent to user.</li>
+ <li>Show date of last reminder sent to user.</li>
+ </ul>
+ </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_inactive.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_inactive.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_inactive.php Fri Jul 24 11:13:32 2009
***************
*** 51,56 ****
--- 51,69 ----
$form_key = 'acp_inactive';
add_form_key($form_key);
+ // We build the sort key and per page settings here, because they may be needed later
+
+ // Number of entries to display
+ $per_page = request_var('users_per_page', (int) $config['topics_per_page']);
+
+ // Sorting
+ $limit_days = array(0 => $user->lang['ALL_ENTRIES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']);
+ $sort_by_text = array('i' => $user->lang['SORT_INACTIVE'], 'j' => $user->lang['SORT_REG_DATE'], 'l' => $user->lang['SORT_LAST_VISIT'], 'd' => $user->lang['SORT_LAST_REMINDER'], 'r' => $user->lang['SORT_REASON'], 'u' => $user->lang['SORT_USERNAME'], 'p' => $user->lang['SORT_POSTS'], 'e' => $user->lang['SORT_REMINDER']);
+ $sort_by_sql = array('i' => 'user_inactive_time', 'j' => 'user_regdate', 'l' => 'user_lastvisit', 'd' => 'user_reminded_time', 'r' => 'user_inactive_reason', 'u' => 'username_clean', 'p' => 'user_posts', 'e' => 'user_reminded');
+
+ $s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
+ 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);
+
if ($submit && sizeof($mark))
{
if ($action !== 'delete' && !check_form_key($form_key))
***************
*** 67,73 ****
FROM ' . USERS_TABLE . '
WHERE ' . $db->sql_in_set('user_id', $mark);
$result = $db->sql_query($sql);
!
$user_affected = array();
while ($row = $db->sql_fetchrow($result))
{
--- 80,86 ----
FROM ' . USERS_TABLE . '
WHERE ' . $db->sql_in_set('user_id', $mark);
$result = $db->sql_query($sql);
!
$user_affected = array();
while ($row = $db->sql_fetchrow($result))
{
***************
*** 122,127 ****
--- 135,146 ----
$messenger->save_queue();
}
+
+ // For activate we really need to redirect, else a refresh can result in users being deactivated again
+ $u_action = $this->u_action . "&$u_sort_param&start=$start";
+ $u_action .= ($per_page != $config['topics_per_page']) ? "&users_per_page=$per_page" : '';
+
+ redirect($u_action);
}
else if ($action == 'delete')
{
***************
*** 175,181 ****
include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
$messenger = new messenger();
! $usernames = array();
do
{
--- 194,200 ----
include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
$messenger = new messenger();
! $usernames = $user_ids = array();
do
{
***************
*** 198,225 ****
$messenger->send($row['user_notify_type']);
$usernames[] = $row['username'];
}
while ($row = $db->sql_fetchrow($result));
$messenger->save_queue();
add_log('admin', 'LOG_INACTIVE_REMIND', implode(', ', $usernames));
unset($usernames);
}
$db->sql_freeresult($result);
!
break;
}
}
- // Sorting
- $limit_days = array(0 => $user->lang['ALL_ENTRIES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']);
- $sort_by_text = array('i' => $user->lang['SORT_INACTIVE'], 'j' => $user->lang['SORT_REG_DATE'], 'l' => $user->lang['SORT_LAST_VISIT'], 'r' => $user->lang['SORT_REASON'], 'u' => $user->lang['SORT_USERNAME']);
- $sort_by_sql = array('i' => 'user_inactive_time', 'j' => 'user_regdate', 'l' => 'user_lastvisit', 'r' => 'user_inactive_reason', 'u' => 'username_clean');
-
- $s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
- 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);
-
// Define where and sort sql for use in displaying logs
$sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
--- 217,250 ----
$messenger->send($row['user_notify_type']);
$usernames[] = $row['username'];
+ $user_ids[] = (int) $row['user_id'];
}
while ($row = $db->sql_fetchrow($result));
$messenger->save_queue();
+ // Add the remind state to the database
+ $sql = 'UPDATE ' . USERS_TABLE . '
+ SET user_reminded = user_reminded + 1,
+ user_reminded_time = ' . time() . '
+ WHERE ' . $db->sql_in_set('user_id', $user_ids);
+ $db->sql_query($sql);
+
add_log('admin', 'LOG_INACTIVE_REMIND', implode(', ', $usernames));
unset($usernames);
}
$db->sql_freeresult($result);
!
! // For remind we really need to redirect, else a refresh can result in more than one reminder
! $u_action = $this->u_action . "&$u_sort_param&start=$start";
! $u_action .= ($per_page != $config['topics_per_page']) ? "&users_per_page=$per_page" : '';
!
! redirect($u_action);
!
break;
}
}
// Define where and sort sql for use in displaying logs
$sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
***************
*** 227,245 ****
$inactive = array();
$inactive_count = 0;
! $start = view_inactive_users($inactive, $inactive_count, $config['topics_per_page'], $start, $sql_where, $sql_sort);
foreach ($inactive as $row)
{
$template->assign_block_vars('inactive', array(
'INACTIVE_DATE' => $user->format_date($row['user_inactive_time']),
'JOINED' => $user->format_date($row['user_regdate']),
'LAST_VISIT' => (!$row['user_lastvisit']) ? ' - ' : $user->format_date($row['user_lastvisit']),
'REASON' => $row['inactive_reason'],
'USER_ID' => $row['user_id'],
! 'USERNAME' => $row['username'],
! 'U_USER_ADMIN' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=users&mode=overview&u={$row['user_id']}"))
! );
}
$option_ary = array('activate' => 'ACTIVATE', 'delete' => 'DELETE');
--- 252,281 ----
$inactive = array();
$inactive_count = 0;
! $start = view_inactive_users($inactive, $inactive_count, $per_page, $start, $sql_where, $sql_sort);
foreach ($inactive as $row)
{
$template->assign_block_vars('inactive', array(
'INACTIVE_DATE' => $user->format_date($row['user_inactive_time']),
+ 'REMINDED_DATE' => $user->format_date($row['user_reminded_time']),
'JOINED' => $user->format_date($row['user_regdate']),
'LAST_VISIT' => (!$row['user_lastvisit']) ? ' - ' : $user->format_date($row['user_lastvisit']),
+
'REASON' => $row['inactive_reason'],
'USER_ID' => $row['user_id'],
! 'POSTS' => ($row['user_posts']) ? $row['user_posts'] : 0,
! 'REMINDED' => $row['user_reminded'],
!
! 'REMINDED_EXPLAIN' => $user->lang('USER_LAST_REMINDED', (int) $row['user_reminded'], $user->format_date($row['user_reminded_time'])),
!
! 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour'], false, append_sid("{$phpbb_admin_path}index.$phpEx", 'i=users&mode=overview')),
! 'USERNAME' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']),
! 'USER_COLOR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']),
!
! 'U_USER_ADMIN' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=users&mode=overview&u={$row['user_id']}"),
! 'U_SEARCH_USER' => ($auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id={$row['user_id']}&sr=posts") : '',
! ));
}
$option_ary = array('activate' => 'ACTIVATE', 'delete' => 'DELETE');
***************
*** 255,263 ****
'S_LIMIT_DAYS' => $s_limit_days,
'S_SORT_KEY' => $s_sort_key,
'S_SORT_DIR' => $s_sort_dir,
! 'S_ON_PAGE' => on_page($inactive_count, $config['topics_per_page'], $start),
! 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param", $inactive_count, $config['topics_per_page'], $start, true),
!
'U_ACTION' => $this->u_action . '&start=' . $start,
));
--- 291,300 ----
'S_LIMIT_DAYS' => $s_limit_days,
'S_SORT_KEY' => $s_sort_key,
'S_SORT_DIR' => $s_sort_dir,
! 'S_ON_PAGE' => on_page($inactive_count, $per_page, $start),
! 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param&users_per_page=$per_page", $inactive_count, $per_page, $start, true),
! 'USERS_PER_PAGE' => $per_page,
!
'U_ACTION' => $this->u_action . '&start=' . $start,
));
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 Fri Jul 24 11:13:32 2009
***************
*** 2375,2381 ****
FROM " . LOG_TABLE . " l, " . USERS_TABLE . " u
WHERE l.log_type = $log_type
AND u.user_id = l.user_id
! " . (($limit_days) ? "AND l.log_time >= $limit_days" : '') .
(!empty($log_operation) ? "AND l.log_operation = '" . $db->sql_escape($log_operation) . "'" : '') . "
$sql_forum
ORDER BY $sort_by";
--- 2375,2381 ----
FROM " . LOG_TABLE . " l, " . USERS_TABLE . " u
WHERE l.log_type = $log_type
AND u.user_id = l.user_id
! " . (($limit_days) ? "AND l.log_time >= $limit_days" : '') .
(!empty($log_operation) ? "AND l.log_operation = '" . $db->sql_escape($log_operation) . "'" : '') . "
$sql_forum
ORDER BY $sort_by";
***************
*** 2685,2691 ****
$offset = ($offset - $limit < 0) ? 0 : $offset - $limit;
}
! $sql = 'SELECT user_id, username, user_regdate, user_lastvisit, user_inactive_time, user_inactive_reason
FROM ' . USERS_TABLE . '
WHERE user_type = ' . USER_INACTIVE .
(($limit_days) ? " AND user_inactive_time >= $limit_days" : '') . "
--- 2685,2691 ----
$offset = ($offset - $limit < 0) ? 0 : $offset - $limit;
}
! $sql = 'SELECT *
FROM ' . USERS_TABLE . '
WHERE user_type = ' . USER_INACTIVE .
(($limit_days) ? " AND user_inactive_time >= $limit_days" : '') . "
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 Fri Jul 24 11:13:32 2009
***************
*** 11,17 ****
$updates_to_version = '3.0.6-dev';
// Enter any version to update from to test updates. The version within the db will not be updated.
! $debug_from_version = false;
// Which oldest version does this updater supports?
$oldest_from_version = '3.0.0';
--- 11,17 ----
$updates_to_version = '3.0.6-dev';
// Enter any version to update from to test updates. The version within the db will not be updated.
! $debug_from_version = '3.0.5';
// Which oldest version does this updater supports?
$oldest_from_version = '3.0.0';
***************
*** 696,702 ****
'attempts' => array('UINT', 0),
),
USERS_TABLE => array(
! 'user_new' => array('BOOL', 1),
),
GROUPS_TABLE => array(
'group_skip_auth' => array('BOOL', 0, 'after' => 'group_founder_manage'),
--- 696,704 ----
'attempts' => array('UINT', 0),
),
USERS_TABLE => array(
! 'user_new' => array('BOOL', 1),
! 'user_reminded' => array('TINT:4', 0),
! 'user_reminded_time'=> array('TIMESTAMP', 0),
),
GROUPS_TABLE => array(
'group_skip_auth' => array('BOOL', 0, 'after' => 'group_founder_manage'),
***************
*** 714,720 ****
),
REPORTS_TABLE => array(
'post_id' => array('post_id'),
! 'pm_id' => array('pm_id'),
),
),
),
--- 716,722 ----
),
REPORTS_TABLE => array(
'post_id' => array('post_id'),
! 'pm_id' => array('pm_id'),
),
),
),
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/common.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/common.php Fri Jul 24 11:13:32 2009
***************
*** 399,404 ****
--- 399,406 ----
'SORT_LAST_VISIT' => 'Last visit',
'SORT_REASON' => 'Reason',
'SORT_REG_DATE' => 'Registration date',
+ 'SORT_LAST_REMINDER'=> 'Last reminded',
+ 'SORT_REMINDER' => 'Reminder sent',
'USER_IS_INACTIVE' => 'User is inactive',
));
Modified: branches/phpBB-3_0_0/phpBB/language/en/common.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/common.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/common.php Fri Jul 24 11:13:32 2009
***************
*** 541,546 ****
--- 541,547 ----
'SORT_JOINED' => 'Joined date',
'SORT_LOCATION' => 'Location',
'SORT_RANK' => 'Rank',
+ 'SORT_POSTS' => 'Posts',
'SORT_TOPIC_TITLE' => 'Topic title',
'SORT_USERNAME' => 'Username',
'SPLIT_TOPIC' => 'Split topic',
Modified: branches/phpBB-3_0_0/phpBB/language/en/memberlist.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/memberlist.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/memberlist.php Fri Jul 24 11:13:32 2009
***************
*** 81,87 ****
'IM_MESSAGE' => 'Your message',
'IM_MSNM' => 'Please note that you need Windows Messenger installed to use this.',
'IM_MSNM_BROWSER' => 'Your browser does not support this.',
! 'IM_MSNM_CONNECT' => 'MSNM is not connected.\nYou have to connect to MSNM to continue.',
'IM_NAME' => 'Your Name',
'IM_NO_DATA' => 'There is no suitable contact information for this user.',
'IM_NO_JABBER' => 'Sorry, direct messaging of Jabber users is not supported on this board. You will need a Jabber client installed on your system to contact the recipient above.',
--- 81,87 ----
'IM_MESSAGE' => 'Your message',
'IM_MSNM' => 'Please note that you need Windows Messenger installed to use this.',
'IM_MSNM_BROWSER' => 'Your browser does not support this.',
! 'IM_MSNM_CONNECT' => 'MSNM is not connected.\nYou have to connect to MSNM to continue.',
'IM_NAME' => 'Your Name',
'IM_NO_DATA' => 'There is no suitable contact information for this user.',
'IM_NO_JABBER' => 'Sorry, direct messaging of Jabber users is not supported on this board. You will need a Jabber client installed on your system to contact the recipient above.',
***************
*** 90,96 ****
'IM_SEND_MESSAGE' => 'Send message',
'IM_SENT_JABBER' => 'Your message to %1$s has been sent successfully.',
'IM_USER' => 'Send an instant message',
!
'LAST_ACTIVE' => 'Last active',
'LESS_THAN' => 'Less than',
'LIST_USER' => '1 user',
--- 90,96 ----
'IM_SEND_MESSAGE' => 'Send message',
'IM_SENT_JABBER' => 'Your message to %1$s has been sent successfully.',
'IM_USER' => 'Send an instant message',
!
'LAST_ACTIVE' => 'Last active',
'LESS_THAN' => 'Less than',
'LIST_USER' => '1 user',
***************
*** 134,139 ****
--- 134,143 ----
'USER_ADMIN' => 'Administrate user',
'USER_BAN' => 'Banning',
'USER_FORUM' => 'User statistics',
+ 'USER_LAST_REMINDED' => array(
+ 0 => 'No reminder sent yet',
+ 1 => '%1$d reminder sent<br />» %2$s',
+ ),
'USER_ONLINE' => 'Online',
'USER_PRESENCE' => 'Board presence',
|
|
From: Joas S. <nic...@ph...> - 2009-07-24 09:06:19
|
Author: nickvergessen
Date: Fri Jul 24 09:05:48 2009
New Revision: 9844
Log:
Fix Bug #47475 - Remove redundant code in prosilver search_results.html
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/search_results.html
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/search_results.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/search_results.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/search_results.html Fri Jul 24 09:05:48 2009
***************
*** 18,24 ****
<div class="search-box" role="search">
<!-- IF SEARCH_IN_RESULTS -->
<label for="add_keywords">{L_SEARCH_IN_RESULTS}: <input type="text" name="add_keywords" id="add_keywords" value="" class="inputbox narrow" /></label>
- <input type="hidden" name="show_results" value="posts" />
<input class="button2" type="submit" name="submit" value="{L_SEARCH}" />
<!-- ENDIF -->
</div>
--- 18,23 ----
|
Author: nickvergessen
Date: Fri Jul 24 09:01:29 2009
New Revision: 9843
Log:
Fix bug #48265 - Correctly set attachment flag for topics, posts and pms after deleting attachments - Patch by WorldWar and nickvergessen
Authorised by: AcydBurn
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_posting.php
branches/phpBB-3_0_0/phpBB/includes/message_parser.php
branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_compose.php
branches/phpBB-3_0_0/phpBB/posting.php
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Fri Jul 24 09:01:29 2009
***************
*** 174,179 ****
--- 174,180 ----
<li>[Fix] Banning an already banned user states to be successful, but has no effect (Bug #47825 - Patch by Pyramide)</li>
<li>[Fix] Do not add style-parameter to URL again, after admin re-authentification (Bug #18005 - Patch by leviatan21)</li>
<li>[Fix] Do not cut post-message in between HTML-Entities on search.php (Bug #31505 - Patch by leviatan21)</li>
+ <li>[Fix] Correctly set attachment flag for topics, posts and pms after deleting attachments (Bug #48265 - Patch by WorldWar and nickvergessen)</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>
<li>[Change] Template engine now permits to a limited extent variable includes.</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 Fri Jul 24 09:01:29 2009
***************
*** 892,910 ****
// Update post indicators for posts now no longer having attachments
if (sizeof($post_ids))
{
! $sql = 'UPDATE ' . POSTS_TABLE . '
! SET post_attachment = 0
! WHERE ' . $db->sql_in_set('post_id', $post_ids);
! $db->sql_query($sql);
}
// Update message table if messages are affected
if (sizeof($message_ids))
{
! $sql = 'UPDATE ' . PRIVMSGS_TABLE . '
! SET message_attachment = 0
! WHERE ' . $db->sql_in_set('msg_id', $message_ids);
! $db->sql_query($sql);
}
// Now update the topics. This is a bit trickier, because there could be posts still having attachments within the topic
--- 892,952 ----
// Update post indicators for posts now no longer having attachments
if (sizeof($post_ids))
{
! // Just check which posts are still having an assigned attachment not orphaned by querying the attachments table
! $sql = 'SELECT post_msg_id
! FROM ' . ATTACHMENTS_TABLE . '
! WHERE ' . $db->sql_in_set('post_msg_id', $post_ids) . '
! AND in_message = 0
! AND is_orphan = 0';
! $result = $db->sql_query($sql);
!
! $remaining_ids = array();
! while ($row = $db->sql_fetchrow($result))
! {
! $remaining_ids[] = $row['post_msg_id'];
! }
! $db->sql_freeresult($result);
!
! // Now only unset those ids remaining
! $post_ids = array_diff($post_ids, $remaining_ids);
!
! if (sizeof($post_ids))
! {
! $sql = 'UPDATE ' . POSTS_TABLE . '
! SET post_attachment = 0
! WHERE ' . $db->sql_in_set('post_id', $post_ids);
! $db->sql_query($sql);
! }
}
// Update message table if messages are affected
if (sizeof($message_ids))
{
! // Just check which messages are still having an assigned attachment not orphaned by querying the attachments table
! $sql = 'SELECT post_msg_id
! FROM ' . ATTACHMENTS_TABLE . '
! WHERE ' . $db->sql_in_set('post_msg_id', $message_ids) . '
! AND in_message = 1
! AND is_orphan = 0';
! $result = $db->sql_query($sql);
!
! $remaining_ids = array();
! while ($row = $db->sql_fetchrow($result))
! {
! $remaining_ids[] = $row['post_msg_id'];
! }
! $db->sql_freeresult($result);
!
! // Now only unset those ids remaining
! $message_ids = array_diff($message_ids, $remaining_ids);
!
! if (sizeof($message_ids))
! {
! $sql = 'UPDATE ' . PRIVMSGS_TABLE . '
! SET message_attachment = 0
! WHERE ' . $db->sql_in_set('msg_id', $message_ids);
! $db->sql_query($sql);
! }
}
// Now update the topics. This is a bit trickier, because there could be posts still having attachments within the topic
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_posting.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_posting.php Fri Jul 24 09:01:29 2009
***************
*** 1549,1554 ****
--- 1549,1569 ----
break;
}
+ if (($post_mode == 'delete') || ($post_mode == 'delete_last_post') || ($post_mode == 'delete_first_post'))
+ {
+ $sql = 'SELECT 1 AS has_attachments
+ FROM ' . ATTACHMENTS_TABLE . '
+ WHERE ' . $db->sql_in_set('topic_id', $topic_ids);
+ $result = $db->sql_query($sql);
+ $has_attachments = (int) $db->sql_fetchfield('has_attachments');
+ $db->sql_freeresult($result);
+
+ if (!$has_attachments)
+ {
+ $sql_data[TOPICS_TABLE] .= ', topic_attachment = 0';
+ }
+ }
+
// $sql_data[USERS_TABLE] = ($data['post_postcount']) ? 'user_posts = user_posts - 1' : '';
$db->sql_transaction('begin');
Modified: branches/phpBB-3_0_0/phpBB/includes/message_parser.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/message_parser.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/message_parser.php Fri Jul 24 09:01:29 2009
***************
*** 1334,1340 ****
/**
* Parse Attachments
*/
! function parse_attachments($form_name, $mode, $forum_id, $submit, $preview, $refresh, $is_message = false)
{
global $config, $auth, $user, $phpbb_root_path, $phpEx, $db;
--- 1334,1340 ----
/**
* Parse Attachments
*/
! function parse_attachments($form_name, $mode, $forum_id, $submit, $preview, $refresh, $is_message = false, $post_msg_id = 0, $topic_id = 0)
{
global $config, $auth, $user, $phpbb_root_path, $phpEx, $db;
***************
*** 1487,1502 ****
'filesize' => $filedata['filesize'],
'filetime' => $filedata['filetime'],
'thumbnail' => $filedata['thumbnail'],
! 'is_orphan' => 1,
'in_message' => ($is_message) ? 1 : 0,
'poster_id' => $user->data['user_id'],
);
$db->sql_query('INSERT INTO ' . ATTACHMENTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
$new_entry = array(
'attach_id' => $db->sql_nextid(),
! 'is_orphan' => 1,
'real_filename' => $filedata['real_filename'],
'attach_comment'=> $this->filename_data['filecomment'],
);
--- 1487,1511 ----
'filesize' => $filedata['filesize'],
'filetime' => $filedata['filetime'],
'thumbnail' => $filedata['thumbnail'],
! 'is_orphan' => ($post_msg_id) ? 0 : 1,
'in_message' => ($is_message) ? 1 : 0,
'poster_id' => $user->data['user_id'],
);
+ if ($post_msg_id)
+ {
+ $sql_ary['post_msg_id'] = $post_msg_id;
+ if ($topic_id)
+ {
+ $sql_ary['topic_id'] = $topic_id;
+ }
+ }
+
$db->sql_query('INSERT INTO ' . ATTACHMENTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
$new_entry = array(
'attach_id' => $db->sql_nextid(),
! 'is_orphan' => ($post_msg_id) ? 0 : 1,
'real_filename' => $filedata['real_filename'],
'attach_comment'=> $this->filename_data['filecomment'],
);
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 Fri Jul 24 09:01:29 2009
***************
*** 665,671 ****
}
// Parse Attachments - before checksum is calculated
! $message_parser->parse_attachments('fileupload', $action, 0, $submit, $preview, $refresh, true);
if (sizeof($message_parser->warn_msg) && !($remove_u || $remove_g || $add_to || $add_bcc))
{
--- 665,686 ----
}
// Parse Attachments - before checksum is calculated
! if ($action == 'edit')
! {
! $message_parser->parse_attachments('fileupload', $action, 0, $submit, $preview, $refresh, true, $msg_id);
! if (sizeof($message_parser->attachment_data))
! {
! // Update attachment indicators for pms having attachments now, as a precaution if the pm does not get stored by submit
! $sql = 'UPDATE ' . PRIVMSGS_TABLE . '
! SET message_attachment = 1
! WHERE msg_id = ' . $msg_id;
! $db->sql_query($sql);
! }
! }
! else
! {
! $message_parser->parse_attachments('fileupload', $action, 0, $submit, $preview, $refresh, true);
! }
if (sizeof($message_parser->warn_msg) && !($remove_u || $remove_g || $add_to || $add_bcc))
{
Modified: branches/phpBB-3_0_0/phpBB/posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/posting.php (original)
--- branches/phpBB-3_0_0/phpBB/posting.php Fri Jul 24 09:01:29 2009
***************
*** 700,706 ****
}
// Parse Attachments - before checksum is calculated
! $message_parser->parse_attachments('fileupload', $mode, $forum_id, $submit, $preview, $refresh);
// Grab md5 'checksum' of new message
$message_md5 = md5($message_parser->message);
--- 700,727 ----
}
// Parse Attachments - before checksum is calculated
! if ($mode == 'edit')
! {
! $message_parser->parse_attachments('fileupload', $mode, $forum_id, $submit, $preview, $refresh, false, $post_id, $topic_id);
! if (sizeof($message_parser->attachment_data))
! {
! // Update attachment indicators for post/topic having attachments now, as a precaution if the post does not get stored by submit
! $sql = 'UPDATE ' . POSTS_TABLE . '
! SET post_attachment = 1
! WHERE post_id = ' . $post_id;
! $db->sql_query($sql);
!
! $sql = 'UPDATE ' . TOPICS_TABLE . '
! SET topic_attachment = 1
! WHERE topic_id = ' . $topic_id;
! $db->sql_query($sql);
! }
! }
! else
! {
! $message_parser->parse_attachments('fileupload', $mode, $forum_id, $submit, $preview, $refresh);
! }
!
// Grab md5 'checksum' of new message
$message_md5 = md5($message_parser->message);
|
|
From: Joas S. <nic...@ph...> - 2009-07-24 08:56:44
|
Author: nickvergessen
Date: Fri Jul 24 08:56:06 2009
New Revision: 9842
Log:
Fix bug #31505 - Do not cut post-message in between HTML-Entities on search.php - Patch by leviatan21
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/functions_content.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 Jul 24 08:56:06 2009
***************
*** 173,178 ****
--- 173,179 ----
<li>[Fix] Fix set_custom_template for database-stored styles (Bug #40515 - Patch by nickvergessen)</li>
<li>[Fix] Banning an already banned user states to be successful, but has no effect (Bug #47825 - Patch by Pyramide)</li>
<li>[Fix] Do not add style-parameter to URL again, after admin re-authentification (Bug #18005 - Patch by leviatan21)</li>
+ <li>[Fix] Do not cut post-message in between HTML-Entities on search.php (Bug #31505 - Patch by leviatan21)</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>
<li>[Change] Template engine now permits to a limited extent variable includes.</li>
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_content.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_content.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_content.php Fri Jul 24 08:56:06 2009
***************
*** 250,255 ****
--- 250,260 ----
// first replace all whitespaces with single spaces
$text = preg_replace('/ +/', ' ', strtr($text, "\t\n\r\x0C ", ' '));
+ // we need to turn the entities back into their original form, to not cut the message in between them
+ $entities = array('<', '>', '[', ']', '.', ':', ':');
+ $characters = array('<', '>', '[', ']', '.', ':', ':');
+ $text = str_replace($entities, $characters, $text);
+
$word_indizes = array();
if (sizeof($words))
{
***************
*** 345,357 ****
}
}
}
! return $final_text;
}
}
if (!sizeof($words) || !sizeof($word_indizes))
{
! return (utf8_strlen($text) >= $length + 3) ? utf8_substr($text, 0, $length) . '...' : $text;
}
}
--- 350,362 ----
}
}
}
! return str_replace($characters, $entities, $final_text);
}
}
if (!sizeof($words) || !sizeof($word_indizes))
{
! return str_replace($characters, $entities, ((utf8_strlen($text) >= $length + 3) ? utf8_substr($text, 0, $length) . '...' : $text));
}
}
|
|
From: Joas S. <nic...@ph...> - 2009-07-24 08:53:27
|
Author: nickvergessen
Date: Fri Jul 24 08:52:56 2009
New Revision: 9841
Log:
Fix bug #18005 - Do not add style-parameter to URL again, after admin re-authentification - Patch by leviatan21
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/session.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 Jul 24 08:52:56 2009
***************
*** 172,177 ****
--- 172,178 ----
<li>[Fix] Be less strict with FTP daemons when getting directory filelists. (Bug #46295)</li>
<li>[Fix] Fix set_custom_template for database-stored styles (Bug #40515 - Patch by nickvergessen)</li>
<li>[Fix] Banning an already banned user states to be successful, but has no effect (Bug #47825 - Patch by Pyramide)</li>
+ <li>[Fix] Do not add style-parameter to URL again, after admin re-authentification (Bug #18005 - Patch by leviatan21)</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>
<li>[Change] Template engine now permits to a limited extent variable includes.</li>
Modified: branches/phpBB-3_0_0/phpBB/includes/session.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/session.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/session.php Fri Jul 24 08:52:56 2009
***************
*** 1534,1540 ****
$this->add_lang($lang_set);
unset($lang_set);
! if (!empty($_GET['style']) && $auth->acl_get('a_styles'))
{
global $SID, $_EXTRA_URL;
--- 1534,1540 ----
$this->add_lang($lang_set);
unset($lang_set);
! if (!empty($_GET['style']) && $auth->acl_get('a_styles') && !defined('ADMIN_START'))
{
global $SID, $_EXTRA_URL;
|
|
From: Joas S. <nic...@ph...> - 2009-07-24 08:50:49
|
Author: nickvergessen
Date: Fri Jul 24 08:49:51 2009
New Revision: 9840
Log:
Fix bug #47825 - Banning an already banned user states to be successful, but has no effect - Patch by Pyramide
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/functions_user.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 Jul 24 08:49:51 2009
***************
*** 171,176 ****
--- 171,177 ----
<li>[Fix] Preserve newlines in template files (one newline had been always dropped after a template variable due to PHP's handling of closing tags)</li>
<li>[Fix] Be less strict with FTP daemons when getting directory filelists. (Bug #46295)</li>
<li>[Fix] Fix set_custom_template for database-stored styles (Bug #40515 - Patch by nickvergessen)</li>
+ <li>[Fix] Banning an already banned user states to be successful, but has no effect (Bug #47825 - Patch by Pyramide)</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>
<li>[Change] Template engine now permits to a limited extent variable includes.</li>
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 Jul 24 08:49:51 2009
***************
*** 1016,1022 ****
}
while ($row = $db->sql_fetchrow($result));
! $banlist_ary = array_unique(array_diff($banlist_ary, $banlist_ary_tmp));
unset($banlist_ary_tmp);
}
$db->sql_freeresult($result);
--- 1016,1032 ----
}
while ($row = $db->sql_fetchrow($result));
! $banlist_ary_tmp = array_intersect($banlist_ary, $banlist_ary_tmp);
!
! if (sizeof($banlist_ary_tmp))
! {
! // One or more entities are already banned/excluded, delete the existing bans, so they can be re-inserted with the given new length
! $sql = 'DELETE FROM ' . BANLIST_TABLE . '
! WHERE ' . $db->sql_in_set($type, $banlist_ary_tmp) . '
! AND ban_exclude = ' . (int) $ban_exclude;
! $db->sql_query($sql);
! }
!
unset($banlist_ary_tmp);
}
$db->sql_freeresult($result);
|
|
From: Joas S. <nic...@ph...> - 2009-07-24 08:47:55
|
Author: nickvergessen
Date: Fri Jul 24 08:47:10 2009
New Revision: 9839
Log:
Fix Bug #40515 - Fix set_custom_template for database-stored styles
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/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 Fri Jul 24 08:47:10 2009
***************
*** 170,175 ****
--- 170,176 ----
<li>[Fix] Copy poll options properly when copying topic. (Bug #39065)</li>
<li>[Fix] Preserve newlines in template files (one newline had been always dropped after a template variable due to PHP's handling of closing tags)</li>
<li>[Fix] Be less strict with FTP daemons when getting directory filelists. (Bug #46295)</li>
+ <li>[Fix] Fix set_custom_template for database-stored styles (Bug #40515 - Patch by nickvergessen)</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>
<li>[Change] Template engine now permits to a limited extent variable includes.</li>
Modified: branches/phpBB-3_0_0/phpBB/includes/template.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/template.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/template.php Fri Jul 24 08:47:10 2009
***************
*** 39,44 ****
--- 39,46 ----
var $files_inherit = array();
var $files_template = array();
var $inherit_root = '';
+ var $orig_tpl_storedb = 'undefined';
+ var $orig_tpl_inherits_id = 'undefined';
// this will hash handle names to the compiled/uncompiled code for that handle.
var $compiled_code = array();
***************
*** 55,60 ****
--- 57,72 ----
{
$this->root = $phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template';
$this->cachepath = $phpbb_root_path . 'cache/tpl_' . str_replace('_', '-', $user->theme['template_path']) . '_';
+ if ($this->orig_tpl_storedb == 'undefined')
+ {
+ $this->orig_tpl_storedb = $user->theme['template_storedb'];
+ }
+ if ($this->orig_tpl_inherits_id == 'undefined')
+ {
+ $this->orig_tpl_inherits_id = $user->theme['template_inherits_id'];
+ }
+ $user->theme['template_storedb'] = $this->orig_tpl_storedb;
+ $user->theme['template_inherits_id'] = $this->orig_tpl_inherits_id;
if ($user->theme['template_inherits_id'])
{
***************
*** 77,86 ****
*/
function set_custom_template($template_path, $template_name)
{
! global $phpbb_root_path;
$this->root = $template_path;
$this->cachepath = $phpbb_root_path . 'cache/ctpl_' . str_replace('_', '-', $template_name) . '_';
$this->_rootref = &$this->_tpldata['.'][0];
--- 89,100 ----
*/
function set_custom_template($template_path, $template_name)
{
! global $phpbb_root_path, $user;
$this->root = $template_path;
$this->cachepath = $phpbb_root_path . 'cache/ctpl_' . str_replace('_', '-', $template_name) . '_';
+ $user->theme['template_storedb'] = false;
+ $user->theme['template_inherits_id'] = false;
$this->_rootref = &$this->_tpldata['.'][0];
|
|
From: Henry S. <kel...@ph...> - 2009-07-23 10:20:00
|
Author: Kellanved
Date: Thu Jul 23 10:19:38 2009
New Revision: 9838
Log:
primitive one-level nesting
Modified:
branches/phpBB-3_0_0/phpBB/posting.php
Modified: branches/phpBB-3_0_0/phpBB/posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/posting.php (original)
--- branches/phpBB-3_0_0/phpBB/posting.php Thu Jul 23 10:19:38 2009
***************
*** 1193,1200 ****
}
else
{
! $message = '> ' . utf8_wordwrap(censor_text(trim($message_parser->message)), 75, "\n");
! $message = str_replace("\n", "\n> ", $message);
$message_parser->message = $post_data['quote_username'] . " " . $user->lang['WROTE'] . " :\n" . $message . "\n";
}
}
--- 1193,1210 ----
}
else
{
! $offset = 0;
! $quote_string = "> ";
! $message = censor_text(trim($message_parser->message));
! // see if we are nesting. It's easily tricked but should work for one level of nesting
! if (strpos($message, ">") !== false)
! {
! $offset = 10;
! }
! $message = utf8_wordwrap($message, 75 + $offset, "\n");
!
! $message = $quote_string . $message;
! $message = str_replace("\n", "\n" . $quote_string, $message);
$message_parser->message = $post_data['quote_username'] . " " . $user->lang['WROTE'] . " :\n" . $message . "\n";
}
}
|
|
From: Henry S. <kel...@ph...> - 2009-07-22 22:02:39
|
Author: Kellanved
Date: Wed Jul 22 22:02:10 2009
New Revision: 9837
Log:
handle newlines
Modified:
branches/phpBB-3_0_0/phpBB/posting.php
Modified: branches/phpBB-3_0_0/phpBB/posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/posting.php (original)
--- branches/phpBB-3_0_0/phpBB/posting.php Wed Jul 22 22:02:10 2009
***************
*** 1193,1199 ****
}
else
{
! $message = '> ' . utf8_wordwrap(censor_text(trim($message_parser->message)), 75, "\n> ");
$message_parser->message = $post_data['quote_username'] . " " . $user->lang['WROTE'] . " :\n" . $message . "\n";
}
}
--- 1193,1200 ----
}
else
{
! $message = '> ' . utf8_wordwrap(censor_text(trim($message_parser->message)), 75, "\n");
! $message = str_replace("\n", "\n> ", $message);
$message_parser->message = $post_data['quote_username'] . " " . $user->lang['WROTE'] . " :\n" . $message . "\n";
}
}
|
|
From: Henry S. <kel...@ph...> - 2009-07-22 16:42:54
|
Author: Kellanved
Date: Wed Jul 22 16:42:30 2009
New Revision: 9836
Log:
fall back to bbcode-less quotes
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Wed Jul 22 16:42:30 2009
***************
*** 220,225 ****
--- 220,226 ----
<li>[Feature] Ability to filter ACP / MCP logs</li>
<li>[Feature] Users can report PMs to moderators which are then visible in a new MCP module</li>
<li>[Feature] Parse email text files with the template engine.</li>
+ <li>[Feature] Use email-style quoting when bbcodes are disabled.</li>
</ul>
<a name="v304"></a><h3>1.ii. Changes since 3.0.4</h3>
|
|
From: Henry S. <kel...@ph...> - 2009-07-22 16:40:03
|
Author: Kellanved
Date: Wed Jul 22 16:39:26 2009
New Revision: 9835
Log:
fall back to bbcode-less quotes
Modified:
branches/phpBB-3_0_0/phpBB/posting.php
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/editor.js
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_topic_review.html
Modified: branches/phpBB-3_0_0/phpBB/posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/posting.php (original)
--- branches/phpBB-3_0_0/phpBB/posting.php Wed Jul 22 16:39:26 2009
***************
*** 1187,1193 ****
if ($mode == 'quote' && !$submit && !$preview && !$refresh)
{
! $message_parser->message = '[quote="' . $post_data['quote_username'] . '"]' . censor_text(trim($message_parser->message)) . "[/quote]\n";
}
if (($mode == 'reply' || $mode == 'quote') && !$submit && !$preview && !$refresh)
--- 1187,1201 ----
if ($mode == 'quote' && !$submit && !$preview && !$refresh)
{
! if ($config['allow_bbcode'])
! {
! $message_parser->message = '[quote="' . $post_data['quote_username'] . '"]' . censor_text(trim($message_parser->message)) . "[/quote]\n";
! }
! else
! {
! $message = '> ' . utf8_wordwrap(censor_text(trim($message_parser->message)), 75, "\n> ");
! $message_parser->message = $post_data['quote_username'] . " " . $user->lang['WROTE'] . " :\n" . $message . "\n";
! }
}
if (($mode == 'reply' || $mode == 'quote') && !$submit && !$preview && !$refresh)
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/editor.js
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/editor.js (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/editor.js Wed Jul 22 16:39:26 2009
***************
*** 7,12 ****
--- 7,13 ----
var imageTag = false;
var theSelection = false;
+ var bbcodeEnabled = true;
// Check for Browser & Platform for PC & IE specific bits
// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
var clientPC = navigator.userAgent.toLowerCase(); // Get client info
***************
*** 14,20 ****
var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1));
var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));
-
var baseHeight;
/**
--- 15,20 ----
***************
*** 250,261 ****
if (theSelection)
{
! insert_text('[quote="' + username + '"]' + theSelection + '[/quote]');
}
return;
}
/**
* From http://www.massless.org/mozedit/
*/
--- 250,308 ----
if (theSelection)
{
! if (bbcodeEnabled)
! {
! insert_text('[quote="' + username + '"]' + theSelection + '[/quote]');
! }
! else
! {
! var lines = split_lines(theSelection);
! for (i = 0; i < lines.length; i++)
! {
! insert_text('> ' + lines[i] + '\n')
! }
! }
}
return;
}
+ function split_lines(text)
+ {
+ var lines = text.split('\n');
+ var splitLines = new Array();
+ var j = 0;
+ for(i = 0; i < lines.length; i++)
+ {
+ if (lines[i].length <= 80)
+ {
+ splitLines[j] = lines[i];
+ j++;
+ }
+ else
+ {
+ var line = lines[i];
+ do
+ {
+ var splitAt = line.indexOf(' ', 80);
+
+ if (splitAt == -1)
+ {
+ splitLines[j] = line;
+ j++
+ }
+ else
+ {
+ splitLines[j] = line.substring(0, splitAt);
+ line = line.substring(splitAt);
+ j++;
+ }
+ }
+ while(splitAt != -1)
+ }
+ }
+ return splitLines;
+ }
/**
* From http://www.massless.org/mozedit/
*/
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_topic_review.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_topic_review.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_topic_review.html Wed Jul 22 16:39:26 2009
***************
*** 5,10 ****
--- 5,15 ----
</h3>
<div id="topicreview">
+ <script>
+ // <![CDATA[
+ bbcodeEnabled = {S_BBCODE_ALLOWED};
+ // ]]>
+ </script>
<!-- BEGIN topic_review_row -->
<!-- IF topic_review_row.S_IGNORE_POST -->
|
|
From: Nils A. <nad...@ph...> - 2009-07-22 15:50:57
|
Author: naderman
Date: Wed Jul 22 15:50:31 2009
New Revision: 9834
Log:
geez I'm blind - use the right template and lang vars
Modified:
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php
Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php Wed Jul 22 15:50:31 2009
***************
*** 322,336 ****
if ($total == 0)
{
$template->assign_vars(array(
! 'L_REPORTS_TOTAL' => $user->lang['REPORTS_ZERO_TOTAL'],
'S_HAS_PM_REPORTS' => false)
);
}
else
{
$template->assign_vars(array(
! 'L_REPORTS_TOTAL' => ($total == 1) ? $user->lang['REPORT_TOTAL'] : sprintf($user->lang['REPORTS_TOTAL'], $total),
! 'S_HAS_REPORTS' => true)
);
}
}
--- 322,336 ----
if ($total == 0)
{
$template->assign_vars(array(
! 'L_REPORTS_TOTAL' => $user->lang['PM_REPORTS_ZERO_TOTAL'],
'S_HAS_PM_REPORTS' => false)
);
}
else
{
$template->assign_vars(array(
! 'L_REPORTS_TOTAL' => ($total == 1) ? $user->lang['PM_REPORT_TOTAL'] : sprintf($user->lang['PM_REPORTS_TOTAL'], $total),
! 'S_HAS_PM_REPORTS' => true)
);
}
}
|
|
From: Nils A. <nad...@ph...> - 2009-07-22 15:47:34
|
Author: naderman
Date: Wed Jul 22 15:47:00 2009
New Revision: 9833
Log:
use « instead of ON string
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_post.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_reports.html
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_post.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_post.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_post.html Wed Jul 22 15:47:00 2009
***************
*** 12,18 ****
<div class="postbody">
<h3>{L_REPORT_REASON}: {REPORT_REASON_TITLE}</h3>
! <p class="author">{L_REPORTED} {L_POST_BY_AUTHOR} {REPORTER_FULL} {L_REPORTED_ON_DATE} {REPORT_DATE}</p>
<!-- IF not S_POST_REPORTED -->
<p class="rules">{L_REPORT_CLOSED}</p>
<!-- ENDIF -->
--- 12,18 ----
<div class="postbody">
<h3>{L_REPORT_REASON}: {REPORT_REASON_TITLE}</h3>
! <p class="author">{L_REPORTED} {L_POST_BY_AUTHOR} {REPORTER_FULL} « {REPORT_DATE}</p>
<!-- IF not S_POST_REPORTED -->
<p class="rules">{L_REPORT_CLOSED}</p>
<!-- ENDIF -->
***************
*** 184,190 ****
<h3>{L_FEEDBACK}</h3>
<!-- BEGIN usernotes -->
! <span class="small"><strong>{L_REPORTED_BY}: {usernotes.REPORT_BY} {L_REPORTED_ON_DATE} {usernotes.REPORT_AT}</strong></span>
<!-- IF S_CLEAR_ALLOWED --><div class="right-box"><input type="checkbox" name="marknote[]" value="{usernotes.ID}" /></div><!-- ENDIF -->
<div class="postbody">{usernotes.ACTION}</div>
--- 184,190 ----
<h3>{L_FEEDBACK}</h3>
<!-- BEGIN usernotes -->
! <span class="small"><strong>{L_REPORTED_BY}: {usernotes.REPORT_BY} « {usernotes.REPORT_AT}</strong></span>
<!-- IF S_CLEAR_ALLOWED --><div class="right-box"><input type="checkbox" name="marknote[]" value="{usernotes.ID}" /></div><!-- ENDIF -->
<div class="postbody">{usernotes.ACTION}</div>
***************
*** 224,230 ****
<h3>{L_MCP_POST_REPORTS}</h3>
<!-- BEGIN reports -->
! <span class="small"><strong>{L_REPORTED_BY}: <!-- IF reports.U_REPORTER --><a href="{reports.U_REPORTER}">{reports.REPORTER}</a><!-- ELSE -->{reports.REPORTER}<!-- ENDIF --> {L_REPORTED_ON_DATE} {reports.REPORT_TIME}</strong></span>
<p><em>{reports.REASON_TITLE}: {reports.REASON_DESC}</em><!-- IF reports.REPORT_TEXT --><br />{reports.REPORT_TEXT}<!-- ENDIF --></p>
<!-- END reports -->
--- 224,230 ----
<h3>{L_MCP_POST_REPORTS}</h3>
<!-- BEGIN reports -->
! <span class="small"><strong>{L_REPORTED_BY}: <!-- IF reports.U_REPORTER --><a href="{reports.U_REPORTER}">{reports.REPORTER}</a><!-- ELSE -->{reports.REPORTER}<!-- ENDIF --> « {reports.REPORT_TIME}</strong></span>
<p><em>{reports.REASON_TITLE}: {reports.REASON_DESC}</em><!-- IF reports.REPORT_TEXT --><br />{reports.REPORT_TEXT}<!-- ENDIF --></p>
<!-- END reports -->
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_reports.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_reports.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_reports.html Wed Jul 22 15:47:00 2009
***************
*** 45,51 ****
<span>{L_MESSAGE_TO} {postrow.RECIPIENTS}</span>
</dt>
<dd class="moderation">
! <span>{postrow.REPORTER_FULL} {L_REPORTED_ON_DATE} {postrow.REPORT_TIME}</span>
</dd>
<!-- ELSE -->
<dt>
--- 45,51 ----
<span>{L_MESSAGE_TO} {postrow.RECIPIENTS}</span>
</dt>
<dd class="moderation">
! <span>{postrow.REPORTER_FULL} « {postrow.REPORT_TIME}</span>
</dd>
<!-- ELSE -->
<dt>
***************
*** 53,59 ****
<span>{L_POSTED} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} » {postrow.POST_TIME}</span>
</dt>
<dd class="moderation">
! <span>{postrow.REPORTER_FULL} {L_REPORTED_ON_DATE} {postrow.REPORT_TIME}<br />
{L_FORUM}: <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a></span>
</dd>
<!-- ENDIF -->
--- 53,59 ----
<span>{L_POSTED} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} » {postrow.POST_TIME}</span>
</dt>
<dd class="moderation">
! <span>{postrow.REPORTER_FULL} « {postrow.REPORT_TIME}<br />
{L_FORUM}: <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a></span>
</dd>
<!-- ENDIF -->
|
|
From: Nils A. <nad...@ph...> - 2009-07-22 15:46:11
|
Author: naderman
Date: Wed Jul 22 15:45:46 2009
New Revision: 9832
Log:
missing language variable
Modified:
branches/phpBB-3_0_0/phpBB/language/en/mcp.php
Modified: branches/phpBB-3_0_0/phpBB/language/en/mcp.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/mcp.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/mcp.php Wed Jul 22 15:45:46 2009
***************
*** 254,259 ****
--- 254,260 ----
'PM_REPORTED_SUCCESS' => 'This private message has been successfully reported.',
'PM_REPORTS_TOTAL' => 'In total there are <strong>%d</strong> PM reports to review.',
'PM_REPORTS_ZERO_TOTAL' => 'There are no PM reports to review.',
+ 'PM_REPORT_DETAILS' => 'Private message report details',
'POSTER' => 'Poster',
'POSTS_APPROVED_SUCCESS' => 'The selected posts have been approved.',
'POSTS_DELETED_SUCCESS' => 'The selected posts have been successfully removed from the database.',
|
|
From: Nils A. <nad...@ph...> - 2009-07-22 15:45:19
|
Author: naderman
Date: Wed Jul 22 15:44:43 2009
New Revision: 9831
Log:
incorrect loop var in template
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_front.html
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_front.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_front.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_front.html Wed Jul 22 15:44:43 2009
***************
*** 107,113 ****
<h3>{L_LATEST_REPORTED_PMS}</h3>
<!-- IF S_HAS_PM_REPORTS --><p>{L_PM_REPORTS_TOTAL}</p><!-- ENDIF -->
! <!-- IF .report -->
<ul class="topiclist">
<li class="header">
<dl>
--- 107,113 ----
<h3>{L_LATEST_REPORTED_PMS}</h3>
<!-- IF S_HAS_PM_REPORTS --><p>{L_PM_REPORTS_TOTAL}</p><!-- ENDIF -->
! <!-- IF .pm_report -->
<ul class="topiclist">
<li class="header">
<dl>
|
|
From: Nils A. <nad...@ph...> - 2009-07-22 13:44:45
|
Author: naderman
Date: Wed Jul 22 13:33:54 2009
New Revision: 9830
Log:
fix mcp sorting for pm_reports, and some minor language changes
Modified:
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_pm_reports.php
branches/phpBB-3_0_0/phpBB/language/en/mcp.php
branches/phpBB-3_0_0/phpBB/language/en/ucp.php
branches/phpBB-3_0_0/phpBB/mcp.php
Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_pm_reports.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_pm_reports.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_pm_reports.php Wed Jul 22 13:33:54 2009
***************
*** 221,227 ****
if ($mode == 'pm_reports')
{
! $report_state = 'pm.message_reported = 1 AND r.report_closed = 0';
}
else
{
--- 221,227 ----
if ($mode == 'pm_reports')
{
! $report_state = 'p.message_reported = 1 AND r.report_closed = 0';
}
else
{
***************
*** 229,238 ****
}
$sql = 'SELECT r.report_id
! FROM ' . PRIVMSGS_TABLE . ' pm, ' . REPORTS_TABLE . ' r ' . (($sort_order_sql[0] == 'u') ? ', ' . USERS_TABLE . ' u' : '') . (($sort_order_sql[0] == 'r') ? ', ' . USERS_TABLE . ' ru' : '') . "
WHERE $report_state
! AND r.pm_id = pm.msg_id
! " . (($sort_order_sql[0] == 'u') ? 'AND u.user_id = pm.author_id' : '') . '
' . (($sort_order_sql[0] == 'r') ? 'AND ru.user_id = r.user_id' : '') . "
AND r.post_id = 0
$limit_time_sql
--- 229,238 ----
}
$sql = 'SELECT r.report_id
! FROM ' . PRIVMSGS_TABLE . ' p, ' . REPORTS_TABLE . ' r ' . (($sort_order_sql[0] == 'u') ? ', ' . USERS_TABLE . ' u' : '') . (($sort_order_sql[0] == 'r') ? ', ' . USERS_TABLE . ' ru' : '') . "
WHERE $report_state
! AND r.pm_id = p.msg_id
! " . (($sort_order_sql[0] == 'u') ? 'AND u.user_id = p.author_id' : '') . '
' . (($sort_order_sql[0] == 'r') ? 'AND ru.user_id = r.user_id' : '') . "
AND r.post_id = 0
$limit_time_sql
Modified: branches/phpBB-3_0_0/phpBB/language/en/mcp.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/mcp.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/mcp.php Wed Jul 22 13:33:54 2009
***************
*** 286,292 ****
'REPORT_DELETED_SUCCESS' => 'The selected report has been deleted successfully.',
'REPORT_DETAILS' => 'Report details',
'REPORT_MESSAGE' => 'Report this message',
! 'REPORT_MESSAGE_EXPLAIN' => 'Use this form to report the selected private message. Reporting should generally be used only if the message breaks forum rules. <strong>Reporting a private message will make its contents visible to all moderators</strong>',
'REPORT_NOTIFY' => 'Notify me',
'REPORT_NOTIFY_EXPLAIN' => 'Informs you when your report is dealt with.',
'REPORT_POST_EXPLAIN' => 'Use this form to report the selected post to the forum moderators and board administrators. Reporting should generally be used only if the post breaks forum rules.',
--- 286,292 ----
'REPORT_DELETED_SUCCESS' => 'The selected report has been deleted successfully.',
'REPORT_DETAILS' => 'Report details',
'REPORT_MESSAGE' => 'Report this message',
! 'REPORT_MESSAGE_EXPLAIN' => 'Use this form to report the selected private message. Reporting should generally be used only if the message breaks forum rules. <strong>Reporting a private message will make its contents visible to all moderators.</strong>',
'REPORT_NOTIFY' => 'Notify me',
'REPORT_NOTIFY_EXPLAIN' => 'Informs you when your report is dealt with.',
'REPORT_POST_EXPLAIN' => 'Use this form to report the selected post to the forum moderators and board administrators. Reporting should generally be used only if the post breaks forum rules.',
Modified: branches/phpBB-3_0_0/phpBB/language/en/ucp.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/ucp.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/ucp.php Wed Jul 22 13:33:54 2009
***************
*** 374,379 ****
--- 374,380 ----
'RENAME' => 'Rename',
'RENAME_FOLDER' => 'Rename folder',
'REPLIED_MESSAGE' => 'Replied to message',
+ 'REPORT_PM' => 'Report private message',
'RESIGN_SELECTED' => 'Resign selected',
'RETURN_FOLDER' => '%1$sReturn to previous folder%2$s',
'RETURN_UCP' => '%sReturn to the User Control Panel%s',
Modified: branches/phpBB-3_0_0/phpBB/mcp.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/mcp.php (original)
--- branches/phpBB-3_0_0/phpBB/mcp.php Wed Jul 22 13:33:54 2009
***************
*** 698,710 ****
case 'pm_reports_closed':
case 'reports':
case 'reports_closed':
! $type = 'reports';
$default_key = 't';
$default_dir = 'd';
$limit_time_sql = ($min_time) ? "AND r.report_time >= $min_time" : '';
- $pm = (strpos($mode, 'pm_') === 0) ? true : false;
-
if ($topic_id)
{
$where_sql .= ' p.topic_id = ' . $topic_id . ' AND ';
--- 698,710 ----
case 'pm_reports_closed':
case 'reports':
case 'reports_closed':
! $pm = (strpos($mode, 'pm_') === 0) ? true : false;
!
! $type = ($pm) ? 'pm_reports' : 'reports';
$default_key = 't';
$default_dir = 'd';
$limit_time_sql = ($min_time) ? "AND r.report_time >= $min_time" : '';
if ($topic_id)
{
$where_sql .= ' p.topic_id = ' . $topic_id . ' AND ';
***************
*** 713,724 ****
{
$where_sql .= ' p.forum_id = ' . $forum_id . ' AND ';
}
! else if ($pm)
{
$where_sql .= ' ' . $db->sql_in_set('p.forum_id', get_forum_list(array('!f_read', '!m_report')), true, true) . ' AND ';
}
! if ($mode == 'reports')
{
$where_sql .= ' r.report_closed = 0 AND ';
}
--- 713,724 ----
{
$where_sql .= ' p.forum_id = ' . $forum_id . ' AND ';
}
! else if (!$pm)
{
$where_sql .= ' ' . $db->sql_in_set('p.forum_id', get_forum_list(array('!f_read', '!m_report')), true, true) . ' AND ';
}
! if ($mode == 'reports' || $mode == 'pm_reports')
{
$where_sql .= ' r.report_closed = 0 AND ';
}
***************
*** 785,790 ****
--- 785,796 ----
$sort_by_sql = array('a' => 'u.username_clean', 'r' => 'ru.username', 'p' => 'p.post_time', 't' => 'r.report_time', 's' => 'p.post_subject');
break;
+ case 'pm_reports':
+ $limit_days = array(0 => $user->lang['ALL_REPORTS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']);
+ $sort_by_text = array('a' => $user->lang['AUTHOR'], 'r' => $user->lang['REPORTER'], 'p' => $user->lang['POST_TIME'], 't' => $user->lang['REPORT_TIME'], 's' => $user->lang['SUBJECT']);
+ $sort_by_sql = array('a' => 'u.username_clean', 'r' => 'ru.username', 'p' => 'p.message_time', 't' => 'r.report_time', 's' => 'p.message_subject');
+ break;
+
case 'logs':
$limit_days = array(0 => $user->lang['ALL_ENTRIES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']);
$sort_by_text = array('u' => $user->lang['SORT_USERNAME'], 't' => $user->lang['SORT_DATE'], 'i' => $user->lang['SORT_IP'], 'o' => $user->lang['SORT_ACTION']);
|
|
From: Nils A. <nad...@ph...> - 2009-07-22 13:09:49
|
Author: naderman
Date: Wed Jul 22 13:09:22 2009
New Revision: 9829
Log:
insert pm_reports module with correct basename on update
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 Wed Jul 22 13:09:22 2009
***************
*** 1217,1223 ****
if (!$row2)
{
$module_data = array(
! 'module_basename' => 'users',
'module_enabled' => 1,
'module_display' => 1,
'parent_id' => $category_id,
--- 1217,1223 ----
if (!$row2)
{
$module_data = array(
! 'module_basename' => 'pm_reports',
'module_enabled' => 1,
'module_display' => 1,
'parent_id' => $category_id,
|
|
From: Joas S. <nic...@ph...> - 2009-07-22 11:48:21
|
Author: nickvergessen
Date: Wed Jul 22 11:47:37 2009
New Revision: 9828
Log:
fix r9758
Authorised by: AcydBurn
Modified:
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/language/en/acp/common.php
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/memberlist_view.html
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 Wed Jul 22 11:47:37 2009
***************
*** 1160,1170 ****
if ($deleteall)
{
! $deleted_warnings = '0';
}
else
{
! $deleted_warnings = ' user_warnings - ' . $db->sql_affectedrows();
}
$sql = 'UPDATE ' . USERS_TABLE . "
--- 1160,1172 ----
if ($deleteall)
{
! $log_warnings = $deleted_warnings = 0;
}
else
{
! $num_warnings = (int) $db->sql_affectedrows();
! $deleted_warnings = ' user_warnings - ' . $num_warnings;
! $log_warnings = ($num_warnings > 2) ? 2 : $num_warnings;
}
$sql = 'UPDATE ' . USERS_TABLE . "
***************
*** 1172,1178 ****
WHERE user_id = $user_id";
$db->sql_query($sql);
! add_log('admin', 'LOG_WARNING_DELETED', $user_row['username']);
}
}
else
--- 1174,1191 ----
WHERE user_id = $user_id";
$db->sql_query($sql);
! switch ($log_warnings)
! {
! case 2:
! add_log('admin', 'LOG_WARNINGS_DELETED', $user_row['username'], $num_warnings);
! break;
! case 1:
! add_log('admin', 'LOG_WARNING_DELETED', $user_row['username']);
! break;
! default:
! add_log('admin', 'LOG_WARNINGS_DELETED_ALL', $user_row['username']);
! break;
! }
}
}
else
Modified: branches/phpBB-3_0_0/phpBB/includes/functions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Wed Jul 22 11:47:37 2009
***************
*** 4035,4041 ****
// Tidy the cache
$cron_type = 'tidy_cache';
}
! else if ($config['warnings_last_gc'] && (time() - $config['warnings_gc'] > $config['warnings_last_gc']))
{
$cron_type = 'tidy_warnings';
}
--- 4035,4041 ----
// Tidy the cache
$cron_type = 'tidy_cache';
}
! else if ($config['warnings_expire_days'] && (time() - $config['warnings_gc'] > $config['warnings_last_gc']))
{
$cron_type = 'tidy_warnings';
}
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/common.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/common.php Wed Jul 22 11:47:37 2009
***************
*** 707,713 ****
'LOG_USER_REACTIVATE_USER' => '<strong>Forced user account reactivation</strong>',
'LOG_USER_UNLOCK' => '<strong>User unlocked own topic</strong><br />» %s',
'LOG_USER_WARNING' => '<strong>Added user warning</strong><br />» %s',
- 'LOG_WARNING_DELETED' => '<strong>Deleted user warning</strong><br />» %s',
'LOG_USER_WARNING_BODY' => '<strong>The following warning was issued to this user</strong><br />» %s',
'LOG_USER_GROUP_CHANGE' => '<strong>User changed default group</strong><br />» %s',
--- 707,712 ----
***************
*** 716,721 ****
--- 715,724 ----
'LOG_USER_GROUP_JOIN_PENDING' => '<strong>User joined group and needs to be approved</strong><br />» %s',
'LOG_USER_GROUP_RESIGN' => '<strong>User resigned membership from group</strong><br />» %s',
+ 'LOG_WARNING_DELETED' => '<strong>Deleted user warning</strong><br />» %s',
+ 'LOG_WARNINGS_DELETED' => '<strong>Deleted %2$s user warnings</strong><br />» %1$s', // Example: '<strong>Deleted 2 user warnings</strong><br />» username'
+ 'LOG_WARNINGS_DELETED_ALL' => '<strong>Deleted all user warnings</strong><br />» %s',
+
'LOG_WORD_ADD' => '<strong>Added word censor</strong><br />» %s',
'LOG_WORD_DELETE' => '<strong>Deleted word censor</strong><br />» %s',
'LOG_WORD_EDIT' => '<strong>Edited word censor</strong><br />» %s',
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 Wed Jul 22 11:47:37 2009
***************
*** 59,66 ****
<dl class="details">
<!-- IF U_EMAIL --><dt>{L_EMAIL_ADDRESS}:</dt> <dd><a href="{U_EMAIL}">{L_SEND_EMAIL_USER} {USERNAME}</a></dd><!-- ENDIF -->
<!-- IF U_WWW --><dt>{L_WEBSITE}:</dt> <dd><a href="{U_WWW}" title="{L_VISIT_WEBSITE}: {U_WWW}">{U_WWW}</a></dd><!-- ENDIF -->
! <!-- IF U_PM --><dt>{L_PM}:</dt> <dd><a href="{U_PM}">{L_SEND_PRIVATE_MESSAGE}</a></dd>
! <!-- ENDIF -->
<!-- IF U_MSN or USER_MSN --><dt>{L_MSNM}:</dt> <dd><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_MSNM_MESSAGE}</a><!-- ELSE -->{USER_MSN}<!-- ENDIF --></dd><!-- ENDIF -->
<!-- IF U_YIM or USER_YIM --><dt>{L_YIM}:</dt> <dd><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false;">{L_SEND_YIM_MESSAGE}</a><!-- ELSE -->{USER_YIM}<!-- ENDIF --></dd><!-- ENDIF -->
<!-- IF U_AIM or USER_AIM --><dt>{L_AIM}:</dt> <dd><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_AIM_MESSAGE}</a><!-- ELSE -->{USER_AIM}<!-- ENDIF --></dd><!-- ENDIF -->
--- 59,65 ----
<dl class="details">
<!-- IF U_EMAIL --><dt>{L_EMAIL_ADDRESS}:</dt> <dd><a href="{U_EMAIL}">{L_SEND_EMAIL_USER} {USERNAME}</a></dd><!-- ENDIF -->
<!-- IF U_WWW --><dt>{L_WEBSITE}:</dt> <dd><a href="{U_WWW}" title="{L_VISIT_WEBSITE}: {U_WWW}">{U_WWW}</a></dd><!-- ENDIF -->
! <!-- IF U_PM --><dt>{L_PM}:</dt> <dd><a href="{U_PM}">{L_SEND_PRIVATE_MESSAGE}</a></dd><!-- ENDIF -->
<!-- IF U_MSN or USER_MSN --><dt>{L_MSNM}:</dt> <dd><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_MSNM_MESSAGE}</a><!-- ELSE -->{USER_MSN}<!-- ENDIF --></dd><!-- ENDIF -->
<!-- IF U_YIM or USER_YIM --><dt>{L_YIM}:</dt> <dd><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false;">{L_SEND_YIM_MESSAGE}</a><!-- ELSE -->{USER_YIM}<!-- ENDIF --></dd><!-- ENDIF -->
<!-- IF U_AIM or USER_AIM --><dt>{L_AIM}:</dt> <dd><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_AIM_MESSAGE}</a><!-- ELSE -->{USER_AIM}<!-- ENDIF --></dd><!-- ENDIF -->
***************
*** 78,84 ****
<dl class="details">
<dt>{L_JOINED}:</dt> <dd>{JOINED}</dd>
<dt>{L_VISITED}:</dt> <dd>{VISITED}</dd>
! <!-- IF WARNINGS -->
<dt>{L_WARNINGS}: </dt>
<dd><strong>{WARNINGS}</strong><!-- IF U_NOTES or U_WARN --> [ <!-- IF U_NOTES --><a href="{U_NOTES}">{L_VIEW_NOTES}</a><!-- ENDIF --> <!-- IF U_WARN --><!-- IF U_NOTES --> | <!-- ENDIF --><a href="{U_WARN}">{L_WARN_USER}</a><!-- ENDIF --> ]<!-- ENDIF --></dd>
<!-- ENDIF -->
--- 77,83 ----
<dl class="details">
<dt>{L_JOINED}:</dt> <dd>{JOINED}</dd>
<dt>{L_VISITED}:</dt> <dd>{VISITED}</dd>
! <!-- IF S_WARNINGS -->
<dt>{L_WARNINGS}: </dt>
<dd><strong>{WARNINGS}</strong><!-- IF U_NOTES or U_WARN --> [ <!-- IF U_NOTES --><a href="{U_NOTES}">{L_VIEW_NOTES}</a><!-- ENDIF --> <!-- IF U_WARN --><!-- IF U_NOTES --> | <!-- ENDIF --><a href="{U_WARN}">{L_WARN_USER}</a><!-- ENDIF --> ]<!-- ENDIF --></dd>
<!-- ENDIF -->
|
|
From: Henry S. <kel...@ph...> - 2009-07-22 10:58:19
|
Author: Kellanved
Date: Wed Jul 22 10:57:56 2009
New Revision: 9827
Log:
index for GC
Modified:
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php Wed Jul 22 10:57:56 2009
***************
*** 271,277 ****
),
'PRIMARY_KEY' => 'question_id',
'KEYS' => array(
- 'question_id' => array('INDEX', array('question_id', 'lang_iso')),
'lang_iso' => array('INDEX', 'lang_iso'),
),
),
--- 271,276 ----
|
|
From: Henry S. <kel...@ph...> - 2009-07-22 10:42:29
|
Author: Kellanved
Date: Wed Jul 22 10:42:01 2009
New Revision: 9826
Log:
index for GC
Modified:
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php Wed Jul 22 10:42:01 2009
***************
*** 294,300 ****
'confirm_type' => array('USINT', 0),
),
'KEYS' => array(
! 'confirm_id' => array('INDEX', 'confirm_id'),
'lookup' => array('INDEX', array('confirm_id', 'session_id', 'lang_iso')),
),
'PRIMARY_KEY' => 'confirm_id',
--- 294,300 ----
'confirm_type' => array('USINT', 0),
),
'KEYS' => array(
! 'session_id' => array('INDEX', 'session_id'),
'lookup' => array('INDEX', array('confirm_id', 'session_id', 'lang_iso')),
),
'PRIMARY_KEY' => 'confirm_id',
|
|
From: Nils A. <nad...@ph...> - 2009-07-22 10:09:51
|
Author: naderman
Date: Wed Jul 22 10:09:25 2009
New Revision: 9825
Log:
removed spaces
Modified:
branches/phpBB-3_0_0/phpBB/includes/questionnaire/questionnaire.php
Modified: branches/phpBB-3_0_0/phpBB/includes/questionnaire/questionnaire.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/questionnaire/questionnaire.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/questionnaire/questionnaire.php Wed Jul 22 10:09:25 2009
***************
*** 23,30 ****
* to a central server. For privacy reasons we try to collect only data which aren't private
* or don't give any information which might help to identify the user.
*
! * @author Johannes Schlueter <joh...@ph...>
! * @copyright (c) 2007-2008 Johannes Schlueter
*/
class phpbb_questionnaire_data_collector
{
--- 23,30 ----
* to a central server. For privacy reasons we try to collect only data which aren't private
* or don't give any information which might help to identify the user.
*
! * @author Johannes Schlueter <joh...@ph...>
! * @copyright (c) 2007-2008 Johannes Schlueter
*/
class phpbb_questionnaire_data_collector
{
***************
*** 35,41 ****
/**
* Constructor.
*
! * @param string
*/
function phpbb_questionnaire_data_collector($install_id)
{
--- 35,41 ----
/**
* Constructor.
*
! * @param string
*/
function phpbb_questionnaire_data_collector($install_id)
{
***************
*** 51,57 ****
/**
* Get data as an array.
*
! * @return array All Data
*/
function get_data_raw()
{
--- 51,57 ----
/**
* Get data as an array.
*
! * @return array All Data
*/
function get_data_raw()
{
***************
*** 71,77 ****
/**
* Collect info into the data property.
*
! * @return void
*/
function collect()
{
--- 71,77 ----
/**
* Collect info into the data property.
*
! * @return void
*/
function collect()
{
***************
*** 80,86 ****
$provider = &$this->providers[$key];
$this->data[$provider->get_identifier()] = $provider->get_data();
}
! $this->data['install_id'] = $this->install_id;
}
}
--- 80,86 ----
$provider = &$this->providers[$key];
$this->data[$provider->get_identifier()] = $provider->get_data();
}
! $this->data['install_id'] = $this->install_id;
}
}
***************
*** 100,106 ****
/**
* Get data about the PHP runtime setup.
*
! * @return array
*/
function get_data()
{
--- 100,106 ----
/**
* Get data about the PHP runtime setup.
*
! * @return array
*/
function get_data()
{
***************
*** 144,150 ****
/**
* Get data about the general system information, like OS or IP (shortened).
*
! * @return array
*/
function get_data()
{
--- 144,150 ----
/**
* Get data about the general system information, like OS or IP (shortened).
*
! * @return array
*/
function get_data()
{
|
|
From: Henry S. <kel...@ph...> - 2009-07-22 10:08:35
|
Author: Kellanved
Date: Wed Jul 22 10:08:14 2009
New Revision: 9824
Log:
layout
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp.html
Modified: branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp.html Wed Jul 22 10:08:14 2009
***************
*** 21,28 ****
</tr>
<tr class="row3">
<td style="text-align: center;">{L_QUESTION_TEXT}</td>
! <td style="text-align: center;">{L_QUESTION_LANG}</td>
! <td style="text-align: center;">{L_ACTION}</td>
</tr>
</thead>
<tbody>
--- 21,28 ----
</tr>
<tr class="row3">
<td style="text-align: center;">{L_QUESTION_TEXT}</td>
! <td style="width: 5%; text-align: center;">{L_QUESTION_LANG}</td>
! <td style="vertical-align: top; width: 50px; text-align: center; white-space: nowrap;">{L_ACTION}</td>
</tr>
</thead>
<tbody>
***************
*** 30,36 ****
<!-- IF questions.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
! <td style="text-align: center;">{questions.QUESTION_TEXT}</td>
<td style="text-align: center;">{questions.QUESTION_LANG}</td>
<td style="text-align: center;"><a href="{questions.U_EDIT}">{ICON_EDIT}</a><a href="{questions.U_DELETE}">{ICON_DELETE}</a></td>
</tr>
--- 30,36 ----
<!-- IF questions.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
! <td style="text-align: left;">{questions.QUESTION_TEXT}</td>
<td style="text-align: center;">{questions.QUESTION_LANG}</td>
<td style="text-align: center;"><a href="{questions.U_EDIT}">{ICON_EDIT}</a><a href="{questions.U_DELETE}">{ICON_DELETE}</a></td>
</tr>
|
7 messages has been excluded from this view by a project administrator.
