Merge branch 'master' into 'master'
FS#3749 - Disable smtp checkbox in mailbox setting has no effect on courier servers
See merge request !199
| | |
| | | MYSQL_QUOTA_FIELD quota |
| | | #MYSQL_QUOTA_FIELD concat(quota,'S') |
| | | #MYSQL_WHERE_CLAUSE access='y' |
| | | MYSQL_AUXOPTIONS_FIELD concat('disableimap=',disableimap,',disablepop3=',disablepop3) |
| | | #MYSQL_AUXOPTIONS_FIELD concat('disableimap=',disableimap,',disablepop3=',disablepop3) |
| | | MYSQL_AUXOPTIONS_FIELD concat('disableimap=', if(disableimap = 'y', 1, 0), ',', 'disablepop3=', if(disablepop3 = 'y', 1, 0)) |