From 15cf4fa9251f01313b5eb5cf1a91ec10643d42cb Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 21 Nov 2012 19:55:34 +0100 Subject: Rename rcube_bc.inc to bc.php for consistency --- program/include/bc.php | 399 +++++++++++++++++++++++++++++++++++++++++++ program/include/iniset.php | 2 +- program/include/rcube_bc.inc | 399 ------------------------------------------- 3 files changed, 400 insertions(+), 400 deletions(-) create mode 100644 program/include/bc.php delete mode 100644 program/include/rcube_bc.inc diff --git a/program/include/bc.php b/program/include/bc.php new file mode 100644 index 000000000..8a3d4f918 --- /dev/null +++ b/program/include/bc.php @@ -0,0 +1,399 @@ + | + +-----------------------------------------------------------------------+ +*/ + +/** + * Roundcube Webmail deprecated functions + * + * @package Core + * @author Thomas Bruederli + */ + +// 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::JS_OBJECT_NAME); + +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 = rcmail::get_instance()->temp_gc(); +} + +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 rcmail::Q($str, $mode, $newlines); +} + +function JQ($str) +{ + return rcmail::JQ($str); +} + +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_utils::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) +{ + rcmail::get_instance()->display_server_error($fallback, $fallback_args); +} + +function rcmail_filetype2classname($mimetype, $filename) +{ + return rcube_utils::file2class($mimetype, $filename); +} + +function rcube_html_editor($mode='') +{ + rcmail::get_instance()->html_editor($mode); +} + +function rcmail_replace_emoticons($html) +{ + return rcmail::get_instance()->replace_emoticons($html); +} + +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 rcmail::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); +} diff --git a/program/include/iniset.php b/program/include/iniset.php index 587ac26a9..3e718c9bf 100644 --- a/program/include/iniset.php +++ b/program/include/iniset.php @@ -64,4 +64,4 @@ require_once 'Roundcube/bootstrap.php'; require_once INSTALL_PATH . 'program/include/rcmail.php'; // backward compatybility (to be removed) -require_once INSTALL_PATH . 'program/include/rcube_bc.inc'; +require_once INSTALL_PATH . 'program/include/bc.php'; diff --git a/program/include/rcube_bc.inc b/program/include/rcube_bc.inc deleted file mode 100644 index 80ca7b907..000000000 --- a/program/include/rcube_bc.inc +++ /dev/null @@ -1,399 +0,0 @@ - | - +-----------------------------------------------------------------------+ -*/ - -/** - * Roundcube Webmail deprecated functions - * - * @package Core - * @author Thomas Bruederli - */ - -// 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::JS_OBJECT_NAME); - -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 = rcmail::get_instance()->temp_gc(); -} - -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 rcmail::Q($str, $mode, $newlines); -} - -function JQ($str) -{ - return rcmail::JQ($str); -} - -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_utils::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) -{ - rcmail::get_instance()->display_server_error($fallback, $fallback_args); -} - -function rcmail_filetype2classname($mimetype, $filename) -{ - return rcube_utils::file2class($mimetype, $filename); -} - -function rcube_html_editor($mode='') -{ - rcmail::get_instance()->html_editor($mode); -} - -function rcmail_replace_emoticons($html) -{ - return rcmail::get_instance()->replace_emoticons($html); -} - -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 rcmail::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); -} -- cgit v1.2.3