[Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_shared.inc.php,1.48.2.2.2.5,1.48.2.2.2.6

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv27064/inc

Modified Files:
      Tag: Version-0_9_16-branch
        class.accounts_shared.inc.php 
Log Message:
update popup

Index: class.accounts_shared.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.accounts_shared.inc.php,v
retrieving revision 1.48.2.2.2.5
retrieving revision 1.48.2.2.2.6
diff -C2 -r1.48.2.2.2.5 -r1.48.2.2.2.6
*** class.accounts_shared.inc.php       3 May 2003 13:09:47 -0000       
1.48.2.2.2.5
--- class.accounts_shared.inc.php       3 May 2003 22:48:17 -0000       
1.48.2.2.2.6
***************
*** 250,259 ****
                function accounts_popup($app)
                {
-                       $start  = get_var('start',array('POST','GET'));
-                       $sort   = get_var('sort',array('POST','GET'));
-                       $order  = get_var('order',array('POST','GET'));
-                       $query  = get_var('query',array('POST','GET'));
                        $group_id       = 
get_var('group_id',array('POST','GET'));
  
                        $this->nextmatchs = CreateObject('phpgwapi.nextmatchs');
  
--- 250,287 ----
                function accounts_popup($app)
                {
                        $group_id       = 
get_var('group_id',array('POST','GET'));
  
+                       if(isset($_POST['query']))
+                       {
+                               $GLOBALS['query'] = $_POST['query'];
+                       }
+                       
+                       if(isset($_POST['start']))
+                       {
+                               $start = intval($_POST['start']);
+                       }
+                       else
+                       {
+                               $start = 0;
+                       }
+ 
+                       if(isset($_GET['order']))
+                       {
+                               $order = $_GET['order'];
+                       }
+                       else
+                       {
+                               $order = 'account_lid';
+                       }
+                       
+                       if(isset($_GET['sort']))
+                       {
+                               $sort = $_GET['sort'];
+                       }
+                       else
+                       {
+                               $sort = 'ASC';
+                       }
+ 
                        $this->nextmatchs = CreateObject('phpgwapi.nextmatchs');
  
***************
*** 271,277 ****
                        
$GLOBALS['phpgw']->template->set_var('lang_select_group',lang('select group'));
  
-                       if (! $start) { $start = 0; }
-                       if (! isset($query)) { $query = ''; }
- 
                        switch($app)
                        {
--- 299,302 ----
***************
*** 299,312 ****
                        );
  
! 
  
                        if ($app != 'admin')
                        {
!                               $user_groups = 
$GLOBALS['phpgw']->accounts->membership($this->account);
                                $app_user = 
$GLOBALS['phpgw']->acl->get_ids_for_location('run',1,$app);
  
                                for ($i = 0;$i<count($app_user);$i++)
                                {
!                                       $type = 
$GLOBALS['phpgw']->accounts->get_type($app_user[$i]);
                                        if ($type == 'g')
                                        {
--- 324,337 ----
                        );
  
!                       $app_groups = array();
  
                        if ($app != 'admin')
                        {
!                               $user_groups = 
$this->membership($this->account);
                                $app_user = 
$GLOBALS['phpgw']->acl->get_ids_for_location('run',1,$app);
  
                                for ($i = 0;$i<count($app_user);$i++)
                                {
!                                       $type = $this->get_type($app_user[$i]);
                                        if ($type == 'g')
                                        {
***************
*** 377,404 ****
                                {
                                        //echo 'GROUP_ID: ' . $group_id;
! 
!                                       $users = 
$GLOBALS['phpgw']->acl->get_ids_for_location($group_id,1,'phpgw_group');
  
                                        //_debug_array($users);
  
!                                       for($i=0;$i<count($users);$i++)
                                        {
!                                               
$GLOBALS['phpgw']->accounts->account_id = $users[$i];
!                                               
$GLOBALS['phpgw']->accounts->read_repository();
! 
!                                               $val_users[] = array
!                                               (
!                                                       'account_id'            
=> $GLOBALS['phpgw']->accounts->data['account_id'],
!                                                       'account_lid'           
=> $GLOBALS['phpgw']->accounts->data['account_lid'],
!                                                       'account_firstname'     
=> $GLOBALS['phpgw']->accounts->data['firstname'],
!                                                       'account_lastname'      
=> $GLOBALS['phpgw']->accounts->data['lastname']
!                                               );
                                        }
                                }
                        }
                        else
                        {
!                               $entries = 
$GLOBALS['phpgw']->accounts->get_list('both',$start,$sort,$order,$query);
! 
                                for ($i=0;$i<count($entries);$i++)
                                {
--- 402,432 ----
                                {
                                        //echo 'GROUP_ID: ' . $group_id;
!                                       $entries        = 
$this->get_list('accounts',$start,$sort,$order,$GLOBALS['query']);
!                                       $total          = $this->total;
!                                       $users          = 
$GLOBALS['phpgw']->acl->get_ids_for_location($group_id,1,'phpgw_group');
  
                                        //_debug_array($users);
  
!                                       for ($i=0;$i<count($entries);$i++)
                                        {
!                                               if 
(in_array($entries[$i]['account_id'],$users))
!                                               {
!                                                       $val_users[] = array
!                                                       (
!                                                               'account_id'    
        => $entries[$i]['account_id'],
!                                                               'account_lid'   
        => $entries[$i]['account_lid'],
!                                                               
'account_firstname'     => $entries[$i]['account_firstname'],
!                                                               
'account_lastname'      => $entries[$i]['account_lastname'],
!                                                               'account_type'  
        => $entries[$i]['account_type']
!                                                       );
!                                               }
                                        }
                                }
+                               $total = count($val_users);
                        }
                        else
                        {
!                               $entries        = 
$this->get_list('both',$start,$sort,$order,$GLOBALS['query']);
!                               $total          = $this->total;
                                for ($i=0;$i<count($entries);$i++)
                                {
***************
*** 417,428 ****
                        }
  
-                       if (is_array($val_users) && !empty($val_users))
-                       {
-                               $total = count($val_users);
-                       }
-                       else
-                       {
-                               $total = 0;
-                       }
  // --------------------------------- nextmatch ---------------------------
  
--- 445,448 ----