Merge commit 'b5b935acd56a1b3aaebf1a6b2a574807366d21fb'

[rawnet] / page_channel.sh

diff --git a/page_channel.sh b/page_channel.sh
old mode 100644 (file)
new mode 100755 (executable)
index 223f882..d12f417
--- a/page_channel.sh
+++ b/page_channel.sh
@@ -26,7 +26,7 @@ if [ "$channel" -a -f "$chan_db" -a -r "$chan_db" ]; then
        $(grep "^${channel}     " "${chan_db}")
        EOF
   if [ "$CHANNEL_ID" ]; then
-           CHANNEL_NAME="$(UNSTRING "$CHANNEL_NAME")"
+           CHANNEL_NAME="$(UNSTRING "${CHANNEL_NAME}")"
     CHANNEL_DESCRIPTION="$(UNSTRING "$CHANNEL_DESCRIPTION")"
         CHANNEL_AUTHORS="$(UNSTRING "$CHANNEL_AUTHORS")"
     CHANNEL_DESCR_CACHE="$(UNSTRING "$CHANNEL_DESCR_CACHE")"
@@ -124,9 +124,10 @@ w_channel(){
   local ID NAME DESCRIPTION LOGO THEME AUTHORS DESCR_CACHE FUTUREUSE
   if read -r ID NAME DESCRIPTION LOGO THEME AUTHORS DESCR_CACHE FUTUREUSE; then
     vid_db="${_DATA}/${ID}/videos.db"
+    [ "$NAME" = \\ ] && NAME="(UNNAMED CHANNEL)"
     cat <<-EOF
        [div .channel
-         [h2 . $(UNSTRING "$NAME" |HTML)]
+         [h2 [a href="${_BASE}/channel/${ID}/" $(UNSTRING "${NAME}" |HTML)]]
          [div .description . $(UNSTRING "$DESCR_CACHE")]
          $( [ -f "$vid_db" -a -r "$vid_db" ] \
             && while w_video "$ID"; do :; done <"$vid_db"
@@ -153,16 +154,21 @@ w_channel_list(){
 if [ "$channel" -a "$video" ]; then
   . ${_EXEC}/page_video.sh
 elif [ "$channel" -a "$action" = edit ]; then
+  [ "$USER_ID" -a ! "${CHANNEL_AUTHORS##*${USER_ID}*}" ] \
+  || REDIRECT "${_BASE}/${channel}/#ERROR_EDIT_NOTALLOWED"
   yield_page "$CHANNEL_NAME - Edit" "channel edit" <<-EOF
        [form .channel .edit method=POST
          [input name="name" value="$(HTML "$CHANNEL_NAME")" placeholder="Channel Name"]
-         <textarea name="description" placeholder="Description">$(HTML "$CHANNEL_DESCRIPTION")</textarea>
+         [textarea name="description" placeholder="Description" . $(HTML "$CHANNEL_DESCRIPTION")]
          [submit "action" "update_channel" . Update]
        ]
        EOF
 elif [ "$channel" ]; then
   yield_page "$CHANNEL_NAME" "channel" <<-EOF
        [h1 .name $(HTML "$CHANNEL_NAME")]
+       $( [ "$USER_ID" -a ! "${CHANNEL_AUTHORS##*${USER_ID}*}" ] \
+           && printf '[a href="edit" edit]'
+        )
        [div .description . ${CHANNEL_DESCR_CACHE}]
        [div .videos
          $( [ -f "$vid_db" -a -r "$vid_db" ] \