[Phpgroupware-cvs] CVS: wcm/website index.php,1.2,1.3 main.php,1.11,1.12

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/wcm/website
In directory subversions:/tmp/cvs-serv17236

Modified Files:
        index.php main.php 
Log Message:
Allow passing of sitename on the commandline for preview



Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/website/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** index.php   24 Feb 2002 03:42:43 -0000      1.2
--- index.php   24 Feb 2002 04:16:33 -0000      1.3
***************
*** 27,33 ****
        define('SITE_ROOT', PHPGW_SERVER_ROOT . SEP . 'wcm' . SEP . 'website');
  
!       $pageid = $HTTP_GET_VARS['pageid'];
  
        $GLOBALS['sessionid'] = 
$GLOBALS['phpgw']->session->create($login,$passwd,'text');
!       
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/wcm/website/main.php','pageid='
 . $pageid));
  ?>
--- 27,34 ----
        define('SITE_ROOT', PHPGW_SERVER_ROOT . SEP . 'wcm' . SEP . 'website');
  
!       $pageid   = $HTTP_GET_VARS['pageid'];
!       $sitename = $HTTP_GET_VARS['sitename'];
  
        $GLOBALS['sessionid'] = 
$GLOBALS['phpgw']->session->create($login,$passwd,'text');
!       
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/wcm/website/main.php','pageid='
 . $pageid . '&sitename=' . $sitename));
  ?>

Index: main.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/website/main.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** main.php    24 Feb 2002 03:42:43 -0000      1.11
--- main.php    24 Feb 2002 04:16:33 -0000      1.12
***************
*** 23,26 ****
--- 23,27 ----
  
        $pageid = $HTTP_GET_VARS['pageid'];
+       $sitename = $HTTP_GET_VARS['sitename'];
  
        if($pageid)
***************
*** 33,37 ****
        else
        {
!               $wcm = CreateObject('wcm.bowcm','phpgw');
                $page = $wcm->site['site_pages'][0];
        }
--- 34,40 ----
        else
        {
!               $siten = $sitename ? $sitename : 'phpgw';
!               $wcm = CreateObject('wcm.bowcm',$siten);
!               unset($siten);
                $page = $wcm->site['site_pages'][0];
        }