summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2012-11-02 14:24:04 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2012-11-02 14:24:04 (GMT)
commitbab0fd3186bad79c421abe90041c127f551bf8b3 (patch)
treea2f4c8b39e82bb1bf1fc83dcee6df968ce5e3a14
parenta9832d444e2b61f0e896e05ff07975bfa1b9c178 (diff)
parente6c915ba280d2589062f3186ae3553be9025fc7a (diff)
downloadlibkolabxml-bab0fd3186bad79c421abe90041c127f551bf8b3.tar.gz
Merge branch 'master' of ssh://git.kolab.org/git/libkolabxml
-rw-r--r--README-Mac.txt2
-rwxr-xr-xsrc/php/test.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/README-Mac.txt b/README-Mac.txt
index 34ac1f5..742cbfe 100644
--- a/README-Mac.txt
+++ b/README-Mac.txt
@@ -1,6 +1,6 @@
# The following commands are used to bild libkolabxml on Mac OS X (Lion)
# with most of the required libraries installed via macports:
-# > sudo port install cmake boost xercesc3
+# > sudo port install cmake boost xercesc3 swig swig-php
#
# The cxx/xsd library has to be downlaoded from http://www.codesynthesis.com/products/xsd/download.xhtml
# and manually copied into /usr/bin and /usr/include/xsd/
diff --git a/src/php/test.php b/src/php/test.php
index f53f2e2..207ccff 100755
--- a/src/php/test.php
+++ b/src/php/test.php
@@ -81,7 +81,7 @@ assertcontains($xml, '<duration>-PT6H30M</duration>', "Alarm::setRelativeStart(D
assertcontains($xml, '<trigger><date-time>2012-07-30T20:30:00Z</date-time>', "Alarm::setStart()");
assertcontains($xml, '<trigger><parameters><related><text>START</text>', "Alarm relative to Start");
assertcontains($xml, '<valarm><properties><action><text>EMAIL</text>', "Email alarm");
-assertcontains($xml, '<attendee><cal-address>mailto:%3Calarms%40kolab%2Eorg%3E</cal-address>', "Email alarm attendee");
+assertcontains($xml, '<attendee><cal-address>mailto:%3Calarms%40kolab.org%3E</cal-address>', "Email alarm attendee");
$e1 = kolabformat::readEvent($xml, false);
assertequal($xml, kolabformat::writeEvent($e1), "kolabformat::readEvent() => kolabformat::writeEvent()");
@@ -188,7 +188,7 @@ $dl->setMembers($m);
$xml = kolabformat::writeDistlist($dl);
#print $xml;
assertcontains($xml, '<fn><text>DalistÄÖŸ</text></fn>', "kolabformat::writeDistlist(): FN (UTF-8)");
-assertcontains($xml, '<uri>mailto:Member%2DA%3Ca%40localhost%3E</uri>', "kolabformat::writeDistlist(): mailto uri");
+assertcontains($xml, '<uri>mailto:Member-A%3Ca%40localhost%3E</uri>', "kolabformat::writeDistlist(): mailto uri");
assertcontains($xml, '<member><uri>urn:uuid:x-member-b-fff</uri>', "kolabformat::writeDistlist(): member urn::uuid");