X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Fbug_report%2Fsystem_specs.php;h=6f0c5740b668a1fc765075600b9ae7ac293e8460;hb=80b242635d0eb41926cae4c09c94e25173866330;hp=311dee762bf998ff8bcfc485114f61a1de342e22;hpb=f8a1ed5aa365d515e4e2ac3602f900bfb9447fce;p=squirrelmail.git

diff --git a/plugins/bug_report/system_specs.php b/plugins/bug_report/system_specs.php
index 311dee76..6f0c5740 100644
--- a/plugins/bug_report/system_specs.php
+++ b/plugins/bug_report/system_specs.php
@@ -1,23 +1,29 @@
 <?php
 /**
- * This gathers system specification details for use with bug reporting
+ * This script gathers system specification details for use with bug reporting
  * and anyone else who needs it.
  *
- * Copyright (c) 1999-2005 The SquirrelMail Project 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-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package plugins
  * @subpackage bug_report
  */
 
+/**
+ * do not allow to call this file directly
+ */
+if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) ||
+     (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) {
+    header("Location: ../../src/login.php");
+    die();
+}
+
 /**
  * load required libraries
  */
-include_once(SM_PATH . 'include/validate.php');
-global $body;
+include_once(SM_PATH . 'functions/imap_general.php');
+
 
 
 /**
@@ -111,23 +117,18 @@ if (isset($ldap_server) && $ldap_server[0] && ! extension_loaded('ldap')) {
 
 $body = "\nMy IMAP server information:\n" .
             "  Server type:  $imap_server_type\n";
-$imap_stream = fsockopen ($imapServerAddress, $imapPort, $error_number, $error_string);
-$server_info = fgets ($imap_stream, 1024);
+
+$imapServerAddress = sqimap_get_user_server($imapServerAddress, $username);
+$imap_stream = sqimap_create_stream($imapServerAddress, $imapPort, $use_imap_tls);
 if ($imap_stream) {
-    // SUPRESS HOST NAME
-    $list = explode(' ', $server_info);
-    $list[2] = '[HIDDEN]';
-    $server_info = implode(' ', $list);
-    $body .=  "  Server info:  $server_info";
-    fputs ($imap_stream, "a001 CAPABILITY\r\n");
-    $read = fgets($imap_stream, 1024);
-    $list = explode(' ', $read);
-    array_shift($list);
-    array_shift($list);
-    $read = implode(' ', $list);
-    $body .= "  Capabilities:  $read";
-    fputs ($imap_stream, "a002 LOGOUT\r\n");
-    fclose($imap_stream);
+    $body.= '  Capabilities: ';
+    if ($imap_capabilities = sqimap_capability($imap_stream)) {
+        foreach ($imap_capabilities as $capability => $value) {
+            $body.= $capability . (is_bool($value) ? ' ' : "=$value ");
+        }
+    }
+    $body.="\n";
+    sqimap_logout($imap_stream);
 } else {
     $body .= "  Unable to connect to IMAP server to get information.\n";
     $warning = 1;
@@ -159,5 +160,3 @@ if (isset($warning) && $warning) {
 }
 
 $body = htmlspecialchars($body_top . $body);
-
-?>
\ No newline at end of file