From 6528f53986467bc48f2a07e04ea82aa8b1de5208 Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Thu, 5 Jul 2012 18:56:26 +0000 Subject: [PATCH] Since the the MAC address has been normalized need to add this for compatibility. A better solution in the future the extension provisioning_list will get its own table. --- app/provision/index.php | 7 +++++-- app/provision/provision_write.php | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/provision/index.php b/app/provision/index.php index ff5464d81f..03a53675e3 100644 --- a/app/provision/index.php +++ b/app/provision/index.php @@ -295,10 +295,13 @@ require_once "includes/require.php"; $file_contents = str_replace("{v_time_zone_offset}", $time_zone_offset, $file_contents); } + //create a mac address with back slashes for backwards compatability + $mac_dash = substr($mac, 0,2).'-'.substr($mac, 2,2).'-'.substr($mac, 4,2).'-'.substr($mac, 6,2).'-'.substr($mac, 8,2).'-'.substr($mac, 10,2); + //lookup the provisioning information for this MAC address. $sql = "select * from v_extensions "; - $sql .= "where provisioning_list like '%|".$mac.":%' "; - $sql .= "and domain_uuid = '$domain_uuid' "; + $sql .= "where domain_uuid = '$domain_uuid' "; + $sql .= "and (provisioning_list like '%|".$mac.":%' or provisioning_list like '%|".$mac_dash.":%') "; $sql .= "and enabled = 'true' "; $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); diff --git a/app/provision/provision_write.php b/app/provision/provision_write.php index 2a7b4beb69..60dc3d065d 100644 --- a/app/provision/provision_write.php +++ b/app/provision/provision_write.php @@ -193,10 +193,13 @@ else { } } + //create a mac address with back slashes for backwards compatability + $mac_dash = substr($phone_mac_address, 0,2).'-'.substr($phone_mac_address, 2,2).'-'.substr($phone_mac_address, 4,2).'-'.substr($phone_mac_address, 6,2).'-'.substr($phone_mac_address, 8,2).'-'.substr($phone_mac_address, 10,2); + //lookup the provisioning information for this MAC address. $sql2 = "select * from v_extensions "; - $sql2 .= "where provisioning_list like '%$phone_mac_address%' "; - $sql2 .= "and domain_uuid = '$domain_uuid' "; + $sql2 .= "where domain_uuid = '$domain_uuid' "; + $sql2 .= "and (provisioning_list like '%|".$phone_mac_address.":%' or provisioning_list like '%|".$mac_dash.":%') "; $sql2 .= "and enabled = 'true' "; $prep_statement_2 = $db->prepare(check_sql($sql2)); $prep_statement_2->execute();