Merge branch 'develop' into features/lock_logins_to_saml

.all-contributorsrc

@@ -2531,6 +2531,24 @@
  "contributions": [
  "code"
  ]
+ },
+ {
+ "login": "adagioajanes",
+ "name": "Alex Janes",
+ "avatar_url": "https://avatars.githubusercontent.com/u/38761237?v=4",
+ "profile": "https://adagiohealth.org",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "nuraeil",
+ "name": "Nuraeil",
+ "avatar_url": "https://avatars.githubusercontent.com/u/32387849?v=4",
+ "profile": "https://github.com/nuraeil",
+ "contributions": [
+ "code"
+ ]
  }
  ]
 }

app/Console/Commands/LdapSync.php

@@ -91,7 +91,7 @@ public function handle()
  }
 
  /* Determine which location to assign users to by default. */
- $location = null; // FIXME - this would be better called "$default_location", which is more explicit about its purpose
+ $location = null; // TODO - this would be better called "$default_location", which is more explicit about its purpose
 
  if ($this->option('location') != '') {
  $location = Location::where('name', '=', $this->option('location'))->first();
@@ -133,7 +133,7 @@ public function handle()
  foreach ($ldap_ou_locations as $ldap_loc) {
  try {
  $location_users = Ldap::findLdapUsers($ldap_loc['ldap_ou']);
- } catch (\Exception $e) { // FIXME: this is stolen from line 77 or so above
+ } catch (\Exception $e) { // TODO: this is stolen from line 77 or so above
  if ($this->option('json_summary')) {
  $json_summary = ['error' => true, 'error_message' => trans('admin/users/message.error.ldap_could_not_search').' Location: '.$ldap_loc['name'].' (ID: '.$ldap_loc['id'].') cannot connect to "'.$ldap_loc['ldap_ou'].'" - '.$e->getMessage(), 'summary' => []];
  $this->info(json_encode($json_summary));