1.1 --- a/public_html/docs/english/theme.html	Sun Oct 04 09:36:19 2009 +0200
     1.2 +++ b/public_html/docs/english/theme.html	Sun Oct 04 10:08:27 2009 +0200
     1.3 @@ -198,6 +198,12 @@
     1.4  <h2><a name="changes">Theme changes in Geeklog 1.6.1</a></h2>
     1.5  
     1.6  <ul>
     1.7 +<li>Added a "send copy to myself" option to
     1.8 +    <tt>profiles/contactauthorform.thtml</tt></li>
     1.9 +<li>Cosmetics: Made the look and layout of the "Send mail to user"
    1.10 +    (<tt>contactuserform.thtml</tt>) and "Mail Story to a Friend"
    1.11 +    (<tt>contactauthorform.thtml</tt>) dialogs more consistent (alignment, size
    1.12 +    of input fields).</li>
    1.13  <li>The Topic Editor now contains a line displaying the number of stories in
    1.14      the current topic. New variables in <tt>admin/topic/topiceditor.thtml</tt>:
    1.15      <code>{lang_num_stories}</code>, <code>{num_stories}</tt></li>
    1.16 @@ -238,12 +244,16 @@
    1.17  <li>Links: Removed a <code>width="150"</code> from the Category editor template
    1.18      (<tt>admin/categoryeditor.thtml</tt>) that pushed the first column too far
    1.19      to the right.</li>
    1.20 +<li>Static Pages: Added new input fields for a meta description and meta
    1.21 +    keywords to the Static Pages editor.</li>
    1.22  <li>Static Pages: In the Static Pages editor, moved the Hits display below
    1.23      the Last Updated entry (<tt>admin/editor.thtml</tt>,
    1.24      <tt>admin/editor_advanced.thtml</tt>).</li>
    1.25  <li>Static Pages: Added textarea fileds for meta description and meta keywords
    1.26      in the Static Pages editor (<tt>admin/editor.thtml</tt>,
    1.27      <tt>admin/editor_advanced.thtml</tt>).</li>
    1.28 +<li>Polls: Added new input fields for a meta description and meta keywords to
    1.29 +    the Polls editor.</li>
    1.30  <li>Polls: Added new CSS classes <tt>poll-autotag-message</tt>,
    1.31      <tt>poll-autotag</tt>, <tt>poll-autotag-left</tt>, used when embedding polls
    1.32      via the new autotags.</li>

     2.1 --- a/public_html/docs/history	Sun Oct 04 09:36:19 2009 +0200
     2.2 +++ b/public_html/docs/history	Sun Oct 04 10:08:27 2009 +0200
     2.3 @@ -3,6 +3,9 @@
     2.4  Oct ??, 2009 (1.6.1)
     2.5  ------------
     2.6  
     2.7 +- Added an option to send a copy to self to the "Mail Story to a Friend" dialog
     2.8 +  and made the look of this and the "Send mail to user" dialogs more consistent
     2.9 +  [Dirk]
    2.10  - Display the number of stories in the current topic in the Topic Editor
    2.11    (feature request #0000806) [Dirk]
    2.12  - Call CUSTOM_userCheck from admin/user.php (bug #0000925) [Dirk]
    2.13 @@ -51,8 +54,8 @@
    2.14  - Only list [code], [raw] tags when story.* permissions are required [Dirk]
    2.15  - [page_break] was not listed when all HTML was allowed for Root users [Dirk]
    2.16  - Added support for meta tags and meta keywords, provided by Tom Homer
    2.17 -- When an error occurs in bigdump.php (during migration) keep the language when
    2.18 -  sending the user back to migrate.php (bug #0000943) [Dirk]
    2.19 +- When an error occurs in bigdump.php (during migration) keep the selected
    2.20 +  language when sending the user back to migrate.php (bug #0000943) [Dirk]
    2.21  - Use COM_getUserDateTimeFormat, i.e. the user's preferred format, for
    2.22    displaying the date and time in search results [Dirk]
    2.23  - When disabling a feed, delete the feed file [Dirk]
    2.24 @@ -94,7 +97,7 @@
    2.25  
    2.26  Static Pages Plugin 1.6.1
    2.27  -------------------
    2.28 -- Fresh installs of the plugin in Geeklog 1.6.1 accidentally used a wrong name
    2.29 +- Fresh installs of the plugin in Geeklog 1.6.0 accidentally used a wrong name
    2.30    for the plugin's admin group. Silently fix that during the upgrade [Dirk]
    2.31  - Made the list of pages sortable by author (feature request #0000978) [Dirk]
    2.32  - List available autotags in the static pages editor [Dirk]

     3.1 --- a/public_html/layout/professional/profiles/contactauthorform.thtml	Sun Oct 04 09:36:19 2009 +0200
     3.2 +++ b/public_html/layout/professional/profiles/contactauthorform.thtml	Sun Oct 04 10:08:27 2009 +0200
     3.3 @@ -23,14 +23,21 @@
     3.4          </tr>
     3.5          <tr>
     3.6              <td class="alignright" style="vertical-align:top;"><b>{lang_shortmessage}:</b></td>
     3.7 -            <td><textarea name="shortmsg" rows="8" style="width:100%">{shortmsg}</textarea></td>
     3.8 +            <td><textarea name="shortmsg" rows="10" style="width:100%">{shortmsg}</textarea></td>
     3.9 +        </tr>
    3.10 +        <tr>
    3.11 +            <td class="alignright"><b>{lang_cc}</b></td>
    3.12 +            <td><input type="checkbox" name="cc" checked="checked"{xhtml}>&nbsp;{lang_cc_description}</td>
    3.13          </tr>
    3.14          {captcha}
    3.15          <tr>
    3.16 -            <td colspan="2" class="warning aligncenter"><br{xhtml}>{lang_warning}<br{xhtml}><br{xhtml}>
    3.17 -                <input type="hidden" name="sid" value="{story_id}"{xhtml}>
    3.18 -                <input type="hidden" name="what" value="sendstory"{xhtml}>
    3.19 -                <input type="submit" value="{lang_sendmessage}"{xhtml}>
    3.20 +            <td colspan="2" class="warning aligncenter" style="padding-top:10px;">
    3.21 +                {lang_warning}
    3.22 +                <div style="padding:5px;">
    3.23 +                    <input type="hidden" name="sid" value="{story_id}"{xhtml}>
    3.24 +                    <input type="hidden" name="what" value="sendstory"{xhtml}>
    3.25 +                    <input type="submit" value="{lang_sendmessage}"{xhtml}>
    3.26 +                </div>
    3.27              </td>
    3.28          </tr>
    3.29      </table>

     4.1 --- a/public_html/layout/professional/profiles/contactuserform.thtml	Sun Oct 04 09:36:19 2009 +0200
     4.2 +++ b/public_html/layout/professional/profiles/contactuserform.thtml	Sun Oct 04 10:08:27 2009 +0200
     4.3 @@ -1,31 +1,29 @@
     4.4 +<p>{lang_description}</p>
     4.5  <form action="{site_url}/profiles.php" method="post" name="contact">
     4.6 -    <table cellspacing="0" cellpadding="0" width="100%" class="plugin">
     4.7 +    <table cellspacing="0" cellpadding="3" width="100%">
     4.8          <tr>
     4.9 -            <td colspan="2" class="pluginInfo">{lang_description}</td>
    4.10 +            <td class="alignright"><b>{lang_username}</b></td>
    4.11 +            <td><input type="text" name="author" size="40" maxlength="96" value="{username}"{xhtml}></td>
    4.12          </tr>
    4.13          <tr>
    4.14 -            <td>{lang_username}</td>
    4.15 -            <td><input type="text" name="author" size="32" value="{username}" maxlength="32"{xhtml}></td>
    4.16 +            <td class="alignright"><b>{lang_useremail}</b></td>
    4.17 +            <td><input type="text" name="authoremail" size="40" maxlength="96" value="{useremail}"{xhtml}></td>
    4.18          </tr>
    4.19          <tr>
    4.20 -            <td>{lang_useremail}</td>
    4.21 -            <td><input type="text" name="authoremail" size="32" value="{useremail}" maxlength="96"{xhtml}></td>
    4.22 +            <td class="alignright"><b>{lang_subject}</b></td>
    4.23 +            <td><input type="text" name="subject" size="40" maxlength="96" value="{subject}"{xhtml}></td>
    4.24          </tr>
    4.25          <tr>
    4.26 -            <td>{lang_cc}</td>
    4.27 -            <td><input type="checkbox" name="cc" checked="checked"{xhtml}>&nbsp;{lang_cc_description}</td>
    4.28 +            <td class="alignright" style="vertical-align:top;"><b>{lang_message}</b></td>
    4.29 +            <td><textarea name="message" rows="10" style="width:100%">{message}</textarea></td>
    4.30          </tr>
    4.31          <tr>
    4.32 -            <td>{lang_subject}</td>
    4.33 -            <td><input type="text" name="subject" size="32" maxlength="96" value="{subject}"{xhtml}></td>
    4.34 -        </tr>
    4.35 -        <tr>
    4.36 -            <td style="vertical-align:top;">{lang_message}</td>
    4.37 -            <td><textarea name="message" wrap="physical" rows="10" cols="50">{message}</textarea></td>
    4.38 +            <td class="alignright"><b>{lang_cc}</b></td>
    4.39 +            <td><input type="checkbox" name="cc" checked="checked"{xhtml}>&nbsp;{lang_cc_description}</td>
    4.40          </tr>
    4.41          {captcha}
    4.42          <tr>
    4.43 -            <td colspan="2" class="warning alignleft" style="padding-left:200px;padding-top:10px;">
    4.44 +            <td colspan="2" class="warning aligncenter" style="padding-top:10px;">
    4.45                  {lang_nohtml}
    4.46                  <div style="padding:5px;">
    4.47                      <input type="hidden" name="what" value="contact"{xhtml}>

     5.1 --- a/public_html/profiles.php	Sun Oct 04 09:36:19 2009 +0200
     5.2 +++ b/public_html/profiles.php	Sun Oct 04 10:08:27 2009 +0200
     5.3 @@ -371,11 +371,19 @@
     5.4                                    . $sid);
     5.5      }
     5.6  
     5.7 -    $mailto = COM_formatEmailAddress ($to, $toemail);
     5.8 -    $mailfrom = COM_formatEmailAddress ($from, $fromemail);
     5.9 -    $subject = COM_undoSpecialChars(strip_tags('Re: '.$story->DisplayElements('title')));
    5.10 +    $mailto = COM_formatEmailAddress($to, $toemail);
    5.11 +    $mailfrom = COM_formatEmailAddress($from, $fromemail);
    5.12 +    $subject = 'Re: ' . COM_undoSpecialChars(strip_tags($story->DisplayElements('title')));
    5.13  
    5.14 -    $sent = COM_mail ($mailto, $subject, $mailtext, $mailfrom);
    5.15 +    $sent = COM_mail($mailto, $subject, $mailtext, $mailfrom);
    5.16 +
    5.17 +    if ($sent && isset($_POST['cc']) && ($_POST['cc'] == 'on')) {
    5.18 +        $ccmessage = sprintf($LANG08[38], $to);
    5.19 +        $ccmessage .= "\n------------------------------------------------------------\n\n" . $mailtext;
    5.20 +
    5.21 +        $sent = COM_mail($mailfrom, $subject, $ccmessage, $mailfrom);
    5.22 +    }
    5.23 +
    5.24      COM_updateSpeedlimit ('mail');
    5.25  
    5.26      // Increment numemails counter for story
    5.27 @@ -468,6 +476,8 @@
    5.28      $mail_template->set_var('toname', $to);
    5.29      $mail_template->set_var('lang_toemailaddress', $LANG08[19]);
    5.30      $mail_template->set_var('toemail', $toemail);
    5.31 +    $mail_template->set_var('lang_cc', $LANG08[36]);
    5.32 +    $mail_template->set_var('lang_cc_description', $LANG08[37]);
    5.33      $mail_template->set_var('lang_shortmessage', $LANG08[27]);
    5.34      $mail_template->set_var('shortmsg', htmlspecialchars($shortmsg));
    5.35      $mail_template->set_var('lang_warning', $LANG08[22]);