[NBM] Step 4: Screen NBM is available

  o Add news parameters
  o Add file functions_notification_by_mail.inc.php in order to use in future, these functions on php file of subscribe/unsubscribe
  o Write a little html help file

+ improve mass_update in order to used binary fields (used collate and SHOW COLUMNS FROM)
 


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

2 files changed, 39 insertions, 11 deletions

diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index 1596d3d24..fe0d5cd64 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -238,35 +238,50 @@ $lang['metadata_basic'] = 'basic';
 $lang['metadata_exif'] = 'EXIF';
 $lang['metadata_iptc'] = 'IPTC';
 $lang['name'] = 'name';
-$lang['nbm_%d mails were not sended.'] = '%d mails were not sended.';
-$lang['nbm_%d mails were sended.'] = '%d mails were sended.';
+$lang['nbm_%d mails were not sent.'] = '%d mails were not sent.';
+$lang['nbm_%d mails were sent.'] = '%d mails were sent.';
 $lang['nbm_Error when sending email to %s [%s].'] = 'Error when sending email to %s [%s].';
-$lang['nbm_Go to %s %s.'] = 'Go to %s %s.';
-$lang['nbm_Hello %s'] = 'Hello %s';
-$lang['nbm_Mail sended to %s [%s].'] = 'Mail sended to %s [%s].';
-$lang['nbm_New elements added'] = 'New elements added';
-$lang['nbm_New elements were added between %s and %s:'] = 'New elements were added between %s and %s:';
-$lang['nbm_New elements were added on %s:'] = 'New elements were added on %s:';
+$lang['nbm_Mail sent to %s [%s].'] = 'Mail sent to %s [%s].';
+$lang['nbm_ContentObject'] = 'New elements added';
+$lang['nbm_ContentHello'] = 'Hello %s';
+$lang['nbm_ContentNewElementsBetween'] = 'New elements were added between %s and %s';
+$lang['nbm_ContentNewElements'] = 'New elements were added on %s';
+$lang['nbm_ContentGoTo'] = 'Go to %s %s.';
+$lang['nbm_ContentByeBye'] = 'See you soon';
+$lang['nbm_ContentUnsubscribe'] = 'To unsubscribe send a message to %s.';
 $lang['nbm_No mail to send.'] = 'No mail to send.';
 $lang['nbm_No user to send notifications by mail.'] = 'No user to send notifications by mail.';
 $lang['nbm_Send mail to users'] = 'Send mail to users';
-$lang['nbm_To unsubscribe send a message to %s.'] = 'To unsubscribe send a message to %s.';
 $lang['nbm_User %s [%s] added.'] = 'User %s [%s] added.';
 $lang['nbm_item_notification'] = 'Notification';
 $lang['nbm_param_mode'] = 'Parameter';
 $lang['nbm_subscribe_mode'] = 'Subscribe';
 $lang['nbm_send_mode'] = 'Send';
 $lang['nbm_title_param'] = 'Parameters';
+$lang['nbm_updated_param_count'] = '%d parameters are updated.';
+$lang['nbm_send_mail_as'] = 'Send mail as';
+$lang['nbm_info_send_mail_as'] = 'With blank value, gallery title will be used';
 $lang['nbm_send_detailed_content'] = 'Send detailed content';
 $lang['nbm_complementary_mail_content'] = 'Complementary mail content';
 $lang['nbm_title_subscribe'] = 'Subscribe/unscribe users';
 $lang['nbm_warning_subscribe_unsubcribe'] = 'Warning, subscribe or unscribe send mails to users [Not Implemented]';
 $lang['nbm_subscribe_col'] = 'Subscribed';
 $lang['nbm_unsubscribe_col'] = 'Unsubcribed';
+$lang['nbm_no_user_available_to_send_L1'] = 'No user are available in order to send mail.';
+$lang['nbm_no_user_available_to_send_L2'] = 'A user is available, if the are news elements to notify';
 $lang['nbm_title_send'] = 'Select sendings';
+$lang['nbm_col_user'] = 'User';
+$lang['nbm_col_mail'] = 'email';
+$lang['nbm_col_last_send'] = 'Last send';
+$lang['nbm_col_check_user_send_mail'] = 'To send ?';
+$lang['nbm_send_options'] = 'Options';
+$lang['nbm_send_complementary_mail_content'] = 'Complementary mail content';
 $lang['nbm_send_submit'] = 'Send';
-$lang['nbm_send_col'] = 'To send';
-$lang['nbm_nosend_col'] = 'No to send';
+$lang['nbm_send_check_all'] = 'Check All';
+$lang['nbm_send_uncheck_all'] = 'Uncheck All';
+$lang['nbm_user_change_enabled_true'] = 'User %s [%s] added to subscribe list.';
+$lang['nbm_user_change_enabled_false'] = 'User %s [%s] removed of subscribe list.';
+$lang['nbm_user_change_enabled_updated_data_count'] = '%d user(s) are updated.';
 $lang['no_write_access'] = 'no write access';
 $lang['order_by'] = 'order by';
 $lang['path'] = 'path';
diff --git a/language/en_UK.iso-8859-1/help/notification_by_mail.html b/language/en_UK.iso-8859-1/help/notification_by_mail.html
index aa977a816..106c5a736 100644
--- a/language/en_UK.iso-8859-1/help/notification_by_mail.html
+++ b/language/en_UK.iso-8859-1/help/notification_by_mail.html
@@ -1,2 +1,15 @@
 <h2>Notification by mail</h2>
 
+<p>This screen allows to configure, to manage the notification to users of news sendinf mail.</p>
+
+<p>This screen is composed of 3 tabs:</p>
+
+<h3>Parameters</h3>
+<p>Available only for webmasters, this tab sets parameters of the notification by mail.</p>
+
+<h3>Subscribe</h3>
+<p>Available only for webmasters, this tab manages subscribe/unsubscribe of notification by mail.</p>
+
+<h3>Envoi</h3>
+<p>Available only for webmasters and administrators, this tab allows to send mails to notify news.</p>
+