From 5be6dcf0e2234b22391ad4f654efddd0ba7c0e92 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 15 Apr 2014 13:19:56 -0400
Subject: [PATCH] Remove useless debug_level=8 and javascripts's rcube_console
---
program/include/rcmail_output_html.php | 19 +++----------------
program/js/common.js | 30 ------------------------------
installer/config.php | 3 ---
skins/classic/common.css | 5 -----
config/defaults.inc.php | 2 +-
5 files changed, 4 insertions(+), 55 deletions(-)
diff --git a/config/defaults.inc.php b/config/defaults.inc.php
index 5c5fccb..7f65b97 100644
--- a/config/defaults.inc.php
+++ b/config/defaults.inc.php
@@ -56,7 +56,7 @@
// LOGGING/DEBUGGING
// ----------------------------------
-// system error reporting, sum of: 1 = log; 4 = show, 8 = trace
+// system error reporting, sum of: 1 = log; 4 = show
$config['debug_level'] = 1;
// log driver: 'syslog' or 'file'.
diff --git a/installer/config.php b/installer/config.php
index fd7932a..8b98dbe 100644
--- a/installer/config.php
+++ b/installer/config.php
@@ -198,9 +198,6 @@
echo $check_debug->show(($value & 4) ? 4 : 0, array('value' => 4, 'id' => 'cfgdebug4'));
echo '<label for="cfgdebug4">Print errors (to the browser)</label><br />';
-echo $check_debug->show(($value & 8) ? 8 : 0, array('value' => 8, 'id' => 'cfgdebug8'));
-echo '<label for="cfgdebug8">Verbose display (enables debug console)</label><br />';
-
?>
</dd>
diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
index a23b840..c3232b2 100644
--- a/program/include/rcmail_output_html.php
+++ b/program/include/rcmail_output_html.php
@@ -519,25 +519,12 @@
$output = preg_replace_callback('/<form\s+([^>]+)>/Ui', array($this, 'alter_form_tag'), $output);
$this->footer = preg_replace_callback('/<form\s+([^>]+)>/Ui', array($this, 'alter_form_tag'), $this->footer);
- if ($write) {
- // add debug console
- if ($realname != 'error' && ($this->config->get('debug_level') & 8)) {
- $this->add_footer('<div id="console" style="position:absolute;top:5px;left:5px;width:405px;padding:2px;background:white;z-index:9000;display:none">
- <a href="#toggle" onclick="con=$(\'#dbgconsole\');con[con.is(\':visible\')?\'hide\':\'show\']();return false">console</a>
- <textarea name="console" id="dbgconsole" rows="20" cols="40" style="display:none;width:400px;border:none;font-size:10px" spellcheck="false"></textarea></div>'
- );
- $this->add_script(
- "if (!window.console || !window.console.log) {\n".
- " window.console = new rcube_console();\n".
- " $('#console').show();\n".
- "}", 'foot');
- }
- $this->write(trim($output));
- }
- else {
+ if (!$write) {
return $output;
}
+ $this->write(trim($output));
+
if ($exit) {
exit;
}
diff --git a/program/js/common.js b/program/js/common.js
index 3f82b6d..3d264c3 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -529,36 +529,6 @@
roundcube_browser.prototype.set_cookie = setCookie;
roundcube_browser.prototype.get_cookie = getCookie;
-// tiny replacement for Firebox functionality
-function rcube_console()
-{
- this.log = function(msg)
- {
- var box = rcube_find_object('dbgconsole');
-
- if (box) {
- if (msg.charAt(msg.length-1)=='\n')
- msg += '--------------------------------------\n';
- else
- msg += '\n--------------------------------------\n';
-
- // Konqueror doesn't allow to just change the value of hidden element
- if (bw.konq) {
- box.innerText += msg;
- box.value = box.innerText;
- } else
- box.value += msg;
- }
- };
-
- this.reset = function()
- {
- var box = rcube_find_object('dbgconsole');
- if (box)
- box.innerText = box.value = '';
- };
-};
-
var bw = new roundcube_browser();
bw.set_html_class();
diff --git a/skins/classic/common.css b/skins/classic/common.css
index 3037020..4367d26 100644
--- a/skins/classic/common.css
+++ b/skins/classic/common.css
@@ -941,11 +941,6 @@
font-weight: bold;
}
-#console
-{
- opacity: 0.8;
-}
-
.disabled,
a.disabled
{
--
Gitblit v1.9.1