diff --git a/examples/common/default/default.css b/examples/common/default/default.css index d3ea51c..8cff198 100644 --- a/examples/common/default/default.css +++ b/examples/common/default/default.css @@ -343,8 +343,6 @@ li.casmenu:hover div, li.casmenu:active div, li.casmenu div:hover, li.casmenu div:active {display: block;} - - /* * PR Web diff --git a/s4-annex.sh b/s4-annex.sh deleted file mode 100755 index 7df353b..0000000 --- a/s4-annex.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh - -if [ -z "$S4MASTERDB" -o ! -s "$S4MASTERDB" ]; then - return -fi -if [ "$db" -ef "$S4MASTERDB" ]; then - return # Points to the same file -fi - -# Now S4ANNEX mode is ACTIVE -# sessdb=`dirname $S4MASTERDB`/sess.sq3 -## skey="skey-`basename $mydir`" -S4NAME="[$S4WORLD]$S4NAME" -syncflag=${db%.*}.synctime -userupdateflag=`dirname $S4MASTERDB`/`basename $userupdateflag` -test ! -e "$userupdateflag" && return -test "$syncflag" -nt "$userupdateflag" && return - -# for sub.sq3 -# -# main: user: 'taro', 'hanako', 'shige' -# sub: user: 'taro', 'hanako', 'shige' -# sub2: user_s: ('taro', 't'), ('hanako', 'h'), ('shige', 's') -# then update -# - -## sqlite3 -cmd '.timer 1' -cmd '.echo 1' $db <> tmp/debug.out + . ./s4-world.sh 2>> tmp/debug.out fi v="" for i in $S4WORLDS; do @@ -1238,10 +1237,10 @@ for kv in `echo $HTTP_COOKIE|sed 's/[;, ]/ /g'`; do k="${kv%%=*}" v="`echo ${kv#*=}|nkf -Ww -mQ|sed -e 's/\"/\"\"/g'`" -err "GetCookie: $k=[$v]" + ## err "GetCookie: $k=[$v]" case "$k" in user) _user="$v" ;; - skey) _skey="$v"; k=skey ;; + skey) _skey="$v" ;; esac query "replace into cookie values('$session', '$k', 'string', \"$v\");" done @@ -1348,7 +1347,7 @@ # $1=passwd dbpswd=`getpwfield $user pswd` encpswd=`mycrypt "$1" "$dbpswd"` - # err user=$user, pswd=$1, db=$dbpswd, enc=$encpswd + ## err user=$user, pswd=$1, db=$dbpswd, enc=$encpswd [ x"$dbpswd" = x"$encpswd" ] } mypwhash() { @@ -1401,7 +1400,6 @@ newsession=`genrandom 34` if setskey "$user" "$newsession" && dbsetbyid user "$user" login "`date '+%F %T'`"; then - # err gencookie "user=$user" "skey=$newsession" gencookie "user=$user" "skey=$newsession" return 0 else diff --git a/s4-world.sh b/s4-world.sh new file mode 100755 index 0000000..125b4fc --- /dev/null +++ b/s4-world.sh @@ -0,0 +1,72 @@ +#!/bin/sh + +if [ -z "$S4MASTERDB" -o ! -s "$S4MASTERDB" ]; then + return +fi +if [ "$db" -ef "$S4MASTERDB" ]; then + return # Points to the same file +fi + +# Now Another world is ACTIVE +# sessdb=`dirname $S4MASTERDB`/sess.sq3 +## skey="skey-`basename $mydir`" +S4NAME="[$S4WORLD]$S4NAME" +syncflag=${db%.*}.synctime +userupdateflag=`dirname $S4MASTERDB`/`basename $userupdateflag` +test ! -e "$userupdateflag" && return +test "$syncflag" -nt "$userupdateflag" && return + +# for sub.sq3 +# +# main: user: 'taro', 'hanako', 'shige' +# sub: user: 'taro', 'hanako', 'shige' +# sub2: user_s: ('taro', 't'), ('hanako', 'h'), ('shige', 's') +# then update +# + +## sqlite3 -cmd '.timer 1' -cmd '.echo 1' $db <