diff options
21 files changed, 652 insertions, 235 deletions
diff --git a/final/app/auth_dialog.php b/final/app/auth_dialog.php index caf3297..fce5948 100644 --- a/final/app/auth_dialog.php +++ b/final/app/auth_dialog.php @@ -1,4 +1,117 @@ <?php +include 'include/ludo/auth.inc.php'; +// Code vérifiant que la personne qui tente de se connecter est bien référencée dans notre base +include 'include/ludo/fonctions.inc.php'; +// Connexion à la base et sélection de la database +include 'include/connect.inc.php'; + +//Fonction d'authentification +function authentification($loginP,$pass,$verifAuth="") +{ + //~ echo "function authentification($loginP,$pass,$verifAuth='')\n"; + include 'include/ludo/config.inc.php'; + + // Requete SQL + $query = "SELECT idP, loginP, nomP, prenomP, methodeAuth FROM AWOR_Personne WHERE loginP='$loginP';"; + if ( ! $result = @mysql_query($query) ) + { + // Cas d'erreur + $errmsg =mysql_generate_errmsg(); + } + else + { + // Initialisation par défaut + $methodeAuth=''; + $existLogin=mysql_num_rows($result); + // Chargement des préférences d'authentification de l'utilisateur + if ($existLogin === 1) + { + list($idP, $loginP, $nomP, $prenomP, $methodeAuth) = mysql_fetch_row($result); + } + + + // Si le script est lancé en local, on saute l'authentification + //~ $a = $CONFIG['AUTH']['bypass_if_local']; + //~ $b = $_SERVER['REMOTE_ADDR']; + + //~ echo "if ( ($a === true ) && ( ($b == 'localhost') || ( $b == '127.0.0.1') ) )\n"; + if ( ($CONFIG['AUTH']['bypass_if_local'] === true ) + && ( ($_SERVER['REMOTE_ADDR'] == 'localhost') || ($_SERVER['REMOTE_ADDR'] == '127.0.0.1') ) ) + { + //~ echo "VRAI"; + $methodeAuth='bypass'; + } + //~ else echo "FAUX"; + + //~ echo "DEBUG1 : \$methodeAuth==$methodeAuth\n"; + + $auth_is_ok=false; + if ($verifAuth != "") {$methodeAuth = $verifAuth;} // Pour la vérification d'authentification (monProfil) + + //~ echo "DEBUG2 : \$methodeAuth==$methodeAuth\n"; + switch ( $methodeAuth ) + { + case 'webetud': + // include... + $auth_is_ok=VerifOuvertureSession("quelconque"); + if ( ! $auth_is_ok ) { $errmsg="Authentification WebEtud refusée !"; } + break; + /*************************************************************** + ** Vous pouvez ajouter d'autres mode d'authentification ici ! ** + ***************************************************************/ + case 'bypass': + $auth_is_ok=true; + break; + default: + // Tentative d'authentification POP + if ( ($errno = pop3_auth_simple($loginP, $pass) ) != 0 ) + { + // Authentification échouée + $errmsg=pop3_generate_errmsg($errno); + //~ echo "DEBUG : \$errmsg == $errmsg\n"; + } + else + { + $auth_is_ok=true; + } + break; + } + if ( $auth_is_ok === true ) + { + // Authentification réussie + /*Inscription de la personne si elle était inconnue de la base de donnée :*/ + if ($existLogin === 0 && $verifAuth == "") + { + $idP_new = new_pers ($loginP); + $query = "SELECT idP, loginP, nomP, prenomP, methodeAuth FROM AWOR_Personne WHERE idP='$idP_new';"; + if ( ! $result = @mysql_query($query) ) + { + // Cas d'erreur + $errmsg =mysql_generate_errmsg(); + } + // Chargement des préférences d'authentification de l'utilisateur + if (mysql_num_rows($result) === 1) + { + list($idP, $loginP, $nomP, $prenomP, $methodeAuth) = mysql_fetch_row($result); + } + } + + + + session_start(); + $_SESSION['session_loginP']=$loginP; + $_SESSION['session_nomP']=$nomP; + $_SESSION['session_prenomP']=$prenomP; + $_SESSION['session_idP']=$idP; + } + return ($auth_is_ok?true:$errmsg); + } + +} + +if ( (! isset($_POST['action']) ) || ( $_POST['action'] != "maj_profil") ) +{ + // Récupération des paramètres if ( isset($_GET['retour']) && $_GET['retour']!='' ) { $retour=addslashes( $_GET['retour'] ); } else { $retour='index.php'; } @@ -12,78 +125,21 @@ } else { - $loginP=addslashes( $_POST['loginP'] ); - - - include 'include/ludo/auth.inc.php'; - - // Code vérifiant que la personne qui tente de se connecter est bien référencée dans notre base - include 'include/ludo/fonctions.inc.php'; - // Connexion à la base et sélection de la database - include 'include/connect.inc.php'; - include 'include/ludo/config.inc.php'; + require ('include/tools.inc.php'); + $ret=authentification(addslashes_if_needed($_POST['loginP']),addslashes_if_needed($_POST['pass'])); + + //~ echo "DEBUG : \$ret==$ret\n"; - // Requete SQL - $query = "SELECT idP, loginP, nomP, prenomP, methodeAuth FROM AWOR_Personne WHERE loginP='$loginP';"; - if ( ! $result = @mysql_query($query) ) + if ( $ret === true ) { - // Cas d'erreur - $errmsg =mysql_generate_errmsg(); + //Authentification réussie + require('include/ludo/redir.inc.php'); + //~ echo "DEBUG : html_redir($retour);\n"; + html_redir($retour); } else { - // Initialisation par défaut - $methodeAuth=''; - // Chargement des préférences d'authentification de l'utilisateur - if ( mysql_num_rows($result) === 1) - { - list($idP, $loginP, $nomP, $prenomP, $methodeAuth) = mysql_fetch_row($result); - } - // Si le script est lancé en local, on saute l'authentification - if ( ($CONFIG['AUTH']['bypass_if_local'] === true ) - && ( ($_SERVER['REMOTE_ADDR'] == 'localhost') || ($_SERVER['REMOTE_ADDR'] == '127.0.0.1') ) ) - { - $methodeAuth='bypass'; - } - - $auth_is_ok=false; - switch ( $methodeAuth ) - { - case 'webetud': - // include... - $auth_is_ok=VerifOuvertureSession("quelconque"); - if ( ! $auth_is_ok ) { $errmsg="Authentification WebEtud refusée !"; } - break; - /*************************************************************** - ** Vous pouvez ajouter d'autres mode d'authentification ici ! ** - ***************************************************************/ - case 'bypass': - $auth_is_ok=true; - break; - default: - // Tentative d'authentification POP - if ( ($errno = pop3_auth_simple($loginP, $_POST['pass']) ) != 0 ) - { - // Authentification échouée - $errmsg=pop3_generate_errmsg($errno); - } - else - { - $auth_is_ok=true; - } - break; - } - if ( $auth_is_ok === true ) - { - // Authentification réussie - session_start(); - $_SESSION['session_loginP']=$loginP; - $_SESSION['session_nomP']=$nomP; - $_SESSION['session_prenomP']=$prenomP; - $_SESSION['session_idP']=$idP; - require('include/ludo/redir.inc.php'); - html_redir($retour); - } + $errmsg = $ret; } } } @@ -123,3 +179,6 @@ generate_html_div_help(); generate_html_div_footer(); ?> </body> </html> +<?php +} +?>
\ No newline at end of file diff --git a/final/app/css/ice.css b/final/app/css/ice.css index a60500d..f643bee 100644 --- a/final/app/css/ice.css +++ b/final/app/css/ice.css @@ -1,6 +1,7 @@ em {color:#F00;} img { border : none ; } img.spacing{ margin: 0 0.2em 0 0.2em;} + body { color: #000000; background-color:#F5F5DC; @@ -26,6 +27,10 @@ th , thead tr { color: #FFFFFF; background-color:#551A8B; } +tr.empty { + height:5px; + background-color:#8470FF; +} th.selected {color:#FFF;background-color:#8470FF} td { border-bottom-width: thin; @@ -326,7 +331,7 @@ div.popup_contenu em margin-top:0px; padding:0px; } -#footer li.right { +#footer li.author { display:inline; float:left; list-style:none; @@ -335,7 +340,12 @@ div.popup_contenu em padding-left:10px; margin-left:0px; } -#footer li.center { +#footer li.author li { + display:inline; + padding:0px; + margin:0px 5px; +} +#footer li.wwwc { display:inline; float:right; list-style: none; @@ -344,10 +354,10 @@ div.popup_contenu em padding-right:30px; margin-left:0px; } -#footer li.left select { +#footer li.csschooser select { border:thin solid #000; } -#footer li.left { +#footer li.csschooser { float:left; display:inline; list-style: none; diff --git a/final/app/css/ice_moche.css b/final/app/css/ice_moche.css index 0004b1a..90702a1 100644 --- a/final/app/css/ice_moche.css +++ b/final/app/css/ice_moche.css @@ -44,52 +44,50 @@ h2 { color: #5C5CFF; margin: 0px; } +li { + margin-left:-20px; +} select { width:auto; } /***** Titre *****/ #titre h2 { color: #551A8B; - height:60px; - width:200px; - margin-left:60px; + height:3em; + width:12em; padding-top:5px; -/* background-image:url(ice_img/titre.png); - background-position:left; - background-repeat:no-repeat;*/ + padding-left:1em; color:#FFFFFF; - font-size:40px; + font-size:2em; } #titre { - height:60px; - padding-top:5px; - width:100%; + height:3em; + width:12em; clear:left; background-color:#551A8B; - background-image:url(ice_img/logo.png); - background-position:left; - background-repeat:no-repeat; } /*****************/ /***** Menu *****/ #menu { - padding:0px; + padding:50px 0 50px 0; + margin:0px; - color:#551A8B; - width:15em; - background-color:#FFFFFF; + background-color:#551A8B; + width:12em; + } #menu a { text-decoration:none; display:block; font-weight:bold; text-align:center; - color:#551A8B; -} -#menu a:hover { color:#FFFFFF; background-color:#551A8B; } +#menu a:hover { + color:#551A8B; + background-color:#FFFFFF; +} /* Pour IE5/MAC \*/#menu a{float:none;}/**/ #menu li { list-style: none; @@ -112,38 +110,44 @@ select { width:auto; } /*******************/ /***** Contenu *****/ #contenu { - padding-top:10px; - padding-bottom:10px; - padding-right:3em; - padding_left:3em; + margin:20px; + padding:20px; + top:30px; + left:12em; + border:thin solid #F7F7F7; + background-color:#8470FF; position:absolute; - top:60px; - left:15em; } #help { - text-align:justify; + text-align:left; color:#000000; float:left; - margin-top:20px; - margin-left:10px; + margin:0px; padding:5px; border:thin solid #000000; background-color:#F7F7F7; + width:14em; font-size:small; - width:15em; } -#help h2 , #help a +#help a:link,#help a:hover,#help a:visited +{ + text-align:center; + font-size:small; + color:#8470FF; + background-color:#F7F7F7; +} +#help h2, #help h2 a, #help h2 a:link, #help h2 a:hover, #help h2 a:visited { text-align:center; font-size:medium; color:#FFFFFF; background-color:#551A8B; - color:#FFFFFF; margin-top:0; margin-bottom:10px; } + #no_help, #no_help h2 { display:none; @@ -231,3 +235,97 @@ div.popup_contenu background-repeat:repeat; z-index: 499; } + +#page_accueil h1 +{ + display:none; + +} + +#page_accueil +{ + position:absolute; + text-align:center; + left:12em; + margin:3em; + top:50px; +} + +#msg +{ + display:none; + position:absolute; + text-align:center; + left:50%; + margin-left:-20%; + width:40%; + background-color:#551A8B; + top:-10px; + padding-top:15px; + padding-bottom:10px; + color:#FFF; + -moz-border-radius:16px; +} +#msg em +{ + color:#FFF; +} + + +#footer +{ + float:left; + clear:left; + display:block; + width:19em; + background-color:#551A8B; + color:#FFF; + font-size:x-small; + margin:0px; + padding-top:10px; + padding-bottom:0px; +} +#footer ul +{ + + list-style-type:none; + white-space:nowrap; + margin-top:0px; + margin-bottom:10px; + padding:0px; + margin-left:0px; +} +#footer li.author { + display:block; + float:left; + list-style:none; + vertical-align:middle; + padding-left:10px; + margin-left:0px; +} +#footer li.author li +{ + padding:0px; + margin:0px; +} +#footer li.wwwc { + float:left; + list-style: none; + padding:0 4em; + margin:10px 0px; +} +#footer li.wwwc a{ + display:block; + +} +#footer li.csschooser select { + border:thin solid #000; +} +#footer li.csschooser { + float:left; + list-style: none; + vertical-align:middle; + margin-top:0px; + padding-left:30px; + margin-left:0px; +} diff --git a/final/app/css/ice_moche_nohelp.css b/final/app/css/ice_moche_nohelp.css index 9032594..45f2014 100644 --- a/final/app/css/ice_moche_nohelp.css +++ b/final/app/css/ice_moche_nohelp.css @@ -1,4 +1,3 @@ - img { border : none ; } body { color: #000000; @@ -6,7 +5,6 @@ body { font-family: Verdana, Arial, Helvetica, sans-serif; padding:0px; margin:0px; - min-width:750px; /*Pour eviter le chevauchement pour FireFox, ne change rien pour IE (qui gere pas trop mal sans ca) */ } table { border-spacing:0px; @@ -22,8 +20,9 @@ th { border-right:none; font-weight: bold; color: #FFFFFF; - background-color: #551A8B; + background-color:#551A8B; } + th.selected {color:#8470FF;} td { border-bottom-width: thin; @@ -34,6 +33,7 @@ th a:link, th a:visited { font-size: x-small; color: #FFFFFF; } + h1 { font-weight: bold; color: #9999FF; @@ -43,62 +43,58 @@ h2 { color: #5C5CFF; margin: 0px; } +li { + margin-left:-20px; +} select { width:auto; } /***** Titre *****/ #titre h2 { color: #551A8B; - margin-left:50px; - height:50px; - width:200px; - background-image:url(ice_img/titre.png); - background-position:left; - background-repeat:no-repeat; + height:3em; + width:12em; + padding-top:5px; + padding-left:1em; color:#FFFFFF; - font-size:0px; + font-size:2em; + } #titre { - height:50px; + height:3em; + width:12em; clear:left; - background-color:#FFFFFF; - background-image:url(ice_img/logo.png); - background-position:left; - background-repeat:no-repeat; + background-color:#551A8B; } /*****************/ /***** Menu *****/ #menu { - padding:0px; + padding:50px 0 50px 0; + margin:0px; - width:100%; - height:1.5em; background-color:#551A8B; + width:12em; + } #menu a { text-decoration:none; display:block; font-weight:bold; text-align:center; - color:#FFFFFF; - height:1.5em; + color:#FFFFFF; + background-color:#551A8B; } #menu a:hover { - color:#000000; + color:#551A8B; background-color:#FFFFFF; - height:1.5em; } /* Pour IE5/MAC \*/#menu a{float:none;}/**/ #menu li { list-style: none; - float:left; - padding:0; - margin:0; - width:10em; - white-space:nowrap;/*Evite l'étalement sur deux ligne*/ + padding:0px; + margin:0px; vertical-align:middle; } #menu #deconnection { - float:right; } #main_menu { @@ -107,68 +103,37 @@ select { width:auto; } /*********************/ /***** Sous Menu *****/ #sous_menu { - clear:left; - padding-top:5px; - padding-bottom:3px; - padding-left:15px; - border-bottom:1px solid #000000; - background-color:#8470FF; -} -/* -------------- Arbre -------------------*/ -p.arbre { - font-size: small; - color: #FFFFFF; - text-align: left; - margin-top: 0px; - margin-right: 0px; - margin-bottom: 0px; - margin-left: 0px; + display:none; } -p.arbre a:link, p.arbre a:visited {color:#FFFFFF; } - /*******************/ /***** Contenu *****/ - #contenu { - padding-top:10px; - padding-bottom:20px; - padding-left:5px; - padding-right:5px; - float:left; - width:95%; -} -#no_help { - display:block; - text-align:justify; - color:#000000; + margin:20px; + padding:20px; + top:30px; + left:12em; + border:thin solid #F7F7F7; + background-color:#8470FF; float:right; - margin:0px; - padding:1px; - border:thin solid #000000; - background-color:#F7F7F7; - font-size:small; - width:3%; + position:absolute; + } -#no_help h2 , #no_help a +#help { + display:none; +} + +#no_help, #no_help h2 , #no_help h2 a { display:block; - text-align:center; - font-size:medium; color:#FFFFFF; background-color:#551A8B; - margin:0px; - padding:0px; -} -#help,#help h2 -{ - display:none; + width:8em; + text-align:center; } - - -.popup , .popup_creneau , .popup_personne , .popup_commentaire , .popup_fichier , .popup_deletelist { +.popup , .popup_creneau , .popup_personne , .popup_commentaire , .popup_fichier , .popup_deletelist { display: none; position: absolute; left:50%; @@ -211,7 +176,6 @@ p.arbre a:link, p.arbre a:visited {color:#FFFFFF; } margin-top: -4em ;/*moitié de height */ margin-left: -15em ;/*moitié de width */ } - .popup_deletelist { width: 26em; height: 8em; @@ -219,7 +183,7 @@ p.arbre a:link, p.arbre a:visited {color:#FFFFFF; } margin-left: -13em ;/*moitié de width */ } -.popup h2 , .popup_creneau h2 , .popup_personne h2 , .popup_commentaire h2 , .popup_fichier h2 , .popup_deletelist h2 +.popup h2 , .popup_creneau h2 , .popup_personne h2 , .popup_commentaire h2 , .popup_fichier h2 , .popup_deletelist h2 { background:#551A8B; color:#FFFFFF; @@ -249,4 +213,89 @@ div.popup_contenu background-image:url(ice_img/masque.png); background-repeat:repeat; z-index: 499; -}
\ No newline at end of file +} + +#page_accueil h1 +{ + background:#551A8B; + color:#FFF; + margin-top:0; +} + +#page_accueil +{ + text-align:center; +} + +#msg +{ + display:none; + position:absolute; + text-align:center; + left:50%; + margin-left:-20%; + width:40%; + background-color:#551A8B; + top:-10px; + padding-top:15px; + padding-bottom:10px; + color:#FFF; + -moz-border-radius:16px; +} +#msg em +{ + color:#FFF; +} + + +#footer +{ + float:left; + clear:left; + display:block; + width:19em; + background-color:#551A8B; + color:#FFF; + font-size:x-small; + margin:0px; + padding-top:10px; + padding-bottom:0px; +} +#footer ul +{ + + list-style-type:none; + white-space:nowrap; + margin-top:0px; + margin-bottom:10px; + padding:0px; +} +#footer li.right { +display:block; + float:left; + list-style:none; + vertical-align:middle; + padding-left:10px; + margin-left:0px; +} +#footer li.center { + float:left; + list-style: none; + padding:0 4em; + margin:10px 0px; +} +#footer li.center a{ + display:block; + +} +#footer li.left select { + border:thin solid #000; +} +#footer li.left { + float:left; + list-style: none; + vertical-align:middle; + margin-top:0px; + padding-left:30px; + margin-left:0px; +} diff --git a/final/app/css/ice_nohelp.css b/final/app/css/ice_nohelp.css index 9724abd..5de91fe 100644 --- a/final/app/css/ice_nohelp.css +++ b/final/app/css/ice_nohelp.css @@ -26,6 +26,10 @@ th, thead tr { color: #FFFFFF; background-color: #551A8B; } +tr.empty { + height:5px; + background-color:#8470FF; +} th.selected {color:#FFF;background-color:#8470FF} td { margin:0.5em; @@ -185,9 +189,10 @@ p.arbre a:link, p.arbre a:visited {color:#FFFFFF; } font-size:medium; color:#8470FF; } -#help,#help h2 +#help,#help h2, #help ul , #help li { display:none; + visibility:hidden; } @@ -332,7 +337,7 @@ div.popup_contenu em margin-top:0px; padding:0px; } -#footer li.right { +#footer li.author { display:inline; float:left; list-style:none; @@ -341,7 +346,12 @@ div.popup_contenu em padding-left:10px; margin-left:0px; } -#footer li.center { +#footer li.author li { + display:inline; + padding:0px; + margin:0px 5px; +} +#footer li.wwwc { display:inline; float:right; list-style: none; @@ -350,7 +360,10 @@ div.popup_contenu em padding-right:30px; margin-left:0px; } -#footer li.left { +#footer li.csschooser select { + border:thin solid #000; +} +#footer li.csschooser { float:left; display:inline; list-style: none; diff --git a/final/app/include/connect.inc.php b/final/app/include/connect.inc.php index 0bc0a10..469ebd1 100644 --- a/final/app/include/connect.inc.php +++ b/final/app/include/connect.inc.php @@ -4,9 +4,9 @@ */ // $bd représente le nom de la database à utiliser -$bd = "awor"; +$bd = "awor_final"; // mysql_connect(<nom_ou_ip_serveur_mysql>, <utilisateur_mysql>, <mot_de_passe_en_clair_mysql>); -$link = @mysql_connect('localhost', 'awor', 'blagnac'); +$link = @mysql_connect('localhost', 'lud_restricted', 'maille_ess_ku_elle'); @mysql_select_db($bd , $link); diff --git a/final/app/include/je.inc.php b/final/app/include/je.inc.php index d7d1081..5205b47 100644 --- a/final/app/include/je.inc.php +++ b/final/app/include/je.inc.php @@ -163,7 +163,7 @@ require_once ('include/connect.inc.php'); if ($row['estPrivee'] == 'oui' || $row['idP_Createur']==$idP) echo "<a href=\"#\" onclick=\"loadid('popdeletelist.php?idL=".htmlentities($row[0], ENT_QUOTES)."','popdeletelist',true);popon('popdeletelist')\"><img src=\"images/supprimer.png\" alt=\"Supprimer ".htmlentities($row[1], ENT_QUOTES)."\" /></a></td>\n" ; else echo "</td>\n"; if ($row['estPrivee'] == 'oui') echo "<td>Privée" ; else echo "<td>Public"; echo "</td>\n<td>"; - echo "<a href=\"#\" onclick=\"loadid('poppersonne.php?idL=".$row['idL']."&idP_orga=".$idP."','poppersonne',true);popon('poppersonne')\">"; + echo "<a href=\"#\" onclick=\"loadid('poppersonne.php?idL=".$row['idL']."&idP_orga=".$idP."','poppersonne',true);popon('poppersonne');loadid('help/listes_modif.php.hlp','help',false)\">"; echo htmlentities($row['libelleL'], ENT_QUOTES); echo "</a></td>\n"; echo "</tr>\n"; @@ -237,5 +237,6 @@ require_once ('include/connect.inc.php'); } } echo '</table>'; - } +} + ?>
\ No newline at end of file diff --git a/final/app/include/ju.inc.php b/final/app/include/ju.inc.php index 4bb9330..4ab1a1c 100644 --- a/final/app/include/ju.inc.php +++ b/final/app/include/ju.inc.php @@ -153,9 +153,13 @@ function traiter_formulaire_maj_profil() { require_once ('include/tools.inc.php'); $requete = "UPDATE AWOR_Personne SET courrielP = '".addslashes_if_needed($_POST["courrielP"])."', loginP = '".addslashes_if_needed($_POST["loginP"])."', nomP = '".addslashes_if_needed($_POST["nomP"])."', prenomP = '".addslashes_if_needed($_POST["prenomP"])."', methodeAuth = '".addslashes_if_needed($_POST["methodeAuth"])."' WHERE idP = '".$_SESSION['session_idP']."'"; - if(mysql_query($requete) == false) return "Une erreur MySQL est survenu : ".mysql_error(); - $_SESSION['session_prenomP'] = $_POST["prenomP"]; - $_SESSION['session_nomP'] = $_POST["nomP"]; + if(mysql_query($requete) === false) return false;// "Une erreur MySQL est survenu : ".mysql_error(); + else + { + $_SESSION['session_prenomP'] = $_POST["prenomP"]; + $_SESSION['session_nomP'] = $_POST["nomP"]; + return true; + } //print_r($_POST); } diff --git a/final/app/include/ludo/auth.inc.php b/final/app/include/ludo/auth.inc.php index 2491203..516bd45 100644 --- a/final/app/include/ludo/auth.inc.php +++ b/final/app/include/ludo/auth.inc.php @@ -13,24 +13,33 @@ define("ERR_BAD_PARAMS", -100); // Fonction d'authentification pop3 function pop3_auth_simple($mail, $upw) { - if ( ($ret = ereg ( "(^.*)@([[:alnum:]]+\.[[:alnum:]]+)", $mail, $re_tokens ) ) ) + //~ echo "DEBUG : function pop3_auth_simple($mail, $upw)\n"; + //~ if ( ($ret = ereg ( "(^.*)@([[:alnum:]]+\.[[:alnum:]]+)", $mail, $re_tokens ) ) ) + if ( ($ret = ereg ( "(^.*)@(.+)", $mail, $re_tokens ) ) ) { /* $re_tokens [] * [0] : email complet * [1] : nom_mail * [2] : serveur_mail */ - require_once('config.inc.php'); - $srv_conf = $CONFIG['AUTH']['POP']['SERVERS'][strtolower($re_tokens[2])]; - if ( is_array($srv_conf) ) + $server_mail=strtolower($re_tokens[2]); + include('config.inc.php'); + + if ( isset($CONFIG['AUTH']['POP']['SERVERS'][$server_mail]) ) { - $server=$srv_conf['subdomain']; - $port=$srv_conf['port']; - if ( $srv_conf['username_is_full_mail'] ) - { $user = $mail; } else { $user = $re_tokens[1]; } - return pop3_auth ($server, $port, $user, $upw); + $srv_conf = $CONFIG['AUTH']['POP']['SERVERS'][$server_mail]; + if ( is_array($srv_conf) ) + { + $server=$srv_conf['subdomain']; + $port=$srv_conf['port']; + if ( $srv_conf['username_is_full_mail'] ) + { $user = $mail; } else { $user = $re_tokens[1]; } + return pop3_auth ($server, $port, $user, $upw); + } } - } + //~ else { print_r($CONFIG); echo "\nDEBUG : \$server_mail==$server_mail\n";} + }//else echo "Pb EREG\n"; + /* DEBUG echo $mail . "\n" . $ret . "\n";; print_r($re_tokens); @@ -40,6 +49,8 @@ function pop3_auth_simple($mail, $upw) function pop3_auth ($server, $port, $user, $upw) { + //~ echo "function pop3_auth ($server, $port, $user, $upw)\n"; + //echo "DEBUG : fsockopen($server, $port, $errno, $errstr, 10);"; $sock = @fsockopen($server, $port, $errno, $errstr, 10); if ( $sock === false) diff --git a/final/app/include/ludo/config.inc.php b/final/app/include/ludo/config.inc.php index c016342..92be407 100644 --- a/final/app/include/ludo/config.inc.php +++ b/final/app/include/ludo/config.inc.php @@ -9,6 +9,12 @@ $CONFIG = array ( 'SERVERS' => array ( + 'etu.iut-blagnac.fr' => array + ( + 'subdomain' => 'mail.google.com', + 'port' => 110, + 'username_is_full_mail' => true + ), 'wanadoo.fr' => array ( 'subdomain' => 'pop.orange.fr', @@ -31,8 +37,8 @@ $CONFIG = array ( // 'nom à afficher' => 'nom_fichier_sans_extension' 'standard' => 'ice', - 'Glace (ancien)' => 'ice_moche', - 'bleu' => 'style1' + 'vertical demo' => 'ice_moche' + //'bleu' => 'style1' ) ), 'MAIL' => array diff --git a/final/app/include/ludo/fonctions.inc.php b/final/app/include/ludo/fonctions.inc.php index 3361827..1dd9117 100644 --- a/final/app/include/ludo/fonctions.inc.php +++ b/final/app/include/ludo/fonctions.inc.php @@ -145,7 +145,7 @@ function generate_html_array_personnes_crenaux($idR) if ( $is_admin ) { echo ' <a href="#poppersonne" onclick="loadid(\'poppersonne.php?idR=' . $idR; - echo '&idL=' . $idL_interne . '&idP_orga=' . $idP_orga . '\',\'poppersonne\',true);popon(\'poppersonne\');">' . "\n"; + echo '&idL=' . $idL_interne . '&idP_orga=' . $idP_orga . '\',\'poppersonne\',true);popon(\'poppersonne\');loadid(\'help/reunion_admin_participants.php.hlp\',\'help\',false)">' . "\n"; echo ' <img src="images/addP.gif" alt="Ajouter une personne" title="Ajouter une personne" height="17" width="19" />' . "\n"; echo ' </a> '; } @@ -185,7 +185,7 @@ function generate_html_array_personnes_crenaux($idR) { ?> <th> - <a href="#popcreneau" onclick="loadid('popcreneau.php?idR=<?php echo $idR; ?>','popcreneau',true);popon('popcreneau');"> + <a href="#popcreneau" onclick="loadid('popcreneau.php?idR=<?php echo $idR; ?>','popcreneau',true);popon('popcreneau');loadid('help/reunion_admin_creneaux.php.hlp','help',false)"> <img src="./images/editCreneau2.gif" alt="Editer les creneaux" title="Editer les creneaux" height="21" width="22" /> </a> </th> @@ -275,7 +275,7 @@ function generate_html_array_personnes_crenaux($idR) <td> <?php echo '<a href="#poppersonne" onclick="loadid(\'poppersonne.php?idR=' . $idR; - echo '&idL=' . $idL_interne . '&idP_orga=' . $idP_orga . '\',\'poppersonne\',true);popon(\'poppersonne\');">' . "\n"; + echo '&idL=' . $idL_interne . '&idP_orga=' . $idP_orga . '\',\'poppersonne\',true);popon(\'poppersonne\');loadid(\'help/reunion_admin_participants.php.hlp\',\'help\',false)">' . "\n"; ?> <img src="images/addP.gif" alt="Ajouter une personne" title="Ajouter une personne" height="17" width="19" /> </a> @@ -443,7 +443,7 @@ function generate_html_reunion_detail2($idR) echo '<a href="#popfixer" onclick="loadid(\'include/ludo/div_create_or_modif.php?idR='; echo $idR . '&objetR=' . urlencode($objetR) . '&lieuR=' . urlencode($lieuR) . '&ordreJourR='; echo urlencode($ordreJourR) . '&remarquesR=' . urlencode($remarquesR); - echo "','details_reunion',false)\">(Editer)</a>\n"; + echo "','details_reunion',false);loadid('help/reunion_admin_info.php.hlp','help',false)\">(Editer)</a>\n"; } $objetR=htmlentities($objetR, ENT_QUOTES); $ordreJourR=htmlentities($ordreJourR, ENT_QUOTES); diff --git a/final/app/include/ludo/html_elements.inc.php b/final/app/include/ludo/html_elements.inc.php index 35eaa68..a252662 100644 --- a/final/app/include/ludo/html_elements.inc.php +++ b/final/app/include/ludo/html_elements.inc.php @@ -16,9 +16,9 @@ echo '<?xml version="1.0" encoding="ISO-8859-1"?>'."\n" <script type="text/javascript" src="script.js"></script> <?php //print_r($_COOKIE['aworcustom_css']); - if ( /*isset($_COOKIE['aworcustom_css'])*/ false ) + if ( isset($_COOKIE['aworchoose_css']) ) { - $cssfilemain = $_COOKIE['aworcustom_css']; + $cssfilemain = $_COOKIE['aworchoose_css']; } else { @@ -27,7 +27,7 @@ echo '<?xml version="1.0" encoding="ISO-8859-1"?>'."\n" } echo ' <link href="css/' . $cssfilemain . '.css" rel="stylesheet" type="text/css" />' . "\n"; echo ' <link href="css/' . $cssfilemain . '_nohelp.css" rel="stylesheet" type="text/css" title="nohelp" />' . "\n"; - +/* if ( isset($CONFIG['CSS']['CHOOSER_LIST']) ) { foreach ( $CONFIG['CSS']['CHOOSER_LIST'] as $cssname => $cssfile ) @@ -39,6 +39,7 @@ echo '<?xml version="1.0" encoding="ISO-8859-1"?>'."\n" } } } +*/ ?> <link href="css/print.css" rel="alternate stylesheet" type="text/css" title="print"/> </head> @@ -101,15 +102,15 @@ function generate_html_div_css_chooser() if ( ! is_array($CONFIG['CSS']['CHOOSER_LIST']) ) { return false; } - if ( isset($_COOKIE['aworcustom_css'] ) ) { $css_selected=$_COOKIE['aworcustom_css']; }else{$css_selected='';}; + if ( isset($_COOKIE['aworchoose_css'] ) ) { $css_selected=$_COOKIE['aworchoose_css']; }else{$css_selected='';}; echo '<div class="css_chooser">' . "\n"; //print_r($_COOKIE); echo ' <select id="switcherCSS" onchange="switchCSS();">' . "\n"; foreach ( $CONFIG['CSS']['CHOOSER_LIST'] as $file => $name ) { - echo ' <option value="' . $file . '"'; - if ( $file == $css_selected ) { echo ' selected="selected"'; } - echo '>' . htmlentities($name, ENT_QUOTES) . '</option>' /*. "$DEBUG:file=$file, css_selected=$css_selected"*/ . "\n"; + echo ' <option value="' . $name . '"'; + if ( $name == $css_selected ) { echo ' selected="selected"'; } + echo '>' . htmlentities($file, ENT_QUOTES) . '</option>' /*. "$DEBUG:file=$file, css_selected=$css_selected"*/ . "\n"; } echo ' </select>'. "\n"; echo '</div>'. "\n"; @@ -120,10 +121,10 @@ function generate_html_div_footer() ?> <div id="footer"> <ul> - <li class="left"> + <li class="csschooser"> <?php generate_html_div_css_chooser(); ?> </li> - <li class="center"> + <li class="wwwc"> <a href="http://validator.w3.org/check/referer"> <img src="./images/vxhtml.gif" alt="Validate" height="31" width="88" /> </a> @@ -134,8 +135,8 @@ function generate_html_div_footer() <img src="./images/wai.gif" alt="W3C-WAI level A conformance icon" height="31" width="88" /> </a> </li> - <li class="right"> - <span class="discret">Application réalisée par Jérémie Dénoyer,<br /> Ludovic Pouzenc, Julien Séré et Andriana Semouchtchak</span> + <li class="author"> + Application réalisée par :<ul><li>Jérémie Dénoyer</li><li>Ludovic Pouzenc</li><li>Julien Séré</li><li>Andriana Semouchtchak</li></ul> </li> </ul> </div> diff --git a/final/app/listes.php b/final/app/listes.php index e4529f1..df7182e 100644 --- a/final/app/listes.php +++ b/final/app/listes.php @@ -35,7 +35,7 @@ generate_html_div_help('help/listes.php.hlp'); <br/><br/> <?php generate_html_array_list($_SESSION['session_idP']) ?> <br/> -<a href="#" onclick="loadid('poppersonne.php?idP_orga=<?php echo $_SESSION['session_idP']; ?>','poppersonne',true);popon('poppersonne')">Créer une liste</a> +<a href="#" onclick="loadid('poppersonne.php?idP_orga=<?php echo $_SESSION['session_idP']; ?>','poppersonne',true);popon('poppersonne');loadid('help/listes_new.php.hlp','help',false)">Créer une liste</a> </div> diff --git a/final/app/profil.php b/final/app/profil.php index 16d3449..eebc750 100644 --- a/final/app/profil.php +++ b/final/app/profil.php @@ -3,20 +3,37 @@ require('include/ludo/session_verify.inc.php'); require_once('include/ludo/html_elements.inc.php'); require_once('include/connect.inc.php'); require_once('include/ju.inc.php'); +require_once('include/je.inc.php'); +require_once('include/tools.inc.php'); if ( isset($_REQUEST['action']) ) { + if ($_POST['action'] == "maj_profil") { - if (1==1)//Verification auth puis traitement + include('auth_dialog.php'); + if ( authentification(addslashes_if_needed($_POST['loginP']),addslashes_if_needed($_POST['pass']),addslashes_if_needed($_POST['methodeAuth'])) === true ) { $nom_func = 'traiter_formulaire_' . $_REQUEST['action']; - $nom_func(); + $result_fonc = $nom_func(); + } + else + { + $result_fonc = -1; } } } +if (isset($_POST['pre_action']) ) +{ + if (($_POST['pre_action'] == "verif_profil" & ($_POST["oldLogin"] == $_POST["loginP"]) | ($_POST["oldMethodeAuth"] == $_POST["methodeAuth"]))) + { + $nom_func = 'traiter_formulaire_maj_profil'; + $result_fonc = $nom_func(); + } +} generate_html_doctype_and_head("Administration du profil"); echo "<body>\n"; + generate_html_divs_menu(); ?> <div id="sous_menu"> @@ -37,29 +54,42 @@ else { $nom = $_SESSION['session_loginP']; } -if (isset($_POST['pre_action']) & $_POST['pre_action']=="verif_profil") +$verif_auth = false; +if (isset($_POST['pre_action']) ) { - + if ($_POST['pre_action']=="verif_profil" & ($_POST["oldLogin"] != $_POST["loginP"]) | ($_POST["oldMethodeAuth"] != $_POST["methodeAuth"])) + { + echo "<form method=\"post\" action=\"profil.php\" >\n"; echo "<table><tr><th>Confirmer votre authentification</th></tr>"; - echo "<tr><td>Identifiant : ".$_POST['loginP']."</td></tr>"; + echo "<tr><td>Identifiant : ".stripslashes_if_needed($_POST['loginP'])."</td></tr>"; echo "<tr><td>Mot de passe : <input name=\"pass\" type=\"password\" size=\"20\" /></td></tr>"; echo "<tr><td><input type=\"submit\" /></td></tr>"; echo "</table>"; - echo "<input type=\"hidden\" name=\"loginP\" value=\"".$_POST['loginP']."\"/>\n"; - echo "<input type=\"hidden\" name=\"courrielP\" value=\"".$_POST['courrielP']."\"/>\n"; - echo "<input type=\"hidden\" name=\"nomP\" value=\"".$_POST['nomP']."\"/>\n"; - echo "<input type=\"hidden\" name=\"methodeAuth\" value=\"".$_POST['methodeAuth']."\"/>\n"; - echo "<input type=\"hidden\" name=\"prenomP\" value=\"".$_POST['prenomP']."\"/>\n"; + echo "<input type=\"hidden\" name=\"loginP\" value=\"".stripslashes_if_needed($_POST['loginP'])."\"/>\n"; + echo "<input type=\"hidden\" name=\"courrielP\" value=\"".stripslashes_if_needed($_POST['courrielP'])."\"/>\n"; + echo "<input type=\"hidden\" name=\"nomP\" value=\"".stripslashes_if_needed($_POST['nomP'])."\"/>\n"; + echo "<input type=\"hidden\" name=\"methodeAuth\" value=\"".stripslashes_if_needed($_POST['methodeAuth'])."\"/>\n"; + echo "<input type=\"hidden\" name=\"prenomP\" value=\"".stripslashes_if_needed($_POST['prenomP'])."\"/>\n"; echo "<input type=\"hidden\" name=\"action\" value=\"maj_profil\" />\n"; echo "</form>\n"; + $verif_auth=true; + } } -else +if ($verif_auth==false) { $resultat = mysql_query("SELECT * FROM AWOR_Personne WHERE idP = '".$_SESSION['session_idP']."'"); if($resultat != false) { + if (isset($result_fonc)) + { + if ($result_fonc === true) echo "Les modifications ont été prises en compte."; + if ($result_fonc === false) echo "Erreur de modification de votre compte."; + if ($result_fonc === -1) echo "Erreur, le mot de passe et le login ne sont pas conformes."; + echo "<br/><br/>\n"; + + } $p = mysql_fetch_array($resultat); echo "<form method=\"post\" action=\"profil.php\" onSubmit=\"return verifProfil()\" >\n"; echo "<table summary=\"Formulaire permettant de modifier le profil de l'utilisateur\" >\n"; @@ -71,9 +101,13 @@ else echo "<tr><td>Votre adresse mail :</td><td><input type=\"text\" name=\"courrielP\" id=\"courrielP\" value=\"".htmlentities($p["courrielP"], ENT_QUOTES)."\"/></td></tr>\n"; echo "<tr><td>Votre nom :</td><td><input type=\"text\" name=\"nomP\" id=\"nomP\" value=\"".htmlentities($p["nomP"], ENT_QUOTES)."\"/></td></tr>\n"; echo "<tr><td>Votre prenom :</td><td><input type=\"text\" name=\"prenomP\" id=\"prenomP\" value=\"".htmlentities($p["prenomP"], ENT_QUOTES)."\"/></td></tr>\n"; + echo "<tr><td>Votre choix d'apparence :</td><td>";generate_html_div_css_chooser();echo"</td></tr>\n"; echo "<tr><td colspan=\"2\"><input type=\"submit\" /></td></tr>\n"; echo "</table>\n"; + echo "<input type=\"hidden\" name=\"oldMethodeAuth\" value=\"".$p["methodeAuth"]."\" />\n"; + echo "<input type=\"hidden\" name=\"oldLogin\" value=\"".$p["loginP"]."\" />\n"; echo "<input type=\"hidden\" name=\"pre_action\" value=\"verif_profil\" />\n"; + echo "</form>\n"; echo "</div>\n"; } diff --git a/final/app/script.js b/final/app/script.js index c8c0a06..824dcb6 100644 --- a/final/app/script.js +++ b/final/app/script.js @@ -32,11 +32,19 @@ function switchCSS() { if (listCSS.options.selectedIndex>=0) { - - setActiveStyleSheet(listCSS.options[listCSS.options.selectedIndex].value); + var date_exp = new Date(); + date_exp.setTime(date_exp.getTime()+(365*24*3600*1000)); + document.cookie="aworchoose_css"+"="+listCSS.options[listCSS.options.selectedIndex].value+ + "; expires="+date_exp.toGMTString()+ + "; path=/"; + window.location.reload(); + window.location=document.location; + + } - } + } + } function addAllPers(form) diff --git a/final/doc/Manuel utilisateur.rar b/final/doc/Manuel utilisateur.rar Binary files differnew file mode 100644 index 0000000..1bedc29 --- /dev/null +++ b/final/doc/Manuel utilisateur.rar diff --git a/final/doc/Manuel Utilisateur.pdf b/final/doc/Manuel_Utilisateur.pdf Binary files differindex 29c2b5f..89d6cd6 100644 --- a/final/doc/Manuel Utilisateur.pdf +++ b/final/doc/Manuel_Utilisateur.pdf diff --git a/final/doc/Manuel_Utilisateur2.pdf b/final/doc/Manuel_Utilisateur2.pdf Binary files differnew file mode 100644 index 0000000..b52b413 --- /dev/null +++ b/final/doc/Manuel_Utilisateur2.pdf diff --git a/final/doc/Manuel Utilisateur.odt b/final/doc/Manuel_Utilisateur2.sxw Binary files differindex 4872609..f75ddc9 100644 --- a/final/doc/Manuel Utilisateur.odt +++ b/final/doc/Manuel_Utilisateur2.sxw diff --git a/final/doc/Rapport_final_1e.rar b/final/doc/Rapport_final_1e.rar Binary files differnew file mode 100644 index 0000000..2d27286 --- /dev/null +++ b/final/doc/Rapport_final_1e.rar diff --git a/final/install/base.txt b/final/install/base.txt new file mode 100644 index 0000000..3e090bd --- /dev/null +++ b/final/install/base.txt @@ -0,0 +1,123 @@ +-- +-- Structure de la table `AWOR_Appartenir` +-- + +DROP TABLE IF EXISTS `AWOR_Appartenir`; +CREATE TABLE IF NOT EXISTS `AWOR_Appartenir` ( + `idL` int(11) NOT NULL, + `idP` int(11) NOT NULL, + PRIMARY KEY (`idL`,`idP`) +); + +-- -------------------------------------------------------- + +-- +-- Structure de la table `Choisir` +-- + +DROP TABLE IF EXISTS `AWOR_Choisir`; +CREATE TABLE IF NOT EXISTS `AWOR_Choisir` ( + `idC` int(11) NOT NULL, + `idP` int(11) NOT NULL, + `estDispo` set('oui','non') NOT NULL, + PRIMARY KEY (`idC`,`idP`) +); + +-- -------------------------------------------------------- + +-- +-- Structure de la table `AWOR_Creneau` +-- + +DROP TABLE IF EXISTS `AWOR_Creneau`; +CREATE TABLE IF NOT EXISTS `AWOR_Creneau` ( + `idC` int(11) NOT NULL auto_increment, + `dateHeure` datetime NOT NULL, + `duree` int(11) NOT NULL, + `idR` int(11) NOT NULL, + PRIMARY KEY (`idC`) +); + +-- -------------------------------------------------------- + +-- +-- Structure de la table `AWOR_Fichier` +-- + +DROP TABLE IF EXISTS `AWOR_Fichier`; +CREATE TABLE IF NOT EXISTS `AWOR_Fichier` ( + `idFic` int(11) NOT NULL auto_increment, + `nomFic` varchar(254) NOT NULL, + `idR` int(11) NOT NULL, + PRIMARY KEY (`idFic`) +); + +-- -------------------------------------------------------- + +-- +-- Structure de la table `AWOR_Liste` +-- + +DROP TABLE IF EXISTS `AWOR_Liste`; +CREATE TABLE IF NOT EXISTS `AWOR_Liste` ( + `idL` int(11) NOT NULL auto_increment, + `libelleL` varchar(50) NOT NULL, + `estPrivee` set('oui','non') NOT NULL default 'oui', + `idP_Createur` int(11) default NULL, + PRIMARY KEY (`idL`) +); + +-- -------------------------------------------------------- + +-- +-- Structure de la table `AWOR_Personne` +-- + +DROP TABLE IF EXISTS `AWOR_Personne`; +CREATE TABLE IF NOT EXISTS `AWOR_Personne` ( + `idP` int(11) NOT NULL auto_increment, + `courrielP` varchar(50) NOT NULL, + `loginP` varchar(50) default NULL, + `nomP` varchar(50) NOT NULL, + `prenomP` varchar(50) NOT NULL, + `estAdmin` set('oui','non') NOT NULL default 'non', + `methodeAuth` set('pop','webetud','bypass') NOT NULL default 'pop', + PRIMARY KEY (`idP`), + UNIQUE KEY `loginP` (`loginP`), + UNIQUE KEY `courrielP` (`courrielP`) +); + +-- -------------------------------------------------------- + +-- +-- Structure de la table `AWOR_Repondre` +-- + +DROP TABLE IF EXISTS `AWOR_Repondre`; +CREATE TABLE IF NOT EXISTS `AWOR_Repondre` ( + `idR` int(11) NOT NULL, + `idP` int(11) NOT NULL, + `commentaireReponse` blob(500) default NULL, + PRIMARY KEY (`idR`,`idP`) +); + +-- -------------------------------------------------------- + +-- +-- Structure de la table `Reunion` +-- + +DROP TABLE IF EXISTS `AWOR_Reunion`; +CREATE TABLE IF NOT EXISTS `AWOR_Reunion` ( + `idR` int(11) NOT NULL auto_increment, + `objetR` varchar(80) NOT NULL, + `ordreJourR` varchar(250), + `lieuR` varchar(50), + `remarquesR` blob(500), + `montrerDispoR` set('oui','non') NOT NULL default 'non', + `estAnnulee` set('oui','non') NOT NULL default 'non', + `idP_Orga` int(11) NOT NULL, + `idC_Fixe` int(11) default NULL, + `idL` int(11) default NULL, + PRIMARY KEY (`idR`) +); |