diff --git a/Changelog b/Changelog
index ee607917d97e4d0665d661acc95beeeb9103ac84..354402bfb284bec42f5aa4db2f02631cd66cc73e 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,12 @@
FusionDirectory changelog
=========================
+* FusionDirectory 1.0.19
+
+[Fix] Bugs #5303: When clicking on login from user selection we end up in user edition
+[Fix] Bugs #5314: after upgrading to 1.0.18 we see those errors
+[Fix] Bugs #5317: The link sent by password recovery is broken
+
* FusionDirectory 1.0.18
[Fix] Bugs #4888: DNS record matching should be case insensitive
diff --git a/contrib/docs/UPGRADE b/contrib/docs/UPGRADE
index 9f0803397528b85f48ade193a8ee6b3bfd987598..498267ef9791ba8bb8966a21b67eaa8e14a088d3 100644
--- a/contrib/docs/UPGRADE
+++ b/contrib/docs/UPGRADE
@@ -2500,6 +2500,41 @@ Checking your indexed attributes
Check that all you index still match with valid attributes present in your ldap directory
+Migrate FusionDirectory from 1.0.18 to 1.0.19
+=============================================
+
+Ubuntu 12.0.4 TLS users
+=======================
+
+Since 1.0.9.2 FusionDirectory need the php-cas library for CAS server support. This library can normally found in universe in the Ubuntu repositories
+
+In case you did not find it, grab the deb from here and install it
+
+http://packages.ubuntu.com/trusty/all/php-cas/download
+
+and select your preferred mirror
+
+Upgrade FusionDirectory first
+=============================
+
+- Upgrade FusionDirectory core package before other ones to avoid dependencies errors:
+
+apt-get install fusiondirectory
+
+- Upgrade FusionDirectory schema package too.
+
+apt-get install fusiondirectory-schema
+
+Upgrade of LDAP directory
+=========================
+
+No upgrade
+
+Upgrade of LDAP directory
+=========================
+
+No Upgrade
+
Enjoy :)
---
diff --git a/contrib/man/fusiondirectory-insert-schema.1 b/contrib/man/fusiondirectory-insert-schema.1
index 1eb3669f8f96226e2f09a93412784b2b9a63ede6..89600d8e6ce9a48458c6bf6f53cde565aca6aae5 100644
--- a/contrib/man/fusiondirectory-insert-schema.1
+++ b/contrib/man/fusiondirectory-insert-schema.1
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "FUSIONDIRECTORY-INSERT-SCHEMA 1"
-.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2017-01-13" "FusionDirectory 1.0.18" "FusionDirectory Documentation"
+.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2017-01-19" "FusionDirectory 1.0.19" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/contrib/man/fusiondirectory-setup.1 b/contrib/man/fusiondirectory-setup.1
index 4bb2d65cef15ede37843b9ac2e65d85a2ec8f4ac..670244dea49b8d08d64a1ddeb88bb0f946f09d53 100644
--- a/contrib/man/fusiondirectory-setup.1
+++ b/contrib/man/fusiondirectory-setup.1
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "FUSIONDIRECTORY-SETUP 1"
-.TH FUSIONDIRECTORY-SETUP 1 "2017-01-14" "FusionDirectory 1.0.18" "FusionDirectory Documentation"
+.TH FUSIONDIRECTORY-SETUP 1 "2017-01-19" "FusionDirectory 1.0.19" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/contrib/man/fusiondirectory.conf.5 b/contrib/man/fusiondirectory.conf.5
index a957d46a67e1d579d2fde0f0375961b79f41582b..dbf11f82be594694227012fc9d028eb77a529e88 100644
--- a/contrib/man/fusiondirectory.conf.5
+++ b/contrib/man/fusiondirectory.conf.5
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "FUSIONDIRECTORY.CONF 1"
-.TH FUSIONDIRECTORY.CONF 1 "2016-11-02" "FusionDirectory 1.0.18" "FusionDirectory Documentation"
+.TH FUSIONDIRECTORY.CONF 1 "2016-11-02" "FusionDirectory 1.0.19" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/html/class_passwordRecovery.inc b/html/class_passwordRecovery.inc
index 664562e792d9530de247a787dbba207629a81baa..5886aa8444d8a0eeaae9a85286e3d27291826044 100644
--- a/html/class_passwordRecovery.inc
+++ b/html/class_passwordRecovery.inc
@@ -554,7 +554,7 @@ class passwordRecovery extends standAlonePage {
}
$reinit_link = $this->getPageURL();
- $reinit_link .= "?uniq=".urlencode($activatecode);
+ $reinit_link .= "?uniq=".urlencode($token);
$reinit_link .= "&uid=".urlencode($this->uid);
$reinit_link .= "&email_address=".urlencode($this->email_address);
diff --git a/html/include/pulldown.js b/html/include/pulldown.js
index 4f8c49be29a83be68d20444bbdd7146b6f99754d..fc5637791167ed3e9d1910ca05bb7e26005dd338 100644
--- a/html/include/pulldown.js
+++ b/html/include/pulldown.js
@@ -25,6 +25,9 @@
* for an example see Menu.prototype.config
*/
var Menu = Class.create();
+var MenuContainer = Class.create();
+var MenuItem = Class.create();
+
Menu.prototype = {
initialize: function(idOrElement, name, customConfigFunction) {
@@ -50,7 +53,6 @@ Menu.prototype = {
}
-var MenuContainer = Class.create();
MenuContainer.prototype = {
initialize: function(idOrElement, parent) {
this.type = "menuContainer";
@@ -112,7 +114,7 @@ MenuContainer.prototype = {
}
},
- getBorders: function(element) {
+ getBorders: function() {
var ltrb = ["Left","Top","Right","Bottom"];
var result = {};
var value;
@@ -175,9 +177,6 @@ MenuContainer.prototype = {
}
-
-var MenuItem = Class.create();
-
Object.extend(Object.extend(MenuItem.prototype, MenuContainer.prototype), {
initialize: function(idOrElement, parent) {
var menuItem = this;
@@ -231,10 +230,8 @@ Object.extend(Object.extend(MenuItem.prototype, MenuContainer.prototype), {
}
});
-
var menu;
-
function configMenu() {
this.closeDelayTime = 300;
}
@@ -243,5 +240,4 @@ function initMenu() {
menu = new Menu('root', 'menu', configMenu);
}
-
Event.observe(window, 'load', initMenu, false);
diff --git a/html/themes/legacy/icons/16/actions/document-save.png b/html/themes/legacy/icons/16/actions/document-save.png
deleted file mode 120000
index 37b0485e473b554d318aa54f72b13a558e4e2046..0000000000000000000000000000000000000000
--- a/html/themes/legacy/icons/16/actions/document-save.png
+++ /dev/null
@@ -1 +0,0 @@
-save.png
\ No newline at end of file
diff --git a/include/variables_common.inc b/include/variables_common.inc
index 2e1b035abdc99ce2ce0a7d3b0f31771290f77178..5901ed06cf2a732b877cd5c04a3b9c2dc224d810 100644
--- a/include/variables_common.inc
+++ b/include/variables_common.inc
@@ -63,7 +63,7 @@ define("FPDF_FONTPATH", "/usr/share/php/fpdf/font/"); /*! Define fpdf font path
/*!
* \brief FusionDirectory Version
*/
-define ("FD_VERSION", "1.0.18"); /*! Define FusionDirectory version */
+define ("FD_VERSION", "1.0.19"); /*! Define FusionDirectory version */
/*!
* \brief FusionDirectory config object RDN