[Phpgroupware-cvs] phpgwapi/inc class.shm.inc.php class.sql_builde...

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/09/19 16:04:51

Modified files:
        inc            : class.shm.inc.php class.sql_builder.inc.php 

Log message:
        notices

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.shm.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.sql_builder.inc.php?cvsroot=phpgwapi&r1=1.6&r2=1.7

Patches:
Index: class.shm.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.shm.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- class.shm.inc.php   3 Sep 2006 11:14:42 -0000       1.7
+++ class.shm.inc.php   19 Sep 2006 16:04:51 -0000      1.8
@@ -63,7 +63,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package phpgwapi
        * @subpackage application
-       * @version $Id: class.shm.inc.php,v 1.7 2006/09/03 11:14:42 skwashd Exp 
$
+       * @version $Id: class.shm.inc.php,v 1.8 2006/09/19 16:04:51 skwashd Exp 
$
        */
 
        class shm
@@ -299,7 +299,7 @@
                */
                function &hash($hash_string)
                {
-                       $hash =& fmod(hexdec(md5($hash_string)), 
PHPGW_SHM_HASH_PRIME);
+                       $hash = fmod(hexdec(md5($hash_string)), 
PHPGW_SHM_HASH_PRIME);
                        //$this->log_this("Hashing " . $hash_string . " to " . 
$hash . "\n"); 
                        return $hash;
                }

Index: class.sql_builder.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.sql_builder.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- class.sql_builder.inc.php   3 Sep 2006 06:15:27 -0000       1.6
+++ class.sql_builder.inc.php   19 Sep 2006 16:04:51 -0000      1.7
@@ -8,7 +8,7 @@
        * @license http://www.fsf.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage database
-       * @version $Id: class.sql_builder.inc.php,v 1.6 2006/09/03 06:15:27 
skwashd Exp $
+       * @version $Id: class.sql_builder.inc.php,v 1.7 2006/09/19 16:04:51 
skwashd Exp $
        * @internal Development of this application was funded by 
http://www.sogrp.com
        * @link http://www.sogrp.com/
        */
@@ -664,14 +664,14 @@
                */
                function ent_name($field)
                {
-                       $this->ldebug('ent_name', array("Map[$field]" => 
$this->map[$field]),
-                                         'dump');
                        if(isset($this->map[$field]))
                        {
+                               $this->ldebug('ent_name', array("Map[$field]" 
=> $this->map[$field]), 'dump');
                                return 
$this->map[$field][PHPGW_SQL_ENTITY_NAME];
                        }
                        else
                        {
+                               $this->ldebug('ent_name', array("Map[$field]" 
=> '__UNDEFINED__'), 'dump');
                                $this->raise_error();
                                $this->ldebug('ent_name', array('Class Map' => 
$this->map),
                                                  'dump', 'error');
@@ -1115,7 +1115,8 @@
                        $ent = $this->get_entity($data);
                        $this->ldebug('_request', array('Data' => $data,
                                                           'Entity name' => 
$ent));
-                       if(is_object($this->entities[$ent]))
+                       if ( isset($this->entities[$ent])
+                               && is_object($this->entities[$ent]) )
                        {
                                $this->entities[$ent]->add_select($data);
                        }