From 08c772cde4adf7e3ec8ea0f45081c09f8382677d Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Fri, 3 Jan 2014 08:05:46 +0000
Subject: [PATCH] Add device_key_line

---
 app/devices/app_config.php      |  4 ++
 app/devices/app_languages.php   |  6 ++
 app/devices/device_edit.php     | 26 +++++++++
 app/devices/device_key_edit.php | 98 ++++++++++++++++++++++++++++++++-
 4 files changed, 133 insertions(+), 1 deletion(-)

diff --git a/app/devices/app_config.php b/app/devices/app_config.php
index b0c1783817..9d9d0003aa 100644
--- a/app/devices/app_config.php
+++ b/app/devices/app_config.php
@@ -361,6 +361,10 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Select the type.';
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'device_key_line';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the value.';
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'device_key_value';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the value.';
diff --git a/app/devices/app_languages.php b/app/devices/app_languages.php
index 6459ed3130..3cf2186520 100644
--- a/app/devices/app_languages.php
+++ b/app/devices/app_languages.php
@@ -241,6 +241,12 @@
 		$text['description-device_key_type']['en-us'] = 'Select the type of key.';
 		$text['description-device_key_type']['pt-pt'] = '';
 
+		$text['label-device_key_line']['en-us'] = 'Line';
+		$text['label-device_key_line']['pt-pt'] = '';
+
+		$text['description-device_key_line']['en-us'] = 'Select the line number.';
+		$text['description-device_key_line']['pt-pt'] = '';
+
 		$text['label-device_key_value']['en-us'] = 'Value';
 		$text['label-device_key_value']['pt-pt'] = '';
 
diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index aa5736d791..a3947a9941 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -75,8 +75,10 @@ require_once "resources/require.php";
 			$auth_id = check_str($_POST["auth_id"]);
 			$password = check_str($_POST["password"]);
 		//keys
+			$device_key_category = check_str($_POST["device_key_category"]);
 			$device_key_id = check_str($_POST["device_key_id"]);
 			$device_key_type = check_str($_POST["device_key_type"]);
+			$device_key_line = check_str($_POST["device_key_line"]);
 			$device_key_value = check_str($_POST["device_key_value"]);
 			$device_key_label = check_str($_POST["device_key_label"]);
 		//settings
@@ -260,6 +262,7 @@ require_once "resources/require.php";
 						$sql .= "device_key_id, ";
 						$sql .= "device_key_category, ";
 						$sql .= "device_key_type, ";
+						$sql .= "device_key_line, ";
 						$sql .= "device_key_value, ";
 						$sql .= "device_key_label ";
 						$sql .= ")";
@@ -271,6 +274,7 @@ require_once "resources/require.php";
 						$sql .= "'$device_key_id', ";
 						$sql .= "'$device_key_category', ";
 						$sql .= "'$device_key_type', ";
+						$sql .= "'$device_key_line', ";
 						$sql .= "'$device_key_value', ";
 						$sql .= "'$device_key_label' ";
 						$sql .= ")";
@@ -559,6 +563,7 @@ require_once "resources/require.php";
 		echo "				<td class='vtable'>".$text['label-device_key_category']."</td>\n";
 		echo "				<td class='vtable'>".$text['label-device_key_id']."</td>\n";
 		echo "				<td class='vtable'>".$text['label-device_key_type']."</td>\n";
+		echo "				<td class='vtable'>".$text['label-device_key_line']."</td>\n";
 		echo "				<td class='vtable'>".$text['label-device_key_value']."</td>\n";
 		echo "				<td class='vtable'>".$text['label-device_key_label']."</td>\n";
 		echo "				<td>&nbsp;</td>\n";
@@ -589,6 +594,9 @@ require_once "resources/require.php";
 			echo "					".$row['device_key_type']."&nbsp;\n";
 			echo "				</td>\n";
 			echo "				<td class='vtable'>\n";
+			echo "					".$row['device_key_line']."&nbsp;\n";
+			echo "				</td>\n";
+			echo "				<td class='vtable'>\n";
 			echo "					".$row['device_key_value']."&nbsp;\n";
 			echo "				</td>\n";
 			echo "				<td class='vtable'>\n";
@@ -728,6 +736,24 @@ require_once "resources/require.php";
 		<?php
 		echo "</td>\n";
 
+		echo "<td class='vtable' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "	<select class='formfld' style='width: 45px;' name='device_key_line'>\n";
+		echo "	<option value=''></option>\n";
+		echo "	<option value='1'>1</option>\n";
+		echo "	<option value='2'>2</option>\n";
+		echo "	<option value='3'>3</option>\n";
+		echo "	<option value='4'>4</option>\n";
+		echo "	<option value='5'>5</option>\n";
+		echo "	<option value='6'>6</option>\n";
+		echo "	<option value='7'>7</option>\n";
+		echo "	<option value='8'>8</option>\n";
+		echo "	<option value='9'>9</option>\n";
+		echo "	<option value='10'>10</option>\n";
+		echo "	<option value='11'>11</option>\n";
+		echo "	<option value='12'>12</option>\n";
+		echo "	</select>\n";
+		echo "</td>\n";
+
 		echo "<td class='vtable' align='left'>\n";
 		echo "	<input class='formfld' type='text' name='device_key_value' style='width: 120px;' maxlength='255' value=\"$device_key_value\">\n";
 		echo "</td>\n";
diff --git a/app/devices/device_key_edit.php b/app/devices/device_key_edit.php
index 304a6bf77c..f54a235755 100644
--- a/app/devices/device_key_edit.php
+++ b/app/devices/device_key_edit.php
@@ -59,6 +59,7 @@ else {
 		$device_key_id = check_str($_POST["device_key_id"]);
 		$device_key_category = check_str($_POST["device_key_category"]);
 		$device_key_type = check_str($_POST["device_key_type"]);
+		$device_key_line = check_str($_POST["device_key_line"]);
 		$device_key_value = check_str($_POST["device_key_value"]);
 		$device_key_label = check_str($_POST["device_key_label"]);
 	}
@@ -74,6 +75,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($device_key_id) == 0) { $msg .= $text['message-required']." ".$text['label-device_key_id']."<br>\n"; }
 		//if (strlen($device_key_category) == 0) { $msg .= $text['message-required']." ".$text['label-device_key_category']."<br>\n"; }
 		//if (strlen($device_key_type) == 0) { $msg .= $text['message-required']." ".$text['label-device_key_type']."<br>\n"; }
+		//if (strlen($device_key_line) == 0) { $msg .= $text['message-required']." ".$text['label-device_key_line']."<br>\n"; }
 		//if (strlen($device_key_value) == 0) { $msg .= $text['message-required']." ".$text['label-device_key_value']."<br>\n"; }
 		//if (strlen($device_key_label) == 0) { $msg .= $text['message-required']." ".$text['label-device_key_label']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
@@ -100,6 +102,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$sql .= "device_key_id, ";
 				$sql .= "device_key_category, ";
 				$sql .= "device_key_type, ";
+				$sql .= "device_key_line, ";
 				$sql .= "device_key_value, ";
 				$sql .= "device_key_label ";
 				$sql .= ")";
@@ -111,7 +114,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$sql .= "'$device_key_id', ";
 				$sql .= "'$device_key_category', ";
 				$sql .= "'$device_key_type', ";
-				$sql .= "'$device_key_value', ";
+				$sql .= "'$device_key_line', ";
 				$sql .= "'$device_key_label' ";
 				$sql .= ")";
 				$db->exec(check_sql($sql));
@@ -131,6 +134,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$sql .= "device_key_id = '$device_key_id', ";
 				$sql .= "device_key_category = '$device_key_category', ";
 				$sql .= "device_key_type = '$device_key_type', ";
+				$sql .= "device_key_line = '$device_key_line', ";
 				$sql .= "device_key_value = '$device_key_value', ";
 				$sql .= "device_key_label = '$device_key_label' ";
 				$sql .= "where domain_uuid = '$domain_uuid' ";
@@ -162,6 +166,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$device_key_id = $row["device_key_id"];
 			$device_key_category = $row["device_key_category"];
 			$device_key_type = $row["device_key_type"];
+			$device_key_line = $row["device_key_line"];
 			$device_key_value = $row["device_key_value"];
 			$device_key_label = $row["device_key_label"];
 		}
@@ -344,6 +349,97 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "</tr>\n";
 
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-device_key_line'].": \n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<select class='formfld' name='device_key_line'>\n";
+	echo "	<option value=''></option>\n";
+	if ($device_key_line == "0") { 
+		echo "	<option value='0' selected='selected'>0</option>\n";
+	}
+	else {
+		echo "	<option value='0'>0</option>\n";
+	}
+	if ($device_key_line == "1") { 
+		echo "	<option value='1' selected='selected'>1</option>\n";
+	}
+	else {
+		echo "	<option value='1'>1</option>\n";
+	}
+	if ($device_key_line == "2") { 
+		echo "	<option value='2' selected='selected'>2</option>\n";
+	}
+	else {
+		echo "	<option value='2'>2</option>\n";
+	}
+	if ($device_key_line == "3") { 
+		echo "	<option value='3' selected='selected'>3</option>\n";
+	}
+	else {
+		echo "	<option value='3'>3</option>\n";
+	}
+	if ($device_key_line == "4") { 
+		echo "	<option value='4' selected='selected'>4</option>\n";
+	}
+	else {
+		echo "	<option value='4'>4</option>\n";
+	}
+	if ($device_key_line == "5") { 
+		echo "	<option value='5' selected='selected'>5</option>\n";
+	}
+	else {
+		echo "	<option value='5'>5</option>\n";
+	}
+	if ($device_key_line == "6") { 
+		echo "	<option value='6' selected='selected'>6</option>\n";
+	}
+	else {
+		echo "	<option value='6'>6</option>\n";
+	}
+	if ($device_key_line == "7") { 
+		echo "	<option value='7' selected='selected'>7</option>\n";
+	}
+	else {
+		echo "	<option value='7'>7</option>\n";
+	}
+	if ($device_key_line == "8") { 
+		echo "	<option value='8' selected='selected'>8</option>\n";
+	}
+	else {
+		echo "	<option value='8'>8</option>\n";
+	}
+	if ($device_key_line == "9") { 
+		echo "	<option value='9' selected='selected'>9</option>\n";
+	}
+	else {
+		echo "	<option value='9'>9</option>\n";
+	}
+	if ($device_key_line == "10") { 
+		echo "	<option value='10' selected='selected'>10</option>\n";
+	}
+	else {
+		echo "	<option value='10'>10</option>\n";
+	}
+	if ($device_key_line == "11") { 
+		echo "	<option value='11' selected='selected'>11</option>\n";
+	}
+	else {
+		echo "	<option value='11'>11</option>\n";
+	}
+	if ($device_key_line == "12") { 
+		echo "	<option value='12' selected='selected'>12</option>\n";
+	}
+	else {
+		echo "	<option value='12'>12</option>\n";
+	}
+	echo "	</select>\n";
+	echo "<br />\n";
+	echo $text['description-device_key_line']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-device_key_type'].":\n";