Revision 2065
Added by Dietmar over 10 years ago
- /admin/users bugfixes user deactivating and deleting
| user_list.php | ||
|---|---|---|
| 26 | 26 |
|
| 27 | 27 |
function show_userlist($admin, &$aActionRequest) |
| 28 | 28 |
{
|
| 29 |
global $TEXT, $MESSAGE, $HEADING, $MENU; |
|
| 30 | 29 |
$database = WbDatabase::getInstance(); |
| 30 |
$mLang = Translate::getInstance(); |
|
| 31 | 31 |
$iUserStatus = 1; |
| 32 | 32 |
$iUserStatus = ( ( $admin->get_get('status')==1 ) ? 0 : $iUserStatus );
|
| 33 | 33 |
unset($_GET); |
| ... | ... | |
| 54 | 54 |
$UserStatusActive = 'url('.THEME_URL.'/images/user.png)';
|
| 55 | 55 |
$UserStatusInactive = 'url('.THEME_URL.'/images/user_red.png)';
|
| 56 | 56 |
|
| 57 |
$sUserTitle = ($iUserStatus == 0) ? $MENU['USERS'].' '.strtolower($TEXT['ACTIVE']) : $MENU['USERS'].' '.strtolower($TEXT['DELETED']) ;
|
|
| 57 |
$sUserTitle = ($iUserStatus == 0) ? $mLang->MENU_USERS.' '.strtolower($mLang->TEXT_ACTIVE) : $mLang->MENU_USERS.' '.strtolower($mLang->TEXT_DELETED) ;
|
|
| 58 | 58 |
|
| 59 |
$oTpl->set_var('TEXT_USERS', $sUserTitle.' '.$TEXT['SHOW'] );
|
|
| 59 |
$oTpl->set_var('TEXT_USERS', $sUserTitle.' '.$mLang->TEXT_SHOW );
|
|
| 60 | 60 |
$oTpl->set_var('STATUS_ICON', ( ($iUserStatus==0) ? $UserStatusActive : $UserStatusInactive) );
|
| 61 | 61 |
|
| 62 | 62 |
// Get existing value from database |
| 63 | 63 |
$sql = 'SELECT `user_id`, `username`, `display_name`, `active` FROM `'.TABLE_PREFIX.'users` ' ; |
| 64 | 64 |
$sql .= 'WHERE user_id != 1 '; |
| 65 |
$sql .= 'AND active = '.$iUserStatus.' '; |
|
| 65 |
$sql .= 'AND `active` = '.$iUserStatus.' '; |
|
| 66 |
$sql .= 'AND `confirm_code` = \'\' '; |
|
| 66 | 67 |
$sql .= 'ORDER BY `display_name`,`username`'; |
| 67 | 68 |
|
| 68 | 69 |
// $query = "SELECT user_id, username, display_name, active FROM ".TABLE_PREFIX."users WHERE user_id != '1' ORDER BY display_name,username"; |
| ... | ... | |
| 71 | 72 |
$admin->print_error($database->get_error(), 'index.php'); |
| 72 | 73 |
} |
| 73 | 74 |
|
| 74 |
$sUserList = $TEXT['LIST_OPTIONS'].' ';
|
|
| 75 |
$sUserList .= ($iUserStatus == 1) ? $MENU['USERS'].' '.strtolower($TEXT['ACTIVE']) : $MENU['USERS'].' '.strtolower($TEXT['DELETED']) ;
|
|
| 75 |
$sUserList = $mLang->TEXT_LIST_OPTIONS.' ';
|
|
| 76 |
$sUserList .= ($iUserStatus == 1) ? $mLang->MENU_USERS.' '.strtolower($mLang->TEXT_ACTIVE) : $mLang->MENU_USERS.' '.strtolower($mLang->TEXT_DELETED) ;
|
|
| 76 | 77 |
// Insert values into the modify/remove menu |
| 77 | 78 |
$oTpl->set_block('main_block', 'list_block', 'list');
|
| 78 | 79 |
if($oRes->numRows() > 0) {
|
| ... | ... | |
| 90 | 91 |
} |
| 91 | 92 |
} else {
|
| 92 | 93 |
// Insert single value to say no users were found |
| 93 |
$oTpl->set_var('NAME', $TEXT['NONE_FOUND']);
|
|
| 94 |
$oTpl->set_var('NAME', $mLang->TEXT_NONE_FOUND);
|
|
| 94 | 95 |
$oTpl->parse('list', 'list_block', true);
|
| 95 | 96 |
} |
| 96 | 97 |
|
| ... | ... | |
| 104 | 105 |
if($admin->get_permission('users_delete') != true) {
|
| 105 | 106 |
$oTpl->set_var('DISPLAY_DELETE', 'hide');
|
| 106 | 107 |
} |
| 107 |
$HeaderTitle = $HEADING['MODIFY_DELETE_USER'].' ';
|
|
| 108 |
$HeaderTitle .= (($iUserStatus == 1) ? strtolower($TEXT['ACTIVE']) : strtolower($TEXT['DELETED']));
|
|
| 108 |
$HeaderTitle = (($iUserStatus == 1) ? $mLang->HEADING_MODIFY_ACTIVE_USER : $mLang->HEADING_MODIFY_DELETE_USER ).' ';
|
|
| 109 |
$HeaderTitle .= (($iUserStatus == 1) ? strtolower($mLang->TEXT_ACTIVE) : strtolower($mLang->TEXT_INACTIVE));
|
|
| 109 | 110 |
// Insert language headings |
| 110 | 111 |
$oTpl->set_var(array( |
| 111 | 112 |
'HEADING_MODIFY_DELETE_USER' => $HeaderTitle, |
| 112 |
'HEADING_ADD_USER' => $HEADING['ADD_USER']
|
|
| 113 |
'HEADING_ADD_USER' => $mLang->HEADING_ADD_USER
|
|
| 113 | 114 |
) |
| 114 | 115 |
); |
| 115 | 116 |
// insert urls |
| ... | ... | |
| 122 | 123 |
// Insert language text and messages |
| 123 | 124 |
$oTpl->set_var(array( |
| 124 | 125 |
'DISPLAY_WAITING_ACTIVATION' => '', |
| 125 |
'TEXT_MODIFY' => $TEXT['MODIFY'], |
|
| 126 |
'TEXT_DELETE' => $TEXT['DELETE'], |
|
| 127 |
'TEXT_MANAGE_GROUPS' => ( $admin->get_permission('groups') == true ) ? $TEXT['MANAGE_GROUPS'] : "**",
|
|
| 128 |
'CONFIRM_DELETE' => (($iUserStatus == 1) ? $TEXT['ARE_YOU_SURE'] : $MESSAGE['USERS_CONFIRM_DELETE']) |
|
| 126 |
'TEXT_MODIFY' => $mLang->TEXT_MODIFY, |
|
| 127 |
'TEXT_DELETE' => $mLang->TEXT_DELETE, |
|
| 128 |
'TEXT_USER_DELETE' => (($iUserStatus == 1) ? $mLang->TEXT_DEACTIVE : $mLang->TEXT_DELETE), |
|
| 129 |
'TEXT_MANAGE_GROUPS' => ( $admin->get_permission('groups') == true ) ? $mLang->TEXT_MANAGE_GROUPS : "**",
|
|
| 130 |
'CONFIRM_DELETE' => (($iUserStatus == 1) ? $mLang->TEXT_ARE_YOU_SURE : $mLang->MESSAGE_USERS_CONFIRM_DELETE) |
|
| 129 | 131 |
) |
| 130 | 132 |
); |
| 131 | 133 |
|
| 132 | 134 |
$oTpl->set_block('main_block', 'show_confirmed_activation_block', 'show_confirmed_activation');
|
| 133 | 135 |
if($admin->ami_group_member('1')) {
|
| 134 | 136 |
$oTpl->set_block('show_confirmed_activation_block', 'list_confirmed_activation_block', 'list_confirmed_activation');
|
| 135 |
$oTpl->set_var('DISPLAY_WAITING_ACTIVATION', 'Users awaiting activation');
|
|
| 137 |
$oTpl->set_var('DISPLAY_WAITING_ACTIVATION', $mLang->MESSAGE_USERS_WAITING_ACTIVATION);
|
|
| 136 | 138 |
$sql = 'SELECT * FROM `'.TABLE_PREFIX.'users` '; |
| 137 | 139 |
$sql .= 'WHERE `confirm_timeout` != 0 '; |
| 138 | 140 |
$sql .= 'AND `active` = 0 '; |
| ... | ... | |
| 144 | 146 |
// Loop through users |
| 145 | 147 |
if($nNumRows = $oRes->numRows()) {
|
| 146 | 148 |
while($aUser = $oRes->fetchRow(MYSQL_ASSOC)) {
|
| 147 |
$oTpl->set_var('VALUE',$admin->getIDKEY($aUser['user_id']));
|
|
| 148 |
$oTpl->set_var('STATUS', '') ;
|
|
| 149 |
$oTpl->set_var('NAME', $aUser['display_name'].' ('.$aUser['username'].')'.' ['.$aUser['email'].']');
|
|
| 149 |
$oTpl->set_var('CVALUE',$admin->getIDKEY($aUser['user_id']));
|
|
| 150 |
$oTpl->set_var('CSTATUS', '') ;
|
|
| 151 |
$oTpl->set_var('CNAME', $aUser['display_name'].' ('.$aUser['username'].')'.' ['.$aUser['email'].']');
|
|
| 150 | 152 |
$oTpl->parse('list_confirmed_activation', 'list_confirmed_activation_block', true);
|
| 151 | 153 |
} |
| 152 | 154 |
$oTpl->parse('show_confirmed_activation', 'show_confirmed_activation_block',true);
|
| ... | ... | |
| 192 | 194 |
'DISPLAY_MODIFY' => '', |
| 193 | 195 |
'HEADING_MODIFY_USER' => '', |
| 194 | 196 |
'DISPLAY_HOME_FOLDERS' => '', |
| 195 |
'SUBMIT_TITLE' => $TEXT['ADD'],
|
|
| 197 |
'SUBMIT_TITLE' => $mLang->TEXT_ADD,
|
|
| 196 | 198 |
'HIDE_SAVE_BACK' => 'hide', |
| 197 | 199 |
) |
| 198 | 200 |
); |
| ... | ... | |
| 217 | 219 |
$results = $database->query("SELECT group_id, name FROM ".TABLE_PREFIX."groups WHERE group_id != '1'");
|
| 218 | 220 |
if($results->numRows() > 0) {
|
| 219 | 221 |
$oTpl->set_var('ID', '');
|
| 220 |
$oTpl->set_var('NAME', $TEXT['PLEASE_SELECT'].'...');
|
|
| 222 |
$oTpl->set_var('NAME', $mLang->TEXT_PLEASE_SELECT.'...');
|
|
| 221 | 223 |
$oTpl->set_var('SELECTED', ' selected="selected"');
|
| 222 | 224 |
$oTpl->parse('group_list', 'group_list_block', true);
|
| 223 | 225 |
while($group = $results->fetchRow()) {
|
| ... | ... | |
| 237 | 239 |
} else {
|
| 238 | 240 |
if($results->numRows() == 0) {
|
| 239 | 241 |
$oTpl->set_var('ID', '');
|
| 240 |
$oTpl->set_var('NAME', $TEXT['NONE_FOUND']);
|
|
| 242 |
$oTpl->set_var('NAME', $mLang->TEXT_NONE_FOUND);
|
|
| 241 | 243 |
$oTpl->parse('group_list', 'group_list_block', true);
|
| 242 | 244 |
} |
| 243 | 245 |
} |
| ... | ... | |
| 278 | 280 |
|
| 279 | 281 |
// Insert language text and messages |
| 280 | 282 |
$oTpl->set_var(array( |
| 281 |
'TEXT_CANCEL' => $TEXT['CANCEL'],
|
|
| 282 |
'TEXT_RESET' => $TEXT['RESET'],
|
|
| 283 |
'TEXT_ACTIVE' => $TEXT['ACTIVE'],
|
|
| 284 |
'TEXT_DISABLED' => $TEXT['DISABLED'],
|
|
| 285 |
'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'],
|
|
| 286 |
'TEXT_USERNAME' => $TEXT['USERNAME'],
|
|
| 287 |
'TEXT_PASSWORD' => $TEXT['PASSWORD'],
|
|
| 288 |
'TEXT_RETYPE_PASSWORD' => $TEXT['RETYPE_PASSWORD'],
|
|
| 289 |
'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'],
|
|
| 290 |
'TEXT_EMAIL' => $TEXT['EMAIL'],
|
|
| 291 |
'TEXT_GROUP' => $TEXT['GROUP'],
|
|
| 292 |
'TEXT_NONE' => $TEXT['NONE'],
|
|
| 293 |
'TEXT_HOME_FOLDER' => $TEXT['HOME_FOLDER'],
|
|
| 283 |
'TEXT_CANCEL' => $mLang->TEXT_CANCEL,
|
|
| 284 |
'TEXT_RESET' => $mLang->TEXT_RESET,
|
|
| 285 |
'TEXT_ACTIVE' => $mLang->TEXT_ACTIVE,
|
|
| 286 |
'TEXT_DISABLED' => $mLang->TEXT_DISABLED,
|
|
| 287 |
'TEXT_PLEASE_SELECT' => $mLang->TEXT_PLEASE_SELECT,
|
|
| 288 |
'TEXT_USERNAME' => $mLang->TEXT_USERNAME,
|
|
| 289 |
'TEXT_PASSWORD' => $mLang->TEXT_PASSWORD,
|
|
| 290 |
'TEXT_RETYPE_PASSWORD' => $mLang->TEXT_RETYPE_PASSWORD,
|
|
| 291 |
'TEXT_DISPLAY_NAME' => $mLang->TEXT_DISPLAY_NAME,
|
|
| 292 |
'TEXT_EMAIL' => $mLang->TEXT_EMAIL,
|
|
| 293 |
'TEXT_GROUP' => $mLang->TEXT_GROUP,
|
|
| 294 |
'TEXT_NONE' => $mLang->TEXT_NONE,
|
|
| 295 |
'TEXT_HOME_FOLDER' => $mLang->TEXT_HOME_FOLDER,
|
|
| 294 | 296 |
'USERNAME_FIELDNAME' => $username_fieldname, |
| 295 |
'CHANGING_PASSWORD' => $MESSAGE['USERS_CHANGING_PASSWORD']
|
|
| 297 |
'CHANGING_PASSWORD' => $mLang->MESSAGE_USERS_CHANGING_PASSWORD
|
|
| 296 | 298 |
) |
| 297 | 299 |
); |
| 298 | 300 |
|
Also available in: Unified diff