diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index b154f6c8c..dcd85d535 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -391,6 +391,7 @@ class SettingsController extends Controller $setting->brand = $request->input('brand', '1'); $setting->header_color = $request->input('header_color'); + $setting->show_url_in_emails = $request->input('show_url_in_emails', '0'); // Only allow the site name and CSS to be changed if lock_passwords is false diff --git a/database/migrations/2017_10_17_133709_add_display_url_to_settings.php b/database/migrations/2017_10_17_133709_add_display_url_to_settings.php new file mode 100644 index 000000000..9b90df957 --- /dev/null +++ b/database/migrations/2017_10_17_133709_add_display_url_to_settings.php @@ -0,0 +1,32 @@ +boolean('show_url_in_emails')->default(0); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('settings', function (Blueprint $table) { + $table->dropColumn('show_url_in_emails'); + }); + } +} diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php index 73fd052a5..1beed4ea5 100644 --- a/resources/lang/en/admin/settings/general.php +++ b/resources/lang/en/admin/settings/general.php @@ -116,6 +116,8 @@ return array( 'inches' => 'inches', 'width_w' => 'w', 'height_h' => 'h', + 'show_url_in_emails' => 'Link to Snipe-IT in Emails', + 'show_url_in_emails_help_text' => 'Uncheck this box if you do not wish to link back to your Snipe-IT installation in your email footers. Useful if most of your users never login. ', 'text_pt' => 'pt', 'thumbnail_max_h' => 'Max thumbnail height', 'thumbnail_max_h_help' => 'Maximum height in pixels that thumbnails may display in the listing view. Min 25, max 500.', diff --git a/resources/views/emails/accept-accessory.blade.php b/resources/views/emails/accept-accessory.blade.php index 61f7cc246..49756d579 100644 --- a/resources/views/emails/accept-accessory.blade.php +++ b/resources/views/emails/accept-accessory.blade.php @@ -57,5 +57,10 @@

{{ trans('mail.i_have_read') }}

@endif -

{{ $snipeSettings->site_name }}

+@if ($snipeSettings->show_url_in_emails=='1') +

{{ $snipeSettings->site_name }}

+@else +

{{ $snipeSettings->site_name }}

+@endif + @stop diff --git a/resources/views/emails/accept-asset.blade.php b/resources/views/emails/accept-asset.blade.php index df078104e..ca209610c 100755 --- a/resources/views/emails/accept-asset.blade.php +++ b/resources/views/emails/accept-asset.blade.php @@ -117,5 +117,10 @@

{{ trans('mail.i_have_read') }}

@endif -

{{ $snipeSettings->site_name }}

+ @if ($snipeSettings->show_url_in_emails=='1') +

{{ $snipeSettings->site_name }}

+ @else +

{{ $snipeSettings->site_name }}

+ @endif + @stop diff --git a/resources/views/emails/asset-canceled.blade.php b/resources/views/emails/asset-canceled.blade.php index 08736b8d6..6f434b683 100644 --- a/resources/views/emails/asset-canceled.blade.php +++ b/resources/views/emails/asset-canceled.blade.php @@ -9,5 +9,9 @@ {{ trans('mail.canceled') }} {{ $requested_date }}

-

{{ $snipeSettings->site_name }}

+@if ($snipeSettings->show_url_in_emails=='1') +

{{ $snipeSettings->site_name }}

+@else +

{{ $snipeSettings->site_name }}

+@endif @stop diff --git a/resources/views/emails/asset-requested.blade.php b/resources/views/emails/asset-requested.blade.php index 901b2606b..c5ece1311 100644 --- a/resources/views/emails/asset-requested.blade.php +++ b/resources/views/emails/asset-requested.blade.php @@ -11,5 +11,10 @@ {{ trans('mail.quantity') }} {{ $item_quantity}} @endif -

{{ $snipeSettings->site_name }}

+@if ($snipeSettings->show_url_in_emails=='1') +

{{ $snipeSettings->site_name }}

+@else +

{{ $snipeSettings->site_name }}

+@endif + @stop diff --git a/resources/views/emails/checkin-asset.blade.php b/resources/views/emails/checkin-asset.blade.php index 6358daffd..2dba781e7 100644 --- a/resources/views/emails/checkin-asset.blade.php +++ b/resources/views/emails/checkin-asset.blade.php @@ -75,5 +75,10 @@ @endif -

{{ $snipeSettings->site_name }}

+@if ($snipeSettings->show_url_in_emails=='1') +

{{ $snipeSettings->site_name }}

+@else +

{{ $snipeSettings->site_name }}

+@endif + @stop diff --git a/resources/views/emails/expiring-assets-report.blade.php b/resources/views/emails/expiring-assets-report.blade.php index d4006b76a..ae36b143a 100644 --- a/resources/views/emails/expiring-assets-report.blade.php +++ b/resources/views/emails/expiring-assets-report.blade.php @@ -17,5 +17,10 @@ {!! $email_content !!} -

{{ $snipeSettings->site_name }}

+ @if ($snipeSettings->show_url_in_emails=='1') +

{{ $snipeSettings->site_name }}

+ @else +

{{ $snipeSettings->site_name }}

+ @endif + @stop diff --git a/resources/views/emails/expiring-licenses-report.blade.php b/resources/views/emails/expiring-licenses-report.blade.php index b032d7c35..bb5373e76 100755 --- a/resources/views/emails/expiring-licenses-report.blade.php +++ b/resources/views/emails/expiring-licenses-report.blade.php @@ -14,5 +14,10 @@ {!! $email_content !!} -

{{ $snipeSettings->site_name }}

+@if ($snipeSettings->show_url_in_emails=='1') +

{{ $snipeSettings->site_name }}

+@else +

{{ $snipeSettings->site_name }}

+@endif + @stop diff --git a/resources/views/emails/forgot-password.blade.php b/resources/views/emails/forgot-password.blade.php index 5ab341881..363cd9fe7 100755 --- a/resources/views/emails/forgot-password.blade.php +++ b/resources/views/emails/forgot-password.blade.php @@ -9,5 +9,9 @@

{{ trans('mail.best_regards') }}

-

{{ $snipeSettings->site_name }}

+@if ($snipeSettings->show_url_in_emails=='1') +

{{ $snipeSettings->site_name }}

+@else +

{{ $snipeSettings->site_name }}

+@endif @stop diff --git a/resources/views/emails/low-inventory.blade.php b/resources/views/emails/low-inventory.blade.php index e7f2191fe..552f0ebd1 100644 --- a/resources/views/emails/low-inventory.blade.php +++ b/resources/views/emails/low-inventory.blade.php @@ -27,6 +27,10 @@ -

{{ $snipeSettings->site_name }}

+ @if ($snipeSettings->show_url_in_emails=='1') +

{{ $snipeSettings->site_name }}

+ @else +

{{ $snipeSettings->site_name }}

+ @endif @stop diff --git a/resources/views/emails/register-activate.blade.php b/resources/views/emails/register-activate.blade.php index cc0b5d8fc..b8d072cfb 100755 --- a/resources/views/emails/register-activate.blade.php +++ b/resources/views/emails/register-activate.blade.php @@ -9,5 +9,9 @@

{{ trans('mail.best_regards') }}

-

{{ $snipeSettings->site_name }}

+@if ($snipeSettings->show_url_in_emails=='1') +

{{ $snipeSettings->site_name }}

+@else +

{{ $snipeSettings->site_name }}

+@endif @stop diff --git a/resources/views/emails/send-login.blade.php b/resources/views/emails/send-login.blade.php index 4f728dec1..24c45cd71 100644 --- a/resources/views/emails/send-login.blade.php +++ b/resources/views/emails/send-login.blade.php @@ -12,5 +12,10 @@

{{ trans('mail.best_regards') }}

-

{{ $snipeSettings->site_name }}

+@if ($snipeSettings->show_url_in_emails=='1') +

{{ $snipeSettings->site_name }}

+@else +

{{ $snipeSettings->site_name }}

+@endif + @stop diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php index 5365c091a..3405247c9 100644 --- a/resources/views/settings/branding.blade.php +++ b/resources/views/settings/branding.blade.php @@ -86,6 +86,17 @@ {!! $errors->first('brand', ':message') !!} + +
+
+ {{ Form::label('show_url_in_emails', trans('admin/settings/general.show_url_in_emails')) }} +
+
+ {{ Form::checkbox('show_url_in_emails', '1', Input::old('show_url_in_emails', $setting->show_url_in_emails),array('class' => 'minimal')) }} + {{ trans('general.yes') }} +

{{ trans('admin/settings/general.show_url_in_emails_help_text') }}

+
+