[Debian-live-changes] r1886 - in dists/trunk/live-webhelper: scripts templates
daniel at alioth.debian.org
daniel at alioth.debian.org
Tue May 29 21:04:30 UTC 2007
Author: daniel
Date: 2007-05-29 21:04:29 +0000 (Tue, 29 May 2007)
New Revision: 1886
Modified:
dists/trunk/live-webhelper/scripts/cgi
dists/trunk/live-webhelper/templates/form.html
Log:
Modified: dists/trunk/live-webhelper/scripts/cgi
===================================================================
--- dists/trunk/live-webhelper/scripts/cgi 2007-05-29 20:31:39 UTC (rev 1885)
+++ dists/trunk/live-webhelper/scripts/cgi 2007-05-29 21:04:29 UTC (rev 1886)
@@ -44,12 +44,12 @@
if [ -z "${QUERY_STRING}" ]
then
# Sending html form
- sed -e "s/VERSION/${VERSION}/" \
- -e "s/DATE/`date +%Y%m%d-%H:%M`/" \
- -e "s#MIRROR_BOOTSTRAP_SECURITY#${MIRROR_BOOTSTRAP_SECURITY}#" \
+ sed -e "s#MIRROR_BOOTSTRAP_SECURITY#${MIRROR_BOOTSTRAP_SECURITY}#" \
-e "s#MIRROR_BOOTSTRAP#${MIRROR_BOOTSTRAP}#" \
-e "s#MIRROR_BINARY_SECURITY#${MIRROR_BINARY_SECURITY}#" \
-e "s#MIRROR_BINARY#${MIRROR_BINARY}#" \
+ -e "s/VERSION/${VERSION}/" \
+ -e "s/DATE/`date +%Y%m%d-%H:%M`/" \
"${TEMPLATES}"/form.html
else
# Converting spaces: sed "s/+/ /g"
@@ -60,18 +60,48 @@
# Filtering url parameters
EMAIL="`echo ${QUERY_STRING} | grep -oE '(^|[?&])email=[0-9,a-z,A-Z,.,%,-]+' | sed 's/%40/@/g' | cut -f 2 -d '=' | head -n1`"
+ # Standard options
BINARY_IMAGE="`echo ${QUERY_STRING} | grep -oE '(^|[?&])binary_image=[a-z]+' | cut -f 2 -d '=' | head -n1`"
DISTRIBUTION="`echo ${QUERY_STRING} | grep -oE '(^|[?&])distribution=[a-z]+' | cut -f 2 -d '=' | head -n1`"
PACKAGES_LISTS="`echo ${QUERY_STRING} | grep -oE '(^|[?&])packages_lists=[a-z,-]+' | cut -f 2 -d '=' | head -n1`"
PACKAGES="`echo ${QUERY_STRING} | grep -oE '(^|[?&])packages=[0-9,a-z,A-Z,.,_,+,-]+' | sed 's/+/ /g' | cut -f 2 -d '=' | head -n1`"
+ # Advanced bootstrap options
+ ARCHITECTURE="`echo ${QUERY_STRING} | grep -oE '(^|[?&])architecture=[0-9,a-z]+' | cut -f 2 -d '=' | head -n1`"
+ BOOSTRAP_FLAVOUR="`echo ${QUERY_STRING} | grep -oE '(^|[?&])bootstrap_flavour=[a-z]+' | cut -f 2 -d '=' | head -n1`"
+ #MIRROR_BOOTSTRAP
+ #MIRROR_BOOTSTRAP_SECURITY
+ #MIRROR_BINARY
+ #MIRROR_BINARY_SECURITY
+ SECTIONS="`echo ${QUERY_STRING} | grep -oE '(^|[?&])sections=[a-z]+' | sed 's/+/ /g' | cut -f 2 -d '=' | head -n1`"
+
+ # Advanced chroot options
CHROOT_FILESYSTEM="`echo ${QUERY_STRING} | grep -oE '(^|[?&])chroot_filesystem=[0-9,a-z]+' | cut -f 2 -d '=' | head -n1`"
+ LINUX_FLAVOURS="`echo ${QUERY_STRING} | grep -oE '(^|[?&])linux_flavours=[0-9,a-z,-,]+' | cut -f 2 -d '=' | head -n1`"
+ SECURITY="`echo ${QUERY_STRING} | grep -oE '(^|[?&])security=[a-z]+' | cut -f 2 -d '=' | head -n1`"
+ SYMLINKS="`echo ${QUERY_STRING} | grep -oE '(^|[?&])symlinks=[a-z]+' | cut -f 2 -d '=' | head -n1`"
+ SYSVINIT="`echo ${QUERY_STRING} | grep -oE '(^|[?&])sysvinit=[a-z]+' | cut -f 2 -d '=' | head -n1`"
+ # Advanced binary options
+ BINARY_INDICES="`echo ${QUERY_STRING} | grep -oE '(^|[?&])binary_indices=[a-z]+' | cut -f 2 -d '=' | head -n1`"
+ BOOTAPPEND="`echo ${QUERY_STRING} | grep -oE '(^|[?&])bootappend=[0-9,a-z,A-Z,.,_,+,-]+' | cut -f 2 -d '=' | head -n1`"
+ BOOTLOADER="`echo ${QUERY_STRING} | grep -oE '(^|[?&])bootloader=[a-z]+' | cut -f 2 -d '=' | head -n1`"
+ DEBIAN_INSTALLER="`echo ${QUERY_STRING} | grep -oE '(^|[?&])debian_installer=[a-z]+' | cut -f 2 -d '=' | head -n1`"
+ ENCRYPTION="`echo ${QUERY_STRING} | grep -oE '(^|[?&])encryption=[0-9,a-z,A-Z]+' | cut -f 2 -d '=' | head -n1`"
+ HOSTNAME="`echo ${QUERY_STRING} | grep -oE '(^|[?&])hostname=[0-9,a-z,A-Z,.,-]+' | cut -f 2 -d '=' | head -n1`"
ISO_APPLICATION="`echo ${QUERY_STRING} | grep -oE '(^|[?&])iso_application=[0-9,a-z,A-Z,.,_,+,-]+' | sed 's/+/ /g' | cut -f 2 -d '=' | head -n1`"
ISO_PREPARER="`echo ${QUERY_STRING} | grep -oE '(^|[?&])iso_preparer=[0-9,a-z,A-Z,.,_,+,-]+' | sed 's/+/ /g' | cut -f 2 -d '=' | head -n1`"
ISO_PUBLISHER="`echo ${QUERY_STRING} | grep -oE '(^|[?&])iso_publisher=[0-9,a-z,A-Z,.,_,+,-]+' | sed 's/+/ /g' | cut -f 2 -d '=' | head -n1`"
ISO_VOLUME="`echo ${QUERY_STRING} | grep -oE '(^|[?&])iso_volume=[0-9,a-z,A-Z,.,_,+,-]+' | sed 's/+/ /g' | cut -f 2 -d '=' | head -n1`"
+ MEMTEST="`echo ${QUERY_STRING} | grep -oE '(^|[?&])memtest=[0-9,a-z,A-Z,.,_,+,-]+' | cut -f 2 -d '=' | head -n1`"
+ NET_PATH="`echo ${QUERY_STRING} | grep -oE '(^|[?&])net_path=[0-9,a-z,A-Z,.,_,+,-]+' | cut -f 2 -d '=' | head -n1`"
+ NET_SERVER="`echo ${QUERY_STRING} | grep -oE '(^|[?&])net_server=[0-9,a-z,A-Z,.,_,+,-]+' | cut -f 2 -d '=' | head -n1`"
+ USERNAME="`echo ${QUERY_STRING} | grep -oE '(^|[?&])username=[0-9,a-z,A-Z,.,-]+' | cut -f 2 -d '=' | head -n1`"
+ # Advanced source options
+ SOURCE="`echo ${QUERY_STRING} | grep -oE '(^|[?&])source=[a-z]+' | cut -f 2 -d '=' | head -n1`"
+ SOURCE_IMAGES="`echo ${QUERY_STRING} | grep -oE '(^|[?&])source_images=[a-z]+' | cut -f 2 -d '=' | head -n1`"
+
# FIXME: filter invalid options
unset QUERY_STRING
Modified: dists/trunk/live-webhelper/templates/form.html
===================================================================
--- dists/trunk/live-webhelper/templates/form.html 2007-05-29 20:31:39 UTC (rev 1885)
+++ dists/trunk/live-webhelper/templates/form.html 2007-05-29 21:04:29 UTC (rev 1886)
@@ -18,8 +18,8 @@
</tr>
</table>
-<span id="click_1" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(1,"<b>Standard settings</b>")'>
- <b>Standard settings</b><small> (click to collapse)</small>
+<span id="click_1" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(1,"<b>Standard options</b>")'>
+ <b>Standard options</b><small> (click to collapse)</small>
<br />
</span>
@@ -80,8 +80,8 @@
</table>
</div>
-<span id="click_2" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(2,"<b>Advanced bootstrap settings</b>")'>
- <b>Advanced bootstrap settings</b><small> (click to expand)</small>
+<span id="click_2" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(2,"<b>Advanced bootstrap options</b>")'>
+ <b>Advanced bootstrap options</b><small> (click to expand)</small>
<br />
</span>
@@ -129,8 +129,8 @@
</table>
</div>
-<span id="click_3" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(3,"<b>Advanced chroot settings</b>")'>
- <b>Advanced chroot settings</b><small> (click to expand)</small>
+<span id="click_3" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(3,"<b>Advanced chroot options</b>")'>
+ <b>Advanced chroot options</b><small> (click to expand)</small>
<br />
</span>
@@ -199,8 +199,8 @@
</table>
</div>
-<span id="click_4" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(4,"<b>Advanced binary settings</b>")'>
- <b>Advanced binary settings</b><small> (click to expand)</small>
+<span id="click_4" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(4,"<b>Advanced binary options</b>")'>
+ <b>Advanced binary options</b><small> (click to expand)</small>
<br />
</span>
@@ -296,8 +296,8 @@
</table>
</div>
-<span id="click_5" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(5,"<b>Advanced source settings</b>")'>
- <b>Advanced source settings</b><small> (click to expand)</small>
+<span id="click_5" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(5,"<b>Advanced source options</b>")'>
+ <b>Advanced source options</b><small> (click to expand)</small>
<br />
</span>
More information about the Debian-live-changes
mailing list