@@ -236,119 +236,120 @@ $RSPAMD_MAPS = array(
$IMAPSYNC_OPTIONS = array(
'whitelist' => array(
+ 'abort',
+ 'authmd51',
+ 'authmd52',
'authmech1',
'authmech2',
'authuser1',
'authuser2',
+ 'debug',
'debugcontent',
- 'disarmreadreceipts',
- 'dry',
- 'logdir',
'debugcrossduplicates',
- 'maxsize',
- 'minsize',
- 'minage',
- 'search',
- 'noabletosearch',
- 'pidfile',
- 'pidfilelocking',
- 'search1',
- 'search2',
- 'sslargs1',
- 'sslargs2',
- 'syncduplicates',
- 'usecache',
- 'synclabels',
- 'truncmess',
+ 'debugflags',
+ 'debugfolders',
+ 'debugimap',
+ 'debugimap1',
+ 'debugimap2',
+ 'debugmemory',
+ 'debugssl',
+ 'delete1emptyfolders',
+ 'delete2folders',
+ 'disarmreadreceipts',
+ 'domain1',
+ 'domain2',
+ 'domino1',
'domino2',
- 'expunge1',
+ 'dry',
+ 'errorsmax',
+ 'exchange1',
+ 'exchange2',
+ 'exitwhenover',
+ 'expunge1',
+ 'f1f2',
'filterbuggyflags',
+ 'folder',
+ 'folderfirst',
+ 'folderlast',
+ 'folderrec',
+ 'gmail1',
+ 'gmail2',
+ 'idatefromheader',
+ 'include',
+ 'inet4',
+ 'inet6',
'justconnect',
'justfolders',
- 'maxlinelength',
- 'useheader',
- 'noabletosearch1',
- 'nolog',
- 'prefix1',
- 'prefix2',
- 'sep1',
- 'sep2',
- 'nofoldersizesatend',
'justfoldersizes',
- 'proxyauth1',
- 'skipemptyfolders',
- 'include',
- 'subfolder1',
- 'subscribed',
- 'subscribe',
- 'debug',
- 'debugimap2',
- 'domino1',
- 'exchange1',
- 'exchange2',
'justlogin',
'keepalive1',
'keepalive2',
+ 'log',
+ 'logdir',
+ 'logfile',
+ 'maxbytesafter',
+ 'maxlinelength',
+ 'maxmessagespersecond',
+ 'maxsize',
+ 'maxsleep',
+ 'minage',
+ 'minsize',
+ 'noabletosearch',
+ 'noabletosearch1',
'noabletosearch2',
+ 'noexpunge1',
'noexpunge2',
+ 'nofoldersizesatend',
+ 'noid',
+ 'nolog',
+ 'nomixfolders',
'noresyncflags',
'nossl1',
- 'nouidexpunge2',
- 'syncinternaldates',
- 'idatefromheader',
- 'useuid',
- 'debugflags',
- 'debugimap',
- 'delete1emptyfolders',
- 'delete2folders',
- 'gmail2',
- 'office1',
- 'testslive6',
- 'debugimap1',
- 'errorsmax',
- 'tests',
- 'gmail1',
- 'maxmessagespersecond',
- 'maxbytesafter',
- 'maxsleep',
- 'abort',
- 'resyncflags',
- 'resynclabels',
- 'syncacls',
+ 'nossl2',
'nosyncacls',
+ 'notls1',
+ 'notls2',
+ 'nouidexpunge2',
'nousecache',
- 'office2',
- 'testslive',
- 'debugmemory',
- 'exitwhenover',
- 'noid',
- 'noexpunge1',
- 'authmd51',
- 'logfile',
- 'proxyauth2',
- 'domain1',
- 'domain2',
'oauthaccesstoken1',
'oauthaccesstoken2',
'oauthdirect1',
'oauthdirect2',
- 'folder',
- 'folderrec',
- 'folderfirst',
- 'folderlast',
- 'nomixfolders',
- 'authmd52',
- 'debugfolders',
- 'nossl2',
+ 'office1',
+ 'office2',
+ 'pidfile',
+ 'pidfilelocking',
+ 'prefix1',
+ 'prefix2',
+ 'proxyauth1',
+ 'proxyauth2',
+ 'resyncflags',
+ 'resynclabels',
+ 'search',
+ 'search1',
+ 'search2',
+ 'sep1',
+ 'sep2',
+ 'showpasswords',
+ 'skipemptyfolders',
'ssl2',
+ 'sslargs1',
+ 'sslargs2',
+ 'subfolder1',
+ 'subscribe',
+ 'subscribed',
+ 'syncacls',
+ 'syncduplicates',
+ 'syncinternaldates',
+ 'synclabels',
+ 'tests',
+ 'testslive',
+ 'testslive6',
'tls2',
- 'notls2',
- 'debugssl',
- 'notls1',
- 'inet4',
- 'inet6',
- 'log',
- 'showpasswords'
+ 'truncmess',
+ 'usecache',
+ 'useheader',
+ 'useuid'
),
'blacklist' => array(
'skipmess',
DerLinkman