From 472069555ca7f42ac478db2c3f48ec8429b36a4c Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Tue, 29 Nov 2016 11:57:54 -0700
Subject: [PATCH] Update extension_copy.php

---
 app/extensions/extension_copy.php | 44 +++++++++++++++----------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/app/extensions/extension_copy.php b/app/extensions/extension_copy.php
index c1047cf469..61985b7eb9 100644
--- a/app/extensions/extension_copy.php
+++ b/app/extensions/extension_copy.php
@@ -17,23 +17,27 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
+	Portions created by the Initial Developer are Copyright (C) 2008-2016
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-require_once "resources/paging.php";
-if (permission_exists('extension_add')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
+
+//includes
+	include "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
+	require_once "resources/paging.php";
+
+//check permissions
+	if (permission_exists('extension_add')) {
+		//access granted
+	}
+	else {
+		echo "access denied";
+		exit;
+	}
 
 //add multi-lingual support
 	$language = new text;
@@ -48,17 +52,11 @@ else {
 		}
 	}
 	
-// skip clone if domain:extension already exists
-	$ext = new extension;
-	$ext->db = $db;
-	if ($ext->exists($domain_uuid, $extension_new)) {
-		//begin the page content
-		require_once "resources/header.php";
-		
-		echo "<div align='center'>".$text['error-extension-copy-already-exists']."<br />";
-		echo "	<input type='button' class='btn' alt='".$text['button-back']."' onclick=\"window.location='./extension_edit.php?id=".$extension_uuid."';\" value='".$text['button-back']."'>\n";
-		echo "</div>";
-		require_once "resources/footer.php";
+// skip the copy if the domain extension already exists
+	$extension = new extension;
+	if ($extension->exists($_SESSION['domain_uuid'], $extension_new)) {
+		$_SESSION["message"] = $text['message-duplicate'];
+		header("Location: extensions.php");
 		return;
 	}