From 57d6a7d35e50d5929709d9722a71486f27d8e8ff Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 18 Nov 2020 13:59:02 -0800
Subject: [PATCH 1/3] Fixed #8753 - create-asset-from-model did not preselect
 the model

---
 resources/views/partials/forms/edit/model-select.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/forms/edit/model-select.blade.php b/resources/views/partials/forms/edit/model-select.blade.php
index f604dba0d..d58eb6ce5 100644
--- a/resources/views/partials/forms/edit/model-select.blade.php
+++ b/resources/views/partials/forms/edit/model-select.blade.php
@@ -5,7 +5,7 @@
 
     <div class="col-md-7{{  ((isset($field_req)) || ((isset($required) && ($required =='true')))) ?  ' required' : '' }}">
         <select class="js-data-ajax" data-endpoint="models" data-placeholder="{{ trans('general.select_model') }}" name="{{ $fieldname }}" style="width: 100%" id="model_select_id" aria-label="{{ $fieldname }}"{!!  (isset($field_req) ? ' data-validation="required" required' : '') !!}>
-            @if ($model_id = old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
+            @if ($model_id = old($fieldname, ($item->{$fieldname} ?? request($fieldname) ?? '')))
                 <option value="{{ $model_id }}" selected="selected">
                     {{ (\App\Models\AssetModel::find($model_id)) ? \App\Models\AssetModel::find($model_id)->name : '' }}
                 </option>

From fa24799d2b2cc318f8db852c5a22084551815ec6 Mon Sep 17 00:00:00 2001
From: Brady Wetherington <bwetherington@grokability.com>
Date: Wed, 18 Nov 2020 14:22:51 -0800
Subject: [PATCH 2/3] Change license serial type to TEXT for longer license
 files (#8782)

---
 ...1_18_214827_widen_license_serial_field.php | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 database/migrations/2020_11_18_214827_widen_license_serial_field.php

diff --git a/database/migrations/2020_11_18_214827_widen_license_serial_field.php b/database/migrations/2020_11_18_214827_widen_license_serial_field.php
new file mode 100644
index 000000000..3b5aaf006
--- /dev/null
+++ b/database/migrations/2020_11_18_214827_widen_license_serial_field.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class WidenLicenseSerialField extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('licenses', function (Blueprint $table) {
+            $table->text('serial')->nullable()->default(null)->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('licenses', function (Blueprint $table) {
+            $table->string('serial', 2048)->nullable()->default(null)->change();
+        });
+    }
+}

From 734cb941dd07ed984e62d2a9cdc6905ce1aecf75 Mon Sep 17 00:00:00 2001
From: Brady Wetherington <bwetherington@grokability.com>
Date: Fri, 20 Nov 2020 11:11:14 -0800
Subject: [PATCH 3/3] Fix for #8772 - initial LDAP import of users are
 deactivated (#8776)

---
 app/Services/LdapAd.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/Services/LdapAd.php b/app/Services/LdapAd.php
index 7a4a05f2a..d5e83de57 100644
--- a/app/Services/LdapAd.php
+++ b/app/Services/LdapAd.php
@@ -237,6 +237,8 @@ class LdapAd extends LdapAdConfiguration
         $user->phone        = trim($userInfo['telephonenumber']);
         if(array_key_exists('activated',$userInfo)) {
             $user->activated    = $userInfo['activated'];
+        } else if ( !$user->exists ) { // no 'activated' flag was set or unset, *AND* this user is new - activate by default.
+            $user->activated = 1;
         }
         if(array_key_exists('location_id',$userInfo)) {
             $user->location_id  = $userInfo['location_id'];
@@ -330,19 +332,30 @@ class LdapAd extends LdapAdConfiguration
             $activeStatus = (in_array($user->getUserAccountControl(), self::AD_USER_ACCOUNT_CONTROL_FLAGS)) ? 1 : 0;
         } else {
 
-            \Log::debug('This looks like LDAP (or an AD where the UAC is disabled)');
             // If there is no activated flag, then we can't make any determination about activated/deactivated
             if (false == $this->ldapSettings['ldap_active_flag']) {
                 \Log::debug('ldap_active_flag is false - no ldap_active_flag is set');
                 return null;
             }
 
-            // If there *is* an activated flag, then respect it *only* if it is actually present. If it's not there, ignore it. <-- NOT SURE IF RIGHT?
+            // If there *is* an activated flag, then respect it *only* if it is actually present. If it's not there, ignore it.
             if (!$user->hasAttribute($this->ldapSettings['ldap_active_flag'])) {
                 return null; // 'active' flag is defined, but does not exist on returned user record. So we don't know if they're active or not.
             }
 
-            $activeStatus = $user->{$this->ldapSettings['ldap_active_flag']} ? 1 : 0 ;
+            // if $user has the flag *AND* that flag has exactly one value -
+            if ( $user->{$this->ldapSettings['ldap_active_flag']} && count($user->{$this->ldapSettings['ldap_active_flag']}) == 1 ) {
+
+                $active_flag_value = $user->{$this->ldapSettings['ldap_active_flag']}[0];
+
+                // if the value of that flag is case-insensitively the string 'false' or boolean false
+                if ( strcasecmp($active_flag_value, "false") == 0 || $active_flag_value === false ) {
+                    return 0; // then make them INACTIVE
+                } else {
+                    return 1; // otherwise active
+                }
+            }
+            return 1; // fail 'open' (active) if we have the attribute and it's multivalued or empty; that's weird
         }
 
         return $activeStatus;