[Phpgroupware-cvs] CVS: sitemgr/inc class.Categories_BO.inc.php,1.8,1.9 class.Categories_UI.inc.php,1.4,1.5 class.Sites_UI.inc.php,1.3,1.4

[Michael Totschnig <address@hidden>]

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

Modified Files:
        class.Categories_BO.inc.php class.Categories_UI.inc.php 
        class.Sites_UI.inc.php 
Log Message:
changes to ACL, write acess to a category now implies read access


Index: class.Categories_BO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Categories_BO.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.Categories_BO.inc.php 23 May 2003 03:37:25 -0000      1.8
--- class.Categories_BO.inc.php 23 May 2003 06:56:39 -0000      1.9
***************
*** 91,95 ****
                                }
                        }
- //print_r($permitted_list);
                        return $permitted_list;
                }
--- 91,94 ----
***************
*** 320,323 ****
--- 319,324 ----
                                                                        break;
                                                                case 'write':
+                                                                       //write 
access implies read access, otherwise editing blocks would not work
+                                                                       
$can_read = true;
                                                                        
$can_write = true;
                                                                        break;

Index: class.Categories_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Categories_UI.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.Categories_UI.inc.php 23 May 2003 03:37:25 -0000      1.4
--- class.Categories_UI.inc.php 23 May 2003 06:56:39 -0000      1.5
***************
*** 55,59 ****
                                {
                                        $this->cat = 
$this->cat_bo->getCategory($this->cat_list[$i],$this->sitelanguages[0]);
!                                       if ($this->cat->depth)
                                        {
                                                $buffer = '-';
--- 55,60 ----
                                {
                                        $this->cat = 
$this->cat_bo->getCategory($this->cat_list[$i],$this->sitelanguages[0]);
! 
!                                       if ($this->cat->depth>1)
                                        {
                                                $buffer = '-';
***************
*** 113,124 ****
                        }
  
!                       $this->t->set_var('add', 
!                               '<form action="'.
!                               $GLOBALS['phpgw']->link('/index.php',
!                               
'menuaction=sitemgr.Categories_UI._editCategory').
!                               '" method="POST">
!                               <input type=submit value = "' . lang('Add a 
category') .'">
!                               </form>'
!                       );
                        
$this->t->set_var('managepageslink',$GLOBALS['phpgw']->link(
                                '/index.php',
--- 114,129 ----
                        }
  
!                       if ($this->isadmin)
!                       {
!                               $this->t->set_var('add', 
!                                       '<form action="'.
!                                       $GLOBALS['phpgw']->link('/index.php',
!                                       
'menuaction=sitemgr.Categories_UI._editCategory').
!                                       '" method="POST">
!                                       <input type=submit value = "' . 
lang('Add a category') .'">
!                                       </form>'
!                               );
!                       }
! 
                        
$this->t->set_var('managepageslink',$GLOBALS['phpgw']->link(
                                '/index.php',
***************
*** 216,219 ****
--- 221,225 ----
                                'lang_readperm' => lang('Read Permission'),
                                'lang_writeperm' => lang('Write Permission'),
+                               'lang_implies' => lang('implies read 
permission'),
                                'lang_useraccess' => lang('Individual Access 
Permission'),
                                'lang_username' => lang('User Name'),

Index: class.Sites_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Sites_UI.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.Sites_UI.inc.php      23 May 2003 03:37:25 -0000      1.3
--- class.Sites_UI.inc.php      23 May 2003 06:56:39 -0000      1.4
***************
*** 245,249 ****
                        $accounts = $GLOBALS['phpgw']->accounts->get_list();
                        $admin_list = $this->bo->get_adminlist($site_id);
! print_r($admin_list);
                        while (list($null,$account) = each($accounts))
                        {
--- 245,249 ----
                        $accounts = $GLOBALS['phpgw']->accounts->get_list();
                        $admin_list = $this->bo->get_adminlist($site_id);
! 
                        while (list($null,$account) = each($accounts))
                        {
***************
*** 282,285 ****
--- 282,287 ----
                                echo parse_navbar();
  
+                               $site = $this->bo->read($site_id);
+ 
                                
$GLOBALS['phpgw']->template->set_file(array('site_delete' => 
'delete_common.tpl'));
  
***************
*** 287,291 ****
                                        'form_action' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=sitemgr.Sites_UI.delete'),
                                        'hidden_vars' => '<input type="hidden" 
name="site_id" value="' . $site_id . 
'"><script>document.yesbutton.yesbutton.focus()</script>',
!                                       'messages' => lang('Are you sure you 
want to delete this site and all its content?'),
                                        'no' => lang('No'),
                                        'yes' => lang('Yes'),
--- 289,293 ----
                                        'form_action' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=sitemgr.Sites_UI.delete'),
                                        'hidden_vars' => '<input type="hidden" 
name="site_id" value="' . $site_id . 
'"><script>document.yesbutton.yesbutton.focus()</script>',
!                                       'messages' => lang('Are you sure you 
want to delete site %1 and all its content? You cannot retrieve it if you 
continue.',$site['site_name']),
                                        'no' => lang('No'),
                                        'yes' => lang('Yes'),