X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fplatal.inc.php;h=8dd58f46865b704c5b59b0f1f93ec7015232d94f;hb=2ab75571bf840471fa9559292b75852bfce004d3;hp=ad6bbe92c97474f25cf9a7d8e9ad4c6b9a83cd51;hpb=32111f706bcbf1d3244f64b7928b37bbc5210ab0;p=platal.git
diff --git a/include/platal.inc.php b/include/platal.inc.php
index ad6bbe9..8dd58f4 100644
--- a/include/platal.inc.php
+++ b/include/platal.inc.php
@@ -1,6 +1,6 @@
"User Error",
E_USER_WARNING => "User Warning",
E_USER_NOTICE => "User Notice",
- E_STRICT => "Runtime Notice"
+ E_STRICT => "Runtime Notice",
+ E_RECOVERABLE_ERROR => "Recoverable Error"
);
}
@@ -85,10 +87,11 @@ function pl_error_handler($errno, $errstr, $errfile, $errline)
}
}
+ $type = isset($errortype[$errno]) ? $errortype[$errno] : $errno;
$errstr = utf8_encode(htmlentities($errstr));
$GLOBALS['pl_errors'][] =
"
".
- "{$errortype[$errno]} $errstr
".
+ "{$type} $errstr
".
"$errfile : $errline".
"
";
}
@@ -101,10 +104,10 @@ function pl_clear_errors()
function pl_dump_env()
{
echo "";
- echo "\nSESSION: "; var_export($_SESSION);
- echo "\nPOST: "; var_export($_POST);
- echo "\nGET: "; var_export($_GET);
- echo "\nCOOKIE: "; var_export($_COOKIE);
+ echo "\nSESSION: " . session_id(); var_dump($_SESSION);
+ echo "\nPOST: "; var_dump($_POST);
+ echo "\nGET: "; var_dump($_GET);
+ echo "\nCOOKIE: "; var_dump($_COOKIE);
echo "
";
}
@@ -117,7 +120,7 @@ function pl_print_errors()
set_error_handler('pl_error_handler', E_ALL | E_STRICT);
register_shutdown_function('pl_print_errors');
-// register_shutdown_function('pl_dump_env');
+//register_shutdown_function('pl_dump_env');
/** Check if the string is utf8
*/
@@ -152,10 +155,8 @@ function pl_self($n = null) {
function http_redirect($fullurl)
{
- if (count($_SESSION)) {
- session_write_close();
- }
- header('Location: '.$fullurl);
+ Platal::session()->close();
+ header('Location: '. $fullurl);
exit;
}
@@ -175,5 +176,58 @@ function pl_entity_decode($text, $mode = ENT_COMPAT)
return html_entity_decode($text, $mode, 'UTF-8');
}
+/**
+ * Returns the path of a static content, including, when appropriate, the
+ * version number. This is used to avoid cross-version cache issues, by ensuiring
+ * that all static resources are served on a unique path.
+ */
+function pl_static_content_path($path, $filename)
+{
+ global $globals;
+ if (isset($globals) && isset($globals->version)) {
+ return $path . $globals->version . '/' . $filename;
+ } else {
+ return $path . $filename;
+ }
+}
+
+/**
+ * Adds content type headers; by default the encoding used is utf-8.
+ */
+function pl_content_headers($content_type, $encoding = 'utf-8')
+{
+ if (is_null($encoding)) {
+ header("Content-Type: $content_type");
+ } else {
+ header("Content-Type: $content_type; charset=$encoding");
+ }
+}
+
+/**
+ * Adds content type and caching headers for content generated by plat/al. The
+ * cache duration defaults to the global static_cache_duration. No encoding is
+ * applied by default.
+ */
+function pl_cached_content_headers($content_type, $encoding = null, $cache_duration = -1)
+{
+ global $globals;
+ $cache_duration = ($cache_duration < 0 ? $globals->static_cache_duration : $cache_duration);
+
+ header("Cache-Control: max-age=$cache_duration");
+ header("Expires: " . gmdate('D, d M Y H:i:s', time() + $cache_duration) . " GMT");
+ header("Pragma: ");
+ pl_content_headers($content_type, $encoding);
+}
+
+/**
+ * Same as above, but applying an expiration time suitable for cacheable dynamic
+ * content (eg. photos, logos, ...).
+ */
+function pl_cached_dynamic_content_headers($content_type, $encoding = null)
+{
+ global $globals;
+ pl_cached_content_headers($content_type, $encoding, $globals->dynamic_cache_duration);
+}
+
// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
?>