From 39da04e611b42303d544fb6d78a7031e537338cf Mon Sep 17 00:00:00 2001 From: Marcel Folaron Date: Sun, 17 Apr 2022 19:28:31 -0400 Subject: [PATCH 1/2] fixing ldap issues --- resources/logs/error.log | 3 +++ src/domain/ldap/services/class.ldap.php | 5 +++++ src/domain/users/controllers/class.showAll.php | 4 ---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/logs/error.log b/resources/logs/error.log index e69de29bb..1affc262b 100644 --- a/resources/logs/error.log +++ b/resources/logs/error.log @@ -0,0 +1,3 @@ +[17-Apr-2022 16:24:47 America/Los_Angeles] PHP Warning: ldap_connect(): invalid port number: 0 in C:\xampp\htdocs\leantime-oss\src\domain\ldap\services\class.ldap.php on line 97 +[17-Apr-2022 16:24:47 America/Los_Angeles] PHP Warning: ldap_set_option(): supplied argument is not a valid ldap link resource in C:\xampp\htdocs\leantime-oss\src\domain\ldap\services\class.ldap.php on line 99 +[17-Apr-2022 16:27:56 America/Los_Angeles] PHP Notice: Undefined index: priority in C:\xampp\htdocs\leantime-oss\src\domain\tickets\repositories\class.tickets.php on line 1031 diff --git a/src/domain/ldap/services/class.ldap.php b/src/domain/ldap/services/class.ldap.php index 228a0e089..6db33f30c 100644 --- a/src/domain/ldap/services/class.ldap.php +++ b/src/domain/ldap/services/class.ldap.php @@ -93,7 +93,12 @@ private function getRoleAssignments (){ public function connect() { + if(!$this->config->useLdap){ + return false; + } + if(function_exists("ldap_connect")) { + $this->ldapConnection = ldap_connect($this->host, $this->port); ldap_set_option($this->ldapConnection, LDAP_OPT_PROTOCOL_VERSION, 3) or die('Unable to set LDAP protocol version'); diff --git a/src/domain/users/controllers/class.showAll.php b/src/domain/users/controllers/class.showAll.php index 158187c87..d543e2dc8 100644 --- a/src/domain/users/controllers/class.showAll.php +++ b/src/domain/users/controllers/class.showAll.php @@ -30,10 +30,6 @@ public function get() $tpl->assign('admin', true); $tpl->assign('roles', core\login::$userRoles); - if($ldapService->connect()) { - $ldapService->getAllMembers($_SESSION['userdata']['mail'], ''); - } - $tpl->display('users.showAll'); }else{ From 2e1e57e62fc3680293b56c534b1e5f22dafee363 Mon Sep 17 00:00:00 2001 From: Marcel Folaron Date: Sun, 17 Apr 2022 19:34:39 -0400 Subject: [PATCH 2/2] fixing milestone save notice --- resources/logs/error.log | 3 --- src/domain/tickets/services/class.tickets.php | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/resources/logs/error.log b/resources/logs/error.log index 1affc262b..e69de29bb 100644 --- a/resources/logs/error.log +++ b/resources/logs/error.log @@ -1,3 +0,0 @@ -[17-Apr-2022 16:24:47 America/Los_Angeles] PHP Warning: ldap_connect(): invalid port number: 0 in C:\xampp\htdocs\leantime-oss\src\domain\ldap\services\class.ldap.php on line 97 -[17-Apr-2022 16:24:47 America/Los_Angeles] PHP Warning: ldap_set_option(): supplied argument is not a valid ldap link resource in C:\xampp\htdocs\leantime-oss\src\domain\ldap\services\class.ldap.php on line 99 -[17-Apr-2022 16:27:56 America/Los_Angeles] PHP Notice: Undefined index: priority in C:\xampp\htdocs\leantime-oss\src\domain\tickets\repositories\class.tickets.php on line 1031 diff --git a/src/domain/tickets/services/class.tickets.php b/src/domain/tickets/services/class.tickets.php index 121af1abb..19ccaaa81 100644 --- a/src/domain/tickets/services/class.tickets.php +++ b/src/domain/tickets/services/class.tickets.php @@ -256,6 +256,7 @@ public function quickAddMilestone($params) 'hourRemaining' => '', 'planHours' => '', 'sprint' => '', + 'priority' => 3, 'dependingTicketId' =>$params['dependentMilestone'], 'acceptanceCriteria' => '', 'tags' => $params['tags'], @@ -438,6 +439,7 @@ public function quickUpdateMilestone($params) 'planHours' => '', 'sprint' => '', 'acceptanceCriteria' => '', + 'priority' => 3, 'dependingTicketId' => $params['dependentMilestone'], 'tags' => $params['tags'], 'editFrom' => $this->language->getISODateString($params['editFrom']),