Added pkwk_common_headers()

[pukiwiki/pukiwiki.git] / lib / html.php

diff --git a/lib/html.php b/lib/html.php
index 7cd9a96..c01995c 100644 (file)
--- a/lib/html.php
+++ b/lib/html.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: html.php,v 1.15 2004/11/23 11:33:25 henoheno Exp $
+// $Id: html.php,v 1.20 2004/12/25 00:38:21 henoheno Exp $
 //
 
 // ËÜʸ¤ò½ÐÎÏ
@@ -340,7 +340,7 @@ function make_heading(& $str, $strip = TRUE)
        // Cut fixed-anchors
        $id = '';
        $matches = array();
-       if (preg_match('/^(\*{0,3})(.*?)\[#([a-z][a-f0-9]{7})\](.*?)$/m', $str, $matches)) {
+       if (preg_match('/^(\*{0,3})(.*?)\[#([A-Za-z][\w-]+)\](.*?)$/m', $str, $matches)) {
                $str = $matches[2] . $matches[4];
                $id  = $matches[3];
        } else {
@@ -376,4 +376,31 @@ function anchor_explode($page, $strict_editable = FALSE)
                return array ($s_page, $anchor, FALSE);
        }
 }
+
+// Check header()s were sent already, or
+// there're blank lines or something out of php blocks
+function pkwk_headers_sent()
+{
+       if (version_compare(PHP_VERSION, '4.3.0', '>=')) {
+               if (headers_sent($file, $line))
+                   die('Headers already sent at ' .
+                       htmlspecialchars($file) .
+                       ' line ' . $line . '.');
+       } else {
+               if (headers_sent())
+                       die('Headers already sent.');
+       }
+}
+
+function pkwk_common_headers()
+{
+       if (! PKWK_OPTIMISE) pkwk_headers_sent();
+
+       $matches = array();
+       if(ini_get('zlib.output_compression') &&
+           preg_match('/\b(gzip|deflate)\b/i', $_SERVER['HTTP_ACCEPT_ENCODING'], $matches)) {
+               header('Content-Encoding: ' . $matches[1]);
+               header('Vary: Accept-Encoding');
+       }
+}
 ?>