1.1 --- a/language/english.php	Sun Oct 04 11:10:08 2009 +0200
     1.2 +++ b/language/english.php	Sun Oct 04 13:32:11 2009 +0200
     1.3 @@ -994,10 +994,10 @@
     1.4  
     1.5  $LANG31 = array(
     1.6      1 => "{$_CONF['site_name']} Mail Utility",
     1.7 -    2 => 'From',
     1.8 -    3 => 'Reply-to',
     1.9 +    2 => 'From Name',
    1.10 +    3 => 'From Email Address',
    1.11      4 => 'Subject',
    1.12 -    5 => 'Body',
    1.13 +    5 => 'Message',
    1.14      6 => 'Send to:',
    1.15      7 => 'All users',
    1.16      8 => 'Admin',

     2.1 --- a/language/english_utf-8.php	Sun Oct 04 11:10:08 2009 +0200
     2.2 +++ b/language/english_utf-8.php	Sun Oct 04 13:32:11 2009 +0200
     2.3 @@ -994,10 +994,10 @@
     2.4  
     2.5  $LANG31 = array(
     2.6      1 => "{$_CONF['site_name']} Mail Utility",
     2.7 -    2 => 'From',
     2.8 -    3 => 'Reply-to',
     2.9 +    2 => 'From Name',
    2.10 +    3 => 'From Email Address',
    2.11      4 => 'Subject',
    2.12 -    5 => 'Body',
    2.13 +    5 => 'Message',
    2.14      6 => 'Send to:',
    2.15      7 => 'All users',
    2.16      8 => 'Admin',

     3.1 --- a/language/german.php	Sun Oct 04 11:10:08 2009 +0200
     3.2 +++ b/language/german.php	Sun Oct 04 13:32:11 2009 +0200
     3.3 @@ -455,7 +455,7 @@
     3.4      33 => 'Kompletter Artikel unter',
     3.5      34 => 'Ende dieser Nachricht',
     3.6      35 => 'Sorry, dieser User möchte keine E-Mails bekommen.',
     3.7 -    36 => 'Copy:',
     3.8 +    36 => 'Kopie:',
     3.9      37 => 'Send me a copy of this email',
    3.10      38 => "This is a copy of the email that you sent to %s from <{$_CONF['site_url']}>:"
    3.11  );
    3.12 @@ -993,10 +993,10 @@
    3.13  
    3.14  $LANG31 = array(
    3.15      1 => "{$_CONF['site_name']} Mail Utility",
    3.16 -    2 => 'Von',
    3.17 -    3 => 'Reply-to',
    3.18 +    2 => 'Von (Name)',
    3.19 +    3 => 'Von (E-Mail)',
    3.20      4 => 'Betreff',
    3.21 -    5 => 'Text',
    3.22 +    5 => 'Nachricht',
    3.23      6 => 'Senden',
    3.24      7 => 'Alle User',
    3.25      8 => 'Admin',

     4.1 --- a/language/german_formal.php	Sun Oct 04 11:10:08 2009 +0200
     4.2 +++ b/language/german_formal.php	Sun Oct 04 13:32:11 2009 +0200
     4.3 @@ -456,7 +456,7 @@
     4.4      33 => 'Kompletter Artikel unter',
     4.5      34 => 'Ende dieser Nachricht',
     4.6      35 => 'Sorry, dieser User möchte keine E-Mails bekommen.',
     4.7 -    36 => 'Copy:',
     4.8 +    36 => 'Kopie:',
     4.9      37 => 'Send me a copy of this email',
    4.10      38 => "This is a copy of the email that you sent to %s from <{$_CONF['site_url']}>:"
    4.11  );
    4.12 @@ -994,10 +994,10 @@
    4.13  
    4.14  $LANG31 = array(
    4.15      1 => "{$_CONF['site_name']} Mail Utility",
    4.16 -    2 => 'Von',
    4.17 -    3 => 'Reply-to',
    4.18 +    2 => 'Von (Name)',
    4.19 +    3 => 'Von (E-Mail)',
    4.20      4 => 'Betreff',
    4.21 -    5 => 'Text',
    4.22 +    5 => 'Nachricht',
    4.23      6 => 'Senden',
    4.24      7 => 'Alle User',
    4.25      8 => 'Admin',

     5.1 --- a/language/german_formal_utf-8.php	Sun Oct 04 11:10:08 2009 +0200
     5.2 +++ b/language/german_formal_utf-8.php	Sun Oct 04 13:32:11 2009 +0200
     5.3 @@ -456,7 +456,7 @@
     5.4      33 => 'Kompletter Artikel unter',
     5.5      34 => 'Ende dieser Nachricht',
     5.6      35 => 'Sorry, dieser User möchte keine E-Mails bekommen.',
     5.7 -    36 => 'Copy:',
     5.8 +    36 => 'Kopie:',
     5.9      37 => 'Send me a copy of this email',
    5.10      38 => "This is a copy of the email that you sent to %s from <{$_CONF['site_url']}>:"
    5.11  );
    5.12 @@ -994,10 +994,10 @@
    5.13  
    5.14  $LANG31 = array(
    5.15      1 => "{$_CONF['site_name']} Mail Utility",
    5.16 -    2 => 'Von',
    5.17 -    3 => 'Reply-to',
    5.18 +    2 => 'Von (Name)',
    5.19 +    3 => 'Von (E-Mail)',
    5.20      4 => 'Betreff',
    5.21 -    5 => 'Text',
    5.22 +    5 => 'Nachricht',
    5.23      6 => 'Senden',
    5.24      7 => 'Alle User',
    5.25      8 => 'Admin',

     6.1 --- a/language/german_utf-8.php	Sun Oct 04 11:10:08 2009 +0200
     6.2 +++ b/language/german_utf-8.php	Sun Oct 04 13:32:11 2009 +0200
     6.3 @@ -455,7 +455,7 @@
     6.4      33 => 'Kompletter Artikel unter',
     6.5      34 => 'Ende dieser Nachricht',
     6.6      35 => 'Sorry, dieser User möchte keine E-Mails bekommen.',
     6.7 -    36 => 'Copy:',
     6.8 +    36 => 'Kopie:',
     6.9      37 => 'Send me a copy of this email',
    6.10      38 => "This is a copy of the email that you sent to %s from <{$_CONF['site_url']}>:"
    6.11  );
    6.12 @@ -993,10 +993,10 @@
    6.13  
    6.14  $LANG31 = array(
    6.15      1 => "{$_CONF['site_name']} Mail Utility",
    6.16 -    2 => 'Von',
    6.17 -    3 => 'Reply-to',
    6.18 +    2 => 'Von (Name)',
    6.19 +    3 => 'Von (E-Mail)',
    6.20      4 => 'Betreff',
    6.21 -    5 => 'Text',
    6.22 +    5 => 'Nachricht',
    6.23      6 => 'Senden',
    6.24      7 => 'Alle User',
    6.25      8 => 'Admin',

     7.1 --- a/public_html/admin/mail.php	Sun Oct 04 11:10:08 2009 +0200
     7.2 +++ b/public_html/admin/mail.php	Sun Oct 04 13:32:11 2009 +0200
     7.3 @@ -153,7 +153,7 @@
     7.4  
     7.5      if (empty($vars['fra']) OR empty($vars['fraepost']) OR
     7.6              empty($vars['subject']) OR empty($vars['message']) OR
     7.7 -            empty($vars['to_group'])) {
     7.8 +            empty($vars['to_group']) OR (strpos($vars['fra'], '@') !== false)) {
     7.9          $retval .= COM_showMessageText($LANG31[26]);
    7.10  
    7.11          return $retval;

     8.1 --- a/public_html/docs/english/changes.html	Sun Oct 04 11:10:08 2009 +0200
     8.2 +++ b/public_html/docs/english/changes.html	Sun Oct 04 13:32:11 2009 +0200
     8.3 @@ -16,6 +16,30 @@
     8.4  <a href="../history">ChangeLog</a>. The file <tt>docs/changed-files</tt> has a
     8.5  list of files that have been changed since the last release.</p>
     8.6  
     8.7 +<h2><a name="changes161">Geeklog 1.6.1</a></h2>
     8.8 +
     8.9 +<h3>New Features and Improvements</h3>
    8.10 +
    8.11 +<ul>
    8.12 +<li>Geeklog now lets you enter meta descriptions and meta keywords for the main
    8.13 +    page, for stories, topics, static pages, and polls. Please note that these
    8.14 +    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>
    8.15 +<li>You can now have one featured story per topic (for stories set to "Show
    8.16 +    only in Topic").</li>
    8.17 +<li>New autotags now allow you to embed polls in stories and everywhere else
    8.18 +    where autotags are allowed.</li>
    8.19 +<li>Minor security enhancement: "Important" cookies (like the session cookies)
    8.20 +    are now created with the HttpOnly flag set. This will help avoid some XSS
    8.21 +    attacks, provided your browser supports this flag.</li>
    8.22 +</ul>
    8.23 +
    8.24 +<h3>Bugfixes</h3>
    8.25 +
    8.26 +<ul>
    8.27 +<li>The admin group for the Static Pages plugin was created with a wrong name
    8.28 +    in Geeklog 1.6.0 (fresh installs only).</li>
    8.29 +</ul>
    8.30 +
    8.31  <h2><a name="changes160sr2">Geeklog 1.6.0sr2</a></h2>
    8.32  
    8.33  <p>This release addresses the following security issue:</p>

     9.1 --- a/public_html/docs/english/theme.html	Sun Oct 04 11:10:08 2009 +0200
     9.2 +++ b/public_html/docs/english/theme.html	Sun Oct 04 13:32:11 2009 +0200
     9.3 @@ -201,9 +201,10 @@
     9.4  <li>Added a "send copy to myself" option to
     9.5      <tt>profiles/contactauthorform.thtml</tt></li>
     9.6  <li>Cosmetics: Made the look and layout of the "Send mail to user"
     9.7 -    (<tt>contactuserform.thtml</tt>) and "Mail Story to a Friend"
     9.8 -    (<tt>contactauthorform.thtml</tt>) dialogs more consistent (alignment, size
     9.9 -    of input fields).</li>
    9.10 +    (<tt>profiles/contactuserform.thtml</tt>), "Mail Story to a Friend"
    9.11 +    (<tt>profiles/contactauthorform.thtml</tt>), and "Mail Users"
    9.12 +    (<tt>admin/mail/mailform.thtml</tt>) dialogs more consistent (alignment,
    9.13 +    size of input fields).</li>
    9.14  <li>The Topic Editor now contains a line displaying the number of stories in
    9.15      the current topic. New variables in <tt>admin/topic/topiceditor.thtml</tt>:
    9.16      <code>{lang_num_stories}</code>, <code>{num_stories}</tt></li>

    10.1 --- a/public_html/docs/history	Sun Oct 04 11:10:08 2009 +0200
    10.2 +++ b/public_html/docs/history	Sun Oct 04 13:32:11 2009 +0200
    10.3 @@ -3,9 +3,9 @@
    10.4  Oct ??, 2009 (1.6.1)
    10.5  ------------
    10.6  
    10.7 -- Additional checks in "Mail Story to a Friend" and "Send mail to user" dialogs
    10.8 -  to make sure users don't enter email addresses into the name fields (bug
    10.9 -  #0000992) [Dirk]
   10.10 +- Additional checks in "Mail Story to a Friend", "Send mail to user", and
   10.11 +  "Mail Users" dialogs to make sure users don't enter email addresses into the
   10.12 +  name fields (bug #0000992) [Dirk]
   10.13  - Added an option to send a copy to self to the "Mail Story to a Friend" dialog
   10.14    and made the look of this and the "Send mail to user" dialogs more consistent
   10.15    [Dirk]

    11.1 --- a/public_html/layout/professional/admin/mail/mailform.thtml	Sun Oct 04 11:10:08 2009 +0200
    11.2 +++ b/public_html/layout/professional/admin/mail/mailform.thtml	Sun Oct 04 13:32:11 2009 +0200
    11.3 @@ -1,7 +1,7 @@
    11.4  <form action="{php_self}" method="post">
    11.5 -    <table cellpadding="2" cellspacing="0">
    11.6 +    <table cellspacing="0" cellpadding="3" width="100%">
    11.7          <tr>
    11.8 -            <td class="alignright">{lang_to}:</td>
    11.9 +            <td class="alignright"><b>{lang_to}:</b></td>
   11.10              <td>
   11.11                  <select name="to_group">
   11.12                      <option value="">{lang_selectgroup}</option>
   11.13 @@ -10,26 +10,23 @@
   11.14              </td>
   11.15          </tr>
   11.16          <tr>
   11.17 -            <td class="alignright">{lang_from}:</td>
   11.18 +            <td class="alignright"><b>{lang_from}:</b></td>
   11.19              <td><input type="text" name="fra" value="{site_name}" size="40"{xhtml}></td>
   11.20          </tr>
   11.21          <tr>
   11.22 -            <td class="alignright">{lang_replyto}:</td>
   11.23 +            <td class="alignright"><b>{lang_replyto}:</b></td>
   11.24              <td><input type="text" name="fraepost" value="{site_mail}" size="40"{xhtml}></td>
   11.25          </tr>
   11.26          <tr>
   11.27 -            <td class="alignright">{lang_subject}:</td>
   11.28 +            <td class="alignright"><b>{lang_subject}:</b></td>
   11.29              <td><input type="text" name="subject" size="40"{xhtml}></td>
   11.30          </tr>
   11.31          <tr>
   11.32 -            <td class="alignright" style="vertical-align:top;">{lang_body}:</td>
   11.33 -            <td><textarea rows="12" name="message" cols="44"></textarea></td>
   11.34 +            <td class="alignright" style="vertical-align:top;"><b>{lang_body}:</b></td>
   11.35 +            <td><textarea name="message" rows="10" style="width:100%"></textarea></td>
   11.36          </tr>
   11.37          <tr>
   11.38 -            <td colspan="2" class="alignleft"><b>{lang_options}</b></td>
   11.39 -        </tr>
   11.40 -        <tr>
   11.41 -            <td>&nbsp;</td>
   11.42 +            <td class="alignright"><b>{lang_options}:</b></td>
   11.43              <td><input type="checkbox" name="html"{xhtml}> {lang_HTML}</td>
   11.44          </tr>
   11.45          <tr>
   11.46 @@ -41,10 +38,12 @@
   11.47              <td><input type="checkbox" name="overstyr"{xhtml}> {lang_ignoreusersettings}</td>
   11.48          </tr>
   11.49          <tr>
   11.50 -            <td colspan="2" class="aligncenter">
   11.51 -                <input type="submit" value="{lang_send}"{xhtml}>
   11.52 -                <input type="hidden" name="mail" value="mail"{xhtml}>
   11.53 -                <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
   11.54 +            <td colspan="2" class="aligncenter" style="padding-top:10px;">
   11.55 +                <div style="padding:5px;">
   11.56 +                    <input type="submit" value="{lang_send}"{xhtml}>
   11.57 +                    <input type="hidden" name="mail" value="mail"{xhtml}>
   11.58 +                    <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
   11.59 +                </div>
   11.60              </td>
   11.61          </tr>
   11.62      </table>