'; -// echo 'last:'.$key; -// print_r($array); -// echo ''; - } - } - /** * Gracefully handle decrypting the legacy data (encrypted via mcrypt) and use the new @@ -646,7 +660,8 @@ class Helper * @param String $string * @return string */ - public static function gracefulDecrypt(CustomField $field, $string) { + public static function gracefulDecrypt(CustomField $field, $string) + { if ($field->isFieldDecryptable($string)) { @@ -663,26 +678,52 @@ class Helper } - /** - * Strip HTML out of returned JSON. This is pretty gross, and I'd like to find a better way - * to handle this, but the REST API will solve some of these problems anyway. - * - * This is not currently used, but will be. - * - * @author A. Gianotto - * @since 3.4 - * @param $array array - * @return Array - */ - public static function stripTagsFromJSON(Array $array) { - foreach ($array as $key => $value) { - $clean_value = strip_tags($value); - $clean_array[$key] = $clean_value; + + public static function formatStandardApiResponse($status, $payload = null, $messages = null) { + + $array['status'] = $status; + $array['messages'] = $messages; + if (($messages) && (count($messages) > 0)) { + $array['messages'] = $messages; } - return $clean_array; + ($payload) ? $array['payload'] = $payload : $array['payload'] = null; + return $array; + } + + + /* + Possible solution for unicode fieldnames + */ + public static function make_slug($string) { + return preg_replace('/\s+/u', '_', trim($string)); + } + + + public static function getFormattedDateObject($date, $type = 'datetime', $array = true) { + + if ($date=='') { + return null; + } + + $settings = Setting::getSettings(); + $tmp_date = new \Carbon($date); + + if ($type == 'datetime') { + $dt['datetime'] = $tmp_date->format('Y-m-d H:i:s'); + $dt['formatted'] = $tmp_date->format($settings->date_display_format .' '. $settings->time_display_format); + } else { + $dt['date'] = $tmp_date->format('Y-m-d'); + $dt['formatted'] = $tmp_date->format($settings->date_display_format); + } + + if ($array == 'true') { + return $dt; + } + return $dt['formatted']; } + } diff --git a/app/Http/Controllers/AccessoriesController.php b/app/Http/Controllers/AccessoriesController.php index 6bf5c8f62c..6658997cf7 100755 --- a/app/Http/Controllers/AccessoriesController.php +++ b/app/Http/Controllers/AccessoriesController.php @@ -3,9 +3,7 @@ namespace App\Http\Controllers; use App\Helpers\Helper; use App\Models\Accessory; -use App\Models\Actionlog; use App\Models\Company; -use App\Models\Setting; use App\Models\User; use Auth; use Carbon\Carbon; @@ -16,7 +14,7 @@ use Input; use Lang; use Mail; use Redirect; -use Request; +use Illuminate\Http\Request; use Slack; use Str; use View; @@ -38,9 +36,10 @@ class AccessoriesController extends Controller * @since [v1.0] * @return View */ - public function getIndex(Request $request) + public function index(Request $request) { - return View::make('accessories/index'); + $this->authorize('index', Accessory::class); + return view('accessories/index'); } @@ -50,10 +49,11 @@ class AccessoriesController extends Controller * @author [A. Gianotto] [
.'/uploads/models/'.$model->image.')
' : '',
- 'modelnumber' => $model->model_number,
- 'numassets' => $model->assets->count(),
- 'depreciation' => (($model->depreciation) && ($model->depreciation->id > 0)) ? $model->depreciation->name.' ('.$model->depreciation->months.')' : trans('general.no_depreciation'),
- 'category' => ($model->category) ? (string)link_to('admin/settings/categories/'.$model->category->id.'/view', $model->category->name) : '',
- 'eol' => ($model->eol) ? $model->eol.' '.trans('general.months') : '',
- 'note' => $model->getNote(),
- 'fieldset' => ($model->fieldset) ? (string)link_to('admin/custom_fields/'.$model->fieldset->id, $model->fieldset->name) : '',
- 'actions' => $actions
- );
- }
-
- $data = array('total' => $modelCount, 'rows' => $rows);
-
- return $data;
- }
-
-
- /**
- * Get the asset information to present to the model view detail page
- *
- * @author [A. Gianotto] [';
- if ($asset->deleted_at=='') {
- if (Gate::allows('assets.create')) {
- $actions .= ' ';
- }
- if (Gate::allows('assets.edit')) {
- $actions .= ' ';
- }
- if (Gate::allows('assets.delete')) {
- $actions .= '';
- }
- } elseif ($asset->model->deleted_at=='') {
- $actions .= '';
- }
-
- $actions .= '
';
-
- if (($asset->availableForCheckout()))
- {
- if (Gate::allows('assets.checkout')) {
- $inout = '' . trans('general.checkout') . '';
- }
-
- } else {
- if (($asset->assigned_to!='') && (Gate::allows('assets.checkin'))) {
- $inout = '' . trans('general.checkin') . '';
- }
- }
-
- $purchase_cost = Helper::formatCurrencyOutput($asset->purchase_cost);
-
- $row = array(
- 'checkbox' =>'',
- 'id' => $asset->id,
- 'image' => (($asset->image) && ($asset->image!='')) ? '.'/uploads/assets/'.$asset->image.')
' : ((($asset->model) && ($asset->model->image!='')) ? '.'/uploads/models/'.$asset->model->image.'){kind=small}
' : ''),
- 'name' => ''.e($asset->name).'',
- 'asset_tag' => ''.e($asset->asset_tag).'',
- 'serial' => e($asset->serial),
- 'model' => ($asset->model) ? (string)link_to('/hardware/models/'.$asset->model->id.'/view', e($asset->model->name)) : 'No model',
- 'model_number' => ($asset->model && $asset->model->model_number) ? (string)$asset->model->model_number : '',
- 'status_label' => ($asset->assigneduser) ? 'Deployed' : ((e($asset->assetstatus)) ? e($asset->assetstatus->name) : ''),
- 'assigned_to' => ($asset->assigneduser) ? (string)link_to(config('app.url').'/admin/users/'.$asset->assigned_to.'/view', e($asset->assigneduser->fullName())) : '',
- 'location' => (($asset->assigneduser) && ($asset->assigneduser->userloc!='')) ? (string)link_to('admin/settings/locations/'.$asset->assigneduser->userloc->id.'/view', e($asset->assigneduser->userloc->name)) : (($asset->defaultLoc!='') ? (string)link_to('admin/settings/locations/'.$asset->defaultLoc->id.'/view', e($asset->defaultLoc->name)) : ''),
- 'category' => (($asset->model) && ($asset->model->category)) ?(string)link_to('/admin/settings/categories/'.$asset->model->category->id.'/view', e($asset->model->category->name)) : '',
- 'manufacturer' => (($asset->model) && ($asset->model->manufacturer)) ? (string)link_to('/admin/settings/manufacturers/'.$asset->model->manufacturer->id.'/view', e($asset->model->manufacturer->name)) : '',
- 'eol' => ($asset->eol_date()) ? $asset->eol_date() : '',
- 'purchase_cost' => $purchase_cost,
- 'purchase_date' => ($asset->purchase_date) ? $asset->purchase_date : '',
- 'notes' => e($asset->notes),
- 'order_number' => ($asset->order_number!='') ? ''.e($asset->order_number).'' : '',
- 'last_checkout' => ($asset->last_checkout!='') ? e($asset->last_checkout) : '',
- 'expected_checkin' => ($asset->expected_checkin!='') ? e($asset->expected_checkin) : '',
- 'created_at' => ($asset->created_at!='') ? e($asset->created_at->format('F j, Y h:iA')) : '',
- 'change' => ($inout) ? $inout : '',
- 'actions' => ($actions) ? $actions : '',
- 'companyName' => is_null($asset->company) ? '' : e($asset->company->name)
- );
- foreach ($all_custom_fields as $field) {
- $column_name = $field->db_column_name();
-
- if ($field->isFieldDecryptable($asset->{$column_name})) {
-
- if (Gate::allows('admin')) {
- if (($field->format=='URL') && ($asset->{$column_name}!='')) {
- $row[$column_name] = ''.Helper::gracefulDecrypt($field, $asset->{$column_name}).'';
- } else {
- $row[$column_name] = Helper::gracefulDecrypt($field, $asset->{$column_name});
- }
-
- } else {
- $row[$field->db_column_name()] = strtoupper(trans('admin/custom_fields/general.encrypted'));
- }
- } else {
- if (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) {
- $row[$field->db_column_name()] = ''.$asset->{$field->db_column_name()}.'';
- } else {
- $row[$field->db_column_name()] = e($asset->{$field->db_column_name()});
- }
- }
-
- }
-
- if (($request->has('report')) && ($request->get('report')=='true')) {
- $rows[]= Helper::stripTagsFromJSON($row);
- } else {
- $rows[]= $row;
- }
-
- }
-
- $data = array('total'=>$assetCount, 'rows'=>$rows);
-
- return $data;
+ $this->authorize('checkout', Asset::class);
+ // Filter out assets that are not deployable.
+ $assets_list = Company::scopeCompanyables(Asset::RTD()->get(), 'assets.company_id')->pluck('detailed_name', 'id')->toArray();
+ return view('hardware/bulk-checkout')
+ ->with('users_list', Helper::usersList())
+ ->with('assets_list', $assets_list);
}
- public function getBulkCheckout()
- {
- // Get the dropdown of users and then pass it to the checkout view
- $users_list = Helper::usersList();
- // Filter out assets that are not deployable.
- $assets = Asset::RTD()->get();
+ public function postBulkCheckout(Request $request)
+ {
+ $this->validate($request, [
+ "assigned_to" => 'required'
+ ]);
- $assets_list = Company::scopeCompanyables($assets, 'assets.company_id')->lists('detailed_name', 'id')->toArray();
+ $user = User::find(e(Input::get('assigned_to')));
+ $admin = Auth::user();
- return View::make('hardware/bulk-checkout')->with('users_list', $users_list)->with('assets_list', $assets_list);
- }
+ $asset_ids = array_filter(Input::get('selected_assets'));
- public function postBulkCheckout(Request $request)
- {
+ if ((Input::has('checkout_at')) && (Input::get('checkout_at')!= date("Y-m-d"))) {
+ $checkout_at = e(Input::get('checkout_at'));
+ } else {
+ $checkout_at = date("Y-m-d H:i:s");
+ }
- $this->validate($request, [
- "assigned_to" => 'required'
- ]);
+ if (Input::has('expected_checkin')) {
+ $expected_checkin = e(Input::get('expected_checkin'));
+ } else {
+ $expected_checkin = '';
+ }
- $user = User::find(e(Input::get('assigned_to')));
- $admin = Auth::user();
+ $errors = [];
+ DB::transaction(function () use ($user, $admin, $checkout_at, $expected_checkin, $errors, $asset_ids) {
+
+ foreach ($asset_ids as $asset_id) {
+ $asset = Asset::find($asset_id);
+ $this->authorize('checkout', $asset);
+ $error = $asset->checkOutToUser($user, $admin, $checkout_at, $expected_checkin, e(Input::get('note')), null);
- $asset_ids = array_filter(Input::get('selected_assets'));
+ if ($error) {
+ array_merge_recursive($errors, $asset->getErrors()->toArray());
+ }
+ }
+ });
- if ((Input::has('checkout_at')) && (Input::get('checkout_at')!= date("Y-m-d"))) {
- $checkout_at = e(Input::get('checkout_at'));
- } else {
- $checkout_at = date("Y-m-d H:i:s");
- }
+ if (!$errors) {
+ // Redirect to the new asset page
+ return redirect()->to("hardware")->with('success', trans('admin/hardware/message.checkout.success'));
+ }
+ // Redirect to the asset management page with error
+ return redirect()->to("hardware/bulk-checkout")->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($errors);
+ }
- if (Input::has('expected_checkin')) {
- $expected_checkin = e(Input::get('expected_checkin'));
- } else {
- $expected_checkin = '';
- }
- $has_errors = false;
- $errors = [];
- DB::transaction(function() use ($user, $admin, $checkout_at, $expected_checkin, $errors, $asset_ids)
- {
- foreach($asset_ids as $asset_id)
- {
- $asset = Asset::find($asset_id);
+ public function quickScan(Request $request)
+ {
+ $this->authorize('audit', Asset::class);
+ $dt = Carbon::now()->addMonths(12)->toDateString();
+ return view('hardware/quickscan')->with('next_audit_date', $dt)->with('locations_list', Helper::locationsList());
+ }
- $error = $asset->checkOutToUser($user, $admin, $checkout_at, $expected_checkin, e(Input::get('note')), null);
- if($error)
- {
- $has_errors = true;
- array_merge_recursive($errors, $asset->getErrors()->toArray());
- }
- }
- });
- if (!$errors) {
- // Redirect to the new asset page
- return redirect()->to("hardware")->with('success', trans('admin/hardware/message.checkout.success'));
- }
+ public function audit(Request $request, $id)
+ {
+ $this->authorize('audit', Asset::class);
+ $dt = Carbon::now()->addMonths(12)->toDateString();
+ $asset = Asset::findOrFail($id);
+ return view('hardware/audit')->with('asset', $asset)->with('next_audit_date', $dt)->with('locations_list', Helper::locationsList());
+ }
+
+ public function auditStore(Request $request, $id)
+ {
+ $this->authorize('audit', Asset::class);
+
+ $rules = array(
+ 'location_id' => 'exists:locations,id|nullable|numeric',
+ 'next_audit_date' => 'date|nullable'
+ );
+
+ $validator = \Validator::make($request->all(), $rules);
+ if ($validator->fails()) {
+ return response()->json(Helper::formatStandardApiResponse('error', null, $validator->errors()->all()));
+ }
+
+ $asset = Asset::findOrFail($id);
+ $asset->next_audit_date = $request->input('next_audit_date');
+
+ if ($asset->save()) {
+ $asset->logAudit(request('note'),request('location_id'));
+ return redirect()->to("hardware")->with('success', trans('admin/hardware/message.audit.success'));
+ }
+ }
- // Redirect to the asset management page with error
- return redirect()->to("hardware/bulk-checkout")->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($errors);
- }
}
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
new file mode 100644
index 0000000000..0282bbeb5d
--- /dev/null
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -0,0 +1,72 @@
+middleware('guest');
+ }
+
+ /**
+ * Get the e-mail subject line to be used for the reset link email.
+ * Overriding method "getEmailSubject()" from trait "use ResetsPasswords"
+ * @return string
+ */
+ public function getEmailSubject()
+ {
+ return property_exists($this, 'subject') ? $this->subject : \Lang::get('mail.reset_link');
+ }
+
+ /**
+ * Send a reset link to the given user.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ public function sendResetLinkEmail(Request $request)
+ {
+ $this->validate($request, ['email' => 'required|email']);
+
+ // We will send the password reset link to this user. Once we have attempted
+ // to send the link, we will examine the response then see the message we
+ // need to show to the user. Finally, we'll send out a proper response.
+ $response = $this->broker()->sendResetLink(
+ $request->only('email')
+ );
+
+ if ($response === \Password::RESET_LINK_SENT) {
+ return redirect()->route('login')->with('status', trans($response));
+ }
+
+ // If an error was returned by the password broker, we will get this message
+ // translated so we can notify a user of the problem. We'll redirect back
+ // to where the users came from so they can attempt this process again.
+ return back()->withErrors(
+ ['email' => trans($response)]
+ );
+ }
+}
diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/LoginController.php
similarity index 71%
rename from app/Http/Controllers/Auth/AuthController.php
rename to app/Http/Controllers/Auth/LoginController.php
index bd9fc475cb..884606716a 100644
--- a/app/Http/Controllers/Auth/AuthController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -5,7 +5,6 @@ namespace App\Http\Controllers\Auth;
use Validator;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ThrottlesLogins;
-use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
use App\Models\Setting;
use App\Models\Ldap;
use App\Models\User;
@@ -18,20 +17,17 @@ use Log;
use View;
use PragmaRX\Google2FA\Google2FA;
-
-
/**
* This controller handles authentication for the user, including local
* database users and LDAP users.
*
- * @todo Move LDAP methods into user model for better separation of concerns.
* @author [A. Gianotto] [