X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fplatal.inc.php;h=38912a22dc2b23bf6d48b74baeb070f205525a6b;hb=3f0fafbde81f4dcb8067e4bc5fc7eca57f535ae2;hp=7ab9ef8c5f4dcd2fc6f1c4b35fbc2fe47291076b;hpb=eaf30d86cc99df2414cf4f171a9b0f11b0561e3b;p=platal.git
diff --git a/include/platal.inc.php b/include/platal.inc.php
index 7ab9ef8..38912a2 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,12 +89,17 @@ 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
".
- "$errfile : $errline".
- "
";
+ if (php_sapi_name() == 'cli') {
+ $GLOBALS['pl_errors'] = "$type: $errstr\n $errfile:$errline\n";
+ } else {
+ $GLOBALS['pl_errors'][] =
+ "".
+ "{$type} $errstr
".
+ "$errfile : $errline".
+ "
";
+ }
}
function pl_clear_errors()
@@ -101,10 +110,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 +126,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
*/
@@ -134,7 +143,7 @@ function isvalid_email($email)
// la rfc2822 authorise les caractères "a-z", "0-9", "!", "#", "$", "%", "&", "'", "*", "+", "-", "/", "=", "?", "^", `", "{", "|", "}", "~" aussi bien dans la partie locale que dans le domaine.
// Pour la partie locale, on réduit cet ensemble car il n'est pas utilisé.
// Pour le domaine, le système DNS limite à [a-z0-9.-], on y ajoute le "_" car il est parfois utilisé.
- return preg_match("/^[a-z0-9_.'+-]+@[a-z0-9._-]+\.[a-z]{2,4}$/i", $email);
+ return preg_match("/^[a-z0-9_.'+-]+@[a-z0-9._-]+\.[a-z]{2,6}$/i", $email);
}
function pl_url($path, $query = null, $fragment = null)
@@ -152,10 +161,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 +182,76 @@ function pl_entity_decode($text, $mode = ENT_COMPAT)
return html_entity_decode($text, $mode, 'UTF-8');
}
+function pl_flatten_aux(array &$dest, array $src)
+{
+ foreach ($src as $val) {
+ if (is_array($val)) {
+ pl_flatten_aux($dest, $val);
+ } else {
+ $dest[] = $val;
+ }
+ }
+}
+
+function pl_flatten(array $array)
+{
+ $res = array();
+ pl_flatten_aux($res, $array);
+ return $res;
+}
+
+/**
+ * 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:
?>