nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-20 01:44:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'itemfix' into 'master'

Browse Source 
Fixed grouped Properties naming (e.g. Addresses: item1.ADR instead of just ADR) …

…that caused item1.ADR to be written to DB(address_address_adr) because it doesn't match ADR, fix works ofr every grouped Property (yet there is only ADR...)
Added VCard Property ORG as nondefault (because it takes more then one Value)
Fixed false handling of Properties that can have more than one value (e.g. ORG) where values are seperated by semicolons

See merge request !19
This commit is contained in:
Jim Fenton 2015-12-11 01:27:48 +00:00
commit 32f4e2924f
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/always.php
View File

@ -203,7 +203,7 @@ if ( function_exists('awl_set_locale') ) {
*
*/
$c->code_version = 0;
$c->want_awl_version = '0.55';
$c->want_awl_version = '0.56';
$c->version_string = '1.1.3.1'; // The actual version # is replaced into that during the build /release process
if ( isset($c->version_string) && preg_match( '/(\d+)\.(\d+)\.(\d+)(.*)/', $c->version_string, $matches) ) {
$c->code_major = $matches[1];

3
inc/caldav-PUT-vcard.php
View File

@ -103,8 +103,7 @@ elseif( !preg_match('{^\d{8}T\d{6}Z$}', $last_modified) ) {
$vcard->ClearProperties('REV');
$vcard->AddProperty('REV',$last_modified);
}
$rendered_card = $vcard->Render();
$rendered_card = $vcard->Render();
$etag = md5($rendered_card);
$params = array(
':user_no' => $user_no,

4
inc/vcard.php
View File

@ -93,7 +93,9 @@ CREATE TABLE addressbook_address_adr (
$type = $adr->GetParameterValue('TYPE');
if ( is_array($type) ) $type = implode('~|~',$type);
$params[':type'] = $type;
$address = explode(';',$adr->Value());
//explode on ; that is not preceeded by an \
$address = preg_split( '{(?<!\\\\);}', $adr->Value());
//$address = explode(';',$adr->Value());
// We use @ to suppress the warnings here, because the NULL in the database suits us well.
@$params[':box_no'] = $address[0];