diff --git a/code/serveur/php/download.php b/code/serveur/php/download.php index cf99c34..c7a27ee 100644 --- a/code/serveur/php/download.php +++ b/code/serveur/php/download.php @@ -2,7 +2,7 @@ session_start(); if(!isset($_SESSION['userId'])) - header("location:login.php?return=download&showmsg=err_download_notauth"); + header("location:login.php?return=download&showmsg=oth_login_download_nauth"); ?> diff --git a/code/serveur/php/login.php b/code/serveur/php/login.php index fa57fb6..335b81d 100644 --- a/code/serveur/php/login.php +++ b/code/serveur/php/login.php @@ -10,11 +10,11 @@ if(isset($_POST['loginid']) && !empty($_POST['loginid'])) if(isset($_POST['loginpswd']) && !empty($_POST['loginpswd'])) $pswd = md5($_POST['loginpswd']); -$location = getlocation(); +$location = get_location(); if(isset($_GET['d']) && $_GET['d'] == "true") { session_destroy(); - return_to($location, "?show_msg=ok_login_disconnect"); + return_to($location, "?showmsg=ok_login_disconnect"); } if(isset($user) && isset($pswd)) @@ -27,7 +27,7 @@ if(isset($user) && isset($pswd)) if($pswd == ($db->querySingle("SELECT hash_passwd FROM user WHERE login='$user';"))) { $_SESSION['userId'] = $user; // Le login se fait aussi dans signup. - return_to($location); + return_to($location,"?showmsg=ok_login_connect"); } else $msg = $strings['err_login_bad_user_pass']; @@ -47,6 +47,7 @@ else if(isset($user) or isset($pswd))

Connexion

+

Vous êtes déjà inscrit ? Authentifiez-vous.

\ No newline at end of file +?> diff --git a/code/serveur/php/ressources/showmsg.inc b/code/serveur/php/ressources/showmsg.inc index 8d9314a..8feeaea 100644 --- a/code/serveur/php/ressources/showmsg.inc +++ b/code/serveur/php/ressources/showmsg.inc @@ -1,26 +1,31 @@ '.htmlspecialchars($msg).'

'; - else + else if($okmsg) echo '

'.htmlspecialchars($msg).'

'; + else + echo '

'.htmlspecialchars($msg).'

'; } } showmsg(); -?> \ No newline at end of file +?> diff --git a/code/serveur/php/ressources/simple.css b/code/serveur/php/ressources/simple.css index 1fca410..50469b9 100644 --- a/code/serveur/php/ressources/simple.css +++ b/code/serveur/php/ressources/simple.css @@ -16,12 +16,12 @@ background-color : #F0F0D0; border-top : 1px solid grey; padding : 4px; - padding-left : 3%; - padding-right : 3%; + padding-left : 2.2%; + padding-right : 1%; } .menu #links a { - margin-left : 2%; + margin-right : 2em; } .menu #cnx { @@ -41,7 +41,11 @@ } .content p { - margin-left : 2%; + margin-left : 3em; +} + +.content ul { + margin-left : 1.5em; } @@ -169,23 +173,27 @@ a:visited { h1 { color: #8b4; margin : 0; - padding: 0.2em 0.5em; + margin : 0.5ex 2em 0.5ex 0.5em; } h2 { color: #4a4; + margin : 1.5ex 2em 0 0; } h3 { color: #484; + margin : 1.5ex 2em 0 1em; } h4 { color: #784; + margin : 1.5ex 2em 0 1.5em; } h5 { color: #874; + margin : 1.5ex 2em 0 1.8em; } @@ -194,7 +202,7 @@ h5 { /**********************************************/ .message { display : inline-block; - padding : 5px 30px; + padding : 2ex 6em 2ex 2em; margin-top : 10px; margin-bottom : 10px; margin-right : 6%; @@ -203,10 +211,15 @@ h5 { .warning { border : 1px dashed red; - background-color : #F0C060 + background-color : #F0C060; } .success { border : 1px dashed red; - background-color : #90FF90 + background-color : #90FF90; +} + +.other { + border : 1px solid yellow; + background-color : #FFFFE0; } diff --git a/code/serveur/php/ressources/strings.inc b/code/serveur/php/ressources/strings.inc index 57a3168..09e523c 100644 --- a/code/serveur/php/ressources/strings.inc +++ b/code/serveur/php/ressources/strings.inc @@ -1,6 +1,10 @@