From e2f8ff8b0a798913204ed0de5bff919f72d1773c Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Mon, 29 Mar 2010 21:54:04 +1300
Subject: [PATCH] Reorder if statement for better readability.

---
 inc/caldav-PUT-functions.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/inc/caldav-PUT-functions.php b/inc/caldav-PUT-functions.php
index 457c0f3c..129ccdf6 100644
--- a/inc/caldav-PUT-functions.php
+++ b/inc/caldav-PUT-functions.php
@@ -901,17 +901,7 @@ function write_resource( $user_no, $path, $caldav_data, $collection_id, $author,
   $calitem_params[':due'] = $first->GetPValue('DUE');
   $calitem_params[':percent_complete'] = $first->GetPValue('PERCENT-COMPLETE');
   $calitem_params[':status'] = $first->GetPValue('STATUS');
-  if ( $put_action_type != 'INSERT' ) {
-    $sql = <<<EOSQL
-UPDATE calendar_item SET dav_etag=:etag, uid=:uid, dtstamp=:dtstamp,
-                dtstart=:dtstart, dtend=$dtend, summary=:summary, location=:location, class=:class, transp=:transp,
-                description=:description, rrule=:rrule, tz_id=:tzid, last_modified=:modified, url=:url, priority=:priority,
-                created=:created, due=:due, percent_complete=:percent_complete, status=:status
-       WHERE user_no=:user_no AND dav_name=:dav_name
-EOSQL;
-    $sync_change = 200;
-  }
-  else {
+  if ( $put_action_type == 'INSERT' ) {
     $sql = <<<EOSQL
 INSERT INTO calendar_item (user_no, dav_name, dav_id, dav_etag, uid, dtstamp,
                 dtstart, dtend, summary, location, class, transp,
@@ -924,6 +914,16 @@ INSERT INTO calendar_item (user_no, dav_name, dav_id, dav_etag, uid, dtstamp,
 EOSQL;
     $sync_change = 201;
   }
+  else {
+    $sql = <<<EOSQL
+UPDATE calendar_item SET dav_etag=:etag, uid=:uid, dtstamp=:dtstamp,
+                dtstart=:dtstart, dtend=$dtend, summary=:summary, location=:location, class=:class, transp=:transp,
+                description=:description, rrule=:rrule, tz_id=:tzid, last_modified=:modified, url=:url, priority=:priority,
+                created=:created, due=:due, percent_complete=:percent_complete, status=:status
+       WHERE user_no=:user_no AND dav_name=:dav_name
+EOSQL;
+    $sync_change = 200;
+  }
 
   write_alarms($dav_id, $first);
   write_attendees($dav_id, $first);