X-Git-Url: http://git.plutz.net/?p=busy;a=blobdiff_plain;f=actions%2Fwikiedit.sh;fp=write%2Flock.cgi;h=4c614093235f00e11b0ed96c8161a458390849df;hp=33989b67440f2c789c569cc1298e399bbf1da39f;hb=f485895094cd72318b46f39689c3ba954eb37411;hpb=904730d1782749bfac15b0344fe5782433f3099b

diff --git a/write/lock.cgi b/actions/wikiedit.sh
similarity index 58%
rename from write/lock.cgi
rename to actions/wikiedit.sh
index 33989b6..4c61409 100755
--- a/write/lock.cgi
+++ b/actions/wikiedit.sh
@@ -15,19 +15,17 @@
 # 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/permissions.sh
 $ACL_WIKIEDIT || echo "Location: ${proto}://${HTTP_HOST}/?p=Error&i=noaccess\n\n"
-$ACL_WIKIEDIT || exit 0 
+$ACL_WIKIEDIT || exit 0
 
-page=$(egrep -o '(^|&)p=(QandA|Locations|Wiki)(&|$)' <<<"${QUERY_STRING}" |sed 's,p=,,;s,&,,g')
-edit=$(egrep -o '(^|&)e=[0-9]{10}_[0-9]{3}(_[0-9]{1,4})?(&|$)' <<<"${QUERY_STRING}" |tr -d 'e=&')
+info="$(echo "$_GET[\"i\"]" |grep -Ex '[0-9]{10}_[0-9]{3}')"
+[ -f "$_DATA/Wiki/$info.lock" ] && rm "$_DATA/Wiki/$info.lock"
 
-case "$page" in
-  Wiki)	[ -f "../Wiki/${edit}" ] && echo "${REMOTE_USER}:$(($(date +%s)+600))" >"../Wiki/${edit}.lock"
-	;;
-  *)	echo -n "Location: http://$host/?p=Error&r=input&$page\n\n"
-	exit 0
-	;;
-esac
-echo -n "Location: ${proto}://${HTTP_HOST}/?${QUERY_STRING}\n\n"
+cgi_post
+page="$_POST[\"page\"]"
+[ -n "$_POST[\"cancel\"]" ] && cancel=true
+
+[ -z "$cancel" -a -f "$_DATA/Wiki/$info" ] && mv "$_DATA/Wiki/$info" "$_DATA/Wiki/$info.$(date +%s)"
+[ -z "$cancel" ] && echo -e "${page}" >"$_DATA/Wiki/$info"
+
+echo -n "Location: //${HTTP_HOST}/?p=Wiki&i=$info\n\n"