diff s4-funcs.sh @ 1042:99ba706d5fdb draft default tip

Update ctime on (un)set frozen on blog
author HIROSE Yuuji <yuuji@gentei.org>
date Thu, 02 May 2024 10:23:10 +0900
parents 8682149ed229
children
line wrap: on
line diff
--- a/s4-funcs.sh	Sun Apr 21 12:16:44 2024 +0900
+++ b/s4-funcs.sh	Thu May 02 10:23:10 2024 +0900
@@ -504,6 +504,9 @@
     fi
   }
 fi >/dev/null 2>&1
+curtimestamp() {
+  date "${*:-+%F %T}"
+}
 ismember() {
   # $1=user, $2=group
 #err ismem: "select user from grp_mem where gname=$(sqlquote $2) and user='$1';"
@@ -807,7 +810,7 @@
   # $1=table, $2=rowid
   n=${2%%[!-0-9]*}	# Remove non-digit chars from $2(should be rowid)
   if [ -n "$n" ]; then
-    now=`date +"%F %T"`
+    now=`curtimestamp`
     #query "replace into acclog values('$user', '$1', '$n', '$now');"
     #query "replace into acclog values('$user', '$1', $n, '$now');"
     query "replace into tblaccesses values('$user', '$1', $n, '$now');"
@@ -941,7 +944,7 @@
     user|author)		# author added 2015-06-18 for article(author)
       echo "$user" ;;
     stamp|datetime)
-      date "+%F %T" ;;
+      curtimestamp ;;
     serial)
       (s=`getpar $2`
        if [ -n "$s" ]; then echo $s; else echo "`date +%s`x$$"; fi) ;;
@@ -1553,7 +1556,7 @@
   if pwcheck "$pswd"; then
     newsession=`genrandom 34`
     if setskey "$user" "$newsession" &&
-	dbsetbyid user "$user" login "`date '+%F %T'`"; then
+	dbsetbyid user "$user" login "`curtimestamp`"; then
       gencookie "user=$user" "skey=$newsession"
       return 0
     else

yatex.org