From fddfd8e6d7ff6c413ddbfe2b93ff826fb01e38b5 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 16 Oct 2015 13:51:28 -0400
Subject: [PATCH] Remove backward compatibility "layer" of bc.php (#1490534)
---
CHANGELOG | 1
/dev/null | 423 ----------------------------------------------------
program/include/iniset.php | 3
3 files changed, 1 insertions(+), 426 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index a5f5b91..6456fa6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Remove backward compatibility "layer" of bc.php (#1490534)
- Add possibility to define date format in write operations for ldap attributes (#1488741)
- Display attachment size in compose (#1484774)
- Added possibility to drag-n-drop attachments from mail preview to compose window
diff --git a/program/include/bc.php b/program/include/bc.php
deleted file mode 100644
index 259ebc3..0000000
--- a/program/include/bc.php
+++ /dev/null
@@ -1,423 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | program/include/bc.php |
- | |
- | This file is part of the Roundcube Webmail client |
- | Copyright (C) 2005-2012, The Roundcube Dev Team |
- | |
- | Licensed under the GNU General Public License version 3 or |
- | any later version with exceptions for skins & plugins. |
- | See the README file for a full license statement. |
- | |
- | PURPOSE: |
- | Provide deprecated functions aliases for backward compatibility |
- | |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com> |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Roundcube Webmail deprecated functions
- *
- * @package Webmail
- * @subpackage Legacy
- * @author Thomas Bruederli <roundcube@gmail.com>
- */
-
-// constants for input reading
-define('RCUBE_INPUT_GET', rcube_utils::INPUT_GET);
-define('RCUBE_INPUT_POST', rcube_utils::INPUT_POST);
-define('RCUBE_INPUT_GPC', rcube_utils::INPUT_GPC);
-
-define('JS_OBJECT_NAME', rcmail_output::JS_OBJECT_NAME);
-define('RCMAIL_CHARSET', RCUBE_CHARSET);
-
-function get_table_name($table)
-{
- return rcmail::get_instance()->db->table_name($table);
-}
-
-function rcube_label($p, $domain=null)
-{
- return rcmail::get_instance()->gettext($p, $domain);
-}
-
-function rcube_label_exists($name, $domain=null, &$ref_domain = null)
-{
- return rcmail::get_instance()->text_exists($name, $domain, $ref_domain);
-}
-
-function rcmail_overwrite_action($action)
-{
- rcmail::get_instance()->overwrite_action($action);
-}
-
-function rcmail_url($action, $p=array(), $task=null)
-{
- return rcmail::get_instance()->url((array)$p + array('_action' => $action, 'task' => $task));
-}
-
-function rcmail_temp_gc()
-{
- rcmail::get_instance()->gc_temp();
-}
-
-function rcube_charset_convert($str, $from, $to=NULL)
-{
- return rcube_charset::convert($str, $from, $to);
-}
-
-function rc_detect_encoding($string, $failover='')
-{
- return rcube_charset::detect($string, $failover);
-}
-
-function rc_utf8_clean($input)
-{
- return rcube_charset::clean($input);
-}
-
-function json_serialize($input)
-{
- return rcube_output::json_serialize($input);
-}
-
-function rep_specialchars_output($str, $enctype='', $mode='', $newlines=true)
-{
- return rcube_utils::rep_specialchars_output($str, $enctype, $mode, $newlines);
-}
-
-function Q($str, $mode='strict', $newlines=true)
-{
- return rcube_utils::rep_specialchars_output($str, 'html', $mode, $newlines);
-}
-
-function JQ($str)
-{
- return rcube_utils::rep_specialchars_output($str, 'js');
-}
-
-function get_input_value($fname, $source, $allow_html=FALSE, $charset=NULL)
-{
- return rcube_utils::get_input_value($fname, $source, $allow_html, $charset);
-}
-
-function parse_input_value($value, $allow_html=FALSE, $charset=NULL)
-{
- return rcube_utils::parse_input_value($value, $allow_html, $charset);
-}
-
-function request2param($mode = RCUBE_INPUT_GPC, $ignore = 'task|action')
-{
- return rcube_utils::request2param($mode, $ignore);
-}
-
-function html_identifier($str, $encode=false)
-{
- return rcube_utils::html_identifier($str, $encode);
-}
-
-function rcube_table_output($attrib, $table_data, $a_show_cols, $id_col)
-{
- return rcmail::get_instance()->table_output($attrib, $table_data, $a_show_cols, $id_col);
-}
-
-function rcmail_get_edit_field($col, $value, $attrib, $type='text')
-{
- return rcube_output::get_edit_field($col, $value, $attrib, $type);
-}
-
-function rcmail_mod_css_styles($source, $container_id, $allow_remote=false)
-{
- return rcube_utils::mod_css_styles($source, $container_id, $allow_remote);
-}
-
-function rcmail_xss_entity_decode($content)
-{
- return rcube_utils::xss_entity_decode($content);
-}
-
-function create_attrib_string($attrib, $allowed_attribs=array('id', 'class', 'style'))
-{
- return html::attrib_string($attrib, $allowed_attribs);
-}
-
-function parse_attrib_string($str)
-{
- return html::parse_attrib_string($str);
-}
-
-function format_date($date, $format=NULL, $convert=true)
-{
- return rcmail::get_instance()->format_date($date, $format, $convert);
-}
-
-function rcmail_mailbox_list($attrib)
-{
- return rcmail::get_instance()->folder_list($attrib);
-}
-
-function rcmail_mailbox_select($attrib = array())
-{
- return rcmail::get_instance()->folder_selector($attrib);
-}
-
-function rcmail_render_folder_tree_html(&$arrFolders, &$mbox_name, &$jslist, $attrib, $nestLevel = 0)
-{
- return rcmail::get_instance()->render_folder_tree_html($arrFolders, $mbox_name, $jslist, $attrib, $nestLevel);
-}
-
-function rcmail_render_folder_tree_select(&$arrFolders, &$mbox_name, $maxlength, &$select, $realnames = false, $nestLevel = 0, $opts = array())
-{
- return rcmail::get_instance()->render_folder_tree_select($arrFolders, $mbox_name, $maxlength, $select, $realnames, $nestLevel, $opts);
-}
-
-function rcmail_build_folder_tree(&$arrFolders, $folder, $delm = '/', $path = '')
-{
- return rcmail::get_instance()->build_folder_tree($arrFolders, $folder, $delm, $path);
-}
-
-function rcmail_folder_classname($folder_id)
-{
- return rcmail::get_instance()->folder_classname($folder_id);
-}
-
-function rcmail_localize_foldername($name)
-{
- return rcmail::get_instance()->localize_foldername($name);
-}
-
-function rcmail_localize_folderpath($path)
-{
- return rcmail::get_instance()->localize_folderpath($path);
-}
-
-function rcmail_quota_display($attrib)
-{
- return rcmail::get_instance()->quota_display($attrib);
-}
-
-function rcmail_quota_content($attrib = null)
-{
- return rcmail::get_instance()->quota_content($attrib);
-}
-
-function rcmail_display_server_error($fallback=null, $fallback_args=null, $suffix='')
-{
- rcmail::get_instance()->display_server_error($fallback, $fallback_args, $suffix);
-}
-
-function rcmail_filetype2classname($mimetype, $filename)
-{
- return rcube_utils::file2class($mimetype, $filename);
-}
-
-function rcube_html_editor($mode='')
-{
- rcmail::get_instance()->html_editor($mode);
-}
-
-function rcmail_deliver_message(&$message, $from, $mailto, &$smtp_error, &$body_file=null, $smtp_opts=null)
-{
- return rcmail::get_instance()->deliver_message($message, $from, $mailto, $smtp_error, $body_file, $smtp_opts);
-}
-
-function rcmail_gen_message_id()
-{
- return rcmail::get_instance()->gen_message_id();
-}
-
-function rcmail_user_date()
-{
- return rcmail::get_instance()->user_date();
-}
-
-function rcmail_mem_check($need)
-{
- return rcube_utils::mem_check($need);
-}
-
-function rcube_https_check($port=null, $use_https=true)
-{
- return rcube_utils::https_check($port, $use_https);
-}
-
-function rcube_sess_unset($var_name=null)
-{
- rcmail::get_instance()->session->remove($var_name);
-}
-
-function rcube_parse_host($name, $host='')
-{
- return rcube_utils::parse_host($name, $host);
-}
-
-function check_email($email, $dns_check=true)
-{
- return rcube_utils::check_email($email, $dns_check);
-}
-
-function console()
-{
- call_user_func_array(array('rcmail', 'console'), func_get_args());
-}
-
-function write_log($name, $line)
-{
- return rcmail::write_log($name, $line);
-}
-
-function rcmail_log_login()
-{
- return rcmail::get_instance()->log_login();
-}
-
-function rcmail_remote_ip()
-{
- return rcube_utils::remote_ip();
-}
-
-function rcube_check_referer()
-{
- return rcube_utils::check_referer();
-}
-
-function rcube_timer()
-{
- return rcmail::timer();
-}
-
-function rcube_print_time($timer, $label='Timer', $dest='console')
-{
- rcmail::print_timer($timer, $label, $dest);
-}
-
-function raise_error($arg=array(), $log=false, $terminate=false)
-{
- rcmail::raise_error($arg, $log, $terminate);
-}
-
-function rcube_log_bug($arg_arr)
-{
- rcmail::log_bug($arg_arr);
-}
-
-function rcube_upload_progress()
-{
- rcmail::get_instance()->upload_progress();
-}
-
-function rcube_upload_init()
-{
- return rcmail::get_instance()->upload_init();
-}
-
-function rcube_autocomplete_init()
-{
- rcmail::get_instance()->autocomplete_init();
-}
-
-function rcube_fontdefs($font = null)
-{
- return rcmail::font_defs($font);
-}
-
-function send_nocacheing_headers()
-{
- return rcmail::get_instance()->output->nocacheing_headers();
-}
-
-function show_bytes($bytes)
-{
- return rcmail::get_instance()->show_bytes($bytes);
-}
-
-function rc_wordwrap($string, $width=75, $break="\n", $cut=false, $charset=null)
-{
- return rcube_mime::wordwrap($string, $width, $break, $cut, $charset);
-}
-
-function rc_request_header($name)
-{
- return rcube_utils::request_header($name);
-}
-
-function rcube_explode_quoted_string($delimiter, $string)
-{
- return rcube_utils::explode_quoted_string($delimiter, $string);
-}
-
-function rc_mime_content_type($path, $name, $failover = 'application/octet-stream', $is_stream=false)
-{
- return rcube_mime::file_content_type($path, $name, $failover, $is_stream);
-}
-
-function rc_image_content_type($data)
-{
- return rcube_mime::image_content_type($data);
-}
-
-function rcube_strtotime($date)
-{
- return rcube_utils::strtotime($date);
-}
-
-function rcube_idn_to_ascii($str)
-{
- return rcube_utils::idn_to_ascii($str);
-}
-
-function rcube_idn_to_utf8($str)
-{
- return rcube_utils::idn_to_utf8($str);
-}
-
-function send_future_expire_header($offset = 2600000)
-{
- return rcmail::get_instance()->output->future_expire_header($offset);
-}
-
-function get_opt($aliases = array())
-{
- return rcube_utils::get_opt($aliases);
-}
-
-function prompt_silent($prompt = 'Password:')
-{
- return rcube_utils::prompt_silent($prompt);
-}
-
-function get_boolean($str)
-{
- return rcube_utils::get_boolean($str);
-}
-
-function enriched_to_html($data)
-{
- return rcube_enriched::to_html($data);
-}
-
-function strip_quotes($str)
-{
- return str_replace(array("'", '"'), '', $str);
-}
-
-function strip_newlines($str)
-{
- return preg_replace('/[\r\n]/', '', $str);
-}
-
-class rcube_html_page extends rcmail_html_page
-{
-}
-
-class washtml extends rcube_washtml
-{
-}
-
-class html2text extends rcube_html2text
-{
-}
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 3044e0e..6436767 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -65,9 +65,6 @@
// register autoloader for rcmail app classes
spl_autoload_register('rcmail_autoload');
-// backward compatybility (to be removed)
-require_once INSTALL_PATH . 'program/include/bc.php';
-
/**
* PHP5 autoloader routine for dynamic class loading
*/
--
Gitblit v1.9.1