mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-24 07:39:27 +01:00
Added return of total to get_list by ref, needs tweaking
This commit is contained in:
parent
b64dbe3d4d
commit
8fe80611d3
@ -468,9 +468,30 @@
|
|||||||
return False;
|
return False;
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_list($start='',$sort='',$order='',$query='',$offset='')
|
function get_list($start='',$sort='',$order='',$query='',$offset='',&$total)
|
||||||
{
|
{
|
||||||
$sql = "SELECT * FROM $this->table";
|
if (!$sort)
|
||||||
|
{
|
||||||
|
$sort = 'DESC';
|
||||||
|
}
|
||||||
|
if ($query)
|
||||||
|
{
|
||||||
|
$whereclause = "WHERE server_name LIKE '%$query%'"
|
||||||
|
. "OR server_url LIKE '%$query%'"
|
||||||
|
. "OR server_mode LIKE '%$query%'"
|
||||||
|
. "OR admin_name LIKE '%$query%'"
|
||||||
|
. "OR admin_email LIKE '%$query%'";
|
||||||
|
}
|
||||||
|
if ($order)
|
||||||
|
{
|
||||||
|
$orderclause = 'ORDER BY ' . $order . ' ' . $sort;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$orderclause = 'ORDER BY server_name ASC';
|
||||||
|
}
|
||||||
|
|
||||||
|
$sql = "SELECT * FROM $this->table $whereclause $orderclause";
|
||||||
$this->db->query($sql,__LINE__,__FILE__);
|
$this->db->query($sql,__LINE__,__FILE__);
|
||||||
|
|
||||||
while ($this->db->next_record())
|
while ($this->db->next_record())
|
||||||
@ -485,11 +506,12 @@
|
|||||||
$this->servers[$this->db->f('server_name')]['admin_name'] = $this->db->f('admin_name');
|
$this->servers[$this->db->f('server_name')]['admin_name'] = $this->db->f('admin_name');
|
||||||
$this->servers[$this->db->f('server_name')]['admin_email'] = $this->db->f('admin_email');
|
$this->servers[$this->db->f('server_name')]['admin_email'] = $this->db->f('admin_email');
|
||||||
}
|
}
|
||||||
$this->total = $this->db->num_rows() + 1;
|
$this->total = $this->db->num_rows();
|
||||||
|
$total = $this->total;
|
||||||
return $this->servers;
|
return $this->servers;
|
||||||
}
|
}
|
||||||
|
|
||||||
function formatted_list($server_id=0,$java=False)
|
function formatted_list($server_id=0,$java=False,$local=False)
|
||||||
{
|
{
|
||||||
if ($java)
|
if ($java)
|
||||||
{
|
{
|
||||||
@ -501,9 +523,11 @@
|
|||||||
{
|
{
|
||||||
$select .= ' selected';
|
$select .= ' selected';
|
||||||
}
|
}
|
||||||
$select .= '>' . lang('Please Select') . '</option>'."\n";
|
$selectlang = $local ? lang('Local') : lang('Please Select');
|
||||||
|
$select .= '>' . $selectlang . '</option>'."\n";
|
||||||
|
|
||||||
$slist = $this->get_list();
|
$x = '';
|
||||||
|
$slist = $this->get_list('','','','','',$x);
|
||||||
while (list($key,$val) = each($slist))
|
while (list($key,$val) = each($slist))
|
||||||
{
|
{
|
||||||
$foundservers = True;
|
$foundservers = True;
|
||||||
|
Loading…
Reference in New Issue
Block a user