summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-11-04 15:28:27 +0100
committerAleksander Machniak <alec@alec.pl>2014-11-04 15:28:27 +0100
commit2883fcba2bf3fcff286a70c3629016a0c53a6803 (patch)
treeee260eef992e7f81494d31804b69f85746a8cf41 /program/lib
parent14094fca82dc4d78d6e8ebc1c7baec5e8c0ff77c (diff)
Move TNEF decoder class to the Roundcube Framework (#1490055)
So, for now all dependencies of the Framework can be installed with composer and we need only lib/Roundcube folder. des.inc was never required and is less important since we do encryption using openssl or mcrypt extensions.
Diffstat (limited to 'program/lib')
-rw-r--r--program/lib/Roundcube/rcube_message.php2
-rw-r--r--program/lib/Roundcube/rcube_tnef_decoder.php (renamed from program/lib/tnef_decoder.php)36
2 files changed, 24 insertions, 14 deletions
diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php
index 3644d6b8e..169d00ce1 100644
--- a/program/lib/Roundcube/rcube_message.php
+++ b/program/lib/Roundcube/rcube_message.php
@@ -851,7 +851,7 @@ class rcube_message
{
// @TODO: attachment may be huge, handle body via file
$body = $this->get_part_body($part->mime_id);
- $tnef = new tnef_decoder;
+ $tnef = new rcube_tnef_decoder;
$tnef_arr = $tnef->decompress($body);
$parts = array();
diff --git a/program/lib/tnef_decoder.php b/program/lib/Roundcube/rcube_tnef_decoder.php
index e6ccc23d7..f047ba072 100644
--- a/program/lib/tnef_decoder.php
+++ b/program/lib/Roundcube/rcube_tnef_decoder.php
@@ -1,22 +1,33 @@
<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2008-2014, The Roundcube Dev Team |
+ | Copyright (C) 2002-2010, The Horde Project (http://www.horde.org/) |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
+ | |
+ | PURPOSE: |
+ | MS-TNEF format decoder |
+ +-----------------------------------------------------------------------+
+ | Author: Jan Schneider <jan@horde.org> |
+ | Author: Michael Slusarz <slusarz@horde.org> |
+ +-----------------------------------------------------------------------+
+*/
+
/**
- * The Horde's class allows MS-TNEF data to be displayed.
- *
- * The TNEF rendering is based on code by:
+ * MS-TNEF format decoder based on code by:
* Graham Norbury <gnorbury@bondcar.com>
* Original design by:
* Thomas Boll <tb@boll.ch>, Mark Simpson <damned@world.std.com>
*
- * Copyright 2002-2010 The Horde Project (http://www.horde.org/)
- *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
- *
- * @author Jan Schneider <jan@horde.org>
- * @author Michael Slusarz <slusarz@horde.org>
- * @package Horde_Compress
+ * @package Framework
+ * @subpackage Storage
*/
-class tnef_decoder
+class rcube_tnef_decoder
{
const SIGNATURE = 0x223e9f78;
const LVL_MESSAGE = 0x01;
@@ -327,5 +338,4 @@ class tnef_decoder
$this->_decodeAttribute($data, $attribute);
}
}
-
}