codes****@googl*****
codes****@googl*****
2009年 2月 8日 (日) 17:20:38 JST
Author: dengenxp
Date: Sat Feb 7 22:41:45 2009
New Revision: 1147
Added:
trunk/plugins/forum/history.txt (contents, props changed)
trunk/plugins/forum/v2.7.1_changes.txt (contents, props changed)
trunk/plugins/forum/v2.7.2_changes.txt (contents, props changed)
Modified:
trunk/plugins/forum/admin/messages.php
trunk/plugins/forum/admin/mods.php
trunk/plugins/forum/config.php
trunk/plugins/forum/functions.inc
trunk/plugins/forum/language/english.php
trunk/plugins/forum/language/english_utf-8.php
trunk/plugins/forum/language/german.php
trunk/plugins/forum/language/german_utf-8.php
trunk/plugins/forum/language/japanese_utf-8.php
trunk/plugins/forum/public_html/createtopic.php
trunk/plugins/forum/public_html/include/gf_format.php
trunk/plugins/forum/public_html/include/gf_showtopic.php
trunk/plugins/forum/public_html/index.php
trunk/plugins/forum/public_html/notify.php
trunk/plugins/forum/public_html/print.php
trunk/plugins/forum/public_html/viewtopic.php
trunk/plugins/forum/readme.jp
trunk/plugins/forum/themefiles/forum/layout/admin/banip_mgmt.thtml
trunk/plugins/forum/themefiles/forum/layout/admin/board_categories.thtml
trunk/plugins/forum/themefiles/forum/layout/admin/boards_edtcategory.thtml
trunk/plugins/forum/themefiles/forum/layout/admin/header.thtml
trunk/plugins/forum/themefiles/forum/layout/admin/ip_records.thtml
trunk/plugins/forum/themefiles/forum/layout/admin/ips_unban.thtml
trunk/plugins/forum/themefiles/forum/layout/admin/message_line.thtml
trunk/plugins/forum/themefiles/forum/layout/admin/messages.thtml
trunk/plugins/forum/themefiles/forum/layout/admin/migratestories.thtml
trunk/plugins/forum/themefiles/forum/layout/admin/mod_add.thtml
trunk/plugins/forum/themefiles/forum/layout/admin/moderators.thtml
trunk/plugins/forum/themefiles/forum/layout/blocks/block_displayline.thtml
trunk/plugins/forum/themefiles/forum/layout/categorylisting.thtml
trunk/plugins/forum/themefiles/forum/layout/forumlisting_record.thtml
trunk/plugins/forum/themefiles/forum/layout/links/edittopic.thtml
trunk/plugins/forum/themefiles/forum/layout/links/email.thtml
trunk/plugins/forum/themefiles/forum/layout/links/pm.thtml
trunk/plugins/forum/themefiles/forum/layout/links/profile.thtml
trunk/plugins/forum/themefiles/forum/layout/links/quotetopic.thtml
trunk/plugins/forum/themefiles/forum/layout/links/website.thtml
trunk/plugins/forum/themefiles/forum/layout/navbar.thtml
trunk/plugins/forum/themefiles/forum/layout/reports/memberlist.thtml
trunk/plugins/forum/themefiles/forum/layout/reports/memberlist_line.thtml
trunk/plugins/forum/themefiles/forum/layout/reports/memberlist_link.thtml
trunk/plugins/forum/themefiles/forum/layout/reports/notifications.thtml
trunk/plugins/forum/themefiles/forum/layout/reports/notifications_line.thtml
trunk/plugins/forum/themefiles/forum/layout/reports/report_results.thtml
trunk/plugins/forum/themefiles/forum/layout/smilies.thtml
trunk/plugins/forum/themefiles/forum/layout/submissionform_main.thtml
trunk/plugins/forum/themefiles/forum/layout/topic.thtml
trunk/plugins/forum/themefiles/forum/layout/topicfooter.thtml
trunk/plugins/forum/themefiles/forum/layout/userprefs/user_settings.thtml
Log:
forumプラグイン:バージョンJPr4.2候補に更新します。
・オリジナル版のversion 2.7.2をマージ（セキュリティ対策）
・HTMLコードの適正化を実施（ほぼ達成）
・印刷用ページの改善
・その他、微調整
Modified: trunk/plugins/forum/admin/messages.php
==============================================================================
--- trunk/plugins/forum/admin/messages.php (original)
+++ trunk/plugins/forum/admin/messages.php Sat Feb 7 22:41:45 2009
@@ -60,9 +60,9 @@
}
$firstforum = false;
if ($B['forum_id'] == $selected) {
- $selectHTML .= LB .'<option
value="' .$B['forum_id']. '"
selected="selected"> » ' .$B['forum_name']. '';
+ $selectHTML .= LB .'<option
value="' .$B['forum_id']. '"
selected="selected"> » ' .$B['forum_name']. '';
} else {
- $selectHTML .= LB .'<option
value="' .$B['forum_id']. '"> » ' .$B['forum_name']. '';
+ $selectHTML .= LB .'<option
value="' .$B['forum_id']. '"> » ' .$B['forum_name']. '';
}
}
}
Modified: trunk/plugins/forum/admin/mods.php
==============================================================================
--- trunk/plugins/forum/admin/mods.php (original)
+++ trunk/plugins/forum/admin/mods.php Sat Feb 7 22:41:45 2009
@@ -257,7 +257,7 @@
$sql .= " ORDER BY 'mod_username' ASC";
$modsql = DB_query("$sql");
- $i = 1;
+ $i = 0;
while($M = DB_fetchArray($modsql)) {
if ($M['mod_delete'] == "1") {
@@ -309,8 +309,6 @@
$moderators->parse ('output', 'moderators');
echo $moderators->finish ($moderators->get_var('output'));
}
-
- echo "</table></form>";
}
echo COM_endBlock();
echo adminfooter();
Modified: trunk/plugins/forum/config.php
==============================================================================
--- trunk/plugins/forum/config.php (original)
+++ trunk/plugins/forum/config.php Sat Feb 7 22:41:45 2009
@@ -34,7 +34,7 @@
}
$CONF_FORUM['debug'] = false;
-$CONF_FORUM['version'] = '2.7.1';
+$CONF_FORUM['version'] = '2.7.2';
// Set to true if you are using MYSQL 4.0 or greater and this will improve
performance.
$CONF_FORUM['mysql4+'] = false;
@@ -84,7 +84,8 @@
$CONF_FORUM['linkinfo_width'] = 70;
/* Format style for quotes */
-$CONF_FORUM['quoteformat'] = "[QUOTE][u]Quote by: %s[/u][p]%s[/p][/QUOTE]";
+//$CONF_FORUM['quoteformat'] = "[QUOTE][u]Quote
by: %s[/u][p]%s[/p][/QUOTE]";
+$CONF_FORUM['quoteformat'] = "[QUOTE][u]Quote by: %s[/u]%s[/QUOTE]"; // p要
素内にブロックレベル要素を含めることはできないので、これを回避する。
$CONF_FORUM['show_popular_perpage'] = '20'; // @TODO: Need to make this
an online admin setting
Modified: trunk/plugins/forum/functions.inc
==============================================================================
--- trunk/plugins/forum/functions.inc (original)
+++ trunk/plugins/forum/functions.inc Sat Feb 7 22:41:45 2009
@@ -784,6 +784,10 @@
case "2.7" :
DB_query("UPDATE {$_TABLES['plugins']} SET `pi_version`
= '2.7.1', `pi_gl_version` = '1.4.1' WHERE `pi_name` = 'forum' LIMIT 1");
break;
+
+ case "2.7.1" :
+ DB_query("UPDATE {$_TABLES['plugins']} SET `pi_version`
= '2.7.2' WHERE `pi_name` = 'forum' LIMIT 1");
+ break;
}
/* Check if update completed and return a message number to be shown */
@@ -889,9 +893,9 @@
global $_CONF, $LANG_GF01, $LANG_GF02, $CONF_FORUM, $_USER;
if ($CONF_FORUM['registration_required'] && $_USER['uid'] < 2) {
- echo '<TABLE WIDTH="100%" HEIGHT="100"><TR><TD><CENTER>';
- printf($LANG_GF01['loginreqview'], '<A
HREF="' .$_CONF['site_url']. '/users.php?mode=new">', '<A
HREF="' .$_CONF['site_url']. '/users.php">');
- echo '</CENTER></TD></TR></TABLE>';
+ echo '<table width="100%" height="100"><tr><td><center>';
+ printf($LANG_GF01['loginreqview'], '<a
href="' .$_CONF['site_url']. '/users.php?mode=new">', '<a
href="' .$_CONF['site_url']. '/users.php">');
+ echo '</center></td></tr></table>';
echo COM_siteFooter();
exit;
} elseif($secure AND empty($_USER['uid'])) {
@@ -909,6 +913,7 @@
":evil:", ":twisted:", ":roll:", ";)", ":!:", ":question:", ":idea:", ":arrow:", ":|",
":mrgreen:",":mrt:",":love:",":cat:");
$replace = array(
+/*
"<img align=absmiddle src='images/smilies/biggrin.gif' alt='Big
Grin'>",
"<img align=absmiddle src='images/smilies/smile.gif' alt='Smile'>",
"<img align=absmiddle src='images/smilies/frown.gif' alt='Frown'>",
@@ -931,6 +936,29 @@
"<img align=absmiddle src='images/smilies/arrow.gif' alt='Arrow'>",
"<img align=absmiddle src='images/smilies/neutral.gif' alt='Neutral'>",
"<img align=absmiddle src='images/smilies/mrgreen.gif' alt='Mr.
Green'>");
+*/
+ '<img style="virtical-align:middle;" src="images/smilies/biggrin.gif"
alt="Big Grin">',
+ '<img style="virtical-align:middle;" src="images/smilies/smile.gif"
alt="Smile">',
+ '<img style="virtical-align:middle;" src="images/smilies/frown.gif"
alt="Frown">',
+ '<img style="virtical-align:middle;" src="images/smilies/eek.gif"
alt="Eek!">',
+ '<img style="virtical-align:middle;" src="images/smilies/confused.gif"
alt="Confused">',
+ '<img style="virtical-align:middle;" src="images/smilies/cool.gif"
alt="Cool">',
+ '<img style="virtical-align:middle;" src="images/smilies/lol.gif"
alt="Laughing Out Loud">',
+ '<img style="virtical-align:middle;" src="images/smilies/mad.gif"
alt="Angry">',
+ '<img style="virtical-align:middle;" src="images/smilies/razz.gif"
alt="Razz">',
+ '<img style="virtical-align:middle;" src="images/smilies/redface.gif"
alt="Oops!">',
+ '<img style="virtical-align:middle;"
src="images/smilies/surprised.gif" alt="Surprised!">',
+ '<img style="virtical-align:middle;" src="images/smilies/cry.gif"
alt="Cry">',
+ '<img style="virtical-align:middle;" src="images/smilies/evil.gif"
alt="Evil">',
+ '<img style="virtical-align:middle;" src="images/smilies/twisted.gif"
alt="Twisted Evil">',
+ '<img style="virtical-align:middle;" src="images/smilies/rolleyes.gif"
alt="Rolling Eyes">',
+ '<img style="virtical-align:middle;" src="images/smilies/wink.gif"
alt="Wink">',
+ '<img style="virtical-align:middle;" src="images/smilies/exclaim.gif"
alt="Exclaimation">',
+ '<img style="virtical-align:middle;" src="images/smilies/question.gif"
alt="Question">',
+ '<img style="virtical-align:middle;" src="images/smilies/idea.gif"
alt="Idea">',
+ '<img style="virtical-align:middle;" src="images/smilies/arrow.gif"
alt="Arrow">',
+ '<img style="virtical-align:middle;" src="images/smilies/neutral.gif"
alt="Neutral">',
+ '<img style="virtical-align:middle;" src="images/smilies/mrgreen.gif"
alt="Mr. Green">');
if (!$reverse) {
$message = str_replace($search, $replace, $message);
@@ -1424,11 +1452,11 @@
if (!SEC_inGroup('Root',$uid)) {
foreach ($CONF_FORUM['grouptags'] as $groupid => $buttonimg) {
if (SEC_inGroup($groupid,$uid)) {
- return "<img
src=\"{$CONF_FORUM['imgset']}/badges/{$buttonimg}\"><br" . XHTML . ">";
+ return "<img alt=\"\"
src=\"{$CONF_FORUM['imgset']}/badges/{$buttonimg}\"><br" . XHTML . ">";
}
}
} else {
- return "<img
src=\"{$CONF_FORUM['imgset']}/badges/{$CONF_FORUM['grouptags']['Root']}\"><br" .
XHTML . ">";
+ return "<img alt=\"\"
src=\"{$CONF_FORUM['imgset']}/badges/{$CONF_FORUM['grouptags']['Root']}\"><br" .
XHTML . ">";
}
}
}
Added: trunk/plugins/forum/history.txt
==============================================================================
--- (empty file)
+++ trunk/plugins/forum/history.txt Sat Feb 7 22:41:45 2009
@@ -0,0 +1,25 @@
+Geeklog Forum Plugin Changes for version 2.7.1
+Date: July 19/2008
+
+Blaine Lang
+
+
+*** Summary of changes ***
+Fixed a cross-site scripting vulnerability as identified by Yosuke Yamada
of NetAgent Co., Ltd and reported to us by Noriko Takahashi of JPCERT/CC
+http://jvn.jp/
+
+This release addressed the issue is related to entering a specially
crafted javascript string into the forum search.
+
+
+*** Listing of file changes ***
+
+Version 2.7.1 File Changes
+--------------------
+
+ public_html\index.php
+ config.php
+ functions.inc
+
+Upgrade Steps:
+ - Replace the changed files
+ - Run the plugin upgrade
Modified: trunk/plugins/forum/language/english.php
==============================================================================
--- trunk/plugins/forum/language/english.php (original)
+++ trunk/plugins/forum/language/english.php Sat Feb 7 22:41:45 2009
@@ -4,7 +4,7 @@
// | Geeklog Forums Plugin 2.0 for Geeklog - The Ultimate
Weblog |
// | Official release date: Feb
7,2003 |
//
+---------------------------------------------------------------------------+
-// |
English.php |
+// |
english.php |
// | Language defines for all
text |
//
+---------------------------------------------------------------------------+
// | Copyright (C) 2000,2001 by the following
authors: |
@@ -34,6 +34,10 @@
//
+---------------------------------------------------------------------------+
//
+if (!defined('XHTML')) {
+ define('XHTML', '');
+}
+
$LANG_GF00 = array (
'admin_only' => 'Sorry Admins Only. If you are an Admin please
login first.',
'plugin' => 'Plugin',
@@ -50,7 +54,7 @@
'access_denied_msg' => 'Only Root Users have Access to this Page.
Your user name and IP have been recorded.',
'admin' => 'Plugin Admin',
'install_header' => 'Install/Uninstall Plugin',
- 'installed' => 'The Plugin and Block are now
installed,<p><i>Enjoy,<br><a
href="MAILTO:langm****@sympa*****">Blaine</a></i>',
+ 'installed' => 'The Plugin and Block are now
installed,<p><i>Enjoy,<br' . XHTML . '><a
href="MAILTO:langm****@sympa*****">Blaine</a></i>',
'uninstalled' => 'The Plugin is Not Installed',
'install_success' => 'Installation Successful<p><b>Next Steps</b>:
<ol><li>Use the Forum Admin to configure your new forum
@@ -62,7 +66,7 @@
'uninstall_msg' => 'Plugin Successfully Uninstalled',
'install' => 'Install',
'uninstall' => 'UnInstall',
- 'enabled' => '<br>Plugin is installed and
enabled.<br>Disable first if you want to De-Install it.<p>',
+ 'enabled' => '<br' . XHTML . '>Plugin is installed and
enabled.<br' . XHTML . '>Disable first if you want to De-Install it.<p>',
'warning' => 'Forum De-Install Warning',
'uploaderr' => 'File Upload Error'
);
@@ -181,9 +185,9 @@
$LANG_GF01['back2parent'] = 'Parent Topic';
$LANG_GF01['forumname'] = ''; // Enter name here if you want it to
show in the footer of the admin screens
$LANG_GF01['category'] = 'Category: ';
-$LANG_GF01['loginreqview'] = '<B>Sorry you must %s register</A> or %s
login </A> to use these forums</B>';
-$LANG_GF01['loginreqpost'] = '<B>Sorry you must register or login to
post on these forums</B>';
-$LANG_GF01['searchresults'] = '<b>�</b> Your search for <b>%s</b> %s
author returned <b>%s</b> results:</b><br><br>';
+$LANG_GF01['loginreqview'] = '<b>Sorry you must %s register</a> or %s
login </a> to use these forums</b>';
+$LANG_GF01['loginreqpost'] = '<b>Sorry you must register or login to
post on these forums</b>';
+$LANG_GF01['searchresults'] = '<b>�</b> Your search for <b>%s</b> %s
author returned <b>%s</b> results:</b><br' . XHTML . '><br' . XHTML . '>';
$LANG_GF01['feature_not_on'] = 'Feature not enabled';
$LANG_GF01['nolastpostmsg'] = 'N/A';
$LANG_GF01['no_one'] = 'No one.';
@@ -195,7 +199,7 @@
$LANG_GF01['DELOLDER_PM'] = 'Delete older';
$LANG_GF01['members'] = 'Members';
$LANG_GF01['save_sucess'] = 'Save Sucessful';
-$LANG_GF01['trademark'] = '<BR><CENTER><B>Geeklog Forum Project
version 2.0</B> © 2002</B></CENTER>';
+$LANG_GF01['trademark'] = '<br' . XHTML . '><center><b>Geeklog Forum
Project version 2.0</b> © 2002</b></center>';
$LANG_GF01['back2top'] = 'Back to top';
$LANG_GF01['POSTMODE'] = 'Post Mode:';
$LANG_GF01['TEXTMODE'] = 'Text Mode:';
@@ -234,7 +238,7 @@
$LANG_GF01['PRINTABLE'] = 'Printable Version';
$LANG_GF01['ForumProfile'] = 'Forum Options';
$LANG_GF01['USERPREFS'] = 'User Preferences';
-$LANG_GF01['SPEEDLIMIT'] = '"Your last comment was %s seconds
ago.<br>This site requires at least %s seconds between forum posts."';
+$LANG_GF01['SPEEDLIMIT'] = '"Your last comment was %s seconds
ago.<br' . XHTML . '>This site requires at least %s seconds between forum
posts."';
$LANG_GF01['ACCESSERROR'] = 'ACCESS ERROR';
$LANG_GF01['LEGEND'] = 'Legend';
$LANG_GF01['ACTIONS'] = 'Actions';
@@ -297,26 +301,26 @@
$LANG_GF02['msg01'] = 'Sorry you must register to use these forums';
-$LANG_GF02['msg02'] = 'You should not be here!<br>Restricted access to
this forum only';
+$LANG_GF02['msg02'] = 'You should not be here!<br' .
XHTML . '>Restricted access to this forum only';
$LANG_GF02['msg03'] = '';
$LANG_GF02['msg04'] = '';
-$LANG_GF02['msg05'] = '<CENTER><I>Sorry, no topics have been created
yet.</CENTER></I>';
+$LANG_GF02['msg05'] = '<center><em>Sorry, no topics have been created
yet.</em></center>';
$LANG_GF02['msg06'] = ' new posts since your last visit';
$LANG_GF02['msg07'] = 'Online Users:';
-$LANG_GF02['msg08'] = '<br><B>Total Registered Users to Date:</B> %s';
-$LANG_GF02['msg09'] = '<br><B>Total Posts to Date:</B> %s <br>';
-$LANG_GF02['msg10'] = '<B>Total Topics to Date:</B> %s <br>';
+$LANG_GF02['msg08'] = '<br' . XHTML . '><b>Total Registered Users to
Date:</b> %s';
+$LANG_GF02['msg09'] = '<br' . XHTML . '><b>Total Posts to Date:</b> %s
<br' . XHTML . '>';
+$LANG_GF02['msg10'] = '<b>Total Topics to Date:</b> %s <br' .
XHTML . '>';
$LANG_GF02['msg11'] = 'Back to Forum Index';
$LANG_GF02['msg12'] = 'Back to Main Homepage';
$LANG_GF02['msg13'] = 'Registration Required, you currently must
register or login to use this feature.';
-$LANG_GF02['msg14'] = 'Sorry, You have been banned from making
entries.<br>';
-$LANG_GF02['msg15'] = 'If you feel this is an error, contact <A
HREF="mailto:%s?subject=Forum IP Ban">Site Admin</A>.';
+$LANG_GF02['msg14'] = 'Sorry, You have been banned from making
entries.<br' . XHTML . '>';
+$LANG_GF02['msg15'] = 'If you feel this is an error, contact <a
href="mailto:%s?subject=Forum IP Ban">Site Admin</a>.';
$LANG_GF02['msg16'] = 'These are the most popular posts, you may order
them by views or replies.';
$LANG_GF02['msg17'] = 'Message Edited, Your message has been edited
sucessfully. Returning to your message.';
$LANG_GF02['msg18'] = 'Error! Not all required fields were completed or
were too short in length.';
$LANG_GF02['msg19'] = 'Your message has been posted.';
$LANG_GF02['msg20'] = 'Reply Added, Your reply has been posted.
Returning to Forum';
-$LANG_GF02['msg21'] = 'Sorry, you are unauthorized to do this. Please
<a href="javascript:history.back()">Go Back</a> or <a
href="%s/users.php?mode=login">Login</a><br><br>';
+$LANG_GF02['msg21'] = 'Sorry, you are unauthorized to do this. Please
<a href="javascript:history.back()">Go Back</a> or <a
href="%s/users.php?mode=login">Login</a><br' . XHTML . '><br' . XHTML . '>';
$LANG_GF02['msg22'] = '- Forum Post Notification';
$LANG_GF02['msg23a'] = "A reply has been made to the thread '%s'
by %s.\n\nThis topic was started by %s in the %s forum. ";
$LANG_GF02['msg23b'] = "A new topic '%s' has been posted by %s in the %s
forum on the %s website. You may view it
at:\n%s/forum/viewtopic.php?showtopic=%s\n";
@@ -336,19 +340,19 @@
$LANG_GF02['msg36'] = 'Mood:';
$LANG_GF02['msg37'] = 'Message:';
$LANG_GF02['msg38'] = 'Notify me of replies ';
-$LANG_GF02['msg39'] = '<br>There are no topic reviews for this new
topic.';
-$LANG_GF02['msg40'] = '<br>Sorry, but you have already asked to be
notified of replies to this topic.<br><br>';
-$LANG_GF02['msg41'] = '<br>Thank you! You will now be notified of
replies to topic %s .<br><br>';
+$LANG_GF02['msg39'] = '<br' . XHTML . '>There are no topic reviews for
this new topic.';
+$LANG_GF02['msg40'] = '<br' . XHTML . '>Sorry, but you have already
asked to be notified of replies to this topic.<br' . XHTML . '><br' .
XHTML . '>';
+$LANG_GF02['msg41'] = '<br' . XHTML . '>Thank you! You will now be
notified of replies to topic %s .<br' . XHTML . '><br' . XHTML . '>';
$LANG_GF02['msg42'] = 'Thank you! You have now deleted notifications on
this topic.';
$LANG_GF02['msg43'] = 'Are you sure you want to delete this
notification?.';
$LANG_GF02['msg44'] = '<p style="margin:0px; padding:5px;">You have no
notifications currently.</p>';
$LANG_GF02['msg45'] = 'Search the Forum';
$LANG_GF02['msg46'] = 'You can search the forum by entering keywords:';
$LANG_GF02['msg47'] = 'You can also specify an author to search under:';
-$LANG_GF02['msg48'] = '<br>The Chatterblock Plugin needs to be
installed first.';
+$LANG_GF02['msg48'] = '<br' . XHTML . '>The Chatterblock Plugin needs
to be installed first.';
$LANG_GF02['msg49'] = '(Read %s times) ';
$LANG_GF02['msg50'] = 'Signature n/a';
-$LANG_GF02['msg51'] = "%s\n\n<br>[Edited at %s by %s]";
+$LANG_GF02['msg51'] = "%s\n\n<br" . XHTML . ">[Edited at %s by %s]";
$LANG_GF02['msg52'] = 'Confirmed:';
$LANG_GF02['msg53'] = 'Returning to topic..';
$LANG_GF02['msg54'] = 'Post Edited.';
@@ -362,26 +366,26 @@
$LANG_GF02['msg62'] = 'Notify me of replies';
$LANG_GF02['msg63'] = 'Profile';
$LANG_GF02['msg64'] = 'Are you sure you want to delete topic %s
titled: %s ?';
-$LANG_GF02['msg65'] = '<br>This is a parent topic, so all replies
posted to it will also be deleted.';
+$LANG_GF02['msg65'] = '<br' . XHTML . '>This is a parent topic, so all
replies posted to it will also be deleted.';
$LANG_GF02['msg66'] = 'Confirm Delete Post';
$LANG_GF02['msg67'] = 'Edit Forum Post';
$LANG_GF02['msg68'] = 'Note: BE CAREFUL WHEN YOU BAN, only admins have
the rights to unban someone.';
$LANG_GF02['msg69'] = 'Do you really want to ban the ip address: %s?';
$LANG_GF02['msg70'] = 'Confirm Ban';
-$LANG_GF02['msg71'] = 'No function selected, choose a post and then a
moderator function.<br>Note: You must be a moderator to perform these
functions.';
+$LANG_GF02['msg71'] = 'No function selected, choose a post and then a
moderator function.<br' . XHTML . '>Note: You must be a moderator to
perform these functions.';
$LANG_GF02['msg72'] = 'Warning, you do not have rights to perform this
moderation function.';
$LANG_GF02['msg74'] = 'Latest %s Forum Posts';
$LANG_GF02['msg75'] = 'Top %s Topics By Views';
$LANG_GF02['msg76'] = 'Top %s Topics By Posts';
-$LANG_GF02['msg77'] = '<br><p style="padding-left:10px;">You should not
be here!<br>Restricted access to this forum only.<p />';
-$LANG_GF02['msg78'] = '<br>You should not be here!<br>Invalid Forum.';
+$LANG_GF02['msg77'] = '<br' . XHTML . '><p
style="padding-left:10px;">You should not be here!<br' .
XHTML . '>Restricted access to this forum only.</p>';
+$LANG_GF02['msg78'] = '<br' . XHTML . '>You should not be here!<br' .
XHTML . '>Invalid Forum.';
$LANG_GF02['msg81'] = '- Topic Edit Notification';
-$LANG_GF02['msg82'] = '<p>Your message "%s" has been edited by the
moderator %s.<p>';
-$LANG_GF02['msg83'] = '<br><br>You need to be signed in to use this
forum feature.<p />';
+$LANG_GF02['msg82'] = '<p>Your message "%s" has been edited by the
moderator %s.</p>';
+$LANG_GF02['msg83'] = '<br' . XHTML . '><br' . XHTML . '><p>You need to
be signed in to use this forum feature.</p>';
$LANG_GF02['msg84'] = 'Mark all topics read';
$LANG_GF02['msg85'] = 'Page:';
$LANG_GF02['msg86'] = ' Last %s posts ';
-$LANG_GF02['msg87'] = '<br>Warning: This topic has been locked by the
moderator.<br>No additional posts are permitted';
+$LANG_GF02['msg87'] = '<br' . XHTML . '>Warning: This topic has been
locked by the moderator.<br' . XHTML . '>No additional posts are permitted';
$LANG_GF02['msg88'] = 'Site Members';
$LANG_GF02['msg88b'] = 'Forum Activity Only';
$LANG_GF02['msg89'] = 'My Enabled Notifications';
@@ -407,17 +411,17 @@
$LANG_GF02['msg119'] = 'Forum Search results for the query:';
$LANG_GF02['msg120'] = 'Most popular posts by';
$LANG_GF02['msg121'] = 'All times are %s. The time is now %s.';
-$LANG_GF02['msg122'] = 'Popular Limit:';
+$LANG_GF02['msg122'] = 'Popular Limit';
$LANG_GF02['msg123'] = 'Number of posts before calling a topic popular';
$LANG_GF02['msg124'] = 'Messages Per Page:';
$LANG_GF02['msg125'] = 'Moderator Only: Messages Listing screen';
-$LANG_GF02['msg126'] = 'Search Lines:';
+$LANG_GF02['msg126'] = 'Search Lines';
$LANG_GF02['msg127'] = 'Number of lines to display in search results';
-$LANG_GF02['msg128'] = 'Members Per Page:';
+$LANG_GF02['msg128'] = 'Members Per Page';
$LANG_GF02['msg129'] = 'For the Members listing screen';
-$LANG_GF02['msg130'] = 'View Anonymous Posts:';
+$LANG_GF02['msg130'] = 'View Anonymous Posts';
$LANG_GF02['msg131'] = 'Setting of No will filter out anonymous posts';
-$LANG_GF02['msg132'] = 'Always Notify:';
+$LANG_GF02['msg132'] = 'Always Notify';
$LANG_GF02['msg133'] = 'Setting of Yes will enable auto notifcation for
any topics you create or reply';
$LANG_GF02['msg134'] = 'Subscription Added';
$LANG_GF02['msg135'] = 'You will now be notified of all posts to this
forum.';
@@ -447,10 +451,10 @@
$LANG_GF02['msg159'] = 'Are you sure you want to DELETE these selected
Moderator records?';
$LANG_GF02['msg160'] = 'View last page of topic';
$LANG_GF02['msg161'] = 'Return to members list';
-$LANG_GF02['msg162'] = 'To return to the forum index now click <a
href="%s">here</a><br><p />Default is to return automatically to view your
post.<br>If you do not wish to wait, click <a href="%s">here</a> now.';
+$LANG_GF02['msg162'] = 'To return to the forum index now click <a
href="%s">here</a><br' . XHTML . '>Default is to return automatically to
view your post.<br' . XHTML . '>If you do not wish to wait, click <a
href="%s">here</a> now.';
$LANG_GF02['msg163'] = 'Post moved';
$LANG_GF02['msg164'] = 'Mark all Categories and Topics Read';
-$LANG_GF02['msg165'] = 'ERROR<p />Matching <b>QUOTE</b> tag missing.
Unable to format message.<p />';
+$LANG_GF02['msg165'] = '<p>ERROR: Matching <b>QUOTE</b> tag missing.
Unable to format message.</p>';
$LANG_GF02['msg166'] = 'ERROR: Invalid topic or Topic not found';
$LANG_GF02['msg167'] = 'Notification Option';
$LANG_GF02['msg168'] = 'Setting of No will disable email notifictions';
@@ -508,8 +512,8 @@
'stick' => 'Make Sticky',
'unstick' => 'Un-Stick',
'movetopic' => 'Move Topic',
- 'movetopicmsg' => '<br>Topic to be moved: "<b>%s</b>"',
- 'splittopicmsg' => '<br>Create a new Topic with this
post: "<b>%s</b>"<br><em>By:</em> %s  <em>On:</em> %s',
+ 'movetopicmsg' => '<br' . XHTML . '>Topic to be
moved: "<b>%s</b>"',
+ 'splittopicmsg' => '<br' . XHTML . '>Create a new Topic with this
post: "<b>%s</b>"<br' . XHTML . '><em>By:</em> %s 
<em>On:</em> %s',
'selectforum' => 'Select new forum:',
'lockedpost' => 'Add Reply Post',
'splitheading' => 'Split thread option:',
@@ -659,7 +663,7 @@
'allownotify' => 'Allow Notification',
'allownotifydscp' => 'Do you want to allow people to be notified?',
'defaultmode' => 'Default Post Mode',
- 'defaultmodedscp' => 'Enable HTML Mode as default - set to
Yes.<br>Enable Text mode as default (safest) - set to No',
+ 'defaultmodedscp' => 'Enable HTML Mode as default - set to
Yes.<br' . XHTML . '>Enable Text mode as default (safest) - set to No',
'cbsettings' => 'Centerblock Settings',
'cbenable' => 'Enable Centerblock',
'cbenabledscp' => '',
@@ -756,7 +760,7 @@
'ModBan' => 'Ban',
'addmoderator' => "Add Record",
'delmoderator' => " Delete\nSelected",
- 'moderatorwarning' => '<b>Warning: No Forums
Defined</b><br><br>Setup Forum Categories and Add at least 1
forum<br>before attempting to add Modertators',
+ 'moderatorwarning' => '<b>Warning: No Forums Defined</b><br' .
XHTML . '><br' . XHTML . '>Setup Forum Categories and Add at least 1
forum<br' . XHTML . '>before attempting to add Modertators',
'private' => 'Private Forum',
'filtertitle' => 'Select Moderator records to view',
'addmessage' => 'Add new Moderator',
Modified: trunk/plugins/forum/language/english_utf-8.php
==============================================================================
--- trunk/plugins/forum/language/english_utf-8.php (original)
+++ trunk/plugins/forum/language/english_utf-8.php Sat Feb 7 22:41:45 2009
@@ -4,7 +4,7 @@
// | Geeklog Forums Plugin 2.0 for Geeklog - The Ultimate
Weblog |
// | Official release date: Feb
7,2003 |
//
+---------------------------------------------------------------------------+
-// |
English.php |
+// |
english_utf-8.php |
// | Language defines for all
text |
//
+---------------------------------------------------------------------------+
// | Copyright (C) 2000,2001 by the following
authors: |
@@ -34,6 +34,10 @@
//
+---------------------------------------------------------------------------+
//
+if (!defined('XHTML')) {
+ define('XHTML', '');
+}
+
$LANG_GF00 = array (
'admin_only' => 'Sorry Admins Only. If you are an Admin please
login first.',
'plugin' => 'Plugin',
@@ -50,7 +54,7 @@
'access_denied_msg' => 'Only Root Users have Access to this Page.
Your user name and IP have been recorded.',
'admin' => 'Plugin Admin',
'install_header' => 'Install/Uninstall Plugin',
- 'installed' => 'The Plugin and Block are now
installed,<p><i>Enjoy,<br><a
href="MAILTO:langm****@sympa*****">Blaine</a></i>',
+ 'installed' => 'The Plugin and Block are now
installed,<p><i>Enjoy,<br' . XHTML . '><a
href="MAILTO:langm****@sympa*****">Blaine</a></i>',
'uninstalled' => 'The Plugin is Not Installed',
'install_success' => 'Installation Successful<p><b>Next Steps</b>:
<ol><li>Use the Forum Admin to configure your new forum
@@ -62,7 +66,7 @@
'uninstall_msg' => 'Plugin Successfully Uninstalled',
'install' => 'Install',
'uninstall' => 'UnInstall',
- 'enabled' => '<br>Plugin is installed and
enabled.<br>Disable first if you want to De-Install it.<p>',
+ 'enabled' => '<br' . XHTML . '>Plugin is installed and
enabled.<br' . XHTML . '>Disable first if you want to De-Install it.<p>',
'warning' => 'Forum De-Install Warning',
'uploaderr' => 'File Upload Error'
);
@@ -181,9 +185,9 @@
$LANG_GF01['back2parent'] = 'Parent Topic';
$LANG_GF01['forumname'] = ''; // Enter name here if you want it to
show in the footer of the admin screens
$LANG_GF01['category'] = 'Category: ';
-$LANG_GF01['loginreqview'] = '<B>Sorry you must %s register</A> or %s
login </A> to use these forums</B>';
-$LANG_GF01['loginreqpost'] = '<B>Sorry you must register or login to
post on these forums</B>';
-$LANG_GF01['searchresults'] = '<b>ｻ</b> Your search for <b>%s</b> %s
author returned <b>%s</b> results:</b><br><br>';
+$LANG_GF01['loginreqview'] = '<b>Sorry you must %s register</a> or %s
login </a> to use these forums</b>';
+$LANG_GF01['loginreqpost'] = '<b>Sorry you must register or login to
post on these forums</b>';
+$LANG_GF01['searchresults'] = '<b>�</b> Your search for <b>%s</b> %s
author returned <b>%s</b> results:</b><br' . XHTML . '><br' . XHTML . '>';
$LANG_GF01['feature_not_on'] = 'Feature not enabled';
$LANG_GF01['nolastpostmsg'] = 'N/A';
$LANG_GF01['no_one'] = 'No one.';
@@ -195,7 +199,7 @@
$LANG_GF01['DELOLDER_PM'] = 'Delete older';
$LANG_GF01['members'] = 'Members';
$LANG_GF01['save_sucess'] = 'Save Sucessful';
-$LANG_GF01['trademark'] = '<BR><CENTER><B>Geeklog Forum Project
version 2.0</B> © 2002</B></CENTER>';
+$LANG_GF01['trademark'] = '<br' . XHTML . '><center><b>Geeklog Forum
Project version 2.0</b> © 2002</b></center>';
$LANG_GF01['back2top'] = 'Back to top';
$LANG_GF01['POSTMODE'] = 'Post Mode:';
$LANG_GF01['TEXTMODE'] = 'Text Mode:';
@@ -234,7 +238,7 @@
$LANG_GF01['PRINTABLE'] = 'Printable Version';
$LANG_GF01['ForumProfile'] = 'Forum Options';
$LANG_GF01['USERPREFS'] = 'User Preferences';
-$LANG_GF01['SPEEDLIMIT'] = '"Your last comment was %s seconds
ago.<br>This site requires at least %s seconds between forum posts."';
+$LANG_GF01['SPEEDLIMIT'] = '"Your last comment was %s seconds
ago.<br' . XHTML . '>This site requires at least %s seconds between forum
posts."';
$LANG_GF01['ACCESSERROR'] = 'ACCESS ERROR';
$LANG_GF01['LEGEND'] = 'Legend';
$LANG_GF01['ACTIONS'] = 'Actions';
@@ -297,26 +301,26 @@
$LANG_GF02['msg01'] = 'Sorry you must register to use these forums';
-$LANG_GF02['msg02'] = 'You should not be here!<br>Restricted access to
this forum only';
+$LANG_GF02['msg02'] = 'You should not be here!<br' .
XHTML . '>Restricted access to this forum only';
$LANG_GF02['msg03'] = '';
$LANG_GF02['msg04'] = '';
-$LANG_GF02['msg05'] = '<CENTER><I>Sorry, no topics have been created
yet.</CENTER></I>';
+$LANG_GF02['msg05'] = '<center><em>Sorry, no topics have been created
yet.</em></center>';
$LANG_GF02['msg06'] = ' new posts since your last visit';
$LANG_GF02['msg07'] = 'Online Users:';
-$LANG_GF02['msg08'] = '<br><B>Total Registered Users to Date:</B> %s';
-$LANG_GF02['msg09'] = '<br><B>Total Posts to Date:</B> %s <br>';
-$LANG_GF02['msg10'] = '<B>Total Topics to Date:</B> %s <br>';
+$LANG_GF02['msg08'] = '<br' . XHTML . '><b>Total Registered Users to
Date:</b> %s';
+$LANG_GF02['msg09'] = '<br' . XHTML . '><b>Total Posts to Date:</b> %s
<br' . XHTML . '>';
+$LANG_GF02['msg10'] = '<b>Total Topics to Date:</b> %s <br' .
XHTML . '>';
$LANG_GF02['msg11'] = 'Back to Forum Index';
$LANG_GF02['msg12'] = 'Back to Main Homepage';
$LANG_GF02['msg13'] = 'Registration Required, you currently must
register or login to use this feature.';
-$LANG_GF02['msg14'] = 'Sorry, You have been banned from making
entries.<br>';
-$LANG_GF02['msg15'] = 'If you feel this is an error, contact <A
HREF="mailto:%s?subject=Forum IP Ban">Site Admin</A>.';
+$LANG_GF02['msg14'] = 'Sorry, You have been banned from making
entries.<br' . XHTML . '>';
+$LANG_GF02['msg15'] = 'If you feel this is an error, contact <a
href="mailto:%s?subject=Forum IP Ban">Site Admin</a>.';
$LANG_GF02['msg16'] = 'These are the most popular posts, you may order
them by views or replies.';
$LANG_GF02['msg17'] = 'Message Edited, Your message has been edited
sucessfully. Returning to your message.';
$LANG_GF02['msg18'] = 'Error! Not all required fields were completed or
were too short in length.';
$LANG_GF02['msg19'] = 'Your message has been posted.';
$LANG_GF02['msg20'] = 'Reply Added, Your reply has been posted.
Returning to Forum';
-$LANG_GF02['msg21'] = 'Sorry, you are unauthorized to do this. Please
<a href="javascript:history.back()">Go Back</a> or <a
href="%s/users.php?mode=login">Login</a><br><br>';
+$LANG_GF02['msg21'] = 'Sorry, you are unauthorized to do this. Please
<a href="javascript:history.back()">Go Back</a> or <a
href="%s/users.php?mode=login">Login</a><br' . XHTML . '><br' . XHTML . '>';
$LANG_GF02['msg22'] = '- Forum Post Notification';
$LANG_GF02['msg23a'] = "A reply has been made to the thread '%s'
by %s.\n\nThis topic was started by %s in the %s forum. ";
$LANG_GF02['msg23b'] = "A new topic '%s' has been posted by %s in the %s
forum on the %s website. You may view it
at:\n%s/forum/viewtopic.php?showtopic=%s\n";
@@ -336,19 +340,19 @@
$LANG_GF02['msg36'] = 'Mood:';
$LANG_GF02['msg37'] = 'Message:';
$LANG_GF02['msg38'] = 'Notify me of replies ';
-$LANG_GF02['msg39'] = '<br>There are no topic reviews for this new
topic.';
-$LANG_GF02['msg40'] = '<br>Sorry, but you have already asked to be
notified of replies to this topic.<br><br>';
-$LANG_GF02['msg41'] = '<br>Thank you! You will now be notified of
replies to topic %s .<br><br>';
+$LANG_GF02['msg39'] = '<br' . XHTML . '>There are no topic reviews for
this new topic.';
+$LANG_GF02['msg40'] = '<br' . XHTML . '>Sorry, but you have already
asked to be notified of replies to this topic.<br' . XHTML . '><br' .
XHTML . '>';
+$LANG_GF02['msg41'] = '<br' . XHTML . '>Thank you! You will now be
notified of replies to topic %s .<br' . XHTML . '><br' . XHTML . '>';
$LANG_GF02['msg42'] = 'Thank you! You have now deleted notifications on
this topic.';
$LANG_GF02['msg43'] = 'Are you sure you want to delete this
notification?.';
$LANG_GF02['msg44'] = '<p style="margin:0px; padding:5px;">You have no
notifications currently.</p>';
$LANG_GF02['msg45'] = 'Search the Forum';
$LANG_GF02['msg46'] = 'You can search the forum by entering keywords:';
$LANG_GF02['msg47'] = 'You can also specify an author to search under:';
-$LANG_GF02['msg48'] = '<br>The Chatterblock Plugin needs to be
installed first.';
+$LANG_GF02['msg48'] = '<br' . XHTML . '>The Chatterblock Plugin needs
to be installed first.';
$LANG_GF02['msg49'] = '(Read %s times) ';
$LANG_GF02['msg50'] = 'Signature n/a';
-$LANG_GF02['msg51'] = "%s\n\n<br>[Edited at %s by %s]";
+$LANG_GF02['msg51'] = "%s\n\n<br" . XHTML . ">[Edited at %s by %s]";
$LANG_GF02['msg52'] = 'Confirmed:';
$LANG_GF02['msg53'] = 'Returning to topic..';
$LANG_GF02['msg54'] = 'Post Edited.';
@@ -362,26 +366,26 @@
$LANG_GF02['msg62'] = 'Notify me of replies';
$LANG_GF02['msg63'] = 'Profile';
$LANG_GF02['msg64'] = 'Are you sure you want to delete topic %s
titled: %s ?';
-$LANG_GF02['msg65'] = '<br>This is a parent topic, so all replies
posted to it will also be deleted.';
+$LANG_GF02['msg65'] = '<br' . XHTML . '>This is a parent topic, so all
replies posted to it will also be deleted.';
$LANG_GF02['msg66'] = 'Confirm Delete Post';
$LANG_GF02['msg67'] = 'Edit Forum Post';
$LANG_GF02['msg68'] = 'Note: BE CAREFUL WHEN YOU BAN, only admins have
the rights to unban someone.';
$LANG_GF02['msg69'] = 'Do you really want to ban the ip address: %s?';
$LANG_GF02['msg70'] = 'Confirm Ban';
-$LANG_GF02['msg71'] = 'No function selected, choose a post and then a
moderator function.<br>Note: You must be a moderator to perform these
functions.';
+$LANG_GF02['msg71'] = 'No function selected, choose a post and then a
moderator function.<br' . XHTML . '>Note: You must be a moderator to
perform these functions.';
$LANG_GF02['msg72'] = 'Warning, you do not have rights to perform this
moderation function.';
$LANG_GF02['msg74'] = 'Latest %s Forum Posts';
$LANG_GF02['msg75'] = 'Top %s Topics By Views';
$LANG_GF02['msg76'] = 'Top %s Topics By Posts';
-$LANG_GF02['msg77'] = '<br><p style="padding-left:10px;">You should not
be here!<br>Restricted access to this forum only.<p />';
-$LANG_GF02['msg78'] = '<br>You should not be here!<br>Invalid Forum.';
+$LANG_GF02['msg77'] = '<br' . XHTML . '><p
style="padding-left:10px;">You should not be here!<br' .
XHTML . '>Restricted access to this forum only.</p>';
+$LANG_GF02['msg78'] = '<br' . XHTML . '>You should not be here!<br' .
XHTML . '>Invalid Forum.';
$LANG_GF02['msg81'] = '- Topic Edit Notification';
-$LANG_GF02['msg82'] = '<p>Your message "%s" has been edited by the
moderator %s.<p>';
-$LANG_GF02['msg83'] = '<br><br>You need to be signed in to use this
forum feature.<p />';
+$LANG_GF02['msg82'] = '<p>Your message "%s" has been edited by the
moderator %s.</p>';
+$LANG_GF02['msg83'] = '<br' . XHTML . '><br' . XHTML . '><p>You need to
be signed in to use this forum feature.</p>';
$LANG_GF02['msg84'] = 'Mark all topics read';
$LANG_GF02['msg85'] = 'Page:';
$LANG_GF02['msg86'] = ' Last %s posts ';
-$LANG_GF02['msg87'] = '<br>Warning: This topic has been locked by the
moderator.<br>No additional posts are permitted';
+$LANG_GF02['msg87'] = '<br' . XHTML . '>Warning: This topic has been
locked by the moderator.<br' . XHTML . '>No additional posts are permitted';
$LANG_GF02['msg88'] = 'Site Members';
$LANG_GF02['msg88b'] = 'Forum Activity Only';
$LANG_GF02['msg89'] = 'My Enabled Notifications';
@@ -407,17 +411,17 @@
$LANG_GF02['msg119'] = 'Forum Search results for the query:';
$LANG_GF02['msg120'] = 'Most popular posts by';
$LANG_GF02['msg121'] = 'All times are %s. The time is now %s.';
-$LANG_GF02['msg122'] = 'Popular Limit:';
+$LANG_GF02['msg122'] = 'Popular Limit';
$LANG_GF02['msg123'] = 'Number of posts before calling a topic popular';
$LANG_GF02['msg124'] = 'Messages Per Page:';
$LANG_GF02['msg125'] = 'Moderator Only: Messages Listing screen';
-$LANG_GF02['msg126'] = 'Search Lines:';
+$LANG_GF02['msg126'] = 'Search Lines';
$LANG_GF02['msg127'] = 'Number of lines to display in search results';
-$LANG_GF02['msg128'] = 'Members Per Page:';
+$LANG_GF02['msg128'] = 'Members Per Page';
$LANG_GF02['msg129'] = 'For the Members listing screen';
-$LANG_GF02['msg130'] = 'View Anonymous Posts:';
+$LANG_GF02['msg130'] = 'View Anonymous Posts';
$LANG_GF02['msg131'] = 'Setting of No will filter out anonymous posts';
-$LANG_GF02['msg132'] = 'Always Notify:';
+$LANG_GF02['msg132'] = 'Always Notify';
$LANG_GF02['msg133'] = 'Setting of Yes will enable auto notifcation for
any topics you create or reply';
$LANG_GF02['msg134'] = 'Subscription Added';
$LANG_GF02['msg135'] = 'You will now be notified of all posts to this
forum.';
@@ -447,10 +451,10 @@
$LANG_GF02['msg159'] = 'Are you sure you want to DELETE these selected
Moderator records?';
$LANG_GF02['msg160'] = 'View last page of topic';
$LANG_GF02['msg161'] = 'Return to members list';
-$LANG_GF02['msg162'] = 'To return to the forum index now click <a
href="%s">here</a><br><p />Default is to return automatically to view your
post.<br>If you do not wish to wait, click <a href="%s">here</a> now.';
+$LANG_GF02['msg162'] = 'To return to the forum index now click <a
href="%s">here</a><br' . XHTML . '>Default is to return automatically to
view your post.<br' . XHTML . '>If you do not wish to wait, click <a
href="%s">here</a> now.';
$LANG_GF02['msg163'] = 'Post moved';
$LANG_GF02['msg164'] = 'Mark all Categories and Topics Read';
-$LANG_GF02['msg165'] = 'ERROR<p />Matching <b>QUOTE</b> tag missing.
Unable to format message.<p />';
+$LANG_GF02['msg165'] = '<p>ERROR: Matching <b>QUOTE</b> tag missing.
Unable to format message.</p>';
$LANG_GF02['msg166'] = 'ERROR: Invalid topic or Topic not found';
$LANG_GF02['msg167'] = 'Notification Option';
$LANG_GF02['msg168'] = 'Setting of No will disable email notifictions';
@@ -487,7 +491,7 @@
$LANG_GF02['msg199'] = 'View or remove forum notifications';
$LANG_GF02['msg200'] = 'Site members report';
$LANG_GF02['msg201'] = 'Popular topics';
-$LANG_GF02['msg202'] = 'No new posts';
+$LANG_GF02['msg202'] = 'No new posts';
$LANG_GF02['msg300'] = 'Your preferences have block anonymous posts
enabled';
@@ -508,8 +512,8 @@
'stick' => 'Make Sticky',
'unstick' => 'Un-Stick',
'movetopic' => 'Move Topic',
- 'movetopicmsg' => '<br>Topic to be moved: "<b>%s</b>"',
- 'splittopicmsg' => '<br>Create a new Topic with this
post: "<b>%s</b>"<br><em>By:</em> %s  <em>On:</em> %s',
+ 'movetopicmsg' => '<br' . XHTML . '>Topic to be
moved: "<b>%s</b>"',
+ 'splittopicmsg' => '<br' . XHTML . '>Create a new Topic with this
post: "<b>%s</b>"<br' . XHTML . '><em>By:</em> %s 
<em>On:</em> %s',
'selectforum' => 'Select new forum:',
'lockedpost' => 'Add Reply Post',
'splitheading' => 'Split thread option:',
@@ -659,7 +663,7 @@
'allownotify' => 'Allow Notification',
'allownotifydscp' => 'Do you want to allow people to be notified?',
'defaultmode' => 'Default Post Mode',
- 'defaultmodedscp' => 'Enable HTML Mode as default - set to
Yes.<br>Enable Text mode as default (safest) - set to No',
+ 'defaultmodedscp' => 'Enable HTML Mode as default - set to
Yes.<br' . XHTML . '>Enable Text mode as default (safest) - set to No',
'cbsettings' => 'Centerblock Settings',
'cbenable' => 'Enable Centerblock',
'cbenabledscp' => '',
@@ -756,7 +760,7 @@
'ModBan' => 'Ban',
'addmoderator' => "Add Record",
'delmoderator' => " Delete\nSelected",
- 'moderatorwarning' => '<b>Warning: No Forums
Defined</b><br><br>Setup Forum Categories and Add at least 1
forum<br>before attempting to add Modertators',
+ 'moderatorwarning' => '<b>Warning: No Forums Defined</b><br' .
XHTML . '><br' . XHTML . '>Setup Forum Categories and Add at least 1
forum<br' . XHTML . '>before attempting to add Modertators',
'private' => 'Private Forum',
'filtertitle' => 'Select Moderator records to view',
'addmessage' => 'Add new Moderator',
Modified: trunk/plugins/forum/language/german.php
==============================================================================
--- trunk/plugins/forum/language/german.php (original)
+++ trunk/plugins/forum/language/german.php Sat Feb 7 22:41:45 2009
@@ -1,5 +1,4 @@
<?php
-
/* Reminder: always indent with 4 spaces (no tabs). */
//
+---------------------------------------------------------------------------+
// | Geeklog Forums Plugin 2.0 for Geeklog - The Ultimate
Weblog |
@@ -35,6 +34,10 @@
//
+---------------------------------------------------------------------------+
//
+if (!defined('XHTML')) {
+ define('XHTML', '');
+}
+
$LANG_GF00 = array (
'admin_only' => 'Sorry Admins Only. If you are an Admin please
login first.',
'plugin' => 'Plugin',
@@ -51,7 +54,7 @@
'access_denied_msg' => 'Only Root Users have Access to this Page.
Your user name and IP have been recorded.',
'admin' => 'Plugin Admin',
'install_header' => 'Install/Uninstall Plugin',
- 'installed' => 'The Plugin and Block are now
installed,<p><i>Enjoy,<br><a
href="MAILTO:langm****@sympa*****">Blaine</a></i>',
+ 'installed' => 'The Plugin and Block are now
installed,<p><i>Enjoy,<br' . XHTML . '><a
href="MAILTO:langm****@sympa*****">Blaine</a></i>',
'uninstalled' => 'The Plugin is Not Installed',
'install_success' => 'Installation Successful<p><b>Next Steps</b>:
<ol><li>Use the Forum Admin to configure your new forum
@@ -63,7 +66,7 @@
'uninstall_msg' => 'Plugin Successfully Uninstalled',
'install' => 'Install',
'uninstall' => 'UnInstall',
- 'enabled' => '<br>Plugin is installed and
enabled.<br>Disable first if you want to De-Install it.<p>',
+ 'enabled' => '<br' . XHTML . '>Plugin is installed and
enabled.<br' . XHTML . '>Disable first if you want to De-Install it.<p>',
'warning' => 'Forum De-Install Warning',
'uploaderr' => 'File Upload Error'
);
@@ -182,9 +185,9 @@
$LANG_GF01['back2parent'] = 'Parent Topic';
$LANG_GF01['forumname'] = ''; // Enter name here if you want it to
show in the footer of the admin screens
$LANG_GF01['category'] = 'Kategory: ';
-$LANG_GF01['loginreqview'] = '<B>Sorry you must %s register</A> or %s
login </A> to use these forums</B>';
-$LANG_GF01['loginreqpost'] = '<B>Sorry you must register or login to
post on these forums</B>';
-$LANG_GF01['searchresults'] = '<b>�</b> Your search for <b>%s</b> %s
author returned <b>%s</b> results:</b><br><br>';
+$LANG_GF01['loginreqview'] = '<b>Sorry you must %s register</a> or %s
login </a> to use these forums</b>';
+$LANG_GF01['loginreqpost'] = '<b>Sorry you must register or login to
post on these forums</b>';
+$LANG_GF01['searchresults'] = '<b>�</b> Your search for <b>%s</b> %s
author returned <b>%s</b> results:</b><br' . XHTML . '><br' . XHTML . '>';
$LANG_GF01['feature_not_on'] = 'Feature not enabled';
$LANG_GF01['nolastpostmsg'] = 'n/v';
$LANG_GF01['no_one'] = 'No one.';
@@ -196,7 +199,7 @@
$LANG_GF01['DELOLDER_PM'] = 'Delete older';
$LANG_GF01['members'] = 'Mitglieder';
$LANG_GF01['save_sucess'] = 'Save Sucessful';
-$LANG_GF01['trademark'] = '<BR><CENTER><B>Geeklog Forum Project
version 2.0</B> © 2002</B></CENTER>';
+$LANG_GF01['trademark'] = '<br' . XHTML . '><center><b>Geeklog Forum
Project version 2.0</b> © 2002</b></center>';
$LANG_GF01['back2top'] = 'Back to top';
$LANG_GF01['POSTMODE'] = 'Post Mode:';
$LANG_GF01['TEXTMODE'] = 'Text-Modus';
@@ -235,7 +238,7 @@
$LANG_GF01['PRINTABLE'] = 'Druckf�hige Version';
$LANG_GF01['ForumProfile'] = 'Forum-Optionen';
$LANG_GF01['USERPREFS'] = 'Forum-Einstellungen';
-$LANG_GF01['SPEEDLIMIT'] = '"Your last comment was %s seconds
ago.<br>This site requires at least %s seconds between forum posts."';
+$LANG_GF01['SPEEDLIMIT'] = '"Your last comment was %s seconds
ago.<br' . XHTML . '>This site requires at least %s seconds between forum
posts."';
$LANG_GF01['ACCESSERROR'] = 'ACCESS ERROR';
$LANG_GF01['LEGEND'] = 'Legende';
$LANG_GF01['ACTIONS'] = 'Aktionen';
@@ -298,26 +301,26 @@
$LANG_GF02['msg01'] = 'Sorry you must register to use these forums';
-$LANG_GF02['msg02'] = 'You should not be here!<br>Restricted access to
this forum only';
+$LANG_GF02['msg02'] = 'You should not be here!<br' .
XHTML . '>Restricted access to this forum only';
$LANG_GF02['msg03'] = '';
$LANG_GF02['msg04'] = '';
-$LANG_GF02['msg05'] = '<CENTER><I>Sorry, no topics have been created
yet.</CENTER></I>';
+$LANG_GF02['msg05'] = '<center><em>Sorry, no topics have been created
yet.</em></center>';
$LANG_GF02['msg06'] = ' new posts since your last visit';
$LANG_GF02['msg07'] = 'Wer ist online?';
-$LANG_GF02['msg08'] = '<br><B>Total Registered Users to Date:</B> %s';
-$LANG_GF02['msg09'] = '<br><B>Total Posts to Date:</B> %s <br>';
-$LANG_GF02['msg10'] = '<B>Total Topics to Date:</B> %s <br>';
+$LANG_GF02['msg08'] = '<br' . XHTML . '><b>Total Registered Users to
Date:</b> %s';
+$LANG_GF02['msg09'] = '<br' . XHTML . '><b>Total Posts to Date:</b> %s
<br' . XHTML . '>';
+$LANG_GF02['msg10'] = '<b>Total Topics to Date:</b> %s <br' .
XHTML . '>';
$LANG_GF02['msg11'] = 'Back to Forum Index';
$LANG_GF02['msg12'] = 'Back to Main Homepage';
$LANG_GF02['msg13'] = 'Registration Required, you currently must
register or login to use this feature.';
-$LANG_GF02['msg14'] = 'Sorry, You have been banned from making
entries.<br>';
-$LANG_GF02['msg15'] = 'If you feel this is an error, contact <A
HREF="mailto:%s?subject=Forum IP Ban">Site Admin</A>.';
+$LANG_GF02['msg14'] = 'Sorry, You have been banned from making
entries.<br' . XHTML . '>';
+$LANG_GF02['msg15'] = 'If you feel this is an error, contact <a
href="mailto:%s?subject=Forum IP Ban">Site Admin</a>.';
$LANG_GF02['msg16'] = 'These are the most popular posts, you may order
them by views or replies.';
$LANG_GF02['msg17'] = 'Message Edited, Your message has been edited
sucessfully. Returning to your message.';
$LANG_GF02['msg18'] = 'Fehler! Es wurden nicht alle ben�tigten Felder
ausgef�llt oder die Eintr�ge waren zu kurz.';
$LANG_GF02['msg19'] = 'Dein Beitrag wurde ver�ffentlicht.';
$LANG_GF02['msg20'] = 'Reply Added, Your reply has been posted.
Returning to Forum';
-$LANG_GF02['msg21'] = 'Sorry, you are unauthorized to do this. Please
<a href="javascript:history.back()">Go Back</a> or <a
href="%s/users.php?mode=login">Login</a><br><br>';
+$LANG_GF02['msg21'] = 'Sorry, you are unauthorized to do this. Please
<a href="javascript:history.back()">Go Back</a> or <a
href="%s/users.php?mode=login">Login</a><br' . XHTML . '><br' . XHTML . '>';
$LANG_GF02['msg22'] = '- Neuer Beitrag im Forum';
$LANG_GF02['msg23a'] = "Zum Thema '%s' hat %s eine Antwort
geschrieben.\n\nDas Thema wurde von %s im %s-Forum begonnen. ";
$LANG_GF02['msg23b'] = "Ein neues Thema, '%s', wurde von %s im %s-Forum
auf der %s-Website begonnen. Du kannst den Beitrag hier
lesen:\n%s/forum/viewtopic.php?showtopic=%s\n";
@@ -337,19 +340,19 @@
$LANG_GF02['msg36'] = 'Stimmung:';
$LANG_GF02['msg37'] = 'Message:';
$LANG_GF02['msg38'] = 'Bei Antworten benachrichtigen ';
-$LANG_GF02['msg39'] = '<br>There are no topic reviews for this new
topic.';
-$LANG_GF02['msg40'] = '<br>Sorry, but you have already asked to be
notified of replies to this topic.<br><br>';
-$LANG_GF02['msg41'] = '<br>Thank you! You will now be notified of
replies to topic %s .<br><br>';
+$LANG_GF02['msg39'] = '<br' . XHTML . '>There are no topic reviews for
this new topic.';
+$LANG_GF02['msg40'] = '<br' . XHTML . '>Sorry, but you have already
asked to be notified of replies to this topic.<br' . XHTML . '><br' .
XHTML . '>';
+$LANG_GF02['msg41'] = '<br' . XHTML . '>Thank you! You will now be
notified of replies to topic %s .<br' . XHTML . '><br' . XHTML . '>';
$LANG_GF02['msg42'] = 'Thank you! You have now deleted notifications on
this topic.';
$LANG_GF02['msg43'] = 'Are you sure you want to delete this
notification?.';
$LANG_GF02['msg44'] = '<p style="margin:0px; padding:5px;">Du hast
keine Benachrichtigungen aktiviert.</p>';
$LANG_GF02['msg45'] = 'Search the Forum';
$LANG_GF02['msg46'] = 'You can search the forum by entering keywords:';
$LANG_GF02['msg47'] = 'You can also specify an author to search under:';
-$LANG_GF02['msg48'] = '<br>The Chatterblock Plugin needs to be
installed first.';
+$LANG_GF02['msg48'] = '<br' . XHTML . '>The Chatterblock Plugin needs
to be installed first.';
$LANG_GF02['msg49'] = '(%s Mal gelesen) ';
$LANG_GF02['msg50'] = 'Signatur n/v';
-$LANG_GF02['msg51'] = "%s\n\n<br>[Edited at %s by %s]";
+$LANG_GF02['msg51'] = "%s\n\n<br" . XHTML . ">[Edited at %s by %s]";
$LANG_GF02['msg52'] = 'Confirmed:';
$LANG_GF02['msg53'] = 'Returning to topic..';
$LANG_GF02['msg54'] = 'Post Edited.';
@@ -363,26 +366,26 @@
$LANG_GF02['msg62'] = 'Benachrichtigung bei neuen Beitr�gen';
$LANG_GF02['msg63'] = 'Profil';
$LANG_GF02['msg64'] = 'Are you sure you want to delete topic %s
titled: %s ?';
-$LANG_GF02['msg65'] = '<br>This is a parent topic, so all replies
posted to it will also be deleted.';
+$LANG_GF02['msg65'] = '<br' . XHTML . '>This is a parent topic, so all
replies posted to it will also be deleted.';
$LANG_GF02['msg66'] = 'Confirm Delete Post';
$LANG_GF02['msg67'] = 'Edit Forum Post';
$LANG_GF02['msg68'] = 'Note: BE CAREFUL WHEN YOU BAN, only admins have
the rights to unban someone.';
$LANG_GF02['msg69'] = 'Do you really want to ban the ip address: %s?';
$LANG_GF02['msg70'] = 'Confirm Ban';
-$LANG_GF02['msg71'] = 'No function selected, choose a post and then a
moderator function.<br>Note: You must be a moderator to perform these
functions.';
+$LANG_GF02['msg71'] = 'No function selected, choose a post and then a
moderator function.<br' . XHTML . '>Note: You must be a moderator to
perform these functions.';
$LANG_GF02['msg72'] = 'Warning, you do not have rights to perform this
moderation function.';
$LANG_GF02['msg74'] = 'Latest %s Forum Posts';
$LANG_GF02['msg75'] = 'Top %s Topics By Views';
$LANG_GF02['msg76'] = 'Top %s Topics By Posts';
-$LANG_GF02['msg77'] = '<br><p style="padding-left:10px;">You should not
be here!<br>Restricted access to this forum only.<p />';
-$LANG_GF02['msg78'] = '<br>You should not be here!<br>Invalid Forum.';
+$LANG_GF02['msg77'] = '<br' . XHTML . '><p
style="padding-left:10px;">You should not be here!<br' .
XHTML . '>Restricted access to this forum only.</p>';
+$LANG_GF02['msg78'] = '<br' . XHTML . '>You should not be here!<br' .
XHTML . '>Invalid Forum.';
$LANG_GF02['msg81'] = '- Topic Edit Notification';
-$LANG_GF02['msg82'] = '<p>Your message "%s" has been edited by the
moderator %s.<p>';
-$LANG_GF02['msg83'] = '<br><br>You need to be signed in to use this
forum feature.<p />';
+$LANG_GF02['msg82'] = '<p>Your message "%s" has been edited by the
moderator %s.</p>';
+$LANG_GF02['msg83'] = '<br' . XHTML . '><br' . XHTML . '><p>You need to
be signed in to use this forum feature.</p>';
$LANG_GF02['msg84'] = 'Alle Themen als gelesen markieren';
$LANG_GF02['msg85'] = 'Seite:';
$LANG_GF02['msg86'] = ' Letzte %s Beitr�ge ';
-$LANG_GF02['msg87'] = '<br>Warning: This topic has been locked by the
moderator.<br>No additional posts are permitted';
+$LANG_GF02['msg87'] = '<br' . XHTML . '>Warning: This topic has been
locked by the moderator.<br' . XHTML . '>No additional posts are permitted';
$LANG_GF02['msg88'] = 'Mitglieder';
$LANG_GF02['msg88b'] = 'Nur im Forum aktive Mitglieder';
$LANG_GF02['msg89'] = 'Meine Benachrichtigungen';
@@ -448,10 +451,10 @@
$LANG_GF02['msg159'] = 'Are you sure you want to DELETE these selected
Moderator records?';
$LANG_GF02['msg160'] = 'View last page of topic';
$LANG_GF02['msg161'] = 'Return to members list';
-$LANG_GF02['msg162'] = 'To return to the forum index now click <a
href="%s">here</a><br><p />Default is to return automatically to view your
post.<br>If you do not wish to wait, click <a href="%s">here</a> now.';
+$LANG_GF02['msg162'] = 'To return to the forum index now click <a
href="%s">here</a><br' . XHTML . '>Default is to return automatically to
view your post.<br' . XHTML . '>If you do not wish to wait, click <a
href="%s">here</a> now.';
$LANG_GF02['msg163'] = 'Post moved';
$LANG_GF02['msg164'] = 'Mark all Categories and Topics Read';
-$LANG_GF02['msg165'] = 'ERROR<p />Matching <b>QUOTE</b> tag missing.
Unable to format message.<p />';
+$LANG_GF02['msg165'] = '<p>ERROR: Matching <b>QUOTE</b> tag missing.
Unable to format message.</p>';
$LANG_GF02['msg166'] = 'ERROR: Invalid topic or Topic not found';
$LANG_GF02['msg167'] = 'Notification Option';
$LANG_GF02['msg168'] = 'Setting of No will disable email notifictions';
@@ -509,8 +512,8 @@
'stick' => 'Wichtiges Thema',
'unstick' => 'Normales Thema',
'movetopic' => 'Thema verschieben',
- 'movetopicmsg' => '<br>Topic to be moved: "<b>%s</b>"',
- 'splittopicmsg' => '<br>Create a new Topic with this
post: "<b>%s</b>"<br><em>By:</em> %s  <em>On:</em> %s',
+ 'movetopicmsg' => '<br' . XHTML . '>Topic to be
moved: "<b>%s</b>"',
+ 'splittopicmsg' => '<br' . XHTML . '>Create a new Topic with this
post: "<b>%s</b>"<br' . XHTML . '><em>By:</em> %s 
<em>On:</em> %s',
'selectforum' => 'Select new forum:',
'lockedpost' => 'Add Reply Post',
'splitheading' => 'Split thread option:',
@@ -660,7 +663,7 @@
'allownotify' => 'Allow Notification',
'allownotifydscp' => 'Do you want to allow people to be notified?',
'defaultmode' => 'Default Post Mode',
- 'defaultmodedscp' => 'Enable HTML Mode as default - set to
Yes.<br>Enable Text mode as default (safest) - set to No',
+ 'defaultmodedscp' => 'Enable HTML Mode as default - set to
Yes.<br' . XHTML . '>Enable Text mode as default (safest) - set to No',
'cbsettings' => 'Centerblock Settings',
'cbenable' => 'Enable Centerblock',
'cbenabledscp' => '',
@@ -758,7 +761,7 @@
'ModBan' => 'Ban',
'addmoderator' => "Add Record",
'delmoderator' => " Delete\nSelected",
- 'moderatorwarning' => '<b>Warning: No Forums
Defined</b><br><br>Setup Forum Categories and Add at least 1
forum<br>before attempting to add Modertators',
+ 'moderatorwarning' => '<b>Warning: No Forums Defined</b><br' .
XHTML . '><br' . XHTML . '>Setup Forum Categories and Add at least 1
forum<br' . XHTML . '>before attempting to add Modertators',
'private' => 'Private Forum',
'filtertitle' => 'Select Moderator records to view',
'addmessage' => 'Add new Moderator',
Modified: trunk/plugins/forum/language/german_utf-8.php
==============================================================================
--- trunk/plugins/forum/language/german_utf-8.php (original)
+++ trunk/plugins/forum/language/german_utf-8.php Sat Feb 7 22:41:45 2009
@@ -51,7 +51,7 @@
'access_denied_msg' => 'Only Root Users have Access to this Page.
Your user name and IP have been recorded.',
'admin' => 'Plugin Admin',
'install_header' => 'Install/Uninstall Plugin',
- 'installed' => 'The Plugin and Block are now
installed,<p><i>Enjoy,<br><a
href="MAILTO:langm****@sympa*****">Blaine</a></i>',
+ 'installed' => 'The Plugin and Block are now
installed,<p><em>Enjoy,<br' . XHTML . '><a
href="MAILTO:langm****@sympa*****">Blaine</a></em>',
'uninstalled' => 'The Plugin is Not Installed',
'install_success' => 'Installation Successful<p><b>Next Steps</b>:
<ol><li>Use the Forum Admin to configure your new forum
@@ -63,7 +63,7 @@
'uninstall_msg' => 'Plugin Successfully Uninstalled',
'install' => 'Install',
'uninstall' => 'UnInstall',
- 'enabled' => '<br>Plugin is installed and
enabled.<br>Disable first if you want to De-Install it.<p>',
+ 'enabled' => '<br' . XHTML . '>Plugin is installed and
enabled.<br' . XHTML . '>Disable first if you want to De-Install it.<p>',
'warning' => 'Forum De-Install Warning',
'uploaderr' => 'File Upload Error'
);
@@ -182,9 +182,9 @@
$LANG_GF01['back2parent'] = 'Parent Topic';
$LANG_GF01['forumname'] = ''; // Enter name here if you want it to
show in the footer of the admin screens
$LANG_GF01['category'] = 'Kategory: ';
-$LANG_GF01['loginreqview'] = '<B>Sorry you must %s register</A> or %s
login </A> to use these forums</B>';
-$LANG_GF01['loginreqpost'] = '<B>Sorry you must register or login to
post on these forums</B>';
-$LANG_GF01['searchresults'] = '<b>ｻ</b> Your search for <b>%s</b> %s
author returned <b>%s</b> results:</b><br><br>';
+$LANG_GF01['loginreqview'] = '<b>Sorry you must %s register</a> or %s
login </a> to use these forums</b>';
+$LANG_GF01['loginreqpost'] = '<b>Sorry you must register or login to
post on these forums</b>';
+$LANG_GF01['searchresults'] = '<b>ｻ</b> Your search for <b>%s</b> %s
author returned <b>%s</b> results:</b><br' . XHTML . '><br' . XHTML . '>';
$LANG_GF01['feature_not_on'] = 'Feature not enabled';
$LANG_GF01['nolastpostmsg'] = 'n/v';
$LANG_GF01['no_one'] = 'No one.';
@@ -196,7 +196,7 @@
$LANG_GF01['DELOLDER_PM'] = 'Delete older';
$LANG_GF01['members'] = 'Mitglieder';
$LANG_GF01['save_sucess'] = 'Save Sucessful';
-$LANG_GF01['trademark'] = '<BR><CENTER><B>Geeklog Forum Project
version 2.0</B> © 2002</B></CENTER>';
+$LANG_GF01['trademark'] = '<br' . XHTML . '><center><b>Geeklog Forum
Project version 2.0</b> © 2002</b></center>';
$LANG_GF01['back2top'] = 'Back to top';
$LANG_GF01['POSTMODE'] = 'Post Mode:';
$LANG_GF01['TEXTMODE'] = 'Text-Modus';
@@ -236,7 +236,7 @@
$LANG_GF01['PRINTABLE'] = 'Druckf臧ige Version';
$LANG_GF01['ForumProfile'] = 'Forum-Optionen';
$LANG_GF01['USERPREFS'] = 'Forum-Einstellungen';
-$LANG_GF01['SPEEDLIMIT'] = '"Your last comment was %s seconds
ago.<br>This site requires at least %s seconds between forum posts."';
+$LANG_GF01['SPEEDLIMIT'] = '"Your last comment was %s seconds
ago.<br' . XHTML . '>This site requires at least %s seconds between forum
posts."';
$LANG_GF01['ACCESSERROR'] = 'ACCESS ERROR';
$LANG_GF01['LEGEND'] = 'Legende';
$LANG_GF01['ACTIONS'] = 'Aktionen';
@@ -299,26 +299,26 @@
$LANG_GF02['msg01'] = 'Sorry you must register to use these forums';
-$LANG_GF02['msg02'] = 'You should not be here!<br>Restricted access to
this forum only';
+$LANG_GF02['msg02'] = 'You should not be here!<br' .
XHTML . '>Restricted access to this forum only';
$LANG_GF02['msg03'] = '';
$LANG_GF02['msg04'] = '';
-$LANG_GF02['msg05'] = '<CENTER><I>Sorry, no topics have been created
yet.</CENTER></I>';
+$LANG_GF02['msg05'] = '<center><em>Sorry, no topics have been created
yet.</em></center>';
$LANG_GF02['msg06'] = ' new posts since your last visit';
$LANG_GF02['msg07'] = 'Wer ist online?';
-$LANG_GF02['msg08'] = '<br><B>Total Registered Users to Date:</B> %s';
-$LANG_GF02['msg09'] = '<br><B>Total Posts to Date:</B> %s <br>';
-$LANG_GF02['msg10'] = '<B>Total Topics to Date:</B> %s <br>';
+$LANG_GF02['msg08'] = '<br' . XHTML . '><b>Total Registered Users to
Date:</b> %s';
+$LANG_GF02['msg09'] = '<br' . XHTML . '><b>Total Posts to Date:</b> %s
<br' . XHTML . '>';
+$LANG_GF02['msg10'] = '<b>Total Topics to Date:</b> %s <br' .
XHTML . '>';
$LANG_GF02['msg11'] = 'Back to Forum Index';
$LANG_GF02['msg12'] = 'Back to Main Homepage';
$LANG_GF02['msg13'] = 'Registration Required, you currently must
register or login to use this feature.';
-$LANG_GF02['msg14'] = 'Sorry, You have been banned from making
entries.<br>';
-$LANG_GF02['msg15'] = 'If you feel this is an error, contact <A
HREF="mailto:%s?subject=Forum IP Ban">Site Admin</A>.';
+$LANG_GF02['msg14'] = 'Sorry, You have been banned from making
entries.<br' . XHTML . '>';
+$LANG_GF02['msg15'] = 'If you feel this is an error, contact <a
href="mailto:%s?subject=Forum IP Ban">Site Admin</a>.';
$LANG_GF02['msg16'] = 'These are the most popular posts, you may order
them by views or replies.';
$LANG_GF02['msg17'] = 'Message Edited, Your message has been edited
sucessfully. Returning to your message.';
$LANG_GF02['msg18'] = 'Fehler! Es wurden nicht alle benigten Felder
ausgef・lt oder die Eintr臠e waren zu kurz.';
$LANG_GF02['msg19'] = 'Dein Beitrag wurde verfentlicht.';
$LANG_GF02['msg20'] = 'Reply Added, Your reply has been posted.
Returning to Forum';
-$LANG_GF02['msg21'] = 'Sorry, you are unauthorized to do this. Please
<a href="javascript:history.back()">Go Back</a> or <a
href="%s/users.php?mode=login">Login</a><br><br>';
+$LANG_GF02['msg21'] = 'Sorry, you are unauthorized to do this. Please
<a href="javascript:history.back()">Go Back</a> or <a
href="%s/users.php?mode=login">Login</a><br' . XHTML . '><br' . XHTML . '>';
$LANG_GF02['msg22'] = '- Neuer Beitrag im Forum';
$LANG_GF02['msg23a'] = "Zum Thema '%s' hat %s eine Antwort
geschrieben.\n\nDas Thema wurde von %s im %s-Forum begonnen. ";
$LANG_GF02['msg23b'] = "Ein neues Thema, '%s', wurde von %s im %s-Forum
auf der %s-Website begonnen. Du kannst den Beitrag hier
lesen:\n%s/forum/viewtopic.php?showtopic=%s\n";
@@ -338,19 +338,19 @@
$LANG_GF02['msg36'] = 'Stimmung:';
$LANG_GF02['msg37'] = 'Message:';
$LANG_GF02['msg38'] = 'Bei Antworten benachrichtigen ';
-$LANG_GF02['msg39'] = '<br>There are no topic reviews for this new
topic.';
-$LANG_GF02['msg40'] = '<br>Sorry, but you have already asked to be
notified of replies to this topic.<br><br>';
-$LANG_GF02['msg41'] = '<br>Thank you! You will now be notified of
replies to topic %s .<br><br>';
+$LANG_GF02['msg39'] = '<br' . XHTML . '>There are no topic reviews for
this new topic.';
+$LANG_GF02['msg40'] = '<br' . XHTML . '>Sorry, but you have already
asked to be notified of replies to this topic.<br' . XHTML . '><br' .
XHTML . '>';
+$LANG_GF02['msg41'] = '<br' . XHTML . '>Thank you! You will now be
notified of replies to topic %s .<br' . XHTML . '><br' . XHTML . '>';
$LANG_GF02['msg42'] = 'Thank you! You have now deleted notifications on
this topic.';
$LANG_GF02['msg43'] = 'Are you sure you want to delete this
notification?.';
$LANG_GF02['msg44'] = '<p style="margin:0px; padding:5px;">Du hast
keine Benachrichtigungen aktiviert.</p>';
$LANG_GF02['msg45'] = 'Search the Forum';
$LANG_GF02['msg46'] = 'You can search the forum by entering keywords:';
$LANG_GF02['msg47'] = 'You can also specify an author to search under:';
-$LANG_GF02['msg48'] = '<br>The Chatterblock Plugin needs to be
installed first.';
+$LANG_GF02['msg48'] = '<br' . XHTML . '>The Chatterblock Plugin needs
to be installed first.';
$LANG_GF02['msg49'] = '(%s Mal gelesen) ';
$LANG_GF02['msg50'] = 'Signatur n/v';
-$LANG_GF02['msg51'] = "%s\n\n<br>[Edited at %s by %s]";
+$LANG_GF02['msg51'] = "%s\n\n<br" . XHTML . ">[Edited at %s by %s]";
$LANG_GF02['msg52'] = 'Confirmed:';
$LANG_GF02['msg53'] = 'Returning to topic..';
$LANG_GF02['msg54'] = 'Post Edited.';
@@ -364,26 +364,26 @@
$LANG_GF02['msg62'] = 'Benachrichtigung bei neuen Beitr臠en';
$LANG_GF02['msg63'] = 'Profil';
$LANG_GF02['msg64'] = 'Are you sure you want to delete topic %s
titled: %s ?';
-$LANG_GF02['msg65'] = '<br>This is a parent topic, so all replies
posted to it will also be deleted.';
+$LANG_GF02['msg65'] = '<br' . XHTML . '>This is a parent topic, so all
replies posted to it will also be deleted.';
$LANG_GF02['msg66'] = 'Confirm Delete Post';
$LANG_GF02['msg67'] = 'Edit Forum Post';
$LANG_GF02['msg68'] = 'Note: BE CAREFUL WHEN YOU BAN, only admins have
the rights to unban someone.';
$LANG_GF02['msg69'] = 'Do you really want to ban the ip address: %s?';
$LANG_GF02['msg70'] = 'Confirm Ban';
-$LANG_GF02['msg71'] = 'No function selected, choose a post and then a
moderator function.<br>Note: You must be a moderator to perform these
functions.';
+$LANG_GF02['msg71'] = 'No function selected, choose a post and then a
moderator function.<br' . XHTML . '>Note: You must be a moderator to
perform these functions.';
$LANG_GF02['msg72'] = 'Warning, you do not have rights to perform this
moderation function.';
$LANG_GF02['msg74'] = 'Latest %s Forum Posts';
$LANG_GF02['msg75'] = 'Top %s Topics By Views';
$LANG_GF02['msg76'] = 'Top %s Topics By Posts';
-$LANG_GF02['msg77'] = '<br><p style="padding-left:10px;">You should not
be here!<br>Restricted access to this forum only.<p />';
-$LANG_GF02['msg78'] = '<br>You should not be here!<br>Invalid Forum.';
+$LANG_GF02['msg77'] = '<br' . XHTML . '><p
style="padding-left:10px;">You should not be here!<br' .
XHTML . '>Restricted access to this forum only.</p>';
+$LANG_GF02['msg78'] = '<br' . XHTML . '>You should not be here!<br' .
XHTML . '>Invalid Forum.';
$LANG_GF02['msg81'] = '- Topic Edit Notification';
-$LANG_GF02['msg82'] = '<p>Your message "%s" has been edited by the
moderator %s.<p>';
-$LANG_GF02['msg83'] = '<br><br>You need to be signed in to use this
forum feature.<p />';
+$LANG_GF02['msg82'] = '<p>Your message "%s" has been edited by the
moderator %s.</p>';
+$LANG_GF02['msg83'] = '<br' . XHTML . '><br' . XHTML . '><p>You need to
be signed in to use this forum feature.</p>';
$LANG_GF02['msg84'] = 'Alle Themen als gelesen markieren';
$LANG_GF02['msg85'] = 'Seite:';
$LANG_GF02['msg86'] = ' Letzte 10 Beitr臠e ';
-$LANG_GF02['msg87'] = '<br>Warning: This topic has been locked by the
moderator.<br>No additional posts are permitted';
+$LANG_GF02['msg87'] = '<br' . XHTML . '>Warning: This topic has been
locked by the moderator.<br' . XHTML . '>No additional posts are permitted';
$LANG_GF02['msg88'] = 'Mitglieder';
$LANG_GF02['msg88b'] = 'Nur im Forum aktive Mitglieder';
$LANG_GF02['msg89'] = 'Meine Benachrichtigungen';
@@ -449,10 +449,10 @@
$LANG_GF02['msg159'] = 'Are you sure you want to DELETE these selected
Moderator records?';
$LANG_GF02['msg160'] = 'View last page of topic';
$LANG_GF02['msg161'] = 'Return to members list';
-$LANG_GF02['msg162'] = 'To return to the forum index now click <a
href="%s">here</a><br><p />Default is to return automatically to view your
post.<br>If you do not wish to wait, click <a href="%s">here</a> now.';
+$LANG_GF02['msg162'] = 'To return to the forum index now click <a
href="%s">here</a><br' . XHTML . '>Default is to return automatically to
view your post.<br' . XHTML . '>If you do not wish to wait, click <a
href="%s">here</a> now.';
$LANG_GF02['msg163'] = 'Post moved';
$LANG_GF02['msg164'] = 'Mark all Categories and Topics Read';
-$LANG_GF02['msg165'] = 'ERROR<p />Matching <b>QUOTE</b> tag missing.
Unable to format message.<p />';
+$LANG_GF02['msg165'] = '<p>ERROR: Matching <b>QUOTE</b> tag missing.
Unable to format message.</p>';
$LANG_GF02['msg166'] = 'ERROR: Invalid topic or Topic not found';
$LANG_GF02['msg167'] = 'Notification Option';
$LANG_GF02['msg168'] = 'Setting of No will disable email notifictions';
@@ -510,8 +510,8 @@
'stick' => 'Wichtiges Thema',
'unstick' => 'Normales Thema',
'movetopic' => 'Thema verschieben',
- 'movetopicmsg' => '<br>Topic to be moved: "<b>%s</b>"',
- 'splittopicmsg' => '<br>Create a new Topic with this
post: "<b>%s</b>"<br><em>By:</em> %s  <em>On:</em> %s',
+ 'movetopicmsg' => '<br' . XHTML . '>Topic to be
moved: "<b>%s</b>"',
+ 'splittopicmsg' => '<br' . XHTML . '>Create a new Topic with this
post: "<b>%s</b>"<br' . XHTML . '><em>By:</em> %s 
<em>On:</em> %s',
'selectforum' => 'Select new forum:',
'lockedpost' => 'Add Reply Post',
'splitheading' => 'Split thread option:',
@@ -661,7 +661,7 @@
'allownotify' => 'Allow Notification',
'allownotifydscp' => 'Do you want to allow people to be notified?',
'defaultmode' => 'Default Post Mode',
- 'defaultmodedscp' => 'Enable HTML Mode as default - set to
Yes.<br>Enable Text mode as default (safest) - set to No',
+ 'defaultmodedscp' => 'Enable HTML Mode as default - set to
Yes.<br' . XHTML . '>Enable Text mode as default (safest) - set to No',
'cbsettings' => 'Centerblock Settings',
'cbenable' => 'Enable Centerblock',
'cbenabledscp' => '',
@@ -759,7 +759,7 @@
'ModBan' => 'Ban',
'addmoderator' => "Add Record",
'delmoderator' => " Delete\nSelected",
- 'moderatorwarning' => '<b>Warning: No Forums
Defined</b><br><br>Setup Forum Categories and Add at least 1
forum<br>before attempting to add Modertators',
+ 'moderatorwarning' => '<b>Warning: No Forums Defined</b><br' .
XHTML . '><br' . XHTML . '>Setup Forum Categories and Add at least 1
forum<br' . XHTML . '>before attempting to add Modertators',
'private' => 'Private Forum',
'filtertitle' => 'Select Moderator records to view',
'addmessage' => 'Add new Moderator',
Modified: trunk/plugins/forum/language/japanese_utf-8.php
==============================================================================
--- trunk/plugins/forum/language/japanese_utf-8.php (original)
+++ trunk/plugins/forum/language/japanese_utf-8.php Sat Feb 7 22:41:45 2009
@@ -1,35 +1,36 @@
<?php
/* Reminder: always indent with 4 spaces (no tabs). */
//
+---------------------------------------------------------------------------+
-// | Geeklog Forums Plugin 2.0 for Geeklog - The Ultimate Weblog
-// | Official release date: Feb 7,2003
+// | Geeklog Forums Plugin 2.0 for Geeklog - The Ultimate
Weblog |
+// | Official release date: Feb
7,2003 |
//
+---------------------------------------------------------------------------+
-// | japanese_utf-8.php ★もし万一エンコードがutf-8でなければ変換してくださ
い
+// |
japanese_utf-8.php |
+// | Language defines for all
text |
//
+---------------------------------------------------------------------------+
-// | Copyright (C) 2000,2001 by the following authors:
-// | Geeklog Author: Tony Bibbs - tony****@tonyb*****
+// | Copyright (C) 2000,2001 by the following
authors: |
+// | Geeklog Author: Tony Bibbs -
tony****@tonyb***** |
//
+---------------------------------------------------------------------------+
-// | FORUM Plugin Authors
-// | Prototype & Concept : Mr.GxBlock of www.gxblock.com
-// | Co-Developed by Matthew and Blaine
-// | Matthew DeWyer, contact: matt****@mycws***** www.cweb.ws
-// | Blaine Lang, contact: geekl****@langf***** www.langfamily.ca
+// | FORUM Plugin
Authors |
+// | Prototype & Concept : Mr.GxBlock of
www.gxblock.com |
+// | Co-Developed by Matthew and
Blaine |
+// | Matthew DeWyer, contact: matt****@mycws*****
www.cweb.ws |
+// | Blaine Lang, contact: geekl****@langf*****
www.langfamily.ca |
//
+---------------------------------------------------------------------------+
-// |
-// | This program is free software; you can redistribute it and/or
-// | modify it under the terms of the GNU General Public License
-// | as published by the Free Software Foundation; either version 2
-// | of the License, or (at your option) any later version.
-// |
-// | This program is distributed in the hope that it will be useful,
-// | but WITHOUT ANY WARRANTY; without even the implied warranty of
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// | GNU General Public License for more details.
-// |
-// | You should have received a copy of the GNU General Public License
-// | along with this program; if not, write to the Free Software
Foundation,
-// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-// |
+//
|
|
+// | This program is free software; you can redistribute it
and/or |
+// | modify it under the terms of the GNU General Public
License |
+// | as published by the Free Software Foundation; either version
2 |
+// | of the License, or (at your option) any later
version. |
+//
|
|
+// | This program is distributed in the hope that it will be
useful, |
+// | but WITHOUT ANY WARRANTY; without even the implied warranty
of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
the |
+// | GNU General Public License for more
details. |
+//
|
|
+// | You should have received a copy of the GNU General Public
License |
+// | along with this program; if not, write to the Free Software
Foundation, |
+// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. |
+//
|
|
//
+---------------------------------------------------------------------------+
//
# Tranlated by Geeklog Japanese group SaY and Ivy
@@ -64,7 +65,7 @@
'access_denied_msg' => 'Rootユーザのみこのページにアクセスできます。あ
なたの名前とIPアドレスは記録されました。',
'admin' => 'プラグイン管理者',
'install_header' => 'プラグインのインストール/アンインストール',
- 'installed' => 'プラグインとブロックがインストールされました。
<p><i>楽しんでください<br' . XHTML . '><a
href="mailto:langm****@sympa*****">Blaine</a></i>',
+ 'installed' => 'プラグインとブロックがインストールされました。
<p><em>楽しんでください<br' . XHTML . '><a
href="mailto:langm****@sympa*****">Blaine</a></em>',
'uninstalled' => 'Forumプラグインはアンインストールされました。',
'install_success' => 'インストールは<p><b>次のステップへ</b>:
<ol><li>掲示板管理者は、新しく掲示板を開設してください。<li>掲示板の設定と個
人の設定を再設定してください。 <li>少なくとも掲示板を1つ、カテゴリを1つ、作
成してください。</ol> <p><a href="%s">インストールの注意</a> を再度ご覧くだ
さい。',
@@ -315,7 +316,7 @@
$LANG_GF02['msg02'] = '申し訳ありませんが、この掲示板への参加には登録が
必要です。';
$LANG_GF02['msg03'] = '';
$LANG_GF02['msg04'] = '';
-$LANG_GF02['msg05'] = '<center><i>まだ登録されていません。
</center></i>';
+$LANG_GF02['msg05'] = '<center><em>まだ登録されていません。
</em></center>';
$LANG_GF02['msg06'] = '最後の訪問以後の投稿';
$LANG_GF02['msg07'] = 'オンラインユーザ:';
$LANG_GF02['msg08'] = '<br' . XHTML . '><b>すべての登録ユーザの登録日
時:</b> %s';
@@ -325,7 +326,7 @@
$LANG_GF02['msg12'] = 'メインホームページに戻る';
$LANG_GF02['msg13'] = '登録が必要です。';
$LANG_GF02['msg14'] = '登録が必要です。<br' . XHTML . '>';
-$LANG_GF02['msg15'] = 'エラーだと思われたら、 <a
href="mailto:%s?subject=Guestbook IP Ban">掲示板管理者</A>まで。';
+$LANG_GF02['msg15'] = 'エラーだと思われたら、 <a
href="mailto:%s?subject=Guestbook IP Ban">掲示板管理者</a>まで。';
$LANG_GF02['msg16'] = 'よくある投稿です。他の投稿や書き込みをご覧くださ
い。';
$LANG_GF02['msg17'] = 'メッセージ編集が完了しされました。';
$LANG_GF02['msg18'] = 'エラー! 必須項目が入力されていないかまたは短すぎ
ます。';
@@ -388,11 +389,11 @@
$LANG_GF02['msg74'] = '最近の投稿 %s 件';
$LANG_GF02['msg75'] = '閲覧数トップ %s 件';
$LANG_GF02['msg76'] = '投稿数トップ %s 件';
-$LANG_GF02['msg77'] = '<br' . XHTML . '><p style="padding-left:
10px;">申し訳ありません。先にログインしてください。アカウントがなければ新規
登録してください。<p />';
+$LANG_GF02['msg77'] = '<br' . XHTML . '><p style="padding-left:
10px;">申し訳ありません。先にログインしてください。アカウントがなければ新規
登録してください。</p>';
$LANG_GF02['msg78'] = '<br' . XHTML . '>ここに掲示板はありません。';
$LANG_GF02['msg81'] = '- 投稿編集通知';
-$LANG_GF02['msg82'] = '<p>あなたのメッセージ "%s" は、モデーレータ %s に
よって編集されました。<p>';
-$LANG_GF02['msg83'] = '<br' . XHTML . '><br' . XHTML . '>掲示板のタイト
ルを入力してください。<p />';
+$LANG_GF02['msg82'] = '<p>あなたのメッセージ "%s" は、モデーレータ %s に
よって編集されました。</p>';
+$LANG_GF02['msg83'] = '<br' . XHTML . '><br' . XHTML . '><p>掲示板のタイ
トルを入力してください。</p>';
$LANG_GF02['msg84'] = 'すべて読んだことにする';
$LANG_GF02['msg85'] = 'ページ:';
$LANG_GF02['msg86'] = '最新 %s 投稿 投稿者: ';
@@ -415,7 +416,7 @@
$LANG_GF02['msg112'] = '未読を表示する';
$LANG_GF02['msg113'] = '未読を表示する';
$LANG_GF02['msg114'] = 'ロック済';
-$LANG_GF02['msg115'] = '注目トピック新着';
+$LANG_GF02['msg115'] = '注目トピック 新着';
$LANG_GF02['msg116'] = 'ロック済トピック 新着';
$LANG_GF02['msg117'] = 'サイト検索';
$LANG_GF02['msg118'] = '掲示板検索';
@@ -426,13 +427,13 @@
$LANG_GF02['msg123'] = '人気順リストに表示する件数';
$LANG_GF02['msg124'] = '1ページごとのメッセージ数';
$LANG_GF02['msg125'] = 'モデレータのみ: メッセージ一覧画面';
-$LANG_GF02['msg126'] = '検索ライン:';
+$LANG_GF02['msg126'] = '検索ライン';
$LANG_GF02['msg127'] = '探索結果に表示するラインの数';
-$LANG_GF02['msg128'] = '投稿者数/1ページ:';
+$LANG_GF02['msg128'] = '投稿者数/1ページ';
$LANG_GF02['msg129'] = '投稿者リストの1ページに表示する人数';
-$LANG_GF02['msg130'] = 'ゲストユーザ投稿表示:';
+$LANG_GF02['msg130'] = 'ゲストユーザ投稿表示';
$LANG_GF02['msg131'] = 'ゲストユーザ投稿を表示する';
-$LANG_GF02['msg132'] = 'メール通知設定モード:';
+$LANG_GF02['msg132'] = 'メール通知設定モード';
$LANG_GF02['msg133'] = '書き込みがあればメール通知を既定値にする';
$LANG_GF02['msg134'] = '投稿が追加されました。';
$LANG_GF02['msg135'] = 'あなたの全ての投稿が掲示板に通知されます';
@@ -462,10 +463,10 @@
$LANG_GF02['msg159'] = 'モデレータのデータを本当に削除してもよいです
か？';
$LANG_GF02['msg160'] = '投稿の最後のページを見る';
$LANG_GF02['msg161'] = 'メンバーリストへ戻る';
-$LANG_GF02['msg162'] = '<a href="%s">こちら</a><br' . XHTML . '><p>へ自動
的に戻りますが、すぐに戻りたい場合は <a href="%s">こちら</a>';
+$LANG_GF02['msg162'] = '<a href="%s">こちら</a><br' . XHTML . '>へ自動的
に戻りますが、すぐに戻りたい場合は <a href="%s">こちら</a>';
$LANG_GF02['msg163'] = '投稿が移動しました';
$LANG_GF02['msg164'] = 'すべて読んだことにする';
-$LANG_GF02['msg165'] = 'エラー：<p>マッチする <b>引用</b> タグがありませ
ん。フォーマットできません。</p>';
+$LANG_GF02['msg165'] = '<p>エラー: マッチする <b>引用</b> タグがありませ
ん。フォーマットできません。</p>';
$LANG_GF02['msg166'] = 'エラー: 記事が壊れたか、見つかりません。';
$LANG_GF02['msg167'] = '通知オプション';
$LANG_GF02['msg168'] = 'メール通知を無効にする';
Modified: trunk/plugins/forum/public_html/createtopic.php
==============================================================================
--- trunk/plugins/forum/public_html/createtopic.php (original)
+++ trunk/plugins/forum/public_html/createtopic.php Sat Feb 7 22:41:45 2009
@@ -34,7 +34,7 @@
//
require_once('../lib-common.php'); // Path to your lib-common.php
-require_once ($_CONF['path_html'] . 'forum/include/include_html.php');
+// require_once ($_CONF['path_html'] . 'forum/include/include_html.php');
// The include is unnecessary
require_once ($_CONF['path_html'] . 'forum/include/gf_showtopic.php');
require_once ($_CONF['path_html'] . 'forum/include/gf_format.php');
require_once($_CONF['path'] . 'plugins/forum/debug.php'); // Common Debug
Code
@@ -393,7 +393,7 @@
echo '<input type="hidden" name="modedit" value="1"' . XHTML . '>';
} else {
// User is trying to edit their topic post - this is allowed
- if ($edittopic['date'] > 0 ) {
+ if ($edittopic['date'] > 0 AND $edittopic['uid'] == $_USER['uid'])
{
if ($CONF_FORUM['allowed_editwindow'] > 0) { // Check if
edit timeframe is still valid
$t2 = $CONF_FORUM['allowed_editwindow'];
$time = time();
@@ -558,8 +558,8 @@
$topicnavbar->set_file (array
('topicnavbar'=>'post_topic_navbar.thtml'));
$topicnavbar->set_var ('xhtml', XHTML);
$topicnavbar->set_var ('imgset', $CONF_FORUM['imgset']);
- $topicnavbar->set_var ('navbreadcrumbsimg','<img
src="'.gf_getImage('nav_breadcrumbs').'">');
- $topicnavbar->set_var ('navtopicimg','<img
src="'.gf_getImage('nav_topic').'">');
+ $topicnavbar->set_var ('navbreadcrumbsimg','<img alt=""
src="'.gf_getImage('nav_breadcrumbs').'">');
+ $topicnavbar->set_var ('navtopicimg','<img alt=""
src="'.gf_getImage('nav_topic').'">');
$topicnavbar->set_var ('site_url', $_CONF['site_url']);
$topicnavbar->set_var ('layout_url', $_CONF['layout_url']);
$topicnavbar->set_var ('phpself',
$_CONF['site_url'] .'/forum/createtopic.php');
Modified: trunk/plugins/forum/public_html/include/gf_format.php
==============================================================================
--- trunk/plugins/forum/public_html/include/gf_format.php (original)
+++ trunk/plugins/forum/public_html/include/gf_format.php Sat Feb 7
22:41:45 2009
@@ -309,6 +309,7 @@
$bbcode = new StringParser_BBCode ();
$bbcode->setGlobalCaseSensitive (false);
+ $bbcode->setParagraphHandlingParameters ("\n\n", "", ""); // p要素内に
ブロックレベル要素を含めることはできないので、これを回避する。
if ( $CONF_FORUM['use_glfilter'] == 1 && ($postmode == 'html' ||
$postmode == 'HTML')) {
$bbcode->addParser(array('block','inline'), 'gf_cleanHTML');
@@ -450,6 +451,7 @@
$bbcode = new StringParser_BBCode ();
$bbcode->setGlobalCaseSensitive (false);
+ $bbcode->setParagraphHandlingParameters ("\n\n", "", ""); // p要素内に
ブロックレベル要素を含めることはできないので、これを回避する。
if ( $postmode == 'text') {
$bbcode->addParser (array
('block', 'inline', 'link', 'listitem'), 'bbcode_htmlspecialchars');
@@ -558,7 +560,10 @@
}
$str = str_ireplace("[code]<code>",'[code]',$str);
$str = str_ireplace("</code>[/code]",'[/code]',$str);
- $str = str_replace(array("<br />\r\n","<br />\n\r","<br />\r","<br
/>\n"), '<br />', $str );
+
+// $str = str_replace(array("<br />\r\n","<br />\n\r","<br />\r","<br
/>\n"), '<br />', $str );
+ $str = str_replace(array("<br />\r\n","<br />\n\r","<br />\r","<br
/>\n"), '<br'.XHTML.'>', $str );
+
$str = preg_replace("/\[QUOTE\sBY=\s(.+?)\]/i","[QUOTE] Quote by
$1:",$str);
/* Reformat code blocks - version 2.3.3 and prior */
$str = str_replace( '<pre class="forumCode">', '[code]', $str );
@@ -566,6 +571,7 @@
$bbcode = new StringParser_BBCode ();
$bbcode->setGlobalCaseSensitive (false);
+ $bbcode->setParagraphHandlingParameters ("\n\n", "", ""); // p要素内に
ブロックレベル要素を含めることはできないので、これを回避する。
if ( $postmode == 'text') {
$bbcode->addParser (array
('block', 'inline', 'link', 'listitem'), 'bbcode_htmlspecialchars');
@@ -853,13 +859,13 @@
if ( $CONF_FORUM['registered_to_post'] AND ($_USER['uid'] < 2 OR
empty($_USER['uid'])) ) {
$postperm_msg = $LANG_GF01['POST_PERM_MSG2'];
- $post_perm_image = '<img src="'.gf_getImage('red_dot').'">';
+ $post_perm_image = '<img alt="" src="'.gf_getImage('red_dot').'">';
} else {
$postperm_msg = $LANG_GF01['POST_PERM_MSG1'];
- $post_perm_image = '<img src="'.gf_getImage('green_dot').'">';
+ $post_perm_image = '<img alt=""
src="'.gf_getImage('green_dot').'">';
}
if ($CONF_FORUM['allow_html']) {
- $html_perm_image = '<img src="'.gf_getImage('green_dot').'">';
+ $html_perm_image = '<img alt=""
src="'.gf_getImage('green_dot').'">';
if ($CONF_FORUM['use_glfilter']) {
$htmlmsg = $LANG_GF01['HTML_FILTER_MSG'];
} else {
@@ -867,18 +873,18 @@
}
} else {
$htmlmsg = $LANG_GF01['HTML_MSG'];
- $html_perm_image = '<img src="'.gf_getImage('red_dot').'">';
+ $html_perm_image = '<img alt="" src="'.gf_getImage('red_dot').'">';
}
if ($CONF_FORUM['use_censor']) {
- $censor_perm_image = '<img src="'.gf_getImage('green_dot').'">';
+ $censor_perm_image = '<img alt=""
src="'.gf_getImage('green_dot').'">';
} else {
- $censor_perm_image = '<img src="'.gf_getImage('red_dot').'">';
+ $censor_perm_image = '<img alt=""
src="'.gf_getImage('red_dot').'">';
}
if ($CONF_FORUM['show_anonymous_posts']) {
- $anon_perm_image = '<img src="'.gf_getImage('green_dot').'">';
+ $anon_perm_image = '<img alt=""
src="'.gf_getImage('green_dot').'">';
} else {
- $anon_perm_image = '<img src="'.gf_getImage('red_dot').'">';
+ $anon_perm_image = '<img alt="" src="'.gf_getImage('red_dot').'">';
}
$forum_rules = new
Template($_CONF['path_layout'] . 'forum/layout/footer');
$forum_rules->set_file (array ('forum_rules'=>'forum_rules.thtml'));
Modified: trunk/plugins/forum/public_html/include/gf_showtopic.php
==============================================================================
--- trunk/plugins/forum/public_html/include/gf_showtopic.php (original)
+++ trunk/plugins/forum/public_html/include/gf_showtopic.php Sat Feb 7
22:41:45 2009
@@ -153,7 +153,7 @@
}
if ($CONF_FORUM['show_moods'] && $showtopic['mood'] != "") {
- $moodimage = '<img align="absmiddle"
src="'.gf_getImage($showtopic['mood'],'moods') .'"
title="'.$showtopic['mood'].'"><br'. XHTML . '>';
+ $moodimage = '<img style="virtical-align:middle;"
src="'.gf_getImage($showtopic['mood'],'moods') .'"
title="'.$showtopic['mood'].'" alt="'.$showtopic['mood'].'"><br'.
XHTML . '>';
$min_height = $min_height + 30;
}
@@ -175,7 +175,7 @@
}
$showtopic['comment'] =
str_ireplace("[code]<code>",'[code]',$showtopic['comment']);
$showtopic['comment'] =
str_ireplace("</code>[/code]",'[/code]',$showtopic['comment']);
- $showtopic['comment'] = str_replace(array("<br" .
XHTML . ">\r\n","<br" . XHTML . ">\n\r","<br" . XHTML . ">\r","<br" .
XHTML . ">\n"), '<br' . XHTML . '>', $showtopic['comment'] );
+ $showtopic['comment'] = str_replace(array("<br />\r\n","<br
/>\n\r","<br />\r","<br
/>\n","<br>\r\n","<br>\n\r","<br>\r","<br>\n"), '<br' . XHTML . '>',
$showtopic['comment'] );
$showtopic['comment'] =
preg_replace("/\[QUOTE\sBY=\s(.+?)\]/i","[QUOTE] Quote by
$1:",$showtopic['comment']);
/* Reformat code blocks - version 2.3.3 and prior */
$showtopic['comment'] = str_replace( '<pre
class="forumCode">', '[code]', $showtopic['comment'] );
@@ -212,7 +212,7 @@
}
if ($editAllowed) {
$editlink
= "{$_CONF['site_url']}/forum/createtopic.php?method=edit&forum={$showtopic['forum']}&id={$showtopic['id']}&editid={$showtopic['id']}&page=$page";
- $editlinkimg = '<img src="'.gf_getImage('edit_button').'"
border="0" align="absmiddle" alt="'.$LANG_GF01['EDITICON'].'"
title="'.$LANG_GF01['EDITICON'].'">';
+ $editlinkimg = '<img src="'.gf_getImage('edit_button').'"
style="border:none; virtical-align:middle;"
alt="'.$LANG_GF01['EDITICON'].'" title="'.$LANG_GF01['EDITICON'].'">';
$topictemplate->set_var ('editlink', $editlink);
$topictemplate->set_var ('editlinkimg', $editlinkimg);
$topictemplate->set_var ('LANG_edit', $LANG_GF01['EDITICON']);
@@ -252,7 +252,7 @@
$is_readonly =
DB_getItem($_TABLES['gf_forums'],'is_readonly','forum_id=' .
$showtopic['forum']);
if ($is_readonly == 0 OR
forum_modPermission($showtopic['forum'],$_USER['uid'],'mod_edit')) {
$quotelink
= "{$_CONF['site_url']}/forum/createtopic.php?method=postreply&forum={$showtopic['forum']}&id=$replytopicid&quoteid={$showtopic['id']}";
- $quotelinkimg = '<img
src="'.gf_getImage('quote_button').'" border="0" align="absmiddle"
alt="'.$LANG_GF01['QUOTEICON'].'" title="'.$LANG_GF01['QUOTEICON'].'">';
+ $quotelinkimg = '<img
src="'.gf_getImage('quote_button').'" style="border:none;
virtical-align:middle;" alt="'.$LANG_GF01['QUOTEICON'].'"
title="'.$LANG_GF01['QUOTEICON'].'">';
$topictemplate->set_var ('quotelink', $quotelink);
$topictemplate->set_var ('quotelinkimg', $quotelinkimg);
$topictemplate->set_var ('LANG_quote',
$LANG_GF01['QUOTEICON']);
@@ -261,12 +261,13 @@
}
$topictemplate->set_var ('topic_post_link_begin', '<a
name="'.$showtopic['id'].'">');
+// $topictemplate->set_var ('topic_post_link_begin', '<a
id="post_'.$showtopic['id'].'" name="post_'.$showtopic['id'].'">'); // こち
らの方が適正だろう
$topictemplate->set_var ('topic_post_link_end', '</a>');
$mod_functions = forum_getmodFunctions($showtopic);
if($showtopic['uid'] > 1 && $uservalid) {
$profile_link
= "{$_CONF['site_url']}/users.php?mode=profile&uid={$showtopic['uid']}";
- $profile_linkimg = '<img
src="'.gf_getImage('profile_button').'" border="0" align="absmiddle"
alt="'.$LANG_GF01['ProfileLink'].'" title="'.$LANG_GF01['ProfileLink'].'">';
+ $profile_linkimg = '<img
src="'.gf_getImage('profile_button').'" style="border:none;
virtical-align:middle;" alt="'.$LANG_GF01['ProfileLink'].'"
title="'.$LANG_GF01['ProfileLink'].'">';
$topictemplate->set_var ('profilelink', $profile_link);
$topictemplate->set_var ('profilelinkimg', $profile_linkimg);
$topictemplate->set_var
('LANG_profile',$LANG_GF01['ProfileLink']);
@@ -276,7 +277,7 @@
$pmplugin_link = forumPLG_getPMlink($pmusernmame);
if ($pmplugin_link != '') {
$pm_link = $pmplugin_link;
- $pm_linkimg = '<img src="'.gf_getImage('pm_button').'"
border="0" align="absmiddle" alt="'.$LANG_GF01['PMLink'].'"
title="'.$LANG_GF01['PMLink'].'">';
+ $pm_linkimg = '<img src="'.gf_getImage('pm_button').'"
style="border:none; virtical-align:middle;" alt="'.$LANG_GF01['PMLink'].'"
title="'.$LANG_GF01['PMLink'].'">';
$topictemplate->set_var ('pmlink', $pm_link);
$topictemplate->set_var ('pmlinkimg', $pm_linkimg);
$topictemplate->set_var ('LANG_pm',
$LANG_GF01['PMLink']);
@@ -287,7 +288,7 @@
if($userarray['email'] != '' && $showtopic["uid"] > 1) {
$email_link
= "{$_CONF['site_url']}/profiles.php?uid={$showtopic['uid']}";
- $email_linkimg = '<img src="'.gf_getImage('email_button').'"
border="0" align="absmiddle" alt="'.$LANG_GF01['EmailLink'].'"
title="'.$LANG_GF01['EmailLink'].'">';
+ $email_linkimg = '<img src="'.gf_getImage('email_button').'"
style="border:none; virtical-align:middle;"
alt="'.$LANG_GF01['EmailLink'].'" title="'.$LANG_GF01['EmailLink'].'">';
$topictemplate->set_var ('emaillink', $email_link);
$topictemplate->set_var ('emaillinkimg', $email_linkimg);
$topictemplate->set_var ('LANG_email',
$LANG_GF01['EmailLink']);
@@ -298,7 +299,7 @@
if(!eregi("http",$homepage)) {
$homepage = 'http://' .$homepage;
}
- $homepageimg = '<img src="'.gf_getImage('website_button').'"
border="0" align="absmiddle" alt="'.$LANG_GF01['WebsiteLink'].'"
title="'.$LANG_GF01['WebsiteLink'].'">';
+ $homepageimg = '<img src="'.gf_getImage('website_button').'"
style="border:none; virtical-align:middle;"
alt="'.$LANG_GF01['WebsiteLink'].'" title="'.$LANG_GF01['WebsiteLink'].'">';
$topictemplate->set_var ('websitelink', $homepage);
$topictemplate->set_var ('websitelinkimg', $homepageimg);
$topictemplate->set_var ('LANG_website',
$LANG_GF01['WebsiteLink']);
@@ -329,6 +330,9 @@
$showtopic['comment'] =
str_replace('{','{',$showtopic['comment']);
$showtopic['comment'] =
str_replace('}','}',$showtopic['comment']);
+
+ // 暫定対応。もっと根っこの方で対応すべき。
+ $showtopic['comment'] = str_replace(array("<br />","<br>"), '<br' .
XHTML . '>', $showtopic['comment'] );
$topictemplate->set_var ('layout_url', $_CONF['layout_url']);
$topictemplate->set_var ('csscode', $onetwo);
Modified: trunk/plugins/forum/public_html/index.php
==============================================================================
--- trunk/plugins/forum/public_html/index.php (original)
+++ trunk/plugins/forum/public_html/index.php Sat Feb 7 22:41:45 2009
@@ -417,7 +417,7 @@
$result = DB_query("SELECT date,subject,comment,replies,views,id,forum
FROM {$_TABLES['gf_topic']} WHERE (pid = '0') ORDER BY $orderby
$direction");
$nrows = DB_numRows($result);
$displayrecs = 0;
- for ($i = 1; $i <= $nrows; $i++) {
+ for ($i = 0; $i < $nrows; $i++) {
$P = DB_fetchArray($result);
$forumgrpid =
DB_getItem($_TABLES['gf_forums'],'grp_id',"forum_id='{$P['forum']}'");
$groupname =
DB_getItem($_TABLES['groups'],'grp_name',"grp_id='$forumgrpid'");
@@ -524,7 +524,7 @@
$forumlisting->set_var ('xhtml', XHTML);
$forumlisting->set_var ('imgset', $CONF_FORUM['imgset']);
- $forumlisting->set_var ('forumindeximg','<img
src="'.gf_getImage('forumindex').'">');
+ $forumlisting->set_var ('forumindeximg','<img alt="forum index"
src="'.gf_getImage('forumindex').'">');
$forumlisting->set_var ('phpself',
$_CONF['site_url'] .'/forum/index.php');
$forumlisting->set_var('layout_url', $_CONF['layout_url']);
$viewnewpostslink = false; // Set true when we have set the view
newposts link template var
@@ -597,12 +597,12 @@
// Determine if there are new topics since last visit
for this user.
$lsql = DB_query("SELECT * FROM {$_TABLES['gf_log']}
WHERE uid='{$_USER['uid']}' AND forum='{$B['forum_id']}' AND time > 0");
if ($topicCount > DB_numRows($lsql)) {
- $folderimg = '<img
src="'.gf_getImage('busyforum').'" border="0" align="absmiddle"
alt="'.$LANG_GF02['msg111'].'" title="'.$LANG_GF02['msg111'].'">';
+ $folderimg = '<img
src="'.gf_getImage('busyforum').'" style="border:none;
virtical-align:middle;" alt="'.$LANG_GF02['msg111'].'"
title="'.$LANG_GF02['msg111'].'">';
} else {
- $folderimg = '<img
src="'.gf_getImage('quietforum').'" border="0" align="absmiddle"
alt="'.$LANG_GF02['quietforum'].'" title="'.$LANG_GF02['quietforum'].'">';
+ $folderimg = '<img
src="'.gf_getImage('quietforum').'" style="border:none;
virtical-align:middle;" alt="'.$LANG_GF02['quietforum'].'"
title="'.$LANG_GF02['quietforum'].'">';
}
} else {
- $folderimg = '<img src="'.gf_getImage('quietforum').'"
border="0" align="absmiddle" alt="'.$LANG_GF02['quietforum'].'"
title="'.$LANG_GF02['quietforum'].'">';
+ $folderimg = '<img src="'.gf_getImage('quietforum').'"
style="border:none; virtical-align:middle;"
alt="'.$LANG_GF02['quietforum'].'" title="'.$LANG_GF02['quietforum'].'">';
}
$lastdate1 = strftime('%d', $B['date']);
@@ -632,7 +632,7 @@
$forumlisting->set_var ('lastpostmsgDate',
$LANG_GF01['nolastpostmsg']);
$forumlisting->set_var ('lastpostmsgTopic', '');
$forumlisting->set_var ('lastpostmsgBy', '');
- $folderimg = '<img src="'.gf_getImage('quietforum').'"
border="0" align="absmiddle" alt="'.$LANG_GF02['quietforum'].'"
title="'.$LANG_GF02['quietforum'].'">';
+ $folderimg = '<img src="'.gf_getImage('quietforum').'"
style="border:none; virtical-align:middle;"
alt="'.$LANG_GF02['quietforum'].'" title="'.$LANG_GF02['quietforum'].'">';
}
if ($B['pid'] == 0) {
@@ -708,17 +708,17 @@
$topiclisting->set_var('site_url',$_CONF['site_url']);
$topiclisting->set_var ('LANG_HOME', $LANG_GF01['HOMEPAGE']);
$topiclisting->set_var('forum_home',$LANG_GF01['INDEXPAGE']);
- $topiclisting->set_var ('navbreadcrumbsimg','<img
src="'.gf_getImage('nav_breadcrumbs').'">');
- $topiclisting->set_var ('img_asc1', '<img src="'.gf_getImage('asc').'"
border="0">');
- $topiclisting->set_var ('img_asc2', '<img src="'.gf_getImage('asc').'"
border="0">');
- $topiclisting->set_var ('img_asc3', '<img
src="' .$CONF_FORUM['imgset']. '/asc.gif" border="0">');
- $topiclisting->set_var ('img_asc4', '<img src="'.gf_getImage('asc').'"
border="0">');
- $topiclisting->set_var ('img_asc5', '<img src="'.gf_getImage('asc').'"
border="0">');
- $topiclisting->set_var ('img_desc1', '<img
src="'.gf_getImage('desc').'" border="0">');
- $topiclisting->set_var ('img_desc2', '<img
src="'.gf_getImage('desc').'" border="0">');
- $topiclisting->set_var ('img_desc3', '<img
src="'.gf_getImage('desc').'" border="0">');
- $topiclisting->set_var ('img_desc4', '<img
src="'.gf_getImage('desc').'" border="0">');
- $topiclisting->set_var ('img_desc5', '<img
src="'.gf_getImage('desc').'" border="0">');
+ $topiclisting->set_var ('navbreadcrumbsimg','<img alt=""
src="'.gf_getImage('nav_breadcrumbs').'">');
+ $topiclisting->set_var ('img_asc1', '<img alt=""
src="'.gf_getImage('asc').'" style="border:none;">');
+ $topiclisting->set_var ('img_asc2', '<img alt=""
src="'.gf_getImage('asc').'" style="border:none;">');
+ $topiclisting->set_var ('img_asc3', '<img alt=""
src="' .$CONF_FORUM['imgset']. '/asc.gif" style="border:none;">');
+ $topiclisting->set_var ('img_asc4', '<img alt=""
src="'.gf_getImage('asc').'" style="border:none;">');
+ $topiclisting->set_var ('img_asc5', '<img alt=""
src="'.gf_getImage('asc').'" style="border:none;">');
+ $topiclisting->set_var ('img_desc1', '<img alt=""
src="'.gf_getImage('desc').'" style="border:none;">');
+ $topiclisting->set_var ('img_desc2', '<img alt=""
src="'.gf_getImage('desc').'" style="border:none;">');
+ $topiclisting->set_var ('img_desc3', '<img alt=""
src="'.gf_getImage('desc').'" style="border:none;">');
+ $topiclisting->set_var ('img_desc4', '<img alt=""
src="'.gf_getImage('desc').'" style="border:none;">');
+ $topiclisting->set_var ('img_desc5', '<img alt=""
src="'.gf_getImage('desc').'" style="border:none;">');
if(function_exists(prj_getSessionProject)) {
$projectid = prj_getSessionProject();
@@ -732,51 +732,51 @@
case 1:
if($order == 0) {
$sortOrder = "subject ASC";
- $topiclisting->set_var ('img_asc1', '<img
src="'.gf_getImage('asc_on').'" border="0">');
+ $topiclisting->set_var ('img_asc1', '<img alt=""
src="'.gf_getImage('asc_on').'" style="border:none;">');
} else {
$sortOrder = "subject DESC";
- $topiclisting->set_var ('img_desc1', '<img
src="'.gf_getImage('desc_on').'" border="0">');
+ $topiclisting->set_var ('img_desc1', '<img alt=""
src="'.gf_getImage('desc_on').'" style="border:none;">');
}
break;
case 2:
if($order == 0) {
$sortOrder = "views ASC";
- $topiclisting->set_var ('img_asc2', '<img
src="'.gf_getImage('asc_on').'" border="0">');
+ $topiclisting->set_var ('img_asc2', '<img alt=""
src="'.gf_getImage('asc_on').'" style="border:none;">');
} else {
$sortOrder = "views DESC";
- $topiclisting->set_var ('img_desc2', '<img
src="'.gf_getImage('desc_on').'" border="0">');
+ $topiclisting->set_var ('img_desc2', '<img alt=""
src="'.gf_getImage('desc_on').'" style="border:none;">');
}
break;
case 3:
if($order == 0) {
$sortOrder = "replies ASC";
- $topiclisting->set_var ('img_asc3', '<img
src="'.gf_getImage('asc_on').'" border="0">');
+ $topiclisting->set_var ('img_asc3', '<img alt=""
src="'.gf_getImage('asc_on').'" style="border:none;">');
} else {
$sortOrder = "replies DESC";
- $topiclisting->set_var ('img_desc3', '<img
src="'.gf_getImage('desc_on').'" border="0">');
+ $topiclisting->set_var ('img_desc3', '<img alt=""
src="'.gf_getImage('desc_on').'" style="border:none;">');
}
break;
case 4:
if($order == 0) {
$sortOrder = "name ASC";
- $topiclisting->set_var ('img_asc4', '<img
src="'.gf_getImage('asc_on').'" border="0">');
+ $topiclisting->set_var ('img_asc4', '<img alt=""
src="'.gf_getImage('asc_on').'" style="border:none;">');
} else {
$sortOrder = "name DESC";
- $topiclisting->set_var ('img_desc4', '<img
src="'.gf_getImage('desc_on').'" border="0">');
+ $topiclisting->set_var ('img_desc4', '<img alt=""
src="'.gf_getImage('desc_on').'" style="border:none;">');
}
break;
case 5:
if($order == 0) {
$sortOrder = "lastupdated ASC";
- $topiclisting->set_var ('img_asc5', '<img
src="' .$CONF_FORUM['imgset']. '/asc_on.gif" border="0">');
+ $topiclisting->set_var ('img_asc5', '<img alt=""
src="' .$CONF_FORUM['imgset']. '/asc_on.gif" style="border:none;">');
} else {
$sortOrder = "lastupdated DESC";
- $topiclisting->set_var ('img_desc5', '<img
src="' .$CONF_FORUM['imgset']. '/desc_on.gif" border="0">');
+ $topiclisting->set_var ('img_desc5', '<img alt=""
src="' .$CONF_FORUM['imgset']. '/desc_on.gif" style="border:none;">');
}
break;
default:
$sortOrder = "lastupdated DESC";
- $topiclisting->set_var ('img_desc5', '<img
src="'.gf_getImage('desc_on').'" border="0">');
+ $topiclisting->set_var ('img_desc5', '<img alt=""
src="'.gf_getImage('desc_on').'" style="border:none;">');
break;
}
@@ -805,14 +805,14 @@
// Check for user subscription status
$sub_check =
DB_getITEM($_TABLES['gf_watch'],"id","forum_id='$forum' AND topic_id=0 AND
uid='{$_USER['uid']}'");
if ($sub_check == '') {
- $subscribelinkimg = '<img
src="'.gf_getImage('forumnotify_on').'" border="0" align="absmiddle"
alt="'.$LANG_GF01['FORUMSUBSCRIBE'].'"
title="'.$LANG_GF01['FORUMSUBSCRIBE'].'">';
+ $subscribelinkimg = '<img
src="'.gf_getImage('forumnotify_on').'" style="border:none;
virtical-align:middle;" alt="'.$LANG_GF01['FORUMSUBSCRIBE'].'"
title="'.$LANG_GF01['FORUMSUBSCRIBE'].'">';
$subscribelink
= "{$_CONF['site_url']}/forum/index.php?op=subscribe&forum=$forum";
$topiclisting->set_var ('subscribelink', $subscribelink);
$topiclisting->set_var ('subscribelinkimg', $subscribelinkimg);
$topiclisting->set_var ('LANG_subscribe',
$LANG_GF01['FORUMSUBSCRIBE']);
$topiclisting->parse ('subscribe_link','subscribe');
} else {
- $subscribelinkimg = '<img
src="'.gf_getImage('forumnotify_off').'" border="0" align="absmiddle"
alt="'.$LANG_GF01['FORUMUNSUBSCRIBE'].'"
title="'.$LANG_GF01['FORUMUNSUBSCRIBE'].'">';
+ $subscribelinkimg = '<img
src="'.gf_getImage('forumnotify_off').'" style="border:none;
virtical-align:middle;" alt="'.$LANG_GF01['FORUMUNSUBSCRIBE'].'"
title="'.$LANG_GF01['FORUMUNSUBSCRIBE'].'">';
$subscribelink
= "{$_CONF['site_url']}/forum/notify.php?filter=2";
$topiclisting->set_var ('subscribelink', $subscribelink);
$topiclisting->set_var ('subscribelinkimg', $subscribelinkimg);
@@ -835,7 +835,7 @@
$topiclisting->set_var ('LANG_newforumposts', $LANG_GF02['msg113']);
if ($category['is_readonly'] == 0 OR
forum_modPermission($forum,$_USER['uid'],'mod_edit')) {
- $newtopiclinkimg = '<img src="'.gf_getImage('post_newtopic').'"
border="0" align="absmiddle" alt="'.$LANG_GF01['NEWTOPIC'].'"
title="'.$LANG_GF01['NEWTOPIC'].'">';
+ $newtopiclinkimg = '<img src="'.gf_getImage('post_newtopic').'"
style="border:none; virtical-align:middle;"
alt="'.$LANG_GF01['NEWTOPIC'].'" title="'.$LANG_GF01['NEWTOPIC'].'">';
$topiclisting->set_var ('LANG_newtopic', $LANG_GF01['NEWTOPIC']);
$topiclisting->set_var('newtopiclinkimg',$newtopiclinkimg);
$topiclisting->set_var
('newtopiclink',"{$_CONF['site_url']}/forum/createtopic.php?method=newtopic&forum=$forum");
@@ -932,26 +932,27 @@
$lsql = DB_query($sql);
if (DB_numRows($lsql) == 0) {
if ($record['sticky'] == 1) {
- $folderimg = '<img src="'.gf_getImage('sticky_new').'"
border="0" align="absmiddle" alt="'.$LANG_GF02['msg115'].'"
title="'.$LANG_GF02['msg115'].'">';
+ $folderimg = '<img src="'.gf_getImage('sticky_new').'"
style="border:none; virtical-align:middle;" alt="'.$LANG_GF02['msg115'].'"
title="'.$LANG_GF02['msg115'].'">';
+
} elseif ($record['locked'] == 1) {
- $folderimg = '<img src="'.gf_getImage('locked_new').'"
border="0" align="absmiddle" alt="'.$LANG_GF02['msg116'].'"
title="'.$LANG_GF02['msg116'].'">';
+ $folderimg = '<img src="'.gf_getImage('locked_new').'"
style="border:none; virtical-align:middle;" alt="'.$LANG_GF02['msg116'].'"
title="'.$LANG_GF02['msg116'].'">';
} else {
- $folderimg = '<img src="'.gf_getImage('newposts').'"
border="0" align="absmiddle" alt="'.$LANG_GF02['msg60'].'"
title="'.$LANG_GF02['msg60'].'">';
+ $folderimg = '<img src="'.gf_getImage('newposts').'"
style="border:none; virtical-align:middle;" alt="'.$LANG_GF02['msg60'].'"
title="'.$LANG_GF02['msg60'].'">';
}
} elseif ($record['sticky'] == 1) {
- $folderimg = '<img src="'.gf_getImage('sticky').'"
border="0" align="absmiddle" alt="'.$LANG_GF02['msg61'].'"
title="'.$LANG_GF02['msg61'].'">';
+ $folderimg = '<img src="'.gf_getImage('sticky').'"
style="border:none; virtical-align:middle;" alt="'.$LANG_GF02['msg61'].'"
title="'.$LANG_GF02['msg61'].'">';
} elseif ($record['locked'] == 1) {
- $folderimg = '<img src="'.gf_getImage('locked').'"
border="0" align="absmiddle" alt="'.$LANG_GF02['msg114'].'"
title="'.$LANG_GF02['msg114'].'">';
+ $folderimg = '<img src="'.gf_getImage('locked').'"
style="border:none; virtical-align:middle;" alt="'.$LANG_GF02['msg114'].'"
title="'.$LANG_GF02['msg114'].'">';
} else {
- $folderimg = '<img src="'.gf_getImage('noposts').'"
border="0" align="absmiddle" alt="'.$LANG_GF02['msg59'].'"
title="'.$LANG_GF02['msg59'].'">';
+ $folderimg = '<img src="'.gf_getImage('noposts').'"
style="border:none; virtical-align:middle;" alt="'.$LANG_GF02['msg59'].'"
title="'.$LANG_GF02['msg59'].'">';
}
} elseif ($record['sticky'] == 1) {
- $folderimg = '<img src="'.gf_getImage('sticky').'" border="0"
align="absmiddle" alt="'.$LANG_GF02['msg61'].'"
title="'.$LANG_GF02['msg61'].'">';
+ $folderimg = '<img src="'.gf_getImage('sticky').'"
style="border:none; virtical-align:middle;" alt="'.$LANG_GF02['msg61'].'"
title="'.$LANG_GF02['msg61'].'">';
} elseif ($record['locked'] == 1) {
- $folderimg = '<img src="'.gf_getImage('locked').'" border="0"
align="absmiddle" alt="'.$LANG_GF02['msg114'].'"
title="'.$LANG_GF02['msg114'].'">';
+ $folderimg = '<img src="'.gf_getImage('locked').'"
style="border:none; virtical-align:middle;" alt="'.$LANG_GF02['msg114'].'"
title="'.$LANG_GF02['msg114'].'">';
} else {
- $folderimg = '<img src="'.gf_getImage('noposts').'" border="0"
align="absmiddle" alt="'.$LANG_GF02['msg59'].'"
title="'.$LANG_GF02['msg59'].'">';
+ $folderimg = '<img src="'.gf_getImage('noposts').'"
style="border:none; virtical-align:middle;" alt="'.$LANG_GF02['msg59'].'"
title="'.$LANG_GF02['msg59'].'">';
}
Modified: trunk/plugins/forum/public_html/notify.php
==============================================================================
--- trunk/plugins/forum/public_html/notify.php (original)
+++ trunk/plugins/forum/public_html/notify.php Sat Feb 7 22:41:45 2009
@@ -12,7 +12,7 @@
//
+---------------------------------------------------------------------------+
// | Plugin
Authors |
// | Blaine Lang, blain****@porta*****,
www.portalparts.com |
-// | Version 1.0 co-developer: Matthew DeWyer,
matt****@mycws***** |
+// | Version 1.0 co-developer: Matthew DeWyer,
matt****@mycws***** |
// | Prototype & Concept : Mr.GxBlock,
www.gxblock.com |
//
+---------------------------------------------------------------------------+
//
|
|
@@ -190,7 +190,7 @@
$sql .= " LIMIT $offset, $show";
$notifications = DB_query($sql);
-$i = 1;
+$i = 0;
while (list($notify_recid,$forum_id,$topic_id,$date_added) =
DB_fetchARRAY($notifications)) {
$forum_name =
DB_getITEM($_TABLES['gf_forums'],"forum_name","forum_id='$forum_id'");
$is_forum = '';
Modified: trunk/plugins/forum/public_html/print.php
==============================================================================
--- trunk/plugins/forum/public_html/print.php (original)
+++ trunk/plugins/forum/public_html/print.php Sat Feb 7 22:41:45 2009
@@ -46,7 +46,7 @@
$showtopic['comment'] =
str_replace('<pre>','[code]',$showtopic['comment']);
$showtopic['comment'] =
str_replace('</pre>','[/code]',$showtopic['comment']);
}
- $showtopic['comment'] = str_replace(array("<br" .
XHTML . ">\r\n","<br" . XHTML . ">\n\r","<br" . XHTML . ">\r","<br" .
XHTML . ">\n"), '<br' . XHTML . '>', $showtopic['comment'] );
+ $showtopic['comment'] = str_replace(array("<br />\r\n","<br
/>\n\r","<br />\r","<br
/>\n","<br>\r\n","<br>\n\r","<br>\r","<br>\n"), '<br' . XHTML . '>',
$showtopic['comment'] );
$showtopic['comment'] =
preg_replace("/\[QUOTE\sBY=\s(.+?)\]/i","[QUOTE] Quote by
$1:",$showtopic['comment']);
/* Reformat code blocks - version 2.3.3 and prior */
$showtopic['comment'] = str_replace( '<pre
class="forumCode">', '[code]', $showtopic['comment'] );
@@ -101,31 +101,31 @@
if ($CONF_FORUM['allow_smilies']) {
$search =
array(":D", ":)", ":(", "8O", ":?", "B)", ":lol:", ":x", ":P" ,":oops:", ":o",":cry:", ":evil:", ":twisted:", ":roll:", ";)", ":!:", ":question:", ":idea:", ":arrow:", ":|", ":mrgreen:",":mrt:",":love:",":cat:");
- $replace = array('<img align="absmiddle"
src="images/smilies/biggrin.gif" alt="Big Grin">',
- '<img align="absmiddle"
src="images/smilies/smile.gif" alt="Smile">',
- '<img align="absmiddle"
src="images/smilies/frown.gif" alt="Frown">',
- '<img align="absmiddle"
src="images/smilies/eek.gif" alt="Eek!">',
- '<img align="absmiddle"
src="images/smilies/confused.gif" alt="Confused">',
- '<img align="absmiddle"
src="images/smilies/cool.gif" alt="Cool">',
- '<img align="absmiddle"
src="images/smilies/lol.gif" alt="Laughing Out Loud">',
- '<img align="absmiddle"
src="images/smilies/mad.gif" alt="Angry">',
- '<img align="absmiddle"
src="images/smilies/razz.gif" alt="Razz">',
- '<img align="absmiddle"
src="images/smilies/redface.gif" alt="Oops!">',
- '<img align="absmiddle"
src="images/smilies/surprised.gif" alt="Surprised!">',
- '<img align="absmiddle"
src="images/smilies/cry.gif" alt="Cry">',
- '<img align="absmiddle"
src="images/smilies/evil.gif" alt="Evil">',
- '<img align="absmiddle"
src="images/smilies/twisted.gif" alt="Twisted Evil">',
- '<img align="absmiddle"
src="images/smilies/rolleyes.gif" alt="Rolling Eyes">',
- '<img align="absmiddle"
src="images/smilies/wink.gif" alt="Wink">',
- '<img align="absmiddle"
src="images/smilies/exclaim.gif" alt="Exclaimation">',
- '<img align="absmiddle"
src="images/smilies/question.gif" alt="Question">',
- '<img align="absmiddle"
src="images/smilies/idea.gif" alt="Idea">',
- '<img align="absmiddle"
src="images/smilies/arrow.gif" alt="Arrow">',
- '<img align="absmiddle"
src="images/smilies/neutral.gif" alt="Neutral">',
- '<img align="absmiddle"
src="images/smilies/mrgreen.gif" alt="Mr. Green">',
- '<img align="absmiddle"
src="images/smilies/mrt.gif" alt="Mr. T">',
- '<img align="absmiddle"
src="images/smilies/heart.gif" alt="Love">',
- '<img align="absmiddle"
src="images/smilies/cat.gif" alt="Kitten">');
+ $replace = array('<img style="virtical-align:middle;"
src="images/smilies/biggrin.gif" alt="Big Grin">',
+ '<img style="virtical-align:middle;"
src="images/smilies/smile.gif" alt="Smile">',
+ '<img style="virtical-align:middle;"
src="images/smilies/frown.gif" alt="Frown">',
+ '<img style="virtical-align:middle;"
src="images/smilies/eek.gif" alt="Eek!">',
+ '<img style="virtical-align:middle;"
src="images/smilies/confused.gif" alt="Confused">',
+ '<img style="virtical-align:middle;"
src="images/smilies/cool.gif" alt="Cool">',
+ '<img style="virtical-align:middle;"
src="images/smilies/lol.gif" alt="Laughing Out Loud">',
+ '<img style="virtical-align:middle;"
src="images/smilies/mad.gif" alt="Angry">',
+ '<img style="virtical-align:middle;"
src="images/smilies/razz.gif" alt="Razz">',
+ '<img style="virtical-align:middle;"
src="images/smilies/redface.gif" alt="Oops!">',
+ '<img style="virtical-align:middle;"
src="images/smilies/surprised.gif" alt="Surprised!">',
+ '<img style="virtical-align:middle;"
src="images/smilies/cry.gif" alt="Cry">',
+ '<img style="virtical-align:middle;"
src="images/smilies/evil.gif" alt="Evil">',
+ '<img style="virtical-align:middle;"
src="images/smilies/twisted.gif" alt="Twisted Evil">',
+ '<img style="virtical-align:middle;"
src="images/smilies/rolleyes.gif" alt="Rolling Eyes">',
+ '<img style="virtical-align:middle;"
src="images/smilies/wink.gif" alt="Wink">',
+ '<img style="virtical-align:middle;"
src="images/smilies/exclaim.gif" alt="Exclaimation">',
+ '<img style="virtical-align:middle;"
src="images/smilies/question.gif" alt="Question">',
+ '<img style="virtical-align:middle;"
src="images/smilies/idea.gif" alt="Idea">',
+ '<img style="virtical-align:middle;"
src="images/smilies/arrow.gif" alt="Arrow">',
+ '<img style="virtical-align:middle;"
src="images/smilies/neutral.gif" alt="Neutral">',
+ '<img style="virtical-align:middle;"
src="images/smilies/mrgreen.gif" alt="Mr. Green">',
+ '<img style="virtical-align:middle;"
src="images/smilies/mrt.gif" alt="Mr. T">',
+ '<img style="virtical-align:middle;"
src="images/smilies/heart.gif" alt="Love">',
+ '<img style="virtical-align:middle;"
src="images/smilies/cat.gif" alt="Kitten">');
}
$A["name"] = COM_getDisplayName($A["uid"]);
@@ -135,69 +135,58 @@
$A["subject"] =
htmlspecialchars($A["subject"],ENT_QUOTES,$CONF_FORUM['charset']);
$A['comment'] = gf_FormatForPrint( $A['comment'], $A['postmode'] );
+$A['comment'] = str_replace('<br />', '<br>', $A['comment'] );
$date = strftime($CONF_FORUM['default_Datetime_format'], $A['date']);
-echo"
- <html>
- <head>
- <title>$_CONF[site_name] - ".$LANG_GF02['msg147']." $A[id]]</title>
-<style>
-<!--
-body { font-size:small; }
-table { font-size:small; }
-h1 { font-size:middle; }
--->
-</style>
- </head>
- <body>
- <font face=\"verdana\" size=\"2\">
- <h3>{$LANG_GF01['SUBJECT']}: $A[subject]</h3>
- <b>{$LANG_GF01['POSTEDON']}:</b> $date
- <br" . XHTML . ">
- <b>{$LANG_GF01['BY']}</b> $A[name]
- <br" . XHTML . ">
- <br" . XHTML . ">
- <b>{$LANG_GF01['CONTENT']}:</b>
- <p>$A[comment]</p>
- <hr width=\"25%\" align=\"left\"" . XHTML . ">
-
- <br" . XHTML . ">
- <b>{$LANG_GF01['REPLIES']}:</b>
- <hr width=\"50%\" align=\"left\"" . XHTML . ">
- <br" . XHTML . ">
-";
+echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\"
\"http://www.w3.org/TR/html4/strict.dtd\">
+<html>
+<head>
+ <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
+ <meta http-equiv=\"Content-Style-Type\" content=\"text/css\">
+ <title>{$_CONF['site_name']} - {$LANG_GF02['msg147']}
[{$A['id']}]</title>
+ <style type=\"text/css\">
+ <!--
+ body { font-size:small; }
+ table { font-size:small; }
+ h1 { font-size:x-large; }
+ h2 { font-size:medium; }
+ -->
+ </style>
+</head>
+<body>
+ <h1>{$LANG_GF01['SUBJECT']}: {$A['subject']}</h1>
+ <div style=\"margin-bottom:1em;\">
+ <p>
+ <b>{$LANG_GF01['POSTEDON']}:</b> $date<br>
+ <b>{$LANG_GF01['BY']}</b> {$A['name']}<br>
+ </p>
+ </div>
+ <div>{$A['comment']}</div>";
$result2 = DB_query("SELECT * FROM {$_TABLES['gf_topic']} WHERE
(pid='$id')");
-while($B = DB_fetchArray($result2)){
-$date = strftime($CONF_FORUM['default_Datetime_format'], $B['date']);
-$B["name"] = COM_getDisplayName($B["uid"]);
-
-echo"
-
- <h4>$B[subject]</h4>
- <b>{$LANG_GF01['POSTEDON']}:</b> $date
- <br" . XHTML . ">
- <b>{$LANG_GF01['BY']}</b> $B[name]
- <br" . XHTML . ">
- <br" . XHTML . ">
- <b>{$LANG_GF01['CONTENT']}:</b>
- <p>" . gf_FormatForPrint( $B['comment'], $B['postmode']
) . "</p>
- <hr width=\"25%\" align=\"left\"" . XHTML . ">
-
-";
-
-}
-
-echo"
-
- <p>$_CONF[site_name] - {$LANG_GF01['FORUM']}<br" . XHTML . ">
- <a
href=\"$_CONF[site_url]/forum/viewtopic.php?showtopic=$A[id]\">$_CONF[site_url]/forum/viewtopic.php?showtopic=$A[id]</a>
- </p>
-
- </font>
-
- </body>
- </html>
-";
+while ($B = DB_fetchArray($result2)) {
+ $date = strftime($CONF_FORUM['default_Datetime_format'], $B['date']);
+ $B["name"] = COM_getDisplayName($B["uid"]);
+ $B['comment'] = gf_FormatForPrint( $B['comment'], $B['postmode'] );
+ $B['comment'] = str_replace('<br />', '<br>', $B['comment'] );
+ echo "
+ <hr>
+ <div style=\"margin-bottom:1em;\">
+ <h2>{$B['subject']}</h2>
+ <p>
+ <b>{$LANG_GF01['POSTEDON']}:</b> $date<br>
+ <b>{$LANG_GF01['BY']}</b> {$B['name']}<br>
+ </p>
+ </div>
+ <div>{$B['comment']}</div>";
+}
+
+echo "
+ <hr>
+ <p>{$_CONF['site_name']} - {$LANG_GF01['FORUM']}<br>
+ <a
href=\"{$_CONF['site_url']}/forum/viewtopic.php?showtopic={$A['id']}\">{$_CONF['site_url']}/forum/viewtopic.php?showtopic={$A['id']}</a>
+ </p>
+</body>
+</html>";
?>
Modified: trunk/plugins/forum/public_html/viewtopic.php
==============================================================================
--- trunk/plugins/forum/public_html/viewtopic.php (original)
+++ trunk/plugins/forum/public_html/viewtopic.php Sat Feb 7 22:41:45 2009
@@ -149,7 +149,7 @@
$printlink = "{$_CONF['site_url']}/forum/print.php?id=$showtopic";
- $printlinkimg = '<img src="'.gf_getImage('print').'" border="0"
align="absmiddle" alt="'.$LANG_GF01['PRINTABLE'].'"
title="'.$LANG_GF01['PRINTABLE'].'">';
+ $printlinkimg = '<img src="'.gf_getImage('print').'"
style="border:none; virtical-align:middle;"
alt="'.$LANG_GF01['PRINTABLE'].'" title="'.$LANG_GF01['PRINTABLE'].'">';
if ($topic_pid > 0) {
$replytopic_id = $topic_pid;
@@ -159,10 +159,10 @@
if ($viewtopic['is_readonly'] == 0 OR
forum_modPermission($viewtopic['forum'],$_USER['uid'],'mod_edit')) {
$newtopiclink
= "{$_CONF['site_url']}/forum/createtopic.php?method=newtopic&forum=$forum";
- $newtopiclinkimg = '<img src="'.gf_getImage('post_newtopic').'"
border="0" align="absmiddle" alt="'.$LANG_GF01['NEWTOPIC'].'"
title="'.$LANG_GF01['NEWTOPIC'].'">';
+ $newtopiclinkimg = '<img src="'.gf_getImage('post_newtopic').'"
style="border:none; virtical-align:middle;"
alt="'.$LANG_GF01['NEWTOPIC'].'" title="'.$LANG_GF01['NEWTOPIC'].'">';
if($viewtopic['locked'] != 1) {
$replytopiclink
= "{$_CONF['site_url']}/forum/createtopic.php?method=postreply&forum=$forum&id=$replytopic_id";
- $replytopiclinkimg = '<img src="'.gf_getImage('post_reply').'"
border="0" align="absmiddle" alt="'.$LANG_GF01['POSTREPLY'].'"
title="'.$LANG_GF01['POSTREPLY'].'">';
+ $replytopiclinkimg = '<img src="'.gf_getImage('post_reply').'"
style="border:none; virtical-align:middle;"
alt="'.$LANG_GF01['POSTREPLY'].'" title="'.$LANG_GF01['POSTREPLY'].'">';
$topicnavbar->set_var ('replytopiclink', $replytopiclink);
$topicnavbar->set_var ('replytopiclinkimg',
$replytopiclinkimg);
$topicnavbar->set_var ('LANG_reply', $LANG_GF01['POSTREPLY']);
@@ -178,7 +178,7 @@
$P = DB_fetchArray($prev_sql);
if ($P['id'] != "") {
$prevlink
= "{$_CONF['site_url']}/forum/viewtopic.php?showtopic={$P['id']}";
- $prevlinkimg = '<img src="'.gf_getImage('prev').'" border="0"
align="absmiddle" alt="'.$LANG_GF01['PREVTOPIC'].'"
title="'.$LANG_GF01['PREVTOPIC'].'">';
+ $prevlinkimg = '<img src="'.gf_getImage('prev').'"
style="border:none; virtical-align:middle;"
alt="'.$LANG_GF01['PREVTOPIC'].'" title="'.$LANG_GF01['PREVTOPIC'].'">';
$topicnavbar->set_var ('prevlinkimg', $prevlinkimg);
$topicnavbar->set_var ('prevlink', $prevlink);
$topicnavbar->set_var ('LANG_prevlink',$LANG_GF01['PREVTOPIC']);
@@ -189,7 +189,7 @@
$N = DB_fetchArray($next_sql);
if ($N['id'] > 0) {
$nextlink
= "{$_CONF['site_url']}/forum/viewtopic.php?showtopic={$N['id']}";
- $nextlinkimg = '<img src="'.gf_getImage('next').'" border="0"
align="absmiddle" alt="'.$LANG_GF01['NEXTTOPIC'].'"
title="'.$LANG_GF01['NEXTTOPIC'].'">';
+ $nextlinkimg = '<img src="'.gf_getImage('next').'"
style="border:none; virtical-align:middle;"
alt="'.$LANG_GF01['NEXTTOPIC'].'" title="'.$LANG_GF01['NEXTTOPIC'].'">';
$topicnavbar->set_var ('nextlinkimg', $nextlinkimg);
$topicnavbar->set_var ('nextlink', $nextlink);
$topicnavbar->set_var ('LANG_nextlink',$LANG_GF01['NEXTTOPIC']);
@@ -203,26 +203,26 @@
/* Check for a un-subscribe record */
$ntopicid = -$showtopic; // Negative value
if (DB_count($_TABLES['gf_watch'],
array('forum_id', 'topic_id', 'uid'), array($forumid,
$ntopicid,$_USER['uid'])) > 0) {
- $notifylinkimg = '<img src="'.gf_getImage('notify_on').'"
border="0" align="absmiddle" alt="'.$LANG_GF02['msg62'].'"
title="'.$LANG_GF02['msg62'].'">';
+ $notifylinkimg = '<img src="'.gf_getImage('notify_on').'"
style="border:none; virtical-align:middle;" alt="'.$LANG_GF02['msg62'].'"
title="'.$LANG_GF02['msg62'].'">';
$notifylink
= "{$_CONF['site_url']}/forum/notify.php?forum=$forumid&submit=save&id=$showtopic";
$topicnavbar->set_var ('LANG_notify',
$LANG_GF01['SubscribeLink']);
/* Check if user has subscribed to complete forum */
} elseif (DB_count($_TABLES['gf_watch'],
array('forum_id', 'topic_id', 'uid'), array($forumid, '0',$_USER['uid'])) >
0) {
$notifyID =
DB_getItem($_TABLES['gf_watch'],'id', "forum_id='$forumid' AND topic_id='0'
AND uid='{$_USER['uid']}'");
- $notifylinkimg = '<img src="'.gf_getImage('notify_off').'"
border="0" align="absmiddle" alt="'.$LANG_GF02['msg137'].'"
title="'.$LANG_GF02['msg137'].'">';
+ $notifylinkimg = '<img src="'.gf_getImage('notify_off').'"
style="border:none; virtical-align:middle;" alt="'.$LANG_GF02['msg137'].'"
title="'.$LANG_GF02['msg137'].'">';
$notifylink
= "{$_CONF['site_url']}/forum/notify.php?submit=delete2&id=$notifyID&forum=$forumid&topic=$showtopic";
$topicnavbar->set_var ('LANG_notify',
$LANG_GF01['unSubscribeLink']);
/* Check if user is subscribed to this specific topic */
} elseif (DB_count($_TABLES['gf_watch'],
array('forum_id', 'topic_id', 'uid'), array($forumid,
$showtopic,$_USER['uid'])) > 0) {
$notifyID =
DB_getItem($_TABLES['gf_watch'],'id', "forum_id='$forumid' AND
topic_id='$showtopic' AND uid='{$_USER['uid']}'");
- $notifylinkimg = '<img src="'.gf_getImage('notify_off').'"
border="0" align="absmiddle" alt="'.$LANG_GF02['msg137'].'"
title="'.$LANG_GF02['msg137'].'">';
+ $notifylinkimg = '<img src="'.gf_getImage('notify_off').'"
style="border:none; virtical-align:middle;" alt="'.$LANG_GF02['msg137'].'"
title="'.$LANG_GF02['msg137'].'">';
$notifylink
= "{$_CONF['site_url']}/forum/notify.php?submit=delete2&id=$notifyID&forum=$forumid&topic=$showtopic";
$topicnavbar->set_var ('LANG_notify',
$LANG_GF01['unSubscribeLink']);
} else {
- $notifylinkimg = '<img src="'.gf_getImage('notify_on').'"
border="0" align="absmiddle" alt="'.$LANG_GF02['msg62'].'"
title="'.$LANG_GF02['msg62'].'">';
+ $notifylinkimg = '<img src="'.gf_getImage('notify_on').'"
style="border:none; virtical-align:middle;" alt="'.$LANG_GF02['msg62'].'"
title="'.$LANG_GF02['msg62'].'">';
$notifylink
= "{$_CONF['site_url']}/forum/notify.php?forum=$forumid&submit=save&id=$showtopic";
$topicnavbar->set_var ('LANG_notify',
$LANG_GF01['SubscribeLink']);
}
@@ -253,8 +253,8 @@
$topicnavbar->parse ('print_link', 'print');
$topicnavbar->set_var ('imgset', $CONF_FORUM['imgset']);
- $topicnavbar->set_var ('navbreadcrumbsimg','<img
src="'.gf_getImage('nav_breadcrumbs').'">');
- $topicnavbar->set_var ('navtopicimg','<img
src="'.gf_getImage('nav_topic').'">');
+ $topicnavbar->set_var ('navbreadcrumbsimg','<img alt=""
src="'.gf_getImage('nav_breadcrumbs').'">');
+ $topicnavbar->set_var ('navtopicimg','<img alt=""
src="'.gf_getImage('nav_topic').'">');
$topicnavbar->set_var('forum_home',$LANG_GF01['INDEXPAGE']);
$topicnavbar->set_var ('cat_name',
DB_getItem($_TABLES['gf_categories'],"cat_name","id={$viewtopic['forum_cat']}"));
$topicnavbar->set_var ('forum_id', $forum);
@@ -340,7 +340,7 @@
if ($viewtopic['is_readonly'] == 0 OR
forum_modPermission($viewtopic['forum'],$_USER['uid'],'mod_edit')) {
$newtopiclink
= "{$_CONF['site_url']}/forum/createtopic.php?method=newtopic&forum=$forum";
- $newtopiclinkimg = '<img src="'.gf_getImage('post_newtopic').'"
border="0" align="absmiddle" alt="'.$LANG_GF01['NEWTOPIC'].'"
title="'.$LANG_GF01['NEWTOPIC'].'">';
+ $newtopiclinkimg = '<img src="'.gf_getImage('post_newtopic').'"
style="border:none; virtical-align:middle;"
alt="'.$LANG_GF01['NEWTOPIC'].'" title="'.$LANG_GF01['NEWTOPIC'].'">';
$topic_footer->set_var ('xhtml', XHTML);
$topic_footer->set_var ('layout_url', $_CONF['layout_url']);
$topicDisplayTime = $mytimer->stopTimer();
@@ -352,7 +352,7 @@
if($viewtopic['locked'] != 1) {
$replytopiclink
= "{$_CONF['site_url']}/forum/createtopic.php?method=postreply&forum=$forum&id=$replytopic_id";
- $replytopiclinkimg = '<img src="'.gf_getImage('post_reply').'"
border="0" align="absmiddle" alt="'.$LANG_GF01['POSTREPLY'].'"
title="'.$LANG_GF01['POSTREPLY'].'">';
+ $replytopiclinkimg = '<img src="'.gf_getImage('post_reply').'"
style="border:none; virtical-align:middle;"
alt="'.$LANG_GF01['POSTREPLY'].'" title="'.$LANG_GF01['POSTREPLY'].'">';
$topic_footer->set_var ('replytopiclink', $replytopiclink);
$topic_footer->set_var ('replytopiclinkimg',
$replytopiclinkimg);
$topic_footer->set_var ('LANG_reply', $LANG_GF01['POSTREPLY']);
Modified: trunk/plugins/forum/readme.jp
==============================================================================
--- trunk/plugins/forum/readme.jp (original)
+++ trunk/plugins/forum/readme.jp Sat Feb 7 22:41:45 2009
@@ -96,3 +96,10 @@
JPr4.1 #edited by dengen
・大文字小文字を区別しないファイルシステム（MS Windowsなど）で、インクルー
ドファイルが直接アクセスされるのを防ぐ措置を追加
+
+JPr4.2 #edited by dengen
+
+・オリジナル版のversion 2.7.2をマージ（セキュリティ対策）
+・HTMLコードの適正化を実施（ほぼ達成）
+・印刷用ページの改善
+・その他、微調整
Modified: trunk/plugins/forum/themefiles/forum/layout/admin/banip_mgmt.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/admin/banip_mgmt.thtml
(original)
+++ trunk/plugins/forum/themefiles/forum/layout/admin/banip_mgmt.thtml Sat
Feb 7 22:41:45 2009
@@ -3,11 +3,11 @@
{startblock}
{navbar}
<form name="frm_messages" action="{phpself}" method="post"
style="margin:0px;">
-<input type="hidden" name="op" value=""{xhtml}>
+<div><input type="hidden" name="op" value=""{xhtml}></div>
<table width="100%" border="0" cellspacing="1" cellpadding="3"
class="pluginSolidOutline" style="margin-top:25px;">
<tr>
- <td class="pluginTitle" width="90%">{LANG_IP}</td>
- <td class="pluginTitle" width="10%"
style="padding-right:5px;">{LANG_Actions}</td>
+ <td class="pluginCellTitle" style="width:90%
white-space:nowrap;">{LANG_IP}</td>
+ <td class="pluginCellTitle" style="width:10%; padding-right:5px;
white-space:nowrap;">{LANG_Actions}</td>
</tr>
<tr style="display:{showalert};">
<td colspan="6" class="pluginAlert">{alertmessage}</td>
Modified:
trunk/plugins/forum/themefiles/forum/layout/admin/board_categories.thtml
==============================================================================
---
trunk/plugins/forum/themefiles/forum/layout/admin/board_categories.thtml
(original)
+++
trunk/plugins/forum/themefiles/forum/layout/admin/board_categories.thtml
Sat Feb 7 22:41:45 2009
@@ -5,7 +5,7 @@
<td>
<table width="100%" cellspacing="0" cellpadding="0"
style="border:0 none;">
<tr>
- <td style="height:8px; width:10px;"><img
src="{imgset}/forumindex.png" border="0"{xhtml}></td>
+ <td style="height:8px; width:10px;"><img alt=""
src="{imgset}/forumindex.png" style="border:none;"{xhtml}></td>
<td class="pluginHeader alignleft"
style="white-space:nowrap;"> {catname}:</td>
<td class="alignright"
style="white-space:nowrap;">{catorder}: {order} </td>
</tr>
@@ -16,10 +16,10 @@
<td style="padding:0px;">
<table width="100%" cellspacing="1" cellpadding="3"
class="pluginSolidOutline" style="border:0 none;">
<tr>
- <td class="pluginCellTitle" style="padding-left:5px
width:15%;">{LANG_action}</td>
+ <td class="pluginCellTitle aligncenter"
style="padding-left:5px width:15%;">{LANG_action}</td>
<td class="pluginCellTitle"
style="width:70%;">{LANG_forumdesc}</td>
- <td class="pluginCellTitle" style="width:5%;
white-space:nowrap;">{LANG_posts}</td>
- <td class="pluginCellTitle"
style="width:10%;">{LANG_order}</td>
+ <td class="pluginCellTitle aligncenter"
style="width:5%; white-space:nowrap;">{LANG_posts}</td>
+ <td class="pluginCellTitle aligncenter"
style="width:10%;">{LANG_order}</td>
</tr>
{forum_records}
</table>
@@ -42,7 +42,7 @@
</fieldset>
</form>
</td>
- <td class="alignright" style="width:60%;
white-space:nowrap;">[ <a
href="{phpself}?mode=add&type=forum&category={catid}&catname={catname}">{addforum}</a> ] <br{xhtml}><p{xhtml}></td>
+ <td class="alignright" style="width:60%;
white-space:nowrap;">[ <a
href="{phpself}?mode=add&type=forum&category={catid}&catname={catname}">{addforum}</a> ] <br{xhtml}></td>
</tr>
</table>
</td>
Modified:
trunk/plugins/forum/themefiles/forum/layout/admin/boards_edtcategory.thtml
==============================================================================
---
trunk/plugins/forum/themefiles/forum/layout/admin/boards_edtcategory.thtml
(original)
+++
trunk/plugins/forum/themefiles/forum/layout/admin/boards_edtcategory.thtml
Sat Feb 7 22:41:45 2009
@@ -9,7 +9,7 @@
<td class="pluginCellSubTitle" style="padding:0px;">
<table width="100%" border="0" cellspacing="1"
cellpadding="0">
<tr>
- <td width="110"
class="pluginCellSubTitle">{LANG_NAME}</td>
+ <td style="width:110px;"
class="pluginCellSubTitle">{LANG_NAME}</td>
<td class="pluginCellText pluginCellFill"
style="white-space:nowrap;"><input type="text" name="name"
value="{catname}" size="70"{xhtml}></td>
</tr>
<tr>
Modified: trunk/plugins/forum/themefiles/forum/layout/admin/header.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/admin/header.thtml
(original)
+++ trunk/plugins/forum/themefiles/forum/layout/admin/header.thtml Sat Feb
7 22:41:45 2009
@@ -10,5 +10,4 @@
<td class="navbar" style="width:16%; white-space:nowrap;"><a
class="btn1" href="ips.php">{ipman}</a></td>
</tr>
</table>
-<p{xhtml}>
<!-- end header.thtml -->
Modified: trunk/plugins/forum/themefiles/forum/layout/admin/ip_records.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/admin/ip_records.thtml
(original)
+++ trunk/plugins/forum/themefiles/forum/layout/admin/ip_records.thtml Sat
Feb 7 22:41:45 2009
@@ -2,6 +2,6 @@
<!-- start ip_records.thtml -->
<tr class="pluginRow{csscode}">
<td style="padding:5px;">{ip}</td>
- <td style="padding:5px; white-space:nowrap;">[ <a
href="{phpself}?op=unban&ip={ip}">{unban}</a> ]</td>
+ <td style="padding:5px; white-space:nowrap;">[ <a
href="{phpself}?op=unban&ip={ip}">{unban}</a> ]</td>
</tr>
<!-- end ip_records.thtml -->
Modified: trunk/plugins/forum/themefiles/forum/layout/admin/ips_unban.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/admin/ips_unban.thtml
(original)
+++ trunk/plugins/forum/themefiles/forum/layout/admin/ips_unban.thtml Sat
Feb 7 22:41:45 2009
@@ -1,6 +1,7 @@
<!-- start ips_unban.thtml -->
<form action="{phpself}" method="post">
+<div>
<input type="hidden" name="mode" value="{mode}"{xhtml}>
<input type="hidden" name="sure" value="{sure}"{xhtml}>
<input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
@@ -9,6 +10,7 @@
<br{xhtml}>
{msg2}
<br{xhtml}><br{xhtml}>
-<center><input type="submit" value="{ban]"{xhtml}></center>
+<center><input type="submit" value="{ban}"{xhtml}></center>
+</div>
</form>
<!-- end ips_unban.thtml -->
Modified:
trunk/plugins/forum/themefiles/forum/layout/admin/message_line.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/admin/message_line.thtml
(original)
+++ trunk/plugins/forum/themefiles/forum/layout/admin/message_line.thtml
Sat Feb 7 22:41:45 2009
@@ -6,6 +6,6 @@
<td>{subject}</td>
<td class="aligncenter">{views}</td>
<td class="aligncenter">{replies}</td>
- <td class="aligncenter"><a href="{phpself}?op=delrecord&id={id}"
onclick='return confirm("{LANG_DELCONFIRM}");'>{LANG_Delete}</a> |
<a
href="{siteurl}/forum/viewtopic.php?&forum={forum}&showtopic={topicid}">{LANG_Moderate}</a></td>
+ <td class="aligncenter"><a
href="{phpself}?op=delrecord&id={id}" onclick='return
confirm("{LANG_DELCONFIRM}");'>{LANG_Delete}</a> | <a
href="{siteurl}/forum/viewtopic.php?forum={forum}&showtopic={topicid}">{LANG_Moderate}</a></td>
</tr>
<!-- end message_line.thtml -->
Modified: trunk/plugins/forum/themefiles/forum/layout/admin/messages.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/admin/messages.thtml
(original)
+++ trunk/plugins/forum/themefiles/forum/layout/admin/messages.thtml Sat
Feb 7 22:41:45 2009
@@ -3,25 +3,27 @@
{startblock}
{navbar}
<form name="frm_messages" action="{phpself}" method="post"
style="margin:0px;">
-<input type="hidden" name="op" value=""{xhtml}>
-<input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
+<div>
+ <input type="hidden" name="op" value=""{xhtml}>
+ <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
+</div>
<table cellspacing="0" cellpadding="0" border="0" width="100%"
style="margin-top:25px; margin-bottom:15px;">
<tr>
<td>
<select name="forum" style="width:140px"
onchange="document.frm_messages.submit();"><option selected="selected"
value="-1">{LANG_select1}{select_forum}</option></select>
- <span style="padding-left:15px;"><select name="member"
style="width:140px" onchange="document.frm_messages.submit();"><option
selected="selected"
value="-1">{LANG_select2}{select_member}</option></select></span>
+ <span style="padding-left:15px;"><select name="member"
style="width:140px" onchange="document.frm_messages.submit();"><option
selected="selected"
value="-1">{LANG_select2}</option>{select_member}</select></span>
<span style="padding-left:15px;"><input type="checkbox"
name="parentonly" value="1" onclick=' document.frm_messages.submit();'
{chk_parentonly}{xhtml}>{LANG_Parent}</span>
</td>
</tr>
</table>
<table width="100%" border="0" cellspacing="1" cellpadding="3"
class="pluginSolidOutline">
<tr>
- <td class="pluginCellTitle" width="5%"><img
src="{imgset}/trash.gif" title="{LANG_deleteall}" border="0" onclick='
if(confirm("{LANG_DELALLCONFIRM}"))
{document.frm_messages.op.value="delchecked";
document.frm_messages.submit();}'{xhtml}></td>
- <td class="pluginCellTitle" width="20%">{LANG_Author}</td>
- <td class="pluginCellTitle" width="35%">{LANG_Subject}</td>
- <td class="pluginCellTitle aligncenter"
width="10%">{LANG_Views}</td>
- <td class="pluginCellTitle aligncenter"
width="10%">{LANG_Replies}</td>
- <td class="pluginCellTitle aligncenter"
width="20%">{LANG_Actions}</td>
+ <td class="pluginCellTitle" style="width:1%;
white-space:nowrap;"><img src="{imgset}/trash.gif" title="{LANG_deleteall}"
alt="" style="border:none;" onclick=' if(confirm("{LANG_DELALLCONFIRM}"))
{document.frm_messages.op.value="delchecked";
document.frm_messages.submit();}'{xhtml}></td>
+ <td class="pluginCellTitle" style="width:20%;
white-space:nowrap;">{LANG_Author}</td>
+ <td class="pluginCellTitle" style="width:39%;
white-space:nowrap;">{LANG_Subject}</td>
+ <td class="pluginCellTitle aligncenter" style="width:10%;
white-space:nowrap;">{LANG_Views}</td>
+ <td class="pluginCellTitle aligncenter" style="width:10%;
white-space:nowrap;">{LANG_Replies}</td>
+ <td class="pluginCellTitle aligncenter" style="width:20%;
white-space:nowrap;">{LANG_Actions}</td>
</tr>
<tr style="display:{showalert};">
<td colspan="6" class="pluginAlert">{alertmessage}</td>
Modified:
trunk/plugins/forum/themefiles/forum/layout/admin/migratestories.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/admin/migratestories.thtml
(original)
+++ trunk/plugins/forum/themefiles/forum/layout/admin/migratestories.thtml
Sat Feb 7 22:41:45 2009
@@ -25,7 +25,7 @@
// End -->
</script>
<form name="storymigrate" action="{action_url}" method="post">
-<input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
+<div><input type="hidden" name="{gltoken_name}"
value="{gltoken}"{xhtml}></div>
<table cellspacing="0" cellpadding="0" border="0" width="100%"
style="margin-top:25px; margin-bottom:15px;">
<tr>
<td style="width:50%;
padding-left:10px;">{filter_topic_selection} <input type="submit"
value="{LANG_filterlist}"{xhtml}></td>
@@ -40,10 +40,10 @@
</tr>
<tr>
<td class="pluginCellTitle" style="width:5%;
white-space:nowrap;"><input type="checkbox" name="cb_migrateall" value="y"
onclick="if(!allChecked)
checkAll(document.storymigrate.elements['cb_chkentry[]']); else
uncheckAll(document.storymigrate.elements['cb_chkentry[]']);"{xhtml}> {LANG_all}</td>
- <td class="pluginCellTitle aligncenter" style="width:15%;
padding-top:5px;">{LANG_topic}</td>
- <td class="pluginCellTitle" style="width:45%;
padding-top:5px;">{LANG_title}</td>
- <td class="pluginCellTitle" style="width:25%;
padding-top:5px;">{LANG_date}</td>
- <td class="pluginCellTitle" style="width:10%;
padding-top:5px;">{LANG_comments}</td>
+ <td class="pluginCellTitle" style="width:20%; padding-top:5px;
white-space:nowrap;">{LANG_topic}</td>
+ <td class="pluginCellTitle" style="width:55%; padding-top:5px;
white-space:nowrap;">{LANG_title}</td>
+ <td class="pluginCellTitle" style="width:15%; padding-top:5px;
white-space:nowrap;">{LANG_date}</td>
+ <td class="pluginCellTitle aligncenter" style="width:10%;
padding-top:5px; white-space:nowrap;">{LANG_comments}</td>
</tr>
{story_record}
</table>
Modified: trunk/plugins/forum/themefiles/forum/layout/admin/mod_add.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/admin/mod_add.thtml
(original)
+++ trunk/plugins/forum/themefiles/forum/layout/admin/mod_add.thtml Sat
Feb 7 22:41:45 2009
@@ -1,6 +1,6 @@
<!-- start mod_add.thtml -->
-<script language="javascript">
+<script type="text/javascript">
<!-- Begin
function toggleModeratorMode(mode) {
if (mode == 'user') {
@@ -19,12 +19,14 @@
</script>
<form name="modform" action="{action_url}" method="post">
- <input type="hidden" name="recid" value=""{xhtml}>
- <input type="hidden" name="operation" value="addrecord"{xhtml}>
- <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
+ <div>
+ <input type="hidden" name="recid" value=""{xhtml}>
+ <input type="hidden" name="operation" value="addrecord"{xhtml}>
+ <input type="hidden" name="{gltoken_name}"
value="{gltoken}"{xhtml}>
+ </div>
<table width="100%" border="0" cellspacing="1" cellpadding="0"
class="plugin">
<tr>
- <td colspan="4" class="pluginCellTitle" style="padding:20px
5px 10px 10px;">{LANG_ADDMessage}</td>
+ <td colspan="4" class="pluginCellTitle" style="padding:10px
5px 10px 10px;">{LANG_ADDMessage}</td>
</tr>
<tr style="text-align:left; vertical-align:top;">
<td class="pluginCellSubTitle" style="padding:10px 5px 5px
10px;">{LANG_filtertitle}</td>
@@ -34,14 +36,14 @@
<td class="pluginCellSubTitle" style="padding:10px 5px 5px
5px">{LANG_functions}</td>
</tr>
<tr style="text-align:left; vertical-align:top;">
- <td width="25%" class="pluginCellText
pluginCellFill"style="padding:5px 5px 5px 20px;">
+ <td class="pluginCellText pluginCellFill"style="width:25%;
padding:5px 5px 5px 20px;">
<input type="radio" name="modtype" value="user"
checked="checked"
onclick="toggleModeratorMode('user');"{xhtml}>{LANG_user}<br{xhtml}>
<input type="radio" name="modtype" value="group"
onclick="toggleModeratorMode('group');"{xhtml}>{LANG_group}</td>
- <td width="25%" class="pluginCellText pluginCellFill"
style="padding:5px 5px 5px 10px;"><select name="sel_forum[]"
style="width:200px;" size="6" multiple>{sel_forums}</select></td>
- <td id="selusers" width="25%" class="pluginCellText
pluginCellFill" style="padding:5px 5px 5px 10px;display:;"><select
name="sel_user[]" style="width:100px;" size="6"
multiple>{sel_users}</select></td>
- <td id="selgroup" width="25%" class="pluginCellText
pluginCellFill" style="padding:5px 5px 5px 10px;display:none;"><select
name="sel_group" style="width:100px;" >{sel_groups}</select></td>
+ <td class="pluginCellText pluginCellFill" style="width:25%;
padding:5px 5px 5px 10px;"><select name="sel_forum[]" style="width:200px;"
size="6" multiple>{sel_forums}</select></td>
+ <td id="selusers" class="pluginCellText pluginCellFill"
style="width:25%; padding:5px 5px 5px 10px; display:;"><select
name="sel_user[]" style="width:100px;" size="6"
multiple>{sel_users}</select></td>
+ <td id="selgroup" class="pluginCellText pluginCellFill"
style="width:25%; padding:5px 5px 5px 10px; display:none;"><select
name="sel_group" style="width:100px;" >{sel_groups}</select></td>
- <td width="25%" class="pluginCellText pluginCellFill"
style="padding:5px 5px 5px 10px;">
+ <td class="pluginCellText pluginCellFill" style="width:25%;
padding:5px 5px 5px 10px;">
<table width="100%" border="0" cellspacing="0"
cellpadding="0">
<tr>
<td><input type="checkbox" name="chk_delete"
value="1"{xhtml}></td><td>{LANG_DELETE}</td>
Modified: trunk/plugins/forum/themefiles/forum/layout/admin/moderators.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/admin/moderators.thtml
(original)
+++ trunk/plugins/forum/themefiles/forum/layout/admin/moderators.thtml Sat
Feb 7 22:41:45 2009
@@ -10,10 +10,11 @@
// End -->
</script>
<form name="modform" action="{action_url}" method="post">
- <input type="hidden" name="recid" value=""{xhtml}>
- <input type="hidden" name="operation" value=""{xhtml}>
- <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
-
+ <div>
+ <input type="hidden" name="recid" value=""{xhtml}>
+ <input type="hidden" name="operation" value=""{xhtml}>
+ <input type="hidden" name="{gltoken_name}"
value="{gltoken}"{xhtml}>
+ </div>
<table width="100%" border="0" cellspacing="0" cellpadding="0"
style="margin-top:10px;">
<tr>
<td style="padding:2px 0px 2px 10px;">
@@ -29,21 +30,21 @@
</table>
</fieldset>
</td>
- <td class="alignright" style="padding-right:5px;"
width="20%"><input name="promptadd" type="submit" value="{LANG_addmod}"
style="padding:3px;"{xhtml}></td>
+ <td class="alignright" style="padding-right:5px;
width:20%;"><input name="promptadd" type="submit" value="{LANG_addmod}"
style="padding:3px;"{xhtml}></td>
</tr>
<tr>
<td colspan="2">
<table border="0" width="100%" cellspacing="1"
cellpadding="3" class="pluginSolidOutline">
<tr>
- <td class="pluginCellTitle"><img
src="{imgset}/trash.gif" title="{LANG_deleteall}" border="0" onclick='
if(confirm("{LANG_DELCONFIRM}"))
{document.modform.operation.value="delchecked";
document.modform.submit();}'{xhtml}></td>
+ <td class="pluginCellTitle" style="width:1%;
white-space:nowrap;"><img src="{imgset}/trash.gif" title="{LANG_deleteall}"
onclick=' if(confirm("{LANG_DELCONFIRM}"))
{document.modform.operation.value="delchecked";
document.modform.submit();}' alt=""{xhtml}></td>
<td class="pluginCellTitle alignleft"
style="width:10%; white-space:nowrap;">{LANG_HEADING2}</td>
<td class="pluginCellTitle alignleft"
style="width:35%; white-space:nowrap;">{LANG_FORUM}</td>
- <td class="pluginCellTitle">{LANG_DELETE}</td>
- <td class="pluginCellTitle">{LANG_BAN}</td>
- <td class="pluginCellTitle">{LANG_EDIT}</td>
- <td class="pluginCellTitle">{LANG_MOVE}</td>
- <td class="pluginCellTitle">{LANG_STICK}</td>
- <td class="pluginCellTitle aligncenter"
style="white-space:nowrap;">{LANG_OPERATION}</td>
+ <td class="pluginCellTitle aligncenter"
style="width:1%; white-space:nowrap;">{LANG_DELETE}</td>
+ <td class="pluginCellTitle aligncenter"
style="width:1%; white-space:nowrap;">{LANG_BAN}</td>
+ <td class="pluginCellTitle aligncenter"
style="width:1%; white-space:nowrap;">{LANG_EDIT}</td>
+ <td class="pluginCellTitle aligncenter"
style="width:1%; white-space:nowrap;">{LANG_MOVE}</td>
+ <td class="pluginCellTitle aligncenter"
style="width:1%; white-space:nowrap;">{LANG_STICK}</td>
+ <td class="pluginCellTitle aligncenter"
style="width:1%; white-space:nowrap;">{LANG_OPERATION}</td>
</tr>
{moderator_records}
</table>
Modified:
trunk/plugins/forum/themefiles/forum/layout/blocks/block_displayline.thtml
==============================================================================
---
trunk/plugins/forum/themefiles/forum/layout/blocks/block_displayline.thtml
(original)
+++
trunk/plugins/forum/themefiles/forum/layout/blocks/block_displayline.thtml
Sat Feb 7 22:41:45 2009
@@ -3,7 +3,7 @@
<table width="100%" border="0" cellpadding="0" cellspacing="0" >
<tr>
<td class="pluginRow{css_id} alignleft" style="width:100%">
- <img alt="red arrow" src="{img_dir}/redarrow.gif"{xhtml}><b><a
href="{site_url}/forum/viewtopic.php?showtopic={topic_id}&fromblock=yes"
title="{fullsubject}">{topic_subject}</a></b><br{xhtml}> <small><b>{LANG_BY}</b> {user_name}</small><br{xhtml}> <small><b>{LANG_ON}</b> {date}</small><br{xhtml}> <small><b>{LANG_VIEWS}</b> {views} <b>{LANG_REPLIES}</b> {replies}</small><br{xhtml}>
+ <img src="{img_dir}/redarrow.gif" alt=""{xhtml}><b><a
href="{site_url}/forum/viewtopic.php?showtopic={topic_id}&fromblock=yes"
title="{fullsubject}">{topic_subject}</a></b><br{xhtml}> <small><b>{LANG_BY}</b> {user_name}</small><br{xhtml}> <small><b>{LANG_ON}</b> {date}</small><br{xhtml}> <small><b>{LANG_VIEWS}</b> {views} <b>{LANG_REPLIES}</b> {replies}</small><br{xhtml}>
</td>
</tr>
</table>
Modified: trunk/plugins/forum/themefiles/forum/layout/categorylisting.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/categorylisting.thtml
(original)
+++ trunk/plugins/forum/themefiles/forum/layout/categorylisting.thtml Sat
Feb 7 22:41:45 2009
@@ -12,9 +12,9 @@
<table width="100%" border="0" cellspacing="1" cellpadding="3"
class="pluginSolidOutline" style="margin-bottom:10px;">
<tr>
<td class="pluginCellTitle alignleft" colspan="2">{cat_desc}</td>
- <td class="pluginCellTitle aligntop" style="width:5%"><span
style="white-space:nowrap">{LANGGF01_TOPICS}</span></td>
- <td class="pluginCellTitle aligntop" style="width:5%"><span
style="white-space:nowrap">{LANGGF01_POSTS}</span></td>
- <td class="pluginCellTitle aligntop" style="width:25%"><span
style="white-space:nowrap">{LANGGF01_LASTPOST}</span></td>
+ <td class="pluginCellTitle aligncenter" style="width:5%"><span
style="white-space:nowrap">{LANGGF01_TOPICS}</span></td>
+ <td class="pluginCellTitle aligncenter" style="width:5%"><span
style="white-space:nowrap">{LANGGF01_POSTS}</span></td>
+ <td class="pluginCellTitle alignleft" style="width:25%"><span
style="white-space:nowrap">{LANGGF01_LASTPOST}</span></td>
</tr>
{forum_records}
</table>
Modified:
trunk/plugins/forum/themefiles/forum/layout/forumlisting_record.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/forumlisting_record.thtml
(original)
+++ trunk/plugins/forum/themefiles/forum/layout/forumlisting_record.thtml
Sat Feb 7 22:41:45 2009
@@ -1,10 +1,10 @@
<!-- start forumlisting_record.thtml -->
<tr class="pluginRollOut pluginLinks"
onmouseover="className='pluginRollOver pluginLinks';"
onmouseout="className='pluginRollOut pluginLinks';">
- <td style="vertical-align:top; width:25px">{folderimg}</td>
+ <td style="vertical-align:top; width:1%">{folderimg}</td>
<td class="alignleft pluginCellText"
style="vertical-align:top; width:60%"
onmouseover="this.style.cursor='pointer';"
onclick="window.location.href='index.php?forum={forum_id}';
this.style.cursor='pointer';"><a class="pluginLinks"
style="text-decoration:none;"
href="index.php?forum={forum_id}">{forum_name}</a><div
style="text-align:left">{forum_desc}</div>{moderator}</td>
- <td class="aligncenter pluginCellText"
style="vertical-align:top; width:5%">{topics}</td>
- <td class="aligncenter pluginCellText"
style="vertical-align:top; width:5%">{posts}</td>
+ <td class="aligncenter pluginCellText"
style="vertical-align:middle; width:5%">{topics}</td>
+ <td class="aligncenter pluginCellText"
style="vertical-align:middle; width:5%">{posts}</td>
<td class="alignleft pluginCellText"
style="vertical-align:top; width:5%; white-space:nowrap;"
onmouseover="this.style.cursor='pointer';"
onclick="window.location.href='viewtopic.php?showtopic={topic_id}&lastpost=true#{lastpostid}';
this.style.cursor='pointer';">{lastpostmsgDate}<br{xhtml}>{lastpostmsgTopic}<br{xhtml}>{lastpostmsgBy}</td>
</tr>
<!-- end forumlisting_record.thtml -->
Modified: trunk/plugins/forum/themefiles/forum/layout/links/edittopic.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/links/edittopic.thtml
(original)
+++ trunk/plugins/forum/themefiles/forum/layout/links/edittopic.thtml Sat
Feb 7 22:41:45 2009
@@ -1,3 +1,3 @@
<!-- start edittopic.thtml -->
-<td style="padding-right:3px;"><a href="{editlink}">{editlinkimg}</a></td>
+<td style="padding-top:3px; padding-right:3px;"><a
href="{editlink}">{editlinkimg}</a></td>
<!-- end edittopic.thtml -->
Modified: trunk/plugins/forum/themefiles/forum/layout/links/email.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/links/email.thtml (original)
+++ trunk/plugins/forum/themefiles/forum/layout/links/email.thtml Sat Feb
7 22:41:45 2009
@@ -1,3 +1,3 @@
<!-- start email.thtml -->
-<td style="padding-right:3px;"><a
href="{emaillink}">{emaillinkimg}</a></td>
+<td style="padding-top:3px; padding-right:3px;"><a
href="{emaillink}">{emaillinkimg}</a></td>
<!-- end email.thtml -->
Modified: trunk/plugins/forum/themefiles/forum/layout/links/pm.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/links/pm.thtml (original)
+++ trunk/plugins/forum/themefiles/forum/layout/links/pm.thtml Sat Feb 7
22:41:45 2009
@@ -1,3 +1,3 @@
<!-- start pm.thtml -->
-<td style="padding-right:3px;"><a href="{pmlink}">{pmlinkimg}</a></td>
+<td style="padding-top:3px; padding-right:3px;"><a
href="{pmlink}">{pmlinkimg}</a></td>
<!-- end pm.thtml -->
Modified: trunk/plugins/forum/themefiles/forum/layout/links/profile.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/links/profile.thtml
(original)
+++ trunk/plugins/forum/themefiles/forum/layout/links/profile.thtml Sat
Feb 7 22:41:45 2009
@@ -1,3 +1,3 @@
<!-- start profile.thtml -->
-<td style="padding-right:3px;"><a
href="{profilelink}">{profilelinkimg}</a></td>
+<td style="padding-top:3px; padding-right:3px;"><a
href="{profilelink}">{profilelinkimg}</a></td>
<!-- end profile.thtml -->
Modified: trunk/plugins/forum/themefiles/forum/layout/links/quotetopic.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/links/quotetopic.thtml
(original)
+++ trunk/plugins/forum/themefiles/forum/layout/links/quotetopic.thtml Sat
Feb 7 22:41:45 2009
@@ -1,3 +1,3 @@
<!-- start quotetopic.thtml -->
-<td><a href="{quotelink}">{quotelinkimg}</a></td>
+<td style="padding-top:3px;"><a href="{quotelink}">{quotelinkimg}</a></td>
<!-- end quotetopic.thtml -->
Modified: trunk/plugins/forum/themefiles/forum/layout/links/website.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/links/website.thtml
(original)
+++ trunk/plugins/forum/themefiles/forum/layout/links/website.thtml Sat
Feb 7 22:41:45 2009
@@ -1,3 +1,3 @@
<!-- start website.thtml -->
-<td style="padding-right:3px;"><a
href="{websitelink}">{websitelinkimg}</a></td>
+<td style="padding-top:3px; padding-right:3px;"><a
href="{websitelink}">{websitelinkimg}</a></td>
<!-- end website.thtml -->
Modified: trunk/plugins/forum/themefiles/forum/layout/navbar.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/navbar.thtml (original)
+++ trunk/plugins/forum/themefiles/forum/layout/navbar.thtml Sat Feb 7
22:41:45 2009
@@ -1,12 +1,12 @@
<!-- start navbar.thtml -->
-<table width="100%" border="0" cellspacing="1" cellpadding="0">
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
- <td colspan="5" style="padding-right:5px;">{navmenu}</td>
+ <td colspan="5" style="padding-right:0px;">{navmenu}</td>
</tr>
<tr>
- <td colspan="5" style="padding-right:5px;">
- <table width="100%" border="0" cellspacing="0" cellpadding="2">
+ <td colspan="5" style="padding-right:0px;">
+ <table width="100%" border="0" cellspacing="0" cellpadding="1">
<tr>
<td style="white-space:nowrap">
{search_forum}
Modified:
trunk/plugins/forum/themefiles/forum/layout/reports/memberlist.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/reports/memberlist.thtml
(original)
+++ trunk/plugins/forum/themefiles/forum/layout/reports/memberlist.thtml
Sat Feb 7 22:41:45 2009
@@ -7,13 +7,13 @@
<td colspan="5" class="pluginHeader"
style="padding:5px;text-align:right;
white-space:nowrap;">{LANG_ACTIVITY} <input type="checkbox"
name="chkactivity" value="1" {chk_activity} onclick="submit();"{xhtml}></td>
</tr>
</table>
-<table width="100%" border="0" cellspacing="1" cellpadding="3"
class="plugin" style="margin-bottom:10px;">
+<table width="100%" border="0" cellspacing="1" cellpadding="3"
class="pluginSolidOutline" style="margin-bottom:10px;">
<tr>
- <td class="pluginBreadCrumbs pluginCellTitle aligncenter"
style="padding:2px 5px 2px 5px; width:40%; white-space:nowrap;"><a
href="{phpself}?order=1&prevorder={prevorder}&direction={direction}&page={page}&chkactivity={chkactivity}">{LANG_Heading1}</a></td>
- <td class="pluginBreadCrumbs pluginCellTitle" style="padding:2px
5px 2px 5px; white-space:nowrap;"><a
href="{phpself}?order=2&prevorder={prevorder}&direction={direction}&page={page}&chkactivity={chkactivity}">{LANG_Heading2}</a></td>
- <td class="pluginBreadCrumbs pluginCellTitle aligncenter"
style="padding:2px 5px 2px 5px; width:120%; white-space:nowrap;"><a
href="{phpself}?order=3&prevorder={prevorder}&direction={direction}&page={page}&chkactivity={chkactivity}">{LANG_Heading3}</a></td>
- <td class="pluginBreadCrumbs pluginCellTitle aligncenter"
style="padding:2px 5px 2px 5px; width:40%; white-space:nowrap;"><a
href="{phpself}?order=4&prevorder={prevorder}&direction={direction}&page={page}&chkactivity={chkactivity}">{LANG_Heading4}</a></td>
- <td class="pluginCellTitle" colspan="4" style="padding:2px 0px 2px
5px; white-space:nowrap; width:120%;"> </td>
+ <td class="pluginBreadCrumbs pluginCellTitle aligncenter"
style="padding:5px; width:40%; white-space:nowrap;"><a
href="{phpself}?order=1&prevorder={prevorder}&direction={direction}&page={page}&chkactivity={chkactivity}">{LANG_Heading1}</a></td>
+ <td class="pluginBreadCrumbs pluginCellTitle" style="padding:5px;
white-space:nowrap;"><a
href="{phpself}?order=2&prevorder={prevorder}&direction={direction}&page={page}&chkactivity={chkactivity}">{LANG_Heading2}</a></td>
+ <td class="pluginBreadCrumbs pluginCellTitle aligncenter"
style="padding:5px; width:120%; white-space:nowrap;"><a
href="{phpself}?order=3&prevorder={prevorder}&direction={direction}&page={page}&chkactivity={chkactivity}">{LANG_Heading3}</a></td>
+ <td class="pluginBreadCrumbs pluginCellTitle aligncenter"
style="padding:5px; width:40%; white-space:nowrap;"><a
href="{phpself}?order=4&prevorder={prevorder}&direction={direction}&page={page}&chkactivity={chkactivity}">{LANG_Heading4}</a></td>
+ <td class="pluginCellTitle" colspan="4" style="padding:5px 0px 5px
5px; white-space:nowrap; width:120%;"> </td>
</tr>
{report_records}
</table>
Modified:
trunk/plugins/forum/themefiles/forum/layout/reports/memberlist_line.thtml
==============================================================================
---
trunk/plugins/forum/themefiles/forum/layout/reports/memberlist_line.thtml
(original)
+++
trunk/plugins/forum/themefiles/forum/layout/reports/memberlist_line.thtml
Sat Feb 7 22:41:45 2009
@@ -1,11 +1,11 @@
<!-- memberlist_line.thtml -->
<tr class="pluginRow{csscode}">
<td class="aligncenter">{member_uid}</td>
- <td> <a
href="{site_url}/users.php?mode=profile&uid={member_uid}">{member_name}</a></td>
+ <td> <a
href="{site_url}/users.php?mode=profile&uid={member_uid}">{member_name}</a></td>
<td class="aligncenter">{member_regdate}</td>
<td class="aligncenter">{member_numposts}</td>
- <td width="1%">{pm_link}</td>
- <td width="1%">{email_link}</td>
- <td width="1%">{website_link}</td>
- <td width="1%">{lastposts_link}</td>
+ <td>{pm_link}</td>
+ <td>{email_link}</td>
+ <td>{website_link}</td>
+ <td>{lastposts_link}</td>
</tr>
Modified:
trunk/plugins/forum/themefiles/forum/layout/reports/memberlist_link.thtml
==============================================================================
---
trunk/plugins/forum/themefiles/forum/layout/reports/memberlist_link.thtml
(original)
+++
trunk/plugins/forum/themefiles/forum/layout/reports/memberlist_link.thtml
Sat Feb 7 22:41:45 2009
@@ -1 +1 @@
-<a href="{link_url}"><img src="{image}" title="{LANG_title}"{xhtml}></a>
+<a href="{link_url}"><img src="{image}" title="{LANG_title}"
alt="{LANG_title}"{xhtml}></a>
Modified:
trunk/plugins/forum/themefiles/forum/layout/reports/notifications.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/reports/notifications.thtml
(original)
+++ trunk/plugins/forum/themefiles/forum/layout/reports/notifications.thtml
Sat Feb 7 22:41:45 2009
@@ -2,27 +2,26 @@
{navmenu}
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
- <td width="95%" class="alignright" style="padding:5px 10px 5px
0px;">
- <form action="{phpself}" method="post" style="margin:0px;">
- <select name="filter" style="width:180px;"
onchange="this.form.submit();">{filter_options}</select>
+ <td class="alignright" style="width:95%; padding:5px 10px 5px
0px;">
+ <form action="{phpself}" method="post" style="margin:0px;">
+ <div><select name="filter" style="width:180px;"
onchange="this.form.submit();">{filter_options}</select></div>
</form>
</td>
<td style="padding:5px 0px 5px 10px;
white-space:nowrap;">{select_forum}</td>
</tr>
</table>
-<p{xhtml}>
<form action="{phpself}" method="post" name="notifications"
style="margin:0px;">
-<input type="hidden" name="op" value=""{xhtml}>
-<table width="100%" border="0" cellspacing="1" cellpadding="3"
class="plugin" style="margin-bottom:10px;">
+<div><input type="hidden" name="op" value=""{xhtml}></div>
+<table width="100%" border="0" cellspacing="1" cellpadding="3"
class="pluginSolidOutline" style="margin-bottom:10px;">
<tr>
- <td class="pluginCellTitle" width="2%"
style="text-align:center;"><img src="{imgset}/trash.gif"
title="{LANG_deleteall}" border="0" onclick='
if(confirm("{LANG_DELALLCONFIRM}"))
{document.notifications.op.value="delchecked";
document.notifications.submit();}'{xhtml}></td>
+ <td class="pluginCellTitle" style="width:2%;
text-align:center;"><img src="{imgset}/trash.gif" title="{LANG_deleteall}"
style="border:none;" onclick=' if(confirm("{LANG_DELALLCONFIRM}"))
{document.notifications.op.value="delchecked";
document.notifications.submit();}' alt=""{xhtml}></td>
<td class="pluginCellTitle"
style="white-space:nowrap;">{LANG_Heading2}</td>
<td class="pluginCellTitle"
style="white-space:nowrap;">{LANG_Heading3}</td>
<td class="pluginCellTitle"
style="white-space:nowrap;">{LANG_Heading4}</td>
<td class="pluginCellTitle"
style="white-space:nowrap;">{LANG_Heading5}</td>
- <td class="pluginCellTitle">{LANG_Heading6}</td>
- <td class="pluginCellTitle">{LANG_Heading7}</td>
- <td class="pluginCellTitle">{LANG_Heading8}</td>
+ <td class="pluginCellTitle"
style="white-space:nowrap;">{LANG_Heading6}</td>
+ <td class="pluginCellTitle"
style="white-space:nowrap;">{LANG_Heading7}</td>
+ <td class="pluginCellTitle"
style="white-space:nowrap;">{LANG_Heading8}</td>
</tr>
{notification_records}
</table>
@@ -33,4 +32,3 @@
<td class="aligncenter">{bottomlink}</td>
</tr>
</table>
-<p{xhtml}>
\ No newline at end of file
Modified:
trunk/plugins/forum/themefiles/forum/layout/reports/notifications_line.thtml
==============================================================================
---
trunk/plugins/forum/themefiles/forum/layout/reports/notifications_line.thtml
(original)
+++
trunk/plugins/forum/themefiles/forum/layout/reports/notifications_line.thtml
Sat Feb 7 22:41:45 2009
@@ -1,12 +1,12 @@
<!-- notifications_line.thtml -->
<tr class="aligncenter pluginRow{csscode}">
- <td style="padding:2px 5px 2px 5px;"><input type="checkbox"
name="chkrecid[]" value="{id}"{xhtml}></td>
- <td class="alignleft" style="padding:2px 5px 2px 5px;
white-space:nowrap;">{forum}</td>
- <td class="alignleft" style="text-align:left;padding:2px 0px 2px 5px;
white-space:nowrap;">{is_forum} {topic_link}</td>
- <td style="width:20%; padding:2px 5px 2px 5px;">{date_added}</td>
- <td style="width:20%; padding:2px 5px 2px 5px;"><a
href="{site_url}/users.php?mode=profile&uid={uid}">{topicauthor}</a></td>
- <td style="width:20%; padding:2px 5px 2px 5px;">{views}</td>
- <td style="width:20%; padding:2px 5px 2px 5px;">{replies}</td>
- <td style="width:20%; padding:2px 5px 2px 5px;"><a
href="notify.php?submit=delete&id={notify_id}&filter={notifytype}">{LANG_REMOVE}</a></td>
+ <td style="padding:2px 5px;"><input type="checkbox" name="chkrecid[]"
value="{id}"{xhtml}></td>
+ <td class="alignleft" style="padding:2px 5px;
white-space:nowrap;">{forum}</td>
+ <td class="alignleft" style="text-align:left;padding:2px 5px;
white-space:nowrap;">{is_forum} {topic_link}</td>
+ <td style="width:2%; padding:2px 5px;">{date_added}</td>
+ <td style="width:2%; padding:2px 5px;"><a
href="{site_url}/users.php?mode=profile&uid={uid}">{topicauthor}</a></td>
+ <td style="width:2%; padding:2px 5px;">{views}</td>
+ <td style="width:2%; padding:2px 5px;">{replies}</td>
+ <td style="width:2%; padding:2px 5px;"><a
href="notify.php?submit=delete&id={notify_id}&filter={notifytype}">{LANG_REMOVE}</a></td>
</tr>
Modified:
trunk/plugins/forum/themefiles/forum/layout/reports/report_results.thtml
==============================================================================
---
trunk/plugins/forum/themefiles/forum/layout/reports/report_results.thtml
(original)
+++
trunk/plugins/forum/themefiles/forum/layout/reports/report_results.thtml
Sat Feb 7 22:41:45 2009
@@ -1,11 +1,11 @@
<!-- start report_results.thtml -->
{navmenu}
-<table width="100%" border="0" cellspacing="1" cellpadding="3"
class="plugin" style="margin-top:20px;margin-bottom:10px;">
+<table width="100%" border="0" cellspacing="1" cellpadding="3"
class="pluginSolidOutline" style="margin-top:20px;margin-bottom:10px;">
<tr class="aligncenter">
- <td class="pluginBreadCrumbs pluginCellTitle" style="padding:2px
5px 2px 5px; white-space:nowrap;"><a
href="{phpself}&order=1&prevorder={prevorder}&direction={direction}&page={page}{op}">{LANG_Heading1}</a></td>
- <td class="pluginBreadCrumbs pluginCellTitle" style="padding:2px
5px 2px 5px; white-space:nowrap;"><a
href="{phpself}&order=2&prevorder={prevorder}&direction={direction}&page={page}{op}">{LANG_Heading2}</a></td>
- <td class="pluginBreadCrumbs pluginCellTitle" style="padding:2px
5px 2px 5px; white-space:nowrap;"><a
href="{phpself}&order=3&prevorder={prevorder}&direction={direction}&page={page}{op}">{LANG_Heading3}</a></td>
- <td class="pluginBreadCrumbs pluginCellTitle" style="padding:2px
5px 2px 5px; white-space:nowrap;"><a
href="{phpself}&order=4&prevorder={prevorder}&direction={direction}&page={page}{op}">{LANG_Heading4}</a></td>
+ <td class="pluginBreadCrumbs pluginCellTitle" style="padding:5px;
white-space:nowrap;"><a
href="{phpself}&order=1&prevorder={prevorder}&direction={direction}&page={page}{op}">{LANG_Heading1}</a></td>
+ <td class="pluginBreadCrumbs pluginCellTitle" style="padding:5px;
white-space:nowrap;"><a
href="{phpself}&order=2&prevorder={prevorder}&direction={direction}&page={page}{op}">{LANG_Heading2}</a></td>
+ <td class="pluginBreadCrumbs pluginCellTitle" style="padding:5px;
white-space:nowrap;"><a
href="{phpself}&order=3&prevorder={prevorder}&direction={direction}&page={page}{op}">{LANG_Heading3}</a></td>
+ <td class="pluginBreadCrumbs pluginCellTitle" style="padding:5px;
white-space:nowrap;"><a
href="{phpself}&order=4&prevorder={prevorder}&direction={direction}&page={page}{op}">{LANG_Heading4}</a></td>
</tr>
{report_records}
</table>
Modified: trunk/plugins/forum/themefiles/forum/layout/smilies.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/smilies.thtml (original)
+++ trunk/plugins/forum/themefiles/forum/layout/smilies.thtml Sat Feb 7
22:41:45 2009
@@ -1,55 +1,49 @@
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
+<table width="100%" cellspacing="0" cellpadding="0">
<tr>
<td style="white-space:nowrap;">
- <a href="javascript:emoticon(':D')"><img align="absmiddle"
src="{imgset}/smilies/biggrin.gif" alt="Big Grin" title="Big Grin"
border="0"{xhtml}></a> |
- <a href="javascript:emoticon(':)')"><img align="absmiddle"
src="{imgset}/smilies/smile.gif" alt="Smile" title="Smile"
border="0"{xhtml}></a> |
- <a href="javascript:emoticon(':(')"><img align="absmiddle"
src="{imgset}/smilies/frown.gif" alt="Frown" title="Frown"
border="0"{xhtml}></a> |
- <a href="javascript:emoticon('8O')"><img align="absmiddle"
src="{imgset}/smilies/eek.gif" alt="Eek!" title="Eek" border="0"{xhtml}></a>
+ <a href="javascript:emoticon(':D')"><img style="border:none;
virtical-align:middle;" src="{imgset}/smilies/biggrin.gif" alt="Big Grin"
title="Big Grin"{xhtml}></a> |
+ <a href="javascript:emoticon(':)')"><img style="border:none;
virtical-align:middle;" src="{imgset}/smilies/smile.gif" alt="Smile"
title="Smile"{xhtml}></a> |
+ <a href="javascript:emoticon(':(')"><img style="border:none;
virtical-align:middle;" src="{imgset}/smilies/frown.gif" alt="Frown"
title="Frown"{xhtml}></a> |
+ <a href="javascript:emoticon('8O')"><img style="border:none;
virtical-align:middle;" src="{imgset}/smilies/eek.gif" alt="Eek!"
title="Eek"{xhtml}></a>
</td>
-<td height="2"></td>
</tr>
<tr>
<td style="white-space:nowrap;">
- <a href="javascript:emoticon(':?')"><img align="absmiddle"
src="{imgset}/smilies/confused.gif" alt="Confused" title="Confused"
border="0"{xhtml}></a> |
- <a href="javascript:emoticon('B)')"><img align="absmiddle"
src="{imgset}/smilies/cool.gif" alt="Cool" title="Cool"
border="0"{xhtml}></a> |
- <a href="javascript:emoticon(':lol:')"><img align="absmiddle"
src="{imgset}/smilies/lol.gif" alt="Laughing Out Loud" title="Laughing Out
Loud" border="0"{xhtml}></a> |
- <a href="javascript:emoticon(':x')"><img align="absmiddle"
src="{imgset}/smilies/mad.gif" alt="Angry" title="Angry"
border="0"{xhtml}></a>
+ <a href="javascript:emoticon(':?')"><img style="border:none;
virtical-align:middle;" src="{imgset}/smilies/confused.gif" alt="Confused"
title="Confused"{xhtml}></a> |
+ <a href="javascript:emoticon('B)')"><img style="border:none;
virtical-align:middle;" src="{imgset}/smilies/cool.gif" alt="Cool"
title="Cool"{xhtml}></a> |
+ <a href="javascript:emoticon(':lol:')"><img style="border:none;
virtical-align:middle;" src="{imgset}/smilies/lol.gif" alt="Laughing Out
Loud" title="Laughing Out Loud"{xhtml}></a> |
+ <a href="javascript:emoticon(':x')"><img style="border:none;
virtical-align:middle;" src="{imgset}/smilies/mad.gif" alt="Angry"
title="Angry"{xhtml}></a>
</td>
-<td height="2"></td>
</tr>
<tr>
<td style="white-space:nowrap;">
- <a href="javascript:emoticon(':P')"><img align="absmiddle"
src="{imgset}/smilies/razz.gif" alt="Razz" title="Razz"
border="0"{xhtml}></a> |
- <a href="javascript:emoticon(':oops:')"><img align="absmiddle"
src="{imgset}/smilies/redface.gif" alt="Oops!" title="Oops!"
border="0"{xhtml}></a> |
- <a href="javascript:emoticon(':o')"><img align="absmiddle"
src="{imgset}/smilies/surprised.gif" alt="Surprised!" title="Surprised!"
border="0"{xhtml}></a> |
- <a href="javascript:emoticon(':cry:')"><img align="absmiddle"
src="{imgset}/smilies/cry.gif" alt="Cry" title="Cry" border="0"{xhtml}></a>
+ <a href="javascript:emoticon(':P')"><img style="border:none;
virtical-align:middle;" src="{imgset}/smilies/razz.gif" alt="Razz"
title="Razz"{xhtml}></a> |
+ <a href="javascript:emoticon(':oops:')"><img style="border:none;
virtical-align:middle;" src="{imgset}/smilies/redface.gif" alt="Oops!"
title="Oops!"{xhtml}></a> |
+ <a href="javascript:emoticon(':o')"><img style="border:none;
virtical-align:middle;" src="{imgset}/smilies/surprised.gif"
alt="Surprised!" title="Surprised!"{xhtml}></a> |
+ <a href="javascript:emoticon(':cry:')"><img style="border:none;
virtical-align:middle;" src="{imgset}/smilies/cry.gif" alt="Cry"
title="Cry"{xhtml}></a>
</td>
-<td height="2"></td>
</tr>
<tr>
<td style="white-space:nowrap;">
- <a href="javascript:emoticon(':evil:')"><img align="absmiddle"
src="{imgset}/smilies/evil.gif" alt="Evil" title="Evil"
border="0"{xhtml}></a> |
- <a href="javascript:emoticon(':twisted:')"><img align="absmiddle"
src="{imgset}/smilies/twisted.gif" alt="Twisted Evil" title="Twisted Evil"
border="0"{xhtml}></a> |
- <a href="javascript:emoticon(':roll:')"><img align="absmiddle"
src="{imgset}/smilies/rolleyes.gif" alt="Rolling Eyes" title="Rolling Eyes"
border="0"{xhtml}></a> |
- <a href="javascript:emoticon(';)')"><img align="absmiddle"
src="{imgset}/smilies/wink.gif" alt="Wink" title="Wink"
border="0"{xhtml}></a>
+ <a href="javascript:emoticon(':evil:')"><img style="border:none;
virtical-align:middle;" src="{imgset}/smilies/evil.gif" alt="Evil"
title="Evil"{xhtml}></a> |
+ <a href="javascript:emoticon(':twisted:')"><img style="border:none;
virtical-align:middle;" src="{imgset}/smilies/twisted.gif" alt="Twisted
Evil" title="Twisted Evil"{xhtml}></a> |
+ <a href="javascript:emoticon(':roll:')"><img style="border:none;
virtical-align:middle;" src="{imgset}/smilies/rolleyes.gif" alt="Rolling
Eyes" title="Rolling Eyes"{xhtml}></a> |
+ <a href="javascript:emoticon(';)')"><img style="border:none;
virtical-align:middle;" src="{imgset}/smilies/wink.gif" alt="Wink"
title="Wink"{xhtml}></a>
</td>
-<td height="2"></td>
</tr>
<tr>
<td style="white-space:nowrap;">
- <a href="javascript:emoticon(':!:')"><img align="absmiddle"
src="{imgset}/smilies/exclaim.gif" alt="Exclaimation" title="Exclaimation"
border="0"{xhtml}></a> |
- <a href="javascript:emoticon(':question:')"><img align="absmiddle"
src="{imgset}/smilies/question.gif" alt="Question" title="Question"
border="0"{xhtml}></a> |
- <a href="javascript:emoticon(':idea:')"><img align="absmiddle"
src="{imgset}/smilies/idea.gif" alt="Idea" title="Idea"
border="0"{xhtml}></a> |
- <a href="javascript:emoticon(':arrow:')"><img align="absmiddle"
src="{imgset}/smilies/arrow.gif" alt="Arrow" title="Arrow"
border="0"{xhtml}></a>
+ <a href="javascript:emoticon(':!:')"><img style="border:none;
virtical-align:middle;" src="{imgset}/smilies/exclaim.gif"
alt="Exclaimation" title="Exclaimation"{xhtml}></a> |
+ <a href="javascript:emoticon(':question:')"><img style="border:none;
virtical-align:middle;" src="{imgset}/smilies/question.gif" alt="Question"
title="Question"{xhtml}></a> |
+ <a href="javascript:emoticon(':idea:')"><img style="border:none;
virtical-align:middle;" src="{imgset}/smilies/idea.gif" alt="Idea"
title="Idea"{xhtml}></a> |
+ <a href="javascript:emoticon(':arrow:')"><img style="border:none;
virtical-align:middle;" src="{imgset}/smilies/arrow.gif" alt="Arrow"
title="Arrow"{xhtml}></a>
</td>
-<td height="2"></td>
</tr>
<tr>
<td style="white-space:nowrap;">
- <a href="javascript:emoticon(':|')"><img align="absmiddle"
src="{imgset}/smilies/neutral.gif" alt="Neutral" title="Neutral"
border="0"{xhtml}></a> |
- <a href="javascript:emoticon(':mrgreen:')"><img align="absmiddle"
src="{imgset}/smilies/mrgreen.gif" alt="Mr. Green" title="Mr. Green"
border="0"{xhtml}></a>
+ <a href="javascript:emoticon(':|')"><img style="border:none;
virtical-align:middle;" src="{imgset}/smilies/neutral.gif" alt="Neutral"
title="Neutral"{xhtml}></a> |
+ <a href="javascript:emoticon(':mrgreen:')"><img style="border:none;
virtical-align:middle;" src="{imgset}/smilies/mrgreen.gif" alt="Mr. Green"
title="Mr. Green"{xhtml}></a>
</td>
-<td height="2"></td>
</tr>
</table>
Modified:
trunk/plugins/forum/themefiles/forum/layout/submissionform_main.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/submissionform_main.thtml
(original)
+++ trunk/plugins/forum/themefiles/forum/layout/submissionform_main.thtml
Sat Feb 7 22:41:45 2009
@@ -12,7 +12,7 @@
{smilies}
</td>
<td class="pluginCellText pluginCellFill"
style="padding-left: 5px;">
- <textarea name="comment" id="input2" rows="20"
wrap="virtual" tabindex="6" class="post" style="width:98%"
onselect="storeCaret(this);" onclick="storeCaret(this);"
onkeyup="storeCaret(this);">{post_message}</textarea>
+ <textarea name="comment" id="input2" rows="20"
cols="45" tabindex="6" class="post" style="width:98%"
onselect="storeCaret(this);" onclick="storeCaret(this);"
onkeyup="storeCaret(this);">{post_message}</textarea>
</td>
</tr>
{captcha}
Modified: trunk/plugins/forum/themefiles/forum/layout/topic.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/topic.thtml (original)
+++ trunk/plugins/forum/themefiles/forum/layout/topic.thtml Sat Feb 7
22:41:45 2009
@@ -4,7 +4,7 @@
<td style="padding-left:6px; padding-right:6px;">
<table width="100%" border="0" cellspacing="0"
cellpadding="0">
<tr>
- <td style="width:8px"
class="aligncenter"><img src="{imgset}/icon_minipost.gif"{xhtml}></td>
+ <td style="width:8px"
class="aligncenter"><img alt=""
src="{imgset}/icon_minipost.gif"{xhtml}></td>
<td
style="white-space:nowrap;"> {posted_date}{preview_topic_subject} {read_msg} {locked_icon}</td>
<td class="alignright">
<div style="vertical-align:top;
padding-top:2px;" class="alignright">
Modified: trunk/plugins/forum/themefiles/forum/layout/topicfooter.thtml
==============================================================================
--- trunk/plugins/forum/themefiles/forum/layout/topicfooter.thtml (original)
+++ trunk/plugins/forum/themefiles/forum/layout/topicfooter.thtml Sat Feb
7 22:41:45 2009
@@ -13,11 +13,10 @@
</td>
</tr>
</table>
-<p{xhtml}>
<table border="0" cellspacing="0" cellpadding="2" width="100%">
<tr>
<td class="aligncenter"
style="white-space:nowrap;">{pagenavigation}</td>
</tr>
</table>
-<p{xhtml}><br{xhtml}>
+<br{xhtml}>
<!-- end topicfooter.thtml -->
Modified:
trunk/plugins/forum/themefiles/forum/layout/userprefs/user_settings.thtml
==============================================================================
---
trunk/plugins/forum/themefiles/forum/layout/userprefs/user_settings.thtml
(original)
+++
trunk/plugins/forum/themefiles/forum/layout/userprefs/user_settings.thtml
Sat Feb 7 22:41:45 2009
@@ -2,21 +2,19 @@
<!-- start userprefs/user_settings.thtml -->
{navmenu}
<form action="{PHP_SELF}" method="post">
-<input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
-<table width="100%" border="0" cellspacing="1" cellpadding="3"
class="pluginSolidOutline" style="margin-top:20px;">
+<div><input type="hidden" name="{gltoken_name}"
value="{gltoken}"{xhtml}></div>
+<table width="100%" border="0" cellspacing="1" cellpadding="0"
class="pluginSolidOutline" style="margin-top:20px;">
<tr>
- <td class="pluginCellTitle" style="padding:2px 0px 2px 5px;
width:20%;">{LANG_feature}</td>
- <td class="pluginCellTitle" style="padding:2px 0px 2px
5px;">{LANG_setting}</td>
+ <td class="pluginCellTitle" style="width:20%;">{LANG_feature}</td>
+ <td class="pluginCellTitle">{LANG_setting}</td>
</tr>
-</table>
-<table width="100%" border="0" cellspacing="1" cellpadding="0"
class="pluginSolidOutline">
<tr>
<td class="pluginCellSubTitle" style="width:20%;
white-space:nowrap;">{LANG_GF92[topicspp]}</td>
<td class="pluginCellText pluginCellFill">
- <table width="100%" border="0" cellspacing="0" cellpadding="0"
class="pluginSolidOutline">
+ <table width="100%" border="0" cellspacing="0" cellpadding="3"
class="pluginSolidOutline">
<tr>
<td class="pluginCellText pluginCellFill"
style="padding-left:6px;">{LANG_GF92[topicsppdscp]}</td>
- <td class="pluginCellText pluginCellFill" style="width:25px;
white-space:nowrap;"><input type="text" name="xtopicsperpage" size="3"
maxlength="11" value="{topicsperpage}"{xhtml}></td>
+ <td class="pluginCellText pluginCellFill" style="width:25px;
white-space:nowrap;"><input type="text" name="xtopicsperpage" size="6"
maxlength="11" value="{topicsperpage}"{xhtml}></td>
</tr>
</table>
</td>
@@ -24,10 +22,10 @@
<tr>
<td class="pluginCellSubTitle">{LANG_GF92[postspp]}</td>
<td class="pluginCellText pluginCellFill">
- <table width="100%" border="0" cellspacing="0" cellpadding="0"
class="pluginSolidOutline">
+ <table width="100%" border="0" cellspacing="0" cellpadding="3"
class="pluginSolidOutline">
<tr>
<td class="pluginCellText pluginCellFill"
style="padding-left:6px;">{LANG_GF92[postsppdscp]}</td>
- <td class="pluginCellText pluginCellFill" style="width:25px;
white-space:nowrap;"><input type="text" name="xpostsperpage" size="3"
maxlength="11" value="{postsperpage}"{xhtml}></td>
+ <td class="pluginCellText pluginCellFill" style="width:25px;
white-space:nowrap;"><input type="text" name="xpostsperpage" size="6"
maxlength="11" value="{postsperpage}"{xhtml}></td>
</tr>
</table>
</td>
@@ -35,10 +33,10 @@
<tr>
<td class="pluginCellSubTitle">{LANG_GF02[msg122]}</td>
<td class="pluginCellText pluginCellFill">
- <table width="100%" border="0" cellspacing="0" cellpadding="0"
class="pluginSolidOutline">
+ <table width="100%" border="0" cellspacing="0" cellpadding="3"
class="pluginSolidOutline">
<tr>
<td class="pluginCellText pluginCellFill"
style="padding-left:6px;">{LANG_GF02[msg123]}</td>
- <td class="pluginCellText pluginCellFill" style="width:25px;
white-space:nowrap;"><input type="text" name="xpopularlimit" size="3"
maxlength="11" value="{popularlimit}"{xhtml}></td>
+ <td class="pluginCellText pluginCellFill" style="width:25px;
white-space:nowrap;"><input type="text" name="xpopularlimit" size="6"
maxlength="11" value="{popularlimit}"{xhtml}></td>
</tr>
</table>
</td>
@@ -46,10 +44,10 @@
<tr>
<td class="pluginCellSubTitle">{LANG_GF02[msg126]}</td>
<td class="pluginCellText pluginCellFill">
- <table width="100%" border="0" cellspacing="0" cellpadding="0"
class="pluginSolidOutline">
+ <table width="100%" border="0" cellspacing="0" cellpadding="3"
class="pluginSolidOutline">
<tr>
<td class="pluginCellText pluginCellFill"
style="padding-left:6px;">{LANG_GF02[msg127]}</td>
- <td class="pluginCellText pluginCellFill" style="width:25px;
white-space:nowrap;"><input type="text" name="xsearchlines" size="3"
maxlength="11" value="{searchlines}"{xhtml}></td>
+ <td class="pluginCellText pluginCellFill" style="width:25px;
white-space:nowrap;"><input type="text" name="xsearchlines" size="6"
maxlength="11" value="{searchlines}"{xhtml}></td>
</tr>
</table>
</td>
@@ -57,10 +55,10 @@
<tr>
<td class="pluginCellSubTitle">{LANG_GF02[msg128]}</td>
<td class="pluginCellText pluginCellFill">
- <table width="100%" border="0" cellspacing="0" cellpadding="0"
class="pluginSolidOutline">
+ <table width="100%" border="0" cellspacing="0" cellpadding="3"
class="pluginSolidOutline">
<tr>
<td class="pluginCellText pluginCellFill"
style="padding-left:6px;">{LANG_GF02[msg129]}</td>
- <td class="pluginCellText pluginCellFill" style="width:25px;
white-space:nowrap;"><input type="text" name="xmembersperpage" size="3"
maxlength="11" value="{membersperpage}"{xhtml}></td>
+ <td class="pluginCellText pluginCellFill" style="width:25px;
white-space:nowrap;"><input type="text" name="xmembersperpage" size="6"
maxlength="11" value="{membersperpage}"{xhtml}></td>
</tr>
</table>
</td>
@@ -68,7 +66,7 @@
<tr>
<td class="pluginCellSubTitle">{LANG_GF02[msg130]}</td>
<td class="pluginCellText pluginCellFill">
- <table width="100%" border="0" cellspacing="0" cellpadding="0"
class="pluginSolidOutline">
+ <table width="100%" border="0" cellspacing="0" cellpadding="3"
class="pluginSolidOutline">
<tr>
<td class="pluginCellText pluginCellFill"
style="padding-left:6px;">{LANG_GF02[msg131]}</td>
<td class="pluginCellText pluginCellFill" style="width:3%;
white-space:nowrap;"><input type="radio" name="xviewanonposts" value="1"
{viewanonposts_yes}{xhtml}>{LANG_GF01[YES]} </td>
@@ -80,7 +78,7 @@
<tr>
<td class="pluginCellSubTitle">{LANG_GF02[msg132]}</td>
<td class="pluginCellText pluginCellFill">
- <table width="100%" border="0" cellspacing="0" cellpadding="0"
class="pluginSolidOutline">
+ <table width="100%" border="0" cellspacing="0" cellpadding="3"
class="pluginSolidOutline">
<tr>
<td class="pluginCellText pluginCellFill"
style="padding-left:6px;">{LANG_GF02[msg133]}</td>
<td class="pluginCellText pluginCellFill" style="width:3%;
white-space:nowrap;"><input type="radio" name="xalwaysnotify" value="1"
{alwaysnotify_yes}{xhtml}>{LANG_GF01[YES]} </td>
@@ -92,7 +90,7 @@
<tr>
<td class="pluginCellSubTitle">{LANG_GF02[msg184]}</td>
<td class="pluginCellText pluginCellFill">
- <table width="100%" border="0" cellspacing="0" cellpadding="0"
class="pluginSolidOutline">
+ <table width="100%" border="0" cellspacing="0" cellpadding="3"
class="pluginSolidOutline">
<tr>
<td class="pluginCellText pluginCellFill"
style="padding-left:6px;">{LANG_GF02[msg185]}</td>
<td class="pluginCellText pluginCellFill" style="width:3%;
white-space:nowrap;"><input type="radio" name="xnotifyonce" value="1"
{notifyonce_yes}{xhtml}>{LANG_GF01[YES]} </td>
@@ -104,7 +102,7 @@
<tr>
<td class="pluginCellSubTitle">{LANG_GF92[showiframe]}</td>
<td class="pluginCellText pluginCellFill">
- <table width="100%" border="0" cellspacing="0" cellpadding="0"
class="pluginSolidOutline">
+ <table width="100%" border="0" cellspacing="0" cellpadding="3"
class="pluginSolidOutline">
<tr>
<td class="pluginCellText pluginCellFill"
style="padding-left:6px;">{LANG_GF92[showiframedscp]}</td>
<td class="pluginCellText pluginCellFill" style="width:3%;
white-space:nowrap;"><input type="radio" name="xshowiframe" value="1"
{showiframe_yes}{xhtml}>{LANG_GF01[YES]} </td>
@@ -116,7 +114,7 @@
</table>
<table width="100%" border="0" cellspacing="1" cellpadding="3"
style="padding-top:1em;">
<tr>
- <td class="alignright"><input type="submit" name="submit"
value="{LANG_save}" style="text-align:center;padding:5px;"{xhtml}></td>
+ <td class="alignright"><input type="submit" name="submit"
value="{LANG_save}" style="text-align:center; padding:3px;"{xhtml}></td>
</tr>
</table>
</form>
Added: trunk/plugins/forum/v2.7.1_changes.txt
==============================================================================
--- (empty file)
+++ trunk/plugins/forum/v2.7.1_changes.txt Sat Feb 7 22:41:45 2009
@@ -0,0 +1,25 @@
+Geeklog Forum Plugin Changes for version 2.7.1
+Date: July 19/2008
+
+Blaine Lang
+
+
+*** Summary of changes ***
+Fixed a cross-site scripting vulnerability as identified by Yosuke Yamada
of NetAgent Co., Ltd and reported to us by Noriko Takahashi of JPCERT/CC
+http://jvn.jp/
+
+This release addressed the issue is related to entering a specially
crafted javascript string into the forum search.
+
+
+*** Listing of file changes ***
+
+Version 2.7.1 File Changes
+--------------------
+
+ public_html\index.php
+ config.php
+ functions.inc
+
+Upgrade Steps:
+ - Replace the changed files
+ - Run the plugin upgrade
Added: trunk/plugins/forum/v2.7.2_changes.txt
==============================================================================
--- (empty file)
+++ trunk/plugins/forum/v2.7.2_changes.txt Sat Feb 7 22:41:45 2009
@@ -0,0 +1,22 @@
+Geeklog Forum Plugin Changes for version 2.7.2
+Date: Jan 25/2009
+
+Blaine Lang
+
+
+*** Summary of changes ***
+Fixed an issue where a topic could be edited by another user during the
allowable edit time-window (default 1 min).
+Reported by: Matthew R. Demicco of www.armitunes.com
+
+*** Listing of file changes ***
+
+Version 2.7.2 File Changes
+--------------------
+
+ public_html\createtopic.php
+ config.php
+ functions.inc
+
+Upgrade Steps:
+ - Replace the changed files
+ - Run the plugin upgrade