Marino Faggiana 6 years ago
parent
commit
81322a154d

+ 2 - 3
iOSClient/Library/OCCommunicationLib/OCWebDavClient/OCWebDAVClient.m

@@ -1230,9 +1230,8 @@ NSString const *OCWebDAVModificationDateKey	= @"modificationdate";
     
     
     NSMutableURLRequest *request = [self sharedRequestWithMethod:_requestMethod path:serverPath parameters:nil timeout:k_timeout_webdav];
     NSMutableURLRequest *request = [self sharedRequestWithMethod:_requestMethod path:serverPath parameters:nil timeout:k_timeout_webdav];
     [request setValue:@"true" forHTTPHeaderField:@"OCS-APIRequest"];
     [request setValue:@"true" forHTTPHeaderField:@"OCS-APIRequest"];
-    [request setHTTPBody:[[NSString stringWithFormat: @"path=%@",path] dataUsingEncoding:NSUTF8StringEncoding]];
-    [request setHTTPBody:[[NSString stringWithFormat: @"template=%@",templateID] dataUsingEncoding:NSUTF8StringEncoding]];
-
+    [request setHTTPBody:[[NSString stringWithFormat: @"path=%@&template=%@", path, templateID] dataUsingEncoding:NSUTF8StringEncoding]];
+    
     OCHTTPRequestOperation *operation = [self mr_operationWithRequest:request onCommunication:sharedOCCommunication success:success failure:failure];
     OCHTTPRequestOperation *operation = [self mr_operationWithRequest:request onCommunication:sharedOCCommunication success:success failure:failure];
     [self setRedirectionBlockOnDatataskWithOCCommunication:sharedOCCommunication andSessionManager:sharedOCCommunication.networkSessionManager];
     [self setRedirectionBlockOnDatataskWithOCCommunication:sharedOCCommunication andSessionManager:sharedOCCommunication.networkSessionManager];
     
     

+ 2 - 4
iOSClient/Networking/OCNetworking.m

@@ -2338,10 +2338,8 @@
     
     
     [communication setCredentialsWithUser:_activeUser andUserID:_activeUserID andPassword:_activePassword];
     [communication setCredentialsWithUser:_activeUser andUserID:_activeUserID andPassword:_activePassword];
     [communication setUserAgent:[CCUtility getUserAgent]];
     [communication setUserAgent:[CCUtility getUserAgent]];
-    
-    NSString *fileNamePath = [CCUtility returnFileNamePathFromFileName:fileName serverUrl:serverUrl activeUrl:_activeUrl];
-    
-    [communication createNewRichdocuments:[_activeUrl stringByAppendingString:@"/"] path:fileNamePath templateID:templateID onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *url, NSString *redirectedServer) {
+        
+    [communication createNewRichdocuments:[_activeUrl stringByAppendingString:@"/"] path:fileName templateID:templateID onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *url, NSString *redirectedServer) {
         
         
         success(url);
         success(url);
         
         

+ 0 - 1
iOSClient/Settings/CCManageAutoUpload.h

@@ -25,7 +25,6 @@
 #import "CCMain.h"
 #import "CCMain.h"
 #import "CCManageLocation.h"
 #import "CCManageLocation.h"
 #import "CCMedia.h"
 #import "CCMedia.h"
-#import "CCMove.h"
 
 
 @interface CCManageAutoUpload : XLFormViewController
 @interface CCManageAutoUpload : XLFormViewController