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

fixes for #1821 4.2 branch (#2034)

Browse Source 
* fixes for #1822 4.2 branch

app/extensions/app_languages.php
+ add duplicate extension error prompt

app/extensions/extension_copy.php
+ add check to see if duplicate extension exists

app/extensions/resources/classes/extension.php
+ add function to check if extension exists
+ all cherry picks "AND AND" fix from master

* fix typo

* Update app_languages.php

* Update extension_copy.php

* Update extension.php
This commit is contained in:
jebsolutions
2016-11-24 01:12:21 -07:00
committed by FusionPBX
parent 42aa667a26
commit 8547f2ac32
3 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/extensions/resources/classes/extension.php
+12
View File
@@ -504,6 +504,18 @@ if (!class_exists('extension')) {
$_SESSION["reload_xml"] = true;
}
}
// returns true if domain:extension already exists
public function exists($domain_uuid, $extension) {
$sql = "select * from v_extensions where domain_uuid = '".$domain_uuid."' ";
$sql .= "and extension='".$extension."'";
$prep_statement = $this->db->prepare(check_sql($sql));
$prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
return count($result) != 0;
}
}
}