Changeset d559cba in github

Timestamp:

Jul 7, 2009 12:38:31 PM (4 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

8bc018a

Parents:

b6b5934

Message:

• Added 'imap_debug' option, described 'sql_debug' option in config file

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (2 diffs)
• program/include/rcmail.php (modified) (1 diff)
• program/include/rcube_mdb2.php (modified) (1 diff)
• program/lib/imap.inc (modified) (6 diffs)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Added 'imap_debug' option
 - Support strftime's format modifiers in date_* options (#1484806)
 - Support %h variable in 'smtp_server' option (#1485766)

config/main.inc.php.dist

@@ -15 +15 @@
 $rcmail_config = array();
 
-
 // system error reporting: 1 = log; 2 = report (not implemented yet), 4 = show, 8 = trace
 $rcmail_config['debug_level'] = 1;
@@ -125 +124 @@
 // Log sent messages
 $rcmail_config['smtp_log'] = TRUE;
+
+// Log SQL queries to <log_dir>/sql or to syslog
+$rcmail_config['sql_debug'] = false;
+
+// Log IMAP conversation to <log_dir>/imap or to syslog
+$rcmail_config['imap_debug'] = false;
 
 // How many seconds must pass between emails sent by a user

program/include/rcmail.php

@@ -367 +367 @@
       'delimiter' => isset($_SESSION['imap_delimiter']) ? $_SESSION['imap_delimiter'] : $this->config->get('imap_delimiter'),
       'rootdir' => isset($_SESSION['imap_root']) ? $_SESSION['imap_root'] : $this->config->get('imap_root'),
+      'debug_mode' => (bool) $this->config->get('imap_debug', 0),
     );
 

program/include/rcube_mdb2.php

@@ -702 +702 @@
     $debug_output = $scope . '('.$db->db_index.'): ';
     $debug_output .= $message . $db->getOption('log_line_break');
-    write_log('sqllog', $debug_output);
+    write_log('sql', $debug_output);
   }
 }
-
-

program/lib/imap.inc

@@ -198 +198 @@
 
 function iil_PutLine($fp, $string, $endln=true) {
-//      console('C: '. rtrim($string));
+        global $my_prefs;
+        
+        if(!empty($my_prefs['debug_mode']))
+                write_log('imap', 'C: '. rtrim($string));
+        
         return fputs($fp, $string . ($endln ? "\r\n" : ''));
 }
@@ -226 +230 @@
 
 function iil_ReadLine($fp, $size=1024) {
+        global $my_prefs;
+        
         $line = '';
 
@@ -241 +247 @@
                         break;
                 }
-//              console('S: '. chop($buffer));
+                if(!empty($my_prefs['debug_mode']))
+                        write_log('imap', 'S: '. chop($buffer));
                 $line .= $buffer;
         } while ($buffer[strlen($buffer)-1] != "\n");
@@ -266 +273 @@
 
 function iil_ReadBytes($fp, $bytes) {
+        global $my_prefs;
         $data = '';
         $len  = 0;
@@ -274 +282 @@
                         break; //nothing was read -> exit to avoid apache lockups
                 }
-//              console('[...] '. $d);
+                if(!empty($my_prefs['debug_mode']))
+                        write_log('imap', 'S: '. $d);
                 $len = strlen($data);
         } while ($len < $bytes);
@@ -554 +563 @@
                         } else if ($optkey == 'delimiter') {
                                 $my_prefs['delimiter'] = $optval;
+                        } else if ($optkey == 'debug_mode') {
+                                $my_prefs['debug_mode'] = $optval;
                         }
                 }