From b3e0418b9f4efbb0811a7a75d84d6ced5199c848 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Tue, 23 Feb 2021 04:53:03 +0100
Subject: M2LDAP: ldap-user-add

---
 "egy\303\251b/nextcloud/mayor-nextcloud.php" | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'egyéb/nextcloud/mayor-nextcloud.php')

diff --git "a/egy\303\251b/nextcloud/mayor-nextcloud.php" "b/egy\303\251b/nextcloud/mayor-nextcloud.php"
index 7f0b970b..dbf7ee1d 100644
--- "a/egy\303\251b/nextcloud/mayor-nextcloud.php"
+++ "b/egy\303\251b/nextcloud/mayor-nextcloud.php"
@@ -59,8 +59,9 @@ $pwchars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_?";
 for($i = 1; $i<$argc; $i++){  //Ha van külön config megadva, akkor először azt töltjük be.
     if($argv[$i] == "--config-file" ){$cfgfile = strval($argv[$i+1]); $i++;}
 }
-if(file_exists($cfgfile) === TRUE){ include($cfgfile); }   //Config betöltés
-if(!empty($m2n)){  $cfg_o = $cfg;  $cfg = $m2n;  $cfg = array_merge($cfg, $cfg_o); }    //Ha valahol még a régi config lenne 
+if(file_exists($cfgfile) === TRUE){ $cfg_o = $cfg; include($cfgfile); $cfg_n = $cfg; $cfg = array_merge($cfg, $cfg_o, $cfg_n); }   //Config betöltés
+if(!empty($m2n)){  $cfg_o = $cfg; $cfg = array_merge($cfg, $m2n, $cfg_o); }    //Ha valahol még a régi config lenne 
+
 
 for($i = 1; $i<$argc; $i++){    // Kézzel felülbírált config opciók
     if($argv[$i] == "--help" ){$printhelp = true;}
-- 
cgit v1.2.3