From c65c0d5d32744dd611f3fbf9a47c44e613e4bbf6 Mon Sep 17 00:00:00 2001
From: smartin77 <svec@vadium.sk>
Date: Fri, 29 Jan 2021 20:34:30 +0100
Subject: [PATCH 01/22] New user - Remove accents/diacritics from Username and
 Email while typing

---
 www/includes/web_functions.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/includes/web_functions.inc.php b/www/includes/web_functions.inc.php
index f0ac314..3f47ed5 100644
--- a/www/includes/web_functions.inc.php
+++ b/www/includes/web_functions.inc.php
@@ -423,9 +423,9 @@ function update_username() {
 
   var actual_username = template;
 
-  actual_username = actual_username.replace('{first_name}', first_name.toLowerCase() );
+  actual_username = actual_username.replace('{first_name}', first_name.toLowerCase().normalize('NFD').replace(/[\u0300-\u036f]/g, '') );
   actual_username = actual_username.replace('{first_name_initial}', first_name.charAt(0).toLowerCase() );
-  actual_username = actual_username.replace('{last_name}', last_name.toLowerCase() );
+  actual_username = actual_username.replace('{last_name}', last_name.toLowerCase().normalize('NFD').replace(/[\u0300-\u036f]/g, '') );
   actual_username = actual_username.replace('{last_name_initial}', last_name.charAt(0).toLowerCase() );
 
   check_entity_name_validity(actual_username,'$username_div_id');

From 3e20e828404662a999485de3eab7d7256ed3f64f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0vec?= <martin.svec@slovenskoit.sk>
Date: Tue, 2 Feb 2021 19:10:05 +0100
Subject: [PATCH 02/22] .gitignore added

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..40b32c7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.idea
+ldap-user-manager.iml

From 837554a5ea731f83da02a300b743db91911bdda4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0vec?= <martin.svec@slovenskoit.sk>
Date: Wed, 3 Feb 2021 21:23:44 +0100
Subject: [PATCH 03/22] custom logo firts commit

---
 www/includes/web_functions.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/includes/web_functions.inc.php b/www/includes/web_functions.inc.php
index 3f47ed5..71e2ac4 100644
--- a/www/includes/web_functions.inc.php
+++ b/www/includes/web_functions.inc.php
@@ -250,7 +250,7 @@ function render_menu() {
   <nav class="navbar navbar-default">
    <div class="container-fluid">
    <div class="navbar-header">
-     <a class="navbar-brand" href="#"><?php print $SITE_NAME ?></a>
+     <a class="navbar-brand" href="#"><img src="/opt/ldap_user_manager/gfx/SlovenskoIT_logo.svg" width="30" height="30" class="d-inline-block align-top" alt=""><?php print $SITE_NAME ?></a>
    </div>
      <ul class="nav navbar-nav">
      <?php

From eb5788fd648dd4c826408c7545a0761db9b26854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0vec?= <martin.svec@slovenskoit.sk>
Date: Wed, 3 Feb 2021 21:34:43 +0100
Subject: [PATCH 04/22] relative path to image

---
 www/includes/web_functions.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/includes/web_functions.inc.php b/www/includes/web_functions.inc.php
index 71e2ac4..046237f 100644
--- a/www/includes/web_functions.inc.php
+++ b/www/includes/web_functions.inc.php
@@ -250,7 +250,7 @@ function render_menu() {
   <nav class="navbar navbar-default">
    <div class="container-fluid">
    <div class="navbar-header">
-     <a class="navbar-brand" href="#"><img src="/opt/ldap_user_manager/gfx/SlovenskoIT_logo.svg" width="30" height="30" class="d-inline-block align-top" alt=""><?php print $SITE_NAME ?></a>
+     <a class="navbar-brand" href="#"><img src="./gfx/SlovenskoIT_logo.svg" width="30" height="30" class="d-inline-block align-top" alt=""><?php print $SITE_NAME ?></a>
    </div>
      <ul class="nav navbar-nav">
      <?php

From 1f816a479f21710a4beba4833a1a118bb6ed161c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0vec?= <martin.svec@slovenskoit.sk>
Date: Wed, 3 Feb 2021 21:40:15 +0100
Subject: [PATCH 05/22] relative path adjusted

---
 www/includes/web_functions.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/includes/web_functions.inc.php b/www/includes/web_functions.inc.php
index 046237f..492867a 100644
--- a/www/includes/web_functions.inc.php
+++ b/www/includes/web_functions.inc.php
@@ -250,7 +250,7 @@ function render_menu() {
   <nav class="navbar navbar-default">
    <div class="container-fluid">
    <div class="navbar-header">
-     <a class="navbar-brand" href="#"><img src="./gfx/SlovenskoIT_logo.svg" width="30" height="30" class="d-inline-block align-top" alt=""><?php print $SITE_NAME ?></a>
+     <a class="navbar-brand" href="#"><img src="../gfx/SlovenskoIT_logo.svg" width="30" height="30" class="d-inline-block align-top" alt=""><?php print $SITE_NAME ?></a>
    </div>
      <ul class="nav navbar-nav">
      <?php

From 62792e4136dabe357fab8f09defb13388f023bf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0vec?= <martin.svec@slovenskoit.sk>
Date: Wed, 3 Feb 2021 21:47:58 +0100
Subject: [PATCH 06/22] bootstrap update to v.4.3.1

---
 www/includes/web_functions.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/includes/web_functions.inc.php b/www/includes/web_functions.inc.php
index 492867a..3ac4ed1 100644
--- a/www/includes/web_functions.inc.php
+++ b/www/includes/web_functions.inc.php
@@ -221,9 +221,9 @@ function render_header($title="",$menu=TRUE) {
  <TITLE><?php print "$title"; ?></TITLE>
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1">
- <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
- <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+ <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
 </HEAD>
 <BODY>
 <?php

From e8f472248782319e4bb746b3cb4bd7b8849b557f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0vec?= <martin.svec@slovenskoit.sk>
Date: Wed, 3 Feb 2021 21:49:40 +0100
Subject: [PATCH 07/22] Revert "bootstrap update to v.4.3.1"

This reverts commit 62792e4136dabe357fab8f09defb13388f023bf6.
---
 www/includes/web_functions.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/includes/web_functions.inc.php b/www/includes/web_functions.inc.php
index 3ac4ed1..492867a 100644
--- a/www/includes/web_functions.inc.php
+++ b/www/includes/web_functions.inc.php
@@ -221,9 +221,9 @@ function render_header($title="",$menu=TRUE) {
  <TITLE><?php print "$title"; ?></TITLE>
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1">
- <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
+ <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
- <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 </HEAD>
 <BODY>
 <?php

From 5323185db603a903e4a6953bf70cc09c2082567e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0vec?= <martin.svec@slovenskoit.sk>
Date: Wed, 3 Feb 2021 22:14:00 +0100
Subject: [PATCH 08/22] modified header inline blocks

---
 www/includes/web_functions.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/includes/web_functions.inc.php b/www/includes/web_functions.inc.php
index 492867a..44d06f2 100644
--- a/www/includes/web_functions.inc.php
+++ b/www/includes/web_functions.inc.php
@@ -250,7 +250,8 @@ function render_menu() {
   <nav class="navbar navbar-default">
    <div class="container-fluid">
    <div class="navbar-header">
-     <a class="navbar-brand" href="#"><img src="../gfx/SlovenskoIT_logo.svg" width="30" height="30" class="d-inline-block align-top" alt=""><?php print $SITE_NAME ?></a>
+     <span class="navbar-brand"><img src="../gfx/SlovenskoIT_logo.svg" width="30" height="30" alt="logo">
+     <a class="navbar-brand" href="#"><?php print $SITE_NAME ?></a>
    </div>
      <ul class="nav navbar-nav">
      <?php

From 41e5c26782dd896b4af1d392e11851007531f7bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0vec?= <martin.svec@slovenskoit.sk>
Date: Wed, 3 Feb 2021 22:20:22 +0100
Subject: [PATCH 09/22] span fix

---
 www/includes/web_functions.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/includes/web_functions.inc.php b/www/includes/web_functions.inc.php
index 44d06f2..f9a1b74 100644
--- a/www/includes/web_functions.inc.php
+++ b/www/includes/web_functions.inc.php
@@ -250,7 +250,7 @@ function render_menu() {
   <nav class="navbar navbar-default">
    <div class="container-fluid">
    <div class="navbar-header">
-     <span class="navbar-brand"><img src="../gfx/SlovenskoIT_logo.svg" width="30" height="30" alt="logo">
+     <span class="navbar-brand"><img src="../gfx/SlovenskoIT_logo.svg" width="30" height="30" alt="logo"></span>
      <a class="navbar-brand" href="#"><?php print $SITE_NAME ?></a>
    </div>
      <ul class="nav navbar-nav">

From 4ace3b6bf1126117c5b85e6abfa65a80abb3cf53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0vec?= <martin.svec@slovenskoit.sk>
Date: Wed, 3 Feb 2021 22:57:21 +0100
Subject: [PATCH 10/22] hardcoded logo

---
 www/includes/web_functions.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/includes/web_functions.inc.php b/www/includes/web_functions.inc.php
index f9a1b74..4f79bf4 100644
--- a/www/includes/web_functions.inc.php
+++ b/www/includes/web_functions.inc.php
@@ -250,7 +250,7 @@ function render_menu() {
   <nav class="navbar navbar-default">
    <div class="container-fluid">
    <div class="navbar-header">
-     <span class="navbar-brand"><img src="../gfx/SlovenskoIT_logo.svg" width="30" height="30" alt="logo"></span>
+     <span class="navbar-brand"><img src="../gfx/SlovenskoIT_logo.svg" width="30" height="30" style="margin-top: -5px" alt="logo"></span>
      <a class="navbar-brand" href="#"><?php print $SITE_NAME ?></a>
    </div>
      <ul class="nav navbar-nav">

From 199567aedd493a492c2790855bc9780d3ffb0e6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0vec?= <martin.svec@slovenskoit.sk>
Date: Wed, 3 Feb 2021 23:01:16 +0100
Subject: [PATCH 11/22] hardcoded logo - style fix

---
 www/includes/web_functions.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/includes/web_functions.inc.php b/www/includes/web_functions.inc.php
index 4f79bf4..7d7238e 100644
--- a/www/includes/web_functions.inc.php
+++ b/www/includes/web_functions.inc.php
@@ -250,7 +250,7 @@ function render_menu() {
   <nav class="navbar navbar-default">
    <div class="container-fluid">
    <div class="navbar-header">
-     <span class="navbar-brand"><img src="../gfx/SlovenskoIT_logo.svg" width="30" height="30" style="margin-top: -5px" alt="logo"></span>
+     <span class="navbar-brand"><img src="../gfx/SlovenskoIT_logo.svg" width="30" height="30" style="margin-top: -8px" alt="logo"></span>
      <a class="navbar-brand" href="#"><?php print $SITE_NAME ?></a>
    </div>
      <ul class="nav navbar-nav">

From b202b26c8da38c3d609d2c6fc02aed864cc9cea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0vec?= <martin.svec@slovenskoit.sk>
Date: Wed, 3 Feb 2021 23:03:10 +0100
Subject: [PATCH 12/22] hardcoded logo - style fix #2

---
 www/includes/web_functions.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/includes/web_functions.inc.php b/www/includes/web_functions.inc.php
index 7d7238e..82b7ccd 100644
--- a/www/includes/web_functions.inc.php
+++ b/www/includes/web_functions.inc.php
@@ -250,7 +250,7 @@ function render_menu() {
   <nav class="navbar navbar-default">
    <div class="container-fluid">
    <div class="navbar-header">
-     <span class="navbar-brand"><img src="../gfx/SlovenskoIT_logo.svg" width="30" height="30" style="margin-top: -8px" alt="logo"></span>
+     <span class="navbar-brand"><img src="../gfx/SlovenskoIT_logo.svg" width="30" height="30" style="margin-top: -7px" alt="logo"></span>
      <a class="navbar-brand" href="#"><?php print $SITE_NAME ?></a>
    </div>
      <ul class="nav navbar-nav">

From 33055b30400cc9431a38f1630017322715d6acf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0vec?= <martin.svec@slovenskoit.sk>
Date: Thu, 4 Feb 2021 11:31:43 +0100
Subject: [PATCH 13/22] IMG element

---
 www/includes/config.inc.php        | 3 +++
 www/includes/web_functions.inc.php | 8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/www/includes/config.inc.php b/www/includes/config.inc.php
index 8a7a8af..4e314c4 100644
--- a/www/includes/config.inc.php
+++ b/www/includes/config.inc.php
@@ -89,6 +89,9 @@
 
  ###
 
+ $CUSTOM_LOGO = (getenv('CUSTOM_LOGO') ? getenv('CUSTOM_LOGO') : FALSE);
+ $CUSTOM_STYLES = (getenv('CUSTOM_STYLES') ? getenv('CUSTOM_STYLES') : FALSE);
+
  $errors = "";
 
  if (empty($LDAP['uri'])) {
diff --git a/www/includes/web_functions.inc.php b/www/includes/web_functions.inc.php
index 82b7ccd..a56cff1 100644
--- a/www/includes/web_functions.inc.php
+++ b/www/includes/web_functions.inc.php
@@ -244,14 +244,16 @@ function render_menu() {
  #Render the navigation menu.
  #The menu is dynamically rendered the $MODULES hash
 
- global $SITE_NAME, $MODULES, $THIS_MODULE_PATH, $VALIDATED, $IS_ADMIN;
+ global $SITE_NAME, $MODULES, $THIS_MODULE_PATH, $VALIDATED, $IS_ADMIN, $CUSTOM_LOGO;
 
  ?>
   <nav class="navbar navbar-default">
    <div class="container-fluid">
    <div class="navbar-header">
-     <span class="navbar-brand"><img src="../gfx/SlovenskoIT_logo.svg" width="30" height="30" style="margin-top: -7px" alt="logo"></span>
-     <a class="navbar-brand" href="#"><?php print $SITE_NAME ?></a>
+     <?php
+      if ($CUSTOM_LOGO) echo '<span class="navbar-brand"><img src="<?=$CUSTOM_LOGO?>" width="30" height="30" style="margin-top: -7px" alt="logo"></span>'
+     ?>
+     <a class="navbar-brand" href="./"><?php print $SITE_NAME ?></a>
    </div>
      <ul class="nav navbar-nav">
      <?php

From b754c697bf494b30e1c890cc771f3cf2482ea5a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0vec?= <martin.svec@slovenskoit.sk>
Date: Thu, 4 Feb 2021 11:42:38 +0100
Subject: [PATCH 14/22] modified IMG

---
 www/includes/web_functions.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/includes/web_functions.inc.php b/www/includes/web_functions.inc.php
index a56cff1..adf3032 100644
--- a/www/includes/web_functions.inc.php
+++ b/www/includes/web_functions.inc.php
@@ -251,7 +251,7 @@ function render_menu() {
    <div class="container-fluid">
    <div class="navbar-header">
      <?php
-      if ($CUSTOM_LOGO) echo '<span class="navbar-brand"><img src="<?=$CUSTOM_LOGO?>" width="30" height="30" style="margin-top: -7px" alt="logo"></span>'
+      if ($CUSTOM_LOGO) echo '<span class="navbar-brand"><img src="<?=$CUSTOM_LOGO?>" class="logo" style="margin-top: -7px; width: 30px; height: 30px" alt="logo"></span>'
      ?>
      <a class="navbar-brand" href="./"><?php print $SITE_NAME ?></a>
    </div>

From aedf47987e30c0d72a68ab75cfd3e0e5704257e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0vec?= <martin.svec@slovenskoit.sk>
Date: Thu, 4 Feb 2021 11:46:51 +0100
Subject: [PATCH 15/22] modified IMG #2

---
 www/includes/web_functions.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/includes/web_functions.inc.php b/www/includes/web_functions.inc.php
index adf3032..0a6a036 100644
--- a/www/includes/web_functions.inc.php
+++ b/www/includes/web_functions.inc.php
@@ -251,7 +251,7 @@ function render_menu() {
    <div class="container-fluid">
    <div class="navbar-header">
      <?php
-      if ($CUSTOM_LOGO) echo '<span class="navbar-brand"><img src="<?=$CUSTOM_LOGO?>" class="logo" style="margin-top: -7px; width: 30px; height: 30px" alt="logo"></span>'
+      if ($CUSTOM_LOGO) echo '<span class="navbar-brand"><img src="'<?$CUSTOM_LOGO?>'" class="logo" style="margin-top: -7px; width: 30px; height: 30px" alt="logo"></span>'
      ?>
      <a class="navbar-brand" href="./"><?php print $SITE_NAME ?></a>
    </div>

From 1f2cd90edf1c87b95ebbddca5711786df09c8812 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0vec?= <martin.svec@slovenskoit.sk>
Date: Thu, 4 Feb 2021 12:01:41 +0100
Subject: [PATCH 16/22] modified IMG #3

---
 www/includes/web_functions.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/includes/web_functions.inc.php b/www/includes/web_functions.inc.php
index 0a6a036..17da332 100644
--- a/www/includes/web_functions.inc.php
+++ b/www/includes/web_functions.inc.php
@@ -251,7 +251,7 @@ function render_menu() {
    <div class="container-fluid">
    <div class="navbar-header">
      <?php
-      if ($CUSTOM_LOGO) echo '<span class="navbar-brand"><img src="'<?$CUSTOM_LOGO?>'" class="logo" style="margin-top: -7px; width: 30px; height: 30px" alt="logo"></span>'
+      if ($CUSTOM_LOGO) echo '<span class="navbar-brand"><img src="'.$CUSTOM_LOGO.'" class="logo" style="margin-top: -7px; width: 30px; height: 30px" alt="logo"></span>'
      ?>
      <a class="navbar-brand" href="./"><?php print $SITE_NAME ?></a>
    </div>

From 42051cfdba63d308870a10b02e00c0875a0fe141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0vec?= <martin.svec@slovenskoit.sk>
Date: Thu, 4 Feb 2021 12:44:12 +0100
Subject: [PATCH 17/22] adding custom styles

---
 www/includes/web_functions.inc.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/www/includes/web_functions.inc.php b/www/includes/web_functions.inc.php
index 17da332..a67471c 100644
--- a/www/includes/web_functions.inc.php
+++ b/www/includes/web_functions.inc.php
@@ -209,7 +209,7 @@ function log_out($method='normal') {
 
 function render_header($title="",$menu=TRUE) {
 
- global $SITE_NAME, $IS_ADMIN, $SENT_HEADERS;
+ global $SITE_NAME, $IS_ADMIN, $SENT_HEADERS, $CUSTOM_STYLES;
 
  if (empty($title)) { $title = $SITE_NAME; }
 
@@ -222,6 +222,7 @@ function render_header($title="",$menu=TRUE) {
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <?php if ($CUSTOM_STYLES) echo '<link rel="stylesheet" href="'.$CUSTOM_STYLES.'">' ?>
  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 </HEAD>
@@ -249,11 +250,9 @@ function render_menu() {
  ?>
   <nav class="navbar navbar-default">
    <div class="container-fluid">
-   <div class="navbar-header">
-     <?php
+   <div class="navbar-header"><?php
       if ($CUSTOM_LOGO) echo '<span class="navbar-brand"><img src="'.$CUSTOM_LOGO.'" class="logo" style="margin-top: -7px; width: 30px; height: 30px" alt="logo"></span>'
-     ?>
-     <a class="navbar-brand" href="./"><?php print $SITE_NAME ?></a>
+     ?><a class="navbar-brand" href="./"><?php print $SITE_NAME ?></a>
    </div>
      <ul class="nav navbar-nav">
      <?php

From e5db62346927fc94bdc5640046a2a981e4e46d8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0vec?= <martin.svec@slovenskoit.sk>
Date: Thu, 4 Feb 2021 12:54:28 +0100
Subject: [PATCH 18/22] custom styles used

---
 www/includes/web_functions.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/includes/web_functions.inc.php b/www/includes/web_functions.inc.php
index a67471c..ee74f71 100644
--- a/www/includes/web_functions.inc.php
+++ b/www/includes/web_functions.inc.php
@@ -251,7 +251,7 @@ function render_menu() {
   <nav class="navbar navbar-default">
    <div class="container-fluid">
    <div class="navbar-header"><?php
-      if ($CUSTOM_LOGO) echo '<span class="navbar-brand"><img src="'.$CUSTOM_LOGO.'" class="logo" style="margin-top: -7px; width: 30px; height: 30px" alt="logo"></span>'
+      if ($CUSTOM_LOGO) echo '<span class="navbar-brand"><img src="'.$CUSTOM_LOGO.'" class="logo" alt="logo"></span>'
      ?><a class="navbar-brand" href="./"><?php print $SITE_NAME ?></a>
    </div>
      <ul class="nav navbar-nav">

From 940e81f7125aa9f60549258136391463fb4a1814 Mon Sep 17 00:00:00 2001
From: smartin77 <svec@vadium.sk>
Date: Thu, 4 Feb 2021 13:58:56 +0100
Subject: [PATCH 19/22] Update README.md

Website logo and styles customisation
---
 README.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/README.md b/README.md
index c978208..2adc19f 100644
--- a/README.md
+++ b/README.md
@@ -162,6 +162,24 @@ To send emails you'll need to use an existing SMTP server.  Email sending will b
    
 * `SESSION_TIMEOUT` (default: *10 minutes*):  How long before an idle session will be timed out.
 
+**Website customs**
+
+* `$CUSTOM_LOGO` (default: *FALSE*)*: If this is defined with path to image file, then this image will be displayed in header. You need also mount volume with this file. 
+
+* `$CUSTOM_STYLES` (default: *FALSE*)*:  If this is defined with path to css file, then this style will be used in header. Also helps vith logo positioninig. You need also mount volume with this file.
+
+docker-compose.yml example:
+
+```yaml
+ldap-user-manager:
+  environment:
+    CUSTOM_LOGO: "../gfx/logo.svg"
+    CUSTOM_STYLES: "../css/custom.css"
+  volumes:
+    - '/opt/openldap/www/gfx:/opt/ldap_user_manager/gfx'
+    - '/opt/openldap/www/css:/opt/ldap_user_manager/css'
+```
+
 **Debugging settings**
 
 * `LDAP_DEBUG` (default: *FALSE*): Set to TRUE to increase the logging level for LDAP requests.  This will output passwords to the error log - don't enable this in a production environment.  This is for information on problems updating LDAP records and such.  To debug problems connecting to the LDAP server in the first place use `LDAP_VERBOSE_CONNECTION_LOGS`.

From dd711ebab333812905aca21b3246a184c38991c8 Mon Sep 17 00:00:00 2001
From: smartin77 <svec@vadium.sk>
Date: Thu, 4 Feb 2021 14:02:39 +0100
Subject: [PATCH 20/22] Update README.md

typo...
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2adc19f..333d175 100644
--- a/README.md
+++ b/README.md
@@ -162,7 +162,7 @@ To send emails you'll need to use an existing SMTP server.  Email sending will b
    
 * `SESSION_TIMEOUT` (default: *10 minutes*):  How long before an idle session will be timed out.
 
-**Website customs**
+**Website customisation**
 
 * `$CUSTOM_LOGO` (default: *FALSE*)*: If this is defined with path to image file, then this image will be displayed in header. You need also mount volume with this file. 
 

From 34b20a8eb1599f8b3657408e01aa8322073c9743 Mon Sep 17 00:00:00 2001
From: smartin77 <svec@vadium.sk>
Date: Wed, 21 Apr 2021 21:03:08 +0200
Subject: [PATCH 21/22] Update README.md

Updated description of LDAP_ACCOUNT_ADDITIONAL_ATTRIBUTES_PERSONAL
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 60ebf2d..103d021 100644
--- a/README.md
+++ b/README.md
@@ -113,6 +113,8 @@ These settings should only be changed if you're trying to make the user manager
 * `LDAP_ACCOUNT_ADDITIONAL_OBJECTCLASSES` (no default): A comma-separated list of additional objectClasses to use when creating an account.  See [Extra objectClasses and attributes](#extra-objectclasses-and-attributes) for more information.
 
 * `LDAP_ACCOUNT_ADDITIONAL_ATTRIBUTES` (no default): A comma-separated list of extra attributes to display when creating an account.  See [Extra objectClasses and attributes](#extra-objectclasses-and-attributes) for more information.
+
+* `LDAP_ACCOUNT_ADDITIONAL_ATTRIBUTES_PERSONAL` (default: *FALSE*): If *TRUE* then user is able to modify all his account additional attributes himself in module "Additional Attributes" (also some account additional attributes have to be set), otherwise just admin is able to update them. Personal account attributes can be e.g. SSH public key.
    
 * `LDAP_GROUP_MEMBERSHIP_USES_UID` (default: *TRUE* or *FALSE*): If *TRUE* then the entry for a member of a group will be just the username, otherwise it's the member's full DN.  When the `groupOfMembers` objectClass is detected or `FORCE_RFC2307BIS` is `TRUE` it  defaults to `FALSE`, otherwise it'll default to `TRUE`. Explicitly setting this variable will override the default.
    

From bbf5ac4a0350f164b42f8f0fc5b471901cc58ff2 Mon Sep 17 00:00:00 2001
From: Martin Svec <martin.svec@slovenskoit.sk>
Date: Wed, 21 Apr 2021 22:14:02 +0200
Subject: [PATCH 22/22] User can update his own account additional attributes
 e.g. SSH public key

---
 .gitignore                                    |   4 +-
 www/additional_attributes/index.php           | 143 ++++++++++++++++++
 .../module_functions.inc.php                  |  47 ++++++
 www/includes/config.inc.php                   |   2 +
 www/includes/modules.inc.php                  |  25 ++-
 5 files changed, 214 insertions(+), 7 deletions(-)
 create mode 100644 www/additional_attributes/index.php
 create mode 100644 www/additional_attributes/module_functions.inc.php

diff --git a/.gitignore b/.gitignore
index 40b32c7..e6d7f09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 .idea
-ldap-user-manager.iml
+*.iml
+*.sublime-project
+*.sublime-workspace
\ No newline at end of file
diff --git a/www/additional_attributes/index.php b/www/additional_attributes/index.php
new file mode 100644
index 0000000..736cdc6
--- /dev/null
+++ b/www/additional_attributes/index.php
@@ -0,0 +1,143 @@
+<?php
+
+set_include_path( ".:" . __DIR__ . "/../includes/");
+
+include_once "web_functions.inc.php";
+include_once "ldap_functions.inc.php";
+include_once "module_functions.inc.php";
+
+set_page_access("user");
+
+render_header('Update additional attributes');
+
+$to_update = array();
+
+$attribute_map = ldap_additional_account_attribute_array();
+
+$account_identifier = $USER_ID;
+
+$ldap_connection = open_ldap_connection();
+$ldap_search_query="(${LDAP['account_attribute']}=". ldap_escape($account_identifier, "", LDAP_ESCAPE_FILTER) . ")";
+$ldap_search = ldap_search( $ldap_connection, $LDAP['user_dn'], $ldap_search_query);
+
+
+if ($ldap_search) {
+ $user = ldap_get_entries($ldap_connection, $ldap_search);
+
+ foreach ($attribute_map as $attribute => $attr_r) {
+
+   $$attribute = $user[0][$attribute][0];
+
+   if (isset($_POST['update_account']) and isset($_POST[$attribute]) and $_POST[$attribute] != $$attribute) {
+     $$attribute = filter_var($_POST[$attribute], FILTER_SANITIZE_STRING);
+     $to_update[$attribute] = $$attribute;
+   }
+   elseif (isset($attr_r['default'])) {
+     $$attribute = $attr_r['default'];
+   }
+
+ }
+ $dn = $user[0]['dn'];
+
+
+  ### Update values
+
+ if (isset($_POST['update_account'])) {
+
+  if (array_key_exists($LDAP['account_attribute'], $to_update)) {
+    $new_rdn = "${LDAP['account_attribute']}=${to_update[$LDAP['account_attribute']]}";
+    $renamed_entry = ldap_rename($ldap_connection, $dn, $new_rdn, $LDAP['user_dn'], true);
+    if ($renamed_entry) {
+      $dn = "${new_rdn},${LDAP['user_dn']}";
+      $account_identifier = $to_update[$LDAP['account_attribute']];
+    }
+    else {
+      ldap_get_option($ldap_connection, LDAP_OPT_DIAGNOSTIC_MESSAGE, $detailed_err);
+      error_log("$log_prefix Failed to rename the DN for ${account_identifier}: " . ldap_error($ldap_connection) . " -- " . $detailed_err,0);
+    }
+  }
+
+  $updated_account = @ ldap_mod_replace($ldap_connection, $dn, $to_update);
+  if (!$updated_account) {
+    ldap_get_option($ldap_connection, LDAP_OPT_DIAGNOSTIC_MESSAGE, $detailed_err);
+    error_log("$log_prefix Failed to modify account details for ${account_identifier}: " . ldap_error($ldap_connection) . " -- " . $detailed_err,0);
+  }
+
+  if ($updated_account) {
+   ?>
+   <script>
+     window.setTimeout(function() {
+                                   $(".alert").fadeTo(500, 0).slideUp(500, function(){ $(this).remove(); });
+                                  }, 4000);
+   </script>
+   <div class="alert alert-success" role="alert">
+    <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="TRUE">&times;</span></button>
+    <p class="text-center">The account has been updated.<?php print $sent_email_message; ?></p>
+   </div>
+  <?php
+  }
+  else {
+   ?>
+   <script>
+     window.setTimeout(function() {
+                                   $(".alert").fadeTo(500, 0).slideUp(500, function(){ $(this).remove(); });
+                                  }, 4000);
+   </script>
+   <div class="alert alert-danger" role="alert">
+    <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="TRUE">&times;</span></button>
+    <p class="text-center">There was a problem updating the account.  Check the logs for more information.</p>
+   </div>
+  <?php
+  }
+ }
+}
+
+?>
+
+<div class="container">
+ <div class="col-sm-8">
+
+  <div class="panel panel-default"> 
+   <div class="panel-heading text-center">Update your additional attributes</div>
+   <div class="panel-body text-center">
+   
+    <form class="form-horizontal" action='' method='post'>
+
+     <input type="hidden" name="update_account">
+     <input type="hidden" id="pass_score" value="0" name="pass_score">
+     <input type="hidden" name="account_identifier" value="<?php print $account_identifier; ?>">
+     
+<?php
+
+  foreach ($attribute_map as $attribute => $attr_r) {
+    $label   = $attr_r['label'];
+
+    if ($attribute == $LDAP['account_attribute']) { $label = "<strong>$label</strong><sup>&ast;</sup>"; }
+  ?>
+     <div class="form-group" id="<?php print $attribute; ?>_div">
+      <label for="<?php print $attribute; ?>" class="col-sm-3 control-label"><?php print $label; ?></label>
+      <div class="col-sm-8">
+       <input type="text" class="form-control" id="<?php print $attribute; ?>" name="<?php print $attribute; ?>" value="<?php if (isset($$attribute)) { print $$attribute; } ?>" >
+      </div>
+     </div>
+  <?php
+  }
+?>
+
+     <div class="form-group">
+       <button type="submit" class="btn btn-default">Update account</button>
+     </div>
+     
+    </form>
+
+   </div>
+  </div>
+
+ </div>
+</div>
+<?php
+
+render_footer();
+
+?>
+
diff --git a/www/additional_attributes/module_functions.inc.php b/www/additional_attributes/module_functions.inc.php
new file mode 100644
index 0000000..7dfd6c0
--- /dev/null
+++ b/www/additional_attributes/module_functions.inc.php
@@ -0,0 +1,47 @@
+<?php
+
+
+
+##################################
+
+function ldap_additional_account_attribute_array() {
+
+ global $LDAP;
+
+  $additional_attributes_r = array();
+
+ if (isset($LDAP['account_additional_attributes'])) {
+
+  $user_attribute_r = explode(",", $LDAP['account_additional_attributes']);
+
+  foreach ($user_attribute_r as $this_attr) {
+
+    $this_r = array();
+    $kv = explode(":", $this_attr);
+    $attr_name = strtolower(filter_var($kv[0], FILTER_SANITIZE_STRING));
+
+    if (preg_match('/^[a-zA-Z0-9\-]+$/', $attr_name) == 1) {
+
+     if (isset($kv[1]) and $kv[1] != "") {
+      $this_r['label'] = filter_var($kv[1], FILTER_SANITIZE_STRING);
+     }
+     else {
+      $this_r['label'] = $attr_name;
+     }
+
+     if (isset($kv[2]) and $kv[2] != "") {
+      $this_r['default'] = filter_var($kv[2], FILTER_SANITIZE_STRING);
+     }
+
+     $additional_attributes_r[$attr_name] = $this_r;
+
+   }
+  }
+ }
+
+ return($additional_attributes_r);
+
+}
+
+
+?>
diff --git a/www/includes/config.inc.php b/www/includes/config.inc.php
index e667884..97a3ec7 100644
--- a/www/includes/config.inc.php
+++ b/www/includes/config.inc.php
@@ -32,6 +32,8 @@
  if (getenv('LDAP_ACCOUNT_ADDITIONAL_OBJECTCLASSES')) { $LDAP['account_additional_objectclasses'] = strtolower(getenv('LDAP_ACCOUNT_ADDITIONAL_OBJECTCLASSES')); }
  if (getenv('LDAP_ACCOUNT_ADDITIONAL_ATTRIBUTES')) { $LDAP['account_additional_attributes'] = getenv('LDAP_ACCOUNT_ADDITIONAL_ATTRIBUTES'); }
 
+ $LDAP['account_additional_attributes_personal'] = ((strcasecmp(getenv('LDAP_ACCOUNT_ADDITIONAL_ATTRIBUTES_PERSONAL'), 'TRUE') == 0) ? TRUE : FALSE);
+
  if (getenv('LDAP_GROUP_MEMBERSHIP_ATTRIBUTE')) { $LDAP['group_membership_attribute'] = getenv('LDAP_GROUP_MEMBERSHIP_ATTRIBUTE'); }
  if (getenv('LDAP_GROUP_MEMBERSHIP_USES_UID') and strtoupper(getenv('LDAP_GROUP_MEMBERSHIP_USES_UID')) == TRUE )  { $LDAP['group_membership_uses_uid']  = TRUE; }
 
diff --git a/www/includes/modules.inc.php b/www/includes/modules.inc.php
index c44e0d7..31757b4 100644
--- a/www/includes/modules.inc.php
+++ b/www/includes/modules.inc.php
@@ -7,12 +7,25 @@
  #hidden_on_login = only visible when not logged in
  #admin = need to be logged in as an admin to see it
 
- $MODULES = array(
-                    'log_in'          => 'hidden_on_login',
-                    'change_password' => 'auth',
-                    'account_manager' => 'admin',
-                    'log_out'         => 'auth'
-                  );
+if (isset($LDAP['account_additional_attributes']) && $LDAP['account_additional_attributes_personal']) {
+
+    $MODULES = array(
+        'log_in'                => 'hidden_on_login',
+        'account_manager'       => 'admin',
+        'change_password'       => 'auth',
+        'additional_attributes' => 'auth',
+        'log_out'               => 'auth'
+    );
+
+} else {
+
+    $MODULES = array(
+        'log_in'          => 'hidden_on_login',
+        'account_manager' => 'admin',
+        'change_password' => 'auth',
+        'log_out'         => 'auth'
+    );
+}
 
 if ($ACCOUNT_REQUESTS_ENABLED == TRUE) {
   $MODULES['request_account'] = 'hidden_on_login';