Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't use deprecated Roundcube constants

Browse source
This commit is contained in:
Aleksander Machniak 2015-08-29 19:48:55 +02:00
parent d2f74ee9fa
commit 6b3063030d
10 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/calendar/calendar.php
View file

@ -914,7 +914,7 @@ class calendar extends rcube_plugin
// display message with Undo link. // display message with Undo link.
$msg = html::span(null, $this->gettext('successremoval')) $msg = html::span(null, $this->gettext('successremoval'))
. ' ' . html::a(array('onclick' => sprintf("%s.http_request('event', 'action=undo', %s.display_message('', 'loading'))", . ' ' . html::a(array('onclick' => sprintf("%s.http_request('event', 'action=undo', %s.display_message('', 'loading'))",
JS_OBJECT_NAME, JS_OBJECT_NAME)), $this->gettext('undo')); rcmail_output::JS_OBJECT_NAME, rcmail_output::JS_OBJECT_NAME)), $this->gettext('undo'));
$this->rc->output->show_message($msg, 'confirmation', null, true, $undo_time); $this->rc->output->show_message($msg, 'confirmation', null, true, $undo_time);
$got_msg = true; $got_msg = true;
} }
@ -3100,7 +3100,7 @@ class calendar extends rcube_plugin
$uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST); $uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
$mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST); $mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
$mime_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_POST); $mime_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_POST);
$charset = RCMAIL_CHARSET; $charset = RCUBE_CHARSET;
// establish imap connection // establish imap connection
$imap = $this->rc->get_storage(); $imap = $this->rc->get_storage();

4
plugins/calendar/lib/calendar_ui.php
View file

@ -291,7 +291,7 @@ class calendar_ui
$classes = array('calendar', 'cal-' . asciiwords($id, true)); $classes = array('calendar', 'cal-' . asciiwords($id, true));
$title = $prop['title'] ?: ($prop['name'] != $prop['listname'] || strlen($prop['name']) > 25 ? $title = $prop['title'] ?: ($prop['name'] != $prop['listname'] || strlen($prop['name']) > 25 ?
html_entity_decode($prop['name'], ENT_COMPAT, RCMAIL_CHARSET) : ''); html_entity_decode($prop['name'], ENT_COMPAT, RCUBE_CHARSET) : '');
if ($prop['virtual']) if ($prop['virtual'])
$classes[] = 'virtual'; $classes[] = 'virtual';
@ -617,7 +617,7 @@ class calendar_ui
return html::div($attrib, return html::div($attrib,
html::div(null, $input->show()) . html::div(null, $input->show()) .
html::div('formbuttons', $button->show($this->rc->gettext('upload'), array('class' => 'button mainaction', html::div('formbuttons', $button->show($this->rc->gettext('upload'), array('class' => 'button mainaction',
'onclick' => JS_OBJECT_NAME . ".upload_file(this.form)"))) . 'onclick' => rcmail_output::JS_OBJECT_NAME . ".upload_file(this.form)"))) .
html::div('hint', $this->rc->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))) html::div('hint', $this->rc->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize))))
); );
} }

2
plugins/kolab_addressbook/lib/kolab_addressbook_ui.php
View file

@ -173,7 +173,7 @@ class kolab_addressbook_ui
$hidden_fields[] = array('name' => '_source', 'value' => $folder); $hidden_fields[] = array('name' => '_source', 'value' => $folder);
$folder = rcube_charset::convert($folder, RCMAIL_CHARSET, 'UTF7-IMAP'); $folder = rcube_charset::convert($folder, RCUBE_CHARSET, 'UTF7-IMAP');
$storage = $this->rc->get_storage(); $storage = $this->rc->get_storage();
$delim = $storage->get_hierarchy_delimiter(); $delim = $storage->get_hierarchy_delimiter();

6
plugins/kolab_files/lib/kolab_files_engine.php
View file

@ -464,7 +464,7 @@ class kolab_files_engine
$a_sort_cols = $this->sort_cols; $a_sort_cols = $this->sort_cols;
if (!empty($attrib['optionsmenuicon'])) { if (!empty($attrib['optionsmenuicon'])) {
$onclick = 'return ' . JS_OBJECT_NAME . ".command('menu-open', 'filelistmenu', this, event)"; $onclick = 'return ' . rcmail_output::JS_OBJECT_NAME . ".command('menu-open', 'filelistmenu', this, event)";
$inner = $this->rc->gettext('listoptions'); $inner = $this->rc->gettext('listoptions');
if (is_string($attrib['optionsmenuicon']) && $attrib['optionsmenuicon'] != 'true') { if (is_string($attrib['optionsmenuicon']) && $attrib['optionsmenuicon'] != 'true') {
@ -505,7 +505,7 @@ class kolab_files_engine
if (in_array($col, $a_sort_cols)) { if (in_array($col, $a_sort_cols)) {
$col_name = html::a(array( $col_name = html::a(array(
'href' => "#sort", 'href' => "#sort",
'onclick' => 'return '.JS_OBJECT_NAME.".command('files-sort','".$col."',this)", 'onclick' => 'return ' . rcmail_output::JS_OBJECT_NAME . ".command('files-sort','$col',this)",
'title' => $this->plugin->gettext('sortby') 'title' => $this->plugin->gettext('sortby')
), $col_name); ), $col_name);
} }
@ -1095,7 +1095,7 @@ class kolab_files_engine
$content = html::a(array( $content = html::a(array(
'href' => "#delete", 'href' => "#delete",
'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this)", JS_OBJECT_NAME, $id), 'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this)", rcmail_output::JS_OBJECT_NAME, $id),
'title' => $this->rc->gettext('delete'), 'title' => $this->rc->gettext('delete'),
'class' => 'delete', 'class' => 'delete',
), $button); ), $button);

2
plugins/kolab_notes/kolab_notes_ui.php
View file

@ -206,7 +206,7 @@ class kolab_notes_ui
} }
$title = $prop['title'] ?: ($prop['name'] != $prop['listname'] || strlen($prop['name']) > 25 ? $title = $prop['title'] ?: ($prop['name'] != $prop['listname'] || strlen($prop['name']) > 25 ?
html_entity_decode($prop['name'], ENT_COMPAT, RCMAIL_CHARSET) : ''); html_entity_decode($prop['name'], ENT_COMPAT, RCUBE_CHARSET) : '');
$label_id = 'nl:' . $id; $label_id = 'nl:' . $id;
$attr = $prop['virtual'] ? array('tabindex' => '0') : array('href' => $this->rc->url(array('_list' => $id))); $attr = $prop['virtual'] ? array('tabindex' => '0') : array('href' => $this->rc->url(array('_list' => $id)));

6
plugins/libcalendaring/lib/libcalendaring_itip.php
View file

@ -265,8 +265,8 @@ class libcalendaring_itip
$message = new Mail_mime("\r\n"); $message = new Mail_mime("\r\n");
$message->setParam('text_encoding', 'quoted-printable'); $message->setParam('text_encoding', 'quoted-printable');
$message->setParam('head_encoding', 'quoted-printable'); $message->setParam('head_encoding', 'quoted-printable');
$message->setParam('head_charset', RCMAIL_CHARSET); $message->setParam('head_charset', RCUBE_CHARSET);
$message->setParam('text_charset', RCMAIL_CHARSET . ";\r\n format=flowed"); $message->setParam('text_charset', RCUBE_CHARSET . ";\r\n format=flowed");
$message->setContentType('multipart/alternative'); $message->setContentType('multipart/alternative');
// compose common headers array // compose common headers array
@ -286,7 +286,7 @@ class libcalendaring_itip
$ical = libcalendaring::get_ical(); $ical = libcalendaring::get_ical();
$ics = $ical->export(array($event), $method, false, $method == 'REQUEST' && $this->plugin->driver ? array($this->plugin->driver, 'get_attachment_body') : false); $ics = $ical->export(array($event), $method, false, $method == 'REQUEST' && $this->plugin->driver ? array($this->plugin->driver, 'get_attachment_body') : false);
$filename = $event['_type'] == 'task' ? 'todo.ics' : 'event.ics'; $filename = $event['_type'] == 'task' ? 'todo.ics' : 'event.ics';
$message->addAttachment($ics, 'text/calendar', $filename, false, '8bit', '', RCMAIL_CHARSET . "; method=" . $method); $message->addAttachment($ics, 'text/calendar', $filename, false, '8bit', '', RCUBE_CHARSET . "; method=" . $method);
return $message; return $message;
} }

8
plugins/libcalendaring/libcalendaring.php
View file

@ -1114,7 +1114,7 @@ class libcalendaring extends rcube_plugin
$content = html::a(array( $content = html::a(array(
'href' => "#delete", 'href' => "#delete",
'class' => 'delete', 'class' => 'delete',
'onclick' => sprintf("return %s.remove_from_attachment_list('rcmfile%s')", JS_OBJECT_NAME, $id), 'onclick' => sprintf("return %s.remove_from_attachment_list('rcmfile%s')", rcmail_output::JS_OBJECT_NAME, $id),
'title' => $this->rc->gettext('delete'), 'title' => $this->rc->gettext('delete'),
'aria-label' => $this->rc->gettext('delete') . ' ' . $attachment['name'], 'aria-label' => $this->rc->gettext('delete') . ' ' . $attachment['name'],
), $button); ), $button);
@ -1208,7 +1208,7 @@ class libcalendaring extends rcube_plugin
// display page, @TODO: support text/plain (and maybe some other text formats) // display page, @TODO: support text/plain (and maybe some other text formats)
if ($mimetype == 'text/html' && empty($_GET['_download'])) { if ($mimetype == 'text/html' && empty($_GET['_download'])) {
$OUTPUT = new rcube_html_page(); $OUTPUT = new rcmail_html_page();
// @TODO: use washtml on $body // @TODO: use washtml on $body
$OUTPUT->write($plugin['body']); $OUTPUT->write($plugin['body']);
} }
@ -1345,7 +1345,7 @@ class libcalendaring extends rcube_plugin
foreach ($this->ical_parts as $mime_id) { foreach ($this->ical_parts as $mime_id) {
$part = $this->ical_message->mime_parts[$mime_id]; $part = $this->ical_message->mime_parts[$mime_id];
$charset = $part->ctype_parameters['charset'] ?: RCMAIL_CHARSET; $charset = $part->ctype_parameters['charset'] ?: RCUBE_CHARSET;
$this->mail_ical_parser->import($this->ical_message->get_part_body($mime_id, true), $charset); $this->mail_ical_parser->import($this->ical_message->get_part_body($mime_id, true), $charset);
// check if the parsed object is an instance of a recurring event/task // check if the parsed object is an instance of a recurring event/task
@ -1384,7 +1384,7 @@ class libcalendaring extends rcube_plugin
*/ */
public function mail_get_itip_object($mbox, $uid, $mime_id, $type = null) public function mail_get_itip_object($mbox, $uid, $mime_id, $type = null)
{ {
$charset = RCMAIL_CHARSET; $charset = RCUBE_CHARSET;
// establish imap connection // establish imap connection
$imap = $this->rc->get_storage(); $imap = $this->rc->get_storage();

2
plugins/odfviewer/odfviewer.php
View file

@ -77,7 +77,7 @@ class odfviewer extends rcube_plugin
// send webODF viewer page // send webODF viewer page
$html = file_get_contents($this->home . '/odf.html'); $html = file_get_contents($this->home . '/odf.html');
header("Content-Type: text/html; charset=" . RCMAIL_CHARSET); header("Content-Type: text/html; charset=" . RCUBE_CHARSET);
echo strtr($html, array( echo strtr($html, array(
'%%PARAMS%%' => rcube_output::json_serialize($params), '%%PARAMS%%' => rcube_output::json_serialize($params),
'%%viewer.css%%' => $this->asset_path('viewer.css'), '%%viewer.css%%' => $this->asset_path('viewer.css'),

2
plugins/tasklist/tasklist.php
View file

@ -1785,7 +1785,7 @@ class tasklist extends rcube_plugin
$uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST); $uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
$mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST); $mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
$mime_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_POST); $mime_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_POST);
$charset = RCMAIL_CHARSET; $charset = RCUBE_CHARSET;
// establish imap connection // establish imap connection
$imap = $this->rc->get_storage(); $imap = $this->rc->get_storage();

4
plugins/tasklist/tasklist_ui.php
View file

@ -256,7 +256,7 @@ class tasklist_ui
$classes = array('tasklist'); $classes = array('tasklist');
$title = $prop['title'] ?: ($prop['name'] != $prop['listname'] || strlen($prop['name']) > 25 ? $title = $prop['title'] ?: ($prop['name'] != $prop['listname'] || strlen($prop['name']) > 25 ?
html_entity_decode($prop['name'], ENT_COMPAT, RCMAIL_CHARSET) : ''); html_entity_decode($prop['name'], ENT_COMPAT, RCUBE_CHARSET) : '');
if ($prop['virtual']) if ($prop['virtual'])
$classes[] = 'virtual'; $classes[] = 'virtual';
@ -448,7 +448,7 @@ class tasklist_ui
return html::div($attrib, return html::div($attrib,
html::div(null, $input->show()) . html::div(null, $input->show()) .
html::div('formbuttons', $button->show($this->rc->gettext('upload'), array('class' => 'button mainaction', html::div('formbuttons', $button->show($this->rc->gettext('upload'), array('class' => 'button mainaction',
'onclick' => JS_OBJECT_NAME . ".upload_file(this.form)"))) . 'onclick' => rcmail_output::JS_OBJECT_NAME . ".upload_file(this.form)"))) .
html::div('hint', $this->rc->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))) html::div('hint', $this->rc->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize))))
); );
} }