These are constants now

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php
index d4a4fa7..eaed4da 100644 (file)
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php
@@ -468,53 +468,21 @@ class Horde_ActiveSync_Message_Appointment extends Horde_ActiveSync_Message_Base
      * Should be one of:
      *   normal, personal, private, confidential
      *
-     * @param string $sensitivity
+     * @param integer $sensitivity  The SENSITIVITY constant
      */
     public function setSensitivity($sensitivity)
     {
-        switch ($sensitivity) {
-        case 'normal':
-            $sensitivity = self::SENSITIVITY_NORMAL;
-            break;
-        case 'personal':
-            $sensitivity = self::SENSITIVITY_PERSONAL;
-            break;
-        case 'private':
-            $sensitivity = self::SENSITIVITY_PRIVATE;
-            break;
-        case 'confidential':
-            $sensitivity = self::SENSITIVITY_CONFIDENTIAL;
-            break;
-        default:
-            return;
-        }
-
         $this->_properties['sensitivity'] = $sensitivity;
     }
 
     /**
      * Return the sensitivity setting for this appointment
      *
-     * @return string  One of: normal, personal, private, confidential
+     * @return integer  The SENSITIVITY constant
      */
     public function getSensitivity()
     {
-        switch ($this->_getAttribute('sensitivity')) {
-        case self::SENSITIVITY_NORMAL:
-            return 'normal';
-            break;
-        case self::SENSITIVITY_PERSONAL:
-            return 'personal';
-            break;
-        case self::SENSITIVITY_PRIVATE:
-            return 'private';
-            break;
-        case self::SENSITIVITY_CONFIDENTIAL:
-            return 'confidential';
-            break;
-        default:
-            return;
-        }
+        return $this->_getAttribute('sensitivity');
     }
 
     /**

diff --git a/kronolith/lib/Event.php b/kronolith/lib/Event.php
index cd54f8e..a9c3bef 100644 (file)
--- a/kronolith/lib/Event.php
+++ b/kronolith/lib/Event.php
@@ -1013,7 +1013,7 @@ abstract class Kronolith_Event
         $this->allday = $dates['allday'];
 
         /* Sensitivity */
-        $this->private = ($message->getSensitivity() == 'private' || $message->getSensitivity() == 'confidential') ? true :  false;
+        $this->private = ($message->getSensitivity() == Horde_ActiveSync_Message_Appointment::SENSITIVITY_PRIVATE || $message->getSensitivity() == Horde_ActiveSync_Message_Appointment::SENSITIVITY_CONFIDENTIAL) ? true :  false;
 
         /* Busy Status */
         $status = $message->getBusyStatus();
@@ -1134,9 +1134,11 @@ abstract class Kronolith_Event
         );
 
         /* Privacy */
-        $message->setSensitivity($this->private ? 'private' : 'normal');
+        $message->setSensitivity($this->private ?
+            Horde_ActiveSync_Message_Appointment::SENSITIVITY_PRIVATE :
+            Horde_ActiveSync_Message_Appointment::SENSITIVITY_NORMAL);
 
-        /* Response Status */
+        /* Busy Status */
         switch ($this->status) {
         case Kronolith::STATUS_CANCELLED:
             $status = Horde_ActiveSync_Message_Appointment::BUSYSTATUS_FREE;