From 33b4c9fad727a729c9d0ea1dd2626166f7c2fa87 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 18 Oct 2013 10:38:59 +0200 Subject: [PATCH] Fix: Bug into xcal decode --- htdocs/core/lib/xcal.lib.php | 20 +---- test/phpunit/AllTests.php | 2 + test/phpunit/XCalLibTest.php | 141 +++++++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+), 19 deletions(-) create mode 100644 test/phpunit/XCalLibTest.php diff --git a/htdocs/core/lib/xcal.lib.php b/htdocs/core/lib/xcal.lib.php index 08212f807ce..f8f8524743a 100644 --- a/htdocs/core/lib/xcal.lib.php +++ b/htdocs/core/lib/xcal.lib.php @@ -515,25 +515,7 @@ function quotedPrintEncode($str,$forcal=0) function quotedPrintDecode($str) { $out = preg_replace('/=\r?\n/', '', $str); - /* - * preg_replace /e modifier is deprecated in PHP 5.5 - * but anonymous functions for use in preg_replace_callback are only available from 5.3.0 - */ -/* if (version_compare(PHP_VERSION, '5.3.0') >= 0) - { - $out = preg_replace_callback( - '/=([A-F0-9]{2})/', - function ($m) { - return chr(hexdec($m[1])); - }, - $out - ); - } - else - {*/ - $out = @preg_replace('/=([A-F0-9]{2})/e', chr(hexdec('\\1')), $out); -// } - + $out = quoted_printable_decode($out); // Available with PHP 4+ return trim($out); } diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php index 047d4a98e64..89f17b4476b 100644 --- a/test/phpunit/AllTests.php +++ b/test/phpunit/AllTests.php @@ -78,6 +78,8 @@ class AllTests $suite->addTestSuite('FunctionsTest'); require_once dirname(__FILE__).'/Functions2Test.php'; $suite->addTestSuite('Functions2Test'); + require_once dirname(__FILE__).'/XCalLibTest.php'; + $suite->addTestSuite('XCalLibTest'); require_once dirname(__FILE__).'/SecurityTest.php'; $suite->addTestSuite('SecurityTest'); diff --git a/test/phpunit/XCalLibTest.php b/test/phpunit/XCalLibTest.php new file mode 100644 index 00000000000..8aa8217bb1f --- /dev/null +++ b/test/phpunit/XCalLibTest.php @@ -0,0 +1,141 @@ + + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * or see http://www.gnu.org/ + */ + +/** + * \file test/phpunit/XCalLibTest.php + * \ingroup test + * \brief PHPUnit test + * \remarks To run this script as CLI: phpunit filename.php + */ + +global $conf,$user,$langs,$db; +//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver +require_once 'PHPUnit/Autoload.php'; +require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; +require_once dirname(__FILE__).'/../../htdocs/core/lib/xcal.lib.php'; + +if (empty($user->id)) +{ + print "Load permissions for admin user nb 1\n"; + $user->fetch(1); + $user->getrights(); +} +$conf->global->MAIN_DISABLE_ALL_MAILS=1; + + +/** + * Class for PHPUnit tests + * + * @backupGlobals disabled + * @backupStaticAttributes enabled + * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased. + */ +class XCalLibTest extends PHPUnit_Framework_TestCase +{ + protected $savconf; + protected $savuser; + protected $savlangs; + protected $savdb; + + /** + * Constructor + * We save global variables into local variables + * + * @return FilesLibTest + */ + function __construct() + { + //$this->sharedFixture + global $conf,$user,$langs,$db; + $this->savconf=$conf; + $this->savuser=$user; + $this->savlangs=$langs; + $this->savdb=$db; + + print __METHOD__." db->type=".$db->type." user->id=".$user->id; + //print " - db ".$db->db; + print "\n"; + } + + // Static methods + public static function setUpBeforeClass() + { + global $conf,$user,$langs,$db; + $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + + print __METHOD__."\n"; + } + public static function tearDownAfterClass() + { + global $conf,$user,$langs,$db; + $db->rollback(); + + print __METHOD__."\n"; + } + + /** + * Init phpunit tests + * + * @return void + */ + protected function setUp() + { + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; + + print __METHOD__."\n"; + } + /** + * End phpunit tests + * + * @return void + */ + protected function tearDown() + { + print __METHOD__."\n"; + } + + + /** + * testQuotedPrintEncodeDecode + * + * @return void + */ + public function testQuotedPrintEncodeDecode() + { + global $conf,$user,$langs,$db; + $conf=$this->savconf; + $user=$this->savuser; + $langs=$this->savlangs; + $db=$this->savdb; + + $stringtoencode='ABCD=1234;'; + $result=quotedPrintEncode($stringtoencode); + print __METHOD__." result=".$result."\n"; + $this->assertEquals('ABCD=3D1234;',$result); + + $resultback=quotedPrintDecode($result); + print __METHOD__." result=".$resultback."\n"; + $this->assertEquals($stringtoencode,$resultback); + } + +} +?>