Update the memcache reference to use the new cache PHP class.

This commit is contained in:
Mark Crane
2015-01-16 00:21:02 +00:00
parent 495f4a0226
commit bee6b9ae5e
32 changed files with 207 additions and 231 deletions

View File

@@ -41,10 +41,24 @@ else {
}
//check for the id
if (count($_GET)>0) {
$id = $_GET["id"];
if (count($_GET) > 0) {
$id = check_str($_GET["id"]);
}
if (strlen($id)>0) {
if (strlen($id) > 0) {
//get the user_context
$sql = "select extension, user_context from v_extensions ";
$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
$sql .= "and extension_uuid = '$id' ";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
foreach ($result as &$row) {
$extension = $row["extension"];
$user_context = $row["user_context"];
}
unset ($prep_statement);
//delete the extension
$sql = "delete from v_extensions ";
$sql .= "where domain_uuid = '$domain_uuid' ";
@@ -60,17 +74,20 @@ else {
$prep_statement->execute();
unset($prep_statement, $sql);
//clear the cache
$cache = new cache;
$cache->delete("directory:".$extension."@".$user_context);
//synchronize configuration
if (is_readable($_SESSION['switch']['extensions']['dir'])) {
require_once "app/extensions/resources/classes/extension.php";
$extension = new extension;
$extension->xml();
}
}
$_SESSION["message"] = $text['message-delete'];
header("Location: extensions.php");
return;
//redirect the browser
$_SESSION["message"] = $text['message-delete'];
header("Location: extensions.php");
return;
?>

View File

@@ -17,7 +17,7 @@
The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com>
Copyright (C) 2008-2014 All Rights Reserved.
Copyright (C) 2008-2015 All Rights Reserved.
Contributor(s):
Mark J Crane <markjcrane@fusionpbx.com>
@@ -659,12 +659,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$ext = new extension;
}
//delete extension from memcache
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
if ($fp) {
$switch_cmd = "memcache delete directory:".$extension."@".$user_context;
$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
}
//clear the cache
$cache = new cache;
$cache->delete("directory:".$extension."@".$user_context);
}
//show the action and redirect the user