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

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/09/01 14:44:58

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

Log message:
        major code clean up, should now run with E_ALL (orgs still needs some 
work done) and works with CSS, only tested with idots, might looks a little 
dodgy on other template sets

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

Patches:
Index: class.contacts_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.contacts_sql.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- class.contacts_sql.inc.php  29 Aug 2006 16:03:05 -0000      1.30
+++ class.contacts_sql.inc.php  1 Sep 2006 14:44:58 -0000       1.31
@@ -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.30 2006/08/29 16:03:05 
skwashd Exp $
+       * @version $Id: class.contacts_sql.inc.php,v 1.31 2006/09/01 14:44:58 
skwashd Exp $
        * @internal Development of this application was funded by 
http://www.sogrp.com
        */
 
@@ -1354,7 +1354,9 @@
                */
                function get_addr_contact_data($contact_id, $criteria='')
                {
-                       $data = array('addr_contact_id',
+                       $data = array
+                       (
+                               'addr_contact_id',
                                      'key_addr_id',
                                      'addr_type',
                                      'addr_add1',
@@ -1364,19 +1366,23 @@
                                      'addr_postal_code',
                                      'addr_country',
                                      'addr_preferred',
-                                     'addr_description');
+                               'addr_description'
+                       );
                        $this->request($data);
                        $this->criteria(array('addr_contact_id' => 
$contact_id));
                        if($criteria!='')
                        {
                                $this->criteria($criteria);
                        }
-                       $entry =  $this->get_records(__LINE__, __FILE__);
-                       if($entry)
+                       
+                       $locations = array();
+                       
+                       $entries =  $this->get_records(__LINE__, __FILE__);
+                       if ( is_array($entries) && count($entries) )
                        {
-                               foreach($entry as $k => $v)
+                               foreach($entries as $entry)
                                {
-                                       $locations[] = $entry[$k];
+                                       $locations[] = $entry;
                                }
                        }
                        return $locations;