X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fplatal.inc.php;h=6bfd24f83d8244ae345989600f23e9bc93c974c7;hb=59887c4a8a1f014c1f4107c43deda0d1be994f5d;hp=b936f324e01333fcde643d464597d54be0c57845;hpb=94c63478e2e66e968a61daedbafc5fbde9442102;p=platal.git diff --git a/include/platal.inc.php b/include/platal.inc.php index b936f32..6bfd24f 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" - ); - - $errstr = htmlentities($errstr); + 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 ($errno == E_NOTICE || $errno == E_USER_NOTICE || $errno == E_STRICT) { + return; + } + } + + $type = isset($errortype[$errno]) ? $errortype[$errno] : $errno; + $errstr = utf8_encode(htmlentities($errstr)); $GLOBALS['pl_errors'][] = "
". - "{$errortype[$errno]} $errstr
". + "{$type} $errstr
". "$errfile : $errline". "
"; } +function pl_clear_errors() +{ + unset($GLOBALS['pl_errors']); +} + function pl_dump_env() { echo "
";
@@ -89,13 +116,33 @@ function pl_dump_env()
 
 function pl_print_errors()
 {
-    print join("\n", $GLOBALS['pl_errors']);
+    if (!empty($GLOBALS['pl_errors'])) {
+        print join("\n", $GLOBALS['pl_errors']);
+    }
 }
 
 set_error_handler('pl_error_handler', E_ALL | E_STRICT);
 register_shutdown_function('pl_print_errors');
 // register_shutdown_function('pl_dump_env');
 
+/** 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;
@@ -124,5 +171,15 @@ function pl_redirect($path, $query = null, $fragment = null)
     http_redirect($globals->baseurl . '/' . pl_url($path, $query, $fragment));
 }
 
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
+function pl_entities($text, $mode = ENT_COMPAT)
+{
+    return htmlentities($text, $mode, 'UTF-8');
+}
+
+function pl_entity_decode($text, $mode = ENT_COMPAT)
+{
+    return html_entity_decode($text, $mode, 'UTF-8');
+}
+
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>