Page MenuHomePhorge
Files F223035

No OneTemporary
Actions

View Options

diff --git a/plugins/legacy_browser/legacy_browser.php b/plugins/legacy_browser/legacy_browser.php
index 9378cdc3e..a26167710 100644
--- a/plugins/legacy_browser/legacy_browser.php
+++ b/plugins/legacy_browser/legacy_browser.php
@@ -1,86 +1,100 @@
<?php
/**
- * Plugin which adds support for legacy browsers (IE 7/8)
+ * Plugin which adds support for legacy browsers (IE 7/8, Firefox < 4)
*
* @author Aleksander Machniak <alec@alec.pl>
* @license GNU GPLv3+
*/
class legacy_browser extends rcube_plugin
{
public $noajax = true;
+ private $rc;
public function init()
{
- $rcube = rcube::get_instance();
+ $this->rc = $rcube = rcube::get_instance();
- if ($rcube->output->browser->ie && $rcube->output->browser->ver < 9) {
+ if (
+ // IE < 9
+ ($rcube->output->browser->ie && $rcube->output->browser->ver < 9)
+ // Firefox < 4 (Firefox 4 is recognized as 2.0)
+ || ($rcube->output->browser->mz && $rcube->output->browser->ver < 2)
+ ) {
$this->add_hook('send_page', array($this, 'send_page'));
$this->add_hook('render_page', array($this, 'render_page'));
}
}
function send_page($args)
{
- // replace jQuery 2.x with 1.x
$ts1 = filemtime($this->home . '/js/jquery.min.js');
$ts2 = filemtime($this->home . '/js/iehacks.js');
// put iehacks.js after app.js
- $args['content'] = preg_replace(
- '|(<script src="program/js/app(\.min)?\.js\?s=[0-9]+" type="text/javascript"></script>)|',
- '\\1<script src="plugins/legacy_browser/js/iehacks.js?s=' . $ts2 . '" type="text/javascript"></script>',
- $args['content'], 1, $count);
+ if ($this->rc->output->browser->ie) {
+ $args['content'] = preg_replace(
+ '|(<script src="program/js/app(\.min)?\.js\?s=[0-9]+" type="text/javascript"></script>)|',
+ '\\1<script src="plugins/legacy_browser/js/iehacks.js?s=' . $ts2 . '" type="text/javascript"></script>',
+ $args['content'], 1, $count);
+ }
+ else {
+ $count = 1;
+ }
+ // replace jQuery 2.x with 1.x
$args['content'] = preg_replace(
'|<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>'
+ // add iehacks.js if it is IE and it wasn't added yet
. ($count ? '' : "\n".'<script src="plugins/legacy_browser/js/iehacks.js?s=' . $ts2 . '" type="text/javascript"></script>'),
$args['content'], 1);
return $args;
}
function render_page($args)
{
- $rcube = rcube::get_instance();
+ if (!$this->rc->output->browser->ie) {
+ return $args;
+ }
+
$skin = $this->skin();
if ($skin == 'classic') {
$minified = file_exists(INSTALL_PATH . '/plugins/legacy_browser/skins/classic/iehacks.min.css') ? '.min' : '';
- $rcube->output->add_header(
+ $this->rc->output->add_header(
'<link rel="stylesheet" type="text/css" href="plugins/legacy_browser/skins/classic/iehacks' . $minified . '.css" />'
);
}
else if ($skin == 'larry') {
$minified = file_exists(INSTALL_PATH . '/plugins/legacy_browser/skins/larry/iehacks.min.css') ? '.min' : '';
- $rcube->output->add_header(
+ $this->rc->output->add_header(
'<link rel="stylesheet" type="text/css" href="plugins/legacy_browser/skins/larry/iehacks' . $minified . '.css" />'
);
- if ($rcube->output->browser->ver < 8) {
- $rcube->output->add_header(
+ if ($this->rc->output->browser->ver < 8) {
+ $this->rc->output->add_header(
'<link rel="stylesheet" type="text/css" href="plugins/legacy_browser/skins/larry/ie7hacks' . $minified . '.css" />'
);
}
}
}
private function skin()
{
- $rcube = rcube::get_instance();
- $skin = $rcube->config->get('skin');
+ $skin = $this->rc->config->get('skin');
// external skin, find if it inherits from other skin
if ($skin != 'larry' && $skin != 'classic') {
$json = @file_get_contents(INSTALL_PATH . "/skins/$skin/meta.json");
$json = @json_decode($json, true);
if (!empty($json['extends'])) {
return $json['extends'];
}
}
return $skin;
}
}
diff --git a/plugins/legacy_browser/package.xml b/plugins/legacy_browser/package.xml
index 71a76ef79..06e5fa2ba 100644
--- a/plugins/legacy_browser/package.xml
+++ b/plugins/legacy_browser/package.xml
@@ -1,54 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
http://pear.php.net/dtd/tasks-1.0.xsd
http://pear.php.net/dtd/package-2.0
http://pear.php.net/dtd/package-2.0.xsd">
<name>legacy_browser</name>
<channel>pear.roundcube.net</channel>
- <summary>Legacy browser (IE 7/8) support</summary>
- <description>This adds support for legacy browsers (IE 7/8).</description>
+ <summary>Legacy browser (IE 7/8, Firefox &lt; 4) support</summary>
+ <description>This adds support for legacy browsers (IE 7/8, Firefox &lt; 4).</description>
<lead>
<name>Aleksander Machniak</name>
<user>alec</user>
<email>alec@alec.pl</email>
<active>yes</active>
</lead>
- <date>2014-04-12</date>
+ <date>2014-06-19</date>
<version>
- <release>1.0</release>
+ <release>1.1</release>
<api>1.0</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
<notes>-</notes>
<contents>
<dir baseinstalldir="/" name="/">
<file name="legacy_browser.php" role="php">
<tasks:replace from="@name@" to="name" type="package-info"/>
<tasks:replace from="@package_version@" to="version" type="package-info"/>
</file>
<file name="js/jquery.min.js" role="data"></file>
<file name="skins/classic/iehacks.css" role="data"></file>
<file name="skins/classic/images/abook_toolbar.gif" role="data"></file>
<file name="skins/classic/images/mail_toolbar.gif" role="data"></file>
<file name="skins/larry/ie7hacks.css" role="data"></file>
<file name="skins/larry/iehacks.css" role="data"></file>
<file name="skins/larry/images/buttons.gif" role="data"></file>
</dir>
<!-- / -->
</contents>
<dependencies>
<required>
<php>
<min>5.2.1</min>
</php>
<pearinstaller>
<min>1.7.0</min>
</pearinstaller>
</required>
</dependencies>
<phprelease/>
</package>

File Metadata

Mime Type
text/x-diff
Expires
Sat, Mar 1, 12:56 AM (5 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
165319
Default Alt Text
(6 KB)

Event Timeline