commit a8f5c0189efa25d72869976f34f0a5527687e8b2
parent 8fe3893871dc0bc4ce7662dd8fe891962c8619f5
Author: Georges Dupéron <jahvascriptmaniac+github@free.fr>
Date: Wed, 4 Aug 2010 23:14:59 +0200
Connexion / Déconnexion marchent !
Diffstat:
5 files changed, 35 insertions(+), 28 deletions(-)
diff --git a/__cms__/code/modules/admin/connexion.php b/__cms__/code/modules/admin/connexion.php
@@ -8,7 +8,7 @@ class AdminConnexion {
} else {
return self::vue($chemin, "connexion échouée");
}
- } else if ($action == "déconnexion") {
+ } else if ($action == "deconnexion") {
Authentification::déconnexion();
return self::vue($chemin, "déconnexion");
} else {
diff --git a/__cms__/code/modules/modules.php b/__cms__/code/modules/modules.php
@@ -10,12 +10,12 @@ class Modules {
"post" => qw($post),
"file" => qw($file)
);
- self::$liste_modules[$type]["get_post"][] = "action"; // Toujours présent.
+ self::$liste_modules[$type]["get_post"][] = "action"; // Toujours présent.
}
public static function get_module($chemin) {
$type = Stockage::get_prop($chemin, "type");
- if ($type === false || !isset(self::$liste_modules[$type])) {
+ if (Erreur::is_erreur($type) || !isset(self::$liste_modules[$type])) {
Erreur::fatale("Type inconnu (" . var_export($type, true) . ") pour la page " . $chemin->get() . ".");
// return false;
}
diff --git a/__cms__/code/securite/authentification.php b/__cms__/code/securite/authentification.php
@@ -20,7 +20,7 @@ class Authentification {
}
public static function est_connecté() {
- return get_utilisateur() == "Anonyme";
+ return self::get_utilisateur() != "Anonyme";
}
public static function déconnexion() {
diff --git a/__cms__/code/securite/erreur.php b/__cms__/code/securite/erreur.php
@@ -28,7 +28,7 @@ class Erreur {
}
public static function lecture($message) {
- $t = new self("lecture", $message);
+ return new self("lecture", $message);
}
public function __construct($type, $message, $string = "[debug:erreur]") {
diff --git a/__cms__/code/site/squelette.php b/__cms__/code/site/squelette.php
@@ -12,29 +12,36 @@ class Squelette {
// TODO : chemin css relatif.
$racine = new Chemin('/');
$chemin_css = $racine->get_url('?vue=css');
- return
-'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
- <head>
- <title>' . $page->titre . '</title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta http-equiv="Content-Language" content="fr" />
- <link href="' . $chemin_css . '" rel="stylesheet" type="text/css" />
- </head>
- <body>
- <h1><a href="' . $racine->get_url() . '">' . Stockage::get_prop($racine, "nom_site") . '</a></h1>
- <div class="site connexion">
- <a href="' . $racine->enfant("admin")->enfant("connexion")->get_url() . '">connexion</a>
- </div>
- <div class="site navigation">
- <ul>
- <li><a href="' . $racine->enfant("galerie")->get_url() . '">Galerie</a></li>
- </ul>
- </div>
- <div class="site contenu">
-';
-// <meta name="keywords" lang="fr" content="motcle1,mocle2" />
-// <meta name="description" content="Description de ma page web." />
+ $nl = "\n";
+ $ret = '';
+ $ret .= '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' . $nl;
+ $ret .= '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">' . $nl;
+ $ret .= ' <head>' . $nl;
+ $ret .= ' <title>' . $page->titre . '</title>' . $nl;
+ $ret .= ' <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />' . $nl;
+ $ret .= ' <meta http-equiv="Content-Language" content="fr" />' . $nl;
+ $ret .= ' <meta name="keywords" lang="fr" content="motcle1,mocle2" />' . $nl;
+ $ret .= ' <meta name="description" content="Description de ma page web." />' . $nl;
+ $ret .= ' <link href="' . $chemin_css . '" rel="stylesheet" type="text/css" />' . $nl;
+ $ret .= ' </head>' . $nl;
+ $ret .= ' <body>' . $nl;
+ $ret .= ' <h1><a href="' . $racine->get_url() . '">' . Stockage::get_prop($racine, "nom_site") . '</a></h1>' . $nl;
+ $ret .= ' <div class="site connexion">' . $nl;
+
+ if (Authentification::est_connecté()) {
+ $ret .= '<a href="' . $racine->enfant("admin")->enfant("connexion")->get_url("?action=deconnexion") . '">déconnexion</a>' . $nl;
+ } else {
+ $ret .= '<a href="' . $racine->enfant("admin")->enfant("connexion")->get_url() . '">connexion</a>' . $nl;
+ }
+
+ $ret .= ' </div>' . $nl;
+ $ret .= ' <div class="site navigation">' . $nl;
+ $ret .= ' <ul>' . $nl;
+ $ret .= ' <li><a href="' . $racine->enfant("galerie")->get_url() . '">Galerie</a></li>' . $nl;
+ $ret .= ' </ul>' . $nl;
+ $ret .= ' </div>' . $nl;
+ $ret .= ' <div class="site contenu">' . $nl;
+ return $ret;
}
public static function pied() {
