From 2d42c674f99d4a0090dec9bde4775a63fdb5f87c Mon Sep 17 00:00:00 2001 From: Adam Zammit Date: Wed, 17 Sep 2014 10:45:53 +1000 Subject: [PATCH] Remove references to extension_password as now password in extension table --- admin/operatorlist.php | 4 ++-- admin/operators.php | 2 +- functions/functions.operator.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/admin/operatorlist.php b/admin/operatorlist.php index 002466f1..e6bb7e40 100644 --- a/admin/operatorlist.php +++ b/admin/operatorlist.php @@ -255,9 +255,9 @@ if (isset($_GET['operator_id'])) header("Pragma: public"); // HTTP/1.0 if (isset($_GET['winbat'])) - echo "voipclient.exe -i -u {$rs['ext']} -p {$rs['extension_password']} -h " . $_SERVER['SERVER_NAME']; + echo "voipclient.exe -i -u {$rs['ext']} -p {$rs['password']} -h " . $_SERVER['SERVER_NAME']; else - echo "./voipclient -i -u {$rs['ext']} -p {$rs['extension_password']} -h " . $_SERVER['SERVER_NAME']; + echo "./voipclient -i -u {$rs['ext']} -p {$rs['password']} -h " . $_SERVER['SERVER_NAME']; } } } diff --git a/admin/operators.php b/admin/operators.php index e14bfd96..d56054db 100644 --- a/admin/operators.php +++ b/admin/operators.php @@ -113,7 +113,7 @@ if (isset($_POST['operator'])) if (FREEPBX_PATH !== false) { //add extension - $sql = "INSERT INTO extension (`extension`,`extension_password`,`current_operator_id`) + $sql = "INSERT INTO extension (`extension`,`password`,`current_operator_id`) VALUES ($extension, $extensionp, $oid)"; $db->Execute($sql); diff --git a/functions/functions.operator.php b/functions/functions.operator.php index 9d8f972e..c9f57024 100644 --- a/functions/functions.operator.php +++ b/functions/functions.operator.php @@ -860,12 +860,12 @@ function get_extension_password($operator_id) { global $db; - $sql = "SELECT e.extension_password + $sql = "SELECT e.password FROM `extension` as e WHERE e.current_operator_id = '$operator_id'"; $rs = $db->GetRow($sql); - if (!empty($rs) && isset($rs['extension_password'])) return $rs['extension_password']; + if (!empty($rs) && isset($rs['password'])) return $rs['password']; return false; }