* Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************
- $Id: trombino.php,v 1.2 2004-08-31 10:03:28 x2000habouzit Exp $
+ $Id: trombino.php,v 1.3 2004-09-02 21:09:31 x2000habouzit Exp $
***************************************************************************/
require("auto.prepend.inc.php");
}
} elseif (isset($_REQUEST["trombi"])) {
// Fichier à récupérer dans les archives trombi + commit immédiat
- $file = "/home/web/trombino/photos".$_SESSION["promo"]."/".$_SESSION["username"].".jpg";
+ $file = "/home/web/trombino/photos".$_SESSION["promo"]."/".$_SESSION["forlife"].".jpg";
$myphoto = new PhotoReq($_SESSION['uid'], $file);
$myphoto->commit();
$myphoto->clean();
* Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************
- $Id: valid_epouses.inc.php,v 1.15 2004-09-01 22:51:00 x2000habouzit Exp $
+ $Id: valid_epouses.inc.php,v 1.16 2004-09-02 21:09:32 x2000habouzit Exp $
***************************************************************************/
class EpouseReq extends Validate {
var $epouse;
var $alias;
- var $username;
+ var $forlife;
var $oldepouse;
var $oldalias;
var $homonyme;
- function EpouseReq ($_uid, $_username, $_epouse, $_stamp=0) {
+ function EpouseReq ($_uid, $_forlife, $_epouse, $_stamp=0) {
global $globals;
$this->Validate($_uid, true, 'epouse', $_stamp);
$this->epouse = $_epouse;
- $this->username = $_username;
+ $this->forlife = $_forlife;
- list($prenom) = explode('.',$_username);
- $this->alias = make_username($prenom,$this->epouse);
+ list($prenom) = explode('.',$_forlife);
+ $this->alias = make_forlife($prenom,$this->epouse);
if(empty($_epouse)) $this->alias = "";
- $sql = $globals->db->query("select u1.alias, u1.epouse, u1.prenom, u1.nom"
- .", IFNULL(u2.username,u3.username)"
- ." FROM auth_user_md5 as u1"
- ." LEFT JOIN auth_user_md5 as u2"
- ." ON(u2.username = '{$this->alias}' and u2.user_id != u1.user_id)"
- ." LEFT JOIN auth_user_md5 as u3"
- ." ON(u3.alias = '{$this->alias}' and u3.user_id != u1.user_id)"
- ." WHERE u1.user_id = ".$this->uid);
+ $sql = $globals->db->query("
+ SELECT u.alias, u.epouse, u.prenom, u.nom, a.id
+ FROM auth_user_md5 as u
+ LEFT JOIN aliases as a ON(a.alias = '{$this->alias}' and a.id != u.user_id)
+ WHERE u.user_id = ".$this->uid);
list($this->oldalias, $this->oldepouse, $this->prenom, $this->nom, $this->homonyme) = mysql_fetch_row($sql);
mysql_free_result($sql);
}
require_once("tpl.mailer.inc.php");
$mymail = new TplMailer('valid.epouses.tpl');
- $mymail->assign('username', $this->username);
+ $mymail->assign('forlife', $this->forlife);
if($_REQUEST['submit']=="Accepter") {
$mymail->assign('answer','yes');
* Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************
- $Id: valid_evts.inc.php,v 1.10 2004-08-31 11:16:48 x2000habouzit Exp $
+ $Id: valid_evts.inc.php,v 1.11 2004-09-02 21:09:32 x2000habouzit Exp $
***************************************************************************/
var $peremption;
var $comment;
- var $username;
+ var $forlife;
var $promo;
var $nom;
var $prenom;
$this->pmax = $_pmax;
$this->peremption = $_peremption;
$this->comment = $_comment;
- $req = $globals->db->query("SELECT username,promo,nom,prenom FROM "
- ."auth_user_md5 WHERE user_id='$_uid'");
- list($this->username,$this->promo,$this->nom,$this->prenom)
+ $req = $globals->db->query("
+ SELECT a.alias,promo,nom,prenom
+ FROM auth_user_md5 AS u
+ INNER JOIN aliases AS a ON ( u.user_id=a.id AND type='a_vie')
+ WHERE user_id='$_uid'");
+ list($this->forlife,$this->promo,$this->nom,$this->prenom)
= mysql_fetch_row($req);
mysql_free_result($req);
}
if (isset($_POST['action'])) {
require("tpl.mailer.inc.php");
$mymail = new TplMailer('valid.evts.tpl');
- $mymail->assign('username',$this->username);
+ $mymail->assign('forlife',$this->forlife);
$mymail->assign('titre',$this->titre);
if($_REQUEST['action']=="Valider") {
* Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************
- $Id: valid_photos.inc.php,v 1.11 2004-08-31 22:01:31 x2000habouzit Exp $
+ $Id: valid_photos.inc.php,v 1.12 2004-09-02 21:09:32 x2000habouzit Exp $
***************************************************************************/
var $x;
var $y;
- var $username;
+ var $forlife;
var $prenom;
var $nom;
global $erreur, $globals;
$this->Validate($_uid, true, 'photo', $_stamp);
- $sql = $globals->db->query("SELECT username, prenom, nom FROM auth_user_md5 WHERE user_id=".$this->uid);
- list($this->username,$this->prenom,$this->nom) = mysql_fetch_row($sql);
+ $sql = $globals->db->query("
+ SELECT a.alias, prenom, nom
+ FROM auth_user_md5 AS u
+ INNER JOIN aliases AS a ON ( a.id=u.user_id AND type='a_vie' )
+ WHERE user_id=".$this->uid);
+ list($this->forlife,$this->prenom,$this->nom) = mysql_fetch_row($sql);
mysql_free_result($sql);
if(!file_exists($_file)) {
require_once("tpl.mailer.inc.php");
$mymail = new TplMailer('valid.photos.tpl');
- $mymail->assign('username', $this->username);
+ $mymail->assign('forlife', $this->forlife);
if($_REQUEST['submit']=="Accepter") {
$mymail->assign('answer','yes');
* Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************
- $Id: evenements.tpl,v 1.5 2004-08-31 11:25:38 x2000habouzit Exp $
+ $Id: evenements.tpl,v 1.6 2004-09-02 21:09:32 x2000habouzit Exp $
***************************************************************************}
</p>
{/if}
-<form action="{$smarty.request.PHP_SELF}" method="post" name="evenement_nouveau">
- <input type="hidden" name="titre" value="{$titre}" />
- <input type="hidden" name="texte" value="{$texte}" />
- <input type="hidden" name="promo_min" value="{$promo_min}" />
- <input type="hidden" name="promo_max" value="{$promo_max}" />
- <input type="hidden" name="peremption" value="{$peremption}" />
- <input type="hidden" name="validation_message" value="{$validation_message}" />
- <input type="submit" name="action" value="Confirmer" />
- <input type="submit" name="action" value="Modifier" />
+<form action="{$smarty.request.PHP_SELF}" method="post">
+ <div>
+ <input type="hidden" name="titre" value="{$titre}" />
+ <input type="hidden" name="texte" value="{$texte}" />
+ <input type="hidden" name="promo_min" value="{$promo_min}" />
+ <input type="hidden" name="promo_max" value="{$promo_max}" />
+ <input type="hidden" name="peremption" value="{$peremption}" />
+ <input type="hidden" name="validation_message" value="{$validation_message}" />
+ <input type="submit" name="action" value="Confirmer" />
+ <input type="submit" name="action" value="Modifier" />
+ </div>
</form>
* Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************
- $Id: form.valid.epouses.tpl,v 1.7 2004-09-01 22:51:00 x2000habouzit Exp $
+ $Id: form.valid.epouses.tpl,v 1.8 2004-09-02 21:09:32 x2000habouzit Exp $
***************************************************************************}
<tr>
<td>Demandeur :</td>
<td>
- <a href="javascript:x()" onclick="popWin('/fiche.php?user={$valid->username}')">
+ <a href="javascript:x()" onclick="popWin('/fiche.php?user={$valid->forlife}')">
{$valid->prenom} {$valid->nom}
</a>
{if $valid->oldepouse}({$valid->oldepouse} - {$valid->oldalias}){/if}
</td>
<td>
<p>Raison du refus:</p>
- <textarea rows="5" cols="74" name=motif></textarea>
+ <textarea rows="5" cols="50" name=motif></textarea>
</td>
</tr>
</table>
* Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************
- $Id: form.valid.evts.tpl,v 1.6 2004-08-31 11:25:40 x2000habouzit Exp $
+ $Id: form.valid.evts.tpl,v 1.7 2004-09-02 21:09:32 x2000habouzit Exp $
***************************************************************************}
-<form action="{$smarty.server.PHP_SELF}" method="post" name="modif">
+<form action="{$smarty.server.PHP_SELF}" method="post">
<table class="bicol">
<tr>
<th class="titre" colspan="2">Événement</th>
</tr>
<tr>
- <td>
- Posté par <a href="javascript:x()" onclick="popWin('{"fiche.php"|url}?user={$valid->username}">
+ <td colspan="2">
+ Posté par <a href="javascript:x()" onclick="popWin('{"fiche.php"|url}?user={$valid->forlife}')">
{$valid->prenom} {$valid->nom} (X{$valid->promo})
</a>
- [<a href="mailto:{$valid->username}@polytechnique.org">lui écrire</a>]
+ [<a href="mailto:{$valid->forlife}@polytechnique.org">lui écrire</a>]
</td>
</tr>
<tr>
* Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************
- $Id: form.valid.photos.tpl,v 1.7 2004-08-31 11:25:40 x2000habouzit Exp $
+ $Id: form.valid.photos.tpl,v 1.8 2004-09-02 21:09:32 x2000habouzit Exp $
***************************************************************************}
<table class="bicol" summary="Demande d'alias">
<tr>
<td>Demandeur :</td>
- <td><a href="javascript:x()" onclick="popWin('{"fiche.php"|url}?user={$valid->username}')">
+ <td><a href="javascript:x()" onclick="popWin('{"fiche.php"|url}?user={$valid->forlife}')">
{$valid->prenom} {$valid->nom}
</a>
</td>
<tr>
<td class="middle" colspan="2">
<img src="{"getphoto.php"|url}?x={$valid->uid}" style="width:110px;" alt=" [ PHOTO ] " />
+
<img src="{"getphoto.php"|url}?x={$valid->uid}&req=true" style="width:110px;" alt=" [ PHOTO ] " />
</td>
</tr>
</td>
<td>
<p>Raison du refus:</p>
- <textarea rows="5" cols="74" name="motif"></textarea>
+ <textarea rows="5" cols="50" name="motif"></textarea>
</td>
</tr>
</table>
* Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************
- $Id: valid.alias.tpl,v 1.2 2004-08-31 11:25:41 x2000habouzit Exp $
+ $Id: valid.alias.tpl,v 1.3 2004-09-02 21:09:33 x2000habouzit Exp $
***************************************************************************}
{config_load file="mails.conf" section="valid_alias"}
-{subject text="[Polytechnique.org/MELIX] Demande de l'alias $alias@melix.net par $username"}
+{subject text="[Polytechnique.org/MELIX] Demande de l'alias $alias@melix.net par $forlife"}
{from full=#from#}
-{to addr="$username@polytechnique.org"}
+{to addr="$forlife@polytechnique.org"}
{cc full=#cc#}
{if $answer eq "yes"}
Cher(e) camarade,
+++ /dev/null
-{***************************************************************************
- * Copyright (C) 2003-2004 Polytechnique.org *
- * http://opensource.polytechnique.org/ *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the Free Software *
- * Foundation, Inc., *
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
- ***************************************************************************
- $Id: valid.emploi.tpl,v 1.2 2004-08-31 11:25:41 x2000habouzit Exp $
- ***************************************************************************}
-
-{config_load file="mails.conf" section="valid_emploi"}
-{subject text="[Polytechnique.org/EMPLOI] Annonce emploi $entreprise"}
-{from full=#from#}
-{cc full=#cc#}
-{if $answer eq "yes"}
-Bonjour,
-
-L'annonce « {$titre} » a été acceptée par les modérateurs. Elle apparaîtra dans le forum emploi du site.
-
-Nous vous remercions d'avoir proposé cette annonce
-
-Cordialement,
-L'équipe Polytechnique.org
-{elseif $answer eq 'no'}
-Bonjour,
-
-L'annonce « {$titre} » a été refusée par les modérateurs.
-
-Cordialement,
-L'équipe Polytechnique.org
-{/if}
-{* vim:set et sw=2 sts=2 sws=2: *}
* Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************
- $Id: valid.epouses.tpl,v 1.2 2004-08-31 11:25:41 x2000habouzit Exp $
+ $Id: valid.epouses.tpl,v 1.3 2004-09-02 21:09:33 x2000habouzit Exp $
***************************************************************************}
{config_load file="mails.conf" section="valid_epouses"}
-{subject text="[Polytechnique.org/EPOUSE] Changement de nom de mariage de $username"}
+{subject text="[Polytechnique.org/EPOUSE] Changement de nom de mariage de $forlife"}
{from full=#from#}
-{to addr="$username@polytechnique.org"}
+{to addr="$forlife@polytechnique.org"}
{cc full=#cc#}
{if $answer eq "yes"}
Chère camarade,
* Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************
- $Id: valid.evts.tpl,v 1.2 2004-08-31 11:25:41 x2000habouzit Exp $
+ $Id: valid.evts.tpl,v 1.3 2004-09-02 21:09:33 x2000habouzit Exp $
***************************************************************************}
{config_load file="mails.conf" section="valid_evts"}
{subject text="[Polytechnique.org/EVENEMENTS] Proposition d'événement"}
{from full=#from#}
-{to addr="$username@polytechnique.org"}
+{to addr="$forlife@polytechnique.org"}
{cc full=#cc#}
{if $answer eq "yes"}
Cher(e) camarade,
* Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************
- $Id: valid.ml.tpl,v 1.2 2004-08-31 11:25:41 x2000habouzit Exp $
+ $Id: valid.ml.tpl,v 1.3 2004-09-02 21:09:33 x2000habouzit Exp $
***************************************************************************}
{config_load file="mails.conf" section="valid_ml"}
-{subject text="[Polytechnique.org/LISTES] Demande de la liste $alias par $username"}
+{subject text="[Polytechnique.org/LISTES] Demande de la liste $alias par $forlife"}
{from full=#from#}
-{to addr="$username@polytechnique.org"}
+{to addr="$forlife@polytechnique.org"}
{cc full=#cc#}
{if $answer eq "yes"}
Cher(e) camarade,
* Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************
- $Id: valid.photos.tpl,v 1.2 2004-08-31 11:25:41 x2000habouzit Exp $
+ $Id: valid.photos.tpl,v 1.3 2004-09-02 21:09:33 x2000habouzit Exp $
***************************************************************************}
{config_load file="mails.conf" section="valid_photos"}
-{subject text="[Polytechnique.org/PHOTO] Changement de photo de $username"}
+{subject text="[Polytechnique.org/PHOTO] Changement de photo de $forlife"}
{from full=#from#}
-{to addr="$username@polytechnique.org"}
+{to addr="$forlife@polytechnique.org"}
{cc full=#cc#}
{if $answer eq "yes"}
Cher(e) camarade,
+++ /dev/null
-{***************************************************************************
- * Copyright (C) 2003-2004 Polytechnique.org *
- * http://opensource.polytechnique.org/ *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the Free Software *
- * Foundation, Inc., *
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
- ***************************************************************************
- $Id: valid.sondages.tpl,v 1.2 2004-08-31 11:25:41 x2000habouzit Exp $
- ***************************************************************************}
-
-{config_load file="mails.conf" section="valid_sondages"}
-{subject text="[Polytechnique.org/SONDAGE] Demande de validation du sondage $titre par $username"}
-{from full=#from#}
-{to addr="$username@polytechnique.org"}
-{cc full=#cc#}
-{if $answer eq "yes"}
-Cher(e) camarade,
-
- Le sondage {$titre} que tu as composé vient d'être validé.
- Il ne te reste plus qu'à transmettre aux sondés l'adresse où ils pourront voter. Cette adresse est : https://www.polytechnique.org/sondages/questionnaire.php?alias={$alias|escape:'url'}
-
-Cordialement,
-L'équipe X.org
-{elseif $answer eq 'no'}
-
-Cher(e) camarade,
-
- Le sondage $titre que tu avais proposé a été refusé.
-La raison de ce refus est :
-{$smarty.request.motif}
-
-Cordialement,
-L'équipe X.org
-{/if}
-{* vim:set et sw=2 sts=2 sws=2: *}
* Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************
- $Id: general.tpl,v 1.10 2004-08-31 14:48:57 x2000habouzit Exp $
+ $Id: general.tpl,v 1.11 2004-09-02 21:09:33 x2000habouzit Exp $
***************************************************************************}
quelque part (sur ton ordinateur ou sur Internet) d'une photo
d'identité (dans un fichier au format JPEG, PNG ou GIF).<br />
<div class="center">
- <span class="lien"><a href="javascript:x()" onclick="popWin('trombino.php','trmb','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=750,height=480')">Éditer ta photo</a></span>
+ <span class="lien">
+ <a href="trombino.php">Éditer ta photo</a>
+ </span>
</div>
</td>
</tr>
* Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************
- $Id: trombino.tpl,v 1.5 2004-08-31 11:25:39 x2000habouzit Exp $
+ $Id: trombino.tpl,v 1.6 2004-09-02 21:09:32 x2000habouzit Exp $
***************************************************************************}
</tr>
<tr>
<td class="center">
- <img src="{"getphoto.php"|url}?x={$smarty.session.uid}" width=110 alt=" [ PHOTO ] " />
+ <img src="{"getphoto.php"|url}?x={$smarty.session.uid}" width="110" alt=" [ PHOTO ] " />
</td>
<td class="center half">
{if $submited}
</tr>
</table>
- <br />
-
<table class="bicol" cellspacing="0" cellpadding="2">
<tr>
<th>
projects / platal.git / commitdiff