From 690ffeb4da55ba66ffc76abdb9e91c7a3b5f190a Mon Sep 17 00:00:00 2001 From: x2000gommard Date: Tue, 3 Feb 2004 09:51:09 +0000 Subject: [PATCH] =?utf8?q?Anonymisation=20du=20site=20:=20.bandeau=20publi?= =?utf8?q?cit=E9=20de=20la=20page=20de=20login=20.menu.inc.php=20->=20menu?= =?utf8?q?.conf.php=20.validation=20des=20aliases?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit ! Ajout de données de config dans config.xorg.inc.php --- configs/login.conf.php | 19 ++++++++++++ configs/menu.conf.php | 67 ++++++++++++++++++++++++++++++++++++++++++ configs/valid.conf.php | 57 +++++++++++++++++++++++++++++++++++ htdocs/login.php | 33 ++++++++++----------- include/auto.prepend.inc.php | 3 +- include/valid_aliases.inc.php | 49 ++++++++++++------------------ include/valid_emploi.inc.php | 6 ++-- include/valid_epouses.inc.php | 6 ++-- include/valid_evts.inc.php | 6 ++-- include/valid_ml.inc.php | 10 +++---- include/valid_photos.inc.php | 6 ++-- include/valid_sondages.inc.php | 8 ++--- install.d/config.xorg.inc.php | 8 ++++- templates/skin/default.tpl | 4 +-- 14 files changed, 208 insertions(+), 74 deletions(-) create mode 100644 configs/login.conf.php create mode 100644 configs/menu.conf.php create mode 100644 configs/valid.conf.php diff --git a/configs/login.conf.php b/configs/login.conf.php new file mode 100644 index 0000000..54ef765 --- /dev/null +++ b/configs/login.conf.php @@ -0,0 +1,19 @@ + "Changer mon mot de passe" , + "dons.php" => "Faire un don à l'association Polytechnique.org" + ) ; + +// Liens apparaissant de façon aléatoire +$pub_rnd = array( + "newsletter.php?nl_id=$nb" => "Afficher la dernière newsletter" , + "http://asso.polytechnique.org\" target=\"new" => "Vers les autres sites polytechniciens" , + "trombipromo.php?xpromo={$_SESSION["promo"]}" => "Voir le trombi de ma promo" , + "banana/" => "Un petit tour du côté des forums !!" + ) ; +?> diff --git a/configs/menu.conf.php b/configs/menu.conf.php new file mode 100644 index 0000000..53a777f --- /dev/null +++ b/configs/menu.conf.php @@ -0,0 +1,67 @@ + Array( 'Page d\'accueil' => 'login.php' ), + 'Personnaliser' => Array( + 'Mes emails' => 'emails.php' , + 'Mon profil' => '###url###' , + 'Mes contacts' => '###url###' , + 'Mon mot de passe' => 'motdepassemd5.php' , + 'Mes préférences' => 'preferences.php' + ), + 'Services' => Array ( + 'Envoyer un mail' => '###url###' , + 'Forums & PA' => '###url###' , + 'Listes de diffusion' => '###url###' , + 'Micropaiements' => '###url###' , + 'Patte cassée' => '###url###' , + 'Sondages' => '###url###' + ), + 'Communauté X' => Array ( + 'Annuaire' => '###url###', + 'Trombi promo' => '###url###', + 'Groupes X' => '###url###', + 'Sites Polytechniciens' => '###url###' + ), + 'Informations' => Array ( + 'Lettres mensuelles' => '###url###', + 'Documentation' => '###url###', + 'Nous contacter ' => "docs/contacts.php", + 'Emploi' => '###url###' + ) + ); + + if(identified()) { + $menu[0] = array_merge( Array('Déconnexion' => 'deconnexion.php'), $menu[0] ); + } + + if(has_perms()) { + $menu['***'] = Array ( + 'Marketing' => '###url###', + 'Administration' => '###url###', + 'Trackers' => '###url###', + 'Documentations' => 'docs/', + 'Clear cache' => 'clear_all_cache.php' + ); + } +} else { + $menu = Array( + 'Polytechniciens' => Array( + 'Me connecter !' => "login.php", + 'M\'inscrire' => "###url###" + ), + 'Visiteurs' => Array( + 'Annuaire de l\'X' => "###url###", + 'Associations X' => "###url###", + 'Recrutement' => "###url###" + ), + 'Informations' => Array( + 'A propos du site' => "docs/apropos.php", + 'Nous contacter ' => "docs/contacts.php", + 'FAQ' => "###url###" + ) + ); +} +$this->assign_by_ref('menu', $menu); +?> diff --git a/configs/valid.conf.php b/configs/valid.conf.php new file mode 100644 index 0000000..4574629 --- /dev/null +++ b/configs/valid.conf.php @@ -0,0 +1,57 @@ +domaine_mail_alias[0] ; +} + +function from_mail_valid_alias() { + global $globals ; + return "Equipe Polytechnique.org <".$globals->addr_mail_valid_alias.">" ; +} + +function to_mail_valid_alias ($nomUser) { + global $globals ; + return $nomUser.'@'.$globals->domaine_mail ; +} + +function subject_mail_valid_alias ($nomUser,$nomAlias) { + global $globals ; + return "[Polytechnique.org/MELIX] Demande de l'alias ". + addr_alias($nomAlias)." par $nomUser" ; +} + +function cc_mail_valid_alias() { + global $globals ; + return $globals->addr_mail_valid_alias ; +} + +function msg_valid_alias_OK ($nomAlias) { + global $globals ; + $msg = "Cher(e) camarade,\n". + "\n". + " Les adresses e-mail $nomAlias@melix.net et $nomAlias@melix.org que ". + "tu avais demandées viennent d'être créées, tu peux désormais les ". + "utiliser à ta convenance.\n". + "\n". + "Cordialement,\n". + "L'équipe X.org" ; + return $msg ; +} + +function msg_valid_alias_NON ($nomAlias,$motif) { + global $globals ; + $msg = "Cher(e) camarade,\n". + "\n". + " La demande que tu avais faite pour les alias $nomAlias@melix.net et $nomAlias@melix.org ". + "a été refusée pour la raison suivante :\n". + $motif. + "\n". + "Cordialement,\n". + "L'équipe X.org" ; + return $msg ; +} + +?> diff --git a/htdocs/login.php b/htdocs/login.php index 4dfe1a5..d029be7 100644 --- a/htdocs/login.php +++ b/htdocs/login.php @@ -29,31 +29,28 @@ if (mysql_num_rows($res) == 0) mysql_free_result($res); // affichage de la boîte avec quelques liens + $res = mysql_query("SELECT id FROM newsletter ORDER BY date DESC"); list($nb) = mysql_fetch_row($res); mysql_free_result($res); -$publicite = Array(Array(), Array()); -$publicite[0]["motdepassemd5.php"] = "Changer mon mot de passe"; -$i = rand(0, 1); -switch ($i) { - case 0 : - $publicite[0]["newsletter.php?nl_id=$nb"]="Afficher la dernière newsletter"; break; - case 1 : - $publicite[0]["http://asso.polytechnique.org\" target=\"new"]="Vers les autres sites polytechniciens"; break; -} -$i = rand(0, 1); -switch ($i) { - case 0 : - $publicite[1]["trombipromo.php?xpromo={$_SESSION["promo"]}"]="Voir le trombi de ma promo"; break; - case 1 : - $publicite[1]["banana/"]="Un petit tour du côté des forums !!"; break; -} -$publicite[1]["dons.php"] = "Faire un don à l'association Polytechnique.org"; +include('login.conf.php') ; +$pub_nbElem = $pub_nbLig * $pub_nbCol ; +if (count($pub_tjs) <= $pub_nbElem) + $publicite = array_slice ($pub_tjs,0,$pub_nbElem) ; +else + $publicite = $pub_tjs ; +$nbAlea = $pub_nbElem - count($publicite) ; +if ($nbAlea > 0) { + $choix = array_rand($pub_rnd,$nbAlea) ; + foreach ($choix as $url) + $publicite[$url] = $pub_rnd[$url] ; + } +$publicite = array_chunk( $publicite , $pub_nbLig , true ) ; $page->assign_by_ref('publicite', $publicite); -//affichage des evenements +// affichage des evenements // annonces promos triées par présence d'une limite sur les promos // puis par dates croissantes d'expiration $res = mysql_query( diff --git a/include/auto.prepend.inc.php b/include/auto.prepend.inc.php index b8b01dc..cdfb162 100644 --- a/include/auto.prepend.inc.php +++ b/include/auto.prepend.inc.php @@ -1,5 +1,6 @@ root}/include/:{$globals->root}/configs/:$globals->libroot") ; setlocale(LC_TIME, "fr_FR"); require("xorg.common.inc.php"); diff --git a/include/valid_aliases.inc.php b/include/valid_aliases.inc.php index 50ca85d..f2e75ca 100644 --- a/include/valid_aliases.inc.php +++ b/include/valid_aliases.inc.php @@ -1,4 +1,5 @@ old ? "({$this->old})" : ""; $raison = nl2br(stripslashes(htmlentities($this->raison))); + $newAlias = addr_alias( $this->alias ) ; return <<<________EOF
- - - + + + - + @@ -76,35 +78,20 @@ ________EOF; return false; require_once("diogenes.mailer.inc.php"); - $mxnet = $this->alias."@melix.net"; - $mxorg = $this->alias."@melix.org"; - $mymail = new DiogenesMailer('Equipe Polytechnique.org ', - $this->username."@polytechnique.org", - "[Polytechnique.org/MELIX] Demande de l'alias $mxnet par ".$this->username, - false, "validation+melix@m4x.org"); - - $message = - "Cher(e) camarade,\n". - "\n"; + $mymail = new DiogenesMailer( + from_mail_valid_alias(), + to_mail_valid_alias( $this->username ), + subject_mail_valid_alias( $this->username , $this->alias ), + false, + cc_mail_valid_alias()); if($_REQUEST['submit']=="Accepter") { - $this->commit(); - $message .= - " Les adresses e-mail $mxnet et $mxorg que tu avais demandées viennent". - " d'être créées, tu peux désormais les utiliser à ta convenance.\n"; - } else { - $message .= - "La demande que tu avais faite pour les alias $mxnet et $mxorg a été refusée.\n"; - if (!empty($_REQUEST["motif"])) - $message .= "\nLa raison de ce refus est : \n". - stripslashes($_REQUEST["motif"])."\n"; - } + $this->commit() ; + $message = msg_valid_alias_OK( $this->alias ) ; + } else + $message = msg_valid_alias_NON( $this->alias , stripslashes($_REQUEST["motif"]) ) ; - $message .= - "\n". - "Cordialement,\n". - "L'équipe X.org"; $message = wordwrap($message,78); $mymail->setBody($message); $mymail->send(); @@ -117,9 +104,9 @@ ________EOF; global $no_update_bd; if($no_update_bd) return false; + $domain=addr_alias( $this->alias ) ; mysql_query("DELETE FROM groupex.aliases WHERE id=12 AND email='{$this->username}'"); - mysql_query("INSERT INTO groupex.aliases SET email='{$this->username}',domain='" - .$this->alias."@melix.net',id=12"); + mysql_query("INSERT INTO groupex.aliases SET email='{$this->username}',domain='$domain',id=12"); } } diff --git a/include/valid_emploi.inc.php b/include/valid_emploi.inc.php index 30726c5..f1df165 100644 --- a/include/valid_emploi.inc.php +++ b/include/valid_emploi.inc.php @@ -25,9 +25,9 @@ class EmploiReq extends Validate { $texte = wordwrap($this->text, 80); return <<<________EOF - - - + + +
Demandeur : @@ -43,7 +45,7 @@ class AliasReq extends Validate {
Nouvel alias :{$this->alias}@melix.net{$newAlias}
Motif :
diff --git a/include/valid_epouses.inc.php b/include/valid_epouses.inc.php index 954819d..1d92114 100644 --- a/include/valid_epouses.inc.php +++ b/include/valid_epouses.inc.php @@ -54,9 +54,9 @@ ________EOF; return <<<________EOF - - - + + +
diff --git a/include/valid_evts.inc.php b/include/valid_evts.inc.php index 6f44e1e..e935129 100644 --- a/include/valid_evts.inc.php +++ b/include/valid_evts.inc.php @@ -38,9 +38,9 @@ class EvtReq extends Validate { function formu() { return <<<________EOF - - - + + +
Demandeur :
diff --git a/include/valid_ml.inc.php b/include/valid_ml.inc.php index a1322aa..2ae23ca 100644 --- a/include/valid_ml.inc.php +++ b/include/valid_ml.inc.php @@ -63,9 +63,9 @@ class MListReq extends Validate { return <<<________EOF - - - + + +
@@ -84,12 +84,12 @@ class MListReq extends Validate { Alias : - diff --git a/include/valid_photos.inc.php b/include/valid_photos.inc.php index 15c0375..64dae9f 100644 --- a/include/valid_photos.inc.php +++ b/include/valid_photos.inc.php @@ -57,9 +57,9 @@ class PhotoReq extends Validate { $url_app = isset($_COOKIE[session_name()]) ? "" : "&".SID; return <<<________EOF - - - + + +
Demandeur : - @polytechnique.org + @polytechnique.org
Topic : +
diff --git a/include/valid_sondages.inc.php b/include/valid_sondages.inc.php index 67a9c32..1e1b46c 100644 --- a/include/valid_sondages.inc.php +++ b/include/valid_sondages.inc.php @@ -33,9 +33,9 @@ class SondageReq extends Validate { $url = "$baseurl/sondage/questionnaire.php?SID=".$this->sid; return <<<________EOF - - - + + +
Demandeur :
- diff --git a/install.d/config.xorg.inc.php b/install.d/config.xorg.inc.php index 0658697..486df81 100644 --- a/install.d/config.xorg.inc.php +++ b/install.d/config.xorg.inc.php @@ -1,5 +1,5 @@ dbhost; // recherche.php : 303 $dbuser = $globals->dbuser; $dbpwd = $globals->dbpwd; $xdat = $globals->dbdb; + +/* domaines et mails utilisés */ +$globals->domaine_mail='domaine.org' ; +$globals->domaine_mail_alias=array('alias.net','alias.org') ; // seul le 1er apparaît dans la BD +$globals->addr_mail_valid_alias='validation+alias@'.$globals->domaine_mail ; + ?> diff --git a/templates/skin/default.tpl b/templates/skin/default.tpl index f68aa6b..760572c 100644 --- a/templates/skin/default.tpl +++ b/templates/skin/default.tpl @@ -1,4 +1,4 @@ -{* $Id: default.tpl,v 1.4 2004-01-26 22:59:05 x2000habouzit Exp $ *} +{* $Id: default.tpl,v 1.5 2004-02-03 09:52:09 x2000gommard Exp $ *} @@ -27,7 +27,7 @@
Demandeur : @@ -56,7 +56,7 @@ class SondageReq extends Validate {
Alias du sondage : (ne doit +  (ne doit pas contenir le caractère ')
[ LOGO ]