X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fplatal.inc.php;h=900220c2a770795ed7c59fd4fa6f1ef4f0dbac48;hb=c4bcb1697481d3a6549f228739f17dc081641491;hp=802f9f1948858bcfd7c10e1fb06a27f246b716b4;hpb=92432704df1eccf5ca67be2127a2bdd21376a2bf;p=platal.git diff --git a/include/platal.inc.php b/include/platal.inc.php index 802f9f1..900220c 100644 --- a/include/platal.inc.php +++ b/include/platal.inc.php @@ -1,6 +1,6 @@ "Error", - E_WARNING => "Warning", - E_PARSE => "Parsing Error", - E_NOTICE => "Notice", - E_CORE_ERROR => "Core Error", - E_CORE_WARNING => "Core Warning", - E_COMPILE_ERROR => "Compile Error", - E_COMPILE_WARNING => "Compile Warning", - E_USER_ERROR => "User Error", - E_USER_WARNING => "User Warning", - E_USER_NOTICE => "User Notice", - E_STRICT => "Runtime Notice" - ); + if (!isset($errortype)) { + $errortype = array ( + E_ERROR => "Error", + E_WARNING => "Warning", + E_PARSE => "Parsing Error", + E_NOTICE => "Notice", + E_CORE_ERROR => "Core Error", + E_CORE_WARNING => "Core Warning", + E_COMPILE_ERROR => "Compile Error", + E_COMPILE_WARNING => "Compile Warning", + E_USER_ERROR => "User Error", + E_USER_WARNING => "User Warning", + E_USER_NOTICE => "User Notice", + E_STRICT => "Runtime Notice", + E_RECOVERABLE_ERROR => "Recoverable Error" + ); + } global $globals; if (isset($globals) && !$globals->debug) { - if (strpos($errortype[$errno], 'Notice') !== false) { + if ($errno == E_NOTICE || $errno == E_USER_NOTICE || $errno == E_STRICT) { return; } } + $type = isset($errortype[$errno]) ? $errortype[$errno] : $errno; + $error = strpos($type, 'Warning') !== false || strpos($type, 'Error') !==false; - $errstr = utf8_encode(htmlentities($errstr)); - $GLOBALS['pl_errors'][] = - "
". - "{$errortype[$errno]} $errstr
". - "$errfile : $errline". - "
"; -} - -function pl_clear_errors() -{ - unset($GLOBALS['pl_errors']); + pl_autoload('PlBacktrace'); + if (!isset(PlBacktrace::$bt['PHP Errors'])) { + new PlBacktrace('PHP Errors'); + } + PlBacktrace::$bt['PHP Errors']->newEvent("$type: $errstr", + 0, $error ? $errstr : null, + array(array('file' => $errfile, + 'line' => $errline))); } 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 "
"; } -function pl_print_errors() +function pl_print_errors($html = false) +{ + if (!isset(PlBacktrace::$bt['PHP Errors'])) { + return; + } + foreach (PlBacktrace::$bt['PHP Errors']->traces as $trace) { + if ($html) { + echo "
";
+        }
+        print "{$trace['action']}\n";
+        print "  {$trace['data'][0]['file']}: {$trace['data'][0]['line']}\n";
+        if ($html) {
+            echo "
"; + } + } +} + +function pl_assert_cb($file, $line, $message) { - print join("\n", $GLOBALS['pl_errors']); + Platal::assert(false, "Assertion failed at $file:$line with message: $message"); } set_error_handler('pl_error_handler', E_ALL | E_STRICT); -register_shutdown_function('pl_print_errors'); -// register_shutdown_function('pl_dump_env'); +assert_options(ASSERT_CALLBACK, 'pl_assert_cb'); +assert_options(ASSERT_WARNING, false); +if (php_sapi_name() == 'cli') { + register_shutdown_function('pl_print_errors'); +} +//register_shutdown_function('pl_dump_env'); -/** Check if the string is utf8 +/** Check if the string is utf8 */ function is_utf8($s) { return @iconv('utf-8', 'utf-8', $s) == $s; } +/** vérifie si une adresse email est bien formatée * ATTENTION, cette fonction ne doit pas être appelée sur une chaîne ayant subit un addslashes (car elle accepte le "'" qui it alors un "\'" + * @param $email l'adresse email a verifier + * @return BOOL */ +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,6}$/i", $email); +} + function pl_url($path, $query = null, $fragment = null) { global $platal; @@ -131,10 +190,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; } @@ -154,5 +211,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: ?>