[Phpgroupware-cvs] eldaptir/inc class.ldap_iplanet.inc.php, 1.2, 1.2.4.1 class.ldap_openldap2.inc.php, 1.2, 1.2.4.1 functions.inc.php, 1.24, 1.24.4.1

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/eldaptir/inc
In directory subversions:/tmp/cvs-serv8936/inc

Modified Files:
      Tag: Version-0_9_16-branch
        class.ldap_iplanet.inc.php class.ldap_openldap2.inc.php 
        functions.inc.php 
Log Message:
globals and sql

Index: class.ldap_openldap2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/eldaptir/inc/class.ldap_openldap2.inc.php,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** class.ldap_openldap2.inc.php        19 Nov 2001 15:50:05 -0000      1.2
--- class.ldap_openldap2.inc.php        9 Oct 2003 23:28:08 -0000       1.2.4.1
***************
*** 392,396 ****
                function read($server_id,$data='')
                {
!                       $this->db->query('SELECT * FROM ' . $this->table . ' 
WHERE id=' . $server_id);
                        while ($this->db->next_record())
                        {
--- 392,397 ----
                function read($server_id,$data='')
                {
!                       $this->db->query('SELECT * FROM ' . $this->table 
!                                       . ' WHERE id=' . intval($server_id), 
__LINE__, __FILE__);
                        while ($this->db->next_record())
                        {
***************
*** 420,427 ****
                                        $may  = implode(',',$val['may']);
  
!                                       $this->db->query('INSERT INTO ' . 
$this->table . ' (id,_oid,name,extra,descr,must,may) VALUES ('
!                                               . $server_id . ",'" 
.$val['oid'] . "','" . addslashes($val['name']) ."',"
!                                               . "'" . 
addslashes($val['extra']) . "','" . addslashes($val['descr']) ."',"
!                                               . "'" . addslashes($must)  . 
"','" . addslashes($may) . "')"
                                        );
                                }
--- 421,433 ----
                                        $may  = implode(',',$val['may']);
  
!                                       $this->db->query('INSERT INTO ' . 
$this->table . ' (id,_oid,name,extra,descr,must,may)'
!                                               . 'VALUES ('
!                                               . intval($server_id) . ","
!                                               . "'" .$val['oid'] . "',"
!                                               . "'" . 
$this->db->db_addslashes($val['name']) ."',"
!                                               . "'" . 
$this->db->db_addslashes($val['extra']) . "',"
!                                               . "'" . 
$this->db->db_addslashes($val['descr']) ."',"
!                                               . "'" . 
$this->db->db_addslashes($must)  . "',"
!                                               . "'" . 
$this->db->db_addslashes($may) . "')", __LINE__, __FILE__
                                        );
                                }
***************
*** 433,437 ****
                function delete($server_id,$data='')
                {
!                       $ret = $this->db->query('DELETE FROM ' . $this->table . 
' WHERE id=' . $server_id);
                        return $ret;
                }       
--- 439,444 ----
                function delete($server_id,$data='')
                {
!                       $ret = $this->db->query('DELETE FROM ' . $this->table 
!                                               . ' WHERE id=' . 
intval($server_id), __LINE__, __FILE__);
                        return $ret;
                }       

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/eldaptir/inc/functions.inc.php,v
retrieving revision 1.24
retrieving revision 1.24.4.1
diff -C2 -d -r1.24 -r1.24.4.1
*** functions.inc.php   19 Nov 2001 15:50:05 -0000      1.24
--- functions.inc.php   9 Oct 2003 23:28:08 -0000       1.24.4.1
***************
*** 18,22 ****
                $servers = array();
  
!               $GLOBALS['phpgw']->db->query("SELECT * FROM 
phpgw_eldaptir_servers WHERE id>0");
                while ($GLOBALS['phpgw']->db->next_record())
                {
--- 18,22 ----
                $servers = array();
  
!               $GLOBALS['phpgw']->db->query('SELECT * FROM 
phpgw_eldaptir_servers WHERE id>0', __LINE__, __FILE__);
                while ($GLOBALS['phpgw']->db->next_record())
                {

Index: class.ldap_iplanet.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/eldaptir/inc/class.ldap_iplanet.inc.php,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** class.ldap_iplanet.inc.php  19 Nov 2001 15:50:05 -0000      1.2
--- class.ldap_iplanet.inc.php  9 Oct 2003 23:28:08 -0000       1.2.4.1
***************
*** 392,396 ****
                function read($server_id,$data='')
                {
!                       $this->db->query('SELECT * FROM ' . $this->table . ' 
WHERE id=' . $server_id);
                        while ($this->db->next_record())
                        {
--- 392,397 ----
                function read($server_id,$data='')
                {
!                       $this->db->query('SELECT * FROM ' . $this->table 
!                                       . ' WHERE id=' . intval($server_id), 
__LINE__, __FILE__);
                        while ($this->db->next_record())
                        {
***************
*** 420,427 ****
                                        $may  = implode(',',$val['may']);
  
!                                       $this->db->query('INSERT INTO ' . 
$this->table . ' (id,_oid,name,extra,descr,must,may) VALUES ('
!                                               . $server_id . ",'" 
.$val['oid'] . "','" . addslashes($val['name']) ."',"
!                                               . "'" . 
addslashes($val['extra']) . "','" . addslashes($val['descr']) ."',"
!                                               . "'" . addslashes($must)  . 
"','" . addslashes($may) . "')"
                                        );
                                }
--- 421,432 ----
                                        $may  = implode(',',$val['may']);
  
!                                       $this->db->query('INSERT INTO ' . 
$this->table . ' (id,_oid,name,extra,descr,must,may) '
!                                               . 'VALUES (' 
!                                               . intval($server_id) . ",'" 
.$val['oid'] . "',"
!                                               . "'" . 
$this->db->db_addslashes($val['name']) ."',"
!                                               . "'" . 
$this->db->db_addslashes($val['extra']) . "',"
!                                               . "'" . 
$this->db->db_addslashes($val['descr']) ."',"
!                                               . "'" . 
$this->db->db_addslashes($must)  . "',"
!                                               . "'" . 
$this->db->db_addslashes($may) . "')", __LINE__, __FILE__
                                        );
                                }
***************
*** 433,437 ****
                function delete($server_id,$data='')
                {
!                       $ret = $this->db->query('DELETE FROM ' . $this->table . 
' WHERE id=' . $server_id);
                        return $ret;
                }       
--- 438,443 ----
                function delete($server_id,$data='')
                {
!                       $ret = $this->db->query('DELETE FROM ' . $this->table 
!                                               . ' WHERE id=' . 
intval($server_id), __LINE__, __FILE__);
                        return $ret;
                }