aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-11-19 20:08:24 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-11-19 20:08:24 +0000
commit33bcb91d05aa43bd248128ca02f247a98f53bff8 (patch)
tree39de456650b921f75310bcd9412d679350dee228 /phpBB
parent174d43d5327c039c41142667291054162a53906c (diff)
downloadforums-33bcb91d05aa43bd248128ca02f247a98f53bff8.tar
forums-33bcb91d05aa43bd248128ca02f247a98f53bff8.tar.gz
forums-33bcb91d05aa43bd248128ca02f247a98f53bff8.tar.bz2
forums-33bcb91d05aa43bd248128ca02f247a98f53bff8.tar.xz
forums-33bcb91d05aa43bd248128ca02f247a98f53bff8.zip
some tiny fixes.
git-svn-id: file:///svn/phpbb/trunk@6612 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/adm/style/acp_groups.html5
-rw-r--r--phpBB/adm/style/acp_users.html4
-rw-r--r--phpBB/adm/style/editor.js2
-rw-r--r--phpBB/adm/style/permission_mask.html2
-rw-r--r--phpBB/language/en/acp/groups.php1
-rw-r--r--phpBB/language/en/viewforum.php4
-rw-r--r--phpBB/search.php2
-rw-r--r--phpBB/styles/subSilver/template/posting_preview.html4
8 files changed, 16 insertions, 8 deletions
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 1d3ed9c62f..c8e56f9d81 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -289,6 +289,11 @@
<tbody>
<!-- BEGIN groups -->
<!-- IF groups.S_SPECIAL -->
+ <!-- IF groups.S_FIRST_ROW -->
+ <tr>
+ <td colspan="5" class="row3">{L_NO_GROUPS_CREATED}</td>
+ </tr>
+ <!-- ENDIF -->
</tbody>
</table>
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index bc8da69997..f15d448722 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -94,7 +94,7 @@
<dl>
<dt><label>{L_REGISTERED_IP}:</label></dt>
<dd><a href="{U_SHOW_IP}">{REGISTERED_IP}</a></dd>
- <dd>[ <a href="#" onclick="window.open('{U_WHOIS}', '_whois', 'height=500, resizable=yes, scrollbars=yes, width=700'); return false;">{L_WHOIS}</a> ]</strong></dd>
+ <dd>[ <a href="#" onclick="window.open('{U_WHOIS}', '_whois', 'height=500, resizable=yes, scrollbars=yes, width=700'); return false;">{L_WHOIS}</a> ]</dd>
</dl>
<!-- ENDIF -->
<dl>
@@ -595,7 +595,7 @@ var help_line = {
<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" onmouseover="helpline('p')" />
<!-- ENDIF -->
<!-- IF S_LINKS_ALLOWED -->
- <input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" onmouseover="helpline('w')" onmouseover="helpline('d')" />
+ <input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" onmouseover="helpline('w')" />
<!-- ENDIF -->
<!-- IF S_BBCODE_FLASH -->
<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" onmouseover="helpline('d')" />
diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js
index 9591fc67d1..2dc9e0bf79 100644
--- a/phpBB/adm/style/editor.js
+++ b/phpBB/adm/style/editor.js
@@ -23,7 +23,7 @@ var is_mac = (clientPC.indexOf('mac') != -1);
*/
function helpline(help)
{
- document.forms[form_name].helpbox.value = eval(help + '_help');
+ document.forms[form_name].helpbox.value = help_line[help];
}
/**
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index d841dbd31f..51b5bf9c63 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -186,7 +186,7 @@
<!-- ELSE -->
<td class="preset preset_custom">
<!-- ENDIF -->
- <a href="#" onclick="swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '{p_mask.f_mask.category.S_ROW_COUNT}'); return false;"><span></span></a></td>
+ <a href="#" onclick="swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '{p_mask.f_mask.category.S_ROW_COUNT}'); return false;">&nbsp;</a></td>
<!-- END category -->
</tr>
<tr class="row3">
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index 582dbb3465..06f1301e4b 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -95,6 +95,7 @@ $lang = array_merge($lang, array(
'MEMBERS' => 'Members',
'NO_GROUP' => 'No group specified.',
+ 'NO_GROUPS_CREATED' => 'No groups created yet.',
'NO_PERMISSIONS' => 'Do not copy permissions',
'NO_USERS' => 'You haven’t entered any users.',
diff --git a/phpBB/language/en/viewforum.php b/phpBB/language/en/viewforum.php
index 8c7c6a78d9..f18dc37c77 100644
--- a/phpBB/language/en/viewforum.php
+++ b/phpBB/language/en/viewforum.php
@@ -33,7 +33,9 @@ if (empty($lang) || !is_array($lang))
$lang = array_merge($lang, array(
'ACTIVE_TOPICS' => 'Active topics',
'ANNOUNCEMENTS' => 'Announcements',
-
+
+ 'FORUM_PERMISSIONS' => 'Forum permissions',
+
'ICON_ANNOUNCEMENT' => 'Announcement',
'ICON_STICKY' => 'Sticky',
diff --git a/phpBB/search.php b/phpBB/search.php
index a9c098adc7..d9a1a7457b 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -1002,7 +1002,7 @@ $result = $db->sql_query_limit($sql, 5);
while ($row = $db->sql_fetchrow($result))
{
- $keywords = htmlspecialchars($row['search_keywords']);
+ $keywords = htmlspecialchars($row['search_keywords'], ENT_COMPAT, 'UTF-8');
$template->assign_block_vars('recentsearch', array(
'KEYWORDS' => $keywords,
diff --git a/phpBB/styles/subSilver/template/posting_preview.html b/phpBB/styles/subSilver/template/posting_preview.html
index 4bb98fbd7d..b990428f36 100644
--- a/phpBB/styles/subSilver/template/posting_preview.html
+++ b/phpBB/styles/subSilver/template/posting_preview.html
@@ -43,9 +43,9 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td><div class="postbody">{PREVIEW_MESSAGE}</div>
- <!-- IF S_HAS_ATTACHMENTS -->
+ <!-- IF .attachment -->
<br clear="all" /><br />
-
+
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<td class="row3"><b class="genmed">{L_ATTACHMENTS}: </b></td>
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-02 11:06:01 +0000