[Phpgroupware-cvs] sitemgr/inc/class.Pages_BO.inc.php, 1.10

[nomail]

Update of /sitemgr/inc
Modified Files:
        Branch: 
          class.Pages_BO.inc.php

date: 2004/07/20 23:22:53;  author: skwashd;  state: Exp;  lines: +5 -5

Log Message:
merge from 16
=====================================================================
Index: sitemgr/inc/class.Pages_BO.inc.php
diff -u sitemgr/inc/class.Pages_BO.inc.php:1.9 
sitemgr/inc/class.Pages_BO.inc.php:1.10
--- sitemgr/inc/class.Pages_BO.inc.php:1.9      Sat May 31 04:29:22 2003
+++ sitemgr/inc/class.Pages_BO.inc.php  Tue Jul 20 23:22:53 2004
@@ -112,14 +112,13 @@
                {
                        $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))
-                       )
+                       
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 = strtr($page_Info->name, 
'address@hidden&*()=+     /?><,.\\\'":;|`~{}[]','                               
');
                        $fixed_name = str_replace(' ', '', $fixed_name);
                        if ($fixed_name != $page_Info->name)
                        {
@@ -128,6 +127,7 @@
                                $this->so->savePageLang($page_Info,$lang);
                                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';