[Phpgroupware-cvs] phpgwapi/inc class.acl.inc.php class.categories...

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/09/09 11:41:04

Modified files:
        inc            : class.acl.inc.php class.categories.inc.php 
                         class.nextmatchs.inc.php 
                         class.nextmatchs_xslt.inc.php 

Log message:
        notices

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.acl.inc.php?cvsroot=phpgwapi&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.categories.inc.php?cvsroot=phpgwapi&r1=1.132&r2=1.133
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.nextmatchs.inc.php?cvsroot=phpgwapi&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.nextmatchs_xslt.inc.php?cvsroot=phpgwapi&r1=1.3&r2=1.4

Patches:
Index: class.acl.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.acl.inc.php,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- class.acl.inc.php   3 Sep 2006 06:15:26 -0000       1.85
+++ class.acl.inc.php   9 Sep 2006 11:41:03 -0000       1.86
@@ -6,7 +6,7 @@
        * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage accounts
-       * @version $Id: class.acl.inc.php,v 1.85 2006/09/03 06:15:26 skwashd 
Exp $
+       * @version $Id: class.acl.inc.php,v 1.86 2006/09/09 11:41:03 skwashd 
Exp $
        */
 
        /**
@@ -707,7 +707,7 @@
                {
                        static $cache_accountid;
 
-                       if($cache_accountid[$accountid])
+                       if ( isset($cache_accountid[$accountid]) && 
$cache_accountid[$accountid] )
                        {
                                $account_id = $cache_accountid[$accountid];
                        }

Index: class.categories.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.categories.inc.php,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- class.categories.inc.php    4 Sep 2006 13:07:00 -0000       1.132
+++ class.categories.inc.php    9 Sep 2006 11:41:03 -0000       1.133
@@ -7,7 +7,7 @@
        * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage utilities
-       * @version $Id: class.categories.inc.php,v 1.132 2006/09/04 13:07:00 
skwashd Exp $
+       * @version $Id: class.categories.inc.php,v 1.133 2006/09/09 11:41:03 
skwashd Exp $
        */
 
        /**
@@ -264,6 +264,7 @@
                        $order          = 
$order?$this->db->db_addslashes($order):'cat_name';
                        $parent_id      = intval($parent_id);
 
+                       $global_cats = '';
                        if ($globals)
                        {
                                $global_cats = " OR cat_appname='phpgw'";

Index: class.nextmatchs.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.nextmatchs.inc.php,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- class.nextmatchs.inc.php    5 Sep 2006 13:13:43 -0000       1.77
+++ class.nextmatchs.inc.php    9 Sep 2006 11:41:03 -0000       1.78
@@ -8,7 +8,7 @@
        * @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage gui
-       * @version $Id: class.nextmatchs.inc.php,v 1.77 2006/09/05 13:13:43 
sigurdne Exp $
+       * @version $Id: class.nextmatchs.inc.php,v 1.78 2006/09/09 11:41:03 
skwashd Exp $
        */
 
        /**
@@ -132,7 +132,7 @@
                 */
                function page($extravars = array())
                {
-                       if ( $extravars && is_string($extravars) )
+                       if ( is_string($extravars) )
                        {
                                $extras = explode('&', $extravars);
                                foreach ( $extras as $extra )
@@ -314,12 +314,14 @@
                {
                        list($filter,$qfield,,$order,$sort) = $this->get_var();
 
-                       $extravars = Array(
+                       $query = isset($_REQUEST['query']) ? 
urlencode(stripslashes($_REQUEST['query'])) : '';
+                       $extravars = array
+                       (
                                'order'   => $order,
                                'filter'  => $filter,
                                'q_field' => $qfield,
                                'sort'    => $sort,
-                               'query'   => 
urlencode(stripslashes($GLOBALS['query']))
+                               'query'   => $query
                        );
 
                        $extravars = $this->split_extras($extravars,$extradata);
@@ -368,12 +370,13 @@
                {
                        list($filter,$qfield,,$order,$sort) = $this->get_var();
 
+                       $query = isset($_REQUEST['query']) ? 
urlencode(stripslashes($_REQUEST['query'])) : '';
                        $extravars = Array(
                                'order'   => $order,
                                'filter'  => $filter,
                                'q_field' => $qfield,
                                'sort'    => $sort,
-                               'query'   => 
urlencode(stripslashes($GLOBALS['query']))
+                               'query'   => $query
                        );
 
                        $extravars = $this->split_extras($extravars,$extradata);

Index: class.nextmatchs_xslt.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.nextmatchs_xslt.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- class.nextmatchs_xslt.inc.php       22 Mar 2006 01:33:11 -0000      1.3
+++ class.nextmatchs_xslt.inc.php       9 Sep 2006 11:41:03 -0000       1.4
@@ -6,7 +6,7 @@
        * @license http://www.fsf.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage gui
-       * @version $Id: class.nextmatchs_xslt.inc.php,v 1.3 2006/03/22 01:33:11 
skwashd Exp $
+       * @version $Id: class.nextmatchs_xslt.inc.php,v 1.4 2006/09/09 11:41:03 
skwashd Exp $
        */
 
        /**
@@ -106,15 +106,16 @@
                {
                        $GLOBALS['phpgw']->xslttpl->add_file('nextmatchs', 
PHPGW_TEMPLATE_DIR);
 
+                       $start = isset($values['start']) ? (int) 
$values['start'] : 0;
                        $nm_data = array
                        (
-                               'img_width'                     => 
($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set']=='funkwerk'?'':'12'),
-                               'img_height'            => 
($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set']=='funkwerk'?'':'12'),
-                               'allow_all_rows'        => 
(isset($values['allow_all_rows'])?False:'yes'),
-                               'start_record'          => 
intval($values['start']),
+                               'img_width'                     => 
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] == 
'funkwerk' ? '' : '12',
+                               'img_height'            => 
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] == 
'funkwerk' ? '' : '12',
+                               'allow_all_rows'        => 
isset($values['allow_all_rows']) ? false : 'yes',
+                               'start_record'          => $start,
                                'record_limit'          => $this->maxmatches,
-                               'num_records'           => 
intval($values['num_records']),
-                               'all_records'           => 
intval($values['all_records']),
+                               'num_records'           => (int) 
$values['num_records'],
+                               'all_records'           => (int) 
$values['all_records'],
                                'nextmatchs_url'        => 
$GLOBALS['phpgw']->link('/index.php',$values['link_data']),
                                'first_img'                     => 
$GLOBALS['phpgw']->common->image('phpgwapi','first'),
                                'first_grey_img'        => 
$GLOBALS['phpgw']->common->image('phpgwapi','first-grey'),
@@ -130,7 +131,7 @@
                                'title_next'            => lang('next page'),
                                'title_last'            => lang('last page'),
                                'title_all'                     => lang('show 
all'),
-                               'lang_showing'          => 
$this->show_hits(intval($values['all_records']),intval($values['start']))
+                               'lang_showing'          => 
$this->show_hits((int) $values['all_records'], $start)
                        );
                        return $nm_data;
                }