Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1841) +++ branches/2.8.x/CHANGELOG (revision 1842) @@ -12,6 +12,10 @@ =============================================================================== +26 Dez-2012 Build 1842 Dietmar Woellbrink (Luisehahne) +# fixed output activation conformation +# fixed deleting Users awaiting activation +! add YYYY-MM-DD in date_formats dropdown 23 Dez-2012 Build 1841 Dietmar Woellbrink (Luisehahne) # fixed index depth in access files 23 Dez-2012 Build 1840 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/skel/themes/htt/users.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/users.htt (revision 1841) +++ branches/2.8.x/wb/admin/skel/themes/htt/users.htt (revision 1842) @@ -29,7 +29,7 @@

{DISPLAY_WAITING_ACTIVATION}

- Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1841) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1842) @@ -51,5 +51,5 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.3'); -if(!defined('REVISION')) define('REVISION', '1841'); +if(!defined('REVISION')) define('REVISION', '1842'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/admin/interface/date_formats.php =================================================================== --- branches/2.8.x/wb/admin/interface/date_formats.php (revision 1841) +++ branches/2.8.x/wb/admin/interface/date_formats.php (revision 1842) @@ -43,6 +43,7 @@ $DATE_FORMATS['d|M|Y'] = gmdate('d M Y', $actual_time); $DATE_FORMATS['M|d|Y'] = gmdate('M d Y', $actual_time); $DATE_FORMATS['D|M|d,|Y'] = gmdate('D M d, Y', $actual_time); +$DATE_FORMATS['Y-m-d'] = gmdate('Y-m-d', $actual_time).' (Y-M-D)'; $DATE_FORMATS['d-m-Y'] = gmdate('d-m-Y', $actual_time).' (D-M-Y)'; $DATE_FORMATS['m-d-Y'] = gmdate('m-d-Y', $actual_time).' (M-D-Y)'; $DATE_FORMATS['d.m.Y'] = gmdate('d.m.Y', $actual_time).' (D.M.Y)'; Index: branches/2.8.x/wb/admin/users/user_list.php =================================================================== --- branches/2.8.x/wb/admin/users/user_list.php (revision 1841) +++ branches/2.8.x/wb/admin/users/user_list.php (revision 1842) @@ -132,7 +132,7 @@ $oTpl->set_block('main_block', 'show_confirmed_activation_block', 'show_confirmed_activation'); if($admin->ami_group_member('1')) { $oTpl->set_block('show_confirmed_activation_block', 'list_confirmed_activation_block', 'list_confirmed_activation'); - $oTpl->set_var('DISPLAY_WAITING_ACTIVATION', 'Users awaiting for activation'); + $oTpl->set_var('DISPLAY_WAITING_ACTIVATION', 'Users awaiting activation'); $sql = 'SELECT * FROM `'.TABLE_PREFIX.'users` '; $sql .= 'WHERE `confirm_timeout` != 0 '; $sql .= 'AND `active` = 0 '; Index: branches/2.8.x/wb/admin/users/delete.php =================================================================== --- branches/2.8.x/wb/admin/users/delete.php (revision 1841) +++ branches/2.8.x/wb/admin/users/delete.php (revision 1842) @@ -29,11 +29,23 @@ $database = WbDatabase::getInstance(); $aUserID = array(); $bRetVal = false; - if(isset($aActionRequest['user_id']) && !is_array($aActionRequest['user_id'])) { - $aUserID[] = $aActionRequest['user_id']; + if(isset($aActionRequest['activation_user_id'])) { + if(!is_array($aActionRequest['activation_user_id'])) { + + $aUserID[] = $aActionRequest['activation_user_id']; + } else { + $aUserID = $aActionRequest['activation_user_id']; + } } else { - $aUserID = $aActionRequest['user_id']; - } + if(isset($aActionRequest['user_id'])) { + if(!is_array($aActionRequest['user_id'])) { + + $aUserID[] = $aActionRequest['user_id']; + } else { + $aUserID = $aActionRequest['user_id']; + } + } + } foreach ( $aUserID AS $key => $value) { Index: branches/2.8.x/wb/admin/users/index.php =================================================================== --- branches/2.8.x/wb/admin/users/index.php (revision 1841) +++ branches/2.8.x/wb/admin/users/index.php (revision 1842) @@ -51,8 +51,8 @@ switch($action) : case 'delete': // delete the user + case 'delete_outdated': // delete Users awaiting activation $admin = new admin('Access', 'users_delete',false); - include($sAdminPath.'/delete.php'); $output = delete_user($admin,$aActionRequest); @@ -59,7 +59,6 @@ if( ($msg = msgQueue::getError()) != '') { } - $aActionRequest['cancel_url'] = ADMIN_URL.'/access/index.php'; $admin = new admin('Access', 'users'); include($sAdminPath.'/user_list.php'); Index: branches/2.8.x/wb/account/htt/success.htt =================================================================== --- branches/2.8.x/wb/account/htt/success.htt (revision 1841) +++ branches/2.8.x/wb/account/htt/success.htt (revision 1842) @@ -1,9 +1,9 @@ -
+

{MESSAGE_VALUE}

-

{MESSAGE}

+

{MESSAGE}

\ No newline at end of file Index: branches/2.8.x/wb/install/save.php =================================================================== --- branches/2.8.x/wb/install/save.php (revision 1841) +++ branches/2.8.x/wb/install/save.php (revision 1842) @@ -371,7 +371,7 @@ ." (11, 'app_name', 'wb_$session_rand')," ." (12, 'sec_anchor', 'section_')," ." (13, 'default_timezone', '$default_timezone')," - ." (14, 'default_date_format', 'M d Y')," + ." (14, 'default_date_format', 'Y-m-d')," ." (15, 'default_time_format', 'h:i A')," ." (16, 'redirect_timer', '1500')," ." (17, 'home_folders', 'true'),"