[Phpgroupware-cvs] CVS: phpgwapi/inc class.categories.inc.php,1.74.2.6,1.74.2.7 class.nextmatchs.inc.php,1.43.2.3,1.43.2.4

[Mark A Peters <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        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.74.2.6
retrieving revision 1.74.2.7
diff -C2 -r1.74.2.6 -r1.74.2.7
*** class.categories.inc.php    14 Apr 2002 03:27:42 -0000      1.74.2.6
--- class.categories.inc.php    27 Apr 2002 22:14:23 -0000      1.74.2.7
***************
*** 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())
***************
*** 371,379 ****
                @result $s array - populated with categories
                */
!               function formatted_list($format,$type,$selected = '',$public = 
False,$site_link = 'site')
                {
                        return 
$this->formated_list($format,$type,$selected,$public,$site_link);
                }
!               function formated_list($format,$type,$selected = '',$public = 
False,$site_link = 'site')
                {
                        if(is_array($format))
--- 371,379 ----
                @result $s array - populated with categories
                */
!               function formatted_list($format,$type='',$selected = '',$public 
= False,$site_link = 'site')
                {
                        return 
$this->formated_list($format,$type,$selected,$public,$site_link);
                }
!               function formated_list($format,$type='',$selected = '',$public 
= False,$site_link = 'site')
                {
                        if(is_array($format))

Index: class.nextmatchs.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.nextmatchs.inc.php,v
retrieving revision 1.43.2.3
retrieving revision 1.43.2.4
diff -C2 -r1.43.2.3 -r1.43.2.4
*** class.nextmatchs.inc.php    5 Apr 2002 14:07:23 -0000       1.43.2.3
--- class.nextmatchs.inc.php    27 Apr 2002 22:14:23 -0000      1.43.2.4
***************
*** 36,54 ****
                var $extra_filters = array();
  
!               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']) 
&&
--- 36,57 ----
                var $extra_filters = array();
  
!               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']) 
&&