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

Remove the is_numeric on format_phone.

This commit is contained in:
markjcrane 2015-09-15 21:53:14 -06:00
parent 9eba74f645
commit a7915f6dd9
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/domain_settings/domains.php
View File

@ -87,6 +87,11 @@ else {
} }
} }
//redirect the user
if (file_exists($_SERVER["DOCUMENT_ROOT"]."/app/domains/domains.php")) {
$href = '/app/domains/domains.php';
}
//includes //includes
require_once "resources/header.php"; require_once "resources/header.php";
$document['title'] = $text['title-domains']; $document['title'] = $text['title-domains'];

16
resources/functions.php
View File

@ -771,15 +771,13 @@ function format_string ($format, $data) {
//get the format and use it to format the phone number //get the format and use it to format the phone number
function format_phone($phone_number) { function format_phone($phone_number) {
if (is_numeric($phone_number)) { foreach ($_SESSION["format"]["phone"] as &$format) {
foreach ($_SESSION["format"]["phone"] as &$format) { $format_count = substr_count($format, 'x');
$format_count = substr_count($format, 'x'); $format_count = $format_count + substr_count($format, 'R');
$format_count = $format_count + substr_count($format, 'R'); $format_count = $format_count + substr_count($format, 'r');
$format_count = $format_count + substr_count($format, 'r'); if ($format_count == strlen($phone_number)) {
if ($format_count == strlen($phone_number)) { //format the number
//format the number $phone_number = format_string($format, $phone_number);
$phone_number = format_string($format, $phone_number);
}
} }
} }
return $phone_number; return $phone_number;