[Phpgroupware-cvs] phpgwapi/inc class.categories.inc.php, 1.117, 1.118 class.db_mysql.inc.php, 1.39, 1.40 class.db_pgsql.inc.php, 1.36, 1.37

[Bettina Gille <address@hidden>]

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

Modified Files:
        class.categories.inc.php class.db_mysql.inc.php 
        class.db_pgsql.inc.php 
Log Message:
bug #5923

Index: class.db_pgsql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.db_pgsql.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** class.db_pgsql.inc.php      10 Oct 2003 08:51:42 -0000      1.36
--- class.db_pgsql.inc.php      13 Nov 2003 17:08:36 -0000      1.37
***************
*** 1,19 ****
  <?php
!  /**********************************************************************\
!  * phpGroupWare - API - Database Abstraction                          *
!  * http://www.phpgroupware.org                                                
*
!  * This program is part of the GNU project, see http://www.gnu.org/   *
!  *                                                                    *
!  * Portions Copyright 2001, 2002, 2003 Free Software Foundation, Inc. *
!  * Based on phplib - Copyright 1998-2000 SH Online Dienst GmbH                
*
!  *                    Boris Erdmann, Kristian Koehntopp               *
!  * Contributions from Dan Kuykendall, Michael Dean, Dave Hall and others*
!  * --------------------------------------------                               
*
!  *  This program is Free Software; you can redistribute it and/or     *
!  *  modify it under the terms of the GNU Lesser General Public License        
*
!  *  as published by the Free Software Foundation; either version 2.1 of *
!  *  the License, or (at your option) any later version.                       
*
!  \**********************************************************************/
!  /* $Id$ */
  
        class db extends db_
--- 1,20 ----
  <?php
!       /* do not put tabs inside the header info!!! */
!       
/***********************************************************************\
!       * phpGroupWare - API - Database Abstraction                             
*
!       * http://www.phpgroupware.org                                           
*
!       * This program is part of the GNU project, see http://www.gnu.org/      
*
!       *                                                                       
*
!       * Portions Copyright 2001, 2002, 2003 Free Software Foundation, Inc.    
*
!       * Based on phplib - Copyright 1998-2000 NetUSE AG,                      
* 
!       *                       Boris Erdmann, Kristian Koehntopp               
            *
!       * Contributions from Dan Kuykendall, Michael Dean, Dave Hall and others 
*
!       * --------------------------------------------------------------------- 
*
!       *  This program is Free Software; you can redistribute it and/or        
*
!       *  modify it under the terms of the GNU Lesser General Public License   
*
!       *  as published by the Free Software Foundation; either version 2.1 of  
*
!       *  the License, or (at your option) any later version.                  
*
!       
\***********************************************************************/
!       /* $Id$ */
  
        class db extends db_
***************
*** 185,193 ****
                }
  
!               function limit_query($Query_String, $offset, $line = '', $file 
= '', $num_rows = '')
                {
!                       if (! $num_rows)
                        {
!                               $num_rows = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
                        }
  
--- 186,198 ----
                }
  
!               function limit_query($Query_String, $offset, $line = '', $file 
= '', $num_rows = 0)
                {
!                       $offset         = intval($offset);
!                       $num_rows       = intval($num_rows);
! 
!                       if ($num_rows == 0)
                        {
!                               $maxmatches = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
!                               $num_rows = 
(isset($maxmatches)?intval($maxmatches):15);
                        }
  

Index: class.categories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.categories.inc.php,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** class.categories.inc.php    13 Nov 2003 13:51:35 -0000      1.117
--- class.categories.inc.php    13 Nov 2003 17:08:36 -0000      1.118
***************
*** 585,589 ****
                                'cat_list'                              => 
$cat_list,
                                'lang_no_cat'                   => lang('no 
category'),
!                               'lang_cat_statustext'   => lang('Select the 
category the entry belongs to. To do not use a category select NO CATEGORY'),
                                'select_url'                    => 
$GLOBALS['phpgw']->link('/index.php',$link_data),
                                'select_name'                   => $select_name,
--- 585,589 ----
                                'cat_list'                              => 
$cat_list,
                                'lang_no_cat'                   => lang('no 
category'),
!                               'lang_cat_statustext'   => lang('Select the 
category the data belong to. To do not use a category select NO CATEGORY'),
                                'select_url'                    => 
$GLOBALS['phpgw']->link('/index.php',$link_data),
                                'select_name'                   => $select_name,

Index: class.db_mysql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.db_mysql.inc.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** class.db_mysql.inc.php      9 Oct 2003 03:31:32 -0000       1.39
--- class.db_mysql.inc.php      13 Nov 2003 17:08:36 -0000      1.40
***************
*** 1,19 ****
  <?php
!  /**********************************************************************\
!  * phpGroupWare - API - Database Abstraction                          *
!  * http://www.phpgroupware.org                                                
*
!  * This program is part of the GNU project, see http://www.gnu.org/   *
!  *                                                                    *
!  * Portions Copyright 2001, 2002, 2003 Free Software Foundation, Inc. *
!  * Based on phplib - Copyright 1998-2000 NetUSE AG,                   * 
!  *                    Boris Erdmann, Kristian Koehntopp               *
!  * Contributions from Dan Kuykendall, Dave Hall and others            *
!  * --------------------------------------------                               
*
!  *  This program is Free Software; you can redistribute it and/or     *
!  *  modify it under the terms of the GNU Lesser General Public License        
*
!  *  as published by the Free Software Foundation; either version 2.1 of *
!  *  the License, or (at your option) any later version.                       
*
!  \**********************************************************************/
!  /* $Id$ */
  
        class db extends db_
--- 1,20 ----
  <?php
!       /* do not put tabs inside the header info!!! */
!       
/***********************************************************************\
!       * phpGroupWare - API - Database Abstraction                             
*
!       * http://www.phpgroupware.org                                           
*
!       * This program is part of the GNU project, see http://www.gnu.org/      
*
!       *                                                                       
*
!       * Portions Copyright 2001, 2002, 2003 Free Software Foundation, Inc.    
*
!       * Based on phplib - Copyright 1998-2000 NetUSE AG,                      
* 
!       *                       Boris Erdmann, Kristian Koehntopp               
            *
!       * Contributions from Dan Kuykendall, Michael Dean, Dave Hall and others 
*
!       * --------------------------------------------------------------------- 
*
!       *  This program is Free Software; you can redistribute it and/or        
*
!       *  modify it under the terms of the GNU Lesser General Public License   
*
!       *  as published by the Free Software Foundation; either version 2.1 of  
*
!       *  the License, or (at your option) any later version.                  
*
!       
\***********************************************************************/
!       /* $Id$ */
  
        class db extends db_
***************
*** 152,160 ****
  
                // public: perform a query with limited result set
!               function limit_query($Query_String, $offset, $line = '', $file 
= '', $num_rows = '')
                {
!                       if (! $num_rows)
                        {
!                               $num_rows = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
                        }
  
--- 153,165 ----
  
                // public: perform a query with limited result set
!               function limit_query($Query_String, $offset, $line = '', $file 
= '', $num_rows = 0)
                {
!                       $offset         = intval($offset);
!                       $num_rows       = intval($num_rows);
! 
!                       if ($num_rows == 0)
                        {
!                               $maxmatches = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
!                               $num_rows = 
(isset($maxmatches)?intval($maxmatches):15);
                        }