|
|
@@ -941,6 +941,9 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
$tls_enforce_in = (isset($_data['tls_enforce_in'])) ? intval($_data['tls_enforce_in']) : intval($MAILBOX_DEFAULT_ATTRIBUTES['tls_enforce_in']);
|
|
|
$tls_enforce_out = (isset($_data['tls_enforce_out'])) ? intval($_data['tls_enforce_out']) : intval($MAILBOX_DEFAULT_ATTRIBUTES['tls_enforce_out']);
|
|
|
$sogo_access = (isset($_data['sogo_access'])) ? intval($_data['sogo_access']) : intval($MAILBOX_DEFAULT_ATTRIBUTES['sogo_access']);
|
|
|
+ $imap_access = (isset($_data['imap_access'])) ? intval($_data['imap_access']) : intval($MAILBOX_DEFAULT_ATTRIBUTES['imap_access']);
|
|
|
+ $pop3_access = (isset($_data['pop3_access'])) ? intval($_data['pop3_access']) : intval($MAILBOX_DEFAULT_ATTRIBUTES['pop3_access']);
|
|
|
+ $smtp_access = (isset($_data['smtp_access'])) ? intval($_data['smtp_access']) : intval($MAILBOX_DEFAULT_ATTRIBUTES['smtp_access']);
|
|
|
$quarantine_notification = (isset($_data['quarantine_notification'])) ? strval($_data['quarantine_notification']) : strval($MAILBOX_DEFAULT_ATTRIBUTES['quarantine_notification']);
|
|
|
$quota_b = ($quota_m * 1048576);
|
|
|
$mailbox_attrs = json_encode(
|
|
|
@@ -949,6 +952,9 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
'tls_enforce_in' => strval($tls_enforce_in),
|
|
|
'tls_enforce_out' => strval($tls_enforce_out),
|
|
|
'sogo_access' => strval($sogo_access),
|
|
|
+ 'imap_access' => strval($imap_access),
|
|
|
+ 'pop3_access' => strval($pop3_access),
|
|
|
+ 'smtp_access' => strval($smtp_access),
|
|
|
'mailbox_format' => strval($MAILBOX_DEFAULT_ATTRIBUTES['mailbox_format']),
|
|
|
'quarantine_notification' => strval($quarantine_notification)
|
|
|
)
|
|
|
@@ -1235,7 +1241,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
$alias_domain = idn_to_ascii(strtolower(trim($alias_domain)), 0, INTL_IDNA_VARIANT_UTS46);
|
|
|
$is_now = mailbox('get', 'alias_domain_details', $alias_domain);
|
|
|
if (!empty($is_now)) {
|
|
|
- $active = (isset($_data['active'])) ? intval($_data['active']) : $is_now['active_int'];
|
|
|
+ $active = (isset($_data['active'])) ? intval($_data['active']) : $is_now['active'];
|
|
|
$target_domain = (!empty($_data['target_domain'])) ? idn_to_ascii(strtolower(trim($_data['target_domain'])), 0, INTL_IDNA_VARIANT_UTS46) : $is_now['target_domain'];
|
|
|
}
|
|
|
else {
|
|
|
@@ -1603,7 +1609,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
if (!empty($is_now)) {
|
|
|
$username = $is_now['user2'];
|
|
|
$user1 = (!empty($_data['user1'])) ? $_data['user1'] : $is_now['user1'];
|
|
|
- $active = (isset($_data['active'])) ? intval($_data['active']) : $is_now['active_int'];
|
|
|
+ $active = (isset($_data['active'])) ? intval($_data['active']) : $is_now['active'];
|
|
|
$last_run = (isset($_data['last_run'])) ? NULL : $is_now['last_run'];
|
|
|
$delete2duplicates = (isset($_data['delete2duplicates'])) ? intval($_data['delete2duplicates']) : $is_now['delete2duplicates'];
|
|
|
$subscribeall = (isset($_data['subscribeall'])) ? intval($_data['subscribeall']) : $is_now['subscribeall'];
|
|
|
@@ -1761,7 +1767,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
$is_now = mailbox('get', 'filter_details', $id);
|
|
|
if (!empty($is_now)) {
|
|
|
$username = $is_now['username'];
|
|
|
- $active = (isset($_data['active'])) ? intval($_data['active']) : $is_now['active_int'];
|
|
|
+ $active = (isset($_data['active'])) ? intval($_data['active']) : $is_now['active'];
|
|
|
$script_desc = (!empty($_data['script_desc'])) ? $_data['script_desc'] : $is_now['script_desc'];
|
|
|
$script_data = (!empty($_data['script_data'])) ? $_data['script_data'] : $is_now['script_data'];
|
|
|
$filter_type = (!empty($_data['filter_type'])) ? $_data['filter_type'] : $is_now['filter_type'];
|
|
|
@@ -1834,8 +1840,8 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
foreach ($ids as $id) {
|
|
|
$is_now = mailbox('get', 'alias_details', $id);
|
|
|
if (!empty($is_now)) {
|
|
|
- $active = (isset($_data['active'])) ? intval($_data['active']) : $is_now['active_int'];
|
|
|
- $sogo_visible = (isset($_data['sogo_visible'])) ? intval($_data['sogo_visible']) : $is_now['sogo_visible_int'];
|
|
|
+ $active = (isset($_data['active'])) ? intval($_data['active']) : $is_now['active'];
|
|
|
+ $sogo_visible = (isset($_data['sogo_visible'])) ? intval($_data['sogo_visible']) : $is_now['sogo_visible'];
|
|
|
$goto_null = (isset($_data['goto_null'])) ? intval($_data['goto_null']) : 0;
|
|
|
$goto_spam = (isset($_data['goto_spam'])) ? intval($_data['goto_spam']) : 0;
|
|
|
$goto_ham = (isset($_data['goto_ham'])) ? intval($_data['goto_ham']) : 0;
|
|
|
@@ -2014,7 +2020,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
hasDomainAccess($_SESSION['mailcow_cc_username'], $_SESSION['mailcow_cc_role'], $domain)) {
|
|
|
$is_now = mailbox('get', 'domain_details', $domain);
|
|
|
if (!empty($is_now)) {
|
|
|
- $gal = (isset($_data['gal'])) ? intval($_data['gal']) : $is_now['gal_int'];
|
|
|
+ $gal = (isset($_data['gal'])) ? intval($_data['gal']) : $is_now['gal'];
|
|
|
$description = (!empty($_data['description']) && isset($_SESSION['acl']['domain_desc']) && $_SESSION['acl']['domain_desc'] == "1") ? $_data['description'] : $is_now['description'];
|
|
|
}
|
|
|
else {
|
|
|
@@ -2043,11 +2049,11 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
elseif ($_SESSION['mailcow_cc_role'] == "admin") {
|
|
|
$is_now = mailbox('get', 'domain_details', $domain);
|
|
|
if (!empty($is_now)) {
|
|
|
- $active = (isset($_data['active'])) ? intval($_data['active']) : $is_now['active_int'];
|
|
|
- $backupmx = (isset($_data['backupmx'])) ? intval($_data['backupmx']) : $is_now['backupmx_int'];
|
|
|
- $gal = (isset($_data['gal'])) ? intval($_data['gal']) : $is_now['gal_int'];
|
|
|
- $relay_all_recipients = (isset($_data['relay_all_recipients'])) ? intval($_data['relay_all_recipients']) : $is_now['relay_all_recipients_int'];
|
|
|
- $relay_unknown_only = (isset($_data['relay_unknown_only'])) ? intval($_data['relay_unknown_only']) : $is_now['relay_unknown_only_int'];
|
|
|
+ $active = (isset($_data['active'])) ? intval($_data['active']) : $is_now['active'];
|
|
|
+ $backupmx = (isset($_data['backupmx'])) ? intval($_data['backupmx']) : $is_now['backupmx'];
|
|
|
+ $gal = (isset($_data['gal'])) ? intval($_data['gal']) : $is_now['gal'];
|
|
|
+ $relay_all_recipients = (isset($_data['relay_all_recipients'])) ? intval($_data['relay_all_recipients']) : $is_now['relay_all_recipients'];
|
|
|
+ $relay_unknown_only = (isset($_data['relay_unknown_only'])) ? intval($_data['relay_unknown_only']) : $is_now['relay_unknown_only'];
|
|
|
$relayhost = (isset($_data['relayhost'])) ? intval($_data['relayhost']) : $is_now['relayhost'];
|
|
|
$aliases = (!empty($_data['aliases'])) ? $_data['aliases'] : $is_now['max_num_aliases_for_domain'];
|
|
|
$mailboxes = (isset($_data['mailboxes']) && $_data['mailboxes'] != '') ? intval($_data['mailboxes']) : $is_now['max_num_mboxes_for_domain'];
|
|
|
@@ -2208,10 +2214,18 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
continue;
|
|
|
}
|
|
|
$is_now = mailbox('get', 'mailbox_details', $username);
|
|
|
+ if (isset($_data['protocol_access'])) {
|
|
|
+ $_data['imap_access'] = (in_array('imap', $_data['protocol_access'])) ? 1 : 0;
|
|
|
+ $_data['pop3_access'] = (in_array('pop3', $_data['protocol_access'])) ? 1 : 0;
|
|
|
+ $_data['smtp_access'] = (in_array('smtp', $_data['protocol_access'])) ? 1 : 0;
|
|
|
+ }
|
|
|
if (!empty($is_now)) {
|
|
|
- $active = (isset($_data['active'])) ? intval($_data['active']) : $is_now['active_int'];
|
|
|
+ $active = (isset($_data['active'])) ? intval($_data['active']) : $is_now['active'];
|
|
|
(int)$force_pw_update = (isset($_data['force_pw_update'])) ? intval($_data['force_pw_update']) : intval($is_now['attributes']['force_pw_update']);
|
|
|
- (int)$sogo_access = (isset($_data['sogo_access']) && isset($_SESSION['acl']['sogo_access']) && $_SESSION['acl']['sogo_access'] == "1") ? intval($_data['sogo_access']) : intval($is_now['attributes']['sogo_access']);
|
|
|
+ (int)$sogo_access = (isset($_data['sogo_access']) && isset($_SESSION['acl']['protocol_access']) && $_SESSION['acl']['protocol_access'] == "1") ? intval($_data['sogo_access']) : intval($is_now['attributes']['sogo_access']);
|
|
|
+ (int)$imap_access = (isset($_data['imap_access']) && isset($_SESSION['acl']['protocol_access']) && $_SESSION['acl']['protocol_access'] == "1") ? intval($_data['imap_access']) : intval($is_now['attributes']['imap_access']);
|
|
|
+ (int)$pop3_access = (isset($_data['pop3_access']) && isset($_SESSION['acl']['protocol_access']) && $_SESSION['acl']['protocol_access'] == "1") ? intval($_data['pop3_access']) : intval($is_now['attributes']['pop3_access']);
|
|
|
+ (int)$smtp_access = (isset($_data['smtp_access']) && isset($_SESSION['acl']['protocol_access']) && $_SESSION['acl']['protocol_access'] == "1") ? intval($_data['smtp_access']) : intval($is_now['attributes']['smtp_access']);
|
|
|
(int)$quota_m = (isset_has_content($_data['quota'])) ? intval($_data['quota']) : ($is_now['quota'] / 1048576);
|
|
|
$name = (!empty($_data['name'])) ? ltrim(rtrim($_data['name'], '>'), '<') : $is_now['name'];
|
|
|
$domain = $is_now['domain'];
|
|
|
@@ -2490,7 +2504,10 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
`name`= :name,
|
|
|
`quota` = :quota_b,
|
|
|
`attributes` = JSON_SET(`attributes`, '$.force_pw_update', :force_pw_update),
|
|
|
- `attributes` = JSON_SET(`attributes`, '$.sogo_access', :sogo_access)
|
|
|
+ `attributes` = JSON_SET(`attributes`, '$.sogo_access', :sogo_access),
|
|
|
+ `attributes` = JSON_SET(`attributes`, '$.imap_access', :imap_access),
|
|
|
+ `attributes` = JSON_SET(`attributes`, '$.pop3_access', :pop3_access),
|
|
|
+ `attributes` = JSON_SET(`attributes`, '$.smtp_access', :smtp_access)
|
|
|
WHERE `username` = :username");
|
|
|
$stmt->execute(array(
|
|
|
':active' => $active,
|
|
|
@@ -2498,6 +2515,9 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
':quota_b' => $quota_b,
|
|
|
':force_pw_update' => $force_pw_update,
|
|
|
':sogo_access' => $sogo_access,
|
|
|
+ ':imap_access' => $imap_access,
|
|
|
+ ':pop3_access' => $pop3_access,
|
|
|
+ ':smtp_access' => $smtp_access,
|
|
|
':username' => $username
|
|
|
));
|
|
|
$_SESSION['return'][] = array(
|
|
|
@@ -2518,7 +2538,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
foreach ($names as $name) {
|
|
|
$is_now = mailbox('get', 'resource_details', $name);
|
|
|
if (!empty($is_now)) {
|
|
|
- $active = (isset($_data['active'])) ? intval($_data['active']) : $is_now['active_int'];
|
|
|
+ $active = (isset($_data['active'])) ? intval($_data['active']) : $is_now['active'];
|
|
|
$multiple_bookings = (isset($_data['multiple_bookings'])) ? intval($_data['multiple_bookings']) : $is_now['multiple_bookings'];
|
|
|
$description = (!empty($_data['description'])) ? $_data['description'] : $is_now['description'];
|
|
|
$kind = (!empty($_data['kind'])) ? $_data['kind'] : $is_now['kind'];
|
|
|
@@ -2808,8 +2828,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
if (!is_numeric($_data)) {
|
|
|
return false;
|
|
|
}
|
|
|
- $stmt = $pdo->prepare("SELECT CASE `script_name` WHEN 'active' THEN '".$lang['mailbox']['yes']."' ELSE '".$lang['mailbox']['no']."' END AS `active`,
|
|
|
- CASE `script_name` WHEN 'active' THEN 1 ELSE 0 END AS `active_int`,
|
|
|
+ $stmt = $pdo->prepare("SELECT CASE `script_name` WHEN 'active' THEN 1 ELSE 0 END AS `active`,
|
|
|
id,
|
|
|
username,
|
|
|
filter_type,
|
|
|
@@ -2868,14 +2887,12 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
$shown_fields[] = $field['Field'];
|
|
|
}
|
|
|
$stmt = $pdo->prepare("SELECT " . implode(',', $shown_fields) . ",
|
|
|
- `active` AS `active_int`,
|
|
|
- CASE `active` WHEN 1 THEN '".$lang['mailbox']['yes']."' ELSE '".$lang['mailbox']['no']."' END AS `active`
|
|
|
+ `active`
|
|
|
FROM `imapsync` WHERE id = :id");
|
|
|
}
|
|
|
elseif (isset($_extra) && in_array('with_password', $_extra)) {
|
|
|
$stmt = $pdo->prepare("SELECT *,
|
|
|
- `active` AS `active_int`,
|
|
|
- CASE `active` WHEN 1 THEN '".$lang['mailbox']['yes']."' ELSE '".$lang['mailbox']['no']."' END AS `active`
|
|
|
+ `active`
|
|
|
FROM `imapsync` WHERE id = :id");
|
|
|
}
|
|
|
else {
|
|
|
@@ -2885,8 +2902,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
$shown_fields[] = $field['Field'];
|
|
|
}
|
|
|
$stmt = $pdo->prepare("SELECT " . implode(',', $shown_fields) . ",
|
|
|
- `active` AS `active_int`,
|
|
|
- CASE `active` WHEN 1 THEN '".$lang['mailbox']['yes']."' ELSE '".$lang['mailbox']['no']."' END AS `active`
|
|
|
+ `active`
|
|
|
FROM `imapsync` WHERE id = :id");
|
|
|
}
|
|
|
$stmt->execute(array(':id' => $_data));
|
|
|
@@ -3119,10 +3135,8 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
`address`,
|
|
|
`public_comment`,
|
|
|
`private_comment`,
|
|
|
- `active` as `active_int`,
|
|
|
- `sogo_visible` as `sogo_visible_int`,
|
|
|
- CASE `active` WHEN 1 THEN '".$lang['mailbox']['yes']."' ELSE '".$lang['mailbox']['no']."' END AS `active`,
|
|
|
- CASE `sogo_visible` WHEN 1 THEN '".$lang['mailbox']['yes']."' ELSE '".$lang['mailbox']['no']."' END AS `sogo_visible`,
|
|
|
+ `active`,
|
|
|
+ `sogo_visible`,
|
|
|
`created`,
|
|
|
`modified`
|
|
|
FROM `alias`
|
|
|
@@ -3153,8 +3167,6 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
(!filter_var($aliasdata['address'], FILTER_VALIDATE_EMAIL)) ? $aliasdata['is_catch_all'] = 1 : $aliasdata['is_catch_all'] = 0;
|
|
|
$aliasdata['active'] = $row['active'];
|
|
|
$aliasdata['sogo_visible'] = $row['sogo_visible'];
|
|
|
- $aliasdata['active_int'] = $row['active_int'];
|
|
|
- $aliasdata['sogo_visible_int'] = $row['sogo_visible_int'];
|
|
|
$aliasdata['created'] = $row['created'];
|
|
|
$aliasdata['modified'] = $row['modified'];
|
|
|
if (!hasDomainAccess($_SESSION['mailcow_cc_username'], $_SESSION['mailcow_cc_role'], $aliasdata['domain'])) {
|
|
|
@@ -3168,8 +3180,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
$stmt = $pdo->prepare("SELECT
|
|
|
`alias_domain`,
|
|
|
`target_domain`,
|
|
|
- `active` AS `active_int`,
|
|
|
- CASE `active` WHEN 1 THEN '".$lang['mailbox']['yes']."' ELSE '".$lang['mailbox']['no']."' END AS `active`,
|
|
|
+ `active`,
|
|
|
`created`,
|
|
|
`modified`
|
|
|
FROM `alias_domain`
|
|
|
@@ -3188,7 +3199,6 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
$aliasdomaindata['target_domain'] = $row['target_domain'];
|
|
|
$aliasdomaindata['active'] = $row['active'];
|
|
|
$aliasdomaindata['rl'] = $rl;
|
|
|
- $aliasdomaindata['active_int'] = $row['active_int'];
|
|
|
$aliasdomaindata['created'] = $row['created'];
|
|
|
$aliasdomaindata['modified'] = $row['modified'];
|
|
|
if (!hasDomainAccess($_SESSION['mailcow_cc_username'], $_SESSION['mailcow_cc_role'], $aliasdomaindata['target_domain'])) {
|
|
|
@@ -3240,16 +3250,11 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
`maxquota`,
|
|
|
`quota`,
|
|
|
`relayhost`,
|
|
|
- `relay_all_recipients` as `relay_all_recipients_int`,
|
|
|
- `relay_unknown_only` as `relay_unknown_only_int`,
|
|
|
- `backupmx` as `backupmx_int`,
|
|
|
- `gal` as `gal_int`,
|
|
|
- `active` as `active_int`,
|
|
|
- CASE `relay_all_recipients` WHEN 1 THEN '".$lang['mailbox']['yes']."' ELSE '".$lang['mailbox']['no']."' END AS `relay_all_recipients`,
|
|
|
- CASE `relay_unknown_only` WHEN 1 THEN '".$lang['mailbox']['yes']."' ELSE '".$lang['mailbox']['no']."' END AS `relay_unknown_only`,
|
|
|
- CASE `backupmx` WHEN 1 THEN '".$lang['mailbox']['yes']."' ELSE '".$lang['mailbox']['no']."' END AS `backupmx`,
|
|
|
- CASE `gal` WHEN 1 THEN '".$lang['mailbox']['yes']."' ELSE '".$lang['mailbox']['no']."' END AS `gal`,
|
|
|
- CASE `active` WHEN 1 THEN '".$lang['mailbox']['yes']."' ELSE '".$lang['mailbox']['no']."' END AS `active`
|
|
|
+ `relay_all_recipients`,
|
|
|
+ `relay_unknown_only`,
|
|
|
+ `backupmx`,
|
|
|
+ `gal`,
|
|
|
+ `active`
|
|
|
FROM `domain` WHERE `domain`= :domain");
|
|
|
$stmt->execute(array(
|
|
|
':domain' => $_data
|
|
|
@@ -3306,15 +3311,10 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
$domaindata['relayhost'] = $row['relayhost'];
|
|
|
$domaindata['backupmx'] = $row['backupmx'];
|
|
|
$domaindata['gal'] = $row['gal'];
|
|
|
- $domaindata['backupmx_int'] = $row['backupmx_int'];
|
|
|
- $domaindata['gal_int'] = $row['gal_int'];
|
|
|
$domaindata['rl'] = $rl;
|
|
|
$domaindata['active'] = $row['active'];
|
|
|
- $domaindata['active_int'] = $row['active_int'];
|
|
|
$domaindata['relay_all_recipients'] = $row['relay_all_recipients'];
|
|
|
$domaindata['relay_unknown_only'] = $row['relay_unknown_only'];
|
|
|
- $domaindata['relay_all_recipients_int'] = $row['relay_all_recipients_int'];
|
|
|
- $domaindata['relay_unknown_only_int'] = $row['relay_unknown_only_int'];
|
|
|
$stmt = $pdo->prepare("SELECT COUNT(*) AS `alias_count` FROM `alias`
|
|
|
WHERE (`domain`= :domain OR `domain` IN (SELECT `alias_domain` FROM `alias_domain` WHERE `target_domain` = :domain2))
|
|
|
AND `address` NOT IN (
|
|
|
@@ -3361,8 +3361,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
`domain`.`backupmx`,
|
|
|
`mailbox`.`username`,
|
|
|
`mailbox`.`name`,
|
|
|
- `mailbox`.`active` AS `active_int`,
|
|
|
- CASE `mailbox`.`active` WHEN 1 THEN '".$lang['mailbox']['yes']."' ELSE '".$lang['mailbox']['no']."' END AS `active`,
|
|
|
+ `mailbox`.`active`,
|
|
|
`mailbox`.`domain`,
|
|
|
`mailbox`.`local_part`,
|
|
|
`mailbox`.`quota`,
|
|
|
@@ -3377,8 +3376,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
`domain`.`backupmx`,
|
|
|
`mailbox`.`username`,
|
|
|
`mailbox`.`name`,
|
|
|
- `mailbox`.`active` AS `active_int`,
|
|
|
- CASE `mailbox`.`active` WHEN 1 THEN '".$lang['mailbox']['yes']."' ELSE '".$lang['mailbox']['no']."' END AS `active`,
|
|
|
+ `mailbox`.`active`,
|
|
|
`mailbox`.`domain`,
|
|
|
`mailbox`.`local_part`,
|
|
|
`mailbox`.`quota`,
|
|
|
@@ -3423,7 +3421,6 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
$mailboxdata['last_smtp_login'] = $last_smtp_login;
|
|
|
$mailboxdata['last_pop3_login'] = $last_pop3_login;
|
|
|
$mailboxdata['active'] = $row['active'];
|
|
|
- $mailboxdata['active_int'] = $row['active_int'];
|
|
|
$mailboxdata['domain'] = $row['domain'];
|
|
|
$mailboxdata['local_part'] = $row['local_part'];
|
|
|
$mailboxdata['quota'] = $row['quota'];
|
|
|
@@ -3432,7 +3429,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
$mailboxdata['percent_in_use'] = ($row['quota'] == 0) ? '- ' : round((intval($row['bytes']) / intval($row['quota'])) * 100);
|
|
|
$mailboxdata['messages'] = $row['messages'];
|
|
|
$mailboxdata['spam_aliases'] = $SpamaliasUsage['sa_count'];
|
|
|
- $mailboxdata['pushover_active'] = ($PushoverActive['pushover_active'] == 1) ? $lang['mailbox']['yes'] : $lang['mailbox']['no'];
|
|
|
+ $mailboxdata['pushover_active'] = ($PushoverActive['pushover_active'] == 1) ? 1 : 0;
|
|
|
if ($mailboxdata['percent_in_use'] === '- ') {
|
|
|
$mailboxdata['percent_class'] = "info";
|
|
|
}
|
|
|
@@ -3458,8 +3455,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
`kind`,
|
|
|
`multiple_bookings`,
|
|
|
`local_part`,
|
|
|
- `active` AS `active_int`,
|
|
|
- CASE `active` WHEN 1 THEN '".$lang['mailbox']['yes']."' ELSE '".$lang['mailbox']['no']."' END AS `active`,
|
|
|
+ `active`,
|
|
|
`domain`
|
|
|
FROM `mailbox` WHERE `kind` REGEXP 'location|thing|group' AND `username` = :resource");
|
|
|
$stmt->execute(array(
|
|
|
@@ -3471,7 +3467,6 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
|
$resourcedata['multiple_bookings'] = $row['multiple_bookings'];
|
|
|
$resourcedata['description'] = $row['name'];
|
|
|
$resourcedata['active'] = $row['active'];
|
|
|
- $resourcedata['active_int'] = $row['active_int'];
|
|
|
$resourcedata['domain'] = $row['domain'];
|
|
|
$resourcedata['local_part'] = $row['local_part'];
|
|
|
if (!isset($resourcedata['domain']) ||
|
andryyy