Menu
▾
▴
phpbb-checkins — If you subscribed to this list, please update: code.phpbb.com
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(193) |
Nov
(393) |
Dec
(347) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(401) |
Feb
(232) |
Mar
(343) |
Apr
(129) |
May
(129) |
Jun
(116) |
Jul
(189) |
Aug
(129) |
Sep
(68) |
Oct
(172) |
Nov
(298) |
Dec
(148) |
| 2003 |
Jan
(264) |
Feb
(210) |
Mar
(322) |
Apr
(309) |
May
(234) |
Jun
(188) |
Jul
(215) |
Aug
(161) |
Sep
(234) |
Oct
(163) |
Nov
(110) |
Dec
(7) |
| 2004 |
Jan
(95) |
Feb
(107) |
Mar
(55) |
Apr
(3) |
May
(49) |
Jun
(35) |
Jul
(57) |
Aug
(43) |
Sep
(56) |
Oct
(40) |
Nov
(25) |
Dec
(21) |
| 2005 |
Jan
(93) |
Feb
(25) |
Mar
(22) |
Apr
(72) |
May
(45) |
Jun
(24) |
Jul
(29) |
Aug
(20) |
Sep
(50) |
Oct
(93) |
Nov
(69) |
Dec
(183) |
| 2006 |
Jan
(185) |
Feb
(143) |
Mar
(402) |
Apr
(260) |
May
(322) |
Jun
(367) |
Jul
(234) |
Aug
(299) |
Sep
(206) |
Oct
(288) |
Nov
(338) |
Dec
(307) |
| 2007 |
Jan
(296) |
Feb
(250) |
Mar
(261) |
Apr
(434) |
May
(539) |
Jun
(274) |
Jul
(440) |
Aug
(190) |
Sep
(128) |
Oct
(249) |
Nov
(86) |
Dec
(51) |
| 2008 |
Jan
(177) |
Feb
(67) |
Mar
(61) |
Apr
(48) |
May
(56) |
Jun
(97) |
Jul
(60) |
Aug
(64) |
Sep
(151) |
Oct
(79) |
Nov
(109) |
Dec
(123) |
| 2009 |
Jan
(70) |
Feb
(70) |
Mar
(73) |
Apr
(80) |
May
(22) |
Jun
(193) |
Jul
(191) |
Aug
(181) |
Sep
(120) |
Oct
(48) |
Nov
(24) |
Dec
|
|
From: Henry S. <kel...@ph...> - 2009-08-16 21:08:00
|
Author: Kellanved
Date: Sun Aug 16 22:07:11 2009
New Revision: 9997
Log:
don't pick a new question without an explicit reset call
Modified:
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php Sun Aug 16 22:07:11 2009
***************
*** 354,360 ****
if (strlen($error))
{
// okay, incorrect answer. Let's ask a new question.
! $this->new_attempt();
return $error;
}
else
--- 354,361 ----
if (strlen($error))
{
// okay, incorrect answer. Let's ask a new question.
! // $this->new_attempt();
! $this->solved = false;
return $error;
}
else
***************
*** 433,439 ****
function load_answer()
{
global $db, $user;
!
$sql = 'SELECT con.question_id, attempts, question_text, strict
FROM ' . CAPTCHA_QA_CONFIRM_TABLE . ' con, ' . CAPTCHA_QUESTIONS_TABLE . " qes
WHERE con.question_id = qes.question_id
--- 434,440 ----
function load_answer()
{
global $db, $user;
!
$sql = 'SELECT con.question_id, attempts, question_text, strict
FROM ' . CAPTCHA_QA_CONFIRM_TABLE . ' con, ' . CAPTCHA_QUESTIONS_TABLE . " qes
WHERE con.question_id = qes.question_id
|
|
From: Henry S. <kel...@ph...> - 2009-08-16 20:50:12
|
Author: Kellanved
Date: Sun Aug 16 21:49:22 2009
New Revision: 9996
Log:
append_sid
Modified:
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php Sun Aug 16 21:49:22 2009
***************
*** 95,101 ****
}
else
{
! $link = append_sid($phpbb_root_path . 'ucp.' . $phpEx . '?mode=confirm&confirm_id=' . $this->confirm_id . '&type=' . $this->type);
$explain = ($this->type != CONFIRM_POST) ? sprintf($user->lang['CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>') : $user->lang['POST_CONFIRM_EXPLAIN'];
$template->assign_vars(array(
--- 95,101 ----
}
else
{
! $link = append_sid($phpbb_root_path . 'ucp.' . $phpEx, 'mode=confirm&confirm_id=' . $this->confirm_id . '&type=' . $this->type);
$explain = ($this->type != CONFIRM_POST) ? sprintf($user->lang['CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>') : $user->lang['POST_CONFIRM_EXPLAIN'];
$template->assign_vars(array(
***************
*** 129,135 ****
// acp_captcha has a delivery function; let's use it
$template->assign_vars(array(
! 'CONFIRM_IMAGE' => append_sid($phpbb_admin_path . 'index.' . $phpEx . '?captcha_demo=1&mode=visual&i=' . $id . '&select_captcha=' . $this->get_class_name()) . $variables,
'CONFIRM_ID' => $this->confirm_id,
));
--- 129,135 ----
// acp_captcha has a delivery function; let's use it
$template->assign_vars(array(
! 'CONFIRM_IMAGE' => append_sid($phpbb_admin_path . 'index.' . $phpEx, 'captcha_demo=1&mode=visual&i=' . $id . '&select_captcha=' . $this->get_class_name()) . $variables,
'CONFIRM_ID' => $this->confirm_id,
));
|
|
From: Chris S. <too...@ph...> - 2009-08-15 23:14:32
|
Author: toonarmy
Date: Sun Aug 16 00:13:47 2009
New Revision: 9995
Log:
Clarify r9994 #49335
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/styleswitcher.js
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/styleswitcher.js
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/styleswitcher.js (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/styleswitcher.js Sun Aug 16 00:13:47 2009
***************
*** 1,7 ****
function fontsizeup(event)
{
! // Skip tabs
if (event && getKeyCode(event) == 9)
{
return true;
--- 1,7 ----
function fontsizeup(event)
{
! // Skip tabs; 9 being the ASCII code for a tab
if (event && getKeyCode(event) == 9)
{
return true;
|
|
From: Chris S. <too...@ph...> - 2009-08-15 20:45:45
|
Author: toonarmy
Date: Sat Aug 15 21:44:53 2009
New Revision: 9994
Log:
Prevent style switcher from blocking the tab key. #49335
Tested under FF 3.0/3.5/Opera/Chrome on Linux
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/styleswitcher.js
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Sat Aug 15 21:44:53 2009
***************
*** 194,199 ****
--- 194,200 ----
<li>[Fix] Update search index if only post subject changed. (Bug #49435)</li>
<li>[Fix] Fix who is online displaying incorrect data. (Bug #49485, thanks Brainy)</li>
<li>[Fix] Fixed incorrect "topic does not exist" when unapproved posts were visited without global moderator permissions. (Bug #47795)</li>
+ <li>[Fix] Prevent style switcher from blocking the tab key. (Bug #49335)</li>
<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html Sat Aug 15 21:44:53 2009
***************
*** 136,142 ****
<ul class="linklist navlinks">
<li class="icon-home"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a> <!-- BEGIN navlinks --> <strong>‹</strong> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></li>
! <li class="rightside"><a href="#" onclick="fontsizeup(); return false;" onkeypress="fontsizeup(); return false;" class="fontsize" title="{L_CHANGE_FONT_SIZE}">{L_CHANGE_FONT_SIZE}</a></li>
<!-- IF U_EMAIL_TOPIC --><li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li><!-- ENDIF -->
<!-- IF U_EMAIL_PM --><li class="rightside"><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class="sendemail">{L_EMAIL_PM}</a></li><!-- ENDIF -->
--- 136,142 ----
<ul class="linklist navlinks">
<li class="icon-home"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a> <!-- BEGIN navlinks --> <strong>‹</strong> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></li>
! <li class="rightside"><a href="#" onclick="fontsizeup(); return false;" onkeypress="return fontsizeup(event);" class="fontsize" title="{L_CHANGE_FONT_SIZE}">{L_CHANGE_FONT_SIZE}</a></li>
<!-- IF U_EMAIL_TOPIC --><li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li><!-- ENDIF -->
<!-- IF U_EMAIL_PM --><li class="rightside"><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class="sendemail">{L_EMAIL_PM}</a></li><!-- ENDIF -->
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/styleswitcher.js
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/styleswitcher.js (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/styleswitcher.js Sat Aug 15 21:44:53 2009
***************
*** 1,6 ****
! function fontsizeup()
{
var active = getActiveStyleSheet();
switch (active)
--- 1,12 ----
! function fontsizeup(event)
{
+ // Skip tabs
+ if (event && getKeyCode(event) == 9)
+ {
+ return true;
+ }
+
var active = getActiveStyleSheet();
switch (active)
***************
*** 29,39 ****
setActiveStyleSheet('A');
break;
}
}
! function fontsizedown()
{
! active = getActiveStyleSheet();
switch (active)
{
--- 35,53 ----
setActiveStyleSheet('A');
break;
}
+
+ return false;
}
! function fontsizedown(event)
{
! // Skip tabs
! if (event && getKeyCode(event) == 9)
! {
! return true;
! }
!
! var active = getActiveStyleSheet();
switch (active)
{
***************
*** 60,65 ****
--- 74,97 ----
setActiveStyleSheet('A--');
break;
}
+
+ return false;
+ }
+
+ function getKeyCode(event)
+ {
+ // IE doesn't fire the onkeypress event for tabs
+ // Reference: http://www.quirksmode.org/js/keys.html
+
+ var code = (event.keyCode) ? event.keyCode : 0;
+
+ // Probably using FF
+ if (!code && event.charCode)
+ {
+ code = event.charCode;
+ }
+
+ return code;
}
function setActiveStyleSheet(title)
|
|
From: Chris S. <too...@ph...> - 2009-08-15 19:57:33
|
Author: toonarmy
Date: Sat Aug 15 20:56:45 2009
New Revision: 9993
Log:
- #49775
- Some coding guidelines fixes
Modified:
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php Sat Aug 15 20:56:45 2009
***************
*** 676,690 ****
{
global $db, $template;
! $sql = 'SELECT * FROM ' . CAPTCHA_QUESTIONS_TABLE;
$result = $db->sql_query($sql);
$template->assign_vars(array(
! 'S_LIST' => true,
));
! while($row = $db->sql_fetchrow($result))
{
! $url = $module->u_action . "&question_id={$row['question_id']}&configure=1&select_captcha=" . $this->get_class_name() . "&";
$template->assign_block_vars('questions', array(
'QUESTION_TEXT' => $row['question_text'],
--- 676,692 ----
{
global $db, $template;
! $sql = 'SELECT *
! FROM ' . CAPTCHA_QUESTIONS_TABLE;
$result = $db->sql_query($sql);
+
$template->assign_vars(array(
! 'S_LIST' => true,
));
! while ($row = $db->sql_fetchrow($result))
{
! $url = $module->u_action . "&question_id={$row['question_id']}&configure=1&select_captcha=" . $this->get_class_name() . '&';
$template->assign_block_vars('questions', array(
'QUESTION_TEXT' => $row['question_text'],
***************
*** 704,734 ****
{
global $db;
-
if ($question_id)
{
! $sql = 'SELECT * FROM ' . CAPTCHA_QUESTIONS_TABLE . ' WHERE question_id = ' . $question_id;
$result = $db->sql_query($sql);
! if ($row = $db->sql_fetchrow($result))
! {
! $question = $row;
! }
! else
{
- $db->sql_freeresult($result);
return false;
}
$question['answers'] = array();
! $sql = 'SELECT * FROM ' . CAPTCHA_ANSWERS_TABLE . ' WHERE question_id = ' . $question_id;
$result = $db->sql_query($sql);
! while($row = $db->sql_fetchrow($result))
{
$question['answers'][] = $row['answer_text'];
}
$db->sql_freeresult($result);
return $question;
}
-
}
--- 706,740 ----
{
global $db;
if ($question_id)
{
! $sql = 'SELECT *
! FROM ' . CAPTCHA_QUESTIONS_TABLE . '
! WHERE question_id = ' . $question_id;
$result = $db->sql_query($sql);
! $question = $db->sql_fetchrow($result);
! $db->sql_freeresult($result);
!
! if (!$question)
{
return false;
}
+
$question['answers'] = array();
!
! $sql = 'SELECT *
! FROM ' . CAPTCHA_ANSWERS_TABLE . '
! WHERE question_id = ' . $question_id;
$result = $db->sql_query($sql);
!
! while ($row = $db->sql_fetchrow($result))
{
$question['answers'][] = $row['answer_text'];
}
$db->sql_freeresult($result);
+
return $question;
}
}
***************
*** 737,751 ****
*/
function acp_get_question_input()
{
- global $db;
-
$question = array(
'question_text' => request_var('question_text', '', true),
'strict' => request_var('strict', false),
'lang_iso' => request_var('lang_iso', ''),
'answers' => explode("\n", request_var('answers', '', true)),
);
!
return $question;
}
--- 743,755 ----
*/
function acp_get_question_input()
{
$question = array(
'question_text' => request_var('question_text', '', true),
'strict' => request_var('strict', false),
'lang_iso' => request_var('lang_iso', ''),
'answers' => explode("\n", request_var('answers', '', true)),
);
!
return $question;
}
***************
*** 755,773 ****
*/
function acp_update_question($data, $question_id)
{
! global $db;
// easier to delete all answers than to figure out which to update
! $sql = "DELETE FROM " . CAPTCHA_ANSWERS_TABLE . " WHERE question_id = $question_id";
$db->sql_query($sql);
$langs = $this->get_languages();
$question_ary = $data;
$question_ary['lang_id'] = $langs[$question_ary['lang_iso']]['id'];
unset($question_ary['answers']);
! $sql = "UPDATE " . CAPTCHA_QUESTIONS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $question_ary) . "
! WHERE question_id = $question_id";
$db->sql_query($sql);
$this->acp_insert_answers($data, $question_id);
}
/**
--- 759,783 ----
*/
function acp_update_question($data, $question_id)
{
! global $db, $cache;
// easier to delete all answers than to figure out which to update
! $sql = 'DELETE FROM ' . CAPTCHA_ANSWERS_TABLE . " WHERE question_id = $question_id";
$db->sql_query($sql);
+
$langs = $this->get_languages();
$question_ary = $data;
$question_ary['lang_id'] = $langs[$question_ary['lang_iso']]['id'];
unset($question_ary['answers']);
!
! $sql = 'UPDATE ' . CAPTCHA_QUESTIONS_TABLE . '
! SET ' . $db->sql_build_array('UPDATE', $question_ary) . "
! WHERE question_id = $question_id";
$db->sql_query($sql);
+
$this->acp_insert_answers($data, $question_id);
+
+ $cache->destroy('sql', CAPTCHA_QUESTIONS_TABLE);
}
/**
***************
*** 776,792 ****
*/
function acp_add_question($data)
{
! global $db;
$langs = $this->get_languages();
$question_ary = $data;
$question_ary['lang_id'] = $langs[$data['lang_iso']]['id'];
unset($question_ary['answers']);
! $sql = "INSERT INTO " . CAPTCHA_QUESTIONS_TABLE . $db->sql_build_array('INSERT', $question_ary);
$db->sql_query($sql);
$question_id = $db->sql_nextid();
$this->acp_insert_answers($data, $question_id);
}
/**
--- 786,807 ----
*/
function acp_add_question($data)
{
! global $db, $cache;
$langs = $this->get_languages();
$question_ary = $data;
$question_ary['lang_id'] = $langs[$data['lang_iso']]['id'];
unset($question_ary['answers']);
!
! $sql = 'INSERT INTO ' . CAPTCHA_QUESTIONS_TABLE . $db->sql_build_array('INSERT', $question_ary);
$db->sql_query($sql);
+
$question_id = $db->sql_nextid();
+
$this->acp_insert_answers($data, $question_id);
+
+ $cache->destroy('sql', CAPTCHA_QUESTIONS_TABLE);
}
/**
***************
*** 795,811 ****
*/
function acp_insert_answers($data, $question_id)
{
! global $db;
! foreach($data['answers'] as $answer)
{
$answer_ary = array(
'question_id' => $question_id,
'answer_text' => $answer,
);
! $sql = "INSERT INTO " . CAPTCHA_ANSWERS_TABLE . $db->sql_build_array('INSERT', $answer_ary);
$db->sql_query($sql);
}
}
--- 810,829 ----
*/
function acp_insert_answers($data, $question_id)
{
! global $db, $cache;
! foreach ($data['answers'] as $answer)
{
$answer_ary = array(
'question_id' => $question_id,
'answer_text' => $answer,
);
!
! $sql = 'INSERT INTO ' . CAPTCHA_ANSWERS_TABLE . $db->sql_build_array('INSERT', $answer_ary);
$db->sql_query($sql);
}
+
+ $cache->destroy('sql', CAPTCHA_ANSWERS_TABLE);
}
***************
*** 814,827 ****
*/
function acp_delete_question($question_id)
{
! global $db;
!
$tables = array(CAPTCHA_QUESTIONS_TABLE, CAPTCHA_ANSWERS_TABLE);
! foreach($tables as $table)
{
! $sql = "DELETE FROM $table WHERE question_id = $question_id";
$db->sql_query($sql);
}
}
--- 832,849 ----
*/
function acp_delete_question($question_id)
{
! global $db, $cache;
!
$tables = array(CAPTCHA_QUESTIONS_TABLE, CAPTCHA_ANSWERS_TABLE);
!
! foreach ($tables as $table)
{
! $sql = "DELETE FROM $table
! WHERE question_id = $question_id";
$db->sql_query($sql);
}
+
+ $cache->destroy('sql', $tables);
}
***************
*** 832,837 ****
--- 854,860 ----
function validate_input($question_data)
{
$langs = $this->get_languages();
+
if (!isset($question_data['lang_iso']) ||
!isset($question_data['question_text']) ||
!isset($question_data['strict']) ||
***************
*** 839,851 ****
{
return false;
}
if (!isset($langs[$question_data['lang_iso']]) ||
!$question_data['question_text'] ||
!sizeof($question_data['answers']))
{
return false;
}
!
return true;
}
--- 862,875 ----
{
return false;
}
+
if (!isset($langs[$question_data['lang_iso']]) ||
!$question_data['question_text'] ||
!sizeof($question_data['answers']))
{
return false;
}
!
return true;
}
***************
*** 855,872 ****
function get_languages()
{
global $db;
!
$langs = array();
! $sql = 'SELECT * FROM ' . LANG_TABLE;
$result = $db->sql_query($sql);
! while($row = $db->sql_fetchrow($result))
{
$langs[$row['lang_iso']] = array(
'name' => $row['lang_local_name'],
! 'id' => $row['lang_id'],
);
}
$db->sql_freeresult($result);
return $langs;
}
--- 879,901 ----
function get_languages()
{
global $db;
!
$langs = array();
!
! $sql = 'SELECT *
! FROM ' . LANG_TABLE;
!
$result = $db->sql_query($sql);
!
! while ($row = $db->sql_fetchrow($result))
{
$langs[$row['lang_iso']] = array(
'name' => $row['lang_local_name'],
! 'id' => (int) $row['lang_id'],
);
}
$db->sql_freeresult($result);
+
return $langs;
}
|
|
From: Henry S. <kel...@ph...> - 2009-08-15 16:11:00
|
Author: Kellanved
Date: Sat Aug 15 17:10:13 2009
New Revision: 9992
Log:
#49755
Modified:
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php Sat Aug 15 17:10:13 2009
***************
*** 676,682 ****
{
global $db, $template;
! $sql = 'SELECT * FROM ' . CAPTCHA_QUESTIONS_TABLE . ' WHERE 1';
$result = $db->sql_query($sql);
$template->assign_vars(array(
'S_LIST' => true,
--- 676,682 ----
{
global $db, $template;
! $sql = 'SELECT * FROM ' . CAPTCHA_QUESTIONS_TABLE;
$result = $db->sql_query($sql);
$template->assign_vars(array(
'S_LIST' => true,
***************
*** 857,863 ****
global $db;
$langs = array();
! $sql = 'SELECT * FROM ' . LANG_TABLE . ' WHERE 1';
$result = $db->sql_query($sql);
while($row = $db->sql_fetchrow($result))
{
--- 857,863 ----
global $db;
$langs = array();
! $sql = 'SELECT * FROM ' . LANG_TABLE;
$result = $db->sql_query($sql);
while($row = $db->sql_fetchrow($result))
{
|
|
From: Joas S. <nic...@ph...> - 2009-08-15 14:19:07
|
Author: nickvergessen
Date: Sat Aug 15 15:18:19 2009
New Revision: 9991
Log:
r9961 - also set item name in page_header parameter for better implementation of #31975
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 Sat Aug 15 15:18:19 2009
***************
*** 3895,3901 ****
/**
* Generate page header
*/
! function page_header($page_title = '', $display_online_list = true, $forum_id = 0)
{
global $db, $config, $template, $SID, $_SID, $user, $auth, $phpEx, $phpbb_root_path;
--- 3895,3901 ----
/**
* Generate page header
*/
! function page_header($page_title = '', $display_online_list = true, $item_id = 0, $item = 'forum')
{
global $db, $config, $template, $SID, $_SID, $user, $auth, $phpEx, $phpbb_root_path;
***************
*** 3937,3968 ****
{
/**
* Load online data:
! * For obtaining another session column use the following code, whereby the column is session_{$item}_id.
! * Put the code directly after $item = 'forum';
! *
! * <code>
! * $my_item_id = request_var('my_item_id', 0);
! *
! * if ($my_item_id > 0)
! * {
! * // would revolve to the column session_myitem_id in the SESSIONS_TABLE
! * $item = 'myitem';
! * $item_id = $my_item_id;
! * }
! * </code>
*/
- if ($forum_id)
- {
- $item_id = max($forum_id, 0);
- }
- else
- {
- $item_id = 0;
- }
-
- // workaround legacy code
- $item = 'forum';
$online_users = obtain_users_online($item_id, $item);
$user_online_strings = obtain_users_online_string($online_users, $item_id, $item);
--- 3937,3946 ----
{
/**
* Load online data:
! * For obtaining another session column use $item and $item_id in the function-parameter, whereby the column is session_{$item}_id.
*/
+ $item_id = max($item_id, 0);
$online_users = obtain_users_online($item_id, $item);
$user_online_strings = obtain_users_online_string($online_users, $item_id, $item);
|
|
From: Joas S. <nic...@ph...> - 2009-08-15 10:49:49
|
Author: nickvergessen
Date: Sat Aug 15 11:49:01 2009
New Revision: 9990
Log:
Fix Bug #49615 - Unapproved topic icon has incorrect forum (introduced in r9635 fixing #46865)
Authorised by: ToonArmy
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 Sat Aug 15 11:49:01 2009
***************
*** 155,161 ****
}
// Count the difference of real to public topics, so we can display an information to moderators
! $row['forum_topics_unapproved'] = ($auth->acl_get('m_approve', $forum_id)) ? $row['forum_topics_real'] - $row['forum_topics'] : 0;
$row['forum_topics'] = ($auth->acl_get('m_approve', $forum_id)) ? $row['forum_topics_real'] : $row['forum_topics'];
// Display active topics from this forum?
--- 155,161 ----
}
// 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?
***************
*** 214,220 ****
$subforums[$parent_id][$row['parent_id']]['children'][] = $forum_id;
}
! $forum_rows[$parent_id]['forum_topics_unapproved'] += $row['forum_topics_unapproved'];
$forum_rows[$parent_id]['forum_topics'] += $row['forum_topics'];
// Do not list redirects in LINK Forums as Posts.
--- 214,224 ----
$subforums[$parent_id][$row['parent_id']]['children'][] = $forum_id;
}
! if (!$forum_rows[$parent_id]['forum_id_unapproved_topics'] && $row['forum_id_unapproved_topics'])
! {
! $forum_rows[$parent_id]['forum_id_unapproved_topics'] = $forum_id;
! }
!
$forum_rows[$parent_id]['forum_topics'] += $row['forum_topics'];
// Do not list redirects in LINK Forums as Posts.
***************
*** 456,462 ****
'L_FORUM_FOLDER_ALT' => $folder_alt,
'L_MODERATOR_STR' => $l_moderator,
! 'U_UNAPPROVED_TOPICS' => ($row['forum_topics_unapproved'] > 0) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=unapproved_topics&f=' . $row['forum_id']) : '',
'U_VIEWFORUM' => $u_viewforum,
'U_LAST_POSTER' => get_username_string('profile', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),
'U_LAST_POST' => $last_post_url)
--- 460,466 ----
'L_FORUM_FOLDER_ALT' => $folder_alt,
'L_MODERATOR_STR' => $l_moderator,
! 'U_UNAPPROVED_TOPICS' => ($row['forum_id_unapproved_topics']) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=unapproved_topics&f=' . $row['forum_id_unapproved_topics']) : '',
'U_VIEWFORUM' => $u_viewforum,
'U_LAST_POSTER' => get_username_string('profile', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),
'U_LAST_POST' => $last_post_url)
|
|
From: Joas S. <nic...@ph...> - 2009-08-15 10:46:23
|
Author: nickvergessen
Date: Sat Aug 15 11:45:32 2009
New Revision: 9989
Log:
Fix Bug #49725 introduced in r9814
Authorised by: ToonArmy
Modified:
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php
Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php Sat Aug 15 11:45:32 2009
***************
*** 34,40 ****
$forum_id = request_var('f', 0);
$template->assign_var('S_SHOW_UNAPPROVED', (!empty($forum_list)) ? true : false);
!
if (!empty($forum_list))
{
$sql = 'SELECT COUNT(post_id) AS total
--- 34,40 ----
$forum_id = request_var('f', 0);
$template->assign_var('S_SHOW_UNAPPROVED', (!empty($forum_list)) ? true : false);
!
if (!empty($forum_list))
{
$sql = 'SELECT COUNT(post_id) AS total
***************
*** 249,254 ****
--- 249,255 ----
if ($module->loaded('pm_reports') && $auth->acl_getf_global('m_report'))
{
$template->assign_var('S_SHOW_PM_REPORTS', true);
+ $user->add_lang(array('ucp'));
$sql = 'SELECT COUNT(r.report_id) AS total
FROM ' . REPORTS_TABLE . ' r, ' . PRIVMSGS_TABLE . ' p
***************
*** 262,268 ****
if ($total)
{
include($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx);
- $user->add_lang(array('ucp'));
$sql = $db->sql_build_query('SELECT', array(
'SELECT' => 'r.report_id, r.report_time, p.msg_id, p.message_subject, p.message_time, p.to_address, p.bcc_address, u.username, u.username_clean, u.user_colour, u.user_id, u2.username as author_name, u2.username_clean as author_name_clean, u2.user_colour as author_colour, u2.user_id as author_id',
--- 263,268 ----
***************
*** 300,306 ****
$template->assign_block_vars('pm_report', array(
'U_PM_DETAILS' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'r=' . $row['report_id'] . "&i=pm_reports&mode=pm_report_details"),
!
'REPORTER_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
'REPORTER' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']),
'REPORTER_COLOUR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']),
--- 300,306 ----
$template->assign_block_vars('pm_report', array(
'U_PM_DETAILS' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'r=' . $row['report_id'] . "&i=pm_reports&mode=pm_report_details"),
!
'REPORTER_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
'REPORTER' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']),
'REPORTER_COLOUR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']),
|
|
From: Andreas F. <ba...@ph...> - 2009-08-15 00:54:08
|
Author: bantu
Date: Sat Aug 15 01:53:22 2009
New Revision: 9988
Log:
Fix bug #49705
Modified:
branches/phpBB-3_0_0/phpBB/language/en/install.php
Modified: branches/phpBB-3_0_0/phpBB/language/en/install.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/install.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/install.php Sat Aug 15 01:53:22 2009
***************
*** 188,194 ****
'INITIAL_CONFIG_EXPLAIN' => 'Now that install has determined your server can run phpBB you need to supply some specific information. If you do not know how to connect to your database please contact your hosting provider (in the first instance) or use the phpBB support forums. When entering data please ensure you check it thoroughly before continuing.',
'INSTALL_CONGRATS' => 'Congratulations!',
'INSTALL_CONGRATS_EXPLAIN' => '
! You have successfully installed phpBB %1$s. Please proceed by choosing one of the following opions:</p>
<h2>Convert an existing board to phpBB3</h2>
<p>The phpBB Unified Convertor Framework supports the conversion of phpBB 2.0.x and other board systems to phpBB3. If you have an existing board that you wish to convert, please <a href="%2$s">proceed to the convertor</a>.</p>
<h2>Go live with your phpBB3!</h2>
--- 188,194 ----
'INITIAL_CONFIG_EXPLAIN' => 'Now that install has determined your server can run phpBB you need to supply some specific information. If you do not know how to connect to your database please contact your hosting provider (in the first instance) or use the phpBB support forums. When entering data please ensure you check it thoroughly before continuing.',
'INSTALL_CONGRATS' => 'Congratulations!',
'INSTALL_CONGRATS_EXPLAIN' => '
! You have successfully installed phpBB %1$s. Please proceed by choosing one of the following options:</p>
<h2>Convert an existing board to phpBB3</h2>
<p>The phpBB Unified Convertor Framework supports the conversion of phpBB 2.0.x and other board systems to phpBB3. If you have an existing board that you wish to convert, please <a href="%2$s">proceed to the convertor</a>.</p>
<h2>Go live with your phpBB3!</h2>
|
|
From: Henry S. <kel...@ph...> - 2009-08-14 16:23:14
|
Author: Kellanved
Date: Fri Aug 14 17:22:59 2009
New Revision: 9987
Log:
meh
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Fri Aug 14 17:22:59 2009
***************
*** 193,198 ****
--- 193,199 ----
<li>[Fix] Allow updater to work correctly with PHP filename extensions other than ".php". (Bugs #15809, #49215)</li>
<li>[Fix] Update search index if only post subject changed. (Bug #49435)</li>
<li>[Fix] Fix who is online displaying incorrect data. (Bug #49485, thanks Brainy)</li>
+ <li>[Fix] Fixed incorrect "topic does not exist" when unapproved posts were visited without global moderator permissions. (Bug #47795)</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>
***************
*** 461,467 ****
<li>[Fix] Moderators can only see reports/queue/logs from forums they can actually read. (Bug #31085)</li>
<li>[Fix] Correctly display topic when start parameter is equal to the number of posts.</li>
<li>[Fix] Correctly display topic in MCP when start parameter is equal to or greater than the number of posts. (Bug #30525)</li>
- <li>[Fix] Fixed incorrect "topic does not exist" when unapproved posts were visited without global moderator permissions. (Bug #47795)</li>
<li>[Change] No longer allow the direct use of MULTI_INSERT in sql_build_array. sql_multi_insert() must be used.</li>
<li>[Change] Display warning in ACP if config.php file is left writable.</li>
--- 462,467 ----
|
|
From: Henry S. <kel...@ph...> - 2009-08-14 15:59:24
|
Author: Kellanved
Date: Fri Aug 14 16:59:08 2009
New Revision: 9986
Log:
meh
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Fri Aug 14 16:59:08 2009
***************
*** 461,466 ****
--- 461,467 ----
<li>[Fix] Moderators can only see reports/queue/logs from forums they can actually read. (Bug #31085)</li>
<li>[Fix] Correctly display topic when start parameter is equal to the number of posts.</li>
<li>[Fix] Correctly display topic in MCP when start parameter is equal to or greater than the number of posts. (Bug #30525)</li>
+ <li>[Fix] Fixed incorrect "topic does not exist" when unapproved posts were visited without global moderator permissions. (Bug #47795)</li>
<li>[Change] No longer allow the direct use of MULTI_INSERT in sql_build_array. sql_multi_insert() must be used.</li>
<li>[Change] Display warning in ACP if config.php file is left writable.</li>
|
|
From: Henry S. <kel...@ph...> - 2009-08-14 15:57:20
|
Author: Kellanved
Date: Fri Aug 14 16:56:35 2009
New Revision: 9985
Log:
we are not supposed to know that yet
Modified:
branches/phpBB-3_0_0/phpBB/viewtopic.php
Modified: branches/phpBB-3_0_0/phpBB/viewtopic.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/viewtopic.php (original)
--- branches/phpBB-3_0_0/phpBB/viewtopic.php Fri Aug 14 16:56:35 2009
***************
*** 282,291 ****
if ($post_id)
{
// are we where we are supposed to be?
! if ($post_id && !$topic_data['post_approved'] && !$auth->acl_get('m_approve', $topic_data['forum_id']))
{
// If post_id was submitted, we try at least to display the topic as a last resort...
! if ($post_id && $topic_id)
{
redirect(append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id" . (($forum_id) ? "&f=$forum_id" : '')));
}
--- 282,291 ----
if ($post_id)
{
// are we where we are supposed to be?
! if (!$topic_data['post_approved'] && !$auth->acl_get('m_approve', $topic_data['forum_id']))
{
// If post_id was submitted, we try at least to display the topic as a last resort...
! if ($topic_id)
{
redirect(append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id" . (($forum_id) ? "&f=$forum_id" : '')));
}
|
|
From: Henry S. <kel...@ph...> - 2009-08-14 15:56:07
|
Author: Kellanved
Date: Fri Aug 14 16:55:50 2009
New Revision: 9984
Log:
we are not supposed to know that yet
Modified:
branches/phpBB-3_0_0/phpBB/viewtopic.php
Modified: branches/phpBB-3_0_0/phpBB/viewtopic.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/viewtopic.php (original)
--- branches/phpBB-3_0_0/phpBB/viewtopic.php Fri Aug 14 16:55:50 2009
***************
*** 278,285 ****
}
$forum_id = (int) $topic_data['forum_id'];
- $topic_id = (int) $topic_data['topic_id'];
-
// This is for determining where we are (page)
if ($post_id)
{
--- 278,283 ----
***************
*** 324,329 ****
--- 322,328 ----
}
}
+ $topic_id = (int) $topic_data['topic_id'];
//
$topic_replies = ($auth->acl_get('m_approve', $forum_id)) ? $topic_data['topic_replies_real'] : $topic_data['topic_replies'];
|
|
From: Henry S. <kel...@ph...> - 2009-08-14 15:51:54
|
Author: Kellanved
Date: Fri Aug 14 16:51:34 2009
New Revision: 9983
Log:
#47795
Modified:
branches/phpBB-3_0_0/phpBB/viewtopic.php
Modified: branches/phpBB-3_0_0/phpBB/viewtopic.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/viewtopic.php (original)
--- branches/phpBB-3_0_0/phpBB/viewtopic.php Fri Aug 14 16:51:34 2009
***************
*** 86,91 ****
--- 86,92 ----
WHERE topic_id = $topic_id
" . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND post_approved = 1') . "
AND post_time > $topic_last_read
+ AND forum_id = $forum_id
ORDER BY post_time ASC";
$result = $db->sql_query_limit($sql, 1);
$row = $db->sql_fetchrow($result);
***************
*** 188,193 ****
--- 189,195 ----
// The FROM-Order is quite important here, else t.* columns can not be correctly bound.
if ($post_id)
{
+ $sql_array['SELECT'] .= ', p.post_approved';
$sql_array['FROM'][POSTS_TABLE] = 'p';
}
***************
*** 235,241 ****
}
else
{
! $sql_array['WHERE'] = "p.post_id = $post_id AND t.topic_id = p.topic_id" . ((!$auth->acl_get('m_approve', $forum_id)) ? ' AND p.post_approved = 1' : '');
}
$sql_array['WHERE'] .= ' AND (f.forum_id = t.forum_id';
--- 237,243 ----
}
else
{
! $sql_array['WHERE'] = "p.post_id = $post_id AND t.topic_id = p.topic_id";
}
$sql_array['WHERE'] .= ' AND (f.forum_id = t.forum_id';
***************
*** 263,268 ****
--- 265,271 ----
$topic_data = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
+ // link to unapproved post or incorrect link
if (!$topic_data)
{
// If post_id was submitted, we try at least to display the topic as a last resort...
***************
*** 274,282 ****
--- 277,299 ----
trigger_error('NO_TOPIC');
}
+ $forum_id = (int) $topic_data['forum_id'];
+ $topic_id = (int) $topic_data['topic_id'];
+
// This is for determining where we are (page)
if ($post_id)
{
+ // are we where we are supposed to be?
+ if ($post_id && !$topic_data['post_approved'] && !$auth->acl_get('m_approve', $topic_data['forum_id']))
+ {
+ // If post_id was submitted, we try at least to display the topic as a last resort...
+ if ($post_id && $topic_id)
+ {
+ redirect(append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id" . (($forum_id) ? "&f=$forum_id" : '')));
+ }
+
+ trigger_error('NO_TOPIC');
+ }
if ($post_id == $topic_data['topic_first_post_id'] || $post_id == $topic_data['topic_last_post_id'])
{
$check_sort = ($post_id == $topic_data['topic_first_post_id']) ? 'd' : 'a';
***************
*** 307,315 ****
}
}
- $forum_id = (int) $topic_data['forum_id'];
- $topic_id = (int) $topic_data['topic_id'];
-
//
$topic_replies = ($auth->acl_get('m_approve', $forum_id)) ? $topic_data['topic_replies_real'] : $topic_data['topic_replies'];
--- 324,329 ----
|
|
From: Meik S. <acy...@ph...> - 2009-08-14 14:15:16
|
Author: acydburn
Date: Fri Aug 14 15:14:59 2009
New Revision: 9982
Log:
XHTML fixes by Raimon
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html
branches/phpBB-3_0_0/phpBB/adm/style/acp_profile.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_topic_review.html
Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html Fri Aug 14 15:14:59 2009
***************
*** 99,105 ****
<tr>
<td>{L_BOARD_VERSION}: </td>
<td>
! <strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822"<!-- ELSE -->style="color: #BC2A4D"<!-- ENDIF --> title="{L_MORE_INFORMATION}" href="{U_VERSIONCHECK}">{BOARD_VERSION}</a></strong> [ <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> ]
</td>
<!-- IF S_TOTAL_ORPHAN -->
<td>{L_NUMBER_ORPHAN}: </td>
--- 99,105 ----
<tr>
<td>{L_BOARD_VERSION}: </td>
<td>
! <strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF --> title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [ <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> ]
</td>
<!-- IF S_TOTAL_ORPHAN -->
<td>{L_NUMBER_ORPHAN}: </td>
Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_profile.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_profile.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_profile.html Fri Aug 14 15:14:59 2009
***************
*** 127,133 ****
<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
<input class="button1" type="submit" name="prev" value="{L_PROFILE_BASIC_OPTIONS}" />
</fieldset>
!
<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
{S_HIDDEN_FIELDS}
{S_FORM_TOKEN}
--- 127,133 ----
<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
<input class="button1" type="submit" name="prev" value="{L_PROFILE_BASIC_OPTIONS}" />
</fieldset>
!
<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
{S_HIDDEN_FIELDS}
{S_FORM_TOKEN}
***************
*** 151,165 ****
<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
<input class="button1" type="submit" name="prev" value="{L_PROFILE_TYPE_OPTIONS}" />
</fieldset>
!
<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
{S_HIDDEN_FIELDS}
<input class="button1" type="submit" name="save" value="{L_SAVE}" />
{S_FORM_TOKEN}
</fieldset>
!
<!-- ENDIF -->
!
</form>
<!-- ELSE -->
--- 151,165 ----
<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
<input class="button1" type="submit" name="prev" value="{L_PROFILE_TYPE_OPTIONS}" />
</fieldset>
!
<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
{S_HIDDEN_FIELDS}
<input class="button1" type="submit" name="save" value="{L_SAVE}" />
{S_FORM_TOKEN}
</fieldset>
!
<!-- ENDIF -->
!
</form>
<!-- ELSE -->
***************
*** 194,207 ****
{ICON_MOVE_UP_DISABLED}
<a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
<!-- ELSEIF not fields.S_FIRST_ROW && not fields.S_LAST_ROW-->
! <a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a>
! <a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
<!-- ELSEIF fields.S_LAST_ROW && not fields.S_FIRST_ROW -->
<a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a>
! {ICON_MOVE_DOWN_DISABLED}
<!-- ENDIF -->
<!-- IF not fields.S_NEED_EDIT -->
! <a href="{fields.U_EDIT}">{ICON_EDIT}</a>
<!-- ELSE -->
{ICON_EDIT_DISABLED}
<!-- ENDIF -->
--- 194,207 ----
{ICON_MOVE_UP_DISABLED}
<a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
<!-- ELSEIF not fields.S_FIRST_ROW && not fields.S_LAST_ROW-->
! <a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a>
! <a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
<!-- ELSEIF fields.S_LAST_ROW && not fields.S_FIRST_ROW -->
<a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a>
! {ICON_MOVE_DOWN_DISABLED}
<!-- ENDIF -->
<!-- IF not fields.S_NEED_EDIT -->
! <a href="{fields.U_EDIT}">{ICON_EDIT}</a>
<!-- ELSE -->
{ICON_EDIT_DISABLED}
<!-- ENDIF -->
***************
*** 209,220 ****
</td>
</tr>
<!-- END fields -->
</tbody>
</table>
<form id="profile_fields" method="post" action="{U_ACTION}">
!
<fieldset class="quick">
<input class="text small" type="text" name="field_ident" /> <select name="field_type">{S_TYPE_OPTIONS}</select>
<input class="button1" type="submit" name="submit" value="{L_CREATE_NEW_FIELD}" />
--- 209,224 ----
</td>
</tr>
+ <!-- BEGINELSE -->
+ <tr class="row3">
+ <td colspan="4">{L_ACP_NO_ITEMS}</td>
+ </tr>
<!-- END fields -->
</tbody>
</table>
<form id="profile_fields" method="post" action="{U_ACTION}">
!
<fieldset class="quick">
<input class="text small" type="text" name="field_ident" /> <select name="field_type">{S_TYPE_OPTIONS}</select>
<input class="button1" type="submit" name="submit" value="{L_CREATE_NEW_FIELD}" />
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_topic_review.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_topic_review.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_topic_review.html Fri Aug 14 15:14:59 2009
***************
*** 5,11 ****
</h3>
<div id="topicreview">
! <script>
// <![CDATA[
bbcodeEnabled = {S_BBCODE_ALLOWED};
// ]]>
--- 5,11 ----
</h3>
<div id="topicreview">
! <script type="text/javascript">
// <![CDATA[
bbcodeEnabled = {S_BBCODE_ALLOWED};
// ]]>
|
|
From: Meik S. <acy...@ph...> - 2009-08-14 14:15:09
|
Author: acydburn
Date: Fri Aug 14 15:14:28 2009
New Revision: 9980
Log:
the form actually is no longer required - in tests we had a form to submit the reply/reply to all, but this only worked with JS, so i decided to use a link.
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_message_header.html
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_message_header.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_message_header.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_message_header.html Fri Aug 14 15:14:28 2009
***************
*** 5,13 ****
<!-- IF FOLDER_STATUS and FOLDER_MAX_MESSAGES neq 0 --><p>{FOLDER_STATUS}</p><!-- ENDIF -->
! <!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM -->
! <form method="post" action="{U_PM_ACTION}" id="reply-form">
!
<div class="buttons">
<!-- IF U_POST_REPLY_PM --><div class="pmreply-icon clearfix"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_POST_REPLY_PM}</a></div>
<!-- ELSEIF U_POST_NEW_TOPIC --><div class="newpm-icon"><a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}"><span></span>{L_UCP_PM_COMPOSE}</a></div><!-- ENDIF -->
--- 5,11 ----
<!-- IF FOLDER_STATUS and FOLDER_MAX_MESSAGES neq 0 --><p>{FOLDER_STATUS}</p><!-- ENDIF -->
! <!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM -->
<div class="buttons">
<!-- IF U_POST_REPLY_PM --><div class="pmreply-icon clearfix"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_POST_REPLY_PM}</a></div>
<!-- ELSEIF U_POST_NEW_TOPIC --><div class="newpm-icon"><a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}"><span></span>{L_UCP_PM_COMPOSE}</a></div><!-- ENDIF -->
***************
*** 18,27 ****
<div class="reply-all"><a title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">» {L_REPLY_TO_ALL}</a></div>
<!-- ENDIF -->
! <input type="hidden" name="action" value="" id="reply-action" />
!
! </form>
! <!-- ENDIF -->
<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
<ul class="linklist pm-return-to">
--- 16,22 ----
<div class="reply-all"><a title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">» {L_REPLY_TO_ALL}</a></div>
<!-- ENDIF -->
! <!-- ENDIF -->
<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
<ul class="linklist pm-return-to">
|
|
From: Meik S. <acy...@ph...> - 2009-08-14 14:15:00
|
Author: acydburn
Date: Fri Aug 14 15:14:44 2009
New Revision: 9981
Log:
add missing space
Modified:
branches/phpBB-3_0_0/phpBB/posting.php
Modified: branches/phpBB-3_0_0/phpBB/posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/posting.php (original)
--- branches/phpBB-3_0_0/phpBB/posting.php Fri Aug 14 15:14:44 2009
***************
*** 39,45 ****
$delete = (isset($_POST['delete'])) ? true : false;
$cancel = (isset($_POST['cancel']) && !isset($_POST['save'])) ? true : false;
! $refresh = (isset($_POST['add_file']) || isset($_POST['delete_file']) || isset($_POST['full_editor']) ||isset($_POST['cancel_unglobalise']) || $save || $load) ? true : false;
$mode = ($delete && !$preview && !$refresh && $submit) ? 'delete' : request_var('mode', '');
$error = $post_data = array();
--- 39,45 ----
$delete = (isset($_POST['delete'])) ? true : false;
$cancel = (isset($_POST['cancel']) && !isset($_POST['save'])) ? true : false;
! $refresh = (isset($_POST['add_file']) || isset($_POST['delete_file']) || isset($_POST['full_editor']) || isset($_POST['cancel_unglobalise']) || $save || $load) ? true : false;
$mode = ($delete && !$preview && !$refresh && $submit) ? 'delete' : request_var('mode', '');
$error = $post_data = array();
|
|
From: Andreas F. <ba...@ph...> - 2009-08-14 11:16:07
|
Author: bantu
Date: Fri Aug 14 12:15:44 2009
New Revision: 9979
Log:
Some things I missed in r9887.
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
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 14 12:15:44 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'];
|
|
From: Andreas F. <ba...@ph...> - 2009-08-14 10:44:16
|
Author: bantu
Date: Fri Aug 14 11:43:31 2009
New Revision: 9978
Log:
More r9896 cleanup.
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 Fri Aug 14 11:43:31 2009
***************
*** 74,82 ****
{
trigger_error($user->lang['NO_PERMISSION_FORUM_ADD'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING);
}
!
case 'copy_perm':
!
if (!(($auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth'))))
{
trigger_error($user->lang['NO_PERMISSION_COPY'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING);
--- 74,82 ----
{
trigger_error($user->lang['NO_PERMISSION_FORUM_ADD'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING);
}
!
case 'copy_perm':
!
if (!(($auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth'))))
{
trigger_error($user->lang['NO_PERMISSION_COPY'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING);
***************
*** 204,210 ****
return;
}
-
$auth->acl_clear_prefetch();
$acl_url = '&mode=setting_forum_local&forum_id[]=' . $forum_data['forum_id'];
--- 204,209 ----
***************
*** 722,735 ****
$message .= '<br /><br />' . sprintf($user->lang['REDIRECT_ACL'], '<a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url) . '">', '</a>');
}
- // redirect directly to permission settings screen if authed
- if ($action == 'add' && !$forum_perm_from && $auth->acl_get('a_fauth'))
- {
- meta_refresh(4, append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url));
- }
-
trigger_error($message . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id));
}
}
// Default management page
--- 721,730 ----
$message .= '<br /><br />' . sprintf($user->lang['REDIRECT_ACL'], '<a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url) . '">', '</a>');
}
trigger_error($message . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id));
}
+
+ break;
}
// Default management page
***************
*** 1919,1925 ****
adm_page_footer();
}
!
function copy_permission_page($forum_data)
{
global $phpEx, $phpbb_admin_path, $template, $user;
--- 1914,1923 ----
adm_page_footer();
}
!
! /**
! * Display copy permission page
! */
function copy_permission_page($forum_data)
{
global $phpEx, $phpbb_admin_path, $template, $user;
***************
*** 1927,1937 ****
$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");
-
$l_acl = sprintf($user->lang['COPY_TO_ACL'], '<a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url) . '">', '</a>');
-
-
$this->tpl_name = 'acp_forums_copy_perm';
$template->assign_vars(array(
--- 1925,1932 ----
|
|
From: Joas S. <nic...@ph...> - 2009-08-14 10:20:30
|
Author: nickvergessen
Date: Fri Aug 14 11:19:37 2009
New Revision: 9977
Log:
fix #49685 introduced in r9896
Authorised by: AcydBurn
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 Fri Aug 14 11:19:37 2009
***************
*** 189,194 ****
--- 189,195 ----
if (!sizeof($errors))
{
$forum_perm_from = request_var('forum_perm_from', 0);
+ $cache->destroy('sql', FORUMS_TABLE);
// Copy permissions?
if (!empty($forum_perm_from) && $forum_perm_from != $forum_data['forum_id'] &&
***************
*** 205,211 ****
$auth->acl_clear_prefetch();
- $cache->destroy('sql', FORUMS_TABLE);
$acl_url = '&mode=setting_forum_local&forum_id[]=' . $forum_data['forum_id'];
--- 206,211 ----
|
|
From: Henry S. <kel...@ph...> - 2009-08-14 10:12:20
|
Author: Kellanved
Date: Fri Aug 14 11:11:34 2009
New Revision: 9976
Log:
add back links
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/captcha_gd_acp.html
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
Modified: branches/phpBB-3_0_0/phpBB/adm/style/captcha_gd_acp.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/captcha_gd_acp.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/captcha_gd_acp.html Fri Aug 14 11:11:34 2009
***************
*** 1,6 ****
--- 1,7 ----
<!-- INCLUDE overall_header.html -->
<a name="maincontent"></a>
+ <a href="{U_ACTION}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a>
<h1>{L_ACP_VC_SETTINGS}</h1>
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php Fri Aug 14 11:11:34 2009
***************
*** 140,145 ****
--- 140,146 ----
$template->assign_vars(array(
'CAPTCHA_PREVIEW' => $this->get_demo_template($id),
'CAPTCHA_NAME' => $this->get_class_name(),
+ 'U_ACTION' => $module->u_action,
));
}
}
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 Fri Aug 14 11:11:34 2009
***************
*** 117,122 ****
--- 117,123 ----
$template->assign_vars(array(
'CAPTCHA_PREVIEW' => $this->get_demo_template($id),
'CAPTCHA_NAME' => $this->get_class_name(),
+ 'U_ACTION' => $module->u_action,
));
}
|
|
From: Henry S. <kel...@ph...> - 2009-08-14 10:00:48
|
Author: Kellanved
Date: Fri Aug 14 11:00:30 2009
New Revision: 9975
Log:
#49675 #49655 - ATTENTION: small captcha API change
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/acp_captcha.html
branches/phpBB-3_0_0/phpBB/includes/acp/acp_captcha.php
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_captcha.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_captcha.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_captcha.html Fri Aug 14 11:00:30 2009
***************
*** 39,48 ****
--- 39,50 ----
<dt><label for="captcha_select">{L_CAPTCHA_SELECT}:</label><br /><span>{L_CAPTCHA_SELECT_EXPLAIN}</span></dt>
<dd><select id="captcha_select" name="select_captcha" onchange="(document.getElementById('acp_captcha')).submit()" >{CAPTCHA_SELECT}</select></dd>
</dl>
+ <!-- IF S_CAPTCHA_HAS_CONFIG -->
<dl>
<dt><label for="configure">{L_CAPTCHA_CONFIGURE}:</label><br /><span>{L_CAPTCHA_CONFIGURE_EXPLAIN}</span></dt>
<dd><input class="button2" type="submit" id="configure" name="configure" value="{L_CONFIGURE}" /></dd>
</dl>
+ <!-- ENDIF -->
</fieldset>
<!-- IF CAPTCHA_PREVIEW_TPL -->
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_captcha.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_captcha.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_captcha.php Fri Aug 14 11:00:30 2009
***************
*** 67,73 ****
if ($submit && check_form_key($form_key))
{
- $config_vars = array_keys($config_vars);
foreach ($config_vars as $config_var => $options)
{
set_config($config_var, request_var($config_var, $options['default']));
--- 67,72 ----
***************
*** 122,127 ****
--- 121,127 ----
$template->assign_vars(array(
'CAPTCHA_PREVIEW_TPL' => $demo_captcha->get_demo_template($id),
+ 'S_CAPTCHA_HAS_CONFIG' => $demo_captcha->has_config(),
'CAPTCHA_SELECT' => $captcha_select,
));
}
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php Fri Aug 14 11:00:30 2009
***************
*** 362,367 ****
--- 362,375 ----
return (bool) $this->solved;
}
+ /**
+ * API function
+ */
+ function has_config()
+ {
+ return false;
+ }
+
}
?>
\ No newline at end of file
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php Fri Aug 14 11:00:30 2009
***************
*** 73,78 ****
--- 73,86 ----
return can_load_dll('gd');
}
+ /**
+ * API function
+ */
+ function has_config()
+ {
+ return true;
+ }
+
function get_name()
{
return 'CAPTCHA_GD';
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php Fri Aug 14 11:00:30 2009
***************
*** 17,25 ****
}
global $table_prefix;
! define('QUESTIONS_TABLE', $table_prefix . 'captcha_questions');
! define('ANSWERS_TABLE', $table_prefix . 'captcha_answers');
! define('QA_CONFIRM_TABLE', $table_prefix . 'qa_confirm');
--- 17,25 ----
}
global $table_prefix;
! define('CAPTCHA_QUESTIONS_TABLE', $table_prefix . 'captcha_questions');
! define('CAPTCHA_ANSWERS_TABLE', $table_prefix . 'captcha_answers');
! define('CAPTCHA_QA_CONFIRM_TABLE', $table_prefix . 'qa_confirm');
***************
*** 59,65 ****
$this->question_lang = $user->data['user_lang'];
// we need all defined questions - shouldn't be too many, so we can just grab them
// try the user's lang first
! $sql = 'SELECT question_id FROM ' . QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($user->data['user_lang']) . '\'';
$result = $db->sql_query($sql, 3600);
while ($row = $db->sql_fetchrow($result))
{
--- 59,65 ----
$this->question_lang = $user->data['user_lang'];
// we need all defined questions - shouldn't be too many, so we can just grab them
// try the user's lang first
! $sql = 'SELECT question_id FROM ' . CAPTCHA_QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($user->data['user_lang']) . '\'';
$result = $db->sql_query($sql, 3600);
while ($row = $db->sql_fetchrow($result))
{
***************
*** 70,76 ****
if (!sizeof($this->question_ids))
{
$this->question_lang = $config['default_lang'];
! $sql = 'SELECT question_id FROM ' . QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($config['default_lang']) . '\'';
$result = $db->sql_query($sql, 7200);
while ($row = $db->sql_fetchrow($result))
{
--- 70,76 ----
if (!sizeof($this->question_ids))
{
$this->question_lang = $config['default_lang'];
! $sql = 'SELECT question_id FROM ' . CAPTCHA_QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($config['default_lang']) . '\'';
$result = $db->sql_query($sql, 7200);
while ($row = $db->sql_fetchrow($result))
{
***************
*** 108,114 ****
include("$phpbb_root_path/includes/db/db_tools.$phpEx");
}
$db_tool = new phpbb_db_tools($db);
! return $db_tool->sql_table_exists(QUESTIONS_TABLE);
}
/**
--- 108,114 ----
include("$phpbb_root_path/includes/db/db_tools.$phpEx");
}
$db_tool = new phpbb_db_tools($db);
! return $db_tool->sql_table_exists(CAPTCHA_QUESTIONS_TABLE);
}
/**
***************
*** 125,137 ****
{
return false;
}
! $sql = 'SELECT COUNT(question_id) as count FROM ' . QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($config['default_lang']) . '\'';
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
return ((bool) $row['count']);
}
/**
* API function
*/
--- 125,147 ----
{
return false;
}
! $sql = 'SELECT COUNT(question_id) as count FROM ' . CAPTCHA_QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($config['default_lang']) . '\'';
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
return ((bool) $row['count']);
}
+
+ /**
+ * API function
+ */
+ function has_config()
+ {
+ return true;
+ }
+
+
/**
* API function
*/
***************
*** 219,225 ****
global $db, $config;
$sql = 'SELECT DISTINCT c.session_id
! FROM ' . QA_CONFIRM_TABLE . ' c
LEFT JOIN ' . SESSIONS_TABLE . ' s ON (c.session_id = s.session_id)
WHERE s.session_id IS NULL' .
((empty($type)) ? '' : ' AND c.confirm_type = ' . (int) $type);
--- 229,235 ----
global $db, $config;
$sql = 'SELECT DISTINCT c.session_id
! FROM ' . CAPTCHA_QA_CONFIRM_TABLE . ' c
LEFT JOIN ' . SESSIONS_TABLE . ' s ON (c.session_id = s.session_id)
WHERE s.session_id IS NULL' .
((empty($type)) ? '' : ' AND c.confirm_type = ' . (int) $type);
***************
*** 236,242 ****
if (sizeof($sql_in))
{
! $sql = 'DELETE FROM ' . QA_CONFIRM_TABLE . '
WHERE ' . $db->sql_in_set('session_id', $sql_in);
$db->sql_query($sql);
}
--- 246,252 ----
if (sizeof($sql_in))
{
! $sql = 'DELETE FROM ' . CAPTCHA_QA_CONFIRM_TABLE . '
WHERE ' . $db->sql_in_set('session_id', $sql_in);
$db->sql_query($sql);
}
***************
*** 264,273 ****
include("$phpbb_root_path/includes/db/db_tools.$phpEx");
}
$db_tool = new phpbb_db_tools($db);
! $tables = array(QUESTIONS_TABLE, ANSWERS_TABLE, QA_CONFIRM_TABLE);
$schemas = array(
! QUESTIONS_TABLE => array (
'COLUMNS' => array(
'question_id' => array('UINT', Null, 'auto_increment'),
'strict' => array('BOOL', 0),
--- 274,283 ----
include("$phpbb_root_path/includes/db/db_tools.$phpEx");
}
$db_tool = new phpbb_db_tools($db);
! $tables = array(CAPTCHA_QUESTIONS_TABLE, CAPTCHA_ANSWERS_TABLE, CAPTCHA_QA_CONFIRM_TABLE);
$schemas = array(
! CAPTCHA_QUESTIONS_TABLE => array (
'COLUMNS' => array(
'question_id' => array('UINT', Null, 'auto_increment'),
'strict' => array('BOOL', 0),
***************
*** 280,286 ****
'lang_iso' => array('INDEX', 'lang_iso'),
),
),
! ANSWERS_TABLE => array (
'COLUMNS' => array(
'question_id' => array('UINT', 0),
'answer_text' => array('STEXT_UNI', ''),
--- 290,296 ----
'lang_iso' => array('INDEX', 'lang_iso'),
),
),
! CAPTCHA_ANSWERS_TABLE => array (
'COLUMNS' => array(
'question_id' => array('UINT', 0),
'answer_text' => array('STEXT_UNI', ''),
***************
*** 289,295 ****
'question_id' => array('INDEX', 'question_id'),
),
),
! QA_CONFIRM_TABLE => array (
'COLUMNS' => array(
'session_id' => array('CHAR:32', ''),
'confirm_id' => array('CHAR:32', ''),
--- 299,305 ----
'question_id' => array('INDEX', 'question_id'),
),
),
! CAPTCHA_QA_CONFIRM_TABLE => array (
'COLUMNS' => array(
'session_id' => array('CHAR:32', ''),
'confirm_id' => array('CHAR:32', ''),
***************
*** 363,369 ****
$this->confirm_id = md5(unique_id($user->ip));
$this->question = (int) array_rand($this->question_ids);
! $sql = 'INSERT INTO ' . QA_CONFIRM_TABLE . ' ' . $db->sql_build_array('INSERT', array(
'confirm_id' => (string) $this->confirm_id,
'session_id' => (string) $user->session_id,
'lang_iso' => (string) $this->question_lang,
--- 373,379 ----
$this->confirm_id = md5(unique_id($user->ip));
$this->question = (int) array_rand($this->question_ids);
! $sql = 'INSERT INTO ' . CAPTCHA_QA_CONFIRM_TABLE . ' ' . $db->sql_build_array('INSERT', array(
'confirm_id' => (string) $this->confirm_id,
'session_id' => (string) $user->session_id,
'lang_iso' => (string) $this->question_lang,
***************
*** 386,392 ****
$this->solved = 0;
// compute $seed % 0x7fffffff
! $sql = 'UPDATE ' . QA_CONFIRM_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
'question' => (int) $this->question,)) . '
WHERE
confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\'
--- 396,402 ----
$this->solved = 0;
// compute $seed % 0x7fffffff
! $sql = 'UPDATE ' . CAPTCHA_QA_CONFIRM_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
'question' => (int) $this->question,)) . '
WHERE
confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\'
***************
*** 407,413 ****
$this->solved = 0;
// compute $seed % 0x7fffffff
! $sql = 'UPDATE ' . QA_CONFIRM_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
'question_id' => (int) $this->question)) . ',
attempts = attempts + 1
WHERE
--- 417,423 ----
$this->solved = 0;
// compute $seed % 0x7fffffff
! $sql = 'UPDATE ' . CAPTCHA_QA_CONFIRM_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
'question_id' => (int) $this->question)) . ',
attempts = attempts + 1
WHERE
***************
*** 425,431 ****
global $db, $user;
$sql = 'SELECT con.question_id, attempts, question_text, strict
! FROM ' . QA_CONFIRM_TABLE . ' con, ' . QUESTIONS_TABLE . " qes
WHERE con.question_id = qes.question_id
AND confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
AND session_id = '" . $db->sql_escape($user->session_id) . "'
--- 435,441 ----
global $db, $user;
$sql = 'SELECT con.question_id, attempts, question_text, strict
! FROM ' . CAPTCHA_QA_CONFIRM_TABLE . ' con, ' . CAPTCHA_QUESTIONS_TABLE . " qes
WHERE con.question_id = qes.question_id
AND confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
AND session_id = '" . $db->sql_escape($user->session_id) . "'
***************
*** 457,463 ****
$answer = ($this->question_strict) ? request_var('qa_answer', '', true) : utf8_clean_string(request_var('qa_answer', '', true));
$sql = 'SELECT answer_text
! FROM ' . ANSWERS_TABLE . '
WHERE question_id = ' . (int) $this->question;
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
--- 467,473 ----
$answer = ($this->question_strict) ? request_var('qa_answer', '', true) : utf8_clean_string(request_var('qa_answer', '', true));
$sql = 'SELECT answer_text
! FROM ' . CAPTCHA_ANSWERS_TABLE . '
WHERE question_id = ' . (int) $this->question;
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
***************
*** 480,486 ****
{
global $db, $user;
! $sql = 'DELETE FROM ' . QA_CONFIRM_TABLE . "
WHERE confirm_id = '" . $db->sql_escape($confirm_id) . "'
AND session_id = '" . $db->sql_escape($user->session_id) . "'
AND confirm_type = " . $this->type;
--- 490,496 ----
{
global $db, $user;
! $sql = 'DELETE FROM ' . CAPTCHA_QA_CONFIRM_TABLE . "
WHERE confirm_id = '" . $db->sql_escape($confirm_id) . "'
AND session_id = '" . $db->sql_escape($user->session_id) . "'
AND confirm_type = " . $this->type;
***************
*** 502,508 ****
{
global $db, $user;
! $sql = 'DELETE FROM ' . QA_CONFIRM_TABLE . "
WHERE session_id = '" . $db->sql_escape($user->session_id) . "'
AND confirm_type = " . (int) $this->type;
$db->sql_query($sql);
--- 512,518 ----
{
global $db, $user;
! $sql = 'DELETE FROM ' . CAPTCHA_QA_CONFIRM_TABLE . "
WHERE session_id = '" . $db->sql_escape($user->session_id) . "'
AND confirm_type = " . (int) $this->type;
$db->sql_query($sql);
***************
*** 666,672 ****
{
global $db, $template;
! $sql = 'SELECT * FROM ' . QUESTIONS_TABLE . ' WHERE 1';
$result = $db->sql_query($sql);
$template->assign_vars(array(
'S_LIST' => true,
--- 676,682 ----
{
global $db, $template;
! $sql = 'SELECT * FROM ' . CAPTCHA_QUESTIONS_TABLE . ' WHERE 1';
$result = $db->sql_query($sql);
$template->assign_vars(array(
'S_LIST' => true,
***************
*** 697,703 ****
if ($question_id)
{
! $sql = 'SELECT * FROM ' . QUESTIONS_TABLE . ' WHERE question_id = ' . $question_id;
$result = $db->sql_query($sql);
if ($row = $db->sql_fetchrow($result))
{
--- 707,713 ----
if ($question_id)
{
! $sql = 'SELECT * FROM ' . CAPTCHA_QUESTIONS_TABLE . ' WHERE question_id = ' . $question_id;
$result = $db->sql_query($sql);
if ($row = $db->sql_fetchrow($result))
{
***************
*** 709,715 ****
return false;
}
$question['answers'] = array();
! $sql = 'SELECT * FROM ' . ANSWERS_TABLE . ' WHERE question_id = ' . $question_id;
$result = $db->sql_query($sql);
while($row = $db->sql_fetchrow($result))
{
--- 719,725 ----
return false;
}
$question['answers'] = array();
! $sql = 'SELECT * FROM ' . CAPTCHA_ANSWERS_TABLE . ' WHERE question_id = ' . $question_id;
$result = $db->sql_query($sql);
while($row = $db->sql_fetchrow($result))
{
***************
*** 748,760 ****
global $db;
// easier to delete all answers than to figure out which to update
! $sql = "DELETE FROM " . ANSWERS_TABLE . " WHERE question_id = $question_id";
$db->sql_query($sql);
$langs = $this->get_languages();
$question_ary = $data;
$question_ary['lang_id'] = $langs[$question_ary['lang_iso']]['id'];
unset($question_ary['answers']);
! $sql = "UPDATE " . QUESTIONS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $question_ary) . "
WHERE question_id = $question_id";
$db->sql_query($sql);
$this->acp_insert_answers($data, $question_id);
--- 758,770 ----
global $db;
// easier to delete all answers than to figure out which to update
! $sql = "DELETE FROM " . CAPTCHA_ANSWERS_TABLE . " WHERE question_id = $question_id";
$db->sql_query($sql);
$langs = $this->get_languages();
$question_ary = $data;
$question_ary['lang_id'] = $langs[$question_ary['lang_iso']]['id'];
unset($question_ary['answers']);
! $sql = "UPDATE " . CAPTCHA_QUESTIONS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $question_ary) . "
WHERE question_id = $question_id";
$db->sql_query($sql);
$this->acp_insert_answers($data, $question_id);
***************
*** 773,779 ****
$question_ary['lang_id'] = $langs[$data['lang_iso']]['id'];
unset($question_ary['answers']);
! $sql = "INSERT INTO " . QUESTIONS_TABLE . $db->sql_build_array('INSERT', $question_ary);
$db->sql_query($sql);
$question_id = $db->sql_nextid();
$this->acp_insert_answers($data, $question_id);
--- 783,789 ----
$question_ary['lang_id'] = $langs[$data['lang_iso']]['id'];
unset($question_ary['answers']);
! $sql = "INSERT INTO " . CAPTCHA_QUESTIONS_TABLE . $db->sql_build_array('INSERT', $question_ary);
$db->sql_query($sql);
$question_id = $db->sql_nextid();
$this->acp_insert_answers($data, $question_id);
***************
*** 793,799 ****
'question_id' => $question_id,
'answer_text' => $answer,
);
! $sql = "INSERT INTO " . ANSWERS_TABLE . $db->sql_build_array('INSERT', $answer_ary);
$db->sql_query($sql);
}
}
--- 803,809 ----
'question_id' => $question_id,
'answer_text' => $answer,
);
! $sql = "INSERT INTO " . CAPTCHA_ANSWERS_TABLE . $db->sql_build_array('INSERT', $answer_ary);
$db->sql_query($sql);
}
}
***************
*** 806,812 ****
{
global $db;
! $tables = array(QUESTIONS_TABLE, ANSWERS_TABLE);
foreach($tables as $table)
{
$sql = "DELETE FROM $table WHERE question_id = $question_id";
--- 816,822 ----
{
global $db;
! $tables = array(CAPTCHA_QUESTIONS_TABLE, CAPTCHA_ANSWERS_TABLE);
foreach($tables as $table)
{
$sql = "DELETE FROM $table WHERE question_id = $question_id";
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 Fri Aug 14 11:00:30 2009
***************
*** 54,59 ****
--- 54,67 ----
$user->add_lang('captcha_recaptcha');
return (isset($config['recaptcha_pubkey']) && !empty($config['recaptcha_pubkey']));
}
+
+ /**
+ * API function
+ */
+ function has_config()
+ {
+ return true;
+ }
function get_name()
{
|
|
From: Henry S. <kel...@ph...> - 2009-08-14 09:07:21
|
Author: Kellanved
Date: Fri Aug 14 10:06:34 2009
New Revision: 9974
Log:
other icon
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/quickreply_editor.html
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/quickreply_editor.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/quickreply_editor.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/quickreply_editor.html Fri Aug 14 10:06:34 2009
***************
*** 62,68 ****
<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />
<input type="submit" accesskey="f" tabindex="6" name="full_editor" value="{L_FULL_EDITOR}" class="button2" />
</fieldset>
! <a href="" class="top" onclick="hide_qr(); return false;" title="{L_COLLAPSE_QR}">{L_COLLAPSE_QR}</a>
</div>
<span class="corners-bottom"><span></span></span></div>
</div>
--- 62,68 ----
<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />
<input type="submit" accesskey="f" tabindex="6" name="full_editor" value="{L_FULL_EDITOR}" class="button2" />
</fieldset>
! <a href="" class="right-box up" onclick="hide_qr(); return false;" title="{L_COLLAPSE_QR}">{L_COLLAPSE_QR}</a>
</div>
<span class="corners-bottom"><span></span></span></div>
</div>
|
|
From: Henry S. <kel...@ph...> - 2009-08-14 08:50:01
|
Author: Kellanved
Date: Fri Aug 14 09:49:46 2009
New Revision: 9973
Log:
That's not supported by php4 and part of the full 3.1 system anyway
Removed:
branches/phpBB-3_0_0/phpBB/includes/captcha/captcha_plugin.php
Removed: branches/phpBB-3_0_0/phpBB/includes/captcha/captcha_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/captcha_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/captcha_plugin.php (removed)
***************
*** 1,99 ****
- <?php
-
- interface phpbb_captcha_plugin
- {
- /**
- * Initiates the CAPTCHA to validate codes.
- * @param int $type the type as defined in constants.php
- */
- function init($type);
-
-
- /**
- * Returns true if the captcha will work on the current install
- */
- static function is_available();
-
- /**
- * Returns the translated pretty name of the captcha.
- */
- static function get_name();
-
- /**
- * Returns the class name of the captcha.
- */
- static function get_class_name();
-
- /**
- * Returns an instance; does not have to be the same instance twice.
- */
- static function get_instance();
-
- /**
- * Returns the HTML needed to embed the captcha in another template
- */
- function get_template();
-
-
- /**
- * Delivers the image of image based captchas; not required for text/remote etc CAPTCHAs
- */
- function execute();
-
- /**
- * Returns the HTML needed to display a demo of the captcha
- */
- function get_demo_template($id);
-
-
- /**
- * Delivers the demo image of image based captchas; not required for text/remote etc CAPTCHAs
- */
- function execute_demo();
-
- /**
- * Clears leftover entries in the database.
- */
- static function garbage_collect($type);
-
-
- /**
- * Clears all entries from the database if the CAPTCHA is replaced
- */
- function uninstall();
-
- /**
- * Sets up the CAPTCHA when it is selected in the ACP.
- */
- function install();
-
-
- /**
- * Checks the captcha; returns false if the code was correct; a translated error string otherwise
- */
- function validate();
-
- /**
- * Prepares the captcha to ask a new question; required call on failed answers
- */
- function reset();
-
- /**
- * Displays the configuration options in the ACP
- */
- function acp_page($id, &$module);
-
- /**
- * Returns the entries for the hidden field array needed to preserve the current state.
- */
- function get_hidden_fields();
-
-
- /**
- * Returns the number of solving attempts of the current user
- */
- function get_attempt_count();
-
- }
-
- ?>
\ No newline at end of file
--- 0 ----
|
7 messages has been excluded from this view by a project administrator.
