ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
snipe
2015-10-16 01:21:05 -07:00
parent 26c0e96e56 a7ea98ad93
commit 707e5c50e4
6 changed files with 56 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/commands/AssetImportCommand.php
+13 -9
View File
@@ -187,12 +187,17 @@ class AssetImportCommand extends Command {
$last_name = $user_email_array['last_name'];
if ($user_email=='') {
$user_email = $user_email_array['username'].'@'.$this->option('domain');
$user_email = $user_email_array['username'].'@'.Config::get('app.domain');
}
if ($user_username=='') {
$user_name_array = User::generateFormattedNameFromFullName($this->option('username_format'), $user_name);
$user_username = $user_name_array['username'];
if ($this->option('username_format')=='email') {
$user_username = $user_email;
} else {
$user_name_array = User::generateFormattedNameFromFullName($this->option('username_format'), $user_name);
$user_username = $user_name_array['username'];
}
}
}
@@ -394,12 +399,11 @@ class AssetImportCommand extends Command {
*/
protected function getOptions()
{
return array(
array('domain', null, InputOption::VALUE_REQUIRED, 'Email domain for generated email addresses.', null),
array('email_format', null, InputOption::VALUE_REQUIRED, 'The format of the email addresses that should be generated. Options are firstname.lastname, firstname, filastname', null),
array('username_format', null, InputOption::VALUE_REQUIRED, 'The format of the username that should be generated. Options are firstname.lastname, firstname, filastname, email', null),
array('testrun', null, InputOption::VALUE_REQUIRED, 'Test the output without writing to the database or not.', null),
);
return array(
array('email_format', null, InputOption::VALUE_REQUIRED, 'The format of the email addresses that should be generated. Options are firstname.lastname, firstname, filastname', null),
array('username_format', null, InputOption::VALUE_REQUIRED, 'The format of the username that should be generated. Options are firstname.lastname, firstname, filastname, email', null),
array('testrun', null, InputOption::VALUE_REQUIRED, 'Test the output without writing to the database or not.', null),
);
}
app/config/local/app.example.php
+14 -1
View File
@@ -28,6 +28,19 @@ return array(
'url' => 'http://snipe-it-laravel.local:8888',
/*
|--------------------------------------------------------------------------
| Organization Domain Name
|--------------------------------------------------------------------------
|
| The domain name of the organization, used when generating email addresses
| through the import tools.
|
*/
'domain' => 'yourserver.com',
/*
|--------------------------------------------------------------------------
| Encryption Key
@@ -37,7 +50,7 @@ return array(
| to a random, 32 character string, otherwise these encrypted strings
| will not be safe. Please do this before deploying an application!
|
| Run a php artisan key:generate to create a random one
| Run a php artisan key:generate --env=staging to create a random one
*/
'key' => 'Change_this_key_or_snipe_will_get_ya',
app/config/production/app.example.php
+13
View File
@@ -28,6 +28,19 @@ return array(
'url' => 'https://production.yourserver.com',
/*
|--------------------------------------------------------------------------
| Organization Domain Name
|--------------------------------------------------------------------------
|
| The domain name of the organization, used when generating email addresses
| through the import tools.
|
*/
'domain' => 'yourserver.com',
/*
|--------------------------------------------------------------------------
| Encryption Key
app/config/staging/app.example.php
+14 -1
View File
@@ -13,7 +13,7 @@ return array(
|
*/
'debug' => true,
'debug' => false,
/*
|--------------------------------------------------------------------------
@@ -28,6 +28,19 @@ return array(
'url' => 'http://staging.yourserver.com',
/*
|--------------------------------------------------------------------------
| Organization Domain Name
|--------------------------------------------------------------------------
|
| The domain name of the organization, used when generating email addresses
| through the import tools.
|
*/
'domain' => 'yourserver.com',
/*
|--------------------------------------------------------------------------
| Encryption Key
app/config/version.php
+2 -2
View File
@@ -1,5 +1,5 @@
<?php
return array (
'app_version' => 'v2.0-165',
'hash_version' => 'v2.0-165-g66fd0c2',
'app_version' => 'v2.0-169',
'hash_version' => 'v2.0-169-ge75ceba',
);
app/models/User.php
-40
View File
@@ -157,46 +157,6 @@ class User extends SentryUserModel
}
public static function generateUsernameFromFullName($format = 'filastname', $domain, $users_name) {
$name = explode(" ", $users_name);
$first_name = $name[0];
$username_last_name = '';
$username = $username_last_name;
// If there is no last name given
if (!array_key_exists(1, $name)) {
$last_name='';
$username_last_name = $last_name;
$username = $first_name;
// There is a last name given
} else {
$last_name = str_replace($first_name,'',$username);
if ($format=='filastname') {
$email_last_name.=str_replace(' ','',$last_name);
$email_prefix = $first_name[0].$email_last_name;
} elseif ($format=='firstname.lastname') {
$email_last_name.=str_replace(' ','',$last_name);
$email_prefix = $first_name.'.'.$email_last_name;
} elseif ($format=='firstname') {
$email_last_name.=str_replace(' ','',$last_name);
$email_prefix = $first_name;
} elseif ($format=='email') {
$email_last_name.=str_replace(' ','',$last_name);
$email_prefix = $first_name;
}
}
}
public static function generateFormattedNameFromFullName($format = 'filastname', $users_name) {
$name = explode(" ", $users_name);
$name = str_replace("'", '', $name);