Changeset 1806

Timestamp:

Feb 11, 2007, 1:01:07 PM (17 years ago)

Author:

rub

Message:

subcribe instead of subscribe => spam for free.

Correction of all bad English word.

Location:

trunk

Files:

• admin/include/functions_notification_by_mail.inc.php (modified) (4 diffs)
• admin/notification_by_mail.php (modified) (3 diffs)
• language/en_UK.iso-8859-1/admin.lang.php (modified) (4 diffs)
• language/fr_FR.iso-8859-1/admin.lang.php (modified) (2 diffs)
• nbm.php (modified) (3 diffs)
• template/yoga/admin/notification_by_mail.tpl (modified) (1 diff)

trunk/admin/include/functions_notification_by_mail.inc.php

@@ -385 +385 @@
  * @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;
@@ -434 +434 @@
         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
@@ -524 +524 @@
  * @return check_key list treated
  */
-function unsubcribe_notification_by_mail($is_admin_request, $check_key_list = array())
-{
-  return do_subscribe_unsubcribe_notification_by_mail($is_admin_request, false, $check_key_list);
+function unsubscribe_notification_by_mail($is_admin_request, $check_key_list = array())
+{
+  return do_subscribe_unsubscribe_notification_by_mail($is_admin_request, false, $check_key_list);
 }
 
@@ -536 +536 @@
  * @return check_key list treated
  */
-function subcribe_notification_by_mail($is_admin_request, $check_key_list = array())
-{
-  return do_subscribe_unsubcribe_notification_by_mail($is_admin_request, true, $check_key_list);
+function subscribe_notification_by_mail($is_admin_request, $check_key_list = array())
+{
+  return do_subscribe_unsubscribe_notification_by_mail($is_admin_request, true, $check_key_list);
 }
 

trunk/admin/notification_by_mail.php

@@ -189 +189 @@
     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,
@@ -521 +521 @@
       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);
       }
@@ -527 +527 @@
       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);
       }

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

@@ -288 +288 @@
 $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';
@@ -311 +311 @@
 $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...';
@@ -330 +330 @@
 $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.';
@@ -342 +342 @@
 $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';

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

@@ -311 +311 @@
 $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...';
@@ -342 +342 @@
 $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';

trunk/nbm.php

@@ -3 +3 @@
 // | 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)
@@ -50 +50 @@
     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
@@ -56 +56 @@
     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

trunk/template/yoga/admin/notification_by_mail.tpl

@@ -74 +74 @@
   <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>