From 2fd4a952856f6f90bb6ea66f7cbce6ed9eca9cf9 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Fri, 14 Oct 2011 11:07:33 +1300
Subject: [PATCH] Force casting to text in case someone is using integer
 usernames.

---
 inc/CalDAVRequest.php | 4 ++--
 inc/DAVResource.php   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/inc/CalDAVRequest.php b/inc/CalDAVRequest.php
index 70d9a150..4455472e 100644
--- a/inc/CalDAVRequest.php
+++ b/inc/CalDAVRequest.php
@@ -322,9 +322,9 @@ class CalDAVRequest
       $params[':resourcetypes'] = sprintf('<DAV::collection/><urn:ietf:params:xml:ns:caldav:%s/>', $this->collection_type );
       $sql = <<<EOSQL
 INSERT INTO collection ( user_no, parent_container, dav_name, dav_displayname, is_calendar, created, modified, dav_etag, resourcetypes )
-    VALUES( (SELECT user_no FROM usr WHERE username = :username),
+    VALUES( (SELECT user_no FROM usr WHERE username = text(:username)),
             :parent_container, :dav_name,
-            (SELECT fullname FROM usr WHERE username = :username) || :boxname,
+            (SELECT fullname FROM usr WHERE username = text(:username)) || :boxname,
              FALSE, current_timestamp, current_timestamp, '1', :resourcetypes )
 EOSQL;
 
diff --git a/inc/DAVResource.php b/inc/DAVResource.php
index 93e5cc8e..d50e4c54 100644
--- a/inc/DAVResource.php
+++ b/inc/DAVResource.php
@@ -360,9 +360,9 @@ class DAVResource
       $params[':resourcetypes'] = sprintf('<DAV::collection/><urn:ietf:params:xml:ns:caldav:%s/>', $this->collection_type );
       $sql = <<<EOSQL
 INSERT INTO collection ( user_no, parent_container, dav_name, dav_displayname, is_calendar, created, modified, dav_etag, resourcetypes )
-    VALUES( (SELECT user_no FROM usr WHERE username = :username),
+    VALUES( (SELECT user_no FROM usr WHERE username = text(:username)),
             :parent_container, :dav_name,
-            (SELECT fullname FROM usr WHERE username = :username) || :boxname,
+            (SELECT fullname FROM usr WHERE username = text(:username)) || :boxname,
              FALSE, current_timestamp, current_timestamp, '1', :resourcetypes )
 EOSQL;
       $qry = new AwlQuery( $sql, $params );