X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=handlers%2F60_move_rename_delete.sh;h=bbe994e4f7a44911d18e10f7cc4eca923d0518dc;hb=65676ea8331f60d882e3baec99c101382e9fad57;hp=be84ca8afc40e856fad03cb1a4ec354e52135c22;hpb=1addbd404bc8cd6f869e9e1df19cc83081fa7bc2;p=shellwiki diff --git a/handlers/60_move_rename_delete.sh b/handlers/60_move_rename_delete.sh index be84ca8..bbe994e 100755 --- a/handlers/60_move_rename_delete.sh +++ b/handlers/60_move_rename_delete.sh @@ -105,11 +105,14 @@ if [ "$action" = rename -a "$newname" ]; then printf 'Refresh: %i\r\n' 4 theme_error 403 return 0 - else + elif [ "$REV_PAGES" = true ]; then git -C "$_DATA" mv "pages/$oldname" "pages/$newname" git -C "$_DATA" commit -m 'Page # '"$oldname"' # renamed to # '"$newname"' # by user @ '"$USER_NAME"' @' \ -- "pages/$oldname" "pages/$newname" REDIRECT "$_BASE${newname}" + else + mv -- "$_DATA/pages/$oldname" "$_DATA/pages/$newname" + REDIRECT "$_BASE${newname}" fi elif [ "$action" = move -a "$newlocation" ]; then oldname="${PATH_INFO%\[*\]}" @@ -131,11 +134,14 @@ elif [ "$action" = move -a "$newlocation" ]; then printf 'Refresh: %i\r\n' 4 theme_error 403 return 0 - else + elif [ "$REV_PAGES" = true ]; then git -C "$_DATA" mv "pages/${oldname}" "pages/${newname}" git -C "$_DATA" commit -m 'Page # '"$oldname"' # moved to # '"$newname"' # by user @ '"$USER_NAME"' @' \ -- "pages/${oldname}" "pages/${newname}" REDIRECT "$_BASE${newname}" + else + mv -- "$_DATA/pages/$oldname" "$_DATA/pages/$newname" + REDIRECT "$_BASE${newname}" fi elif [ "$action" = delete ]; then oldname="${PATH_INFO%\[*\]}" @@ -143,13 +149,18 @@ elif [ "$action" = delete ]; then printf 'Refresh: %i\r\n' 4 theme_error 403 return 0 - else + elif [ "$REV_PAGES" = true ]; then git -C "$_DATA" rm "pages/${oldname}/#page.md" git -C "$_DATA" commit -m 'Page # '"$oldname"' # deleted by user @ '"$USER_NAME"' @' \ -- "pages/${oldname}/#page.md" rm -r -- "$_DATA/pages/${oldname}"/\#* rmdir -- "$_DATA/pages/${oldname}/" || true REDIRECT ./ + else + rm -- "$_DATA/pages/${oldname}/#page.md" + rm -r -- "$_DATA/pages/${oldname}"/\#* + rmdir -- "$_DATA/pages/${oldname}/" || true + REDIRECT ./ fi elif [ "$action" = cancel ]; then REDIRECT ./