tazpanel rev 441
non-auth by default
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Wed Apr 08 09:55:46 2015 +0200 (2015-04-08) |
parents | f09ef19be78d |
children | ee21700899cc |
files | Makefile boot.cgi data/httpd.conf doc/tazpanel.ru.html lib/libtazpanel network.cgi settings.cgi styles/default/header.html |
line diff
1.1 --- a/Makefile Tue Apr 07 11:12:26 2015 +0200 1.2 +++ b/Makefile Wed Apr 08 09:55:46 2015 +0200 1.3 @@ -46,6 +46,7 @@ 1.4 cp -a tazpanel $(DESTDIR)$(PREFIX)/bin 1.5 -[ "$(VERSION)" ] && sed -i 's/^VERSION=[0-9].*/VERSION=$(VERSION)/' $(DESTDIR)$(PREFIX)/bin/tazpanel 1.6 cp -a *.cgi lib/ styles/ doc/ README* $(DESTDIR)$(PANEL) 1.7 + ln -s . $(DESTDIR)$(PANEL)/user 1.8 cp -a po/mo/* $(DESTDIR)$(PREFIX)/share/locale 1.9 cp -a data/*.conf $(DESTDIR)$(SYSCONFDIR) 1.10 cp -a data/*.desktop $(DESTDIR)$(PREFIX)/share/applications
2.1 --- a/boot.cgi Tue Apr 07 11:12:26 2015 +0200 2.2 +++ b/boot.cgi Wed Apr 08 09:55:46 2015 +0200 2.3 @@ -24,7 +24,7 @@ 2.4 *) tail -n40;; 2.5 esac 2.6 [ $(wc -l < $1) -gt 40 ] && cat <<EOT 2.7 -<hr/><a data-icon="view" href="/index.cgi?file=$1">$(gettext 'Show more...')</a> 2.8 +<hr/><a data-icon="view" href="index.cgi?file=$1">$(gettext 'Show more...')</a> 2.9 EOT 2.10 } 2.11
3.1 --- a/data/httpd.conf Tue Apr 07 11:12:26 2015 +0200 3.2 +++ b/data/httpd.conf Wed Apr 08 09:55:46 2015 +0200 3.3 @@ -10,7 +10,7 @@ 3.4 # File to open by default 3.5 I:index.cgi 3.6 # Require user "*", password "*" on URLs starting with "/" 3.7 -/:*:* 3.8 +/user:*:* 3.9 3.10 # CGI interpreter path 3.11 *.cgi:/bin/sh
4.1 --- a/doc/tazpanel.ru.html Tue Apr 07 11:12:26 2015 +0200 4.2 +++ b/doc/tazpanel.ru.html Wed Apr 08 09:55:46 2015 +0200 4.3 @@ -72,7 +72,7 @@ 4.4 Tazpanel имеет режим отладки, который можно включить в файле 4.5 конфигурации <a data-icon="text" 4.6 href="index.cgi?file=/etc/slitaz/tazpanel.conf">tazpanel.conf</a>; 4.7 - также имеется <a data-icon="info" href="/index.cgi?debug">отладочная 4.8 + также имеется <a data-icon="info" href="index.cgi?debug">отладочная 4.9 страница</a>.</p> 4.10 4.11 </div>
5.1 --- a/lib/libtazpanel Tue Apr 07 11:12:26 2015 +0200 5.2 +++ b/lib/libtazpanel Wed Apr 08 09:55:46 2015 +0200 5.3 @@ -7,7 +7,7 @@ 5.4 5.5 . /lib/libtaz.sh 5.6 5.7 -[ "$(id -un)" == "${REMOTE_USER:-root}" ] || exec su -c "$(realpath $0) $@" $REMOTE_USER 5.8 +[ "$(id -un)" == "${REMOTE_USER:=$USER}" ] || exec su -c "$(realpath $0) $@" $REMOTE_USER 5.9 5.10 5.11 # Get parameters with GET, POST and FILE functions 5.12 @@ -163,10 +163,10 @@ 5.13 for i in $(ls /sys/class/net); do 5.14 case $i in 5.15 eth*) 5.16 - echo " <tr><td><a data-icon='eth' href='/network.cgi?eth'>$i</a></td> 5.17 + echo " <tr><td><a data-icon='eth' href='network.cgi?eth'>$i</a></td> 5.18 <td>Ethernet</td> $(interface_status $i)</tr>" ;; 5.19 wlan*|ath*|ra*) 5.20 - echo " <tr><td><a data-icon='wifi' href='/network.cgi?wifi'>$i</a></td> 5.21 + echo " <tr><td><a data-icon='wifi' href='network.cgi?wifi'>$i</a></td> 5.22 <td>Wireless</td> $(interface_status $i)</tr>" ;; 5.23 lo) 5.24 echo " <tr><td><span data-icon='loopback'>$i</span></td>
6.1 --- a/network.cgi Tue Apr 07 11:12:26 2015 +0200 6.2 +++ b/network.cgi Wed Apr 08 09:55:46 2015 +0200 6.3 @@ -407,7 +407,7 @@ 6.4 </section> 6.5 6.6 <script type="text/javascript"> 6.7 - ajax('/network.cgi?wifi_list', '1', 'wifiList'); 6.8 + ajax('network.cgi?wifi_list', '1', 'wifiList'); 6.9 $(parse_wpa_conf) 6.10 </script> 6.11 EOT
7.1 --- a/settings.cgi Tue Apr 07 11:12:26 2015 +0200 7.2 +++ b/settings.cgi Wed Apr 08 09:55:46 2015 +0200 7.3 @@ -480,7 +480,7 @@ 7.4 [ $? = 1 ] && 7.5 msg tip $(gettext \ 7.6 "Can't see your language?<br/>You can \ 7.7 -<a href='/pkgs.cgi?do=Install&glibc-locale'>install glibc-locale</a> \ 7.8 +<a href='pkgs.cgi?do=Install&glibc-locale'>install glibc-locale</a> \ 7.9 to see a larger list of available locales.") 7.10 7.11 7.12 @@ -701,7 +701,7 @@ 7.13 </fieldset> 7.14 7.15 <p>$(gettext 'TazPanel provides a debugging mode and page:') 7.16 - <a href="/index.cgi?debug">debug</a> 7.17 + <a href="index.cgi?debug">debug</a> 7.18 </p> 7.19 </div> 7.20 </section>
8.1 --- a/styles/default/header.html Tue Apr 07 11:12:26 2015 +0200 8.2 +++ b/styles/default/header.html Wed Apr 08 09:55:46 2015 +0200 8.3 @@ -21,60 +21,60 @@ 8.4 <li tabindex="1"> 8.5 <span>$(gettext 'Panel')</span> 8.6 <menu> 8.7 - <li><a data-icon="info" href="/">$(gettext 'Summary')</a></li> 8.8 - <li><a data-icon="proc" href="/index.cgi?top">$(gettext 'Processes')</a></li> 8.9 - <li><a data-icon="terminal" href="/index.cgi?cmd=help">$(gettext 'Terminal')</a></li> 8.10 - <li><a data-icon="report" href="/index.cgi?report" data-root>$(gettext 'Create Report')</a></li> 8.11 + <li><a data-icon="info" href="index.cgi">$(gettext 'Summary')</a></li> 8.12 + <li><a data-icon="proc" href="index.cgi?top">$(gettext 'Processes')</a></li> 8.13 + <li><a data-icon="terminal" href="index.cgi?cmd=help">$(gettext 'Terminal')</a></li> 8.14 + <li><a data-icon="report" href="index.cgi?report" data-root>$(gettext 'Create Report')</a></li> 8.15 $(for i in menu.d/panel/* ; do [ -f $i ] && sh $i menu $i ; done) 8.16 </menu> 8.17 </li> 8.18 <li tabindex="2"> 8.19 <span>$(gettext 'Network')</span> 8.20 <menu> 8.21 - <li><a data-icon="info" href="/network.cgi">$(gettext 'Summary')</a></li> 8.22 - <li><a data-icon="conf" href="/index.cgi?file=/etc/network.conf">$(gettext 'Config file')</a></li> 8.23 - <li><a data-icon="eth" href="/network.cgi?eth">$(gettext 'Ethernet')</a></li> 8.24 - <li><a data-icon="wifi" href="/network.cgi?wifi">$(gettext 'Wireless')</a></li> 8.25 + <li><a data-icon="info" href="network.cgi">$(gettext 'Summary')</a></li> 8.26 + <li><a data-icon="conf" href="index.cgi?file=/etc/network.conf">$(gettext 'Config file')</a></li> 8.27 + <li><a data-icon="eth" href="network.cgi?eth">$(gettext 'Ethernet')</a></li> 8.28 + <li><a data-icon="wifi" href="network.cgi?wifi">$(gettext 'Wireless')</a></li> 8.29 $(for i in menu.d/network/* ; do [ -f $i ] && sh $i menu $i ; done) 8.30 </menu> 8.31 </li> 8.32 <li tabindex="3"> 8.33 <span>$(gettext 'Boot')</span> 8.34 <menu> 8.35 - <li><a data-icon="info" href="/boot.cgi">$(gettext 'Summary')</a></li> 8.36 + <li><a data-icon="info" href="boot.cgi">$(gettext 'Summary')</a></li> 8.37 EOT 8.38 [ -w /boot/grub/menu.lst ] && cat <<EOT 8.39 - <li><a data-icon="grub" href="/boot.cgi?grub">$(gettext 'Boot loader')</a></li> 8.40 + <li><a data-icon="grub" href="boot.cgi?grub">$(gettext 'Boot loader')</a></li> 8.41 EOT 8.42 cat << EOT 8.43 - <li><a data-icon="logs" href="/boot.cgi?log">$(gettext 'Boot logs')</a> 8.44 + <li><a data-icon="logs" href="boot.cgi?log">$(gettext 'Boot logs')</a> 8.45 <menu> 8.46 - <li><a data-icon="" href="/boot.cgi?log=kernel">$(gettext 'Kernel messages')</a></li> 8.47 - <li><a data-icon="" href="/boot.cgi?log=boot">$(gettext 'Boot scripts')</a></li> 8.48 - <li><a data-icon="" href="/boot.cgi?log=xlog">$(gettext 'X server')</a></li> 8.49 - <li><a data-icon="" href="/boot.cgi?log=slim">$(gettext 'X session')</a></li> 8.50 + <li><a data-icon="" href="boot.cgi?log=kernel">$(gettext 'Kernel messages')</a></li> 8.51 + <li><a data-icon="" href="boot.cgi?log=boot">$(gettext 'Boot scripts')</a></li> 8.52 + <li><a data-icon="" href="boot.cgi?log=xlog">$(gettext 'X server')</a></li> 8.53 + <li><a data-icon="" href="boot.cgi?log=slim">$(gettext 'X session')</a></li> 8.54 </menu> 8.55 </li> 8.56 - <li><a data-icon="daemons" href="/boot.cgi?daemons" data-root>$(gettext 'Manage daemons')</a></li> 8.57 + <li><a data-icon="daemons" href="boot.cgi?daemons">$(gettext 'Manage daemons')</a></li> 8.58 $(for i in menu.d/boot/* ; do [ -f $i ] && sh $i menu $i ; done) 8.59 </menu> 8.60 </li> 8.61 <li tabindex="4"> 8.62 <span>$(gettext 'Hardware')</span> 8.63 <menu> 8.64 - <li><a data-icon="info" href="/hardware.cgi">$(gettext 'Summary')</a></li> 8.65 - <li><a data-icon="modules" href="/hardware.cgi?modules">$(gettext 'Kernel modules')</a></li> 8.66 - <li><a data-icon="detect" href="/hardware.cgi?detect" data-root>$(gettext 'Detect PCI/USB')</a></li> 8.67 - <li><a data-icon="hdd" href="/hardware.cgi#disk">$(gettext 'Disks')</a></li> 8.68 + <li><a data-icon="info" href="hardware.cgi">$(gettext 'Summary')</a></li> 8.69 + <li><a data-icon="modules" href="hardware.cgi?modules">$(gettext 'Kernel modules')</a></li> 8.70 + <li><a data-icon="detect" href="hardware.cgi?detect" data-root>$(gettext 'Detect PCI/USB')</a></li> 8.71 + <li><a data-icon="hdd" href="hardware.cgi#disk">$(gettext 'Disks')</a></li> 8.72 $(for i in menu.d/hardware/* ; do [ -f $i ] && sh $i menu $i ; done) 8.73 </menu> 8.74 </li> 8.75 <li tabindex="5"> 8.76 <span>$(gettext 'Settings')</span> 8.77 <menu> 8.78 - <li><a data-icon="info" href="/settings.cgi" data-root>$(gettext 'Summary')</a></li> 8.79 - <li><a data-icon="user" href="/settings.cgi?users" data-root>$(gettext 'Users')</a></li> 8.80 - <li><a data-icon="group" href="/settings.cgi?groups" data-root>$(gettext 'Groups')</a></li> 8.81 + <li><a data-icon="info" href="settings.cgi" data-root>$(gettext 'Summary')</a></li> 8.82 + <li><a data-icon="user" href="settings.cgi?users" data-root>$(gettext 'Users')</a></li> 8.83 + <li><a data-icon="group" href="settings.cgi?groups" data-root>$(gettext 'Groups')</a></li> 8.84 $(for i in menu.d/settings/* ; do [ -f $i ] && sh $i menu $i ; done) 8.85 </menu> 8.86 </li> 8.87 @@ -93,8 +93,8 @@ 8.88 8.89 cat << EOT 8.90 <a data-img="$icon" title="$(_ 'You are logged in to the TazPanel as user $username.') 8.91 -$warn$(_ 'Click to re-login.')" href="http://$RANDOM:*@tazpanel:82/"></a> 8.92 - <a data-img="help" href="/help.cgi"></a> 8.93 +$warn$(_ 'Click to re-login.')" href="http://$RANDOM:*@tazpanel:82/user/"></a> 8.94 + <a data-img="help" href="help.cgi"></a> 8.95 </span> 8.96 </nav> 8.97 <div id="noMenu"></div>