X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Finfo%2Ffunctions.php;h=412a2d894b9a5ac5e8dd880e1402d1b0559cf33f;hp=92f666dcc69f8b36e7d5c8bfda429e2296620503;hb=a9e1e670fab4399260e0790e018393c7dcefcecc;hpb=a7b90f05ac8a08954d355b96ab133ddaa2690221

diff --git a/plugins/info/functions.php b/plugins/info/functions.php
index 92f666dc..412a2d89 100644
--- a/plugins/info/functions.php
+++ b/plugins/info/functions.php
@@ -1,7 +1,8 @@
 <?PHP
 
-/* functions for info plugin
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+/**
+ * functions for info plugin
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Here are two functions for the info plugin
@@ -10,39 +11,42 @@
  * The third prints the results of the IMAP command
  * to options.php.
  * by: Jason Munro jason@stdbev.com
+ *
+ * $Id$ 
+ * @package plugins
+ * @subpackage info
  */
 
+/**
+ * Get the IMAP capabilities
+ * @return array
+ */
 function get_caps($imap_stream) {
-    $sid = sqimap_session_id();
-    $query = "$sid CAPABILITY\r\n";
-    fputs ($imap_stream, $query);
-    $responses = sqimap_read_data_list($imap_stream, $sid, true, $responses, $message);
-    return $responses;
+    return sqimap_run_command_list($imap_stream, 'CAPABILITY',false, $responses, $message,false);
 }
 
+/**
+ * Run an IMAP test and return the results
+ * @return array Response from the IMAP server
+ */
 function imap_test($imap_stream, $string) {
     global $default_charset;
-    $message = '';
-    $responses = array ();
-    $sid = sqimap_session_id();
-    $results = array();
-    $query = "$sid ".trim($string)."\r\n";
-    print "<TR><TD>".$query."</TD></TR>";
-    fputs ($imap_stream, $query);
-    $response = sqimap_read_data_list($imap_stream, $sid, false, $responses, $message);
-    array_push($response, $message);
+    print "<tr><td>".htmlspecialchars($string)."</td></tr>";
+    $response = sqimap_run_command_list($imap_stream, trim($string),false, $responses, $message,false);
+    array_push($response, $responses . ' ' .$message);
     return $response;
 }
 
+/**
+ * Print the IMAP response to options.php
+ */
 function print_response($response) {
     foreach($response as $index=>$value) {
         if (is_array($value)) {
             print_response($value);
         }
         else {
-            $value = preg_replace("/</", "&lt;", $value);
-            $value = preg_replace("/>/", "&gt;", $value);
-            print $value."<BR>\n";
+            print htmlspecialchars($value)."<br />\n";
         }
     }
 }