amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-03 02:25:25 +00:00
Code Issues Projects Releases Wiki Activity

merge of '3e033b86ce4c3221ccb5e2e1dd845bd3a033ec31'

Browse Source 
and '8efad85108b102663bde58065393dff21ca233c4'

Monotone-Parent: 3e033b86ce4c3221ccb5e2e1dd845bd3a033ec31
Monotone-Parent: 8efad85108b102663bde58065393dff21ca233c4
Monotone-Revision: fa2e7098c9457bb1b9933f49556578b5326860d2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-10-13T01:05:20
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2011-10-13 01:05:20 +00:00
parent 9c17e7be92 0125ed5372
commit 2d45ad52c4
2 changed files with 49 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+10
View File
@@ -1,3 +1,11 @@
2011-10-13 Francis Lachapelle <flachapelle@inverse.ca>
* Tools/SOGoToolUserPreferences.m (-run): added possibility to
specify a file (-f filename) when setting a user
default/setting. Removed the constraint of specifying
administrative credentials of the SIeve server when not setting a
parameter related to Sieve.
2011-10-12 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreSOGo.m (sogo_manager_generate_uri): new
@@ -51,6 +59,8 @@
(-getPidLidReminderFileParameter:inMemCtx:): new alarm-related
forwarders to homonymous methods in MAPIStoreAppointmentWrapper.
2011-10-09 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreMailFolder.m (-synchroniseCache): improved
method to only fetch non-deleted messages in part 1, and to
automatically remove message records in part 2, so that we know
Tools/SOGoToolUserPreferences.m
+39 -9
View File
@@ -21,6 +21,7 @@
*/
#import <Foundation/NSArray.h>
#import <Foundation/NSData.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSString.h>
@@ -61,8 +62,13 @@ typedef enum
- (void) usage
{
fprintf (stderr, "user-preferences get|set|unset defaults|settings user [authname:authpassword] key value\n\n"
" user the user of whom to set the defaults/settings key/value\n");
fprintf (stderr, "user-preferences get|set|unset defaults|settings user [authname:authpassword] key [value|-f filename]\n\n"
" user the user of whom to set the defaults/settings key/value\n"
" value the JSON-formatted value of the key\n\n"
" Examples:\n"
" sogo-tool user-preferences get defaults janedoe SOGoLanguage\n"
" sogo-tool user-preferences unset settings janedoe Mail\n"
" sogo-tool user-preferences set defaults janedoe SOGoTimeFormat '{\"SOGoTimeFormat\":\"%%I:%%M %%p\"}'\n");
}
//
@@ -164,7 +170,9 @@ typedef enum
else
{
NSString *authname, *authpwd, *value;
NSData *data;
int i;
authname = @"";
authpwd = @"";
value = @"";
@@ -172,12 +180,34 @@ typedef enum
if (max > 4)
{
r = [[arguments objectAtIndex: 3] rangeOfString: @":"];
authname = [[arguments objectAtIndex: 3] substringToIndex: r.location];
authpwd = [[arguments objectAtIndex: 3] substringFromIndex: r.location+1];
key = [arguments objectAtIndex: 4];
if (max > 5)
value = [arguments objectAtIndex: 5];
if (r.location == NSNotFound)
{
i = 3;
}
else
{
authname = [[arguments objectAtIndex: 3] substringToIndex: r.location];
authpwd = [[arguments objectAtIndex: 3] substringFromIndex: r.location+1];
i = 4;
}
key = [arguments objectAtIndex: i++];
value = [arguments objectAtIndex: i++];
if (max > i)
{
if ([value caseInsensitiveCompare: @"-f"] == NSOrderedSame)
{
if (max > i)
{
data = [NSData dataWithContentsOfFile: [arguments objectAtIndex: i]];
value = [[NSString alloc] initWithData: data encoding: NSUTF8StringEncoding];
[value autorelease];
}
}
else
value = [arguments objectAtIndex: i];
}
}
else
{