Bumped version

Add model_number to accessory search
Added notes to custom report
2017-02-22 22:38:33 -08:00 · 2017-02-22 22:34:56 -08:00 · 2017-02-03 02:20:56 -08:00 · 2017-01-17 11:57:24 -08:00 · 2017-01-17 09:19:14 -08:00 · 2017-01-10 23:07:06 -08:00
13 changed files with 498 additions and 475 deletions
@@ -38,3 +38,5 @@ tests/_data/scenarios
 tests/_output/*
 tests/_support/_generated/*
 /npm-debug.log
+/storage/oauth-private.key
+/storage/oauth-public.key
@@ -1,4 +1,4 @@
-FROM ubuntu:trusty
+FROM debian:jessie-slim
 MAINTAINER Brady Wetherington <uberbrady@gmail.com>

 RUN apt-get update && apt-get install -y \
@@ -13,7 +13,9 @@ patch \
 curl \
 vim \
 git \
-mysql-client
+mysql-client \
+&& apt-get clean \
+&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

 RUN php5enmod mcrypt
 RUN php5enmod gd
@@ -361,7 +361,7 @@ class ReportsController extends Controller
                $item_type = $activity->itemType();

            } else {
-                $activity_item = "unkonwn";
+                $activity_item = "unknown (deleted)";
                $item_type = "null";
            }
            
@@ -580,6 +580,10 @@ class ReportsController extends Controller
            $header[] = trans('admin/hardware/form.expected_checkin');
        }

+        if (e(Input::get('notes')) == '1') {
+            $header[] = trans('general.notes');
+        }
+

        foreach ($customfields as $customfield) {
            if (e(Input::get($customfield->db_column_name())) == '1') {
@@ -724,6 +728,14 @@ class ReportsController extends Controller
                }
            }

+            if (e(Input::get('notes')) == '1') {
+                if ($asset->notes) {
+                    $row[] = '"' .$asset->notes . '"';
+                } else {
+                    $row[] = '';
+                }
+            }
+
            foreach ($customfields as $customfield) {
                $column_name = $customfield->db_column_name();
                if (e(Input::get($customfield->db_column_name())) == '1') {
@@ -425,17 +425,12 @@ class UsersController extends Controller

            // Check if we are not trying to delete ourselves
            if ($user->id === Auth::user()->id) {
-                // Prepare the error message
-                $error = trans('admin/users/message.error.delete');
-
                // Redirect to the user management page
-                return redirect()->route('users')->with('error', $error);
+                return redirect()->route('users')->with('error', trans('admin/users/message.error.delete'));
            }

-
            // Do we have permission to delete this user?
-            if ((!Auth::user()->isSuperUser()) || (config('app.lock_passwords'))) {
-                // Redirect to the user management page
+            if ((Gate::denies('users.delete') || (config('app.lock_passwords')))) {
                return redirect()->route('users')->with('error', 'Insufficient permissions!');
            }

@@ -459,18 +454,11 @@ class UsersController extends Controller

            // Delete the user
            $user->delete();
-
-            // Prepare the success message
            $success = trans('admin/users/message.success.delete');
-
-            // Redirect to the user management page
            return redirect()->route('users')->with('success', $success);
-        } catch (UserNotFoundException $e) {
-            // Prepare the error message
-            $error = trans('admin/users/message.user_not_found', compact('id'));

-            // Redirect to the user management page
-            return redirect()->route('users')->with('error', $error);
+        } catch (UserNotFoundException $e) {
+            return redirect()->route('users')->with('error', trans('admin/users/message.user_not_found', compact('id')));
        }
    }

@@ -522,10 +510,7 @@ class UsersController extends Controller
            if (($key = array_search(Auth::user()->id, $user_raw_array)) !== false) {
                unset($user_raw_array[$key]);
            }
-
-            if (!Auth::user()->isSuperUser()) {
-                return redirect()->route('users')->with('error', trans('admin/users/message.insufficient_permissions'));
-            }
+            

            if (!config('app.lock_passwords')) {

@@ -865,7 +850,6 @@ class UsersController extends Controller
                            'permissions' => '{"user":1}',
                            'notes' => 'Imported user'
                        );
-                        //dd($newuser);

                        DB::table('users')->insert($newuser);

@@ -1107,7 +1091,6 @@ class UsersController extends Controller
        $user = User::find($userId);
        $destinationPath = config('app.private_uploads').'/users';

-        // the license is valid
        if (isset($user->id)) {

            if (!Company::isCurrentUserHasAccess($user)) {
@@ -819,7 +819,7 @@ Route::group([ 'prefix' => 'admin','middleware' => ['web','auth']], function ()
        Route::post('{userId}/edit', [ 'uses' => 'UsersController@postEdit', 'middleware' => ['authorize:users.edit']  ]);
        Route::get('{userId}/clone', [ 'as' => 'clone/user', 'uses' => 'UsersController@getClone', 'middleware' => ['authorize:users.edit']  ]);
        Route::post('{userId}/clone', [ 'uses' => 'UsersController@postCreate', 'middleware' => ['authorize:users.edit']  ]);
-        Route::get('{userId}/delete', [ 'as' => 'delete/user', 'uses' => 'UsersController@getDelete', 'middleware' => ['authorize:users.edit']  ]);
+        Route::get('{userId}/delete', [ 'as' => 'delete/user', 'uses' => 'UsersController@getDelete', 'middleware' => ['authorize:users.delete']  ]);
        Route::get('{userId}/restore', [ 'as' => 'restore/user', 'uses' => 'UsersController@getRestore', 'middleware' => ['authorize:users.edit']  ]);
        Route::get('{userId}/view', [ 'as' => 'view/user', 'uses' => 'UsersController@getView' , 'middleware' => ['authorize:users.view'] ]);
        Route::get('{userId}/unsuspend', [ 'as' => 'unsuspend/user', 'uses' => 'UsersController@getUnsuspend', 'middleware' => ['authorize:users.edit'] ]);
@@ -154,6 +154,7 @@ class Accessory extends SnipeModel
                            $query->where('locations.name', 'LIKE', '%'.$search.'%');
                        });
                    })->orWhere('accessories.name', 'LIKE', '%'.$search.'%')
+                            ->orWhere('accessories.model_number', 'LIKE', '%'.$search.'%')
                            ->orWhere('accessories.order_number', 'LIKE', '%'.$search.'%')
                            ->orWhere('accessories.purchase_cost', 'LIKE', '%'.$search.'%')
                            ->orWhere('accessories.purchase_date', 'LIKE', '%'.$search.'%');
@@ -485,9 +485,12 @@ class Asset extends Depreciable
        $settings = \App\Models\Setting::getSettings();

        if ($settings->auto_increment_assets == '1') {
-            $asset_tag = \DB::table('assets')
+            $temp_asset_tag = \DB::table('assets')
                ->where('physical', '=', '1')
-                ->max('id');
+                ->max('asset_tag');
+
+            $asset_tag_digits = preg_replace('/\D/', '', $temp_asset_tag);
+            $asset_tag = preg_replace('/^0*/', '', $asset_tag_digits);

            if ($settings->zerofill_count > 0) {
                return $settings->auto_increment_prefix.Asset::zerofill(($asset_tag + 1),$settings->zerofill_count);
@@ -1,7 +1,7 @@
 <?php
 return array (
-  'app_version' => 'v3.6.2',
-  'build_version' => '18',
-  'hash_version' => 'g6f1e0d6',
-  'full_hash' => 'v3.6.2-18-g6f1e0d6',
+  'app_version' => 'v3.6.4',
+  'build_version' => '12',
+  'hash_version' => 'gf7e4fca',
+  'full_hash' => 'v3.6.4-12-gf7e4fca',
 );
@@ -2,310 +2,310 @@

 {{-- Page title --}}
@section('title')
-View Assets for  {{ $user->fullName() }}
-@parent
+    View Assets for  {{ $user->fullName() }}
+    @parent
@stop

 {{-- Account page content --}}
@section('content')

-  <div class="row">
-    <div class="col-md-12">
-      <div class="box box-default">
-
-          @if ($user->id)
-            <div class="box-header with-border">
-              <div class="box-heading">
-                <h3 class="box-title"> {{ trans('admin/users/general.assets_user', array('name' => $user->first_name)) }}</h3>
-              </div>
-            </div><!-- /.box-header -->
-          @endif
-
-        <div class="box-body">
-          <!-- checked out assets table -->
-          @if (count($user->assets) > 0)
-            <div class="table-responsive">
-              <table class="table table-striped">
-                  <thead>
-                      <tr>
-                          <th class="col-md-4">{{ trans('admin/hardware/table.asset_model') }}</th>
-                          <th class="col-md-2">{{ trans('admin/hardware/table.asset_tag') }}</th>
-                          <th class="col-md-3">{{ trans('general.name') }}</th>
-                          <th></th>
-                      </tr>
-                  </thead>
-                  <tbody>
-                      @foreach ($user->assets as $asset)
-                      <tr>
-                          <td>
-                          @if ($asset->physical=='1') {{ $asset->model->name }}
-                          @endif
-                          </td>
-                          <td>{{ $asset->asset_tag }}</td>
-                          <td>{{ $asset->name }}</td>
-                          <td>
-
-                          @if (($asset->image) && ($asset->image!=''))
-                            <img src="{{ config('app.url') }}/uploads/assets/{{ $asset->image }}" height="50" width="50">
-
-                          @elseif (($asset->model) && ($asset->model->image!=''))
-                            <img src="{{ config('app.url') }}/uploads/models/{{ $asset->model->image }}" height="50" width="50">
-                          @endif
-
-                         </td>
-
-                      </tr>
-                      @endforeach
-                  </tbody>
-              </table>
-            </div>
-          @else
-
-          <div class="col-md-12">
-              <div class="alert alert-info alert-block">
-                  <i class="fa fa-info-circle"></i>
-                  {{ trans('general.no_results') }}
-              </div>
-          </div>
-          @endif
-        </div>
-    </div>
-  </div>
-</div>
-
-  <div class="row">
-    <div class="col-md-12">
-      <div class="box box-default">
-
-          @if ($user->id)
-            <div class="box-header with-border">
-              <div class="box-heading">
-                <h3 class="box-title"> {{ trans('admin/users/general.software_user', array('name' => $user->first_name)) }}</h3>
-              </div>
-            </div><!-- /.box-header -->
-          @endif
-
-        <div class="box-body">
-          <!-- checked out licenses table -->
-          @if (count($user->licenses) > 0)
-          <div class="table-responsive">
-            <table class="table table-striped">
-              <thead>
-                  <tr>
-                      <th class="col-md-5">{{ trans('general.name') }}</th>
-                      <th class="col-md-4">{{ trans('admin/hardware/form.serial') }}</th>
-                  </tr>
-              </thead>
-              <tbody>
-                  @foreach ($user->licenses as $license)
-                  <tr>
-                      <td>{{ $license->name }}</td>
-                      <td>
-
-                          @can('licenses.keys')
-
-                             {{ mb_strimwidth($license->serial, 0, 50, "...") }}
-                            @else
-                              ---
-                            @endcan
-                      </td>
-                  </tr>
-                  @endforeach
-              </tbody>
-          </table>
-          </div>
-          @else
-
-          <div class="col-md-12">
-              <div class="alert alert-info alert-block">
-                  <i class="fa fa-info-circle"></i>
-                  {{ trans('general.no_results') }}
-              </div>
-          </div>
-          @endif
-        </div>
-    </div>
-  </div>
-</div>
-
-  <div class="row">
-    <div class="col-md-12">
-      <div class="box box-default">
-
-          @if ($user->id)
-            <div class="box-header with-border">
-              <div class="box-heading">
-                <h3 class="box-title"> {{ trans('general.consumables') }} </h3>
-              </div>
-            </div><!-- /.box-header -->
-          @endif
-
-        <div class="box-body">
-          <!-- checked out consumables table -->
-          @if (count($user->consumables) > 0)
-          <div class="table-responsive">
-            <table class="table table-striped">
-              <thead>
-                  <tr>
-                      <th class="col-md-12">{{ trans('general.name') }}</th>
-                  </tr>
-              </thead>
-              <tbody>
-                  @foreach ($user->consumables as $consumable)
-                  <tr>
-                      <td>{{ $consumable->name }}</td>
-                  </tr>
-                  @endforeach
-              </tbody>
-          </table>
-          </div>
-          @else
-
-          <div class="col-md-12">
-              <div class="alert alert-info alert-block">
-                  <i class="fa fa-info-circle"></i>
-                  {{ trans('general.no_results') }}
-              </div>
-          </div>
-          @endif
-
-        </div>
-    </div>
-  </div>
-</div>
-
-  <div class="row">
-    <div class="col-md-12">
-      <div class="box box-default">
-
-          @if ($user->id)
-            <div class="box-header with-border">
-              <div class="box-heading">
-                <h3 class="box-title"> {{ trans('general.accessories') }}</h3>
-              </div>
-            </div><!-- /.box-header -->
-          @endif
-
-        <div class="box-body">
-          <!-- checked out licenses table -->
-          @if (count($user->accessories) > 0)
-          <div class="table-responsive">
-            <table class="table table-striped">
-              <thead>
-                  <tr>
-                      <th class="col-md-12">Name</th>
-                  </tr>
-              </thead>
-              <tbody>
-                  @foreach ($user->accessories as $accessory)
-                  <tr>
-                      <td>{{ $accessory->name }}</td>
-                  </tr>
-                  @endforeach
-              </tbody>
-          </table>
-          </div>
-          @else
-
-          <div class="col-md-12">
-              <div class="alert alert-info alert-block">
-                  <i class="fa fa-info-circle"></i>
-                  {{ trans('general.no_results') }}
-              </div>
-          </div>
-          @endif
-        </div>
-    </div>
-  </div>
-</div>
-<div class="row">
-  <div class="col-md-12">
-    <div class="box box-default">
-
-        @if ($user->id)
-          <div class="box-header with-border">
-            <div class="box-heading">
-              <h3 class="box-title"> History</h3>
-            </div>
-          </div><!-- /.box-header -->
-        @endif
-
-      <div class="box-body">
-        @if (count($userlog) > 0)
-        <div class="table-responsive">
-        <table class="table table-striped" id="example">
-            <thead>
-                <tr>
-                    <th class="col-md-1"></th>
-                    <th class="col-md-2"><span class="line"></span>{{ trans('table.action') }}</th>
-                    <th class="col-md-4"><span class="line"></span>{{ trans('general.asset') }}</th>
-                    <th class="col-md-2"><span class="line"></span>{{ trans('table.by') }}</th>
-                    <th class="col-md-3">{{ trans('general.date') }}</th>
-                </tr>
-            </thead>
-            <tbody>
-                @foreach ($userlog as $log)
-                <tr>
-                    <td class="text-center">
-                        @if ($log->itemType()=="asset")
-                            <i class="fa fa-barcode"></i>
-                        @elseif ($log->itemType()=="accessory")
-                            <i class="fa fa-keyboard-o"></i>
-                        @elseif ($log->itemType()=="consumable")
-                            <i class="fa fa-tint"></i>
-                        @elseif ($log->itemType()=="license")
-                            <i class="fa fa-floppy-o"></i>
-                        @else
-                            <i class="fa fa-times"></i>
-                        @endif
-
-                    </td>
-                    <td>
-                        {{ strtolower(trans('general.'.str_replace(' ','_',$log->action_type))) }}
-                    </td>
-                    <td>
-                        @if (($log->item) && ($log->itemType()=="asset"))
-                            @if ($log->item->deleted_at=='')
-                                {{ $log->item->showAssetName() }}
-                            @else
-                                <del>{{ $log->item->showAssetName() }}</del> (deleted)
-                            @endif
-
-                        @elseif ($log->item)
-                             @if ($log->item->deleted_at=='')
-                                {{ $log->item->name }}
-                             @else
-                                 <del>{{ $log->item->name }}</del> (deleted)
-                             @endif
-                         @else
-                             {{ trans('general.bad_data') }}
-                        @endif
-
-                    </td>
-                    <td>
-                        @if ($log->user)
-                        {{ $log->user->fullName() }}
-                        @endif
-                    </td>
-                    <td>{{ $log->created_at }}</td>
-                </tr>
-                @endforeach
-            </tbody>
-        </table>
-        </div>
-        @else
-
-
+    <div class="row">
        <div class="col-md-12">
-            <div class="alert alert-info alert-block">
-                <i class="fa fa-info-circle"></i>
-                {{ trans('general.no_results') }}
+            <div class="box box-default">
+
+                @if ($user->id)
+                    <div class="box-header with-border">
+                        <div class="box-heading">
+                            <h3 class="box-title"> {{ trans('admin/users/general.assets_user', array('name' => $user->first_name)) }}</h3>
+                        </div>
+                    </div><!-- /.box-header -->
+                @endif
+
+                <div class="box-body">
+                    <!-- checked out assets table -->
+                    @if (count($user->assets) > 0)
+                        <div class="table-responsive">
+                            <table class="table table-striped">
+                                <thead>
+                                <tr>
+                                    <th class="col-md-4">{{ trans('admin/hardware/table.asset_model') }}</th>
+                                    <th class="col-md-2">{{ trans('admin/hardware/table.asset_tag') }}</th>
+                                    <th class="col-md-3">{{ trans('general.name') }}</th>
+                                    <th></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                @foreach ($user->assets as $asset)
+                                    <tr>
+                                        <td>
+                                            @if ($asset->physical=='1') {{ $asset->model->name }}
+                                            @endif
+                                        </td>
+                                        <td>{{ $asset->asset_tag }}</td>
+                                        <td>{{ $asset->name }}</td>
+                                        <td>
+
+                                            @if (($asset->image) && ($asset->image!=''))
+                                                <img src="{{ config('app.url') }}/uploads/assets/{{ $asset->image }}" height="50" width="50">
+
+                                            @elseif (($asset->model) && ($asset->model->image!=''))
+                                                <img src="{{ config('app.url') }}/uploads/models/{{ $asset->model->image }}" height="50" width="50">
+                                            @endif
+
+                                        </td>
+
+                                    </tr>
+                                @endforeach
+                                </tbody>
+                            </table>
+                        </div>
+                    @else
+
+                        <div class="col-md-12">
+                            <div class="alert alert-info alert-block">
+                                <i class="fa fa-info-circle"></i>
+                                {{ trans('general.no_results') }}
+                            </div>
+                        </div>
+                    @endif
+                </div>
            </div>
        </div>
-        @endif
-      </div>
-  </div>
-</div>
-</div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-12">
+            <div class="box box-default">
+
+                @if ($user->id)
+                    <div class="box-header with-border">
+                        <div class="box-heading">
+                            <h3 class="box-title"> {{ trans('admin/users/general.software_user', array('name' => $user->first_name)) }}</h3>
+                        </div>
+                    </div><!-- /.box-header -->
+                @endif
+
+                <div class="box-body">
+                    <!-- checked out licenses table -->
+                    @if (count($user->licenses) > 0)
+                        <div class="table-responsive">
+                            <table class="table table-striped">
+                                <thead>
+                                <tr>
+                                    <th class="col-md-5">{{ trans('general.name') }}</th>
+                                    <th class="col-md-4">{{ trans('admin/hardware/form.serial') }}</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                @foreach ($user->licenses as $license)
+                                    <tr>
+                                        <td>{{ $license->name }}</td>
+                                        <td>
+
+                                            @can('licenses.keys')
+
+                                                {{ mb_strimwidth($license->serial, 0, 50, "...") }}
+                                            @else
+                                                ---
+                                            @endcan
+                                        </td>
+                                    </tr>
+                                @endforeach
+                                </tbody>
+                            </table>
+                        </div>
+                    @else
+
+                        <div class="col-md-12">
+                            <div class="alert alert-info alert-block">
+                                <i class="fa fa-info-circle"></i>
+                                {{ trans('general.no_results') }}
+                            </div>
+                        </div>
+                    @endif
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-12">
+            <div class="box box-default">
+
+                @if ($user->id)
+                    <div class="box-header with-border">
+                        <div class="box-heading">
+                            <h3 class="box-title"> {{ trans('general.consumables') }} </h3>
+                        </div>
+                    </div><!-- /.box-header -->
+                @endif
+
+                <div class="box-body">
+                    <!-- checked out consumables table -->
+                    @if (count($user->consumables) > 0)
+                        <div class="table-responsive">
+                            <table class="table table-striped">
+                                <thead>
+                                <tr>
+                                    <th class="col-md-12">{{ trans('general.name') }}</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                @foreach ($user->consumables as $consumable)
+                                    <tr>
+                                        <td>{{ $consumable->name }}</td>
+                                    </tr>
+                                @endforeach
+                                </tbody>
+                            </table>
+                        </div>
+                    @else
+
+                        <div class="col-md-12">
+                            <div class="alert alert-info alert-block">
+                                <i class="fa fa-info-circle"></i>
+                                {{ trans('general.no_results') }}
+                            </div>
+                        </div>
+                    @endif
+
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-12">
+            <div class="box box-default">
+
+                @if ($user->id)
+                    <div class="box-header with-border">
+                        <div class="box-heading">
+                            <h3 class="box-title"> {{ trans('general.accessories') }}</h3>
+                        </div>
+                    </div><!-- /.box-header -->
+                @endif
+
+                <div class="box-body">
+                    <!-- checked out licenses table -->
+                    @if (count($user->accessories) > 0)
+                        <div class="table-responsive">
+                            <table class="table table-striped">
+                                <thead>
+                                <tr>
+                                    <th class="col-md-12">Name</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                @foreach ($user->accessories as $accessory)
+                                    <tr>
+                                        <td>{{ $accessory->name }}</td>
+                                    </tr>
+                                @endforeach
+                                </tbody>
+                            </table>
+                        </div>
+                    @else
+
+                        <div class="col-md-12">
+                            <div class="alert alert-info alert-block">
+                                <i class="fa fa-info-circle"></i>
+                                {{ trans('general.no_results') }}
+                            </div>
+                        </div>
+                    @endif
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            <div class="box box-default">
+
+                @if ($user->id)
+                    <div class="box-header with-border">
+                        <div class="box-heading">
+                            <h3 class="box-title"> History</h3>
+                        </div>
+                    </div><!-- /.box-header -->
+                @endif
+
+                <div class="box-body">
+                    @if (count($userlog) > 0)
+                        <div class="table-responsive">
+                            <table class="table table-striped" id="example">
+                                <thead>
+                                <tr>
+                                    <th class="col-md-1"></th>
+                                    <th class="col-md-2"><span class="line"></span>{{ trans('table.action') }}</th>
+                                    <th class="col-md-4"><span class="line"></span>{{ trans('general.asset') }}</th>
+                                    <th class="col-md-2"><span class="line"></span>{{ trans('table.by') }}</th>
+                                    <th class="col-md-3">{{ trans('general.date') }}</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                @foreach ($userlog as $log)
+                                    <tr>
+                                        <td class="text-center">
+                                            @if ($log->itemType()=="asset")
+                                                <i class="fa fa-barcode"></i>
+                                            @elseif ($log->itemType()=="accessory")
+                                                <i class="fa fa-keyboard-o"></i>
+                                            @elseif ($log->itemType()=="consumable")
+                                                <i class="fa fa-tint"></i>
+                                            @elseif ($log->itemType()=="license")
+                                                <i class="fa fa-floppy-o"></i>
+                                            @else
+                                                <i class="fa fa-times"></i>
+                                            @endif
+
+                                        </td>
+                                        <td>
+                                            {{ strtolower(trans('general.'.str_replace(' ','_',$log->action_type))) }}
+                                        </td>
+                                        <td>
+                                            @if (($log->item) && ($log->itemType()=="asset"))
+                                                @if ($log->item->deleted_at=='')
+                                                    {{ $log->item->showAssetName() }}
+                                                @else
+                                                    <del>{{ $log->item->showAssetName() }}</del> (deleted)
+                                                @endif
+
+                                            @elseif ($log->item)
+                                                @if ($log->item->deleted_at=='')
+                                                    {{ $log->item->name }}
+                                                @else
+                                                    <del>{{ $log->item->name }}</del> (deleted)
+                                                @endif
+                                            @else
+                                                {{ trans('general.bad_data') }}
+                                            @endif
+
+                                        </td>
+                                        <td>
+                                            @if ($log->user)
+                                                {{ $log->user->fullName() }}
+                                            @endif
+                                        </td>
+                                        <td>{{ $log->created_at }}</td>
+                                    </tr>
+                                @endforeach
+                                </tbody>
+                            </table>
+                        </div>
+                    @else
+
+
+                        <div class="col-md-12">
+                            <div class="alert alert-info alert-block">
+                                <i class="fa fa-info-circle"></i>
+                                {{ trans('general.no_results') }}
+                            </div>
+                        </div>
+                    @endif
+                </div>
+            </div>
+        </div>
+    </div>

@stop
@@ -202,7 +202,7 @@ $(function () {
      case 'model':
      show_er('#modal-manufacturer_id');
      show_er('#modal-category_id');
-      show_er('#modal-modelno');
+      show_er('#modal-model_number');
      show_er('#modal-fieldset_id');
      break;

@@ -26,8 +26,8 @@
                </div>

                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-modelno">{{ trans('general.model_no') }}:</label></div>
-                    <div class="col-md-8 col-xs-12"><input type='text' id='modal-modelno' class="form-control"></div>
+                    <div class="col-md-4 col-xs-12"><label for="modal-model_number">{{ trans('general.model_no') }}:</label></div>
+                    <div class="col-md-8 col-xs-12"><input type='text' id='modal-model_number' class="form-control"></div>
                </div>

                <div class="dynamic-form-row">
@@ -159,11 +159,18 @@
            {{ trans('admin/hardware/form.expected_checkin') }}
          </label>
        </div>
+        <div class="checkbox col-md-12">
+          <label>
+            {{ Form::checkbox('notes', '1') }}
+            {{ trans('general.notes') }}
+          </label>
+        </div>




-          @foreach ($customfields as $customfield)
+
+        @foreach ($customfields as $customfield)
            <div class="checkbox col-md-12">
              <label>
                {{ Form::checkbox($customfield->db_column_name(), '1') }}
@@ -22,7 +22,6 @@ fi
 clear

 name="snipeit"
-si="Snipe-IT"
 hostname="$(hostname)"
 fqdn="$(hostname --fqdn)"
 ans=default
@@ -36,16 +35,16 @@ spin[1]="\\"
 spin[2]="|"
 spin[3]="/"

-rm -rf $tmp/
+rm -rf ${tmp:?}
 mkdir $tmp

 # Debian/Ubuntu friendly f(x)s
 progress () {
-	while kill -0 $pid > /dev/null 2>&1
+	while kill -0 "$pid" > /dev/null 2>&1
        do
        	for i in "${spin[@]}"
                do
-                	if [ -e /proc/$pid ]; then
+                	if [ -e /proc/"$pid" ]; then
                        echo -ne "\b$i"
                        sleep .1
                        else
@@ -56,24 +55,26 @@ progress () {
 }

 vhenvfile () {
-		sudo ls -al /etc/apache2/mods-enabled/rewrite.load >> /var/log/snipeit-install.log 2>&1
+		find /etc/apache2/mods-enabled -maxdepth 1 -name 'rewrite.load' >/dev/null 2>&1
 		apachefile=/etc/apache2/sites-available/$name.conf
 		echo "* Create Virtual host for apache."
-		echo >> $apachefile "<VirtualHost *:80>"
-		echo >> $apachefile "ServerAdmin webmaster@localhost"
-		echo >> $apachefile "    <Directory $webdir/$name/public>"
-		echo >> $apachefile "        Require all granted"
-		echo >> $apachefile "        AllowOverride All"
-		echo >> $apachefile "   </Directory>"
-		echo >> $apachefile "    DocumentRoot $webdir/$name/public"
-		echo >> $apachefile "    ServerName $fqdn"
-		echo >> $apachefile "        ErrorLog /var/log/apache2/snipeIT.error.log"
-		echo >> $apachefile "        CustomLog /var/log/apache2/access.log combined"
-		echo >> $apachefile "</VirtualHost>"
+		{
+			echo "<VirtualHost *:80>"
+			echo "ServerAdmin webmaster@localhost"
+			echo "<Directory $webdir/$name/public>"
+			echo "        Require all granted"
+			echo "        AllowOverride All"
+			echo "   </Directory>"
+			echo "    DocumentRoot $webdir/$name/public"
+			echo "    ServerName $fqdn"
+			echo "        ErrorLog /var/log/apache2/snipeIT.error.log"
+			echo "        CustomLog /var/log/apache2/access.log combined"
+			echo "</VirtualHost>"
+		} >> $apachefile
 		echo >> $hosts "127.0.0.1 $hostname $fqdn"
-		a2ensite $name.conf >> /var/log/snipeit-install.log 2>&1
+		log "a2ensite $name.conf"

-		cat > $webdir/$name/.env <<-EOF
+		cat > "$webdir/$name/.env" <<-EOF
 		#Created By Snipe-it Installer
 		APP_TIMEZONE=$(cat /etc/timezone)
 		DB_HOST=localhost
@@ -86,44 +87,45 @@ vhenvfile () {
 }

 perms () {
-		if [ $distro == "debian" ]; then
-		#Change permissions on directories
-		 chmod -R 755 $webdir/$name/storage
-		chmod -R 755 $webdir/$name/storage/private_uploads
-		chmod -R 755 $webdir/$name/public/uploads
-		chown -R www-data:www-data /var/www/$name
-		# echo "* Finished permission changes."
-		else
-		sudo chmod -R 755 $webdir/$name/storage
-		sudo chmod -R 755 $webdir/$name/storage/private_uploads
-		sudo chmod -R 755 $webdir/$name/public/uploads
-		sudo chown -R www-data:www-data /var/www/$name
-		fi
+	chmod_dirs=( "$webdir/$name/storage" )
+	chmod_dirs+=( "$webdir/$name/storage/private_uploads" )
+	chmod_dirs+=( "$webdir/$name/public/uploads" )
+	#Change permissions on directories
+	for chmod_dir in "${chmod_dirs[@]}"
+	do
+		chmod -R 755 "$chmod_dir"
+	done
+}
+    
+log () {
+	eval "$@" |& tee -a /var/log/snipeit-install.log >/dev/null 2>&1
 }

 #CentOS Friendly f(x)s
 function isinstalled {
-  if yum list installed "$@" >/dev/null 2>&1; then
-    true
-  else
-    false
-  fi
+	if yum list installed "$@" >/dev/null 2>&1; then
+		true
+	else
+		false
+	fi
 }

 if [ -f /etc/lsb-release ]; then
-    distro="$(lsb_release -s -i )"
-    version="$(lsb_release -s -r)"
+	. /etc/lsb-release
+	distro="${DISTRIB_ID,,}"
+	version="$DISTRIB_RELEASE"
+	codename="$DISTRIB_CODENAME"
 elif [ -f /etc/os-release ]; then
-    distro="$(. /etc/os-release && echo $ID)"
-    version="$(. /etc/os-release && echo $VERSION_ID)"
-#Order is important here.  If /etc/os-release and /etc/centos-release exist, we're on centos 7.
-#If only /etc/centos-release exist, we're on centos6(or earlier).  Centos-release is less parsable,
-#so lets assume that it's version 6 (Plus, who would be doing a new install of anything on centos5 at this point..)
+	distro="$(. /etc/os-release && echo $ID)"
+	version="$(. /etc/os-release && echo $VERSION_ID)"
+	#Order is important here.  If /etc/os-release and /etc/centos-release exist, we're on centos 7.
+	#If only /etc/centos-release exist, we're on centos6(or earlier).  Centos-release is less parsable,
+	#so lets assume that it's version 6 (Plus, who would be doing a new install of anything on centos5 at this point..)
 elif [ -f /etc/centos-release ]; then
 	distro="Centos"
 	version="6"
 else
-    distro="unsupported"
+	distro="unsupported"
 fi


@@ -177,7 +179,7 @@ read setpw

 case $setpw in
        [yY] | [yY][Ee][Ss] )
-                mysqluserpw="$(echo `< /dev/urandom tr -dc _A-Za-z-0-9 | head -c16`)"
+                mysqluserpw="$(< /dev/urandom tr -dc _A-Za-z-0-9 2>&1 | head -c16)"
                ans="yes"
                ;;
        [nN] | [n|N][O|o] )
@@ -192,17 +194,19 @@ esac
 done

 #Snipe says we need a new 32bit key, so let's create one randomly and inject it into the file
-random32="$(echo `< /dev/urandom tr -dc _A-Za-z-0-9 | head -c32`)"
+random32="$(< /dev/urandom tr -dc _A-Za-z-0-9 2>&1 | head -c32)"

 #db_setup.sql will be injected to the database during install.
 #Again, this file should be removed, which will be a prompt at the end of the script.
-dbsetup=$tmp/db_setup.sql
-echo >> $dbsetup "CREATE DATABASE snipeit;"
-echo >> $dbsetup "GRANT ALL PRIVILEGES ON snipeit.* TO snipeit@localhost IDENTIFIED BY '$mysqluserpw';"
+dbsetup="$tmp/db_setup.sql"
+{
+  echo "CREATE DATABASE snipeit;"
+  echo "GRANT ALL PRIVILEGES ON snipeit.* TO snipeit@localhost IDENTIFIED BY '$mysqluserpw';"
+} >> "$dbsetup"

 #Let us make it so only root can read the file. Again, this isn't best practice, so please remove these after the install.
-chown root:root $dbsetup
-chmod 700 $dbsetup
+chown root:root "$dbsetup"
+chmod 700 "$dbsetup"

 ## TODO: Progress tracker on each step

@@ -216,27 +220,28 @@ case $distro in

 		webdir=/var/www
 		echo -e "\n* Updating Debian packages in the background... ${spin[0]}\n"
-		apt-get update >> /var/log/snipeit-install.log & pid=$! 2>&1
+		log "apt-get update" & pid=$!
 		wait
-		apt-get upgrade >> /var/log/snipeit-install.log & pid=$! 2>&1
+		log "apt-get upgrade" & pid=$!
 		wait
 		echo -e "\n* Installing packages... ${spin[0]}\n"
 		echo -e "\n* Going to suppress more messages that you don't need to worry about. Please wait... ${spin[0]}"
-		DEBIAN_FRONTEND=noninteractive apt-get -y install mariadb-server mariadb-client apache2 git unzip php5 php5-mcrypt php5-curl php5-mysql php5-gd php5-ldap libapache2-mod-php5 curl >> /var/log/snipeit-install.log & pid=$! 2>&1
+		log "DEBIAN_FRONTEND=noninteractive apt-get -y install mariadb-server mariadb-client apache2 git unzip php5 php5-mcrypt php5-curl php5-mysql php5-gd php5-ldap libapache2-mod-php5 curl" & pid=$!
 		progress
 		wait
 		echo -e "\n* Cloning Snipeit, extracting to $webdir/$name..."
-		git clone https://github.com/snipe/snipe-it $webdir/$name >> /var/log/snipeit-install.log & pid=$! 2>&1
+		log "git clone https://github.com/snipe/snipe-it $webdir/$name" & pid=$!
 		progress
-		php5enmod mcrypt >> /var/log/snipeit-install.log 2>&1
-		a2enmod rewrite >> /var/log/snipeit-install.log 2>&1
+		log "php5enmod mcrypt"
+		log "a2enmod rewrite"
 		vhenvfile
 		wait
 		echo >> $hosts "127.0.0.1 $hostname $fqdn"
-		a2ensite $name.conf
+		log "a2ensite $name.conf"
 		echo -e "* Modify the Snipe-It files necessary for a production environment.\n* Securing Mysql"
 		# Have user set own root password when securing install
 		# and just set the snipeit database user at the beginning
+		service mysql status >/dev/null || service mysql start
 		/usr/bin/mysql_secure_installation
 		echo -e "* Creating Mysql Database and User.\n##  Please Input your MySQL/MariaDB root password: "
 		mysql -u root -p < $dbsetup
@@ -244,6 +249,7 @@ case $distro in
 		curl -sS https://getcomposer.org/installer | php
 		php composer.phar install --no-dev --prefer-source
 		perms
+		chown -R www-data:www-data "/var/www/$name"
 		service apache2 restart
 		;;
 	ubuntu)
@@ -253,33 +259,37 @@ case $distro in
 		#composer install, set permissions, restart apache.

 		webdir=/var/www
+		echo -ne "\n* Adding MariaDB repo in the background... ${spin[0]}"
+		(echo "deb [arch=amd64,i386] http://ftp.hosteurope.de/mirror/mariadb.org/repo/10.1/ubuntu $codename main" | tee /etc/apt/sources.list.d/mariadb.list >/dev/null 2>&1)
+		log "apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8"
 		echo -ne "\n* Updating with apt-get update in the background... ${spin[0]}"
-		sudo apt-get update >> /var/log/snipeit-install.log & pid=$! 2>&1
-		rm /var/lib/dpkg/lock
+		log "apt-get update" & pid=$!
+		[ -f /var/lib/dpkg/lock ] && rm -f /var/lib/dpkg/lock
 		progress
 		echo -ne "\n* Upgrading packages with apt-get upgrade in the background... ${spin[0]}"
-		sudo apt-get -y upgrade >> /var/log/snipeit-install.log & pid=$! 2>&1
+		log "apt-get -y upgrade" & pid=$!
 		progress
 		echo -ne "\n* Setting up LAMP in the background... ${spin[0]}\n"
-		sudo DEBIAN_FRONTEND=noninteractive apt-get install -y lamp-server^ >> /var/log/snipeit-install.log & pid=$! 2>&1 
+		log "DEBIAN_FRONTEND=noninteractive apt-get install -y mariadb-server mariadb-client apache2 libapache2-mod-php curl" & pid=$!
 		progress
 		if [ "$version" == "16.04" ]; then
-			sudo apt-get install -y git unzip php php-mcrypt php-curl php-mysql php-gd php-ldap php-zip php-mbstring php-xml >> /var/log/snipeit-install.log & pid=$! 2>&1
+			log "apt-get install -y git unzip php php-mcrypt php-curl php-mysql php-gd php-ldap php-zip php-mbstring php-xml" & pid=$!
 			progress
-			sudo phpenmod mcrypt >> /var/log/snipeit-install.log 2>&1
-			sudo phpenmod mbstring >> /var/log/snipeit-install 2>&1
-			sudo a2enmod rewrite >> /var/log/snipeit-install.log 2>&1
+			log "phpenmod mcrypt"
+			log "phpenmod mbstring"
+			log "a2enmod rewrite"
 		else
-			sudo apt-get install -y git unzip php5 php5-mcrypt php5-curl php5-mysql php5-gd php5-ldap >> /var/log/snipeit-install.log & pid=$! 2>&1
+			log "apt-get install -y git unzip php5 php5-mcrypt php5-curl php5-mysql php5-gd php5-ldap" & pid=$!
 			progress
-			sudo php5enmod mcrypt >> /var/log/snipeit-install.log 2>&1
-			sudo a2enmod rewrite >> /var/log/snipeit-install.log 2>&1
+			log "php5enmod mcrypt"
+			log "a2enmod rewrite"
 		fi
 		echo -ne "\n* Cloning Snipeit, extracting to $webdir/$name... ${spin[0]}"
-		git clone https://github.com/snipe/snipe-it $webdir/$name >> /var/log/snipeit-install.log & pid=$! 2>&1
+		log "git clone https://github.com/snipe/snipe-it $webdir/$name" & pid=$!
 		progress
 		vhenvfile
 		echo -e "* MySQL Phase next.\n"
+		service mysql status >/dev/null || service mysql start
 		/usr/bin/mysql_secure_installation
 		echo -e "* Creating MySQL Database and user.\n* Please Input your MySQL/MariaDB root password created in the previous step.: "
 		mysql -u root -p < $dbsetup
@@ -288,9 +298,10 @@ case $distro in
 		curl -sS https://getcomposer.org/installer  | php
 		php composer.phar install --no-dev --prefer-source
 		perms
+		chown -R www-data:www-data "/var/www/$name"
 		service apache2 restart
 		;;
-	centos )
+	centos)
 	if [ "$version" == "6" ]; then
 		#####################################  Install for Centos/Redhat 6  ##############################################

@@ -299,35 +310,37 @@ case $distro in
 		echo ""
 		echo "##  Adding IUS, epel-release and mariaDB repos.";
 		mariadbRepo=/etc/yum.repos.d/MariaDB.repo
-		touch $mariadbRepo
-		echo >> $mariadbRepo "[mariadb]"
-		echo >> $mariadbRepo "name = MariaDB"
-		echo >> $mariadbRepo "baseurl = http://yum.mariadb.org/10.0/centos6-amd64"
-		echo >> $mariadbRepo "gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB"
-		echo >> $mariadbRepo "gpgcheck=1"
-		echo >> $mariadbRepo "enable=1"
+		touch "$mariadbRepo"
+		{
+			echo "[mariadb]"
+			echo "name = MariaDB"
+			echo "baseurl = http://yum.mariadb.org/10.0/centos6-amd64"
+			echo "gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB"
+			echo "gpgcheck=1"
+			echo "enable=1"
+		} >> "$mariadbRepo"

-		yum -y install wget epel-release >> /var/log/snipeit-install.log 2>&1
-		wget -P $tmp/ https://centos6.iuscommunity.org/ius-release.rpm >> /var/log/snipeit-install.log 2>&1
-		rpm -Uvh $tmp/ius-release*.rpm >> /var/log/snipeit-install.log 2>&1
+		log "yum -y install wget epel-release"
+		log "wget -P "$tmp/" https://centos6.iuscommunity.org/ius-release.rpm"
+		log "rpm -Uvh "$tmp/ius-release*.rpm""

 		#Install PHP and other needed stuff.
 		echo "##  Installing PHP and other needed stuff";
 		PACKAGES="httpd MariaDB-server git unzip php56u php56u-mysqlnd php56u-bcmath php56u-cli php56u-common php56u-embedded php56u-gd php56u-mbstring php56u-mcrypt php56u-ldap"

 		for p in $PACKAGES;do
-			if isinstalled $p;then
-				echo " ##" $p "Installed"
+			if isinstalled "$p"; then
+				echo " ## $p already installed"
 			else
-				echo -n " ##" $p "Installing... "
-				yum -y install $p >> /var/log/snipeit-install.log 2>&1
+				echo -n " ## installing $p ... "
+				log "yum -y install $p"
 				echo "";
 			fi
 		done;

 		echo -e "\n##  Downloading Snipe-IT from github and putting it in the web directory.";

-		wget -P $tmp/ https://github.com/snipe/snipe-it/archive/$file >> /var/log/snipeit-install.log 2>&1
+		log "wget -P $tmp/ https://github.com/snipe/snipe-it/archive/$file"
 		unzip -qo $tmp/$file -d $tmp/
 		cp -R $tmp/$fileName $webdir/$name

@@ -347,21 +360,23 @@ case $distro in
 		echo "##  Creating the new virtual host in Apache.";
 		apachefile=/etc/httpd/conf.d/$name.conf

-		echo >> $apachefile ""
-		echo >> $apachefile ""
-		echo >> $apachefile ""
-		echo >> $apachefile "<VirtualHost *:80>"
-		echo >> $apachefile "ServerAdmin webmaster@localhost"
-		echo >> $apachefile "    <Directory $webdir/$name/public>"
-		echo >> $apachefile "        Allow From All"
-		echo >> $apachefile "        AllowOverride All"
-		echo >> $apachefile "        Options +Indexes"
-		echo >> $apachefile "   </Directory>"
-		echo >> $apachefile "    DocumentRoot $webdir/$name/public"
-		echo >> $apachefile "    ServerName $fqdn"
-		echo >> $apachefile "        ErrorLog /var/log/httpd/snipeIT.error.log"
-		echo >> $apachefile "        CustomLog /var/log/access.log combined"
-		echo >> $apachefile "</VirtualHost>"
+		{
+			echo ""
+			echo ""
+			echo ""
+			echo "<VirtualHost *:80>"
+			echo "ServerAdmin webmaster@localhost"
+			echo "    <Directory $webdir/$name/public>"
+			echo "        Allow From All"
+			echo "        AllowOverride All"
+			echo "        Options +Indexes"
+			echo "   </Directory>"
+			echo "    DocumentRoot $webdir/$name/public"
+			echo "    ServerName $fqdn"
+			echo "        ErrorLog /var/log/httpd/snipeIT.error.log"
+			echo "        CustomLog /var/log/access.log combined"
+			echo "</VirtualHost>"
+		} >> "$apachefile"

 		echo "##  Setting up hosts file.";
 		echo >> $hosts "127.0.0.1 $hostname $fqdn"
@@ -391,10 +406,8 @@ case $distro in
 		curl -sS https://getcomposer.org/installer | php
 		php composer.phar install --no-dev --prefer-source

-		# Change permissions on directories
-		sudo chmod -R 755 $webdir/$name/storage
-		sudo chmod -R 755 $webdir/$name/public/uploads
-		sudo chown -R apache:apache $webdir/$name
+		perms
+		chown -R apache:apache $webdir/$name

                /sbin/service iptables status >/dev/null 2>&1
                if [ $? = 0 ]; then
@@ -415,29 +428,29 @@ case $distro in

 		#Allow us to get the mysql engine
 		echo -e "\n##  Add IUS, epel-release and mariaDB repos.";
-		yum -y install wget epel-release >> /var/log/snipeit-install.log 2>&1
-		wget -P $tmp/ https://centos7.iuscommunity.org/ius-release.rpm >> /var/log/snipeit-install.log 2>&1
-		rpm -Uvh $tmp/ius-release*.rpm >> /var/log/snipeit-install.log 2>&1
+		log "yum -y install wget epel-release"
+		log "wget -P $tmp/ https://centos7.iuscommunity.org/ius-release.rpm"
+		log "rpm -Uvh $tmp/ius-release*.rpm"

 		#Install PHP and other needed stuff.
 		echo "##  Installing PHP and other needed stuff";
 		PACKAGES="httpd mariadb-server git unzip php56u php56u-mysqlnd php56u-bcmath php56u-cli php56u-common php56u-embedded php56u-gd php56u-mbstring php56u-mcrypt php56u-ldap"

 		for p in $PACKAGES;do
-			if isinstalled $p;then
-				echo " ##" $p "Installed"
+			if isinstalled "$p"; then
+				echo " ## $p already installed"
 			else
-				echo -n " ##" $p "Installing... "
-				yum -y install $p >> /var/log/snipeit-install.log 2>&1
+				echo -n " ## installing $p ... "
+				log "yum -y install $p"
 			echo "";
 			fi
 		done;

 		echo -e "\n##  Downloading Snipe-IT from github and put it in the web directory.";

-		wget -P $tmp/ https://github.com/snipe/snipe-it/archive/$file >> /var/log/snipeit-install.log 2>&1
-		unzip -qo $tmp/$file -d $tmp/
-		cp -R $tmp/$fileName $webdir/$name
+		log "wget -P $tmp/ https://github.com/snipe/snipe-it/archive/$file"
+		log "unzip -qo $tmp/$file -d $tmp/"
+		log "cp -R $tmp/$fileName $webdir/$name"

 		# Make mariaDB start on boot and restart the daemon
 		echo "##  Starting the mariaDB server.";
@@ -451,30 +464,32 @@ case $distro in

 		echo "##  Creating MySQL Database/User."
 		echo "##  Please Input your MySQL/MariaDB root password "
-		mysql -u root -p < $dbsetup
+		mysql -u root -p < "$dbsetup"

 		##TODO make sure the apachefile doesnt exist isnt already in there

 		#Create the new virtual host in Apache and enable rewrite
-		apachefile=/etc/httpd/conf.d/$name.conf
+		apachefile="/etc/httpd/conf.d/$name.conf"

-		echo "##  Creating the new virtual host in Apache.";
-		echo >> $apachefile ""
-		echo >> $apachefile ""
-		echo >> $apachefile "LoadModule rewrite_module modules/mod_rewrite.so"
-		echo >> $apachefile ""
-		echo >> $apachefile "<VirtualHost *:80>"
-		echo >> $apachefile "ServerAdmin webmaster@localhost"
-		echo >> $apachefile "    <Directory $webdir/$name/public>"
-		echo >> $apachefile "        Allow From All"
-		echo >> $apachefile "        AllowOverride All"
-		echo >> $apachefile "        Options +Indexes"
-		echo >> $apachefile "   </Directory>"
-		echo >> $apachefile "    DocumentRoot $webdir/$name/public"
-		echo >> $apachefile "    ServerName $fqdn"
-		echo >> $apachefile "        ErrorLog /var/log/httpd/snipeIT.error.log"
-		echo >> $apachefile "        CustomLog /var/log/access.log combined"
-		echo >> $apachefile "</VirtualHost>"
+		{
+			echo "##  Creating the new virtual host in Apache.";
+			echo ""
+			echo ""
+			echo "LoadModule rewrite_module modules/mod_rewrite.so"
+			echo ""
+			echo "<VirtualHost *:80>"
+			echo "ServerAdmin webmaster@localhost"
+			echo "    <Directory $webdir/$name/public>"
+			echo "        Allow From All"
+			echo "        AllowOverride All"
+			echo "        Options +Indexes"
+			echo "   </Directory>"
+			echo "    DocumentRoot $webdir/$name/public"
+			echo "    ServerName $fqdn"
+			echo "        ErrorLog /var/log/httpd/snipeIT.error.log"
+			echo "        CustomLog /var/log/access.log combined"
+			echo "</VirtualHost>"
+		} >> "$apachefile"

 ##TODO make sure this isnt already in there
 		echo "##  Setting up hosts file.";
@@ -509,20 +524,18 @@ case $distro in
 		curl -sS https://getcomposer.org/installer | php
 		php composer.phar install --no-dev --prefer-source

-		sudo chmod -R 755 $webdir/$name/storage
-		sudo chmod -R 755 $webdir/$name/storage/private_uploads
-		sudo chmod -R 755 $webdir/$name/public/uploads
-		sudo chown -R apache:apache $webdir/$name
+		perms
+		chown -R apache:apache $webdir/$name
 		# Make SeLinux happy
-		sudo chcon -R -h -t httpd_sys_script_rw_t $webdir/$name/
+		chcon -R -h -t httpd_sys_script_rw_t $webdir/$name/

          	#Check if SELinux is enforcing
-	       	if [ $(getenforce) == "Enforcing" ]; then
+	       	if [ "$(getenforce)" == "Enforcing" ]; then
 	 	       #Add SELinux and firewall exception/rules.
 		       #Required for ldap integration
 	       	       setsebool -P httpd_can_connect_ldap on
 	 	       #Sets SELinux context type so that scripts running in the web server process are allowed read/write access
-	 	       sudo chcon -R -h -t httpd_sys_script_rw_t $webdir/$name/
+	 	       chcon -R -h -t httpd_sys_script_rw_t $webdir/$name/
 	       	fi

 		systemctl restart httpd.service
@@ -542,6 +555,6 @@ echo ""
 echo "* Cleaning up..."
 rm -f snipeit.sh
 rm -f install.sh
-rm -rf $tmp/
+rm -rf ${tmp:?}
 echo "* Finished!"
 sleep 1
Author	SHA1	Message	Date
snipe	265a896211	Bumped version	2017-02-22 22:38:33 -08:00
snipe	f7e4fca70d	Add model_number to accessory search	2017-02-22 22:34:56 -08:00
snipe	bb4c443cd9	Added notes to custom report	2017-02-03 02:20:56 -08:00
snipe	7b1d2ee050	Fixed typo	2017-01-17 11:57:24 -08:00
snipe	b3f70a046f	Don’t require superadmin for checkin and delete user	2017-01-17 09:19:14 -08:00
morph027	734e87f85f	Installer fine tuning (#2993 ) * used shellcheck to lint snipeit.sh * do not depend on lsb-release command * add lsb codename * really use perms() * more fixes * quiet apt * silent logging using log() * start mysql if not running * added curl to ubuntu * added logfile to log function * update apt index after adding mariadb repo * fixed typo * review fixes	2017-01-10 23:07:06 -08:00
snipe	f371c5fd62	Merge branch 'master' of github.com:snipe/snipe-it	2017-01-10 19:02:18 -08:00
snipe	4b3edbd2f5	Fixed #3130 - model ID not being saved weith model info on modal for create asset	2017-01-10 19:02:13 -08:00
Byron Wolfman	1f3106b9da	Use debian base container and clean up apt-get (#3011 ) * Use debian base container and clean up apt-get Attempt to slim down the docker image by replacing ubuntu:trusty with debian:jessie and clean up after apt-get invocation. Building against the 3.6.0 commit shows a healthy reduction of 44MB, or 9%, compared to the ubuntu-based image. * Use debian:jessie-slim for an even smaller image If we're using a debian base image for sizing reasons, we may as well go the full distance and use debian-slim.	2017-01-10 16:22:06 -08:00
snipe	9fd3a9a82d	Removed logging	2017-01-06 03:12:49 -08:00
snipe	a6e6991a2d	Removed second number_format	2017-01-06 03:11:27 -08:00
snipe	93ba0717d8	Removed number_format	2017-01-06 03:02:38 -08:00
snipe	a8839e0ef4	Fixes #3104 , #2914 and #2918 - auto-increment incorrectly generating next ID	2017-01-06 02:52:10 -08:00
snipe	3e4152c966	Bumped version	2017-01-06 00:04:26 -08:00
snipe	1bf34d73f5	Use correct authorize rule in middleware for user delete	2017-01-06 00:02:46 -08:00
snipe	d1e360d64d	Fix logic to use gate instead of asking if superuser	2017-01-06 00:02:19 -08:00
snipe	3b5b19848c	Added oauth keys to gitignore	2017-01-06 00:01:55 -08:00
snipe	93ba90e837	Merge remote-tracking branch 'origin/develop'	2016-12-12 19:24:00 -08:00
snipe	fc70d79a17	Merge remote-tracking branch 'origin/develop'	2016-12-12 19:07:07 -08:00
snipe	65016a2383	Merge remote-tracking branch 'origin/develop'	2016-12-05 16:12:41 -08:00
snipe	dbcb2ccb46	Merge remote-tracking branch 'origin/develop'	2016-12-05 15:09:49 -08:00
snipe	2afcfcc87c	Set DB_SSL to false for config	2016-12-03 17:32:44 -08:00
snipe	1afef9416a	Merge remote-tracking branch 'origin/develop' # Conflicts: # config/version.php	2016-12-03 17:15:02 -08:00
snipe	4049143ebf	Bumped version	2016-12-01 06:11:03 -08:00
snipe	4df53bdf8d	Merge remote-tracking branch 'origin/develop' # Conflicts: # config/version.php # resources/views/account/view-assets.blade.php	2016-12-01 06:10:50 -08:00
snipe	d49a1ea304	More graceful error message if log doesn’t exist	2016-12-01 06:05:14 -08:00
snipe	521f4facd5	Bumped version	2016-12-01 05:56:24 -08:00
snipe	b4653dfc15	Ignore npm log	2016-12-01 05:55:29 -08:00