Bugfix: faulty error messages in move/rename/delete

[shellwiki] / handlers / 60_move_rename_delete.sh

diff --git a/handlers/60_move_rename_delete.sh b/handlers/60_move_rename_delete.sh
index 47886c59d8f1f44130f3c31b27c59194caf79d05..d27fb3937c103f564e30bd6e0e1e05a874b9a512 100755 (executable)
--- a/handlers/60_move_rename_delete.sh
+++ b/handlers/60_move_rename_delete.sh
@@ -1,6 +1,20 @@
 #!/bin/sh
 
-l10n_immutablepage 2>&1 >/dev/null \
+# Copyright 2022 - 2023 Paul Hänsch
+# 
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+# 
+# THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+# IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+l10n_immutablepage >/dev/null 2>&1 \
 || l10n_immutablepage(){  #TRANSLATION
   cat <<-EOF
          <h1>Immutable Page</h1>
@@ -33,7 +47,7 @@ case "${PATH_INFO}" in
   *) return 1;;
 esac
 
-l10n_movepage 2>&1 >/dev/null \
+l10n_movepage >/dev/null 2>&1 \
 || l10n_movepage(){  # TRANSLATION
   cat <<-EOF
          <h1>Move Page</h1>
@@ -49,7 +63,7 @@ l10n_movepage 2>&1 >/dev/null \
          <button type=submit name=action value=cancel>Cancel</button>
        EOF
 }
-l10n_renamepage 2>&1 >/dev/null \
+l10n_renamepage >/dev/null 2>&1 \
 || l10n_renamepage(){  # TRANSLATION
   cat <<-EOF
          <h1>Rename Page</h1>
@@ -65,7 +79,7 @@ l10n_renamepage 2>&1 >/dev/null \
          <button type=submit name=action value=cancel>Cancel</button>
        EOF
 }
-l10n_deletepage 2>&1 >/dev/null \
+l10n_deletepage >/dev/null 2>&1 \
 || l10n_deletepage(){  # TRANSLATION
   cat <<-EOF
          <h1>Delete Page</h1>
@@ -124,7 +138,7 @@ if [ "$action" = rename -a "$newname" ]; then
 
   if [ -d "$_DATA/pages/$newname" ]; then
     printf 'Refresh: %i\r\n' 4
-    export ERRORMSG="A location of that name already exists."
+    export ERROR_MSG="A location of that name already exists."
     theme_error 400
     return 0
   elif ! acl_write "$oldname" || ! acl_write "$newname"; then
@@ -148,12 +162,12 @@ elif [ "$action" = move -a "$newlocation" ]; then
 
   if [ -d "$_DATA/pages/$newname" ]; then
     printf 'Refresh: %i\r\n' 4
-    export ERRORMSG="A page of that name already exists at the given location."
+    export ERROR_MSG="A page of that name already exists at the given location."
     theme_error 400
     return 0
   elif [ ! -d "$_DATA/pages/$newlocation" ]; then
     printf 'Refresh: %i\r\n' 4
-    export ERRORMSG="The given location does not exist."
+    export ERROR_MSG="The given location does not exist."
     theme_error 400
     return 0
   elif ! acl_write "$oldname" || ! acl_write "$newname"; then
@@ -192,7 +206,7 @@ elif [ "$action" = cancel ]; then
   REDIRECT ./
 elif [ "$action" ]; then
   printf 'Refresh: %i\r\n' 4
-  export ERRORMSG="Missing parameters."
+  export ERROR_MSG="Missing parameters."
   theme_error 400
   return 0
 fi