summaryrefslogtreecommitdiff
path: root/plugins/kolab_addressbook
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-10-06 07:19:26 (GMT)
committerAleksander Machniak <alec@alec.pl>2014-10-06 07:19:26 (GMT)
commit77d34666389d38033b03dd35cc803296649abc70 (patch)
treeac05945351b43158f775942c00e84bf2af03caef /plugins/kolab_addressbook
parent48df8c34f9f48c185e340d5a52870e8d38ea1d84 (diff)
downloadroundcubemail-plugins-kolab-77d34666389d38033b03dd35cc803296649abc70.tar.gz
Get rid of deprecated function aliases and constants usage
Diffstat (limited to 'plugins/kolab_addressbook')
-rw-r--r--plugins/kolab_addressbook/kolab_addressbook.php24
-rw-r--r--plugins/kolab_addressbook/lib/kolab_addressbook_ui.php10
2 files changed, 17 insertions, 17 deletions
diff --git a/plugins/kolab_addressbook/kolab_addressbook.php b/plugins/kolab_addressbook/kolab_addressbook.php
index 25bd910..13a32e6 100644
--- a/plugins/kolab_addressbook/kolab_addressbook.php
+++ b/plugins/kolab_addressbook/kolab_addressbook.php
@@ -239,7 +239,7 @@ class kolab_addressbook extends rcube_plugin
*/
protected function addressbook_list_item($id, $source, &$jsdata, $search_mode = false)
{
- $folder = $this->folders[$id];
+ $folder = $this->folders[$id];
$current = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);
if (!$source['virtual']) {
@@ -564,7 +564,7 @@ class kolab_addressbook extends rcube_plugin
$key = 'kolab_addressbook_prio';
if (!in_array('kolab_addressbook_prio', $dont_override) || !isset($_POST['_'.$key])) {
- $args['prefs'][$key] = (int) get_input_value('_'.$key, RCUBE_INPUT_POST);
+ $args['prefs'][$key] = (int) rcube_utils::get_input_value('_'.$key, rcube_utils::INPUT_POST);
}
return $args;
@@ -576,7 +576,7 @@ class kolab_addressbook extends rcube_plugin
*/
public function book_actions()
{
- $action = trim(get_input_value('_act', RCUBE_INPUT_GPC));
+ $action = trim(rcube_utils::get_input_value('_act', rcube_utils::INPUT_GPC));
if ($action == 'create') {
$this->ui->book_edit();
@@ -596,9 +596,9 @@ class kolab_addressbook extends rcube_plugin
public function book_save()
{
$prop = array(
- 'name' => trim(get_input_value('_name', RCUBE_INPUT_POST)),
- 'oldname' => trim(get_input_value('_oldname', RCUBE_INPUT_POST, true)), // UTF7-IMAP
- 'parent' => trim(get_input_value('_parent', RCUBE_INPUT_POST, true)), // UTF7-IMAP
+ 'name' => trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST)),
+ 'oldname' => trim(rcube_utils::get_input_value('_oldname', rcube_utils::INPUT_POST, true)), // UTF7-IMAP
+ 'parent' => trim(rcube_utils::get_input_value('_parent', rcube_utils::INPUT_POST, true)), // UTF7-IMAP
'type' => 'contact',
'subscribed' => true,
);
@@ -649,14 +649,14 @@ class kolab_addressbook extends rcube_plugin
public function book_search()
{
$results = array();
- $query = rcube_utils::get_input_value('q', RCUBE_INPUT_GPC);
- $source = rcube_utils::get_input_value('source', RCUBE_INPUT_GPC);
+ $query = rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC);
+ $source = rcube_utils::get_input_value('source', rcube_utils::INPUT_GPC);
kolab_storage::$encode_ids = true;
$search_more_results = false;
$this->sources = array();
$this->folders = array();
-
+
// find unsubscribed IMAP folders that have "event" type
if ($source == 'folders') {
foreach ((array)kolab_storage::search_folders('contact', $query, array('other')) as $folder) {
@@ -728,7 +728,7 @@ class kolab_addressbook extends rcube_plugin
$this->rc->output->show_message('autocompletemore', 'info');
}
- $this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', RCUBE_INPUT_GPC));
+ $this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC));
}
/**
@@ -737,7 +737,7 @@ class kolab_addressbook extends rcube_plugin
public function book_subscribe()
{
$success = false;
- $id = rcube_utils::get_input_value('_source', RCUBE_INPUT_GPC);
+ $id = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);
if ($id && ($folder = kolab_storage::get_folder(kolab_storage::id_decode($id)))) {
if (isset($_POST['_permanent']))
@@ -773,7 +773,7 @@ class kolab_addressbook extends rcube_plugin
*/
private function book_delete()
{
- $folder = trim(get_input_value('_source', RCUBE_INPUT_GPC, true, 'UTF7-IMAP'));
+ $folder = trim(rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC, true, 'UTF7-IMAP'));
if (kolab_storage::folder_delete($folder)) {
$storage = $this->rc->get_storage();
diff --git a/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php b/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php
index e8f7c03..e154c75 100644
--- a/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php
+++ b/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php
@@ -133,8 +133,8 @@ class kolab_addressbook_ui
*/
public function book_form($attrib)
{
- $action = trim(get_input_value('_act', RCUBE_INPUT_GPC));
- $folder = trim(get_input_value('_source', RCUBE_INPUT_GPC, true)); // UTF8
+ $action = trim(rcube:utils::get_input_value('_act', rcube_utils::INPUT_GPC));
+ $folder = trim(rcube:utils::get_input_value('_source', rcube_utils::INPUT_GPC, true)); // UTF8
$hidden_fields[] = array('name' => '_source', 'value' => $folder);
@@ -144,9 +144,9 @@ class kolab_addressbook_ui
if ($this->rc->action == 'plugin.book-save') {
// save error
- $name = trim(get_input_value('_name', RCUBE_INPUT_GPC, true)); // UTF8
- $old = trim(get_input_value('_oldname', RCUBE_INPUT_GPC, true)); // UTF7-IMAP
- $path_imap = trim(get_input_value('_parent', RCUBE_INPUT_GPC, true)); // UTF7-IMAP
+ $name = trim(rcube:utils::get_input_value('_name', rcube_utils::INPUT_GPC, true)); // UTF8
+ $old = trim(rcube:utils::get_input_value('_oldname', rcube_utils::INPUT_GPC, true)); // UTF7-IMAP
+ $path_imap = trim(rcube:utils::get_input_value('_parent', rcube_utils::INPUT_GPC, true)); // UTF7-IMAP
$hidden_fields[] = array('name' => '_oldname', 'value' => $old);