Skip to content

Commit 0221192

Browse files
namecranenamecrane
authored
new features & improvements
- Add the ability to enable/disable the File Storage - Add the ability to enable/disable the Office Suite - Made the Client Area (`views/default/resource_usage.pdt`) translatable
1 parent 6565cc9 commit 0221192

File tree

4 files changed

+80
-18
lines changed

4 files changed

+80
-18
lines changed

‎README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,27 @@ Available values:
3030
| `userlimit` | `User Emails` | `quantity` | How many email accounts the domain may have |
3131
| `disklimit` | `Disk Storage (GB)` | `quantity` | Total disk storage available (GB) |
3232
| `useraliaslimit` | `User Aliases` | `quantity` | How many email aliases the domain may have |
33-
| `spamexperts` | `Spamexperts` | `checkbox` | Enable SpamExperts anti spam filtering on the domain |
33+
| `spamexperts` | `SpamExperts` | `checkbox` | Enable SpamExperts Anti Spam filtering |
3434
| `domainaliaslimit` | `Domain Aliases` | `quantity` | How many domain aliases the domain may have |
3535
| `archive_years` | `Email Archiving (years)` | `dropdown` | How many years to archive emails for |
3636
| `archive_direction` | `Email Archiving Direction` | `dropdown` (values `in`, `out,` `inout`) | Archive incoming, outgoing, or both, emails |
37-
37+
| `filestorage` | `filestorage\|Online Web Drive` | `yesno` | Enable the online File Storage & Sharing |
38+
| `office` | `office\|Office Suite` | `yesno` | Enable the online Document creating & editing feature suite |
3839

3940
***Archiving Years Options***
4041

4142
| Value | Description |
4243
|-|-|
43-
| `0` | `Disabled` |
4444
| `1` | `1 Year` |
4545
| `2` | `2 Years` |
4646
| `3` | `3 Years` |
4747
| `4` | `4 Years` |
4848
| `5` | `5 Years` |
4949
| `6` | `6 Years` |
50-
| `7` | `7 Years` |
51-
| `8` | `8 Years` |
52-
| `9` | `9 Years` |
53-
| `10` | `10 Years` |
50+
| `1` | `7 Years` |
51+
| `1` | `8 Years` |
52+
| `1` | `9 Years` |
53+
| `1` | `10 Years` |
5454
| `15` | `15 Years` |
5555
| `20` | `20 Years` |
5656

‎components/modules/namecrane_mail/language/en_us/namecrane_mail.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,21 @@
9191
$lang['NamecraneMail.package_fields.spamexperts_adminaccess'] = 'SpamExperts Administrator Access';
9292
$lang['NamecraneMail.package_fields.archive_years'] = 'Archive Years';
9393
$lang['NamecraneMail.package_fields.archive_direction'] = 'Archive Direction';
94+
$lang['NamecraneMail.package_fields.filestorage'] = 'File Storage';
95+
$lang['NamecraneMail.package_fields.office'] = 'Office Suite';
96+
97+
$lang['NamecraneMail.resource_usage.diskspace'] = 'Disk Space';
98+
$lang['NamecraneMail.resource_usage.email_users'] = 'Email Users';
99+
$lang['NamecraneMail.resource_usage.email_aliases'] = 'Email Aliases';
100+
$lang['NamecraneMail.resource_usage.domain_aliases'] = 'Domain Aliases';
101+
$lang['NamecraneMail.resource_usage.filestorage'] = 'File Storage';
102+
$lang['NamecraneMail.resource_usage.office'] = 'Office Suite';
103+
$lang['NamecraneMail.resource_usage.spamexperts.status'] = 'SpamExperts';
104+
$lang['NamecraneMail.resource_usage.email_archives.status'] = 'Email Archiving Status';
105+
$lang['NamecraneMail.resource_usage.email_archives.direction'] = 'Archiving Direction';
106+
$lang['NamecraneMail.resource_usage.email_archives.direction.in'] = 'Incoming';
107+
$lang['NamecraneMail.resource_usage.email_archives.direction.out'] = 'Outgoing';
108+
$lang['NamecraneMail.resource_usage.email_archives.direction.inout'] = 'Incoming + Outgoing';
109+
$lang['NamecraneMail.resource_usage.last_updated'] = 'Last Updated';
94110

95111
// Cron Tasks

‎components/modules/namecrane_mail/namecrane_mail.php

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,34 @@ public function getPackageFields($vars = null) {
421421

422422
$fields->setField($spamexperts_adminaccess);
423423

424+
// file storage
425+
426+
$filestorage = $fields->label(Language::_('NamecraneMail.package_fields.filestorage', true), 'namecrane_mail_filestorage');
427+
$filestorage->attach(
428+
$fields->fieldCheckbox(
429+
'meta[filestorage]',
430+
'true',
431+
(isset($vars->meta['filestorage']) ? $vars->meta['filestorage'] : null) == 'true',
432+
['id' => 'namecrane_mail_filestorage']
433+
)
434+
);
435+
436+
$fields->setField($filestorage);
437+
438+
// office
439+
440+
$office = $fields->label(Language::_('NamecraneMail.package_fields.office', true), 'namecrane_mail_office');
441+
$office->attach(
442+
$fields->fieldCheckbox(
443+
'meta[office]',
444+
'true',
445+
(isset($vars->meta['office']) ? $vars->meta['office'] : null) == 'true',
446+
['id' => 'namecrane_mail_office']
447+
)
448+
);
449+
450+
$fields->setField($office);
451+
424452
return $fields;
425453

426454
}
@@ -446,7 +474,9 @@ public function addService($package, array $vars = null, $parent_package = null,
446474
'spamexperts_adminaccess' => (isset($vars['configoptions']['spamexperts_adminaccess']) ? $vars['configoptions']['spamexperts_adminaccess'] : $package->meta->spamexperts_adminaccess),
447475
'domainaliaslimit' => (isset($vars['configoptions']['domainaliaslimit']) ? $vars['configoptions']['domainaliaslimit'] : $package->meta->domainaliaslimit),
448476
'archive_years' => (isset($vars['configoptions']['archive_years']) ? $vars['configoptions']['archive_years'] : $package->meta->archive_years),
449-
'archive_direction' => (isset($vars['configoptions']['archive_direction']) ? $vars['configoptions']['archive_direction'] : $package->meta->archive_direction)
477+
'archive_direction' => (isset($vars['configoptions']['archive_direction']) ? $vars['configoptions']['archive_direction'] : $package->meta->archive_direction),
478+
'filestorage' => (isset($vars['configoptions']['filestorage']) ? $vars['configoptions']['filestorage'] : $package->meta->filestorage),
479+
'office' => (isset($vars['configoptions']['office']) ? $vars['configoptions']['office'] : $package->meta->office)
450480
];
451481

452482
$return = $api->execute('POST', 'domain/create', $post);
@@ -502,7 +532,9 @@ public function editService($package, $service, array $vars = null, $parent_pack
502532
'spamexperts_adminaccess' => (isset($vars['configoptions']['spamexperts_adminaccess']) ? $vars['configoptions']['spamexperts_adminaccess'] : $package->meta->spamexperts_adminaccess),
503533
'domainaliaslimit' => (isset($vars['configoptions']['domainaliaslimit']) ? $vars['configoptions']['domainaliaslimit'] : $package->meta->domainaliaslimit),
504534
'archive_years' => (isset($vars['configoptions']['archive_years']) ? $vars['configoptions']['archive_years'] : $package->meta->archive_years),
505-
'archive_direction' => (isset($vars['configoptions']['archive_direction']) ? $vars['configoptions']['archive_direction'] : $package->meta->archive_direction)
535+
'archive_direction' => (isset($vars['configoptions']['archive_direction']) ? $vars['configoptions']['archive_direction'] : $package->meta->archive_direction),
536+
'filestorage' => (isset($vars['configoptions']['filestorage']) ? $vars['configoptions']['filestorage'] : $package->meta->filestorage),
537+
'office' => (isset($vars['configoptions']['office']) ? $vars['configoptions']['office'] : $package->meta->office)
506538
];
507539

508540
$return = $api->execute('POST', 'domain/modify', $post);
@@ -837,6 +869,12 @@ public function getResourceUsage($package, $service, array $get = null, array $p
837869

838870
Loader::loadHelpers($this, ['Form', 'Html']);
839871

872+
if(!empty($stats['data']['data']['spamexperts_direction'])) {
873+
874+
} else {
875+
$stats['data']['data']['spamexperts_direction'] = Language::_('NamecraneMail.tabs.webmail_login', true);
876+
}
877+
840878
$this->view->set('info', $stats['data']['data']);
841879

842880
return $this->view->fetch();

‎components/modules/namecrane_mail/views/default/resource_usage.pdt

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,42 @@
55
<td>Usage</td>
66
</tr>
77
<tr>
8-
<td class="fieldarea">Disk Space</td>
8+
<td class="fieldarea"><?=Language::_('NamecraneMail.resource_usage.diskspace', true)?></td>
99
<td align="left"><?=($info['diskusage'] / 1024);?> GB / <strong><?=($info['disklimit'] / 1024)?> GB</strong></td></tr>
1010
<tr>
11-
<td class="fieldarea">Email Users</td>
11+
<td class="fieldarea"><?=Language::_('NamecraneMail.resource_usage.email_users', true)?></td>
1212
<td align="left"><?=$info['usercount']?> / <strong><?=($info['userlimit'] ? $info['userlimit'] : '&infin;')?></strong></td>
1313
</tr>
1414
<tr>
15-
<td class="fieldarea">Email Aliases</td>
15+
<td class="fieldarea"><?=Language::_('NamecraneMail.resource_usage.email_aliases', true)?></td>
1616
<td align="left"><?=$info['useraliascount']?> / <strong><?=($info['useraliaslimit'] ? $info['useraliaslimit'] : '&infin;')?></strong></td>
1717
</tr>
1818
<tr>
19-
<td class="fieldarea">Domain Aliases</td>
19+
<td class="fieldarea"><?=Language::_('NamecraneMail.resource_usage.domain_aliases', true)?></td>
2020
<td align="left"><?=$info['domainaliascount']?> / <strong><?=($info['domainaliaslimit'] ? $info['domainaliaslimit'] : '&infin;')?></strong></td>
2121
</tr>
2222
<tr>
23-
<td class="fieldarea">Spamexperts Status</td>
23+
<td class="fieldarea"><?=Language::_('NamecraneMail.resource_usage.filestorage', true)?></td>
24+
<td align="left"><strong><?=($info['filestorage'] ? 'Enabled' : 'Disabled')?></strong></td>
25+
</tr>
26+
<tr>
27+
<td class="fieldarea"><?=Language::_('NamecraneMail.resource_usage.office', true)?></td>
28+
<td align="left"><strong><?=($info['office'] ? 'Enabled' : 'Disabled')?></strong></td>
29+
</tr>
30+
<tr>
31+
<td class="fieldarea"><?=Language::_('NamecraneMail.resource_usage.spamexperts.status', true)?></td>
2432
<td align="left"><strong><?=($info['spamexperts'] ? 'Enabled' : 'Disabled')?></strong></td>
2533
</tr>
2634
<tr>
27-
<td class="fieldarea">Email Archives</td>
35+
<td class="fieldarea"><?=Language::_('NamecraneMail.resource_usage.email_archives.status', true)?></td>
2836
<td align="left"><strong><?=($info['archive_years'] ? 'Enabled' : 'Disabled')?></strong></td>
2937
</tr>
3038
<tr>
31-
<td class="fieldarea">Archive Direction</td>
32-
<td align="left"><strong><?=($info['archive_years'] ? $info['archive_direction'] : 'N/A')?></strong></td>
39+
<td class="fieldarea"><?=Language::_('NamecraneMail.resource_usage.email_archives.direction', true)?></td>
40+
<td align="left"><strong><?=(Language::_('NamecraneMail.resource_usage.email_archives.direction.' . $info['archive_direction'], true) ?? 'N/A')?></strong></td>
3341
</tr>
3442
<tr>
35-
<td class="fieldarea">Last Updated</td>
43+
<td class="fieldarea"><?=Language::_('NamecraneMail.resource_usage.last_updated', true)?></td>
3644
<td align="left"><strong><?=$info['lastupdated']?></strong></td>
3745
</tr>
3846
</tbody>

0 commit comments

Comments
 (0)