From 74ca9eb980b45116d5a3c652adf36ff36360d24c Mon Sep 17 00:00:00 2001
From: markjcrane <markjcrane@gmail.com>
Date: Sat, 16 Jan 2016 09:54:01 -0700
Subject: [PATCH] Consolidate the SQL Queries for better performance.

---
 app/provision/resources/classes/provision.php     | 8 --------
 resources/templates/provision/snom/320/{$mac}.xml | 6 +++---
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php
index 27a828ef0e..4c06d4ca71 100644
--- a/app/provision/resources/classes/provision.php
+++ b/app/provision/resources/classes/provision.php
@@ -743,14 +743,6 @@ include "root.php";
 					}
 					unset ($prep_statement);
 
-				//populate internal address book
-					$sql = "SELECT extension as , effective_caller_id_name, effective_caller_id_number, outbound_caller_id_name, outbound_caller_id_number, directory_full_name FROM v_extensions";
-					$prep_statement = $this->db->prepare(check_sql($sql));
-					$prep_statement->execute();
-					$internal_addressbook = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-					$view->assign("internal_addressbook",$internal_addressbook);
-					unset ($prep_statement);
-
 				//set the mac address in the correct format
 					$mac = $this->format_mac($mac, $device_vendor);
 
diff --git a/resources/templates/provision/snom/320/{$mac}.xml b/resources/templates/provision/snom/320/{$mac}.xml
index 760c5462db..135fcb8e2e 100644
--- a/resources/templates/provision/snom/320/{$mac}.xml
+++ b/resources/templates/provision/snom/320/{$mac}.xml
@@ -117,11 +117,11 @@
 {/foreach}
 </functionKeys>
 <tbook e="2" complete="true">
-{foreach $internal_addressbook as $address}
+{foreach $extensions as $row}
     <item context="active" type="" fav="false">
-        <number>{$address.extension}</number>
+        <number>{$row.extension}</number>
         <number_type>sip</number_type>
-        <first_name>{$address.directory_full_name} ({$address.extension})</first_name>
+        <first_name>{$row.directory_full_name} ({$row.extension})</first_name>
     </item>
 {/foreach}