From 062abb0ca763894a973d6c9e458fa6474b73ecf2 Mon Sep 17 00:00:00 2001
From: Michael Kuron <m.kuron@gmx.de>
Date: Sun, 4 Jun 2017 13:31:35 +0200
Subject: [PATCH 1/6] Replace symlink to PHP script

---
 data/conf/rspamd/dynmaps/vars.inc.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
 mode change 120000 => 100644 data/conf/rspamd/dynmaps/vars.inc.php

diff --git a/data/conf/rspamd/dynmaps/vars.inc.php b/data/conf/rspamd/dynmaps/vars.inc.php
deleted file mode 120000
index f59ab89b..00000000
--- a/data/conf/rspamd/dynmaps/vars.inc.php
+++ /dev/null
@@ -1 +0,0 @@
-../../../web/inc/vars.inc.php
\ No newline at end of file
diff --git a/data/conf/rspamd/dynmaps/vars.inc.php b/data/conf/rspamd/dynmaps/vars.inc.php
new file mode 100644
index 00000000..d47e9079
--- /dev/null
+++ b/data/conf/rspamd/dynmaps/vars.inc.php
@@ -0,0 +1,3 @@
+<?php
+require_once('../../../web/inc/vars.inc.php');
+?>

From ed448f19c1de6d5b58c5ea4fedfb18927d197679 Mon Sep 17 00:00:00 2001
From: Chris Croome <chris@webarchitects.co.uk>
Date: Thu, 8 Jun 2017 11:41:31 +0100
Subject: [PATCH 2/6] Typo fixed

---
 data/web/lang/lang.en.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/web/lang/lang.en.php b/data/web/lang/lang.en.php
index 41785570..c49a535f 100644
--- a/data/web/lang/lang.en.php
+++ b/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';

From 9754b8c1967d754ee8028359336b7b48bc1d2e06 Mon Sep 17 00:00:00 2001
From: Phoenix Eve Aspacio <aspaciop@gmail.com>
Date: Sun, 11 Jun 2017 07:58:30 +0800
Subject: [PATCH 3/6] Escape HTML special chars

---
 data/web/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/web/index.php b/data/web/index.php
index 2bc6e570..3202fb5b 100644
--- a/data/web/index.php
+++ b/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;
           ?>

From 915ffb19910dd6848c7daa0f1296693c8105a5f7 Mon Sep 17 00:00:00 2001
From: Phoenix Eve Aspacio <aspaciop@gmail.com>
Date: Sun, 11 Jun 2017 08:05:10 +0800
Subject: [PATCH 4/6] Added mailcow app description

---
 data/web/inc/vars.inc.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/data/web/inc/vars.inc.php b/data/web/inc/vars.inc.php
index c986133a..fb8fd478 100644
--- a/data/web/inc/vars.inc.php
+++ b/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 collaborative software (groupware) server.'
   ),
   // array(
     // 'name' => 'Roundcube',
-    // 'link' => '/rc/'
+    // 'link' => '/rc/',
+    // 'description' => 'Roundcube is a web-based IMAP email client.',
   // ),
 );
 
@@ -60,4 +62,4 @@ $LOG_PAGINATION_SIZE = 30;
 $SESSION_LIFETIME = 3600;
 
 // Label for OTP devices
-$OTP_LABEL = "mailcow UI";
\ No newline at end of file
+$OTP_LABEL = "mailcow UI";

From 564fb82257c7f5d4a625e33b2bead93ab481420a Mon Sep 17 00:00:00 2001
From: Phoenix Eve Aspacio <aspaciop@gmail.com>
Date: Sun, 11 Jun 2017 13:43:59 +0800
Subject: [PATCH 5/6] Create header.inc.php

---
 data/web/inc/header.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/web/inc/header.inc.php b/data/web/inc/header.inc.php
index 79078554..533711de 100644
--- a/data/web/inc/header.inc.php
+++ b/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;
           ?>

From 7575b46fbaaa66c4f4136e455597d58a6c81ab75 Mon Sep 17 00:00:00 2001
From: Phoenix Eve Aspacio <aspaciop@gmail.com>
Date: Mon, 12 Jun 2017 15:38:36 +0800
Subject: [PATCH 6/6] Update

---
 data/web/inc/vars.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/web/inc/vars.inc.php b/data/web/inc/vars.inc.php
index fb8fd478..f2d09c5c 100644
--- a/data/web/inc/vars.inc.php
+++ b/data/web/inc/vars.inc.php
@@ -43,12 +43,12 @@ $MAILCOW_APPS = array(
   array(
     'name' => 'SOGo',
     'link' => '/SOGo/',
-    'description' => 'SOGo is a collaborative software (groupware) server.'
+    'description' => 'SOGo is a web-based client for email, address book and calendar.'
   ),
   // array(
     // 'name' => 'Roundcube',
     // 'link' => '/rc/',
-    // 'description' => 'Roundcube is a web-based IMAP email client.',
+    // 'description' => 'Roundcube is a web-based email client.',
   // ),
 );