Changeset 1160

Timestamp:

Apr 14, 2006, 12:25:40 AM (18 years ago)

Author:

rub

Message:

Issue ID 330:

o Remove Apache functions
o Show redirect message on 2 lines

Location:

trunk

Files:

• admin/notification_by_mail.php (modified) (3 diffs)
• include/functions.inc.php (modified) (2 diffs)
• language/en_UK.iso-8859-1/admin.lang.php (modified) (1 diff)
• language/fr_FR.iso-8859-1/admin.lang.php (modified) (1 diff)

trunk/admin/notification_by_mail.php

@@ -118 +118 @@
   global $conf, $page, $env_nbm;
 
+  // Treatment of simulate post
+  if (isset($_POST['insert_new_user_nbm']))
+  {
+     $check_key_treated = do_subscribe_unsubcribe_notification_by_mail
+    (
+      true,
+      $conf['nbm_default_value_user_enabled'],
+      $_POST['insert_new_user_nbm']
+    );
+    do_background_treatment('insert_new_user_nbm', $check_key_treated);
+  }
+
   // Set null mail_address empty
   $query = '
@@ -187 +199 @@
       if ($conf['nbm_default_value_user_enabled'])
       {
-        $_POST['trueify'] = 'trueify';
-        $_POST['cat_false'] = $check_key_list;
-        do_background_treatment('cat_false', $check_key_treated);
-      }
-      else
-      {
-        $_POST['falsify'] = 'falsify';
-        $_POST['cat_true'] = $check_key_list;
-        do_background_treatment('cat_true', $check_key_treated);
+        // Simulate Post
+        $_POST['insert_new_user_nbm'] = $check_key_list;
+        do_background_treatment('insert_new_user_nbm', $check_key_treated);
       }
     }
@@ -573 +579 @@
         $page['mode'].'.send_data',
         array(
-          'CUSTOMIZE_MAIL_CONTENT' => isset($_POST['send_customize_mail_content']) ? $_POST['send_customize_mail_content'] : $conf['nbm_complementary_mail_content']
+          'CUSTOMIZE_MAIL_CONTENT' => isset($_POST['send_customize_mail_content']) ? stripslashes($_POST['send_customize_mail_content']) : $conf['nbm_complementary_mail_content']
           ));
 

trunk/include/functions.inc.php

@@ -537 +537 @@
     $redirect_msg = $msg;
   }
+  $redirect_msg = nl2br($redirect_msg);
   $refresh = $refreh_time;
   $url_link = $url;
@@ -921 +922 @@
   $message_post  = "POST ".$_SERVER['PHP_SELF'].html_entity_decode(get_query_string_diff(array()))." HTTP/1.1\r\n";
 
-  foreach (array_flip(array_diff(array_flip(apache_request_headers()), array('Content-Type', 'Content-Length'))) as $header_name => $header_value)
+/*  foreach (array_flip(array_diff(array_flip(apache_request_headers()), array('Content-Type', 'Content-Length'))) as $header_name => $header_value)
   {
     $message_post .= $header_name.": ".$header_value."\r\n";
-  }
-
-
-//  $message_post .= "Host: ".$_SERVER['HTTP_HOST']."\r\n";
-//  $message_post .= "Cookie: ".$conf['session_name']."=".$_COOKIE[$conf['session_name']]."\r\n";
+  }*/
+  $message_post .= "Host: ".$_SERVER['HTTP_HOST']."\r\n";
+  $message_post .= "Cookie: ".$conf['session_name']."=".$_COOKIE[$conf['session_name']]."\r\n";
+
+
   $message_post .= "Content-Type: application/x-www-form-urlencoded\r\n";
   $message_post .= "Content-Length: ".strlen($data_post)."\r\n";

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

@@ -254 +254 @@
 $lang['metadata_iptc'] = 'IPTC';
 $lang['name'] = 'name';
-$lang['nbm_background_treatment_redirect'] = 'Execution time is out, treatment continue on background. Re-display on %d secondes...';
+$lang['nbm_background_treatment_redirect'] = 'Execution time is out, treatment continue on background.'."\n".'Re-display on %d secondes...';
 $lang['nbm_break_timeout_list_user'] = 'Prepared time for list of users to send mail is limited. Others users are not listed.';
 $lang['nbm_col_check_user_send_mail'] = 'To send ?';

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

@@ -257 +257 @@
 $lang['metadata_iptc'] = 'IPTC';
 $lang['name'] = 'nom';
-$lang['nbm_background_treatment_redirect'] = 'Le temps d\'éxécution étant dépassé, le traitement continue en arrière plan. Ré-affichage dans %d secondes...';
+$lang['nbm_background_treatment_redirect'] = 'Le temps d\'éxécution étant dépassé, le traitement continue en arrière plan.'."\n".'Ré-affichage dans %d secondes...';
 $lang['nbm_break_timeout_list_user'] = 'Le temps de préparation de la liste des utilisateurs pour l\'envoi est limité. Les autres utilisateurs ne sont pas listés.';
 $lang['nbm_col_check_user_send_mail'] = 'A envoyer ?';