banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:roundcube/roundcubemail

Browse Source
pull/171/merge
Aleksander Machniak 10 years ago
parent 398b7a9b0b 5be6dcf0e2
commit e5a77d2634
8 changed files with 30 additions and 84 deletions
Show Stats Download Patch File Download Diff File

2
config/defaults.inc.php
Unescape Escape View File

@ -56,7 +56,7 @@ $config['db_table_dsn'] = array(
// 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'.

3
installer/config.php
Unescape Escape View File

@ -198,9 +198,6 @@ echo '<label for="cfgdebug1">Log errors</label><br />';
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>

20
plugins/legacy_browser/js/iehacks.js
Unescape Escape View File

@ -0,0 +1,20 @@
// Make getElementById() case-sensitive on IE7
document._getElementById = document.getElementById;
document.getElementById = function(id) {
var i = 0, obj = document._getElementById(id);
if (obj && obj.id != id)
while ((obj = document.all[i]) && obj.id != id)
i++;
return obj;
}
// fix missing :last-child selectors
$(document).ready(function() {
if (rcmail && rcmail.env.skin != 'classic')
$('ul.treelist ul').each(function(i, ul) {
$('li:last-child', ul).css('border-bottom', 0);
});
});

19
plugins/legacy_browser/legacy_browser.php
Unescape Escape View File

@ -23,10 +23,12 @@ class legacy_browser extends rcube_plugin
function send_page($args)
{
// replace jQuery 2.x with 1.x
$ts = filemtime($this->home . '/js/jquery.min.js');
$ts1 = filemtime($this->home . '/js/jquery.min.js');
$ts2 = filemtime($this->home . '/js/iehacks.js');
$args['content'] = preg_replace(
'|"program/js/jquery\.min\.js\?s=[0-9]+"|',
'"plugins/legacy_browser/js/jquery.min.js?s=' . $ts . '"',
'|<script src="program/js/jquery\.min\.js\?s=[0-9]+" type="text/javascript"></script>|',
'<script src="plugins/legacy_browser/js/jquery.min.js?s=' . $ts1 . '" type="text/javascript"></script>'."\n"
.'<script src="plugins/legacy_browser/js/iehacks.js?s=' . $ts2 . '" type="text/javascript"></script>',
$args['content'], 1);
return $args;
@ -53,17 +55,6 @@ class legacy_browser extends rcube_plugin
'<link rel="stylesheet" type="text/css" href="plugins/legacy_browser/larry/iehacks.css" />'
);
}
// fix missing :last-child selectors
$rcube->output->add_footer(implode("\n", array(
'<script type="text/javascript">',
'$(document).ready(function() {',
' $(\'ul.treelist ul\').each(function(i,ul) {',
' $(\'li:last-child\', ul).css(\'border-bottom\', 0);',
' });',
'});',
'</script>'
)));
}
}

19
program/include/rcmail_output_html.php
Unescape Escape View File

@ -519,25 +519,12 @@ class rcmail_output_html extends rcmail_output
$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;
}

44
program/js/common.js
Unescape Escape View File

@ -533,36 +533,6 @@ function getCookie(name)
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();
@ -600,20 +570,6 @@ if (!String.prototype.startsWith) {
};
}
// Make getElementById() case-sensitive on IE
if (bw.ie) {
document._getElementById = document.getElementById;
document.getElementById = function(id) {
var i = 0, obj = document._getElementById(id);
if (obj && obj.id != id)
while ((obj = document.all[i]) && obj.id != id)
i++;
return obj;
}
}
// jQuery plugin to emulate HTML5 placeholder attributes on input elements
jQuery.fn.placeholder = function(text) {
return this.each(function() {

2
program/lib/Roundcube/rcube_csv2vcard.php
Unescape Escape View File

@ -56,7 +56,7 @@ class rcube_csv2vcard
//'email_2_type' => '',
//'email_3_address' => '', //@TODO
//'email_3_type' => '',
'email_address' => 'email:main',
'email_address' => 'email:pref',
//'email_type' => '',
'first_name' => 'firstname',
'gender' => 'gender',

5
skins/classic/common.css
Unescape Escape View File

@ -941,11 +941,6 @@ a.rcmContactAddress:hover
font-weight: bold;
}
#console
{
opacity: 0.8;
}
.disabled,
a.disabled
{

Write Preview
Loading…
Cancel
Save