[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_shared.inc.php,1.48
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_shared.inc.php,1.48.2.1,1.48.2.2 class.categories.inc.php,1.74.2.17,1.74.2.18 |
|
Date: |
Tue, 17 Dec 2002 19:22:27 -0500 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv7478
Modified Files:
Tag: Version-0_9_14-branch
class.accounts_shared.inc.php class.categories.inc.php
Log Message:
update accounts_ldap
Index: class.accounts_shared.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.accounts_shared.inc.php,v
retrieving revision 1.48.2.1
retrieving revision 1.48.2.2
diff -C2 -r1.48.2.1 -r1.48.2.2
*** class.accounts_shared.inc.php 18 Dec 2002 00:20:46 -0000 1.48.2.1
--- class.accounts_shared.inc.php 18 Dec 2002 00:22:24 -0000 1.48.2.2
***************
*** 234,368 ****
return $nextid;
}
-
- function accounts_popup()
- {
- $start = $GLOBALS['HTTP_POST_VARS']['start'] ?
$GLOBALS['HTTP_POST_VARS']['start'] : $GLOBALS['HTTP_GET_VARS']['start'];
- $sort = $GLOBALS['HTTP_POST_VARS']['sort'] ?
$GLOBALS['HTTP_POST_VARS']['sort'] : $GLOBALS['HTTP_GET_VARS']['sort'];
- $order = $GLOBALS['HTTP_POST_VARS']['order'] ?
$GLOBALS['HTTP_POST_VARS']['order'] : $GLOBALS['HTTP_GET_VARS']['order'];
- $query = $GLOBALS['HTTP_POST_VARS']['query'] ?
$GLOBALS['HTTP_POST_VARS']['query'] : $GLOBALS['HTTP_GET_VARS']['query'];
-
- $this->nextmatchs = CreateObject('phpgwapi.nextmatchs');
-
-
$GLOBALS['phpgw']->template->set_root($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi'));
-
-
$GLOBALS['phpgw']->template->set_file(array('accounts_list_t' =>
'accounts_popup.tpl'));
-
$GLOBALS['phpgw']->template->set_block('accounts_list_t','accounts_list','list');
-
-
$GLOBALS['phpgw']->template->set_var('title',$GLOBALS['phpgw_info']['site_title']);
-
$GLOBALS['phpgw']->template->set_var('lang_header',lang('Accounts & Groups'));
-
$GLOBALS['phpgw']->template->set_var('charset',$GLOBALS['phpgw']->translation->translate('charset'));
-
$GLOBALS['phpgw']->template->set_var('font',$GLOBALS['phpgw_info']['theme']['font']);
-
- if (! $start) { $start = 0; }
- if (! isset($query)) { $query = ''; }
-
- $link_data = array
- (
- 'menuaction' =>
'calendar.uicalendar.accounts_popup',
- 'start' => $start
- );
-
- $cal_user =
$GLOBALS['phpgw']->acl->get_ids_for_location('run',1,'calendar');
-
- for ($i = 0;$i<count($cal_user);$i++)
- {
- $type =
$GLOBALS['phpgw']->accounts->get_type($cal_user[$i]);
- if ($type == 'g')
- {
- $members[] =
$GLOBALS['phpgw']->acl->get_ids_for_location($cal_user[$i],1,'phpgw_group');
- }
- }
-
- $i = count($cal_user);
- while(is_array($members) && list(,$mem) =
each($members))
- {
- for($j=0;$j<count($mem);$j++)
- {
- $cal_user[$i] = $mem[$j];
- $i++;
- }
- }
-
- //_debug_array($cal_user);
-
- if (!$query)
- {
- $entries = 0;
- $total = 0;
- }
- else
- {
- $entries =
$GLOBALS['phpgw']->accounts->get_list('both',$start,$sort,$order,$query);
-
- for ($i=0;$i<count($entries);$i++)
- {
- if
(in_array($entries[$i]['account_id'],$cal_user))
- {
- $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);
- }
-
- // --------------------------------- nextmatch ---------------------------
-
- $left =
$this->nextmatchs->left('/index.php',$start,$total,$link_data);
- $right =
$this->nextmatchs->right('/index.php',$start,$total,$link_data);
- $GLOBALS['phpgw']->template->set_var('left',$left);
- $GLOBALS['phpgw']->template->set_var('right',$right);
-
-
$GLOBALS['phpgw']->template->set_var('lang_showing',$this->nextmatchs->show_hits($total,$start));
-
- // -------------------------- end nextmatch
------------------------------------
-
-
$GLOBALS['phpgw']->template->set_var('search_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
-
$GLOBALS['phpgw']->template->set_var('search_list',$this->nextmatchs->search(array('query'
=> $query, 'search_obj' => 1)));
-
- // ---------------- list header variable template-declarations
--------------------------
-
- // -------------- list header variable template-declaration
------------------------
-
$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
-
$GLOBALS['phpgw']->template->set_var('sort_lid',$this->nextmatchs->show_sort_order($sort,'account_lid',$order,'/index.php',lang('LoginID'),$link_data));
-
$GLOBALS['phpgw']->template->set_var('sort_firstname',$this->nextmatchs->show_sort_order($sort,'account_firstname',$order,'/index.php',lang('Firstname'),$link_data));
-
$GLOBALS['phpgw']->template->set_var('sort_lastname',$this->nextmatchs->show_sort_order($sort,'account_lastname',$order,'/index.php',lang('Lastname'),$link_data));
-
$GLOBALS['phpgw']->template->set_var('lang_select',lang('Select'));
-
- // ------------------------- end header declaration
--------------------------------
-
- for ($i=0;$i<count($val_users);$i++)
- {
-
$GLOBALS['phpgw']->template->set_var('tr_color',$this->nextmatchs->alternate_row_color($tr_color));
- $firstname =
$val_users[$i]['account_firstname'];
- if (!$firstname) { $firstname = ' '; }
- $lastname = $val_users[$i]['account_lastname'];
- if (!$lastname) { $lastname = ' '; }
-
- // ---------------- template declaration for list records
--------------------------
-
- $GLOBALS['phpgw']->template->set_var(array
- (
- 'lid' =>
$val_users[$i]['account_lid'],
- 'firstname' => $firstname,
- 'lastname' => $lastname,
- 'accountid' =>
$val_users[$i]['account_id'],
- 'accounttype' =>
$val_users[$i]['account_type'])
- );
-
-
$GLOBALS['phpgw']->template->parse('list','accounts_list',True);
- }
-
-
$GLOBALS['phpgw']->template->set_var('lang_done',lang('done'));
-
$GLOBALS['phpgw']->template->parse('out','accounts_list_t',True);
- $GLOBALS['phpgw']->template->p('out');
- $GLOBALS['phpgw']->common->phpgw_exit();
- }
}
/*!
--- 234,237 ----
Index: class.categories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.categories.inc.php,v
retrieving revision 1.74.2.17
retrieving revision 1.74.2.18
diff -C2 -r1.74.2.17 -r1.74.2.18
*** class.categories.inc.php 18 Dec 2002 00:20:46 -0000 1.74.2.17
--- class.categories.inc.php 18 Dec 2002 00:22:24 -0000 1.74.2.18
***************
*** 267,272 ****
$this->db2->query($sql .
$parent_select,__LINE__,__FILE__);
! //$total_mains = $this->db2->num_rows();
! $this->total_records = $this->db2->num_rows();
if ($limit)
--- 267,271 ----
$this->db2->query($sql .
$parent_select,__LINE__,__FILE__);
! $total_mains = $this->db2->num_rows();
if ($limit)
***************
*** 300,307 ****
$sub_select = " AND cat_parent='" .
$cats[$i]['id'] . "' AND cat_level='" . ($cats[$i]['level']+1) . "'";
! /*$this->db2->query($sql .
$sub_select,__LINE__,__FILE__);
$total_subs += $this->db2->num_rows();
! if ($limit)
{
$this->db->limit_query($sql .
$sub_select . $ordermethod,$start,__LINE__,__FILE__);
--- 299,306 ----
$sub_select = " AND cat_parent='" .
$cats[$i]['id'] . "' AND cat_level='" . ($cats[$i]['level']+1) . "'";
! $this->db2->query($sql .
$sub_select,__LINE__,__FILE__);
$total_subs += $this->db2->num_rows();
! /*if ($limit)
{
$this->db->limit_query($sql .
$sub_select . $ordermethod,$start,__LINE__,__FILE__);
***************
*** 349,353 ****
}
}
! //$this->total_records = $total_mains + $total_subs;
return $cats;
}
--- 348,352 ----
}
}
! $this->total_records = $total_mains + $total_subs;
return $cats;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_shared.inc.php,1.48.2.1,1.48.2.2 class.categories.inc.php,1.74.2.17,1.74.2.18,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_ldap.inc.php,1.101.2.8,1.101.2.9 class.accounts_shared.inc.php,1.48,1.48.2.1 class.arrayfunctions.inc.php,1.1.2.1,1.1.2.2 class.categories.inc.php,1.74.2.16,1.74.2.17
- Next by Date:
[Phpgroupware-cvs] CVS: setup index.php,1.98.2.6,1.98.2.7
- Previous by thread:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_ldap.inc.php,1.101.2.8,1.101.2.9 class.accounts_shared.inc.php,1.48,1.48.2.1 class.arrayfunctions.inc.php,1.1.2.1,1.1.2.2 class.categories.inc.php,1.74.2.16,1.74.2.17
- Next by thread:
[Phpgroupware-cvs] CVS: setup index.php,1.98.2.6,1.98.2.7
- Index(es):