improved interface for ad selection

[busy] / write / projectmeta.cgi

diff --git a/write/projectmeta.cgi b/write/projectmeta.cgi
index 436f31e391f3c71889f3ce0517bde98043295dd6..c2ee4427ff718ab95327b463260b87518bf0aeca 100755 (executable)
--- a/write/projectmeta.cgi
+++ b/write/projectmeta.cgi
@@ -25,13 +25,18 @@ $ACL_ADMIN || exit 0
 
 if [ -n "${CONTENT_LENGTH}" -a "${CONTENT_LENGTH}" -gt 0 ]; then
 (head -c "${CONTENT_LENGTH}"; echo)|sed 's/&/\n/g' \
-  |sed -rn '/^((appName|appSlogan|svnRepo|gitRepo|flattrThingURL|paypalAddress|btcAddress|btcAdAddress)=.*|repoType=(svn|git)|(useFlattr|usePaypal|useBitcoin)=yes|advertise=(btcAd|no)|btcAdContent=[1-4])$/{
+  |sed -rn '/^((appName|appSlogan|svnRepo|gitRepo|flattrThingURL|paypalAddress|btcAddress|btcAdAddress)=.*|repoType=(svn|git)|(useFlattr|usePaypal|useBitcoin|btcAdGamble|btcAdErotic)=yes|advertise=(btcAd|no))$/{
             s:\+: :g;s:%:\\x:g;p}' \
   |while line="$(line)"; do
     eval "$(echo -e "$line" |sed -r 's:[\n\r'\'']::g;s:^([a-zA-Z0-9_+-]+)=(.*)$:\1='"'\2'"':;')"
   done
 fi
 
+[ "$btcAdGamble" = yes -a "$btcAdErotic" = yes ] && btcAdContent=1
+[ "$btcAdGamble" != yes -a "$btcAdErotic" = yes ] && btcAdContent=2
+[ "$btcAdGamble" = yes -a "$btcAdErotic" != yes ] && btcAdContent=3
+[ "$btcAdGamble" != yes -a "$btcAdErotic" != yes ] && btcAdContent=4
+
 echo "\
 name=$appName
 slogan=$appSlogan