User can't remove identification footer from bug reports

User can't post an empty bug report

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1385 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/modules/core.php b/modules/core.php
index d0c6522..cbb1613 100644 (file)
--- a/modules/core.php
+++ b/modules/core.php
@@ -101,14 +101,22 @@ class CoreModule extends PLModule
     {
         $page->changeTpl('core/bug.tpl',SIMPLE);
         $page->addJsLink('close_on_esc.js');
-        if (Env::has('send')) {
+        if (Env::has('send') && trim(Env::v('detailed_desc'))) {
+            $body = wordwrap(Env::v('detailed_desc'), 78) . "\n\n"
+                  . "----------------------------\n"
+                  . "Page        : " . Env::v('page') . "\n\n"
+                  . "Utilisateur : " . S::v('forlife') . "\n"
+                  . "Navigateur  : " . Env::v('browser') . "\n"
+                  . "Skin        : " . Env::v('skin') . "\n";
             $page->assign('bug_sent',1);
             $mymail = new PlMailer();
             $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->setTxtBody($body);
             $mymail->send();
+        } elseif (Env::has('send')) {
+            $page->trig("Merci de remplir une explication du problème rencontré");
         }
     }
 }

diff --git a/templates/core/bug.tpl b/templates/core/bug.tpl
index 49c1049..d517368 100644 (file)
--- a/templates/core/bug.tpl
+++ b/templates/core/bug.tpl
@@ -1,28 +1,79 @@
+{**************************************************************************}\r
+{*                                                                        *}\r
+{*  Copyright (C) 2003-2007 Polytechnique.org                             *}\r
+{*  http://opensource.polytechnique.org/                                  *}\r
+{*                                                                        *}\r
+{*  This program is free software; you can redistribute it and/or modify  *}\r
+{*  it under the terms of the GNU General Public License as published by  *}\r
+{*  the Free Software Foundation; either version 2 of the License, or     *}\r
+{*  (at your option) any later version.                                   *}\r
+{*                                                                        *}\r
+{*  This program is distributed in the hope that it will be useful,       *}\r
+{*  but WITHOUT ANY WARRANTY; without even the implied warranty of        *}\r
+{*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *}\r
+{*  GNU General Public License for more details.                          *}\r
+{*                                                                        *}\r
+{*  You should have received a copy of the GNU General Public License     *}\r
+{*  along with this program; if not, write to the Free Software           *}\r
+{*  Foundation, Inc.,                                                     *}\r
+{*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}\r
+{*                                                                        *}\r
+{**************************************************************************}\r
+\r
+<script type="text/javascript">//<![CDATA[\r
+{literal}\r
+var edited=false;\r
+\r
+function cleanContent()\r
+{\r
+  if (edited == false) {\r
+    var field = document.getElementById('flyspray_detail');\r
+    field.value = '';\r
+    field.style.color = "black";\r
+    field.style.textAlign = "left";\r
+  }\r
+}\r
+\r
+function fillContent()\r
+{\r
+  var field = document.getElementById('flyspray_detail');\r
+  if (field.value == '' || field.value.toUpperCase() == field.value) {\r
+    field.value = "** Explique ici le problème ou l'amélioration proposée **";\r
+    field.style.color = "gray";\r
+    field.style.textAlign = "center";\r
+    edited = false;\r
+  } else {\r
+    edited = true;\r
+  }\r
+}\r
+{/literal}\r
+//]]></script>\r
+\r
 <div style="width:800px;height:600px">\r
 {if $bug_sent}\r
 <script type="text/javascript">window.close();</script>\r
 {/if}\r
-<form action="send_bug" method="post">\r
-       <h1>Signaler un bug ou demander une amélioration</h1>\r
-       <div style="margin-left:10%;margin-right:10%">\r
-          <select name="task_type">\r
-           <option value="bug">Bug</option>\r
-            <option value="wish">Wish</option>\r
-          </select>\r
-          &nbsp;&nbsp;Sujet : <input type="text" name="item_summary" id="flyspray_title" value="sur la page {$smarty.server.HTTP_REFERER}" size="50" maxlength="100"/>\r
-          <textarea name="detailed_desc" id="flyspray_detail" cols="70" rows="10" style="width:100%;margin-top:10px;margin-bottom:10px;height:400px;display:block;">\r
-\r
-** Explique ici le problème ou l'amélioration proposée **\r
-               \r
-Page : {$smarty.server.HTTP_REFERER}\r
-\r
-Navigateur : {$smarty.server.HTTP_USER_AGENT}\r
-Skin : {$smarty.session.skin} \r
-Signalé par {$smarty.session.forlife}</textarea>\r
-          <div style="text-align:center">\r
-              <input type="button" value="Fermer" onclick="window.close()"/>\r
-              <input type="submit" name="send" value="Signaler le bug"/>\r
-          </div>\r
+<form action="send_bug" method="post" onsubmit="cleanContent()">\r
+  <h1>Signaler un bug ou demander une amélioration</h1>\r
+  <div style="margin-left:10%;margin-right:10%">\r
+    <select name="task_type">\r
+         <option value="bug">Bug</option>\r
+      <option value="wish">Wish</option>\r
+    </select>\r
+    &nbsp;&nbsp;Sujet : <input type="text" name="item_summary" id="flyspray_title" value="sur la page {$smarty.server.HTTP_REFERER}" size="50" maxlength="100"/>\r
+    <textarea name="detailed_desc" id="flyspray_detail" cols="70" rows="10" style="width:100%;margin-top:10px;margin-bottom:10px;height:400px;display:block;" onFocus="cleanContent()" onBlur="fillContent()"></textarea>\r
+    <input type="hidden" name="page" value="{$smarty.server.HTTP_REFERER}" />\r
+    <input type="hidden" name="browser" value="{$smarty.server.HTTP_USER_AGENT}" />\r
+    <input type="hidden" name="skin" value="{$smarty.session.skin}" />\r
+    <div class="center">\r
+      <input type="button" value="Fermer" onclick="window.close()"/>\r
+      <input type="submit" name="send" value="Signaler le bug"/>\r
     </div>\r
+  </div>\r
 </form>\r
+<script type="text/javascript">\r
+  fillContent();\r
+</script>\r
 </div>\r
+\r
+{* vim:set et sws=2 sts=2 sw=2: *}\r