dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a few bugs caused by changes to provisioning on the dev branch.

This commit is contained in:
Mark Crane 2013-03-26 23:51:22 +00:00
parent 60e5957c73
commit cff505e565
2 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/extensions/extension_delete.php
View File

@ -34,28 +34,32 @@ else {
exit; exit;
} }
if (count($_GET)>0) { //check for the id
$id = $_GET["id"]; if (count($_GET)>0) {
} $id = $_GET["id"];
}
//delete the extension
if (strlen($id)>0) { if (strlen($id)>0) {
$sql = "delete from v_extensions "; //delete the extension
$sql .= "where domain_uuid = '$domain_uuid' "; $sql = "delete from v_extensions ";
$sql .= "and extension_uuid = '$id' "; $sql .= "where domain_uuid = '$domain_uuid' ";
$prep_statement = $db->prepare(check_sql($sql)); $sql .= "and extension_uuid = '$id' ";
$prep_statement->execute(); $prep_statement = $db->prepare(check_sql($sql));
unset($prep_statement, $sql); $prep_statement->execute();
unset($prep_statement, $sql);
$sql = "delete from v_extension_users "; $sql = "delete from v_extension_users ";
$sql .= "where domain_uuid = '$domain_uuid' "; $sql .= "where domain_uuid = '$domain_uuid' ";
$sql .= "and extension_uuid = '$id' "; $sql .= "and extension_uuid = '$id' ";
$prep_statement = $db->prepare(check_sql($sql)); $prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute(); $prep_statement->execute();
unset($prep_statement, $sql); unset($prep_statement, $sql);
//syncrhonize configuration //synchronize configuration
save_extension_xml(); if (is_readable($_SESSION['switch']['extensions']['dir'])) {
require_once "app/extensions/resources/classes/extension.php";
$extension = new extension;
$extension->xml();
}
} }
//redirect the user //redirect the user

16
app/extensions/extension_edit.php
View File

@ -349,9 +349,9 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
} }
$db->commit(); $db->commit();
//syncrhonize configuration //synchronize configuration
if (is_readable($_SESSION['switch']['extensions']['dir'])) { if (is_readable($_SESSION['switch']['extensions']['dir'])) {
require_once "app/extensions/resources/extension.php"; require_once "app/extensions/resources/classes/extension.php";
$extension = new extension; $extension = new extension;
$extension->xml(); $extension->xml();
} }
@ -1046,7 +1046,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$onchange = "document.getElementById('provisioning_list').value += document.getElementById('select_mac_address').value;"; $onchange = "document.getElementById('provisioning_list').value += document.getElementById('select_mac_address').value;";
$onchange .= "document.getElementById('provisioning_list').value += ':'+document.getElementById('prov_line').value + '\\n'"; $onchange .= "document.getElementById('provisioning_list').value += ':'+document.getElementById('prov_line').value + '\\n'";
$sql = "select * from v_hardware_phones "; $sql = "select * from v_devices ";
$sql .= "where domain_uuid = '".$domain_uuid."' "; $sql .= "where domain_uuid = '".$domain_uuid."' ";
$prep_statement = $db->prepare(check_sql($sql)); $prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute(); $prep_statement->execute();
@ -1057,13 +1057,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
echo "<option value=''></option>\n"; echo "<option value=''></option>\n";
foreach($result as $row) { foreach($result as $row) {
$phone_mac_address = $row['phone_mac_address']; $device_mac_address = $row['device_mac_address'];
$phone_mac_address = 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); $device_mac_address = substr($device_mac_address, 0,2).'-'.substr($device_mac_address, 2,2).'-'.substr($device_mac_address, 4,2).'-'.substr($device_mac_address, 6,2).'-'.substr($device_mac_address, 8,2).'-'.substr($device_mac_address, 10,2);
if ($row['phone_mac_address'] == $select_mac_address) { if ($row['device_mac_address'] == $select_mac_address) {
echo "<option value='".$row['phone_mac_address']."' selected>".$phone_mac_address." ".$row['phone_model']." ".$row['phone_description']."</option>\n"; echo "<option value='".$row['device_mac_address']."' selected='selected'>".$device_mac_address." ".$row['device_model']." ".$row['device_description']."</option>\n";
} }
else { else {
echo "<option value='".$row['phone_mac_address']."'>".$phone_mac_address." ".$row['phone_model']." ".$row['phone_description']."</option>\n"; echo "<option value='".$row['device_mac_address']."'>".$device_mac_address." ".$row['device_model']." ".$row['device_description']."</option>\n";
} }
} //end foreach } //end foreach
unset($sql, $result, $row_count); unset($sql, $result, $row_count);