From a1e52d01a43a9a9bbf9dbced9d09ea33e806b328 Mon Sep 17 00:00:00 2001 From: Diederik de Groot Date: Sun, 25 Jul 2021 12:27:05 +0000 Subject: [PATCH] Rename `Device SEP ID` to `Device ID` Use "XX:XX:XX:XX:XX:XX" as the default display format for device MAC Address References #28 --- conf/sccpgeneral.xml.v433 | 12 ++++++------ i18n/ru_RU/LC_MESSAGES/sccp_manager.mo | Bin 44111 -> 44050 bytes i18n/ru_RU/LC_MESSAGES/sccp_manager.po | 10 +++++----- i18n/sccp_manager.pot | 6 +++--- views/form.adddevice.php | 4 ++-- views/form.addsdevice.php | 5 +++-- views/hardware.phone.php | 2 +- views/hardware.sphone.php | 2 +- 8 files changed, 21 insertions(+), 20 deletions(-) diff --git a/conf/sccpgeneral.xml.v433 b/conf/sccpgeneral.xml.v433 index fce9f7c..b9e1416 100644 --- a/conf/sccpgeneral.xml.v433 +++ b/conf/sccpgeneral.xml.v433 @@ -1250,13 +1250,13 @@ and open the template in the editor. Base Version before all crash :-) - + mac 000000000 sccp-custom - The MAC address of the phone. You must specify 12 characters in the format XXXX.XXXX.XXXX or XX-XX-XX-XX-XX-XX or XXXXXXXXXXXX + The MAC address of the phone. You must specify 12 characters in the format XXXX.XXXX.XXXX, XX:XX:XX:XX:XX:XX, XX-XX-XX-XX-XX-XX or XXXXXXXXXXXX @@ -1279,7 +1279,7 @@ and open the template in the editor. Base Version before all crash :-) - + mac 000000000 @@ -1389,7 +1389,7 @@ and open the template in the editor. Base Version before all crash :-) - + mac 000000000 @@ -1889,13 +1889,13 @@ and open the template in the editor. Base Version before all crash :-) - + mac 000000000 sccp-custom - The MAC address of the phone. You must specify 12 characters in the format XXXX.XXXX.XXXX or XX-XX-XX-XX-XX-XX or XXXXXXXXXXXX + The MAC address of the phone. You must specify 12 characters in the format XXXX.XXXX.XXXX, XX:XX:XX:XX:XX:XX, XX-XX-XX-XX-XX-XX or XXXXXXXXXXXX diff --git a/i18n/ru_RU/LC_MESSAGES/sccp_manager.mo b/i18n/ru_RU/LC_MESSAGES/sccp_manager.mo index 4e99ebbcb77c66d4dd423c716b4c591de6491f74..f18da953b3ba3784ad2f05ef38ceaabd66c6686b 100644 GIT binary patch delta 3992 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 'mac', "data" => $val, "seq" => "99"); $val = $_REQUEST['type']; $def_val['type'] = array("keyword" => 'type', "data" => $val, "seq" => "99"); @@ -66,7 +66,7 @@ if (!empty($_REQUEST['id'])) { case 'name': $key = 'mac'; //This is the key that formShow expects $val = str_replace(array('SEP','ATA','VG'), '', $val); - $val = implode('.', sscanf($val, '%4s%4s%4s')); // Convert to Cisco display Format + $val = implode(':', sscanf($val, '%2s%2s%2s%2s%2s%2s')); // Convert to Cisco display Format $def_val[$key] = array("keyword" => $key, "data" => $val, "seq" => "99"); break; case '_hwlang': diff --git a/views/form.addsdevice.php b/views/form.addsdevice.php index 5b09bf8..e2cfb4c 100644 --- a/views/form.addsdevice.php +++ b/views/form.addsdevice.php @@ -17,7 +17,7 @@ $def_val['directed_pickup_context'] = array("keyword" => 'directed_pickup_conte if (!empty($_REQUEST['new_id'])) { $dev_id = $_REQUEST['new_id']; $val = str_replace(array('SEP','ATA','VG'), '', $dev_id); - $val = implode('.', sscanf($val, '%4s%4s%4s')); // Convert to Cisco display Format + $val = implode(':', sscanf($val, '%2s%2s%2s%2s%2s%2s')); // Convert to Cisco display Format $def_val['mac'] = array("keyword" => 'mac', "data" => $val, "seq" => "99"); $val = $_REQUEST['type']; $def_val['type'] = array("keyword" => 'type', "data" => $val, "seq" => "99"); @@ -51,7 +51,8 @@ if (!empty($_REQUEST['id'])) { case 'name': $key = 'mac'; $val = str_replace(array('SEP','ATA','VG'), '', $val); - $val = implode('.', sscanf($val, '%4s%4s%4s')); // Convert to Cisco display Format + $val = implode(':', sscanf($val, '%2s%2s%2s%2s%2s%2s')); // Convert to Cisco display Format + $def_val[$key] = array("keyword" => $key, "data" => $val, "seq" => "99"); break; case '_hwlang': $tmpar = explode(":", $val); diff --git a/views/hardware.phone.php b/views/hardware.phone.php index 562e30c..d350909 100644 --- a/views/hardware.phone.php +++ b/views/hardware.phone.php @@ -35,7 +35,7 @@ - + diff --git a/views/hardware.sphone.php b/views/hardware.sphone.php index 7d5094a..c1321a7 100644 --- a/views/hardware.sphone.php +++ b/views/hardware.sphone.php @@ -29,7 +29,7 @@ - +