paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/mailcow/mailcow-dockerized into dev

master
andryyy 2017-06-12 10:46:08 +02:00
parent ef62f6b383 54cbf89569
commit 5aa2ded331
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/conf/rspamd/dynmaps/vars.inc.php
View File

@ -1 +0,0 @@
../../../web/inc/vars.inc.php

3
data/conf/rspamd/dynmaps/vars.inc.php 100644
View File

@ -0,0 +1,3 @@
<?php
require_once('../../../web/inc/vars.inc.php');
?>

2
data/web/inc/header.inc.php
View File

@ -99,7 +99,7 @@
<?php
foreach ($MAILCOW_APPS as $app):
?>
<li><a href="<?= $app['link']; ?>"><?= $app['name']; ?></a></li>
<li title="<?= htmlspecialchars($app['description']); ?>"><a href="<?= htmlspecialchars($app['link']); ?>"><?= htmlspecialchars($app['name']); ?></a></li>
<?php
endforeach;
?>

6
data/web/inc/vars.inc.php
View File

@ -42,11 +42,13 @@ $PASSWD_REGEP = '.{4,}';
$MAILCOW_APPS = array(
array(
'name' => 'SOGo',
'link' => '/SOGo/'
'link' => '/SOGo/',
'description' => 'SOGo is a web-based client for email, address book and calendar.'
),
// array(
// 'name' => 'Roundcube',
// 'link' => '/rc/'
// 'link' => '/rc/',
// 'description' => 'Roundcube is a web-based email client.',
// ),
);

2
data/web/index.php
View File

@ -69,7 +69,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
<?php
foreach ($MAILCOW_APPS as $app):
?>
<a href="<?= $app['link']; ?>" role="button" class="btn btn-lg btn-default"><?= $app['name']; ?></a>&nbsp;
<a href="<?= htmlspecialchars($app['link']); ?>" role="button" title="<?= htmlspecialchars($app['description']); ?>" class="btn btn-lg btn-default"><?= htmlspecialchars($app['name']); ?></a>&nbsp;
<?php
endforeach;
?>

2
data/web/lang/lang.en.php
View File

@ -175,7 +175,7 @@ $lang['user']['eas_reset'] = 'Reset ActiveSync device cache';
$lang['user']['eas_reset_now'] = 'Reset now';
$lang['user']['eas_reset_help'] = 'In many cases a device cache reset will help to recover a broken ActiveSync profile.<br><b>Attention:</b> All elements will be redownloaded!';
$lang['user']['encryption'] = 'Encyrption';
$lang['user']['encryption'] = 'Encryption';
$lang['user']['username'] = 'Username';
$lang['user']['password'] = 'Password';
$lang['user']['last_run'] = 'Last run';