From 64b391c145d3da3c914ac13d70b6f0543aebaf7d Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Tue, 21 Jan 2014 14:57:10 +0000 Subject: [PATCH] Set provisioning variables use device_key_type as a prefix if it was provided. --- app/provision/index.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/provision/index.php b/app/provision/index.php index 712087f9ac..917454caea 100644 --- a/app/provision/index.php +++ b/app/provision/index.php @@ -285,7 +285,7 @@ require_once "resources/require.php"; } //if $file is not provided then look for a default file that exists - if (strlen($file) == 0) { + if (strlen($file) == 0) { if (file_exists($template_directory."/".$device_template ."/{\$mac}")) { $file = "{\$mac}"; } @@ -429,12 +429,18 @@ require_once "resources/require.php"; $device_key_value = $row['device_key_value']; //1 $device_key_label = $row['device_key_label']; //label //assign the variables - if ($device_key_type == "line") { + if (strlen($device_key_type) == 0) { $view->assign("key_id_".$device_key_id, $device_key_id); $view->assign("key_type_".$device_key_id, $device_key_type); $view->assign("key_value_".$device_key_id, $device_key_value); $view->assign("key_label_".$device_key_id, $device_key_label); } + else { + $view->assign($device_key_type."_key_id_".$device_key_id, $device_key_id); + $view->assign($device_key_type."_key_type_".$device_key_id, $device_key_type); + $view->assign($device_key_type."_key_value_".$device_key_id, $device_key_value); + $view->assign($device_key_type."_key_label_".$device_key_id, $device_key_label); + } } unset ($prep_statement);