OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-meta Date: 11-Mar-2006 17:38:45
Branch: HEAD Handle: 2006031116384500
Modified files:
openpkg-meta canvas.php
Log:
align style and reduce more global variables
Summary:
Revision Changes Path
1.17 +17 -19 openpkg-meta/canvas.php
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-meta/canvas.php
============================================================================
$ cvs diff -u -r1.16 -r1.17 canvas.php
--- openpkg-meta/canvas.php 11 Mar 2006 16:32:59 -0000 1.16
+++ openpkg-meta/canvas.php 11 Mar 2006 16:38:45 -0000 1.17
@@ -91,7 +91,7 @@
# determine last-modification and
# short circuit processing if HTTP If-Modified-Since applies
$gmtime = gmdate("D, d M Y H:i:s", filemtime($_SERVER["SCRIPT_FILENAME"])) .
" UTC";
-header("Last-Modified: $gmtime");
+header(sprintf("Last-Modified: %s", $gmtime));
$if_modified_since = preg_replace('/;.*$/', '', $hdr["If-Modified-Since"]);
if ($if_modified_since == $gmtime) {
header("HTTP/1.1 304 Not Modified");
@@ -110,40 +110,38 @@
unset($spec);
# diversion support
-$diversion_name = "";
-$diversion_data = array();
+$div = array();
+$div["name"] = "";
+$div["data"] = array();
function divert_start ($name) {
- global $diversion_name;
- global $diversion_data;
- $diversion_name = $name;
- if (!isset($diversion_data[$diversion_name])) {
- $diversion_data[$diversion_name] = "";
+ global $div;
+ $div["name"] = $name;
+ if (!isset($div["data"][$diversion_name])) {
+ $div["data"][$diversion_name] = "";
}
ob_start();
}
function divert_end () {
- global $diversion_name;
- global $diversion_data;
- if ($diversion_name != "") {
- $diversion_data[$diversion_name] .= ob_get_contents();
+ global $div;
+ if ($div["name"] != "") {
+ $div["data"][$div["name"]] .= ob_get_contents();
ob_end_clean();
}
}
function divert ($name) {
- global $diversion_name;
- if ($diversion_name != $name) {
+ global $div;
+ if ($div["name"] != $name) {
divert_end();
divert_start($name);
}
}
function undivert ($name) {
- global $diversion_name;
- global $diversion_data;
- if ($diversion_name == $name) {
- $diversion_data[$diversion_name] .= ob_get_contents();
+ global $div;
+ if ($div["name"] == $name) {
+ $div["data"][$div["name"]] .= ob_get_contents();
ob_clean();
}
- return $diversion_data[$name];
+ return $div["data"][$name];
}
# load content generation parts
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
