[Phpgroupware-cvs] CVS: sitemgr/inc class.Pages_BO.inc.php, 1.5.2.1, 1.5.2.2 class.Pages_SO.inc.php, 1.12.2.1, 1.12.2.2

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.Pages_BO.inc.php class.Pages_SO.inc.php 
Log Message:
some bug fixes/enhancements

Index: class.Pages_BO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Pages_BO.inc.php,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -r1.5.2.1 -r1.5.2.2
*** class.Pages_BO.inc.php      23 Jun 2003 20:31:21 -0000      1.5.2.1
--- class.Pages_BO.inc.php      24 Aug 2003 07:02:27 -0000      1.5.2.2
***************
*** 111,124 ****
                function savePageInfo($page_Info,$lang)
                {
                        $oldpage = $this->getpage($page_Info->id);
  
!                       if(
!                               
!($GLOBALS['Common_BO']->acl->can_write_category($page_Info->cat_id) && 
!                               
$GLOBALS['Common_BO']->acl->can_write_category($oldpage->cat_id))
!                       )
                        {
                                return lang("You don't have permission to write 
to that category.");
                        }
!                       $fixed_name = strtr($page_Info->name, 
'address@hidden&*()-_=+   /?><,.\\\'":;|`~{}[]','                               
');
                        $fixed_name = str_replace(' ', '', $fixed_name);
                        if ($fixed_name != $page_Info->name)
--- 111,134 ----
                function savePageInfo($page_Info,$lang)
                {
+                       $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'];
+                               }
+                       }
+ 
                        $oldpage = $this->getpage($page_Info->id);
  
!                       
if(!($GLOBALS['Common_BO']->acl->can_write_category($page_Info->cat_id) && 
!                               
$GLOBALS['Common_BO']->acl->can_write_category($oldpage->cat_id)))
                        {
                                return lang("You don't have permission to write 
to that category.");
                        }
! 
!                       $fixed_name = strtr($page_Info->name, 
'address@hidden&*()=+     /?><,.\\\'":;|`~{}[]','                               
');
                        $fixed_name = str_replace(' ', '', $fixed_name);
                        if ($fixed_name != $page_Info->name)
***************
*** 129,133 ****
                                return lang('The Name field cannot contain 
punctuation or spaces (field modified).');
                        }
!                       if 
($this->so->pageExists($page_Info->name,$page_Info->id))
                        {
                                $page_Info->name .= '--FIX-DUPLICATE-NAME';
--- 139,144 ----
                                return lang('The Name field cannot contain 
punctuation or spaces (field modified).');
                        }
! 
!                       if 
($this->so->pageExists($page_Info->name,$page_Info->id, $site_cats))
                        {
                                $page_Info->name .= '--FIX-DUPLICATE-NAME';

Index: class.Pages_SO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Pages_SO.inc.php,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -C2 -r1.12.2.1 -r1.12.2.2
*** class.Pages_SO.inc.php      23 Jun 2003 20:31:21 -0000      1.12.2.1
--- class.Pages_SO.inc.php      24 Aug 2003 07:02:27 -0000      1.12.2.2
***************
*** 57,67 ****
                }
  
!               function pageExists($page_name,$exclude_page_id)
                {
!                       $sql = 'SELECT page_id FROM phpgw_sitemgr_pages WHERE 
name=\'' . $page_name . '\'';
                        if ($exclude_page_id)
                        {
!                               $sql .= ' and page_id!=\''. $exclude_page_id . 
'\'';
                        }
                        $this->db->query($sql,__LINE__,__FILE__);
                        if ($this->db->next_record())
--- 57,73 ----
                }
  
!               function pageExists($page_name, $exclude_page_id='', 
$site_cats=0)
                {
!                       $sql  = 'SELECT page_id FROM phpgw_sitemgr_pages ';
!                       $sql .= "WHERE name='" . 
$this->db->db_addslashes($page_name) . "' ";
                        if ($exclude_page_id)
                        {
!                               $sql .= "AND page_id!='". 
$this->db->db_addslashes($exclude_page_id) . "' ";
                        }
+                       if($site_cats)
+                       {
+                               $sql .=  'AND cat_id IN(' . implode(',', 
$site_cats) . ') ';
+                       }
+ 
                        $this->db->query($sql,__LINE__,__FILE__);
                        if ($this->db->next_record())