From: x2000habouzit Date: Tue, 31 Aug 2004 15:03:33 +0000 (+0000) Subject: general done THE RIGHT WAY ;p X-Git-Tag: xorg/old~1656 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=f9084468f4061c4b7b2dccde1ce7001aae971d03;p=platal.git general done THE RIGHT WAY ;p now have to convert every one else --- diff --git a/htdocs/profil.php b/htdocs/profil.php index a1a18c3..fe2504f 100644 --- a/htdocs/profil.php +++ b/htdocs/profil.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: profil.php,v 1.6 2004-08-31 14:48:56 x2000habouzit Exp $ + $Id: profil.php,v 1.7 2004-08-31 15:03:33 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); @@ -65,11 +65,22 @@ if (!$naissance) { $page->run();//on affiche le formulaire pour naissance } +$errs=Array(); + //doit-on faire un update ? if (isset($_REQUEST['modifier']) || isset($_REQUEST['suivant'])) { - require_once("profil/profil_{$opened_tab}.inc.php"); + require_once("profil/get_{$opened_tab}.inc.php"); require_once("profil/verif_{$opened_tab}.inc.php"); + if(isset($verif_errs)) { + require_once("profil/assign_{$opened_tab}.inc.php"); + $page->assign("errs", $errs); + $page->assign('onglet',$opened_tab); + $page->assign('onglet_last',get_last_tab()); + $page->assign('onglet_tpl',"profil/$opened_tab.tpl"); + $page->run(); + } + $date=date("Y-m-j");//nouvelle date de mise a jour //On sauvegarde l'uid pour l'AX @@ -102,9 +113,11 @@ if (isset($_REQUEST['modifier']) || isset($_REQUEST['suivant'])) { $page->assign('etat_update','ok'); } -require_once("profil/profil_{$new_tab}.inc.php"); +require_once("profil/get_{$new_tab}.inc.php"); require_once("profil/verif_{$new_tab}.inc.php"); +require_once("profil/assign_{$new_tab}.inc.php"); +$page->assign("errs", $errs); $page->assign('onglet',$new_tab); $page->assign('onglet_last',get_last_tab()); $page->assign('onglet_tpl',"profil/$new_tab.tpl"); diff --git a/include/profil/assign_general.inc.php b/include/profil/assign_general.inc.php new file mode 100644 index 0000000..50ab041 --- /dev/null +++ b/include/profil/assign_general.inc.php @@ -0,0 +1,49 @@ +assign('mobile_public',$mobile_public); +$page->assign('mobile_ax',$mobile_ax); +$page->assign('libre_public',$libre_public); +$page->assign('web_public',$web_public); + +$page->assign('nom', $nom); +$page->assign('prenom', $prenom); +$page->assign('promo', $promo); +$page->assign('epouse', $epouse); +$page->assign('femme', $femme); +$page->assign('alias', $alias); + +$page->assign('nationalite',$nationalite); + +$page->assign('mobile',$mobile); + +$page->assign('web',$web); + +$page->assign('libre',$libre); + +$page->assign('appli_id1',$appli_id1); +$page->assign('appli_id2',$appli_id2); +$page->assign('appli_type1',$appli_type1); +$page->assign('appli_type2',$appli_type2); + +?> diff --git a/include/profil/profil_general.inc.php b/include/profil/get_general.inc.php similarity index 76% rename from include/profil/profil_general.inc.php rename to include/profil/get_general.inc.php index e398fee..d7396fb 100644 --- a/include/profil/profil_general.inc.php +++ b/include/profil/get_general.inc.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: profil_general.inc.php,v 1.4 2004-08-31 14:48:57 x2000habouzit Exp $ + $Id: get_general.inc.php,v 1.1 2004-08-31 15:03:33 x2000habouzit Exp $ ***************************************************************************/ // on ramène les données du profil connecté (uid paramètre de session) @@ -43,41 +43,23 @@ list($nom, $prenom, $libre, $alias, $appli_id1,$appli_type1, $appli_id2,$appli_type2) = mysql_fetch_row($result); -if(mysql_errno($conn) !=0) echo mysql_errno($conn).": ".mysql_error($conn); mysql_free_result($result); -$page->assign('mobile_public',$mobile_public); -$page->assign('mobile_ax',$mobile_ax); -$page->assign('libre_public',$libre_public); -$page->assign('web_public',$web_public); - -$page->assign('nom', $nom); -$page->assign('prenom', $prenom); -$page->assign('promo', $promo); -$page->assign('epouse', $epouse); -$page->assign('femme', $femme); -$page->assign('alias', $alias); - replace_ifset($nationalite,'nationalite'); -$page->assign('nationalite',$nationalite); - replace_ifset($mobile,'mobile'); -$page->assign('mobile',$mobile); - replace_ifset($web,"web"); -$page->assign('web',$web); - replace_ifset($libre,"libre"); -$page->assign('libre',$libre); - replace_ifset($appli_id1,"appli_id1"); replace_ifset($appli_id2,"appli_id2"); -$page->assign('appli_id1',$appli_id1); -$page->assign('appli_id2',$appli_id2); replace_ifset($appli_type1,"appli_type1"); replace_ifset($appli_type2,"appli_type2"); -$page->assign('appli_type1',$appli_type1); -$page->assign('appli_type2',$appli_type2); + +if(isset($_REQUEST['modifier']) || isset($_REQUEST['suivant'])) { + $mobile_public = (isset($_REQUEST['mobile_public'])); + $mobile_ax = (isset($_REQUEST['mobile_ax'])); + $libre_public = (isset($_REQUEST['libre_public'])); + $web_public = (isset($_REQUEST['web_public'])); +} ?> diff --git a/include/profil/verif_general.inc.php b/include/profil/verif_general.inc.php index 3a555d3..9f04e92 100644 --- a/include/profil/verif_general.inc.php +++ b/include/profil/verif_general.inc.php @@ -18,35 +18,30 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: verif_general.inc.php,v 1.3 2004-08-31 14:48:57 x2000habouzit Exp $ + $Id: verif_general.inc.php,v 1.4 2004-08-31 15:03:33 x2000habouzit Exp $ ***************************************************************************/ // validité du mobile -if (strlen(strtok($mobile,"<>{}@&#~\/:;?,!§*_`[]|%$^=")) < strlen($mobile)) -{ - $str_error = $str_error."Le champ 'Téléphone mobile' contient un caractère interdit.
"; +if (strlen(strtok($mobile,"<>{}@&#~\/:;?,!§*_`[]|%$^=")) < strlen($mobile)) { + $verif_errs = true; + $errs[] = "Le champ 'Téléphone mobile' contient un caractère interdit."; } // correction du champ web si vide if ($web=="http://" or $web == '') { - $web=''; + $web=''; } elseif (!preg_match("{^(https?|ftp)://[a-zA-Z0-9._%#+/?=&~-]+$}i", $web)) { - // validité de l'url donnée dans web - $str_error = $str_error."URL incorrecte dans le champ 'Page web perso', une url doit commencer par http:// ou https:// ou ftp:// et ne pas contenir de caractères interdits
"; + // validité de l'url donnée dans web + $errs[] = "URL incorrecte dans le champ 'Page web perso', une url doit commencer par http:// ou https:// ou ftp:// et ne pas contenir de caractères interdits"; } else { - $web = str_replace('&', '&', $web); + $web = str_replace('&', '&', $web); } //validité du champ libre if (strlen(strtok($libre,"<>")) < strlen($libre)) { - $str_error = $str_error."Le champ 'Complément libre' contient un caractère interdit.
"; + $errs[] = "Le champ 'Complément libre' contient un caractère interdit."; } -$mobile_public = (isset($_REQUEST['mobile_public'])); -$mobile_ax = (isset($_REQUEST['mobile_ax'])); -$libre_public = (isset($_REQUEST['libre_public'])); -$web_public = (isset($_REQUEST['web_public'])); - ?> diff --git a/templates/profil.tpl b/templates/profil.tpl index be7030f..e64ab95 100644 --- a/templates/profil.tpl +++ b/templates/profil.tpl @@ -17,7 +17,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: profil.tpl,v 1.8 2004-08-31 13:59:44 x2000habouzit Exp $ + $Id: profil.tpl,v 1.9 2004-08-31 15:03:33 x2000habouzit Exp $ ***************************************************************************} @@ -28,6 +28,10 @@ {/if} {if $etat_naissance == '' || $etat_naissance == 'ok'} +{foreach from=$errs item=e} +

{$e}

+{/foreach} +

Tu peux consulter l'état actuel de ta fiche tel qu'elle apparaîtra pour un camarade.