From 97aff18dbe4166984b1b25a22fcf59df9b6dfcbf Mon Sep 17 00:00:00 2001
From: Maxime Delorme <mdelorme@tennaxia.com>
Date: Wed, 30 May 2007 23:29:54 +1200
Subject: [PATCH] Import patch from Maxime.

---
 htdocs/tools.php | 10 +++++-----
 htdocs/usr.php   |  7 ++++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/tools.php b/htdocs/tools.php
index f8b199d4..9b9600dc 100644
--- a/htdocs/tools.php
+++ b/htdocs/tools.php
@@ -133,12 +133,12 @@ class Tools {
             $path = "/".substr($file,0,-4).$path_ics;
             dbg_error_log( "importFromDirectory", "importing to $path");
             include_once("caldav-PUT-functions.php");
-            $qry = new PgQuery( "SELECT * FROM usr WHERE username = ?;", substr($file,0,-4) );
-            if ( $qry->Exec("importFromDirectory") && $user = $qry->Fetch() ) {
+            if ( $user = getUserByName(substr($file,0,-4),'importFromDirectory',__LINE__,__FILE__)) {
               $user_no = $user->user_no;
             }
-            controlRequestContainer(substr($file,0,-4),$user_no, $path,false);
-            import_collection($ics,$user_no,$path,false);
+            if(controlRequestContainer(substr($file,0,-4),$user_no, $path,false) === -1)
+              continue;
+            import_collection($ics,$user_no,$path,1);
             $c->messages[] = sprintf(i18n("all events of user %s were deleted and replaced by those from file %s"),substr($file,0,-4),$dir.'/'.$file);
           }
           else {
@@ -153,4 +153,4 @@ class Tools {
 
 include("page-footer.php");
 
-?>
\ No newline at end of file
+?>
diff --git a/htdocs/usr.php b/htdocs/usr.php
index 4aab8c12..e33e166b 100644
--- a/htdocs/usr.php
+++ b/htdocs/usr.php
@@ -53,9 +53,10 @@
             if ( check_string($ics) ) {
               $path = "/".$user->Get("username").$path_ics;
               include("caldav-PUT-functions.php");
-              controlRequestContainer($user->Get("username"),$user->user_no, $path,false);
-              import_collection($ics,$user->user_no,$path,false);
-              $c->messages[] = sprintf(translate("All events of user %s were deleted and replaced by those from the file."),$user->Get("username"));
+              if(controlRequestContainer($user->Get("username"),$user->user_no, $path,false) === true ){
+                import_collection($ics,$user->user_no,$path,$session->user_no);
+                $c->messages[] = sprintf(translate("All events of user %s were deleted and replaced by those from the file."),$user->Get("username"));
+              }
             } else
               $c->messages[] =  sprintf(translate("The file %s is not UTF-8 encoded, please check the error for more details."),$dir.'/'.$file);
           }