Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into horde_5_2
Conflicts: horde/docs/CHANGES horde/package.xml
- Loading branch information
Showing
25 changed files
with
835 additions
and
384 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
framework/ListHeaders/lib/Horde/ListHeaders/Translation.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| <?php | ||
| /** | ||
| * Copyright 2010-2013 Horde LLC (http://www.horde.org/) | ||
| * | ||
| * See the enclosed file COPYING for license information (LGPL). If you | ||
| * did not receive this file, see http://www.horde.org/licenses/lgpl21. | ||
| * | ||
| * @category Horde | ||
| * @copyright 2010-2013 Horde LLC | ||
| * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 | ||
| * @package ListHeaders | ||
| */ | ||
|
|
||
| /** | ||
| * Horde_ListHeaders_Translation is the translation wrapper class for | ||
| * Horde_ListHeaders. | ||
| * | ||
| * @author Jan Schneider <jan@horde.org> | ||
| * @category Horde | ||
| * @copyright 2010-2013 Horde LLC | ||
| * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 | ||
| * @package ListHeaders | ||
| */ | ||
| class Horde_ListHeaders_Translation extends Horde_Translation | ||
| { | ||
| /** | ||
| * Returns the translation of a message. | ||
| * | ||
| * @var string $message The string to translate. | ||
| * | ||
| * @return string The string translation, or the original string if no | ||
| * translation exists. | ||
| */ | ||
| static public function t($message) | ||
| { | ||
| self::$_domain = 'Horde_ListHeaders'; | ||
| self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? __DIR__ . '/../../../locale' : '@data_dir@/Horde_ListHeaders/locale'; | ||
| return parent::t($message); | ||
| } | ||
|
|
||
| /** | ||
| * Returns the plural translation of a message. | ||
| * | ||
| * @param string $singular The singular version to translate. | ||
| * @param string $plural The plural version to translate. | ||
| * @param integer $number The number that determines singular vs. plural. | ||
| * | ||
| * @return string The string translation, or the original string if no | ||
| * translation exists. | ||
| */ | ||
| static public function ngettext($singular, $plural, $number) | ||
| { | ||
| self::$_domain = 'Horde_ListHeaders'; | ||
| self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? __DIR__ . '/../../../locale' : '@data_dir@/Horde_ListHeaders/locale'; | ||
| return parent::ngettext($singular, $plural, $number); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| # SOME DESCRIPTIVE TITLE. | ||
| # Copyright (C) YEAR Horde LLC (http://www.horde.org/) | ||
| # This file is distributed under the same license as the Horde_ListHeaders package. | ||
| # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. | ||
| # | ||
| #, fuzzy | ||
| msgid "" | ||
| msgstr "" | ||
| "Project-Id-Version: Horde_ListHeaders \n" | ||
| "Report-Msgid-Bugs-To: dev@lists.horde.org\n" | ||
| "POT-Creation-Date: 2013-10-17 17:50-0600\n" | ||
| "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | ||
| "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||
| "Language-Team: LANGUAGE <LL@li.org>\n" | ||
| "Language: \n" | ||
| "MIME-Version: 1.0\n" | ||
| "Content-Type: text/plain; charset=CHARSET\n" | ||
| "Content-Transfer-Encoding: 8bit\n" | ||
|
|
||
| #: lib/Horde/ListHeaders.php:40 | ||
| msgid "List-Archive" | ||
| msgstr "" | ||
|
|
||
| #: lib/Horde/ListHeaders.php:35 | ||
| msgid "List-Help" | ||
| msgstr "" | ||
|
|
||
| #: lib/Horde/ListHeaders.php:42 | ||
| msgid "List-Id" | ||
| msgstr "" | ||
|
|
||
| #: lib/Horde/ListHeaders.php:38 | ||
| msgid "List-Owner" | ||
| msgstr "" | ||
|
|
||
| #: lib/Horde/ListHeaders.php:39 | ||
| msgid "List-Post" | ||
| msgstr "" | ||
|
|
||
| #: lib/Horde/ListHeaders.php:37 | ||
| msgid "List-Subscribe" | ||
| msgstr "" | ||
|
|
||
| #: lib/Horde/ListHeaders.php:36 | ||
| msgid "List-Unsubscribe" | ||
| msgstr "" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| <?php | ||
| /** | ||
| * Copyright 2013 Horde LLC (http://www.horde.org/) | ||
| * | ||
| * See the enclosed file COPYING for license information (LGPL). If you | ||
| * did not receive this file, see http://www.horde.org/licenses/lgpl21. | ||
| * | ||
| * @category Horde | ||
| * @copyright 2013 Horde LLC | ||
| * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 | ||
| * @package Smtp | ||
| * @subpackage UnitTests | ||
| */ | ||
|
|
||
| /** | ||
| * Test for the SMTP DATA filter. | ||
| * | ||
| * @author Michael Slusarz <slusarz@horde.org> | ||
| * @category Horde | ||
| * @copyright 2013 Horde LLC | ||
| * @ignore | ||
| * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 | ||
| * @package Smtp | ||
| * @subpackage UnitTests | ||
| */ | ||
| class Horde_Smtp_FilterDataTest extends Horde_Test_Case | ||
| { | ||
| private $stream; | ||
|
|
||
| public function setUp() | ||
| { | ||
| $this->stream = fopen('php://temp', 'r+'); | ||
| stream_filter_register('horde_smtp_data', 'Horde_Smtp_Filter_Data'); | ||
| stream_filter_append($this->stream, 'horde_smtp_data', STREAM_FILTER_READ); | ||
| } | ||
|
|
||
| public function tearDown() | ||
| { | ||
| fclose($this->stream); | ||
| } | ||
|
|
||
| public function testLeadingPeriodsEscape() | ||
| { | ||
| fwrite($this->stream, "Foo\r\n.\r\nFoo\r\n"); | ||
| rewind($this->stream); | ||
|
|
||
| $this->assertEquals( | ||
| "Foo\r\n..\r\nFoo\r\n", | ||
| stream_get_contents($this->stream) | ||
| ); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.