Issue ID 330:

  o Remove Apache functions
  o Show redirect message on 2 lines


git-svn-id: http://piwigo.org/svn/trunk@1160 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 23 insertions, 16 deletions

diff --git a/admin/notification_by_mail.php b/admin/notification_by_mail.php
index 9d700b45b..95e939bed 100644
--- a/admin/notification_by_mail.php
+++ b/admin/notification_by_mail.php
@@ -117,6 +117,18 @@ function insert_new_data_user_mail_notification()
 {
   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 = '
 update
@@ -186,15 +198,9 @@ order by
     {
       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);
       }
     }
   }
@@ -572,7 +578,7 @@ switch ($page['mode'])
       $template->assign_block_vars(
         $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']
           ));
 
       foreach ($data_users as $num => $nbm_user)
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 2b53b5c26..2fb4e3cba 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -536,6 +536,7 @@ function redirect( $url , $msg = '', $refreh_time = 0)
   {
     $redirect_msg = $msg;
   }
+  $redirect_msg = nl2br($redirect_msg);
   $refresh = $refreh_time;
   $url_link = $url;
   $title = 'redirection';
@@ -920,14 +921,14 @@ function re_post_http($url_redirect, $redirect_message, $redirect_refreh_time)
 
   $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";
   $message_post .= "\r\n";
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index 36e26a148..ae42dc4e3 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -253,7 +253,7 @@ $lang['metadata_basic'] = 'basic';
 $lang['metadata_exif'] = 'EXIF';
 $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 ?';
 $lang['nbm_col_last_send'] = 'Last send';
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index d7752576e..9eecdaeec 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -256,7 +256,7 @@ $lang['metadata_basic'] = 'basique';
 $lang['metadata_exif'] = 'EXIF';
 $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 ?';
 $lang['nbm_col_last_send'] = 'Dernier envoi';