diff --git a/app/Console/Commands/RecryptFromMcrypt.php b/app/Console/Commands/RecryptFromMcrypt.php index 60599bafa..bb38f098f 100644 --- a/app/Console/Commands/RecryptFromMcrypt.php +++ b/app/Console/Commands/RecryptFromMcrypt.php @@ -93,15 +93,19 @@ class RecryptFromMcrypt extends Command } - if($legacy_cipher){ + if ($legacy_cipher){ $mcrypter = new McryptEncrypter($legacy_key,$legacy_cipher); }else{ $mcrypter = new McryptEncrypter($legacy_key); } $settings = Setting::getSettings(); - if ($settings->ldap_password=='') { + if ($settings->ldap_pword=='') { $this->comment('INFO: No LDAP password found. Skipping... '); + } else { + $decrypted_ldap_pword = $mcrypter->decrypt($settings->ldap_pword); + $settings->ldap_pword = \Crypt::encrypt($decrypted_ldap_pword); + $settings->save(); } /** @var CustomField[] $custom_fields */ $custom_fields = CustomField::where('field_encrypted','=', 1)->get(); diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php index 1a666822f..a7fdd5131 100755 --- a/app/Http/Controllers/AssetModelsController.php +++ b/app/Http/Controllers/AssetModelsController.php @@ -376,13 +376,16 @@ class AssetModelsController extends Controller */ public function postBulkEdit(Request $request) { + $models_raw_array = Input::get('ids'); - $models = AssetModel::whereIn('id', $models_raw_array)->get(); - $nochange = ['NC' => 'No Change']; - $fieldset_list = $nochange + Helper::customFieldsetList(); - $depreciation_list = $nochange + Helper::depreciationList(); - $category_list = $nochange + Helper::categoryList('asset'); - $manufacturer_list = $nochange + Helper::manufacturerList(); + + if (is_array($models_raw_array)) { + $models = AssetModel::whereIn('id', $models_raw_array)->get(); + $nochange = ['NC' => 'No Change']; + $fieldset_list = $nochange + Helper::customFieldsetList(); + $depreciation_list = $nochange + Helper::depreciationList(); + $category_list = $nochange + Helper::categoryList('asset'); + $manufacturer_list = $nochange + Helper::manufacturerList(); return view('models/bulk-edit', compact('models')) @@ -390,6 +393,10 @@ class AssetModelsController extends Controller ->with('category_list', $category_list) ->with('fieldset_list', $fieldset_list) ->with('depreciation_list', $depreciation_list); + } + + return redirect()->route('models.index') + ->with('error', 'You must select at least one model to edit.'); }