[Phpgroupware-cvs] CVS: sitemgr/inc class.Pages_SO.inc.php, 1.12.2.4, 1.12.2.5

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.Pages_SO.inc.php 
Log Message:
more bugfixes - all my fault

Index: class.Pages_SO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Pages_SO.inc.php,v
retrieving revision 1.12.2.4
retrieving revision 1.12.2.5
diff -C2 -r1.12.2.4 -r1.12.2.5
*** class.Pages_SO.inc.php      26 Aug 2003 05:17:15 -0000      1.12.2.4
--- class.Pages_SO.inc.php      26 Aug 2003 06:10:45 -0000      1.12.2.5
***************
*** 95,99 ****
                function PagetoID($page_name)
                {
!                       $sql = 'SELECT page_id FROM phpgw_sitemgr_pages WHERE 
name=\'' . $page_name . '\'';
                        $this->db->query($sql,__LINE__,__FILE__);
                        if ($this->db->next_record())
--- 95,111 ----
                function PagetoID($page_name)
                {
! 
!                       $cats = CreateObject('phpgwapi.categories');
!                       $cat_list = $cats->return_sorted_array(0, False, '', 
'', '', False, CURRENT_SITE_ID, -1, 'id');
!                       if($cat_list)
!                       {
!                               foreach($cat_list as $null => $val)
!                               {
!                                       $site_cats[] = $val['id'];
!                               }
!                       }
!                       $sql  = 'SELECT page_id FROM phpgw_sitemgr_pages ';
!                       $sql .= "WHERE name='" . $page_name . " '";
!                       $sql .= 'AND cat_id IN('. implode(',' $site_cats) .')';
                        $this->db->query($sql,__LINE__,__FILE__);
                        if ($this->db->next_record())