Changeset 3810

Timestamp:

Sep 1, 2009, 7:13:00 PM (15 years ago)

Author:

Criss

Message:

bug 0001150

Add e-mail address management

Location:

extensions/ContactForm

Files:

• CHANGELOG (modified) (1 diff)
• admin/cf_emails.tab.php (added)
• admin/template/cf_emails.tab.tpl (added)
• admin/template/cf_history.tab.tpl (modified) (1 diff)
• admin/template/contactform_admin.css (modified) (1 diff)
• classes/cf_log.class.php (modified) (1 diff)
• classes/cf_plugin.class.php (modified) (3 diffs)
• config.php (modified) (2 diffs)
• include/cf_common.inc.php (modified) (2 diffs)
• include/cf_functions.inc.php (modified) (1 diff)
• language/en_UK/plugin.lang.php (modified) (2 diffs)
• language/fr_FR/plugin.lang.php (modified) (2 diffs)
• language/it_IT/plugin.lang.php (modified) (2 diffs)

extensions/ContactForm/CHANGELOG

@@ -1 +1 @@
 2009-08-21 1.0.6
                   Replace redirect page by a message on the index one
+                  Add e-mail address management
 
 2009-08-21 1.0.5

extensions/ContactForm/admin/template/cf_history.tab.tpl

@@ -10 +10 @@
   </tr>
 {foreach from=$CF_HISTORY item=history_item name=history}
-  <tr class="{if $smarty.foreach.history.index is odd}row1{else}row2{/if}">
+  <tr class="{cycle values="row2,row1"}">
     <td>
     {if isset($history_item.DATE.FORMATTED)}

extensions/ContactForm/admin/template/contactform_admin.css

@@ -21 +21 @@
         text-align: right;
 }
+.cf-refresh {
+        padding-top: 5px;
+        padding-bottom: 5px;
+}

extensions/ContactForm/classes/cf_log.class.php

@@ -22 +22 @@
     $debug_text = $template->parse('contact_form_debug', true);
     $template->assign('CF_DEBUG', $debug_text);
-    
     return $debug_text;
   }

extensions/ContactForm/classes/cf_plugin.class.php

@@ -311 +311 @@
   }
   
+  protected function get_active_admin_emails() {
+    //$cf_emails = $cf_config->get_value(CF_CFG_ADMIN_MAILS);
+    $all_mails = $this->config->get_value(CF_CFG_ADMIN_MAILS);
+    $active = array('WEBMASTER' => null, 'ADMINS' => array());
+    foreach($all_mails as $email => $values) {
+      if (1 == $values['ACTIVE']) {
+        if (1 == $values['WEBMASTER']) {
+          $active['WEBMASTER'] = $values['EMAILSTR'];
+        } else {
+          array_push($active['ADMINS'], $values['EMAILSTR']);
+        }
+      }
+    }
+    return $active;
+  }
+  
   protected function send_message(&$infos) {
     //redirect(make_index_url());
 //    include(PHPWG_ROOT_PATH . 'include/functions_mail.inc.php');
-    $webmaster_mail = get_webmaster_mail_address();
-    if (null == $webmaster_mail) {
-      $webmaster_mail = '';
-    }
-    $admin_mails = cf_get_admins_emails($webmaster_mail);
-    if (('' == $webmaster_mail) and (0 == count($admin_mails))) {
+
+    $admin_mails = $this->get_active_admin_emails();
+    if ( empty($admin_mails) or 
+        (empty($admin_mails['WEBMASTER']) and 
+         empty($admin_mails['ADMINS']))
+        ) {
       // No admin mail...
+      array_push( $infos['infos'], l10n('cf_no_mail'));
       return true;
     }
@@ -338 +355 @@
     $mail_args = array(
         'from' => $from,
-        'Bcc' => $admin_mails,
+        'Bcc' => $admin_mails['ADMINS'],
         'subject' => $subject,
         'content' => $content,
@@ -347 +364 @@
 
     $return = true;
-//    $return = @pwg_mail(
-//      $webmaster_mail,
-//      $mail_args
-//    );
+    $return = @pwg_mail(
+      $admin_mails['WEBMASTER'],
+      $mail_args
+    );
 
     cf_switch_back_to_user_lang();

extensions/ContactForm/config.php

@@ -1 +1 @@
 <?php
-/* $Id: config.php,v 1.4 2009/08/21 09:24:18 Criss Exp $ */
+/* $Id: config.php,v 1.5 2009/09/01 17:10:49 Criss Exp $ */
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 check_status(ACCESS_ADMINISTRATOR);
@@ -8 +8 @@
 
 $config_tabs[]='config';
+$config_tabs[]='emails';
 $config_tabs[]='language';
 $config_tabs[]='history';

extensions/ContactForm/include/cf_common.inc.php

@@ -58 +58 @@
 define('CF_CFG_DEFINE_LINK',    'cf_define_link');
 define('CF_CFG_CONTACT_LINK',   'cf_link');
+define('CF_CFG_ADMIN_MAILS',    'cf_admin_mails');
 
 /* ************************** */
@@ -87 +88 @@
 $cf_config_default[CF_CFG_DEFINE_LINK] = true;
 $cf_config_default[CF_CFG_CONTACT_LINK] = CF_DEFAULT_LINKNAME;
+$cf_config_default[CF_CFG_ADMIN_MAILS] = cf_get_admins_contacts();
+$cf_config_default[CF_CFG_ADMIN_MAILS] = array();
 CF_Config::$default_config = $cf_config_default;
 

extensions/ContactForm/include/cf_functions.inc.php

@@ -74 +74 @@
 }
 
+function cf_get_admins_contacts() {
+  global $conf, $user;
+  $admins = array();
+
+  $query = '
+select
+  U.'.$conf['user_fields']['username'].' as username,
+  U.'.$conf['user_fields']['email'].' as mail_address
+from
+  '.USERS_TABLE.' as U,
+  '.USER_INFOS_TABLE.' as I
+where
+  I.user_id =  U.'.$conf['user_fields']['id'].' and
+  I.status in (\'webmaster\',  \'admin\') and
+  I.adviser = \'false\' and
+  '.$conf['user_fields']['email'].' is not null 
+order by
+  username
+';
+  
+  $webmaster_mail = get_webmaster_mail_address();
+  $datas = pwg_query($query);
+  if (!empty($datas)) {
+    while ($admin = mysql_fetch_array($datas)) {
+      if (!empty($admin['mail_address'])) {
+        $name = $admin['username'];
+        $webmaster = 0;
+        if (0 == strcasecmp($webmaster_mail, $admin['mail_address'])) {
+          $name = l10n('Webmaster');
+          $webmaster = 1;
+        }
+        $admins[$admin['mail_address']] = array(
+            'NAME'     => $name,
+            'EMAILSTR' => format_email($name,
+                                       $admin['mail_address']),
+            'ACTIVE'   => 1,
+            'WEBMASTER'=> $webmaster,
+          );
+      }
+    }
+  }
+  return $admins;
+  
+}
+
 /* Return template for user template/theme*/
 function cf_get_template($file, $dir=CF_TEMPLATE, $prefix='') {

extensions/ContactForm/language/en_UK/plugin.lang.php

@@ -1 +1 @@
 <?php
-/* $Id: plugin.lang.php,v 1.10 2009/09/01 13:25:03 Criss Exp $ */
+/* $Id: plugin.lang.php,v 1.11 2009/09/01 17:10:50 Criss Exp $ */
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 global $lang;
@@ -64 +64 @@
 $lang['cf_define_link'] = 'Define link';
 $lang['cf_link'] = 'Name of the template variable containing the HTML link to the contact form';
+// Emails tab
+$lang['cf_tab_emails'] = 'E-mails';
+$lang['cf_emails_desc'] = 'Destination e-mails management';
+$lang['cf_active'] = 'Active e-mail';
+$lang['cf_no_mail'] = 'No e-mail address available';
+$lang['cf_refresh'] = 'Regenerate e-mail list address';
 // Language tab
 $lang['cf_tab_language'] = 'Localization';

extensions/ContactForm/language/fr_FR/plugin.lang.php

@@ -1 +1 @@
 <?php
-/* $Id: plugin.lang.php,v 1.10 2009/09/01 13:25:03 Criss Exp $ */
+/* $Id: plugin.lang.php,v 1.11 2009/09/01 17:10:49 Criss Exp $ */
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 global $lang;
@@ -64 +64 @@
 $lang['cf_define_link'] = 'Définir le lien';
 $lang['cf_link'] = 'Nom de la variable de template contenant le lien HTML vers le formulaire de contact';
+// Emails tab
+$lang['cf_tab_emails'] = 'E-mails';
+$lang['cf_emails_desc'] = 'Gestion des e-mails de destination';
+$lang['cf_active'] = 'E-mail actif';
+$lang['cf_no_mail'] = 'Aucune adresse e-mail disponible';
+$lang['cf_refresh'] = 'Regénérer la liste des adresses';
 // Language tab
 $lang['cf_tab_language'] = 'Localisation';

extensions/ContactForm/language/it_IT/plugin.lang.php

@@ -1 +1 @@
 <?php
-/* $Id: plugin.lang.php,v 1.10 2009/09/01 13:25:03 Criss Exp $ */
+/* $Id: plugin.lang.php,v 1.11 2009/09/01 17:10:50 Criss Exp $ */
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 global $lang;
@@ -64 +64 @@
 $lang['cf_define_link'] = 'Definire il link';
 $lang['cf_link'] = 'Nome della variabile del template contenente il link HTML verso il formulario di contatto';
+// Emails tab
+// TODO $lang['cf_tab_emails'] = '';
+// TODO $lang['cf_emails_desc'] = '';
+// TODO $lang['cf_active'] = '';
+// TODO $lang['cf_no_mail'] = '';
+// TODO $lang['cf_refresh'] = '';
 // Language tab
 $lang['cf_tab_language'] = 'Localizzazione';