X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Fbug_report%2Fbug_report.php;h=c62498caa2ba23eda0ef70635cd05e932aa26927;hb=46489d06566e040f4852385cc6862f65009dfe97;hp=58917c43d1ca5a5ca7a9bfca992866a90b319893;hpb=ddc94fcb79bf871503fd28902bfe3bba9388e387;p=squirrelmail.git

diff --git a/plugins/bug_report/bug_report.php b/plugins/bug_report/bug_report.php
index 58917c43..c62498ca 100644
--- a/plugins/bug_report/bug_report.php
+++ b/plugins/bug_report/bug_report.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * bug_report.php
  *
@@ -8,33 +7,38 @@
  * a button to show the bug report mail message in order to actually
  * send it.
  *
- * Copyright (c) 1999-2004 The SquirrelMail development team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
- * This is a standard Squirrelmail-1.2 API for plugins.
- *
+ * @copyright &copy; 1999-2007 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package plugins
  * @subpackage bug_report
  */
 
+
 /**
- * @ignore
+ * Include the SquirrelMail initialization file.
  */
-define('SM_PATH','../../');
-
-require_once(SM_PATH . 'include/validate.php');
-
-// loading form functions
+require('../../include/init.php');
+/** load form functions */
 require_once(SM_PATH . 'functions/forms.php');
+/** load plugin functions */
+require_once(SM_PATH . 'plugins/bug_report/functions.php');
 
 displayPageHeader($color, 'None');
 
-include_once(SM_PATH . 'plugins/bug_report/system_specs.php');
-include_once(SM_PATH . 'plugins/bug_report/functions.php');
+/** is bug_report plugin disabled or called by wrong user */
+if (! is_plugin_enabled('bug_report') || ! bug_report_check_user()) {
+    error_box(_("Plugin is disabled."));
+    $oTemplate->display('footer.tpl');
+    exit();
+}
+
+/** get system specs */
+require_once(SM_PATH . 'plugins/bug_report/system_specs.php');
 global $body;
 
-$body_top = "I subscribe to the squirrelmail-users mailing list.\n" .
+$body_top = "I am subscribed to the this mailing list.\n" .
+            " (applies when you are sending email to SquirrelMail mailing list)\n".
             "  [ ]  True - No need to CC me when replying\n" .
             "  [ ]  False - Please CC me when replying\n" .
             "\n" .
@@ -58,8 +62,11 @@ $body = htmlspecialchars($body_top) . $body;
     </tr></table>
 
 <?php
-echo $warning_html; 
+echo $warning_html;
 
+echo '<p><a href="show_system_specs.php" target="_blank">';
+echo _("Show System Specifications");
+echo "</a></p>\n\n";
 echo '<p><big>';
 echo _("Before you send your bug report, please make sure to check this checklist for any common problems.");
 echo "</big></p>\n";
@@ -72,7 +79,7 @@ echo "</li>\n";
 echo '<li>';
 printf(_("Check to see if your bug is already listed in the %sBug List%s on SourceForge. If it is, we already know about it and are trying to fix it."), '<a href="http://sourceforge.net/bugs/?group_id=311" target="_blank">', '</a>');
 echo "</li>\n";
-   
+
 echo '<li>';
 echo _("Try to make sure that you can repeat it. If the bug happens sporatically, try to document what you did when it happened. If it always occurs when you view a specific message, keep that message around so maybe we can see it.");
 echo "</li>\n";
@@ -94,7 +101,14 @@ echo "</p>\n";
       <table align="center" border="0">
         <tr>
           <td>
-            <?php echo _("This bug involves"); ?>: <select name="send_to">
+            <?php echo _("This bug involves:")
+                      .' <select name="send_to">';
+            if (! empty($bug_report_admin_email)) {
+                // if admin's email is set - add 'report to admin' option and make it default one
+                echo '<option value="' . htmlspecialchars($bug_report_admin_email) .'" selected="selected">'
+                    ._("my email account") .'</option>';
+            }
+            ?>
               <option value="squirrelmail-users@lists.sourceforge.net"><?php
                   echo _("the general program"); ?></option>
               <option value="squirrelmail-plugins@lists.sourceforge.net"><?php
@@ -116,24 +130,5 @@ echo addSubmit(_("Start Bug Report Form"));
       </table>
     </form>
     <br />
-<?php
-// special forms that allow searching for bugs in mailing list and bugtracker
-echo html_tag('table',
-    html_tag('tr',
-        html_tag('th', _("Search Mailing List Archives"), 'center', $color[0])
-    ) .
-    html_tag('tr',
-        html_tag('td', add_gmane_form())
-    ) .
-    html_tag('tr',
-        html_tag('td', '&nbsp;<br />')
-    ) .
-    html_tag('tr',
-        html_tag('th', _("Search SourceForge Bugtracker"), 'center', $color[0])
-    ) .
-    html_tag('tr',
-        html_tag('td', add_sf_bug_form())
-    ), 'center', '', 'width="95%"');
-?>
   </body>
-</html>
+</html>
\ No newline at end of file