Permalink
Browse files

Adapt template output to be displayed inside ZK pages; note that the …

…module is executed via the old-style loader, so header&footer shall be emitted manually.
  • Loading branch information...
1 parent 96ba485 commit 9547cc3e1656900cbe53567c1db078cfa093886a tettamanti committed Sep 28, 2008
@@ -3350,6 +3350,11 @@ function page_header($page_title = '', $display_online_list = true)
}
define('HEADER_INC', true);
+
+ PageUtil::setVar('title', $page_title);
+
+ /* buffers are stackable */
+ ob_start();
// gzip_compression
if ($config['gzip_compress'])
@@ -3547,6 +3552,9 @@ function page_header($page_title = '', $display_online_list = true)
header('Cache-Control: private, no-cache="set-cookie"');
header('Expires: 0');
header('Pragma: no-cache');
+
+ /* Zikula header */
+ Loader::includeOnce('header.php');
return;
}
@@ -3681,10 +3689,13 @@ function exit_handler()
}
}
- // As a pre-caution... some setups display a blank page if the flush() is not there.
- (!$config['gzip_compress']) ? @flush() : @ob_flush();
+ if ($config['gzip_compress'])
+ @ob_flush();
- exit;
+ ob_end_flush();
+
+ /* Zikula footer */
+ Loader::includeOnce('footer.php');
}
/**
@@ -44,5 +44,4 @@
<!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF -->
</div>
-</body>
-</html>
+</div>
@@ -1,19 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
-<head>
-
-<meta http-equiv="content-type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="content-style-type" content="text/css" />
-<meta http-equiv="content-language" content="{S_USER_LANG}" />
-<meta http-equiv="imagetoolbar" content="no" />
-<meta name="resource-type" content="document" />
-<meta name="distribution" content="global" />
-<meta name="copyright" content="2000, 2002, 2005, 2007 phpBB Group" />
-<meta name="keywords" content="" />
-<meta name="description" content="" />
-{META}
-<title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
-
+<div>
<!--
phpBB style name: prosilver
Based on style: prosilver (this is the default phpBB3 style)
@@ -87,9 +72,9 @@
<link href="{T_THEME_PATH}/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
<!-- ENDIF -->
-</head>
+</div>
-<body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
+<div id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
<div id="wrap">
<a id="top" name="top" accesskey="t"></a>

0 comments on commit 9547cc3

Please sign in to comment.