From c0d230b0444016cbb248c81c2c50688e77c84a57 Mon Sep 17 00:00:00 2001 From: x2001corpet Date: Sat, 2 Dec 2006 11:23:17 +0000 Subject: [PATCH] fix send_bug to otrs for xnet too git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1223 839d8a87-29fc-0310-9880-83ba4fa771e5 --- include/xnet/page.inc.php | 2 +- modules/events.php | 1 - modules/xnet.php | 14 ++++++++-- templates/xnet/skin.tpl | 66 +++++++++++++++++++++++++---------------------- 4 files changed, 48 insertions(+), 35 deletions(-) diff --git a/include/xnet/page.inc.php b/include/xnet/page.inc.php index 003237a..ce6d324 100644 --- a/include/xnet/page.inc.php +++ b/include/xnet/page.inc.php @@ -69,7 +69,7 @@ class XnetPage extends PlatalPage $sub = array(); $sub['liste des groupes'] = 'plan'; $sub['documentation'] = 'Xnet'; - $sub['Signaler un bug'] = array('link' => 'send_bug', 'onclick' => 'send_bug();return false'); + $sub['signaler un bug'] = array('href' => 'send_bug', 'class' => 'popup_840x600'); $menu["no_title"] = $sub; if (S::logged() && $globals->asso()) { diff --git a/modules/events.php b/modules/events.php index 4e25980..89dcfa8 100644 --- a/modules/events.php +++ b/modules/events.php @@ -77,7 +77,6 @@ class EventsModule extends PLModule $page->addJsLink('close_on_esc.js'); if (Env::has('send')) { $page->assign('bug_sent',1); - require_once "diogenes/diogenes.hermes.inc.php"; $mymail = new HermesMailer(); $mymail->setFrom('"'.S::v('prenom').' '.S::v('nom').'" <'.S::v('bestalias').'@polytechnique.org>'); diff --git a/modules/xnet.php b/modules/xnet.php index f3cf0f9..ce9ed09 100644 --- a/modules/xnet.php +++ b/modules/xnet.php @@ -38,8 +38,18 @@ class XnetModule extends PLModule function handler_bug(&$page) { - $this->handler_index(&$page); - $page->assign('bug', 1); + $page->changeTpl('bug.tpl',SIMPLE); + $page->addJsLink('close_on_esc.js'); + if (Env::has('send')) { + $page->assign('bug_sent',1); + require_once "diogenes/diogenes.hermes.inc.php"; + $mymail = new HermesMailer(); + $mymail->setFrom('"'.S::v('prenom').' '.S::v('nom').'" <'.S::v('bestalias').'@polytechnique.org>'); + $mymail->addTo('support+platal@polytechnique.org'); + $mymail->setSubject('Plat/al '.Env::v('task_type').' : '.Env::v('item_summary')); + $mymail->setTxtBody(Env::v('detailed_desc')); + $mymail->send(); + } } function handler_index(&$page) diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl index e4e1065..683c7a9 100644 --- a/templates/xnet/skin.tpl +++ b/templates/xnet/skin.tpl @@ -59,9 +59,12 @@ {include file=skin/common.devel.tpl} - {include file=skin/common.bandeau.tpl} + {if !$simple} + {include file=skin/common.bandeau.tpl} + {/if} + {if !$simple} + {/if}{* fin simple *} - {if $menu} + {if $menu && !$simple} - + {if !$simple} @@ -172,7 +176,8 @@ {/if} - + {/if} + {if !$simple} @@ -212,14 +217,13 @@ à propos de ce site - {mailto address="contact@polytechnique.org" text="nous contacter" encode="javascript"} {if $smarty.session.auth} - - signaler un bug - {include file=skin/common.bug.tpl} + - signaler un bug {/if}
© Copyright 2000-2006 Association Polytechnique.org - + {/if}
@@ -107,43 +110,44 @@
X.net » {if $asso} - {$asso.cat|cat_pp} » - {if $asso.dom} - {$asso.domnom} » - {/if} - {$asso.nom} + {$asso.cat|cat_pp} » + {if $asso.dom} + {$asso.domnom} » + {/if} + {$asso.nom} {elseif $cat} - {$cat|cat_pp} » - {if $dom || !$doms} - {if $cat eq 'promotions'} - Choix de la promotion - {else} - Choix de l'Asso - {/if} - {else} - Choix du domaine - {/if} + {$cat|cat_pp} » + {if $dom || !$doms} + {if $cat eq 'promotions'} + Choix de la promotion + {else} + Choix de l'Asso + {/if} + {else} + Choix du domaine + {/if} {elseif $wikipage} - Documentation + Documentation {/if}
{include file="skin/common.content.tpl"} @@ -155,7 +159,7 @@ {include file="skin/common.content.tpl"}
----------
----------
-- 2.1.4