Changeset 8271 for extensions/LCAS/trunk/include/functions.inc.php

Timestamp:

Dec 23, 2010, 11:24:37 PM (13 years ago)

Author:

Eric

Message:

bug 2066 second step fix :

• Add option to enable / disable email send
• Email function integration in userlist table
• LCAS_SendMail function coded (not tested)

Database init updated
Translation files updated

File:

• extensions/LCAS/trunk/include/functions.inc.php (modified) (3 diffs)

extensions/LCAS/trunk/include/functions.inc.php

@@ -621 +621 @@
 
 
-/* Function called from main.inc.php to send validation email */
-function LCAS_SendMail2User($typemail, $id, $username, $password, $email, $confirm)
+/* Function called from LCAS_admin.php to send notification email */
+function LCAS_SendMail($id, $username)
 {
   global $conf;
@@ -629 +629 @@
   
         include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
-  
-        $infos1_perso = "";
-  $infos2_perso = "";
 
 /* We have to get the user's language in database */
@@ -656 +653 @@
   }
 
-  switch($typemail)
-  {
-    case 1:
-      $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Add of %s', stripslashes($username)));
-      $password = $password <> '' ? $password : l10n('LCAS_empty_pwd');
-      
-      if (isset($conf_LCAS[9]) and $conf_LCAS[9] <> '')
-      {
-        if (function_exists('get_user_language_desc'))
-        {
-          $infos1_perso = get_user_language_desc($conf_LCAS[9])."\n\n";
-        }
-        else $infos1_perso = l10n($conf_LCAS[9])."\n\n"; 
-      }
-      
-      break;
-      
-    case 2:
-      $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Update of %s', stripslashes($username)));
-      $password = $password <> '' ? $password : l10n('LCAS_empty_pwd');
-
-      break;
-        
-    case 3:
-      $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Update of %s', stripslashes($username)));
-      $password = $password <> '' ? $password : l10n('LCAS_no_update_pwd');
-
-      break;
-  }
-
-  if (isset($conf_LCAS[0]) and $conf_LCAS[0] == 'true')
-  {
-    $infos1 = array(
-      get_l10n_args('infos_mail %s', stripslashes($username)),
-      get_l10n_args('User: %s', stripslashes($username)),
-      get_l10n_args('Password: %s', $password),
-      get_l10n_args('Email: %s', $email),
-      get_l10n_args('', ''),
-    );
-  }
-
-
-  if ( isset($conf_LCAS[1]) and $conf_LCAS[1] == 'true' and $confirm)
-  {
-    $infos2 = array
-    (
-      get_l10n_args('Link: %s', AddConfirmMail($id, $email)),
-      get_l10n_args('', ''),
-    );
-
-    if (isset($conf_LCAS[10]) and $conf_LCAS[10] <> '')
+  $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Username_updated_for_%s', stripslashes($username)));
+
+  if (isset($conf_LCAS[3]) and $conf_LCAS[3] <> '')
+  {
+    if (function_exists('get_user_language_desc'))
     {
-      if (function_exists('get_user_language_desc'))
-      {
-        $infos2_perso = get_user_language_desc($conf_LCAS[10])."\n\n";
-      }
-      else $infos2_perso = l10n($conf_LCAS[10])."\n\n";
+      $customtxt = get_user_language_desc($conf_LCAS[3])."\n\n";
     }
-  }
-
-/* Sending the email with subject and contents */
+    else $customtxt = l10n($conf_LCAS[3])."\n\n"; 
+  }
+
+/* Send the email with subject and contents */
   pwg_mail($email, array(
     'subject' => $subject,
-    'content' => (isset($infos1) ? $infos1_perso.l10n_args($infos1)."\n\n" : "").(isset($infos2) ? $infos2_perso.l10n_args($infos2)."\n\n" : "").get_absolute_root_url(),
+    'content' => ($customtxt),
   ));