Fix EXIF extractor output for XML, and add a format parameter to ask for JSON instead.

Author: cdujeu

core/src/plugins/meta.exif/class.ExifMetaManager.php

@@ -118,21 +118,43 @@ public function extractExif($actionName, $httpVars, $fileVars)
             $exifData["IPTC"] = $iptc;
         }
         $excludeTags = array();// array("componentsconfiguration", "filesource", "scenetype", "makernote", "datadump");
-        AJXP_XMLWriter::header("metadata", array("file" => $selectedNode->getPath(), "type" => "EXIF"));
+        $format = "xml";
+        if(isSet($httpVars["format"]) && $httpVars["format"] == "json"){
+            $format = "json";
+        }
+        $filteredData = array();
         foreach ($exifData as $section => $data) {
-            print("<exifSection name='$section'>");
+            $filteredData[$section] = array();
             foreach ($data as $key => $value) {
                 if (is_array($value)) {
                     $value = implode(",", $value);
                 }
                 if(in_array(strtolower($key), $excludeTags)) continue;
                 if(strpos($key, "UndefinedTag:") === 0) continue;
                 $value = preg_replace( '/[^[:print:]]/', '',$value);
-                print("<exifTag name=\"$key\">".SystemTextEncoding::toUTF8($value)."</exifTag>");
+                $filteredData[$section][$key] = SystemTextEncoding::toUTF8($value);
+            }
+        }
+
+        if($format == "xml"){
+
+            AJXP_XMLWriter::header("metadata", array("file" => $selectedNode->getPath(), "type" => "EXIF"));
+            foreach ($filteredData as $section => $data) {
+                print("<exifSection name='$section'>");
+                foreach ($data as $key => $value) {
+                    print("<exifTag name=\"$key\">". AJXP_Utils::xmlEntities($value)."</exifTag>");
+                }
+                print("</exifSection>");
             }
-            print("</exifSection>");
+            AJXP_XMLWriter::close("metadata");
+
+        }else{
+
+            HTMLWriter::charsetHeader("application/json");
+            echo json_encode($filteredData);
+
         }
-        AJXP_XMLWriter::close("metadata");
+
     }
 
     public function string_format($str)

core/src/plugins/meta.exif/manifest.xml

@@ -25,8 +25,9 @@
 		<actions>
 			<action name="extract_exif">
 				<processing>
-					<serverCallback methodName="extractExif" restParams="/file+" developerComment="Extract all exif data from a compatible image (JPG).">
+					<serverCallback methodName="extractExif" restParams="/format/file+" developerComment="Extract all exif data from a compatible image (JPG).">
                         <input_param name="file" type="path" description="Path to the file to analyze"/>
+                        <input_param name="format" type="string" description="json|xml: Get json instead of xml (default)"/>
                         <output type="XML" description="An XML structure containing all Exif tags"/>
 					</serverCallback>
 				</processing>