Felix Eckhofer
2014-03-26 d71a711ab06483e62b1a7343e296ef8639352689
Remove usage of $RCMAIL global variable
1 files modified
4 ■■■ changed files
program/lib/Roundcube/rcube_utils.php 4 ●●● patch | view | raw | blame | history
program/lib/Roundcube/rcube_utils.php
@@ -593,8 +593,6 @@
     */
    public static function https_check($port=null, $use_https=true)
    {
        global $RCMAIL;
        if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off') {
            return true;
        }
@@ -604,7 +602,7 @@
        if ($port && $_SERVER['SERVER_PORT'] == $port) {
            return true;
        }
        if ($use_https && isset($RCMAIL) && $RCMAIL->config->get('use_https')) {
        if ($use_https && rcube::get_instance()->config->get('use_https')) {
            return true;
        }