Changeset 387
- Timestamp:
- 10/19/07 14:53:45 (11 months ago)
- Files:
-
- firmware/trunk/kamikaze/package/webif/Makefile (modified) (3 diffs)
- firmware/trunk/kamikaze/package/webif/files/bin/klogd (modified) (1 diff)
- firmware/trunk/kamikaze/package/webif/files/bin/syslogd (modified) (1 diff)
- firmware/trunk/kamikaze/package/webif/files/etc/config/dhcp (deleted)
- firmware/trunk/kamikaze/package/webif/files/etc/config/webif (modified) (1 diff)
- firmware/trunk/kamikaze/package/webif/files/etc/config/webifssl (copied) (copied from firmware/trunk/kamikaze/package/webif/files/etc/config/webifssl)
- firmware/trunk/kamikaze/package/webif/files/etc/default (copied) (copied from firmware/trunk/kamikaze/package/webif/files/etc/default)
- firmware/trunk/kamikaze/package/webif/files/etc/default/l2tpns (copied) (copied from firmware/trunk/kamikaze/package/webif/files/etc/default/l2tpns)
- firmware/trunk/kamikaze/package/webif/files/etc/init.d/dnsmasq (deleted)
- firmware/trunk/kamikaze/package/webif/files/etc/init.d/l2tpns (copied) (copied from firmware/trunk/kamikaze/package/webif/files/etc/init.d/l2tpns)
- firmware/trunk/kamikaze/package/webif/files/etc/init.d/syslog (modified) (1 diff)
- firmware/trunk/kamikaze/package/webif/files/etc/init.d/webif (modified) (5 diffs)
- firmware/trunk/kamikaze/package/webif/files/etc/init.d/webifssl (copied) (copied from firmware/trunk/kamikaze/package/webif/files/etc/init.d/webifssl)
- firmware/trunk/kamikaze/package/webif/files/etc/languages.lst (modified) (1 diff)
- firmware/trunk/kamikaze/package/webif/files/usr/lib/webif/apn.csv (modified) (1 diff)
- firmware/trunk/kamikaze/package/webif/files/usr/lib/webif/apply.sh (modified) (9 diffs)
- firmware/trunk/kamikaze/package/webif/files/usr/lib/webif/common.awk (modified) (3 diffs)
- firmware/trunk/kamikaze/package/webif/files/usr/lib/webif/fixed-functions.sh (copied) (copied from firmware/trunk/kamikaze/package/webif/files/usr/lib/webif/fixed-functions.sh)
- firmware/trunk/kamikaze/package/webif/files/usr/lib/webif/l2tpns_apply.sh (copied) (copied from firmware/trunk/kamikaze/package/webif/files/usr/lib/webif/l2tpns_apply.sh)
- firmware/trunk/kamikaze/package/webif/files/usr/lib/webif/lang/cs/common.txt (modified) (21 diffs)
- firmware/trunk/kamikaze/package/webif/files/usr/lib/webif/timezones.csv (modified) (1 diff)
- firmware/trunk/kamikaze/package/webif/files/usr/lib/webif/webif.sh (modified) (1 diff)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/.categories (modified) (1 diff)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/applications-aircrack.sh (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/applications-cifs.sh (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/applications-dlmanager.sh (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/applications-hydra.sh (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/applications-ipkg.sh (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/applications-proftpd.sh (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/applications-shell.sh (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/applications-swap.sh (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/applications.sh (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/config.sh (modified) (1 diff)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/info.awx (modified) (2 diffs)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/network-ddns.sh (modified) (1 diff)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/network-qos.sh (modified) (1 diff)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/network-wan-lan.sh (modified) (2 diffs)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/network-wlan.sh (modified) (16 diffs)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/reboot.sh (modified) (1 diff)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/status-basic.sh (modified) (1 diff)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/status-conntrackread.awx (copied) (copied from firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/status-conntrackread.awx)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/status-conntrackread.sh (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/status-diag.sh (modified) (2 diffs)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/status-interfaces.sh (modified) (4 diffs)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/status-processes.sh (modified) (2 diffs)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/status-qos.sh (modified) (4 diffs)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/status-usb.sh (modified) (5 diffs)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/system-ipkg.sh (modified) (2 diffs)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/system-password.sh (modified) (1 diff)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/system-settings.sh (modified) (15 diffs)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/views/info-about.ahtml (modified) (1 diff)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/views/status-conntrackread.ahtml (copied) (copied from firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/views/status-conntrackread.ahtml)
- firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/vpn-l2tpns.sh (copied) (copied from firmware/trunk/kamikaze/package/webif/files/www/cgi-bin/webif/vpn-l2tpns.sh)
- firmware/trunk/kamikaze/package/webif/files/www/images/app.1.jpg (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/images/app.10.jpg (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/images/app.11.jpg (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/images/app.12.jpg (copied) (copied from firmware/trunk/kamikaze/package/webif/files/www/images/app.12.jpg)
- firmware/trunk/kamikaze/package/webif/files/www/images/app.14.gif (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/images/app.2.jpg (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/images/app.3.jpg (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/images/app.4.jpg (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/images/app.5.jpg (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/images/app.6.jpg (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/images/app.7.jpg (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/images/app.8.jpg (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/images/app.9.jpg (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/images/app13.jpg (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/images/arrwd.gif (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/images/arrwu.gif (deleted)
- firmware/trunk/kamikaze/package/webif/files/www/images/dvsts.jpg (deleted)
- firmware/trunk/kamikaze/package/webif/ipkg/webif.postinst (modified) (6 diffs)
- firmware/trunk/kamikaze/package/webif/storage/dhcp (copied) (copied from firmware/trunk/kamikaze/package/webif/storage/dhcp)
- firmware/trunk/kamikaze/package/webif/storage/dnsmasq (copied) (copied from firmware/trunk/kamikaze/package/webif/storage/dnsmasq)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
firmware/trunk/kamikaze/package/webif/Makefile
r386 r387 3 3 PKG_NAME:=webif 4 4 PKG_VERSION:=0.3 5 PKG_RELEASE:= 55 PKG_RELEASE:=6 6 6 7 7 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) … … 150 150 $(TARGET_CC) $(TARGET_CFLAGS) \ 151 151 -D_METAPACK \ 152 -I$(STAGING_DIR)/include-host - include endian.h \152 -I$(STAGING_DIR)/include-host -I$(STAGING_DIR_HOST)/include -include endian.h \ 153 153 $(TARGET_CFLAGS_EXTRA) \ 154 154 $(TARGET_LDFLAGS) \ … … 171 171 rm -rf $(1)/www/themes/sedky1/ 172 172 rm -f $(1)/www/cgi-bin/webif/*.wip 173 if [ "$(OPENWRTVERSION)" != "7.06 (Kamikaze)" ]; then \ 174 rm -f $(1)/usr/lib/webif/fixed-functions.sh; \ 175 fi 173 176 ./embed_rev.sh $(1)/www/.version \ 174 177 $(1)/usr/lib/webif/webif.sh \ firmware/trunk/kamikaze/package/webif/files/bin/klogd
r386 r387 1 1 #!/bin/sh 2 2 #âNo one can go on being a rebel too long without turning into an autocrat.â 3 if [ -n "$(ps | grep [k]logd )" ]; then3 if [ -n "$(ps | grep [k]logd | grep -v "/bin/sh")" ]; then 4 4 echo "klogd has already been started." 5 5 else firmware/trunk/kamikaze/package/webif/files/bin/syslogd
r386 r387 1 1 #!/bin/sh 2 2 #âNo one can go on being a rebel too long without turning into an autocrat.â 3 if [ -n "$(ps | grep [s]yslogd )" ]; then3 if [ -n "$(ps | grep [s]yslogd | grep -v "/bin/sh")" ]; then 4 4 echo "syslogd has already been started." 5 5 else firmware/trunk/kamikaze/package/webif/files/etc/config/webif
r386 r387 15 15 config webif misc 16 16 option opendns "0" 17 18 config webif ssl 19 option enable '0' 20 17 21 18 config webif wireless 22 option wifi0_txpower ' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16'19 option wifi0_txpower '' firmware/trunk/kamikaze/package/webif/files/etc/init.d/syslog
r386 r387 31 31 [ "$IPCALC_CMD" == "" ] && IPCALC_CMD=$(which ipcalc 2>/dev/null) 32 32 [ "$IPCALC_CMD" != "" ] && { 33 $IPCALC_CMD "$ipaddr"33 eval $($IPCALC_CMD "$ipaddr") 34 34 [ "$ipaddr" != "$IP" ] && ipaddr="" 35 35 } firmware/trunk/kamikaze/package/webif/files/etc/init.d/webif
r386 r387 29 29 30 30 start() { 31 . /etc/functions.sh32 31 . /lib/config/uci.sh 33 32 . /usr/lib/webif/functions.sh … … 38 37 39 38 [ -z "$device_name" ] && [ -f "/proc/diag/model" ] && device_name=$(cat "/proc/diag/model") 40 while [ -z "$device_name" ]; do 41 dd bs=1024 skip=212 count=16 if=/dev/mtd/0 2>/dev/null | strings | grep -q W54G 42 [ $? = "0" ] && { 43 device_name="Linksys WRT54G" 44 break 45 } 46 dd bs=1024 count=1 skip=5 if=/dev/mtd/0 2>/dev/null | strings | grep "WL500gp" 47 [ $? = "0" ] && { 48 device_name="ASUS WL-500gp" 49 break 50 } 51 ifconfig eth0 |grep -q 00:0D:B9:**:**:** 39 while [ -z "$device_name" ]; do 40 uname -a |grep -q "mips" 52 41 [ $? = "0" ] && { 53 device_name="PC Engines WRAP" 54 break 55 } 56 dd bs=1 count=19 skip=5 if=/dev/mtd/5 2>/dev/null | strings | grep "MR3201A-FLF-FON" || ifconfig eth0 |grep -q 00:18:84:**:**:** 42 dd bs=1 count=19 skip=5 if=/dev/mtd/5 2>/dev/null | strings | grep "MR3201A-FLF-FON" || ifconfig eth0 |grep -q 00:18:84:**:**:** 43 [ $? = "0" ] && { 44 device_name="La Fonera (ACCTON MR3201A)" 45 break 46 } 47 ifconfig eth0 |grep -q 00:18:0A:**:**:** 48 [ $? = "0" ] && { 49 device_name="Meraki Mini" 50 break 51 } 52 cat /proc/cpuinfo |grep -q "WP54" 53 [ $? = "0" ] && { 54 device_name="Compex WP54" 55 break 56 } 57 } 58 59 if [ "$(uname -m)" = "i?86" ]; then 60 ifconfig eth0 |grep -q 00:0D:B9:**:**:** 61 [ $? = "0" ] && { 62 device_name="PC Engines WRAP" 63 break 64 } 65 fi 66 67 cat /proc/cpuinfo |grep -q "IXP4\?\?" 57 68 [ $? = "0" ] && { 58 device_name="La Fonera (ACCTON MR3201A)" 59 break 69 cat /proc/cpuinfo |grep "Gateway 7001 AP" 70 [ $? = "0" ] && { 71 device_name="Gateway 7001 AP" 72 break 73 } 74 cat /proc/cpuinfo |grep "D-Link DSM-G600 RevA" 75 [ $? = "0" ] && { 76 device_name="D-Link DSM-G600 RevA" 77 break 78 } 79 cat /proc/cpuinfo |grep "Freecom FSG-3" 80 [ $? = "0" ] && { 81 device_name="Freecom FSG-3" 82 break 83 } 84 cat /proc/cpuinfo |grep "Iomega NAS 100d" 85 [ $? = "0" ] && { 86 device_name="Iomega NAS 100d" 87 break 88 } 89 cat /proc/cpuinfo |grep "Linksys NSLU2" 90 [ $? = "0" ] && { 91 device_name="Linksys NSLU2" 92 break 93 } 60 94 } 61 cat /proc/cpuinfo |grep "Gateway 7001 AP" 62 [ $? = "0" ] && { 63 device_name="Gateway 7001 AP" 64 break 65 } 66 67 #Generic detection in case the router is not caught by the above rules. 68 if [ "$(uname -m)" = "i?86" ]; then 69 device_name="Generic x86" 70 break 71 fi 72 cat /proc/cpuinfo |grep "IXP4\?\?" 73 [ $? = "0" ] && { 74 device_name="Unknown IXP4xx Device" 75 break 76 } 77 break 95 break 78 96 done 79 if [ -z "$CONFIG_general_firmware_version" - a-z "$CONFIG_general_firmware_name" ]; then97 if [ -z "$CONFIG_general_firmware_version" -o -z "$CONFIG_general_firmware_name" ]; then 80 98 #detect firmware info 81 99 firmware_name=$CONFIG_general_firmware_name … … 86 104 firmware_name="OpenWrt Kamikaze" 87 105 else 88 firmware_name=" OpenWrt White Russian"106 firmware_name="Unknown Wrt" 89 107 fi 90 108 firmware_subtitle="With X-Wrt Extensions" … … 92 110 if [ -f "/etc/openwrt_version" ]; then 93 111 firmware_version=$(cat "/etc/openwrt_version") 94 elif grep -q "RC5" "/etc/banner"; then95 firmware_version="RC5"96 elif grep -q "RC6" "/etc/banner"; then97 firmware_version="RC6"98 112 elif grep -q "KAMIKAZE" "/etc/banner"; then 99 firmware_version=$(cat /etc/banner |grep KAMIKAZE |cut -d ' ' -f 5|cut -d ')' -f 1)113 firmware_version=$(cat /etc/banner |grep KAMIKAZE |cut -d '(' -f 2 |cut -d ')' -f 1) 100 114 else 101 115 firmware_version="unknown" … … 122 136 } 123 137 124 # Start stunnel if ssl is enabled125 if [ "$CONFIG_ssl_enable" = "1" ]; then126 killall matrixtunnel127 matrixtunnel -A /etc/ssl/matrixtunnel.cert -p /etc/ssl/matrixtunnel.key -d 443 -r 80128 else129 killall matrixtunnel130 fi131 132 #get txpower for each wireless card and store it becuase madwifi doesn't allow you to get valid txpower133 #settings without a ath interface being created134 is_package_installed "kmod-madwifi"135 if [ "$?" = "0" ]; then136 for wifi in `ifconfig |grep "wifi" |cut -d' ' -f 1`; do137 athname=$(wlanconfig ath create wlandev $wifi wlanmode ap)138 for power in `iwlist ath0 txpower 2>&-|grep "Current Tx-Power" -v |grep "ath0" -v | cut -d'd' -f 1 |cut -d' ' -f 3`; do139 txpower="$txpower $power"140 done141 wlanconfig "$athname" destroy142 eval FORM_power="\$CONFIG_wireless_${wifi}_txpower"143 if [ "$FORM_power" != "$txpower" ]; then144 uci_set "webif" "wireless" "${wifi}_txpower" "$txpower"145 fi146 done147 fi148 149 138 if [ -e "/tmp/.uci/webif" ]; then 150 139 uci_commit "webif" firmware/trunk/kamikaze/package/webif/files/etc/languages.lst
r386 r387 9 9 option|hr|Croatian 10 10 option|hu|Hungarian 11 option|it| wItalian11 option|it|Italian 12 12 option|nl|Dutch 13 13 option|no|Norwegian firmware/trunk/kamikaze/package/webif/files/usr/lib/webif/apn.csv
r386 r387 29 29 is:OG Vodafone:gprs.is:: 30 30 lu:LUXGSM:web.pt.lu:: 31 it:3 Italy:naviga.tre.it:: firmware/trunk/kamikaze/package/webif/files/usr/lib/webif/apply.sh
r386 r387 19 19 timezone_cfg="$CONFIG_SECTION" 20 20 ;; 21 ntp_client) 22 config_get hostname $CONFIG_SECTION hostname 23 config_get port $CONFIG_SECTION port 24 config_get count $CONFIG_SECTION count 25 26 [ "$DONE" = "1" ] && exit 0 27 ps x | grep 'bin/[n]tpclient' >&- || { 28 route -n 2>&- | grep '^0.0.0.0' >&- && { 29 /usr/sbin/ntpclient -c ${count:-1} -s -h $hostname -p ${port:-123} 2>&- >&- && DONE=1 30 } 31 } 32 ;; 33 system) 34 config_get hostname $CONFIG_SECTION hostname 35 echo "${hostname:-OpenWrt}" > /proc/sys/kernel/hostname 36 ;; 21 37 esac 22 38 } … … 25 41 hosts) rm -f /etc/hosts; mv $config /etc/hosts; killall -HUP dnsmasq ;; 26 42 ethers) rm -f /etc/ethers; mv $config /etc/ethers; killall -HUP dnsmasq ;; 27 firewall) mv /tmp/.webif/file-firewall /etc/config/firewall && /etc/init.d/firewall restart ;;43 firewall) mv /tmp/.webif/file-firewall /etc/config/firewall && /etc/init.d/firewall restart && reload_upnpd;; 28 44 dnsmasq.conf) mv /tmp/.webif/file-dnsmasq.conf /etc/dnsmasq.conf && /etc/init.d/dnsmasq restart;; 29 45 ' … … 98 114 fi 99 115 echo '@TR<<Done>>' 116 } 117 118 reload_upnpd() { 119 config_load upnpd 120 config_get_bool test config enabled 0 121 if [ 1 -eq "$test" ]; then 122 echo '@TR<<Starting>> @TR<<upnpd>> ...' 123 [ -f /etc/init.d/miniupnpd ] && { 124 /etc/init.d/miniupnpd enable >&- 2>&- <&- 125 /etc/init.d/miniupnpd start >&- 2>&- <&- 126 } 127 [ -f /etc/init.d/upnpd ] && { 128 /etc/init.d/upnpd enable >&- 2>&- <&- 129 /etc/init.d/upnpd restart >&- 2>&- <&- 130 } 131 else 132 echo '@TR<<Stopping>> @TR<<upnpd>> ...' 133 [ -f /etc/init.d/miniupnpd ] && { 134 /etc/init.d/miniupnpd stop >&- 2>&- <&- 135 /etc/init.d/miniupnpd disable >&- 2>&- <&- 136 } 137 [ -f /etc/init.d/upnpd ] && { 138 /etc/init.d/upnpd stop >&- 2>&- <&- 139 /etc/init.d/upnpd disable >&- 2>&- <&- 140 } 141 fi 142 config_clear config 100 143 } 101 144 … … 144 187 } 145 188 189 # config-* simple config files 190 ( 191 cd /proc/self 192 cat /tmp/.webif/config-* 2>&- | grep '=' >&- 2>&- && { 193 exists "/usr/sbin/nvram" && { 194 cat /tmp/.webif/config-* 2>&- | tee fd/1 | xargs -n1 nvram set 195 echo "@TR<<Committing>> NVRAM ..." 196 nvram commit 197 } 198 } 199 ) 200 146 201 # 147 202 # now apply any UCI config changes … … 168 223 ;; 169 224 "/tmp/.uci/upnpd") 170 config_load upnpd 171 config_get_bool test config enabled 0 172 if [ 1 -eq "$test" ]; then 173 echo '@TR<<Starting>> @TR<<upnpd>> ...' 174 [ -f /etc/init.d/miniupnpd ] && { 175 /etc/init.d/miniupnpd enable >&- 2>&- <&- 176 /etc/init.d/miniupnpd start >&- 2>&- <&- 177 } 178 [ -f /etc/init.d/upnpd ] && { 179 /etc/init.d/upnpd enable >&- 2>&- <&- 180 /etc/init.d/upnpd restart >&- 2>&- <&- 181 } 182 else 183 echo '@TR<<Stopping>> @TR<<upnpd>> ...' 184 [ -f /etc/init.d/miniupnpd ] && { 185 /etc/init.d/miniupnpd stop >&- 2>&- <&- 186 /etc/init.d/miniupnpd disable >&- 2>&- <&- 187 } 188 [ -f /etc/init.d/upnpd ] && { 189 /etc/init.d/upnpd stop >&- 2>&- <&- 190 /etc/init.d/upnpd disable >&- 2>&- <&- 191 } 192 fi 193 config_clear config 225 reload_upnpd 194 226 ;; 195 227 "/tmp/.uci/network") … … 200 232 /etc/init.d/dnsmasq start 201 233 fi 234 ;; 235 "/tmp/.uci/ntp_client") 236 killall ntpclient 237 config_load ntp_client& 202 238 ;; 203 239 "/tmp/.uci/dhcp") … … 216 252 /etc/init.d/openvpn start ;; 217 253 "/tmp/.uci/system") 218 /etc/init.d/boot start;;254 config_load system ;; 219 255 "/tmp/.uci/snmp") 220 256 echo '@TR<<Exporting>> @TR<<snmp settings>> ...' … … 228 264 } 229 265 /etc/init.d/S??snmpd restart >&- 2>&- 266 ;; 267 "/tmp/.uci/l2tpns") 268 echo '@TR<<Exporting>> @TR<<l2tpns server settings>> ...' 269 [ -e "/usr/lib/webif/l2tpns_apply.sh" ] && { 270 /usr/lib/webif/l2tpns_apply.sh >&- 2>&- 271 } 272 273 echo '@TR<<Reloading>> @TR<<l2tpns server>> ...' 274 /etc/init.d/l2tpns restart >&- 2>&- 230 275 ;; 231 276 "/tmp/.uci/updatedd") … … 242 287 "/tmp/.uci/timezone") 243 288 echo '@TR<<Exporting>> @TR<<TZ setting>> ...' 244 uci_load "timezone" 245 eval CONFIG_timezone_posixtz="\$CONFIG_${timezone_cfg}_posixtz" 246 # create symlink to /tmp/TZ if /etc/TZ doesn't exist 247 # todo: -e | -f | -d didn't seem to work here, so I used find 248 if [ -z $(find "/etc/TZ" 2>/dev/null) ]; then 249 ln -s /tmp/TZ /etc/TZ 289 [ ! -f /etc/rc.d/S??timezone ] && /etc/init.d/timezone enable >&- 2>&- <&- 290 /etc/init.d/timezone restart 291 ;; 292 "/tmp/.uci/webifssl") 293 config_load webifssl 294 config_get_bool test matrixtunnel enable 0 295 if [ 1 -eq "$test" ]; then 296 [ -f /etc/init.d/webifssl ] && { 297 #echo '@TR<<Starting>> @TR<<webif^2 ssl tunnel>> ...' 298 /etc/init.d/webifssl enable >&- 2>&- <&- 299 /etc/init.d/webifssl start 300 } 301 else 302 [ -f /etc/init.d/webifssl ] && { 303 #echo '@TR<<Stopping>> @TR<<webif^2 ssl tunnel>> ...' 304 /etc/init.d/webifssl stop 305 /etc/init.d/webifssl disable >&- 2>&- <&- 306 } 250 307 fi 251 # eJunky: set timezone252 [ "$CONFIG_timezone_posixtz" ] && echo $CONFIG_timezone_posixtz > /etc/TZ253 308 ;; 254 309 esac firmware/trunk/kamikaze/package/webif/files/usr/lib/webif/common.awk
r386 r387 2 2 function config_load(package, var) { 3 3 while (("/bin/ash -c '. /etc/functions.sh; unset NO_EXPORT; config_load \""package"\"; env | grep \"^CONFIG_\"'" | getline) == 1) { 4 sub("^CONFIG_", "") 5 if (match($0, "=") == 0) { 6 if (var != "") CONFIG[var] = CONFIG[var] "\n" $0 7 next 8 } 9 var=substr($0, 1, RSTART-1) 10 CONFIG[var] = substr($0, RSTART+1, length($0) - RSTART) 11 } 12 } 13 14 # parameters: 1 15 function config_load_state(package, var) { 16 while (("/bin/ash -c '. /etc/functions.sh; unset NO_EXPORT; . \"/var/state/"package"\" 2>/dev/null; env | grep \"^CONFIG_\"'" | getline) == 1) { 4 17 sub("^CONFIG_", "") 5 18 if (match($0, "=") == 0) { … … 215 228 print "<h3><strong>@TR<<Subcategories>>:</strong></h3>" 216 229 print "<ul>" 217 while (("grep -H '^##WEBIF:name:"CATEGORY":' "cgidir"/*.awx "cgidir"/*.sh 2>/dev/null | sed -e 's,^.*/\\([a-zA-Z \\.\\-]*\\):\\(.*\\)$,\\2:\\1,' | sort -n" | getline) == 1) {230 while (("grep -H '^##WEBIF:name:"CATEGORY":' "cgidir"/*.awx "cgidir"/*.sh 2>/dev/null | sed -e 's,^.*/\\([a-zA-Z0-9\\.\\-]*\\):\\(.*\\)$,\\2:\\1,' | sort -n" | getline) == 1) { 218 231 print_subcategory() 219 232 } … … 263 276 counter++ 264 277 } 265 while ((" cat /tmp/.uci/* 2>&-" | getline) == 1) {278 while (("/bin/ash -c 'for config in \$(ls /tmp/.uci/* 2>&- | grep -v \"\\.lock\$\"); do cat \"\$config\" 2>&-; done'" | getline) == 1) { 266 279 counter++ 267 280 } firmware/trunk/kamikaze/package/webif/files/usr/lib/webif/lang/cs/common.txt
r386 r387 4 4 5 5 ## SVN version referenced 6 lang_for_svn => 3299 7 6 lang_for_svn => 3572 8 7 ## /usr/lib/webif/apn.csv 9 8 Vodafone UK => Vodafone VB … … 53 52 Error installing language pack => Chyba pÅi instalaci jazykového balÃÄku 54 53 Committing => Ukládám 54 Starting => Startuji 55 upnpd => upnpd 56 Stopping => Zastavuji 55 57 Reloading => Obnovuji 56 58 network => sÃÅ¥ová nastavenà … … 58 60 syslogd => syslogd 59 61 OpenVPN => OpenVPN 62 Exporting => Exportuji 63 snmp settings => nastavenà snmp 64 TZ setting => nastavenà TZ 60 65 61 66 ## /usr/lib/webif/browser.awk … … 100 105 101 106 ## /usr/lib/webif/editor.awk 102 File => Soubor107 editor_File => Soubor 103 108 Save Changes => UloÅŸit zmÄny 104 109 Back => ZpÄt … … 131 136 Invalid dots => Neplatné teÄky 132 137 Invalid spaces => Neplatné mezery 138 Missing netmask => ChybÄjÃcà sÃÅ¥ová maska 139 Netmask not allowed => SÃÅ¥ová maska nenà pÅÃpustná 133 140 Error in => Chyba v poloÅŸce 134 141 … … 142 149 Settings saved => Nastavenà byla uloÅŸena 143 150 Settings not saved => Nastavenà nebyla uloÅŸena 151 Password_mismatch => Zadaná hesla nejsou stejná! 144 152 Warning => Varovánà 145 Password_warning => Nenastavili jste heslo pro webové rozhranà a pÅÃstup pÅes SSH <br />ProsÃm zadejte jej nynà (uÅŸivatelské jméno pro váš prohlÃÅŸeÄ bude 'root').153 Password_warning => Nenastavili jste heslo pro webové rozhranà a pÅÃstup pÅes SSH.<br />ProsÃm zadejte jej nynà (uÅŸivatelské jméno pro váš prohlÃÅŸeÄ bude 'root'). 146 154 New Password => Nové heslo 147 155 Confirm Password => Potvrdit heslo 148 156 Set => Nastavit 149 150 ## /www/cgi-bin/webif/applications.sh151 Applications => Aplikace152 Applications => Aplikace153 List => Seznam154 List of Applications => Seznam aplikacÃ155 ## TODO156 157 157 158 ## /www/cgi-bin/webif/.categories … … 163 164 Network => SÃÅ¥ 164 165 VPN => VPN 165 Applications => Aplikace166 166 Logout => Odhlášenà 167 167 … … 184 184 ## temporarily removed #### duplicate ##graphs_svg_required => Tento objekt vyÅŸaduje podporu SVG. 185 185 186 ## /www/cgi-bin/webif/iframe.mini-info.sh187 Device Status => Stav zaÅÃzenÃ188 ## rest is untranslated189 190 186 ## /www/cgi-bin/webif/info.awx 191 Info => Info 187 Please wait => PoÄkejte prosÃm 192 188 info_wait_install => PoÄkejte prosÃm, instalace můşe chvilku trvat 193 189 System Information => Systémové informace 194 190 About => O aplikaci 191 Info => Info 192 System => Systém 195 193 196 194 ## /www/cgi-bin/webif/log-browse.sh … … 212 210 Dest. Port => CÃl. port 213 211 214 ## /www/cgi-bin/webif/log-dmesg.sh 212 ## /www/cgi-bin/webif/log-dmesg.awx 213 log_dmesg_Kernel_Ring_Buffer => KruhovÜ záznam jádra 214 log_dmesg_no_current_messages => Ŝádné záznamy jádra nebyly nalezeny. 215 log_dmesg_no_archived_messages => Neexistujà şádné archivované záznamy jádra. 216 log_dmesg_no_archive_exists => Archiv záznamů jádra neexistuje. 215 217 Log => Záznam 216 218 Kernel => Jádro 217 log_dmesg_Kernel_Ring_Buffer => KruhovÜ záznam jádra218 HelpText Browser_Frames => Váš prohlÃÅŸeÄ nepodporuje rámce,<br />pokraÄujte tÃmto odkazem219 log_dmesg_View_Kernel_Ring_Buffer=> Zobrazit kruhovÜ záznam jádra220 219 221 220 ## /www/cgi-bin/webif/logout.sh … … 225 224 logout_reference => Odkaz k nahlédnutÃ, viz http://httpd.apache.org/docs/1.3/howto/auth.html 226 225 227 ## /www/cgi-bin/webif/log-read_frame.sh 228 Syslog Messages => Zprávy syslogu 229 230 ## /www/cgi-bin/webif/log-read.sh 226 ## /www/cgi-bin/webif/log-read.awx 227 Syslog View => Zobrazenà záznamu syslog 228 log_read_no_messages => Neexistujà şádné záznamy syslogu. 231 229 Log => Záznam 232 230 Syslog => Syslog 233 Syslog View => Zobrazenà záznamu syslog 234 Message Prefix => PÅedpona zpráv 235 HelpText Browser_Frames => Váš prohlÃÅŸeÄ nepodporuje rámce,<br />pokraÄujte tÃmto odkazem 236 View Syslog => Zobrazit syslog 237 238 ## /www/cgi-bin/webif/log-setup.sh 231 232 ## /www/cgi-bin/webif/log-setup.awx 239 233 Remote host => VzdálenÜ poÄÃtaÄ 240 234 Remote Port => VzdálenÜ port 241 235 Minutes Between Marks => Minut mezi znaÄkami 242 236 Log Size => Velikost záznamu 237 ##duplicate Settings saved 238 ##duplicate Settings not saved 239 syslog Settings => Nastavenà pro syslog 243 240 Log => Záznam 244 241 Syslog Settings => Nastavenà pro syslogd 245 syslog Settings => Nastavenà pro syslog246 Remote Syslog => VzdálenÜ syslog247 Server IP Address => Adresa IP serveru248 ##!! $variable trouble249 ##HelpText Remote Syslog => Adresa IP a port vzdáleného logovacÃho poÄÃtaÄe. Nechcete-li pouÅŸÃt vzdálené logovánÃ, ponechte poloÅŸku prázdnou. Port je ve vÜchozÃm stavu nastaven na $DEFAULT_log_port250 HelpText Remote Syslog => Adresa IP a port vzdáleného logovacÃho poÄÃtaÄe. Nechcete-li pouÅŸÃt vzdálené logovánÃ, ponechte poloÅŸku prázdnou.251 Server Port => Port serveru252 Syslog Marks => ZnaÄky v syslogu253 Minutes Between Marks => Minut mezi znaÄkami254 ##!! $variable trouble255 ##HelpText Syslog Marks => Pravidelné znaÄky ve vaÅ¡em záznamu. Tento parametr nastavuje Äas v minutách mezi znaÄkami. Hodnota 0 znamená bez znaÄek. VÜchozà hodnota: $DEFAULT_log_mark.256 HelpText Syslog Marks => Pravidelné znaÄky ve vaÅ¡em záznamu. Tento parametr nastavuje Äas v minutách mezi znaÄkami. Hodnota 0 znamená bez znaÄek.257 Local Log => MÃstnà záznam258 Log type => Typ záznamu259 Circular => KruhovÜ260 File => Soubor261 ##!! $variable trouble262 ##HelpText Log Type => Zda bude váš záznam uloÅŸen ve vyhrazené kruhové oblasti v pamÄti nebo v souboru. Dejte pozor na to, ÅŸe soubory jsou uloÅŸeny pamÄÅ¥ovém souborovém systému, kterÜ se ztratÃ, pokud restartujete router. VÜchozà hodnota: $DEFAULT_log_type.263 HelpText Log Type => Zda bude váš záznam uloÅŸen ve vyhrazené kruhové oblasti v pamÄti nebo v souboru. Dejte pozor na to, ÅŸe soubory jsou uloÅŸeny pamÄÅ¥ovém souborovém systému, kterÜ se ztratÃ, pokud restartujete router.264 Log File => Soubor záznamu265 ##!! $variable trouble266 ##HelpText Log File => Cesta a název vaÅ¡eho souboru záznamu. Můşe bÜt nastavena do jakéhokoli zapisovatelného souborového systému. UPOZORNÄNÃ: NEPOUÅœÃVEJTE souborovÜ systém JFFS, protoÅŸe na nÄj syslog HODNÄ zapisuje. Můşete pouÅŸÃt /tmp nebo jakÜkoli souborovÜ systém na externà ukládacà jednotce. VÜchozà hodnota: $DEFAULT_log_file.267 HelpText Log File => Cesta a název vaÅ¡eho souboru záznamu. Můşe bÜt nastavena do jakéhokoli zapisovatelného souborového systému. UPOZORNÄNÃ: NEPOUÅœÃVEJTE souborovÜ systém JFFS, protoÅŸe na nÄj syslog HODNÄ zapisuje. Můşete pouÅŸÃt /tmp nebo jakÜkoli souborovÜ systém na externà ukládacà jednotce.268 Log Size => Velikost záznamu269 ##!! $variable trouble270 ##HelpText Log Size => Velikost vaÅ¡eho záznamu v kilobajtech. BuÄte opatrnà pÅi stanovenà velikosti kruhové pamÄti, protoÅŸe je o ni zmenÅ¡ena pracovnà pamÄÅ¥. VÜchozà hodnota: $DEFAULT_log_size kB.271 HelpText Log Size => Velikost vaÅ¡eho záznamu v kilobajtech. BuÄte opatrnà pÅi stanovenà velikosti kruhové pamÄti, protoÅŸe je o ni zmenÅ¡ena pracovnà pamÄÅ¥.272 242 273 243 ## /www/cgi-bin/webif/network-firewall.sh … … 469 439 qos_adv_disabled => Zakázáno 470 440 Advanced => PokroÄilé moÅŸnosti 471 HelpText Advanced => NormálnÄ uÅŸivatelům staÄà pouÅŸÃt formuláŠnÃÅŸe ke konfiguraci QoS. NÄkteÅà lidé mohou potÅebovat pÅÃstup k mnohem pokroÄilejÅ¡Ãm nastavenÃm. AlternativnÄ můşete <a href="./system-editor.sh?path=/etc/config&edit=qos">ruÄnÄ upravit konfiguraci</a 441 HelpText Advanced => NormálnÄ uÅŸivatelům staÄà pouÅŸÃt formuláŠnÃÅŸe ke konfiguraci QoS. NÄkteÅà lidé mohou potÅebovat pÅÃstup k mnohem pokroÄilejÅ¡Ãm nastavenÃm. AlternativnÄ můşete <a href="./system-editor.sh?path=/etc/config&edit=qos">ruÄnÄ upravit konfigur
