Changeset 1901

Timestamp:

Mar 13, 2007, 12:10:35 AM (17 years ago)

Author:

rub

Message:

Add notification when a picture is loaded.
Change little translations.
Improve mail sent.

Location:

trunk

Files:

• admin/configuration.php (modified) (1 diff)
• include/functions_comment.inc.php (modified) (2 diffs)
• include/functions_mail.inc.php (modified) (2 diffs)
• install/config.sql (modified) (1 diff)
• install/db/57-database.php (added)
• language/en_UK.iso-8859-1/admin.lang.php (modified) (1 diff)
• language/en_UK.iso-8859-1/help/configuration.html (modified) (2 diffs)
• language/fr_FR.iso-8859-1/admin.lang.php (modified) (1 diff)
• language/fr_FR.iso-8859-1/help/configuration.html (modified) (2 diffs)
• register.php (modified) (1 diff)
• template/yoga/admin/configuration.tpl (modified) (4 diffs)
• upload.php (modified) (1 diff)

trunk/admin/configuration.php

@@ -52 +52 @@
     'email_admin_on_new_user',
     'allow_user_registration',
+    'email_admin_on_picture_uploaded',
    );
 

trunk/include/functions_comment.inc.php

@@ -195 +195 @@
       include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
 
-      $del_url = get_absolute_root_url().'comments.php?delete='.$comm['id'];
+      $del_url =
+          get_absolute_root_url().'comments.php?delete='.$comm['id'];
 
       $content =
-        'Author: '.$comm['author']."\n"
+         'Author: '.$comm['author']."\n"
         .'Comment: '.$comm['content']."\n"
-        .'IP: '.$comm['ip']."\n"
-        .'Browser: '.$comm['agent']."\n\n"
+        .get_block_mail_admin_info()
         .'Delete: '.$del_url."\n";
 
@@ -207 +207 @@
       {
         $content .=
-          'Validate: '.get_absolute_root_url()
-          .'comments.php?validate='.$comm['id'];
+          'Validate: '
+          .get_absolute_root_url().'comments.php?validate='.$comm['id'];
       }
 

trunk/include/functions_mail.inc.php

@@ -195 +195 @@
 
   return $result;
+}
+
+/* Return a standard block useful for admin mail */
+function get_block_mail_admin_info()
+{
+  global $user;
+
+  return 
+    "\n"
+    .'Connected user: '.$user['username']."\n"
+    .'IP: '.$_SERVER['REMOTE_ADDR']."\n"
+    .'Browser: '.$_SERVER['HTTP_USER_AGENT']."\n"
+    ."\n";
 }
 
@@ -374 +387 @@
   if (($args['content_format'] == 'text/plain') and ($args['email_format'] == 'text/html'))
   {
-    $content.= '<p>'.nl2br(htmlentities($args['content'])).'</p>';
+    $content.= '<p>'.
+                nl2br(
+                  preg_replace("/(http:\/\/)([^\s,]*)/i",
+                               "<a href='$1$2'>$1$2</a>",
+                               htmlentities($args['content']))).
+                '</p>';
   }
   else

trunk/install/config.sql

@@ -30 +30 @@
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('nbm_complementary_mail_content','','Complementary mail content for notification by mail');
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('nbm_send_recent_post_dates','true','Send recent post by dates for notification by mail');
-INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('email_admin_on_new_user','false','Send an email to the admin when a user registers');
-INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('email_admin_on_comment','false','Send an email to the admin when a valid comment is entered');
-INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('email_admin_on_comment_validation','false','Send an email to the admin when a comment requires validation');
+INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('email_admin_on_new_user','false','Send an email to theadministrators when a user registers');
+INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('email_admin_on_comment','false','Send an email to the administrators when a valid comment is entered');
+INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('email_admin_on_comment_validation','false','Send an email to the administrators when a comment requires validation');
+INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('email_admin_on_picture_uploaded','false','Send an email to the administrators when a picture is uploaded');

trunk/language/en_UK.iso-8859-1/admin.lang.php

@@ -83 +83 @@
 $lang['Edit tags'] = 'Edit tags';
 $lang['Elements'] = 'Elements';
-$lang['Email admin when a new user registers'] = 'Email admin when a new user registers';
-$lang['Email admin when a valid comment is entered'] = 'Email admin when a valid comment is entered';
-$lang['Email admin when a comment requires validation'] = 'Email admin when a comment requires validation';
+$lang['Email administrators when a new user registers'] = 'Email admins when a new user registers';
+$lang['Email administrators when a valid comment is entered'] = 'Email admins when a valid comment is entered';
+$lang['Email administrators when a comment requires validation'] = 'Email admins when a comment requires validation';
+$lang['Email administrators when a picture is uploaded'] = 'Email adminis when a picture is uploaded';
 $lang['Empty caddie'] = 'Empty caddie';
 $lang['Environment'] = 'Environment';

trunk/language/en_UK.iso-8859-1/help/configuration.html

@@ -30 +30 @@
 rate images.</li>
 
-  <li><strong>Email admin when a new user registers</strong>: Administrators will be received mail for each registration.</li>
+  <li><strong>Email admins when a new user registers</strong>: Administrators will be received mail for each registration.</li>
 
   <li><strong>Allow user registration</strong>: Registration is free for all.</li>
+
+  <li><strong>Email adminis when a picture is uploaded</strong>: Administrators will be received mail for each picture uploaded by a user.</li>
 
 </ul>
@@ -67 +69 @@
   Comments</span>.</li>
 
-  <li><strong>Email admin when a valid comment is entered</strong>:
+  <li><strong>Email admins when a valid comment is entered</strong>:
 Sends an email to the administrators when a user enters a comment and this comment is validated.</li>
 
-  <li><strong>Email admin when a comment requires validation</strong>:
+  <li><strong>Email admins when a comment requires validation</strong>:
 Sends an email to the administrators when a user enters a comment that requires validation by the admin.
 User comments validation takes place in the screen <span class="pwgScreen">Administration, Pictures, Comments</span>.</li>

trunk/language/fr_FR.iso-8859-1/admin.lang.php

@@ -83 +83 @@
 $lang['Edit tags'] = 'Editer les tags';
 $lang['Elements'] = 'Éléments';
-$lang['Email admin when a new user registers'] = 'Notifier le webmestre lors de l\'inscription d\'un utilisateur';
-$lang['Email admin when a valid comment is entered'] = 'Notifier le webmestre quand un commentaire est enregistré';
-$lang['Email admin when a comment requires validation'] = 'Notifier le webmestre quand un commentaire requiert sa validation';
+$lang['Email administrators when a new user registers'] = 'Notifier les administrateurs lors de l\'inscription d\'un utilisateur';
+$lang['Email administrators when a valid comment is entered'] = 'Notifier les administrateurs quand un commentaire est enregistré';
+$lang['Email administrators when a comment requires validation'] = 'Notifier les administrateurs quand un commentaire requiert sa validation';
+$lang['Email administrators when a picture is uploaded'] = 'Notifier les administrateurs quand une image est téléchargée';
 $lang['Empty caddie'] = 'Vider le panier';
 $lang['Environment'] = 'Environnement';

trunk/language/fr_FR.iso-8859-1/help/configuration.html

@@ -30 +30 @@
 non enregistrés peuvent noter les images.</li>
 
-  <li><strong>Notifier le webmestre lors de l'inscription d'un utilisateur</strong>: Les administrateurs recevront un courriel à chaque inscription.</li>
+  <li><strong>Notifier les administrateurs lors de l'inscription d'un utilisateur</strong>: Les administrateurs recevront un courriel à chaque inscription.</li>
 
   <li><strong>Permettre l'enregistrement des utilisateurs</strong>: L'inscription est libre pour tous.</li>
+
+  <li><strong>Notifier les administrateurs quand une image est téléchargée</strong>: Les administrateurs recevront un courriel à chaque image mis à disposition par un utilisateur.</li>
 
 </ul>
@@ -67 +69 @@
 Commentaires</span>.</li>
 
-  <li><strong>Notifier le webmestre quand un commentaire est enregistré</strong>:
+  <li><strong>Notifier les administrateurs quand un commentaire est enregistré</strong>:
 Envoi un courriel aux administrateurs lorsqu'un utilisateur enregistre un commentaire qui est validé.</li>
 
-  <li><strong>Notifier le webmestre quand un commentaire requiert sa validation </strong>:
+  <li><strong>Notifier les administrateurs quand un commentaire requiert sa validation </strong>:
 Envoi un courriel aux administrateurs lorsqu'un utilisateur enregistre un commentaire qui demande une validation de la part des administrateurs.
 La validation des commentaires utilisateurs a lieu dans l'écran <span class="pwgScreen">Administration, Images, Commentaires</span>.</li>

trunk/register.php

@@ -68 +68 @@
       $username = $_POST['login'];
       $admin_url = get_absolute_root_url()
-        .'admin.php?page=user_list&username='.$username;
+                   .'admin.php?page=user_list&username='.$username;
 
       $content =
-        'User: '.$username."\n"
+         'User: '.$username."\n"
         .'Mail: '.$_POST['mail_address']."\n"
-        .'IP: '.$_SERVER['REMOTE_ADDR']."\n"
-        .'Browser: '.$_SERVER['HTTP_USER_AGENT']."\n\n"
-        .l10n('admin').': '.$admin_url;
+        .get_block_mail_admin_info()
+        .'Admin'.': '.$admin_url;
 
       pwg_mail

trunk/template/yoga/admin/configuration.tpl

@@ -54 +54 @@
     <li>
       <label>
-        <span class="property">{lang:Email admin when a new user registers}</span>
+        <span class="property">{lang:Email administrators when a new user registers}</span>
         <input type="checkbox" name="email_admin_on_new_user" {main.EMAIL_ADMIN_ON_NEW_USER} />
       </label>
@@ -65 +65 @@
       </label>
     </li>
+
+    <li>
+      <label>
+        <span class="property">{lang:Email administrators when a picture is uploaded}</span>
+        <input type="checkbox" name="email_admin_on_picture_uploaded" {main.EMAIL_ADMIN_ON_PICTURE_UPLOADED} />
+      </label>
+    </li>
+
   </ul>
 </fieldset>
@@ -114 +122 @@
     <li>
       <label>
-        <span class="property">{lang:Email admin when a valid comment is entered}</span>
+        <span class="property">{lang:Email administrators when a valid comment is entered}</span>
         <input type="checkbox" name="email_admin_on_comment" {comments.EMAIL_ADMIN_ON_COMMENT} />
       </label>
@@ -121 +129 @@
     <li>
       <label>
-        <span class="property">{lang:Email admin when a comment requires validation}</span>
+        <span class="property">{lang:Email administrators when a comment requires validation}</span>
         <input type="checkbox" name="email_admin_on_comment_validation" {comments.EMAIL_ADMIN_ON_COMMENT_VALIDATION} />
       </label>

trunk/upload.php

@@ -223 +223 @@
     pwg_query( $query );
     $page['waiting_id'] = mysql_insert_id();
+
+    if ($conf['email_admin_on_picture_uploaded'])
+    {
+      include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
+
+      $waiting_url = get_absolute_root_url().'admin.php?page=waiting';
+
+      $content =
+         'Category: '.get_cat_display_name($category['upper_names'], null, false)."\n"
+        .'Picture name: '.$_FILES['picture']['name']."\n"
+        .'User: '.$_POST['username']."\n"
+        .'Email: '.$_POST['mail_address']."\n"
+        .'Picture name: '.$_POST['name']."\n"
+        .'Author: '.$_POST['author']."\n"
+        .'Creation Date: '.$_POST['date_creation']."\n"
+        .'Comment: '.$_POST['comment']."\n"
+        .get_block_mail_admin_info()
+        .'Waiting page: '.$waiting_url."\n";
+
+      pwg_mail
+      (
+        format_email('administrators', get_webmaster_mail_address()),
+        array
+        (
+          'subject' => 'PWG picture uploaded by '.$_POST['username'],
+          'content' => $content,
+          'Bcc' => get_administrators_email()
+        )
+      );
+    }
   }
 }