Changeset 493

Timestamp:

02/01/08 16:12:52 (10 months ago)

Author:

kasper

Message:

Notification about new comments is now translatable, and mail body utf-8 encoded so that international characters in the comment works.
Enlarged admin options mail field

Location:

trunk

Files:

• admin/plog-options.php (modified) (1 diff)
• plog-functions.php (modified) (2 diffs)

trunk/admin/plog-options.php

@@ -168 +168 @@
                         <td><strong>' . plog_tr('Administrator E-mail address:') . '</strong></td>
                         <td>
-                            <input type="text" name="admin_email" value="'.$config['admin_email'].'"/>
+                            <input size="45" type="text" name="admin_email" value="'.$config['admin_email'].'"/>
                         </td>
                     </tr>

trunk/plog-functions.php

@@ -1154 +1154 @@
         
         if (!$result) {
-                return array("errors" => "Could not post comment " . mysql_error());
+                return array("errors" => plog_tr("Could not post comment ") . mysql_error());
         }
         
@@ -1160 +1160 @@
         if ($config["comments_notify"] && $config["admin_email"]) {
                 // create and send notify mail message
-                $msg = "New comment posted for picture " . basename($picdata['path']) . " $notify_msg\n\n";
-                $msg .= "Author: $author (IP: $ip, $host)\n";
-                $msg .= "E-mail: $email\n";
-                $msg .= "URI: $url\n\n";
-                $msg .= "Comment:\n$comment\n\n";
-                $msg .= "You can see all the comments for this picture here:\n";
+                $msg = plog_tr("New comment posted for picture ") . basename($picdata['path']) . " $notify_msg\n\n";
+                $msg .= plog_tr("Author") . ": $author (IP: $ip, $host)\n";
+                $msg .= plog_tr("E-mail") . ": $email\n";
+                $msg .= plog_tr("URI") . ": $url\n\n";
+                $msg .= plog_tr("Comment") . ":\n$comment\n\n";
+                $msg .= plog_tr("You can see all the comments for this picture here") . ":\n";
                 $picurl = generate_url("picture",$parent_id);
                 $msg .= $picurl;
-                mail($config['admin_email'],SmartStripSlashes($config['gallery_name']) . ': new comment from '.$author,$msg,"From: $email");
-        }
-        
-        return array("result" => "Comment added.");
+                $headers  = "From: $author <$email>\r\n";
+                $headers .= 'Content-type: text/plain; charset=utf-8\r\n';
+
+                // Subject should be encoded for international characters too!
+                mail(
+      $config['admin_email'],
+      SmartStripSlashes($config['gallery_name']) . ': ' . plog_tr('new comment from') . ' ' . $author,
+      $msg,
+      $headers);
+        }
+        
+        return array("result" => plog_tr("Comment added") . ".");
 }