From 66425ae25cc3fb0142eff2b53caf05f58c54aab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Thu, 3 Sep 2015 15:57:57 +0200 Subject: [PATCH] Allow provisioning with internal addressbook and update snom320 template for it --- app/provision/resources/classes/provision.php | 8 ++++ .../templates/provision/snom/320/{$mac}.xml | 37 ++++++++++++------- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php index 237de12212..4c1fe3215b 100644 --- a/app/provision/resources/classes/provision.php +++ b/app/provision/resources/classes/provision.php @@ -661,6 +661,14 @@ 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 switch (strtolower($device_vendor)) { case "aastra": diff --git a/resources/templates/provision/snom/320/{$mac}.xml b/resources/templates/provision/snom/320/{$mac}.xml index feb2b9c95c..760c5462db 100644 --- a/resources/templates/provision/snom/320/{$mac}.xml +++ b/resources/templates/provision/snom/320/{$mac}.xml @@ -100,19 +100,30 @@ g722,pcmu,pcma,gsm,g726-32,aal2-g726-32,g723,g729,telephone-event -line -line -line -line -line -line -line -line -line -line -line -line +{foreach $keys as $row} +{if $row.device_key_line == ""} + {if $row.device_key_category == "line"} + {$row.device_key_type} {$row.device_key_value} {$row.device_key_extension} + {else} + line + {/if} +{else} + {if $row.device_key_category == "line"} + {$row.device_key_type} {$row.device_key_value} {$row.device_key_extension} + {else} + line + {/if} +{/if} +{/foreach} - + +{foreach $internal_addressbook as $address} + + {$address.extension} + sip + {$address.directory_full_name} ({$address.extension}) + +{/foreach} + \ No newline at end of file