diff --git a/blocks/gs_template.php b/blocks/gs_template.php
old mode 100755
new mode 100644
index 23ad18f..c951dc5
--- a/blocks/gs_template.php
+++ b/blocks/gs_template.php
@@ -140,10 +140,10 @@
Russian
-
- ${device_userpass}
+ ${device_password_u}
-
- ${device_admpass}
+ ${device_password_a}
diff --git a/blocks/gs_template0.php b/blocks/gs_template0.php
deleted file mode 100644
index c951dc5..0000000
--- a/blocks/gs_template0.php
+++ /dev/null
@@ -1,151 +0,0 @@
-
-
-
- -
- No
- 0
- No
- No
- 1
- Standard
- Yes
- 60
- ${exten}
- 9950
- No
- User Name
- UDP
- 20
- Disabled
- Transport_Only
- Auto
- 90
- RTCP-XR
- Disabled
- 15
- Header
- No
- sips
- Yes
- Yes
- 0
- No
-
- -
- ${exten}
- ${exten}
- ${ext_secret}
-
- -
- tlf_${exten}
-
- -
- ${exten}
- Yes
-
- -
- ${sip_serv}
-
- -
- ${sip_serv}/gs
- AlwaysCheck
- HTTP
-
- -
- ${sip_serv}/gs
- ${exten}
- HTTP
-
- -
- ${sip_serv}
- ${ntp_serv}
-
- -
- MTZ+3MDT+3,M4.1.0,M11.1.0
-
- -
- Yes
- Ekaterinburg, Russia
-
- -
- 1440
-
- -
- dd-mm-yyyy
- 12Hour
-
- -
- 0
-
- -
- 60
- No
- No
-
- -
- ARecord
- No
- No
- Default
-
- -
- G.722
- G.722
- PCMU
- PCMA
- G.722
- G.722
- G.722
- G.722
-
- -
- Account1
- Ресепшн
- 8888
- BLF
-
- -
- Account1
- Ресторан
- 8881
- BLF
-
- -
- Account1
- SPA
- 8088
- BLF
-
- -
- Account1
- Клиника
- 8808
- BLF
-
- -
- Account1
- Охрана
- 8800
- BLF
-
- -
- Account1
- Пул-бар
- 8880
- BLF
-
- -
- Russian
-
- -
- ${device_password_u}
-
- -
- ${device_password_a}
-
-
-
-EOD;
-?>
\ No newline at end of file
diff --git a/blocks/head01.png b/blocks/head01.png
new file mode 100644
index 0000000..1e1564a
Binary files /dev/null and b/blocks/head01.png differ
diff --git a/blocks/provisioning_gs0.php b/blocks/provisioning_gs0.php
deleted file mode 100644
index d1db5bf..0000000
--- a/blocks/provisioning_gs0.php
+++ /dev/null
@@ -1,145 +0,0 @@
-
-
-
- -
- No
- 0
- No
- No
- 1
- Standard
- Yes
- 60
- ${exten}
- 9950
- No
- User Name
- UDP
- 20
- Disabled
- Transport_Only
- Auto
- 90
- RTCP-XR
- Disabled
- 15
- Header
- No
- sips
- Yes
- Yes
- 0
- No
-
- -
- ${exten}
- ${exten}
- ${ext_secret}
-
- -
- tlf_${exten}
-
- -
- ${exten}
- Yes
-
- -
- 172.16.0.3
-
- -
- 172.16.0.3/gs
- AlwaysCheck
- HTTP
-
- -
- 172.16.0.3/gs
- ${exten}
- HTTP
-
- -
- 172.16.0.3
- 172.16.0.1
-
- -
- MTZ+3MDT+3,M4.1.0,M11.1.0
-
- -
- Yes
- Moscow, Russia
-
- -
- 1440
-
- -
- dd-mm-yyyy
- 12Hour
-
- -
- 0
-
- -
- 60
- No
- No
-
- -
- ARecord
- No
- No
- Default
-
- -
- G.722
- G.722
- PCMU
- PCMA
- G.722
- G.722
- G.722
- G.722
-
- -
- Account1
- Ресепшн
- 8888
- BLF
-
- -
- Account1
- Ресторан
- 8881
- BLF
-
- -
- Account1
- SPA
- 8088
- BLF
-
- -
- Account1
- Клиника
- 8808
- BLF
-
- -
- Account1
- Охрана
- 8800
- BLF
-
- -
- Account1
- Пул-бар
- 8880
- BLF
-
- -
- Russian
-
-
-
-EOD;
-?>
\ No newline at end of file
diff --git a/blocks/provisioning_gs0.xml b/blocks/provisioning_gs0.xml
deleted file mode 100644
index 1ab9f35..0000000
--- a/blocks/provisioning_gs0.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-
-
-
- -
- No
- 0
- No
- No
- 1
- Standard
- Yes
- 60
- ${exten}
- 9950
- No
- User Name
- UDP
- 20
- Disabled
- Transport_Only
- Auto
- 90
- RTCP-XR
- Disabled
- 15
- Header
- No
- sips
- Yes
- Yes
- 0
- No
-
- -
- ${exten}
- ${exten}
- ${ext_secret}
-
- -
- tlf_${exten}
-
- -
- ${EXTEN}
- Yes
-
- -
- 172.16.0.3
-
- -
- 172.16.0.3/gs
- AlwaysCheck
- HTTP
-
- -
- 172.16.0.3/gs
- ${exten}
- HTTP
-
- -
- 172.16.0.3
- 172.16.0.1
-
- -
- MTZ+3MDT+3,M4.1.0,M11.1.0
-
- -
- Yes
- Moscow, Russia
-
- -
- 1440
-
- -
- dd-mm-yyyy
- 12Hour
-
- -
- 0
-
- -
- 60
- No
- No
-
- -
- ARecord
- No
- No
- Default
-
- -
- G.722
- G.722
- PCMU
- PCMA
- G.722
- G.722
- G.722
- G.722
-
- -
- Account1
- Ресепшн
- 8888
- BLF
-
- -
- Account1
- Ресторан
- 8881
- BLF
-
- -
- Account1
- SPA
- 8088
- BLF
-
- -
- Account1
- Клиника
- 8808
- BLF
-
- -
- Account1
- Охрана
- 8800
- BLF
-
- -
- Account1
- Пул-бар
- 8880
- BLF
-
- -
- Russian
-
-
-
diff --git a/blocks/values.php b/blocks/values.php
old mode 100755
new mode 100644
index df3b47c..2dae804
--- a/blocks/values.php
+++ b/blocks/values.php
@@ -1,18 +1,18 @@
diff --git a/blocks/yl_template.conf b/blocks/yl_template.conf
deleted file mode 100644
index 38aeeaa..0000000
--- a/blocks/yl_template.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#!version:1.0.0.1
-
-### This file is the exported MAC-all.cfg.
-
-### For security, the following parameters with password haven't been display in this file.
-voice.handfree.tone_vol = 9
-voice.ring_vol = 7
-### Time Settings
-local_time.time_zone = +5
-local_time.time_zone_name = Russia(Chelyabinsk)
-local_time.summer_time = 0
-local_time.ntp_server1 = 10.10.150.250
-local_time.ntp_server2 = 10.10.10.101
-local_time.date_format = 6
-local_time.manual_ntp_srv_prior = 1
-### Config Account 1
-account.1.enable = 1
-account.1.codec.pcmu.priority = 1
-account.1.codec.pcma.priority = 2
-account.1.codec.g722.priority = 3
-account.1.label = ${exten}
-account.1.display_name = ${exten}
-account.1.user_name = ${exten}
-account.1.auth_name = ${exten}
-account.1.password = ${ext_secret}
-account.1.sip_server.1.address = 10.10.150.250
-account.1.unregister_on_reboot = 1
-### Static Configuration ###
-static.auto_provision.dhcp_option.enable = 0
-static.auto_provision.pnp_enable = 0
-static.auto_provision.power_on = 0
-### Network
-static.network.dhcp_host_name = tlf_${exten}
-voice_mail.number.1 = *97
-features.relog_offtime = 15
-sip.listen_port = 9950
-lang.gui = Russian
-lang.wui = Russian
-#### по умолчанию rtp-порты 11780-12780
-### User and Admin Login
-security.user_password = admin:Kolodakart.20
-security.user_password = user:Kolodakart.20
diff --git a/blocks/yl_template.php b/blocks/yl_template.php
index 4e69656..18bff40 100644
--- a/blocks/yl_template.php
+++ b/blocks/yl_template.php
@@ -31,10 +31,6 @@
static.auto_provision.pnp_enable = 0
static.auto_provision.power_on = 0
### Network
-static.auto_provision.attempt_expired_time = 300
-static.auto_provision.dhcp_option.enable = 0
-static.auto_provision.pnp_enable = 0
-static.auto_provision.server.url = ${sip_serv}
static.network.dhcp_host_name = tlf_${exten}
voice_mail.number.1 = *97
features.relog_offtime = 15
@@ -43,7 +39,7 @@
lang.wui = Russian
#### по умолчанию rtp-порты 11780-12780
### User and Admin Login
-security.user_password = admin:${device_admpass}
-security.user_password = user:${device_userpass}
+security.user_password = admin:${device_password_a}
+security.user_password = user:${device_password_u}
EOD;
?>
\ No newline at end of file
diff --git a/blocks/yl_template0.php b/blocks/yl_template0.php
deleted file mode 100644
index 18bff40..0000000
--- a/blocks/yl_template0.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
\ No newline at end of file
diff --git a/index.php b/index.php
index de9ecb0..2938e93 100755
--- a/index.php
+++ b/index.php
@@ -49,10 +49,10 @@
-
+
-  |
+  |
@@ -66,24 +66,28 @@
-
-
-
-
-
+
+
+ Статический
+ Автоматический
";
+ }
+
+ $ip_mode = $_GET['ip_mode'];
+
+ if ($ip_mode != "dhcp") {
+ echo "
+
";
+ } else {
+ echo "
";
+ }
+ ?>
+
+
diff --git a/values.php b/values.php
deleted file mode 100644
index df3b47c..0000000
--- a/values.php
+++ /dev/null
@@ -1,18 +0,0 @@
-