Changeset 21696 for extensions/UserAdvManager/branches

Timestamp:

Mar 18, 2013, 9:54:56 PM (12 years ago)

Author:

Eric

Message:

merge from trunk to branch 2.50:
Bug 2874 fixed : Warning message on tracking confirmation tab when confirmation by admins is set and a user is added manually by an admin
Reference language/en_UK/help.lang.php improved
language/fr_FR/help.lang.php updated
Update de_DE, thanks to : stephy
Update lv_LV, thanks to : agrisans

Location:

extensions/UserAdvManager/branches/2.50

Files:

• admin/UAM_admin.php (modified) (1 diff)
• changelog.txt.php (modified) (1 diff)
• include/functions.inc.php (modified) (2 diffs)
• language/de_DE/plugin.lang.php (modified) (1 diff)
• language/en_UK/help.lang.php (modified) (1 diff)
• language/fr_FR/help.lang.php (modified) (1 diff)
• language/lv_LV/plugin.lang.php (modified) (1 diff)

extensions/UserAdvManager/branches/2.50/admin/UAM_admin.php

@@ -1317 +1317 @@
         $reminder = l10n('UAM_Reminder_Sent_OK');
       }
-      else if ((isset($row['reminder']) and $row['reminder'] == 'false') or !isset($row['reminder']))
+      else if ((isset($row['reminder']) and $row['reminder'] == 'false') or $row['reminder'] == null)
       {
         $reminder = l10n('UAM_Reminder_Sent_NOK');
       }
-
 
       if (isset($_POST['pref_submit'])

extensions/UserAdvManager/branches/2.50/changelog.txt.php

@@ -402 +402 @@
             Bug 2871 fixed - Improved process : User registration is confirmed by default when user is added by an admin and confirmation of registration for admins is set to OFF
             Bug 2872 fixed - Check if confirmed users group is set as the default group and set it if not
-            Bug 2873 fixed - Remove annoying flashing message on config submit 
+            Bug 2873 fixed - Remove annoying flashing message on config submit
+
+-- 2.50.4 : Bug 2874 fixed - Warning message on tracking confirmation tab when confirmation by admins is set and a user is added manually by an admin
+            Update de_DE, thanks to : stephy
+            Update lv_LV, thanks to : agrisans
 */
 ?>

extensions/UserAdvManager/branches/2.50/include/functions.inc.php

@@ -1314 +1314 @@
   }
 
-  if ((isset($conf_UAM['CONFIRM_MAIL']) and ($conf_UAM['CONFIRM_MAIL'] == 'true' or $conf_UAM['CONFIRM_MAIL'] == 'local')) and $confirm) // Add confirmation link ?
+  if ((isset($conf_UAM['CONFIRM_MAIL']) and ($conf_UAM['CONFIRM_MAIL'] == 'true')) and $confirm) // Add confirmation link ?
   {
     $infos2 = array(
@@ -1952 +1952 @@
   (id, user_id, mail_address, status, date_check, reminder)
 VALUES
-  ('".$Confirm_Mail_ID."', '".$user_id."', '".$email."', '".$status."', null, false)
+  ('".$Confirm_Mail_ID."', '".$user_id."', '".$email."', '".$status."', null, 'false')
 ;";
     pwg_query($query);

extensions/UserAdvManager/branches/2.50/language/de_DE/plugin.lang.php

@@ -430 +430 @@
 $lang['UAM_Change'] = 'Ändere die Gruppe/den Status/die Privatsphäre des Benutzers der bestätigt wurde.';
 $lang['UAM_Customize_messagesandmails'] = 'Anpassen der Nachrichten und E-Mails.';
+$lang['UAM_group "%s" updated'] = 'Für die beste Geschwindigkeit, wurde die Gruppe %s als Standardgruppe eingestellt.';
 ?>

extensions/UserAdvManager/branches/2.50/language/en_UK/help.lang.php

@@ -18 +18 @@
 $lang['UAM_tipsTitle_d'] = 'Tips and various examples of use';
 
-
-// --------- Starting below: New or revised $lang ---- from version 2.14.0
 $lang['UAM_adminconfmailTitle_d'] = 'You can disable this confirmation only for user accounts created by the administrator via Piwigo\'s users management interface.<br><br>
 By activating this option, email confirmation for registration will be sent to each user created by admin.<br><br>
-By disabling this option (default), only the email information is sent (if &quot;Information email to user&quot; is enabled).';
-// --------- End: New or revised $lang ---- from version 2.14.0
+By disabling this option (default), only the email information is sent (if &quot;Information email to user&quot; is enabled). In addition, the user created will be <b>considered validated</b> by default.';
 
 

extensions/UserAdvManager/branches/2.50/language/fr_FR/help.lang.php

@@ -17 +17 @@
 $lang['UAM_tipsTitle_d'] = 'Astuces et exemples divers d\'utilisation';
 
-
-// --------- Starting below: New or revised $lang ---- from version 2.14.0
 $lang['UAM_adminconfmailTitle_d'] = 'On peut ici désactiver la confirmation des inscriptions uniquement pour les comptes d\'utilisateurs créés par l\'administrateur via l\'interface de gestion des utilisateurs de Piwigo.<br><br>
 En activant cette option, l\'email de confirmation d\'inscription sera envoyé à chaque utilisateur créé par l\'admin.<br><br>
-En désactivant cette option (mode par défaut), seul l\'email d\'information est envoyé (si la fonction &quot;Email d\'information &agrave; l\'utilisateur&quot; est activée).';
-// --------- End: New or revised $lang ---- from version 2.14.0
+En désactivant cette option (mode par défaut), seul l\'email d\'information est envoyé (si la fonction &quot;Email d\'information &agrave; l\'utilisateur&quot; est activée). De plus, l\'utilisateur ainsi créé sera <b>considéré comme validé</b> par défaut.';
 
 

extensions/UserAdvManager/branches/2.50/language/lv_LV/plugin.lang.php

@@ -385 +385 @@
 $lang['UAM_Change'] = 'Izmainīt apstiprināto lietotāju Grupas/Statuss/Konfidencialitāte Līmeni';
 $lang['UAM_Customize_messagesandmails'] = 'Pielāgojiet ziņojumus un pastu';
+$lang['UAM_group "%s" updated'] = 'Labākam sniegumam, grupa %s automātiski tika iestatīta kā noklusējuma grupa.';
 ?>