diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-05-15 13:20:48 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-05-15 13:20:48 +0200 |
| commit | 43079d8e2dbd8e195b63dd8fb9f5251ae7c66248 (patch) | |
| tree | 3a18e472cf88b2004c1ee1058868bbda98acf3f8 /program/lib | |
| parent | e5b376b17845d5377af71b8e505417048d0eec94 (diff) | |
Simplify/fix debug lines truncation
Diffstat (limited to 'program/lib')
| -rw-r--r-- | program/lib/Roundcube/rcube_db.php | 5 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_imap_generic.php | 7 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_smtp.php | 7 |
3 files changed, 11 insertions, 8 deletions
diff --git a/program/lib/Roundcube/rcube_db.php b/program/lib/Roundcube/rcube_db.php index f8a9bdc37..5da38c899 100644 --- a/program/lib/Roundcube/rcube_db.php +++ b/program/lib/Roundcube/rcube_db.php @@ -257,8 +257,9 @@ class rcube_db { if ($this->options['debug_mode']) { if (($len = strlen($query)) > self::DEBUG_LINE_LENGTH) { - $query = substr_replace($query, "\n-----[debug cut]-----\n", - self::DEBUG_LINE_LENGTH/2 - 11, $len - self::DEBUG_LINE_LENGTH - 22); + $diff = $len - self::DEBUG_LINE_LENGTH; + $query = substr($query, 0, self::DEBUG_LINE_LENGTH) + . "... [truncated $diff bytes]"; } rcube::write_log('sql', '[' . (++$this->db_index) . '] ' . $query . ';'); } diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php index 1d2a9be16..292b932e1 100644 --- a/program/lib/Roundcube/rcube_imap_generic.php +++ b/program/lib/Roundcube/rcube_imap_generic.php @@ -72,7 +72,7 @@ class rcube_imap_generic const COMMAND_CAPABILITY = 2; const COMMAND_LASTLINE = 4; - const DEBUG_LINE_LENGTH = 4096; + const DEBUG_LINE_LENGTH = 4098; // 4KB + 2B for \r\n /** * Object constructor @@ -3780,8 +3780,9 @@ class rcube_imap_generic private function debug($message) { if (($len = strlen($message)) > self::DEBUG_LINE_LENGTH) { - $message = substr_replace($message, "\n-----[debug cut]-----\n", - self::DEBUG_LINE_LENGTH/2 - 11, $len - self::DEBUG_LINE_LENGTH - 22); + $diff = $len - self::DEBUG_LINE_LENGTH; + $message = substr($message, 0, self::DEBUG_LINE_LENGTH) + . "... [truncated $diff bytes]"; } if ($this->resourceid) { diff --git a/program/lib/Roundcube/rcube_smtp.php b/program/lib/Roundcube/rcube_smtp.php index 6ba766672..60b1389ea 100644 --- a/program/lib/Roundcube/rcube_smtp.php +++ b/program/lib/Roundcube/rcube_smtp.php @@ -33,7 +33,7 @@ class rcube_smtp // define headers delimiter const SMTP_MIME_CRLF = "\r\n"; - const DEBUG_LINE_LENGTH = 4096; + const DEBUG_LINE_LENGTH = 4098; // 4KB + 2B for \r\n /** @@ -330,8 +330,9 @@ class rcube_smtp public function debug_handler(&$smtp, $message) { if (($len = strlen($message)) > self::DEBUG_LINE_LENGTH) { - $message = substr_replace($message, "\n-----[debug cut]----\n", - self::DEBUG_LINE_LENGTH/2 - 11, $len - self::DEBUG_LINE_LENGTH - 22); + $diff = $len - self::DEBUG_LINE_LENGTH; + $message = substr($message, 0, self::DEBUG_LINE_LENGTH) + . "... [truncated $diff bytes]"; } rcube::write_log('smtp', preg_replace('/\r\n$/', '', $message)); |