X-Git-Url: http://git.plutz.net/?p=busy;a=blobdiff_plain;f=actions%2Fwikimeta.sh;h=0a197192fa221f13ff671f288cf77ab5671295a1;hp=74b8ac963560b80359e6ef1c5d447295e741c7ec;hb=HEAD;hpb=f485895094cd72318b46f39689c3ba954eb37411 diff --git a/actions/wikimeta.sh b/actions/wikimeta.sh index 74b8ac9..0a19719 100755 --- a/actions/wikimeta.sh +++ b/actions/wikimeta.sh @@ -15,11 +15,11 @@ # You should have received a copy of the GNU Affero General Public License # along with Busy. If not, see . -$ACL_WIKIEDIT || echo "Location: //${HTTP_HOST}/?p=Error&i=noaccess\n\n" +$ACL_WIKIEDIT || echo "Location: ?p=Error&i=noaccess\n\n" $ACL_WIKIEDIT || exit 0 info="$(egrep -o '(^|&)i=[0-9]{10}_[0-9]{3}(&|$)' <<<"${QUERY_STRING}" |tr -d '&i=')" -info="$(echo -E "$_GET[\"i\"]" |grep -Ex '[0-9]{10}_[0-9]{3}')" +info="$(printf %s\\n "${_GET[i]}" |grep -Ex '[0-9]{10}_[0-9]{3}')" [ -z "$info" ] && info="$(date +%s)_$(apg -M N -a 1 -n 1 -m 3 -x 3)" descfile="$_DATA/Wiki/$info.meta" @@ -29,21 +29,21 @@ commfile="$_DATA/Wiki/$info.comment.$(date +%s)_$(apg -M N -a 1 -n 1 -m 3 -x 3)" anchor=$(ls "$_DATA/Wiki" |grep -A2 $info |grep '.meta$' |tail -n1 |cut -d. -f1) cgi_post -title="$_POST[\"title\"]" -description="$_POST[\"desc\"]" -comment="$_POST[\"comm\"]" -[ -n "$_POST[\"cancel\"]" ] && cancel=true +title="${_POST[title]}" +description="${_POST[desc]}" +comment="${_POST[comm]}" +[ -n "${_POST[cancel]}" ] && cancel=true if [ -z "$cancel" -a -n "$comment" ]; then touch "$_DATA/Wiki/$info" echo -e "author=${USER}" > "$commfile" echo -e "${comment}" >> "$commfile" - echo -n "Location: //${HTTP_HOST}/?p=Wiki&i=$info\n\n" + echo -n "Location: ?p=Wiki&i=$info\n\n" elif [ -z "$cancel" -a -n "$description" ]; then touch "$_DATA/Wiki/$info" echo -e "title=${title}" > "$descfile" echo -e "description=${description}" >> "$descfile" - echo -n "Location: //${HTTP_HOST}/?p=Wiki#$anchor\n\n" + echo -n "Location: ?p=Wiki#$anchor\n\n" elif [ -n "$cancel" ]; then - echo -n "Location: //${HTTP_HOST}/?p=Wiki#$anchor\n\n" + echo -n "Location: ?p=Wiki#$anchor\n\n" fi