Issue #1393022: Always use PDF key as-is.

xfdf.inc

@@ -20,51 +20,12 @@ function create_xfdf($file, $info, $enc = 'UTF-8') {
   $data = '<?xml version="1.0" encoding="' . $enc . '"?>' . "\n" .
     '<xfdf xmlns="http://ns.adobe.com/xfdf/" xml:space="preserve">' . "\n" .
     '<fields>' . "\n";
-  $data .= print_fields($info);
+  foreach ($info as $name => $value) {
+    $data .= '<field name="' . htmlspecialchars($name) . '"><value>' . htmlspecialchars($value) . '</value></field>' . "\n";
+  }
   $data .= '</fields>' . "\n" .
     '<ids original="' . md5($file) . '" modified="' . REQUEST_TIME . '" />' . "\n" .
     '<f href="' . $file . '" />' . "\n" .
     '</xfdf>' . "\n";
   return $data;
 }
-
-function escape_string($str) {
-  if ($str == NULL) {
-    return $str;
-  }
-  $str = str_replace(array('\\', '\''), array('\\\\', '\\\''), $str);
-  return $str;
-}
-
-function print_fields($info) {
-  $fields = array();
-  $str = '';
-  foreach ($info as $field => $val) {
-    $arr = explode('.', $field);
-    $str .= '$fields';
-    foreach ($arr as $node) {
-      $str .= "['" . escape_string($node) . "']";
-    }
-    $str .= "='" . escape_string($val) . "';";
-  }
-  eval($str);
-
-  $str = '';
-  foreach ($fields as $field => $val) {
-    print_fields_recurse($field, $val, $str);
-  }
-  return $str;
-}
-
-function print_fields_recurse($field, $val, &$str) {
-  $str .= '<field name="' . $field . '">' . "\n";
-  if (is_array($val)) {
-    foreach ($val as $field => $val) {
-      print_fields_recurse($field, $val, $str);
-    }
-  }
-  else {
-    $str .= '<value>' . $val . '</value>' . "\n";
-  }
-  $str .= '</field>' . "\n";
-}