From f827527a4b40f5e621f4a111b2e3cd24592aea0f Mon Sep 17 00:00:00 2001 From: paul Date: Sun, 30 Oct 2011 19:36:03 +0000 Subject: [PATCH] fixed bug in acl testing svn path=/trunk/; revision=22 --- write/introedit.cgi | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/write/introedit.cgi b/write/introedit.cgi index b024371..bfa6e55 100755 --- 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" -- 2.39.2