# HG changeset patch # User Pascal Bellard # Date 1428479746 -7200 # Node ID adedebded23a7ef75a914c3fa913379c8df9e389 # Parent f09ef19be78de21809967ee25f950a6d47c0521f non-auth by default diff -r f09ef19be78d -r adedebded23a Makefile --- a/Makefile Tue Apr 07 11:12:26 2015 +0200 +++ b/Makefile Wed Apr 08 09:55:46 2015 +0200 @@ -46,6 +46,7 @@ cp -a tazpanel $(DESTDIR)$(PREFIX)/bin -[ "$(VERSION)" ] && sed -i 's/^VERSION=[0-9].*/VERSION=$(VERSION)/' $(DESTDIR)$(PREFIX)/bin/tazpanel cp -a *.cgi lib/ styles/ doc/ README* $(DESTDIR)$(PANEL) + ln -s . $(DESTDIR)$(PANEL)/user cp -a po/mo/* $(DESTDIR)$(PREFIX)/share/locale cp -a data/*.conf $(DESTDIR)$(SYSCONFDIR) cp -a data/*.desktop $(DESTDIR)$(PREFIX)/share/applications diff -r f09ef19be78d -r adedebded23a boot.cgi --- a/boot.cgi Tue Apr 07 11:12:26 2015 +0200 +++ b/boot.cgi Wed Apr 08 09:55:46 2015 +0200 @@ -24,7 +24,7 @@ *) tail -n40;; esac [ $(wc -l < $1) -gt 40 ] && cat <$(gettext 'Show more...') +
$(gettext 'Show more...') EOT } diff -r f09ef19be78d -r adedebded23a data/httpd.conf --- a/data/httpd.conf Tue Apr 07 11:12:26 2015 +0200 +++ b/data/httpd.conf Wed Apr 08 09:55:46 2015 +0200 @@ -10,7 +10,7 @@ # File to open by default I:index.cgi # Require user "*", password "*" on URLs starting with "/" -/:*:* +/user:*:* # CGI interpreter path *.cgi:/bin/sh diff -r f09ef19be78d -r adedebded23a doc/tazpanel.ru.html --- a/doc/tazpanel.ru.html Tue Apr 07 11:12:26 2015 +0200 +++ b/doc/tazpanel.ru.html Wed Apr 08 09:55:46 2015 +0200 @@ -72,7 +72,7 @@ Tazpanel имеет режим отладки, который можно включить в файле конфигурации tazpanel.conf; - также имеется отладочная + также имеется отладочная страница.

diff -r f09ef19be78d -r adedebded23a lib/libtazpanel --- a/lib/libtazpanel Tue Apr 07 11:12:26 2015 +0200 +++ b/lib/libtazpanel Wed Apr 08 09:55:46 2015 +0200 @@ -7,7 +7,7 @@ . /lib/libtaz.sh -[ "$(id -un)" == "${REMOTE_USER:-root}" ] || exec su -c "$(realpath $0) $@" $REMOTE_USER +[ "$(id -un)" == "${REMOTE_USER:=$USER}" ] || exec su -c "$(realpath $0) $@" $REMOTE_USER # Get parameters with GET, POST and FILE functions @@ -163,10 +163,10 @@ for i in $(ls /sys/class/net); do case $i in eth*) - echo " $i + echo " $i Ethernet $(interface_status $i)" ;; wlan*|ath*|ra*) - echo " $i + echo " $i Wireless $(interface_status $i)" ;; lo) echo " $i diff -r f09ef19be78d -r adedebded23a network.cgi --- a/network.cgi Tue Apr 07 11:12:26 2015 +0200 +++ b/network.cgi Wed Apr 08 09:55:46 2015 +0200 @@ -407,7 +407,7 @@ EOT diff -r f09ef19be78d -r adedebded23a settings.cgi --- a/settings.cgi Tue Apr 07 11:12:26 2015 +0200 +++ b/settings.cgi Wed Apr 08 09:55:46 2015 +0200 @@ -480,7 +480,7 @@ [ $? = 1 ] && msg tip $(gettext \ "Can't see your language?
You can \ -install glibc-locale \ +install glibc-locale \ to see a larger list of available locales.") @@ -701,7 +701,7 @@

$(gettext 'TazPanel provides a debugging mode and page:') - debug + debug

diff -r f09ef19be78d -r adedebded23a styles/default/header.html --- a/styles/default/header.html Tue Apr 07 11:12:26 2015 +0200 +++ b/styles/default/header.html Wed Apr 08 09:55:46 2015 +0200 @@ -21,60 +21,60 @@
  • $(gettext 'Panel') -
  • $(gettext 'Summary')
  • -
  • $(gettext 'Processes')
  • -
  • $(gettext 'Terminal')
  • -
  • $(gettext 'Create Report')
  • +
  • $(gettext 'Summary')
  • +
  • $(gettext 'Processes')
  • +
  • $(gettext 'Terminal')
  • +
  • $(gettext 'Create Report')
  • $(for i in menu.d/panel/* ; do [ -f $i ] && sh $i menu $i ; done)
  • $(gettext 'Network') -
  • $(gettext 'Summary')
  • -
  • $(gettext 'Config file')
  • -
  • $(gettext 'Ethernet')
  • -
  • $(gettext 'Wireless')
  • +
  • $(gettext 'Summary')
  • +
  • $(gettext 'Config file')
  • +
  • $(gettext 'Ethernet')
  • +
  • $(gettext 'Wireless')
  • $(for i in menu.d/network/* ; do [ -f $i ] && sh $i menu $i ; done)
  • $(gettext 'Boot') -
  • $(gettext 'Summary')
  • +
  • $(gettext 'Summary')
  • EOT [ -w /boot/grub/menu.lst ] && cat <$(gettext 'Boot loader')
  • +
  • $(gettext 'Boot loader')
  • EOT cat << EOT -
  • $(gettext 'Boot logs') +
  • $(gettext 'Boot logs') -
  • $(gettext 'Kernel messages')
  • -
  • $(gettext 'Boot scripts')
  • -
  • $(gettext 'X server')
  • -
  • $(gettext 'X session')
  • +
  • $(gettext 'Kernel messages')
  • +
  • $(gettext 'Boot scripts')
  • +
  • $(gettext 'X server')
  • +
  • $(gettext 'X session')
  • -
  • $(gettext 'Manage daemons')
  • +
  • $(gettext 'Manage daemons')
  • $(for i in menu.d/boot/* ; do [ -f $i ] && sh $i menu $i ; done)
  • $(gettext 'Hardware') -
  • $(gettext 'Summary')
  • -
  • $(gettext 'Kernel modules')
  • -
  • $(gettext 'Detect PCI/USB')
  • -
  • $(gettext 'Disks')
  • +
  • $(gettext 'Summary')
  • +
  • $(gettext 'Kernel modules')
  • +
  • $(gettext 'Detect PCI/USB')
  • +
  • $(gettext 'Disks')
  • $(for i in menu.d/hardware/* ; do [ -f $i ] && sh $i menu $i ; done)
  • $(gettext 'Settings') -
  • $(gettext 'Summary')
  • -
  • $(gettext 'Users')
  • -
  • $(gettext 'Groups')
  • +
  • $(gettext 'Summary')
  • +
  • $(gettext 'Users')
  • +
  • $(gettext 'Groups')
  • $(for i in menu.d/settings/* ; do [ -f $i ] && sh $i menu $i ; done)
  • @@ -93,8 +93,8 @@ cat << EOT - +$warn$(_ 'Click to re-login.')" href="http://$RANDOM:*@tazpanel:82/user/"> +