fsf changes, meant to be rebased on upstream

[squirrelmail.git] / plugins / bug_report / show_system_specs.php
diff --git a/plugins/bug_report/show_system_specs.php b/plugins/bug_report/show_system_specs.php

index 07ceb50c62724d91a5d402ffd79e6473735b796d..6567639e2f3c35654ba31123d18596b81e07a53a 100644 (file)
--- a/plugins/bug_report/show_system_specs.php
+++ b/plugins/bug_report/show_system_specs.php
@@ -2,40 +2,47 @@
  /**
   * This script shows system specification details.
   *
- * @copyright &copy; 1999-2007 The SquirrelMail Project Team
+ * @copyright 1999-2022 The SquirrelMail Project Team
   * @license http://opensource.org/licenses/gpl-license.php GNU Public License
   * @version $Id$
   * @package plugins
   * @subpackage bug_report
   */
  
-/**
- * Include the SquirrelMail initialization file.
- */
+
+// This is the bug_report show system specs page
+//
+define('PAGE_NAME', 'bug_report_show_system_specs');
+
+
+// Include the SquirrelMail initialization file.
+//
  require('../../include/init.php');
  
-/** load plugin functions */
-include_once(SM_PATH.'plugins/bug_report/functions.php');
  
-/** is bug_report plugin disabled or called by wrong user */
+// load plugin functions
+//
+require_once(SM_PATH . 'plugins/bug_report/functions.php');
+
+
+// error out when bug_report plugin is disabled
+// or is called by the wrong user
+//
  if (! is_plugin_enabled('bug_report') || ! bug_report_check_user()) {
      error_box(_("Plugin is disabled."));
      $oTemplate->display('footer.tpl');
      exit();
  }
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-  "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
-<html>
-<body>
-<pre>
-<?php
  
-include_once(SM_PATH . 'plugins/bug_report/system_specs.php');
-global $body;
-echo $body;
  
-?>
-</pre>
-</body>
-</html>
-\ No newline at end of file
+// get system specs
+//
+require_once(SM_PATH . 'plugins/bug_report/system_specs.php');
+list($body, $warnings, $corrections) = get_system_specs();
+
+global $oTemplate;
+$oTemplate->assign('body', $body);
+$oTemplate->display('plugins/bug_report/system_specs.tpl');
+$oTemplate->display('footer.tpl');
+
+