use full login for sogo_cache_folder tables
So when multidomain is enabled we will have tables like sogo_cache_folder_user_A_domain_D_com instead of just sogo_cache_folder_user If multidomain is disabled the folders will still be like sogo_cache_folder_userpull/65/head
parent
914e7b7418
commit
1d6f1a83af
|
@ -2644,7 +2644,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
parts in this url. We strip the '-' character in case we have
|
parts in this url. We strip the '-' character in case we have
|
||||||
this in the domain part - like foo@bar-zot.com */
|
this in the domain part - like foo@bar-zot.com */
|
||||||
ocFSTableName = [NSMutableString stringWithFormat: @"sogo_cache_folder_%@",
|
ocFSTableName = [NSMutableString stringWithFormat: @"sogo_cache_folder_%@",
|
||||||
[[user loginInDomain] asCSSIdentifier]];
|
[[user login] asCSSIdentifier]];
|
||||||
[ocFSTableName replaceOccurrencesOfString: @"-"
|
[ocFSTableName replaceOccurrencesOfString: @"-"
|
||||||
withString: @"_"
|
withString: @"_"
|
||||||
options: 0
|
options: 0
|
||||||
|
|
|
@ -311,9 +311,9 @@ static NSMapTable *contextsTable = nil;
|
||||||
parts in this url. We strip the '-' character in case we have
|
parts in this url. We strip the '-' character in case we have
|
||||||
this in the domain part - like foo@bar-zot.com */
|
this in the domain part - like foo@bar-zot.com */
|
||||||
ocFSTableName = [NSString stringWithFormat: @"sogo_cache_folder_%@",
|
ocFSTableName = [NSString stringWithFormat: @"sogo_cache_folder_%@",
|
||||||
[[[user loginInDomain] asCSSIdentifier]
|
[[[user login] asCSSIdentifier]
|
||||||
stringByReplacingOccurrencesOfString: @"-"
|
stringByReplacingOccurrencesOfString: @"-"
|
||||||
withString: @"_"]];
|
withString: @"_"]];
|
||||||
[parts replaceObjectAtIndex: 4 withObject: ocFSTableName];
|
[parts replaceObjectAtIndex: 4 withObject: ocFSTableName];
|
||||||
folderTableURL
|
folderTableURL
|
||||||
= [NSURL URLWithString: [parts componentsJoinedByString: @"/"]];
|
= [NSURL URLWithString: [parts componentsJoinedByString: @"/"]];
|
||||||
|
|
|
@ -142,7 +142,7 @@ typedef enum
|
||||||
parts in this url. We strip the '-' character in case we have
|
parts in this url. We strip the '-' character in case we have
|
||||||
this in the domain part - like foo@bar-zot.com */
|
this in the domain part - like foo@bar-zot.com */
|
||||||
ocFSTableName = [NSMutableString stringWithFormat: @"sogo_cache_folder_%@",
|
ocFSTableName = [NSMutableString stringWithFormat: @"sogo_cache_folder_%@",
|
||||||
[[user loginInDomain] asCSSIdentifier]];
|
[[user login] asCSSIdentifier]];
|
||||||
[ocFSTableName replaceOccurrencesOfString: @"-"
|
[ocFSTableName replaceOccurrencesOfString: @"-"
|
||||||
withString: @"_"
|
withString: @"_"
|
||||||
options: 0
|
options: 0
|
||||||
|
|
Loading…
Reference in New Issue