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

data/conf/rspamd/dynmaps/vars.inc.php

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

data/conf/rspamd/dynmaps/vars.inc.php

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

data/web/inc/header.inc.php

@@ -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;
           ?>

data/web/inc/vars.inc.php

@@ -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.',
   // ),
 );
 
@@ -60,4 +62,4 @@ $LOG_PAGINATION_SIZE = 30;
 $SESSION_LIFETIME = 3600;
 
 // Label for OTP devices
-$OTP_LABEL = "mailcow UI";
+$OTP_LABEL = "mailcow UI";

data/web/index.php

@@ -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;
           ?>

data/web/lang/lang.en.php

@@ -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';