SliTaz Repositories

     1.1 --- a/tazpanel/pkgs.cgi	Sat Dec 27 17:41:56 2014 +0200
     1.2 +++ b/tazpanel/pkgs.cgi	Sun Dec 28 05:10:28 2014 +0200
     1.3 @@ -124,10 +124,10 @@
     1.4  	do
     1.5  		cat << EOT
     1.6  <li>
     1.7 -	<a href="$SCRIPT_NAME?admin=rm-mirror=$line&amp;file=$(httpd -e $1)">
     1.8 +	<a href="?admin=rm-mirror=$line&amp;file=$(httpd -e $1)">
     1.9  		<img src="$IMAGES/clear.png" title="$(_ 'Delete')" />
    1.10  	</a>
    1.11 -	<a href="$SCRIPT_NAME?admin=select-mirror&amp;mirror=$line">
    1.12 +	<a href="?admin=select-mirror&amp;mirror=$line">
    1.13  		<img src="$IMAGES/start.png" title="$(_ 'Use as default')" />
    1.14  	</a>
    1.15  	<a href="$line">$line</a>
    1.16 @@ -142,7 +142,7 @@
    1.17  list_repos() {
    1.18  	ls $PKGS_DB/undigest 2> /dev/null | while read repo ; do
    1.19  		cat <<EOT
    1.20 -	<li><a href="$SCRIPT_NAME?admin=rm-repo=$repo">
    1.21 +	<li><a href="?admin=rm-repo=$repo">
    1.22  		<img src="$IMAGES/clear.png">$repo</a></li>
    1.23  EOT
    1.24  	done
    1.25 @@ -216,43 +216,43 @@
    1.26  
    1.27  
    1.28  sidebar() {
    1.29 -	[ -n "$repo" ] || repo=Public
    1.30 +	[ -z "$repo" ] && repo=Public
    1.31  	cat << EOT
    1.32  <div id="sidebar">
    1.33 -	<h4>$(_ 'Categories')</h4>
    1.34 -	<a class="active_base-system"  href="$SCRIPT_NAME?cat=base-system&repo=$repo" >$(_ 'base-system')</a>
    1.35 -	<a class="active_x-window"     href="$SCRIPT_NAME?cat=x-window&repo=$repo"    >$(_ 'x-window')</a>
    1.36 -	<a class="active_utilities"    href="$SCRIPT_NAME?cat=utilities&repo=$repo"   >$(_ 'utilities')</a>
    1.37 -	<a class="active_network"      href="$SCRIPT_NAME?cat=network&repo=$repo"     >$(_ 'network')</a>
    1.38 -	<a class="active_games"        href="$SCRIPT_NAME?cat=games&repo=$repo"       >$(_ 'games')</a>
    1.39 -	<a class="active_graphics"     href="$SCRIPT_NAME?cat=graphics&repo=$repo"    >$(_ 'graphics')</a>
    1.40 -	<a class="active_office"       href="$SCRIPT_NAME?cat=office&repo=$repo"      >$(_ 'office')</a>
    1.41 -	<a class="active_multimedia"   href="$SCRIPT_NAME?cat=multimedia&repo=$repo"  >$(_ 'multimedia')</a>
    1.42 -	<a class="active_development"  href="$SCRIPT_NAME?cat=development&repo=$repo" >$(_ 'development')</a>
    1.43 -	<a class="active_system-tools" href="$SCRIPT_NAME?cat=system-tools&repo=$repo">$(_ 'system-tools')</a>
    1.44 -	<a class="active_security"     href="$SCRIPT_NAME?cat=security&repo=$repo"    >$(_ 'security')</a>
    1.45 -	<a class="active_misc"         href="$SCRIPT_NAME?cat=misc&repo=$repo"        >$(_ 'misc')</a>
    1.46 -	<a class="active_meta"         href="$SCRIPT_NAME?cat=meta&repo=$repo"        >$(_ 'meta')</a>
    1.47 -	<a class="active_non-free"     href="$SCRIPT_NAME?cat=non-free&repo=$repo"    >$(_ 'non-free')</a>
    1.48 -	<a class="active_all"          href="$SCRIPT_NAME?cat=all&repo=$repo"         >$(_ 'all')</a>
    1.49 -	<a class="active_extra"        href="$SCRIPT_NAME?cat=extra&repo=$repo"       >$(_ 'extra')</a>
    1.50 +	<h4><a href="?cat">$(_ 'Categories')</a></h4>
    1.51 +	<a class="active_base-system"  href="?cat=base-system&amp;repo=$repo" >$(_ 'base-system')</a>
    1.52 +	<a class="active_x-window"     href="?cat=x-window&amp;repo=$repo"    >$(_ 'x-window')</a>
    1.53 +	<a class="active_utilities"    href="?cat=utilities&amp;repo=$repo"   >$(_ 'utilities')</a>
    1.54 +	<a class="active_network"      href="?cat=network&amp;repo=$repo"     >$(_ 'network')</a>
    1.55 +	<a class="active_games"        href="?cat=games&amp;repo=$repo"       >$(_ 'games')</a>
    1.56 +	<a class="active_graphics"     href="?cat=graphics&amp;repo=$repo"    >$(_ 'graphics')</a>
    1.57 +	<a class="active_office"       href="?cat=office&amp;repo=$repo"      >$(_ 'office')</a>
    1.58 +	<a class="active_multimedia"   href="?cat=multimedia&amp;repo=$repo"  >$(_ 'multimedia')</a>
    1.59 +	<a class="active_development"  href="?cat=development&amp;repo=$repo" >$(_ 'development')</a>
    1.60 +	<a class="active_system-tools" href="?cat=system-tools&amp;repo=$repo">$(_ 'system-tools')</a>
    1.61 +	<a class="active_security"     href="?cat=security&amp;repo=$repo"    >$(_ 'security')</a>
    1.62 +	<a class="active_misc"         href="?cat=misc&amp;repo=$repo"        >$(_ 'misc')</a>
    1.63 +	<a class="active_meta"         href="?cat=meta&amp;repo=$repo"        >$(_ 'meta')</a>
    1.64 +	<a class="active_non-free"     href="?cat=non-free&amp;repo=$repo"    >$(_ 'non-free')</a>
    1.65 +	<a class="active_all"          href="?cat=all&amp;repo=$repo"         >$(_ 'all')</a>
    1.66 +	<a class="active_extra"        href="?cat=extra&amp;repo=$repo"       >$(_ 'extra')</a>
    1.67  EOT
    1.68  
    1.69  	if [ -d $PKGS_DB/undigest ]; then
    1.70 -		[ -n "$category" ] || category="base-system"
    1.71 +		[ -z "$category" ] && category="base-system"
    1.72  		cat << EOT
    1.73  	<h4>$(_ 'Repositories')</h4>
    1.74 -	<a class="repo_Public" href="$SCRIPT_NAME?repo=Public&cat=$category">$(_ 'Public')</a>
    1.75 +	<a class="repo_Public" href="?cat=$category&amp;repo=Public">$(_ 'Public')</a>
    1.76  EOT
    1.77  
    1.78  		for i in $(ls $PKGS_DB/undigest); do
    1.79  			cat << EOT
    1.80 -	<a class="repo_$i" href="$SCRIPT_NAME?repo=$i&cat=$category">$i</a>
    1.81 +	<a class="repo_$i" href="?cat=$category&amp;repo=$i">$i</a>
    1.82  EOT
    1.83  		done
    1.84  
    1.85  		cat << EOT
    1.86 -	<a class="repo_Any" href="$SCRIPT_NAME?repo=Any&cat=$category">$(_ 'Any')</a>
    1.87 +	<a class="repo_Any" href="?cat=$category&amp;repo=Any">$(_ 'Any')</a>
    1.88  EOT
    1.89  	fi
    1.90  	echo "</div>"
    1.91 @@ -797,18 +797,18 @@
    1.92  		<p>
    1.93  EOT
    1.94  		if [ "$temp" != "$pkg" -a "$action" == "Install" ]; then
    1.95 -			show_button "do=Install&$temp&nf"
    1.96 +			show_button "do=Install&amp;$temp&amp;nf"
    1.97  		else
    1.98 -			show_button "do=$action&$pkg"
    1.99 +			show_button "do=$action&amp;$pkg"
   1.100  		fi
   1.101  
   1.102  		if [ -d $INSTALLED/$pkg ]; then
   1.103  			if grep -qs "^$pkg$" $PKGS_DB/blocked-packages.list; then
   1.104 -				show_button "do=Unblock&$pkg"
   1.105 +				show_button "do=Unblock&amp;$pkg"
   1.106  			else
   1.107 -				show_button "do=Block&$pkg"
   1.108 +				show_button "do=Block&amp;$pkg"
   1.109  			fi
   1.110 -			show_button "do=Repack&$pkg"
   1.111 +			show_button "do=Repack&amp;$pkg"
   1.112  		fi
   1.113  		i18n_desc $pkg
   1.114  		cat << EOT
   1.115 @@ -904,10 +904,10 @@
   1.116  	<p>$(_ 'TazPkg administration and settings')</p>
   1.117  </div>
   1.118  <div id="actions">
   1.119 -	$(show_button 'admin=&action=saveconf')
   1.120 -	$(show_button 'admin=&action=listconf')
   1.121 -	$(show_button 'admin=&action=quickcheck')
   1.122 -	$(show_button 'admin=&action=fullcheck')
   1.123 +	$(show_button 'admin=&amp;action=saveconf')
   1.124 +	$(show_button 'admin=&amp;action=listconf')
   1.125 +	$(show_button 'admin=&amp;action=quickcheck')
   1.126 +	$(show_button 'admin=&amp;action=fullcheck')
   1.127  </div>
   1.128  EOT
   1.129  		case "$(GET action)" in
   1.130 @@ -1030,12 +1030,12 @@
   1.131  key." $version)</p>
   1.132  
   1.133  <div>
   1.134 -	<form method="post" action='$SCRIPT_NAME?admin&action=dvdimage#dvd'>
   1.135 +	<form method="post" action='?admin&amp;action=dvdimage#dvd'>
   1.136  	<p>
   1.137  		<a class="button"
   1.138  			href='http://mirror.slitaz.org/iso/$version/packages-$version.iso'>
   1.139  			<img src="$IMAGES/tazpkg.png" />$(_ 'Download DVD image')</a>
   1.140 -		<a class="button" href='$SCRIPT_NAME?admin&action=dvdusbkey#dvd'>
   1.141 +		<a class="button" href='?admin&amp;action=dvdusbkey#dvd'>
   1.142  			<img src="$IMAGES/tazpkg.png" />$(_ 'Install from DVD/USB key')</a>
   1.143  	</p>
   1.144  	<div class="box">