diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/enigma/lib/enigma_driver_phpssl.php | 2 | ||||
| -rw-r--r-- | plugins/new_user_identity/config.inc.php.dist | 10 | ||||
| -rw-r--r-- | plugins/new_user_identity/new_user_identity.php | 12 | ||||
| -rw-r--r-- | plugins/vcard_attachments/vcard_attachments.php | 2 | ||||
| -rw-r--r-- | plugins/zipdownload/zipdownload.php | 20 |
5 files changed, 20 insertions, 26 deletions
diff --git a/plugins/enigma/lib/enigma_driver_phpssl.php b/plugins/enigma/lib/enigma_driver_phpssl.php index 50af44762..fcd15db73 100644 --- a/plugins/enigma/lib/enigma_driver_phpssl.php +++ b/plugins/enigma/lib/enigma_driver_phpssl.php @@ -95,7 +95,7 @@ class enigma_driver_phpssl extends enigma_driver $fh = fopen($msg_file, "w"); if ($struct->mime_id) { - $message->get_part_content($struct->mime_id, $fh, true, 0, false); + $message->get_part_body($struct->mime_id, false, 0, $fh); } else { $this->rc->storage->get_raw_body($message->uid, $fh); diff --git a/plugins/new_user_identity/config.inc.php.dist b/plugins/new_user_identity/config.inc.php.dist new file mode 100644 index 000000000..b2fd76408 --- /dev/null +++ b/plugins/new_user_identity/config.inc.php.dist @@ -0,0 +1,10 @@ +<?php + +// The id of the address book to use to automatically set a new +// user's full name in their new identity. (This should be an +// string, which refers to the $config['ldap_public'] array.) +$config['new_user_identity_addressbook'] = 'People'; + +// When automatically setting a new users's full name in their +// new identity, match the user's login name against this field. +$config['new_user_identity_match'] = 'uid'; diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php index 4dbca3aab..d1d1d9f24 100644 --- a/plugins/new_user_identity/new_user_identity.php +++ b/plugins/new_user_identity/new_user_identity.php @@ -9,17 +9,6 @@ * @version @package_version@ * @author Kris Steinhoff * @license GNU GPLv3+ - * - * Example configuration: - * - * // The id of the address book to use to automatically set a new - * // user's full name in their new identity. (This should be an - * // string, which refers to the $config['ldap_public'] array.) - * $config['new_user_identity_addressbook'] = 'People'; - * - * // When automatically setting a new users's full name in their - * // new identity, match the user's login name against this field. - * $config['new_user_identity_match'] = 'uid'; */ class new_user_identity extends rcube_plugin { @@ -73,6 +62,7 @@ class new_user_identity extends rcube_plugin } $rcmail = rcmail::get_instance(); + $this->load_config(); $addressbook = $rcmail->config->get('new_user_identity_addressbook'); $ldap_config = (array)$rcmail->config->get('ldap_public'); diff --git a/plugins/vcard_attachments/vcard_attachments.php b/plugins/vcard_attachments/vcard_attachments.php index cf7e22d3a..74718be6f 100644 --- a/plugins/vcard_attachments/vcard_attachments.php +++ b/plugins/vcard_attachments/vcard_attachments.php @@ -65,7 +65,7 @@ class vcard_attachments extends rcube_plugin $attach_script = false; foreach ($this->vcard_parts as $part) { - $vcards = rcube_vcard::import($this->message->get_part_content($part, null, true)); + $vcards = rcube_vcard::import($this->message->get_part_body($part, true)); // successfully parsed vcards? if (empty($vcards)) { diff --git a/plugins/zipdownload/zipdownload.php b/plugins/zipdownload/zipdownload.php index edb8188cc..2e103ceb0 100644 --- a/plugins/zipdownload/zipdownload.php +++ b/plugins/zipdownload/zipdownload.php @@ -144,20 +144,14 @@ class zipdownload extends rcube_plugin } } - $disp_name = $this->_convert_filename($filename); + $disp_name = $this->_convert_filename($filename); + $tmpfn = tempnam($temp_dir, 'zipattach'); + $tmpfp = fopen($tmpfn, 'w'); + $tempfiles[] = $tmpfn; - if ($part->body) { - $orig_message_raw = $part->body; - $zip->addFromString($disp_name, $orig_message_raw); - } - else { - $tmpfn = tempnam($temp_dir, 'zipattach'); - $tmpfp = fopen($tmpfn, 'w'); - $imap->get_message_part($message->uid, $part->mime_id, $part, null, $tmpfp, true); - $tempfiles[] = $tmpfn; - fclose($tmpfp); - $zip->addFile($tmpfn, $disp_name); - } + $message->get_part_body($part->mime_id, false, 0, $tmpfp); + $zip->addFile($tmpfn, $disp_name); + fclose($tmpfp); } $zip->close(); |