Skip to content

Commit e22595a

Browse files
namecranenamecrane
authored
added Login Info page
1 parent 281b27f commit e22595a

File tree

5 files changed

+131
-65
lines changed

5 files changed

+131
-65
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
$lang['NamecraneMail.tabs.resource_usage'] = 'Resource Usage';
3838
$lang['NamecraneMail.tabs.dns_records'] = 'DNS Records';
3939
$lang['NamecraneMail.tabs.login_to_spamexperts'] = 'Login to SpamExperts';
40-
$lang['NamecraneMail.tabs.webmail_login'] = 'Login to Webmail / Admin';
40+
$lang['NamecraneMail.tabs.login_details'] = 'Login Details';
4141

4242
// Add row
4343
$lang['NamecraneMail.add_row.box_title'] = 'Namecrane Mail - Add Server';
@@ -61,6 +61,7 @@
6161
// Errors
6262
$lang['NamecraneMail.!error.server_name.valid'] = 'Invalid Server Name';
6363
$lang['NamecraneMail.!error.api_key.valid'] = 'Invalid API Key';
64+
$lang['NamecraneMail.!error.domain.valid'] = 'Invalid Domain';
6465
$lang['NamecraneMail.!error.module_row.missing'] = 'An internal error occurred. The module row is unavailable.';
6566
$lang['NamecraneMail.!error.disklimit.valid'] = 'Disk Space must be a positive whole integer.';
6667
$lang['NamecraneMail.!error.userlimit.valid'] = 'Max Email Users be a positive whole integer.';
@@ -108,4 +109,8 @@
108109
$lang['NamecraneMail.resource_usage.email_archives.direction.inout'] = 'Incoming + Outgoing';
109110
$lang['NamecraneMail.resource_usage.last_updated'] = 'Last Updated';
110111

112+
// Buttons
113+
114+
$lang['NamecraneMail.button.login_portal'] = 'Login Now';
115+
111116
// Cron Tasks

‎components/modules/namecrane_mail/namecrane_mail.php

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ public function getClientTabs($package) {
759759
$tabs = [
760760
'getResourceUsage' => Language::_('NamecraneMail.tabs.resource_usage', true),
761761
'getDNSSettings' => Language::_('NamecraneMail.tabs.dns_records', true),
762-
'webmailLogin' => Language::_('NamecraneMail.tabs.webmail_login', true),
762+
'loginDetails' => Language::_('NamecraneMail.tabs.login_details', true),
763763
];
764764

765765
if($package->meta->spamexperts) {
@@ -877,11 +877,20 @@ public function getSpamExpertsSSO($package, $service, array $get = null, array $
877877

878878
}
879879

880-
public function webmailLogin($package, $service, array $get = null, array $post = null, array $files = null) {
880+
public function loginDetails($package, $service, array $get = null, array $post = null, array $files = null) {
881881

882-
header('Location: https://workspace.org/');
882+
$row = $this->getModuleRow();
883+
$service_fields = $this->serviceFieldsToObject($service->fields);
884+
885+
Loader::loadHelpers($this, [ 'Form', 'Html' ]);
886+
887+
$this->view = new View('login_details', 'default');
888+
$this->view->base_uri = $this->base_uri;
889+
$this->view->setDefaultView('components' . DS . 'modules' . DS . 'namecrane_mail' . DS);
883890

884-
exit();
891+
$this->view->set('service_fields', $service_fields);
892+
893+
return $this->view->fetch();
885894

886895
}
887896

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

Lines changed: 58 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,61 @@
1-
<table class="table">
2-
<tbody>
3-
<tr class="heading_row">
4-
<td>Type</td>
5-
<td>Name / Host</td>
6-
<td>Value</td>
7-
</tr>
8-
<?php foreach($dns as $record) { ?>
1+
<div class="table-responsive">
2+
3+
<h4>DNS Records</h4>
4+
5+
<table class="table table-curved table-striped">
6+
<thead>
97
<tr>
10-
<td><?=$record['type']?></td>
11-
<td><?=$record['record']?><?php if ($record['record'] == '@') { ?> or <?=$service_fields->domain?>.<?php } ?></td>
12-
<td>
13-
<code><?=$record['value']?></code>
14-
<?php if ($record['prio']) { ?> (priority: <code><?=$record['prio']?>)</code><?php } ?>
8+
<th>Type</th>
9+
<th>Name / Host</th>
10+
<th>Value</th>
11+
</tr>
12+
</thead>
13+
<tbody>
14+
<?php foreach($dns as $record) { ?>
15+
<tr>
16+
<td><?=$record['type']?></td>
17+
<td><?=$record['record']?><?php if ($record['record'] == '@') { ?> or <?=$service_fields->domain?>.<?php } ?></td>
18+
<td>
19+
<code><?=$record['value']?></code>
20+
<?php if ($record['prio']) { ?> (priority: <code><?=$record['prio']?>)</code><?php } ?>
21+
</td>
22+
</tr>
23+
<?php } ?>
24+
</tbody>
25+
</table>
26+
<?php if ($dkim) { ?>
27+
28+
<br />
29+
30+
<h4>Domain Keys (DKIM)</h4>
31+
32+
<table class="table table-curved table-striped">
33+
<thead>
34+
<tr>
35+
<th>Type</th>
36+
<th>Name / Host</th>
37+
</tr>
38+
</thead>
39+
<tbody>
40+
<tr>
41+
<td>TXT</td>
42+
<td><?=$dkim['selector']?></td>
43+
</tr>
44+
</tbody>
45+
</table>
46+
<table class="table table-curved table-striped">
47+
<thead>
48+
<tr>
49+
<th>Value</th>
50+
</tr>
51+
</thead>
52+
<tbody>
53+
<tr>
54+
<td colspan="2">
55+
<textarea style="width: 100%;" rows="6" disabled>v=DKIM1;k=rsa;h=<?=$dkim['algo']?>;p=<?=$dkim['key']?></textarea>
1556
</td>
1657
</tr>
17-
<?php } ?>
18-
</tbody>
19-
</table>
20-
<?php if ($dkim) { ?>
21-
<br />
22-
<table class="table">
23-
<tbody>
24-
<tr class="heading_row">
25-
<td>Type</td>
26-
<td>Name / Host</td>
27-
</tr>
28-
<td>TXT</td>
29-
<td><?=$dkim['selector']?></td>
30-
</tr>
31-
<tr>
32-
<td colspan="2">
33-
<textarea style="width: 100%;" rows="6" disabled>v=DKIM1;k=rsa;h=<?=$dkim['algo']?>;p=<?=$dkim['key']?></textarea>
34-
</td>
35-
</tr>
36-
</tbody>
37-
</table>
38-
<?php } ?>
58+
</tbody>
59+
</table>
60+
<?php } ?>
61+
</div>

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<div class="table-responsive">
2+
3+
<h4><?=$this->_('NamecraneMail.tabs.login_details')?></h4>
4+
5+
<table class="table table-curved table-striped">
6+
<thead>
7+
<tr>
8+
<th colspan="2"><?=$this->_('NamecraneMail.tabs.login_details')?></th>
9+
</tr>
10+
</thead>
11+
<tbody>
12+
<tr>
13+
<td><?=$this->_('NamecraneMail.service_fields.username')?></td>
14+
<td><?=(isset($service_fields->namecrane_mail_username) ? $service_fields->namecrane_mail_username : null)?></td>
15+
</tr>
16+
<tr>
17+
<td><?=$this->_('NamecraneMail.service_fields.password')?></td>
18+
<td><?=(isset($service_fields->namecrane_mail_password) ? $service_fields->namecrane_mail_password : null)?></td>
19+
</tr>
20+
</tbody>
21+
</table>
22+
23+
<br />
24+
25+
<a href="https://workspace.org/" class="btn btn-med btn-primary" target="_blank"><?=$this->_('NamecraneMail.button.login_portal')?></a>
26+
27+
</div>

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

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,49 @@
1-
<table class="table">
1+
<table class="table table-striped">
2+
<thead>
3+
<tr>
4+
<th>Resource</th>
5+
<th>Usage</th>
6+
</tr>
7+
</thead>
28
<tbody>
3-
<tr class="heading_row">
4-
<td class="border_none">Resource</td>
5-
<td>Usage</td>
6-
</tr>
79
<tr>
8-
<td class="fieldarea"><?=Language::_('NamecraneMail.resource_usage.diskspace', true)?></td>
9-
<td align="left"><?=($info['diskusage'] / 1024);?> GB / <strong><?=($info['disklimit'] / 1024)?> GB</strong></td></tr>
10+
<td><?=Language::_('NamecraneMail.resource_usage.diskspace', true)?></td>
11+
<td><?=($info['diskusage'] / 1024);?> GB / <?=($info['disklimit'] / 1024)?> GB</td></tr>
1012
<tr>
11-
<td class="fieldarea"><?=Language::_('NamecraneMail.resource_usage.email_users', true)?></td>
12-
<td align="left"><?=$info['usercount']?> / <strong><?=($info['userlimit'] ? $info['userlimit'] : '&infin;')?></strong></td>
13+
<td><?=Language::_('NamecraneMail.resource_usage.email_users', true)?></td>
14+
<td><?=$info['usercount']?> / <?=($info['userlimit'] ? $info['userlimit'] : '&infin;')?></td>
1315
</tr>
1416
<tr>
15-
<td class="fieldarea"><?=Language::_('NamecraneMail.resource_usage.email_aliases', true)?></td>
16-
<td align="left"><?=$info['useraliascount']?> / <strong><?=($info['useraliaslimit'] ? $info['useraliaslimit'] : '&infin;')?></strong></td>
17+
<td><?=Language::_('NamecraneMail.resource_usage.email_aliases', true)?></td>
18+
<td><?=$info['useraliascount']?> / <?=($info['useraliaslimit'] ? $info['useraliaslimit'] : '&infin;')?></td>
1719
</tr>
1820
<tr>
19-
<td class="fieldarea"><?=Language::_('NamecraneMail.resource_usage.domain_aliases', true)?></td>
20-
<td align="left"><?=$info['domainaliascount']?> / <strong><?=($info['domainaliaslimit'] ? $info['domainaliaslimit'] : '&infin;')?></strong></td>
21+
<td><?=Language::_('NamecraneMail.resource_usage.domain_aliases', true)?></td>
22+
<td><?=$info['domainaliascount']?> / <?=($info['domainaliaslimit'] ? $info['domainaliaslimit'] : '&infin;')?></td>
2123
</tr>
2224
<tr>
23-
<td class="fieldarea"><?=Language::_('NamecraneMail.resource_usage.filestorage', true)?></td>
24-
<td align="left"><strong><?=($info['filestorage'] ? 'Enabled' : 'Disabled')?></strong></td>
25+
<td><?=Language::_('NamecraneMail.resource_usage.filestorage', true)?></td>
26+
<td><strong><?=($info['filestorage'] ? 'Enabled' : 'Disabled')?></strong></td>
2527
</tr>
2628
<tr>
27-
<td class="fieldarea"><?=Language::_('NamecraneMail.resource_usage.office', true)?></td>
28-
<td align="left"><strong><?=($info['office'] ? 'Enabled' : 'Disabled')?></strong></td>
29+
<td><?=Language::_('NamecraneMail.resource_usage.office', true)?></td>
30+
<td><strong><?=($info['office'] ? 'Enabled' : 'Disabled')?></strong></td>
2931
</tr>
3032
<tr>
31-
<td class="fieldarea"><?=Language::_('NamecraneMail.resource_usage.spamexperts.status', true)?></td>
32-
<td align="left"><strong><?=($info['spamexperts'] ? 'Enabled' : 'Disabled')?></strong></td>
33+
<td><?=Language::_('NamecraneMail.resource_usage.spamexperts.status', true)?></td>
34+
<td><strong><?=($info['spamexperts'] ? 'Enabled' : 'Disabled')?></strong></td>
3335
</tr>
3436
<tr>
35-
<td class="fieldarea"><?=Language::_('NamecraneMail.resource_usage.email_archives.status', true)?></td>
36-
<td align="left"><strong><?=($info['archive_years'] ? 'Enabled' : 'Disabled')?></strong></td>
37+
<td><?=Language::_('NamecraneMail.resource_usage.email_archives.status', true)?></td>
38+
<td><?=($info['archive_years'] ? 'Enabled' : 'Disabled')?></td>
3739
</tr>
3840
<tr>
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>
41+
<td><?=Language::_('NamecraneMail.resource_usage.email_archives.direction', true)?></td>
42+
<td><?=($info['archive_years'] ? Language::_('NamecraneMail.resource_usage.email_archives.direction.' . $info['archive_direction'], true) : 'N/A')?></td>
4143
</tr>
4244
<tr>
43-
<td class="fieldarea"><?=Language::_('NamecraneMail.resource_usage.last_updated', true)?></td>
44-
<td align="left"><strong><?=$info['lastupdated']?></strong></td>
45+
<td><?=Language::_('NamecraneMail.resource_usage.last_updated', true)?></td>
46+
<td><?=$info['lastupdated']?></td>
4547
</tr>
4648
</tbody>
4749
</table>

0 commit comments

Comments
 (0)