summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-11-27 11:17:37 +0100
committerThomas Bruederli <thomas@roundcube.net>2012-11-27 11:17:37 +0100
commit10da75f3645ff2121bbaf9d603f2e1465eddab78 (patch)
tree86bea83370406d7640844aaa47123da1c4061719 /program/include
parent0c82e95c59ab7a5823c69fcbc4f1b2745b7b86f9 (diff)
Move shortcut functions to framework class
Diffstat (limited to 'program/include')
-rw-r--r--program/include/bc.php8
-rw-r--r--program/include/rcmail.php24
2 files changed, 4 insertions, 28 deletions
diff --git a/program/include/bc.php b/program/include/bc.php
index 4c8f8a4cf..b589135ff 100644
--- a/program/include/bc.php
+++ b/program/include/bc.php
@@ -84,19 +84,19 @@ function json_serialize($input)
return rcube_output::json_serialize($input);
}
-function rep_specialchars_output($str, $enctype='', $mode='', $newlines=TRUE)
+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)
+function Q($str, $mode='strict', $newlines=true)
{
- return rcmail::Q($str, $mode, $newlines);
+ return rcube_utils::rep_specialchars_output($str, 'html', $mode, $newlines);
}
function JQ($str)
{
- return rcmail::JQ($str);
+ return rcube_utils::rep_specialchars_output($str, 'js');
}
function get_input_value($fname, $source, $allow_html=FALSE, $charset=NULL)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index cdafc5e7b..3a8c62cec 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -2029,30 +2029,6 @@ class rcmail extends rcube
/**
- * Quote a given string.
- * Shortcut function for rcube_utils::rep_specialchars_output()
- *
- * @return string HTML-quoted string
- */
- public static function Q($str, $mode = 'strict', $newlines = true)
- {
- return rcube_utils::rep_specialchars_output($str, 'html', $mode, $newlines);
- }
-
-
- /**
- * Quote a given string for javascript output.
- * Shortcut function for rcube_utils::rep_specialchars_output()
- *
- * @return string JS-quoted string
- */
- public static function JQ($str)
- {
- return rcube_utils::rep_specialchars_output($str, 'js');
- }
-
-
- /**
* Returns real size (calculated) of the message part
*
* @param rcube_message_part Message part