Idea for sabre-io#589

the-djmaze · Nov 14, 2023 · cb9ebb8 · cb9ebb8
1 parent 154a84d
commit cb9ebb8
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 0 deletions.
diff --git a/lib/Component/VCard.php b/lib/Component/VCard.php
@@ -130,6 +130,8 @@ class VCard extends VObject\Document
         'HOBBY' => VObject\Property\FlatText::class,
         'INTEREST' => VObject\Property\FlatText::class,
         'ORG-DIRECTORY' => VObject\Property\FlatText::class,
+
+        'X-CRYPTO' => VObject\Property\XCrypto::class,
     ];
 
     /**

diff --git a/lib/Parser/Json.php b/lib/Parser/Json.php
@@ -151,6 +151,10 @@ public function parseProperty(array $jProp): Property
             unset($parameters['group']);
         }
 
+        if ('X-CRYPTO' === $propertyName) {
+            $propertyType = 'X-CRYPTO';
+        }
+
         $prop = $this->root->createProperty($propertyName, null, $parameters, $valueType);
         $prop->setJsonValue($value);
 

diff --git a/lib/Parser/XML.php b/lib/Parser/XML.php
@@ -271,6 +271,27 @@ protected function parseProperties(Component $parentComponent, string $propertyN
                     }
                     break;
 
+                case 'xcard:x-crypto':
+                    foreach ($xmlProperty['value'] as $i => $xmlPropertyChild) {
+                        if (is_array($xmlPropertyChild)) {
+                            $propertyParameterValues = [];
+                            foreach ($xmlPropertyChild['value'] as $xmlParameter) {
+                                if (is_array($xmlParameter['value'])) {
+                                    foreach ($xmlParameter['value'] as $xmlParameterValues) {
+                                        $propertyParameterValues[] = $xmlParameterValues['value'];
+                                    }
+                                } else {
+                                    $propertyParameterValues[] = $xmlParameter['value'];
+                                }
+                            }
+                            $propertyParameters[static::getTagName($xmlPropertyChild['name'])]
+                                = implode(',', $propertyParameterValues);
+                        }
+                        array_splice($xmlProperty['value'], $i, 1);
+                    }
+                    $propertyType = 'X-CRYPTO';
+                    break;
+
                 default:
                     $propertyType = static::getTagName($xmlProperty['value'][0]['name']);
 

diff --git a/lib/Property/XCrypto.php b/lib/Property/XCrypto.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Sabre\VObject\Property;
+
+use Sabre\VObject\Property;
+//use Sabre\VObject\Property\Text;
+
+/**
+ * XCrypto property.
+ *
+ * This object encodes X-CRYPTO values, as defined in KDE KAddressBook
+ *
+ * @copyright Copyright (C) SnappyMail (https://snappymail.eu/)
+ * @author DJMaze (https://snappymail.eu/)
+ * @license http://sabre.io/license/ Modified BSD License
+ *
+ * https://github.com/sabre-io/vobject/issues/589
+ */
+
+class XCrypto extends Property
+//class XCrypto extends Text
+{
+    /**
+     * Returns the type of value.
+     *
+     * This corresponds to the VALUE= parameter. Every property also has a
+     * 'default' valueType.
+     *
+     * @return string
+     */
+    public function getValueType()
+    {
+        return 'X-CRYPTO';
+    }
+
+    /**
+     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
+     *
+     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
+     * not yet done, but parameters are not included.
+     *
+     * @param string $val
+     */
+    public function setRawMimeDirValue($val)
+    {
+        error_log("setRawMimeDirValue({$val})");
+//        $this->setValue(MimeDir::unescapeValue($val, $this->delimiter));
+    }
+
+    /**
+     * Returns a raw mime-dir representation of the value.
+     *
+     * @return string
+     */
+    public function getRawMimeDirValue()
+    {
+        $result = [];
+        foreach ($this->parameters as $parameter) {
+            $result[] = strtolower($parameter->name) . '=' . $parameter->getValue();
+        }
+        return implode(',', $result);
+    }
+
+    public function xmlSerialize(\Sabre\Xml\Writer $writer): void
+    {
+        $writer->startElement(strtolower($this->name));
+        foreach ($this->parameters as $parameter) {
+            $writer->startElement(strtolower($parameter->name));
+            $writer->write($parameter);
+            $writer->endElement();
+        }
+        $writer->endElement();
+    }
+}