[Phpgroupware-cvs] CVS: wcm/inc class.bosite.inc.php,1.13,1.14

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/wcm/inc
In directory subversions:/tmp/cvs-serv4398/inc

Modified Files:
        class.bosite.inc.php 
Log Message:
Some adjustment to help ensure session gets created at the right time



Index: class.bosite.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.bosite.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.bosite.inc.php        27 Feb 2002 04:10:11 -0000      1.13
--- class.bosite.inc.php        27 Feb 2002 05:00:11 -0000      1.14
***************
*** 50,55 ****
                var $site = array();
  
-               var $phpfooter = '<?php /* This is where some code will go to 
determine page and element expiration. */ ?>';
- 
                function bosite($session=False)
                {
--- 50,53 ----
***************
*** 207,212 ****
                        $cfg = CreateObject('phpgwapi.config','wcm');
                        $cfg->read_repository();
!                       $acct = 
$GLOBALS['phpgw']->accounts->id2name($cfg->config_data['website_account']);
!                       $pass = $cfg->config_data['website_account_passwd'];
  
                        if(!$siteid)
--- 205,211 ----
                        $cfg = CreateObject('phpgwapi.config','wcm');
                        $cfg->read_repository();
!                       $acctid = $cfg->config_data['website_account'];
!                       $acct   = $GLOBALS['phpgw']->accounts->id2name($acctid);
!                       $pass   = $cfg->config_data['website_account_passwd'];
  
                        if(!$siteid)
***************
*** 270,275 ****
                                $tpl->set_var('right_width',   $site_right ? 
$site_right : '130');
  
!                               $out = "<?php 
\$GLOBALS['phpgw_info']['user']['account_id'] = $acct;"
!                                       . " settype(\$site,'string'); \$page = 
array(); \$ele = array(); \$site = '" . $this->site['site_name'] . "'; "
                                        . "\$page = array('name' => '" . 
$page['page_name'] . "', "
                                        . "'version' => '" . 
$page['page_version'] . "', "
--- 269,275 ----
                                $tpl->set_var('right_width',   $site_right ? 
$site_right : '130');
  
!                               $out = "<?php 
\$GLOBALS['phpgw_info']['user']['account_id'] = $acctid; "
!                                       . "settype(\$site,'string'); \$page = 
array(); \$ele = array(); \$site = '"
!                                       . $this->site['site_name'] . "'; "
                                        . "\$page = array('name' => '" . 
$page['page_name'] . "', "
                                        . "'version' => '" . 
$page['page_version'] . "', "
***************
*** 304,307 ****
--- 304,311 ----
                                                        
switch($val['element_type'])
                                                        {
+                                                               /* LIVE hook */
+                                                               case '5':
+                                                                       
$working .= "\n<?php \$GLOBALS['phpgw']->hooks->single('website_$section', " . 
$val['element_source'] . ", True); ?>";
+                                                                       break;
                                                                case '4':
                                                                        /* Hook 
*/
***************
*** 347,353 ****
                                $out .= $tpl->fp('out','framing_table_end');
                                $out .= $tpl->fp('out','php_code');
- 
-                               /* add our expiration source code (coming soon) 
*/
-                               $out .= $this->phpfooter;
  
                                /* Clean out the ^M for unix */
--- 351,354 ----