Remove linebreaks from configuration keys and values

Icinga · Nov 11, 2014 · c70f738 · c70f738
1 parent fdfad34
commit c70f738
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/library/Icinga/File/Ini/IniEditor.php b/library/Icinga/File/Ini/IniEditor.php
@@ -433,6 +433,9 @@ private function formatKeyValuePair(array $key, $value)
      */
     private function formatKey(array $key)
     {
+        foreach ($key as $i => $separator) {
+            $key[$i] = $this->sanitize($separator);
+        }
         return implode($this->nestSeparator, $key);
     }
 
@@ -599,7 +602,7 @@ private function removeFromArray($array, $pos)
     }
 
     /**
-     * Prepare a value for INe
+     * Prepare a value for INI
      *
      * @param $value    The value of the string
      *
@@ -613,10 +616,12 @@ private function formatValue($value)
             return $value;
         } elseif (is_bool($value)) {
             return ($value ? 'true' : 'false');
-        } elseif (strpos($value, '"') === false) {
-            return '"' . $value .  '"';
-        } else {
-            return '"' . str_replace('"', '\"', $value) . '"';
         }
+        return '"' . str_replace('"', '\"', $this->sanitize($value)) . '"';
+    }
+
+    private function sanitize($value)
+    {
+        return str_replace('\n', '', $value);
     }
 }