subcribe instead of subscribe => spam for free.

Correction of all bad English word.

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

6 files changed, 25 insertions, 25 deletions

diff --git a/admin/include/functions_notification_by_mail.inc.php b/admin/include/functions_notification_by_mail.inc.php
index 44f1afdb9..64358ec9e 100644
--- a/admin/include/functions_notification_by_mail.inc.php
+++ b/admin/include/functions_notification_by_mail.inc.php
@@ -384,7 +384,7 @@ function assign_vars_nbm_mail_content($nbm_user)
  *

  * @return check_key list treated

  */

-function do_subscribe_unsubcribe_notification_by_mail($is_admin_request, $is_subscribe = false, $check_key_list = array())

+function do_subscribe_unsubscribe_notification_by_mail($is_admin_request, $is_subscribe = false, $check_key_list = array())

 {

   global $conf, $page, $env_nbm, $conf;

 

@@ -433,7 +433,7 @@ function do_subscribe_unsubcribe_notification_by_mail($is_admin_request, $is_sub
         // set env nbm user

         set_user_on_env_nbm($nbm_user['user_id'], true);

 

-        $subject = '['.$conf['gallery_title'].']: '.($is_subscribe ? l10n('nbm_object_subcribe'): l10n('nbm_object_unsubcribe'));

+        $subject = '['.$conf['gallery_title'].']: '.($is_subscribe ? l10n('nbm_object_subscribe'): l10n('nbm_object_unsubscribe'));

 

         // Assign current var for nbm mail

         assign_vars_nbm_mail_content($nbm_user);

@@ -523,9 +523,9 @@ function do_subscribe_unsubcribe_notification_by_mail($is_admin_request, $is_sub
  *

  * @return check_key list treated

  */

-function unsubcribe_notification_by_mail($is_admin_request, $check_key_list = array())

+function unsubscribe_notification_by_mail($is_admin_request, $check_key_list = array())

 {

-  return do_subscribe_unsubcribe_notification_by_mail($is_admin_request, false, $check_key_list);

+  return do_subscribe_unsubscribe_notification_by_mail($is_admin_request, false, $check_key_list);

 }

 

 /*

@@ -535,9 +535,9 @@ function unsubcribe_notification_by_mail($is_admin_request, $check_key_list = ar
  *

  * @return check_key list treated

  */

-function subcribe_notification_by_mail($is_admin_request, $check_key_list = array())

+function subscribe_notification_by_mail($is_admin_request, $check_key_list = array())

 {

-  return do_subscribe_unsubcribe_notification_by_mail($is_admin_request, true, $check_key_list);

+  return do_subscribe_unsubscribe_notification_by_mail($is_admin_request, true, $check_key_list);

 }

 

 ?>

diff --git a/admin/notification_by_mail.php b/admin/notification_by_mail.php
index d2c6f76f4..a000fdb4b 100644
--- a/admin/notification_by_mail.php
+++ b/admin/notification_by_mail.php
@@ -188,7 +188,7 @@ order by
     // Insert new nbm_users
     mass_inserts(USER_MAIL_NOTIFICATION_TABLE, array('user_id', 'check_key', 'enabled'), $inserts);
     // Update field enabled with specific function
-    $check_key_treated = do_subscribe_unsubcribe_notification_by_mail
+    $check_key_treated = do_subscribe_unsubscribe_notification_by_mail
     (
       true,
       $conf['nbm_default_value_user_enabled'],
@@ -520,13 +520,13 @@ where
     {
       if (isset($_POST['falsify']) and isset($_POST['cat_true']))
       {
-        $check_key_treated = unsubcribe_notification_by_mail(true, $_POST['cat_true']);
+        $check_key_treated = unsubscribe_notification_by_mail(true, $_POST['cat_true']);
         do_timeout_treatment('cat_true', $check_key_treated);
       }
       else
       if (isset($_POST['trueify']) and isset($_POST['cat_false']))
       {
-        $check_key_treated = subcribe_notification_by_mail(true, $_POST['cat_false']);
+        $check_key_treated = subscribe_notification_by_mail(true, $_POST['cat_false']);
         do_timeout_treatment('cat_false', $check_key_treated);
       }
     }
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index da0853856..b0f01991f 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -287,13 +287,13 @@ $lang['nbm_content_new_elements'] = 'New elements were added ';
 $lang['nbm_content_new_elements_single'] = ' on ';
 $lang['nbm_content_new_elements_between_1'] = 'between ';
 $lang['nbm_content_new_elements_between_2'] = ' and ';
-$lang['nbm_content_subscribe_by_admin'] = 'The webmaster has subcribed you for receiving notifications by mail.';
-$lang['nbm_content_subscribe_by_himself'] = 'You have subcribed to receiving notifications by mail.';
+$lang['nbm_content_subscribe_by_admin'] = 'The webmaster has subscribed you for receiving notifications by mail.';
+$lang['nbm_content_subscribe_by_himself'] = 'You have subscribed to receiving notifications by mail.';
 $lang['nbm_content_subscribe_link'] = 'To subscribe';
 $lang['nbm_content_problem_contact'] = 'If you encounter problems or have any question, please send a message to ';
 $lang['nbm_content_pb_contact_object'] = '[NBM] Problems or questions';
-$lang['nbm_content_unsubscribe_by_admin'] = 'The webmaster has unsubcribed you from receiving notifications by mail.';
-$lang['nbm_content_unsubscribe_by_himself'] = 'You have unsubcribed from receiving notifications by mail.';
+$lang['nbm_content_unsubscribe_by_admin'] = 'The webmaster has unsubscribed you from receiving notifications by mail.';
+$lang['nbm_content_unsubscribe_by_himself'] = 'You have unsubscribed from receiving notifications by mail.';
 $lang['nbm_content_click_on'] = ', click on ';
 $lang['nbm_content_unsubscribe_link'] = 'To unsubscribe';
 $lang['nbm_info_send_mail_as'] = 'With blank value, gallery title will be used';
@@ -310,8 +310,8 @@ $lang['nbm_no_user_available_to_send_L2'] = 'A user is available, if there are n
 $lang['nbm_no_user_available_to_send_L3'] = 'It\'s possible that the are no subscribed users (only webmaster can see this tab).';
 $lang['nbm_no_user_to send_notifications_by_mail'] = 'No user to send notifications by mail.';
 $lang['nbm_object_news'] = 'New elements added';
-$lang['nbm_object_subcribe'] = 'Subcribe to notification by mail';
-$lang['nbm_object_unsubcribe'] = 'Unsubcribe from notification by mail';
+$lang['nbm_object_subscribe'] = 'Subscribe to notification by mail';
+$lang['nbm_object_unsubscribe'] = 'Unsubscribe from notification by mail';
 $lang['nbm_param_mode'] = 'Parameter';
 $lang['nbm_redirect_msg'] = 'Processing treatment.'."\n\n".'Please wait...';
 $lang['nbm_repost_submit'] = 'Continue processing treatment';
@@ -329,7 +329,7 @@ $lang['nbm_subscribe_mode'] = 'Subscribe';
 $lang['nbm_title_param'] = 'Parameters';
 $lang['nbm_title_send'] = 'Select recipients';
 $lang['nbm_title_subscribe'] = 'Subscribe/unsubscribe users';
-$lang['nbm_unsubscribe_col'] = 'Unsubcribed';
+$lang['nbm_unsubscribe_col'] = 'Unsubscribed';
 $lang['nbm_updated_param_count'] = '%d parameter was updated.';
 $lang['nbm_updated_params_count'] = '%d parameters were updated.';
 $lang['nbm_user_change_enabled_error_on_updated_data_count'] = '%d user was not updated.';
@@ -341,7 +341,7 @@ $lang['nbm_users_change_enabled_updated_data_count'] = '%d users were updated.';
 $lang['nbm_user_not_change_enabled_false'] = 'User %s [%s] was not removed from the subscription list.';
 $lang['nbm_user_not_change_enabled_true'] = 'User %s [%s] was not added to the subscription list.';
 $lang['nbm_user_x_added'] = 'User %s [%s] added.';
-$lang['nbm_warning_subscribe_unsubcribe'] = 'Warning: subscribing or unsubcribing will send mails to users';
+$lang['nbm_warning_subscribe_unsubscribe'] = 'Warning: subscribing or unsubscribing will send mails to users';
 $lang['nbm_send_html_mail'] = 'Send mail on HTML format';
 $lang['nbm_send_recent_post_dates'] = 'Include display of recent pictures group by dates';
 $lang['nbm_info_send_recent_post_dates'] = 'Available only with HTML format';
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index b50b1ace4..c060ea908 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -310,8 +310,8 @@ $lang['nbm_no_user_available_to_send_L2'] = 'Un utilisateur est à notifier si de
 $lang['nbm_no_user_available_to_send_L3'] = 'Il se peut aussi qu\'il n\'y ai aucun utilisateur inscrit (seul le webmaster a accès à cet onglet).';
 $lang['nbm_no_user_to send_notifications_by_mail'] = 'Pas d\'utilisateur pour envoyer des notifications par mails.';
 $lang['nbm_object_news'] = 'Nouveaux éléments ajoutés';
-$lang['nbm_object_subcribe'] = 'Inscription à la notification par mail';
-$lang['nbm_object_unsubcribe'] = 'Désinscription à la notification par mail';
+$lang['nbm_object_subscribe'] = 'Inscription à la notification par mail';
+$lang['nbm_object_unsubscribe'] = 'Désinscription à la notification par mail';
 $lang['nbm_param_mode'] = 'Paramétrage';
 $lang['nbm_redirect_msg'] = 'Traitement en cours.'."\n".'Veuillez patienter...';
 $lang['nbm_repost_submit'] = 'Continuer le traitement en cours...';
@@ -341,7 +341,7 @@ $lang['nbm_users_change_enabled_updated_data_count'] = '%d utilisateurs ont été
 $lang['nbm_user_not_change_enabled_false'] = 'L\'utilisateur %s [%s] n\'a pas été supprimé de la liste des inscrits.';
 $lang['nbm_user_not_change_enabled_true'] = 'L\'utilisateur %s [%s] n\'a pas été ajouté à la liste des inscrits.';
 $lang['nbm_user_x_added'] = 'Utilisateur %s [%s] ajouté.';
-$lang['nbm_warning_subscribe_unsubcribe'] = 'Attention, l\'inscription ou la désincription entraine l\'envoi de mails aux utilisateurs concernés';
+$lang['nbm_warning_subscribe_unsubscribe'] = 'Attention, l\'inscription ou la désincription entraine l\'envoi de mails aux utilisateurs concernés';
 $lang['nbm_send_html_mail'] = 'Envoyer le mail au format HTML';
 $lang['nbm_send_recent_post_dates'] = 'Inclure l\'affichage des dernières images groupées par dates';
 $lang['nbm_info_send_recent_post_dates'] = 'Disponible uniquement avec le format HTML';
diff --git a/nbm.php b/nbm.php
index 62f482423..db6db9236 100644
--- a/nbm.php
+++ b/nbm.php
@@ -2,8 +2,8 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
-// | Copyright (C) 2006 Ruben ARNAUD - team@phpwebgallery.net              |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2006-2007   Ruben ARNAUD - team@phpwebgallery.net       |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
 // | file          : $RCSfile$
@@ -49,13 +49,13 @@ $page['infos'] = array();
 if (isset($_GET['subscribe'])
     and preg_match('/^[A-Za-z0-9]{16}$/', $_GET['subscribe']))
 {
-  subcribe_notification_by_mail(false, array($_GET['subscribe']));
+  subscribe_notification_by_mail(false, array($_GET['subscribe']));
 }
 else
 if (isset($_GET['unsubscribe'])
     and preg_match('/^[A-Za-z0-9]{16}$/', $_GET['unsubscribe']))
 {
-  unsubcribe_notification_by_mail(false, array($_GET['unsubscribe']));
+  unsubscribe_notification_by_mail(false, array($_GET['unsubscribe']));
 }
 else
 {
diff --git a/template/yoga/admin/notification_by_mail.tpl b/template/yoga/admin/notification_by_mail.tpl
index da61bcdfb..16f66d42d 100644
--- a/template/yoga/admin/notification_by_mail.tpl
+++ b/template/yoga/admin/notification_by_mail.tpl
@@ -73,7 +73,7 @@
   <!-- BEGIN subscribe -->
   <fieldset>
     <legend>{lang:nbm_title_subscribe}</legend>
-    <p><i>{lang:nbm_warning_subscribe_unsubcribe}</i></p>
+    <p><i>{lang:nbm_warning_subscribe_unsubscribe}</i></p>
     {DOUBLE_SELECT}
   </fieldset>
   <!-- END subscribe -->