change upload names to allow for transcoding

[rawnet] / page_channel.sh

diff --git a/page_channel.sh b/page_channel.sh
index a1e0161d95c9fa90a952803aed48300d313a4dac..89720d2acb9faa74a84ca9bc12c6fb760d193416 100755 (executable)
--- a/page_channel.sh
+++ b/page_channel.sh
@@ -37,7 +37,7 @@ AUTHOR(){
     if [ ! "$USER_ID" ]; then
       REDIRECT "${_BASE}/channel/#ERROR_NEWCHANNEL_NOTALLOWED"
     elif new_channel "$channel"; then
-      REDIRECT "${_BASE}/channel/${channel}/edit"
+      REDIRECT "${_BASE}/channel/$channel/edit"
     else
       REDIRECT "${_BASE}/channel/#ERROR_NEWCHANNEL_NOLOCK"
     fi
@@ -46,38 +46,38 @@ AUTHOR(){
     if [ ! "$channel" ]; then
       REDIRECT "${_BASE}/channel/#ERROR_NOCHANNEL"
     elif [ ! "$USER_ID" ]; then
-      REDIRECT "${_BASE}/channel/${channel}/#ERROR_NOTLOGGEDIN"
+      REDIRECT "${_BASE}/channel/$CHANNEL_ID/#ERROR_NOTLOGGEDIN"
     elif ! AUTHOR; then
-      REDIRECT "${_BASE}/channel/${channel}/#ERROR_UPDATE_NOTALLOWED"
+      REDIRECT "${_BASE}/channel/$CHANNEL_ID/#ERROR_UPDATE_NOTALLOWED"
     elif update_channel "$channel" "name=$(POST name)" \
                         "description=$(POST description)" \
                         "authors=$USER_ID"; then
-      REDIRECT "${_BASE}/channel/${channel}/"
+      REDIRECT "${_BASE}/channel/$CHANNEL_ID/"
     else
-      REDIRECT "${_BASE}/channel/${channel}/#ERROR_UPDATE_NOLOCK"
+      REDIRECT "${_BASE}/channel/$CHANNEL_ID/#ERROR_UPDATE_NOLOCK"
     fi
     ;;
   update_channel_cancel)
-    REDIRECT "${_BASE}/channel/${channel}/"
+    REDIRECT "${_BASE}/channel/$CHANNEL_ID/"
     ;;
   newvideo)
     video="$(POST video |checkid)"
 
     AUTHOR \
-    && mkdir -p -- "${_DATA}/${channel}/"
+    && mkdir -p -- "${_DATA}/$CHANNEL_ID/"
 
     if [ ! "$video" ]; then
-      REDIRECT "${_BASE}/channel/${channel}/#ERROR_INVALID_ID"
+      REDIRECT "${_BASE}/channel/$CHANNEL_ID/#ERROR_INVALID_ID"
     elif [ ! "$channel" ]; then
       REDIRECT "${_BASE}/channel/#ERROR_NOCHANNEL"
     elif [ ! "$USER_ID" ]; then
-      REDIRECT "${_BASE}/channel/${channel}/#ERROR_NOTLOGGEDIN"
+      REDIRECT "${_BASE}/channel/$CHANNEL_ID/#ERROR_NOTLOGGEDIN"
     elif ! AUTHOR; then
-      REDIRECT "${_BASE}/channel/${channel}/#ERROR_UPDATE_NOTALLOWED"
+      REDIRECT "${_BASE}/channel/$CHANNEL_ID/#ERROR_UPDATE_NOTALLOWED"
     elif new_video "$video"; then
-      REDIRECT "${_BASE}/channel/${channel}/${video}/"
+      REDIRECT "${_BASE}/channel/$CHANNEL_ID/${video}/"
     else
-      REDIRECT "${_BASE}/channel/${channel}/#ERROR_NEWVIDEO_NOLOCK"
+      REDIRECT "${_BASE}/channel/$CHANNEL_ID/#ERROR_NEWVIDEO_NOLOCK"
     fi
     ;;
 esac
@@ -92,7 +92,7 @@ w_video(){
     VIDEO_LENGTH="${VIDEO_LENGTH%.*}"
     [ "${VIDEO_STATUS}" = public ] || AUTHOR || return 0
 
-    thumb="${_BASE}/video/${CHANNEL_ID}/${VIDEO_ID}_thumb.jpg"
+    thumb="${_BASE}/video/${CHANNEL_ID}/${VIDEO_ID}.thumb.jpg"
     [ "$NAME" = \\ ] && NAME="(Unnamed Video)"
     printf '[div .video .thumb
               [a href="%s/channel/%s/%s/"
@@ -144,10 +144,10 @@ w_channel_list(){
 if [ "$channel" -a "$video" ]; then
   . ${_EXEC}/page_video.sh
 elif [ "$channel" -a "$action" = edit ]; then
-  AUTHOR || REDIRECT "${_BASE}/${channel}/#ERROR_EDIT_NOTALLOWED"
+  AUTHOR || REDIRECT "${_BASE}/$CHANNEL_ID/#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"]
+         [input name="name" value="$(HTML "$CHANNEL_NAME")" placeholder="Channel Name" autocomplete=off]
          [textarea name="description" placeholder="Description" . $(HTML "$CHANNEL_DESCRIPTION")]
          [submit "action" "update_channel" . Update]
          [submit "action" "update_channel_cancel" . Cancel]