[Phpgroupware-cvs] phpgwapi/inc class.contacts_sql.inc.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/08/29 16:03:05

Modified files:
        inc            : class.contacts_sql.inc.php 

Log message:
        lots of fixes for E_ALL, some code cleanup, and move more to CSS, still 
a WIP, might fix things on php5 (but untested)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.contacts_sql.inc.php?cvsroot=phpgwapi&r1=1.29&r2=1.30

Patches:
Index: class.contacts_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.contacts_sql.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- class.contacts_sql.inc.php  28 Aug 2006 07:00:48 -0000      1.29
+++ class.contacts_sql.inc.php  29 Aug 2006 16:03:05 -0000      1.30
@@ -6,7 +6,7 @@
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage contacts
-       * @version $Id: class.contacts_sql.inc.php,v 1.29 2006/08/28 07:00:48 
skwashd Exp $
+       * @version $Id: class.contacts_sql.inc.php,v 1.30 2006/08/29 16:03:05 
skwashd Exp $
        * @internal Development of this application was funded by 
http://www.sogrp.com
        */
 
@@ -1213,6 +1213,7 @@
                */
                function get_orgs($fields, $limit='', $ofset='', $orderby='', 
$sort='', $criteria='', $criteria_token='')
                {
+                       $orgs = array();
                        $this->request($fields);
                        $person_fields = array('per_full_name', 
'per_first_name', 'per_last_name');
                        if(count(array_intersect($person_fields, $fields)) > 0)
@@ -3527,7 +3528,9 @@
                                $criteria = sql_criteria::token_and($criteria, 
$addr_preferred_criteria);
                        }
 
-                       if(count($search_fields['comm_media']) > 0)
+                       if( isset($search_fields['comm_media'])
+                               && is_array($search_fielss['comm_media'])
+                               && count($search_fields['comm_media']) > 0)
                        {
                                $search_fields_comms = 
$search_fields['comm_media'];
                        }
@@ -3552,7 +3555,10 @@
                                $criteria = sql_criteria::token_and($criteria, 
sql_criteria::_append_or($search_array));
                        }
 
-                       if(count($search_fields_comms) > 0 && $pattern)
+                       if( $pattern
+                               && isset($search_fields_comms)
+                               && is_array($search_fields_comms)
+                               && count($search_fields_comms) > 0 )
                        {
                                foreach($search_fields_comms as $field)
                                {
@@ -3601,7 +3607,7 @@
                {
                        $required_grants = array();
                        $this->grants = 
$GLOBALS['phpgw']->acl->get_grants('addressbook');
-                       if ( $GLOBALS['phpgw_info']['server']['addressmaster'] 
&& $GLOBALS['phpgw']->acl->check('addressmaster', 7, 'addressbook'))
+                       if ( 
isset($GLOBALS['phpgw_info']['server']['addressmaster']) && 
$GLOBALS['phpgw']->acl->check('addressmaster', 7, 'addressbook'))
                        {
                                $required_grants[] = 
$GLOBALS['phpgw_info']['server']['addressmaster'];
                        }