[geeklog-cvs] geeklog: More consistency for the Mail Users dialog (cf. bug #00...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Sun Oct 4 07:34:45 EDT 2009
changeset 7358:b6d086ec0e01
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/b6d086ec0e01
user: Dirk Haun <dirk at haun-online.de>
date: Sun Oct 04 13:32:11 2009 +0200
description:
More consistency for the Mail Users dialog (cf. bug #0000992)
diffstat:
language/english.php | 6 +-
language/english_utf-8.php | 6 +-
language/german.php | 8 ++--
language/german_formal.php | 8 ++--
language/german_formal_utf-8.php | 8 ++--
language/german_utf-8.php | 8 ++--
public_html/admin/mail.php | 2 +-
public_html/docs/english/changes.html | 24 ++++++++++++
public_html/docs/english/theme.html | 7 ++-
public_html/docs/history | 6 +-
public_html/layout/professional/admin/mail/mailform.thtml | 29 +++++++-------
11 files changed, 68 insertions(+), 44 deletions(-)
diffs (280 lines):
diff -r 6155fbeb6262 -r b6d086ec0e01 language/english.php
--- a/language/english.php Sun Oct 04 11:10:08 2009 +0200
+++ b/language/english.php Sun Oct 04 13:32:11 2009 +0200
@@ -994,10 +994,10 @@
$LANG31 = array(
1 => "{$_CONF['site_name']} Mail Utility",
- 2 => 'From',
- 3 => 'Reply-to',
+ 2 => 'From Name',
+ 3 => 'From Email Address',
4 => 'Subject',
- 5 => 'Body',
+ 5 => 'Message',
6 => 'Send to:',
7 => 'All users',
8 => 'Admin',
diff -r 6155fbeb6262 -r b6d086ec0e01 language/english_utf-8.php
--- a/language/english_utf-8.php Sun Oct 04 11:10:08 2009 +0200
+++ b/language/english_utf-8.php Sun Oct 04 13:32:11 2009 +0200
@@ -994,10 +994,10 @@
$LANG31 = array(
1 => "{$_CONF['site_name']} Mail Utility",
- 2 => 'From',
- 3 => 'Reply-to',
+ 2 => 'From Name',
+ 3 => 'From Email Address',
4 => 'Subject',
- 5 => 'Body',
+ 5 => 'Message',
6 => 'Send to:',
7 => 'All users',
8 => 'Admin',
diff -r 6155fbeb6262 -r b6d086ec0e01 language/german.php
--- a/language/german.php Sun Oct 04 11:10:08 2009 +0200
+++ b/language/german.php Sun Oct 04 13:32:11 2009 +0200
@@ -455,7 +455,7 @@
33 => 'Kompletter Artikel unter',
34 => 'Ende dieser Nachricht',
35 => 'Sorry, dieser User möchte keine E-Mails bekommen.',
- 36 => 'Copy:',
+ 36 => 'Kopie:',
37 => 'Send me a copy of this email',
38 => "This is a copy of the email that you sent to %s from <{$_CONF['site_url']}>:"
);
@@ -993,10 +993,10 @@
$LANG31 = array(
1 => "{$_CONF['site_name']} Mail Utility",
- 2 => 'Von',
- 3 => 'Reply-to',
+ 2 => 'Von (Name)',
+ 3 => 'Von (E-Mail)',
4 => 'Betreff',
- 5 => 'Text',
+ 5 => 'Nachricht',
6 => 'Senden',
7 => 'Alle User',
8 => 'Admin',
diff -r 6155fbeb6262 -r b6d086ec0e01 language/german_formal.php
--- a/language/german_formal.php Sun Oct 04 11:10:08 2009 +0200
+++ b/language/german_formal.php Sun Oct 04 13:32:11 2009 +0200
@@ -456,7 +456,7 @@
33 => 'Kompletter Artikel unter',
34 => 'Ende dieser Nachricht',
35 => 'Sorry, dieser User möchte keine E-Mails bekommen.',
- 36 => 'Copy:',
+ 36 => 'Kopie:',
37 => 'Send me a copy of this email',
38 => "This is a copy of the email that you sent to %s from <{$_CONF['site_url']}>:"
);
@@ -994,10 +994,10 @@
$LANG31 = array(
1 => "{$_CONF['site_name']} Mail Utility",
- 2 => 'Von',
- 3 => 'Reply-to',
+ 2 => 'Von (Name)',
+ 3 => 'Von (E-Mail)',
4 => 'Betreff',
- 5 => 'Text',
+ 5 => 'Nachricht',
6 => 'Senden',
7 => 'Alle User',
8 => 'Admin',
diff -r 6155fbeb6262 -r b6d086ec0e01 language/german_formal_utf-8.php
--- a/language/german_formal_utf-8.php Sun Oct 04 11:10:08 2009 +0200
+++ b/language/german_formal_utf-8.php Sun Oct 04 13:32:11 2009 +0200
@@ -456,7 +456,7 @@
33 => 'Kompletter Artikel unter',
34 => 'Ende dieser Nachricht',
35 => 'Sorry, dieser User möchte keine E-Mails bekommen.',
- 36 => 'Copy:',
+ 36 => 'Kopie:',
37 => 'Send me a copy of this email',
38 => "This is a copy of the email that you sent to %s from <{$_CONF['site_url']}>:"
);
@@ -994,10 +994,10 @@
$LANG31 = array(
1 => "{$_CONF['site_name']} Mail Utility",
- 2 => 'Von',
- 3 => 'Reply-to',
+ 2 => 'Von (Name)',
+ 3 => 'Von (E-Mail)',
4 => 'Betreff',
- 5 => 'Text',
+ 5 => 'Nachricht',
6 => 'Senden',
7 => 'Alle User',
8 => 'Admin',
diff -r 6155fbeb6262 -r b6d086ec0e01 language/german_utf-8.php
--- a/language/german_utf-8.php Sun Oct 04 11:10:08 2009 +0200
+++ b/language/german_utf-8.php Sun Oct 04 13:32:11 2009 +0200
@@ -455,7 +455,7 @@
33 => 'Kompletter Artikel unter',
34 => 'Ende dieser Nachricht',
35 => 'Sorry, dieser User möchte keine E-Mails bekommen.',
- 36 => 'Copy:',
+ 36 => 'Kopie:',
37 => 'Send me a copy of this email',
38 => "This is a copy of the email that you sent to %s from <{$_CONF['site_url']}>:"
);
@@ -993,10 +993,10 @@
$LANG31 = array(
1 => "{$_CONF['site_name']} Mail Utility",
- 2 => 'Von',
- 3 => 'Reply-to',
+ 2 => 'Von (Name)',
+ 3 => 'Von (E-Mail)',
4 => 'Betreff',
- 5 => 'Text',
+ 5 => 'Nachricht',
6 => 'Senden',
7 => 'Alle User',
8 => 'Admin',
diff -r 6155fbeb6262 -r b6d086ec0e01 public_html/admin/mail.php
--- a/public_html/admin/mail.php Sun Oct 04 11:10:08 2009 +0200
+++ b/public_html/admin/mail.php Sun Oct 04 13:32:11 2009 +0200
@@ -153,7 +153,7 @@
if (empty($vars['fra']) OR empty($vars['fraepost']) OR
empty($vars['subject']) OR empty($vars['message']) OR
- empty($vars['to_group'])) {
+ empty($vars['to_group']) OR (strpos($vars['fra'], '@') !== false)) {
$retval .= COM_showMessageText($LANG31[26]);
return $retval;
diff -r 6155fbeb6262 -r b6d086ec0e01 public_html/docs/english/changes.html
--- a/public_html/docs/english/changes.html Sun Oct 04 11:10:08 2009 +0200
+++ b/public_html/docs/english/changes.html Sun Oct 04 13:32:11 2009 +0200
@@ -16,6 +16,30 @@
<a href="../history">ChangeLog</a>. The file <tt>docs/changed-files</tt> has a
list of files that have been changed since the last release.</p>
+<h2><a name="changes161">Geeklog 1.6.1</a></h2>
+
+<h3>New Features and Improvements</h3>
+
+<ul>
+<li>Geeklog now lets you enter meta descriptions and meta keywords for the main
+ page, for stories, topics, static pages, and polls. Please note that these
+ meta tags <a href="http://www.mattcutts.com/blog/keywords-meta-tag-in-web-search/">may not be used</a> by some search engines.</li>
+<li>You can now have one featured story per topic (for stories set to "Show
+ only in Topic").</li>
+<li>New autotags now allow you to embed polls in stories and everywhere else
+ where autotags are allowed.</li>
+<li>Minor security enhancement: "Important" cookies (like the session cookies)
+ are now created with the HttpOnly flag set. This will help avoid some XSS
+ attacks, provided your browser supports this flag.</li>
+</ul>
+
+<h3>Bugfixes</h3>
+
+<ul>
+<li>The admin group for the Static Pages plugin was created with a wrong name
+ in Geeklog 1.6.0 (fresh installs only).</li>
+</ul>
+
<h2><a name="changes160sr2">Geeklog 1.6.0sr2</a></h2>
<p>This release addresses the following security issue:</p>
diff -r 6155fbeb6262 -r b6d086ec0e01 public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html Sun Oct 04 11:10:08 2009 +0200
+++ b/public_html/docs/english/theme.html Sun Oct 04 13:32:11 2009 +0200
@@ -201,9 +201,10 @@
<li>Added a "send copy to myself" option to
<tt>profiles/contactauthorform.thtml</tt></li>
<li>Cosmetics: Made the look and layout of the "Send mail to user"
- (<tt>contactuserform.thtml</tt>) and "Mail Story to a Friend"
- (<tt>contactauthorform.thtml</tt>) dialogs more consistent (alignment, size
- of input fields).</li>
+ (<tt>profiles/contactuserform.thtml</tt>), "Mail Story to a Friend"
+ (<tt>profiles/contactauthorform.thtml</tt>), and "Mail Users"
+ (<tt>admin/mail/mailform.thtml</tt>) dialogs more consistent (alignment,
+ size of input fields).</li>
<li>The Topic Editor now contains a line displaying the number of stories in
the current topic. New variables in <tt>admin/topic/topiceditor.thtml</tt>:
<code>{lang_num_stories}</code>, <code>{num_stories}</tt></li>
diff -r 6155fbeb6262 -r b6d086ec0e01 public_html/docs/history
--- a/public_html/docs/history Sun Oct 04 11:10:08 2009 +0200
+++ b/public_html/docs/history Sun Oct 04 13:32:11 2009 +0200
@@ -3,9 +3,9 @@
Oct ??, 2009 (1.6.1)
------------
-- Additional checks in "Mail Story to a Friend" and "Send mail to user" dialogs
- to make sure users don't enter email addresses into the name fields (bug
- #0000992) [Dirk]
+- Additional checks in "Mail Story to a Friend", "Send mail to user", and
+ "Mail Users" dialogs to make sure users don't enter email addresses into the
+ name fields (bug #0000992) [Dirk]
- Added an option to send a copy to self to the "Mail Story to a Friend" dialog
and made the look of this and the "Send mail to user" dialogs more consistent
[Dirk]
diff -r 6155fbeb6262 -r b6d086ec0e01 public_html/layout/professional/admin/mail/mailform.thtml
--- a/public_html/layout/professional/admin/mail/mailform.thtml Sun Oct 04 11:10:08 2009 +0200
+++ b/public_html/layout/professional/admin/mail/mailform.thtml Sun Oct 04 13:32:11 2009 +0200
@@ -1,7 +1,7 @@
<form action="{php_self}" method="post">
- <table cellpadding="2" cellspacing="0">
+ <table cellspacing="0" cellpadding="3" width="100%">
<tr>
- <td class="alignright">{lang_to}:</td>
+ <td class="alignright"><b>{lang_to}:</b></td>
<td>
<select name="to_group">
<option value="">{lang_selectgroup}</option>
@@ -10,26 +10,23 @@
</td>
</tr>
<tr>
- <td class="alignright">{lang_from}:</td>
+ <td class="alignright"><b>{lang_from}:</b></td>
<td><input type="text" name="fra" value="{site_name}" size="40"{xhtml}></td>
</tr>
<tr>
- <td class="alignright">{lang_replyto}:</td>
+ <td class="alignright"><b>{lang_replyto}:</b></td>
<td><input type="text" name="fraepost" value="{site_mail}" size="40"{xhtml}></td>
</tr>
<tr>
- <td class="alignright">{lang_subject}:</td>
+ <td class="alignright"><b>{lang_subject}:</b></td>
<td><input type="text" name="subject" size="40"{xhtml}></td>
</tr>
<tr>
- <td class="alignright" style="vertical-align:top;">{lang_body}:</td>
- <td><textarea rows="12" name="message" cols="44"></textarea></td>
+ <td class="alignright" style="vertical-align:top;"><b>{lang_body}:</b></td>
+ <td><textarea name="message" rows="10" style="width:100%"></textarea></td>
</tr>
<tr>
- <td colspan="2" class="alignleft"><b>{lang_options}</b></td>
- </tr>
- <tr>
- <td> </td>
+ <td class="alignright"><b>{lang_options}:</b></td>
<td><input type="checkbox" name="html"{xhtml}> {lang_HTML}</td>
</tr>
<tr>
@@ -41,10 +38,12 @@
<td><input type="checkbox" name="overstyr"{xhtml}> {lang_ignoreusersettings}</td>
</tr>
<tr>
- <td colspan="2" class="aligncenter">
- <input type="submit" value="{lang_send}"{xhtml}>
- <input type="hidden" name="mail" value="mail"{xhtml}>
- <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
+ <td colspan="2" class="aligncenter" style="padding-top:10px;">
+ <div style="padding:5px;">
+ <input type="submit" value="{lang_send}"{xhtml}>
+ <input type="hidden" name="mail" value="mail"{xhtml}>
+ <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
+ </div>
</td>
</tr>
</table>
More information about the geeklog-cvs
mailing list