[Phpgroupware-cvs] CVS: phpgwapi/inc class.categories.inc.php,1.81,1.82 class.nextmatchs.inc.php,1.47,1.48

[Mark A Peters <address@hidden>]

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

Modified Files:
        class.categories.inc.php class.nextmatchs.inc.php 
Log Message:
A few changes to bring in line with what the phpGW.org site is running.

Index: class.categories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.categories.inc.php,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -r1.81 -r1.82
*** class.categories.inc.php    14 Apr 2002 03:27:50 -0000      1.81
--- class.categories.inc.php    27 Apr 2002 22:14:33 -0000      1.82
***************
*** 345,349 ****
                function return_single($id = '')
                {
!                       $this->db->query('SELECT * FROM phpgw_categories WHERE 
cat_id=' . $id,__LINE__,__FILE__);
  
                        if ($this->db->next_record())
--- 345,349 ----
                function return_single($id = '')
                {
!                       $this->db->query('SELECT * FROM phpgw_categories WHERE 
cat_id=' . intval($id),__LINE__,__FILE__);
  
                        if ($this->db->next_record())

Index: class.nextmatchs.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.nextmatchs.inc.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** class.nextmatchs.inc.php    17 Apr 2002 23:41:55 -0000      1.47
--- class.nextmatchs.inc.php    27 Apr 2002 22:14:33 -0000      1.48
***************
*** 33,51 ****
                var $template;
  
!               function nextmatchs()
                {
!                       $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']) 
&&
--- 33,54 ----
                var $template;
  
!               function nextmatchs($website=False)
                {
!                       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']) 
&&