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: Andreas F. <ba...@ph...> - 2009-08-23 15:08:54
|
Author: bantu
Date: Sun Aug 23 16:08:37 2009
New Revision: 10047
Log:
Some more cleanup. Mostly whitespace changes.
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/subsilver2/template/captcha_default.html
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_qa.html
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_recaptcha.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 Sun Aug 23 16:08:37 2009
***************
*** 6,13 ****
<p>{L_CONFIRM_EXPLAIN}</p>
<fieldset class="fields2">
-
<!-- ENDIF -->
<dl>
<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt>
<dd><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd>
--- 6,13 ----
<p>{L_CONFIRM_EXPLAIN}</p>
<fieldset class="fields2">
<!-- ENDIF -->
+
<dl>
<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt>
<dd><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd>
***************
*** 16,23 ****
<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd>
<dd>{L_CONFIRM_CODE_EXPLAIN}</dd>
</dl>
<!-- IF S_TYPE == 1 -->
</fieldset>
<span class="corners-bottom"><span></span></span></div>
</div>
! <!-- ENDIF -->
\ No newline at end of file
--- 16,24 ----
<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd>
<dd>{L_CONFIRM_CODE_EXPLAIN}</dd>
</dl>
+
<!-- IF S_TYPE == 1 -->
</fieldset>
<span class="corners-bottom"><span></span></span></div>
</div>
! <!-- ENDIF -->
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 Sun Aug 23 16:08:37 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="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>
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 Sun Aug 23 16:08:37 2009
***************
*** 16,33 ****
<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
// <![CDATA[
var RecaptchaOptions = {
! lang : {L_RECAPTCHA_LANG}
};
// ]]>
</script>
! <noscript>
! <div>
! <object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br />
! <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
! <input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
! </div>
! </noscript>
</dd>
</dl>
--- 16,33 ----
<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
// <![CDATA[
var RecaptchaOptions = {
! lang : {L_RECAPTCHA_LANG}
};
// ]]>
</script>
! <noscript>
! <div>
! <object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br />
! <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
! <input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
! </div>
! </noscript>
</dd>
</dl>
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:08:37 2009
***************
*** 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>
\ No newline at end of file
--- 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>
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_qa.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_qa.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_qa.html Sun Aug 23 16:08:37 2009
***************
*** 2,8 ****
<th colspan="2" valign="middle">{QA_CONFIRM_QUESTION}</th>
</tr>
<tr>
! <td class="row1"><b class="genmed">{QA_CONFIRM_QUESTION}: </b><br /></td>
! <td class="row2"><input class="post" type="text" name="qa_answer" size="80" /></td>
<input type="hidden" name="qa_confirm_id" id="confirm_id" value="{QA_CONFIRM_ID}" /></td>
! </tr>
\ No newline at end of file
--- 2,8 ----
<th colspan="2" valign="middle">{QA_CONFIRM_QUESTION}</th>
</tr>
<tr>
! <td class="row1"><b class="genmed">{QA_CONFIRM_QUESTION}:</b><br /></td>
! <td class="row2"><input class="post" type="text" name="qa_answer" size="80" /></td>
<input type="hidden" name="qa_confirm_id" id="confirm_id" value="{QA_CONFIRM_ID}" /></td>
! </tr>
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_recaptcha.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_recaptcha.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_recaptcha.html Sun Aug 23 16:08:37 2009
***************
*** 2,26 ****
<tr>
<th colspan="2" valign="middle">{L_CONFIRM_CODE}</th>
</tr>
! <tr><td class="row1"><b class="genmed">{L_CONFIRM_CODE}: </b><br /><span class="gensmall">{L_RECAPTCHA_EXPLAIN}
! </span></td>
! <td class="row2">
! <script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
! //<![CDATA[
! var RecaptchaOptions = {
! lang : {L_RECAPTCHA_LANG}
! };
! // ]]>
! </script>
- <noscript>
- <iframe src="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" height="300" width="500" frameborder="0"></iframe><br/>
- <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
- <input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
- </noscript></td></tr>
-
<!-- ELSE -->
{L_RECAPTCHA_NOT_AVAILABLE}
<!-- ENDIF -->
-
-
\ No newline at end of file
--- 2,26 ----
<tr>
<th colspan="2" valign="middle">{L_CONFIRM_CODE}</th>
</tr>
! <tr>
! <td class="row1"><b class="genmed">{L_CONFIRM_CODE}:</b><br /><span class="gensmall">{L_RECAPTCHA_EXPLAIN}</span></td>
! <td class="row2">
! <script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
! //<![CDATA[
! var RecaptchaOptions = {
! lang : {L_RECAPTCHA_LANG}
! };
! // ]]>
! </script>
!
! <noscript>
! <iframe src="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" height="300" width="500" frameborder="0"></iframe><br />
! <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
! <input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
! </noscript>
! </td>
! </tr>
<!-- ELSE -->
{L_RECAPTCHA_NOT_AVAILABLE}
<!-- ENDIF -->
|
|
From: Andreas F. <ba...@ph...> - 2009-08-23 14:51:29
|
Author: bantu
Date: Sun Aug 23 15:50:39 2009
New Revision: 10046
Log:
#50215
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 15:50:39 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>
\ No newline at end of file
--- 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>
\ No newline at end of file
|
|
From: Ruslan U. <rx...@ph...> - 2009-08-23 11:13:11
|
Author: rxu
Date: Sun Aug 23 12:12:22 2009
New Revision: 10045
Log:
More unread posts search adjustment.
Authorised by: AcydBurn
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 Sun Aug 23 12:12:22 2009
***************
*** 1649,1659 ****
*
* @param int $user_id User ID (or false for current user)
* @param string $sql_extra Extra WHERE SQL statement
*
* @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 = '')
{
global $config, $db, $user;
--- 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;
***************
*** 1667,1698 ****
if ($config['load_db_lastread'] && $user->data['is_registered'])
{
- // List of the tracked forums (not ideal, hope the better way will be found)
- // This list is to fetch later the forums user never read (fully) before
- $sql = 'SELECT forum_id
- FROM ' . FORUMS_TRACK_TABLE . "
- WHERE user_id = $user_id";
- $result = $db->sql_query($sql);
-
- while ($row = $db->sql_fetchrow($result))
- {
- $tracked_forums_list[] = (int) $row['forum_id'];
- }
- $db->sql_freeresult($result);
-
// Get list of the unread topics - on topics tracking as the first step
$sql = 'SELECT t.topic_id, t.topic_last_post_time, tt.mark_time
FROM ' . TOPICS_TABLE . ' t, ' . TOPICS_TRACK_TABLE . " tt
WHERE t.topic_id = tt.topic_id
- AND t.topic_last_post_time >= tt.mark_time
AND tt.user_id = $user_id
$sql_extra
ORDER BY t.topic_last_post_time DESC";
! $result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
! if ($row['topic_last_post_time'] == $row['mark_time'])
{
// Check if there're read topics for the forums having unread ones
$read_topics_list[$row['topic_id']] = (int) $row['mark_time'];
--- 1668,1685 ----
if ($config['load_db_lastread'] && $user->data['is_registered'])
{
// Get list of the unread topics - on topics tracking as the first step
$sql = 'SELECT t.topic_id, t.topic_last_post_time, tt.mark_time
FROM ' . TOPICS_TABLE . ' t, ' . TOPICS_TRACK_TABLE . " tt
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))
{
! if ($row['topic_last_post_time'] <= $row['mark_time'])
{
// Check if there're read topics for the forums having unread ones
$read_topics_list[$row['topic_id']] = (int) $row['mark_time'];
***************
*** 1704,1749 ****
}
$db->sql_freeresult($result);
! // Get the full list of the tracked topics
$tracked_topics_list = array_merge(array_keys($unread_topics_list), array_keys($read_topics_list));
! // Get list of the unread topics - on forums tracking as the second step
! // We don't take in account topics tracked before
! $sql = 'SELECT t.topic_id, ft.mark_time
! FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TRACK_TABLE . ' ft
! WHERE t.forum_id = ft.forum_id
! AND t.topic_last_post_time > ft.mark_time
! 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($sql);
!
! while ($row = $db->sql_fetchrow($result))
{
! $unread_topics_list[$row['topic_id']] = (int) $row['mark_time'];
! }
! $db->sql_freeresult($result);
! // Refresh the full list of the tracked topics
! unset($tracked_topics_list);
! $tracked_topics_list = array_merge(array_keys($unread_topics_list), array_keys($read_topics_list));
! // And the last step - find unread topics were not found before (that can mean a user has never read some forums)
! $sql = 'SELECT t.topic_id
! FROM ' . TOPICS_TABLE . ' t
! WHERE t.topic_last_post_time > ' . (int) $user->data['user_lastmark'] . '
! 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, 1000);
! while ($row = $db->sql_fetchrow($result))
! {
! $unread_topics_list[$row['topic_id']] = (int) $user->data['user_lastmark'];
}
- $db->sql_freeresult($result);
}
else if ($config['load_anon_lastread'] || $user->data['is_registered'])
{
--- 1691,1757 ----
}
$db->sql_freeresult($result);
! // Get the full list of the tracked topics and unread topics count
$tracked_topics_list = array_merge(array_keys($unread_topics_list), array_keys($read_topics_list));
+ $unread_list_count = sizeof($unread_topics_list);
! if ($unread_list_count < $sql_limit)
{
! // Get list of the unread topics - on forums tracking as the second step
! // We don't take in account topics tracked before
! $sql = 'SELECT t.topic_id, ft.mark_time
! FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TRACK_TABLE . ' ft
! WHERE t.forum_id = ft.forum_id
! AND t.topic_last_post_time > ft.mark_time
! 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))
! {
! $unread_topics_list[$row['topic_id']] = (int) $row['mark_time'];
! }
! $db->sql_freeresult($result);
! // Refresh the full list of the tracked topics and unread topics count
! unset($tracked_topics_list);
! $tracked_topics_list = array_merge(array_keys($unread_topics_list), array_keys($read_topics_list));
! $unread_list_count = sizeof($unread_topics_list);
! if ($unread_list_count < $sql_limit)
! {
! // List of the tracked forums (not ideal, hope the better way will be found)
! // This list is to fetch later the forums user never read (fully) before
! $sql = 'SELECT forum_id
! FROM ' . FORUMS_TRACK_TABLE . "
! WHERE user_id = $user_id";
! $result = $db->sql_query($sql);
!
! while ($row = $db->sql_fetchrow($result))
! {
! $tracked_forums_list[] = (int) $row['forum_id'];
! }
! $db->sql_freeresult($result);
!
! // And the last step - find unread topics were not found before (that can mean a user has never read some forums)
! $sql = 'SELECT t.topic_id
! FROM ' . TOPICS_TABLE . ' t
! WHERE t.topic_last_post_time > ' . (int) $user->data['user_lastmark'] . '
! 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))
! {
! $unread_topics_list[$row['topic_id']] = (int) $user->data['user_lastmark'];
! }
! $db->sql_freeresult($result);
! }
}
}
else if ($config['load_anon_lastread'] || $user->data['is_registered'])
{
|
|
From: Henry S. <kel...@ph...> - 2009-08-22 12:42:21
|
Author: Kellanved
Date: Sat Aug 22 13:41:33 2009
New Revision: 10044
Log:
#50175
Modified:
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/viewtopic_body.html
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/viewtopic_body.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/viewtopic_body.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/viewtopic_body.html Sat Aug 22 13:41:33 2009
***************
*** 118,124 ****
<!-- ENDIF -->
</table>
{S_HIDDEN_FIELDS}
!
</form>
</td>
--- 118,124 ----
<!-- ENDIF -->
</table>
{S_HIDDEN_FIELDS}
! {S_FORM_TOKEN}
</form>
</td>
|
|
From: Henry S. <kel...@ph...> - 2009-08-22 12:11:34
|
Author: Kellanved
Date: Sat Aug 22 13:10:47 2009
New Revision: 10043
Log:
#50165
Modified:
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_qa.html
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_recaptcha.html
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_qa.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_qa.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_qa.html Sat Aug 22 13:10:47 2009
***************
*** 1,4 ****
--- 1,7 ----
<tr>
+ <th colspan="2" valign="middle">{QA_CONFIRM_QUESTION}</th>
+ </tr>
+ <tr>
<td class="row1"><b class="genmed">{QA_CONFIRM_QUESTION}: </b><br /></td>
<td class="row2"><input class="post" type="text" name="qa_answer" size="80" /></td>
<input type="hidden" name="qa_confirm_id" id="confirm_id" value="{QA_CONFIRM_ID}" /></td>
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_recaptcha.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_recaptcha.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/captcha_recaptcha.html Sat Aug 22 13:10:47 2009
***************
*** 1,7 ****
<!-- IF S_RECAPTCHA_AVAILABLE -->
! <tr><td colspan="22>
<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
! // <![CDATA[
var RecaptchaOptions = {
lang : {L_RECAPTCHA_LANG}
};
--- 1,12 ----
<!-- IF S_RECAPTCHA_AVAILABLE -->
! <tr>
! <th colspan="2" valign="middle">{L_CONFIRM_CODE}</th>
! </tr>
! <tr><td class="row1"><b class="genmed">{L_CONFIRM_CODE}: </b><br /><span class="gensmall">{L_RECAPTCHA_EXPLAIN}
! </span></td>
! <td class="row2">
<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
! //<![CDATA[
var RecaptchaOptions = {
lang : {L_RECAPTCHA_LANG}
};
|
|
From: Jim W. <ter...@ph...> - 2009-08-22 02:56:29
|
Author: terrafrost
Date: Sat Aug 22 03:56:05 2009
New Revision: 10042
Log:
- accidentally undid changes introduced in r9979
- removed a few lines from the old log filtering system
Modified:
branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php
branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_notes.php
branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php Sat Aug 22 03:56:05 2009
***************
*** 140,146 ****
'S_LIMIT_DAYS' => $s_limit_days,
'S_SORT_KEY' => $s_sort_key,
'S_SORT_DIR' => $s_sort_dir,
- 'S_LANG_KEYS' => $s_lang_keys,
'S_CLEARLOGS' => $auth->acl_get('a_clearlogs'),
'S_KEYWORDS' => $keywords,
)
--- 140,145 ----
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 Sat Aug 22 03:56:05 2009
***************
*** 338,349 ****
return false;
}
! // Check if source forums exists
$sql = 'SELECT forum_name
FROM ' . FORUMS_TABLE . '
WHERE forum_id = ' . $src_forum_id;
$result = $db->sql_query($sql);
$src_forum_name = $db->sql_fetchfield('forum_name');
// Source forum doesn't exist
if (empty($src_forum_name))
--- 338,350 ----
return false;
}
! // Check if source forum exists
$sql = 'SELECT forum_name
FROM ' . FORUMS_TABLE . '
WHERE forum_id = ' . $src_forum_id;
$result = $db->sql_query($sql);
$src_forum_name = $db->sql_fetchfield('forum_name');
+ $db->sql_freeresult($result);
// Source forum doesn't exist
if (empty($src_forum_name))
***************
*** 357,362 ****
--- 358,364 ----
WHERE ' . $db->sql_in_set('forum_id', $dest_forum_ids);
$result = $db->sql_query($sql);
+ $dest_forum_ids = $dest_forum_names = array();
while ($row = $db->sql_fetchrow($result))
{
$dest_forum_ids[] = (int) $row['forum_id'];
Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php Sat Aug 22 03:56:05 2009
***************
*** 184,190 ****
'S_SELECT_SORT_DIR' => $s_sort_dir,
'S_SELECT_SORT_KEY' => $s_sort_key,
'S_SELECT_SORT_DAYS' => $s_limit_days,
- 'S_LANG_KEYS' => $s_lang_keys,
'S_LOGS' => ($log_count > 0),
'S_KEYWORDS' => $keywords,
)
--- 184,189 ----
Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_notes.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_notes.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_notes.php Sat Aug 22 03:56:05 2009
***************
*** 222,228 ****
'S_SELECT_SORT_DIR' => $s_sort_dir,
'S_SELECT_SORT_KEY' => $s_sort_key,
'S_SELECT_SORT_DAYS' => $s_limit_days,
- 'S_LANG_KEYS' => $s_lang_keys,
'S_KEYWORDS' => $keywords,
'L_TITLE' => $user->lang['MCP_NOTES_USER'],
--- 222,227 ----
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 Sat Aug 22 03:56:05 2009
***************
*** 232,239 ****
'EXPORT_DOWNLOAD' => 'Download',
'EXPORT_STORE' => 'Store',
- 'FILTER' => 'Filter',
-
'GENERAL_OPTIONS' => 'General options',
'GENERAL_SETTINGS' => 'General settings',
'GLOBAL_MASK' => 'Global permission mask',
--- 232,237 ----
***************
*** 277,283 ****
'RETURN_TO' => 'Return toâ¦',
'SELECT_ANONYMOUS' => 'Select anonymous user',
- 'SELECT_LANG_KEY' => 'Select operation',
'SELECT_OPTION' => 'Select option',
'SETTING_TOO_LOW' => 'The entered value for the setting â%1$sâ is too low. The minimal allowed value is %2$d.',
--- 275,280 ----
***************
*** 311,318 ****
'DISPLAY_LOG' => 'Display entries from previous',
- 'LOGS_PLACEHOLDER' => '<value>',
-
'NO_ENTRIES' => 'No log entries for this period.',
'SORT_IP' => 'IP address',
--- 308,313 ----
|
|
From: Jim W. <ter...@ph...> - 2009-08-21 21:48:09
|
Author: terrafrost
Date: Fri Aug 21 22:47:19 2009
New Revision: 10041
Log:
- replaced the drop down menu log filter thing with log searching
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/acp_logs.html
branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php
branches/phpBB-3_0_0/phpBB/includes/db/dbal.php
branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_notes.php
branches/phpBB-3_0_0/phpBB/includes/utf/utf_tools.php
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_logs.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_notes_user.html
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_logs.html
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_notes_user.html
Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_logs.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_logs.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_logs.html Fri Aug 21 22:47:19 2009
***************
*** 9,15 ****
<form id="list" method="post" action="{U_ACTION}">
<fieldset class="display-options" style="float: left">
! {L_SELECT_LANG_KEY}: <select name="log_operation">{S_LANG_KEYS}</select> <input type="submit" class="button2" name="filter" value="{L_FILTER}" />
</fieldset>
<!-- IF PAGINATION -->
--- 9,15 ----
<form id="list" method="post" action="{U_ACTION}">
<fieldset class="display-options" style="float: left">
! {L_SEARCH_KEYWORDS}: <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
</fieldset>
<!-- IF PAGINATION -->
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php Fri Aug 21 22:47:19 2009
***************
*** 105,191 ****
$sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
! $log_operation = request_var('log_operation', '');
! $log_operation_param = !empty($log_operation) ? '&log_operation=' . urlencode(htmlspecialchars_decode($log_operation)) : '';
! $s_lang_keys = '<option value="">' . $user->lang['SHOW_ALL_OPERATIONS'] . '</option>';
!
! switch ($mode)
! {
! case 'admin':
! $log_type = LOG_ADMIN;
! $sql_forum = '';
! break;
!
! case 'mod':
! $log_type = LOG_MOD;
!
! if ($topic_id)
! {
! $sql_forum = 'AND topic_id = ' . intval($topic_id);
! }
! else if (is_array($forum_id))
! {
! $sql_forum = 'AND ' . $db->sql_in_set('forum_id', array_map('intval', $forum_id));
! }
! else
! {
! $sql_forum = ($forum_id) ? 'AND forum_id = ' . intval($forum_id) : '';
! }
! break;
!
! case 'user':
! $log_type = LOG_USERS;
! $sql_forum = 'AND reportee_id = ' . (int) $user_id;
! break;
!
! case 'users':
! $log_type = LOG_USERS;
! $sql_forum = '';
! break;
!
! case 'critical':
! $log_type = LOG_CRITICAL;
! $sql_forum = '';
! break;
!
! default:
! return;
! }
!
! $sql = "SELECT DISTINCT log_operation
! FROM " . LOG_TABLE . "
! WHERE log_type = $log_type
! " . (($limit_days) ? "AND log_time >= $sql_where " : ' ') .
! $sql_forum;
! $result = $db->sql_query($sql);
!
! while ($row = $db->sql_fetchrow($result))
! {
! if (empty($row['log_operation']))
! {
! continue;
! }
!
! $selected = ($log_operation == $row['log_operation']) ? ' selected="selected"' : '';
!
! if (isset($user->lang[$row['log_operation']]))
! {
! $text = htmlspecialchars(strip_tags(str_replace('<br />', ' ', $user->lang[$row['log_operation']])), ENT_COMPAT, 'UTF-8');
!
! // Fill in sprintf placeholders with translated placeholder text
! if (substr_count($text, '%'))
! {
! $text = vsprintf($text, array_fill(0, substr_count($text, '%'), $user->lang['LOGS_PLACEHOLDER']));
! }
! }
! else
! {
! $text = ucfirst(str_replace('_', ' ', strtolower($row['log_operation'])));
! }
!
! $s_lang_keys .= '<option value="' . $row['log_operation'] . '"' . $selected . '>' . $text . '</option>';
! }
! $db->sql_freeresult($result);
$l_title = $user->lang['ACP_' . strtoupper($mode) . '_LOGS'];
$l_title_explain = $user->lang['ACP_' . strtoupper($mode) . '_LOGS_EXPLAIN'];
--- 105,112 ----
$sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
! $keywords = utf8_normalize_nfc(request_var('keywords', '', true));
! $keywords_param = !empty($keywords) ? '&keywords=' . urlencode(htmlspecialchars_decode($keywords)) : '';
$l_title = $user->lang['ACP_' . strtoupper($mode) . '_LOGS'];
$l_title_explain = $user->lang['ACP_' . strtoupper($mode) . '_LOGS_EXPLAIN'];
***************
*** 206,212 ****
// Grab log data
$log_data = array();
$log_count = 0;
! view_log($mode, $log_data, $log_count, $config['topics_per_page'], $start, $forum_id, 0, 0, $sql_where, $sql_sort, $log_operation);
$template->assign_vars(array(
'L_TITLE' => $l_title,
--- 127,133 ----
// Grab log data
$log_data = array();
$log_count = 0;
! view_log($mode, $log_data, $log_count, $config['topics_per_page'], $start, $forum_id, 0, 0, $sql_where, $sql_sort, $keywords);
$template->assign_vars(array(
'L_TITLE' => $l_title,
***************
*** 214,226 ****
'U_ACTION' => $this->u_action,
'S_ON_PAGE' => on_page($log_count, $config['topics_per_page'], $start),
! 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param$log_operation_param", $log_count, $config['topics_per_page'], $start, true),
'S_LIMIT_DAYS' => $s_limit_days,
'S_SORT_KEY' => $s_sort_key,
'S_SORT_DIR' => $s_sort_dir,
'S_LANG_KEYS' => $s_lang_keys,
'S_CLEARLOGS' => $auth->acl_get('a_clearlogs'),
)
);
--- 135,148 ----
'U_ACTION' => $this->u_action,
'S_ON_PAGE' => on_page($log_count, $config['topics_per_page'], $start),
! 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param$keywords_param", $log_count, $config['topics_per_page'], $start, true),
'S_LIMIT_DAYS' => $s_limit_days,
'S_SORT_KEY' => $s_sort_key,
'S_SORT_DIR' => $s_sort_dir,
'S_LANG_KEYS' => $s_lang_keys,
'S_CLEARLOGS' => $auth->acl_get('a_clearlogs'),
+ 'S_KEYWORDS' => $keywords,
)
);
Modified: branches/phpBB-3_0_0/phpBB/includes/db/dbal.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/db/dbal.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/db/dbal.php Fri Aug 21 22:47:19 2009
***************
*** 235,242 ****
*/
function sql_like_expression($expression)
{
! $expression = str_replace(array('_', '%'), array("\_", "\%"), $expression);
! $expression = str_replace(array(chr(0) . "\_", chr(0) . "\%"), array('_', '%'), $expression);
return $this->_sql_like_expression('LIKE \'' . $this->sql_escape($expression) . '\'');
}
--- 235,242 ----
*/
function sql_like_expression($expression)
{
! $expression = utf8_str_replace(array('_', '%'), array("\_", "\%"), $expression);
! $expression = utf8_str_replace(array(chr(0) . "\_", chr(0) . "\%"), array('_', '%'), $expression);
return $this->_sql_like_expression('LIKE \'' . $this->sql_escape($expression) . '\'');
}
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 Aug 21 22:47:19 2009
***************
*** 338,350 ****
return false;
}
! // Check if source forum exists
$sql = 'SELECT forum_name
FROM ' . FORUMS_TABLE . '
WHERE forum_id = ' . $src_forum_id;
$result = $db->sql_query($sql);
$src_forum_name = $db->sql_fetchfield('forum_name');
- $db->sql_freeresult($result);
// Source forum doesn't exist
if (empty($src_forum_name))
--- 338,349 ----
return false;
}
! // Check if source forums exists
$sql = 'SELECT forum_name
FROM ' . FORUMS_TABLE . '
WHERE forum_id = ' . $src_forum_id;
$result = $db->sql_query($sql);
$src_forum_name = $db->sql_fetchfield('forum_name');
// Source forum doesn't exist
if (empty($src_forum_name))
***************
*** 358,364 ****
WHERE ' . $db->sql_in_set('forum_id', $dest_forum_ids);
$result = $db->sql_query($sql);
- $dest_forum_ids = $dest_forum_names = array();
while ($row = $db->sql_fetchrow($result))
{
$dest_forum_ids[] = (int) $row['forum_id'];
--- 357,362 ----
***************
*** 2497,2503 ****
/**
* View log
*/
! function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $limit_days = 0, $sort_by = 'l.log_time DESC', $log_operation = '')
{
global $db, $user, $auth, $phpEx, $phpbb_root_path, $phpbb_admin_path;
--- 2495,2501 ----
/**
* View log
*/
! function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $limit_days = 0, $sort_by = 'l.log_time DESC', $keywords = '')
{
global $db, $user, $auth, $phpEx, $phpbb_root_path, $phpbb_admin_path;
***************
*** 2548,2559 ****
return;
}
$sql = "SELECT l.*, u.username, u.username_clean, u.user_colour
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";
$result = $db->sql_query_limit($sql, $limit, $offset);
--- 2546,2585 ----
return;
}
+ $keywords = preg_split('#[\s+\-|*()]+#u', utf8_strtolower(preg_quote($keywords, '#')), 0, PREG_SPLIT_NO_EMPTY);
+ $sql_keywords = '';
+
+ if (!empty($keywords))
+ {
+ $keywords_pattern = '#' . implode('|', $keywords) . '#ui';
+ for ($i = 0, $num_keywords = sizeof($keywords); $i < $num_keywords; $i++)
+ {
+ $keywords[$i] = $db->sql_like_expression($db->any_char . $keywords[$i] . $db->any_char);
+ }
+
+ $operations = array();
+ foreach ($user->lang as $key=>$value)
+ {
+ if (substr($key, 0, 4) == 'LOG_' && preg_match($keywords_pattern, $value))
+ {
+ $operations[] = $key;
+ }
+ }
+
+ $sql_keywords = 'AND (';
+ if (!empty($operations))
+ {
+ $sql_keywords.= $db->sql_in_set('l.log_operation', $operations) . ' OR ';
+ }
+ $sql_keywords.= 'LOWER(l.log_data) ' . implode(' OR LOWER(l.log_data) ', $keywords) . ')';
+ }
+
$sql = "SELECT l.*, u.username, u.username_clean, u.user_colour
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" : '') . "
! $sql_keywords
$sql_forum
ORDER BY $sort_by";
$result = $db->sql_query_limit($sql, $limit, $offset);
***************
*** 2718,2725 ****
$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 " .
! (!empty($log_operation) ? "AND l.log_operation = '" . $db->sql_escape($log_operation) . "'" : '') . "
$sql_forum";
$result = $db->sql_query($sql);
$log_count = (int) $db->sql_fetchfield('total_entries');
--- 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";
$result = $db->sql_query($sql);
$log_count = (int) $db->sql_fetchfield('total_entries');
Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php Fri Aug 21 22:47:19 2009
***************
*** 164,230 ****
$sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
! $log_operation = request_var('log_operation', '');
! $log_operation_param = !empty($log_operation) ? '&log_operation=' . urlencode(htmlspecialchars_decode($log_operation)) : '';
! $s_lang_keys = '<option value="">' . $user->lang['SHOW_ALL_OPERATIONS'] . '</option>';
!
! if ($topic_id)
! {
! $sql_forum = 'AND topic_id = ' . intval($topic_id);
! }
! else if (is_array($forum_id))
! {
! $sql_forum = 'AND ' . $db->sql_in_set('forum_id', array_map('intval', $forum_id));
! }
! else
! {
! $sql_forum = ($forum_id) ? 'AND forum_id = ' . intval($forum_id) : '';
! }
!
! $sql = "SELECT DISTINCT log_operation
! FROM " . LOG_TABLE . '
! WHERE log_type = ' . LOG_MOD . '
! ' . (($limit_days) ? "AND log_time >= $sql_where " : ' ') .
! $sql_forum;
! $result = $db->sql_query($sql);
!
! while ($row = $db->sql_fetchrow($result))
! {
! if (empty($row['log_operation']))
! {
! continue;
! }
!
! $selected = ($log_operation == $row['log_operation']) ? ' selected="selected"' : '';
!
! if (isset($user->lang[$row['log_operation']]))
! {
! $text = htmlspecialchars(strip_tags(str_replace('<br />', ' ', $user->lang[$row['log_operation']])), ENT_COMPAT, 'UTF-8');
!
! // Fill in sprintf placeholders with translated placeholder text
! if (substr_count($text, '%'))
! {
! $text = vsprintf($text, array_fill(0, substr_count($text, '%'), $user->lang['LOGS_PLACEHOLDER']));
! }
! }
! else
! {
! $text = ucfirst(str_replace('_', ' ', strtolower($row['log_operation'])));
! }
!
! $s_lang_keys .= '<option value="' . $row['log_operation'] . '"' . $selected . '>' . $text . '</option>';
! }
! $db->sql_freeresult($result);
// Grab log data
$log_data = array();
$log_count = 0;
! view_log('mod', $log_data, $log_count, $config['topics_per_page'], $start, $forum_list, $topic_id, 0, $sql_where, $sql_sort, $log_operation);
$template->assign_vars(array(
'PAGE_NUMBER' => on_page($log_count, $config['topics_per_page'], $start),
'TOTAL' => ($log_count == 1) ? $user->lang['TOTAL_LOG'] : sprintf($user->lang['TOTAL_LOGS'], $log_count),
! 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param$log_operation_param", $log_count, $config['topics_per_page'], $start),
'L_TITLE' => $user->lang['MCP_LOGS'],
--- 164,181 ----
$sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
! $keywords = utf8_normalize_nfc(request_var('keywords', '', true));
! $keywords_param = !empty($keywords) ? '&keywords=' . urlencode(htmlspecialchars_decode($keywords)) : '';
// Grab log data
$log_data = array();
$log_count = 0;
! view_log('mod', $log_data, $log_count, $config['topics_per_page'], $start, $forum_list, $topic_id, 0, $sql_where, $sql_sort, $keywords);
$template->assign_vars(array(
'PAGE_NUMBER' => on_page($log_count, $config['topics_per_page'], $start),
'TOTAL' => ($log_count == 1) ? $user->lang['TOTAL_LOG'] : sprintf($user->lang['TOTAL_LOGS'], $log_count),
! 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param$log_operation_param$keywords_param", $log_count, $config['topics_per_page'], $start, true),
'L_TITLE' => $user->lang['MCP_LOGS'],
***************
*** 235,240 ****
--- 186,192 ----
'S_SELECT_SORT_DAYS' => $s_limit_days,
'S_LANG_KEYS' => $s_lang_keys,
'S_LOGS' => ($log_count > 0),
+ 'S_KEYWORDS' => $keywords,
)
);
Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_notes.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_notes.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_notes.php Fri Aug 21 22:47:19 2009
***************
*** 193,221 ****
$sql_where = ($st) ? (time() - ($st * 86400)) : 0;
$sql_sort = $sort_by_sql[$sk] . ' ' . (($sd == 'd') ? 'DESC' : 'ASC');
! $log_operation = request_var('log_operation', '');
! $log_operation_param = !empty($log_operation) ? '&log_operation=' . urlencode(htmlspecialchars_decode($log_operation)) : '';
! $s_lang_keys = '<option value="">' . $user->lang['SHOW_ALL_OPERATIONS'] . '</option>';
!
! $sql = "SELECT DISTINCT log_operation
! FROM " . LOG_TABLE . '
! WHERE log_type = ' . LOG_USERS .
! (($limit_days) ? " AND log_time >= $sql_where" : '');
! $result = $db->sql_query($sql);
! while ($row = $db->sql_fetchrow($result))
! {
! if (empty($row['log_operation']))
! {
! continue;
! }
! $selected = ($log_operation == $row['log_operation']) ? ' selected="selected"' : '';
! $s_lang_keys .= '<option value="' . $row['log_operation'] . '"' . $selected . '>' . htmlspecialchars(strip_tags($user->lang[$row['log_operation']]), ENT_COMPAT, 'UTF-8') . '</option>';
! }
! $db->sql_freeresult($result);
$log_data = array();
$log_count = 0;
! view_log('user', $log_data, $log_count, $config['posts_per_page'], $start, 0, 0, $user_id, $sql_where, $sql_sort, $log_operation);
if ($log_count)
{
--- 193,204 ----
$sql_where = ($st) ? (time() - ($st * 86400)) : 0;
$sql_sort = $sort_by_sql[$sk] . ' ' . (($sd == 'd') ? 'DESC' : 'ASC');
! $keywords = utf8_normalize_nfc(request_var('keywords', '', true));
! $keywords_param = !empty($keywords) ? '&keywords=' . urlencode(htmlspecialchars_decode($keywords)) : '';
$log_data = array();
$log_count = 0;
! view_log('user', $log_data, $log_count, $config['posts_per_page'], $start, 0, 0, $user_id, $sql_where, $sql_sort, $keywords);
if ($log_count)
{
***************
*** 240,250 ****
'S_SELECT_SORT_KEY' => $s_sort_key,
'S_SELECT_SORT_DAYS' => $s_limit_days,
'S_LANG_KEYS' => $s_lang_keys,
'L_TITLE' => $user->lang['MCP_NOTES_USER'],
'PAGE_NUMBER' => on_page($log_count, $config['posts_per_page'], $start),
! 'PAGINATION' => generate_pagination($this->u_action . "&st=$st&sk=$sk&sd=$sd$log_operation_param", $log_count, $config['posts_per_page'], $start),
'TOTAL_REPORTS' => ($log_count == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $log_count),
'RANK_TITLE' => $rank_title,
--- 223,234 ----
'S_SELECT_SORT_KEY' => $s_sort_key,
'S_SELECT_SORT_DAYS' => $s_limit_days,
'S_LANG_KEYS' => $s_lang_keys,
+ 'S_KEYWORDS' => $keywords,
'L_TITLE' => $user->lang['MCP_NOTES_USER'],
'PAGE_NUMBER' => on_page($log_count, $config['posts_per_page'], $start),
! 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param$keywords_param", $log_count, $config['topics_per_page'], $start, true),
'TOTAL_REPORTS' => ($log_count == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $log_count),
'RANK_TITLE' => $rank_title,
Modified: branches/phpBB-3_0_0/phpBB/includes/utf/utf_tools.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/utf/utf_tools.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/utf/utf_tools.php Fri Aug 21 22:47:19 2009
***************
*** 1945,1948 ****
--- 1945,1995 ----
return $filename;
}
+ /**
+ * UTF8-safe str_replace() function
+ *
+ * @param string $search The value to search for
+ * @param string $replace The replacement string
+ * @param string $subject The target string
+ * @return string The resultant string
+ */
+ function utf8_str_replace($search, $replace, $subject)
+ {
+ if (!is_array($search))
+ {
+ $search = array($search);
+ if (is_array($replace))
+ {
+ $replace = (string) $replace;
+ trigger_error('Array to string conversion', E_USER_NOTICE);
+ }
+ }
+
+ $length = sizeof($search);
+
+ if (!is_array($replace))
+ {
+ $replace = array_fill(0, $length, $replace);
+ }
+ else
+ {
+ $replace = array_pad($replace, $length, '');
+ }
+
+ for ($i = 0; $i < $length; $i++)
+ {
+ $search_length = utf8_strlen($search[$i]);
+ $replace_length = utf8_strlen($replace[$i]);
+
+ $offset = 0;
+ while (($start = utf8_strpos($subject, $search[$i], $offset)) !== false)
+ {
+ $subject = utf8_substr($subject, 0, $start) . $replace[$i] . utf8_substr($subject, $start + $search_length);
+ $offset = $start + $replace_length;
+ }
+ }
+
+ return $subject;
+ }
+
?>
\ No newline at end of file
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_logs.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_logs.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_logs.html Fri Aug 21 22:47:19 2009
***************
*** 9,15 ****
<ul class="linklist">
<li class="leftside">
! {L_SELECT_LANG_KEY}: <select name="log_operation">{S_LANG_KEYS}</select> <input type="submit" class="button2" name="filter" value="{L_FILTER}" />
</li>
<li class="rightside pagination">
<!-- IF TOTAL -->{TOTAL} <!-- ENDIF -->
--- 9,15 ----
<ul class="linklist">
<li class="leftside">
! {L_SEARCH_KEYWORDS}: <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
</li>
<li class="rightside pagination">
<!-- IF TOTAL -->{TOTAL} <!-- ENDIF -->
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 Fri Aug 21 22:47:19 2009
***************
*** 52,58 ****
<ul class="linklist">
<li class="leftside">
! {L_SELECT_LANG_KEY}: <select name="log_operation">{S_LANG_KEYS}</select> <input type="submit" class="button2" name="filter" value="{L_FILTER}" />
</li>
<li class="rightside pagination">
<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS} <!-- ENDIF -->
--- 52,58 ----
<ul class="linklist">
<li class="leftside">
! {L_SEARCH_KEYWORDS}: <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
</li>
<li class="rightside pagination">
<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS} <!-- ENDIF -->
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_logs.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_logs.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_logs.html Fri Aug 21 22:47:19 2009
***************
*** 22,28 ****
</tr>
<!-- END log -->
<tr align="center">
! <td class="row3" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->"><span class="gensmall">{L_SELECT_LANG_KEY}:</span> <select name="log_operation">{S_LANG_KEYS}</select> <input type="submit" class="button2" name="filter" value="{L_FILTER}" /></td>
</tr>
<tr align="center">
<td class="row3" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td>
--- 22,28 ----
</tr>
<!-- END log -->
<tr align="center">
! <td class="row3" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->"><span class="gensmall">{L_SEARCH_KEYWORDS}:</span> <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" /></td>
</tr>
<tr align="center">
<td class="row3" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td>
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_notes_user.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_notes_user.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_notes_user.html Fri Aug 21 22:47:19 2009
***************
*** 55,61 ****
<!-- IF S_USER_NOTES -->
<tr align="center">
! <td colspan="5" class="row3"><span class="gensmall">{L_SELECT_LANG_KEY}:</span> <select name="log_operation">{S_LANG_KEYS}</select> <input type="submit" class="button2" name="filter" value="{L_FILTER}" /></td>
</tr>
<tr align="center">
<td colspan="5" class="row3"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td>
--- 55,61 ----
<!-- IF S_USER_NOTES -->
<tr align="center">
! <td colspan="5" class="row3"><span class="gensmall">{L_SEARCH_KEYWORDS}:</span> <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" /></td>
</tr>
<tr align="center">
<td colspan="5" class="row3"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td>
|
|
From: Andreas F. <ba...@ph...> - 2009-08-21 10:47:18
|
Author: bantu
Date: Fri Aug 21 11:46:58 2009
New Revision: 10040
Log:
Use comparison instead of arithmetic.
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions_display.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_display.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_display.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_display.php Fri Aug 21 11:46:58 2009
***************
*** 168,174 ****
}
// Count the difference of real to public topics, so we can display an information to moderators
! $row['forum_id_unapproved_topics'] = ($auth->acl_get('m_approve', $forum_id) && ($row['forum_topics_real'] - $row['forum_topics'])) ? $forum_id : 0;
$row['forum_topics'] = ($auth->acl_get('m_approve', $forum_id)) ? $row['forum_topics_real'] : $row['forum_topics'];
// Display active topics from this forum?
--- 168,174 ----
}
// Count the difference of real to public topics, so we can display an information to moderators
! $row['forum_id_unapproved_topics'] = ($auth->acl_get('m_approve', $forum_id) && ($row['forum_topics_real'] != $row['forum_topics'])) ? $forum_id : 0;
$row['forum_topics'] = ($auth->acl_get('m_approve', $forum_id)) ? $row['forum_topics_real'] : $row['forum_topics'];
// Display active topics from this forum?
|
|
From: Andreas F. <ba...@ph...> - 2009-08-21 09:45:48
|
Author: bantu
Date: Fri Aug 21 10:44:55 2009
New Revision: 10039
Log:
Allow "0" as censor word and replacement.
Only obtain word censor list if text is not empty.
Modified:
branches/phpBB-3_0_0/phpBB/includes/acp/acp_words.php
branches/phpBB-3_0_0/phpBB/includes/functions_content.php
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_words.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_words.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_words.php Fri Aug 21 10:44:55 2009
***************
*** 23,29 ****
class acp_words
{
var $u_action;
!
function main($id, $mode)
{
global $db, $user, $auth, $template, $cache;
--- 23,29 ----
class acp_words
{
var $u_action;
!
function main($id, $mode)
{
global $db, $user, $auth, $template, $cache;
***************
*** 47,54 ****
switch ($action)
{
case 'edit':
$word_id = request_var('id', 0);
!
if (!$word_id)
{
trigger_error($user->lang['NO_WORD'] . adm_back_link($this->u_action), E_USER_WARNING);
--- 47,55 ----
switch ($action)
{
case 'edit':
+
$word_id = request_var('id', 0);
!
if (!$word_id)
{
trigger_error($user->lang['NO_WORD'] . adm_back_link($this->u_action), E_USER_WARNING);
***************
*** 73,79 ****
'REPLACEMENT' => (isset($word_info['replacement'])) ? $word_info['replacement'] : '',
'S_HIDDEN_FIELDS' => $s_hidden_fields)
);
!
return;
break;
--- 74,80 ----
'REPLACEMENT' => (isset($word_info['replacement'])) ? $word_info['replacement'] : '',
'S_HIDDEN_FIELDS' => $s_hidden_fields)
);
!
return;
break;
***************
*** 84,94 ****
{
trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING);
}
$word_id = request_var('id', 0);
$word = utf8_normalize_nfc(request_var('word', '', true));
$replacement = utf8_normalize_nfc(request_var('replacement', '', true));
!
! if (!$word || !$replacement)
{
trigger_error($user->lang['ENTER_WORD'] . adm_back_link($this->u_action), E_USER_WARNING);
}
--- 85,96 ----
{
trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING);
}
+
$word_id = request_var('id', 0);
$word = utf8_normalize_nfc(request_var('word', '', true));
$replacement = utf8_normalize_nfc(request_var('replacement', '', true));
!
! if ($word === '' || $replacement === '')
{
trigger_error($user->lang['ENTER_WORD'] . adm_back_link($this->u_action), E_USER_WARNING);
}
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 Aug 21 10:44:55 2009
***************
*** 685,690 ****
--- 685,696 ----
{
static $censors;
+ // Nothing to do?
+ if ($text === '')
+ {
+ return '';
+ }
+
// We moved the word censor checks in here because we call this function quite often - and then only need to do the check once
if (!isset($censors) || !is_array($censors))
{
|
|
From: Meik S. <acy...@ph...> - 2009-08-20 15:09:45
|
Author: acydburn
Date: Thu Aug 20 16:09:28 2009
New Revision: 10038
Log:
Fix wrong textLength call in Webkit-based browsers - Bug #25825 - patch by Technocrat
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/editor.js
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/editor.js
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/editor.js
Modified: branches/phpBB-3_0_0/phpBB/adm/style/editor.js
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/editor.js (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/editor.js Thu Aug 20 16:09:28 2009
***************
*** 258,264 ****
*/
function mozWrap(txtarea, open, close)
{
! var selLength = txtarea.textLength;
var selStart = txtarea.selectionStart;
var selEnd = txtarea.selectionEnd;
var scrollTop = txtarea.scrollTop;
--- 258,264 ----
*/
function mozWrap(txtarea, open, close)
{
! var selLength = (typeof(txtarea.textLength) == 'undefined') ? txtarea.value.length : txtarea.textLength;
var selStart = txtarea.selectionStart;
var selEnd = txtarea.selectionEnd;
var scrollTop = txtarea.scrollTop;
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 Thu Aug 20 16:09:28 2009
***************
*** 308,314 ****
*/
function mozWrap(txtarea, open, close)
{
! var selLength = txtarea.textLength;
var selStart = txtarea.selectionStart;
var selEnd = txtarea.selectionEnd;
var scrollTop = txtarea.scrollTop;
--- 308,314 ----
*/
function mozWrap(txtarea, open, close)
{
! var selLength = (typeof(txtarea.textLength) == 'undefined') ? txtarea.value.length : txtarea.textLength;
var selStart = txtarea.selectionStart;
var selEnd = txtarea.selectionEnd;
var scrollTop = txtarea.scrollTop;
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/editor.js
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/editor.js (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/editor.js Thu Aug 20 16:09:28 2009
***************
*** 261,267 ****
*/
function mozWrap(txtarea, open, close)
{
! var selLength = txtarea.textLength;
var selStart = txtarea.selectionStart;
var selEnd = txtarea.selectionEnd;
var scrollTop = txtarea.scrollTop;
--- 261,267 ----
*/
function mozWrap(txtarea, open, close)
{
! var selLength = (typeof(txtarea.textLength) == 'undefined') ? txtarea.value.length : txtarea.textLength;
var selStart = txtarea.selectionStart;
var selEnd = txtarea.selectionEnd;
var scrollTop = txtarea.scrollTop;
|
|
From: Meik S. <acy...@ph...> - 2009-08-20 15:06:34
|
Author: acydburn
Date: Thu Aug 20 16:06:16 2009
New Revision: 10037
Log:
Fix r10035
[ Sort private messages by message time and not message id. (Bug #50015) ]
Modified:
branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php
Modified: branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php Thu Aug 20 16:06:16 2009
***************
*** 462,468 ****
}
// Select the sort order
! $directioin = ($sort_dir == 'd') ? 'ASC' : 'DESC';
$sql_start = max(0, $pm_count - $sql_limit - $start);
}
else
--- 462,468 ----
}
// Select the sort order
! $direction = ($sort_dir == 'd') ? 'ASC' : 'DESC';
$sql_start = max(0, $pm_count - $sql_limit - $start);
}
else
|
|
From: Meik S. <acy...@ph...> - 2009-08-20 14:53:38
|
Author: acydburn
Date: Thu Aug 20 15:53:25 2009
New Revision: 10036
Log:
Check for valid $template_path in includes/template.php - Bug #50055
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 Thu Aug 20 15:53:25 2009
***************
*** 94,99 ****
--- 94,105 ----
{
global $phpbb_root_path, $user;
+ // Make sure $template_path has no ending slash
+ if (substr($template_path, -1) == '/')
+ {
+ $template_path = substr($template_path, 0, -1);
+ }
+
$this->root = $template_path;
$this->cachepath = $phpbb_root_path . 'cache/ctpl_' . str_replace('_', '-', $template_name) . '_';
$user->theme['template_storedb'] = false;
|
|
From: Meik S. <acy...@ph...> - 2009-08-20 14:51:28
|
Author: acydburn
Date: Thu Aug 20 15:50:40 2009
New Revision: 10035
Log:
Sort private messages by message time and not message id. (Bug #50015)
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php
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 Thu Aug 20 15:50:40 2009
***************
*** 198,203 ****
--- 198,204 ----
<li>[Fix] Do not display topic approval status image for shadow topic if a user is not a moderator in the forum the topic has been moved to. (Bug #43295)</li>
<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>[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/ucp/ucp_pm_viewfolder.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php Thu Aug 20 15:50:40 2009
***************
*** 386,397 ****
if ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX)
{
$sort_by_text = array('t' => $user->lang['POST_TIME'], 's' => $user->lang['SUBJECT']);
! $sort_by_sql = array('t' => 'p.msg_id', 's' => 'p.message_subject');
}
else
{
$sort_by_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 's' => $user->lang['SUBJECT']);
! $sort_by_sql = array('a' => 'u.username_clean', 't' => 'p.msg_id', 's' => 'p.message_subject');
}
$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
--- 386,397 ----
if ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX)
{
$sort_by_text = array('t' => $user->lang['POST_TIME'], 's' => $user->lang['SUBJECT']);
! $sort_by_sql = array('t' => 'p.message_time', 's' => array('p.message_subject', 'p.message_time'));
}
else
{
$sort_by_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 's' => $user->lang['SUBJECT']);
! $sort_by_sql = array('a' => array('u.username_clean', 'p.message_time'), 't' => 'p.message_time', 's' => array('p.message_subject', 'p.message_time'));
}
$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
***************
*** 462,477 ****
}
// Select the sort order
! $sql_sort_order = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'ASC' : 'DESC');
$sql_start = max(0, $pm_count - $sql_limit - $start);
}
else
{
// Select the sort order
! $sql_sort_order = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
$sql_start = $start;
}
$sql = 'SELECT t.*, p.root_level, p.message_time, p.message_subject, p.icon_id, p.to_address, p.message_attachment, p.bcc_address, u.username, u.username_clean, u.user_colour
FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p, ' . USERS_TABLE . " u
WHERE t.user_id = $user_id
--- 462,487 ----
}
// Select the sort order
! $directioin = ($sort_dir == 'd') ? 'ASC' : 'DESC';
$sql_start = max(0, $pm_count - $sql_limit - $start);
}
else
{
// Select the sort order
! $direction = ($sort_dir == 'd') ? 'DESC' : 'ASC';
$sql_start = $start;
}
+ // Sql sort order
+ if (is_array($sort_by_sql[$sort_key]))
+ {
+ $sql_sort_order = implode(' ' . $direction . ', ', $sort_by_sql[$sort_key]) . ' ' . $direction;
+ }
+ else
+ {
+ $sql_sort_order = $sort_by_sql[$sort_key] . ' ' . $direction;
+ }
+
$sql = 'SELECT t.*, p.root_level, p.message_time, p.message_subject, p.icon_id, p.to_address, p.message_attachment, p.bcc_address, u.username, u.username_clean, u.user_colour
FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p, ' . USERS_TABLE . " u
WHERE t.user_id = $user_id
Modified: branches/phpBB-3_0_0/phpBB/viewtopic.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/viewtopic.php (original)
--- branches/phpBB-3_0_0/phpBB/viewtopic.php Thu Aug 20 15:50:40 2009
***************
*** 907,912 ****
--- 907,913 ----
$direction = (($sort_dir == 'd') ? 'DESC' : 'ASC');
$sql_start = $start;
}
+
if (is_array($sort_by_sql[$sort_key]))
{
$sql_sort_order = implode(' ' . $direction . ', ', $sort_by_sql[$sort_key]) . ' ' . $direction;
***************
*** 916,922 ****
$sql_sort_order = $sort_by_sql[$sort_key] . ' ' . $direction;
}
-
// Container for user details, only process once
$post_list = $user_cache = $id_cache = $attachments = $attach_list = $rowset = $update_count = $post_edit_list = array();
$has_attachments = $display_notice = false;
--- 917,922 ----
***************
*** 1604,1610 ****
$result = $db->sql_query_limit($sql, 1);
$topic_data['forum_last_post_time'] = (int) $db->sql_fetchfield('forum_last_post_time');
$db->sql_freeresult($result);
!
$sql = 'SELECT mark_time as forum_mark_time
FROM ' . FORUMS_TRACK_TABLE . '
WHERE forum_id = 0
--- 1604,1610 ----
$result = $db->sql_query_limit($sql, 1);
$topic_data['forum_last_post_time'] = (int) $db->sql_fetchfield('forum_last_post_time');
$db->sql_freeresult($result);
!
$sql = 'SELECT mark_time as forum_mark_time
FROM ' . FORUMS_TRACK_TABLE . '
WHERE forum_id = 0
|
|
From: Henry S. <kel...@ph...> - 2009-08-20 14:43:26
|
Author: Kellanved
Date: Thu Aug 20 15:42:38 2009
New Revision: 10034
Log:
#50025
Modified:
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php Thu Aug 20 15:42:38 2009
***************
*** 168,174 ****
// this is required for posting.php - otherwise we would forget about the captcha being already solved
if ($this->solved)
{
! $hidden_fields['confirm_code'] = $this->confirm_code;
}
$hidden_fields['confirm_id'] = $this->confirm_id;
return $hidden_fields;
--- 168,174 ----
// this is required for posting.php - otherwise we would forget about the captcha being already solved
if ($this->solved)
{
! $hidden_fields['confirm_code'] = $this->code;
}
$hidden_fields['confirm_id'] = $this->confirm_id;
return $hidden_fields;
|
|
From: Joas S. <nic...@ph...> - 2009-08-20 14:34:38
|
Author: nickvergessen
Date: Thu Aug 20 15:34:20 2009
New Revision: 10033
Log:
fix r10025
Authorised by: naderman
Modified:
branches/phpBB-3_0_0/phpBB/language/en/acp/board.php
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/board.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/board.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/board.php Thu Aug 20 15:34:20 2009
***************
*** 92,98 ****
'ACP_AVATAR_SETTINGS_EXPLAIN' => 'Avatars are generally small, unique images a user can associate with themselves. Depending on the style they are usually displayed below the username when viewing topics. Here you can determine how users can define their avatars. Please note that in order to upload avatars you need to have created the directory you name below and ensure it can be written to by the web server. Please also note that file size limits are only imposed on uploaded avatars, they do not apply to remotely linked images.',
'ALLOW_AVATARS' => 'Enable avatars',
! 'ALLOW_AVATARS_EXPLAIN' => 'Allow general usage of avatars;<br />If you disable avatars in general or avatars of a certain mode, these avatars will no longer be display within the board, but users are still able to download their own avatar in the User Control Panel',
'ALLOW_LOCAL' => 'Enable gallery avatars',
'ALLOW_REMOTE' => 'Enable remote avatars',
'ALLOW_REMOTE_EXPLAIN' => 'Avatars linked to from another website.',
--- 92,98 ----
'ACP_AVATAR_SETTINGS_EXPLAIN' => 'Avatars are generally small, unique images a user can associate with themselves. Depending on the style they are usually displayed below the username when viewing topics. Here you can determine how users can define their avatars. Please note that in order to upload avatars you need to have created the directory you name below and ensure it can be written to by the web server. Please also note that file size limits are only imposed on uploaded avatars, they do not apply to remotely linked images.',
'ALLOW_AVATARS' => 'Enable avatars',
! 'ALLOW_AVATARS_EXPLAIN' => 'Allow general usage of avatars;<br />If you disable avatars in general or avatars of a certain mode, the disabled avatars will no longer be shown on the board, but users will still be able to download their own avatars in the User Control Panel.',
'ALLOW_LOCAL' => 'Enable gallery avatars',
'ALLOW_REMOTE' => 'Enable remote avatars',
'ALLOW_REMOTE_EXPLAIN' => 'Avatars linked to from another website.',
|
|
From: Andreas F. <ba...@ph...> - 2009-08-20 14:07:46
|
Author: bantu
Date: Thu Aug 20 15:07:01 2009
New Revision: 10032
Log:
Apply template changes of r9965 to subsilver2.
Modified:
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/overall_header.html
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/overall_header.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/overall_header.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/overall_header.html Thu Aug 20 15:07:01 2009
***************
*** 20,27 ****
<!-- IF S_ENABLE_FEEDS_NEWS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FEED_NEWS}" href="{U_FEED}?mode=news" /><!-- ENDIF -->
<!-- IF S_ENABLE_FEEDS_FORUMS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_ALL_FORUMS}" href="{U_FEED}?mode=forums" /><!-- ENDIF -->
<!-- IF S_ENABLE_FEEDS_TOPICS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_ALL_TOPICS}" href="{U_FEED}?mode=topics" /><!-- ENDIF -->
! <!-- IF S_ENABLE_FEEDS_FORUM and S_FORUM_ID --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FORUM} {FORUM_NAME}" href="{U_FEED}?f={S_FORUM_ID}" /><!-- ENDIF -->
! <!-- IF S_ENABLE_FEEDS_TOPIC and S_TOPIC_ID --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_TOPIC} {TOPIC_TITLE}" href="{U_FEED}?f={S_FORUM_ID}&t={S_TOPIC_ID}" /><!-- ENDIF -->
<!-- ENDIF -->
<link rel="stylesheet" href="{T_STYLESHEET_LINK}" type="text/css" />
--- 20,27 ----
<!-- IF S_ENABLE_FEEDS_NEWS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FEED_NEWS}" href="{U_FEED}?mode=news" /><!-- ENDIF -->
<!-- IF S_ENABLE_FEEDS_FORUMS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_ALL_FORUMS}" href="{U_FEED}?mode=forums" /><!-- ENDIF -->
<!-- IF S_ENABLE_FEEDS_TOPICS --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_ALL_TOPICS}" href="{U_FEED}?mode=topics" /><!-- ENDIF -->
! <!-- IF S_ENABLE_FEEDS_FORUM and S_FORUM_ID --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FORUM} - {FORUM_NAME}" href="{U_FEED}?f={S_FORUM_ID}" /><!-- ENDIF -->
! <!-- IF S_ENABLE_FEEDS_TOPIC and S_TOPIC_ID --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_TOPIC} - {TOPIC_TITLE}" href="{U_FEED}?f={S_FORUM_ID}&t={S_TOPIC_ID}" /><!-- ENDIF -->
<!-- ENDIF -->
<link rel="stylesheet" href="{T_STYLESHEET_LINK}" type="text/css" />
|
|
From: Meik S. <acy...@ph...> - 2009-08-20 12:34:22
|
Author: acydburn
Date: Thu Aug 20 13:34:02 2009
New Revision: 10031
Log:
better icon... hopefully. ;)
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/images/feed.gif
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/images/feed.gif
==============================================================================
Binary files - no diff available.
|
|
From: Meik S. <acy...@ph...> - 2009-08-20 12:28:05
|
Author: acydburn
Date: Thu Aug 20 13:19:12 2009
New Revision: 10028
Log:
also populate forum_options on conversions
Modified:
branches/phpBB-3_0_0/phpBB/install/convertors/functions_phpbb20.php
Modified: branches/phpBB-3_0_0/phpBB/install/convertors/functions_phpbb20.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/convertors/functions_phpbb20.php (original)
--- branches/phpBB-3_0_0/phpBB/install/convertors/functions_phpbb20.php Thu Aug 20 13:19:12 2009
***************
*** 71,78 ****
$result = $src_db->sql_query($sql);
$prune_enabled = (int) $src_db->sql_fetchfield('config_value');
$src_db->sql_freeresult($result);
!
!
// Insert categories
$sql = 'SELECT cat_id, cat_title
FROM ' . $convert->src_table_prefix . 'categories
--- 71,78 ----
$result = $src_db->sql_query($sql);
$prune_enabled = (int) $src_db->sql_fetchfield('config_value');
$src_db->sql_freeresult($result);
!
!
// Insert categories
$sql = 'SELECT cat_id, cat_title
FROM ' . $convert->src_table_prefix . 'categories
***************
*** 227,232 ****
--- 227,233 ----
'prune_freq' => (int) null_to_zero($row['prune_freq']),
'forum_flags' => phpbb_forum_flags(),
+ 'forum_options' => 0,
// Default values
'forum_desc_bitfield' => '',
***************
*** 972,983 ****
{
// And now the moderators
// We make sure that they have at least standard access to the forums they moderate in addition to the moderating permissions
!
$mod_post_map = array(
'auth_announce' => 'f_announce',
'auth_sticky' => 'f_sticky'
);
!
foreach ($user_access as $forum_id => $access_map)
{
$forum_id = (int) $forum_id;
--- 973,984 ----
{
// And now the moderators
// We make sure that they have at least standard access to the forums they moderate in addition to the moderating permissions
!
$mod_post_map = array(
'auth_announce' => 'f_announce',
'auth_sticky' => 'f_sticky'
);
!
foreach ($user_access as $forum_id => $access_map)
{
$forum_id = (int) $forum_id;
***************
*** 1229,1235 ****
{
$message = preg_replace('/\[quote="(.*?)"\]/s', '[quote="\1"]', $message);
$message = preg_replace('/\[quote=\\\"(.*?)\\\"\]/s', '[quote="\1"]', $message);
!
// let's hope that this solves more problems than it causes. Deal with escaped quotes.
$message = str_replace('\"', '"', $message);
$message = str_replace('\"', '"', $message);
--- 1230,1236 ----
{
$message = preg_replace('/\[quote="(.*?)"\]/s', '[quote="\1"]', $message);
$message = preg_replace('/\[quote=\\\"(.*?)\\\"\]/s', '[quote="\1"]', $message);
!
// let's hope that this solves more problems than it causes. Deal with escaped quotes.
$message = str_replace('\"', '"', $message);
$message = str_replace('\"', '"', $message);
***************
*** 1258,1264 ****
// parse($allow_bbcode, $allow_magic_url, $allow_smilies, $allow_img_bbcode = true, $allow_flash_bbcode = true, $allow_quote_bbcode = true, $allow_url_bbcode = true, $update_this_message = true, $mode = 'post')
$message_parser->parse($enable_bbcode, $enable_magic_url, $enable_smilies);
!
if (sizeof($message_parser->warn_msg))
{
$msg_id = isset($convert->row['post_id']) ? $convert->row['post_id'] : $convert->row['privmsgs_id'];
--- 1259,1265 ----
// parse($allow_bbcode, $allow_magic_url, $allow_smilies, $allow_img_bbcode = true, $allow_flash_bbcode = true, $allow_quote_bbcode = true, $allow_url_bbcode = true, $update_this_message = true, $mode = 'post')
$message_parser->parse($enable_bbcode, $enable_magic_url, $enable_smilies);
!
if (sizeof($message_parser->warn_msg))
{
$msg_id = isset($convert->row['post_id']) ? $convert->row['post_id'] : $convert->row['privmsgs_id'];
***************
*** 1352,1358 ****
global $db, $convert, $user, $config, $cache, $phpbb_root_path;
$src_path = $convert->options['forum_path'] . '/' . phpbb_get_files_dir() . '/thumbs/';
!
if ($handle = @opendir($src_path))
{
while ($entry = readdir($handle))
--- 1353,1359 ----
global $db, $convert, $user, $config, $cache, $phpbb_root_path;
$src_path = $convert->options['forum_path'] . '/' . phpbb_get_files_dir() . '/thumbs/';
!
if ($handle = @opendir($src_path))
{
while ($entry = readdir($handle))
***************
*** 1431,1443 ****
$pos--;
continue;
}
!
$forum_auth = substr($forum_permissions, $pos, $auth_len);
$forum_id = base64_unpack($forum_auth);
$forum_ids[] = (int) $forum_id;
}
!
if (sizeof($forum_ids))
{
return attachment_forum_perms($forum_ids);
--- 1432,1444 ----
$pos--;
continue;
}
!
$forum_auth = substr($forum_permissions, $pos, $auth_len);
$forum_id = base64_unpack($forum_auth);
$forum_ids[] = (int) $forum_id;
}
!
if (sizeof($forum_ids))
{
return attachment_forum_perms($forum_ids);
***************
*** 1516,1522 ****
function phpbb_get_avatar_height($user_avatar)
{
global $convert_row;
!
if (empty($convert_row['user_avatar_type']))
{
return 0;
--- 1517,1523 ----
function phpbb_get_avatar_height($user_avatar)
{
global $convert_row;
!
if (empty($convert_row['user_avatar_type']))
{
return 0;
***************
*** 1536,1542 ****
{
return 0;
}
!
return get_avatar_width($user_avatar, 'phpbb_avatar_type', $convert_row['user_avatar_type']);
}
--- 1537,1543 ----
{
return 0;
}
!
return get_avatar_width($user_avatar, 'phpbb_avatar_type', $convert_row['user_avatar_type']);
}
***************
*** 1708,1714 ****
case 'mysql':
$map_dbms = 'mysql_40';
break;
!
case 'mysql4':
if (version_compare($db->sql_server_info(true), '4.1.3', '>='))
{
--- 1709,1715 ----
case 'mysql':
$map_dbms = 'mysql_40';
break;
!
case 'mysql4':
if (version_compare($db->sql_server_info(true), '4.1.3', '>='))
{
***************
*** 1719,1734 ****
$map_dbms = 'mysql_40';
}
break;
!
case 'mysqli':
$map_dbms = 'mysql_41';
break;
!
case 'mssql':
case 'mssql_odbc':
$map_dbms = 'mssql';
break;
!
default:
$map_dbms = $db->sql_layer;
break;
--- 1720,1735 ----
$map_dbms = 'mysql_40';
}
break;
!
case 'mysqli':
$map_dbms = 'mysql_41';
break;
!
case 'mssql':
case 'mssql_odbc':
$map_dbms = 'mssql';
break;
!
default:
$map_dbms = $db->sql_layer;
break;
|
|
From: Meik S. <acy...@ph...> - 2009-08-20 12:23:15
|
Author: acydburn
Date: Thu Aug 20 13:14:18 2009
New Revision: 10027
Log:
properties change? :o
Modified:
branches/phpBB-3_0_0/phpBB/includes/acm/acm_eaccelerator.php (props changed)
branches/phpBB-3_0_0/phpBB/includes/acm/acm_memcache.php (props changed)
branches/phpBB-3_0_0/phpBB/includes/acm/acm_memory.php (props changed)
branches/phpBB-3_0_0/phpBB/includes/acm/acm_xcache.php (props changed)
Propchange: branches/phpBB-3_0_0/phpBB/includes/acm/acm_eaccelerator.php
------------------------------------------------------------------------------
(empty)
Propchange: branches/phpBB-3_0_0/phpBB/includes/acm/acm_memcache.php
------------------------------------------------------------------------------
(empty)
Propchange: branches/phpBB-3_0_0/phpBB/includes/acm/acm_memory.php
------------------------------------------------------------------------------
(empty)
Propchange: branches/phpBB-3_0_0/phpBB/includes/acm/acm_xcache.php
------------------------------------------------------------------------------
(empty)
|
|
From: Meik S. <acy...@ph...> - 2009-08-20 12:21:41
|
Author: acydburn
Date: Thu Aug 20 13:20:37 2009
New Revision: 10030
Log:
If style authors want to, they can show a feed icon for every forum enabled to show feeds.
This is commented out by default
Added:
branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/images/feed.gif (with props)
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/forumlist_body.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/bidi.css
branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/links.css
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/forumlist_body.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/forumlist_body.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/forumlist_body.html Thu Aug 20 13:20:37 2009
***************
*** 27,32 ****
--- 27,34 ----
<li class="row">
<dl class="icon" style="background-image: url({forumrow.FORUM_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
<dt title="{forumrow.FORUM_FOLDER_IMG_ALT}">
+ <!-- IF S_ENABLE_FEEDS and forumrow.S_FEED_ENABLED --><!-- <a class="feed-icon-forum" title="{L_FEED} - {forumrow.FORUM_NAME}" href="{U_FEED}?f={forumrow.FORUM_ID}"><img src="{T_THEME_PATH}/images/feed.gif" title="{L_FEED} - {forumrow.FORUM_NAME}" /></a> --><!-- ENDIF -->
+
<!-- IF forumrow.FORUM_IMAGE --><span class="forum-image">{forumrow.FORUM_IMAGE}</span><!-- ENDIF -->
<a href="{forumrow.U_VIEWFORUM}" class="forumtitle">{forumrow.FORUM_NAME}</a><br />
{forumrow.FORUM_DESC}
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/bidi.css
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/bidi.css (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/bidi.css Thu Aug 20 13:20:37 2009
***************
*** 244,249 ****
--- 244,253 ----
left: 0;
}
+ .rtl a.feed-icon-forum {
+ float: left;
+ }
+
/**
* content.css
*/
Added: branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/images/feed.gif
==============================================================================
Binary file - no diff available.
Propchange: branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/images/feed.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/links.css
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/links.css (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/links.css Thu Aug 20 13:20:37 2009
***************
*** 205,207 ****
--- 205,213 ----
left: -999px;
width: 990px;
}
+
+ /* Feed icon in forumlist_body.html */
+ a.feed-icon-forum {
+ float: right;
+ margin: 3px;
+ }
|
|
From: Meik S. <acy...@ph...> - 2009-08-20 12:21:14
|
Author: acydburn
Date: Thu Aug 20 13:19:48 2009
New Revision: 10029
Log:
instead of only enabling forum feeds in viewforum we set it on every location where forums are shown
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions_display.php
branches/phpBB-3_0_0/phpBB/viewforum.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_display.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_display.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_display.php Thu Aug 20 13:19:48 2009
***************
*** 545,551 ****
*/
function generate_forum_nav(&$forum_data)
{
! global $db, $user, $template, $auth;
global $phpEx, $phpbb_root_path;
if (!$auth->acl_get('f_list', $forum_data['forum_id']))
--- 545,551 ----
*/
function generate_forum_nav(&$forum_data)
{
! global $db, $user, $template, $auth, $config;
global $phpEx, $phpbb_root_path;
if (!$auth->acl_get('f_list', $forum_data['forum_id']))
***************
*** 592,599 ****
$template->assign_vars(array(
'FORUM_ID' => $forum_data['forum_id'],
'FORUM_NAME' => $forum_data['forum_name'],
! 'FORUM_DESC' => generate_text_for_display($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_bitfield'], $forum_data['forum_desc_options']))
! );
return;
}
--- 592,601 ----
$template->assign_vars(array(
'FORUM_ID' => $forum_data['forum_id'],
'FORUM_NAME' => $forum_data['forum_name'],
! 'FORUM_DESC' => generate_text_for_display($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_bitfield'], $forum_data['forum_desc_options']),
!
! 'S_ENABLE_FEEDS_FORUM' => ($config['feed_forum'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $forum_data['forum_options'])) ? true : false,
! ));
return;
}
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 Thu Aug 20 13:19:48 2009
***************
*** 310,316 ****
'S_SINGLE_MODERATOR' => (!empty($moderators[$forum_id]) && sizeof($moderators[$forum_id]) > 1) ? false : true,
'S_IS_LOCKED' => ($forum_data['forum_status'] == ITEM_LOCKED) ? true : false,
'S_VIEWFORUM' => true,
- 'S_ENABLE_FEEDS_FORUM' => ($config['feed_forum'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $forum_data['forum_options'])) ? true : false,
'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "f=$forum_id&i=main&mode=forum_view", true, $user->session_id) : '',
'U_POST_NEW_TOPIC' => ($auth->acl_get('f_post', $forum_id) || $user->data['user_id'] == ANONYMOUS) ? append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=post&f=' . $forum_id) : '',
--- 310,315 ----
|
|
From: Meik S. <acy...@ph...> - 2009-08-20 12:05:07
|
Author: acydburn
Date: Thu Aug 20 13:04:55 2009
New Revision: 10026
Log:
add feed switch to forumrow, so forums can be styled correctly (with an rss icon for example)
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions_display.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_display.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_display.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_display.php Thu Aug 20 13:04:55 2009
***************
*** 456,461 ****
--- 456,462 ----
'S_LOCKED_FORUM' => ($row['forum_status'] == ITEM_LOCKED) ? true : false,
'S_LIST_SUBFORUMS' => ($row['display_subforum_list']) ? true : false,
'S_SUBFORUMS' => (sizeof($subforums_list)) ? true : false,
+ 'S_FEED_ENABLED' => ($config['feed_forum'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $row['forum_options'])) ? true : false,
'FORUM_ID' => $row['forum_id'],
'FORUM_NAME' => $row['forum_name'],
|
|
From: Joas S. <nic...@ph...> - 2009-08-20 12:03:35
|
Author: nickvergessen
Date: Thu Aug 20 13:02:51 2009
New Revision: 10025
Log:
fix r10023
Authorised by: naderman
Modified:
branches/phpBB-3_0_0/phpBB/language/en/acp/board.php
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/board.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/board.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/board.php Thu Aug 20 13:02:51 2009
***************
*** 92,98 ****
'ACP_AVATAR_SETTINGS_EXPLAIN' => 'Avatars are generally small, unique images a user can associate with themselves. Depending on the style they are usually displayed below the username when viewing topics. Here you can determine how users can define their avatars. Please note that in order to upload avatars you need to have created the directory you name below and ensure it can be written to by the web server. Please also note that file size limits are only imposed on uploaded avatars, they do not apply to remotely linked images.',
'ALLOW_AVATARS' => 'Enable avatars',
! 'ALLOW_AVATARS_EXPLAIN' => 'Allow general usage of avatars;<br />If you disable avatars in general or avatars of a certain mode, these avatars will no longer be display within the forum, but users are still able to download their own avatar in the User Control Panel',
'ALLOW_LOCAL' => 'Enable gallery avatars',
'ALLOW_REMOTE' => 'Enable remote avatars',
'ALLOW_REMOTE_EXPLAIN' => 'Avatars linked to from another website.',
--- 92,98 ----
'ACP_AVATAR_SETTINGS_EXPLAIN' => 'Avatars are generally small, unique images a user can associate with themselves. Depending on the style they are usually displayed below the username when viewing topics. Here you can determine how users can define their avatars. Please note that in order to upload avatars you need to have created the directory you name below and ensure it can be written to by the web server. Please also note that file size limits are only imposed on uploaded avatars, they do not apply to remotely linked images.',
'ALLOW_AVATARS' => 'Enable avatars',
! 'ALLOW_AVATARS_EXPLAIN' => 'Allow general usage of avatars;<br />If you disable avatars in general or avatars of a certain mode, these avatars will no longer be display within the board, but users are still able to download their own avatar in the User Control Panel',
'ALLOW_LOCAL' => 'Enable gallery avatars',
'ALLOW_REMOTE' => 'Enable remote avatars',
'ALLOW_REMOTE_EXPLAIN' => 'Avatars linked to from another website.',
|
|
From: Meik S. <acy...@ph...> - 2009-08-20 11:40:56
|
Author: acydburn
Date: Thu Aug 20 12:40:36 2009
New Revision: 10024
Log:
fix sql error due to us using STRICT db mode. ;)
Modified:
branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php Thu Aug 20 12:40:36 2009
***************
*** 125,130 ****
--- 125,131 ----
'type_action' => request_var('type_action', ''),
'forum_status' => request_var('forum_status', ITEM_UNLOCKED),
'forum_parents' => '',
+ 'forum_options' => 0,
'forum_name' => utf8_normalize_nfc(request_var('forum_name', '', true)),
'forum_link' => request_var('forum_link', ''),
'forum_link_track' => request_var('forum_link_track', false),
***************
*** 443,448 ****
--- 444,450 ----
'prune_viewed' => 7,
'prune_freq' => 1,
'forum_flags' => FORUM_FLAG_POST_REVIEW,
+ 'forum_options' => 0,
'forum_password' => '',
'forum_password_confirm'=> '',
);
***************
*** 699,706 ****
return;
break;
!
! case 'copy_perm':
$forum_perm_from = request_var('forum_perm_from', 0);
// Copy permissions?
--- 701,708 ----
return;
break;
!
! case 'copy_perm':
$forum_perm_from = request_var('forum_perm_from', 0);
// Copy permissions?
***************
*** 1921,1927 ****
function copy_permission_page($forum_data)
{
global $phpEx, $phpbb_admin_path, $template, $user;
!
$acl_url = '&mode=setting_forum_local&forum_id[]=' . $forum_data['forum_id'];
$action = append_sid($this->u_action . "&parent_id={$this->parent_id}&f={$forum_data['forum_id']}&action=copy_perm");
--- 1923,1929 ----
function copy_permission_page($forum_data)
{
global $phpEx, $phpbb_admin_path, $template, $user;
!
$acl_url = '&mode=setting_forum_local&forum_id[]=' . $forum_data['forum_id'];
$action = append_sid($this->u_action . "&parent_id={$this->parent_id}&f={$forum_data['forum_id']}&action=copy_perm");
|
|
From: Joas S. <nic...@ph...> - 2009-08-20 10:26:06
|
Author: nickvergessen
Date: Thu Aug 20 11:25:13 2009
New Revision: 10023
Log:
Addition to r9632 for #46785
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/language/en/acp/board.php
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/board.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/board.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/board.php Thu Aug 20 11:25:13 2009
***************
*** 92,98 ****
'ACP_AVATAR_SETTINGS_EXPLAIN' => 'Avatars are generally small, unique images a user can associate with themselves. Depending on the style they are usually displayed below the username when viewing topics. Here you can determine how users can define their avatars. Please note that in order to upload avatars you need to have created the directory you name below and ensure it can be written to by the web server. Please also note that file size limits are only imposed on uploaded avatars, they do not apply to remotely linked images.',
'ALLOW_AVATARS' => 'Enable avatars',
! 'ALLOW_AVATARS_EXPLAIN' => 'Allow general usage of avatars',
'ALLOW_LOCAL' => 'Enable gallery avatars',
'ALLOW_REMOTE' => 'Enable remote avatars',
'ALLOW_REMOTE_EXPLAIN' => 'Avatars linked to from another website.',
--- 92,98 ----
'ACP_AVATAR_SETTINGS_EXPLAIN' => 'Avatars are generally small, unique images a user can associate with themselves. Depending on the style they are usually displayed below the username when viewing topics. Here you can determine how users can define their avatars. Please note that in order to upload avatars you need to have created the directory you name below and ensure it can be written to by the web server. Please also note that file size limits are only imposed on uploaded avatars, they do not apply to remotely linked images.',
'ALLOW_AVATARS' => 'Enable avatars',
! 'ALLOW_AVATARS_EXPLAIN' => 'Allow general usage of avatars;<br />If you disable avatars in general or avatars of a certain mode, these avatars will no longer be display within the forum, but users are still able to download their own avatar in the User Control Panel',
'ALLOW_LOCAL' => 'Enable gallery avatars',
'ALLOW_REMOTE' => 'Enable remote avatars',
'ALLOW_REMOTE_EXPLAIN' => 'Avatars linked to from another website.',
|
7 messages has been excluded from this view by a project administrator.
