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

[Michael Totschnig <address@hidden>]

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

Modified Files:
        class.Categories_BO.inc.php class.Categories_UI.inc.php 
        class.Content_BO.inc.php class.Sites_UI.inc.php 
Log Message:
attempt at modest optimization


Index: class.Categories_BO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Categories_BO.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.Categories_BO.inc.php 30 May 2003 18:49:13 -0000      1.11
--- class.Categories_BO.inc.php 30 May 2003 23:17:46 -0000      1.12
***************
*** 16,19 ****
--- 16,20 ----
                {
                        $this->currentcats = 
$this->getpermittedcats(CURRENT_SITE_ID,'active',True);
+                       $this->readablecats = $this->getpermittedcatsRead();
                }
  
***************
*** 210,214 ****
                function getCategory($cat_id,$lang=False,$force=False)
                {
!                       if ($force || ($this->check($cat_id) && 
$GLOBALS['Common_BO']->acl->can_read_category($cat_id)))
                        {
                                return $this->so->getCategory($cat_id,$lang);
--- 211,215 ----
                function getCategory($cat_id,$lang=False,$force=False)
                {
!                       if ($force || ($this->check($cat_id) && 
in_array($cat_id,$this->readablecats)))
                        {
                                return $this->so->getCategory($cat_id,$lang);
***************
*** 233,237 ****
                        while ($cat_id != CURRENT_SITE_ID)
                        {
!                               if (!$permittedonly || 
$GLOBALS['Common_BO']->acl->can_read_category($cat_id))
                                {
                                        $result[] = $cat_id;
--- 234,238 ----
                        while ($cat_id != CURRENT_SITE_ID)
                        {
!                               if (!$permittedonly || 
in_array($cat_id,$this->readablecats))
                                {
                                        $result[] = $cat_id;

Index: class.Categories_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Categories_UI.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.Categories_UI.inc.php 30 May 2003 21:30:35 -0000      1.8
--- class.Categories_UI.inc.php 30 May 2003 23:17:46 -0000      1.9
***************
*** 124,128 ****
                                'lang_writeperm' => lang('Write Permission'),
                                'lang_implies' => lang('implies read 
permission'),
!                               'lang_useraccess' => lang('Individual Access 
Permission'),
                                'lang_username' => lang('User Name'),
                                'lang_reset' => lang('Reset'),
--- 124,128 ----
                                'lang_writeperm' => lang('Write Permission'),
                                'lang_implies' => lang('implies read 
permission'),
!                               'lang_useraccess' => lang('Individual Access 
Permissions'),
                                'lang_username' => lang('User Name'),
                                'lang_reset' => lang('Reset'),

Index: class.Content_BO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Content_BO.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.Content_BO.inc.php    30 May 2003 04:01:43 -0000      1.4
--- class.Content_BO.inc.php    30 May 2003 23:17:46 -0000      1.5
***************
*** 130,134 ****
                                
implode(',',$GLOBALS['Common_BO']->cats->getCategoryancestorids($cat_id,True)) 
: 
                                False;
!                       if ($page_id && 
!$GLOBALS['Common_BO']->acl->can_read_category($cat_id))
                        {
                           $page_id = False;
--- 130,134 ----
                                
implode(',',$GLOBALS['Common_BO']->cats->getCategoryancestorids($cat_id,True)) 
: 
                                False;
!                       if ($page_id && 
!in_array($cat_id,$GLOBALS['Common_BO']->acl->readablecats))
                        {
                           $page_id = False;
***************
*** 140,144 ****
                {
                        $cat_ancestorlist = ($cat_id != CURRENT_SITE_ID) ? 
$GLOBALS['Common_BO']->cats->getCategoryancestorids($cat_id,True) : False;
!                       if ($page_id && 
!$GLOBALS['Common_BO']->acl->can_read_category($cat_id))
                        {
                           $page_id = False;
--- 140,144 ----
                {
                        $cat_ancestorlist = ($cat_id != CURRENT_SITE_ID) ? 
$GLOBALS['Common_BO']->cats->getCategoryancestorids($cat_id,True) : False;
!                       if ($page_id && 
!in_array($cat_id,$GLOBALS['Common_BO']->acl->readablecats))
                        {
                           $page_id = False;

Index: class.Sites_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Sites_UI.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.Sites_UI.inc.php      23 May 2003 06:56:39 -0000      1.4
--- class.Sites_UI.inc.php      30 May 2003 23:17:46 -0000      1.5
***************
*** 87,91 ****
                        
$GLOBALS['phpgw']->template->set_var('lang_search',lang('Search'));
                        
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=sitemgr.Sites_UI.list_sites'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_done',lang('Cancel'));
                        
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/admin/index.php'));
  
--- 87,91 ----
                        
$GLOBALS['phpgw']->template->set_var('lang_search',lang('Search'));
                        
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=sitemgr.Sites_UI.list_sites'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
                        
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/admin/index.php'));