From 18bdb5d854e849892e3f4587fc51c43ec97cacf7 Mon Sep 17 00:00:00 2001
From: objecttothis <objecttothis@gmail.com>
Date: Tue, 28 Jul 2020 16:58:43 +0400
Subject: [PATCH] Modify input validator

- Matched the allowed inputs to what is found in the validator for the
Attribute form (/views/attributes/form.php) for consistency.
- Removed the restriction on colon and added the restriction on
underscore.
- Modified the language line to indicate correct error.
---
 application/language/en-GB/attributes_lang.php | 4 ++--
 application/language/en-US/attributes_lang.php | 4 ++--
 application/views/items/form.php               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/language/en-GB/attributes_lang.php b/application/language/en-GB/attributes_lang.php
index 08991322d..85961aa3d 100644
--- a/application/language/en-GB/attributes_lang.php
+++ b/application/language/en-GB/attributes_lang.php
@@ -1,6 +1,6 @@
-<?php 
+<?php
 
-$lang["attributes_attribute_value_invalid_chars"] = "Attribute value cannot contain ':' or '|'";
+$lang["attributes_attribute_value_invalid_chars"] = "Attribute value cannot contain '_' or '|'";
 $lang["attributes_confirm_delete"] = "Are you sure you want to delete the selected attribute(s)?";
 $lang["attributes_confirm_restore"] = "Are you sure you want to restore the selected attribute(s)?";
 $lang["attributes_definition_cannot_be_deleted"] = "Could not delete selected attribute(s)";
diff --git a/application/language/en-US/attributes_lang.php b/application/language/en-US/attributes_lang.php
index 08991322d..85961aa3d 100644
--- a/application/language/en-US/attributes_lang.php
+++ b/application/language/en-US/attributes_lang.php
@@ -1,6 +1,6 @@
-<?php 
+<?php
 
-$lang["attributes_attribute_value_invalid_chars"] = "Attribute value cannot contain ':' or '|'";
+$lang["attributes_attribute_value_invalid_chars"] = "Attribute value cannot contain '_' or '|'";
 $lang["attributes_confirm_delete"] = "Are you sure you want to delete the selected attribute(s)?";
 $lang["attributes_confirm_restore"] = "Are you sure you want to restore the selected attribute(s)?";
 $lang["attributes_definition_cannot_be_deleted"] = "Could not delete selected attribute(s)";
diff --git a/application/views/items/form.php b/application/views/items/form.php
index 49fd7a586..0022a2257 100644
--- a/application/views/items/form.php
+++ b/application/views/items/form.php
@@ -515,7 +515,7 @@ $(document).ready(function()
 	});
 
 	$.validator.addMethod('valid_chars', function(value, element) {
-		return value.match(/(\||:)/g) == null;
+		return value.match(/(\||_)/g) == null;
 	}, "<?php echo $this->lang->line('attributes_attribute_value_invalid_chars'); ?>");
 
 	var init_validation = function() {