A free open source IT asset/license management system
Remove Form::email_format
Marcus Moore03fd8df8bddd
diff --git a/resources/macros/macros.php b/resources/macros/macros.phpindex b048c407fa..166b4a654e 100644--- a/resources/macros/macros.php+++ b/resources/macros/macros.php@@ -168,32 +168,6 @@ Form::macro('barcode_types', function ($name = 'barcode_type', $selected = null,return $select;});-Form::macro('email_format', function ($name = 'email_format', $selected = null, $class = null) {- $formats = [- 'firstname.lastname' => trans('admin/settings/general.email_formats.firstname_lastname_format'),- 'firstname' => trans('admin/settings/general.email_formats.first_name_format'),- 'lastname' => trans('admin/settings/general.email_formats.last_name_format'),- 'filastname' => trans('admin/settings/general.email_formats.filastname_format'),- 'lastnamefirstinitial' => trans('admin/settings/general.email_formats.lastnamefirstinitial_format'),- 'firstname_lastname' => trans('admin/settings/general.email_formats.firstname_lastname_underscore_format'),- 'firstinitial.lastname' => trans('admin/settings/general.email_formats.firstinitial_lastname'),- 'lastname_firstinitial' => trans('admin/settings/general.email_formats.lastname_firstinitial'),- 'lastname.firstinitial' => trans('admin/settings/general.email_formats.lastname_dot_firstinitial_format'),- 'firstnamelastname' => trans('admin/settings/general.email_formats.firstnamelastname'),- 'firstnamelastinitial' => trans('admin/settings/general.email_formats.firstnamelastinitial'),- 'lastname.firstname' => trans('admin/settings/general.email_formats.lastnamefirstname'),- ];-- $select = '<select name="'.$name.'" class="'.$class.'" style="width: 100%" aria-label="'.$name.'">';- foreach ($formats as $format => $label) {- $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$label.'</option> '."\n";- }-- $select .= '</select>';-- return $select;-});-Form::macro('username_format', function ($name = 'username_format', $selected = null, $class = null) {$formats = ['firstname.lastname' => trans('admin/settings/general.username_formats.firstname_lastname_format'),