Mirror
/
RoundcubeMail
mirror of https://github.com/roundcube/roundcubemail.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

get_input_value() -> get_input_string()

pull/8212/head
Aleksander Machniak 4 years ago
parent
0249656a93
commit
14522d7108
6 changed files with 30 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      program/include/rcmail.php
  2. 2
      program/include/rcmail_action.php
  3. 8
      program/include/rcmail_attachment_handler.php
  4. 8
      program/include/rcmail_output_html.php
  5. 2
      program/include/rcmail_output_json.php
  6. 24
      program/include/rcmail_sendmail.php

16
program/include/rcmail.php
View File

@ -117,8 +117,8 @@ class rcmail extends rcube
$this->set_user(new rcube_user($_SESSION['user_id'] ?? null));
// set task and action properties
$this->set_task(rcube_utils::get_input_value('_task', rcube_utils::INPUT_GPC));
$this->action = asciiwords(rcube_utils::get_input_value('_action', rcube_utils::INPUT_GPC));
$this->set_task(rcube_utils::get_input_string('_task', rcube_utils::INPUT_GPC));
$this->action = asciiwords(rcube_utils::get_input_string('_action', rcube_utils::INPUT_GPC));
// reset some session parameters when changing task
if ($this->task != 'utils') {
@ -854,8 +854,8 @@ class rcmail extends rcube
$_SESSION['password'] = $this->encrypt($password);
$_SESSION['login_time'] = time();
$timezone = rcube_utils::get_input_value('_timezone', rcube_utils::INPUT_GPC);
if ($timezone && is_string($timezone) && $timezone != '_default_') {
$timezone = rcube_utils::get_input_string('_timezone', rcube_utils::INPUT_GPC);
if ($timezone && $timezone != '_default_') {
$_SESSION['timezone'] = $timezone;
}
@ -935,7 +935,7 @@ class rcmail extends rcube
public function session_error()
{
// log session failures
$task = rcube_utils::get_input_value('_task', rcube_utils::INPUT_GPC);
$task = rcube_utils::get_input_string('_task', rcube_utils::INPUT_GPC);
if ($task && !in_array($task, ['login', 'logout']) && !empty($_COOKIE[ini_get('session.name')])) {
$sess_id = $_COOKIE[ini_get('session.name')];
@ -973,8 +973,8 @@ class rcmail extends rcube
$host = null;
if (is_array($default_host)) {
$post_host = rcube_utils::get_input_value('_host', rcube_utils::INPUT_POST);
$post_user = rcube_utils::get_input_value('_user', rcube_utils::INPUT_POST);
$post_host = rcube_utils::get_input_string('_host', rcube_utils::INPUT_POST);
$post_user = rcube_utils::get_input_string('_user', rcube_utils::INPUT_POST);
list(, $domain) = explode('@', $post_user);
@ -1003,7 +1003,7 @@ class rcmail extends rcube
}
}
else if (empty($default_host)) {
$host = rcube_utils::get_input_value('_host', rcube_utils::INPUT_POST);
$host = rcube_utils::get_input_string('_host', rcube_utils::INPUT_POST);
}
else {
$host = rcube_utils::parse_host($default_host);

2
program/include/rcmail_action.php
View File

@ -851,7 +851,7 @@ abstract class rcmail_action
// the form of <ID>-<MBOX>[,<ID>-<MBOX>]*
$_uid = $uids ?: rcube_utils::get_input_value('_uid', $mode ?: rcube_utils::INPUT_GPC, true);
$_mbox = $mbox ?: (string) rcube_utils::get_input_value('_mbox', $mode ?: rcube_utils::INPUT_GPC, true);
$_mbox = $mbox ?: rcube_utils::get_input_string('_mbox', $mode ?: rcube_utils::INPUT_GPC, true);
// already a hash array
if (is_array($_uid) && !isset($_uid[0])) {

8
program/include/rcmail_attachment_handler.php
View File

@ -48,10 +48,10 @@ class rcmail_attachment_handler
{
ob_end_clean();
$part_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_GET);
$file_id = rcube_utils::get_input_value('_file', rcube_utils::INPUT_GET);
$compose_id = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GET);
$uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET);
$part_id = rcube_utils::get_input_string('_part', rcube_utils::INPUT_GET);
$file_id = rcube_utils::get_input_string('_file', rcube_utils::INPUT_GET);
$compose_id = rcube_utils::get_input_string('_id', rcube_utils::INPUT_GET);
$uid = rcube_utils::get_input_string('_uid', rcube_utils::INPUT_GET);
$rcube = rcube::get_instance();
$this->download = !empty($_GET['_download']);

8
program/include/rcmail_output_html.php
View File

@ -2305,7 +2305,7 @@ EOF;
$_SESSION['temp'] = true;
// save original url
$url = rcube_utils::get_input_value('_url', rcube_utils::INPUT_POST);
$url = rcube_utils::get_input_string('_url', rcube_utils::INPUT_POST);
if (
empty($url)
&& !empty($_SERVER['QUERY_STRING'])
@ -2368,7 +2368,7 @@ EOF;
$table = new html_table(['cols' => 2]);
$table->add('title', html::label('rcmloginuser', html::quote($this->app->gettext('username'))));
$table->add('input', $input_user->show(rcube_utils::get_input_value('_user', rcube_utils::INPUT_GPC)));
$table->add('input', $input_user->show(rcube_utils::get_input_string('_user', rcube_utils::INPUT_GPC)));
$table->add('title', html::label('rcmloginpwd', html::quote($this->app->gettext('password'))));
$table->add('input', $input_pass->show());
@ -2376,7 +2376,7 @@ EOF;
// add host selection row
if (is_object($input_host) && !$hide_host) {
$table->add('title', html::label('rcmloginhost', html::quote($this->app->gettext('server'))));
$table->add('input', $input_host->show(rcube_utils::get_input_value('_host', rcube_utils::INPUT_GPC)));
$table->add('input', $input_host->show(rcube_utils::get_input_string('_host', rcube_utils::INPUT_GPC)));
}
$out = $input_task->show();
@ -2622,7 +2622,7 @@ EOF;
'KOI8-R' => 'KOI8-R ('.$this->app->gettext('cyrillic').')',
];
if ($post = rcube_utils::get_input_value('_charset', rcube_utils::INPUT_POST)) {
if ($post = rcube_utils::get_input_string('_charset', rcube_utils::INPUT_POST)) {
$set = $post;
}
else if (!empty($attrib['selected'])) {

2
program/include/rcmail_output_json.php
View File

@ -225,7 +225,7 @@ class rcmail_output_json extends rcmail_output
$rcmail = rcmail::get_instance();
$response['action'] = $rcmail->action;
if ($unlock = rcube_utils::get_input_value('_unlock', rcube_utils::INPUT_GPC)) {
if ($unlock = rcube_utils::get_input_string('_unlock', rcube_utils::INPUT_GPC)) {
$response['unlock'] = $unlock;
}

24
program/include/rcmail_sendmail.php
View File

@ -92,7 +92,7 @@ class rcmail_sendmail
// set default charset
if (empty($this->options['charset'])) {
$charset = rcube_utils::get_input_value('_charset', rcube_utils::INPUT_POST) ?: $this->rcmail->output->get_charset();
$charset = rcube_utils::get_input_string('_charset', rcube_utils::INPUT_POST) ?: $this->rcmail->output->get_charset();
$this->options['charset'] = $charset;
}
@ -100,9 +100,9 @@ class rcmail_sendmail
$this->parse_data = [];
$mailto = $this->email_input_format(rcube_utils::get_input_value('_to', rcube_utils::INPUT_POST, true, $charset), true);
$mailcc = $this->email_input_format(rcube_utils::get_input_value('_cc', rcube_utils::INPUT_POST, true, $charset), true);
$mailbcc = $this->email_input_format(rcube_utils::get_input_value('_bcc', rcube_utils::INPUT_POST, true, $charset), true);
$mailto = $this->email_input_format(rcube_utils::get_input_string('_to', rcube_utils::INPUT_POST, true, $charset), true);
$mailcc = $this->email_input_format(rcube_utils::get_input_string('_cc', rcube_utils::INPUT_POST, true, $charset), true);
$mailbcc = $this->email_input_format(rcube_utils::get_input_string('_bcc', rcube_utils::INPUT_POST, true, $charset), true);
if (!empty($this->parse_data['INVALID_EMAIL']) && empty($this->options['savedraft'])) {
return $this->options['error_handler']('emailformaterror', 'error', ['email' => $this->parse_data['INVALID_EMAIL']]);
@ -125,10 +125,10 @@ class rcmail_sendmail
$dont_override = (array) $this->rcmail->config->get('dont_override');
$mdn_enabled = in_array('mdn_default', $dont_override) ? $this->rcmail->config->get('mdn_default') : !empty($_POST['_mdn']);
$dsn_enabled = in_array('dsn_default', $dont_override) ? $this->rcmail->config->get('dsn_default') : !empty($_POST['_dsn']);
$subject = rcube_utils::get_input_value('_subject', rcube_utils::INPUT_POST, true, $charset);
$from = rcube_utils::get_input_value('_from', rcube_utils::INPUT_POST, true, $charset);
$replyto = rcube_utils::get_input_value('_replyto', rcube_utils::INPUT_POST, true, $charset);
$followupto = rcube_utils::get_input_value('_followupto', rcube_utils::INPUT_POST, true, $charset);
$subject = rcube_utils::get_input_string('_subject', rcube_utils::INPUT_POST, true, $charset);
$from = rcube_utils::get_input_string('_from', rcube_utils::INPUT_POST, true, $charset);
$replyto = rcube_utils::get_input_string('_replyto', rcube_utils::INPUT_POST, true, $charset);
$followupto = rcube_utils::get_input_string('_followupto', rcube_utils::INPUT_POST, true, $charset);
$from_string = '';
// Get sender name and address from identity...
@ -489,7 +489,7 @@ class rcmail_sendmail
}
else if (!$this->rcmail->config->get('no_save_sent_messages')) {
if (isset($_POST['_store_target'])) {
$store_target = rcube_utils::get_input_value('_store_target', rcube_utils::INPUT_POST, true);
$store_target = rcube_utils::get_input_string('_store_target', rcube_utils::INPUT_POST, true);
}
else {
$store_target = $this->rcmail->config->get('sent_mbox');
@ -1057,7 +1057,7 @@ class rcmail_sendmail
$this->rcmail->session->remove("mailto.$mailto_id");
}
else if (!empty($_POST['_' . $header])) {
$fvalue = rcube_utils::get_input_value('_' . $header, rcube_utils::INPUT_POST, true);
$fvalue = rcube_utils::get_input_string('_' . $header, rcube_utils::INPUT_POST, true);
$charset = $this->rcmail->output->charset;
}
else if (!empty($this->data['param'][$header])) {
@ -1229,7 +1229,7 @@ class rcmail_sendmail
// use subject from post
if (isset($_POST['_subject'])) {
$subject = rcube_utils::get_input_value('_subject', rcube_utils::INPUT_POST, TRUE);
$subject = rcube_utils::get_input_string('_subject', rcube_utils::INPUT_POST, TRUE);
}
else if (!empty($this->data['param']['subject'])) {
$subject = $this->data['param']['subject'];
@ -1526,7 +1526,7 @@ class rcmail_sendmail
// Set From field value
if (!empty($_POST['_from'])) {
$message->compose['from'] = rcube_utils::get_input_value('_from', rcube_utils::INPUT_POST);
$message->compose['from'] = rcube_utils::get_input_string('_from', rcube_utils::INPUT_POST);
}
else if (!empty($this->data['param']['from'])) {
$message->compose['from'] = $this->data['param']['from'];

Write Preview
Loading…
Cancel
Save