diff --git a/webroot/channel.shs b/webroot/channel.shs index 5c0c541..3904017 100644 --- a/webroot/channel.shs +++ b/webroot/channel.shs @@ -21,7 +21,7 @@ IFS=$'\n' video_title=($(jq -r '.entries[].title' <<< $data)) video_id=($(jq -r '.entries[].id' <<< $data)) -echo "

$title

Subscribe!
" +echo "

$title

Subscribe!
" for (( i=0; i<${#video_id[@]}; i++ )); do echo "
${video_title[$i]}

" diff --git a/webroot/fav.shs b/webroot/fav.shs index 48539d7..312f923 100644 --- a/webroot/fav.shs +++ b/webroot/fav.shs @@ -1,6 +1,6 @@ #!/bin/bash -if session_verify ${cookies[sh_session]} && [[ ${get_data[v]} != '' ]]; then +if session_verify "${cookies[sh_session]}" && [[ "${get_data[v]}" != '' ]]; then title=$(haruhi-dl $([[ ${cfg[_cookies]} != "" ]] && echo -n -- "-c ${cfg[_cookies]}") -e "https://youtube.com/watch?v=${get_data[v]}") if [[ $(grep -F "$title" storage/faves | grep "$(echo ${cookies[username]} | sed -E "s/\r//")") == '' ]]; then echo "$(session_get_username ${cookies[sh_session]}):${get_data[v]}:$title" >> storage/faves diff --git a/webroot/login.shs b/webroot/login.shs index 63e818b..d8b879d 100755 --- a/webroot/login.shs +++ b/webroot/login.shs @@ -1,10 +1,9 @@ #!/bin/bash if [[ ${post_data[login]} != '' && ${post_data[password]} != '' ]]; then - login ${post_data[login]} ${post_data[password]} + login "${post_data[login]}" "${post_data[password]}" status=$? if [[ $status == 0 ]]; then - echo ${get_data[r]} > /dev/stderr if [[ ${get_data[r]} == '' ]]; then meta[redirect]='/' else @@ -16,7 +15,7 @@ fi source templates/head.sh if [[ $status == 1 && $reason != '' ]]; then - echo $reason + echo "$reason" fi echo "

Log in...

@@ -26,5 +25,4 @@ echo "

Log in...


- -(please make sure that you're connecting over SSL)" +" diff --git a/webroot/unsubscribe.shs b/webroot/unsubscribe.shs index b7c31b6..ae2bf4f 100644 --- a/webroot/unsubscribe.shs +++ b/webroot/unsubscribe.shs @@ -1,8 +1,8 @@ #!/bin/bash -if session_verify ${cookies[sh_session]} && [[ ${get_data[id]} != '' ]]; then - name=$(session_get_username ${cookies[sh_session]}) - channel=$(echo -n ${get_data[id]} | sed -E 's/\r//g') +if session_verify "${cookies[sh_session]}" && [[ "${get_data[id]}" != '' ]]; then + name=$(session_get_username "${cookies[sh_session]}") + channel=$(sed -E 's/\r//g' <<< "${get_data[id]}") sed -i "/^$name:$channel/d" storage/subscribed fi meta[redirect]='subscribe.shs' diff --git a/webroot/watch.shs b/webroot/watch.shs index 139b7e3..ad67f01 100755 --- a/webroot/watch.shs +++ b/webroot/watch.shs @@ -1,7 +1,7 @@ #!/bin/bash -if [[ ${get_data[v]} ]]; then - if [[ ${get_data[v]} == '18l' || ${get_data[v]} == '5eFdt6Y_34E' ]]; then +if [[ "${get_data[v]}" ]]; then + if [[ "${get_data[v]}" == '18l' || "${get_data[v]}" == '5eFdt6Y_34E' ]]; then uploader='MyMusicGroup' title='█▬█ █ ▀█▀ Jeden Osiem L - Jak Zapomnieć (Oficjalny Teledysk)' url='http://sakamoto.pl/tmp/videoplayback_.webm' @@ -48,12 +48,12 @@ if [[ ${get_data[v]} ]]; then $(echo $video | jq -r '.view_count') views
$(echo $video | jq -r '.like_count') likes, $(echo $video | jq -r '.dislike_count') dislikes.
" if [[ ${cookies[sh_session]} ]]; then - if [[ $(grep $(session_get_username ${cookies[sh_session]}) storage/faves | grep ${get_data[v]}) == '' ]]; then - echo "Add to favourites
" + if [[ $(grep $(session_get_username "${cookies[sh_session]}") storage/faves | grep "${get_data[v]}") == '' ]]; then + echo "Add to favourites
" else - echo "Remove from favourites
" + echo "Remove from favourites
" fi - if [[ $(grep $(session_get_username ${cookies[sh_session]}) storage/subscribed | grep $channel_id) == '' ]]; then + if [[ $(grep $(session_get_username "${cookies[sh_session]}") storage/subscribed | grep "$channel_id") == '' ]]; then echo "Subscribe to $uploader!
" else echo "Unsubscribe from $uploader
" @@ -71,7 +71,7 @@ if [[ ${get_data[v]} ]]; then echo "

Recommended

" for i in $(echo "$vid" | grep -ohE "watch\?v\=[A-zaz0-9]{11}" | uniq | cut -c 9-19); do - echo "

"; + echo "

"; done echo "

Comments

"