Merge remote-tracking branch 'origin/develop'

Bumped version
2016-09-06 10:38:31 -07:00 · 2016-09-06 10:38:07 -07:00 · 2016-09-06 10:35:33 -07:00 · 2016-09-01 13:28:15 -07:00 · 2016-09-01 12:53:38 -07:00 · 2016-08-30 13:25:14 -07:00
432 changed files with 4936 additions and 2811 deletions
@@ -30,7 +30,7 @@ MAIL_USERNAME=YOURUSERNAME
 MAIL_PASSWORD=YOURPASSWORD
 MAIL_ENCRYPTION=null
 MAIL_FROM_ADDR=you@example.com
-MAIL_FROM_NAME=Snipe-IT
+MAIL_FROM_NAME='Snipe-IT'


 # --------------------------------------------
@@ -74,4 +74,5 @@ AWS_BUCKET=null
 APP_LOG=single
 APP_LOCKED=false
 FILESYSTEM_DISK=local
-APP_TRUSTED_PROXIES=192.168.1.1,10.0.0.1
+APP_TRUSTED_PROXIES=192.168.1.1,10.0.0.1
+ALLOW_IFRAMING=false
@@ -80,7 +80,7 @@ RUN cd /var/www/html;composer install

 ############### DATA VOLUME #################

-VOLUME [/var/lib/snipeit]
+VOLUME ["/var/lib/snipeit"]

 ##### START SERVER

@@ -1,25 +1,27 @@
 <?php
 namespace App\Console\Commands;

-use Illuminate\Console\Command;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\InputArgument;
-use League\Csv\Reader;
+use App\Helpers\Helper;
 use App\Models\Accessory;
 use App\Models\Asset;
 use App\Models\AssetModel;
 use App\Models\Category;
 use App\Models\Company;
 use App\Models\Consumable;
+use App\Models\CustomField;
 use App\Models\Location;
 use App\Models\Manufacturer;
+use App\Models\Setting;
 use App\Models\Statuslabel;
 use App\Models\Supplier;
 use App\Models\User;
-use App\Models\CustomField;
 use DB;
-use App\Models\Setting;
+use Illuminate\Console\Command;
 use Illuminate\Database\Eloquent\Model;
+use League\Csv\Reader;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
+use ForceUTF8\Encoding;

 ini_set('max_execution_time', 600); //600 seconds = 10 minutes
 ini_set('memory_limit', '500M');
@@ -102,9 +104,17 @@ class ObjectImportCommand extends Command
        $this->companies = Company::All(['name', 'id']);
        $this->status_labels = Statuslabel::All(['name', 'id']);
        $this->suppliers = Supplier::All(['name', 'id']);
-        $this->assets = Asset::all(['asset_tag']);
-        $this->accessories = Accessory::All(['name']);
-        $this->consumables = Consumable::All(['name']);
+        switch (strtolower($this->option('item-type'))) {
+            case "asset":
+                $this->assets = Asset::all();
+                break;
+            case "accessory":
+                $this->accessories = Accessory::All();
+                break;
+            case "consumable":
+                $this->consumables = Consumable::All();
+                break;
+        }
        $this->customfields = CustomField::All(['name']);
        $bar = null;

@@ -275,7 +285,7 @@ class ObjectImportCommand extends Command
     */
    public function array_smart_fetch(array $array, $key, $default = '')
    {
-        return array_key_exists($key, $array) ? e(trim($array[ $key ])) : $default;
+        return array_key_exists(trim($key), $array) ? e(Encoding::fixUTF8(trim($array[ $key ]))) : $default;
    }


@@ -313,7 +323,7 @@ class ObjectImportCommand extends Command
        $asset_model_name = $this->array_smart_fetch($row, "model name");
        $asset_modelno = $this->array_smart_fetch($row, "model number");
        if (empty($asset_model_name)) {
-            $asset_model_name='Unknown';
+            $asset_model_name ='Unknown';
        }
        if (empty($asset_modelno)) {
            $asset_modelno='';
@@ -346,6 +356,7 @@ class ObjectImportCommand extends Command
                return $asset_model;
            } else {
                $this->jsonError('Asset Model "' . $asset_model_name . '"', $asset_model->getErrors());
+                $this->log('Asset Model "' . $asset_model_name . '"', $asset_model->getErrors());
                return $asset_model;
            }
        } else {
@@ -732,6 +743,24 @@ class ObjectImportCommand extends Command
     */
    public function createAssetIfNotExists(array $row, array $item)
    {
+        $asset = null;
+        $editingAsset = false;
+        foreach ($this->assets as $tempasset) {
+            if (strcasecmp($tempasset->asset_tag, $item['asset_tag']) == 0) {
+                $this->log('A matching Asset ' . $item['asset_tag'] . ' already exists');
+                if (!$this->option('update')) {
+                    $this->log("Skipping item.");
+                    return;
+                }
+                $this->log('Updating matching asset with new values');
+                $editingAsset = true;
+                $asset = $tempasset;
+            }
+        }
+        if (is_null($asset)) {
+            $this->log("No Matching Asset, Creating a new one");
+            $asset = new Asset;
+        }
        $asset_serial = $this->array_smart_fetch($row, "serial number");
        $asset_image = $this->array_smart_fetch($row, "image");
        $asset_warranty_months = intval($this->array_smart_fetch($row, "warranty months"));
@@ -747,12 +776,7 @@ class ObjectImportCommand extends Command
        $this->log('Notes: '.$item["notes"]);
        $this->log('Warranty Months: ' . $asset_warranty_months);

-        foreach ($this->assets as $tempasset) {
-            if (strcasecmp($tempasset->asset_tag, $item['asset_tag']) == 0) {
-                $this->log('A matching Asset ' . $item['asset_tag'] . ' already exists');
-                return;
-            }
-        }
+

        if ($item["status_label"]) {
            $status_id = $item["status_label"]->id;
@@ -763,12 +787,14 @@ class ObjectImportCommand extends Command
            $status_id = 1;
        }

-        $asset = new Asset();
-        $asset->name = $item["item_name"];
-        if ($item["purchase_date"] != '') {
+        if (!$editingAsset) {
+            $asset->asset_tag = $item['asset_tag']; // This doesn't need to be guarded for empty because it's the key we use to identify the asset.
+        }
+        if (!empty($item['item_name'])) {
+            $asset->name = $item["item_name"];
+        }
+        if (!empty($item["purchase_date"])) {
            $asset->purchase_date = $item["purchase_date"];
-        } else {
-            $asset->purchase_date = null;
        }

        if (array_key_exists('custom_fields', $item)) {
@@ -780,37 +806,53 @@ class ObjectImportCommand extends Command
        if (!empty($item["purchase_cost"])) {
            //TODO How to generalize this for not USD?
            $purchase_cost = substr($item["purchase_cost"], 0, 1) === '$' ? substr($item["purchase_cost"], 1) : $item["purchase_cost"];
-            $asset->purchase_cost = number_format($purchase_cost, 2);
+            // $asset->purchase_cost = number_format($purchase_cost, 2, '.', '');
+            $asset->purchase_cost = Helper::ParseFloat($purchase_cost);
            $this->log("Asset cost parsed: " . $asset->purchase_cost);
        } else {
            $asset->purchase_cost = 0.00;
        }
-        $asset->serial = $asset_serial;
-        $asset->asset_tag = $item['asset_tag'];
-                $asset->warranty_months = $asset_warranty_months;
+        if (!empty($asset_serial)) {
+            $asset->serial = $asset_serial;
+        }
+        if (!empty($asset_warranty_months)) {
+            $asset->warranty_months = $asset_warranty_months;
+        }

        if ($asset_model) {
            $asset->model_id = $asset_model->id;
        }
+
        if ($item["user"]) {
            $asset->assigned_to = $item["user"]->id;
        }
+
        if ($item["location"]) {
            $asset->rtd_location_id = $item["location"]->id;
        }
+
        $asset->user_id = $this->option('user_id');
-        $this->log("status_id: " . $status_id);
-        $asset->status_id = $status_id;
+        if (!empty($status_id)) {
+            $asset->status_id = $status_id;
+        }
        if ($item["company"]) {
            $asset->company_id = $item["company"]->id;
        }
-        $asset->order_number = $item["order_number"];
+        if ($item["order_number"]) {
+            $asset->order_number = $item["order_number"];
+        }
        if ($supplier) {
            $asset->supplier_id = $supplier->id;
        }
-        $asset->notes = $item["notes"];
-        $asset->image = $asset_image;
-        $this->assets->add($asset);
+        if ($item["notes"]) {
+            $asset->notes = $item["notes"];
+        }
+        if (!empty($asset_image)) {
+            $asset->image = $asset_image;
+        }
+        if (!$editingAsset) {
+            $this->assets->add($asset);
+        }
        if (!$this->option('testrun')) {

            if ($asset->save()) {
@@ -835,17 +877,29 @@ class ObjectImportCommand extends Command
     */
    public function createAccessoryIfNotExists(array $item)
    {
+        $accessory = null;
+        $editingAccessory = false;
        $this->log("Creating Accessory");
        foreach ($this->accessories as $tempaccessory) {
            if (strcasecmp($tempaccessory->name, $item["item_name"]) == 0) {
                $this->log('A matching Accessory ' . $item["item_name"] . ' already exists.  ');
-                // FUTURE: Adjust quantity on import maybe?
-                return;
+                if (!$this->option('update')) {
+                    $this->log("Skipping accessory.");
+                    return;
+                }
+                $this->log('Updating matching accessory with new values');
+                $editingAccessory = true;
+                $accessory = $tempaccessory;
            }
        }
+        if (is_null($accessory)) {
+            $this->log("No Matching Accessory, Creating a new one");
+            $accessory = new Accessory();
+        }

-        $accessory = new Accessory();
-        $accessory->name = $item["item_name"];
+        if (!$editingAccessory) {
+            $accessory->name = $item["item_name"];
+        }

        if (!empty($item["purchase_date"])) {
            $accessory->purchase_date = $item["purchase_date"];
@@ -853,10 +907,9 @@ class ObjectImportCommand extends Command
            $accessory->purchase_date = null;
        }
        if (!empty($item["purchase_cost"])) {
-            $accessory->purchase_cost = number_format(e($item["purchase_cost"]), 2);
-        } else {
-            $accessory->purchase_cost = 0.00;
+            $accessory->purchase_cost = Helper::ParseFloat($item["purchase_cost"]);
        }
+
        if ($item["location"]) {
            $accessory->location_id = $item["location"]->id;
        }
@@ -864,20 +917,26 @@ class ObjectImportCommand extends Command
        if ($item["company"]) {
            $accessory->company_id = $item["company"]->id;
        }
-        $accessory->order_number = $item["order_number"];
+        if (!empty($item["order_number"])) {
+            $accessory->order_number = $item["order_number"];
+        }
        if ($item["category"]) {
            $accessory->category_id = $item["category"]->id;
        }

        //TODO: Implement
 //		$accessory->notes = e($item_notes);
-        $accessory->requestable = filter_var($item["requestable"], FILTER_VALIDATE_BOOLEAN);
+        if (!empty($item["requestable"])) {
+            $accessory->requestable = filter_var($item["requestable"], FILTER_VALIDATE_BOOLEAN);
+        }

        //Must have at least zero of the item if we import it.
-        if ($item["quantity"] > -1) {
-            $accessory->qty = $item["quantity"];
-        } else {
-            $accessory->qty = 1;
+        if (!empty($item["quantity"])) {
+            if ($item["quantity"] > -1) {
+                $accessory->qty = $item["quantity"];
+            } else {
+                $accessory->qty = 1;
+            }
        }

        if (!$this->option('testrun')) {
@@ -904,18 +963,29 @@ class ObjectImportCommand extends Command
     */
    public function createConsumableIfNotExists(array $item)
    {
+        $consumable = null;
+        $editingConsumable = false;
        $this->log("Creating Consumable");
        foreach ($this->consumables as $tempconsumable) {
            if (strcasecmp($tempconsumable->name, $item["item_name"]) == 0) {
                $this->log("A matching consumable " . $item["item_name"] . " already exists");
-                //TODO: Adjust quantity if different maybe?
-                return;
+                if (!$this->option('update')) {
+                    $this->log("Skipping consumable.");
+                    return;
+                }
+                $this->log('Updating matching consumable with new values');
+                $editingConsumable = true;
+                $consumable = $tempconsumable;
            }
        }

-        $consumable = new Consumable();
-        $consumable->name = $item["item_name"];
-
+        if (is_null($consumable)) {
+            $this->log("No matching consumable, creating one");
+            $consumable = new Consumable();
+        }
+        if (!$editingConsumable) {
+            $consumable->name = $item["item_name"];
+        }
        if (!empty($item["purchase_date"])) {
            $consumable->purchase_date = $item["purchase_date"];
        } else {
@@ -923,26 +993,37 @@ class ObjectImportCommand extends Command
        }

        if (!empty($item["purchase_cost"])) {
-            $consumable->purchase_cost = number_format(e($item["purchase_cost"]), 2);
-        } else {
-            $consumable->purchase_cost = 0.00;
+            $consumable->purchase_cost = Helper::ParseFloat($item["purchase_cost"]);
+        }
+        if ($item["location"]) {
+            $consumable->location_id = $item["location"]->id;
        }
-        $consumable->location_id = $item["location"]->id;
        $consumable->user_id = $this->option('user_id');
-        $consumable->company_id = $item["company"]->id;
-        $consumable->order_number = $item["order_number"];
-        $consumable->category_id = $item["category"]->id;
+        if ($item["company"]) {
+            $consumable->company_id = $item["company"]->id;
+        }
+        if (!empty($item["order_number"])) {
+            $consumable->order_number = $item["order_number"];
+        }
+        if ($item["category"]) {
+            $consumable->category_id = $item["category"]->id;
+        }
        // TODO:Implement
        //$consumable->notes= e($item_notes);
-        $consumable->requestable = filter_var($item["requestable"], FILTER_VALIDATE_BOOLEAN);
+        if (!empty($item["requestable"])) {
+            $consumable->requestable = filter_var($item["requestable"], FILTER_VALIDATE_BOOLEAN);
+        }

-        if ($item["quantity"] > -1) {
-            $consumable->qty = $item["quantity"];
-        } else {
-            $consumable->qty = 1;
+        if (!empty($item["quantity"])) {
+            if ($item["quantity"] > -1) {
+                $consumable->qty = $item["quantity"];
+            } else {
+                $consumable->qty = 1;
+            }
        }

        if (!$this->option("testrun")) {
+            // dd($consumable);
            if ($consumable->save()) {
                $this->log("Consumable " . $item["item_name"] . ' was created');
                // $this->comment("Consumable " . $item["item_name"] . ' was created');
@@ -985,8 +1066,9 @@ class ObjectImportCommand extends Command
        array('testrun', null, InputOption::VALUE_NONE, 'If set, will parse and output data without adding to database', null),
        array('logfile', null, InputOption::VALUE_REQUIRED, 'The path to log output to.  storage/logs/importer.log by default', storage_path('logs/importer.log') ),
        array('item-type', null, InputOption::VALUE_REQUIRED, 'Item Type To import.  Valid Options are Asset, Consumable, Or Accessory', 'Asset'),
-                array('web-importer', null, InputOption::VALUE_NONE, 'Internal: packages output for use with the web importer'),
-                array('user_id', null, InputOption::VALUE_REQUIRED, 'ID of user creating items', 1)
+        array('web-importer', null, InputOption::VALUE_NONE, 'Internal: packages output for use with the web importer'),
+        array('user_id', null, InputOption::VALUE_REQUIRED, 'ID of user creating items', 1),
+        array('update', null, InputOption::VALUE_NONE, 'If a matching item is found, update item information'),
        );

    }
@@ -62,15 +62,19 @@ class Purge extends Command
            $assetcount = $assets->count();
            $this->info($assets->count().' assets purged.');
            $asset_assoc = 0;
+            $asset_maintenances = 0;

            foreach ($assets as $asset) {
                $this->info('- Asset "'.$asset->showAssetName().'" deleted.');
                $asset_assoc += $asset->assetlog()->count();
                $asset->assetlog()->forceDelete();
+                $asset_maintenances += $asset->assetmaintenances()->count();
+                $asset->assetmaintenances()->forceDelete();
                $asset->forceDelete();
            }

            $this->info($asset_assoc.' corresponding log records purged.');
+            $this->info($asset_maintenances.' corresponding maintenance records purged.');

            $locations = Location::whereNotNull('deleted_at')->withTrashed()->get();
            $this->info($locations->count().' locations purged.');
@@ -17,6 +17,8 @@ use App\Models\Component;
 use App\Models\Accessory;
 use App\Models\Consumable;
 use App\Models\Asset;
+use Crypt;
+use Illuminate\Contracts\Encryption\DecryptException;

 /*
 * To change this license header, choose License Headers in Project Properties.
@@ -43,6 +45,17 @@ class Helper
        return array_walk($emails_array, 'trim_value');
    }

+    public static function formatCurrencyOutput($cost)
+    {
+        // The importer has formatted number strings since v3, so the value might be a string, or an integer.
+        // If it's a number, format it as a string
+        if (is_numeric($cost)) {
+            return number_format($cost, 2, '.', '');
+        }
+        // It's already been parsed.
+        return $cost;
+    }
+
    // This doesn't do anything yet
    public static function trim_value(&$value)
    {
@@ -226,7 +239,7 @@ class Helper
    {
        $keys=array_keys(CustomField::$PredefinedFormats);
        $stuff=array_combine($keys, $keys);
-        return $stuff+["" => "Custom Format..."];
+        return $stuff+["" => trans('admin/custom_fields/general.custom_format')];
    }

    public static function barcodeDimensions($barcode_type = 'QRCODE')
@@ -429,4 +442,57 @@ class Helper
        }
    }

+
+    /**
+     * Check to see if the given key exists in the array, and trim excess white space before returning it
+     *
+     * @author Daniel Melzter
+     * @since 3.0
+     * @param $array array
+     * @param $key string
+     * @param $default string
+     * @return string
+     */
+    public static function array_smart_fetch(array $array, $key, $default = '')
+    {
+       array_change_key_case($array, CASE_LOWER);
+        return array_key_exists(strtolower($key), array_change_key_case($array)) ? e(trim($array[ $key ])) : $default;
+    }
+
+    /**
+     * Check to see if the given key exists in the array, and trim excess white space before returning it
+     *
+     * @author A. Gianotto
+     * @since 3.2
+     * @param $array array
+     * @return string
+     */
+    public static function getLastDateFromHistoryArray(array $array)
+    {
+        foreach ($array as $key => $value) {
+//            echo '<pre>';
+//            echo 'last:'.$key;
+//            print_r($array);
+//            echo '</pre>';
+        }
+    }
+
+
+    public static function gracefulDecrypt(CustomField $field, $string) {
+
+        if ($field->isFieldDecryptable($string)) {
+
+            try {
+                Crypt::decrypt($string);
+                return Crypt::decrypt($string);
+
+            } catch (DecryptException $e) {
+                return 'Error Decrypting: '.$e->getMessage();
+            }
+
+        }
+        return $string;
+
+    }
+
 }
@@ -53,14 +53,12 @@ class AccessoriesController extends Controller
    public function getCreate(Request $request)
    {
        // Show the page
-        $category_list = Helper::categoryList('accessory');
-        $company_list = Helper::companyList();
-        $location_list = Helper::locationsList();
        return View::make('accessories/edit')
          ->with('accessory', new Accessory)
-          ->with('category_list', $category_list)
-          ->with('company_list', $company_list)
-          ->with('location_list', $location_list);
+          ->with('category_list', Helper::categoryList('accessory'))
+          ->with('company_list', Helper::companyList())
+          ->with('location_list', Helper::locationsList())
+          ->with('manufacturer_list', Helper::manufacturerList());
    }


@@ -77,12 +75,13 @@ class AccessoriesController extends Controller
        $accessory = new Accessory();

        // Update the accessory data
-        $accessory->name                  = e(Input::get('name'));
-        $accessory->category_id               = e(Input::get('category_id'));
-        $accessory->location_id               = e(Input::get('location_id'));
-        $accessory->min_amt               = e(Input::get('min_amt'));
+        $accessory->name                    = e(Input::get('name'));
+        $accessory->category_id             = e(Input::get('category_id'));
+        $accessory->location_id             = e(Input::get('location_id'));
+        $accessory->min_amt                 = e(Input::get('min_amt'));
        $accessory->company_id              = Company::getIdForCurrentUser(Input::get('company_id'));
        $accessory->order_number            = e(Input::get('order_number'));
+        $accessory->manufacturer_id         = e(Input::get('manufacturer_id'));

        if (e(Input::get('purchase_date')) == '') {
            $accessory->purchase_date       =  null;
@@ -96,8 +95,8 @@ class AccessoriesController extends Controller
            $accessory->purchase_cost       = e(Input::get('purchase_cost'));
        }

-        $accessory->qty                       = e(Input::get('qty'));
-        $accessory->user_id               = Auth::user()->id;
+        $accessory->qty                     = e(Input::get('qty'));
+        $accessory->user_id                 = Auth::user()->id;

        // Was the accessory created?
        if ($accessory->save()) {
@@ -126,14 +125,11 @@ class AccessoriesController extends Controller
            return redirect()->to('admin/accessories')->with('error', trans('general.insufficient_permissions'));
        }

-        $category_list = Helper::categoryList('accessory');
-        $company_list = Helper::companyList();
-        $location_list = Helper::locationsList();
-
        return View::make('accessories/edit', compact('accessory'))
-          ->with('category_list', $category_list)
-          ->with('company_list', $company_list)
-          ->with('location_list', $location_list);
+          ->with('category_list', Helper::categoryList('accessory'))
+          ->with('company_list', Helper::companyList())
+          ->with('location_list', Helper::locationsList())
+          ->with('manufacturer_list', Helper::manufacturerList());
    }


@@ -146,9 +142,9 @@ class AccessoriesController extends Controller
   */
    public function postEdit(Request $request, $accessoryId = null)
    {
-      // Check if the blog post exists
+      // Check if the accessory exists
        if (is_null($accessory = Accessory::find($accessoryId))) {
-            // Redirect to the blogs management page
+            // Redirect to the accessory index page
            return redirect()->to('admin/accessories')->with('error', trans('admin/accessories/message.does_not_exist'));
        } elseif (!Company::isCurrentUserHasAccess($accessory)) {
            return redirect()->to('admin/accessories')->with('error', trans('general.insufficient_permissions'));
@@ -160,11 +156,12 @@ class AccessoriesController extends Controller
        if (e(Input::get('location_id')) == '') {
            $accessory->location_id = null;
        } else {
-            $accessory->location_id     = e(Input::get('location_id'));
+            $accessory->location_id         = e(Input::get('location_id'));
        }
-        $accessory->min_amt             = e(Input::get('min_amt'));
+        $accessory->min_amt                 = e(Input::get('min_amt'));
        $accessory->category_id             = e(Input::get('category_id'));
        $accessory->company_id              = Company::getIdForCurrentUser(Input::get('company_id'));
+        $accessory->manufacturer_id         = e(Input::get('manufacturer_id'));
        $accessory->order_number            = e(Input::get('order_number'));

        if (e(Input::get('purchase_date')) == '') {
@@ -181,9 +178,9 @@ class AccessoriesController extends Controller

        $accessory->qty                     = e(Input::get('qty'));

-      // Was the accessory created?
+      // Was the accessory updated?
        if ($accessory->save()) {
-            // Redirect to the new accessory page
+            // Redirect to the updated accessory page
            return redirect()->to("admin/accessories")->with('success', trans('admin/accessories/message.update.success'));
        }

@@ -617,10 +614,12 @@ class AccessoriesController extends Controller
            'min_amt'  => e($accessory->min_amt),
            'location'      => ($accessory->location) ? e($accessory->location->name): '',
            'purchase_date' => e($accessory->purchase_date),
-            'purchase_cost' => number_format($accessory->purchase_cost, 2),
+            'purchase_cost' => Helper::formatCurrencyOutput($accessory->purchase_cost),
            'numRemaining'  => $accessory->numRemaining(),
            'actions'       => $actions,
-            'companyName'   => is_null($company) ? '' : e($company->name)
+            'companyName'   => is_null($company) ? '' : e($company->name),
+            'manufacturer'      => $accessory->manufacturer ? (string) link_to('/admin/settings/manufacturers/'.$accessory->manufacturer_id.'/view', $accessory->manufacturer->name) : ''
+
            );
        }

@@ -122,20 +122,18 @@ class AssetMaintenancesController extends Controller

            $actions = '<nobr><a href="'.route('update/asset_maintenance', $maintenance->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/asset_maintenance', $maintenance->id).'" data-content="'.trans('admin/asset_maintenances/message.delete.confirm').'" data-title="'.trans('general.delete').' '.htmlspecialchars($maintenance->title).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></nobr>';

-            if (($maintenance->cost) && ($maintenance->asset->assetloc) &&  ($maintenance->asset->assetloc->currency!='')) {
+            if (($maintenance->cost) && (isset($maintenance->asset)) && ($maintenance->asset->assetloc) &&  ($maintenance->asset->assetloc->currency!='')) {
                $maintenance_cost = $maintenance->asset->assetloc->currency.$maintenance->cost;
            } else {
                $maintenance_cost = $settings->default_currency.$maintenance->cost;
            }
-
-            $company = $maintenance->asset->company;
-
+            
            $rows[] = array(
                'id'            => $maintenance->id,
-                'asset_name'    =>  (string)link_to('/hardware/'.$maintenance->asset->id.'/view', $maintenance->asset->showAssetName()) ,
+                'asset_name'    =>  ($maintenance->asset) ? (string)link_to('/hardware/'.$maintenance->asset->id.'/view', $maintenance->asset->showAssetName()) : 'Deleted Asset' ,
                'title'         => $maintenance->title,
                'notes'         => $maintenance->notes,
-                'supplier'      => $maintenance->supplier->name,
+                'supplier'      => ($maintenance->supplier) ? (string)link_to('/admin/settings/suppliers/'.$maintenance->supplier->id.'/view', $maintenance->supplier->name) : 'Deleted Supplier',
                'cost'          => $maintenance_cost,
                'asset_maintenance_type'          => e($maintenance->asset_maintenance_type),
                'start_date'         => $maintenance->start_date,
@@ -143,7 +141,7 @@ class AssetMaintenancesController extends Controller
                'completion_date'     => $maintenance->completion_date,
                'user_id'       => ($maintenance->admin) ? (string)link_to('/admin/users/'.$maintenance->admin->id.'/view', $maintenance->admin->fullName()) : '',
                'actions'       => $actions,
-                'companyName'   => is_null($company) ? '' : $company->name
+                'companyName'   => ($maintenance->asset) ? $maintenance->asset->company->name : ''
            );
        }

@@ -309,7 +307,7 @@ class AssetMaintenancesController extends Controller
                                    '' => 'Select an improvement type',
                                ] + AssetMaintenance::getImprovementOptions();

-        $assets = Company::scopeCompanyables(Asset::all(), 'assets.company_id')->lists('detailed_name', 'id');
+        $assets = Company::scopeCompanyables(Asset::with('model','assignedUser')->get(), 'assets.company_id')->lists('detailed_name', 'id');
        // Get Supplier List
        $supplier_list = Helper::suppliersList();

@@ -23,6 +23,7 @@ use Validator;
 use Artisan;
 use Auth;
 use Config;
+use League\Csv\Reader;
 use DB;
 use Image;
 use Input;
@@ -239,7 +240,7 @@ class AssetsController extends Controller
                    $constraint->upsize();
                })->save($path);
                $asset->image = $file_name;
-            } catch(\Exception $e) {
+            } catch (\Exception $e) {
                \Input::flash();
                $messageBag = new \Illuminate\Support\MessageBag();
                $messageBag->add('image', $e->getMessage());
@@ -353,7 +354,7 @@ class AssetsController extends Controller
        }

        if ($request->has('purchase_cost')) {
-            $asset->purchase_cost = e(number_format($request->input('purchase_cost'), 2, '.', ''));
+            $asset->purchase_cost = e(Helper::formatCurrencyOutput($request->input('purchase_cost')));
        } else {
            $asset->purchase_cost =  null;
        }
@@ -417,7 +418,7 @@ class AssetsController extends Controller
                    $constraint->upsize();
                })->save($path);
                $asset->image = $file_name;
-            } catch(\Exception $e) {
+            } catch (\Exception $e) {
                \Input::flash();
                $messageBag = new \Illuminate\Support\MessageBag();
                $messageBag->add('image', $e->getMessage());
@@ -435,14 +436,22 @@ class AssetsController extends Controller
        $model = AssetModel::find($request->get('model_id'));
        if ($model->fieldset) {
            foreach ($model->fieldset->fields as $field) {
-                $asset->{\App\Models\CustomField::name_to_db_name($field->name)} = e($request->input(\App\Models\CustomField::name_to_db_name($field->name)));
-    //                LOG::debug($field->name);
-    //                LOG::debug(\App\Models\CustomField::name_to_db_name($field->name));
-    //                LOG::debug($field->db_column_name());
+
+
+                if ($field->field_encrypted=='1') {
+                    if (Gate::allows('admin')) {
+                        $asset->{\App\Models\CustomField::name_to_db_name($field->name)} = \Crypt::encrypt(e($request->input(\App\Models\CustomField::name_to_db_name($field->name))));
+                    }
+
+                } else {
+                    $asset->{\App\Models\CustomField::name_to_db_name($field->name)} = e($request->input(\App\Models\CustomField::name_to_db_name($field->name)));
+                }
+

            }
        }

+
        if ($asset->save()) {
            // Redirect to the new asset page
            \Session::flash('success', trans('admin/hardware/message.update.success'));
@@ -529,6 +538,8 @@ class AssetsController extends Controller
            return redirect()->to('hardware')->with('error', trans('admin/hardware/message.does_not_exist'));
        } elseif (!Company::isCurrentUserHasAccess($asset)) {
            return redirect()->to('hardware')->with('error', trans('general.insufficient_permissions'));
+        } elseif (!$asset->availableForCheckout()) {
+            return redirect()->to('hardware')->with('error', trans('admin/hardware/message.checkout.not_available'));
        }

        $user = User::find(e(Input::get('assigned_to')));
@@ -767,7 +778,7 @@ class AssetsController extends Controller
                } else {
                    $barcode = new \Com\Tecnick\Barcode\Barcode();
                    $barcode_obj =  $barcode->getBarcodeObj($settings->barcode_type, route('view/hardware', $asset->id), $size['height'], $size['width'], 'black', array(-2, -2, -2, -2));
-                    file_put_contents($qr_file,$barcode_obj->getPngData());
+                    file_put_contents($qr_file, $barcode_obj->getPngData());
                    return response($barcode_obj->getPngData())->header('Content-type', 'image/png');
                }

@@ -801,7 +812,7 @@ class AssetsController extends Controller
            } else {
                $barcode = new \Com\Tecnick\Barcode\Barcode();
                $barcode_obj = $barcode->getBarcodeObj($settings->alt_barcode, $asset->asset_tag, 250, 20);
-                file_put_contents($barcode_file,$barcode_obj->getPngData());
+                file_put_contents($barcode_file, $barcode_obj->getPngData());
                return response($barcode_obj->getPngData())->header('Content-type', 'image/png');
            }
        }
@@ -889,11 +900,11 @@ class AssetsController extends Controller
                try {
                    $file->move($path, $date.'-'.$fixed_filename);
                } catch (\Symfony\Component\HttpFoundation\File\Exception\FileException $exception) {
-                        $results['error']=trans('admin/hardware/message.upload.error');
-                        if( config('app.debug')) {
-                            $results['error'].= ' ' . $exception->getMessage();
-                        }
-                        return $results;
+                    $results['error']=trans('admin/hardware/message.upload.error');
+                    if (config('app.debug')) {
+                        $results['error'].= ' ' . $exception->getMessage();
+                    }
+                    return $results;
                }
                $name = date('Y-m-d-his').'-'.$fixed_filename;
                $filesize = Setting::fileSizeConvert(filesize($path.'/'.$name));
@@ -916,6 +927,18 @@ class AssetsController extends Controller

    }

+    public function getDeleteImportFile($filename)
+    {
+        if (!Company::isCurrentUserAuthorized()) {
+            return redirect()->to('hardware')->with('error', trans('general.insufficient_permissions'));
+        }
+
+        if (unlink(config('app.private_uploads').'/imports/assets/'.$filename)) {
+            return redirect()->back()->with('success', trans('admin/hardware/message.import.file_delete_success'));
+        }
+        return redirect()->back()->with('error', trans('admin/hardware/message.import.file_delete_error'));
+    }
+

    /**
    * Process the uploaded file
@@ -925,28 +948,47 @@ class AssetsController extends Controller
    * @since [v2.0]
    * @return Redirect
    */
-    public function getProcessImportFile($filename)
+    public function postProcessImportFile()
    {
        // php artisan asset-import:csv path/to/your/file.csv --domain=yourdomain.com --email_format=firstname.lastname
+        $filename = Input::get('filename');
+        $itemType = Input::get('import-type');
+        $updateItems  = Input::get('import-update');

        if (!Company::isCurrentUserAuthorized()) {
            return redirect()->to('hardware')->with('error', trans('general.insufficient_permissions'));
        }
-
-        $return = Artisan::call(
-            'snipeit:import',
-            ['filename'=> config('app.private_uploads').'/imports/assets/'.$filename,
+        $importOptions =    ['filename'=> config('app.private_uploads').'/imports/assets/'.$filename,
                                '--email_format'=>'firstname.lastname',
                                '--username_format'=>'firstname.lastname',
                                '--web-importer' => true,
-                                '--user_id' => Auth::user()->id
-                                ]
-        );
+                                '--user_id' => Auth::user()->id,
+                                '--item-type' => $itemType,
+                            ];
+        if ($updateItems) {
+            $importOptions['--update'] = true;
+        }
+
+        $return = Artisan::call('snipeit:import', $importOptions);
        $display_output =  Artisan::output();
        $file = config('app.private_uploads').'/imports/assets/'.str_replace('.csv', '', $filename).'-output-'.date("Y-m-d-his").'.txt';
        file_put_contents($file, $display_output);
+        // We use hardware instead of asset in the url
+        $redirectTo = "hardware";
+        switch($itemType) {
+            case "asset":
+                $redirectTo = "hardware";
+                break;
+            case "accessory":
+                $redirectTo = "accessories";
+                break;
+            case "consumable":
+                $redirectTo = "consumables";
+                break;
+        }
+
        if ($return === 0) { //Success
-            return redirect()->to('hardware')->with('success', trans('admin/hardware/message.import.success'));
+            return redirect()->to(route($redirectTo))->with('success', trans('admin/hardware/message.import.success'));
        } elseif ($return === 1) { // Failure
            return redirect()->back()->with('import_errors', json_decode($display_output))->with('error', trans('admin/hardware/message.import.error'));
        }
@@ -1004,6 +1046,171 @@ class AssetsController extends Controller
    }


+    /**
+     * Return history import view
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
+    public function getImportHistory()
+    {
+
+        return View::make('hardware/history');
+    }
+
+    /**
+     * Import history
+     *
+     * This needs a LOT of love. It's done very inelegantly right now, and there are
+     * a ton of optimizations that could (and should) be done.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.3]
+     * @return View
+     */
+    public function postImportHistory(Request $request)
+    {
+
+        if (!ini_get("auto_detect_line_endings")) {
+            ini_set("auto_detect_line_endings", '1');
+        }
+
+        $assets = Asset::all(['asset_tag']);
+
+        $csv = Reader::createFromPath(Input::file('user_import_csv'));
+        $csv->setNewline("\r\n");
+        //get the first row, usually the CSV header
+        //$headers = $csv->fetchOne();
+
+        $results = $csv->fetchAssoc();
+        $item = array();
+        $status = array();
+
+
+        foreach($results as $row) {
+
+            if (is_array($row)) {
+
+                $row = array_change_key_case($row, CASE_LOWER);
+                $asset_tag = Helper::array_smart_fetch($row, "asset tag");
+                if (!array_key_exists($asset_tag, $item)) {
+                    $item[$asset_tag] = array();
+                }
+                $batch_counter = count($item[$asset_tag]);
+
+                $item[$asset_tag][$batch_counter]['checkout_date'] = Carbon::parse(Helper::array_smart_fetch($row, "date"))->format('Y-m-d H:i:s');
+
+                $item[$asset_tag][$batch_counter]['asset_tag'] = Helper::array_smart_fetch($row, "asset tag");
+                $item[$asset_tag][$batch_counter]['name'] = Helper::array_smart_fetch($row, "name");
+                $item[$asset_tag][$batch_counter]['email'] = Helper::array_smart_fetch($row, "email");
+
+                $asset = Asset::where('asset_tag','=',$asset_tag)->first();
+                $item[$asset_tag][$batch_counter]['asset_id'] = $asset->id;
+
+                $base_username = User::generateFormattedNameFromFullName(Setting::getSettings()->username_format,$item[$asset_tag][$batch_counter]['name']);
+                $user = User::where('username','=',$base_username['username']);
+                $user_query = ' on username '.$base_username['username'];
+
+                if ($request->input('match_firstnamelastname')=='1') {
+                    $firstnamedotlastname = User::generateFormattedNameFromFullName('firstname.lastname',$item[$asset_tag][$batch_counter]['name']);
+                    $item[$asset_tag][$batch_counter]['username'][] = $firstnamedotlastname['username'];
+                    $user->orWhere('username','=',$firstnamedotlastname['username']);
+                    $user_query .= ', or on username '.$firstnamedotlastname['username'];
+                }
+
+                if ($request->input('match_flastname')=='1') {
+                    $flastname = User::generateFormattedNameFromFullName('filastname',$item[$asset_tag][$batch_counter]['name']);
+                    $item[$asset_tag][$batch_counter]['username'][] = $flastname['username'];
+                    $user->orWhere('username','=',$flastname['username']);
+                    $user_query .= ', or on username '.$flastname['username'];
+                }
+                if ($request->input('match_firstname')=='1') {
+                    $firstname = User::generateFormattedNameFromFullName('firstname',$item[$asset_tag][$batch_counter]['name']);
+                    $item[$asset_tag][$batch_counter]['username'][] = $firstname['username'];
+                    $user->orWhere('username','=',$firstname['username']);
+                    $user_query .= ', or on username '.$firstname['username'];
+                }
+                if ($request->input('match_email')=='1') {
+                    if ($item[$asset_tag][$batch_counter]['email']=='') {
+                        $item[$asset_tag][$batch_counter]['username'][] = $user_email = User::generateEmailFromFullName($item[$asset_tag][$batch_counter]['name']);
+                        $user->orWhere('username','=',$user_email);
+                        $user_query .= ', or on username '.$user_email;
+                    }
+                }
+
+                // A matching user was found
+                if ($user = $user->first()) {
+                    $item[$asset_tag][$batch_counter]['checkedout_to'] = $user->id;
+
+                    $status['success'][] = 'Found user '.Helper::array_smart_fetch($row, "name").$user_query;
+
+                    if ($asset) {
+
+                        $item[$asset_tag][$batch_counter]['user_id'] = $user->id;
+
+                        Actionlog::firstOrCreate(array(
+                            'asset_id' => $asset->id,
+                            'asset_type' => 'hardware',
+                            'user_id' =>  Auth::user()->id,
+                            'note' => 'Checkout imported by '.Auth::user()->fullName().' from history importer',
+                            'checkedout_to' => $item[$asset_tag][$batch_counter]['user_id'],
+                            'created_at' =>  $item[$asset_tag][$batch_counter]['checkout_date'],
+                            'action_type'   => 'checkout'
+                            )
+                        );
+
+                        $asset->assigned_to = $user->id;
+                        $asset->save();
+
+                    } else {
+                        $status['error'][] = 'Asset does not exist so no checkin log was created.';
+                    }
+
+
+                } else {
+                    $item[$asset_tag][$batch_counter]['checkedout_to'] = null;
+                    $status['error'][] = 'No matching user for '.Helper::array_smart_fetch($row, "name");
+                }
+
+            }
+        }
+
+        // Loop through and backfill the checkins
+        foreach ($item as $key => $asset_batch) {
+            $total_in_batch = count($asset_batch);
+            for($x = 0; $x < $total_in_batch; $x++) {
+                $next = $x + 1;
+
+                // Only do this if a matching user was found
+                if ($asset_batch[$x]['checkedout_to']!='') {
+
+                    if (($total_in_batch > 1) && ($x < $total_in_batch) && (array_key_exists($next,$asset_batch))) {
+                        $checkin_date = Carbon::parse($asset_batch[$next]['checkout_date'])->subDay(1)->format('Y-m-d H:i:s');
+                        $asset_batch[$x]['real_checkin'] = $checkin_date;
+
+                        Actionlog::firstOrCreate(array(
+                                'asset_id' => $asset_batch[$x]['asset_id'],
+                                'asset_type' => 'hardware',
+                                'user_id' => Auth::user()->id,
+                                'note' => 'Checkin imported by ' . Auth::user()->fullName() . ' from history importer',
+                                'checkedout_to' => null,
+                                'created_at' => $checkin_date,
+                                'action_type' => 'checkin'
+                            )
+                        );
+                    }
+                }
+
+
+            }
+        }
+
+
+        return View::make('hardware/history')->with('status',$status);
+    }
+
+
    /**
    * Retore a deleted asset.
    *
@@ -1420,31 +1627,31 @@ class AssetsController extends Controller
    * @since [v2.0]
    * @return String JSON
    */
-    public function getDatatable($status = null)
+    public function getDatatable(Request $request, $status = null)
    {


        $assets = Company::scopeCompanyables(Asset::select('assets.*'))->with('model', 'assigneduser', 'assigneduser.userloc', 'assetstatus', 'defaultLoc', 'assetlog', 'model', 'model.category', 'model.manufacturer', 'model.fieldset', 'assetstatus', 'assetloc', 'company')
        ->Hardware();

-        if (Input::has('search')) {
-             $assets = $assets->TextSearch(e(Input::get('search')));
+        if ($request->has('search')) {
+             $assets = $assets->TextSearch(e($request->get('search')));
        }

-        if (Input::has('offset')) {
-             $offset = e(Input::get('offset'));
+        if ($request->has('offset')) {
+             $offset = e($request->get('offset'));
        } else {
             $offset = 0;
        }

-        if (Input::has('limit')) {
-             $limit = e(Input::get('limit'));
+        if ($request->has('limit')) {
+             $limit = e($request->get('limit'));
        } else {
             $limit = 50;
        }

-        if (Input::has('order_number')) {
-            $assets->where('order_number', '=', e(Input::get('order_number')));
+        if ($request->has('order_number')) {
+            $assets->where('order_number', '=', e($request->get('order_number')));
        }

        switch ($status) {
@@ -1469,9 +1676,18 @@ class AssetsController extends Controller
            case 'Deployed':
                $assets->Deployed();
                break;
+            default:
+                $assets->NotArchived();
+                break;

        }

+        if ($request->has('status_id')) {
+            $assets->where('status_id','=', e($request->get('status_id')));
+        }
+
+
+
        $allowed_columns = [
        'id',
        'name',
@@ -1501,8 +1717,8 @@ class AssetsController extends Controller
            $allowed_columns[]=$field->db_column_name();
        }

-        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'asset_tag';
+        $order = $request->get('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array($request->get('sort'), $allowed_columns) ? $request->get('sort') : 'asset_tag';

        switch ($sort) {
            case 'model':
@@ -1541,40 +1757,42 @@ class AssetsController extends Controller
        $rows = array();
        foreach ($assets as $asset) {
            $inout = '';
-            $actions = '';
+            $actions = '<div style="white-space: nowrap;">';
            if ($asset->deleted_at=='') {
                if (Gate::allows('assets.create')) {
-                    $actions = '<div style=" white-space: nowrap;"><a href="' . route('clone/hardware',
-                            $asset->id) . '" class="btn btn-info btn-sm" title="Clone asset" data-toggle="tooltip"><i class="fa fa-clone"></i>';
+                    $actions .= '<a href="' . route('clone/hardware',
+                            $asset->id) . '" class="btn btn-info btn-sm" title="Clone asset" data-toggle="tooltip"><i class="fa fa-clone"></i></a> ';
                }
                if (Gate::allows('assets.edit')) {
-                    $actions .= '</a> <a href="' . route('update/hardware',
+                    $actions .= '<a href="' . route('update/hardware',
                            $asset->id) . '" class="btn btn-warning btn-sm" title="Edit asset" data-toggle="tooltip"><i class="fa fa-pencil icon-white"></i></a> ';
                }
                if (Gate::allows('assets.delete')) {
                    $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/hardware',
-                            $asset->id) . '" data-content="' . trans('admin/hardware/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($asset->asset_tag) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></div>';
+                            $asset->id) . '" data-content="' . trans('admin/hardware/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($asset->asset_tag) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
                }
            } elseif ($asset->model->deleted_at=='') {
-                $actions = '<a href="'.route('restore/hardware', $asset->id).'" title="Restore asset" data-toggle="tooltip" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
+                $actions .= '<a href="'.route('restore/hardware', $asset->id).'" title="Restore asset" data-toggle="tooltip" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
            }

-            if ($asset->assetstatus) {
-                if (($asset->assetstatus->deployable != 0) && ($asset->deleted_at=='')) {
-                    if (($asset->assigned_to !='') && ($asset->assigned_to > 0)) {
-                        if (Gate::allows('assets.checkin')) {
-                            $inout = '<a href="' . route('checkin/hardware',
-                                    $asset->id) . '" class="btn btn-primary btn-sm" title="Checkin this asset" data-toggle="tooltip">' . trans('general.checkin') . '</a>';
-                        }
-                    } else {
-                        if (Gate::allows('assets.checkout')) {
-                            $inout = '<a href="' . route('checkout/hardware',
-                                    $asset->id) . '" class="btn btn-info btn-sm" title="Checkout this asset to a user" data-toggle="tooltip">' . trans('general.checkout') . '</a>';
-                        }
-                    }
+            $actions .= '</div>';
+
+            if (($asset->availableForCheckout()))
+            {
+                if (Gate::allows('assets.checkout')) {
+                    $inout = '<a href="' . route('checkout/hardware',
+                            $asset->id) . '" class="btn btn-info btn-sm" title="Checkout this asset to a user" data-toggle="tooltip">' . trans('general.checkout') . '</a>';
+                }
+
+            } else {
+                if (Gate::allows('assets.checkin')) {
+                    $inout = '<a href="' . route('checkin/hardware',
+                            $asset->id) . '" class="btn btn-primary btn-sm" title="Checkin this asset" data-toggle="tooltip">' . trans('general.checkin') . '</a>';
                }
            }

+            $purchase_cost = Helper::formatCurrencyOutput($asset->purchase_cost);
+
            $row = array(
            'checkbox'      =>'<div class="text-center"><input type="checkbox" name="edit_asset['.$asset->id.']" class="one_required"></div>',
            'id'        => $asset->id,
@@ -1590,7 +1808,7 @@ class AssetsController extends Controller
            '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'           => ($asset->purchase_cost) ? number_format($asset->purchase_cost, 2) : '',
+            'purchase_cost'           => $purchase_cost,
            'purchase_date'           => ($asset->purchase_date) ? $asset->purchase_date : '',
            'notes'         => e($asset->notes),
            'order_number'  => ($asset->order_number!='') ? '<a href="'.config('app.url').'/hardware?order_number='.e($asset->order_number).'">'.e($asset->order_number).'</a>' : '',
@@ -1602,7 +1820,28 @@ class AssetsController extends Controller
            'companyName'   => is_null($asset->company) ? '' : e($asset->company->name)
            );
            foreach ($all_custom_fields as $field) {
-                $row[$field->db_column_name()]=$asset->{$field->db_column_name()};
+                $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] = '<a href="'.Helper::gracefulDecrypt($field, $asset->{$column_name}).'" target="_blank">'.Helper::gracefulDecrypt($field, $asset->{$column_name}).'</a>';
+                        } 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()] = '<a href="'.$asset->{$field->db_column_name()}.'" target="_blank">'.$asset->{$field->db_column_name()}.'</a>';
+                    } else {
+                        $row[$field->db_column_name()] = e($asset->{$field->db_column_name()});
+                    }
+                }
+
            }
            $rows[]=$row;
        }
@@ -108,7 +108,7 @@ class AuthController extends Controller
                        LOG::debug("Creating local user ".Input::get('username'));

                        if ($newuser = Ldap::createUserFromLdap($userattr)) {
-                            LOG::debug("Local user created..");
+                            LOG::debug("Local user created.");
                        } else {
                            LOG::debug("Could not create local user.");
                        }
@@ -131,12 +131,21 @@ class AuthController extends Controller

                    LOG::debug("Valid LDAP login. Updating the local data.");

-                    $user->password = bcrypt($request->input('password'));
+                    if (Setting::getSettings()->ldap_pw_sync=='1') {
+                        $user->password = bcrypt($request->input('password'));
+                    }
+
                    $user->email = $ldap_attr['email'];
                    $user->first_name = $ldap_attr['firstname'];
                    $user->last_name = $ldap_attr['lastname'];
                    $user->save();

+                    if (Setting::getSettings()->ldap_pw_sync!='1') {
+                        Auth::login($user, true);
+                        // Redirect to the users page
+                        return redirect()->to('/home')->with('success', trans('auth/message.signin.success'));
+                    }
+
                } else {
                    LOG::debug("User ".Input::get('username')." did not authenticate correctly against LDAP. Local user was not updated.");
                }// End LDAP auth
@@ -146,14 +155,17 @@ class AuthController extends Controller
        // NO LDAP enabled - just try to login the user normally
        }

+
        LOG::debug("Authenticating user against database.");
        // Try to log the user in
        if (!Auth::attempt(Input::only('username', 'password'), Input::get('remember-me', 0))) {
            LOG::debug("Local authentication failed.");
-          // throw new Cartalyst\Sentry\Users\UserNotFoundException();
+            // throw new Cartalyst\Sentry\Users\UserNotFoundException();
            return redirect()->back()->withInput()->with('error', trans('auth/message.account_not_found'));
        }

+
+
        // Get the page we were before
        $redirect = \Session::get('loginRedirect', 'home');

@@ -1,13 +1,14 @@
 <?php
 namespace App\Http\Controllers;

-use Illuminate\Http\Request;
 use App\Helpers\Helper;
 use App\Models\Category as Category;
 use App\Models\Company;
 use App\Models\Setting;
 use Auth;
 use DB;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
 use Input;
 use Lang;
 use Redirect;
@@ -344,13 +345,13 @@ class CategoriesController extends Controller
                $actions = '<a href="'.route('restore/hardware', $asset->id).'" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
            }

-            if ($asset->assetstatus) {
-                if ($asset->assetstatus->deployable != 0) {
-                    if (($asset->assigned_to !='') && ($asset->assigned_to > 0)) {
-                        $inout = '<a href="'.route('checkin/hardware', $asset->id).'" class="btn btn-primary btn-sm">'.trans('general.checkin').'</a>';
-                    } else {
-                        $inout = '<a href="'.route('checkout/hardware', $asset->id).'" class="btn btn-info btn-sm">'.trans('general.checkout').'</a>';
-                    }
+            if ($asset->availableForCheckout()) {
+                if (Gate::allows('assets.checkout')) {
+                    $inout = '<a href="'.route('checkout/hardware', $asset->id).'" class="btn btn-info btn-sm">'.trans('general.checkout').'</a>';
+                }
+            } else {
+                if (Gate::allows('assets.checkin')) {
+                    $inout = '<a href="'.route('checkin/hardware', $asset->id).'" class="btn btn-primary btn-sm">'.trans('general.checkin').'</a>';
                }
            }

@@ -375,7 +375,7 @@ class ComponentsController extends Controller
                        'fields' => [
                            [
                                'title' => 'Checked Out:',
-                                'value' => strtoupper($logaction->asset_type).' <'.config('app.url').'/admin/components/'.$component->id.'/view'.'|'.$component->name.'> checked out to <'.config('app.url').'/hardware/'.$asset->id.'/view|'.$asset->name.'> by <'.config('app.url').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.'
+                                'value' => strtoupper($logaction->asset_type).' <'.config('app.url').'/admin/components/'.$component->id.'/view'.'|'.$component->name.'> checked out to <'.config('app.url').'/hardware/'.$asset->id.'/view|'.$asset->showAssetName().'> by <'.config('app.url').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.'
                            ],
                            [
                                'title' => 'Note:',
@@ -484,7 +484,7 @@ class ComponentsController extends Controller
                'category'           => ($component->category) ? e($component->category->name) : 'Missing category',
                'order_number'  => e($component->order_number),
                'purchase_date'  => e($component->purchase_date),
-                'purchase_cost'  => ($component->purchase_cost!='') ? number_format($component->purchase_cost, 2): '' ,
+                'purchase_cost'  => Helper::formatCurrencyOutput($component->purchase_cost),
                'numRemaining'  => $component->numRemaining(),
                'actions'       => $actions,
                'companyName'   => is_null($company) ? '' : e($company->name),
@@ -470,13 +470,13 @@ class ConsumablesController extends Controller
                'location'   => ($consumable->location) ? e($consumable->location->name) : '',
                'min_amt'           => e($consumable->min_amt),
                'qty'           => e($consumable->qty),
-                'manufacturer'           => ($consumable->manufacturer) ? e($consumable->manufacturer->name) : '',
-                'model_no'           => e($consumable->model_no),
-                'item_no'           => e($consumable->item_no),
-                'category'           => ($consumable->category) ? e($consumable->category->name) : 'Missing category',
+                'manufacturer'  => ($consumable->manufacturer) ? (string) link_to('/admin/settings/manufacturers/'.$consumable->manufacturer_id.'/view', $consumable->manufacturer->name): '',
+                'model_no'      => e($consumable->model_no),
+                'item_no'       => e($consumable->item_no),
+                'category'      => ($consumable->category) ? (string) link_to('/admin/settings/categories/'.$consumable->category_id.'/view', $consumable->category->name) : 'Missing category',
                'order_number'  => e($consumable->order_number),
                'purchase_date'  => e($consumable->purchase_date),
-                'purchase_cost'  => ($consumable->purchase_cost!='') ? number_format($consumable->purchase_cost, 2): '' ,
+                'purchase_cost'  => Helper::formatCurrencyOutput($consumable->purchase_cost),
                'numRemaining'  => $consumable->numRemaining(),
                'actions'       => $actions,
                'companyName'   => is_null($company) ? '' : e($company->name),
@@ -10,6 +10,7 @@ use Redirect;
 use App\Models\AssetModel;
 use Lang;
 use Auth;
+use Illuminate\Http\Request;

 /**
 * This controller handles all actions related to Custom Asset Fields for
@@ -63,10 +64,15 @@ class CustomFieldsController extends Controller
    * @since [v1.8]
    * @return Redirect
    */
-    public function store()
+    public function store(Request $request)
    {
        //
-        $cfset=new CustomFieldset(["name" => Input::get("name"),"user_id" => Auth::user()->id]);
+        $cfset = new CustomFieldset(
+            [
+                "name" => e($request->get("name")),
+                "user_id" => Auth::user()->id]
+            );
+
        $validator=Validator::make(Input::all(), $cfset->rules);
        if ($validator->passes()) {
            $cfset->save();
@@ -122,24 +128,33 @@ class CustomFieldsController extends Controller
    * @since [v1.8]
    * @return Redirect
    */
-    public function storeField()
+    public function storeField(Request $request)
    {
-        $field=new CustomField(["name" => Input::get("name"),"element" => Input::get("element"),"user_id" => Auth::user()->id]);
+        $field = new CustomField([
+            "name" => e($request->get("name")),
+            "element" => e($request->get("element")),
+            "field_values" => e($request->get("field_values")),
+            "field_encrypted" => e($request->get("field_encrypted", 0)),
+            "user_id" => Auth::user()->id
+        ]);
+


        if (!in_array(Input::get('format'), array_keys(CustomField::$PredefinedFormats))) {
-            $field->format=Input::get("custom_format");
+            $field->format = e($request->get("custom_format"));
        } else {
-            $field->format=Input::get('format');
+            $field->format = e($request->get("format"));
        }

+
+
        $validator=Validator::make(Input::all(), $field->rules);
        if ($validator->passes()) {
-            $results=$field->save();
-            //return "postCreateField: $results";
+            $results = $field->save();
            if ($results) {
                return redirect()->route("admin.custom_fields.index")->with("success", trans('admin/custom_fields/message.field.create.success'));
            } else {
+                dd($field);
                return redirect()->back()->withInput()->with('error', trans('admin/custom_fields/message.field.create.error'));
            }
        } else {
@@ -175,9 +190,7 @@ class CustomFieldsController extends Controller
    */
    public function deleteField($field_id)
    {
-        $field=CustomField::find($field_id);
-
-
+        $field = CustomField::find($field_id);

        if ($field->fieldset->count()>0) {
            return redirect()->back()->withErrors(['message' => "Field is in-use"]);
@@ -32,7 +32,7 @@ class DashboardController extends Controller

            $recent_activity = Actionlog::orderBy('created_at', 'DESC')
                ->with('accessorylog', 'consumablelog', 'licenselog', 'assetlog', 'adminlog', 'userlog', 'componentlog')
-                ->take(30)
+                ->take(20)
                ->get();


@@ -61,18 +61,17 @@ class LicensesController extends Controller
    public function getCreate()
    {

-        $depreciation_list = Helper::depreciationList();
-        $supplier_list = Helper::suppliersList();
        $maintained_list = array('' => 'Maintained', '1' => 'Yes', '0' => 'No');
-        $company_list = Helper::companyList();

        return View::make('licenses/edit')
            //->with('license_options',$license_options)
-            ->with('depreciation_list', $depreciation_list)
-            ->with('supplier_list', $supplier_list)
+            ->with('depreciation_list', Helper::depreciationList())
+            ->with('supplier_list', Helper::suppliersList())
            ->with('maintained_list', $maintained_list)
-            ->with('company_list', $company_list)
+            ->with('company_list', Helper::companyList())
+            ->with('manufacturer_list', Helper::manufacturerList())
            ->with('license', new License);
+
    }


@@ -125,6 +124,12 @@ class LicensesController extends Controller
            $license->purchase_order = e(Input::get('purchase_order'));
        }

+        if (empty(e(Input::get('manufacturer_id')))) {
+            $license->manufacturer_id = null;
+        } else {
+            $license->manufacturer_id = e(Input::get('manufacturer_id'));
+        }
+
        // Save the license data
        $license->name              = e(Input::get('name'));
        $license->serial            = e(Input::get('serial'));
@@ -206,17 +211,15 @@ class LicensesController extends Controller

        // Show the page
        $license_options = array('' => 'Top Level') + DB::table('assets')->where('id', '!=', $licenseId)->pluck('name', 'id');
-        $depreciation_list = array('0' => trans('admin/licenses/form.no_depreciation')) + Depreciation::pluck('name', 'id')->toArray();
-        $supplier_list = array('' => 'Select Supplier') + Supplier::orderBy('name', 'asc')->pluck('name', 'id')->toArray();
        $maintained_list = array('' => 'Maintained', '1' => 'Yes', '0' => 'No');
-        $company_list = Helper::companyList();

        return View::make('licenses/edit', compact('license'))
            ->with('license_options', $license_options)
-            ->with('depreciation_list', $depreciation_list)
-            ->with('supplier_list', $supplier_list)
-            ->with('company_list', $company_list)
-            ->with('maintained_list', $maintained_list);
+            ->with('depreciation_list', Helper::depreciationList())
+            ->with('supplier_list', Helper::suppliersList())
+            ->with('company_list', Helper::companyList())
+            ->with('maintained_list', $maintained_list)
+            ->with('manufacturer_list', Helper::manufacturerList());
    }


@@ -253,6 +256,13 @@ class LicensesController extends Controller
        $license->maintained        = e(Input::get('maintained'));
        $license->reassignable      = e(Input::get('reassignable'));

+        if (empty(e(Input::get('manufacturer_id')))) {
+            $license->manufacturer_id = null;
+        } else {
+            $license->manufacturer_id = e(Input::get('manufacturer_id'));
+        }
+
+
        if (e(Input::get('supplier_id')) == '') {
            $license->supplier_id = null;
        } else {
@@ -502,7 +512,7 @@ class LicensesController extends Controller
            }


-            if (($asset->assigned_to!='') && (($asset->assigned_to!=$assigned_to)) && ($assigned_to!='') ) {
+            if (($asset->assigned_to!='') && (($asset->assigned_to!=$assigned_to)) && ($assigned_to!='')) {
                return redirect()->to('admin/licenses')->with('error', trans('admin/licenses/message.owner_doesnt_match_asset'));
            }

@@ -987,21 +997,22 @@ class LicensesController extends Controller
            $actions = '<span style="white-space: nowrap;">';

            if (Gate::allows('licenses.checkout')) {
-                $actions .= '<a href="' . route('freecheckout/license',
-                        $license->id) . '" class="btn btn-primary btn-sm' . (($license->remaincount() > 0) ? '' : ' disabled') . '" style="margin-right:5px;">' . trans('general.checkout') . '</a> ';
+                $actions .= '<a href="' . route('freecheckout/license', $license->id)
+                . '" class="btn btn-primary btn-sm' . (($license->remaincount() > 0) ? '' : ' disabled') . '" style="margin-right:5px;">' . trans('general.checkout') . '</a> ';
            }

            if (Gate::allows('licenses.create')) {
-                $actions .= '<a href="' . route('clone/license',
-                        $license->id) . '" class="btn btn-info btn-sm" style="margin-right:5px;" title="Clone asset"><i class="fa fa-files-o"></i></a>';
+                $actions .= '<a href="' . route('clone/license', $license->id)
+                . '" class="btn btn-info btn-sm" style="margin-right:5px;" title="Clone asset"><i class="fa fa-files-o"></i></a>';
            }
            if (Gate::allows('licenses.edit')) {
-                $actions .= '<a href="' . route('update/license',
-                        $license->id) . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a>';
+                $actions .= '<a href="' . route('update/license', $license->id)
+                . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a>';
            }
            if (Gate::allows('licenses.delete')) {
-                $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/license',
-                        $license->id) . '" data-content="' . trans('admin/licenses/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($license->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+                $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'
+                 . route('delete/license', $license->id)
+                 . '" data-content="' . trans('admin/licenses/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($license->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
            }
            $actions .='</span>';

@@ -1012,15 +1023,16 @@ class LicensesController extends Controller
                'totalSeats'        => $license->totalSeatsByLicenseID(),
                'remaining'         => $license->remaincount(),
                'license_name'      => e($license->license_name),
-                'license_email'      => e($license->license_email),
+                'license_email'     => e($license->license_email),
                'purchase_date'     => ($license->purchase_date) ? $license->purchase_date : '',
                'expiration_date'     => ($license->expiration_date) ? $license->expiration_date : '',
-                'purchase_cost'     => ($license->purchase_cost) ? number_format($license->purchase_cost, 2) : '',
+                'purchase_cost'     => Helper::formatCurrencyOutput($license->purchase_cost),
                'purchase_order'     => ($license->purchase_order) ? e($license->purchase_order) : '',
                'order_number'     => ($license->order_number) ? e($license->order_number) : '',
                'notes'     => ($license->notes) ? e($license->notes) : '',
                'actions'           => $actions,
-                'companyName'       => is_null($license->company) ? '' : e($license->company->name)
+                'companyName'       => is_null($license->company) ? '' : e($license->company->name),
+                'manufacturer'      => $license->manufacturer ? (string) link_to('/admin/settings/manufacturers/'.$license->manufacturer_id.'/view', $license->manufacturer->name) : ''
            );
        }

@@ -2,14 +2,15 @@
 namespace App\Http\Controllers;

 use App\Models\Company;
+use App\Models\Manufacturer;
+use App\Models\Setting;
+use Auth;
+use Gate;
 use Input;
 use Lang;
-use App\Models\Manufacturer;
 use Redirect;
-use App\Models\Setting;
 use Str;
 use View;
-use Auth;

 /**
 * This controller handles all actions related to Manufacturers for
@@ -254,10 +255,27 @@ class ManufacturersController extends Controller
    * @since [v1.0]
    * @return String JSON
    */
-    public function getDataView($manufacturerId)
+    public function getDataView($manufacturerId, $itemtype = null)
    {
-
        $manufacturer = Manufacturer::with('assets.company')->find($manufacturerId);
+
+        switch ($itemtype) {
+            case "assets":
+                return $this->getDataAssetsView($manufacturer);
+            case "licenses":
+                return $this->getDataLicensesView($manufacturer);
+            case "accessories":
+                return $this->getDataAccessoriesView($manufacturer);
+            case "consumables":
+                return $this->getDataConsumablesView($manufacturer);
+        }
+
+        throw new Exception("We shouldn't be here");
+
+    }
+
+    protected function getDataAssetsView(Manufacturer $manufacturer)
+    {
        $manufacturer_assets = $manufacturer->assets;

        if (Input::has('search')) {
@@ -293,35 +311,213 @@ class ManufacturersController extends Controller
                $actions = '<a href="'.route('restore/hardware', $asset->id).'" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
            }

-            if ($asset->assetstatus) {
-                if ($asset->assetstatus->deployable != 0) {
-                    if (($asset->assigned_to !='') && ($asset->assigned_to > 0)) {
-                        $inout = '<a href="'.route('checkin/hardware', $asset->id).'" class="btn btn-primary btn-sm">'.trans('general.checkin').'</a>';
-                    } else {
-                        $inout = '<a href="'.route('checkout/hardware', $asset->id).'" class="btn btn-info btn-sm">'.trans('general.checkout').'</a>';
-                    }
+            if ($asset->availableForCheckout()) {
+                if (Gate::allows('assets.checkout')) {
+                    $inout = '<a href="'.route('checkout/hardware', $asset->id).'" class="btn btn-info btn-sm">'.trans('general.checkout').'</a>';
+                }
+            } else {
+                if (Gate::allows('assets.checkin')) {
+                    $inout = '<a href="'.route('checkin/hardware', $asset->id).'" class="btn btn-primary btn-sm">'.trans('general.checkin').'</a>';
                }
            }

-            $row = array(
-            'id' => $asset->id,
-            'name' => (string)link_to('/hardware/'.$asset->id.'/view', e($asset->showAssetName())),
-            'model' => e($asset->model->name),
-            'asset_tag' => e($asset->asset_tag),
-            'serial' => e($asset->serial),
-            'assigned_to' => ($asset->assigneduser) ? (string)link_to('/admin/users/'.$asset->assigneduser->id.'/view', e($asset->assigneduser->fullName())): '',
-            'actions' => $actions,
-            'companyName' => e(Company::getName($asset)),
-            );
+            $rows[] = array(
+                'id' => $asset->id,
+                'name' => (string)link_to('/hardware/'.$asset->id.'/view', e($asset->showAssetName())),
+                'model' => e($asset->model->name),
+                'asset_tag' => e($asset->asset_tag),
+                'serial' => e($asset->serial),
+                'assigned_to' => ($asset->assigneduser) ? (string)link_to('/admin/users/'.$asset->assigneduser->id.'/view', e($asset->assigneduser->fullName())): '',
+                'actions' => $actions,
+                'companyName' => e(Company::getName($asset)),
+                );

-            if (isset($inout)) {
-                $row['change'] = $inout;
+                if (isset($inout)) {
+                    $row['change'] = $inout;
+                }
            }
-
-            $rows[] = $row;
-        }
-
+            
        $data = array('total' => $count, 'rows' => $rows);
        return $data;
    }
+
+    protected function getDataLicensesView(Manufacturer $manufacturer)
+    {
+        $licenses = $manufacturer->licenses;
+
+        if (Input::has('search')) {
+            $licenses = $licenses->TextSearch(Input::get('search'));
+        }
+
+        $licenseCount = $licenses->count();
+
+        $rows = array();
+
+        foreach ($licenses as $license) {
+            $actions = '<span style="white-space: nowrap;">';
+
+            if (Gate::allows('licenses.checkout')) {
+                $actions .= '<a href="' . route('freecheckout/license', $license->id)
+                . '" class="btn btn-primary btn-sm' . (($license->remaincount() > 0) ? '' : ' disabled') . '" style="margin-right:5px;">' . trans('general.checkout') . '</a> ';
+            }
+
+            if (Gate::allows('licenses.create')) {
+                $actions .= '<a href="' . route('clone/license', $license->id)
+                . '" class="btn btn-info btn-sm" style="margin-right:5px;" title="Clone asset"><i class="fa fa-files-o"></i></a>';
+            }
+            if (Gate::allows('licenses.edit')) {
+                $actions .= '<a href="' . route('update/license', $license->id)
+                . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a>';
+            }
+            if (Gate::allows('licenses.delete')) {
+                $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'
+                 . route('delete/license', $license->id)
+                 . '" data-content="' . trans('admin/licenses/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($license->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+            }
+            $actions .='</span>';
+
+            $rows[] = array(
+                'id'                => $license->id,
+                'name'              => (string) link_to('/admin/licenses/'.$license->id.'/view', $license->name),
+                'serial'            => (string) link_to('/admin/licenses/'.$license->id.'/view', mb_strimwidth($license->serial, 0, 50, "...")),
+                'totalSeats'        => $license->totalSeatsByLicenseID(),
+                'remaining'         => $license->remaincount(),
+                'license_name'      => e($license->license_name),
+                'license_email'     => e($license->license_email),
+                'purchase_date'     => ($license->purchase_date) ? $license->purchase_date : '',
+                'expiration_date'   => ($license->expiration_date) ? $license->expiration_date : '',
+                'purchase_cost'     => ($license->purchase_cost) ? number_format($license->purchase_cost, 2) : '',
+                'purchase_order'    => ($license->purchase_order) ? e($license->purchase_order) : '',
+                'order_number'      => ($license->order_number) ? e($license->order_number) : '',
+                'notes'             => ($license->notes) ? e($license->notes) : '',
+                'actions'           => $actions,
+                'companyName'       => is_null($license->company) ? '' : e($license->company->name),
+                'manufacturer'      => $license->manufacturer ? (string) link_to('/admin/settings/manufacturers/'.$license->manufacturer_id.'/view', $license->manufacturer->name) : ''
+            );
+        }
+
+        $data = array('total' => $licenseCount, 'rows' => $rows);
+
+        return $data;
+    }
+
+    public function getDataAccessoriesView(Manufacturer $manufacturer)
+    {
+        $accessories = $manufacturer->accessories;
+
+        if (Input::has('search')) {
+            $accessories = $accessories->TextSearch(e(Input::get('search')));
+        }
+
+        if (Input::has('limit')) {
+            $limit = e(Input::get('limit'));
+        } else {
+            $limit = 50;
+        }
+
+        $accessCount = $accessories->count();
+
+        $rows = array();
+
+        foreach ($accessories as $accessory) {
+
+            $actions = '<nobr>';
+            if (Gate::allows('accessories.checkout')) {
+                $actions .= '<a href="' . route('checkout/accessory',
+                        $accessory->id) . '" style="margin-right:5px;" class="btn btn-info btn-sm" ' . (($accessory->numRemaining() > 0) ? '' : ' disabled') . '>' . trans('general.checkout') . '</a>';
+            }
+            if (Gate::allows('accessories.edit')) {
+                $actions .= '<a href="' . route('update/accessory',
+                        $accessory->id) . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a>';
+            }
+            if (Gate::allows('accessories.delete')) {
+                $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/accessory',
+                        $accessory->id) . '" data-content="' . trans('admin/accessories/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($accessory->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+            }
+            $actions .= '</nobr>';
+            $company = $accessory->company;
+
+            $rows[] = array(
+            'name'          => '<a href="'.url('admin/accessories/'.$accessory->id).'/view">'. $accessory->name.'</a>',
+            'category'      => ($accessory->category) ? (string)link_to('admin/settings/categories/'.$accessory->category->id.'/view', $accessory->category->name) : '',
+            'qty'           => e($accessory->qty),
+            'order_number'  => e($accessory->order_number),
+            'min_amt'  => e($accessory->min_amt),
+            'location'      => ($accessory->location) ? e($accessory->location->name): '',
+            'purchase_date' => e($accessory->purchase_date),
+            'purchase_cost' => number_format($accessory->purchase_cost, 2),
+            'numRemaining'  => $accessory->numRemaining(),
+            'actions'       => $actions,
+            'companyName'   => is_null($company) ? '' : e($company->name),
+            'manufacturer'      => $accessory->manufacturer ? (string) link_to('/admin/settings/manufacturers/'.$accessory->manufacturer_id.'/view', $accessory->manufacturer->name) : ''
+
+            );
+        }
+
+        $data = array('total'=>$accessCount, 'rows'=>$rows);
+
+        return $data;
+    }
+
+    public function getDataConsumablesView($manufacturer)
+    {
+        $consumables = $manufacturer->consumables;
+
+        if (Input::has('search')) {
+            $consumables = $consumables->TextSearch(e(Input::get('search')));
+        }
+
+        if (Input::has('limit')) {
+            $limit = e(Input::get('limit'));
+        } else {
+            $limit = 50;
+        }
+
+        $consumCount = $consumables->count();
+
+        $rows = array();
+
+        foreach ($consumables as $consumable) {
+            $actions = '<nobr>';
+            if (Gate::allows('consumables.checkout')) {
+                $actions .= '<a href="' . route('checkout/consumable',
+                        $consumable->id) . '" style="margin-right:5px;" class="btn btn-info btn-sm" ' . (($consumable->numRemaining() > 0) ? '' : ' disabled') . '>' . trans('general.checkout') . '</a>';
+            }
+
+            if (Gate::allows('consumables.edit')) {
+                $actions .= '<a href="' . route('update/consumable',
+                        $consumable->id) . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a>';
+            }
+            if (Gate::allows('consumables.delete')) {
+                $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/consumable',
+                        $consumable->id) . '" data-content="' . trans('admin/consumables/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($consumable->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+            }
+
+            $actions .='</nobr>';
+
+            $company = $consumable->company;
+
+            $rows[] = array(
+                'id'            => $consumable->id,
+                'name'          => (string)link_to('admin/consumables/'.$consumable->id.'/view', e($consumable->name)),
+                'location'      => ($consumable->location) ? e($consumable->location->name) : '',
+                'min_amt'       => e($consumable->min_amt),
+                'qty'           => e($consumable->qty),
+                'manufacturer'  => ($consumable->manufacturer) ? (string) link_to('/admin/settings/manufacturers/'.$consumable->manufacturer_id.'/view', $consumable->manufacturer->name): '',
+                'model_no'      => e($consumable->model_no),
+                'item_no'       => e($consumable->item_no),
+                'category'      => ($consumable->category) ? (string) link_to('/admin/settings/categories/'.$consumable->category_id.'/view', $consumable->category->name) : 'Missing category',
+                'order_number'  => e($consumable->order_number),
+                'purchase_date' => e($consumable->purchase_date),
+                'purchase_cost' => ($consumable->purchase_cost!='') ? number_format($consumable->purchase_cost, 2): '' ,
+                'numRemaining'  => $consumable->numRemaining(),
+                'actions'       => $actions,
+                'companyName'   => is_null($company) ? '' : e($company->name),
+            );
+        }
+
+        $data = array('total' => $consumCount, 'rows' => $rows);
+
+        return $data;
+    }
 }
@@ -55,7 +55,7 @@ class ProfileController extends Controller

        if (Input::file('avatar')) {
            $image = Input::file('avatar');
-            $file_name = $user->first_name."-".$user->last_name.".".$image->getClientOriginalExtension();
+            $file_name = str_slug($user->first_name."-".$user->last_name).".".$image->getClientOriginalExtension();
            $path = public_path('uploads/avatars/'.$file_name);
            Image::make($image->getRealPath())->resize(84, 84)->save($path);
            $user->avatar = $file_name;
@@ -1,25 +1,26 @@
 <?php
 namespace App\Http\Controllers;

+use App\Helpers\Helper;
 use App\Models\Accessory;
 use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\AssetMaintenance;
-use Carbon\Carbon;
+use App\Models\AssetModel;
 use App\Models\Company;
+use App\Models\CustomField;
+use App\Models\License;
+use App\Models\Location;
+use App\Models\Setting;
+use App\Models\User;
+use Carbon\Carbon;
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\View;
 use Input;
 use League\Csv\Reader;
-use App\Models\License;
-use App\Models\Location;
-use App\Models\AssetModel;
-use App\Models\CustomField;
 use Redirect;
-use App\Models\Setting;
-use App\Models\User;

 /**
 * This controller handles all actions related to Reports for
@@ -166,7 +167,7 @@ class ReportsController extends Controller
                $row[] = '';
            }
            $row[] = $asset->purchase_date;
-            $row[] = '"' . number_format($asset->purchase_cost, 2) . '"';
+            $row[] = '"' . Helper::formatCurrencyOutput($asset->purchase_cost) . '"';
            if ($asset->order_number) {
                $row[] = e($asset->order_number);
            } else {
@@ -308,9 +309,9 @@ class ReportsController extends Controller
            }

            $row[] = $asset->purchase_date;
-            $row[] = $currency . number_format($asset->purchase_cost, 2);
-            $row[] = $currency . number_format($asset->getDepreciatedValue(), 2);
-            $row[] = $currency . number_format(( $asset->purchase_cost - $asset->getDepreciatedValue() ), 2);
+            $row[] = $currency . Helper::formatCurrencyOutput($asset->purchase_cost);
+            $row[] = $currency . Helper::formatCurrencyOutput($asset->getDepreciatedValue());
+            $row[] = $currency . Helper::formatCurrencyOutput(( $asset->purchase_cost - $asset->getDepreciatedValue() ));
            $csv->insertOne($row);
        }

@@ -392,7 +393,7 @@ class ReportsController extends Controller
            $row[] = $license->remaincount();
            $row[] = $license->expiration_date;
            $row[] = $license->purchase_date;
-            $row[] = '"' . number_format($license->purchase_cost, 2) . '"';
+            $row[] = '"' . Helper::formatCurrencyOutput($license->purchase_cost) . '"';

            $rows[] = implode($row, ',');
        }
@@ -416,7 +417,7 @@ class ReportsController extends Controller
    public function getCustomReport()
    {
        $customfields = CustomField::get();
-        return View::make('reports/custom')->with('customfields',$customfields);
+        return View::make('reports/custom')->with('customfields', $customfields);
    }

    /**
@@ -528,7 +529,7 @@ class ReportsController extends Controller
                $row[] = e($asset->purchase_date);
            }
            if (e(Input::get('purchase_cost')) == '1' && ( e(Input::get('depreciation')) != '1' )) {
-                $row[] = '"' . number_format($asset->purchase_cost, 2) . '"';
+                $row[] = '"' . Helper::formatCurrencyOutput($asset->purchase_cost) . '"';
            }
            if (e(Input::get('order')) == '1') {
                if ($asset->order_number) {
@@ -605,9 +606,9 @@ class ReportsController extends Controller
            }
            if (e(Input::get('depreciation')) == '1') {
                $depreciation = $asset->getDepreciatedValue();
-                $row[]        = '"' . number_format($asset->purchase_cost, 2) . '"';
-                $row[]        = '"' . number_format($depreciation, 2) . '"';
-                $row[]        = '"' . number_format($asset->purchase_cost - $depreciation, 2) . '"';
+                $row[]        = '"' . Helper::formatCurrencyOutput($asset->purchase_cost) . '"';
+                $row[]        = '"' . Helper::formatCurrencyOutput($depreciation) . '"';
+                $row[]        = '"' . Helper::formatCurrencyOutput($asset->purchase_cost) . '"';
            }

            foreach ($customfields as $customfield) {
@@ -698,7 +699,7 @@ class ReportsController extends Controller
                $improvementTime = intval($assetMaintenance->asset_maintenance_time);
            }
            $row[]  = $improvementTime;
-            $row[]  = trans('general.currency') . number_format($assetMaintenance->cost, 2);
+            $row[]  = trans('general.currency') . Helper::formatCurrencyOutput($assetMaintenance->cost);
            $rows[] = implode($row, ',');
        }

@@ -417,6 +417,7 @@ class SettingsController extends Controller
        $setting->ad_domain = e(Input::get('ad_domain'));
        $setting->is_ad = e(Input::get('is_ad', '0'));
        $setting->ldap_tls = e(Input::get('ldap_tls', '0'));
+        $setting->ldap_pw_sync = e(Input::get('ldap_pw_sync', '0'));

        // If validation fails, we'll exit the operation now.
        if ($setting->save()) {
@@ -120,6 +120,7 @@ class StatuslabelsController extends Controller
        $statuslabel->pending          =  $statustype['pending'];
        $statuslabel->archived          =  $statustype['archived'];
        $statuslabel->color          =  e(Input::get('color'));
+        $statuslabel->show_in_nav          =  e(Input::get('show_in_nav'),0);


        // Was the asset created?
@@ -208,6 +209,7 @@ class StatuslabelsController extends Controller
        $statuslabel->pending          =  $statustype['pending'];
        $statuslabel->archived          =  $statustype['archived'];
        $statuslabel->color          =  e(Input::get('color'));
+        $statuslabel->show_in_nav          =  e(Input::get('show_in_nav'),0);


        // Was the asset created?
@@ -258,7 +260,7 @@ class StatuslabelsController extends Controller

    public function getDatatable()
    {
-        $statuslabels = Statuslabel::select(array('id','name','deployable','pending','archived','color'))
+        $statuslabels = Statuslabel::select(array('id','name','deployable','pending','archived','color','show_in_nav'))
        ->whereNull('deleted_at');

        if (Input::has('search')) {
@@ -314,6 +316,7 @@ class StatuslabelsController extends Controller
                'type'          => e($label_type),
                'name'          => e($statuslabel->name),
                'color'          => $color,
+                'show_in_nav' => ($statuslabel->show_in_nav=='1') ? trans('general.yes') : trans('general.no'),
                'actions'       => $actions
            );
        }
@@ -14,7 +14,7 @@ class Kernel extends HttpKernel
     * @var array
     */
    protected $middleware = [
-        \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
+        \MisterPhilip\MaintenanceMode\Http\Middleware\CheckForMaintenanceMode::class,
        \Illuminate\Session\Middleware\StartSession::class,
        \Illuminate\View\Middleware\ShareErrorsFromSession::class,
        \App\Http\Middleware\FrameGuard::class,
@@ -15,7 +15,10 @@ class FrameGuard
    public function handle($request, Closure $next)
    {
        $response = $next($request);
-        $response->headers->set('X-Frame-Options', 'SAMEORIGIN', false);
+        if (config('app.allow_iframing') == false) {
+            $response->headers->set('X-Frame-Options', 'SAMEORIGIN', false);
+        }
        return $response;
+
    }
 }
@@ -37,6 +37,7 @@ class AssetRequest extends Request
          'supplier_id'     => 'integer',
          'status'          => 'integer',
          'asset_tag'       => 'required',
+          'purchase_cost'   => 'numeric',
    
        ];

@@ -25,10 +25,10 @@ class SaveUserRequest extends Request
    {
        return [
            'first_name'              => 'required|string|min:1',
-            'last_name'               => 'required|string|min:1',
            'email'                   => 'email',
            'password'                => 'required|min:6',
            'password_confirm'        => 'sometimes|required_with:password',
+            'username'                => 'required|string|min:2|unique:users,username,NULL,deleted_at',
        ];
    }
 }
@@ -78,7 +78,7 @@ Route::group([ 'prefix' => 'api', 'middleware' => 'auth' ], function () {
    /*---Manufacturers API---*/
    Route::group(array('prefix'=>'manufacturers'), function () {
        Route::get('list', array('as'=>'api.manufacturers.list', 'uses'=>'ManufacturersController@getDatatable'));
-        Route::get('{manufacturerID}/view', array('as'=>'api.manufacturers.view', 'uses'=>'ManufacturersController@getDataView'));
+        Route::get('{manufacturerID}/view/{itemtype}', array('as'=>'api.manufacturers.view', 'uses'=>'ManufacturersController@getDataView'));
    });

    /*---Suppliers API---*/
@@ -187,6 +187,19 @@ Route::group(
    'auth']],
    function () {

+        Route::get('history', [
+            'as' => 'asset.import-history',
+            'middleware' => 'authorize:assets.checkout',
+            'uses' => 'AssetsController@getImportHistory'
+        ]);
+
+        Route::post('history', [
+            'as' => 'asset.process-import-history',
+            'middleware' => 'authorize:assets.checkout',
+            'uses' => 'AssetsController@postImportHistory'
+        ]);
+
+
        Route::get('create/{model?}', [
                'as'   => 'create/hardware',
                'middleware' => 'authorize:assets.create',
@@ -280,9 +293,13 @@ Route::group(
                'uses' => 'AssetsController@getDeleteImportFile'
        ]);

-        Route::get( 'import/process/{filename}', [ 'as' => 'assets/import/process-file',
+        Route::post( 'import/process/', [ 'as' => 'assets/import/process-file',
                'middleware' => 'authorize:assets.create',
-                'uses' => 'AssetsController@getProcessImportFile'
+                'uses' => 'AssetsController@postProcessImportFile'
+        ]);
+        Route::get( 'import/delete/{filename}', [ 'as' => 'assets/import/delete-file',
+                'middleware' => 'authorize:assets.create', // TODO What permissions should this require?
+                'uses' => 'AssetsController@getDeleteImportFile'
        ]);

        Route::get('import',[
@@ -22,11 +22,12 @@ class Accessory extends Model
    * Accessory validation rules
    */
    public $rules = array(
-      'name'        => 'required|min:3|max:255',
-      'qty'         => 'required|integer|min:1',
-      'category_id' => 'required|integer',
-      'company_id'  => 'integer',
-      'min_amt'     => 'integer|min:1',
+        'name'              => 'required|min:3|max:255',
+        'qty'               => 'required|integer|min:1',
+        'category_id'       => 'required|integer',
+        'company_id'        => 'integer',
+        'min_amt'           => 'integer|min:1',
+        'purchase_cost'     => 'numeric',
    );


@@ -81,6 +82,11 @@ class Accessory extends Model
        return $this->belongsToMany('\App\Models\User', 'accessories_users', 'accessory_id', 'assigned_to')->count();
    }

+    public function manufacturer()
+    {
+        return $this->belongsTo('\App\Models\Manufacturer', 'manufacturer_id');
+    }
+
    public function checkin_email()
    {
        return $this->category->checkin_email;
@@ -21,7 +21,7 @@ class Actionlog extends Model implements ICompanyableChild

    protected $table      = 'asset_logs';
    public $timestamps = true;
-    protected $fillable   = [ 'created_at', 'asset_type' ];
+    protected $fillable   = [ 'created_at', 'asset_type','user_id','asset_id','action_type','note','checkedout_to' ];

    public function getCompanyableParents()
    {
@@ -55,6 +55,7 @@ class Asset extends Depreciable
    'supplier_id'     => 'integer',
    'asset_tag'       => 'required|min:1|max:255|unique_undeleted',
    'status'          => 'integer',
+    'purchase_cost'   => 'numeric',
    ];


@@ -72,22 +73,36 @@ class Asset extends Depreciable
    }


-
+    public function availableForCheckout()
+    {
+      return (
+          empty($this->assigned_to) &&
+          $this->assetstatus->deployable == 1 &&
+          empty($this->deleted_at)
+        );
+    }

  /**
  * Checkout asset
  */
    public function checkOutToUser($user, $admin, $checkout_at = null, $expected_checkin = null, $note = null, $name = null)
    {
+        if (!$user) {
+            return false;
+        }

        if ($expected_checkin) {
-            $this->expected_checkin = $expected_checkin ;
+            $this->expected_checkin = $expected_checkin;
        }

        $this->last_checkout = $checkout_at;

        $this->assigneduser()->associate($user);
-        $this->name = $name;
+
+        if($name != null)
+        {
+            $this->name = $name;
+        }

        $settings = Setting::getSettings();

@@ -95,9 +110,7 @@ class Asset extends Depreciable
            $this->accepted="pending";
        }

-        if (!$user) {
-            return false;
-        }
+

        if ($this->save()) {

@@ -615,6 +628,23 @@ public function checkin_email()
        });
    }

+    /**
+     * Query builder scope for non-Archived assets
+     *
+     * @param  Illuminate\Database\Query\Builder $query Query builder instance
+     *
+     * @return Illuminate\Database\Query\Builder          Modified query builder
+     */
+
+    public function scopeNotArchived($query)
+    {
+
+        return $query->whereHas('assetstatus', function ($query) {
+
+            $query->where('archived', '=', 0);
+        });
+    }
+
  /**
   * Query builder scope for Archived assets
   *
@@ -34,6 +34,7 @@ class Component extends Model
        'category_id' => 'required|integer',
        'company_id'  => 'integer',
        'purchase_date'  => 'date',
+        'purchase_cost'   => 'numeric',
    );

    /**
@@ -29,6 +29,7 @@ class Consumable extends Model
        'category_id' => 'required|integer',
        'company_id'  => 'integer',
        'min_amt'     => 'integer|min:1',
+        'purchase_cost'   => 'numeric',
    );

    /**
@@ -11,14 +11,14 @@ class CustomField extends Model

    */
    public static $PredefinedFormats=[
-    "ANY" => "",
-    "ALPHA" => "alpha",
-    "EMAIL" => "email",
-    "DATE" => "date",
-    "URL" => "url",
-    "NUMERIC" => "numeric",
-    "MAC" => "regex:/^[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}$/",
-    "IP" => "ip"
+        "ANY" => "",
+        "ALPHA" => "alpha",
+        "EMAIL" => "email",
+        "DATE" => "date",
+        "URL" => "url",
+        "NUMERIC" => "numeric",
+        "MAC" => "regex:/^[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}$/",
+        "IP" => "ip",
    ];

    public $rules=[
@@ -109,4 +109,43 @@ class CustomField extends Model
            $this->attributes['format']=$value;
        }
    }
+
+    /**
+     * Format a value string as an array for select boxes and checkboxes.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.4]
+     * @return Array
+     */
+    public function formatFieldValuesAsArray() {
+        $arr = preg_split("/\\r\\n|\\r|\\n/", $this->field_values);
+
+        $result[''] = 'Select '.strtolower($this->format);
+
+        for ($x = 0; $x < count($arr); $x++) {
+            $arr_parts = explode('|', $arr[$x]);
+            if ($arr_parts[0]!='') {
+                if (key_exists('1',$arr_parts)) {
+                    $result[$arr_parts[0]] = $arr_parts[1];
+                } else {
+                    $result[$arr_parts[0]] = $arr_parts[0];
+                }
+            }
+
+        }
+
+
+        return $result;
+    }
+
+    public function isFieldDecryptable($string) {
+        if (($this->field_encrypted=='1') && ($string!='')) {
+            return true;
+        }
+        return false;
+    }
+
+
+
+
 }
@@ -2,6 +2,7 @@
 namespace App\Models;

 use Illuminate\Database\Eloquent\Model;
+use Gate;

 class CustomFieldset extends Model
 {
@@ -30,16 +31,21 @@ class CustomFieldset extends Model
    {
        $rules=[];
        foreach ($this->fields as $field) {
-            $rule=[];
-            if ($field->pivot->required) {
-                $rule[]="required";
+            $rule = [];
+
+            if (($field->field_encrypted!='1') ||
+                  (($field->field_encrypted =='1')  && (Gate::allows('admin')) ))
+                  {
+
+                if ($field->pivot->required) {
+                    $rule[]="required";
+                }
            }
+
            array_push($rule, $field->attributes['format']);
            $rules[$field->db_column_name()]=$rule;
        }
        return $rules;
    }

-  //requiredness goes *here*
-  //sequence goes here?
 }
@@ -81,11 +81,18 @@ class Ldap extends Model
        if ($settings->is_ad =='1')
        {

-            // In case they haven't added an AD domain
-            if ($settings->ad_domain == '') {
-                $userDn      = $username.'@'.$settings->email_domain;
+            // Check if they are using the userprincipalname for the username field.
+            // If they are, we can skip building the UPN to authenticate against AD
+            if ($ldap_username_field=='userprincipalname')
+            {
+                $userDn = $username;
            } else {
-               $userDn      = $username.'@'.$settings->ad_domain;
+                // In case they haven't added an AD domain
+                if ($settings->ad_domain == '') {
+                    $userDn      = $username.'@'.$settings->email_domain;
+                } else {
+                    $userDn      = $username.'@'.$settings->ad_domain;
+                }
            }

        } else {
@@ -191,6 +198,7 @@ class Ldap extends Model
    {
        $item = Ldap::parseAndMapLdapAttributes($ldapatttibutes);

+
        // Create user from LDAP data
        if (!empty($item["username"])) {
            $user = new User;
@@ -198,7 +206,14 @@ class Ldap extends Model
            $user->last_name = $item["lastname"];
            $user->username = $item["username"];
            $user->email = $item["email"];
-            $user->password = bcrypt(Input::get("password"));
+
+            if (Setting::getSettings()->ldap_pw_sync=='1') {
+                $user->password = bcrypt(Input::get("password"));
+            } else {
+                $pass = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 25);
+                $user->password = bcrypt($pass);
+            }
+
            $user->activated = 1;
            $user->ldap_import = 1;
            $user->notes = 'Imported on first login from LDAP';
@@ -239,8 +254,12 @@ class Ldap extends Model

        // Perform the search
        do {
+
            // Paginate (non-critical, if not supported by server)
-            ldap_control_paged_result($ldapconn, $page_size, false, $cookie);
+            if (!$ldap_paging = @ldap_control_paged_result($ldapconn, $page_size, false, $cookie)) {
+                throw new Exception('Problem with your LDAP connection. Try checking the Use TLS setting in Admin > Settings. ');
+            }
+

            $search_results = ldap_search($ldapconn, $base_dn, '('.$filter.')');

@@ -36,6 +36,11 @@ class License extends Depreciable
        return $this->belongsTo('\App\Models\Company', 'company_id');
    }

+    public function manufacturer()
+    {
+        return $this->belongsTo('\App\Models\Manufacturer', 'manufacturer_id');
+    }
+
    /**
     * Get the assigned user
     */
@@ -46,6 +46,21 @@ class Manufacturer extends Model
        return $this->hasManyThrough('\App\Models\Asset', '\App\Models\AssetModel', 'manufacturer_id', 'model_id');
    }

+    public function licenses()
+    {
+        return $this->hasMany('\App\Models\License', 'manufacturer_id');
+    }
+
+    public function accessories()
+    {
+        return $this->hasMany('\App\Models\Accessory', 'manufacturer_id');
+    }
+
+    public function consumables()
+    {
+        return $this->hasMany('\App\Models\Consumable', 'manufacturer_id');
+    }
+
    /**
    * Query builder scope to search on text
    *
@@ -67,7 +67,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon

        // Loop through the groups to see if any of them grant this permission
        foreach ($user_groups as $user_group) {
-            $group_permissions = json_decode($user_group->permissions, true);
+            $group_permissions = (array) json_decode($user_group->permissions, true);
            if (((array_key_exists($section, $group_permissions)) && ($group_permissions[$section]=='1'))) {
                return true;
            }
@@ -84,7 +84,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon

        foreach ($this->groups as $user_group) {
            $group_permissions = json_decode($user_group->permissions, true);
-            $group_array = $group_permissions;
+            $group_array = (array)$group_permissions;
            if ((array_key_exists('superuser', $group_array)) && ($group_permissions['superuser']=='1')) {
                return true;
            }
@@ -302,6 +302,10 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
            ->orWhere('username', '=', $user_email);
    }

+    public static function generateEmailFromFullName($name) {
+        $username = User::generateFormattedNameFromFullName(Setting::getSettings()->email_format, $name);
+        return $username['username'].'@'.Setting::getSettings()->email_domain;
+    }

    public static function generateFormattedNameFromFullName($format = 'filastname', $users_name)
    {
@@ -333,8 +337,9 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
            } elseif ($format=='firstname') {
                $email_last_name.=str_replace(' ', '', $last_name);
                $email_prefix = $first_name;
-
            }
+
+
        }

        $user_username = $email_prefix;
@@ -91,6 +91,12 @@ class AuthServiceProvider extends ServiceProvider
            }
        });

+        $gate->define('assets.edit', function ($user) {
+            if (($user->hasAccess('assets.edit')) || ($user->hasAccess('admin'))) {
+                return true;
+            }
+        });
+
        // Checks for some level of management
        $gate->define('assets.manage', function ($user) {
            if (($user->hasAccess('assets.checkin')) || ($user->hasAccess('assets.edit')) || ($user->hasAccess('assets.delete')) || ($user->hasAccess('assets.checkout')) || ($user->hasAccess('admin'))) {
@@ -21,7 +21,9 @@
      "doctrine/common": "v2.5.3",
      "doctrine/dbal": "v2.4.2",
      "barryvdh/laravel-debugbar": "^2.1",
-      "spatie/laravel-backup": "3.8.1"
+      "spatie/laravel-backup": "3.8.1",
+      "misterphilip/maintenance-mode": "1.0.*",
+      "neitanod/forceutf8": "dev-master"
    },
    "require-dev": {
      "fzaninotto/faker": "~1.4",
@@ -4,21 +4,21 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
        "This file is @generated automatically"
    ],
-    "hash": "bf63c53f99a010e882f5c4b797e9f098",
-    "content-hash": "47c6ecb6331ff36a3e58ca8ddac195f8",
+    "hash": "ed9f8700f2dcd943ff662a82e4d8314f",
+    "content-hash": "9c0251ddc1a110d83a762483abeea079",
    "packages": [
        {
            "name": "aws/aws-sdk-php",
-            "version": "3.18.30",
+            "version": "3.19.2",
            "source": {
                "type": "git",
                "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "fbce85229b913a9e1aded54e464a9bbff0787bf1"
+                "reference": "3cb90413129da42c9d3289d542bee0ae1049892c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/fbce85229b913a9e1aded54e464a9bbff0787bf1",
-                "reference": "fbce85229b913a9e1aded54e464a9bbff0787bf1",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3cb90413129da42c9d3289d542bee0ae1049892c",
+                "reference": "3cb90413129da42c9d3289d542bee0ae1049892c",
                "shasum": ""
            },
            "require": {
@@ -85,7 +85,7 @@
                "s3",
                "sdk"
            ],
-            "time": "2016-07-18 16:15:53"
+            "time": "2016-08-23 20:58:48"
        },
        {
            "name": "aws/aws-sdk-php-laravel",
@@ -145,21 +145,21 @@
        },
        {
            "name": "barryvdh/laravel-debugbar",
-            "version": "v2.2.2",
+            "version": "V2.2.3",
            "source": {
                "type": "git",
                "url": "https://github.com/barryvdh/laravel-debugbar.git",
-                "reference": "c291e58d0a13953e0f68d99182ee77ebc693edc0"
+                "reference": "ecd1ce5c4a827e2f6a8fb41bcf67713beb1c1cbd"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/c291e58d0a13953e0f68d99182ee77ebc693edc0",
-                "reference": "c291e58d0a13953e0f68d99182ee77ebc693edc0",
+                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/ecd1ce5c4a827e2f6a8fb41bcf67713beb1c1cbd",
+                "reference": "ecd1ce5c4a827e2f6a8fb41bcf67713beb1c1cbd",
                "shasum": ""
            },
            "require": {
-                "illuminate/support": "5.1.*|5.2.*",
-                "maximebf/debugbar": "~1.11.0",
+                "illuminate/support": "5.1.*|5.2.*|5.3.*",
+                "maximebf/debugbar": "~1.11.0|~1.12.0",
                "php": ">=5.5.9",
                "symfony/finder": "~2.7|~3.0"
            },
@@ -195,7 +195,7 @@
                "profiler",
                "webprofiler"
            ],
-            "time": "2016-05-11 13:54:43"
+            "time": "2016-07-29 15:00:36"
        },
        {
            "name": "classpreloader/classpreloader",
@@ -754,12 +754,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/erusev/parsedown.git",
-                "reference": "490a8f35a4163f59230f53c34f1fbb22a864c01e"
+                "reference": "f671ae73647b6666c1442cbaac98e5d60208e409"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/erusev/parsedown/zipball/490a8f35a4163f59230f53c34f1fbb22a864c01e",
-                "reference": "490a8f35a4163f59230f53c34f1fbb22a864c01e",
+                "url": "https://api.github.com/repos/erusev/parsedown/zipball/f671ae73647b6666c1442cbaac98e5d60208e409",
+                "reference": "f671ae73647b6666c1442cbaac98e5d60208e409",
                "shasum": ""
            },
            "require": {
@@ -788,7 +788,7 @@
                "markdown",
                "parser"
            ],
-            "time": "2016-03-09 17:02:39"
+            "time": "2016-07-27 08:05:24"
        },
        {
            "name": "fideloper/proxy",
@@ -1018,12 +1018,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/Intervention/image.git",
-                "reference": "6886d43f5babe6900c29c59640ca81401fe71c80"
+                "reference": "45a41a38bd1e5290cd51ab773013e6f041b2b711"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/image/zipball/6886d43f5babe6900c29c59640ca81401fe71c80",
-                "reference": "6886d43f5babe6900c29c59640ca81401fe71c80",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/45a41a38bd1e5290cd51ab773013e6f041b2b711",
+                "reference": "45a41a38bd1e5290cd51ab773013e6f041b2b711",
                "shasum": ""
            },
            "require": {
@@ -1072,7 +1072,7 @@
                "thumbnail",
                "watermark"
            ],
-            "time": "2016-06-22 08:03:11"
+            "time": "2016-08-19 14:41:12"
        },
        {
            "name": "jakub-onderka/php-console-color",
@@ -1221,16 +1221,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v5.2.39",
+            "version": "v5.2.45",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "c2a77050269b4e03bd9a735a9f24e573a7598b8a"
+                "reference": "2a79f920d5584ec6df7cf996d922a742d11095d1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/c2a77050269b4e03bd9a735a9f24e573a7598b8a",
-                "reference": "c2a77050269b4e03bd9a735a9f24e573a7598b8a",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/2a79f920d5584ec6df7cf996d922a742d11095d1",
+                "reference": "2a79f920d5584ec6df7cf996d922a742d11095d1",
                "shasum": ""
            },
            "require": {
@@ -1287,7 +1287,8 @@
                "illuminate/support": "self.version",
                "illuminate/translation": "self.version",
                "illuminate/validation": "self.version",
-                "illuminate/view": "self.version"
+                "illuminate/view": "self.version",
+                "tightenco/collect": "self.version"
            },
            "require-dev": {
                "aws/aws-sdk-php": "~3.0",
@@ -1310,7 +1311,7 @@
                "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0).",
                "symfony/css-selector": "Required to use some of the crawler integration testing tools (2.8.*|3.0.*).",
                "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (2.8.*|3.0.*).",
-                "symfony/psr-http-message-bridge": "Required to psr7 bridging features (0.2.*)."
+                "symfony/psr-http-message-bridge": "Required to use psr7 bridging features (0.2.*)."
            },
            "type": "library",
            "extra": {
@@ -1346,7 +1347,7 @@
                "framework",
                "laravel"
            ],
-            "time": "2016-06-17 19:25:12"
+            "time": "2016-08-26 11:44:52"
        },
        {
            "name": "laravelcollective/html",
@@ -1461,16 +1462,16 @@
        },
        {
            "name": "league/flysystem",
-            "version": "1.0.25",
+            "version": "1.0.27",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "a76afa4035931be0c78ca8efc6abf3902362f437"
+                "reference": "50e2045ed70a7e75a5e30bc3662904f3b67af8a9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a76afa4035931be0c78ca8efc6abf3902362f437",
-                "reference": "a76afa4035931be0c78ca8efc6abf3902362f437",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/50e2045ed70a7e75a5e30bc3662904f3b67af8a9",
+                "reference": "50e2045ed70a7e75a5e30bc3662904f3b67af8a9",
                "shasum": ""
            },
            "require": {
@@ -1540,7 +1541,7 @@
                "sftp",
                "storage"
            ],
-            "time": "2016-07-18 12:22:57"
+            "time": "2016-08-10 08:55:11"
        },
        {
            "name": "maknz/slack",
@@ -1548,12 +1549,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/maknz/slack.git",
-                "reference": "e44a4685743c2286466ce5f0dbc025cf23248333"
+                "reference": "e9bab77eb7344f4697756ca55386576b05dc8e5a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/maknz/slack/zipball/e44a4685743c2286466ce5f0dbc025cf23248333",
-                "reference": "e44a4685743c2286466ce5f0dbc025cf23248333",
+                "url": "https://api.github.com/repos/maknz/slack/zipball/e9bab77eb7344f4697756ca55386576b05dc8e5a",
+                "reference": "e9bab77eb7344f4697756ca55386576b05dc8e5a",
                "shasum": ""
            },
            "require": {
@@ -1590,20 +1591,20 @@
                "laravel",
                "slack"
            ],
-            "time": "2016-06-26 05:15:48"
+            "time": "2016-07-27 23:17:40"
        },
        {
            "name": "maximebf/debugbar",
-            "version": "v1.11.1",
+            "version": "v1.12.0",
            "source": {
                "type": "git",
                "url": "https://github.com/maximebf/php-debugbar.git",
-                "reference": "d9302891c1f0a0ac5a4f66725163a00537c6359f"
+                "reference": "e634fbd32cd6bc3fa0e8c972b52d4bf49bab3988"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/d9302891c1f0a0ac5a4f66725163a00537c6359f",
-                "reference": "d9302891c1f0a0ac5a4f66725163a00537c6359f",
+                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/e634fbd32cd6bc3fa0e8c972b52d4bf49bab3988",
+                "reference": "e634fbd32cd6bc3fa0e8c972b52d4bf49bab3988",
                "shasum": ""
            },
            "require": {
@@ -1622,7 +1623,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.11-dev"
+                    "dev-master": "1.12-dev"
                }
            },
            "autoload": {
@@ -1651,20 +1652,65 @@
                "debug",
                "debugbar"
            ],
-            "time": "2016-01-22 12:22:23"
+            "time": "2016-05-15 13:11:34"
        },
        {
-            "name": "monolog/monolog",
-            "version": "1.20.0",
+            "name": "misterphilip/maintenance-mode",
+            "version": "1.0.2",
            "source": {
                "type": "git",
-                "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "55841909e2bcde01b5318c35f2b74f8ecc86e037"
+                "url": "https://github.com/MisterPhilip/maintenance-mode.git",
+                "reference": "35e061703edb3c0703baea677335c03085f2b179"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/55841909e2bcde01b5318c35f2b74f8ecc86e037",
-                "reference": "55841909e2bcde01b5318c35f2b74f8ecc86e037",
+                "url": "https://api.github.com/repos/MisterPhilip/maintenance-mode/zipball/35e061703edb3c0703baea677335c03085f2b179",
+                "reference": "35e061703edb3c0703baea677335c03085f2b179",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/support": "5.0 - 5.2",
+                "nesbot/carbon": "~1.19",
+                "php": ">=5.4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "MisterPhilip\\MaintenanceMode": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Philip Lawrence",
+                    "email": "philip@misterphilip.com",
+                    "homepage": "http://misterphilip.com"
+                }
+            ],
+            "description": "An enhanced drop-in replacement for Laravel 5's maintenance mode",
+            "keywords": [
+                "l5",
+                "laravel",
+                "laravel5",
+                "maintenance"
+            ],
+            "time": "2015-12-23 07:24:42"
+        },
+        {
+            "name": "monolog/monolog",
+            "version": "1.21.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Seldaek/monolog.git",
+                "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952",
+                "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952",
                "shasum": ""
            },
            "require": {
@@ -1729,7 +1775,7 @@
                "logging",
                "psr-3"
            ],
-            "time": "2016-07-02 14:02:10"
+            "time": "2016-07-29 03:23:52"
        },
        {
            "name": "mtdowling/cron-expression",
@@ -1830,6 +1876,40 @@
            ],
            "time": "2016-01-05 18:25:05"
        },
+        {
+            "name": "neitanod/forceutf8",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/neitanod/forceutf8.git",
+                "reference": "2c1b21e00ed16b2b083ae4e27901cb5f2856db90"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/neitanod/forceutf8/zipball/2c1b21e00ed16b2b083ae4e27901cb5f2856db90",
+                "reference": "2c1b21e00ed16b2b083ae4e27901cb5f2856db90",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "ForceUTF8\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "authors": [
+                {
+                    "name": "Sebastián Grignoli",
+                    "email": "grignoli@gmail.com"
+                }
+            ],
+            "description": "PHP Class Encoding featuring popular Encoding::toUTF8() function --formerly known as forceUTF8()-- that fixes mixed encoded strings.",
+            "homepage": "https://github.com/neitanod/forceutf8",
+            "time": "2015-05-07 16:37:23"
+        },
        {
            "name": "nesbot/carbon",
            "version": "1.21.0",
@@ -1978,16 +2058,16 @@
        },
        {
            "name": "psr/http-message",
-            "version": "1.0",
+            "version": "1.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/php-fig/http-message.git",
-                "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298"
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
-                "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
                "shasum": ""
            },
            "require": {
@@ -2015,6 +2095,7 @@
                }
            ],
            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
            "keywords": [
                "http",
                "http-message",
@@ -2023,7 +2104,7 @@
                "request",
                "response"
            ],
-            "time": "2015-05-04 20:22:00"
+            "time": "2016-08-06 14:39:51"
        },
        {
            "name": "psr/log",
@@ -2302,16 +2383,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v3.0.8",
+            "version": "v3.0.9",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "a7abb7153f6d1da47f87ec50274844e246b09d9f"
+                "reference": "926061e74229e935d3c5b4e9ba87237316c6693f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/a7abb7153f6d1da47f87ec50274844e246b09d9f",
-                "reference": "a7abb7153f6d1da47f87ec50274844e246b09d9f",
+                "url": "https://api.github.com/repos/symfony/console/zipball/926061e74229e935d3c5b4e9ba87237316c6693f",
+                "reference": "926061e74229e935d3c5b4e9ba87237316c6693f",
                "shasum": ""
            },
            "require": {
@@ -2358,20 +2439,20 @@
            ],
            "description": "Symfony Console Component",
            "homepage": "https://symfony.com",
-            "time": "2016-06-29 07:02:21"
+            "time": "2016-07-30 07:22:48"
        },
        {
            "name": "symfony/debug",
-            "version": "v3.0.8",
+            "version": "v3.0.9",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/debug.git",
-                "reference": "c54bc3539c3b87e86799533801e8ae0e971d78c2"
+                "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/c54bc3539c3b87e86799533801e8ae0e971d78c2",
-                "reference": "c54bc3539c3b87e86799533801e8ae0e971d78c2",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/697c527acd9ea1b2d3efac34d9806bf255278b0a",
+                "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a",
                "shasum": ""
            },
            "require": {
@@ -2415,20 +2496,20 @@
            ],
            "description": "Symfony Debug Component",
            "homepage": "https://symfony.com",
-            "time": "2016-06-29 05:40:00"
+            "time": "2016-07-30 07:22:48"
        },
        {
            "name": "symfony/event-dispatcher",
-            "version": "v3.1.2",
+            "version": "v3.1.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "7f9839ede2070f53e7e2f0849b9bd14748c434c5"
+                "reference": "c0c00c80b3a69132c4e55c3e7db32b4a387615e5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7f9839ede2070f53e7e2f0849b9bd14748c434c5",
-                "reference": "7f9839ede2070f53e7e2f0849b9bd14748c434c5",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/c0c00c80b3a69132c4e55c3e7db32b4a387615e5",
+                "reference": "c0c00c80b3a69132c4e55c3e7db32b4a387615e5",
                "shasum": ""
            },
            "require": {
@@ -2475,11 +2556,11 @@
            ],
            "description": "Symfony EventDispatcher Component",
            "homepage": "https://symfony.com",
-            "time": "2016-06-29 05:41:56"
+            "time": "2016-07-19 10:45:57"
        },
        {
            "name": "symfony/finder",
-            "version": "v3.0.8",
+            "version": "v3.0.9",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/finder.git",
@@ -2528,16 +2609,16 @@
        },
        {
            "name": "symfony/http-foundation",
-            "version": "v3.0.8",
+            "version": "v3.0.9",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "1341139f906d295baa4f4abd55293d07e25a065a"
+                "reference": "49ba00f8ede742169cb6b70abe33243f4d673f82"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1341139f906d295baa4f4abd55293d07e25a065a",
-                "reference": "1341139f906d295baa4f4abd55293d07e25a065a",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/49ba00f8ede742169cb6b70abe33243f4d673f82",
+                "reference": "49ba00f8ede742169cb6b70abe33243f4d673f82",
                "shasum": ""
            },
            "require": {
@@ -2577,20 +2658,20 @@
            ],
            "description": "Symfony HttpFoundation Component",
            "homepage": "https://symfony.com",
-            "time": "2016-06-29 07:02:21"
+            "time": "2016-07-17 13:54:30"
        },
        {
            "name": "symfony/http-kernel",
-            "version": "v3.0.8",
+            "version": "v3.0.9",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "177b63b2d50b63fa6d82ea41359ed9928cc7a1fb"
+                "reference": "d97ba4425e36e79c794e7d14ff36f00f081b37b3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/177b63b2d50b63fa6d82ea41359ed9928cc7a1fb",
-                "reference": "177b63b2d50b63fa6d82ea41359ed9928cc7a1fb",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d97ba4425e36e79c794e7d14ff36f00f081b37b3",
+                "reference": "d97ba4425e36e79c794e7d14ff36f00f081b37b3",
                "shasum": ""
            },
            "require": {
@@ -2659,7 +2740,7 @@
            ],
            "description": "Symfony HttpKernel Component",
            "homepage": "https://symfony.com",
-            "time": "2016-06-30 16:30:17"
+            "time": "2016-07-30 09:10:37"
        },
        {
            "name": "symfony/polyfill-mbstring",
@@ -2830,16 +2911,16 @@
        },
        {
            "name": "symfony/process",
-            "version": "v3.0.8",
+            "version": "v3.0.9",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/process.git",
-                "reference": "d7cde1f9d94d87060204f863779389b61c382eeb"
+                "reference": "768debc5996f599c4372b322d9061dba2a4bf505"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/d7cde1f9d94d87060204f863779389b61c382eeb",
-                "reference": "d7cde1f9d94d87060204f863779389b61c382eeb",
+                "url": "https://api.github.com/repos/symfony/process/zipball/768debc5996f599c4372b322d9061dba2a4bf505",
+                "reference": "768debc5996f599c4372b322d9061dba2a4bf505",
                "shasum": ""
            },
            "require": {
@@ -2875,11 +2956,11 @@
            ],
            "description": "Symfony Process Component",
            "homepage": "https://symfony.com",
-            "time": "2016-06-29 05:40:00"
+            "time": "2016-07-28 11:13:34"
        },
        {
            "name": "symfony/routing",
-            "version": "v3.0.8",
+            "version": "v3.0.9",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/routing.git",
@@ -2954,16 +3035,16 @@
        },
        {
            "name": "symfony/translation",
-            "version": "v3.0.8",
+            "version": "v3.0.9",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/translation.git",
-                "reference": "6bf844e1ee3c820c012386c10427a5c67bbefec8"
+                "reference": "eee6c664853fd0576f21ae25725cfffeafe83f26"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/6bf844e1ee3c820c012386c10427a5c67bbefec8",
-                "reference": "6bf844e1ee3c820c012386c10427a5c67bbefec8",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/eee6c664853fd0576f21ae25725cfffeafe83f26",
+                "reference": "eee6c664853fd0576f21ae25725cfffeafe83f26",
                "shasum": ""
            },
            "require": {
@@ -3014,20 +3095,20 @@
            ],
            "description": "Symfony Translation Component",
            "homepage": "https://symfony.com",
-            "time": "2016-06-29 05:40:00"
+            "time": "2016-07-30 07:22:48"
        },
        {
            "name": "symfony/var-dumper",
-            "version": "v3.0.8",
+            "version": "v3.0.9",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "2f046e9a9d571f22cc8b26783564876713b06579"
+                "reference": "1f7e071aafc6676fcb6e3f0497f87c2397247377"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2f046e9a9d571f22cc8b26783564876713b06579",
-                "reference": "2f046e9a9d571f22cc8b26783564876713b06579",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/1f7e071aafc6676fcb6e3f0497f87c2397247377",
+                "reference": "1f7e071aafc6676fcb6e3f0497f87c2397247377",
                "shasum": ""
            },
            "require": {
@@ -3077,7 +3158,7 @@
                "debug",
                "dump"
            ],
-            "time": "2016-06-29 05:40:00"
+            "time": "2016-07-26 08:03:56"
        },
        {
            "name": "tecnickcom/tc-lib-barcode",
@@ -3085,17 +3166,17 @@
            "source": {
                "type": "git",
                "url": "https://github.com/tecnickcom/tc-lib-barcode.git",
-                "reference": "220728e5f659b935348442e8d1d3e46fd5f9e178"
+                "reference": "df69541618a0ebc24bc8f938e52f76a471f2e018"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/tecnickcom/tc-lib-barcode/zipball/220728e5f659b935348442e8d1d3e46fd5f9e178",
-                "reference": "220728e5f659b935348442e8d1d3e46fd5f9e178",
+                "url": "https://api.github.com/repos/tecnickcom/tc-lib-barcode/zipball/df69541618a0ebc24bc8f938e52f76a471f2e018",
+                "reference": "df69541618a0ebc24bc8f938e52f76a471f2e018",
                "shasum": ""
            },
            "require": {
                "php": ">=5.4",
-                "tecnickcom/tc-lib-color": "^1.11.0"
+                "tecnickcom/tc-lib-color": "^1.12.0"
            },
            "require-dev": {
                "apigen/apigen": "^4.1.2",
@@ -3163,20 +3244,20 @@
                "tc-lib-barcode",
                "upc"
            ],
-            "time": "2016-07-10 18:29:15"
+            "time": "2016-08-25 12:36:23"
        },
        {
            "name": "tecnickcom/tc-lib-color",
-            "version": "1.11.0",
+            "version": "1.12.0",
            "source": {
                "type": "git",
                "url": "https://github.com/tecnickcom/tc-lib-color.git",
-                "reference": "6a000b658758e271bf4c41bbc1ce4c685d8a7160"
+                "reference": "176464ae7ad0256c1dfd9d742ee2461d0b660f7c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/tecnickcom/tc-lib-color/zipball/6a000b658758e271bf4c41bbc1ce4c685d8a7160",
-                "reference": "6a000b658758e271bf4c41bbc1ce4c685d8a7160",
+                "url": "https://api.github.com/repos/tecnickcom/tc-lib-color/zipball/176464ae7ad0256c1dfd9d742ee2461d0b660f7c",
+                "reference": "176464ae7ad0256c1dfd9d742ee2461d0b660f7c",
                "shasum": ""
            },
            "require": {
@@ -3225,7 +3306,7 @@
                "tc-lib-color",
                "web"
            ],
-            "time": "2016-06-13 14:31:19"
+            "time": "2016-08-25 11:56:01"
        },
        {
            "name": "vlucas/phpdotenv",
@@ -3279,24 +3360,24 @@
        },
        {
            "name": "watson/validating",
-            "version": "2.2.1",
+            "version": "2.2.2",
            "source": {
                "type": "git",
                "url": "https://github.com/dwightwatson/validating.git",
-                "reference": "64dc3d211372576d468e2bfaf3c7b7ace66ee970"
+                "reference": "8f37e416aaf02129c8ad57a446a6ef7080019687"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/dwightwatson/validating/zipball/64dc3d211372576d468e2bfaf3c7b7ace66ee970",
-                "reference": "64dc3d211372576d468e2bfaf3c7b7ace66ee970",
+                "url": "https://api.github.com/repos/dwightwatson/validating/zipball/8f37e416aaf02129c8ad57a446a6ef7080019687",
+                "reference": "8f37e416aaf02129c8ad57a446a6ef7080019687",
                "shasum": ""
            },
            "require": {
-                "illuminate/contracts": "~5.0",
-                "illuminate/database": "~5.0 || >=5.1.27",
-                "illuminate/events": "~5.0",
-                "illuminate/support": "~5.0",
-                "illuminate/validation": "~5.0",
+                "illuminate/contracts": "~5.0 <5.3",
+                "illuminate/database": "~5.0 <5.3 || >=5.1.27",
+                "illuminate/events": "~5.0 <5.3",
+                "illuminate/support": "~5.0 <5.3",
+                "illuminate/validation": "~5.0 <5.3",
                "php": ">=5.4.0"
            },
            "require-dev": {
@@ -3330,7 +3411,7 @@
                "laravel",
                "validation"
            ],
-            "time": "2016-04-07 14:59:06"
+            "time": "2016-08-28 07:54:32"
        }
    ],
    "packages-dev": [
@@ -3524,16 +3605,16 @@
        },
        {
            "name": "facebook/webdriver",
-            "version": "1.1.2",
+            "version": "1.1.3",
            "source": {
                "type": "git",
                "url": "https://github.com/facebook/php-webdriver.git",
-                "reference": "0b889d7de7461439f8a3bbcca46e0f696cb27986"
+                "reference": "b7186fb1bcfda956d237f59face250d06ef47253"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/0b889d7de7461439f8a3bbcca46e0f696cb27986",
-                "reference": "0b889d7de7461439f8a3bbcca46e0f696cb27986",
+                "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/b7186fb1bcfda956d237f59face250d06ef47253",
+                "reference": "b7186fb1bcfda956d237f59face250d06ef47253",
                "shasum": ""
            },
            "require": {
@@ -3541,7 +3622,9 @@
                "php": ">=5.3.19"
            },
            "require-dev": {
-                "phpunit/phpunit": "4.6.*"
+                "friendsofphp/php-cs-fixer": "^1.11",
+                "phpunit/phpunit": "4.6.* || ~5.0",
+                "squizlabs/php_codesniffer": "^2.6"
            },
            "suggest": {
                "phpdocumentor/phpdocumentor": "2.*"
@@ -3564,7 +3647,7 @@
                "selenium",
                "webdriver"
            ],
-            "time": "2016-06-04 00:02:34"
+            "time": "2016-08-10 00:44:08"
        },
        {
            "name": "fzaninotto/faker",
@@ -4289,16 +4372,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "4.8.26",
+            "version": "4.8.27",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74"
+                "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc1d8cd5b5de11625979125c5639347896ac2c74",
-                "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c062dddcb68e44b563f66ee319ddae2b5a322a90",
+                "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90",
                "shasum": ""
            },
            "require": {
@@ -4357,7 +4440,7 @@
                "testing",
                "xunit"
            ],
-            "time": "2016-05-17 03:09:28"
+            "time": "2016-07-21 06:48:14"
        },
        {
            "name": "phpunit/phpunit-mock-objects",
@@ -4533,23 +4616,23 @@
        },
        {
            "name": "sebastian/environment",
-            "version": "1.3.7",
+            "version": "1.3.8",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716"
+                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716",
-                "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea",
+                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea",
                "shasum": ""
            },
            "require": {
-                "php": ">=5.3.3"
+                "php": "^5.3.3 || ^7.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "~4.4"
+                "phpunit/phpunit": "^4.8 || ^5.0"
            },
            "type": "library",
            "extra": {
@@ -4579,7 +4662,7 @@
                "environment",
                "hhvm"
            ],
-            "time": "2016-05-17 03:18:57"
+            "time": "2016-08-18 05:49:44"
        },
        {
            "name": "sebastian/exporter",
@@ -4867,16 +4950,16 @@
        },
        {
            "name": "symfony/browser-kit",
-            "version": "v3.1.2",
+            "version": "v3.1.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "dcf41ed026b0499254385b5c88f03247b2ba010b"
+                "reference": "d2a07cc11c5fa94820240b1e67592ffb18e347b9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/dcf41ed026b0499254385b5c88f03247b2ba010b",
-                "reference": "dcf41ed026b0499254385b5c88f03247b2ba010b",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/d2a07cc11c5fa94820240b1e67592ffb18e347b9",
+                "reference": "d2a07cc11c5fa94820240b1e67592ffb18e347b9",
                "shasum": ""
            },
            "require": {
@@ -4920,11 +5003,11 @@
            ],
            "description": "Symfony BrowserKit Component",
            "homepage": "https://symfony.com",
-            "time": "2016-06-29 05:41:56"
+            "time": "2016-07-26 08:04:17"
        },
        {
            "name": "symfony/css-selector",
-            "version": "v3.1.2",
+            "version": "v3.1.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/css-selector.git",
@@ -4977,16 +5060,16 @@
        },
        {
            "name": "symfony/dom-crawler",
-            "version": "v3.1.2",
+            "version": "v3.1.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0"
+                "reference": "c7b9b8db3a6f2bac76dcd9a9db5446f2591897f9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0",
-                "reference": "99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/c7b9b8db3a6f2bac76dcd9a9db5446f2591897f9",
+                "reference": "c7b9b8db3a6f2bac76dcd9a9db5446f2591897f9",
                "shasum": ""
            },
            "require": {
@@ -5029,20 +5112,20 @@
            ],
            "description": "Symfony DomCrawler Component",
            "homepage": "https://symfony.com",
-            "time": "2016-06-29 05:41:56"
+            "time": "2016-07-26 08:04:17"
        },
        {
            "name": "symfony/yaml",
-            "version": "v3.1.2",
+            "version": "v3.1.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/yaml.git",
-                "reference": "2884c26ce4c1d61aebf423a8b912950fe7c764de"
+                "reference": "1819adf2066880c7967df7180f4f662b6f0567ac"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/2884c26ce4c1d61aebf423a8b912950fe7c764de",
-                "reference": "2884c26ce4c1d61aebf423a8b912950fe7c764de",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/1819adf2066880c7967df7180f4f662b6f0567ac",
+                "reference": "1819adf2066880c7967df7180f4f662b6f0567ac",
                "shasum": ""
            },
            "require": {
@@ -5078,32 +5161,33 @@
            ],
            "description": "Symfony Yaml Component",
            "homepage": "https://symfony.com",
-            "time": "2016-06-29 05:41:56"
+            "time": "2016-07-17 14:02:08"
        },
        {
            "name": "webmozart/assert",
-            "version": "1.0.2",
+            "version": "1.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/webmozart/assert.git",
-                "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde"
+                "reference": "bb2d123231c095735130cc8f6d31385a44c7b308"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
-                "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/bb2d123231c095735130cc8f6d31385a44c7b308",
+                "reference": "bb2d123231c095735130cc8f6d31385a44c7b308",
                "shasum": ""
            },
            "require": {
-                "php": ">=5.3.3"
+                "php": "^5.3.3|^7.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "^4.6"
+                "phpunit/phpunit": "^4.6",
+                "sebastian/version": "^1.0.1"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-master": "1.2-dev"
                }
            },
            "autoload": {
@@ -5127,7 +5211,7 @@
                "check",
                "validate"
            ],
-            "time": "2015-08-24 13:29:44"
+            "time": "2016-08-09 15:02:57"
        }
    ],
    "aliases": [],
@@ -5136,7 +5220,8 @@
        "intervention/image": 20,
        "maknz/slack": 20,
        "erusev/parsedown": 20,
-        "tecnickcom/tc-lib-barcode": 20
+        "tecnickcom/tc-lib-barcode": 20,
+        "neitanod/forceutf8": 20
    },
    "prefer-stable": false,
    "prefer-lowest": false,
@@ -127,6 +127,20 @@ return [
    'private_uploads' => storage_path().'/private_uploads',


+    /*
+    |--------------------------------------------------------------------------
+    | ALLOW I-FRAMING
+    |--------------------------------------------------------------------------
+    |
+    | Normal users will never need to edit this. This option lets you run
+    | Snipe-IT within an I-Frame, which is normally disabled by default for
+    | security reasons, to prevent clickjacking. It should normally be set to false.
+    |
+    */
+
+    'allow_iframing' => env('ALLOW_IFRAMING', false),
+
+
    /*
    |--------------------------------------------------------------------------
    | Demo Mode Lockdown
@@ -140,7 +154,6 @@ return [
    'lock_passwords' => env('APP_LOCKED', false),


-
    /*
    |--------------------------------------------------------------------------
    | Autoloaded Service Providers
@@ -197,6 +210,8 @@ return [
        Collective\Html\HtmlServiceProvider::class,
        Spatie\Backup\BackupServiceProvider::class,
        Fideloper\Proxy\TrustedProxyServiceProvider::class,
+        MisterPhilip\MaintenanceMode\MaintenanceModeServiceProvider::class,
+        MisterPhilip\MaintenanceMode\MaintenanceCommandServiceProvider::class,

        /*
         * Custom service provider
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v3.2.0',
-  'hash_version' => 'v3.2.0-53-gfff2bce',
+  'app_version' => 'v3.4.0',
+  'hash_version' => 'v3.4.0-9-g67315d8',
 );
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddDisallowLdapPwSyncToSettings extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->boolean('ldap_pw_sync')->default(1);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('settings', function ($table) {
+            $table->dropColumn('ldap_pw_sync');
+        });
+    }
+}
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddManufacturerToLicenses extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('licenses', function (Blueprint $table) {
+            //
+            $table->integer('manufacturer_id')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('licenses', function (Blueprint $table) {
+            //
+        });
+    }
+}
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddManufacturerToAccessoriesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('accessories', function (Blueprint $table) {
+            //
+            $table->integer('manufacturer_id')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('accessories', function (Blueprint $table) {
+            //
+            $table->dropColumn('manufacturer_id');
+        });
+    }
+}
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddNewFieldsToCustomFields extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('custom_fields', function (Blueprint $table) {
+            //
+            $table->string('field_values')->nullable()->default(null);
+            $table->boolean('field_encrypted')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('custom_fields', function (Blueprint $table) {
+            //
+            $table->dropColumn('field_values', 'field_encrypted');
+        });
+    }
+}
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddShowInNavToStatusLabels extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('status_labels', function (Blueprint $table) {
+            $table->boolean('show_in_nav')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('status_labels', function (Blueprint $table) {
+            $table->dropColumn('show_in_nav', 'field_encrypted');
+        });
+    }
+}
@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class MakePurchaseCostNullable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('assets', function ($table) {
+            $table->decimal('purchase_cost',8,2)->nullable()->default(null)->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
@@ -22,3 +22,5 @@ APP_KEY=Y5hJeC7x1i7OxhDrvrQPlB9KvCorvRdO
 APP_URL=http://127.0.0.1:32782
 APP_TIMEZONE=US/Pacific
 APP_LOCALE=en
+
+ALLOW_IFRAMING=false
@@ -50,7 +50,7 @@
 		#   when the CA certificates are directly appended to the server
 		#   certificate for convinience.
 		#SSLCertificateChainFile /etc/apache2/ssl.crt/server-ca.crt
-		SSLCertificateChainFile /etc/ssl/private/snipeit-ssl.crt
+		SSLCertificateChainFile /var/lib/snipeit/ssl/snipeit-ssl.crt

 		#   Certificate Authority (CA):
 		#   Set the CA certificate verification path where to find CA
@@ -18,6 +18,7 @@ DB_DATABASE=${MYSQL_DATABASE}
 DB_USERNAME=${MYSQL_USER}
 DB_PASSWORD=${MYSQL_PASSWORD}
 DB_PREFIX=null
+DB_DUMP_PATH='/usr/bin'


 # --------------------------------------------
@@ -0,0 +1,4 @@
+/**
+* @preserve HTML5 Shiv 3.7.3 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
+*/
+!function(a,b){function c(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function d(){var a=t.elements;return"string"==typeof a?a.split(" "):a}function e(a,b){var c=t.elements;"string"!=typeof c&&(c=c.join(" ")),"string"!=typeof a&&(a=a.join(" ")),t.elements=c+" "+a,j(b)}function f(a){var b=s[a[q]];return b||(b={},r++,a[q]=r,s[r]=b),b}function g(a,c,d){if(c||(c=b),l)return c.createElement(a);d||(d=f(c));var e;return e=d.cache[a]?d.cache[a].cloneNode():p.test(a)?(d.cache[a]=d.createElem(a)).cloneNode():d.createElem(a),!e.canHaveChildren||o.test(a)||e.tagUrn?e:d.frag.appendChild(e)}function h(a,c){if(a||(a=b),l)return a.createDocumentFragment();c=c||f(a);for(var e=c.frag.cloneNode(),g=0,h=d(),i=h.length;i>g;g++)e.createElement(h[g]);return e}function i(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return t.shivMethods?g(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+d().join().replace(/[\w\-:]+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(t,b.frag)}function j(a){a||(a=b);var d=f(a);return!t.shivCSS||k||d.hasCSS||(d.hasCSS=!!c(a,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),l||i(a,d),a}var k,l,m="3.7.3",n=a.html5||{},o=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,p=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,q="_html5shiv",r=0,s={};!function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",k="hidden"in a,l=1==a.childNodes.length||function(){b.createElement("a");var a=b.createDocumentFragment();return"undefined"==typeof a.cloneNode||"undefined"==typeof a.createDocumentFragment||"undefined"==typeof a.createElement}()}catch(c){k=!0,l=!0}}();var t={elements:n.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video",version:m,shivCSS:n.shivCSS!==!1,supportsUnknownElements:l,shivMethods:n.shivMethods!==!1,type:"default",shivDocument:j,createElement:g,createDocumentFragment:h,addElements:e};a.html5=t,j(b),"object"==typeof module&&module.exports&&(module.exports=t)}("undefined"!=typeof window?window:this,document);
@@ -36,6 +36,11 @@ include '../c3.php';

 $app = require_once __DIR__.'/../bootstrap/app.php';

+// set the public path to this directory
+$app->bind('path.public', function() {
+    return __DIR__;
+});
+
 /*
 |--------------------------------------------------------------------------
 | Run The Application
@@ -5,11 +5,16 @@ return array(
    'field'		                => 'حقل',
    'about_fieldsets_title'		=> 'حول مجموعة الحقول',
    'about_fieldsets_text'		=> 'مجموعات-الحقول تسمح لك بإنشاء مجموعات من الحقول اللتي يمكن إعادة إستخدامها مع أنواع موديل محدد.',
+    'custom_format'             => 'Custom format...',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
    'fieldset'      	        => 'مجموعة-حقول',
    'qty_fields'      	      => 'الحقول الكمية',
    'fieldsets'      	        => 'مجموعات-الحقول',
    'fieldset_name'           => 'إسم مجموعة-الحقل',
    'field_name'              => 'إسم الحقل',
+    'field_values'            => 'Field Values',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
    'field_element'           => 'عنصر النموذج',
    'field_element_short'     => 'عنصر',
    'field_format'            => 'صيغة',
@@ -37,9 +37,9 @@ return array(
    ),

    'import' => array(
-        'error'         => 'Some Items did not import Correctly.',
-        'errorDetail'   => 'The Following Items were not imported because of errors.',
-        'success'       => "Your File has been imported",
+        'error'         => 'Some items did not import correctly.',
+        'errorDetail'   => 'The following Items were not imported because of errors.',
+        'success'       => "Your file has been imported",
    ),


@@ -52,7 +52,8 @@ return array(
    'checkout' => array(
        'error'   		=> 'Asset was not checked out, please try again',
        'success' 		=> 'Asset checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'not_available' => 'That asset is not available for checkout!'
    ),

    'checkin' => array(
@@ -51,6 +51,8 @@ return array(
    'ldap_pword'                => 'LDAP Bind Password',
    'ldap_basedn'               => 'Base Bind DN',
    'ldap_filter'               => 'LDAP Filter',
+    'ldap_pw_sync'              => 'LDAP Password Sync',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
    'ldap_username_field'       => 'Username Field',
    'ldap_lname_field'          => 'Last Name',
    'ldap_fname_field'          => 'LDAP First Name',
@@ -4,11 +4,13 @@ return array(
    'about'      	=> 'About Status Labels',
    'archived'      	=> 'Archived',
    'create'      	=> 'Create Status Label',
+    'color'      	=> 'Chart Color',
    'deployable'      	=> 'Deployable',
    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
    'name'      	=> 'Status Name',
    'pending'      	=> 'Pending',
    'status_type'   => 'Status Type',
+    'show_in_nav'   => 'Show in side nav',
    'title'      	=> 'Status Labels',
    'undeployable'  => 'Undeployable',
    'update'      	=> 'Update Status Label',
@@ -76,6 +76,7 @@
    'image_delete'         	=> 'حذف الصورة',
    'image_upload'         	=> 'رفع صورة',
    'import'         	    => 'Import',
+    'import-history'        => 'Import History',
    'asset_maintenance'        => 'Asset Maintenance',
    'asset_maintenance_report' => 'Asset Maintenance Report',
    'asset_maintenances'       => 'Asset Maintenances',
@@ -5,11 +5,16 @@ return array(
    'field'		                => 'Поле',
    'about_fieldsets_title'		=> 'About Fieldsets',
    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.',
+    'custom_format'             => 'Custom format...',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
    'fieldset'      	        => 'Fieldset',
    'qty_fields'      	      => 'Qty Fields',
    'fieldsets'      	        => 'Fieldsets',
    'fieldset_name'           => 'Fieldset Name',
    'field_name'              => 'Field Name',
+    'field_values'            => 'Field Values',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
    'field_element'           => 'Form Element',
    'field_element_short'     => 'Element',
    'field_format'            => 'Format',
@@ -36,9 +36,9 @@ return array(
    ),

    'import' => array(
-        'error'         => 'Some Items did not import Correctly.',
-        'errorDetail'   => 'The Following Items were not imported because of errors.',
-        'success'       => "Your File has been imported",
+        'error'         => 'Some items did not import correctly.',
+        'errorDetail'   => 'The following Items were not imported because of errors.',
+        'success'       => "Your file has been imported",
    ),


@@ -51,7 +51,8 @@ return array(
    'checkout' => array(
        'error'   		=> 'Активът не беше изписан. Моля опитайте отново.',
        'success' 		=> 'Активът изписан успешно.',
-        'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.'
+        'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.',
+        'not_available' => 'That asset is not available for checkout!'
    ),

    'checkin' => array(
@@ -51,6 +51,8 @@ return array(
    'ldap_pword'                => 'LDAP парола на потребител за връзка',
    'ldap_basedn'               => 'Базов DN',
    'ldap_filter'               => 'LDAP филтър',
+    'ldap_pw_sync'              => 'LDAP Password Sync',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
    'ldap_username_field'       => 'Поле за потребителско име',
    'ldap_lname_field'          => 'Фамилия',
    'ldap_fname_field'          => 'LDAP собствено име',
@@ -4,11 +4,13 @@ return array(
    'about'      	=> 'Относно статус етикетите',
    'archived'      	=> 'Архивирани',
    'create'      	=> 'Създаване на статус етикет',
+    'color'      	=> 'Chart Color',
    'deployable'      	=> 'Може да бъде предоставен',
    'info'      	=> 'Статусите се използват за описване на различните състояния на Вашите активи. Например, това са Предаден за ремонт, Изгубен/откраднат и др. Можете да създавате нови статуси за активите, които могат да бъдат предоставяни, очакващи набавяне и архивирани.',
    'name'      	=> 'Статус',
    'pending'      	=> 'Изчакване',
    'status_type'   => 'Тип на статуса',
+    'show_in_nav'   => 'Show in side nav',
    'title'      	=> 'Заглавия на статуси',
    'undeployable'  => 'Не може да бъде предоставян',
    'update'      	=> 'Обновяване на статус',
@@ -76,6 +76,7 @@
    'image_delete'         	=> 'Изтриване на изображението',
    'image_upload'         	=> 'Качване на изображение',
    'import'         	    => 'Зареждане',
+    'import-history'        => 'Import History',
    'asset_maintenance'        => 'Поддръжка на активи',
    'asset_maintenance_report' => 'Справка за поддръжка на активи',
    'asset_maintenances'       => 'Поддръжки на активи',
@@ -5,11 +5,16 @@ return array(
    'field'		                => 'Pole',
    'about_fieldsets_title'		=> 'O sadách polí',
    'about_fieldsets_text'		=> 'Sady polí Vám umožňují vytvořit si vlastní hodnoty, které chcete evidovat u modelů majetku.',
+    'custom_format'             => 'Custom format...',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
    'fieldset'      	        => 'Sada',
    'qty_fields'      	      => 'Počet',
    'fieldsets'      	        => 'Sady',
    'fieldset_name'           => 'Název sady',
    'field_name'              => 'Název pole',
+    'field_values'            => 'Field Values',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
    'field_element'           => 'Typ pole',
    'field_element_short'     => 'Typ',
    'field_format'            => 'Formát',
@@ -37,9 +37,9 @@ return array(
    ),

    'import' => array(
-        'error'         => 'Některé položky se nepodařilo správně nahrát.',
-        'errorDetail'   => 'Pro chyby se nepodařilo nahrát následující položky.',
-        'success'       => "Váš soubor byl v pořádku nahrán",
+        'error'         => 'Some items did not import correctly.',
+        'errorDetail'   => 'The following Items were not imported because of errors.',
+        'success'       => "Your file has been imported",
    ),


@@ -52,7 +52,8 @@ return array(
    'checkout' => array(
        'error'   		=> 'Majetek nebyl předán, zkuste to prosím znovu',
        'success' 		=> 'Majetek byl v pořádku předán.',
-        'user_does_not_exist' => 'Tento uživatel je neplatný. Zkuste to prosím znovu.'
+        'user_does_not_exist' => 'Tento uživatel je neplatný. Zkuste to prosím znovu.',
+        'not_available' => 'That asset is not available for checkout!'
    ),

    'checkin' => array(
@@ -51,6 +51,8 @@ return array(
    'ldap_pword'                => 'LDAP Bind Password',
    'ldap_basedn'               => 'Base Bind DN',
    'ldap_filter'               => 'LDAP Filter',
+    'ldap_pw_sync'              => 'LDAP Password Sync',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
    'ldap_username_field'       => 'Username Field',
    'ldap_lname_field'          => 'Last Name',
    'ldap_fname_field'          => 'LDAP First Name',
@@ -4,11 +4,13 @@ return array(
    'about'      	=> 'O označení stavu',
    'archived'      	=> 'Archivováno',
    'create'      	=> 'Vytvořit označení stavu',
+    'color'      	=> 'Chart Color',
    'deployable'      	=> 'Připraveno k nasazení',
    'info'      	=> 'Označení stavu se používá k popisu různých stavů majetku. Můžou být v opravě, ztracení atd. Lze vytvořit nové stavy pro další možné stavy.',
    'name'      	=> 'Název stavu',
    'pending'      	=> 'Probíhající',
    'status_type'   => 'Typ stavu',
+    'show_in_nav'   => 'Show in side nav',
    'title'      	=> 'Označení stavu',
    'undeployable'  => 'Nemožné připravit',
    'update'      	=> 'Upravit označení stavu',
@@ -76,6 +76,7 @@
    'image_delete'         	=> 'Smazat obrázek',
    'image_upload'         	=> 'Nahrát obrázek',
    'import'         	    => 'Import',
+    'import-history'        => 'Import History',
    'asset_maintenance'        => 'Údržba zařízení',
    'asset_maintenance_report' => 'Zpráva o údržbě zařízení',
    'asset_maintenances'       => 'Záznamy o údržbě zařízení',
@@ -6,11 +6,11 @@ return array(
    'accessory_category' 				=> 'Tilbehør Kategori',
    'accessory_name'  					=> 'Tilbehør Navn',
    'cost'					=> 'Indkøbspris',
-    'checkout'  							=> 'Checkout Accessory',
-    'checkin'  							=> 'Checkin Accessory',
+    'checkout'  							=> 'Tjek tilbehør ud',
+    'checkin'  							=> 'Tjek tilbehør ind',
    'create'  							=> 'Opret tilbehør',
    'date'					=> 'Købsdato',
-    'edit'  							=> 'Edit Accessory',
+    'edit'  							=> 'Rediger tilbehør',
    'eula_text'							=> 'Slutbrugerlicenskategori',
    'eula_text_help'					=> 'Dette felt tillader dig at tilpasse din slutbrugerlicens til specifikke typer af tilbehør. Hvis du kun har en slutbrugerlicens for alle dine tilbehør, kan du afkrydse boksen nedenfor for at bruge den primære standardlicens.',
    'require_acceptance'				=> 'Kræver brugere at bekræfte accept af tilbehør i denne kategori.',
@@ -2,23 +2,23 @@

 return array(

-    'does_not_exist' => 'The accessory does not exist.',
+    'does_not_exist' => 'Tilbehøret findes ikke.',
    'assoc_users'	 => 'Dette tilbehør har pt. :count emner tjekket ud til brugere. Tjek tilbehør ind og prøv igen.',

    'create' => array(
-        'error'   => 'The accessory was not created, please try again.',
-        'success' => 'The accessory was successfully created.'
+        'error'   => 'Tilbehøret blev ikke oprettet, prøv venligst igen.',
+        'success' => 'Tilbehøret blev oprettet.'
    ),

    'update' => array(
-        'error'   => 'The accessory was not updated, please try again',
-        'success' => 'The accessory was updated successfully.'
+        'error'   => 'Tilbehøret blev ikke opdateret, prøv venligst igen',
+        'success' => 'Tilbehøret blev opdateret med success.'
    ),

    'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this accessory?',
-        'error'   => 'There was an issue deleting the accessory. Please try again.',
-        'success' => 'The accessory was deleted successfully.'
+        'confirm'   => 'Er du sikker på du vil slette dette tilbehør?',
+        'error'   => 'Der opstod et problem under sletning af tilbehøret. Prøv venligst igen.',
+        'success' => 'Tilbehøret blev slettet med success.'
    ),

     'checkout' => array(
@@ -1,17 +1,17 @@
 <?php

    return [
-        'not_found'                    => 'Asset Maintenance you were looking for was not found!',
+        'not_found'                    => 'Aktivets vedligeholdelse blev ikke fundet!',
        'delete'                       => [
-            'confirm' => 'Are you sure you wish to delete this asset maintenance?',
-            'error'   => 'There was an issue deleting the asset maintenance. Please try again.',
-            'success' => 'The asset maintenance was deleted successfully.'
+            'confirm' => 'Er du sikker på du vil slette dette aktivs vedligeholdelse?',
+            'error'   => 'Der opstod et problem under sletning af aktivets vedligeholdelse. Prøv venligst igen.',
+            'success' => 'Aktivets vedligeholdelse blev slettet med succes.'
        ],
        'create'                       => [
-            'error'   => 'Asset Maintenance was not created, please try again.',
-            'success' => 'Asset Maintenance created successfully.'
+            'error'   => 'Aktivets vedligeholdelse blev ikke oprettet, prøv venligst igen.',
+            'success' => 'Aktivets vedligeholdelse blev oprettet med succes.'
        ],
-        'asset_maintenance_incomplete' => 'Not Completed Yet',
-        'warranty'                     => 'Warranty',
-        'not_warranty'                 => 'Not Warranty',
+        'asset_maintenance_incomplete' => 'Ikke afsluttet endnu',
+        'warranty'                     => 'Garanti',
+        'not_warranty'                 => 'Ingen garanti',
    ];
@@ -5,7 +5,7 @@ return array(
    'about_categories'  				=> 'Aktiver kategorier hjælper dig med at organisere dine aktiver. Eksempler på kategorier kunne være &quot;Stationære coputere&quot;, &quot;Bærbare&quot;, &quot;Mobiltelefoner&quot;, &quot;Tabletter&quot; osv., men du kan bruge aktiver kategorier på en hvilken som helst måde som giver mening for dig.',
    'asset_categories' 					=> 'Aktiver Kategorier',
    'category_name'  					=> 'Kategorinavn',
-    'checkin_email'                     => 'Send email to user on checkin.',
+    'checkin_email'                     => 'Send email til bruger ved tjek ind.',
    'clone'                             => 'Klon Kategori',
    'create'  							=> 'Opret kategori',
    'edit'                              => 'Rediger Kategori',
@@ -3,8 +3,8 @@
 return array(

    'does_not_exist' => 'Kategorien eksisterer ikke.',
-    'assoc_models'	 => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ',
-    'assoc_items'	 => 'This category is currently associated with at least one :asset_type and cannot be deleted. Please update your :asset_type  to no longer reference this category and try again. ',
+    'assoc_models'	 => 'Denne kategori er i øjeblikket associeret med mindst en model og kan ikke slettes. Opdater venligst dine modeller, så de ikke længere refererer til denne kategori og prøv igen. ',
+    'assoc_items'	 => 'Denne kategori er i øjeblikket associeret med mindst en :asset_type og kan ikke slettes. Opdater venligst din :asset_type, så de ikke længere refererer til denne kategori og prøv igen. ',

    'create' => array(
        'error'   => 'Kategorien blev ikke oprettet, prøv igen.',
@@ -5,11 +5,16 @@ return array(
    'field'		                => 'Field',
    'about_fieldsets_title'		=> 'About Fieldsets',
    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.',
+    'custom_format'             => 'Custom format...',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
    'fieldset'      	        => 'Fieldset',
    'qty_fields'      	      => 'Qty Fields',
    'fieldsets'      	        => 'Fieldsets',
    'fieldset_name'           => 'Fieldset Name',
    'field_name'              => 'Field Name',
+    'field_values'            => 'Field Values',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
    'field_element'           => 'Form Element',
    'field_element_short'     => 'Element',
    'field_format'            => 'Format',
@@ -1,9 +1,9 @@
 <?php

 return array(
-	'bulk_delete'		=> 'Confrm Bulk Delete Assets',
-  'bulk_delete_help'	=> 'Review the assets for bulk deletion below. Once deleted, these assets can be restored, but they will no longer be associated with any users they are currently assigned to.',
-  'bulk_delete_warn'	=> 'You are about to delete :asset_count assets.',
+	'bulk_delete'		=> 'Bekræft massesletning af aktiver',
+  'bulk_delete_help'	=> 'Gennemgå aktiver for massesletning nedenfor. Disse aktiver kan gendannes når slettet, men de vil ikke længere være forbundet med eventuelle brugere, de i øjeblikket er tildelt.',
+  'bulk_delete_warn'	=> 'Du er i gang med at slette :asset_count aktiver.',
 	'bulk_update'		=> 'Masseopdater Aktiver',
 	'bulk_update_help'	=> 'Denne form tillader dig at opdatere flere aktiver på en gang. Udfyld kun de felter der skal ændres. Ikke udfyldte feltet forbilver uændret.',
 	'bulk_update_warn'	=> 'Du er i færd med at redigere egenskaber på :asset_count aktiver.',
@@ -19,10 +19,10 @@ return array(
    'default_location'	=> 'Standardplacering',
    'eol_date'			=> 'EOL Dato',
    'eol_rate'			=> 'EOL Rate',
-    'expected_checkin'  => 'Expected Checkin Date',
+    'expected_checkin'  => 'Forventet indtjekningsdato',
    'expires'			=> 'Udløber',
    'fully_depreciated'	=> 'Fuldt Afskrevet',
-    'help_checkout'		=> 'If you wish to assign this asset immediately, select "Ready to Deploy" from the status list above. ',
+    'help_checkout'		=> 'Vælg "Klar til implementering" fra listen ovenfor, hvis du ønsker at tildele dette aktiv med det samme. ',
    'mac_address'		=> 'MAC-adresse',
    'manufacturer'		=> 'Producent',
    'model'				=> 'Model',
@@ -37,9 +37,9 @@ return array(
    ),

    'import' => array(
-        'error'         => 'Some Items did not import Correctly.',
-        'errorDetail'   => 'The Following Items were not imported because of errors.',
-        'success'       => "Your File has been imported",
+        'error'         => 'Some items did not import correctly.',
+        'errorDetail'   => 'The following Items were not imported because of errors.',
+        'success'       => "Your file has been imported",
    ),


@@ -52,7 +52,8 @@ return array(
    'checkout' => array(
        'error'   		=> 'Asset was not checked out, please try again',
        'success' 		=> 'Asset checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'not_available' => 'That asset is not available for checkout!'
    ),

    'checkin' => array(
@@ -11,7 +11,7 @@ return array(
    'title'					=> 'Asset Models',
    'update'				=> 'Update Asset Model',
    'view'					=> 'View Asset Model',
-    'update'				=> 'Update Asset Model',
+    'update'				=> 'Update Model',
    'clone'				=> 'Clone Model',
    'edit'				=> 'Edit Model',
 );
@@ -51,6 +51,8 @@ return array(
    'ldap_pword'                => 'LDAP Bind Password',
    'ldap_basedn'               => 'Base Bind DN',
    'ldap_filter'               => 'LDAP Filter',
+    'ldap_pw_sync'              => 'LDAP Password Sync',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
    'ldap_username_field'       => 'Username Field',
    'ldap_lname_field'          => 'Last Name',
    'ldap_fname_field'          => 'LDAP First Name',
@@ -4,11 +4,13 @@ return array(
    'about'      	=> 'Om status labels',
    'archived'      	=> 'Archived',
    'create'      	=> 'Opret status label',
+    'color'      	=> 'Chart Color',
    'deployable'      	=> 'Deployable',
    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
    'name'      	=> 'Status navn',
    'pending'      	=> 'Pending',
    'status_type'   => 'Status Type',
+    'show_in_nav'   => 'Show in side nav',
    'title'      	=> 'Status labels',
    'undeployable'  => 'Undeployable',
    'update'      	=> 'Opdater status label',
@@ -5,7 +5,7 @@ return array(
    'actions' 	                => 'Handlinger',
    'add'    	                => 'Tilføj Ny',
    'cancel'                    => 'Annuller',
-    'checkin_and_delete'  	    => 'Checkin & Delete User',
+    'checkin_and_delete'  	    => 'Tjek ind og slet bruger',
    'delete'  	                => 'Slet',
    'edit'    	                => 'Rediger',
    'restore' 	                => 'Gendan',
@@ -2,11 +2,11 @@

    return [
    'accessories'			=> 'Tilbehør',
-    'activated'			=> 'Activated',
+    'activated'			=> 'Aktiveret',
    'accessory'				=> 'Tilbehør',
-    'accessory_report'			=> 'Accessory Report',
-    'action'                => 'Action',
-    'activity_report'		=> 'Activity Report',
+    'accessory_report'			=> 'Tilbehørsrapport',
+    'action'                => 'Handling',
+    'activity_report'		=> 'Aktivitetsrapport',
    'address'				=> 'Addresse',
    'admin'					=> 'Admin',
    'add_seats'     => 'Added seats',
@@ -22,21 +22,21 @@
    'avatar_delete'         => 'Slet avatar',
    'avatar_upload'         => 'Upload Avatar',
    'back'      			=> 'Tilbage',
-    'bad_data'      		=> 'Nothing found. Maybe bad data?',
-    'bulk_checkout'  		=> 'Bulk Checkout',
+    'bad_data'      		=> 'Intet fundet. Måske dårlig data?',
+    'bulk_checkout'  		=> 'Masseudtjekning',
    'cancel'  				=> 'Annuller',
-    'categories'			=> 'Categories',
-    'category'				=> 'Category',
+    'categories'			=> 'Kategorier',
+    'category'				=> 'Kategori',
    'changeemail'  			=> 'Skift email adresse',
    'changepassword'  		=> 'Skift adgangskode',
    'checkin'  				=> 'Tjek Ind',
-    'checkin_from'  		=> 'Checkin from',
+    'checkin_from'  		=> 'Tjek ind fra',
    'checkout'  			=> 'Tjek Ud',
    'city'  				=> 'By',
-    'companies'			=> 'Companies',
-    'company'				=> 'Company',
-    'component'			=> 'Component',
-    'components'			=> 'Components',
+    'companies'			=> 'Selskaber',
+    'company'				=> 'Selskab',
+    'component'			=> 'Komponent',
+    'components'			=> 'Komponenter',
    'consumable'			=> 'Consumable',
    'consumables'			=> 'Consumables',
    'country'  				=> 'Land',
@@ -57,73 +57,74 @@
    'depreciation'			=> 'Afskrivning',
    'editprofile'  			=> 'Ret Din Profil',
    'eol'					=> 'EOL',
-    'email_domain'			=> 'Email Domain',
-    'email_format'			=> 'Email Format',
-    'email_domain_help'		=> 'This is used to generate email addresses when importing',
-    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
-    'first'					=> 'First',
+    'email_domain'			=> 'Email domæne',
+    'email_format'			=> 'Email formattering',
+    'email_domain_help'		=> 'Dette bruges til at generere email-adresser ved importering',
+    'filastname_format'			=> 'Fornavnskarakter Efternavn (jsmith@example.com)',
+    'firstname_lastname_format'	=> 'Fornavn Efternavn (jane.smith@example.com)',
+    'first'					=> 'Første',
    'first_name'			=> 'Fornavn',
-    'first_name_format'		=> 'First Name (jane@example.com)',
+    'first_name_format'		=> 'Fornavn (jane@example.com)',
    'file_name'				=> 'Fil',
    'file_uploads'			=> 'Filoverførsel',
    'generate'				=> 'Skab',
    'groups'				=> 'Grupper',
    'gravatar_email'        => 'Gravatar email addresse',
-    'history'  			    => 'History',
+    'history'  			    => 'Historik',
    'history_for'  			=> 'Historie for',
    'id'  					=> 'ID',
    'image_delete'         	=> 'Slet billede',
    'image_upload'         	=> 'Upload billede',
-    'import'         	    => 'Import',
-    'asset_maintenance'        => 'Asset Maintenance',
-    'asset_maintenance_report' => 'Asset Maintenance Report',
-    'asset_maintenances'       => 'Asset Maintenances',
-    'item'  				=> 'Item',
-    'insufficient_permissions' => 'Insufficient permissions!',
-    'language'				=> 'Language',
-    'last'					=> 'Last',
+    'import'         	    => 'Importér',
+    'import-history'        => 'Import History',
+    'asset_maintenance'        => 'Vedligeholdelse af aktiv',
+    'asset_maintenance_report' => 'Aktiv vedligeholdelsesrapport',
+    'asset_maintenances'       => 'Vedligeholdelse af aktiv',
+    'item'  				=> 'Emne',
+    'insufficient_permissions' => 'Ingen rettigheder!',
+    'language'				=> 'Sprog',
+    'last'					=> 'Sidste',
    'last_name'             => 'Efternavn',
    'license'				=> 'Licens',
    'license_report'        => 'Licensrapport',
    'licenses_available'	=> 'Tilgængelige licenser',
    'licenses'				=> 'Licenser',
    'list_all'				=> 'Vis alle',
-    'loading'				=> 'Loading',
+    'loading'				=> 'Indlæser',
    'lock_passwords'        => 'This field cannot be edited in this installation.',
    'feature_disabled'      => 'This feature has been disabled for this installation.',
    'location'              => 'Lokation',
    'locations'				=> 'Lokationer',
    'logout'				=> 'Log ud',
-    'lookup_by_tag'     => 'Lookup by Asset Tag',
+    'lookup_by_tag'     => 'Søg på aktivkode',
    'manufacturer'			=> 'Producent',
    'manufacturers'			=> 'Producenter',
-    'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
-    'min_amt'				=> 'Min. QTY',
+    'markdown'				=> 'Dette felt tillader <a href="https://help.github.com/articles/github-flavored-markdown/">Github koder</a>.',
+    'min_amt'				=> 'Min. antal',
    'min_amt_help'	=> 'Minimum number of items that should be available before an alert gets triggered.',
    'model_no'				=> 'Modelnummer',
    'months'				=> 'måneder',
    'moreinfo'				=> 'Mere Info',
    'name'					=> 'Navn',
-    'next'					=> 'Next',
-    'new'					=> 'new!',
+    'next'					=> 'Næste',
+    'new'					=> 'ny!',
    'no_depreciation'		=> 'Ingen Afskrivning',
    'no_results'			=> 'Ingen Resultater.',
    'no'  					=> 'Nej',
    'notes'  				=> 'Noter',
-    'page_menu'				=> 'Showing _MENU_ items',
-    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
+    'page_menu'				=> 'Viser _MENU_ emner',
+    'pagination_info'		=> 'Viser _START_ til _END_ af _TOTAL_ emner',
    'pending'				=> 'Afventer',
    'people'				=> 'Personer',
    'per_page'				=> 'Resultater Per Side',
-    'previous'				=> 'Previous',
-    'processing'			=> 'Processing',
+    'previous'				=> 'Forrige',
+    'processing'			=> 'Behandler',
    'profile'				=> 'Din profil',
-    'qty'		            => 'QTY',
-    'quantity'		        => 'Quantity',
+    'qty'		            => 'STK',
+    'quantity'		        => 'Antal',
    'ready_to_deploy'		=> 'Klar til Implementering',
-    'recent_activity'		=> 'Recent Activity',
-    'remove_company'        => 'Remove Company Association',
+    'recent_activity'		=> 'Seneste aktivitet',
+    'remove_company'        => 'Fjern association med selskab',
    'reports'				=> 'Rapporter',
    'requested'				=> 'Requested',
    'save'  				=> 'Gem',
@@ -1,7 +1,7 @@
 <?php

 return [
-    'sent'	        => 'Your password link has been sent!',
-    'user'			=> 'That user does not exist or does not have an email address associated',
+    'sent'	        => 'Dit adgangskode link er blevet sendt!',
+    'user'			=> 'Brugeren findes ikke eller har ikke nogen email-adresse tilknyttet',
 ];

@@ -17,7 +17,7 @@ return array(

    "user"     => "Brugernavn eller email adresse er forkert",

-    "token"    => "This password reset token is invalid.",
+    "token"    => "Denne adgangskode nulstillingstoken er ugyldig.",

    "sent" => "Hvis en tilsvarende email adresse blev fundet, er der afsendt en påmindelse om adgangskode!",

@@ -5,6 +5,6 @@ return array(
    'actions'	 	=> 'Handlinger',
    'action' 		=> 'Handling',
    'by'      		=> 'Af',
-    'item' 			=> 'Item',
+    'item' 			=> 'Emne',

 );
@@ -32,11 +32,11 @@ return array(
    "digits"           => ":attribute skal være :digits cifre.",
    "digits_between"   => ":attribute skal være imellem :min og :max cifre.",
    "email"            => ":attribute formatet er ugylidgt.",
-    "exists"           => "The selected :attribute is invalid.",
-    "email_array"      => "One or more email addresses is invalid.",
+    "exists"           => "Den valgte :attribute er ugyldig.",
+    "email_array"      => "En eller flere email-adresser er ugyldige.",
    "image"            => ":attribute skal være et billede.",
    "in"               => "Det valgte :attribute er ugyldigt.",
-    "integer"          => "The :attribute must be an integer.",
+    "integer"          => ":attribute skal være et heltal.",
    "ip"               => ":attribute skal være en gyldig IP adresse.",
    "max"              => array(
        "numeric" => ":attribute må ikke overstige :max.",
@@ -49,8 +49,8 @@ return array(
        "file"    => ":attribute skal mindst være :min kilobytes.",
        "string"  => ":attribute skal mindst være :min tegn.",
    ),
-    "not_in"           => "The selected :attribute is invalid.",
-    "numeric"          => "The :attribute must be a number.",
+    "not_in"           => "Den valgte :attribute er ugyldig.",
+    "numeric"          => ":attribute skal være et tal.",
    "regex"            => ":attribute formatet er ugyldigt.",
    "required"         => ":attribute feltet er krævet.",
    "required_if"      => ":attribute feltet er krævet når :other er :value.",
@@ -62,10 +62,10 @@ return array(
        "file"    => ":attribute skal være :size kilobytes.",
        "string"  => ":attribute skal være :size tegn.",
    ),
-    "unique"           => "The :attribute has already been taken.",
+    "unique"           => ":attribute er allerede taget.",
    "url"              => ":attribute formatet er ugyldigt.",
-    "statuslabel_type" => "You must select a valid status label type",
-    "unique_undeleted" => "The :attribute must be unique.",
+    "statuslabel_type" => "Du skal vælge en gyldig statusmærke type",
+    "unique_undeleted" => ":attribute skal være unik.",


    /*
@@ -80,7 +80,7 @@ return array(
    */

    'custom' => array(),
-    'alpha_space' => "The :attribute field contains a character that is not allowed.",
+    'alpha_space' => ":attribute feltet indeholder en karakter der ikke er tilladt.",

    /*
    |--------------------------------------------------------------------------
@@ -5,11 +5,16 @@ return array(
    'field'		                => 'Feld',
    'about_fieldsets_title'		=> 'Über Feldsätze',
    'about_fieldsets_text'		=> 'Feldsätze erlauben es Gruppen aus benutzerdefinierten Feldern zu erstellen, welche regelmäßig für spezifische Modelltypen benutzt werden.',
+    'custom_format'             => 'Custom format...',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
    'fieldset'      	        => 'Feldsatz',
    'qty_fields'      	      => 'Anzahl Felder',
    'fieldsets'      	        => 'Feldsätze',
    'fieldset_name'           => 'Feldsatzname',
    'field_name'              => 'Feldname',
+    'field_values'            => 'Field Values',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
    'field_element'           => 'Formularelement',
    'field_element_short'     => 'Element',
    'field_format'            => 'Format',
@@ -3,7 +3,7 @@
 return array(
 	'archived'  				=> 'Archiviert',
    'asset'  					=> 'Asset',
-    'bulk_checkout'             => 'Checkout Assets to User',
+    'bulk_checkout'             => 'Assets an Benutzer herausgeben',
    'checkin'  					=> 'Asset zurücknehmen',
    'checkout'  				=> 'Asset an Benutzer herausgeben',
    'clone'  					=> 'Asset duplizieren',
@@ -37,9 +37,9 @@ return array(
    ),

    'import' => array(
-        'error'         => 'Einige Elemente wurden nicht korrekt importiert.',
-        'errorDetail'   => 'Die Folgenden Elemente wurden aufgrund von Fehlern nicht importiert.',
-        'success'       => "Ihre Datei wurde importiert",
+        'error'         => 'Some items did not import correctly.',
+        'errorDetail'   => 'The following Items were not imported because of errors.',
+        'success'       => "Your file has been imported",
    ),


@@ -52,7 +52,8 @@ return array(
    'checkout' => array(
        'error'   		=> 'Asset konnte nicht herausgegeben werden. Bitte versuchen Sie es erneut',
        'success' 		=> 'Asset wurde erfolgreich herausgegeben.',
-        'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.'
+        'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.',
+        'not_available' => 'That asset is not available for checkout!'
    ),

    'checkin' => array(
@@ -11,7 +11,7 @@ return array(
    'title'					=> 'Asset Modelle',
    'update'				=> 'Asset Modell aktualisieren',
    'view'					=> 'Asset Modell ansehen',
-    'update'				=> 'Asset Modell aktualisieren',
+    'update'				=> 'Modell aktualisieren',
    'clone'				=> 'Modell duplizieren',
    'edit'				=> 'Modell bearbeiten',
 );
@@ -2,9 +2,9 @@

 return array(
    'ad'				        => 'Active Directory',
-    'ad_domain'				    => 'Active Directory domain',
-    'ad_domain_help'			=> 'This is sometimes the same as your email domain, but not always.',
-    'is_ad'				        => 'This is an Active Directory server',
+    'ad_domain'				    => 'Active Directory Domäne',
+    'ad_domain_help'			=> 'Meistens dieselbe wie die E-Mail Domäne.',
+    'is_ad'				        => 'Dies ist ein Active Directory Server',
 	'alert_email'				=> 'Alarme senden an',
 	'alerts_enabled'			=> 'Alarme aktiviert',
 	'alert_interval'			=> 'Ablauf Alarmschwelle (in Tagen)',
@@ -41,16 +41,18 @@ return array(
    'ldap_integration'          => 'LDAP Integration',
    'ldap_settings'             => 'LDAP Einstellungen',
    'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
+    'ldap_server_help'          => 'Sollte mit ldap:// (für unencrypted oder TLS) oder ldaps:// (für SSL) starten',
 	'ldap_server_cert'			=> 'LDAP SSL Zertifikatsüberprüfung',
 	'ldap_server_cert_ignore'	=> 'Erlaube ungültige SSL Zertifikate',
 	'ldap_server_cert_help'		=> 'Wählen Sie diese Option, wenn Sie selbstsignierte SSL Zertifikate verwenden und diese gegebenenfalls ungültigen Zertifikate akzeptieren möchten.',
-    'ldap_tls'                  => 'Use TLS',
-    'ldap_tls_help'             => 'This should be checked only if you are running STARTTLS on your LDAP server. ',
+    'ldap_tls'                  => 'TLS verwenden',
+    'ldap_tls_help'             => 'Sollte nur wenn STARTTLS am LDAP Server verwendet wird, aktiviert sein. ',
    'ldap_uname'                => 'LDAP Bind Nutzername',
    'ldap_pword'                => 'LDAP Bind Passwort',
    'ldap_basedn'               => 'Basis Bind DN',
    'ldap_filter'               => 'LDAP Filter',
+    'ldap_pw_sync'              => 'LDAP Password Sync',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
    'ldap_username_field'       => 'Benutzername',
    'ldap_lname_field'          => 'Familienname',
    'ldap_fname_field'          => 'LDAP Vorname',
@@ -108,5 +110,5 @@ return array(
    'bottom'        => 'Unten',
    'vertical'        => 'Vertikal',
    'horizontal'        => 'Horizontal',
-    'zerofill_count'        => 'Length of asset tags, including zerofill',
+    'zerofill_count'        => 'Länge der Asset Tags, inklusive zerofill',
 );
@@ -4,11 +4,13 @@ return array(
    'about'      	=> 'Info Statusbezeichnung',
    'archived'      	=> 'Archiviert',
    'create'      	=> 'Statusbezeichnung erstellen',
+    'color'      	=> 'Chart Color',
    'deployable'      	=> 'Einsetzbar',
    'info'      	=> 'Status Label werden eingesetzt um diverse Stati Ihrer Assets zu beschreiben. Diese können zB. in Reparatur sein, Gestohlen oder Verlohren worden sein. Sie können neue Status Labels für Einsetzbare, Unerledigte und Archivierte Assets erstellen.',
    'name'      	=> 'Statusname',
    'pending'      	=> 'Unerledigt',
    'status_type'   => 'Statustyp',
+    'show_in_nav'   => 'Show in side nav',
    'title'      	=> 'Statusbezeichnungen',
    'undeployable'  => 'nicht Einsetzbar',
    'update'      	=> 'Statusbezeichnung bearbeiten',
@@ -23,7 +23,7 @@
    'avatar_upload'         => 'Avatar hochladen',
    'back'      			=> 'Zurück',
    'bad_data'      		=> 'Nichts gefunden. Vielleicht defekte Daten?',
-    'bulk_checkout'  		=> 'Bulk Checkout',
+    'bulk_checkout'  		=> 'Massen-Checkout',
    'cancel'  				=> 'Abbrechen',
    'categories'			=> 'Kategorien',
    'category'				=> 'Kategorie',
@@ -76,6 +76,7 @@
    'image_delete'         	=> 'Bild löschen',
    'image_upload'         	=> 'Bild hinzufügen',
    'import'         	    => 'Import',
+    'import-history'        => 'Import History',
    'asset_maintenance'        => 'Asset Wartung',
    'asset_maintenance_report' => 'Asset Wartungsbericht',
    'asset_maintenances'       => 'Asset Wartungen',
@@ -106,7 +107,7 @@
    'moreinfo'				=> 'Mehr Informationen',
    'name'					=> 'Location Name',
    'next'					=> 'Nächstes',
-    'new'					=> 'new!',
+    'new'					=> 'Neu!',
    'no_depreciation'		=> 'Do Not Depreciate',
    'no_results'			=> 'Keine Treffer.',
    'no'  					=> 'Nein',
@@ -142,7 +143,7 @@
    'select_asset'    		=> 'Asset auswählen',
    'settings'				=> 'Einstellungen',
    'sign_in'				=> 'Einloggen',
-    'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
+    'some_features_disabled' => 'Einige Funktionen sind für den DEMO-Modus deaktiviert.',
    'site_name'				=> 'Seitenname',
    'state'  				=> 'Zustand',
    'status_labels'			=> 'Statusbezeichnungen',
@@ -64,8 +64,8 @@ return array(
    ),
    "unique"           => ":attribute schon benutzt.",
    "url"              => ":attribute Format ist ungültig.",
-    "statuslabel_type" => "You must select a valid status label type",
-    "unique_undeleted" => "The :attribute must be unique.",
+    "statuslabel_type" => "Gültigen Status Beschriftungstyp auswählen!",
+    "unique_undeleted" => ":attribute muss eindeutig sein.",


    /*
@@ -5,11 +5,16 @@ return array(
    'field'		                => 'Field',
    'about_fieldsets_title'		=> 'About Fieldsets',
    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.',
+    'custom_format'             => 'Custom format...',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
    'fieldset'      	        => 'Fieldset',
    'qty_fields'      	      => 'Qty Fields',
    'fieldsets'      	        => 'Fieldsets',
    'fieldset_name'           => 'Fieldset Name',
    'field_name'              => 'Field Name',
+    'field_values'            => 'Field Values',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
    'field_element'           => 'Form Element',
    'field_element_short'     => 'Element',
    'field_format'            => 'Format',
@@ -37,9 +37,9 @@ return array(
    ),

    'import' => array(
-        'error'         => 'Some Items did not import Correctly.',
-        'errorDetail'   => 'The Following Items were not imported because of errors.',
-        'success'       => "Your File has been imported",
+        'error'         => 'Some items did not import correctly.',
+        'errorDetail'   => 'The following Items were not imported because of errors.',
+        'success'       => "Your file has been imported",
    ),


@@ -52,7 +52,8 @@ return array(
    'checkout' => array(
        'error'   		=> 'Asset was not checked out, please try again',
        'success' 		=> 'Asset checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'not_available' => 'That asset is not available for checkout!'
    ),

    'checkin' => array(
@@ -11,7 +11,7 @@ return array(
    'title'					=> 'Asset Models',
    'update'				=> 'Update Asset Model',
    'view'					=> 'View Asset Model',
-    'update'				=> 'Update Asset Model',
+    'update'				=> 'Update Model',
    'clone'				=> 'Clone Model',
    'edit'				=> 'Edit Model',
 );
@@ -51,6 +51,8 @@ return array(
    'ldap_pword'                => 'LDAP Bind Password',
    'ldap_basedn'               => 'Base Bind DN',
    'ldap_filter'               => 'LDAP Filter',
+    'ldap_pw_sync'              => 'LDAP Password Sync',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
    'ldap_username_field'       => 'Username Field',
    'ldap_lname_field'          => 'Last Name',
    'ldap_fname_field'          => 'LDAP First Name',
@@ -4,11 +4,13 @@ return array(
    'about'      	=> 'About Status Labels',
    'archived'      	=> 'Archived',
    'create'      	=> 'Create Status Label',
+    'color'      	=> 'Chart Color',
    'deployable'      	=> 'Deployable',
    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
    'name'      	=> 'Status Name',
    'pending'      	=> 'Pending',
    'status_type'   => 'Status Type',
+    'show_in_nav'   => 'Show in side nav',
    'title'      	=> 'Status Labels',
    'undeployable'  => 'Undeployable',
    'update'      	=> 'Update Status Label',
@@ -76,6 +76,7 @@
    'image_delete'         	=> 'Delete Image',
    'image_upload'         	=> 'Upload Image',
    'import'         	    => 'Import',
+    'import-history'        => 'Import History',
    'asset_maintenance'        => 'Asset Maintenance',
    'asset_maintenance_report' => 'Asset Maintenance Report',
    'asset_maintenances'       => 'Asset Maintenances',
@@ -5,11 +5,16 @@ return array(
    'field'		                => 'Field',
    'about_fieldsets_title'		=> 'About Fieldsets',
    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.',
+    'custom_format'             => 'Custom format...',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
    'fieldset'      	        => 'Fieldset',
    'qty_fields'      	      => 'Qty Fields',
    'fieldsets'      	        => 'Fieldsets',
    'fieldset_name'           => 'Fieldset Name',
    'field_name'              => 'Field Name',
+    'field_values'            => 'Field Values',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
    'field_element'           => 'Form Element',
    'field_element_short'     => 'Element',
    'field_format'            => 'Format',
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
snipe	e7fba08f92	Merge remote-tracking branch 'origin/develop'	2016-09-06 10:38:31 -07:00
snipe	35f3f1432f	Bumped version	2016-09-06 10:38:07 -07:00
snipe	934b39268d	Merge remote-tracking branch 'origin/develop'	2016-09-06 10:35:33 -07:00
snipe	67315d81d6	Fixes #2134 - hide archived assets from list all	2016-09-01 13:28:15 -07:00
snipe	eee64d5509	Set the public path for users who can’t use public as a directory (shared hosting)	2016-09-01 12:53:38 -07:00
snipe	b450ef3534	Cast group permissions as array for older, wonky installs	2016-08-30 13:25:14 -07:00
snipe	d4dc1830ec	Fixes #2527 - honor the setting for whether Snpie-IT can access the outside world	2016-08-30 12:58:08 -07:00
snipe	04e9ca0942	Fixes #2399	2016-08-30 12:34:23 -07:00
snipe	06021d79c1	Fixed typo	2016-08-30 12:25:46 -07:00
snipe	7ecb8d7bc1	Patches PR#2526 to develop	2016-08-30 12:13:29 -07:00
Ryan Stafford	efe95d9ad0	Syntax error on VOLUME instruction (#2526 ) Added quotes to volume path.	2016-08-30 12:11:42 -07:00
snipe	6f89699f1a	Make purchase cost default to null I don’t know why I need to do this?	2016-08-30 08:52:33 -07:00
snipe	2c18bc24a7	Check if username is userprincipalname If it is, skip building the UPN for AD	2016-08-30 08:34:17 -07:00
snipe	f81b21208b	Bumped version for v3.4.0-beta	2016-08-30 07:39:55 -07:00
snipe	ba70e5b053	A little demo-proofing of the maintenances page	2016-08-30 07:34:33 -07:00
snipe	5090468357	Fixes #2510 and #2488 - CSS class added to images in views	2016-08-30 07:20:07 -07:00
snipe	213cda8cf4	Fixes #2525	2016-08-30 07:03:22 -07:00
snipe	421cbf11fc	Patches PR#2500 for dev because @dmeltzer forgot that we commit to the develop branch :P	2016-08-30 06:54:04 -07:00
snipe	8816c481af	Added HTML for generating passwords in asset user creation modal	2016-08-30 06:48:23 -07:00
snipe	3ed0cf2be8	Moved import errors up higher on the screen, fixed some weird formatting bugaboos	2016-08-30 06:48:00 -07:00
snipe	cd28b012b3	Remove last name requirement in save user request	2016-08-30 06:47:38 -07:00
snipe	25902db659	Generate password from modal	2016-08-30 06:47:18 -07:00
snipe	35a67ab18a	Fixes #2516 - listbox error on new asset	2016-08-29 23:49:23 -07:00
snipe	2cfb015b1a	Removed extra debugging info	2016-08-29 23:13:30 -07:00
snipe	e4dcd47d6c	Fix UTF-8 issues in imports	2016-08-29 22:57:48 -07:00
snipe	64cd4fb1c9	Allow X-Frame-Options to be disabled via env if necessary	2016-08-29 22:57:29 -07:00
Daniel Meltzer	276e0a7114	Importer: Implement item update and interface improvments (#2507 ) * Add support for updating assets to the importer. If an asset with a matching asset tag is found, and the --update flag is passed to the importer, we edit the matching asset with any asset-specific values, and persist to the database. Any missing/blank values are skipped. TODO: Add to web interface, add support in consumables/accessories * Allow deleting of files on the import page. * Extend web interface to allow updating of imported items. This adds a modal dialog to the import process. Currently the dialog allows the choice of update vs ignore, and choosing the item type to import (Accessory, Asset, Consumable). Also use Helper::ParseFloat() for purchase_cost processing. It exists, and fixes issues on my end at least. * Implement editing of consumables and accessories. * Rename getProcessImportFile to postProcessImportFile to reflect how it's now used * Fix copy-pasta error.	2016-08-29 15:49:32 -07:00
Daniel Meltzer	9bf3403f31	Fix #2499 (#2500 ) Missed this instance when renaming the method. Sorry!	2016-08-26 06:01:58 -07:00
snipe	0d088f3031	Fixes #2491 - show asset tag on dashboard	2016-08-25 21:28:46 -07:00
snipe	a92ed97b4e	Definitely not beta ;)	2016-08-25 21:06:43 -07:00
snipe	fcdea4825e	Bumped version	2016-08-25 21:04:43 -07:00
snipe	35439f9976	Additional strings	2016-08-25 21:04:36 -07:00
snipe	d473432436	Show encryption in fieldset list	2016-08-25 21:04:25 -07:00
snipe	4dff58ec26	Fix array generation for select	2016-08-25 21:04:10 -07:00
snipe	537ad28a67	Don’t make required encrypted custom fields required if user is not an admin	2016-08-25 21:03:52 -07:00
snipe	96eb832fd3	Only decrypt if the user is an admin	2016-08-25 21:03:24 -07:00
snipe	130c798c90	Only accept a new value for encrypted fields if the user is an admin	2016-08-25 20:59:54 -07:00
snipe	e1229bfb0f	Graceful decryption method	2016-08-25 20:58:56 -07:00
snipe	f185c2e0de	Hide radio and checkboxes for now	2016-08-25 19:48:11 -07:00
snipe	122f0b9cba	Custom fields form in asset edit view	2016-08-25 18:35:28 -07:00
snipe	c49f10c9bb	Removed line break	2016-08-25 18:35:16 -07:00
snipe	97a938f119	Method helper to translate piped field_values into a useable array	2016-08-25 18:35:01 -07:00
snipe	308fcf96de	Updated language strings	2016-08-25 17:43:07 -07:00
snipe	f1fab8b164	Added Indonesian to dropdown locale list	2016-08-25 17:22:08 -07:00
snipe	0e8502a323	Removed newline	2016-08-25 17:12:50 -07:00
snipe	3171d9230b	Better language	2016-08-25 17:12:34 -07:00
snipe	11b9df4b48	Use updated L5 request method	2016-08-25 17:11:52 -07:00
snipe	0c2524954f	Removed unusued status_id variable	2016-08-25 17:10:09 -07:00
snipe	b76ad5ea88	Reverted name of form field	2016-08-25 17:08:39 -07:00
snipe	43fbd54a12	Store new fields in the database	2016-08-25 17:08:08 -07:00
snipe	406d270c01	Use L5 Request method for input	2016-08-25 17:07:58 -07:00
snipe	98eb26a2bd	Merge branch 'features/cusom_field_types' into develop	2016-08-25 16:36:21 -07:00
snipe	61aa9beddb	Added new fields to custom fields views	2016-08-25 16:36:00 -07:00
snipe	e89fd9b3a2	Additional strings	2016-08-25 16:35:45 -07:00
snipe	d72443c335	Use trans() for custom format text	2016-08-25 16:35:31 -07:00
snipe	f38593b530	Merge remote-tracking branch 'origin/develop'	2016-08-23 19:01:53 -07:00
snipe	4cf2d16c7a	Temp fix for number import on cost	2016-08-23 19:01:40 -07:00
snipe	f38912a5cf	Custom fields additions	2016-08-23 18:52:54 -07:00
snipe	ad22293f4b	Added show in nav for status label views and controller	2016-08-23 18:52:42 -07:00
snipe	fb402e138d	Smaller dashboard number	2016-08-23 18:52:12 -07:00
snipe	90d2d0c7e1	Fixes #2469 - corrected config app.url	2016-08-23 16:04:22 -07:00
snipe	9d730af50f	Added single quotes to env for mail sender	2016-08-23 16:03:57 -07:00
snipe	9407b4e28c	Removed console warning	2016-08-23 15:53:18 -07:00
snipe	ec19924bea	Custom field types	2016-08-23 15:52:34 -07:00
snipe	7b8403cdb9	Pass status ID to ajax	2016-08-23 15:52:10 -07:00
snipe	85f3e7e3d4	Added filter by status type	2016-08-23 15:51:59 -07:00
snipe	11dc20de61	Show in nav language option	2016-08-23 15:51:45 -07:00
snipe	14fa7ed965	Fixed indenting	2016-08-23 15:51:14 -07:00
snipe	5cf1c8dfa3	Added DB DUMP PATH to docker.env	2016-08-23 15:51:05 -07:00
snipe	f04cfb3e7f	Allow admins to show status labels in nav	2016-08-23 15:50:52 -07:00
snipe	d970daa666	Add new fields to custom fields table	2016-08-23 15:50:43 -07:00
snipe	0b0c81a110	Merge remote-tracking branch 'origin/develop'	2016-08-23 11:38:03 -07:00
snipe	b1324c2e64	Removed beta from version	2016-08-23 11:37:49 -07:00
snipe	3c28be33c5	Bumped version	2016-08-23 11:37:00 -07:00
snipe	e52a0f65bb	Update asset report to show deployed if asset is checked out	2016-08-23 11:36:34 -07:00
snipe	b726d131a4	More helpful message for LDAP TLS issue	2016-08-23 11:32:11 -07:00
snipe	014167699d	Fixes #2441 - use showAssetName to avoid blank entries in link name which makes Slack do weird things	2016-08-18 13:10:31 -07:00
snipe	d9f2e7bf58	If custom field is type URL, display it as a link	2016-08-18 12:44:55 -07:00
snipe	4c8c58d453	Clean up divs for gates in list view	2016-08-18 12:31:45 -07:00
snipe	923352537c	Moved column for in/out	2016-08-18 07:06:55 -07:00
snipe	be8049b41a	Include asset maintenances in purge	2016-08-18 07:06:15 -07:00
snipe	4419dc7434	Merge branch 'fix-double-format' of https://github.com/dmeltzer/snipe-it into dmeltzer-fix-double-format # Conflicts: # app/Http/Controllers/ConsumablesController.php # app/Http/Controllers/LicensesController.php # resources/views/hardware/view.blade.php	2016-08-16 18:53:45 -07:00
Daniel Meltzer	ac63642224	Add manufacturer to licenses (#2436 ) * Add manufacturer to licenses. Shows in table and edit. Need to improve manufacturer view to show lists beyond assets still. * Remove extra closing tags, formatting * Work on making the manufacturer view show more options. Need to figure out how to change the table dynamically. * Cleanup formatting and fix a few weirdities in hardware/view.blade.php * Standardize on two-space tabs in this file, as it seems the most * common. * Fix a few places where we call number_format without guaranteeing the * item is a number and not a string. * Show a "No Results" message on components page if there are no * components. * Show table of licenses on manufacturer view page. This reworks the ManufacturersController::getDataView method to delegate the view to a sub method (currently assets or licenses, but plan to extend to consumables/accessories/components as well). We then put tabs at the top of the view to show multiple tables. This just duplicates the table layout from licenses/index.blade, but I wonder if theres a way to centralize that code, maybe through partials, over time.. The only known missing part of manufacturers for licenses would be adding it to the importer, but the license importer should probably migrate to object importer before doing too much more... * Add manufacturer to accessory. * Add consumables to the manufacturer view page.	2016-08-16 18:49:54 -07:00
Daniel Meltzer	5959f83de3	Rename parseCurrencyString to formatCurrencyOutput to clarify what it does better.	2016-08-16 20:47:53 -05:00
Daniel Meltzer	0c912bcf49	Fix more number_format madness. This does two main things: 1) The importer now imports as numbers, not parsed strings. This allows is to format values on output instead of input, which is what was happening in most places. 2) Add a Helper::parseCurrencyString method and port everything to use this. This checks to see if the value is numeric or empty, and returns the appropriate value in all cases. Should fix all known occurances of number_format expections.	2016-08-16 20:41:28 -05:00
snipe	16014945b6	Merge remote-tracking branch 'origin/develop'	2016-08-16 18:23:36 -07:00
snipe	44821b9667	Fixes #2404 Only update name of asset if it isn't null.	2016-08-16 18:23:20 -07:00
snipe	c5d7a1fdd6	Merge remote-tracking branch 'origin/develop'	2016-08-16 18:21:05 -07:00
snipe	29c4189419	Bumped version	2016-08-16 18:20:42 -07:00
Daniel Meltzer	7ef4f23d0f	Validate that purchase_cost is a numeric value. (#2452 )	2016-08-16 18:18:50 -07:00
timwsuqld	8232cefbba	Fix path to snipeit-ssl.crt (#2428 )	2016-08-16 13:03:55 -07:00
Daniel Meltzer	a852c624d3	Fix 2347 (#2394 ) * Prevent multiple checkouts of the same asset. This adds a new method to the Asset model, availableForCheckout. Port getDataTable to use availableForCheckout instead of doing the check manually. Fixes Issue #2347 * Use availableForCheckout in categories controller. Also gate the checkin/checkout actions here. * Use gate and availableForCheckout in manufactuers as well.	2016-08-16 13:02:42 -07:00
snipe	7edf1db101	Small tweaks to history	2016-08-12 19:03:32 -07:00
snipe	5e9740e0b4	Merge branch 'develop' of github.com:snipe/snipe-it into develop	2016-08-12 17:10:10 -07:00
snipe	41a20d8f66	Tidied up some debugging code, better explanation	2016-08-12 17:10:03 -07:00
snipe	7a0843e954	Import history language file	2016-08-12 16:02:51 -07:00
snipe	4a9f3fd6ff	Generate email method	2016-08-12 16:02:39 -07:00
snipe	9ae1841fc4	Make additional fields fillable	2016-08-12 16:02:18 -07:00
snipe	ba5a2edd54	CSV history routes	2016-08-12 16:02:09 -07:00
snipe	c73cbccffc	Method to import CSV history	2016-08-12 16:01:59 -07:00
snipe	24d2726c86	Added helper for imports	2016-08-12 16:01:45 -07:00
snipe	06fcf3e07d	Import history blade	2016-08-12 16:01:34 -07:00
Daniel Meltzer	cc15a4f018	Use showAssetName instead of asset->name to include the asset tag (#2437 )	2016-08-11 23:56:40 -07:00
snipe	18e576e5fd	Merge branch 'develop' of github.com:snipe/snipe-it into develop	2016-08-11 22:03:25 -07:00
snipe	4c787891e4	Use custom maintenance middleware	2016-08-11 19:22:26 -07:00
Daniel Meltzer	dbd96a4c10	Don't try to format a formatted number string. (#2396 ) The importer already formatted/parsed numbers on input into the db (maybe it shouldn't have?) so running number_format on that string throws an exception. Check to make sure the value is numeric before formatting it.	2016-08-11 19:13:49 -07:00
snipe	d314f85b93	Merge branch 'develop' of github.com:snipe/snipe-it into develop	2016-08-11 15:58:22 -07:00
snipe	3a81b7e612	Eager load asset query on maintenances to prevent n+1 queries	2016-08-11 15:56:21 -07:00
snipe	7992258b46	Updated UI with new required indicator	2016-08-11 15:44:01 -07:00
snipe	869da1da78	Add maintenance notes to maintenances tab in hardware view	2016-08-11 15:40:41 -07:00
Michael T	a6a6aa78b0	Fixing the script freezing prior to mysql secure install (#2434 )	2016-08-11 15:17:55 -07:00
snipe	4ffea7ceaa	Fixes #2406 - added missing gate for assets.edit	2016-08-09 16:38:43 -07:00
snipe	1d3255a00b	Allow admin to turn LDAP password sync off. This is added to handle customers/users with a security policy that prohibits third-parties or external databases from storing LDAP passwords.	2016-08-04 14:29:28 -07:00
snipe	29eadb10ae	Fixes #2387	2016-08-02 17:03:15 -07:00
snipe	1ca5f8bee5	Removed asterisks, use orange bar for req fields in locations	2016-08-02 16:40:38 -07:00