X-Git-Url: http://git.plutz.net/?p=busy;a=blobdiff_plain;f=index.cgi;h=1612a9fb89d42c75dd024c4858f6a15fa97f7345;hp=4f3a10f47c36510a8c649abc4028e8c630f6b9d2;hb=470dbac80eb2334fdb04a85e448d6194140d250d;hpb=766fa0c3db0db95dff75858caeab75e7fa3d1ef0

diff --git a/index.cgi b/index.cgi
index 4f3a10f..1612a9f 100755
--- a/index.cgi
+++ b/index.cgi
@@ -18,16 +18,15 @@
 
 umask=002
 alias _wiki="stx2any --no-template --link-abbrevs --quote -T html"
+. auth/acl.sh
 
 page=$(egrep -o '(^|&)p=[a-zA-Z0-9/_-]+(&|$)' <<<"${QUERY_STRING}" |sed 's,&,,g;s,p=,,')
 
 [ -z "$LOGIN" ] && LOGIN=false
-[ -z "$DEV" ] && DEV=false
-[ -z "$ADM" ] && ADM=false
 [ -z "$page" ] && page=Home
 
 if (! $LOGIN && egrep -qx "https?://${HTTP_HOST}/(session.cgi\?|write/).*" <<<"${HTTP_REFERER}"); then
-  echo -n "Location: http://${HTTP_HOST}/session.cgi?${QUERY_STRING}\n\n"
+  echo -n "Location: https://${HTTP_HOST}/session.cgi?${QUERY_STRING}\n\n"
   exit 0
 fi
 
@@ -42,6 +41,7 @@ cat <<END_index.cgi
     <title>Busy</title>
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
     <link rel="stylesheet" type="text/css" href="busy.css">
+    <link rel="stylesheet" type="text/css" href="wikitext.css">
     $([ -r "${page}.css" ] && echo '<link rel="stylesheet" type="text/css" href="'"$page"'.css">')
     <style type="text/css"><!-- --></style>
     <script type="text/javascript">
@@ -61,7 +61,7 @@ function hide_screen(id){
       <span id="SLOGAN">$(egrep '^slogan=.*$' project.meta |cut -d= -f2-)</span>
     </div>
     <div id="USERMENU">
-$( $LOGIN || echo '<form action="/login.cgi?'${QUERY_STRING:gs/&/&amp;/}'" method="post" accept-charset="UTF-8">
+$( $LOGIN || echo '<form action="https://'${HTTP_HOST}'/login.cgi?'${QUERY_STRING:gs/&/&amp;/}'" method="post" accept-charset="UTF-8">
 		     Login:<br>
 		     <input type="text" name="user" value placeholder="Username"><br>
 		     <input type="password" name="pass" value placeholder="Password"><br>
@@ -73,7 +73,7 @@ $( $LOGIN || echo '<form action="/login.cgi?'${QUERY_STRING:gs/&/&amp;/}'" metho
     <div id="MENU">
       <a href='/?p=Home'>Home</a>
       <a href='/?p=Wiki'>Wiki</a>
-      <a href='/?p=Code'>Code</a>
+      <a href='/?p=Subversion'>Code</a>
       <a href='/?p=Tasks'>Tasks</a>
     </div>
       $(if [ -r "./${page}.page" ]; then