1.1 --- a/s4-cgi.sh	Tue Jun 23 12:58:31 2020 +0900
     1.2 +++ b/s4-cgi.sh	Thu Dec 17 07:36:56 2020 +0900
     1.3 @@ -57,6 +57,12 @@
     1.4    # $1=name $2=val(as filename) $3=args(if any)
     1.5    ## err cgi_file: \$1=$1 \$2=$2 \$3="[$3]"
     1.6    # Using global variable $dir
     1.7 +  case "$3" in
     1.8 +    *multiple*)
     1.9 +      onemore='<button type="button" id="morefile" title="More attachment file">添付追加</button>'
    1.10 +      multiple="$nl$onemore"
    1.11 +      ;;
    1.12 +  esac
    1.13    if [ -n "$2" -a -s "$dir/$2" ]; then
    1.14      file=$dir/$2
    1.15      bn=${file##*/}
    1.16 @@ -66,13 +72,14 @@
    1.17    fi
    1.18    cat<<EOF
    1.19   ${icon}
    1.20 -<input type="file" name="$1" value="$bn" $3>
    1.21 +<input type="file" name="$1" value="$bn" $3>$multiple
    1.22  EOF
    1.23  )
    1.24  cgi_multi() (
    1.25    # $1=name $2=dir $3=func $4=args...
    1.26    # `dir' should contain $name.count and $name.N where N is 1 upto N
    1.27    i=1 name=$1 dir=$2 func=$3
    1.28 +  argnomulti=`echo "$4"|sed 's/multiple//'` # No multiple for Replaced entres
    1.29    n=`cat $dir/$name.count`
    1.30    case "$func" in
    1.31      *file) addrename=yes ;;
    1.32 @@ -82,21 +89,26 @@
    1.33      file=$name.$i
    1.34      vname=$file.`cat "$dir/$file.rowid"`
    1.35      val="`cat $dir/$file`"
    1.36 +    if [ -n "$addrename" ]; then
    1.37 +      # ${var:+..} cannot be used for inside-quotes incompatibility of shells
    1.38 +      ren1="<input class=\"action\" type=\"radio\" name=\"action.$vname\"
    1.39 +	id=\"mv.$vname\" value=\"mv\"><label for=\"mv.$vname\"
    1.40 +	title=\"Rename\">名前変更</label>"
    1.41 +      ren2="<input class=\"mv\" type=\"text\" name=\"mv.$vname\" value=\"$val\">"
    1.42 +    fi
    1.43      cat<<EOF
    1.44   <tr><td>($i)</td><td>
    1.45  <input class="action" type="radio" name="action.$vname" id="keep.$vname"
    1.46   value="keep"><label for="keep.$vname" title="Keep">温存</label>
    1.47  <input class="action" type="radio" name="action.$vname" id="edit.$vname"
    1.48   value="edit"><label for="edit.$vname" title="Replace">修正</label>
    1.49 -${addrename:+<input class="action" type="radio" name="action.$vname"
    1.50 - id="mv.$vname" value="mv"><label for="mv.$vname"
    1.51 -  title="Rename">名前変更</label>}
    1.52 +$ren1
    1.53  <input class="action" type="radio" name="action.$vname" id="rm.$vname"
    1.54   value="rm"><label for="rm.$vname" title="Remove">削除</label>
    1.55  <label class="confirm" title="OK?">本当に消します<input class="confirm" type="checkbox"
    1.56   name="confirm.$vname" value="yes">はい</label><br>
    1.57 -`$func $vname "$val" "$4"`<span>$val</span>
    1.58 -${addrename:+<input class="mv" type="text" name="mv.$vname" value="$val">}
    1.59 +`$func $vname "$val" "$argnomulti"`<span>$val</span>
    1.60 +$ren2
    1.61  </td></tr>
    1.62  EOF
    1.63      i=$((i+1))