aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Gallo <tonicucoz@gmail.com>2012-09-27 20:04:48 +0000
committerAntonio Gallo <tonicucoz@gmail.com>2012-09-27 20:04:48 +0000
commitdf6d8940d91acfd43448936f201fa0c4eae801a0 (patch)
tree3401c64249cb698d2465c83c5b1855a03bf505f3
parent5917a11e89ef3dcb49648c834d5402acbaea4a60 (diff)
the model entry can now containg up to 190 characters - lammi87 issue
-rw-r--r--h-source/Application/Controllers/NotebooksController.php2
-rw-r--r--h-source/Application/Controllers/PrintersController.php2
-rw-r--r--h-source/Application/Models/HardwareModel.php2
-rwxr-xr-xh-source/Config/Reporting.php2
-rw-r--r--h-source/tables.sql4
5 files changed, 6 insertions, 6 deletions
diff --git a/h-source/Application/Controllers/NotebooksController.php b/h-source/Application/Controllers/NotebooksController.php
index 5d70d90..4128a00 100644
--- a/h-source/Application/Controllers/NotebooksController.php
+++ b/h-source/Application/Controllers/NotebooksController.php
@@ -45,7 +45,7 @@ class NotebooksController extends GenericController
"checkNotEmpty" => "model|you have to fill the <i>model name</i> entry",
"checkMatch|".Hardware::$regExpressions['model'] => "model|characters not allowed in the <i>model name</i> entry",
"+checkIsStrings|".Notebooks::compatibilityList() => "compatibility",
- "checkLength|99" => "model",
+ "checkLength|190" => "model",
"+checkLength|299" => "distribution",
"++checkIsStrings|".Hardware::getCommYears() => "comm_year",
"+++checkIsStrings|".Notebooks::$subtypeSelect => "subtype",
diff --git a/h-source/Application/Controllers/PrintersController.php b/h-source/Application/Controllers/PrintersController.php
index 018d92f..438bbba 100644
--- a/h-source/Application/Controllers/PrintersController.php
+++ b/h-source/Application/Controllers/PrintersController.php
@@ -44,7 +44,7 @@ class PrintersController extends GenericController
"checkNotEmpty" => "model|you have to fill the <i>model name</i> entry",
"checkMatch|".Hardware::$regExpressions['model'] => "model|characters not allowed in the <i>model name</i> entry",
"+checkMatch|".Hardware::$regExpressions['vendorid_productid'] => "pci_id|<i>VendorID:ProductID</i> has to have the following format: [a-zA-Z0-9]{4}(\:)[a-zA-Z0-9]{4}",
- "checkLength|99" => "model",
+ "checkLength|190" => "model",
"+checkLength|299" => "distribution",
"+checkIsStrings|".Printer::compatibilityList() => "compatibility",
"++checkIsStrings|".Hardware::getCommYears() => "comm_year",
diff --git a/h-source/Application/Models/HardwareModel.php b/h-source/Application/Models/HardwareModel.php
index fdfdd7b..f51333e 100644
--- a/h-source/Application/Models/HardwareModel.php
+++ b/h-source/Application/Models/HardwareModel.php
@@ -79,7 +79,7 @@ class HardwareModel extends Model_Map {
"checkNotEmpty" => "model|you have to fill the <i>model name</i> entry",
"checkMatch|".Hardware::$regExpressions['model'] => "model|characters not allowed in the <i>model name</i> entry",
"+checkMatch|".Hardware::$regExpressions['vendorid_productid'] => "pci_id|<i>VendorID:ProductID</i> has to have the following format: [a-zA-Z0-9]{4}(\:)[a-zA-Z0-9]{4}",
- "checkLength|99" => "model",
+ "checkLength|190" => "model",
"+checkLength|299" => "distribution",
"++checkIsStrings|".Hardware::getCommYears() => "comm_year",
"+++checkIsStrings|".$worksOptions => $worksField,
diff --git a/h-source/Config/Reporting.php b/h-source/Config/Reporting.php
index 852e11d..9f2e75b 100755
--- a/h-source/Config/Reporting.php
+++ b/h-source/Config/Reporting.php
@@ -55,4 +55,4 @@ define ('MAX_POST_LENGTH',50000);
//max length of the REQUEST_URI
//set MAX_REQUEST_URI_LENGTH equal to 0 if you don't want to set an upper limit in the length of the REQUEST_URI
-define ('MAX_REQUEST_URI_LENGTH',200); \ No newline at end of file
+define ('MAX_REQUEST_URI_LENGTH',300); \ No newline at end of file
diff --git a/h-source/tables.sql b/h-source/tables.sql
index 2cdcdad..8d0b671 100644
--- a/h-source/tables.sql
+++ b/h-source/tables.sql
@@ -136,7 +136,7 @@ CREATE TABLE IF NOT EXISTS `hardware` (
`type` varchar(50) NOT NULL,
`kernel` varchar(50) NOT NULL,
`vendor` varchar(50) NOT NULL,
- `model` varchar(100) NOT NULL,
+ `model` varchar(200) NOT NULL,
`created_by` int(11) NOT NULL,
`updated_by` int(11) NOT NULL,
`creation_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -387,7 +387,7 @@ CREATE TABLE IF NOT EXISTS `revisions` (
`type` varchar(50) NOT NULL,
`kernel` varchar(50) NOT NULL,
`vendor` varchar(50) NOT NULL,
- `model` varchar(100) NOT NULL,
+ `model` varchar(200) NOT NULL,
`created_by` int(11) NOT NULL,
`updated_by` int(11) NOT NULL,
`creation_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,