Index: /extensions/UserAdvManager/branches/2.50/admin/UAM_admin.php
===================================================================
--- /extensions/UserAdvManager/branches/2.50/admin/UAM_admin.php (revision 21632)
+++ /extensions/UserAdvManager/branches/2.50/admin/UAM_admin.php (revision 21633)
@@ -183,4 +183,33 @@
$UAM_Illegal_Flag_Error1 = true;
array_push($page['errors'], l10n('UAM_Error_Using_illegal_Kdays'));
+ }
+
+ // Check if VALIDATED_GROUP is set as the gallery's default group and set it as default if not
+ // Experimental : It's better the "validated users" group is the gallery's default group
+ // -------------------------------------------------------------------------------------------
+ if (isset($_POST['UAM_Validated_Group']) and $_POST['UAM_Validated_Group'] <> '-1')
+ {
+ $query = '
+SELECT name, is_default
+FROM '.GROUPS_TABLE.'
+WHERE id = '.$_POST['UAM_Validated_Group'].'
+;';
+
+ $UAM_group = pwg_db_fetch_assoc(pwg_query($query));
+
+ if (isset($UAM_group['is_default']) and $UAM_group['is_default'] == "false")
+ {
+ $query = '
+UPDATE '.GROUPS_TABLE.'
+SET is_default = true
+WHERE id = '.$_POST['UAM_Validated_Group'].'
+;';
+ pwg_query($query);
+
+ array_push(
+ $page['infos'],
+ sprintf(l10n('UAM_group "%s" updated'), $UAM_group['name'])
+ );
+ }
}
@@ -1336,5 +1365,5 @@
'GROUPS' => $groups_string,
'REGISTRATION' => $local_user['registration_date'],
- 'REMINDER' => $reminder,
+ 'REMINDER' => $reminder,
'EXPIRATION' => $expiration,
)
Index: /extensions/UserAdvManager/branches/2.50/admin/template/ghosttracker.tpl
===================================================================
--- /extensions/UserAdvManager/branches/2.50/admin/template/ghosttracker.tpl (revision 21632)
+++ /extensions/UserAdvManager/branches/2.50/admin/template/ghosttracker.tpl (revision 21633)
@@ -109,12 +109,2 @@
{/if}
-
-{html_head}
-
-{/html_head}
Index: /extensions/UserAdvManager/branches/2.50/admin/template/global.tpl
===================================================================
--- /extensions/UserAdvManager/branches/2.50/admin/template/global.tpl (revision 21632)
+++ /extensions/UserAdvManager/branches/2.50/admin/template/global.tpl (revision 21633)
@@ -969,12 +969,2 @@
uam_blockToggleDisplay(n1,n2);
{/literal}{/footer_script}
-
-{html_head}
-
-{/html_head}
Index: /extensions/UserAdvManager/branches/2.50/admin/template/usermanager.tpl
===================================================================
--- /extensions/UserAdvManager/branches/2.50/admin/template/usermanager.tpl (revision 21632)
+++ /extensions/UserAdvManager/branches/2.50/admin/template/usermanager.tpl (revision 21633)
@@ -112,12 +112,2 @@
{/if}
-
-{html_head}
-
-{/html_head}
Index: /extensions/UserAdvManager/branches/2.50/changelog.txt.php
===================================================================
--- /extensions/UserAdvManager/branches/2.50/changelog.txt.php (revision 21632)
+++ /extensions/UserAdvManager/branches/2.50/changelog.txt.php (revision 21633)
@@ -398,5 +398,9 @@
Update tr_TR, thanks to : LazBoy
Update it_IT, thanks to : Ericnet
-
+
+-- 2.50.3 : Bug 2870 fixed - Error in tracking confirmation tab if $conf['default_user_id'] is set with an ID different than Guest user ID
+ 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
*/
?>
Index: /extensions/UserAdvManager/branches/2.50/include/functions.inc.php
===================================================================
--- /extensions/UserAdvManager/branches/2.50/include/functions.inc.php (revision 21632)
+++ /extensions/UserAdvManager/branches/2.50/include/functions.inc.php (revision 21633)
@@ -2303,10 +2303,5 @@
// Set UAM_validated field to True in #_users table
- $query = '
-UPDATE '.USERS_TABLE.'
-SET UAM_validated = "true"
-WHERE id = '.$data['user_id'].'
-;';
- pwg_query($query);
+ SetValidated($data['user_id']);
// Refresh user's category cache
@@ -2395,10 +2390,5 @@
// Set UAM_validated field to True in #_users table
- $query = '
-UPDATE '.USERS_TABLE.'
-SET UAM_validated = "true"
-WHERE id = '.$data['user_id'].'
-;';
- pwg_query($query);
+ SetValidated($data['user_id']);
// Refresh user's category cache
@@ -2493,10 +2483,5 @@
// Set UAM_validated field to True in #_users table
- $query = '
-UPDATE '.USERS_TABLE.'
-SET UAM_validated = "true"
-WHERE id = '.$id.'
-;';
- pwg_query($query);
+ SetValidated($data['user_id']);
}
@@ -2629,4 +2614,5 @@
ON u.'.$conf['user_fields']['id'].' = ug.user_id
WHERE u.'.$conf['user_fields']['id'].' >= 3
+ AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].'
AND (TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) >= "'.$conf_UAM_ConfirmMail['CONFIRMMAIL_DELAY'].'"
OR TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) < "'.$conf_UAM_ConfirmMail['CONFIRMMAIL_DELAY'].'")
@@ -2704,4 +2690,5 @@
ON u.'.$conf['user_fields']['id'].' = ui.user_id
WHERE u.'.$conf['user_fields']['id'].' >= 3
+ AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].'
AND (TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) >= "'.$conf_UAM_ConfirmMail['CONFIRMMAIL_DELAY'].'")
ORDER BY ui.registration_date ASC;';
@@ -2744,4 +2731,5 @@
ON u.'.$conf['user_fields']['id'].' = lv.user_id
WHERE (TO_DAYS(NOW()) - TO_DAYS(lv.lastvisit) >= "'.$conf_UAM['GHOSTRACKER_DAYLIMIT'].'")
+AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].'
ORDER BY lv.lastvisit ASC;';
@@ -2791,4 +2779,5 @@
ON u.'.$conf['user_fields']['id'].' = lv.user_id
WHERE (TO_DAYS(NOW()) - TO_DAYS(lv.lastvisit) >= "'.$conf_UAM['GHOSTRACKER_DAYLIMIT'].'")
+AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].'
ORDER BY lv.lastvisit ASC;';
@@ -2827,4 +2816,5 @@
ON u.'.$conf['user_fields']['id'].' = ug.user_id
WHERE u.'.$conf['user_fields']['id'].' >= 3
+ AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].'
AND u.username NOT LIKE "16"
AND u.username NOT LIKE "18"
@@ -3086,5 +3076,5 @@
$result = pwg_db_fetch_assoc(pwg_query($query));
- if($result['UAM_validated'] == 'true')
+ if($result['UAM_validated'] == 'true' or is_null($result['UAM_validated']))
{
return true;
@@ -3104,4 +3094,22 @@
UPDATE '.USERS_TABLE.'
SET UAM_validated = "false"
+WHERE id = '.$user_id.'
+LIMIT 1
+;';
+
+ pwg_query($query);
+}
+
+
+/**
+ * SetValidated
+ * Set UAM_validated field to true in #_users table
+ *
+ **/
+function SetValidated($user_id)
+{
+ $query ='
+UPDATE '.USERS_TABLE.'
+SET UAM_validated = "true"
WHERE id = '.$user_id.'
LIMIT 1
Index: /extensions/UserAdvManager/branches/2.50/language/en_UK/plugin.lang.php
===================================================================
--- /extensions/UserAdvManager/branches/2.50/language/en_UK/plugin.lang.php (revision 21632)
+++ /extensions/UserAdvManager/branches/2.50/language/en_UK/plugin.lang.php (revision 21633)
@@ -424,5 +424,6 @@
$lang['UAM_Customize_messagesandmails'] = 'Customize the messages and mails';
$lang['UAM_Change'] = 'Change the Group/Status/Privacy Level of the users who have been confirmed';
-
// --------- End: New or revised $lang ---- from version 2.41.0
+
+$lang['UAM_group "%s" updated'] = 'For best performance, the group %s was automatically set as the default group.';
?>
Index: /extensions/UserAdvManager/branches/2.50/language/fr_FR/plugin.lang.php
===================================================================
--- /extensions/UserAdvManager/branches/2.50/language/fr_FR/plugin.lang.php (revision 21632)
+++ /extensions/UserAdvManager/branches/2.50/language/fr_FR/plugin.lang.php (revision 21633)
@@ -426,3 +426,5 @@
$lang['UAM_Change'] = 'Changer l\'utilisateur confirmé de Groupe/Statut/Niveau de confidentialité';
// --------- End: New or revised $lang ---- from version 2.41.0
+
+$lang['UAM_group "%s" updated'] = 'Pour un meilleur fonctionnement, le groupe %s a été automatiquement positionné comme groupe par défault.';
?>