tazpanel rev 284 1.5.1

pkgs.cgi: get package info, fix + case
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Mar 28 18:22:46 2012 +0200 (2012-03-28)
parents ce6912938421
children 6fb57b34813e
files pkgs.cgi
line diff
     1.1 --- a/pkgs.cgi	Sat Mar 24 15:08:23 2012 +0100
     1.2 +++ b/pkgs.cgi	Wed Mar 28 18:22:46 2012 +0200
     1.3 @@ -17,6 +17,10 @@
     1.4  TITLE="- Packages"
     1.5  xhtml_header | sed 's/id="content"/id="content-sidebar"/'
     1.6  
     1.7 +pkg_info_link()
     1.8 +{
     1.9 +	echo "$SCRIPT_NAME?info=$1" | sed 's/+/%2B/g'
    1.10 +}
    1.11  
    1.12  # We need packages information for list and search
    1.13  parse_packages_desc() {
    1.14 @@ -26,11 +30,11 @@
    1.15  		echo '<tr>'
    1.16  		if [ -d $INSTALLED/${PACKAGE% } ]; then
    1.17  			echo -e "<td><input type='checkbox' name='pkg' value='$PACKAGE'>\n
    1.18 -				<a href='$SCRIPT_NAME?info=$PACKAGE'>
    1.19 +				<a href='$(pkg_info_link $PACKAGE)'>
    1.20  				<img src='$IMAGES/tazpkg-installed.png'/>$PACKAGE</a></td>"
    1.21  		else
    1.22  			echo -e "<td><input type='checkbox' name='pkg' value='$PACKAGE'>\n
    1.23 -				<a href='$SCRIPT_NAME?info=$PACKAGE'>
    1.24 +				<a href='$(pkg_info_link $PACKAGE)'>
    1.25  				<img src='$IMAGES/tazpkg.png'/>$PACKAGE</a></td>"
    1.26  		fi
    1.27  		echo "<td>$VERSION</td>"
    1.28 @@ -232,7 +236,7 @@
    1.29  				colorpkg="<span style='color: red;'>$pkg</span>"
    1.30  			echo "<td class='pkg'>
    1.31  				<input type='checkbox' name='pkg' value=\"$pkg\" />
    1.32 -				<a href='$SCRIPT_NAME?info=$pkg'><img
    1.33 +				<a href='$(pkg_info_link $pkg)'><img
    1.34  					src='$IMAGES/tazpkg-installed.png'/>$colorpkg</a></td>"
    1.35  			echo "<td>$VERSION</td>"
    1.36  			echo "<td class='desc'>$SHORT_DESC</td>"
    1.37 @@ -275,7 +279,7 @@
    1.38  			echo '<tr>'
    1.39  			echo "<td class='pkg'>
    1.40  				<input type='checkbox' name='pkg' value=\"$pkg\" />
    1.41 -				<a href='$SCRIPT_NAME?info=$pkg'><img
    1.42 +				<a href='$(pkg_info_link $pkg)'><img
    1.43  					src='$IMAGES/tazpkg.png'/>$pkg</a></td>"
    1.44  			echo "<td>$VERSION</td>"
    1.45  			echo "<td class='desc'>$SHORT_DESC</td>"
    1.46 @@ -375,7 +379,7 @@
    1.47  		  	[ -d $INSTALLED/$PACKAGE ] || image=tazpkg.png
    1.48  		  	echo "<tr>
    1.49  	<td><input type='checkbox' name='pkg' value='$PACKAGE'>
    1.50 -	    <a href='$SCRIPT_NAME?info=$PACKAGE'><img src='$IMAGES/$image' />$PACKAGE</a></td>
    1.51 +	    <a href='$(pkg_info_link $PACKAGE)'><img src='$IMAGES/$image' />$PACKAGE</a></td>
    1.52  	<td>$FILE</td>
    1.53  </tr>"
    1.54  		 done)
    1.55 @@ -587,14 +591,14 @@
    1.56  			if [ -n "$DEPENDS" ]; then
    1.57  				echo -n "Depends     : "
    1.58  				for i in $DEPENDS; do 
    1.59 -					echo -n "<a href="$SCRIPT_NAME?info=$i">$i</a> "
    1.60 +					echo -n "<a href="$(pkg_info_link $i)">$i</a> "
    1.61  				done
    1.62  				echo ""
    1.63  			fi
    1.64  			if [ -n "$SUGGESTED" ]; then
    1.65  				echo -n "Suggested   : "
    1.66  				for i in $SUGGESTED; do 
    1.67 -					echo -n "<a href="$SCRIPT_NAME?info=$i">$i</a> "
    1.68 +					echo -n "<a href="$(pkg_info_link $i)">$i</a> "
    1.69  				done
    1.70  				echo ""
    1.71  			fi