From: Michael J. Rubinsky Date: Fri, 9 Apr 2010 21:53:38 +0000 (-0400) Subject: More constant fixes X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=9477bfaebf28ae293b7a08368554662da93c3da2;p=horde.git More constant fixes --- diff --git a/framework/ActiveSync/lib/Horde/ActiveSync.php b/framework/ActiveSync/lib/Horde/ActiveSync.php index 69116559c..2792bdea3 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync.php @@ -102,46 +102,46 @@ define("SYNC_AIRNOTIFY_ID","AirNotify:Id"); define("SYNC_AIRNOTIFY_EXPIRY","AirNotify:Expiry"); define("SYNC_AIRNOTIFY_NOTIFYGUID","AirNotify:NotifyGUID"); -// POOMCAL -define("SYNC_POOMCAL_TIMEZONE","POOMCAL:Timezone"); -define("SYNC_POOMCAL_ALLDAYEVENT","POOMCAL:AllDayEvent"); -define("SYNC_POOMCAL_ATTENDEES","POOMCAL:Attendees"); -define("SYNC_POOMCAL_ATTENDEE","POOMCAL:Attendee"); -define("SYNC_POOMCAL_ATTENDEESTATUS", "POOMCAL:AttendeeStatus"); -define("SYNC_POOMCAL_ATTENDEETYPE", "POOMCAL:AttendeeType"); -define("SYNC_POOMCAL_EMAIL","POOMCAL:Email"); -define("SYNC_POOMCAL_NAME","POOMCAL:Name"); -define("SYNC_POOMCAL_BODY","POOMCAL:Body"); -define("SYNC_POOMCAL_BODYTRUNCATED","POOMCAL:BodyTruncated"); -define("SYNC_POOMCAL_BUSYSTATUS","POOMCAL:BusyStatus"); -define("SYNC_POOMCAL_CATEGORIES","POOMCAL:Categories"); -define("SYNC_POOMCAL_CATEGORY","POOMCAL:Category"); -define("SYNC_POOMCAL_RTF","POOMCAL:Rtf"); -define("SYNC_POOMCAL_DTSTAMP","POOMCAL:DtStamp"); -define("SYNC_POOMCAL_ENDTIME","POOMCAL:EndTime"); -define("SYNC_POOMCAL_EXCEPTION","POOMCAL:Exception"); -define("SYNC_POOMCAL_EXCEPTIONS","POOMCAL:Exceptions"); -define("SYNC_POOMCAL_DELETED","POOMCAL:Deleted"); -define("SYNC_POOMCAL_EXCEPTIONSTARTTIME","POOMCAL:ExceptionStartTime"); -define("SYNC_POOMCAL_LOCATION","POOMCAL:Location"); -define("SYNC_POOMCAL_MEETINGSTATUS","POOMCAL:MeetingStatus"); -define("SYNC_POOMCAL_ORGANIZEREMAIL","POOMCAL:OrganizerEmail"); -define("SYNC_POOMCAL_ORGANIZERNAME","POOMCAL:OrganizerName"); -define("SYNC_POOMCAL_RECURRENCE","POOMCAL:Recurrence"); -define("SYNC_POOMCAL_TYPE","POOMCAL:Type"); -define("SYNC_POOMCAL_UNTIL","POOMCAL:Until"); -define("SYNC_POOMCAL_OCCURRENCES","POOMCAL:Occurrences"); -define("SYNC_POOMCAL_INTERVAL","POOMCAL:Interval"); -define("SYNC_POOMCAL_DAYOFWEEK","POOMCAL:DayOfWeek"); -define("SYNC_POOMCAL_DAYOFMONTH","POOMCAL:DayOfMonth"); -define("SYNC_POOMCAL_WEEKOFMONTH","POOMCAL:WeekOfMonth"); -define("SYNC_POOMCAL_MONTHOFYEAR","POOMCAL:MonthOfYear"); -define("SYNC_POOMCAL_REMINDER","POOMCAL:Reminder"); -define("SYNC_POOMCAL_SENSITIVITY","POOMCAL:Sensitivity"); -define("SYNC_POOMCAL_SUBJECT","POOMCAL:Subject"); -define("SYNC_POOMCAL_STARTTIME","POOMCAL:StartTime"); -define("SYNC_POOMCAL_UID","POOMCAL:UID"); -define("SYNC_POOMCAL_RESPONSETYPE", "POOMCAL:ResponseType"); +//// POOMCAL +//define("SYNC_POOMCAL_TIMEZONE","POOMCAL:Timezone"); +//define("SYNC_POOMCAL_ALLDAYEVENT","POOMCAL:AllDayEvent"); +//define("SYNC_POOMCAL_ATTENDEES","POOMCAL:Attendees"); +//define("SYNC_POOMCAL_ATTENDEE","POOMCAL:Attendee"); +//define("SYNC_POOMCAL_ATTENDEESTATUS", "POOMCAL:AttendeeStatus"); +//define("SYNC_POOMCAL_ATTENDEETYPE", "POOMCAL:AttendeeType"); +//define("SYNC_POOMCAL_EMAIL","POOMCAL:Email"); +//define("SYNC_POOMCAL_NAME","POOMCAL:Name"); +//define("SYNC_POOMCAL_BODY","POOMCAL:Body"); +//define("SYNC_POOMCAL_BODYTRUNCATED","POOMCAL:BodyTruncated"); +//define("SYNC_POOMCAL_BUSYSTATUS","POOMCAL:BusyStatus"); +//define("SYNC_POOMCAL_CATEGORIES","POOMCAL:Categories"); +//define("SYNC_POOMCAL_CATEGORY","POOMCAL:Category"); +//define("SYNC_POOMCAL_RTF","POOMCAL:Rtf"); +//define("SYNC_POOMCAL_DTSTAMP","POOMCAL:DtStamp"); +//define("SYNC_POOMCAL_ENDTIME","POOMCAL:EndTime"); +//define("SYNC_POOMCAL_EXCEPTION","POOMCAL:Exception"); +//define("SYNC_POOMCAL_EXCEPTIONS","POOMCAL:Exceptions"); +//define("SYNC_POOMCAL_DELETED","POOMCAL:Deleted"); +//define("SYNC_POOMCAL_EXCEPTIONSTARTTIME","POOMCAL:ExceptionStartTime"); +//define("SYNC_POOMCAL_LOCATION","POOMCAL:Location"); +//define("SYNC_POOMCAL_MEETINGSTATUS","POOMCAL:MeetingStatus"); +//define("SYNC_POOMCAL_ORGANIZEREMAIL","POOMCAL:OrganizerEmail"); +//define("SYNC_POOMCAL_ORGANIZERNAME","POOMCAL:OrganizerName"); +//define("SYNC_POOMCAL_RECURRENCE","POOMCAL:Recurrence"); +//define("SYNC_POOMCAL_TYPE","POOMCAL:Type"); +//define("SYNC_POOMCAL_UNTIL","POOMCAL:Until"); +//define("SYNC_POOMCAL_OCCURRENCES","POOMCAL:Occurrences"); +//define("SYNC_POOMCAL_INTERVAL","POOMCAL:Interval"); +//define("SYNC_POOMCAL_DAYOFWEEK","POOMCAL:DayOfWeek"); +//define("SYNC_POOMCAL_DAYOFMONTH","POOMCAL:DayOfMonth"); +//define("SYNC_POOMCAL_WEEKOFMONTH","POOMCAL:WeekOfMonth"); +//define("SYNC_POOMCAL_MONTHOFYEAR","POOMCAL:MonthOfYear"); +//define("SYNC_POOMCAL_REMINDER","POOMCAL:Reminder"); +//define("SYNC_POOMCAL_SENSITIVITY","POOMCAL:Sensitivity"); +//define("SYNC_POOMCAL_SUBJECT","POOMCAL:Subject"); +//define("SYNC_POOMCAL_STARTTIME","POOMCAL:StartTime"); +//define("SYNC_POOMCAL_UID","POOMCAL:UID"); +//define("SYNC_POOMCAL_RESPONSETYPE", "POOMCAL:ResponseType"); // Move define("SYNC_MOVE_MOVES","Move:Moves"); @@ -353,6 +353,10 @@ class Horde_ActiveSync const TRUNCATION_5K = 4; const TRUNCATION_SEVEN = 7; const TRUNCATION_ALL = 9; + + /* Flags */ + const FLAG_NEWMESSAGE = 'NewMessage'; + /** * Logger * diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php b/framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php index ec64d9e56..7dfa9f2ad 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php @@ -103,17 +103,17 @@ class Horde_ActiveSync_Connector_Exporter $this->_seenObjects[] = $id; /* Specify if this is an ADD or a MODIFY change? */ - if ($message->flags === false || $message->flags === SYNC_NEWMESSAGE) { - $this->_encoder->startTag(SYNC_ADD); + if ($message->flags === false || $message->flags === Horde_ActiveSync::FLAG_NEWMESSAGE) { + $this->_encoder->startTag(Horde_ActiveSync_Request_Sync::ADD); } else { - $this->_encoder->startTag(SYNC_MODIFY); + $this->_encoder->startTag(Horde_ActiveSync_Request_Sync::MODIFY); } /* Send the message */ - $this->_encoder->startTag(SYNC_SERVERENTRYID); + $this->_encoder->startTag(Horde_ActiveSync_Request_Sync::SERVERENTRYID); $this->_encoder->content($id); $this->_encoder->endTag(); - $this->_encoder->startTag(SYNC_DATA); + $this->_encoder->startTag(Horde_ActiveSync_Request_Sync::DATA); $message->encodeStream($this->_encoder); $this->_encoder->endTag(); $this->_encoder->endTag(); @@ -130,8 +130,8 @@ class Horde_ActiveSync_Connector_Exporter */ public function messageDeletion($id) { - $this->_encoder->startTag(SYNC_REMOVE); - $this->_encoder->startTag(SYNC_SERVERENTRYID); + $this->_encoder->startTag(Horde_ActiveSync_Request_Sync::REMOVE); + $this->_encoder->startTag(Horde_ActiveSync_Request_Sync::SERVERENTRYID); $this->_encoder->content($id); $this->_encoder->endTag(); $this->_encoder->endTag(); @@ -155,11 +155,11 @@ class Horde_ActiveSync_Connector_Exporter } /* Encode and stream */ - $this->_encoder->startTag(SYNC_MODIFY); - $this->_encoder->startTag(SYNC_SERVERENTRYID); + $this->_encoder->startTag(Horde_ActiveSync_Request_Sync::MODIFY); + $this->_encoder->startTag(Horde_ActiveSync_Request_Sync::SERVERENTRYID); $this->_encoder->content($id); $this->_encoder->endTag(); - $this->_encoder->startTag(SYNC_DATA); + $this->_encoder->startTag(Horde_ActiveSync_Request_Sync::DATA); $this->_encoder->startTag(SYNC_POOMMAIL_READ); $this->_encoder->content($flags); $this->_encoder->endTag(); diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php index 30eeea75b..dcabbbdc8 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php @@ -10,6 +10,47 @@ */ class Horde_ActiveSync_Message_Appointment extends Horde_ActiveSync_Message_Base { + /* POOMCAL Tag Constants */ + const POOMCAL_TIMEZONE = 'POOMCAL:Timezone'; + const POOMCAL_ALLDAYEVENT = 'POOMCAL:AllDayEvent'; + const POOMCAL_ATTENDEES = 'POOMCAL:Attendees'; + const POOMCAL_ATTENDEE = 'POOMCAL:Attendee'; + const POOMCAL_ATTENDEESTATUS = 'POOMCAL:AttendeeStatus'; + const POOMCAL_ATTENDEETYPE = 'POOMCAL:AttendeeType'; + const POOMCAL_EMAIL = 'POOMCAL:Email'; + const POOMCAL_NAME = 'POOMCAL:Name'; + const POOMCAL_BODY = 'POOMCAL:Body'; + const POOMCAL_BODYTRUNCATED = 'POOMCAL:BodyTruncated'; + const POOMCAL_BUSYSTATUS = 'POOMCAL:BusyStatus'; + const POOMCAL_CATEGORIES = 'POOMCAL:Categories'; + const POOMCAL_CATEGORY = 'POOMCAL:Category'; + const POOMCAL_RTF = 'POOMCAL:Rtf'; + const POOMCAL_DTSTAMP = 'POOMCAL:DtStamp'; + const POOMCAL_ENDTIME = 'POOMCAL:EndTime'; + const POOMCAL_EXCEPTION = 'POOMCAL:Exception'; + const POOMCAL_EXCEPTIONS = 'POOMCAL:Exceptions'; + const POOMCAL_DELETED = 'POOMCAL:Deleted'; + const POOMCAL_EXCEPTIONSTARTTIME = 'POOMCAL:ExceptionStartTime'; + const POOMCAL_LOCATION = 'POOMCAL:Location'; + const POOMCAL_MEETINGSTATUS = 'POOMCAL:MeetingStatus'; + const POOMCAL_ORGANIZEREMAIL = 'POOMCAL:OrganizerEmail'; + const POOMCAL_ORGANIZERNAME = 'POOMCAL:OrganizerName'; + const POOMCAL_RECURRENCE = 'POOMCAL:Recurrence'; + const POOMCAL_TYPE = 'POOMCAL:Type'; + const POOMCAL_UNTIL = 'POOMCAL:Until'; + const POOMCAL_OCCURRENCES = 'POOMCAL:Occurrences'; + const POOMCAL_INTERVAL = 'POOMCAL:Interval'; + const POOMCAL_DAYOFWEEK = 'POOMCAL:DayOfWeek'; + const POOMCAL_DAYOFMONTH = 'POOMCAL:DayOfMonth'; + const POOMCAL_WEEKOFMONTH = 'POOMCAL:WeekOfMonth'; + const POOMCAL_MONTHOFYEAR = 'POOMCAL:MonthOfYear'; + const POOMCAL_REMINDER = 'POOMCAL:Reminder'; + const POOMCAL_SENSITIVITY = 'POOMCAL:Sensitivity'; + const POOMCAL_SUBJECT = 'POOMCAL:Subject'; + const POOMCAL_STARTTIME = 'POOMCAL:StartTime'; + const POOMCAL_UID = 'POOMCAL:UID'; + const POOMCAL_RESPONSETYPE = 'POOMCAL:ResponseType'; + /* Sensitivity */ const SENSITIVITY_NORMAL = 0; const SENSITIVITY_PERSONAL = 1; @@ -46,7 +87,7 @@ class Horde_ActiveSync_Message_Appointment extends Horde_ActiveSync_Message_Base */ public $exceptions = array(); public $attendees = array(); - public $categories; + public $categories = array(); /** * Constructor @@ -57,28 +98,28 @@ class Horde_ActiveSync_Message_Appointment extends Horde_ActiveSync_Message_Base */ public function __construct($params = array()) { $mapping = array( - SYNC_POOMCAL_TIMEZONE => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'timezone'), - SYNC_POOMCAL_DTSTAMP => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'dtstamp', Horde_ActiveSync_Message_Base::KEY_TYPE => Horde_ActiveSync_Message_Base::TYPE_DATE), - SYNC_POOMCAL_STARTTIME => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'starttime', Horde_ActiveSync_Message_Base::KEY_TYPE => Horde_ActiveSync_Message_Base::TYPE_DATE), - SYNC_POOMCAL_SUBJECT => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'subject'), - SYNC_POOMCAL_UID => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'uid', Horde_ActiveSync_Message_Base::KEY_TYPE => Horde_ActiveSync_Message_Base::TYPE_HEX), - SYNC_POOMCAL_ORGANIZERNAME => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'organizername'), - SYNC_POOMCAL_ORGANIZEREMAIL => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'organizeremail'), - SYNC_POOMCAL_LOCATION => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'location'), - SYNC_POOMCAL_ENDTIME => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'endtime', Horde_ActiveSync_Message_Base::KEY_TYPE => Horde_ActiveSync_Message_Base::TYPE_DATE), - SYNC_POOMCAL_RECURRENCE => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'recurrence', Horde_ActiveSync_Message_Base::KEY_TYPE => 'Horde_ActiveSync_Message_Recurrence'), - SYNC_POOMCAL_SENSITIVITY => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'sensitivity'), - SYNC_POOMCAL_BUSYSTATUS => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'busystatus'), - SYNC_POOMCAL_ALLDAYEVENT => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'alldayevent'), - SYNC_POOMCAL_REMINDER => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'reminder'), - SYNC_POOMCAL_RTF => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'rtf'), - SYNC_POOMCAL_MEETINGSTATUS => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'meetingstatus'), - SYNC_POOMCAL_ATTENDEES => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'attendees', Horde_ActiveSync_Message_Base::KEY_TYPE => 'Horde_ActiveSync_Message_Attendee', Horde_ActiveSync_Message_Base::KEY_VALUES => SYNC_POOMCAL_ATTENDEE), - SYNC_POOMCAL_BODY => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'body'), - SYNC_POOMCAL_BODYTRUNCATED => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'bodytruncated'), - SYNC_POOMCAL_EXCEPTIONS => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'exceptions', Horde_ActiveSync_Message_Base::KEY_TYPE => 'Horde_ActiveSync_Message_Exception', Horde_ActiveSync_Message_Base::KEY_VALUES => SYNC_POOMCAL_EXCEPTION), - SYNC_POOMCAL_CATEGORIES => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'categories', Horde_ActiveSync_Message_Base::KEY_VALUES => SYNC_POOMCAL_CATEGORY), - //SYNC_POOMCAL_RESPONSETYPE => array(Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'responsetype'), + self::POOMCAL_TIMEZONE => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'timezone'), + self::POOMCAL_DTSTAMP => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'dtstamp', Horde_ActiveSync_Message_Base::KEY_TYPE => Horde_ActiveSync_Message_Base::TYPE_DATE), + self::POOMCAL_STARTTIME => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'starttime', Horde_ActiveSync_Message_Base::KEY_TYPE => Horde_ActiveSync_Message_Base::TYPE_DATE), + self::POOMCAL_SUBJECT => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'subject'), + self::POOMCAL_UID => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'uid', Horde_ActiveSync_Message_Base::KEY_TYPE => Horde_ActiveSync_Message_Base::TYPE_HEX), + self::POOMCAL_ORGANIZERNAME => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'organizername'), + self::POOMCAL_ORGANIZEREMAIL => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'organizeremail'), + self::POOMCAL_LOCATION => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'location'), + self::POOMCAL_ENDTIME => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'endtime', Horde_ActiveSync_Message_Base::KEY_TYPE => Horde_ActiveSync_Message_Base::TYPE_DATE), + self::POOMCAL_RECURRENCE => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'recurrence', Horde_ActiveSync_Message_Base::KEY_TYPE => 'Horde_ActiveSync_Message_Recurrence'), + self::POOMCAL_SENSITIVITY => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'sensitivity'), + self::POOMCAL_BUSYSTATUS => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'busystatus'), + self::POOMCAL_ALLDAYEVENT => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'alldayevent'), + self::POOMCAL_REMINDER => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'reminder'), + self::POOMCAL_RTF => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'rtf'), + self::POOMCAL_MEETINGSTATUS => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'meetingstatus'), + self::POOMCAL_ATTENDEES => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'attendees', Horde_ActiveSync_Message_Base::KEY_TYPE => 'Horde_ActiveSync_Message_Attendee', Horde_ActiveSync_Message_Base::KEY_VALUES => self::POOMCAL_ATTENDEE), + self::POOMCAL_BODY => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'body'), + self::POOMCAL_BODYTRUNCATED => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'bodytruncated'), + self::POOMCAL_EXCEPTIONS => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'exceptions', Horde_ActiveSync_Message_Base::KEY_TYPE => 'Horde_ActiveSync_Message_Exception', Horde_ActiveSync_Message_Base::KEY_VALUES => self::POOMCAL_EXCEPTION), + self::POOMCAL_CATEGORIES => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'categories', Horde_ActiveSync_Message_Base::KEY_VALUES => self::POOMCAL_CATEGORY), + //self::POOMCAL_RESPONSETYPE => array(Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'responsetype'), ); parent::__construct($mapping, $params); diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Attendee.php b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Attendee.php index ebd426a12..2e9976e0f 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Attendee.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Attendee.php @@ -29,8 +29,8 @@ class Horde_ActiveSync_Message_Attendee extends Horde_ActiveSync_Message_Base */ function __construct($params = array()) { $mapping = array( - SYNC_POOMCAL_EMAIL => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'email'), - SYNC_POOMCAL_NAME => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'name'), + Horde_ActiveSync_Message_Appointment::POOMCAL_EMAIL => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'email'), + Horde_ActiveSync_Message_Appointment::POOMCAL_NAME => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'name'), //SYNC_POOMCAL_ATTENDEETYPE => array(Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'type'), //SYNC_POOMCAL_ATTENDEESTATUS => array(Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'status') ); diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Base.php b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Base.php index 14c2de9b0..3146d064b 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Base.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Base.php @@ -42,7 +42,7 @@ class Horde_ActiveSync_Message_Base const TYPE_MAPI_STREAM = 4; /** - * Holds the mapping for SYNC_POOMCAL_* -> object properties + * Holds the mapping for object properties * * @var array */ diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Exception.php b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Exception.php index 80ef6a227..f227c82e5 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Exception.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Exception.php @@ -22,11 +22,11 @@ class Horde_ActiveSync_Message_Exception extends Horde_ActiveSync_Message_Appoin parent::__construct($params); /* Some additional properties for Exceptions */ - $this->_mapping[SYNC_POOMCAL_EXCEPTIONSTARTTIME] = array( + $this->_mapping[Horde_ActiveSync_Message_Appointment::POOMCAL_EXCEPTIONSTARTTIME] = array( Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'exceptionstarttime', Horde_ActiveSync_Message_Base::KEY_TYPE => Horde_ActiveSync_Message_Base::TYPE_DATE); - $this->_mapping[SYNC_POOMCAL_DELETED] = array(Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'deleted'); + $this->_mapping[Horde_ActiveSync_Message_Appointment::POOMCAL_DELETED] = array(Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'deleted'); } /** diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Recurrence.php b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Recurrence.php index f0dae43f6..95665e110 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Recurrence.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Recurrence.php @@ -10,15 +10,6 @@ */ class Horde_ActiveSync_Message_Recurrence extends Horde_ActiveSync_Message_Base { - public $type; - public $until; - public $occurrences; - public $interval; - public $dayofweek; - public $dayofmonth; - public $weekofmonth; - public $monthofyear; - /* MS AS Recurrence types */ const TYPE_DAILY = 0; const TYPE_WEEKLY = 1; @@ -27,19 +18,17 @@ class Horde_ActiveSync_Message_Recurrence extends Horde_ActiveSync_Message_Base const TYPE_YEARLY = 5; const TYPE_YEARLYNTH = 6; - - function __construct($params = array()) { $mapping = array ( - SYNC_POOMCAL_TYPE => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'type'), - SYNC_POOMCAL_UNTIL => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'until', Horde_ActiveSync_Message_Base::KEY_TYPE => Horde_ActiveSync_Message_Base::TYPE_DATE), - SYNC_POOMCAL_OCCURRENCES => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'occurrences'), - SYNC_POOMCAL_INTERVAL => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'interval'), - SYNC_POOMCAL_DAYOFWEEK => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'dayofweek'), - SYNC_POOMCAL_DAYOFMONTH => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'dayofmonth'), - SYNC_POOMCAL_WEEKOFMONTH => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'weekofmonth'), - SYNC_POOMCAL_MONTHOFYEAR => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'monthofyear') + Horde_ActiveSync_Message_Appointment::POOMCAL_TYPE => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'type'), + Horde_ActiveSync_Message_Appointment::POOMCAL_UNTIL => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'until', Horde_ActiveSync_Message_Base::KEY_TYPE => Horde_ActiveSync_Message_Base::TYPE_DATE), + Horde_ActiveSync_Message_Appointment::OCCURRENCES => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'occurrences'), + Horde_ActiveSync_Message_Appointment::POOMCAL_INTERVAL => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'interval'), + Horde_ActiveSync_Message_Appointment::POOMCAL_DAYOFWEEK => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'dayofweek'), + Horde_ActiveSync_Message_Appointment::POOMCAL_DAYOFMONTH => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'dayofmonth'), + Horde_ActiveSync_Message_Appointment::POOMCAL_WEEKOFMONTH => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'weekofmonth'), + Horde_ActiveSync_Message_Appointment::POOMCAL_MONTHOFYEAR => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'monthofyear') ); parent::__construct($mapping, $params); diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php index a6a8aa1bd..225afa50f 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php @@ -46,7 +46,6 @@ class Horde_ActiveSync_Request_Sync extends Horde_ActiveSync_Request_Base const SOFTDELETE = 'SoftDelete'; const MIMESUPPORT = 'MIMESupport'; const MIMETRUNCATION = 'MIMETruncation'; - const NEWMESSAGE = 'NewMessage'; /* Status */ const STATUS_SUCCESS = 1; diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/State/File.php b/framework/ActiveSync/lib/Horde/ActiveSync/State/File.php index 55eeb5b4a..90869ff13 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/State/File.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/State/File.php @@ -738,7 +738,7 @@ class Horde_ActiveSync_State_File extends Horde_ActiveSync_State_Base } else { // Message in new seems to be new (add) $change['type'] = 'change'; - $change['flags'] = Horde_ActiveSync_Request_Sync::NEWMESSAGE; + $change['flags'] = Horde_ActiveSync::FLAG_NEWMESSAGE; $change['id'] = $new[$inew]['id']; $changes[] = $change; $inew++; @@ -757,7 +757,7 @@ class Horde_ActiveSync_State_File extends Horde_ActiveSync_State_Base while ($inew < count($new)) { // All data left in new have been added $change['type'] = 'change'; - $change['flags'] = Horde_ActiveSync_Request_Sync::NEWMESSAGE; + $change['flags'] = Horde_ActiveSync::FLAG_NEWMESSAGE; $change['id'] = $new[$inew]['id']; $changes[] = $change; $inew++; diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/State/History.php b/framework/ActiveSync/lib/Horde/ActiveSync/State/History.php index c1b2c1c11..a6c98b929 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/State/History.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/State/History.php @@ -553,7 +553,7 @@ class Horde_ActiveSync_State_History extends Horde_ActiveSync_State_Base } else { // Message in new seems to be new (add) $change['type'] = 'change'; - $change['flags'] = SYNC_NEWMESSAGE; + $change['flags'] = Horde_ActiveSync::FLAG_NEWMESSAGE; $change['id'] = $new[$inew]['id']; $changes[] = $change; $inew++; @@ -572,7 +572,7 @@ class Horde_ActiveSync_State_History extends Horde_ActiveSync_State_Base while ($inew < count($new)) { // All data left in new have been added $change['type'] = 'change'; - $change['flags'] = SYNC_NEWMESSAGE; + $change['flags'] = Horde_ActiveSync::FLAG_NEWMESSAGE; $change['id'] = $new[$inew]['id']; $changes[] = $change; $inew++;