forked from extern/egroupware
A few changes to bring in line with what the phpGW.org site is running.
This commit is contained in:
parent
2f001c89f5
commit
63b54968a3
@ -344,7 +344,7 @@
|
||||
*/
|
||||
function return_single($id = '')
|
||||
{
|
||||
$this->db->query('SELECT * FROM phpgw_categories WHERE cat_id=' . $id,__LINE__,__FILE__);
|
||||
$this->db->query('SELECT * FROM phpgw_categories WHERE cat_id=' . intval($id),__LINE__,__FILE__);
|
||||
|
||||
if ($this->db->next_record())
|
||||
{
|
||||
|
@ -32,21 +32,24 @@
|
||||
var $action;
|
||||
var $template;
|
||||
|
||||
function nextmatchs()
|
||||
function nextmatchs($website=False)
|
||||
{
|
||||
$this->template = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
|
||||
$this->template->set_file(array(
|
||||
'_nextmatchs' => 'nextmatchs.tpl'
|
||||
));
|
||||
$this->template->set_block('_nextmatchs','nextmatchs');
|
||||
$this->template->set_block('_nextmatchs','filter');
|
||||
$this->template->set_block('_nextmatchs','form');
|
||||
$this->template->set_block('_nextmatchs','icon');
|
||||
$this->template->set_block('_nextmatchs','link');
|
||||
$this->template->set_block('_nextmatchs','search');
|
||||
$this->template->set_block('_nextmatchs','cats');
|
||||
$this->template->set_block('_nextmatchs','search_filter');
|
||||
$this->template->set_block('_nextmatchs','cats_search_filter');
|
||||
if(!$website)
|
||||
{
|
||||
$this->template = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
|
||||
$this->template->set_file(array(
|
||||
'_nextmatchs' => 'nextmatchs.tpl'
|
||||
));
|
||||
$this->template->set_block('_nextmatchs','nextmatchs');
|
||||
$this->template->set_block('_nextmatchs','filter');
|
||||
$this->template->set_block('_nextmatchs','form');
|
||||
$this->template->set_block('_nextmatchs','icon');
|
||||
$this->template->set_block('_nextmatchs','link');
|
||||
$this->template->set_block('_nextmatchs','search');
|
||||
$this->template->set_block('_nextmatchs','cats');
|
||||
$this->template->set_block('_nextmatchs','search_filter');
|
||||
$this->template->set_block('_nextmatchs','cats_search_filter');
|
||||
}
|
||||
|
||||
if(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) &&
|
||||
intval($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) > 0)
|
||||
|
Loading…
Reference in New Issue
Block a user