fixed bug in acl testing

[busy] / write / introedit.cgi

diff --git a/write/introedit.cgi b/write/introedit.cgi
index 4bb507f53b7f0beca3512f68020dc515ff194e59..d37af6f6b6261179503d328fe3750701bf86eef2 100755 (executable)
--- a/write/introedit.cgi
+++ b/write/introedit.cgi
@@ -15,17 +15,36 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Busy.  If not, see <http://www.gnu.org/licenses/>.
 
+[ "$HTTPS" = "on" ] && proto=https || proto=http
+. ../auth/acl.sh
+
+info="$(egrep -o '(^|&)i=([0-9]{10}_[0-9]{3}|intro|news)(&|$)' <<<"${QUERY_STRING}" |sed 's:&::g;s:i=::')"
+
+if [ "$info" = "news" ]; then
+  $ACL_ADDNEWS || info=''
+elif [ "$info" = "intro" ]; then
+  $ACL_EDITINTRO || info=''
+elif [ -z "$info" ]; then
+  $ACL_EDITNEWS || info=''
+fi
+[ -n "$info" ] || echo -n "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 'intro=.+'); then
-    intro="$(cut -d= -f2- <<<"${line}" |sed 's/+/ /g;s/%/\\x/g')"
-    intro=$(echo -e "${intro}" |sed 's/\t/ /g;s/\r//g;s/\\/\\\\/g')
+  if (echo "${line}" | egrep -xq 'text=.+'); then
+    text="$(cut -d= -f2- <<<"${line}" |sed 's/+/ /g;s/%/\\x/g')"
+    text=$(echo -e "${text}" |sed 's/\t/ /g;s/\r//g;s/\\/\\\\/g')
   elif (echo "${line}" | egrep -xq 'cancel=.+'); then
     cancel=true
   fi
 done
 fi
 
-[ -z "$cancel" ] && grep -qx "${REMOTE_USER}" ../auth/admin.user && echo -e "${intro}" >"../Home/intro"
+[ -z "$cancel" ] && echo -e "${text}" >"../Home/$info"
 
-echo -n "Location: http://${HTTP_HOST}/?p=Home\n\n"
+echo -n "Location: ${proto}://${HTTP_HOST}/?p=Home\n\n"