Changeset 21804

Timestamp:

Mar 23, 2013, 4:38:35 PM (11 years ago)

Author:

Eric

Message:

r21769, r21770, r21773, r21787 and r21803 merged from trunk to branch 2.50:
Bug 2877 fixed - Disabling Confirmation of registration main option disables child options (child options remain configured and shown but no force or effect)
Bug 2878 fixed - [Kdays] flag was not translated in confirmation text sent by email to user
Update tr_TR, thanks to : LazBoy
Update da_DK, thanks to : Kaare
Update es_ES, thanks to : crazydark

Location:

extensions/UserAdvManager/branches/2.50

Files:

• changelog.txt.php (modified) (1 diff)
• include/functions.inc.php (modified) (4 diffs)
• language/da_DK/plugin.lang.php (modified) (1 diff)
• language/es_ES/plugin.lang.php (modified) (1 diff)
• language/tr_TR/plugin.lang.php (modified) (2 diffs)

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

@@ -411 +411 @@
             Bug 2876 fixed - Make templates compatible HTML 5
             Update it_IT, thanks to : salvatore
+
+-- 2.50.6 : Bug 2877 fixed - Disabling Confirmation of registration main option disables child options (child options remain configured and shown but no force or effect)
+            Bug 2878 fixed - [Kdays] flag was not translated in confirmation text sent by email to user
+            Update tr_TR, thanks to : LazBoy
+            Update da_DK, thanks to : Kaare
+            Update es_ES, thanks to : crazydark
+            
 */
 ?>

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

@@ -103 +103 @@
 
     // Perform user logout after registration if not validated
-    if ((isset($conf_UAM['REJECTCONNECT']) and $conf_UAM['REJECTCONNECT'] == 'true') and !UAM_UsrReg_Verif($user['id']) and !is_admin() and !is_webmaster() )
+    if ((isset($conf_UAM['CONFIRM_MAIL']) and ($conf_UAM['CONFIRM_MAIL']=='true' or $conf_UAM['CONFIRM_MAIL']=='local'))
+          and (isset($conf_UAM['REJECTCONNECT']) and $conf_UAM['REJECTCONNECT'] == 'true')
+          and !UAM_UsrReg_Verif($user['id'])
+          and !is_admin()
+          and !is_webmaster())
     {
       invalidate_user_cache();
@@ -436 +440 @@
   // Performing User validation scheduled tasks
   // ------------------------------------------
-  if ((isset($conf_UAM['USRAUTO']) and $conf_UAM['USRAUTO'] == 'true'))
+  if ((isset($conf_UAM['CONFIRM_MAIL']) and $conf_UAM['CONFIRM_MAIL']=='true')
+        and (isset($conf_UAM['USRAUTO']) and $conf_UAM['USRAUTO'] == 'true'))
   {
     UAM_USR_ScheduledTasks();
@@ -442 +447 @@
 
   // Avoid login into public galleries until registration confirmation is done
-  if ((isset($conf_UAM['REJECTCONNECT']) and $conf_UAM['REJECTCONNECT'] == 'false') or ((isset($conf_UAM['REJECTCONNECT']) and $conf_UAM['REJECTCONNECT'] == 'true') and UAM_UsrReg_Verif($user['id'])) or  (!is_admin() and !is_webmaster()))
+  if ((isset($conf_UAM['REJECTCONNECT']) and $conf_UAM['REJECTCONNECT'] == 'false')
+        or ((isset($conf_UAM['REJECTCONNECT']) and $conf_UAM['REJECTCONNECT'] == 'true') and UAM_UsrReg_Verif($user['id']))
+        or (!is_admin() and !is_webmaster()))
   {
     // Performing redirection to profile page on first login
@@ -1134 +1141 @@
 
   $conf_UAM = unserialize($conf['UserAdvManager']);
+  $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
 
   include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');

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

@@ -335 +335 @@
             </li>
           </ul>';
+$lang['UAM_group "%s" updated'] = 'For at opnå den bedste ydeevne, er gruppen %s automatisk blevet opsat som standardgruppen. ';
 ?>

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

@@ -389 +389 @@
 $lang['UAM_Change'] = 'Change the Group/Status/Privacy Level of the users who have been confirmed';
 $lang['UAM_Customize_messagesandmails'] = 'Personalizar los mensajes y correos';
+$lang['UAM_group "%s" updated'] = 'Para un mejor rendimiento, el grupo %s se configura automáticamente como el grupo predeterminado.';
 ?>

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

@@ -109 +109 @@
 $lang['UAM_Default user cannot be pwgreset'] = 'Şifre yenileme varsayılan kullanıcı hesabı için ayarlanamaz!';
 $lang['UAM_Default_CfmMail_Custom_Txt2'] = 'Yanlış / Süresi geçmiş doğrulama kodu, hesap zaten başarıyla doğrulanmış';
-$lang['UAM_Default_CfmMail_Custom_Txt1'] = '[username] hesap başarıyla doğrulandı';
+$lang['UAM_Default_CfmMail_Custom_Txt1'] = '[username] hesabı başarıyla doğrulandı!';
 $lang['UAM_Default_AdminValidationMail_Subject'] = '[username] - [mygallery] e Kayıt başarıyla doğrulandı.';
 $lang['UAM_Default_AdminValidation_Txt'] = 'Merhaba [username]! [mygallery] Galerimize kayıt olduğunuz için teşekkür ederiz.
@@ -159 +159 @@
 $lang['UAM_Confirm_Status'] = 'Durumlar<br>(Piwigo varsayılanı için ------- olarak bırakın)';
 $lang['UAM_Confirm_Level'] = 'Gizlilik seviyesi<br>(Piwigo varsayılanı için ------- olarak bırakın)';
+$lang['UAM_Expired_Group'] = 'Kullanıcının kayıtlı olduğu <b>grubun</b> geçerliliği sona ermiş durumdadır.<br>';
+$lang['UAM_Confirm_grpstat_notice'] = 'Dikkat: Grup yada doğrulama durumlarından sadece birini kullanmanız önerilir. Gizlilik seviyesi bir grup ya da durum atama ile bağlantılı olarak kullanılabilir.';
 ?>