fixed bug in acl testing

svn path=/trunk/; revision=22

diff --git a/write/introedit.cgi b/write/introedit.cgi
index b02437193e28f860229c780db343e1df6fd44a8b..bfa6e55f2a2214e50aa940d56ac09cce4aeea9b7 100755 (executable)
--- a/write/introedit.cgi
+++ b/write/introedit.cgi
@@ -19,13 +19,21 @@
 . ../auth/acl.sh
 
 info="$(egrep -o '(^|&)i=([0-9]{10}_[0-9]{3}|intro|news)(&|$)' <<<"${QUERY_STRING}" |sed 's:&::g;s:i=::')"
-[ "$info" = "news" ] && $ACL_ADDNEWS && info="$(date +%s)_$(apg -M N -a 1 -n 1 -m 3 -x 3)"
-[ "$info" != "intro" ] && $ACL_EDITNEWS && info="${info}.news"
-[ "$info" = "intro" ] && ($ACL_EDITINTRO || info='')
 
+if [ "$info" = "news" ]; then
+  $ACL_ADDNEWS || info=''
+elif [ "$info" = "intro" ]; then
+  $ACL_EDITINTRO || info=''
+elif [ -z "$info" ]
+  $ACL_EDITNEWS || info=''
+fi
 [ -n "$info" ] || echo "Location: ${proto}://${HTTP_HOST}/?p=Error&i=noaccess\n\n"
 [ -n "$info" ] || exit 0
 
+[ "$info" = "news" ] && info="$(date +%s)_$(apg -M N -a 1 -n 1 -m 3 -x 3)"
+[ "$info" != "intro" ] && info="${info}.news"
+[ "$info" = "intro" ] && ($ACL_EDITINTRO || info='')
+
 if [ -n "${CONTENT_LENGTH}" -a "${CONTENT_LENGTH}" -gt 0 ]; then
 (head -c "${CONTENT_LENGTH}"; echo)|sed 's/&/\n/g' |while read line; do
   if (echo "${line}" | egrep -xq 'text=.+'); then
@@ -37,6 +45,6 @@ if [ -n "${CONTENT_LENGTH}" -a "${CONTENT_LENGTH}" -gt 0 ]; then
 done
 fi
 
-[ -z "$cancel" ] && grep -qx "${REMOTE_USER}" ../auth/admin.user && echo -e "${text}" >"../Home/$info"
+[ -z "$cancel" ] && echo -e "${text}" >"../Home/$info"
 
 echo -n "Location: ${proto}://${HTTP_HOST}/?p=Home\n\n"