From 06a388283eb84b5833ed866d43b55cbac3cce52b Mon Sep 17 00:00:00 2001 From: pyg77 Date: Thu, 23 Jun 2011 16:52:10 +0200 Subject: [PATCH] nombreuses modifs : cf changelog 22 et 23 juin --- .gitignore | 2 ++ CHANGELOG | 15 +++++++++++++++ admin/index.php | 8 ++++++-- adminstuds.php | 35 +++++++++++++++++++++++++++------- bandeaux.php | 19 ++++++++++++++---- choix_autre.php | 2 ++ choix_date.php | 1 + contacts.php | 2 ++ creation_sondage.php | 6 +++--- favicon.ico | Bin 1150 -> 1150 bytes images/logo-framadate.png | Bin 0 -> 7339 bytes images/logo-framadate.xcf | Bin 0 -> 26869 bytes index.php | 2 ++ infos_sondage.php | 2 ++ scripts/nettoyage_sondage.php | 7 +++++-- studs.php | 5 +++-- style.css | 13 ++++++++----- 17 files changed, 94 insertions(+), 25 deletions(-) create mode 100644 images/logo-framadate.png create mode 100644 images/logo-framadate.xcf diff --git a/.gitignore b/.gitignore index ac4896f..ec542fe 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ variables.php admin/.htaccess admin/.htpasswd admin/logs_studs.txt +framanav + diff --git a/CHANGELOG b/CHANGELOG index e5d9916..a999e2e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,20 @@ Les dernières améliorations d'OpenSondage + Changelog des 22 et 23 juin (pyg@framasoft.net) + - très nombreuses modifications CSS + - ajout de buttons.css pour des boutons plus propres + - ajout de print.css pour une impression sans la classe "corps" + - refonte de la page d'accueil + - ajout de la framanav + - qq retouches dans les fichiers .po + - date de destruction passée de 2j à 30j + - ajout de l'adresse à transmettre + - ajout d'un bouton imprimer + - généralisation des stripslashes + - fix d'un bug sur une requete (suppression). Reste la seconde partie : https://github.com/leblanc-simon/OpenSondage/issues/8 + - modification du titre en image + - ajout de htmlspecialchars_decode avec param ENT_QUOTES pour l'envoi des emails + Changelog du 21 juin 2011 (pyg@framasoft.net) - très nombreuses modifications CSS - modification adminstuds.php : ajout de classes aux formulaires et ajout de stripslashes à l'affichage (TODO: à généraliser) diff --git a/admin/index.php b/admin/index.php index dc4a77e..2fc0d12 100644 --- a/admin/index.php +++ b/admin/index.php @@ -38,6 +38,7 @@ //========================================================================== + session_start(); include_once('../variables.php'); @@ -59,10 +60,12 @@ echo ''."\n"; echo ''."\n"; //Affichage des bandeaux et début du formulaire +framanav(); logo(); bandeau_tete(); bandeau_titre(_("Polls administrator")); sous_bandeau_admin(); +//print_r($_SESSION); $sondage=$connect->Execute("select * from sondage"); @@ -114,7 +117,7 @@ while($dsondage = $sondage->FetchNextObject(false)) { $user_studs=$connect->Execute( "select * from user_studs where id_sondage='$dsondage->id_sondage'"); $nbuser=$user_studs->RecordCount(); - echo ''.$dsondage->id_sondage.''.$dsondage->format.''.$dsondage->titre.''.$dsondage->nom_admin.''; + echo ''.$dsondage->id_sondage.''.$dsondage->format.''. stripslashes($dsondage->titre).''.stripslashes($dsondage->nom_admin).''; if (strtotime($dsondage->date_fin) > time()) { echo ''.date("d/m/y",strtotime($dsondage->date_fin)).''; @@ -124,7 +127,7 @@ while($dsondage = $sondage->FetchNextObject(false)) { echo''.$nbuser.''."\n"; echo ''. _("See the poll") .''."\n"; - echo ''. _("Change the poll") .''."\n"; + echo ''. _("Change the poll") .''."\n"; echo ''."\n"; echo ''."\n"; @@ -135,6 +138,7 @@ echo ''."\n"; echo''."\n"; // fin du formulaire et de la page web echo ''."\n"; +echo '
 
'; echo ''."\n"; echo ''."\n"; diff --git a/adminstuds.php b/adminstuds.php index 683ccb6..99833cf 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -78,10 +78,12 @@ if (preg_match(";[\w\d]{24};i", $numsondageadmin)) { if (!$sondage || $sondage->RecordCount() != 1){ print_header(false); echo ''."\n"; - + framanav(); logo(); bandeau_tete(); bandeau_titre(_("Error!")); + + echo '
'."\n"; print "

" . _("This poll doesn't exist !") . "



"."\n"; print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION.". "."\n"; @@ -183,12 +185,17 @@ $dsondage=$sondage->FetchObject(false); if (isset($_POST["ajoutsujet"]) || isset($_POST["ajoutsujet_x"])) { print_header(true); echo ''."\n"; + framanav(); logo(); bandeau_tete(); bandeau_titre(_("Make your polls")); sous_bandeau(); //on recupere les données et les sujets du sondage + + echo '
'."\n"; + + echo '
'."\n"; echo '
'."\n"; @@ -258,6 +265,10 @@ if (isset($_POST["ajoutsujet"]) || isset($_POST["ajoutsujet_x"])) { echo '



'."\n"; echo '
'."\n"; + echo '
'."\n"; + echo '
 
'; + + bandeau_pied(); echo''."\n"; @@ -291,10 +302,11 @@ if (isset($_POST["confirmesuppression"]) || isset($_POST["confirmesuppression_x" //affichage de l'ecran de confirmation de suppression de sondage print_header(); echo ''."\n"; + framanav(); logo(); bandeau_tete(); bandeau_titre(_("Make your polls")); - + echo '
'."\n"; print "

" . _("Your poll has been removed!") . "



"; print _("Back to the homepage of ") . " ".NOMAPPLICATION."."."\n"; @@ -342,10 +354,14 @@ if(isset($_POST['ajoutcomment']) || isset($_POST['ajoutcomment_x'])) { // DEBUT DE L'AFFICHAGE DE LA PAGE HTML print_header(true); echo ''."\n"; +framanav(); logo(); bandeau_tete(); bandeau_titre(_("Make your polls")); sous_bandeau(); + +echo '
'."\n"; + echo '
'."\n"; @@ -354,14 +370,14 @@ $titre=str_replace("\\","",$dsondage->titre); echo '

'.$titre.'

'."\n"; //affichage du nom de l'auteur du sondage -echo _("Initiator of the poll") .' : '.$dsondage->nom_admin.'
'."\n"; +echo _("Initiator of the poll") .' : '.stripslashes($dsondage->nom_admin).'
'."\n"; //affichage des commentaires du sondage if ($dsondage->commentaires){ echo '
'. _("Comments") .' :
'."\n"; $commentaires=$dsondage->commentaires; $commentaires=str_replace("\\","",$commentaires); - echo nl2br($commentaires); + echo stripslashes(nl2br($commentaires)); echo '
'."\n"; } echo '
'."\n"; @@ -698,6 +714,7 @@ if ($sondage !== false) { } else { print_header(false); echo ''."\n"; + framanav(); logo(); bandeau_tete(); bandeau_titre(_("Error!")); @@ -706,6 +723,8 @@ if ($sondage !== false) { print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION.". "."\n"; echo '



'."\n"; echo '
'."\n"; + + bandeau_pied(); echo''."\n"; echo ''."\n"; @@ -871,7 +890,7 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { echo ''."\n"; for ($i = 0; isset($toutsujet[$i]); $i++) { - echo ''.$toutsujet[$i].''."\n"; + echo ''.stripslashes($toutsujet[$i]).''."\n"; } echo ''."\n"; @@ -891,7 +910,7 @@ while ($data = $user_studs->FetchNextObject(false)) { //affichage du nom $nombase=str_replace("°","'",$data->nom); - echo ''.$nombase.''."\n"; + echo ''.stripslashes($nombase).''."\n"; //si la ligne n'est pas a changer, on affiche les données if (!$testligneamodifier) { @@ -1152,7 +1171,7 @@ if ($comment_user->RecordCount() != 0) { $i = 0; while ( $dcomment=$comment_user->FetchNextObject(false)) { - print " $dcomment->usercomment : $dcomment->comment
"; + print " ". stripslashes($dcomment->usercomment) ." : ".stripslashes($dcomment->comment) ."
"; $i++; } @@ -1201,6 +1220,8 @@ echo '

'."\n"; //fin de la partie GESTION et beandeau de pied echo '

'."\n"; +echo '
'; +echo '
 
'; bandeau_pied_mobile(); echo ''."\n"; echo ''."\n"; diff --git a/bandeaux.php b/bandeaux.php index f759a84..ca4e19f 100644 --- a/bandeaux.php +++ b/bandeaux.php @@ -40,6 +40,17 @@ // pour get_server_name() include_once('fonctions.php'); +function framanav() +{ + if (file_exists($_SERVER['DOCUMENT_ROOT']."/framanav/nav.inc.html")) { + echo "\n".' '."\n";; + echo ''."\n"; + include_once($_SERVER['DOCUMENT_ROOT']."/framanav/nav.inc.html"); + echo ' '."\n"; + } +} + + //le logo function logo () { @@ -52,7 +63,7 @@ function logo () #le bandeau principal function bandeau_tete() { - echo '
Framadate
'."\n"; + echo '
'.NOMAPPLICATION.'
'."\n"; } @@ -95,13 +106,13 @@ function sous_bandeau() function sous_bandeau_admin() { echo '
' . - ''. _("Home") .''; + ''. _("Home") .''; if(is_readable('logs_studs.txt')) { - echo ''. _("Logs") .''; + echo ''. _("Logs") .''; } - echo ''. _("Cleaning") .'' . + echo ''. _("Cleaning") .'' . '' . liste_lang() . ''. '
'."\n"; diff --git a/choix_autre.php b/choix_autre.php index 9a787d0..93a8e85 100644 --- a/choix_autre.php +++ b/choix_autre.php @@ -56,6 +56,7 @@ if (issetAndNoEmpty('titre', $_SESSION) === false || issetAndNoEmpty('nom', $_SE echo ''."\n"; echo ''."\n"; echo ''."\n"; + framanav(); logo(); bandeau_tete(); bandeau_titre(_("Error!")); @@ -137,6 +138,7 @@ if (issetAndNoEmpty('titre', $_SESSION) === false || issetAndNoEmpty('nom', $_SE print_header(); echo ''."\n"; + framanav(); echo '
'."\n"; logo(); diff --git a/choix_date.php b/choix_date.php index 307fa2d..b58e4ca 100644 --- a/choix_date.php +++ b/choix_date.php @@ -57,6 +57,7 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) echo ''."\n"; echo ''."\n"; echo ''."\n"; + framanav(); logo(); bandeau_tete(); bandeau_titre(_("Error!")); diff --git a/contacts.php b/contacts.php index e163b34..a7b1842 100644 --- a/contacts.php +++ b/contacts.php @@ -97,6 +97,8 @@ if ((isset($_POST['envoiquestion']) || isset($_POST['envoiquestion_x'])) && isse echo ''."\n"; echo ''."\n"; echo ''."\n"; + +framanav(); //debut du formulaire echo ''."\n"; diff --git a/creation_sondage.php b/creation_sondage.php index 8e0c863..2ab07e8 100644 --- a/creation_sondage.php +++ b/creation_sondage.php @@ -108,7 +108,7 @@ function ajouter_sondage() $message = _("This is the message you have to send to the people you want to poll. \nNow, you have to send this message to everyone you want to poll."); $message .= "\n\n"; - $message .= stripslashes($_SESSION["nom"])." " . _("hast just created a poll called") . " : \"".stripslashes($_SESSION["titre"])."\".\n"; + $message .= stripslashes(htmlspecialchars_decode($_SESSION["nom"],ENT_QUOTES))." " . _("hast just created a poll called") . " : \"".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES))."\".\n"; $message .= _("Thanks for filling the poll at the link above") . " :\n\n%s\n\n" . _("Thanks for your confidence") . ",\n".NOMAPPLICATION; $message_admin = _("This message should NOT be sended to the polled people. It is private for the poll's creator.\n\nYou can now modify it at the link above"); @@ -118,8 +118,8 @@ function ajouter_sondage() $message_admin = sprintf($message_admin, getUrlSondage($sondage_admin, true)); if (validateEmail($_SESSION['adresse'])) { - mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), $message_admin, $headers); - mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), $message, $headers); + mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message_admin, $headers); + mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message, $headers); } $date=date('H:i:s d/m/Y:'); diff --git a/favicon.ico b/favicon.ico index 551344a2f254a5e1513c3f2f2ff91aff75e4c222..ded95854f1dd9b33b34aa3e474e985a07cbf1464 100644 GIT binary patch literal 1150 zcmbtTJ4gdT6x_ogh!(NX)|6UVMC=3`L2NASY;A;87M3X@CL*y4ilm4H4n;j7TG&_^ zF&qdgl0wD8K(x3*@Po)1B#b-9Ei9sf?j4i7%$s@l^7fq&mb{};A+MO2jtJ2$qh1M8 zF$pX96k=HBzPYSGLYc&4t=3<)?Ulo1@_Ij!Xb_CaF{f+w_`~$7a53ZF zBd&OASc4vN{7>wQwfWn7Mc3dO%3>bSF}4ZkVf+;*kt|);RYN%!VFyMx3$I z{`5V%ffD`8rh8+` literal 1150 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 R1Bw6u002ovPDHLkV1lmOP!IqB literal 0 HcmV?d00001 diff --git a/images/logo-framadate.xcf b/images/logo-framadate.xcf new file mode 100644 index 0000000000000000000000000000000000000000..871886eac814aedc20f68bb099386f1facce4775 GIT binary patch literal 26869 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 literal 0 HcmV?d00001 diff --git a/index.php b/index.php index cb986cb..adb6a6e 100644 --- a/index.php +++ b/index.php @@ -56,6 +56,8 @@ echo ''."\n"; echo ''."\n"; echo ''."\n"; +framanav(); + //debut du formulaire echo ''."\n"; diff --git a/infos_sondage.php b/infos_sondage.php index ba506d5..9c56dea 100644 --- a/infos_sondage.php +++ b/infos_sondage.php @@ -147,6 +147,8 @@ if (issetAndNoEmpty("poursuivre")){ //affichage de la page print_header(true); echo ''."\n"; +framanav(); + //affichage des bandeaux de tete logo(); bandeau_tete(); diff --git a/scripts/nettoyage_sondage.php b/scripts/nettoyage_sondage.php index 280ac7f..b905c5f 100644 --- a/scripts/nettoyage_sondage.php +++ b/scripts/nettoyage_sondage.php @@ -49,10 +49,13 @@ $sondage=$connect->Execute("select * from sondage"); while ($dsondage=$sondage->FetchNextObject(false)) { if ($date_courante > strtotime($dsondage->date_fin)) { //destruction des données dans la base - $connect->Execute('DELETE FROM sondage LEFT INNER JOIN sujet_studs ON sujet_studs.id_sondage = sondage.id_sondage '. + + $req = 'DELETE FROM sondage LEFT INNER JOIN sujet_studs ON sujet_studs.id_sondage = sondage.id_sondage '. 'LEFT INNER JOIN user_studs ON user_studs.id_sondage = sondage.id_sondage ' . 'LEFT INNER JOIN comments ON comments.id_sondage = sondage.id_sondage ' . - "WHERE id_sondage = '$dsondage->id_sondage' "); + "WHERE id_sondage = '$dsondage->id_sondage'; "; + echo $req; + $connect->Execute($req); // ecriture des traces dans le fichier de logs error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", '../admin/logs_studs.txt'); } diff --git a/studs.php b/studs.php index 27a80fb..a62e3d5 100644 --- a/studs.php +++ b/studs.php @@ -173,8 +173,8 @@ if (!is_error(NO_POLL) && (isset($_POST["boutonp"]) || isset($_POST["boutonp_x"] if ($dsondage->mailsonde || /* compatibility for non boolean DB */ $dsondage->mailsonde=="yes" || $dsondage->mailsonde=="true") { $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; mail ("$dsondage->mail_admin", - "[".NOMAPPLICATION."] "._("Poll's participation")." : $dsondage->titre", - "\"$nom\" ". + "[".NOMAPPLICATION."] "._("Poll's participation")." : ".htmlspecialchars_decode($dsondage->titre, ENT_QUOTES).",". + htmlspecialchars_decode("\"$nom\" ",ENT_QUOTES). _("has filled a line.\nYou can find your poll at the link") . " :\n\n". getUrlSondage($numsondage)." \n\n" . _("Thanks for your confidence.") . "\n". NOMAPPLICATION, @@ -188,6 +188,7 @@ if (!is_error(NO_POLL) && (isset($_POST["boutonp"]) || isset($_POST["boutonp_x"] print_header(true, $dsondage->titre); echo ''."\n"; +framanav(); logo(); bandeau_tete(); bandeau_titre(_("Make your polls")); diff --git a/style.css b/style.css index b5e1b3f..77f07b4 100644 --- a/style.css +++ b/style.css @@ -82,11 +82,12 @@ div.bandeau{ font-size:42px; font-family:arial; padding:8px; - height:50px; + height:40px; position:static; top:6px; left:6px; right:6px; + padding-top:35px; } @@ -102,6 +103,7 @@ div.logo{ margin-left: 0; margin-right:0; margin-bottom:auto; + padding-top: 30px; } /*Sous bandeau avec bouton de navigation*/ div.bandeautitre{ @@ -201,7 +203,7 @@ div.bandeaupiedmobile{ */ span.sousbandeaulangue { margin-left:6px; - margin-right:20px; + margin-right:90px; float:right; } @@ -231,8 +233,7 @@ span.sousbandeaulangue { div.corps table{ - font-size:12px; - font-weight:bold; + font-size:12px; } div.corpscentre{ font-size:12px; @@ -556,7 +557,9 @@ li.error { .index_date .opacity, .index_sondage .opacity { opacity: 0.6; } - +.button img { + vertical-align: middle; +} .index_date img:hover, .index_sondage img:hover { opacity: 1; cursor: pointer;