modify removeForbiddenCharacters

iOSClient/Main/CCMain.m

@@ -1972,7 +1972,7 @@
     NSString *fileNameTo, *newTitleTo;
     CCCrypto *crypto = [[CCCrypto alloc] init];
     
-    fileNameTo = [CCUtility clearFile:fileName];
+    fileNameTo = [CCUtility removeForbiddenCharacters:fileName];
     if (![fileNameTo length]) return;
     
     if ([metadata.fileNamePrint isEqualToString:fileNameTo]) return;
@@ -2268,7 +2268,7 @@
 {
     CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
     
-    fileNameFolder = [CCUtility clearFile:fileNameFolder];
+    fileNameFolder = [CCUtility removeForbiddenCharacters:fileNameFolder];
     if (![fileNameFolder length]) return;
     
     if (folderCameraUpload) metadataNet.serverUrl = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl typeCloud:app.typeCloud];
@@ -2293,7 +2293,7 @@
     CCCrypto *crypto = [[CCCrypto alloc] init];
     NSString *fileNamePlist;
     
-    fileNameFolder = [CCUtility clearFile:fileNameFolder];
+    fileNameFolder = [CCUtility removeForbiddenCharacters:fileNameFolder];
     if (![fileNameFolder length]) return;
     
     NSString *title = [AESCrypt encrypt:fileNameFolder password:[crypto getKeyPasscode:[CCUtility getUUID]]];

iOSClient/Move/CCMove.m

@@ -119,7 +119,7 @@
     if (buttonIndex == 1) {
         NSString *nome = [alertView textFieldAtIndex:0].text;
         if ([nome length]) {
-            nome = [NSString stringWithFormat:@"%@/%@", self.localServerUrl, [CCUtility clearFile:nome]];
+            nome = [NSString stringWithFormat:@"%@/%@", self.localServerUrl, [CCUtility removeForbiddenCharacters:nome]];
         }
     }
 }
@@ -392,7 +392,7 @@
 {
     CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:activeAccount];
     
-    fileNameFolder = [CCUtility clearFile:fileNameFolder];
+    fileNameFolder = [CCUtility removeForbiddenCharacters:fileNameFolder];
     if (![fileNameFolder length]) return;
     
     metadataNet.action = actionCreateFolder;

iOSClient/Networking/CCNetworking.m

@@ -434,7 +434,7 @@
             NSDictionary *fields = [httpResponse allHeaderFields];
             
             if (errorCode == 0) {
-                rev = [CCUtility clearFile:[fields objectForKey:@"OC-ETag"]];
+                rev = [CCUtility removeForbiddenCharacters:[fields objectForKey:@"OC-ETag"]];
                 date = [dateFormatter dateFromString:[fields objectForKey:@"Date"]];
             }
         }
@@ -478,8 +478,8 @@
             NSDictionary *fields = [httpResponse allHeaderFields];
             
             if (errorCode == 0) {
-                fileID = [CCUtility clearFile:[fields objectForKey:@"OC-FileId"]];
-                rev = [CCUtility clearFile:[fields objectForKey:@"OC-ETag"]];
+                fileID = [CCUtility removeForbiddenCharacters:[fields objectForKey:@"OC-FileId"]];
+                rev = [CCUtility removeForbiddenCharacters:[fields objectForKey:@"OC-ETag"]];
                 date = [dateFormatter dateFromString:[fields objectForKey:@"Date"]];
             }
         }

iOSClient/Utility/CCUtility.h

@@ -126,7 +126,7 @@
 + (NSString *)dateDiff:(NSDate *) convertedDate;
 + (NSString *)transformedSize:(double)value;
 
-+ (NSString *)clearFile:(NSString *)nomeFile;
++ (NSString *)removeForbiddenCharacters:(NSString *)fileName;
 + (NSString *)stringAppendServerUrl:(NSString *)serverUrl addServerUrl:(NSString *)addServerUrl;
 
 + (NSString *)createID;

iOSClient/Utility/CCUtility.m

@@ -416,15 +416,15 @@
 }
 
 // Remove do not forbidden characters
-+ (NSString *)clearFile:(NSString *)nomeFile
++ (NSString *)removeForbiddenCharacters:(NSString *)fileName
 {
     NSArray *arrayForbiddenCharacters = [NSArray arrayWithObjects:@"\\",@"<",@">",@":",@"\"",@"|",@"?",@"*",@"/", nil];
     
     for (NSString *currentCharacter in arrayForbiddenCharacters) {
-        nomeFile = [nomeFile stringByReplacingOccurrencesOfString:currentCharacter withString:@""];
+        fileName = [fileName stringByReplacingOccurrencesOfString:currentCharacter withString:@""];
     }
     
-    return nomeFile;
+    return fileName;
 }
 
 + (NSString*)stringAppendServerUrl:(NSString *)serverUrl addServerUrl:(NSString *)addServerUrl
@@ -507,7 +507,7 @@
         if ([baseUrl hasPrefix:@"http://"]) baseUrl = [baseUrl substringFromIndex:7];
         
         dirUserBaseUrl = [NSString stringWithFormat:@"%@-%@", user, baseUrl];
-        dirUserBaseUrl = [[self clearFile:dirUserBaseUrl] lowercaseString];
+        dirUserBaseUrl = [[self removeForbiddenCharacters:dirUserBaseUrl] lowercaseString];
     } else return @"";
     
     dirApplicationUserGroup = [[dirGroup URLByAppendingPathComponent:appApplicationSupport] path];
@@ -532,7 +532,7 @@
         if ([baseUrl hasPrefix:@"http://"]) baseUrl = [baseUrl substringFromIndex:7];
         
         dirUserBaseUrl = [NSString stringWithFormat:@"%@-%@", user, baseUrl];
-        dirUserBaseUrl = [[self clearFile:dirUserBaseUrl] lowercaseString];
+        dirUserBaseUrl = [[self removeForbiddenCharacters:dirUserBaseUrl] lowercaseString];
     } else return @"";
     
     NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
@@ -715,9 +715,9 @@
     metadata.errorPasscode = NO;
     metadata.fileID = dbMetadata.rev;
     metadata.directoryID = directoryID;
-    metadata.fileName = [CCUtility clearFile:dbMetadata.filename];
+    metadata.fileName = [CCUtility removeForbiddenCharacters:dbMetadata.filename];
     metadata.fileNameData = [CCUtility trasformedFileNamePlistInCrypto:metadata.fileName];
-    metadata.fileNamePrint = [CCUtility clearFile:fileNamePrint];
+    metadata.fileNamePrint = [CCUtility removeForbiddenCharacters:fileNamePrint];
     metadata.iconName = @"";
     metadata.model = @"";
     metadata.nameCurrentDevice = [CCUtility getNameCurrentDevice];
@@ -768,9 +768,9 @@
     metadata.errorPasscode = false;
     metadata.fileID = itemDto.ocId;
     metadata.directoryID = directoryID;
-    metadata.fileName = [CCUtility clearFile:itemDto.fileName];
+    metadata.fileName = [CCUtility removeForbiddenCharacters:itemDto.fileName];
     metadata.fileNameData = [CCUtility trasformedFileNamePlistInCrypto:metadata.fileName];
-    metadata.fileNamePrint = [CCUtility clearFile:fileNamePrint];
+    metadata.fileNamePrint = [CCUtility removeForbiddenCharacters:fileNamePrint];
     metadata.iconName = @"";
     metadata.model = @"";
     metadata.nameCurrentDevice = [CCUtility getNameCurrentDevice];