Don't ignore the client-provided UID for EAS meeting requests.

Fixes the issue where the iTip request generated by the EAS client
and the iTip responses generated by the email client were mismatched
with the UID generated by Kronolith when the event was imported.

framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php

@@ -390,10 +390,14 @@ public function getSubject()
     }
 
     /**
-     * Set the appointment uid. Note that this is the client's UID value, and not
-     * the value that the server uses for the UID. ActiveSync messages do not
-     * include any server uid value as part of the message natively.
-     *
+     * Set the appointment uid. Note that this is the client's UID value, and
+     * not the value that the server normally uses for the UID. ActiveSync
+     * messages do not normally include any server uid value as part of the
+     * message directly. This causes issues with meeting requests since most
+     * clients will use the CLIENT_ENTRY_ID for this value, and will send the
+     * invitation email out using this value as the UID so we sort-of HAVE to
+     * use this value as the server's UID.
+     * 
      * @param string $uid  The server's uid for this appointment
      */
     public function setUid($uid)

kronolith/lib/Event.php

@@ -1490,6 +1490,12 @@ public function fromASAppointment(Horde_ActiveSync_Message_Appointment $message)
         if ($this->id === null) {
             $this->creator = $GLOBALS['registry']->getAuth();
         }
+
+        /* Meeting requests come with their own UID value. */
+        if (empty($this->uid) && !empty($message->getUid())) {
+            $this->uid = $message->getUid();
+        }
+
         if (strlen($title = $message->getSubject())) {
             $this->title = $title;
         }