Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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...
commit 9547cc3e1656900cbe53567c1db078cfa093886a 1 parent 96ba485
tettamanti authored
17 pnphpbb3/includes/functions.php
@@ -3350,6 +3350,11 @@ function page_header($page_title = '', $display_online_list = true)
3350 3350 }
3351 3351
3352 3352 define('HEADER_INC', true);
  3353 +
  3354 + PageUtil::setVar('title', $page_title);
  3355 +
  3356 + /* buffers are stackable */
  3357 + ob_start();
3353 3358
3354 3359 // gzip_compression
3355 3360 if ($config['gzip_compress'])
@@ -3547,6 +3552,9 @@ function page_header($page_title = '', $display_online_list = true)
3547 3552 header('Cache-Control: private, no-cache="set-cookie"');
3548 3553 header('Expires: 0');
3549 3554 header('Pragma: no-cache');
  3555 +
  3556 + /* Zikula header */
  3557 + Loader::includeOnce('header.php');
3550 3558
3551 3559 return;
3552 3560 }
@@ -3681,10 +3689,13 @@ function exit_handler()
3681 3689 }
3682 3690 }
3683 3691
3684   - // As a pre-caution... some setups display a blank page if the flush() is not there.
3685   - (!$config['gzip_compress']) ? @flush() : @ob_flush();
  3692 + if ($config['gzip_compress'])
  3693 + @ob_flush();
3686 3694
3687   - exit;
  3695 + ob_end_flush();
  3696 +
  3697 + /* Zikula footer */
  3698 + Loader::includeOnce('footer.php');
3688 3699 }
3689 3700
3690 3701 /**
3  pnphpbb3/styles/prosilver/template/overall_footer.html
@@ -44,5 +44,4 @@
21 pnphpbb3/styles/prosilver/template/overall_header.html
... ... @@ -1,19 +1,4 @@
1   -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2   -<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
3   -<head>
4   -
5   -<meta http-equiv="content-type" content="text/html; charset={S_CONTENT_ENCODING}" />
6   -<meta http-equiv="content-style-type" content="text/css" />
7   -<meta http-equiv="content-language" content="{S_USER_LANG}" />
8   -<meta http-equiv="imagetoolbar" content="no" />
9   -<meta name="resource-type" content="document" />
10   -<meta name="distribution" content="global" />
11   -<meta name="copyright" content="2000, 2002, 2005, 2007 phpBB Group" />
12   -<meta name="keywords" content="" />
13   -<meta name="description" content="" />
14   -{META}
15   -<title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
16   -
  1 +<div>
17 2 <!--
18 3 phpBB style name: prosilver
19 4 Based on style: prosilver (this is the default phpBB3 style)
@@ -87,9 +72,9 @@
87 72 <link href="{T_THEME_PATH}/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
88 73 <!-- ENDIF -->
89 74
90   -</head>
  75 +</div>
91 76
92   -<body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
  77 +<div id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
93 78
94 79 <div id="wrap">
95 80 <a id="top" name="top" accesskey="t"></a>

0 comments on commit 9547cc3

Please sign in to comment.
Something went wrong with that request. Please try again.