[Phpgroupware-cvs] CVS: sitemgr/inc class.Pages_SO.inc.php, 1.12.2.2, 1.12.2.3 class.Sites_SO.inc.php, 1.2.2.1, 1.2.2.2

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/sitemgr/inc
In directory subversions:/tmp/cvs-serv4841/inc

Modified Files:
      Tag: Version-0_9_16-branch
        class.Pages_SO.inc.php class.Sites_SO.inc.php 
Log Message:
couple of fixes for pgsql

Index: class.Pages_SO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Pages_SO.inc.php,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -C2 -r1.12.2.2 -r1.12.2.3
*** class.Pages_SO.inc.php      24 Aug 2003 07:02:27 -0000      1.12.2.2
--- class.Pages_SO.inc.php      24 Aug 2003 07:52:28 -0000      1.12.2.3
***************
*** 109,113 ****
                function getcatidforpage($page_id)
                {
!                       $sql = "SELECT cat_id FROM phpgw_sitemgr_pages WHERE 
page_id = $page_id";
                        $this->db->query($sql,__LINE__,__FILE__);
                        if ($this->db->next_record())
--- 109,114 ----
                function getcatidforpage($page_id)
                {
!                       $sql  = 'SELECT cat_id FROM phpgw_sitemgr_pages ';
!                       $sql .= 'WHERE page_id = ' . intval($page_id);
                        $this->db->query($sql,__LINE__,__FILE__);
                        if ($this->db->next_record())

Index: class.Sites_SO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Sites_SO.inc.php,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** class.Sites_SO.inc.php      23 Jun 2003 20:31:21 -0000      1.2.2.1
--- class.Sites_SO.inc.php      24 Aug 2003 07:52:28 -0000      1.2.2.2
***************
*** 31,34 ****
--- 31,35 ----
                                if ($query)
                                {
+                                       $query = 
$this->db->db_addslashes($query);
                                        $whereclause = "WHERE site_name LIKE 
'%$query%'"
                                                . "OR site_url LIKE '%$query%'"
***************
*** 74,78 ****
                function urltoid($url)
                {
!                       $sql = "SELECT site_id FROM phpgw_sitemgr_sites WHERE 
site_url = '$url'";
                        $this->db->query($sql,__LINE__,__FILE__);
                        $this->db->next_record();
--- 75,80 ----
                function urltoid($url)
                {
!                       $sql  = 'SELECT site_id FROM phpgw_sitemgr_sites ';
!                       $sql .= "WHERE site_url ='" . 
$this->db->db_addslashes($url) . "'";
                        $this->db->query($sql,__LINE__,__FILE__);
                        $this->db->next_record();
***************
*** 82,86 ****
                function read($id)
                {
!                       $sql = "SELECT * from phpgw_sitemgr_sites WHERE site_id 
= $id";
                        $this->db->query($sql,__LINE__,__FILE__);
                        if ($this->db->next_record())
--- 84,89 ----
                function read($id)
                {
!                       $sql =  'SELECT * FROM phpgw_sitemgr_sites ';
!                       $sql .= 'WHERE site_id = ' . intval($id);
                        $this->db->query($sql,__LINE__,__FILE__);
                        if ($this->db->next_record())
***************
*** 105,109 ****
                function read2($id)
                {
!                       $sql = "SELECT site_url,site_dir from 
phpgw_sitemgr_sites WHERE site_id = $id";
                        $this->db->query($sql,__LINE__,__FILE__);
                        if ($this->db->next_record())
--- 108,113 ----
                function read2($id)
                {
!                       $sql  = 'SELECT site_url,site_dir FROM 
phpgw_sitemgr_sites ';
!                       $sql .= 'WHERE site_id = ' . intval($id);
                        $this->db->query($sql,__LINE__,__FILE__);
                        if ($this->db->next_record())
***************
*** 164,166 ****
                        $this->db->query($sql,__LINE__,__FILE__);
                }
!       }
\ No newline at end of file
--- 168,170 ----
                        $this->db->query($sql,__LINE__,__FILE__);
                }
!       }