slitaz-pizza rev 37

rootfs.cgi: Add support for file on user Desktop
author Christophe Lincoln <pankso@slitaz.org>
date Tue Mar 27 10:50:17 2012 +0200 (2012-03-27)
parents b870dbff832c
children c60a80d384d3 7f228f4402eb
files web/rootfs.cgi
line diff
     1.1 --- a/web/rootfs.cgi	Tue Mar 27 10:33:41 2012 +0200
     1.2 +++ b/web/rootfs.cgi	Tue Mar 27 10:50:17 2012 +0200
     1.3 @@ -85,16 +85,17 @@
     1.4  		else
     1.5  			notify "$(gettext "Unsupported image format")" "error"
     1.6  		fi ;;
     1.7 -	*\ desktop-file\ *)
     1.8 +	*\ desktop\ *)
     1.9  		id="$(POST id)"
    1.10 -		tmpname="$(FILE desktop-file tmpname)"
    1.11 -		file="$(FILE desktop-file name)"
    1.12 -		size="$(FILE desktop-file size)"
    1.13 +		tmpname="$(FILE desktop tmpname)"
    1.14 +		file="$(FILE desktop name)"
    1.15 +		size="$(FILE desktop size)"
    1.16  		path="$tmpdir/slitaz-$id/rootfs/etc/skel/Desktop"
    1.17  		mkdir -p $path
    1.18  		case "$file" in
    1.19  			*README*|*.desktop|*.html|*.png|*.jpg) 
    1.20  				mv $tmpname $path/$file
    1.21 +				chmod a+r $path/$file
    1.22  				notify "$(gettext "Added file:") $file ($size Bytes)" ;;
    1.23  			*) 
    1.24  				notify "$(gettext "Unsupported file type")" "error" ;;
    1.25 @@ -154,22 +155,20 @@
    1.26  </div>
    1.27  <input type="submit" value="Upload Image" style="margin-left: 6px;" />
    1.28  
    1.29 -<!-- Buggy case action
    1.30 -
    1.31  <p>
    1.32  $(gettext "Files on user desktop such as README, desktop file or documenatation.
    1.33 -Allowed file and extentions are:") README .desktop .html .png .jpg:
    1.34 -/etc/skel/Desktop:
    1.35 +The file will be copied in the Home directory of each new user. SliTaz create
    1.36 +the default Live user at boot. Allowed file and extentions are:") README 
    1.37 +.desktop .html .png .jpg:
    1.38  <p>
    1.39  
    1.40  <div class="inputfile">
    1.41  	<div class="inputhide">
    1.42 -		<input type="file" name="desktop-file" size="48" />
    1.43 +		<input type="file" name="desktop" size="48" />
    1.44  	</div>
    1.45  </div>
    1.46  <input type="submit" value="Upload File" style="margin-left: 6px;" />
    1.47  
    1.48 --->
    1.49  
    1.50  <h3>$(gettext "Rootfs tarball")</h3>
    1.51  <p>