Changeset 1617

Timestamp:

Nov 22, 2006, 5:41:25 AM (17 years ago)

Author:

rvelices

Message:

feature 440: send mail to admin when comment is entered

Location:

trunk

Files:

• admin/configuration.php (modified) (5 diffs)
• comments.php (modified) (1 diff)
• include/config_default.inc.php (modified) (1 diff)
• include/picture_comment.inc.php (modified) (1 diff)
• install/config.sql (modified) (1 diff)
• install/db/35-database.php (added)
• language/en_UK.iso-8859-1/admin.lang.php (modified) (1 diff)
• language/fr_FR.iso-8859-1/admin.lang.php (modified) (1 diff)
• template/yoga/admin/configuration.tpl (modified) (3 diffs)

trunk/admin/configuration.php

@@ -47 +47 @@
   $page['section'] = $_GET['section'];
 }
+
+$general_checkboxes = array(
+    'log',
+    'history_admin',
+    'history_guest',
+    'login_history',
+    'email_admin_on_new_user'
+   );
+
+$comments_checkboxes = array(
+    'comments_forall',
+    'comments_validation',
+    'email_admin_on_comment',
+    'email_admin_on_comment_validation',
+  );
+
 //------------------------------ verification and registration of modifications
 if (isset($_POST['submit']) and !is_adviser())
@@ -59 +75 @@
         array_push($page['errors'], $lang['conf_gallery_url_error']);
       }
-      $_POST['log'] = empty($_POST['log'])?'false':'true';
-      $_POST['history_admin'] = empty($_POST['history_admin'])?'false':'true';
-      $_POST['history_guest'] = empty($_POST['history_guest'])?'false':'true';
-      $_POST['login_history'] = empty($_POST['login_history'])?'false':'true';
+      foreach( $general_checkboxes as $checkbox)
+      {
+        $_POST[$checkbox] = empty($_POST[$checkbox])?'false':'true';
+      }
       break;
     }
@@ -74 +90 @@
       {
         array_push($page['errors'], $lang['conf_nb_comment_page_error']);
+      }
+      foreach( $comments_checkboxes as $checkbox)
+      {
+        $_POST[$checkbox] = empty($_POST[$checkbox])?'false':'true';
       }
       break;
@@ -161 +181 @@
     ));
 
+$html_check='checked="checked"';
+
 switch ($page['section'])
 {
   case 'general' :
   {
-    $html_check='checked="checked"';
-
     $lock_yes = ($conf['gallery_locked']=='true')?'checked="checked"':'';
     $lock_no = ($conf['gallery_locked']=='false')?'checked="checked"':'';
-    $history_users = ($conf['log']=='true')?$html_check:'';
-    $history_admin = ($conf['history_admin']=='true')?$html_check:'';
-    $history_guest = ($conf['history_guest']=='true')?$html_check:'';
-    $login_history = ($conf['login_history']=='true')?$html_check:'';
 
     $template->assign_block_vars(
       'general',
       array(
-        'HISTORY_USERS'=>$history_users,
-        'HISTORY_ADMIN'=>$history_admin,
-        'HISTORY_GUEST'=>$history_guest,
-        'LOGIN_HISTORY'=>$login_history,
         'GALLERY_LOCKED_YES'=>$lock_yes,
         'GALLERY_LOCKED_NO'=>$lock_no,
@@ -190 +202 @@
         'CONF_GALLERY_URL' => $conf['gallery_url'],
         ));
+
+    foreach( $general_checkboxes as $checkbox)
+    {
+      $template->merge_block_vars(
+          'general',
+          array(
+            strtoupper($checkbox) => ($conf[$checkbox]=='true')?$html_check:''
+            )
+        );
+    }
     break;
   }
   case 'comments' :
   {
-    $all_yes = ($conf['comments_forall']=='true')?'checked="checked"':'';
-    $all_no  = ($conf['comments_forall']=='false')?'checked="checked"':'';
-    $validate_yes = ($conf['comments_validation']=='true')?'checked="checked"':'';
-    $validate_no = ($conf['comments_validation']=='false')?'checked="checked"':'';
-
     $template->assign_block_vars(
       'comments',
       array(
         'NB_COMMENTS_PAGE'=>$conf['nb_comment_page'],
-        'COMMENTS_ALL_YES'=>$all_yes,
-        'COMMENTS_ALL_NO'=>$all_no,
-        'VALIDATE_YES'=>$validate_yes,
-        'VALIDATE_NO'=>$validate_no
         ));
+
+    foreach( $comments_checkboxes as $checkbox)
+    {
+      $template->merge_block_vars(
+          'comments',
+          array(
+            strtoupper($checkbox) => ($conf[$checkbox]=='true')?$html_check:''
+            )
+        );
+    }
     break;
   }

trunk/comments.php

@@ -156 +156 @@
 // |                         comments management                           |
 // +-----------------------------------------------------------------------+
-if (is_admin() and !is_adviser() )
-{
-  if (isset($_GET['delete']) and is_numeric($_GET['delete']) )
-  {// comments deletion
-    $query = '
+if (isset($_GET['delete']) and is_numeric($_GET['delete'])
+      and !is_adviser() )
+{// comments deletion
+  check_status(ACCESS_ADMINISTRATOR);
+  $query = '
 DELETE FROM '.COMMENTS_TABLE.'
   WHERE id='.$_GET['delete'].'
 ;';
-    pwg_query($query);
-  }
-
-  if (isset($_GET['validate']) and is_numeric($_GET['validate']) )
-  {  // comments validation
-    $query = '
+  pwg_query($query);
+}
+
+if (isset($_GET['validate']) and is_numeric($_GET['validate'])
+      and !is_adviser() )
+{  // comments validation
+  check_status(ACCESS_ADMINISTRATOR);
+  $query = '
 UPDATE '.COMMENTS_TABLE.'
   SET validated = \'true\'
-    , validation_date = NOW()
+  , validation_date = NOW()
   WHERE id='.$_GET['validate'].'
 ;';
-    pwg_query($query);
-  }
-}
+  pwg_query($query);
+}
+
 // +-----------------------------------------------------------------------+
 // |                       page header and options                         |

trunk/include/config_default.inc.php

@@ -516 +516 @@
 $conf['nbm_treatment_timeout_default'] = 20;
 
-// Send an email to the webmaster when a new user registers
-$conf['email_admin_on_new_user']=false;
-
 // +-----------------------------------------------------------------------+
 // | Set default admin layout                                              |

trunk/include/picture_comment.inc.php

@@ -194 +194 @@
     $template->assign_block_vars('information',
                                  array('INFORMATION'=>$message));
+    if ( ($comment_action=='validate' and $conf['email_admin_on_comment'])
+      or $conf['email_admin_on_comment_validation'] )
+    {
+      include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
+
+      $del_url = get_host_url().cookie_path()
+        .'comments.php?delete='.$comm['id'];
+
+      $content =
+        'Author: '.$comm['author']."\n"
+        .'Comment: '.$comm['content']."\n"
+        .'IP: '.$comm['ip']."\n"
+        .'Browser: '.$comm['agent']."\n\n"
+        .'Delete: '.$del_url."\n";
+      if ($comment_action!='validate')
+      {
+        $content .=
+          'Validate: '.get_host_url().cookie_path()
+          .'comments.php?validate='.$comm['id'];
+      }
+      pwg_mail( get_webmaster_mail_address(), '',
+          'PWG comment by '.$comm['author'],
+          $content
+          );
+    }
   }
   else

trunk/install/config.sql

@@ -27 +27 @@
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('nbm_send_detailed_content','true','Send detailed content for notification by mail');
 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 ('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');

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

@@ -82 +82 @@
 $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['Empty caddie'] = 'Empty caddie';
 $lang['Environment'] = 'Environment';

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

@@ -82 +82 @@
 $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['Empty caddie'] = 'Vider le panier';
 $lang['Environment'] = 'Environnement';

trunk/template/yoga/admin/configuration.tpl

@@ -54 +54 @@
 
     <li>
+      <label>
+        <span class="property">{lang:Email admin when a new user registers}</span>
+        <input type="checkbox" name="email_admin_on_new_user" {general.EMAIL_ADMIN_ON_NEW_USER} />
+      </label>
+    </li>
+
+    <br/>
+    <li>
       <fieldset>
         <legend>{lang:History}</legend>
         <ul>
           <li>
-            <label><span class="property">{lang:Users}</span><input type="checkbox" name="log" {general.HISTORY_USERS} /></label>
+            <label><span class="property">{lang:Users}</span><input type="checkbox" name="log" {general.LOG} /></label>
           </li>
 
@@ -85 +93 @@
   <ul>
     <li>
-      <span class="property">{lang:Comments for all}</span>
-      <label><input type="radio" class="radio" name="comments_forall" value="true" {comments.COMMENTS_ALL_YES} />{lang:Yes}</label>
-      <label><input type="radio" class="radio" name="comments_forall" value="false" {comments.COMMENTS_ALL_NO} />{lang:No}</label>
+      <label>
+        <span class="property">{lang:Comments for all}</span>
+        <input type="checkbox" name="comments_forall" {comments.COMMENTS_FORALL} />
+      </label>
     </li>
 
@@ -98 +107 @@
 
     <li>
-      <span class="property">{lang:Validation}</span>
-      <label><input type="radio" class="radio" name="comments_validation" value="true" {comments.VALIDATE_YES} />{lang:Yes}</label>
-      <label><input type="radio" class="radio" name="comments_validation" value="false" {comments.VALIDATE_NO} />{lang:No}</label>
-    </li>
+      <label>
+        <span class="property">{lang:Validation}</span>
+        <input type="checkbox" name="comments_validation" {comments.COMMENTS_VALIDATION} />
+      </label>
+    </li>
+
+
+    <li>
+      <label>
+        <span class="property">{lang:Email admin when a valid comment is entered}</span>
+        <input type="checkbox" name="email_admin_on_comment" {comments.EMAIL_ADMIN_ON_COMMENT} />
+      </label>
+    </li>
+
+    <li>
+      <label>
+        <span class="property">{lang:Email admin when a comment requires validation}</span>
+        <input type="checkbox" name="email_admin_on_comment_validation" {comments.EMAIL_ADMIN_ON_COMMENT_VALIDATION} />
+      </label>
+    </li>
+
   </ul>
 </fieldset>