mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add Compound property to avoid double escaping values.

This commit is contained in:
Thomas Tanghus 2013-05-15 18:56:54 +02:00
parent fdef2a373a
commit cb41a30b00
2 changed files with 89 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
lib/vobject/compoundproperty.php Normal file
View File

@ -0,0 +1,70 @@
<?php
/**
* ownCloud - VObject Compound Property
*
* @author Thomas Tanghus
* @author Evert Pot (http://www.rooftopsolutions.nl/)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
* License as published by the Free Software Foundation; either
* version 3 of the License, or any later version.
*
* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
*
* You should have received a copy of the GNU Affero General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OC\VObject;
/**
* This class overrides \Sabre\VObject\Property::serialize() to not
* double escape commas and semi-colons in compound properties.
*/
class CompoundProperty extends \Sabre\VObject\Property\Compound {
/**
* Turns the object back into a serialized blob.
*
* @return string
*/
public function serialize() {
$str = $this->name;
if ($this->group) {
$str = $this->group . '.' . $this->name;
}
foreach($this->parameters as $param) {
$str.=';' . $param->serialize();
}
$src = array(
"\n",
);
$out = array(
'\n',
);
$str.=':' . str_replace($src, $out, $this->value);
$out = '';
while(strlen($str) > 0) {
if (strlen($str) > 75) {
$out .= mb_strcut($str, 0, 75, 'utf-8') . "\r\n";
$str = ' ' . mb_strcut($str, 75, strlen($str), 'utf-8');
} else {
$out .= $str . "\r\n";
$str = '';
break;
}
}
return $out;
}
}

19
tests/lib/vobject.php
View File

@ -10,10 +10,29 @@ class Test_VObject extends PHPUnit_Framework_TestCase {
public function setUp() {
Sabre\VObject\Property::$classMap['SUMMARY'] = 'OC\VObject\StringProperty';
Sabre\VObject\Property::$classMap['ORG'] = 'OC\VObject\CompoundProperty';
}
function testStringProperty() {
$property = Sabre\VObject\Property::create('SUMMARY', 'Escape;this,please');
$this->assertEquals("SUMMARY:Escape\;this\,please\r\n", $property->serialize());
}
function testCompoundProperty() {
$arr = array(
'ABC, Inc.',
'North American Division',
'Marketing;Sales',
);
$property = Sabre\VObject\Property::create('ORG');
$property->setParts($arr);
$this->assertEquals('ABC\, Inc.;North American Division;Marketing\;Sales', $property->value);
$this->assertEquals('ORG:ABC\, Inc.;North American Division;Marketing\;Sales' . "\r\n", $property->serialize());
$this->assertEquals(3, count($property->getParts()));
$parts = $property->getParts();
$this->assertEquals('Marketing;Sales', $parts[2]);
}
}