Changeset 808 for trunk/admin/user_list.php
- Timestamp:
- Aug 8, 2005, 10:52:19 PM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/user_list.php
r805 r808 46 46 if (isset($_POST['submit_add'])) 47 47 { 48 $page['errors'] = register_user($_POST['login'], 49 $_POST['password'], 50 $_POST['password'], 51 ''); 48 $page['errors'] = register_user($_POST['login'], $_POST['password'], ''); 52 49 } 53 50 … … 67 64 SELECT id 68 65 FROM '.USERS_TABLE.' 69 WHERE id != 266 WHERE id != '.$conf['guest_id'].' 70 67 ;'; 71 68 $collection = array_from_query($query, 'id'); … … 124 121 // properties to set for the collection (a user list) 125 122 $datas = array(); 126 $dbfields = array('primary' => array(' id'), 'update' => array());123 $dbfields = array('primary' => array('user_id'), 'update' => array()); 127 124 128 125 $formfields = … … 147 144 { 148 145 $data = array(); 149 $data[' id'] = $user_id;146 $data['user_id'] = $user_id; 150 147 151 148 // TODO : verify if submited values are semanticaly correct … … 169 166 } 170 167 171 mass_updates(USER S_TABLE, $dbfields, $datas);168 mass_updates(USER_INFOS_TABLE, $dbfields, $datas); 172 169 } 173 170 } … … 203 200 $base_url = add_session_id(PHPWG_ROOT_PATH.'admin.php?page=user_list'); 204 201 205 $conf['users_page'] = 10;202 $conf['users_page'] = 20; 206 203 207 204 if (isset($_GET['start']) and is_numeric($_GET['start'])) … … 318 315 )); 319 316 320 foreach (get_enums(USER S_TABLE, 'status') as $status)317 foreach (get_enums(USER_INFOS_TABLE, 'status') as $status) 321 318 { 322 319 $selected = (isset($_GET['status']) and $_GET['status'] == $status) ? … … 433 430 $blockname = 'pref_status_option'; 434 431 435 foreach (get_enums(USER S_TABLE, 'status') as $status)432 foreach (get_enums(USER_INFOS_TABLE, 'status') as $status) 436 433 { 437 434 if (isset($_POST['pref_submit'])) … … 551 548 552 549 if (isset($_GET['status']) 553 and in_array($_GET['status'], get_enums(USER S_TABLE, 'status')))550 and in_array($_GET['status'], get_enums(USER_INFOS_TABLE, 'status'))) 554 551 { 555 552 $filter['status'] = $_GET['status']; … … 561 558 562 559 $query = ' 563 SELECT COUNT(DISTINCT(id)) 564 FROM '.USERS_TABLE.' LEFT JOIN '.USER_GROUP_TABLE.' ON id = user_id 565 WHERE id != 2'; 560 SELECT COUNT(DISTINCT u.'.$conf['user_fields']['id'].') 561 FROM '.USERS_TABLE.' AS u 562 INNER JOIN '.USER_INFOS_TABLE.' AS ui 563 ON u.'.$conf['user_fields']['id'].' = ui.user_id 564 LEFT JOIN '.USER_GROUP_TABLE.' AS ug 565 ON u.'.$conf['user_fields']['id'].' = ug.user_id 566 WHERE u.'.$conf['user_fields']['id'].' != '.$conf['guest_id']; 566 567 if (isset($filter['username'])) 567 568 { 568 569 $query.= ' 569 AND usernameLIKE \''.$filter['username'].'\'';570 AND u.'.$conf['user_fields']['username'].' LIKE \''.$filter['username'].'\''; 570 571 } 571 572 if (isset($filter['group'])) 572 573 { 573 574 $query.= ' 574 AND group_id = '.$filter['group'];575 AND ug.group_id = '.$filter['group']; 575 576 } 576 577 if (isset($filter['status'])) 577 578 { 578 579 $query.= ' 579 AND status = \''.$filter['status']."'";580 AND ui.status = \''.$filter['status']."'"; 580 581 } 581 582 $query.= ' … … 618 619 619 620 $query = ' 620 SELECT DISTINCT(id), username, mail_address, status 621 FROM '.USERS_TABLE.' LEFT JOIN '.USER_GROUP_TABLE.' ON id = user_id 622 WHERE id != 2'; 621 SELECT DISTINCT u.'.$conf['user_fields']['id'].' AS id, 622 u.'.$conf['user_fields']['username'].' AS username, 623 u.'.$conf['user_fields']['email'].' AS email, 624 ui.status 625 FROM '.USERS_TABLE.' AS u 626 INNER JOIN '.USER_INFOS_TABLE.' AS ui 627 ON u.'.$conf['user_fields']['id'].' = ui.user_id 628 LEFT JOIN '.USER_GROUP_TABLE.' AS ug 629 ON u.'.$conf['user_fields']['id'].' = ug.user_id 630 WHERE id != '.$conf['guest_id']; 623 631 if (isset($filter['username'])) 624 632 { … … 629 637 { 630 638 $query.= ' 631 AND group_id = '.$filter['group'];639 AND ug.group_id = '.$filter['group']; 632 640 } 633 641 if (isset($filter['status'])) 634 642 { 635 643 $query.= ' 636 AND status = \''.$filter['status']."'";644 AND ui.status = \''.$filter['status']."'"; 637 645 } 638 646 $query.= ' … … 688 696 'USERNAME'=>$item['username'], 689 697 'STATUS'=>$lang['user_status_'.$item['status']], 690 'EMAIL'=>isset($item[' mail_address']) ? $item['mail_address'] : '',698 'EMAIL'=>isset($item['email']) ? $item['email'] : '', 691 699 'GROUPS'=>$groups_string 692 700 ));
Note: See TracChangeset
for help on using the changeset viewer.