[Phpgroupware-cvs] CVS: sitemgr/sitemgr-site/inc class.Template3.inc.php,1.5,1.6 class.sitebo.inc.php,1.2,1.3 class.ui.inc.php,1.11,1.12

[Michael Totschnig <address@hidden>]

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

Modified Files:
        class.Template3.inc.php class.sitebo.inc.php class.ui.inc.php 
Log Message:
make sitemgr capable of editing multiple sites


Index: class.Template3.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/sitemgr/sitemgr-site/inc/class.Template3.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.Template3.inc.php     4 Mar 2003 18:59:14 -0000       1.5
--- class.Template3.inc.php     22 May 2003 02:36:54 -0000      1.6
***************
*** 115,118 ****
--- 115,119 ----
                        global $page;
                        $areaname = $vars[1];
+ 
                        $this->permitted_modules = 
array_keys($this->modulebo->getcascadingmodulepermissions($areaname,$page->cat_id));
                        $transformername = $areaname . '_bt';
***************
*** 253,263 ****
                                case 'sitename':
                                case 'site_name':
!                                       return 
$GLOBALS['sitemgr_info']['sitemgr-site-name-' . 
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang']];
!                               case 'footer':
!                               case 'site_footer':
!                                       return 
$GLOBALS['Common_BO']->headerfooter->getsitefooter($GLOBALS['phpgw_info']['user']['preferences']['common']['lang']);
!                               case 'header':
!                               case 'site_header':
!                                       return 
$GLOBALS['Common_BO']->headerfooter->getsiteheader($GLOBALS['phpgw_info']['user']['preferences']['common']['lang']);
                                case 'user':
                                        return 
$GLOBALS['phpgw_info']['user']['account_lid'];
--- 254,264 ----
                                case 'sitename':
                                case 'site_name':
!                                       return 
$GLOBALS['sitemgr_info']['site_name_' . 
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang']];
! //                            case 'footer':
! //                            case 'site_footer':
! //                                    return 
$GLOBALS['Common_BO']->headerfooter->getsitefooter($GLOBALS['phpgw_info']['user']['preferences']['common']['lang']);
! //                            case 'header':
! //                            case 'site_header':
! //                                    return 
$GLOBALS['Common_BO']->headerfooter->getsiteheader($GLOBALS['phpgw_info']['user']['preferences']['common']['lang']);
                                case 'user':
                                        return 
$GLOBALS['phpgw_info']['user']['account_lid'];

Index: class.sitebo.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/sitemgr-site/inc/class.sitebo.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.sitebo.inc.php        8 Apr 2003 18:33:36 -0000       1.2
--- class.sitebo.inc.php        22 May 2003 02:36:54 -0000      1.3
***************
*** 82,85 ****
--- 82,86 ----
                        $page->block->module_id = 
$GLOBALS['Common_BO']->modules->getmoduleid('index');
                        $page->block->view = 0;
+                       $page->cat_id = 
$GLOBALS['Common_BO']->current_site['site_id'];
                        return true;
                }
***************
*** 150,153 ****
--- 151,156 ----
                                $page->subtitle = '';
                                $page->toc = True;
+                               $page->cat_id = 
$GLOBALS['Common_BO']->current_site['site_id'];
+ 
                        }
                        $page->block = CreateObject('sitemgr.Block_SO',True);
***************
*** 206,210 ****
                {
                        global $sitemgr_info,$phpgw_info;
!                       if ($phpgw_info['user']['account_lid'] != 
$sitemgr_info['anonymous-user'])
                        {
                                return true;
--- 209,213 ----
                {
                        global $sitemgr_info,$phpgw_info;
!                       if ($phpgw_info['user']['account_lid'] != 
$sitemgr_info['anonymous_user'])
                        {
                                return true;
***************
*** 227,230 ****
--- 230,237 ----
                function setsitemgrPreferredLanguage()
                {
+                       //since there are lang calls in the API, and the first 
lang call builds $GLOBAL['lang'], wet have to unset it, if
+                       //the change of 
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] should have any 
effect.
+                       //is there a more efficient way to do the same thing?
+                       unset($GLOBALS['lang']);
                        $supportedLanguages = 
$GLOBALS['sitemgr_info']['sitelanguages'] ? 
$GLOBALS['sitemgr_info']['sitelanguages'] : array('en');
                        $postlang = $_POST['language'];
***************
*** 245,249 ****
                        }
                        
!               if ($this->is_user())
                        {
                                $userlang = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'];
--- 252,256 ----
                        }
                        
!                       if ($this->is_user())
                        {
                                $userlang = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'];

Index: class.ui.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/sitemgr-site/inc/class.ui.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.ui.inc.php    18 Jan 2003 04:30:34 -0000      1.11
--- class.ui.inc.php    22 May 2003 02:36:54 -0000      1.12
***************
*** 20,24 ****
                {
                        $themesel = $GLOBALS['sitemgr_info']['themesel'];
!                       $templateroot = 
$GLOBALS['sitemgr_info']['sitemgr-site-dir'] . SEP . 'templates' . SEP . 
$themesel;
                        $this->t = new Template3($templateroot);
                }
--- 20,24 ----
                {
                        $themesel = $GLOBALS['sitemgr_info']['themesel'];
!                       $templateroot = $GLOBALS['sitemgr_info']['site_dir'] . 
SEP . 'templates' . SEP . $themesel;
                        $this->t = new Template3($templateroot);
                }