$title

+ $description

+ View + $($ACL_WIKIEDIT && echo "Change Info") +

+ $($ACL_WIKIEDIT && change_wiki $info) + +WikiEND + done +} + +cat < + +

+ $(list_search) +

+ $($LOGIN && add_page) +

+ $(list_wikis) +

+WikiEND diff --git a/templates/Wiki_show.page b/templates/Wiki_show.page new file mode 100755 index 0000000..87e848f --- /dev/null +++ b/templates/Wiki_show.page @@ -0,0 +1,80 @@ +#!/bin/zsh + +list_comments() { + base="$1" + + stat -c '' Wiki/${base}.comment.<0000000001-9999999999>_<000-999> \ + && for each in $(ls -c Wiki/${base}.comment.<0000000001-9999999999>_<000-999>); do + author=$(grep -m1 '^author=' "$each" |cut -d= -f2-) + echo "

$author wrote:

" + tail -n+2 $each |_wiki + echo '

' + done +} + +add_comment(){ + info="$1" + + cat <Comment / Ask + +WikiEND +} + +cat < + +

+ + Revisions: + $(rno=1; for each in Wiki/$info.<0000000000-9999999999>; do + revi=$(cut -d. -f2 <<<"$each") + echo "$rno" + rno=$(($rno+1)) + done) Latest
+

+ $($LOGIN && if [ -z "$lock" ]; then + [ -z "$rev" ] && echo "edit this page" + [ -n "$rev" ] && echo "Click edit to derive a new page revision from this one." + else + echo "This page is currently being edited by $lockedit anyway" + fi + $LOGIN && echo '

') +

Table of Content

+ $(cat Wiki/"${info}${rev}" |while read line; do + if (egrep -q '^ *###' <<<"$line"); then + echo "$(sed 's,^ *###,,' <<<"$line")
" + elif (egrep -q '^ *##' <<<"$line"); then + echo "$(sed 's,^ *##,,' <<<"$line")
" + elif (egrep -q '^ *#' <<<"$line"); then + echo "$(sed 's,^ *#,,' <<<"$line")
" + fi + done) +

+ +

$title

+ $(_wiki Wiki/"${info}${rev}") +

+ +

+ $($LOGIN && add_comment $info) + $(list_comments $info) +

+WikiEND diff --git a/busy.css b/templates/busy.css similarity index 100% rename from busy.css rename to templates/busy.css diff --git a/templates/frame.html.sh b/templates/frame.html.sh new file mode 100755 index 0000000..9695122 --- /dev/null +++ b/templates/frame.html.sh @@ -0,0 +1,115 @@ +# Copyright 2011 - 2014 Paul HÃ¤nsch +# +# This file is part of Busy +# +# Busy is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Busy is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with Busy. If not, see . + +list_accounts(){ + btcAddress="$(sed -rn 's:^btcAddress=(.*)$:\1:p' project.meta)" + flattrThingURL=$(sed -rn 's:^flattrThingURL=(.*)$:\1:p' project.meta) + + grep -q 'useBitcoin=yes' project.meta \ + && [ \! -f "QRcodes/bitcoin:${btcAddress}.png" ] \ + && qrencode -o "QRcodes/bitcoin:${btcAddress}.png" "bitcoin:${btcAddress}" + grep -q 'useBitcoin=yes' project.meta \ + && cat <

+ +PageEND + + grep -q 'useFlattr=yes' project.meta \ + && cat < + +PageEND +} + +cat < + + + + $(sed -rn 's:^name=(.*)$:\1:p' $_DATA/project.meta) - Busy $(. $PAGE title) + + + + + + + + + + + +

$(egrep '^name=.*$' project.meta |cut -d= -f2-)

+ $(egrep '^slogan=.*$' project.meta |cut -d= -f2-) +

+ $( $LOGIN || echo '') + $( $LOGIN && echo "You are loggeed in as ${USER}
") + $( $LOGIN && $ACL_ADMIN && echo 'Admin
') + $( $LOGIN && echo 'My Settings
') + $( $LOGIN && echo 'Log Out
') + $sess_msg +

+ $(list_accounts) +

+ + + $(. $PAGE body) + + +EOF + +# vi:set filetype=html: diff --git a/wikitext.css b/templates/wikitext.css similarity index 100% rename from wikitext.css rename to templates/wikitext.css diff --git a/write/.htaccess b/write/.htaccess deleted file mode 100644 index 607090d..0000000 --- a/write/.htaccess +++ /dev/null @@ -1,14 +0,0 @@ -Options +ExecCGI -AddHandler cgi-script .cgi -DirectoryIndex index.cgi - -#RewriteEngine On -#RewriteCond %{SERVER_PORT} 80 -#RewriteRule ^.*(/write/.*)$ https://%{SERVER_NAME}/$1 - - -AuthType Basic -AuthName "Busy Login" -AuthUserFile /srv/busy.plutz.net/http/auth/htpasswd -Require valid-user - diff --git a/write/projectmeta.cgi b/write/projectmeta.cgi deleted file mode 100755 index c2ee442..0000000 --- a/write/projectmeta.cgi +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/zsh - -# Copyright 2012 Paul HÃ¤nsch -# This file is part of Busy -# -# Busy is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Busy is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Busy. If not, see . - -metafile="../project.meta" - -[ "$HTTPS" = "on" ] && proto=https || proto=http -. ../auth/permissions.sh -$ACL_ADMIN || echo "Location: ${proto}://${HTTP_HOST}/?p=Error&i=noaccess\n\n" -$ACL_ADMIN || exit 0 - -if [ -n "${CONTENT_LENGTH}" -a "${CONTENT_LENGTH}" -gt 0 ]; then -(head -c "${CONTENT_LENGTH}"; echo)|sed 's/&/\n/g' \ - |sed -rn '/^((appName|appSlogan|svnRepo|gitRepo|flattrThingURL|paypalAddress|btcAddress|btcAdAddress)=.*|repoType=(svn|git)|(useFlattr|usePaypal|useBitcoin|btcAdGamble|btcAdErotic)=yes|advertise=(btcAd|no))$/{ - s:\+: :g;s:%:\\x:g;p}' \ - |while line="$(line)"; do - eval "$(echo -e "$line" |sed -r 's:[\n\r'\'']::g;s:^([a-zA-Z0-9_+-]+)=(.*)$:\1='"'\2'"':;')" - done -fi - -[ "$btcAdGamble" = yes -a "$btcAdErotic" = yes ] && btcAdContent=1 -[ "$btcAdGamble" != yes -a "$btcAdErotic" = yes ] && btcAdContent=2 -[ "$btcAdGamble" = yes -a "$btcAdErotic" != yes ] && btcAdContent=3 -[ "$btcAdGamble" != yes -a "$btcAdErotic" != yes ] && btcAdContent=4 - -echo "\ -name=$appName -slogan=$appSlogan -repoType=$repoType -svnRepo=$svnRepo -gitRepo=$gitRepo -useFlattr=$useFlattr -flattrThingURL=$flattrThingURL -usePaypal=$usePaypal -paypalAddress=$paypalAddress -useBitcoin=$useBitcoin -btcAddress=$btcAddress -advertise=$advertise -btcAdAddress=$btcAdAddress -btcAdContent=$btcAdContent -" >"$metafile" - -echo -n "Location: ${proto}://${HTTP_HOST}/?p=Admin\n\n" diff --git a/write/taskmeta.cgi b/write/taskmeta.cgi deleted file mode 100755 index 7b09551..0000000 --- a/write/taskmeta.cgi +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/zsh -# Copyright 2011 Paul Haensch -# This file is part of Busy -# -# Busy is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Busy is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Busy. If not, see . - -#info="$(egrep -o '(^|&)i=[0-9]{10}_[0-9]{3}(&|$)' <<<"${QUERY_STRING}" |tr -d '&i=')" -[ "$HTTPS" = "on" ] && PROTO=https || proto=http - -. ../auth/permissions.sh -$ACL_CREATETASK || echo "Location: ${proto}://${HTTP_HOST}/?p=Error&i=noaccess\n\n" -$ACL_CREATETASK || exit 0 - -info="$(sed -r 's:(^|.*&)i=(.*)|.*:\2:;s:&.*::' <<<"${QUERY_STRING}")" - -[ -z "$info" ] && info="$(date +%s)_$(apg -M N -a 1 -n 1 -m 3 -x 3)" -descfile="../Tasks/$info.meta" -commfile="../Tasks/$info.comment.$(date +%s)_$(apg -M N -a 1 -n 1 -m 3 -x 3)" - -[ -f "../Tasks/$info.lock" ] && rm "../Wiki/$info.lock" -anchor=$(ls ../Tasks |grep -A2 $info |grep '.meta$' |tail -n1 |cut -d. -f1) - -if [ -n "${CONTENT_LENGTH}" -a "${CONTENT_LENGTH}" -gt 0 ]; then -(head -c "${CONTENT_LENGTH}"; echo)|sed 's/&/\n/g' |while read line; do - if (egrep -xq 'headline=.+' <<<"${line}"); then - headline="$(cut -d= -f2- <<<"${line}" |sed 's/+/ /g;s/%/\\x/g')" - headline="$(echo -e "${headline}" |sed 's/\t/ /g;s/\r//g;s/\\/\\\\/g' |head -n1)" - elif (egrep -xq 'status=.+' <<<"${line}"); then - taskstatus="$(cut -d= -f2- <<<"${line}" |sed 's/+/ /g;s/%/\\x/g')" - taskstatus="$(echo -e "${taskstatus}" |sed 's/\t/ /g;s/\r//g;s/\\/\\\\/g' |head -n1)" - elif (egrep -xq 'section=.+' <<<"${line}"); then - section="$(cut -d= -f2- <<<"${line}" |sed 's/+/ /g;s/%/\\x/g')" - section="$(echo -e "${section}" |sed 's/\t/ /g;s/\r//g;s/\\/\\\\/g' |head -n1)" - elif (egrep -xq 'description=.+' <<<"${line}"); then - description="$(cut -d= -f2- <<<"${line}" |sed 's/+/ /g;s/%/\\x/g')" - description="$(echo -e "${description}" |sed 's/\r//g;s/\\/\\\\/g')" - elif (egrep -xq 'comm=.+' <<<"${line}"); then - comment="$(cut -d= -f2- <<<"${line}" |sed 's/+/ /g;s/%/\\x/g')" - comment="$(echo -e "${comment}" |sed 's/\r//g;s/\\/\\\\/g')" - elif (egrep -xq 'cancel=.+' <<<"${line}"); then - cancel="true" - elif (egrep -xq 'submit=Robots click here' <<<"${line}"); then - cancel="true" - fi -done -fi - -if [ -z "$cancel" -a -n "$comment" ]; then - touch "../Tasks/$info" - echo -e "author=${REMOTE_USER}" > "$commfile" - echo -e "${comment}" >> "$commfile" - echo -n "Location: ${proto}://${HTTP_HOST}/?p=Tasks&i=$info\n\n" -elif [ -z "$cancel" -a -n "$description" ]; then - touch "../Tasks/$info" - echo -e "headline=${headline}" > "$descfile" - echo -e "status=${taskstatus}" >> "$descfile" - echo -e "section=${section}" >> "$descfile" - echo -e "${description}" >> "../Tasks/$info" - echo -n "Location: ${proto}://${HTTP_HOST}/?p=Tasks#$anchor\n\n" -elif [ -n "$cancel" ]; then - echo -n "Location: ${proto}://${HTTP_HOST}/?p=Tasks#$anchor\n\n" -fi diff --git a/write/user_introedit.cgi b/write/user_introedit.cgi deleted file mode 120000 index a23710b..0000000 --- a/write/user_introedit.cgi +++ /dev/null @@ -1 +0,0 @@ -introedit.cgi \ No newline at end of file diff --git a/write/user_lock.cgi b/write/user_lock.cgi deleted file mode 120000 index a247558..0000000 --- a/write/user_lock.cgi +++ /dev/null @@ -1 +0,0 @@ -lock.cgi \ No newline at end of file diff --git a/write/user_projectmeta.cgi b/write/user_projectmeta.cgi deleted file mode 120000 index 7c85894..0000000 --- a/write/user_projectmeta.cgi +++ /dev/null @@ -1 +0,0 @@ -projectmeta.cgi \ No newline at end of file diff --git a/write/user_taskmeta.cgi b/write/user_taskmeta.cgi deleted file mode 120000 index b6544bf..0000000 --- a/write/user_taskmeta.cgi +++ /dev/null @@ -1 +0,0 @@ -taskmeta.cgi \ No newline at end of file diff --git a/write/user_wikiedit.cgi b/write/user_wikiedit.cgi deleted file mode 120000 index 368a76b..0000000 --- a/write/user_wikiedit.cgi +++ /dev/null @@ -1 +0,0 @@ -wikiedit.cgi \ No newline at end of file diff --git a/write/user_wikimeta.cgi b/write/user_wikimeta.cgi deleted file mode 120000 index 002e11e..0000000 --- a/write/user_wikimeta.cgi +++ /dev/null @@ -1 +0,0 @@ -wikimeta.cgi \ No newline at end of file diff --git a/write/wikiedit.cgi b/write/wikiedit.cgi deleted file mode 100755 index fc437ee..0000000 --- a/write/wikiedit.cgi +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/zsh -# Copyright 2011 Paul Haensch -# This file is part of Busy -# -# Busy is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Busy is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Busy. If not, see . - -[ "$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 - -info="$(egrep -o '(^|&)i=[0-9]{10}_[0-9]{3}(&|$)' <<<"${QUERY_STRING}" |tr -d '&=i')" -[ -f "../Wiki/$info.lock" ] && rm "../Wiki/$info.lock" - -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 'page=.+'); then - page="$(cut -d= -f2- <<<"${line}" |sed 's/+/ /g;s/%/\\x/g')" - page=$(echo -e "${page}" |sed 's/\t/ /g;s/\r//g;s/\\/\\\\/g') - elif (echo "${line}" | egrep -xq 'cancel=.+'); then - cancel=true - fi -done -fi - -[ -z "$cancel" -a -f "../Wiki/$info" ] && mv "../Wiki/$info" "../Wiki/$info.$(date +%s)" -[ -z "$cancel" ] && echo -e "${page}" >"../Wiki/$info" - -echo -n "Location: ${proto}://${HTTP_HOST}/?p=Wiki&i=$info\n\n" diff --git a/write/wikimeta.cgi b/write/wikimeta.cgi deleted file mode 100755 index af72eab..0000000 --- a/write/wikimeta.cgi +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/zsh -# Copyright 2011 Paul Haensch -# This file is part of Busy -# -# Busy is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Busy is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Busy. If not, see . - -[ "$HTTPS" = "on" ] && proto=https || proto=http -. ../auth/permissions.sh -env >../debug -$ACL_WIKIEDIT || echo "Location: ${proto}://${HTTP_HOST}/?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=')" - -[ -z "$info" ] && info="$(date +%s)_$(apg -M N -a 1 -n 1 -m 3 -x 3)" -descfile="../Wiki/$info.meta" -commfile="../Wiki/$info.comment.$(date +%s)_$(apg -M N -a 1 -n 1 -m 3 -x 3)" - -[ -f "../Wiki/$info.lock" ] && rm "../Wiki/$info.lock" -anchor=$(ls ../Wiki |grep -A2 $info |grep '.meta$' |tail -n1 |cut -d. -f1) - -if [ -n "${CONTENT_LENGTH}" -a "${CONTENT_LENGTH}" -gt 0 ]; then -(head -c "${CONTENT_LENGTH}"; echo)|sed 's/&/\n/g' |while read line; do - if (egrep -xq 'title=.+' <<<"${line}"); then - title="$(cut -d= -f2- <<<"${line}" |sed 's/+/ /g;s/%/\\x/g')" - title="$(echo -e "${title}" |sed 's/\t/ /g;s/\r//g;s/\\/\\\\/g' |head -n1)" - elif (egrep -xq 'desc=.+' <<<"${line}"); then - description="$(cut -d= -f2- <<<"${line}" |sed 's/+/ /g;s/%/\\x/g')" - description="$(echo -e "${description}" |sed 's/\r//g;s/\\/\\\\/g')" - elif (egrep -xq 'comm=.+' <<<"${line}"); then - comment="$(cut -d= -f2- <<<"${line}" |sed 's/+/ /g;s/%/\\x/g')" - comment="$(echo -e "${comment}" |sed 's/\r//g;s/\\/\\\\/g')" - elif (egrep -xq 'cancel=.+' <<<"${line}"); then - cancel="true" - fi -done -fi - -if [ -z "$cancel" -a -n "$comment" ]; then - touch "../Wiki/$info" - echo -e "author=${REMOTE_USER}" > "$commfile" - echo -e "${comment}" >> "$commfile" - echo -n "Location: ${proto}://${HTTP_HOST}/?p=Wiki&i=$info\n\n" -elif [ -z "$cancel" -a -n "$description" ]; then - touch "../Wiki/$info" - echo -e "title=${title}" > "$descfile" - echo -e "description=${description}" >> "$descfile" - echo -n "Location: ${proto}://${HTTP_HOST}/?p=Wiki#$anchor\n\n" -elif [ -n "$cancel" ]; then - echo -n "Location: ${proto}://${HTTP_HOST}/?p=Wiki#$anchor\n\n" -fi

General

News search results for: $search

$(date -d @$(cut -d_ -f1 <<<"$id"))

Sponsored Links:

Tasks search results for: $search

$(date -d @$(cut -d_ -f1 <<<"$id"))

$headline

$new

$title

$author wrote:

Table of Content

$title

$author wrote:

Wiki search results for: $search

$(grep '^title=' "$each.meta" |cut -d= -f2-)

$title

$(egrep '^name=.*$' project.meta |cut -d= -f2-)

Page not found or nevermore

News search results for: $search

$(date -d @$(cut -d_ -f1 <<<"$id"))

General

Tasks search results for: $search

$(date -d @$(cut -d_ -f1 <<<"$id"))

$headline

$new

$author wrote:

$title

Wiki search results for: $search

$(grep '^title=' "$each.meta" |cut -d= -f2-)

$title

$author wrote:

Table of Content

$title

$(egrep '^name=.*$' project.meta |cut -d= -f2-)