added ethernet cards to the list of allowed hardware

3 files changed, 176 insertions, 7 deletions

diff --git a/h-source/Application/Controllers/DownloadController.php b/h-source/Application/Controllers/DownloadController.php
index 2fcacfa..a51fc1d 100644
--- a/h-source/Application/Controllers/DownloadController.php
+++ b/h-source/Application/Controllers/DownloadController.php
@@ -231,4 +231,9 @@ class DownloadController extends BaseController
 	{
 		$this->printXml($lang, array('type'=>'fingerprint-reader','-deleted'=>'no'));
 	}
+
+	public function ethernetcards($lang = 'en')
+	{
+		$this->printXml($lang, array('type'=>'ethernet-card','-deleted'=>'no'));
+	}
 }
\ No newline at end of file
diff --git a/h-source/Application/Controllers/EthernetcardsController.php b/h-source/Application/Controllers/EthernetcardsController.php
new file mode 100644
index 0000000..40b90de
--- /dev/null
+++ b/h-source/Application/Controllers/EthernetcardsController.php
@@ -0,0 +1,164 @@
+<?php 
+
+// h-source, a web software to build a community of people that want to share their hardware information.
+// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
+//
+// This file is part of h-source
+//
+// h-source is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// h-source is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
+
+if (!defined('EG')) die('Direct access not allowed!');
+
+class EthernetcardsController extends GenericController
+{
+
+	public function __construct($model, $controller, $queryString)
+	{
+		
+		$this->_topMenuClasses['hardware'] = " class='currentitem'";
+		
+		parent::__construct($model, $controller, $queryString);
+		
+		//load the model
+		$this->model('HardwareModel');
+		$this->model('RevisionsModel');
+		$this->model('EthernetcardsModel');
+		$this->model('TalkModel');
+		
+		$this->mod = $this->m['EthernetcardsModel'];
+		
+		$this->m['HardwareModel']->id_user = $this->s['registered']->status['id_user'];
+		$this->m['HardwareModel']->type = 'ethernet-card';
+
+		//hardware conditions
+		$this->m['HardwareModel']->strongConditions['update'] = array(
+			"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]{4}(\:)[a-zA-Z0-9]{4}$/"		=>	"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|299"							=>	"distribution",
+			"++checkIsStrings|".Wifi::$commYear	=> 	"comm_year",
+			"+++checkIsStrings|".Ethernetcards::$select 	=> 	"ethernet_card_works",
+			"++++checkIsStrings|".Ethernetcards::$interface	=> 	"interface",
+		);
+
+		$this->m['HardwareModel']->strongConditions['insert'] = array(
+			"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]{4}(\:)[a-zA-Z0-9]{4}$/"		=>	"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|299"							=>	"distribution",
+			"++checkIsStrings|".Wifi::$commYear	=> 	"comm_year",
+			"+++checkIsStrings|".Ethernetcards::$select 	=> 	"ethernet_card_works",
+			"++++checkIsStrings|".Ethernetcards::$interface	=> 	"interface",
+		);
+
+		$this->m['HardwareModel']->softConditions['update'] = array(
+			"checkMatch|/^[a-zA-Z0-9\-\_\.\+\s]+$/"			=>	"kernel|characters not allowed in the <i>kernel</i> entry",
+			"checkLength|20000"							=>	"description",
+			"+checkLength|49"							=>	"kernel",
+			"++checkLength|49"							=>	"driver",
+			"++checkMatch|/^[a-zA-Z0-9\-\_\.\+\s\/\,\:\;\(\)\[\]]+$/"	=>	"driver|only the following characters are allowed for the <i>driver</i> entry: a-z A-Z 0-9 - _ . + s / , : ; ( ) [ ]",
+			"+++checkLength|1000"							=>	"other_names|the <i>other names</i> entry exceeds the value of 1000 characters",
+		);
+		
+		$this->m['HardwareModel']->softConditions['insert'] = array(
+			"checkMatch|/^[a-zA-Z0-9\-\_\.\+\s]+$/"		=>	"kernel|characters not allowed in the <i>kernel</i> entry",
+			"checkLength|20000"							=>	"description",
+			"+checkLength|49"							=>	"kernel",
+			"++checkLength|49"							=>	"driver",
+			"++checkMatch|/^[a-zA-Z0-9\-\_\.\+\s\/\,\:\;\(\)\[\]]+$/"	=>	"driver|only the following characters are allowed for the <i>driver</i> entry: a-z A-Z 0-9 - _ . + s / , : ; ( ) [ ]",
+			"+++checkLength|1000"							=>	"other_names|the <i>other names</i> entry exceeds the value of 1000 characters",
+		);
+		
+		$this->m['HardwareModel']->setFields('model,kernel,description,distribution,comm_year,ethernet_card_works,pci_id,interface,driver,other_names','sanitizeAll');
+		
+		$argKeys = array(
+			'page:forceNat'						=>	1,
+			'history_page:forceNat'				=>	1,
+			'vendor:sanitizeString'				=>	'undef',
+			'comm_year:sanitizeString'			=>	'undef',
+			'ethernet_card_works:sanitizeString'	=>	'undef',
+			'interface:sanitizeString'			=>	'undef',
+			'sort-by:sanitizeString'			=>	'undef'
+		);
+
+		$this->setArgKeys($argKeys);
+		
+		$data['title'] = 'Ethernet cards';
+
+		$data['intefaceOptions'] = Ethernetcards::$interface;
+		$data['worksOptions'] = Ethernetcards::$select;
+		$data['worksField'] = 'ethernet_card_works';
+		$this->append($data);
+	}
+	
+	public function catalogue($lang = 'en')
+	{		
+		$this->shift(1);
+		
+		$whereArray = array(
+			'type'				=>	$this->mod->type,
+			'vendor'			=>	$this->viewArgs['vendor'],
+			'comm_year'			=>	$this->viewArgs['comm_year'],
+			'ethernet_card_works'	=>	$this->viewArgs['ethernet_card_works'],
+			'interface'			=>	$this->viewArgs['interface'],
+		);
+		
+		$this->mod->setWhereQueryClause($whereArray);
+		
+		parent::catalogue($lang);
+	}
+
+	public function view($lang = 'en', $id = 0, $name = null)
+	{
+		parent::view($lang, $id, $name);
+	}
+
+	public function history($lang = 'en', $id = 0)
+	{
+		parent::history($lang, $id);
+	}
+
+	public function revision($lang = 'en', $id_rev = 0)
+	{
+		parent::revision($lang, $id_rev);
+	}
+
+	public function insert($lang = 'en', $token = '')
+	{
+		parent::insert($lang, $token);
+	}
+	
+	public function update($lang = 'en', $token = '')
+	{
+		parent::update($lang, $token);
+	}
+
+	public function differences($lang = 'en', $id_hard = 0, $id_rev = 0)
+	{
+		parent::differences($lang, $id_hard, $id_rev);
+	}
+
+	public function climb($lang = 'en', $id_rev = 0, $token = '')
+	{
+		parent::climb($lang, $id_rev, $token);
+	}
+
+	public function talk($lang = 'en', $id_hard = 0, $token = '')
+	{
+		parent::talk($lang, $id_hard, $token);
+	}
+
+}
\ No newline at end of file
diff --git a/h-source/Application/Controllers/GenericController.php b/h-source/Application/Controllers/GenericController.php
index 8ab98ba..f955820 100644
--- a/h-source/Application/Controllers/GenericController.php
+++ b/h-source/Application/Controllers/GenericController.php
@@ -75,8 +75,8 @@ class GenericController extends BaseController
 		
 		$this->s['registered']->checkStatus();
 		
-// 		if ($this->s['registered']->status['status'] === 'logged')
-// 		{
+		if ($this->s['registered']->status['status'] === 'logged' or Website::$allowAnonymousSubmission === "yes")
+		{
 // 			if (!$this->s['registered']->checkCsrf($clean['token'])) $this->redirect($this->controller.'/catalogue/'.$this->lang,2,'wrong token..');
 			
 // 			if ($this->m['UsersModel']->isBlocked($this->s['registered']->status['id_user'])) $this->redirect('my/home/'.$this->lang,2,'your account has been blocked..');
@@ -145,11 +145,11 @@ class GenericController extends BaseController
 				$this->clean();
 				$this->load('xml_response');
 			}
-// 		}
-// 		else
-// 		{
-// 			$this->redirect("users/login/".$this->lang."?redirect=".$this->controller."/catalogue/".$this->lang,0);
-// 		}
+		}
+		else
+		{
+			$this->redirect("users/login/".$this->lang."?redirect=".$this->controller."/catalogue/".$this->lang,0);
+		}
 	}
 
 	public function del($lang = 'en', $token = '')