From: x2000habouzit Date: Thu, 5 Feb 2004 14:32:46 +0000 (+0000) Subject: fin du debug, un peu de css X-Git-Tag: xorg/old~1900 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=f00c8424ff65c2c38bbd8b0eb58e140e0a7fed11;p=platal.git fin du debug, un peu de css --- diff --git a/etat_migration b/etat_migration index 3a95b50..c9e3794 100644 --- a/etat_migration +++ b/etat_migration @@ -139,12 +139,8 @@ Etat | Ancien nom | Nouveau nom ------+-------------------------------------------+---------------- @@@ | groupex/donne-chall.php | - @@@ | groupex/export-econfiance.php | - -x | coupure.php | stats/coupure.php -> encore un pb (afficher deux coupures d'affilée) -x | domaineperso.php | - x | epouse.php | - -x | groupex.php | groupex/index.php x | parselog.php | stats/... -x | sendmail.php | - x | trackers/index.php | - x | trackers/tracker_admin.php | - xx | AccesPermanentOff.php | cookie_off.php @@ -169,6 +165,7 @@ xx | auth-redirect.php | - xx | cacert.php | - xx | charte.php | docs/charte.php xx | contacts.php | docs/contacts.php +xx | coupure.php | stats/coupure.php -> encore un pb (afficher deux coupures d'affilée) xx | deconnexion.php | - xx | docs/doc_carva.php | - xx | docs/doc_emails.php | - @@ -182,11 +179,13 @@ xx | docs/doc_patte_cassee.php | - xx | docs/doc_smtp.php | - xx | docs/doc_ssl.php | - xx | docs/index.php | - +xx | domaineperso.php | - xx | dons.php | - xx | ethique.php | docs/ethique.php xx | exit.php | - xx | faq.php | docs/faq.php xx | getphoto.php | - +xx | groupex.php | groupex/index.php xx | index.php | - xx | login.php | - xx | motdepassemd5.php | - @@ -195,6 +194,7 @@ xx | pattecassee.php | - xx | preferences.php | - xx | rss.php | - xx | secu.php | docs/secu.php +xx | sendmail.php | - xx | skins.php | - xx | vcard.php | - ------+-------------------------------------------+---------------- diff --git a/htdocs/domaineperso.php b/htdocs/domaineperso.php index 700ba40..15cac30 100644 --- a/htdocs/domaineperso.php +++ b/htdocs/domaineperso.php @@ -7,7 +7,7 @@ new_skinned_page('domaineperso.tpl', AUTH_MDP); if (isset($_REQUEST['dnom'])) $page->assign('result', add_domain($_REQUEST['dnom'])); -$domaines = liste_domaines(): +$domaines = liste_domaines(); $page->assign('nb_dom',count($domaines)); $page->assign_by_ref('domaines',$domaines); diff --git a/htdocs/groupex/index.php b/htdocs/groupex/index.php index 2e97041..b72d437 100644 --- a/htdocs/groupex/index.php +++ b/htdocs/groupex/index.php @@ -2,9 +2,9 @@ require("auto.prepend.inc.php"); require("domaine.inc.php"); -new_skinned_page('groupex/index.tpl'); +new_skinned_page('groupex/index.tpl',AUTH_COOKIE); -$domaines = liste_domaines(): +$domaines = liste_domaines(); $page->assign('nb_dom',count($domaines)); $page->assign_by_ref('domaines',$domaines); diff --git a/htdocs/sendmail.php b/htdocs/sendmail.php index 09c32b4..0bf48a3 100644 --- a/htdocs/sendmail.php +++ b/htdocs/sendmail.php @@ -21,11 +21,11 @@ if (isset($_REQUEST['submit']) and $_REQUEST['submit'] == 'Envoyer' $_REQUEST['bcc'] = stripslashes($_REQUEST['bcc']); $autre_to = stripslashes($autre_to); } - require("mailer.inc.php"); + require("diogenes.mailer.inc.php"); $FROM = "From: {$_REQUEST['from']}"; //$_REQUEST['contenu'] = chunk_split($_REQUEST['contenu'], 76, "\n"); // pas bon, ne tient pas compte des mots $dest = $_REQUEST['to'].', '.$autre_to; - $mymail = new mailer($_SESSION['username'], $dest, $_REQUEST['sujet'], false, $_REQUEST['cc'], $_REQUEST['bcc']); + $mymail = new DiogenesMailer($_SESSION['username'], $dest, $_REQUEST['sujet'], false, $_REQUEST['cc'], $_REQUEST['bcc']); $mymail->addHeader($FROM); $mymail->setBody(wordwrap($_REQUEST['contenu'],72,"\n")); if ($mymail->send()) { @@ -41,7 +41,7 @@ $sql = "SELECT u.prenom, u.nom, u.promo, u.username FROM auth_user_md5 as u, contacts as c WHERE u.user_id = c.contact AND c.uid = {$_SESSION['uid']} ORDER BY u.nom, u.prenom"; -$page->mysql_assoc($sql, 'contacts','nb_contacts'); +$page->mysql_assign($sql, 'contacts','nb_contacts'); $page->display(); ?> diff --git a/htdocs/stats/coupure.php b/htdocs/stats/coupure.php index 9f0e789..3bac3eb 100644 --- a/htdocs/stats/coupure.php +++ b/htdocs/stats/coupure.php @@ -2,12 +2,23 @@ require("auto.prepend.inc.php"); new_skinned_page('stats/coupure.tpl',AUTH_PUBLIC); +function serv_to_str($params) { + $flags = explode(',',$params); + $trad = Array('web' => 'site web', 'mail'=> 'redirection mail', + 'smtp' => 'serveur sécurisé d\'envoi de mails', + 'nntp' => 'serveur des forums de discussion'); + $ret = Array(); + foreach($flags as $flag) + $ret[] = $trad[$flag]; + return implode(', ',$ret); +} if (isset($_REQUEST['cp_id'])) $res=mysql_query("select UNIX_TIMESTAMP(debut) AS debut, TIME_FORMAT(duree,'%kh%i') AS duree, resume, description, services from coupures where id='{$_REQUEST['cp_id']}'"); else $res=""; if(($res)&&($cp = mysql_fetch_assoc($res))) { + $cp['lg_services'] = serv_to_str($cp['services']); $page->assign_by_ref('cp',$cp); } else { $beginning_date = date("Ymd", time() - 3600*24*21) . "000000"; diff --git a/include/domaine.inc.php b/include/domaine.inc.php index 5ac8bb9..2de6097 100644 --- a/include/domaine.inc.php +++ b/include/domaine.inc.php @@ -8,9 +8,9 @@ function liste_domaines() { // on récupère la liste des domaines gérables par l'utilisateur $sql = "SELECT domain FROM groupex.aliases as d ". - ($_SESSION['perms'] == 'admin'?'':', groupex.gestionnaires as g'). - " WHERE domain NOT LIKE '%@%'". - ($_SESSION['perms'] == 'admin'?'':" AND g.did = d.id AND g.uid = {$_SESSION['uid']}"). + (has_perms() ? '' : ', groupex.gestionnaires as g'). + " WHERE domain NOT LIKE '%@%' ". + (has_perms() ? '' : " AND g.did = d.id AND g.uid = {$_SESSION['uid']}"). " ORDER BY domain"; $result = mysql_query($sql); diff --git a/include/insert.pattecassee.inc.php b/include/insert.pattecassee.inc.php deleted file mode 100644 index 103d5b2..0000000 --- a/include/insert.pattecassee.inc.php +++ /dev/null @@ -1,24 +0,0 @@ - diff --git a/templates/domaineperso.tpl b/templates/domaineperso.tpl index 86c921f..b09dc30 100644 --- a/templates/domaineperso.tpl +++ b/templates/domaineperso.tpl @@ -1,4 +1,4 @@ -{* $Id: domaineperso.tpl,v 1.1 2004-02-04 19:47:47 x2000habouzit Exp $ *} +{* $Id: domaineperso.tpl,v 1.2 2004-02-05 14:32:47 x2000habouzit Exp $ *} {include file='include/liste_domaines.tpl' result=$result nb_dom=$nbdom domaines=$domaines} @@ -31,7 +31,7 @@ Laisse le temps à la DNS de se mettre à jour (24 à 48h), et le tour est joué.

- Pour toute question, n'hesite pas à {mailto address'info@polytechnique.org' text='envoyer un mail' encode='javascript'} + Pour toute question, n'hesite pas à {mailto address='info@polytechnique.org' text='envoyer un mail' encode='javascript'}

Indique le domaine que tu souhaites gérer : diff --git a/templates/stats/coupure.tpl b/templates/stats/coupure.tpl index f7d655f..00c670f 100644 --- a/templates/stats/coupure.tpl +++ b/templates/stats/coupure.tpl @@ -1,30 +1,30 @@ -{* $Id: coupure.tpl,v 1.2 2004-02-04 23:22:05 x2000habouzit Exp $ *} +{* $Id: coupure.tpl,v 1.3 2004-02-05 14:32:47 x2000habouzit Exp $ *} {dynamic} {if $cp} - - + - + - + - + - +
détails de l'interruption de service + détails de l'interruption de service
début {$cp.debut|date_format:"%d/%m/%Y, %Hh%M"}
durée {$cp.duree}
résumé {$cp.resume}
services - {insert name="serv_to_str" arg=$cp.services script="insert.pattecassee.inc.php"} + {$cp.lg_services}
description {$cp.description}