mirror of
https://github.com/snipe/snipe-it.git
synced 2025-03-05 20:52:15 -08:00
Removed leftover user code
This commit is contained in:
snipe
parent
698cb161d4
commit
7e56934484
|
|
@ -185,10 +185,7 @@ class Ldap extends Model
|
||||||
// Create user from LDAP data
|
// Create user from LDAP data
|
||||||
if (!empty($item["username"])) {
|
if (!empty($item["username"])) {
|
||||||
|
|
||||||
if (!$user) {
|
|
||||||
$user = new User;
|
$user = new User;
|
||||||
}
|
|
||||||
|
|
||||||
$user->first_name = $item["firstname"];
|
$user->first_name = $item["firstname"];
|
||||||
$user->last_name = $item["lastname"];
|
$user->last_name = $item["lastname"];
|
||||||
$user->username = $item["username"];
|
$user->username = $item["username"];
|
||||||
|
|
|
||||||
54
composer.lock
generated
54
composer.lock
generated
|
|
@ -4,21 +4,21 @@
|
||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"hash": "32c4dd66d67e8a97d860ba0c240311e2",
|
"hash": "17edcfcd319a08ff70ceced7a8eba93a",
|
||||||
"content-hash": "b58ec5f9391932ec93d74531a4ba0310",
|
"content-hash": "825bf05d61eea6d7b2f63ccd3dc7adf0",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "aws/aws-sdk-php",
|
"name": "aws/aws-sdk-php",
|
||||||
"version": "3.18.25",
|
"version": "3.18.28",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/aws/aws-sdk-php.git",
|
"url": "https://github.com/aws/aws-sdk-php.git",
|
||||||
"reference": "37a8ce927a69de3d821c21b64674a2b3b9d1d247"
|
"reference": "c75d3ba185d5db6998124fa1a99a63e5d529b247"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/37a8ce927a69de3d821c21b64674a2b3b9d1d247",
|
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c75d3ba185d5db6998124fa1a99a63e5d529b247",
|
||||||
"reference": "37a8ce927a69de3d821c21b64674a2b3b9d1d247",
|
"reference": "c75d3ba185d5db6998124fa1a99a63e5d529b247",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -85,7 +85,7 @@
|
||||||
"s3",
|
"s3",
|
||||||
"sdk"
|
"sdk"
|
||||||
],
|
],
|
||||||
"time": "2016-07-05 19:25:06"
|
"time": "2016-07-13 20:34:06"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "aws/aws-sdk-php-laravel",
|
"name": "aws/aws-sdk-php-laravel",
|
||||||
|
|
@ -2390,23 +2390,23 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "swiftmailer/swiftmailer",
|
"name": "swiftmailer/swiftmailer",
|
||||||
"version": "v5.4.2",
|
"version": "v5.4.3",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/swiftmailer/swiftmailer.git",
|
"url": "https://github.com/swiftmailer/swiftmailer.git",
|
||||||
"reference": "d8db871a54619458a805229a057ea2af33c753e8"
|
"reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/d8db871a54619458a805229a057ea2af33c753e8",
|
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/4cc92842069c2bbc1f28daaaf1d2576ec4dfe153",
|
||||||
"reference": "d8db871a54619458a805229a057ea2af33c753e8",
|
"reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3.3"
|
"php": ">=5.3.3"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"mockery/mockery": "~0.9.1,<0.9.4"
|
"mockery/mockery": "~0.9.1"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
|
|
@ -2439,7 +2439,7 @@
|
||||||
"mail",
|
"mail",
|
||||||
"mailer"
|
"mailer"
|
||||||
],
|
],
|
||||||
"time": "2016-05-01 08:45:47"
|
"time": "2016-07-08 11:51:25"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/console",
|
"name": "symfony/console",
|
||||||
|
|
@ -3226,12 +3226,12 @@
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/tecnickcom/tc-lib-barcode.git",
|
"url": "https://github.com/tecnickcom/tc-lib-barcode.git",
|
||||||
"reference": "2e574593447df2f935aa1cee1a16724fdcc15c3f"
|
"reference": "220728e5f659b935348442e8d1d3e46fd5f9e178"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/tecnickcom/tc-lib-barcode/zipball/2e574593447df2f935aa1cee1a16724fdcc15c3f",
|
"url": "https://api.github.com/repos/tecnickcom/tc-lib-barcode/zipball/220728e5f659b935348442e8d1d3e46fd5f9e178",
|
||||||
"reference": "2e574593447df2f935aa1cee1a16724fdcc15c3f",
|
"reference": "220728e5f659b935348442e8d1d3e46fd5f9e178",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -3304,7 +3304,7 @@
|
||||||
"tc-lib-barcode",
|
"tc-lib-barcode",
|
||||||
"upc"
|
"upc"
|
||||||
],
|
],
|
||||||
"time": "2016-06-13 15:25:44"
|
"time": "2016-07-10 18:29:15"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "tecnickcom/tc-lib-color",
|
"name": "tecnickcom/tc-lib-color",
|
||||||
|
|
@ -3477,16 +3477,16 @@
|
||||||
"packages-dev": [
|
"packages-dev": [
|
||||||
{
|
{
|
||||||
"name": "codeception/c3",
|
"name": "codeception/c3",
|
||||||
"version": "2.0.6",
|
"version": "2.0.7",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/Codeception/c3.git",
|
"url": "https://github.com/Codeception/c3.git",
|
||||||
"reference": "dc4d39b36d585c2eda58129407e78855ea67b1ca"
|
"reference": "51eec2c3a8e093deb621f58004f0393dc0871983"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/Codeception/c3/zipball/dc4d39b36d585c2eda58129407e78855ea67b1ca",
|
"url": "https://api.github.com/repos/Codeception/c3/zipball/51eec2c3a8e093deb621f58004f0393dc0871983",
|
||||||
"reference": "dc4d39b36d585c2eda58129407e78855ea67b1ca",
|
"reference": "51eec2c3a8e093deb621f58004f0393dc0871983",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -3523,7 +3523,7 @@
|
||||||
"code coverage",
|
"code coverage",
|
||||||
"codecoverage"
|
"codecoverage"
|
||||||
],
|
],
|
||||||
"time": "2016-02-09 23:31:08"
|
"time": "2016-06-27 16:49:12"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "codeception/codeception",
|
"name": "codeception/codeception",
|
||||||
|
|
@ -4930,16 +4930,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "squizlabs/php_codesniffer",
|
"name": "squizlabs/php_codesniffer",
|
||||||
"version": "2.6.1",
|
"version": "2.6.2",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
|
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
|
||||||
"reference": "fb72ed32f8418db5e7770be1653e62e0d6f5dd3d"
|
"reference": "4edb770cb853def6e60c93abb088ad5ac2010c83"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/fb72ed32f8418db5e7770be1653e62e0d6f5dd3d",
|
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/4edb770cb853def6e60c93abb088ad5ac2010c83",
|
||||||
"reference": "fb72ed32f8418db5e7770be1653e62e0d6f5dd3d",
|
"reference": "4edb770cb853def6e60c93abb088ad5ac2010c83",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -5004,7 +5004,7 @@
|
||||||
"phpcs",
|
"phpcs",
|
||||||
"standards"
|
"standards"
|
||||||
],
|
],
|
||||||
"time": "2016-05-30 22:24:32"
|
"time": "2016-07-13 23:29:13"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/browser-kit",
|
"name": "symfony/browser-kit",
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue