aboutsummaryrefslogtreecommitdiff
path: root/h-source/Application
diff options
context:
space:
mode:
authorAntonio Gallo <tonicucoz@gmail.com>2010-12-27 21:31:00 +0000
committerAntonio Gallo <tonicucoz@gmail.com>2010-12-27 21:31:00 +0000
commit547b27015b4173e33409cf1be1b0aea2dfa0994d (patch)
treec50832f2e8ba382007c7352ddf2703380a5a114f /h-source/Application
parentc24e925cd11f221a9a79485147ddb26b35a8153c (diff)
added ESI as vendor name and added @ as allowed characters for the model name for Soundcards
Diffstat (limited to 'h-source/Application')
-rw-r--r--h-source/Application/Controllers/SoundcardsController.php4
-rw-r--r--h-source/Application/Include/hardware.php1
-rw-r--r--h-source/Application/Include/myFunctions.php1
3 files changed, 4 insertions, 2 deletions
diff --git a/h-source/Application/Controllers/SoundcardsController.php b/h-source/Application/Controllers/SoundcardsController.php
index 9952afd..91d9039 100644
--- a/h-source/Application/Controllers/SoundcardsController.php
+++ b/h-source/Application/Controllers/SoundcardsController.php
@@ -45,7 +45,7 @@ class SoundcardsController extends GenericController
$this->m['HardwareModel']->strongConditions['update'] = array(
"checkIsStrings|".Soundcards::vendorsList() => "vendor",
"checkNotEmpty" => "model|you have to fill the <i>model name</i> entry",
- "checkMatch|/^[a-zA-Z0-9\-\_\.\+\s\(\)]+$/" => "model|characters not allowed in the <i>model name</i> entry",
+ "checkMatch|/^[a-zA-Z0-9\-\_\.\+\s\(\)\@]+$/" => "model|characters not allowed in the <i>model name</i> entry",
"checkLength|99" => "model",
"+checkLength|299" => "distribution",
"++checkIsStrings|".Wifi::$commYear => "comm_year",
@@ -56,7 +56,7 @@ class SoundcardsController extends GenericController
$this->m['HardwareModel']->strongConditions['insert'] = array(
"checkIsStrings|".Soundcards::vendorsList() => "vendor",
"checkNotEmpty" => "model|you have to fill the <i>model name</i> entry",
- "checkMatch|/^[a-zA-Z0-9\-\_\.\+\s\(\)]+$/" => "model|characters not allowed in the <i>model name</i> entry",
+ "checkMatch|/^[a-zA-Z0-9\-\_\.\+\s\(\)\@]+$/" => "model|characters not allowed in the <i>model name</i> entry",
"checkLength|99" => "model",
"+checkLength|299" => "distribution",
"++checkIsStrings|".Wifi::$commYear => "comm_year",
diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php
index c6d930e..e7435f9 100644
--- a/h-source/Application/Include/hardware.php
+++ b/h-source/Application/Include/hardware.php
@@ -309,6 +309,7 @@ class Soundcards extends Hardware
"Cirrus Logic" => "Cirrus-Logic",
"Creative Labs" => "Creative-Labs",
"Ensoniq" => "Ensoniq",
+ "ESI" => "ESI",
"ESS Technology" => "ESS-Technology",
"ForteMedia Inc" => "ForteMedia-Inc",
"Intel Corporation" => "Intel-Corporation",
diff --git a/h-source/Application/Include/myFunctions.php b/h-source/Application/Include/myFunctions.php
index 0aa5aca..fa87b08 100644
--- a/h-source/Application/Include/myFunctions.php
+++ b/h-source/Application/Include/myFunctions.php
@@ -27,6 +27,7 @@ function encodeUrl($url)
$url = str_replace(']',null,$url);
$url = str_replace('(',null,$url);
$url = str_replace(')',null,$url);
+ $url = str_replace('@','-at-',$url);
$url = urlencode($url);
// $url = html_entity_decode($url, ENT_QUOTES);
// $url = xml_encode($url);