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

Compare commits

base: msb:2b0c90661572c3b0601b84392e87d89113041587
Branches Tags
msb:master
..
compare: msb:9259d6cd6be90481a2e91fc91202f2ac6b1df0f9
Branches Tags
msb:master

No commits in common. "2b0c90661572c3b0601b84392e87d89113041587" and "9259d6cd6be90481a2e91fc91202f2ac6b1df0f9" have entirely different histories.
2b0c906615 ... 9259d6cd6b

7 changed files with 12 additions and 18 deletions
Show Stats Expand all files Collapse all files

12
etc/apache2/conf-available/vpanel.conf
View File

@ -27,6 +27,11 @@ Alias /panel /srv/www/html/panel
# all hidden files and dirs (anything beginning with a .) # all hidden files and dirs (anything beginning with a .)
RewriteRule ^(classes|config|f3|tmp)\/|^\.|^/\. - [R=404] RewriteRule ^(classes|config|f3|tmp)\/|^\.|^/\. - [R=404]
# deny direct access to html (template) files
<FilesMatch "\.(htm|html)$">
Deny from all
</FilesMatch>
# Route requests to the framework # Route requests to the framework
RewriteCond %{REQUEST_FILENAME} !-l RewriteCond %{REQUEST_FILENAME} !-l
RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-f
@ -35,10 +40,3 @@ Alias /panel /srv/www/html/panel
RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L] RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
</Directory> </Directory>
# deny direct access to html (template) files
<Directory /srv/www/html/panel/ui>
<FilesMatch "\.(htm|html)$">
Deny from all
</FilesMatch>
</Directory>

2
panel/classes/Panel/Login.php
View File

@ -47,7 +47,7 @@ class Login extends \Panel {
$username = "$username@$domain"; $username = "$username@$domain";
} }
$emaildomain = $f3->get('HOST'); $emaildomain = $f3->get('HOST');
$auth = new \Auth('smtp', ['host' => $emaildomain, 'port' => 587, 'scheme' => 'tls']); $auth = new \Auth('smtp', ['host' => $emaildomain, 'port' => 25, 'scheme' => null]);
if ($auth->login($username, $password)) { if ($auth->login($username, $password)) {
/* user passed smtp auth, check for admin access */ /* user passed smtp auth, check for admin access */
if ($email_array = $f3->call('\Panel::vGet', array("vmail-mboxes-get.sh -e $username -c", FALSE))) { if ($email_array = $f3->call('\Panel::vGet', array("vmail-mboxes-get.sh -e $username -c", FALSE))) {

4
panel/classes/Panel/Vmail/AutorespondersAdd.php
View File

@ -22,10 +22,6 @@ class AutorespondersAdd extends \Panel\Vmail {
static function get($f3) { static function get($f3) {
/* initialize autoresponder_array */
$autoresponder_array = array('subject' => '', 'body' => '', 'mode' => 'Vacation', 'status' => '1');
$f3->set('autoresponder_array', $autoresponder_array);
echo \Template::instance()->render('vmail/autoresponders-add.html'); echo \Template::instance()->render('vmail/autoresponders-add.html');
} }

2
panel/classes/Panel/Vmail/AutorespondersEdit.php
View File

@ -34,7 +34,7 @@ class AutorespondersEdit extends \Panel\Vmail {
$body = substr_replace($body, "", -1); $body = substr_replace($body, "", -1);
$autoresponder_array[0]['body'] = $body; $autoresponder_array[0]['body'] = $body;
$autoresponders_array[0] = $autoresponder_array; $autoresponders_array[$k] = $autoresponder_array;
$f3->set('autoresponder_array', $autoresponder_array[0]); $f3->set('autoresponder_array', $autoresponder_array[0]);

3
panel/classes/Panel/Vmail/ForwardsAdd.php
View File

@ -22,9 +22,6 @@ class ForwardsAdd extends \Panel\Vmail {
static function get($f3) { static function get($f3) {
/* initialize forward_array */
$forward_array = array('forward' => '', 'save_local' => '0');
$f3->set('forward_array', $forward_array);
echo \Template::instance()->render('vmail/forwards-add.html'); echo \Template::instance()->render('vmail/forwards-add.html');
} }

3
panel/ui/vmail/autoresponders-autoresponder.html
View File

@ -3,6 +3,9 @@
<check if="isset(@autoresponders_array)"> <check if="isset(@autoresponders_array)">
<table> <table>
<!-- <tr>
<th colspan="2">Autoresponder for {{ @mbox }}@{{ @domain }} </th>
</tr>-->
<tr> <tr>
<td align="right"><b>Subject:</b></td> <td align="right"><b>Subject:</b></td>

4
panel/ui/vmail/mboxes-edit.html
View File

@ -6,10 +6,10 @@
<legend>Edit Email Account {{ @PARAMS.mbox }}@{{ @PARAMS.domain }} (All fields are required)</legend> <legend>Edit Email Account {{ @PARAMS.mbox }}@{{ @PARAMS.domain }} (All fields are required)</legend>
<label for="password">Password <small>(leave empty to keep same password)</small></label> <label for="password">Password <small>(leave empty to keep same password)</small></label>
<input id="password" name="password" type="password" value=""> <input id="password" name="password" type="password" value="{{ @mbox.password }}">
<label for="password_confirm">Confirm Password <small>(repeat same password, only if making a change)</small></label> <label for="password_confirm">Confirm Password <small>(repeat same password, only if making a change)</small></label>
<input id="password_confirm" name="password_confirm" type="password" value=""> <input id="password_confirm" name="password_confirm" type="password" value="{{ @mbox.password_confirm }}">
<label for="status">Status</label> <label for="status">Status</label>
<select id="status" name="status"> <select id="status" name="status">