added bios and architecture filters for notebooks

2 files changed, 15 insertions, 2 deletions

diff --git a/h-source/Application/Controllers/GenericController.php b/h-source/Application/Controllers/GenericController.php
index f955820..829fe05 100644
--- a/h-source/Application/Controllers/GenericController.php
+++ b/h-source/Application/Controllers/GenericController.php
@@ -441,6 +441,15 @@ class GenericController extends BaseController
 		$this->helper('Popup',$this->controller.'/catalogue/'.$this->lang,$popup,'inclusive','page');
 		//create the HTML of the popup
 		$data['popup'] = $this->h['Popup']->render();
+
+		if (strcmp($this->controller,'notebooks') === 0)
+		{
+			$this->mod->popupArray = array();
+			$this->mod->morePopups();
+			$this->mod->popupBuild();
+			$this->h['Popup']->popupArray = $this->mod->popupArray;
+			$data['popupMore'] = $this->h['Popup']->render();
+		}
 		
 		$this->mod->orderBy = getOrderByClause($this->viewArgs['sort-by']);
 		$recordNumber = $this->mod->rowNumber();
diff --git a/h-source/Application/Controllers/NotebooksController.php b/h-source/Application/Controllers/NotebooksController.php
index b533a4e..470edc2 100644
--- a/h-source/Application/Controllers/NotebooksController.php
+++ b/h-source/Application/Controllers/NotebooksController.php
@@ -103,7 +103,9 @@ class NotebooksController extends GenericController
 			'compatibility:sanitizeString'	=>	'undef',
 			'comm_year:sanitizeString'		=>	'undef',
 			'subtype:sanitizeString'		=>	'undef',
-			'sort-by:sanitizeString'		=>	'undef'
+			'sort-by:sanitizeString'		=>	'undef',
+			'bios:sanitizeString'			=>	'undef',
+			'architecture:sanitizeString'	=>	'undef',
 		);
 
 		$this->setArgKeys($argKeys);
@@ -121,7 +123,9 @@ class NotebooksController extends GenericController
 			'vendor'		=>	$this->viewArgs['vendor'],
 			'comm_year'		=>	$this->viewArgs['comm_year'],
 			'subtype'		=>	$this->viewArgs['subtype'],
-			'compatibility'	=>	$this->viewArgs['compatibility']
+			'compatibility'	=>	$this->viewArgs['compatibility'],
+			'bios'			=>	$this->viewArgs['bios'],
+			'architecture'	=>	$this->viewArgs['architecture'],
 		);
 		
 		$this->mod->setWhereQueryClause($whereArray);