s4: s4-blog.sh comparison

comparison s4-blog.sh @ 898:411ce55c0dae

AJAX posting and PJAX file-viewer initially introduced.

author	HIROSE Yuuji <yuuji@gentei.org>
date	Sat, 02 Jan 2021 15:15:03 +0900
parents	bc52f605f41d
children	1fa8b4440f8f

comparison

equal deleted inserted replaced

-:3d437261edca
+:411ce55c0dae
 	  return
 	fi
 fi
 fi
 fi
+err "blog_showentry  Entered: `gdate +%S.%03N` blogrowid=$rowid"
 blog_notify=`getvalbyid blog notify "$rowid"`
 blog_team=`blog_getteam "$rowid"`
 blog_mode=`getvalbyid blog mode "$rowid"`
 case "$blog_notify" in # "all", "admin" or "no" (or NULL)
 admin)	notifyto=adm ;;
 		THEN ''
 		WHEN author = '$user'
 		THEN ''
 		ELSE 'Unreadable'
 		END"
+	  elif [ x"$blog_mode" = x"report-closed" ]; then
+	    F_UNREADABLE="CASE
+		WHEN author = '$user'
+		THEN ''
+		ELSE 'Unreadable'
+		END"
 	  else
 	    F_UNREADABLE="'Unreadable'"
 	  fi
 	fi
 else		# User blog
 # err "SELECT id from $tbl where rowid=$rowid"
 id=`query "select id from $tbl where rowid=$rowid;"`
 #err id=$id
 #err "select val from $ts where key='title' and id='$id';"
+## Parse control sequence
+nlimit=$listartlimit
+case "$control" in
+n:[Aa][Ll][Ll])
+unset nlimit ;;
+n:*)
+nlimit=${control##*:}
+nlimit=${nlimit%%[!A-Z0-9a-z_]*}
+;;
+f:[Aa][Ll][Ll])	;;
+f:2???-??-??*)	# f:2020-12-27T08:02:43
+fetch=${control#f:}
+fetch_ajax=`echo "'$fetch'"|tr T ' '`
+esac
+err control=$control fetch_ajax=$fetch_ajax
 #(1)Display root article
 cat<<EOF
 <form class="replyblog" action="$myname?replyblog+${rowid}#bottom" method="POST" enctype="multipart/form-data">
 <table class="bloghead">
 EOF
 	       END
 	FROM $ts WHERE id='$id' GROUP BY id;
 	EOF
 if test -s $midfile && IFS='|' read edit ctime hexhead blogtype < $midfile
 then
-cat<<-EOF
+if [ -z "$fetch_ajax" ]; then	# UUUUU
+cat<<-EOF
 	<tr><td>${edit:+$href }$ctime $blogtype $href2${edit:+$href3} $href4 $href5</td></tr>
 	<tr class="preface${frozen_class:+ }$frozen_class">
 	 <td>`echo "$hexhead"|unhexize|htmlescape|hreflink|minitbl`</td></tr>
 	</table>
 	EOF
 case "$blogtype" in
-"クイズ"|"XXXX集計")
+	"クイズ"|"XXXX集計")
-	echo "${blogtype}モードは本人と管理者の書き込みのみが表示されます。"
+	  echo "${blogtype}モードは本人と管理者の書き込みのみが表示されます。"
-	;;
+	  ;;
 esac | html p 'class="warn"'
+fi			# UUUUU
 if [ x"$blogtype" = x"クイズ" -o x"$blogtype" = x"XXXX集計" ]; then
 if $isgroup; then
 	# Failsafe to query timeout
 	qgrp=`sqlquote "$blogowner"`
 	cat<<-EOF > $quizmodefile
 fi
 else		# Cannot read SQL output
 echo "時間をおいて繋いでください(Please visit later)." | html p
 return
 fi
-## Parse control sequence
-nlimit=$listartlimit
-case "$control" in
-n:[Aa][Ll][Ll])
-	unset nlimit ;;
-n:*)
-	nlimit=${control##*:}
-	nlimit=${nlimit%%[!A-Z0-9a-z_]*}
-	;;
-esac
 lkhome="<a href=\"$myname?home" lke='">'
 lkedit="<a href=\"$myname?editart"
 hlink="$myname?home" elink="$myname?editart"
 catlink="$myname?showattc+article_m"
 deficon="img/file-icon.png"
 where blogid in
 (select id from blog where rowid=$rowid)
 $cond_qz) a
 LEFT JOIN
 a_s s
-ON a.id=s.id;
+ON a.id=s.id
+${fetch_ajax:+WHERE s.TIME > $fetch_ajax};
 EOF
 if [ $? -ne 0 -a ! -s $midfile ]; then
 echo "時間をおいてください(Visit later please)." | html p
 return
 fi
 	<th>$showalllink</td></th>
 	EOF
 else
 CAT=cat
 fi
+err "blog_showentry  Started: `gdate +%S.%03N` ${fetch_ajax:+ajax}"
 # Start blog_replies table
 $CAT $midfile |
 while IFS='|' read id edit notify uid author uname icon aid \
 	   tm reki new hte fa imgids
 do
 	echo -n "<td id=\"$aid\" class=\"repl\">"
 	echo "$hte"|unhexize|htmlescape|hreflink|minitbl
 	usecache='' tsfile=$td/$id.stamp
 	for i in $imgids; do
 	  mrid=${i%%:*}; i=${i#*:}; sz=`size_h ${i%%:*}`
+	  _href="href=\"$catlink+$mrid\""
 	  fn=`echo "${i#*:}"|unhexize`
 	  fnb=$fn"(${sz})"
 	  case "$fn" in
 	    *.[Pp][Nn][Gg]|*.[Jj][Pp][Gg]|*.[Jj][Pp][Ee][Gg]|*.[GgTt][Ii][Ff])
 	      #  fmt=${fn##*.}	# convert - jpg:- is slow...why
 		     { [ "$usecache" ] ||	# And usecache flag is true, or...
 			   { [ -s "$tsfile" ] && [ x"`cat $tsfile`" = x"$tm" ]
 			   };}; then
 		usecache=1		# Set usecache flag on
 		cat<<-EOF
-		<a href="$catlink+$mrid"><img src="$outfile">
+		<__UNCLICKABLE__><a $_href><img src="$outfile">
 		$fnb</a>
 		EOF
 		# !!NOTE!! Create row stamp ONLY WHEN imgcache is active
 	      else
 		query "SELECT hex(bin) FROM article_m WHERE rowid=$mrid;" \
 			      - ${fmt}:- > $outfile
 		then
 		  cat "$outfile" \
 		    | hexize \
 		    | sed -e 's/\(..\)/%\1/g' \
-	    		  -e "s|^|<a href=\"$catlink+$mrid\"><img src=\"data:image/$fmt,|" \
+	    		  -e "s|^|<__UNCLICKABLE__><a $_href><img src=\"data:image/$fmt,|" \
 			  -e "s|\$|\">$fnb</a>|"
 		  unset stampfile # img data stream is not suitable to cache
 		  echo $tm > $tsfile
 		else	# Failed to convert
 		  rm -f $outfile
-		  echo "<a href=\"$catlink+$mrid\">$fnb</a>"
+		  echo "<__UNCLICKABLE__><a $_href>$fnb</a>"
 		fi
 	      fi
 	      ;;
 	    *)
-	      echo "<__UNREADABLE__><a href=\"$catlink+$mrid\"><img src=\"$deficon\">$fnb</a>"
+	      echo "<__UNCLICKABLE__><a $_href><img src=\"$deficon\">$fnb</a>"
 	      ;;
 	  esac
 	done
 	echo "</td></tr>"
 } > "$cachefile.$$"	######## New ROW Creation Ends here ########
 else
 	mv -f $cachefile.$$ $cachefile
 fi
 test -n "$stampfile" && date "+%F %T" > $stampfile
 fi
+if [ -n "$fa" ]; then
+replhref="s/a href=[^>]*>/a>/"
+else
+replhref=""
+fi
 # Printing a cached row
 sed -e "/^<td class=/s/__NEWCLS__/$new${new:+ }/" \
 	-e "/^<td class=/s,__EDIT__,$editlink," \
 	-e "/^<__NOTIFY__>/s,,${notify:+$nt}," \
+	${replhref:+-e "/^<__UNCLICKABLE__>/$replhref"} \
+	${replhref:+-e "/^<__UNREADABLE__>/$replhref"} \
+	-e "/<__UNCLICKABLE__>/s///" \
 	-e "/<__UNREADABLE__>/s,,${fa:+$cannotread}," \
 	$cachefile
 done
 help="=== コメントに使用できる特殊記法(記号は全て半角) ===
 </textarea>$touchhelp</td></tr>
 <tr><td>添付ファイル(${filesize_max_MB}以下):
 `cgi_file image "" "$file_accept title=\"$filehelp\" multiple"`
 </td></tr>
 </table>
-<input type="submit" value="送信" class="$blog_notify" title="$ntmode">
+<input type="hidden" name="fetchtime" value="`date +%FT%T`">
+<input type="hidden" name="filesize_max" value="$filesize_max">
+<input type="submit" id="c" value="送信" class="$blog_notify" title="$ntmode">
 <input type="reset" value="リセット"></div></div>
 EOF
-	)
+	  )
 cat<<-EOF
 	</table> <!-- end of s4-blog:blog_showentry() main table -->
 	<p class="update_link"><a
 	 href="?reload/$rowid" accesskey="r"
 	  title="Shortcut: R${nl}Reload">再読込</a> / <a
 	EOF
 # Clean up orphaned icon cache
 [ -s $iconcleaner ] && query ".read '$iconcleaner'"
 # Record access log
 acclog blog $rowid
+err "blog_showentry Finished: `gdate +%S.%03N` ${fetch_ajax:+ajax}"
 }
 lshandout() {
 # $1=rowid of blog (numericalized in s4.cgi)
 blog_writable $1 $user
 	    -D_DUMPTABLE_="syscmd(cat)" -D_DUMPHEAD_="" \
 	    $layout/html.m4.html $layout/form+dump-whead.m4.html
 err "blog_reply Finished: `gdate +%S.%03N` user=$user owner=[$owner] title=[$title]"
 }
+blog_fetch() {
+contenttype "text/plain; charset=utf-8"; echo
+err blog_fetch: blog "$@"
+blog_reply "$@"
+# blog_showentry blog "$@"
+}
 blog_reply_article() {		# Direct link to article in some blog
 arid=${1:-0}			# Already sanitized to digits
 brid=`query "SELECT rowid FROM blog WHERE \
 	       id=(SELECT blogid FROM article WHERE rowid=$arid);"`
 if [ -n "$brid" ]; then

Mercurial > hgrepos > hgweb.cgi > s4

comparison s4-blog.sh @ 898:411ce55c0dae