vendor is now automatically obtained from vendorid, except for notebooks

14 files changed, 15 insertions, 63 deletions

diff --git a/h-source/Application/Views/Bluetooth/form.php b/h-source/Application/Views/Bluetooth/form.php
index 6de2ece..a03597a 100644
--- a/h-source/Application/Views/Bluetooth/form.php
+++ b/h-source/Application/Views/Bluetooth/form.php
@@ -38,13 +38,7 @@
 		<form action="<?php echo $this->baseUrl."/".$this->controller."/".$this->action."/$lang/$token".$this->viewStatus;?>" method="POST">
 		
 			<div class="edit_form">
-			
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("vendor");?>:</div>
-					<?php echo Html_Form::select('vendor',$values['vendor'],Bluetooth::$vendors,"select_entry");?>
-					<a href="<?php echo $this->baseUrl."/issues/viewall/$lang/1/$token";?>">Vendor not present?</a>
-				</div>
-				
+
 				<div class="form_entry">
 					<div class="entry_label"><?php echo gtext("model name");?>: <b>*</b></div>
 					<?php echo Html_Form::input('model',$values['model'],'input_entry');?>
diff --git a/h-source/Application/Views/Printers/catalogue.php b/h-source/Application/Views/Printers/catalogue.php
index 3a166dd..7e42862 100644
--- a/h-source/Application/Views/Printers/catalogue.php
+++ b/h-source/Application/Views/Printers/catalogue.php
@@ -25,11 +25,11 @@
 				<?php echo $popup;?>
 			</div>
 			<div class="viewall_popup_menu_status">
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['vendor']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['compatibility']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['comm_year']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['interface']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['sort-by']?></div>
+				<div class="viewall_popup_menu_status_item"><?php echo betterVendor($this->viewArgs['vendor']);?></div>
+				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['compatibility'];?></div>
+				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['comm_year'];?></div>
+				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['interface'];?></div>
+				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['sort-by'];?></div>
 			</div>
 		</div>
 		
@@ -50,7 +50,7 @@
 
 			<div class="notebook_vendor">
 				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><?php echo $item['hardware']['vendor'];?></div>
+				<div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div>
 			</div>
 			
 			<div class="notebook_vendor">
diff --git a/h-source/Application/Views/Printers/form.php b/h-source/Application/Views/Printers/form.php
index aafb747..2ccfb38 100644
--- a/h-source/Application/Views/Printers/form.php
+++ b/h-source/Application/Views/Printers/form.php
@@ -38,13 +38,7 @@
 		<form action="<?php echo $this->baseUrl."/".$this->controller."/".$this->action."/$lang/$token".$this->viewStatus;?>" method="POST">
 		
 			<div class="edit_form">
-			
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("vendor");?>:</div>
-					<?php echo Html_Form::select('vendor',$values['vendor'],Printer::$vendors,"select_entry");?>
-					<a href="<?php echo $this->baseUrl."/issues/viewall/$lang/1/$token";?>">Vendor not present?</a>
-				</div>
-				
+
 				<div class="form_entry">
 					<div class="entry_label"><?php echo gtext("model name");?>: <b>*</b></div>
 					<?php echo Html_Form::input('model',$values['model'],'input_entry');?>
diff --git a/h-source/Application/Views/Printers/page.php b/h-source/Application/Views/Printers/page.php
index 8e3d463..c33b1d3 100644
--- a/h-source/Application/Views/Printers/page.php
+++ b/h-source/Application/Views/Printers/page.php
@@ -45,7 +45,7 @@
 
 			<div class="notebook_vendor">
 				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['vendor'];?></b></div>
+				<div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div>
 			</div>
 			
 			<div class="notebook_vendor">
diff --git a/h-source/Application/Views/Scanners/catalogue.php b/h-source/Application/Views/Scanners/catalogue.php
index d0a3c94..aadc463 100644
--- a/h-source/Application/Views/Scanners/catalogue.php
+++ b/h-source/Application/Views/Scanners/catalogue.php
@@ -25,7 +25,7 @@
 				<?php echo $popup;?>
 			</div>
 			<div class="viewall_popup_menu_status">
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['vendor']?></div>
+				<div class="viewall_popup_menu_status_item"><?php echo betterVendor($this->viewArgs['vendor'])?></div>
 				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['compatibility']?></div>
 				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['comm_year']?></div>
 				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['interface']?></div>
@@ -50,7 +50,7 @@
 
 			<div class="notebook_vendor">
 				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><?php echo $item['hardware']['vendor'];?></div>
+				<div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div>
 			</div>
 			
 			<div class="notebook_vendor">
diff --git a/h-source/Application/Views/Scanners/form.php b/h-source/Application/Views/Scanners/form.php
index a180d6a..c9085d9 100644
--- a/h-source/Application/Views/Scanners/form.php
+++ b/h-source/Application/Views/Scanners/form.php
@@ -38,13 +38,7 @@
 		<form action="<?php echo $this->baseUrl."/".$this->controller."/".$this->action."/$lang/$token".$this->viewStatus;?>" method="POST">
 		
 			<div class="edit_form">
-			
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("vendor");?>:</div>
-					<?php echo Html_Form::select('vendor',$values['vendor'],Printer::$vendors,"select_entry");?>
-					<a href="<?php echo $this->baseUrl."/issues/viewall/$lang/1/$token";?>">Vendor not present?</a>
-				</div>
-				
+
 				<div class="form_entry">
 					<div class="entry_label"><?php echo gtext("model name");?>: <b>*</b></div>
 					<?php echo Html_Form::input('model',$values['model'],'input_entry');?>
diff --git a/h-source/Application/Views/Scanners/page.php b/h-source/Application/Views/Scanners/page.php
index 1998377..8be06c1 100644
--- a/h-source/Application/Views/Scanners/page.php
+++ b/h-source/Application/Views/Scanners/page.php
@@ -45,7 +45,7 @@
 
 			<div class="notebook_vendor">
 				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><b><?php echo $item[$tableName]['vendor'];?></b></div>
+				<div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div>
 			</div>
 			
 			<div class="notebook_vendor">
diff --git a/h-source/Application/Views/Soundcards/form.php b/h-source/Application/Views/Soundcards/form.php
index 03858da..4e754dd 100644
--- a/h-source/Application/Views/Soundcards/form.php
+++ b/h-source/Application/Views/Soundcards/form.php
@@ -38,12 +38,6 @@
 		<form action="<?php echo $this->baseUrl."/".$this->controller."/".$this->action."/$lang/$token".$this->viewStatus;?>" method="POST">
 		
 			<div class="edit_form">
-			
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("vendor");?>:</div>
-					<?php echo Html_Form::select('vendor',$values['vendor'],Soundcards::$vendors,"select_entry");?>
-					<a href="<?php echo $this->baseUrl."/issues/viewall/$lang/1/$token";?>">Vendor not present?</a>
-				</div>
 				
 				<div class="form_entry">
 					<div class="entry_label"><?php echo gtext("model name");?>: <b>*</b></div>
diff --git a/h-source/Application/Views/Threegcards/form.php b/h-source/Application/Views/Threegcards/form.php
index 19f1586..55a4402 100644
--- a/h-source/Application/Views/Threegcards/form.php
+++ b/h-source/Application/Views/Threegcards/form.php
@@ -38,12 +38,6 @@
 		<form action="<?php echo $this->baseUrl."/".$this->controller."/".$this->action."/$lang/$token".$this->viewStatus;?>" method="POST">
 		
 			<div class="edit_form">
-			
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("vendor");?>:</div>
-					<?php echo Html_Form::select('vendor',$values['vendor'],ThreeGcards::$vendors,"select_entry");?>
-					<a href="<?php echo $this->baseUrl."/issues/viewall/$lang/1/$token";?>">Vendor not present?</a>
-				</div>
 				
 				<div class="form_entry">
 					<div class="entry_label"><?php echo gtext("model name");?>: <b>*</b></div>
diff --git a/h-source/Application/Views/Videocards/catalogue.php b/h-source/Application/Views/Videocards/catalogue.php
index 3f77e15..bf69cd2 100644
--- a/h-source/Application/Views/Videocards/catalogue.php
+++ b/h-source/Application/Views/Videocards/catalogue.php
@@ -25,7 +25,7 @@
 				<?php echo $popup;?>
 			</div>
 			<div class="viewall_popup_menu_status">
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['vendor']?></div>
+				<div class="viewall_popup_menu_status_item"><?php echo betterVendor($this->viewArgs['vendor']);?></div>
 				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['comm_year']?></div>
 				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['video_card_works']?></div>
 				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['interface']?></div>
diff --git a/h-source/Application/Views/Videocards/form.php b/h-source/Application/Views/Videocards/form.php
index 39ec680..bdbeaa9 100644
--- a/h-source/Application/Views/Videocards/form.php
+++ b/h-source/Application/Views/Videocards/form.php
@@ -40,12 +40,6 @@
 			<div class="edit_form">
 			
 				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("vendor");?>:</div>
-					<?php echo Html_Form::select('vendor',$values['vendor'],Videocard::$vendors,"select_entry");?>
-					<a href="<?php echo $this->baseUrl."/issues/viewall/$lang/1/$token";?>">Vendor not present?</a>
-				</div>
-				
-				<div class="form_entry">
 					<div class="entry_label"><?php echo gtext("model name");?>: <b>*</b></div>
 					<?php echo Html_Form::input('model',$values['model'],'input_entry');?>
 				</div>
diff --git a/h-source/Application/Views/Webcams/form.php b/h-source/Application/Views/Webcams/form.php
index e60ddcf..24fe218 100644
--- a/h-source/Application/Views/Webcams/form.php
+++ b/h-source/Application/Views/Webcams/form.php
@@ -38,12 +38,6 @@
 		<form action="<?php echo $this->baseUrl."/".$this->controller."/".$this->action."/$lang/$token".$this->viewStatus;?>" method="POST">
 		
 			<div class="edit_form">
-			
-				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("vendor");?>:</div>
-					<?php echo Html_Form::select('vendor',$values['vendor'],Webcams::$vendors,"select_entry");?>
-					<a href="<?php echo $this->baseUrl."/issues/viewall/$lang/1/$token";?>">Vendor not present?</a>
-				</div>
 				
 				<div class="form_entry">
 					<div class="entry_label"><?php echo gtext("model name");?>: <b>*</b></div>
diff --git a/h-source/Application/Views/Wifi/catalogue.php b/h-source/Application/Views/Wifi/catalogue.php
index 6a67c00..5e36380 100644
--- a/h-source/Application/Views/Wifi/catalogue.php
+++ b/h-source/Application/Views/Wifi/catalogue.php
@@ -25,7 +25,7 @@
 				<?php echo $popup;?>
 			</div>
 			<div class="viewall_popup_menu_status">
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['vendor']?></div>
+				<div class="viewall_popup_menu_status_item"><?php echo betterVendor($this->viewArgs['vendor']);?></div>
 				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['comm_year']?></div>
 				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['wifi_works']?></div>
 				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['interface']?></div>
diff --git a/h-source/Application/Views/Wifi/form.php b/h-source/Application/Views/Wifi/form.php
index a61b11f..fc26f70 100644
--- a/h-source/Application/Views/Wifi/form.php
+++ b/h-source/Application/Views/Wifi/form.php
@@ -40,12 +40,6 @@
 			<div class="edit_form">
 			
 				<div class="form_entry">
-					<div class="entry_label"><?php echo gtext("vendor");?>:</div>
-					<?php echo Html_Form::select('vendor',$values['vendor'],Wifi::$vendors,"select_entry");?>
-					<a href="<?php echo $this->baseUrl."/issues/viewall/$lang/1/$token";?>">Vendor not present?</a>
-				</div>
-				
-				<div class="form_entry">
 					<div class="entry_label"><?php echo gtext("model name");?>: <b>*</b></div>
 					<?php echo Html_Form::input('model',$values['model'],'input_entry');?>
 				</div>