Changeset 21633
- Timestamp:
- Mar 17, 2013, 2:08:54 PM (11 years ago)
- Location:
- extensions/UserAdvManager/branches/2.50
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/UserAdvManager/branches/2.50/admin/UAM_admin.php
r21075 r21633 183 183 $UAM_Illegal_Flag_Error1 = true; 184 184 array_push($page['errors'], l10n('UAM_Error_Using_illegal_Kdays')); 185 } 186 187 // Check if VALIDATED_GROUP is set as the gallery's default group and set it as default if not 188 // Experimental : It's better the "validated users" group is the gallery's default group 189 // ------------------------------------------------------------------------------------------- 190 if (isset($_POST['UAM_Validated_Group']) and $_POST['UAM_Validated_Group'] <> '-1') 191 { 192 $query = ' 193 SELECT name, is_default 194 FROM '.GROUPS_TABLE.' 195 WHERE id = '.$_POST['UAM_Validated_Group'].' 196 ;'; 197 198 $UAM_group = pwg_db_fetch_assoc(pwg_query($query)); 199 200 if (isset($UAM_group['is_default']) and $UAM_group['is_default'] == "false") 201 { 202 $query = ' 203 UPDATE '.GROUPS_TABLE.' 204 SET is_default = true 205 WHERE id = '.$_POST['UAM_Validated_Group'].' 206 ;'; 207 pwg_query($query); 208 209 array_push( 210 $page['infos'], 211 sprintf(l10n('UAM_group "%s" updated'), $UAM_group['name']) 212 ); 213 } 185 214 } 186 215 … … 1336 1365 'GROUPS' => $groups_string, 1337 1366 'REGISTRATION' => $local_user['registration_date'], 1338 'REMINDER' => $reminder, 1367 'REMINDER' => $reminder, 1339 1368 'EXPIRATION' => $expiration, 1340 1369 ) -
extensions/UserAdvManager/branches/2.50/admin/template/ghosttracker.tpl
r18799 r21633 109 109 {/if} 110 110 </form> 111 112 {html_head}113 <script type="text/javascript">114 jQuery(document).ready(function() {ldelim}115 jQuery('#theAdminPage #the_page').addClass('{$themeconf.name}');116 jQuery(".infos").fadeOut(800).fadeIn(1200).fadeOut(400).fadeIn(800).fadeOut(400);117 //jQuery(".errors").fadeOut(200).fadeIn(200).fadeOut(300).fadeIn(300).fadeOut(400).fadeIn(400);118 });119 </script>120 {/html_head} -
extensions/UserAdvManager/branches/2.50/admin/template/global.tpl
r18999 r21633 969 969 uam_blockToggleDisplay(n1,n2); 970 970 {/literal}{/footer_script} 971 972 {html_head}973 <script type="text/javascript">974 jQuery(document).ready(function() {ldelim}975 jQuery('#theAdminPage #the_page').addClass('{$themeconf.name}');976 jQuery(".infos").fadeOut(800).fadeIn(1200).fadeOut(400).fadeIn(800).fadeOut(400);977 //jQuery(".errors").fadeOut(200).fadeIn(200).fadeOut(300).fadeIn(300).fadeOut(400).fadeIn(400);978 });979 </script>980 {/html_head} -
extensions/UserAdvManager/branches/2.50/admin/template/usermanager.tpl
r18799 r21633 112 112 {/if} 113 113 </form> 114 115 {html_head}116 <script type="text/javascript">117 jQuery(document).ready(function() {ldelim}118 jQuery('#theAdminPage #the_page').addClass('{$themeconf.name}');119 jQuery(".infos").fadeOut(800).fadeIn(1200).fadeOut(400).fadeIn(800).fadeOut(400);120 //jQuery(".errors").fadeOut(200).fadeIn(200).fadeOut(300).fadeIn(300).fadeOut(400).fadeIn(400);121 });122 </script>123 {/html_head} -
extensions/UserAdvManager/branches/2.50/changelog.txt.php
r21520 r21633 398 398 Update tr_TR, thanks to : LazBoy 399 399 Update it_IT, thanks to : Ericnet 400 400 401 -- 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 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 403 Bug 2872 fixed - Check if confirmed users group is set as the default group and set it if not 404 Bug 2873 fixed - Remove annoying flashing message on config submit 401 405 */ 402 406 ?> -
extensions/UserAdvManager/branches/2.50/include/functions.inc.php
r21520 r21633 2303 2303 2304 2304 // Set UAM_validated field to True in #_users table 2305 $query = ' 2306 UPDATE '.USERS_TABLE.' 2307 SET UAM_validated = "true" 2308 WHERE id = '.$data['user_id'].' 2309 ;'; 2310 pwg_query($query); 2305 SetValidated($data['user_id']); 2311 2306 2312 2307 // Refresh user's category cache … … 2395 2390 2396 2391 // Set UAM_validated field to True in #_users table 2397 $query = ' 2398 UPDATE '.USERS_TABLE.' 2399 SET UAM_validated = "true" 2400 WHERE id = '.$data['user_id'].' 2401 ;'; 2402 pwg_query($query); 2392 SetValidated($data['user_id']); 2403 2393 2404 2394 // Refresh user's category cache … … 2493 2483 2494 2484 // Set UAM_validated field to True in #_users table 2495 $query = ' 2496 UPDATE '.USERS_TABLE.' 2497 SET UAM_validated = "true" 2498 WHERE id = '.$id.' 2499 ;'; 2500 pwg_query($query); 2485 SetValidated($data['user_id']); 2501 2486 } 2502 2487 … … 2629 2614 ON u.'.$conf['user_fields']['id'].' = ug.user_id 2630 2615 WHERE u.'.$conf['user_fields']['id'].' >= 3 2616 AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].' 2631 2617 AND (TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) >= "'.$conf_UAM_ConfirmMail['CONFIRMMAIL_DELAY'].'" 2632 2618 OR TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) < "'.$conf_UAM_ConfirmMail['CONFIRMMAIL_DELAY'].'") … … 2704 2690 ON u.'.$conf['user_fields']['id'].' = ui.user_id 2705 2691 WHERE u.'.$conf['user_fields']['id'].' >= 3 2692 AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].' 2706 2693 AND (TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) >= "'.$conf_UAM_ConfirmMail['CONFIRMMAIL_DELAY'].'") 2707 2694 ORDER BY ui.registration_date ASC;'; … … 2744 2731 ON u.'.$conf['user_fields']['id'].' = lv.user_id 2745 2732 WHERE (TO_DAYS(NOW()) - TO_DAYS(lv.lastvisit) >= "'.$conf_UAM['GHOSTRACKER_DAYLIMIT'].'") 2733 AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].' 2746 2734 ORDER BY lv.lastvisit ASC;'; 2747 2735 … … 2791 2779 ON u.'.$conf['user_fields']['id'].' = lv.user_id 2792 2780 WHERE (TO_DAYS(NOW()) - TO_DAYS(lv.lastvisit) >= "'.$conf_UAM['GHOSTRACKER_DAYLIMIT'].'") 2781 AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].' 2793 2782 ORDER BY lv.lastvisit ASC;'; 2794 2783 … … 2827 2816 ON u.'.$conf['user_fields']['id'].' = ug.user_id 2828 2817 WHERE u.'.$conf['user_fields']['id'].' >= 3 2818 AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].' 2829 2819 AND u.username NOT LIKE "16" 2830 2820 AND u.username NOT LIKE "18" … … 3086 3076 $result = pwg_db_fetch_assoc(pwg_query($query)); 3087 3077 3088 if($result['UAM_validated'] == 'true' )3078 if($result['UAM_validated'] == 'true' or is_null($result['UAM_validated'])) 3089 3079 { 3090 3080 return true; … … 3104 3094 UPDATE '.USERS_TABLE.' 3105 3095 SET UAM_validated = "false" 3096 WHERE id = '.$user_id.' 3097 LIMIT 1 3098 ;'; 3099 3100 pwg_query($query); 3101 } 3102 3103 3104 /** 3105 * SetValidated 3106 * Set UAM_validated field to true in #_users table 3107 * 3108 **/ 3109 function SetValidated($user_id) 3110 { 3111 $query =' 3112 UPDATE '.USERS_TABLE.' 3113 SET UAM_validated = "true" 3106 3114 WHERE id = '.$user_id.' 3107 3115 LIMIT 1 -
extensions/UserAdvManager/branches/2.50/language/en_UK/plugin.lang.php
r19234 r21633 424 424 $lang['UAM_Customize_messagesandmails'] = 'Customize the messages and mails'; 425 425 $lang['UAM_Change'] = 'Change the Group/Status/Privacy Level of the users who have been confirmed'; 426 427 426 // --------- End: New or revised $lang ---- from version 2.41.0 427 428 $lang['UAM_group "%s" updated'] = 'For best performance, the group %s was automatically set as the default group.'; 428 429 ?> -
extensions/UserAdvManager/branches/2.50/language/fr_FR/plugin.lang.php
r21075 r21633 426 426 $lang['UAM_Change'] = 'Changer l\'utilisateur confirmé de Groupe/Statut/Niveau de confidentialité'; 427 427 // --------- End: New or revised $lang ---- from version 2.41.0 428 429 $lang['UAM_group "%s" updated'] = 'Pour un meilleur fonctionnement, le groupe %s a été automatiquement positionné comme groupe par défault.'; 428 430 ?>
Note: See TracChangeset
for help on using the changeset viewer.