Changeset 3721


Ignorieren:
Zeitstempel:
30.09.2009 18:02:11 (vor 9 Jahren)
Autor:
oliver
Nachricht:

[freetz-stable-1.1] Merge in r3659, r3663, r3666, r3673:r3674, r3681, r3695:r3696, r3706, r3717, r3718 from trunk:

  • Add FritzBox 7112 (87.04.76)
  • Bump 7141 firmware version to 40.04.76
  • 7270 EN/A-CH: Version bump to 54.04.76
  • fix led-errormessage in fw-update process
  • remove obsolete kernel sources 04.67 and 04.70 for 7270
  • get_ip: -w (webcm query) works now from 04.33 to 04.76 firmware, -w switched back to default (refs #525)
  • fix: 7150 doesn't have minid
  • fix no_avm_exit patch for 7270
Ort:
branches/freetz-stable-1.1
Dateien:
4 gelöscht
44 bearbeitet
4 kopiert

Legende:

Unverändert
Hinzugefügt
Entfernt
  • branches/freetz-stable-1.1

  • branches/freetz-stable-1.1/CHANGELOG

    r3646 r3721  
    33Latest changes: 
    44 
    5 === Freetz-1.1-stable === 
     5=== Freetz-1.1.1 === 
    66 
    77- Build system: 
  • branches/freetz-stable-1.1/Config.in

    r3665 r3721  
    12531253        ( \ 
    12541254            FREETZ_TYPE_FON_WLAN_7141 || \ 
    1255             FREETZ_TYPE_FON_7150 || \ 
    12561255            FREETZ_TYPE_FON_WLAN_7170 || \ 
    12571256            FREETZ_TYPE_FON_WLAN_7240 || \ 
  • branches/freetz-stable-1.1/FIRMWARES

    r3646 r3721  
    1616    * Fritz!Box Fon WLAN (English, Annex B): 30.04.49 
    1717* Fritz!Box Fon WLAN 7050: 14.04.33 
     18* Fritz!Box Fon WLAN 7112: 87.04.76 
    1819* Fritz!Box Fon WLAN 7113: 60.04.68 
    1920* Fritz!Box Fon WLAN 7140: 30.04.33 
     
    2122    * Fritz!Box Fon WLAN 7140 (English, Annex B): 30.04.67 
    2223    * Fritz!Box Fon WLAN 7140 (A-CH, Annex A): 39.04.76 
    23 * Fritz!Box Fon WLAN 7141: 40.04.70 
     24* Fritz!Box Fon WLAN 7141: 40.04.76 
    2425* Fritz!Fon 7150: 38.04.71 
    2526* Fritz!Box Fon WLAN 7170 bzw. 7170 SL: 29.04.76 
     
    2930* Fritz!Box Fon WLAN 7240: 73.04.76 
    3031* Fritz!Box Fon WLAN 7270: 54.04.76 7270 v3: 74.04.76 
    31     * Fritz!Box Fon WLAN 7270 (English): 54.04.67 
    32     * Fritz!Box Fon WLAN 7270 (A-CH): 54.04.67 
     32    * Fritz!Box Fon WLAN 7270 (English): 54.04.76 
     33    * Fritz!Box Fon WLAN 7270 (A-CH): 54.04.76 
    3334* Fritz!Box WLAN 3020/SL: 09.04.34 
    3435* Fritz!Box WLAN 3030: 21.04.34 
  • branches/freetz-stable-1.1/make/avm-gpl/avm-gpl.mk

    r3646 r3721  
    1111AVM_SOURCE__04.70:=$(AVM_SITE__AVM)/fritzbox-source-files-04.70.tar.gz 
    1212AVM_SOURCE__04.76:=$(AVM_SITE__AVM_7170)/fritzbox7170-source-files-04.76.tar.gz 
    13 AVM_SOURCE__7270_04.67:=$(AVM_SITE__AVM)/fritzbox7270-source-files-04.67.tar.gz 
    14 AVM_SOURCE__7270_04.70:=$(AVM_SITE__AVM)/fritzbox7270-source-files-04.70.tar.gz 
    1513AVM_SOURCE__7270_04.76:=$(AVM_SITE__AVM_7270)/fritzbox7270-source-files-04.76.tar.gz 
    1614AVM_SOURCE__r7203:=$(AVM_SITE__TCOM)/Speedport_W501V/GPL-r7203-4mb_26-tar.bz2 
  • branches/freetz-stable-1.1/patches/196-usbstorage.sh

    r3646 r3721  
    55elif isFreetzType 3130; then 
    66    modpatch "$FILESYSTEM_MOD_DIR" "${PATCHES_DIR}/cond/usbstorage_wotam.patch" 
    7 elif isFreetzType 7141; then 
     7elif isFreetzType 7141 && isFreetzType LANG_A_CH; then 
    88        modpatch "$FILESYSTEM_MOD_DIR" "${PATCHES_DIR}/cond/usbstorage_7170_a_ch.patch" 
    99elif isFreetzType 3170 3270 7141 7150 7170 7240 7270 7270_V3; then 
  • branches/freetz-stable-1.1/patches/220-assistant.sh

    r3646 r3721  
    1919 
    2020if [ -e "$HTML_DIR/home/sitemap.html" ]; then 
    21     if isFreetzType 3270 7141 7150 7170 7240 7270 7270_V3; then 
    22         modpatch "$FILESYSTEM_MOD_DIR" "${PATCHES_DIR}/cond/de/remove_assistant_${FREETZ_TYPE_STRING}.patch" 
     21    if isFreetzType 3270 7112 7141 7150 7170 7240 7270 7270_V3; then 
     22        modpatch "$FILESYSTEM_MOD_DIR" "${PATCHES_DIR}/cond/${FREETZ_TYPE_LANG_STRING}/remove_assistant_${FREETZ_TYPE_STRING}.patch" 
    2323    elif isFreetzType 7140; then 
    2424        if isFreetzType LANG_A_CH; then 
  • branches/freetz-stable-1.1/patches/520-remove_dect.sh

    r3207 r3721  
    22echo1 "removing DECT files" 
    33for files in \ 
    4     lib/modules/2.6.19.2/kernel/drivers/isdn/avm_dect/avm_dect.ko \ 
    5     lib/modules/2.6.19.2/kernel/drivers/char/dect_io/dect_io.ko \ 
     4    bin/supportdata.dect \ 
     5    lib/modules/2.6.??.?/kernel/drivers/char/dect_io \ 
     6    lib/modules/2.6.??.?/kernel/drivers/isdn/avm_dect \ 
     7    sbin/start_dect_update.sh \ 
    68    usr/bin/dect_manager \ 
    79    usr/share/ctlmgr/libdect.so \ 
     10    $(find ${FILESYSTEM_MOD_DIR} -iwholename "*usr/www/*/html/*dect*" -printf "%P\n") \ 
    811    ; do 
    912    rm_files "${FILESYSTEM_MOD_DIR}/$files" 
    1013done 
     14[ "$FREETZ_REMOVE_MINID" == "y" ] && rm_files "${FILESYSTEM_MOD_DIR}/lib/libfoncclient.so*" 
     15 
     16echo1 "patching web UI" 
     17    sed -i -e "s/document.write(Dect.\{1,10\}(.*))//g" "${HTML_LANG_MOD_DIR}/html/de/home/home.html" 
     18    sed -i -e "/jslGoTo('dect'/d;/^<?.*[dD]ect.*?>$/d" "${HTML_LANG_MOD_DIR}/html/de/menus/menu2_konfig.html" 
     19 
     20echo1 "patching rc.S" 
     21sed -i -e "s/^modprobe dect_io$//g" "${FILESYSTEM_MOD_DIR}/etc/init.d/rc.S" 
    1122 
    1223echo1 "patching rc.conf" 
    13 sed -i -e "s/CONFIG_DECT=.*$/CONFIG_DECT=\"n\"/g" "${FILESYSTEM_MOD_DIR}/etc/init.d/rc.conf" 
     24sed -i -e "s/\(CONFIG_.*DECT.*=\).*/\1\"n\"/" "${FILESYSTEM_MOD_DIR}/etc/init.d/rc.conf" 
  • branches/freetz-stable-1.1/patches/7141/110-rc.S-mknod.patch

    r3336 r3721  
    1 --- etc/init.d/rc.S.orig    2009-04-14 14:46:28.000000000 +0200 
    2 +++ etc/init.d/rc.S 2009-04-23 07:02:21.000000000 +0200 
    3 @@ -925,6 +925,11 @@ 
     1--- etc/init.d/rc.S.orig    2009-08-18 17:25:18.000000000 +0200 
     2+++ etc/init.d/rc.S 2009-09-22 01:49:31.000000000 +0200 
     3@@ -196,6 +196,11 @@ 
    44 ######################################################################### 
    55 mknod /var/flash/voip.cfg c $tffs_major $((0x72)) 
  • branches/freetz-stable-1.1/patches/7141/140-rc.S-no_avm_exit.patch

    r3336 r3721  
    1 --- etc/init.d/rc.S.orig    2009-04-23 07:02:21.000000000 +0200 
    2 +++ etc/init.d/rc.S 2009-04-23 07:02:21.000000000 +0200 
    3 @@ -1403,4 +1403,3 @@ 
     1--- etc/init.d/rc.S.orig    2009-09-22 01:49:31.000000000 +0200 
     2+++ etc/init.d/rc.S 2009-09-22 01:49:31.000000000 +0200 
     3@@ -1474,4 +1474,3 @@ 
    44 echo AVMDBG_EOF 1 >/dev/debug 
    55 fi; 
  • branches/freetz-stable-1.1/patches/7141/290-replace_websrv-remove_igdd.patch

    r3477 r3721  
    1 --- etc/init.d/rc.net.orig  2009-04-23 07:02:21.000000000 +0200 
    2 +++ etc/init.d/rc.net   2009-04-23 07:02:21.000000000 +0200 
     1--- etc/init.d/rc.net.orig  2008-12-17 22:22:17.000000000 +0100 
     2+++ etc/init.d/rc.net   2008-12-17 22:22:17.000000000 +0100 
    33@@ -57,9 +57,25 @@ 
    44    WLAN_TEST=0 
    55 fi 
    66  
    7 +# Do we have a UPnP server (igdd) or was ist stripped from the firmware? 
    8 +_igdd=$(basename $(which igdd) 2> /dev/null) 
    9 +# Does a multid option to start without UPnP device (-u) exist? 
     7+# Do we have a UPnP server (upnpd) or was ist stripped from the firmware? 
     8+_upnpd=$(basename $(which upnpd) 2> /dev/null) 
     9+# Does a multid option to start without UPnP device (-U) exist? 
    1010+_multid_upnp=$(/sbin/multid -? 2>&1 | grep upnp) 
    1111+# Does a dsld option to start without igd (-g) exist? 
     
    1313+# Set multid "no UPnP" option, if 
    1414+#   a) it has the parameter at all AND 
    15 +#   b) igdd binary does *not* exist 
    16 +[ "$_multid_upnp" ] && [ ! "$_igdd" ] && MULTIDPARAM="$MULTIDPARAM -u" 
     15+#   b) upnpd binary does *not* exist 
     16+[ "$_multid_upnp" ] && [ ! "$_upnpd" ] && MULTIDPARAM="$MULTIDPARAM -U" 
    1717+# Set dsld "no igd" option, if 
    1818+#   a) it has the parameter at all AND 
    19 +#   b) igdd binary does *not* exist 
    20 +[ "$_dsld_upnp" ] && [ ! "$_igdd" ] && DSLDDPARAM="-g" 
     19+#   b) upnpd binary does *not* exist 
     20+[ "$_dsld_upnp" ] && [ ! "$_upnpd" ] && DSLDDPARAM="-g" 
    2121+ 
    2222  
    23  igddstart() 
     23 upnpdstart() 
    2424 { 
    25 +    [ "$_igdd" ] || return; 
    26     if [ "`pidof igdd`" = "" ] ; then 
    27        igdd $VERBOSEPARAM 
     25+    [ "$_upnpd" ] || return; 
     26    if [ "`pidof upnpd`" = "" ] ; then 
     27       upnpd $VERBOSEPARAM 
    2828       sleep 1 
    2929@@ -285,9 +301,9 @@ 
  • branches/freetz-stable-1.1/patches/7141/301-remove_smbd.patch

    r3336 r3721  
    1 --- etc/init.d/rc.net.orig  2009-04-23 07:02:21.000000000 +0200 
    2 +++ etc/init.d/rc.net   2009-04-23 07:02:21.000000000 +0200 
    3 @@ -14,6 +14,8 @@ 
    4  PKG=dnsmasq 
    5  BASE=/mod/pkg/$PKG 
    6  PATH=$BASE/usr/lib/$PKG/bin:$PATH 
     1--- etc/init.d/rc.net.orig  2009-09-22 01:52:59.000000000 +0200 
     2+++ etc/init.d/rc.net   2009-09-22 01:52:59.000000000 +0200 
     3@@ -71,6 +71,8 @@ 
     4 #   a) it has the parameter at all AND 
     5 #   b) upnpd binary does *not* exist 
     6 [ "$_dsld_upnp" ] && [ ! "$_upnpd" ] && DSLDDPARAM="-g" 
    77+# Do we have a Samba server (smbd) or was ist stripped from the firmware? 
    88+_smbd=$(basename $(which smbd) 2> /dev/null) 
    99  
    10  case "`uname -r`" in 
    11    2.6* ) KERNEL_26=yes; ;; 
    12 @@ -316,6 +318,7 @@ 
     10  
     11 upnpdstart() 
     12@@ -323,6 +325,7 @@ 
    1313 #we have the samba cfg in /var, so crate them there 
    1414 sambastart() 
  • branches/freetz-stable-1.1/patches/7141/de/130-foncalls.patch

    r3557 r3721  
    1 --- usr/www/all/html/de/home/foncalls.js.orig   2009-04-14 14:46:17.000000000 +0200 
    2 +++ usr/www/all/html/de/home/foncalls.js    2009-04-23 07:02:22.000000000 +0200 
    3 @@ -298,17 +298,17 @@ 
     1--- usr/www/all/html/de/home/foncalls.js.orig   2009-08-18 17:25:23.000000000 +0200 
     2+++ usr/www/all/html/de/home/foncalls.js    2009-09-22 01:52:59.000000000 +0200 
     3@@ -301,17 +301,17 @@ 
    44 var buchname = GetBuchName(name); 
    55 var buchnrtype = GetBuchNumberType(telbooknumbertyp); 
  • branches/freetz-stable-1.1/patches/7141/de/190-webmenu.patch

    r3077 r3721  
    1 --- usr/www/all/html/de/menus/menu2_homehome.html.orig  2008-11-12 17:00:51.000000000 +0100 
    2 +++ usr/www/all/html/de/menus/menu2_homehome.html   2008-11-15 19:13:34.000000000 +0100 
    3 @@ -56,5 +56,6 @@ 
     1--- usr/www/all/html/de/menus/menu2_homehome.html.orig  2009-08-18 17:24:55.000000000 +0200 
     2+++ usr/www/all/html/de/menus/menu2_homehome.html   2009-09-22 01:53:00.000000000 +0200 
     3@@ -59,5 +59,6 @@ 
    44 <? if eq $var:pagename energy `<? setvariable var:classname 'LStatusMenuitemaktivTop' ?>` ?> 
    55 <? if eq $var:pagename ecosettings `<? setvariable var:classname 'LStatusMenuitemaktivTop' ?>` ?> 
     
    88 <li class="LMenubottom">&nbsp;</li> 
    99 </ul> 
    10 --- usr/www/all/html/de/menus/menu2_konfig.html.orig    2008-11-12 17:00:41.000000000 +0100 
    11 +++ usr/www/all/html/de/menus/menu2_konfig.html 2008-11-15 19:13:34.000000000 +0100 
     10--- usr/www/all/html/de/menus/menu2_konfig.html.orig    2009-08-18 17:25:21.000000000 +0200 
     11+++ usr/www/all/html/de/menus/menu2_konfig.html 2009-09-22 01:53:00.000000000 +0200 
    1212@@ -66,5 +66,6 @@ 
    1313 <li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="../html/de/images/leer.gif" style="width:7px;"><a href="javascript:jslGoTo('software','extern')">Programme</a><span class="PTextOnly">Programme</span></li> 
  • branches/freetz-stable-1.1/patches/7141/de/210-notmountable.patch

    r3336 r3721  
    1 --- usr/www/all/html/de/home/home.js.orig   2009-04-14 14:46:08.000000000 +0200 
    2 +++ usr/www/all/html/de/home/home.js    2009-04-23 07:03:51.000000000 +0200 
    3 @@ -671,14 +671,13 @@ 
     1--- usr/www/all/html/de/home/home.js.orig   2009-08-18 17:25:05.000000000 +0200 
     2+++ usr/www/all/html/de/home/home.js    2009-09-22 01:53:00.000000000 +0200 
     3@@ -714,14 +714,13 @@ 
    44 var nPartTotal = Number("<? query ctlusb:settings/storage-part-total ?>"); 
    55 if (isNaN(nPartTotal)) nPartTotal = 0; 
  • branches/freetz-stable-1.1/patches/7270/110-rc.S-mknod.patch

    r3133 r3721  
    1 --- etc/init.d/rc.S.orig    2009-02-25 10:41:49.000000000 +0100 
    2 +++ etc/init.d/rc.S 2009-02-27 09:02:47.000000000 +0100 
    3 @@ -947,6 +947,11 @@ 
     1--- etc/init.d/rc.S.orig    2009-09-17 09:18:48.078288387 +0200 
     2+++ etc/init.d/rc.S 2009-09-17 09:18:48.222750066 +0200 
     3@@ -217,6 +217,11 @@ 
    44 ######################################################################### 
    55 mknod /var/flash/voip.cfg c $tffs_major $((0x72)) 
  • branches/freetz-stable-1.1/patches/7270/140-rc.S-no_avm_exit.patch

    r3133 r3721  
    1 --- etc/init.d/rc.S.orig    2009-02-27 09:02:47.000000000 +0100 
    2 +++ etc/init.d/rc.S 2009-02-27 09:02:47.000000000 +0100 
    3 @@ -1480,4 +1480,3 @@ 
     1--- etc/init.d/rc.S.orig        2009-09-29 12:58:29.000000000 +0200 
     2+++ etc/init.d/rc.S     2009-09-29 13:17:50.000000000 +0200 
     3@@ -1534,4 +1534,3 @@ 
    44 echo "$0[$$]: trigger: msgsend ctlmgr check-plugins" 
    55 msgsend ctlmgr check-plugins 
  • branches/freetz-stable-1.1/patches/7270/a-ch/130-foncalls.patch

    r3557 r3721  
    1 --- usr/www/avme/html/de/home/foncalls.js.orig  2008-11-10 16:02:17.000000000 +0100 
    2 +++ usr/www/avme/html/de/home/foncalls.js   2008-11-12 09:31:09.000000000 +0100 
    3 @@ -218,17 +218,17 @@ 
     1--- usr/www/avme/html/de/home/foncalls.js.orig  2009-09-15 15:26:24.000000000 +0200 
     2+++ usr/www/avme/html/de/home/foncalls.js   2009-09-16 22:29:37.000000000 +0200 
     3@@ -307,17 +307,17 @@ 
    44 var buchname = GetBuchName(name); 
    55 var buchnrtype = GetBuchNumberType(telbooknumbertyp); 
  • branches/freetz-stable-1.1/patches/7270/a-ch/190-webmenu.patch

    r3054 r3721  
    1 --- usr/www/avme/html/de/menus/menu2_homehome.html.orig 2008-10-28 13:12:45.000000000 +0100 
    2 +++ usr/www/avme/html/de/menus/menu2_homehome.html  2008-11-02 13:59:10.000000000 +0100 
    3 @@ -56,5 +56,6 @@ 
     1--- usr/www/avme/html/de/menus/menu2_homehome.html.orig 2009-09-15 15:26:20.000000000 +0200 
     2+++ usr/www/avme/html/de/menus/menu2_homehome.html  2009-09-16 22:29:37.000000000 +0200 
     3@@ -59,5 +59,6 @@ 
    44 <? if eq $var:pagename energy `<? setvariable var:classname 'LStatusMenuitemaktivTop' ?>` ?> 
    55 <? if eq $var:pagename ecosettings `<? setvariable var:classname 'LStatusMenuitemaktivTop' ?>` ?> 
     
    88 <li class="LMenubottom">&nbsp;</li> 
    99 </ul> 
    10 --- usr/www/avme/html/de/menus/menu2_konfig.html.orig   2008-10-28 13:12:52.000000000 +0100 
    11 +++ usr/www/avme/html/de/menus/menu2_konfig.html    2008-11-02 13:59:10.000000000 +0100 
    12 @@ -75,5 +75,6 @@ 
    13  <li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="../html/de/images/leer.gif" style="width:7px;"><a href="javascript:jslGoTo('software','extern')">{?de.menus.menu2_konfig.html:245?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:250?}</span></li> 
     10--- usr/www/avme/html/de/menus/menu2_konfig.html.orig   2009-09-15 15:26:21.000000000 +0200 
     11+++ usr/www/avme/html/de/menus/menu2_konfig.html    2009-09-16 22:29:37.000000000 +0200 
     12@@ -80,5 +80,6 @@ 
     13 <li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="../html/de/images/leer.gif" style="width:7px;"><a href="javascript:jslGoTo('software','extern')">{?txtPrograms?}</a><span class="PTextOnly">{?txtPrograms?}</span></li> 
    1414 ` ?> 
    1515 ` ?> 
  • branches/freetz-stable-1.1/patches/7270/a-ch/200-sperre1.patch

    r3054 r3721  
    1 --- usr/www/avme/html/de/fon/sperre1.js.orig    2008-08-15 12:02:19.000000000 +0200 
    2 +++ usr/www/avme/html/de/fon/sperre1.js 2008-08-15 12:06:00.000000000 +0200 
    3 @@ -69,7 +69,7 @@ 
     1--- usr/www/avme/html/de/fon/sperre1.js.orig    2009-09-15 15:26:16.000000000 +0200 
     2+++ usr/www/avme/html/de/fon/sperre1.js 2009-09-16 22:29:37.000000000 +0200 
     3@@ -68,7 +68,7 @@ 
    44 var nummer=""; 
    55 if (jslGetValue("uiViewBereichIncoming") == "") 
     
    1010 if (x != "") { 
    1111 if (jslGetValue("uiPostInAction"+x) == "1") { 
    12 @@ -162,7 +162,7 @@ 
     12@@ -161,7 +161,7 @@ 
    1313 } 
    1414 } else { 
  • branches/freetz-stable-1.1/patches/7270/a-ch/210-notmountable.patch

    r3054 r3721  
    1 --- usr/www/avme/html/de/home/home.js   2008-12-21 23:09:50.000000000 +0100 
    2 +++ usr/www/avme/html/de/home/home.js   2008-12-21 23:37:35.000000000 +0100 
    3 @@ -697,12 +697,6 @@ 
    4  if (isNaN(nStor)) nStor = 0; 
     1--- usr/www/avme/html/de/home/home.js.orig  2009-09-15 15:26:15.000000000 +0200 
     2+++ usr/www/avme/html/de/home/home.js   2009-09-16 19:26:35.000000000 +0200 
     3@@ -802,15 +802,13 @@ 
    54 var nPartTotal = Number("<? query ctlusb:settings/storage-part-total ?>"); 
    6  if (isNaN(nStor)) nPartTotal = 0; 
     5 if (isNaN(nPartTotal)) nPartTotal = 0; 
     6 var unplugOk = parseInt("<? query ctlusb:settings/unplug-ok ?>", 10) == 1; 
    77-if (nPartTotal > nStor) { 
    8 -var str=""; 
    9 -str += "{?de.home.home.js:5308?} "; 
    10 -str += "<a href=\"javascript:jslGoTo('home', 'syslog');\">{?de.home.home.js:3744?}</a>"; 
    11 -return str.fontcolor("#cc0000"); 
    12 -} 
    13  var strArr = new Array(); 
    14  if (nUsb == 0) 
    15  { 
    16 @@ -711,6 +705,7 @@ 
    17  strArr.push(g_usbConnected); 
    18  return strArr.join(" "); 
     8+if (nPartTotal > 0) { 
     9 var strStor = ""; 
     10 if (unplugOk) { 
     11 strStor = "{?de.home.home.js:912?}"; 
    1912 } 
    20 +strArr.push("Es wurden " + nStor + " von " + nPartTotal + " Partitionen eingebunden."); 
    21  <? if eq '<? query aura:settings/enabled ?>' '1' ` 
    22  <? multiquery aura:settings/device/list(class,manufacturer,comment,client) ` 
    23  var strAura = UsbDeviceName("<? query aura:settings/$11 ?>", "$13","$14","$12"); 
     13 else { 
     14-strStor = "{?de.home.home.js:5308?} "; 
     15-strStor += "<a href=\"javascript:jslGoTo('home', 'syslog');\">{?de.home.home.js:3744?}</a>"; 
     16-strStor = strStor.fontcolor("#cc0000"); 
     17+strStor = "Es wurden " + nStor + " von " + nPartTotal + " Partitionen eingebunden."; 
     18 } 
     19 strArr.push(strStor); 
     20 } 
  • branches/freetz-stable-1.1/patches/7270/a-ch/290-replace_websrv-remove_igdd.patch

    r3477 r3721  
    1 --- etc/init.d/rc.net.orig  2009-06-28 13:42:56.000000000 +0000 
    2 +++ etc/init.d/rc.net   2009-06-28 13:42:57.000000000 +0000 
     1--- etc/init.d/rc.net.orig  2008-12-17 22:22:17.000000000 +0100 
     2+++ etc/init.d/rc.net   2008-12-17 22:22:17.000000000 +0100 
    33@@ -57,9 +57,25 @@ 
    44    WLAN_TEST=0 
    55 fi 
    66  
    7 +# Do we have a UPnP server (igdd) or was ist stripped from the firmware? 
    8 +_igdd=$(basename $(which igdd) 2> /dev/null) 
    9 +# Does a multid option to start without UPnP device (-u) exist? 
     7+# Do we have a UPnP server (upnpd) or was ist stripped from the firmware? 
     8+_upnpd=$(basename $(which upnpd) 2> /dev/null) 
     9+# Does a multid option to start without UPnP device (-U) exist? 
    1010+_multid_upnp=$(/sbin/multid -? 2>&1 | grep upnp) 
    1111+# Does a dsld option to start without igd (-g) exist? 
     
    1313+# Set multid "no UPnP" option, if 
    1414+#   a) it has the parameter at all AND 
    15 +#   b) igdd binary does *not* exist 
    16 +[ "$_multid_upnp" ] && [ ! "$_igdd" ] && MULTIDPARAM="-u" 
     15+#   b) upnpd binary does *not* exist 
     16+[ "$_multid_upnp" ] && [ ! "$_upnpd" ] && MULTIDPARAM="$MULTIDPARAM -U" 
    1717+# Set dsld "no igd" option, if 
    1818+#   a) it has the parameter at all AND 
    19 +#   b) igdd binary does *not* exist 
    20 +[ "$_dsld_upnp" ] && [ ! "$_igdd" ] && DSLDDPARAM="-g" 
     19+#   b) upnpd binary does *not* exist 
     20+[ "$_dsld_upnp" ] && [ ! "$_upnpd" ] && DSLDDPARAM="-g" 
    2121+ 
    2222  
    23  igddstart() 
     23 upnpdstart() 
    2424 { 
    25 +    [ "$_igdd" ] || return; 
    26     if [ "`pidof igdd`" = "" ] ; then 
    27        igdd $VERBOSEPARAM 
     25+    [ "$_upnpd" ] || return; 
     26    if [ "`pidof upnpd`" = "" ] ; then 
     27       upnpd $VERBOSEPARAM 
    2828       sleep 1 
    29 @@ -279,9 +295,9 @@ 
     29@@ -285,9 +301,9 @@ 
    3030    if [ "$CONFIG_DSL" ] ; then 
    3131      if [ "`pidof dsld`" = "" ] ; then 
  • branches/freetz-stable-1.1/patches/7270/a-ch/301-remove_smbd.patch

    r3477 r3721  
    1 --- etc/init.d/rc.net.orig  2009-06-28 13:42:57.000000000 +0000 
    2 +++ etc/init.d/rc.net   2009-06-28 13:42:57.000000000 +0000 
     1--- etc/init.d/rc.net.orig  2009-09-17 09:18:48.439250721 +0200 
     2+++ etc/init.d/rc.net   2009-09-17 09:18:48.463248832 +0200 
    33@@ -71,6 +71,8 @@ 
    44 #   a) it has the parameter at all AND 
    5  #   b) igdd binary does *not* exist 
    6  [ "$_dsld_upnp" ] && [ ! "$_igdd" ] && DSLDDPARAM="-g" 
     5 #   b) upnpd binary does *not* exist 
     6 [ "$_dsld_upnp" ] && [ ! "$_upnpd" ] && DSLDDPARAM="-g" 
    77+# Do we have a Samba server (smbd) or was ist stripped from the firmware? 
    88+_smbd=$(basename $(which smbd) 2> /dev/null) 
    99  
    1010  
    11  igddstart() 
    12 @@ -310,6 +312,7 @@ 
     11 upnpdstart() 
     12@@ -323,6 +325,7 @@ 
    1313 #we have the samba cfg in /var, so crate them there 
    1414 sambastart() 
  • branches/freetz-stable-1.1/patches/7270/a-ch/400_remove_ftpd.patch

    r3477 r3721  
    1 --- etc/hotplug/storage.orig    2009-01-28 14:58:39.000000000 +0000 
    2 +++ etc/hotplug/storage 2009-06-28 13:42:57.000000000 +0000 
    3 @@ -12,6 +12,10 @@ 
    4  FIRST=$6 
     1--- etc/hotplug/storage.orig    2009-09-17 09:18:48.102286500 +0200 
     2+++ etc/hotplug/storage 2009-09-17 09:18:48.507250450 +0200 
     3@@ -14,6 +14,10 @@ 
    54 MSTART=/sbin/start_mediasrv 
    65 MSTOP=/sbin/stop_mediasrv 
     6 WEBDAVCONTROL=/etc/webdav_control 
    77+ 
    88+# Do we have a Ftp server (ftpd) or was ist stripped from the firmware? 
     
    1212 wait4remove () { 
    1313 local COUNT=0 
    14 @@ -139,6 +143,7 @@ 
     14@@ -183,6 +187,7 @@ 
    1515 ## ftp server control 
    16  ENABLED=`echo usbhost.ftp_server_enabled|ar7cfgctl -s` 
     16 ENABLED=`echo usbhost.ftp_server_enabled|usbcfgctl -s` 
    1717 if [ "$ENABLED" != "no" ] ; then 
    1818+if [ "$_ftpd" ] ; then 
     
    2020 inetdctl enable ftpd 
    2121 else 
    22 @@ -155,6 +160,7 @@ 
     22@@ -199,6 +204,7 @@ 
    2323 ftpd -D -q $READONLYOPTION -t 120 -m 15 $USERSOPTION -h "$CONFIG_PRODUKT_NAME" & 
    2424 fi 
     
    2828 if test -x /bin/inetdctl ; then 
    2929 inetdctl disable ftpd 
    30 --- etc/hotplug/run_mount.orig  2009-01-28 14:58:35.000000000 +0000 
    31 +++ etc/hotplug/run_mount   2009-06-28 13:42:57.000000000 +0000 
    32 @@ -15,6 +15,10 @@ 
    33  MSTART=/sbin/start_mediasrv 
     30--- etc/hotplug/run_mount.orig  2009-09-17 09:18:48.102286500 +0200 
     31+++ etc/hotplug/run_mount   2009-09-17 09:18:48.507250450 +0200 
     32@@ -16,6 +16,10 @@ 
     33 WEBDAVCONTROL=/etc/webdav_control 
    3434 TR069START=/bin/tr069starter 
    3535 SYSFS=/var/sysfs 
     
    4141 nicename () { 
    4242 ## Find device's strings, remove/translate evil chars... 
    43 @@ -114,6 +118,7 @@ 
     43@@ -115,6 +119,7 @@ 
    4444 eventadd 140 $MNTNAME 
    45  ENABLED=`echo usbhost.ftp_server_enabled|ar7cfgctl -s` 
     45 ENABLED=`echo usbhost.ftp_server_enabled|usbcfgctl -s` 
    4646 if [ "$ENABLED" != "no" ] ; then 
    4747+if [ "$_ftpd" ] ; then 
     
    4949 inetdctl enable ftpd 
    5050 else 
    51 @@ -133,6 +138,7 @@ 
     51@@ -134,6 +139,7 @@ 
    5252 fi 
    5353 fi 
  • branches/freetz-stable-1.1/patches/7270/en/130-foncalls.patch

    r3557 r3721  
    1 --- usr/www/avme/html/de/home/foncalls.js.orig  2008-11-10 16:02:17.000000000 +0100 
    2 +++ usr/www/avme/html/de/home/foncalls.js   2008-11-12 09:31:09.000000000 +0100 
    3 @@ -218,17 +218,17 @@ 
     1--- usr/www/avme/html/de/home/foncalls.js.orig  2009-09-15 15:26:24.000000000 +0200 
     2+++ usr/www/avme/html/de/home/foncalls.js   2009-09-16 19:22:16.000000000 +0200 
     3@@ -307,17 +307,17 @@ 
    44 var buchname = GetBuchName(name); 
    55 var buchnrtype = GetBuchNumberType(telbooknumbertyp); 
  • branches/freetz-stable-1.1/patches/7270/en/190-webmenu.patch

    r3054 r3721  
    1 --- usr/www/avme/html/de/menus/menu2_homehome.html.orig 2008-10-28 13:12:45.000000000 +0100 
    2 +++ usr/www/avme/html/de/menus/menu2_homehome.html  2008-11-02 13:59:10.000000000 +0100 
    3 @@ -56,5 +56,6 @@ 
     1--- usr/www/avme/html/de/menus/menu2_homehome.html.orig 2009-09-15 15:26:20.000000000 +0200 
     2+++ usr/www/avme/html/de/menus/menu2_homehome.html  2009-09-16 19:22:16.000000000 +0200 
     3@@ -59,5 +59,6 @@ 
    44 <? if eq $var:pagename energy `<? setvariable var:classname 'LStatusMenuitemaktivTop' ?>` ?> 
    55 <? if eq $var:pagename ecosettings `<? setvariable var:classname 'LStatusMenuitemaktivTop' ?>` ?> 
     
    88 <li class="LMenubottom">&nbsp;</li> 
    99 </ul> 
    10 --- usr/www/avme/html/de/menus/menu2_konfig.html.orig   2008-10-28 13:12:52.000000000 +0100 
    11 +++ usr/www/avme/html/de/menus/menu2_konfig.html    2008-11-02 13:59:10.000000000 +0100 
    12 @@ -75,5 +75,6 @@ 
    13  <li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="../html/de/images/leer.gif" style="width:7px;"><a href="javascript:jslGoTo('software','extern')">{?de.menus.menu2_konfig.html:245?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:250?}</span></li> 
     10--- usr/www/avme/html/de/menus/menu2_konfig.html.orig   2009-09-15 15:26:21.000000000 +0200 
     11+++ usr/www/avme/html/de/menus/menu2_konfig.html    2009-09-16 19:22:16.000000000 +0200 
     12@@ -80,5 +80,6 @@ 
     13 <li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="../html/de/images/leer.gif" style="width:7px;"><a href="javascript:jslGoTo('software','extern')">{?txtPrograms?}</a><span class="PTextOnly">{?txtPrograms?}</span></li> 
    1414 ` ?> 
    1515 ` ?> 
  • branches/freetz-stable-1.1/patches/7270/en/200-sperre1.patch

    r3054 r3721  
    1 --- usr/www/avme/html/de/fon/sperre1.js.orig    2008-08-15 12:02:19.000000000 +0200 
    2 +++ usr/www/avme/html/de/fon/sperre1.js 2008-08-15 12:06:00.000000000 +0200 
    3 @@ -69,7 +69,7 @@ 
     1--- usr/www/avme/html/de/fon/sperre1.js.orig    2009-09-15 15:26:16.000000000 +0200 
     2+++ usr/www/avme/html/de/fon/sperre1.js 2009-09-16 19:22:16.000000000 +0200 
     3@@ -68,7 +68,7 @@ 
    44 var nummer=""; 
    55 if (jslGetValue("uiViewBereichIncoming") == "") 
     
    1010 if (x != "") { 
    1111 if (jslGetValue("uiPostInAction"+x) == "1") { 
    12 @@ -162,7 +162,7 @@ 
     12@@ -161,7 +161,7 @@ 
    1313 } 
    1414 } else { 
  • branches/freetz-stable-1.1/patches/7270/en/210-notmountable.patch

    r3054 r3721  
    1 --- usr/www/avme/html/de/home/home.js   2008-12-21 23:09:50.000000000 +0100 
    2 +++ usr/www/avme/html/de/home/home.js   2008-12-21 23:37:35.000000000 +0100 
    3 @@ -697,12 +697,6 @@ 
    4  if (isNaN(nStor)) nStor = 0; 
     1--- usr/www/avme/html/de/home/home.js.orig  2009-09-15 15:26:15.000000000 +0200 
     2+++ usr/www/avme/html/de/home/home.js   2009-09-16 19:26:35.000000000 +0200 
     3@@ -802,15 +802,13 @@ 
    54 var nPartTotal = Number("<? query ctlusb:settings/storage-part-total ?>"); 
    6  if (isNaN(nStor)) nPartTotal = 0; 
     5 if (isNaN(nPartTotal)) nPartTotal = 0; 
     6 var unplugOk = parseInt("<? query ctlusb:settings/unplug-ok ?>", 10) == 1; 
    77-if (nPartTotal > nStor) { 
    8 -var str=""; 
    9 -str += "{?de.home.home.js:5308?} "; 
    10 -str += "<a href=\"javascript:jslGoTo('home', 'syslog');\">{?de.home.home.js:3744?}</a>"; 
    11 -return str.fontcolor("#cc0000"); 
    12 -} 
    13  var strArr = new Array(); 
    14  if (nUsb == 0) 
    15  { 
    16 @@ -711,6 +705,7 @@ 
    17  strArr.push(g_usbConnected); 
    18  return strArr.join(" "); 
     8+if (nPartTotal > 0) { 
     9 var strStor = ""; 
     10 if (unplugOk) { 
     11 strStor = "{?de.home.home.js:912?}"; 
    1912 } 
    20 +strArr.push("Es wurden " + nStor + " von " + nPartTotal + " Partitionen eingebunden."); 
    21  <? if eq '<? query aura:settings/enabled ?>' '1' ` 
    22  <? multiquery aura:settings/device/list(class,manufacturer,comment,client) ` 
    23  var strAura = UsbDeviceName("<? query aura:settings/$11 ?>", "$13","$14","$12"); 
     13 else { 
     14-strStor = "{?de.home.home.js:5308?} "; 
     15-strStor += "<a href=\"javascript:jslGoTo('home', 'syslog');\">{?de.home.home.js:3744?}</a>"; 
     16-strStor = strStor.fontcolor("#cc0000"); 
     17+strStor = nStor + " of " + nPartTotal + " partitions mounted."; 
     18 } 
     19 strArr.push(strStor); 
     20 } 
  • branches/freetz-stable-1.1/patches/7270/en/290-replace_websrv-remove_igdd.patch

    r3477 r3721  
    1 --- etc/init.d/rc.net.orig  2009-06-28 13:43:33.000000000 +0000 
    2 +++ etc/init.d/rc.net   2009-06-28 13:43:34.000000000 +0000 
     1--- etc/init.d/rc.net.orig  2008-12-17 22:22:17.000000000 +0100 
     2+++ etc/init.d/rc.net   2008-12-17 22:22:17.000000000 +0100 
    33@@ -57,9 +57,25 @@ 
    44    WLAN_TEST=0 
    55 fi 
    66  
    7 +# Do we have a UPnP server (igdd) or was ist stripped from the firmware? 
    8 +_igdd=$(basename $(which igdd) 2> /dev/null) 
    9 +# Does a multid option to start without UPnP device (-u) exist? 
     7+# Do we have a UPnP server (upnpd) or was ist stripped from the firmware? 
     8+_upnpd=$(basename $(which upnpd) 2> /dev/null) 
     9+# Does a multid option to start without UPnP device (-U) exist? 
    1010+_multid_upnp=$(/sbin/multid -? 2>&1 | grep upnp) 
    1111+# Does a dsld option to start without igd (-g) exist? 
     
    1313+# Set multid "no UPnP" option, if 
    1414+#   a) it has the parameter at all AND 
    15 +#   b) igdd binary does *not* exist 
    16 +[ "$_multid_upnp" ] && [ ! "$_igdd" ] && MULTIDPARAM="$MULTIDPARAM -u" 
     15+#   b) upnpd binary does *not* exist 
     16+[ "$_multid_upnp" ] && [ ! "$_upnpd" ] && MULTIDPARAM="$MULTIDPARAM -U" 
    1717+# Set dsld "no igd" option, if 
    1818+#   a) it has the parameter at all AND 
    19 +#   b) igdd binary does *not* exist 
    20 +[ "$_dsld_upnp" ] && [ ! "$_igdd" ] && DSLDDPARAM="-g" 
     19+#   b) upnpd binary does *not* exist 
     20+[ "$_dsld_upnp" ] && [ ! "$_upnpd" ] && DSLDDPARAM="-g" 
    2121+ 
    2222  
    23  igddstart() 
     23 upnpdstart() 
    2424 { 
    25 +    [ "$_igdd" ] || return; 
    26     if [ "`pidof igdd`" = "" ] ; then 
    27        igdd $VERBOSEPARAM 
     25+    [ "$_upnpd" ] || return; 
     26    if [ "`pidof upnpd`" = "" ] ; then 
     27       upnpd $VERBOSEPARAM 
    2828       sleep 1 
    29 @@ -279,9 +295,9 @@ 
     29@@ -285,9 +301,9 @@ 
    3030    if [ "$CONFIG_DSL" ] ; then 
    3131      if [ "`pidof dsld`" = "" ] ; then 
  • branches/freetz-stable-1.1/patches/7270/en/301-remove_smbd.patch

    r3477 r3721  
    1 --- etc/init.d/rc.net.orig  2009-06-28 13:43:34.000000000 +0000 
    2 +++ etc/init.d/rc.net   2009-06-28 13:43:34.000000000 +0000 
     1--- etc/init.d/rc.net.orig  2009-09-17 09:19:26.070752150 +0200 
     2+++ etc/init.d/rc.net   2009-09-17 09:19:26.090752800 +0200 
    33@@ -71,6 +71,8 @@ 
    44 #   a) it has the parameter at all AND 
    5  #   b) igdd binary does *not* exist 
    6  [ "$_dsld_upnp" ] && [ ! "$_igdd" ] && DSLDDPARAM="-g" 
     5 #   b) upnpd binary does *not* exist 
     6 [ "$_dsld_upnp" ] && [ ! "$_upnpd" ] && DSLDDPARAM="-g" 
    77+# Do we have a Samba server (smbd) or was ist stripped from the firmware? 
    88+_smbd=$(basename $(which smbd) 2> /dev/null) 
    99  
    1010  
    11  igddstart() 
    12 @@ -310,6 +312,7 @@ 
     11 upnpdstart() 
     12@@ -323,6 +325,7 @@ 
    1313 #we have the samba cfg in /var, so crate them there 
    1414 sambastart() 
  • branches/freetz-stable-1.1/patches/7270/en/400_remove_ftpd.patch

    r3477 r3721  
    1 --- etc/hotplug/storage.orig    2009-01-28 14:58:39.000000000 +0000 
    2 +++ etc/hotplug/storage 2009-06-28 13:43:34.000000000 +0000 
    3 @@ -12,6 +12,10 @@ 
    4  FIRST=$6 
     1--- etc/hotplug/storage.orig    2009-09-17 09:19:25.834752395 +0200 
     2+++ etc/hotplug/storage 2009-09-17 09:19:26.130752754 +0200 
     3@@ -14,6 +14,10 @@ 
    54 MSTART=/sbin/start_mediasrv 
    65 MSTOP=/sbin/stop_mediasrv 
     6 WEBDAVCONTROL=/etc/webdav_control 
    77+ 
    88+# Do we have a Ftp server (ftpd) or was ist stripped from the firmware? 
     
    1212 wait4remove () { 
    1313 local COUNT=0 
    14 @@ -139,6 +143,7 @@ 
     14@@ -183,6 +187,7 @@ 
    1515 ## ftp server control 
    16  ENABLED=`echo usbhost.ftp_server_enabled|ar7cfgctl -s` 
     16 ENABLED=`echo usbhost.ftp_server_enabled|usbcfgctl -s` 
    1717 if [ "$ENABLED" != "no" ] ; then 
    1818+if [ "$_ftpd" ] ; then 
     
    2020 inetdctl enable ftpd 
    2121 else 
    22 @@ -155,6 +160,7 @@ 
     22@@ -199,6 +204,7 @@ 
    2323 ftpd -D -q $READONLYOPTION -t 120 -m 15 $USERSOPTION -h "$CONFIG_PRODUKT_NAME" & 
    2424 fi 
     
    2828 if test -x /bin/inetdctl ; then 
    2929 inetdctl disable ftpd 
    30 --- etc/hotplug/run_mount.orig  2009-01-28 14:58:35.000000000 +0000 
    31 +++ etc/hotplug/run_mount   2009-06-28 13:43:34.000000000 +0000 
    32 @@ -15,6 +15,10 @@ 
    33  MSTART=/sbin/start_mediasrv 
     30--- etc/hotplug/run_mount.orig  2009-09-17 09:19:25.834752395 +0200 
     31+++ etc/hotplug/run_mount   2009-09-17 09:19:26.130752754 +0200 
     32@@ -16,6 +16,10 @@ 
     33 WEBDAVCONTROL=/etc/webdav_control 
    3434 TR069START=/bin/tr069starter 
    3535 SYSFS=/var/sysfs 
     
    4141 nicename () { 
    4242 ## Find device's strings, remove/translate evil chars... 
    43 @@ -114,6 +118,7 @@ 
     43@@ -115,6 +119,7 @@ 
    4444 eventadd 140 $MNTNAME 
    45  ENABLED=`echo usbhost.ftp_server_enabled|ar7cfgctl -s` 
     45 ENABLED=`echo usbhost.ftp_server_enabled|usbcfgctl -s` 
    4646 if [ "$ENABLED" != "no" ] ; then 
    4747+if [ "$_ftpd" ] ; then 
     
    4949 inetdctl enable ftpd 
    5050 else 
    51 @@ -133,6 +138,7 @@ 
     51@@ -134,6 +139,7 @@ 
    5252 fi 
    5353 fi 
  • branches/freetz-stable-1.1/patches/7270_labor_core/de/301-remove_smbd.patch

    r3581 r3721  
    1 --- etc/init.d/rc.net.orig  2009-08-16 16:14:56.311828627 +0200 
    2 +++ etc/init.d/rc.net   2009-08-16 16:14:56.335826970 +0200 
     1--- etc/init.d/rc.net.orig  2009-09-16 11:54:11.866914469 +0200 
     2+++ etc/init.d/rc.net   2009-09-16 11:54:11.886921348 +0200 
    33@@ -71,6 +71,8 @@ 
    44 #   a) it has the parameter at all AND 
     
    1010  
    1111 upnpdstart() 
    12 @@ -316,6 +318,7 @@ 
     12@@ -323,6 +325,7 @@ 
    1313 #we have the samba cfg in /var, so crate them there 
    1414 sambastart() 
  • branches/freetz-stable-1.1/patches/7270_v3_labor_core/de/301-remove_smbd.patch

    r3581 r3721  
    1 --- etc/init.d/rc.net.orig  2009-08-16 16:14:56.311828627 +0200 
    2 +++ etc/init.d/rc.net   2009-08-16 16:14:56.335826970 +0200 
     1--- etc/init.d/rc.net.orig  2009-09-16 11:47:49.198416145 +0200 
     2+++ etc/init.d/rc.net   2009-09-16 11:47:49.226423078 +0200 
    33@@ -71,6 +71,8 @@ 
    44 #   a) it has the parameter at all AND 
     
    1010  
    1111 upnpdstart() 
    12 @@ -316,6 +318,7 @@ 
     12@@ -323,6 +325,7 @@ 
    1313 #we have the samba cfg in /var, so crate them there 
    1414 sambastart() 
  • branches/freetz-stable-1.1/patches/cond/a-ch/remove_assistant_7270.patch

    r3077 r3721  
    1 --- usr/www/avme/html/de/home/sitemap.html.orig 2009-01-28 15:58:34.000000000 +0100 
    2 +++ usr/www/avme/html/de/home/sitemap.html  2009-02-15 23:51:30.000000000 +0100 
     1--- usr/www/avme/html/de/home/sitemap.html.orig 2009-09-15 15:26:29.000000000 +0200 
     2+++ usr/www/avme/html/de/home/sitemap.html  2009-09-16 22:28:31.000000000 +0200 
    33@@ -24,19 +24,6 @@ 
    44 <p class="ml10"><a href="javascript:jslGoTo('home', 'syslog');">{?de.home.sitemap.html:9348?}</a></p> 
     
    66 </div> 
    77-<div class="gelb"> 
    8 -<p class="mb5 fett"><a href="javascript:jslGoTo('konfig', 'home');">{?de.home.sitemap.html:70MenuAssi?}</a></p> 
    9 -<p class="ml10"><a href="javascript:DoFirstLotse();">{?de.home.sitemap.html:75Ersteinrichtung?}</a></p> 
     8-<p class="mb5 fett"><a href="javascript:jslGoTo('konfig', 'home');">{?txtAssi?}</a></p> 
     9-<p class="ml10"><a href="javascript:DoFirstLotse();">{?txtBasicSettings?}</a></p> 
    1010-<? if eq $var:showInternetLotse 1 ` 
    1111-<p class="ml10"><a href="javascript:DoInternetLotse();">{?de.home.sitemap.html:80SitemapText5?}</a></p> 
     
    1515-<p id="SitemapFonItem" class="ml10"><a href="javascript:DoFonLotse();">{?de.home.sitemap.html:90SitemapText7?}</a></p> 
    1616-` ?> 
    17 -<p class="ml10"><a href="javascript:DoFirmwareLotse();">{?de.home.sitemap.html:100FWAktualisieren?}</a></p> 
    18 -<p class="ml10"><a href="javascript:DoSaveLotse();">{?de.home.sitemap.html:105EinstellungSichern?}</a></p> 
     17-<p class="ml10"><a href="javascript:DoFirmwareLotse();">{?txtFWUpdate?}</a></p> 
     18-<p class="ml10"><a href="javascript:DoSaveLotse();">{?txtSaveSettings?}</a></p> 
    1919-</div> 
    20  <? setvariable var:title "{?de.home.sitemap.html:110TextMenuInternet?}" ?> 
     20 <? setvariable var:title "{?txtINet?}" ?> 
    2121 <? setvariable var:showsubmenu 1 ?> 
    2222 <? if eq '<? query wlan:settings/WDS_enabled ?>' '1' ` 
    23 --- usr/www/avme/html/de/js/basis.js.orig   2009-01-28 15:58:39.000000000 +0100 
    24 +++ usr/www/avme/html/de/js/basis.js    2009-02-15 23:51:30.000000000 +0100 
    25 @@ -107,11 +107,11 @@ 
     23--- usr/www/avme/html/de/js/basis.js.orig   2009-09-15 15:26:16.000000000 +0200 
     24+++ usr/www/avme/html/de/js/basis.js    2009-09-16 22:28:31.000000000 +0200 
     25@@ -109,11 +109,11 @@ 
    2626 else 
    2727 page = myCookie.substring(myCookie.search('=')+1); 
     
    3737 function GoToSitemap() 
    3838 { 
    39 --- usr/www/avme/html/de/menus/menu2_konfig.html.orig   2009-02-15 23:51:30.000000000 +0100 
    40 +++ usr/www/avme/html/de/menus/menu2_konfig.html    2009-02-15 23:51:30.000000000 +0100 
     39--- usr/www/avme/html/de/menus/menu2_konfig.html.orig   2009-09-16 22:28:31.000000000 +0200 
     40+++ usr/www/avme/html/de/menus/menu2_konfig.html    2009-09-16 22:28:31.000000000 +0200 
    4141@@ -14,23 +14,9 @@ 
    4242 <? setvariable var:showmoremenu 0 ?> 
    4343 <? if neq $var:menu 'software' `<? setvariable var:showmoremenu 1 ?>` ?> 
    4444 <? if eq '$var:ShowAssiMenu' 1 ` 
    45 -<li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="<? echo `$var:aktivpfeil` ?>"><a href="javascript:jslGoTo('konfig','home')">{?de.menus.menu2_konfig.html:10MenuNetzwerk?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:25?}</span></li> 
    46 -<li class="LMenuitem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoFirstLotse();">{?de.menus.menu2_konfig.html:30?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:35Ersteinrichtung?}</span></li> 
     45-<li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="<? echo `$var:aktivpfeil` ?>"><a href="javascript:jslGoTo('konfig','home')">{?txtAssi?}</a><span class="PTextOnly">{?txtAssi?}</span></li> 
     46-<li class="LMenuitem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoFirstLotse();">{?txtBasicSettings?}</a><span class="PTextOnly">{?txtBasicSettings?}</span></li> 
    4747-<? if eq $var:showInternetLotse 1 ` 
    4848-<li class="LMenuitem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoInternetLotse();">{?de.menus.menu2_konfig.html:40Ersteinrichtung?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:45?}</span></li> 
    4949-` ?> 
    50 -<li class="LMenuitem" id="VoipFonLotseMenuItem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoVoipFonLotse();">{?de.menus.menu2_konfig.html:50?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:55?}</span></li> 
     50-<li class="LMenuitem" id="VoipFonLotseMenuItem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoVoipFonLotse();">{?txtNumbers?}</a><span class="PTextOnly">{?txtNumbers?}</span></li> 
    5151-<? if eq $var:showFonLotse 1 ` 
    52 -<li class="LMenuitem" id="FonLotseMenuItem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoFonLotse();">{?de.menus.menu2_konfig.html:60?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:65?}</span></li> 
     52-<li class="LMenuitem" id="FonLotseMenuItem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoFonLotse();">{?txtDevices?}</a><span class="PTextOnly">{?txtDevices?}</span></li> 
    5353-` ?> 
    54 -<li class="LMenuitem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoFirmwareLotse();">{?de.menus.menu2_konfig.html:80?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:85FWAktualisieren?}</span></li> 
    55 -<li class="LMenuitem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoSaveLotse();">{?de.menus.menu2_konfig.html:90FWAktualisieren?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:95EinstellungSichern?}</span></li> 
    56 -<li class="LMenuitemTop"><img class="LMenuPfeil" src="<? echo $var:pfeil ?>"><a href="javascript:jslGoTo('enhsettings','enhsettings')">{?de.menus.menu2_konfig.html:100EinstellungSichern?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:105ErweiterteEinstellung?}</span></li> 
    57 -<li class="LMenuitemTop"><img class="LMenuPfeil" src="../html/de/images/leer.gif" style="width:7px;"><a href="javascript:jslGoTo('software','extern')">{?de.menus.menu2_konfig.html:110ErweiterteEinstellung?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:115MenuSoftware?}</span></li> 
     54-<li class="LMenuitem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoFirmwareLotse();">{?txtFWUpdate?}</a><span class="PTextOnly">{?txtFWUpdate?}</span></li> 
     55-<li class="LMenuitem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoSaveLotse();">{?de.menus.menu2_konfig.html:5506?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:3950?}</span></li> 
     56-<li class="LMenuitemTop"><img class="LMenuPfeil" src="<? echo $var:pfeil ?>"><a href="javascript:jslGoTo('enhsettings','enhsettings')">{?txtAdvancedSettings?}</a><span class="PTextOnly">{?txtAdvancedSettings?}</span></li> 
     57-<li class="LMenuitemTop"><img class="LMenuPfeil" src="../html/de/images/leer.gif" style="width:7px;"><a href="javascript:jslGoTo('software','extern')">{?txtPrograms?}</a><span class="PTextOnly">{?txtPrograms?}</span></li> 
    5858 ` ` 
    5959 <? if eq '$var:showmoremenu' '1' ` 
    6060 <script type="text/javascript">javascript:jslSetMenuPage("enhsettings","enhsettings",100);</script> 
    61 -<li class="LMenuitemTop"><img class="LMenuPfeil" src="<? echo `$var:pfeil` ?>"><a href="javascript:jslGoTo('konfig','home')">{?de.menus.menu2_konfig.html:120MenuSoftware?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:125MenuAssi?}</span></li> 
     61-<li class="LMenuitemTop"><img class="LMenuPfeil" src="<? echo `$var:pfeil` ?>"><a href="javascript:jslGoTo('konfig','home')">{?txtAssi?}</a><span class="PTextOnly">{?txtAssi?}</span></li> 
    6262 <? if eq `$var:menu` 'enhsettings' ` 
    63  <li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="<? echo `$var:aktivpfeil` ?>"><a href="javascript:jslGoTo('enhsettings','enhsettings')">{?de.menus.menu2_konfig.html:130MenuAssi?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:135ErweiterteEinstellung?}</span></li> 
     63 <li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="<? echo `$var:aktivpfeil` ?>"><a href="javascript:jslGoTo('enhsettings','enhsettings')">{?txtAdvancedSettings?}</a><span class="PTextOnly">{?txtAdvancedSettings?}</span></li> 
    6464 ` ` 
    65 @@ -70,7 +56,6 @@ 
     65@@ -75,7 +61,6 @@ 
    6666 ` ?> 
    6767 <? if eq '$var:menu' 'software' ` 
    6868 <script type="text/javascript">javascript:jslSetMenuPage("software","extern",100);</script> 
    69 -<li class="LMenuitemTop"><img class="LMenuPfeil" src="<? echo `$var:pfeil` ?>"><a href="javascript:jslGoTo('konfig','home')">{?de.menus.menu2_konfig.html:225MenuSoftware?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:230MenuSoftware?}</span></li> 
    70  <li class="LMenuitemTop"><img class="LMenuPfeil" src="<? echo `$var:pfeil` ?>"><a href="javascript:jslGoTo('enhsettings','enhsettings')">{?de.menus.menu2_konfig.html:235MenuAssi?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:240MenuAssi?}</span></li> 
    71  <li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="../html/de/images/leer.gif" style="width:7px;"><a href="javascript:jslGoTo('software','extern')">{?de.menus.menu2_konfig.html:245?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:250?}</span></li> 
     69-<li class="LMenuitemTop"><img class="LMenuPfeil" src="<? echo `$var:pfeil` ?>"><a href="javascript:jslGoTo('konfig','home')">{?txtAssi?}</a><span class="PTextOnly">{?txtAssi?}</span></li> 
     70 <li class="LMenuitemTop"><img class="LMenuPfeil" src="<? echo `$var:pfeil` ?>"><a href="javascript:jslGoTo('enhsettings','enhsettings')">{?txtAdvancedSettings?}</a><span class="PTextOnly">{?txtAdvancedSettings?}</span></li> 
     71 <li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="../html/de/images/leer.gif" style="width:7px;"><a href="javascript:jslGoTo('software','extern')">{?txtPrograms?}</a><span class="PTextOnly">{?txtPrograms?}</span></li> 
    7272 ` ?> 
    73 --- usr/www/avme/html/logincheck.html.orig  2009-01-28 15:58:31.000000000 +0100 
    74 +++ usr/www/avme/html/logincheck.html   2009-02-15 23:51:30.000000000 +0100 
    75 @@ -118,8 +118,8 @@ 
    76  { 
     73--- usr/www/avme/html/logincheck.html.orig  2009-09-15 15:26:22.000000000 +0200 
     74+++ usr/www/avme/html/logincheck.html   2009-09-16 22:28:31.000000000 +0200 
     75@@ -242,8 +242,8 @@ 
     76 if (user=="" && pass=="" && type=="bridge") { 
    7777 var pagename = "<? echo $var:pagename ?>"; 
    7878 if (pagename != "sitemap" && pagename != "mini" && pagename != "enhsettings" && pagename != "foncalls") { 
     
    8181+jslSetValue("uiPostPageName", "home"); 
    8282+jslSetValue("uiPostMenu", "home"); 
     83 return true; 
    8384 } 
    8485 } 
    85  ` ?> 
  • branches/freetz-stable-1.1/patches/cond/a-ch/webmenu-wol-7270.patch

    r3077 r3721  
    1 --- usr/www/avme/html/de/menus/menu2_homehome.html.orig 2008-10-01 12:08:21.000000000 +0200 
    2 +++ usr/www/avme/html/de/menus/menu2_homehome.html  2008-10-01 12:08:22.000000000 +0200 
    3 @@ -56,6 +56,7 @@ 
     1--- usr/www/avme/html/de/menus/menu2_homehome.html.orig 2009-09-16 22:31:33.000000000 +0200 
     2+++ usr/www/avme/html/de/menus/menu2_homehome.html  2009-09-16 22:31:37.000000000 +0200 
     3@@ -59,6 +59,7 @@ 
    44 <? if eq $var:pagename energy `<? setvariable var:classname 'LStatusMenuitemaktivTop' ?>` ?> 
    55 <? if eq $var:pagename ecosettings `<? setvariable var:classname 'LStatusMenuitemaktivTop' ?>` ?> 
     
    1010 <li class="LMenubottom">&nbsp;</li> 
    1111 </ul> 
    12 --- usr/www/avme/html/de/menus/menu2_konfig.html.orig   2008-10-01 12:08:21.000000000 +0200 
    13 +++ usr/www/avme/html/de/menus/menu2_konfig.html    2008-10-01 12:08:22.000000000 +0200 
    14 @@ -75,6 +75,7 @@ 
    15  <li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="../html/de/images/leer.gif" style="width:7px;"><a href="javascript:jslGoTo('software','extern')">{?de.menus.menu2_konfig.html:245?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:250?}</span></li> 
     12--- usr/www/avme/html/de/menus/menu2_konfig.html.orig   2009-09-16 22:31:33.000000000 +0200 
     13+++ usr/www/avme/html/de/menus/menu2_konfig.html    2009-09-16 22:31:37.000000000 +0200 
     14@@ -80,6 +80,7 @@ 
     15 <li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="../html/de/images/leer.gif" style="width:7px;"><a href="javascript:jslGoTo('software','extern')">{?txtPrograms?}</a><span class="PTextOnly">{?txtPrograms?}</span></li> 
    1616 ` ?> 
    1717 ` ?> 
  • branches/freetz-stable-1.1/patches/cond/de/remove_assistant_7141.patch

    r3557 r3721  
    1 --- usr/www/all/html/de/home/sitemap.html.orig  2009-04-14 12:46:17.000000000 +0000 
    2 +++ usr/www/all/html/de/home/sitemap.html   2009-07-25 13:18:07.000000000 +0000 
     1--- usr/www/all/html/de/home/sitemap.html.orig  2009-08-18 17:24:55.000000000 +0200 
     2+++ usr/www/all/html/de/home/sitemap.html   2009-09-23 19:39:14.000000000 +0200 
    33@@ -20,19 +20,6 @@ 
    44 <p class="ml10"><a href="javascript:jslGoTo('home', 'syslog');">Ereignisse</a></p> 
     
    2121 <? setvariable var:showsubmenu 1 ?> 
    2222 <? if eq '<? query wlan:settings/WDS_enabled ?>' '1' ` 
    23 --- usr/www/all/html/de/js/basis.js.orig    2009-04-14 12:46:24.000000000 +0000 
    24 +++ usr/www/all/html/de/js/basis.js 2009-07-25 13:18:07.000000000 +0000 
    25 @@ -107,11 +107,11 @@ 
     23--- usr/www/all/html/de/js/basis.js.orig    2009-08-18 17:25:20.000000000 +0200 
     24+++ usr/www/all/html/de/js/basis.js 2009-09-23 19:39:14.000000000 +0200 
     25@@ -109,11 +109,11 @@ 
    2626 else 
    2727 page = myCookie.substring(myCookie.search('=')+1); 
     
    3737 function GoToSitemap() 
    3838 { 
    39 --- usr/www/avm/html/de/menus/menu2_konfig.html.orig    2009-07-25 13:18:07.000000000 +0000 
    40 +++ usr/www/avm/html/de/menus/menu2_konfig.html 2009-07-25 13:18:07.000000000 +0000 
     39--- usr/www/avm/html/de/menus/menu2_konfig.html.orig    2009-09-23 19:39:14.000000000 +0200 
     40+++ usr/www/avm/html/de/menus/menu2_konfig.html 2009-09-23 19:39:14.000000000 +0200 
    4141@@ -10,23 +10,9 @@ 
    4242 <? setvariable var:showmoremenu 0 ?> 
     
    7171 <li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="../html/de/images/leer.gif" style="width:7px;"><a href="javascript:jslGoTo('software','extern')">Programme</a><span class="PTextOnly">Programme</span></li> 
    7272 ` ?> 
    73 --- usr/www/all/html/logincheck.html.orig   2009-04-14 12:46:21.000000000 +0000 
    74 +++ usr/www/all/html/logincheck.html    2009-07-25 13:18:07.000000000 +0000 
    75 @@ -67,8 +67,8 @@ 
    76  { 
     73--- usr/www/all/html/logincheck.html.orig   2009-08-18 17:25:20.000000000 +0200 
     74+++ usr/www/all/html/logincheck.html    2009-09-23 19:39:14.000000000 +0200 
     75@@ -178,8 +178,8 @@ 
     76 if (user=="" && pass=="" && type=="bridge") { 
    7777 var pagename = "<? echo $var:pagename ?>"; 
    7878 if (pagename != "sitemap" && pagename != "mini" && pagename != "enhsettings" && pagename != "foncalls") { 
     
    8181+jslSetValue("uiPostPageName", "home"); 
    8282+jslSetValue("uiPostMenu", "home"); 
     83 return true; 
    8384 } 
    8485 } 
    85  ` ?> 
  • branches/freetz-stable-1.1/patches/cond/de/webmenu-wol-7141.patch

    r3077 r3721  
    1 --- usr/www/all/html/de/menus/menu2_homehome.html.orig  2009-02-02 05:57:51.000000000 +0100 
    2 +++ usr/www/all/html/de/menus/menu2_homehome.html   2009-02-02 05:57:52.000000000 +0100 
    3 @@ -56,6 +56,7 @@ 
     1--- usr/www/all/html/de/menus/menu2_homehome.html.orig  2009-09-23 19:06:32.000000000 +0200 
     2+++ usr/www/all/html/de/menus/menu2_homehome.html   2009-09-23 19:06:34.000000000 +0200 
     3@@ -59,6 +59,7 @@ 
    44 <? if eq $var:pagename energy `<? setvariable var:classname 'LStatusMenuitemaktivTop' ?>` ?> 
    55 <? if eq $var:pagename ecosettings `<? setvariable var:classname 'LStatusMenuitemaktivTop' ?>` ?> 
     
    1010 <li class="LMenubottom">&nbsp;</li> 
    1111 </ul> 
    12 --- usr/www/all/html/de/menus/menu2_konfig.html.orig    2009-02-02 05:57:51.000000000 +0100 
    13 +++ usr/www/all/html/de/menus/menu2_konfig.html 2009-02-02 05:57:52.000000000 +0100 
     12--- usr/www/all/html/de/menus/menu2_konfig.html.orig    2009-09-23 19:06:32.000000000 +0200 
     13+++ usr/www/all/html/de/menus/menu2_konfig.html 2009-09-23 19:06:34.000000000 +0200 
    1414@@ -66,6 +66,7 @@ 
    1515 <li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="../html/de/images/leer.gif" style="width:7px;"><a href="javascript:jslGoTo('software','extern')">Programme</a><span class="PTextOnly">Programme</span></li> 
  • branches/freetz-stable-1.1/patches/cond/en/remove_assistant_7270.patch

    r3077 r3721  
    1 --- usr/www/avme/html/de/home/sitemap.html.orig 2009-01-28 15:58:34.000000000 +0100 
    2 +++ usr/www/avme/html/de/home/sitemap.html  2009-02-15 23:51:51.000000000 +0100 
     1--- usr/www/avme/html/de/home/sitemap.html.orig 2009-09-15 15:26:29.000000000 +0200 
     2+++ usr/www/avme/html/de/home/sitemap.html  2009-09-16 22:28:31.000000000 +0200 
    33@@ -24,19 +24,6 @@ 
    44 <p class="ml10"><a href="javascript:jslGoTo('home', 'syslog');">{?de.home.sitemap.html:9348?}</a></p> 
     
    66 </div> 
    77-<div class="gelb"> 
    8 -<p class="mb5 fett"><a href="javascript:jslGoTo('konfig', 'home');">{?de.home.sitemap.html:70MenuAssi?}</a></p> 
    9 -<p class="ml10"><a href="javascript:DoFirstLotse();">{?de.home.sitemap.html:75Ersteinrichtung?}</a></p> 
     8-<p class="mb5 fett"><a href="javascript:jslGoTo('konfig', 'home');">{?txtAssi?}</a></p> 
     9-<p class="ml10"><a href="javascript:DoFirstLotse();">{?txtBasicSettings?}</a></p> 
    1010-<? if eq $var:showInternetLotse 1 ` 
    1111-<p class="ml10"><a href="javascript:DoInternetLotse();">{?de.home.sitemap.html:80SitemapText5?}</a></p> 
     
    1515-<p id="SitemapFonItem" class="ml10"><a href="javascript:DoFonLotse();">{?de.home.sitemap.html:90SitemapText7?}</a></p> 
    1616-` ?> 
    17 -<p class="ml10"><a href="javascript:DoFirmwareLotse();">{?de.home.sitemap.html:100FWAktualisieren?}</a></p> 
    18 -<p class="ml10"><a href="javascript:DoSaveLotse();">{?de.home.sitemap.html:105EinstellungSichern?}</a></p> 
     17-<p class="ml10"><a href="javascript:DoFirmwareLotse();">{?txtFWUpdate?}</a></p> 
     18-<p class="ml10"><a href="javascript:DoSaveLotse();">{?txtSaveSettings?}</a></p> 
    1919-</div> 
    20  <? setvariable var:title "{?de.home.sitemap.html:110TextMenuInternet?}" ?> 
     20 <? setvariable var:title "{?txtINet?}" ?> 
    2121 <? setvariable var:showsubmenu 1 ?> 
    2222 <? if eq '<? query wlan:settings/WDS_enabled ?>' '1' ` 
    23 --- usr/www/avme/html/de/js/basis.js.orig   2009-01-28 15:58:39.000000000 +0100 
    24 +++ usr/www/avme/html/de/js/basis.js    2009-02-15 23:51:51.000000000 +0100 
    25 @@ -107,11 +107,11 @@ 
     23--- usr/www/avme/html/de/js/basis.js.orig   2009-09-15 15:26:16.000000000 +0200 
     24+++ usr/www/avme/html/de/js/basis.js    2009-09-16 22:28:31.000000000 +0200 
     25@@ -109,11 +109,11 @@ 
    2626 else 
    2727 page = myCookie.substring(myCookie.search('=')+1); 
     
    3737 function GoToSitemap() 
    3838 { 
    39 --- usr/www/avme/html/de/menus/menu2_konfig.html.orig   2009-02-15 23:51:51.000000000 +0100 
    40 +++ usr/www/avme/html/de/menus/menu2_konfig.html    2009-02-15 23:51:51.000000000 +0100 
     39--- usr/www/avme/html/de/menus/menu2_konfig.html.orig   2009-09-16 22:28:31.000000000 +0200 
     40+++ usr/www/avme/html/de/menus/menu2_konfig.html    2009-09-16 22:28:31.000000000 +0200 
    4141@@ -14,23 +14,9 @@ 
    4242 <? setvariable var:showmoremenu 0 ?> 
    4343 <? if neq $var:menu 'software' `<? setvariable var:showmoremenu 1 ?>` ?> 
    4444 <? if eq '$var:ShowAssiMenu' 1 ` 
    45 -<li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="<? echo `$var:aktivpfeil` ?>"><a href="javascript:jslGoTo('konfig','home')">{?de.menus.menu2_konfig.html:10MenuNetzwerk?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:25?}</span></li> 
    46 -<li class="LMenuitem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoFirstLotse();">{?de.menus.menu2_konfig.html:30?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:35Ersteinrichtung?}</span></li> 
     45-<li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="<? echo `$var:aktivpfeil` ?>"><a href="javascript:jslGoTo('konfig','home')">{?txtAssi?}</a><span class="PTextOnly">{?txtAssi?}</span></li> 
     46-<li class="LMenuitem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoFirstLotse();">{?txtBasicSettings?}</a><span class="PTextOnly">{?txtBasicSettings?}</span></li> 
    4747-<? if eq $var:showInternetLotse 1 ` 
    4848-<li class="LMenuitem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoInternetLotse();">{?de.menus.menu2_konfig.html:40Ersteinrichtung?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:45?}</span></li> 
    4949-` ?> 
    50 -<li class="LMenuitem" id="VoipFonLotseMenuItem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoVoipFonLotse();">{?de.menus.menu2_konfig.html:50?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:55?}</span></li> 
     50-<li class="LMenuitem" id="VoipFonLotseMenuItem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoVoipFonLotse();">{?txtNumbers?}</a><span class="PTextOnly">{?txtNumbers?}</span></li> 
    5151-<? if eq $var:showFonLotse 1 ` 
    52 -<li class="LMenuitem" id="FonLotseMenuItem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoFonLotse();">{?de.menus.menu2_konfig.html:60?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:65?}</span></li> 
     52-<li class="LMenuitem" id="FonLotseMenuItem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoFonLotse();">{?txtDevices?}</a><span class="PTextOnly">{?txtDevices?}</span></li> 
    5353-` ?> 
    54 -<li class="LMenuitem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoFirmwareLotse();">{?de.menus.menu2_konfig.html:80?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:85FWAktualisieren?}</span></li> 
    55 -<li class="LMenuitem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoSaveLotse();">{?de.menus.menu2_konfig.html:90FWAktualisieren?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:95EinstellungSichern?}</span></li> 
    56 -<li class="LMenuitemTop"><img class="LMenuPfeil" src="<? echo $var:pfeil ?>"><a href="javascript:jslGoTo('enhsettings','enhsettings')">{?de.menus.menu2_konfig.html:100EinstellungSichern?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:105ErweiterteEinstellung?}</span></li> 
    57 -<li class="LMenuitemTop"><img class="LMenuPfeil" src="../html/de/images/leer.gif" style="width:7px;"><a href="javascript:jslGoTo('software','extern')">{?de.menus.menu2_konfig.html:110ErweiterteEinstellung?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:115MenuSoftware?}</span></li> 
     54-<li class="LMenuitem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoFirmwareLotse();">{?txtFWUpdate?}</a><span class="PTextOnly">{?txtFWUpdate?}</span></li> 
     55-<li class="LMenuitem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoSaveLotse();">{?de.menus.menu2_konfig.html:5506?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:3950?}</span></li> 
     56-<li class="LMenuitemTop"><img class="LMenuPfeil" src="<? echo $var:pfeil ?>"><a href="javascript:jslGoTo('enhsettings','enhsettings')">{?txtAdvancedSettings?}</a><span class="PTextOnly">{?txtAdvancedSettings?}</span></li> 
     57-<li class="LMenuitemTop"><img class="LMenuPfeil" src="../html/de/images/leer.gif" style="width:7px;"><a href="javascript:jslGoTo('software','extern')">{?txtPrograms?}</a><span class="PTextOnly">{?txtPrograms?}</span></li> 
    5858 ` ` 
    5959 <? if eq '$var:showmoremenu' '1' ` 
    6060 <script type="text/javascript">javascript:jslSetMenuPage("enhsettings","enhsettings",100);</script> 
    61 -<li class="LMenuitemTop"><img class="LMenuPfeil" src="<? echo `$var:pfeil` ?>"><a href="javascript:jslGoTo('konfig','home')">{?de.menus.menu2_konfig.html:120MenuSoftware?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:125MenuAssi?}</span></li> 
     61-<li class="LMenuitemTop"><img class="LMenuPfeil" src="<? echo `$var:pfeil` ?>"><a href="javascript:jslGoTo('konfig','home')">{?txtAssi?}</a><span class="PTextOnly">{?txtAssi?}</span></li> 
    6262 <? if eq `$var:menu` 'enhsettings' ` 
    63  <li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="<? echo `$var:aktivpfeil` ?>"><a href="javascript:jslGoTo('enhsettings','enhsettings')">{?de.menus.menu2_konfig.html:130MenuAssi?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:135ErweiterteEinstellung?}</span></li> 
     63 <li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="<? echo `$var:aktivpfeil` ?>"><a href="javascript:jslGoTo('enhsettings','enhsettings')">{?txtAdvancedSettings?}</a><span class="PTextOnly">{?txtAdvancedSettings?}</span></li> 
    6464 ` ` 
    65 @@ -70,7 +56,6 @@ 
     65@@ -75,7 +61,6 @@ 
    6666 ` ?> 
    6767 <? if eq '$var:menu' 'software' ` 
    6868 <script type="text/javascript">javascript:jslSetMenuPage("software","extern",100);</script> 
    69 -<li class="LMenuitemTop"><img class="LMenuPfeil" src="<? echo `$var:pfeil` ?>"><a href="javascript:jslGoTo('konfig','home')">{?de.menus.menu2_konfig.html:225MenuSoftware?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:230MenuSoftware?}</span></li> 
    70  <li class="LMenuitemTop"><img class="LMenuPfeil" src="<? echo `$var:pfeil` ?>"><a href="javascript:jslGoTo('enhsettings','enhsettings')">{?de.menus.menu2_konfig.html:235MenuAssi?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:240MenuAssi?}</span></li> 
    71  <li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="../html/de/images/leer.gif" style="width:7px;"><a href="javascript:jslGoTo('software','extern')">{?de.menus.menu2_konfig.html:245?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:250?}</span></li> 
     69-<li class="LMenuitemTop"><img class="LMenuPfeil" src="<? echo `$var:pfeil` ?>"><a href="javascript:jslGoTo('konfig','home')">{?txtAssi?}</a><span class="PTextOnly">{?txtAssi?}</span></li> 
     70 <li class="LMenuitemTop"><img class="LMenuPfeil" src="<? echo `$var:pfeil` ?>"><a href="javascript:jslGoTo('enhsettings','enhsettings')">{?txtAdvancedSettings?}</a><span class="PTextOnly">{?txtAdvancedSettings?}</span></li> 
     71 <li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="../html/de/images/leer.gif" style="width:7px;"><a href="javascript:jslGoTo('software','extern')">{?txtPrograms?}</a><span class="PTextOnly">{?txtPrograms?}</span></li> 
    7272 ` ?> 
    73 --- usr/www/avme/html/logincheck.html.orig  2009-01-28 15:58:31.000000000 +0100 
    74 +++ usr/www/avme/html/logincheck.html   2009-02-15 23:51:51.000000000 +0100 
    75 @@ -118,8 +118,8 @@ 
    76  { 
     73--- usr/www/avme/html/logincheck.html.orig  2009-09-15 15:26:22.000000000 +0200 
     74+++ usr/www/avme/html/logincheck.html   2009-09-16 22:28:31.000000000 +0200 
     75@@ -242,8 +242,8 @@ 
     76 if (user=="" && pass=="" && type=="bridge") { 
    7777 var pagename = "<? echo $var:pagename ?>"; 
    7878 if (pagename != "sitemap" && pagename != "mini" && pagename != "enhsettings" && pagename != "foncalls") { 
     
    8181+jslSetValue("uiPostPageName", "home"); 
    8282+jslSetValue("uiPostMenu", "home"); 
     83 return true; 
    8384 } 
    8485 } 
    85  ` ?> 
  • branches/freetz-stable-1.1/patches/cond/en/webmenu-wol-7270.patch

    r3077 r3721  
    1 --- usr/www/avme/html/de/menus/menu2_homehome.html.orig 2008-10-01 12:08:21.000000000 +0200 
    2 +++ usr/www/avme/html/de/menus/menu2_homehome.html  2008-10-01 12:08:22.000000000 +0200 
    3 @@ -56,6 +56,7 @@ 
     1--- usr/www/avme/html/de/menus/menu2_homehome.html.orig 2009-09-16 19:27:25.000000000 +0200 
     2+++ usr/www/avme/html/de/menus/menu2_homehome.html  2009-09-16 19:27:27.000000000 +0200 
     3@@ -59,6 +59,7 @@ 
    44 <? if eq $var:pagename energy `<? setvariable var:classname 'LStatusMenuitemaktivTop' ?>` ?> 
    55 <? if eq $var:pagename ecosettings `<? setvariable var:classname 'LStatusMenuitemaktivTop' ?>` ?> 
     
    1010 <li class="LMenubottom">&nbsp;</li> 
    1111 </ul> 
    12 --- usr/www/avme/html/de/menus/menu2_konfig.html.orig   2008-10-01 12:08:21.000000000 +0200 
    13 +++ usr/www/avme/html/de/menus/menu2_konfig.html    2008-10-01 12:08:22.000000000 +0200 
    14 @@ -75,6 +75,7 @@ 
    15  <li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="../html/de/images/leer.gif" style="width:7px;"><a href="javascript:jslGoTo('software','extern')">{?de.menus.menu2_konfig.html:245?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:250?}</span></li> 
     12--- usr/www/avme/html/de/menus/menu2_konfig.html.orig   2009-09-16 19:27:25.000000000 +0200 
     13+++ usr/www/avme/html/de/menus/menu2_konfig.html    2009-09-16 19:27:27.000000000 +0200 
     14@@ -80,6 +80,7 @@ 
     15 <li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="../html/de/images/leer.gif" style="width:7px;"><a href="javascript:jslGoTo('software','extern')">{?txtPrograms?}</a><span class="PTextOnly">{?txtPrograms?}</span></li> 
    1616 ` ?> 
    1717 ` ?> 
  • branches/freetz-stable-1.1/patches/cond/usbstorage_7141.patch

    r3557 r3721  
    1 --- etc/hotplug/run_mount.orig  2008-09-03 10:52:22.000000000 +0200 
    2 +++ etc/hotplug/run_mount   2008-09-03 10:52:29.000000000 +0200 
     1--- etc/hotplug/run_mount.orig  2009-09-23 19:37:39.000000000 +0200 
     2+++ etc/hotplug/run_mount   2009-09-23 19:37:41.000000000 +0200 
    33@@ -21,19 +21,9 @@ 
    44  
     
    6262 ## (TODO Checking the partition for known filesystem types) 
    6363 do_mount () { 
    64 @@ -75,7 +95,7 @@ 
     64@@ -79,7 +100,7 @@ 
    6565 local OLD_UMASK=`umask` 
    6666 umask 0 
     
    7171 fi 
    7272 if [ $new_filesystem = true ] ; then 
    73 @@ -118,6 +118,7 @@ 
    74  led-ctrl filesystem_mount_failure 
     73@@ -123,6 +144,7 @@ 
     74 else 
    7575 umask $OLD_UMASK 
    7676 rmdir $MNTPATH 
  • branches/freetz-stable-1.1/patches/cond/usbstorage_7270_labor_core.patch

    r3646 r3721  
    1 --- etc/hotplug/run_mount.orig  2009-08-13 12:43:53.000000000 +0200 
    2 +++ etc/hotplug/run_mount   2009-08-16 16:17:22.995324686 +0200 
     1--- etc/hotplug/run_mount.orig  2009-09-16 11:54:11.482913163 +0200 
     2+++ etc/hotplug/run_mount   2009-09-16 11:54:12.767414225 +0200 
    33@@ -19,19 +19,9 @@ 
    44 MORPHSTICK_PARTITION_FILE=/var/tmp/MORPHSTICK_PARTITION_NAME 
     
    6969+if mount_fs; then 
    7070 new_filesystem=true 
     71 if test -x /bin/swlstream ; then 
    7172 MORPHSTICK_ENABLED=`echo morphstick.enabled|usbcfgctl -s` 
    72  echo "run_mount: do_mount MORPHSTICK_ENABLED=$MORPHSTICK_ENABLED" > /dev/ttyS0 
  • branches/freetz-stable-1.1/patches/cond/usbstorage_7270_v3_labor_core.patch

    r3646 r3721  
    1 --- etc/hotplug/run_mount.orig  2009-08-13 12:43:53.000000000 +0200 
    2 +++ etc/hotplug/run_mount   2009-08-16 16:17:22.995324686 +0200 
     1--- etc/hotplug/run_mount.orig  2009-09-16 11:47:48.815412149 +0200 
     2+++ etc/hotplug/run_mount   2009-09-16 11:47:50.238914912 +0200 
    33@@ -19,19 +19,9 @@ 
    44 MORPHSTICK_PARTITION_FILE=/var/tmp/MORPHSTICK_PARTITION_NAME 
     
    6969+if mount_fs; then 
    7070 new_filesystem=true 
     71 if test -x /bin/swlstream ; then 
    7172 MORPHSTICK_ENABLED=`echo morphstick.enabled|usbcfgctl -s` 
    72  echo "run_mount: do_mount MORPHSTICK_ENABLED=$MORPHSTICK_ENABLED" > /dev/ttyS0 
  • branches/freetz-stable-1.1/root/usr/bin/get_ip

    r3646 r3721  
    33helpmsg() 
    44{ 
    5   echo "get_ip - determine external IP address" 
    6   echo 
    7   echo "Usage: $0 [option]" 
    8   echo "    -d, --dsld     - use showdsldstat method (use only with kernel 2.6 firmwares) [default]" 
    9   echo "    -e, --extquery - use external site query method" 
    10   echo "    -w, --webcm    - use webcm CGI handler method" 
    11   echo "    -?, --help     - print this help message" 
    12   echo 
     5    echo "get_ip - determine external IP address" 
     6    echo 
     7    echo "Usage: $0 [option]" 
     8    echo "    -d, --dsld     - use showdsldstat method (use only with kernel 2.6 firmwares)" 
     9    echo "    -e, --extquery - use external site query method" 
     10    echo "    -w, --webcm    - use webcm CGI handler method [default]" 
     11    echo "    -?, --help     - print this help message" 
     12    echo 
    1313} 
    1414 
    1515local ip="" 
     16local queryfile="/usr/www/all/html/query.txt" 
     17local querystring="" 
    1618local retval=0 
    1719 
    1820case "$1" in 
    19   ""|-d|--dsld) 
    20     ip=$(/sbin/showdsldstat | grep "0: ip" | cut -d\/ -f1 | cut -d ' ' -f3) 
    21     retval=$? 
    22     ;; 
     21  -d|--dsld) 
     22    ip=$(/sbin/showdsldstat | grep "0: ip" | cut -d\/ -f1 | cut -d ' ' -f3) 
     23    retval=$? 
     24    ;; 
    2325  -e|--extquery) 
    24     ip=$(wget -q -O - http://checkip.dyndns.org | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+') 
    25     retval=$? 
    26     ;; 
    27   -w|--webcm) 
    28     local pw=$(/bin/allcfgconv -C ar7 -c -o - | sed -ne '/^webui[[:space:]]*{/,/^}/{ 
    29 /=/{s/[[:space:]]*=[[:space:]]*/=/;s/^[[:space:]]*//;p} 
    30 }' | grep '^password=' | cut -d '"' -f2) 
    31     retval=$? 
    32     if [ $retval != 0 ]; then 
    33       echo "get_ip error (exit code $retval)" >&2 
    34       exit $retval 
    35     fi 
    36     export POST_DATA="getpage=/usr/www/all/html/query.txt&login:command/password=$pw&var:cnt=1&var:n0=connection0:pppoe:status/ip" 
    37     ip=$(echo -n "$POST_DATA" | REQUEST_METHOD="POST" REMOTE_ADDR="127.0.0.1" CONTENT_TYPE="application/x-www-form-urlencoded" CONTENT_LENGTH=${#POST_DATA} /usr/www/html/cgi-bin/webcm | sed -e '1,/^$/d;$d') 
    38     retval=$? 
    39     ;; 
     26    ip=$(wget -q -O - http://checkip.dyndns.org | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+') 
     27    retval=$? 
     28    ;; 
     29  ""|-w|--webcm) 
     30    if [ "$(sed -ne '/var:n\[/p' $queryfile)" != "" ]; then 
     31        querystring="var:n[0]=connection0:pppoe:status/ip" 
     32    else 
     33        querystring="var:cnt=1&var:n0=connection0:pppoe:status/ip" 
     34    fi 
     35    ip=$(/usr/www/html/cgi-bin/webcm "getpage=${queryfile}&${querystring}") 
     36        retval=$? 
     37    ;; 
    4038  -?|--help) 
    41     helpmsg 
    42     exit 0 
    43     ;; 
     39    helpmsg 
     40    exit 0 
     41    ;; 
    4442  *) 
    45     helpmsg >&2 
    46     exit 1 
     43    helpmsg >&2 
     44    exit 1 
    4745esac 
    4846 
    4947if [ $retval == 0 ]; then 
    50   echo "$ip" 
    51   exit 0 
     48    echo "$ip" 
     49    exit 0 
    5250fi 
    5351echo "get_ip error (exit code $retval)" >&2 
  • branches/freetz-stable-1.1/toolchain/Config.in

    r3646 r3721  
    2828    default y if \ 
    2929        FREETZ_TYPE_WLAN_3270 || \ 
     30        FREETZ_TYPE_FON_WLAN_7112 || \ 
    3031        (FREETZ_TYPE_FON_WLAN_7140 && (FREETZ_TYPE_LANG_EN || FREETZ_TYPE_LANG_A_CH)) || \ 
    3132        FREETZ_TYPE_FON_WLAN_7141 || \ 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.