[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: wcm/website index.php,1.1,1.2 main.php,1.10,1.11
|
From: |
Miles Lott <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: wcm/website index.php,1.1,1.2 main.php,1.10,1.11 |
|
Date: |
Sat, 23 Feb 2002 22:42:46 -0500 |
Update of /cvsroot/phpgroupware/wcm/website
In directory subversions:/tmp/cvs-serv16218/website
Modified Files:
index.php main.php
Log Message:
website main/index now accept pageid as a param for a page to load - uipage
passes this now for preview
Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/website/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** index.php 3 Feb 2002 16:42:24 -0000 1.1
--- index.php 24 Feb 2002 03:42:43 -0000 1.2
***************
*** 27,31 ****
define('SITE_ROOT', PHPGW_SERVER_ROOT . SEP . 'wcm' . SEP . 'website');
$GLOBALS['sessionid'] =
$GLOBALS['phpgw']->session->create($login,$passwd,'text');
!
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/wcm/website/main.php'));
?>
--- 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));
?>
Index: main.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/website/main.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** main.php 17 Feb 2002 17:11:29 -0000 1.10
--- main.php 24 Feb 2002 03:42:43 -0000 1.11
***************
*** 22,26 ****
include('../../header.inc.php');
! $wcm = CreateObject('wcm.bowcm','phpgw');
$elements = CreateObject('wcm.boelement');
--- 22,41 ----
include('../../header.inc.php');
! $pageid = $HTTP_GET_VARS['pageid'];
!
! if($pageid)
! {
! $wcm = CreateObject('wcm.bopage');
! $wcm->site = array();
! $wcm->site['site_paneo'] = True;
! $page = $wcm->read($pageid,True);
! }
! else
! {
! $wcm = CreateObject('wcm.bowcm','phpgw');
! $page = $wcm->site['site_pages'][0];
! }
! @reset($page);
!
$elements = CreateObject('wcm.boelement');
***************
*** 43,49 ****
$tpl->set_block('frame','bottom','bottom');
! $site_left = $wcm->site['site_paneo'] ?
$wcm->site['site_pages'][0]['page_left'] : $wcm->site['site_left'];
! $site_mid = $wcm->site['site_paneo'] ?
$wcm->site['site_pages'][0]['page_mid'] : $wcm->site['site_mid'];
! $site_right = $wcm->site['site_paneo'] ?
$wcm->site['site_pages'][0]['page_right'] : $wcm->site['site_right'];
$tpl->set_var('left_width', $site_left ? $site_left : '120');
--- 58,64 ----
$tpl->set_block('frame','bottom','bottom');
! $site_left = $wcm->site['site_paneo'] ? $page['page_left'] :
$wcm->site['site_left'];
! $site_mid = $wcm->site['site_paneo'] ? $page['page_mid'] :
$wcm->site['site_mid'];
! $site_right = $wcm->site['site_paneo'] ? $page['page_right'] :
$wcm->site['site_right'];
$tpl->set_var('left_width', $site_left ? $site_left : '120');
***************
*** 55,63 ****
/* Read and parse page header and footer */
! $header_data =
$elements->read($wcm->site['site_pages'][0]['page_header']);
$header = $header_data['element_source'];
$tpl->set_var('header',$header ? $header :
'<html><head>HEADER</head><body>');
! $footer_data =
$elements->read($wcm->site['site_pages'][0]['page_footer']);
$footer = $footer_data['element_source'];
$tpl->set_var('footer',$footer ? $footer : 'FOOTER</body></html>');
--- 70,78 ----
/* Read and parse page header and footer */
! $header_data = $elements->read($page['page_header']);
$header = $header_data['element_source'];
$tpl->set_var('header',$header ? $header :
'<html><head>HEADER</head><body>');
! $footer_data = $elements->read($page['page_footer']);
$footer = $footer_data['element_source'];
$tpl->set_var('footer',$footer ? $footer : 'FOOTER</body></html>');
***************
*** 74,82 ****
while(list(,$section) = each($_list))
{
! while(list($key,$val) =
@each($wcm->site['site_pages'][0]['page_elements'][$section]))
{
switch($val['element_type'])
{
case '4':
$GLOBALS['phpgw']->hooks->single('website_' .
$section,$val['element_source'],True);
$$section .=
$GLOBALS['phpgw_info']['wcm'][$section];
--- 89,98 ----
while(list(,$section) = each($_list))
{
! while(list($key,$val) = @each($page['page_elements'][$section]))
{
switch($val['element_type'])
{
case '4':
+ /* Hook */
$GLOBALS['phpgw']->hooks->single('website_' .
$section,$val['element_source'],True);
$$section .=
$GLOBALS['phpgw_info']['wcm'][$section];
***************
*** 84,87 ****
--- 100,104 ----
case '3':
case '2':
+ /* file/image */
if(@stat($val['element_source']))
{
***************
*** 97,100 ****
--- 114,118 ----
break;
case '1':
+ /* HTML from db */
$$section .= $val['element_source'];
break;
***************
*** 111,115 ****
$tpl->set_var('bottom_content', $bottom ? $bottom : 'BOTTOM');
! // _debug_array($wcm->site['site_pages'][0]);
$tpl->pfp('out','frame');
--- 129,133 ----
$tpl->set_var('bottom_content', $bottom ? $bottom : 'BOTTOM');
! // _debug_array($page);
$tpl->pfp('out','frame');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: wcm/website index.php,1.1,1.2 main.php,1.10,1.11,
Miles Lott <address@hidden> <=