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/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']), 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{