Rename should only work on form submission

Author: TheSyscall

library/Icinga/Web/Form/ConfigForm.php

@@ -105,21 +105,15 @@ protected function getIniKeyFromName(string $name): ?array
      * Get the value of a configuration key from an element name
      *
      * @param string $name The element name
-     * @param mixed $default The default value to return if the element does not exist or the value is empty
+     * @param mixed $default The default value to return if the config entry does not exist
      *
      * @return mixed The value of the configuration key or the default value
      */
     public function getConfigValue(string $name, mixed $default = null): mixed
     {
         [$section, $key] = $this->getIniKeyFromName($name);
-        if ($section !== null && $key !== null) {
-            if (! $this->hasElement($name)) {
-                return $default;
-            }
-
-            if (($value = $this->getPopulatedValue($name)) !== null) {
-                return $value;
-            }
+        if ($section === null || $key === null) {
+            return $default;
         }
 
         return $this->config->get($section, $key, $default);

library/Icinga/Web/Form/ConfigSectionForm.php

@@ -67,14 +67,6 @@ public function __construct()
             if ($this->shouldDelete()) {
                 $this->handleDelete();
                 $this->emit(static::ON_DELETE, [$this]);
-            } elseif ($this->shouldRename()) {
-                $oldName = $this->section;
-                $this->handleRename();
-                $this->emit(static::ON_RENAME, [
-                    $this,
-                    $oldName,
-                    $this->section,
-                ]);
             }
         });
     }
@@ -223,6 +215,14 @@ protected function handleDelete(): void
      */
     protected function handleRename(): void
     {
+        if (! $this->config) {
+            throw new ProgrammingError('Config must be set before renaming a configuration section.');
+        }
+
+        if ($this->section === null) {
+            throw new ProgrammingError('Section must be set before renaming a configuration section.');
+        }
+
         $newName = $this->getPopulatedValue(static::NAME_ELEMENT_NAME);
         $section = $this->config->getSection($this->section);
         $this->config->removeSection($this->section);
@@ -322,7 +322,22 @@ protected function onSuccess(): void
             }
         }
 
+        $oldSection = $this->section;
+        $isRename = $this->shouldRename();
+
+        if ($isRename) {
+            $this->handleRename();
+        }
+
         parent::onSuccess();
+
+        if ($isRename) {
+            $this->emit(static::ON_RENAME, [
+                $this,
+                $oldSection,
+                $this->section,
+            ]);
+        }
     }
 
     /**