msb/vpanel-stack
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: msb:2637feee5f25f147a0c0f7e470c824a5b8b8545b
Branches Tags
msb:master
..
compare: msb:9395109d333a4134e5e81ac4e800f9046966ad78
Branches Tags
msb:master

No commits in common. "2637feee5f25f147a0c0f7e470c824a5b8b8545b" and "9395109d333a4134e5e81ac4e800f9046966ad78" have entirely different histories.
2637feee5f ... 9395109d33

2 changed files with 4 additions and 6 deletions
Show Stats Expand all files Collapse all files

4
panel/index.php
View File

@ -23,9 +23,7 @@ $f3->set('NAV.hostname', trim(`/bin/hostname -f`));
/* configurations based on hostname */ /* configurations based on hostname */
if ($f3->get('HOST') == $f3->get('NAV.hostname')) { if ($f3->get('HOST') == $f3->get('NAV.hostname')) {
$mapping = 'vpanel'; $mapping = 'vpanel';
if ($f3->exists('SESSION.domain')) { $f3->clear('SESSION.domain');
$f3->clear('SESSION.domain');
}
} elseif (preg_match('/^mail\./i', $f3->get('HOST'))) { } elseif (preg_match('/^mail\./i', $f3->get('HOST'))) {
$mapping = 'vmail'; $mapping = 'vmail';
$domain = preg_replace('/^mail\./i', '', $f3->get('HOST')); $domain = preg_replace('/^mail\./i', '', $f3->get('HOST'));

6
panel/ui/vmail/domains-domain.html
View File

@ -165,7 +165,7 @@
<tr><th colspan="2">Incoming Server Settings</th></tr> <tr><th colspan="2">Incoming Server Settings</th></tr>
<tr><td style="text-align: right;">Protocol:</td><td>IMAP</td></tr> <tr><td style="text-align: right;">Protocol:</td><td>IMAP</td></tr>
<tr><td style="text-align: right;">Hostname:</td><td>mail.{{ @domain_array.domain }}</td></tr> <tr><td style="text-align: right;">Hostname:</td><td>mail.{{ @domain_array.domain }}</td></tr>
<tr><td style="text-align: right;">Port:</td><td>143</td></tr> <tr><td style="text-align: right;">Port</td><td>143</td></tr>
<tr><td style="text-align: right;">Connection Security:</td><td>STARTTLS</td></tr> <tr><td style="text-align: right;">Connection Security:</td><td>STARTTLS</td></tr>
<tr><td style="text-align: right;">Authentication Method:</td><td>Normal password</td></tr> <tr><td style="text-align: right;">Authentication Method:</td><td>Normal password</td></tr>
<tr><td style="text-align: right;">Username:</td><td>(full email address)</td></tr> <tr><td style="text-align: right;">Username:</td><td>(full email address)</td></tr>
@ -178,7 +178,7 @@
<tr><th colspan="2">Outgoing Server Settings</th></tr> <tr><th colspan="2">Outgoing Server Settings</th></tr>
<tr><td style="text-align: right;">Protocol:</td><td>SMTP</td></tr> <tr><td style="text-align: right;">Protocol:</td><td>SMTP</td></tr>
<tr><td style="text-align: right;">Hostname:</td><td>mail.{{ @domain_array.domain }}</td></tr> <tr><td style="text-align: right;">Hostname:</td><td>mail.{{ @domain_array.domain }}</td></tr>
<tr><td style="text-align: right;">Port:</td><td>587</td></tr> <tr><td style="text-align: right;">Port</td><td>587</td></tr>
<tr><td style="text-align: right;">Connection Security:</td><td>STARTTLS</td></tr> <tr><td style="text-align: right;">Connection Security:</td><td>STARTTLS</td></tr>
<tr><td style="text-align: right;">Authentication Method:</td><td>Normal password</td></tr> <tr><td style="text-align: right;">Authentication Method:</td><td>Normal password</td></tr>
<tr><td style="text-align: right;">Username:</td><td>(full email address)</td></tr> <tr><td style="text-align: right;">Username:</td><td>(full email address)</td></tr>
@ -191,7 +191,7 @@
<tr><th colspan="2">Alternative Incoming Server Settings</th></tr> <tr><th colspan="2">Alternative Incoming Server Settings</th></tr>
<tr><td style="text-align: right;">Protocol:</td><td>POP3</td></tr> <tr><td style="text-align: right;">Protocol:</td><td>POP3</td></tr>
<tr><td style="text-align: right;">Hostname:</td><td>mail.{{ @domain_array.domain }}</td></tr> <tr><td style="text-align: right;">Hostname:</td><td>mail.{{ @domain_array.domain }}</td></tr>
<tr><td style="text-align: right;">Port:</td><td>110</td></tr> <tr><td style="text-align: right;">Port</td><td>110</td></tr>
<tr><td style="text-align: right;">Connection Security:</td><td>STARTTLS</td></tr> <tr><td style="text-align: right;">Connection Security:</td><td>STARTTLS</td></tr>
<tr><td style="text-align: right;">Authentication Method:</td><td>Normal password</td></tr> <tr><td style="text-align: right;">Authentication Method:</td><td>Normal password</td></tr>
<tr><td style="text-align: right;">Username:</td><td>(full email address)</td></tr> <tr><td style="text-align: right;">Username:</td><td>(full email address)</td></tr>