From a85fa14f9c9e0dd2aa2c2692f0fd4854769960f5 Mon Sep 17 00:00:00 2001 From: "Klaus J. Mueller" Date: Mon, 22 Nov 2021 17:58:26 +0100 Subject: [PATCH 1/5] fix #10344 and #9135 --- .../views/partials/bootstrap-table.blade.php | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 130bc9c2d3..7bbef128cf 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -145,7 +145,7 @@ function genericRowLinkFormatter(destination) { return function (value,row) { if (value) { - return ' ' + value + ''; + return '' + value + ''; } }; } @@ -196,7 +196,7 @@ var dpolymorphicItemFormatterest = 'fields/'; } - return ' ' + value.name + ''; + return '' + value.name + ''; } }; } @@ -466,7 +466,7 @@ if (value) { var groups = ''; for (var index in value.rows) { - groups += ' ' + value.rows[index].name + ' '; + groups += '' + value.rows[index].name + ' '; } return groups; } @@ -495,20 +495,20 @@ function deployedLocationFormatter(row, value) { if ((row) && (row!=undefined)) { - return ' ' + row.name + ''; + return '' + row.name + ''; } else if (value.rtd_location) { - return ' ' + value.rtd_location.name + ''; + return '' + value.rtd_location.name + ''; } } function groupsAdminLinkFormatter(value, row) { - return ' ' + value + ''; + return '' + value + ''; } function assetTagLinkFormatter(value, row) { if ((row.asset) && (row.asset.id)) { - return ' ' + row.asset.asset_tag + ''; + return '' + row.asset.asset_tag + ''; } return ''; @@ -516,14 +516,14 @@ function departmentNameLinkFormatter(value, row) { if ((row.assigned_user) && (row.assigned_user.department) && (row.assigned_user.department.name)) { - return ' ' + row.assigned_user.department.name + ''; + return '' + row.assigned_user.department.name + ''; } } function assetNameLinkFormatter(value, row) { if ((row.asset) && (row.asset.name)) { - return ' ' + row.asset.name + ''; + return '' + row.asset.name + ''; } } @@ -550,31 +550,31 @@ function emailFormatter(value) { if (value) { - return ' ' + value + ''; + return '' + value + ''; } } function linkFormatter(value) { if (value) { - return ' ' + value + ''; + return '' + value + ''; } } function assetCompanyFilterFormatter(value, row) { if (value) { - return ' ' + value + ''; + return '' + value + ''; } } function assetCompanyObjFilterFormatter(value, row) { if ((row) && (row.company)) { - return ' ' + row.company.name + ''; + return '' + row.company.name + ''; } } function usersCompanyObjFilterFormatter(value, row) { if (value) { - return ' ' + value + ''; + return '' + value + ''; } else { return value; } @@ -583,13 +583,13 @@ function employeeNumFormatter(value, row) { if ((row) && (row.assigned_to) && ((row.assigned_to.employee_number))) { - return ' ' + row.assigned_to.employee_number + ''; + return '' + row.assigned_to.employee_number + ''; } } function orderNumberObjFilterFormatter(value, row) { if (value) { - return ' ' + row.order_number + ''; + return '' + row.order_number + ''; } } From 1ca770895aba7f318399391eb499cd5508651182 Mon Sep 17 00:00:00 2001 From: Ivan Nieto Vivanco Date: Mon, 22 Nov 2021 18:43:21 -0600 Subject: [PATCH 2/5] Apply trim() function when storing Custom Fields names --- app/Http/Controllers/CustomFieldsController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/CustomFieldsController.php b/app/Http/Controllers/CustomFieldsController.php index a8be424841..04819a9b0f 100644 --- a/app/Http/Controllers/CustomFieldsController.php +++ b/app/Http/Controllers/CustomFieldsController.php @@ -92,7 +92,7 @@ class CustomFieldsController extends Controller $this->authorize('create', CustomField::class); $field = new CustomField([ - "name" => $request->get("name"), + "name" => trim($request->get("name")), "element" => $request->get("element"), "help_text" => $request->get("help_text"), "field_values" => $request->get("field_values"), @@ -212,7 +212,7 @@ class CustomFieldsController extends Controller $this->authorize('update', $field); - $field->name = e($request->get("name")); + $field->name = trim(e($request->get("name"))); $field->element = e($request->get("element")); $field->field_values = e($request->get("field_values")); $field->user_id = Auth::id(); From ab06c265271f1d02fadf96299c1047a296c1962d Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 23 Nov 2021 16:13:38 +0000 Subject: [PATCH 3/5] Rocky Linux Support Addition to enable Rocky Linux installation. --- snipeit.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snipeit.sh b/snipeit.sh index e94cfe018a..20700463c9 100755 --- a/snipeit.sh +++ b/snipeit.sh @@ -301,7 +301,7 @@ echo ' ' echo "" -echo " Welcome to Snipe-IT Inventory Installer for CentOS, Fedora, Debian and Ubuntu!" +echo " Welcome to Snipe-IT Inventory Installer for CentOS, Rocky, Fedora, Debian and Ubuntu!" echo "" shopt -s nocasematch case $distro in @@ -323,7 +323,7 @@ case $distro in apache_group=www-data apachefile=/etc/apache2/sites-available/$APP_NAME.conf ;; - *centos*|*redhat*|*ol*|*rhel*) + *centos*|*redhat*|*ol*|*rhel*|*rocky*) echo " The installer has detected $distro version $version." distro=centos apache_group=apache From b937aedc300f6fb3f90499ba670dc45e0fa5f7c2 Mon Sep 17 00:00:00 2001 From: sneaK <16104273+sneak-it@users.noreply.github.com> Date: Wed, 24 Nov 2021 10:24:05 -0500 Subject: [PATCH 4/5] Add Debian 11 (Bullseye) install script support --- snipeit.sh | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/snipeit.sh b/snipeit.sh index e94cfe018a..97c5441258 100755 --- a/snipeit.sh +++ b/snipeit.sh @@ -374,7 +374,39 @@ done case $distro in debian) - if [[ "$version" =~ ^10 ]]; then + if [[ "$version" =~ ^11 ]]; then + # Install for Debian 11.x + tzone=$(cat /etc/timezone) + + echo "* Adding PHP repository." + log "apt-get install -y apt-transport-https lsb-release ca-certificates" + log "wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg" + echo "deb https://packages.sury.org/php/ $codename main" > /etc/apt/sources.list.d/php.list + + echo -n "* Updating installed packages." + log "apt-get update && apt-get -y upgrade" & pid=$! + progress + + echo "* Installing Apache httpd, PHP, MariaDB and other requirements." + PACKAGES="mariadb-server mariadb-client apache2 libapache2-mod-php7.4 php7.4 php7.4-mcrypt php7.4-curl php7.4-mysql php7.4-gd php7.4-ldap php7.4-zip php7.4-mbstring php7.4-xml php7.4-bcmath curl git unzip" + install_packages + + echo "* Configuring Apache." + create_virtualhost + log "a2enmod rewrite" + log "a2ensite $APP_NAME.conf" + rename_default_vhost + + set_hosts + + echo "* Securing MariaDB." + /usr/bin/mysql_secure_installation + + install_snipeit + + echo "* Restarting Apache httpd." + log "service apache2 restart" + elif [[ "$version" =~ ^10 ]]; then # Install for Debian 10.x tzone=$(cat /etc/timezone) From 00fad35c2a6ddc9813d3322da91086eb06cb7406 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 24 Nov 2021 19:54:45 -0800 Subject: [PATCH 5/5] Escape notes in transformCheckedOutAccessory Signed-off-by: snipe --- app/Http/Transformers/AccessoriesTransformer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Transformers/AccessoriesTransformer.php b/app/Http/Transformers/AccessoriesTransformer.php index d40642d875..1bc70f2314 100644 --- a/app/Http/Transformers/AccessoriesTransformer.php +++ b/app/Http/Transformers/AccessoriesTransformer.php @@ -82,7 +82,7 @@ class AccessoriesTransformer 'first_name'=> e($user->first_name), 'last_name'=> e($user->last_name), 'employee_number' => e($user->employee_num), - 'checkout_notes' => $user->pivot->note, + 'checkout_notes' => e($user->pivot->note), 'last_checkout' => Helper::getFormattedDateObject($user->pivot->created_at, 'datetime'), 'type' => 'user', 'available_actions' => ['checkin' => true]