Changed GET to POST request

Author: dirkgroenen

src/SVGMagic.js

@@ -1,4 +1,4 @@
-/*  Version 2.2.0
+/*  Version 2.3.0
     It's a simple jQuery plugin that searchs for SVG images on your website and creates PNG versions on the run. 
     Meaning that you don't have to create different versions of the images yourself.
     Copyright (C) 2013 - Dirk Groenen [Bitlabs Development]
@@ -36,8 +36,8 @@
             var obj = this, images = [], domimages = [], cssimages = [];
 
             obj.each(function(){
-                if($(this).attr('src') != undefined){
-                    if($(this).attr('src').split('.').pop() == 'svg'){
+                if($(this).attr("src") != undefined){
+                    if($(this).attr("src").split(".").pop() == "svg" || $(this).attr("src").substr(0, 18) == "data:image/svg+xml"){
                         $obj = $(this);
                         var image = new Image();
                         image.src = $(this).attr('src');
@@ -46,10 +46,11 @@
 
                         if(options.preloader != false){
                             preloaderTimer.push(setTimeout(function(){
-                                $obj.attr('src', options.preloader);
+                                $obj.attr("src", options.preloader);
                             },500));
                         }
                     }
+
                 }
             });	
 
@@ -77,8 +78,9 @@
             if(images.length > 0){
                 var i = 0;
                 $.ajax({
-                    dataType: "jsonp",
-                    url: "http://svgmagic.bitlabs.nl/converter.php",
+                    dataType: "json",
+                    method: "POST",
+                    url: "http://svgmagic.bitlabs.nl/converter2.4.0.php",
                     data: data,
                     success: function(response){
                         var i;

src/SVGMagic.min.js

@@ -1,39 +1,36 @@
 <?php
-
     header('Content-Type: application/json');
-    header('Access-Control-Allow-Origin: *');
-    
+    header('Access-Control-Allow-Origin: ' . $_SERVER['HTTP_ORIGIN']);
+    header('Access-Control-Allow-Methods: GET, PUT, POST, DELETE, OPTIONS');
+    header('Access-Control-Max-Age: 1000');
+    header('Access-Control-Allow-Headers: Content-Type, Authorization, X-Requested-With');
+
     $inputimages = ($_REQUEST["svgsources"]);
     $dumpcache = ($_REQUEST["dumpcache"]);
-    $urlprefix   = ($_REQUEST["secure"] == 'false') ? 'http://' : 'https://';
-    $result      = array(
-        'error' => '1',
-        'errormsg' => 'No images given'
-    );
-    
-    if (isset($inputimages) && is_array($inputimages)) {
-        
+    $urlprefix = ($_REQUEST["secure"] == 'false') ? 'http://' : 'https://';
+    $result = array('error' => '1', 'errormsg' => 'No images given');
+
+    if(isset($inputimages) && is_array($inputimages)){
+
         // Create empty array with images to return
         $imageurls = array();
-        
+
         // Loop through given image urls
-        foreach ($inputimages as $input) {
-            
+        foreach($inputimages as $input){
+
             // Get the file name
-            $filename = explode('/', $input);
+            $filename = explode('/',$input);
             $filename = array_pop($filename);
-            $filename = str_replace('.svg', '', $filename);
-            
+            $filename = str_replace('.svg' ,'' , $filename);
+
             // Check the domain and create a folder if needed
-            $url    = parse_url($input);
+            $url = parse_url($input);
             $domain = $url['host'];
-            
-            if (!file_exists("images/results/" . $domain)) {
-                mkdir("images/results/" . $domain, 0777);
+            if(!file_exists("images/results/" . $domain)){
+                 mkdir("images/results/" . $domain, 0777);
             }
-            
             $imagefolder = "images/results/" . $domain;
-            
+
             // Check if we need to dump the cache
             if($dumpcache == "true"){
                 if(file_exists($imagefolder . '/'.$filename.'.png')){
@@ -42,28 +39,31 @@
             }
 
             // Check if the file already exists
-            if (!file_exists($imagefolder . '/' . $filename . '.png')) {
+            if(!file_exists($imagefolder . '/'.$filename.'.png')){
                 // Get the image
                 $inputimage = file_get_contents($input);
-                
+
                 // Convert the given image to PNG and store it in the custom directory
                 $image = new Imagick();
                 $image->setBackgroundColor(new ImagickPixel('transparent'));
                 $image->readImageBlob(($inputimage));
                 $image->setImageFormat("png32");
                 $image->setImageCompressionQuality(100);
-                $image->writeImage($imagefolder . '/' . $filename . '.png');
+                $image->writeImage($imagefolder . '/'.$filename.'.png');
             }
-            
-            $imageurls[] = array(
-                'url' => $urlprefix . "bitlabs.nl/svgmagic/" . $imagefolder . '/' . $filename . '.png'
-            );
+
+            $imageurls[] = array('url'  => $urlprefix."bitlabs.nl/svgmagic/" . $imagefolder . '/'.$filename.'.png');
         }
-        
-        $result = array(
-            'results' => $imageurls,
-            'error' => '0'
-        );
+
+        $result = array('results' => $imageurls, 'error' => '0');
     }
-    echo $_GET['callback'] . '(' . json_encode($result) . ')';
+
+    // Return the images, since version 2.3 we use cross-domain requests via post, so the callback has been removed
+    if(isset($_GET['callback'])){
+        echo $_GET['callback'] . '('. json_encode($result) . ')';
+    }
+    else{
+        echo json_encode($result);
+    }
+    
 ?>

src/converter.php

@@ -0,0 +1,19 @@
+<html>
+    <head>
+        <script src="http://code.jquery.com/jquery.js"></script>
+        <script src="SVGMagic.js"></script>
+
+        <script>
+            $(document).ready(function(){
+                $("img").svgmagic({
+                    testmode: true
+                });
+            });
+            
+        </script>
+    </head>
+
+    <body>
+            <img src="data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJMYXllcl8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIKICAgd2lkdGg9IjYxMnB4IiBoZWlnaHQ9IjUwMi4xNzRweCIgdmlld0JveD0iMCA2NS4zMjYgNjEyIDUwMi4xNzQiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCA2NS4zMjYgNjEyIDUwMi4xNzQiCiAgIHhtbDpzcGFjZT0icHJlc2VydmUiIGNsYXNzPSJsb2dvIj4KCiAgIDxzdHlsZT4KICAgLmdyb3VuZCB7CiAgZmlsbDogIzc4N2Y2YTsKfQouZ3JvdW5kOmhvdmVyIHsKICBmaWx0ZXI6IHVybCgjcGljdHVyZUZpbHRlcik7CiAgZmlsbDogIzg5NmQzZDsKfTwvc3R5bGU+Cgo8ZWxsaXBzZSBjbGFzcz0iZ3JvdW5kIiBjeD0iMjgzLjUiIGN5PSI0ODcuNSIgcng9IjI1OSIgcnk9IjgwIi8+CjxwYXRoIGNsYXNzPSJraXdpIiBkPSJNMjEwLjMzMyw2NS4zMzFDMTA0LjM2Nyw2Ni4xMDUtMTIuMzQ5LDE1MC42MzcsMS4wNTYsMjc2LjQ0OWM0LjMwMyw0MC4zOTMsMTguNTMzLDYzLjcwNCw1Mi4xNzEsNzkuMDMKICBjMzYuMzA3LDE2LjU0NCw1Ny4wMjIsNTQuNTU2LDUwLjQwNiwxMTIuOTU0Yy05LjkzNSw0Ljg4LTE3LjQwNSwxMS4wMzEtMTkuMTMyLDIwLjAxNWM3LjUzMS0wLjE3LDE0Ljk0My0wLjMxMiwyMi41OSw0LjM0MQogIGMyMC4zMzMsMTIuMzc1LDMxLjI5NiwyNy4zNjMsNDIuOTc5LDUxLjcyYzEuNzE0LDMuNTcyLDguMTkyLDIuODQ5LDguMzEyLTMuMDc4YzAuMTctOC40NjctMS44NTYtMTcuNDU0LTUuMjI2LTI2LjkzMwogIGMtMi45NTUtOC4zMTMsMy4wNTktNy45ODUsNi45MTctNi4xMDZjNi4zOTksMy4xMTUsMTYuMzM0LDkuNDMsMzAuMzksMTMuMDk4YzUuMzkyLDEuNDA3LDUuOTk1LTMuODc3LDUuMjI0LTYuOTkxCiAgYy0xLjg2NC03LjUyMi0xMS4wMDktMTAuODYyLTI0LjUxOS0xOS4yMjljLTQuODItMi45ODQtMC45MjctOS43MzYsNS4xNjgtOC4zNTFsMjAuMjM0LDIuNDE1YzMuMzU5LDAuNzYzLDQuNTU1LTYuMTE0LDAuODgyLTcuODc1CiAgYy0xNC4xOTgtNi44MDQtMjguODk3LTEwLjA5OC01My44NjQtNy43OTljLTExLjYxNy0yOS4yNjUtMjkuODExLTYxLjYxNy0xNS42NzQtODEuNjgxYzEyLjYzOS0xNy45MzgsMzEuMjE2LTIwLjc0LDM5LjE0Nyw0My40ODkKICBjLTUuMDAyLDMuMTA3LTExLjIxNSw1LjAzMS0xMS4zMzIsMTMuMDI0YzcuMjAxLTIuODQ1LDExLjIwNy0xLjM5OSwxNC43OTEsMGMxNy45MTIsNi45OTgsMzUuNDYyLDIxLjgyNiw1Mi45ODIsMzcuMzA5CiAgYzMuNzM5LDMuMzAzLDguNDEzLTEuNzE4LDYuOTkxLTYuMDM0Yy0yLjEzOC02LjQ5NC04LjA1My0xMC42NTktMTQuNzkxLTIwLjAxNmMtMy4yMzktNC40OTUsNS4wMy03LjA0NSwxMC44ODYtNi44NzYKICBjMTMuODQ5LDAuMzk2LDIyLjg4Niw4LjI2OCwzNS4xNzcsMTEuMjE4YzQuNDgzLDEuMDc2LDkuNzQxLTEuOTY0LDYuOTE3LTYuOTE3Yy0zLjQ3Mi02LjA4NS0xMy4wMTUtOS4xMjQtMTkuMTgtMTMuNDEzCiAgYy00LjM1Ny0zLjAyOS0zLjAyNS03LjEzMiwyLjY5Ny02LjYwMmMzLjkwNSwwLjM2MSw4LjQ3OCwyLjI3MSwxMy45MDgsMS43NjdjOS45NDYtMC45MjUsNy43MTctNy4xNjktMC44ODMtOS41NjYKICBjLTE5LjAzNi01LjMwNC0zOS44OTEtNi4zMTEtNjEuNjY1LTUuMjI1Yy00My44MzctOC4zNTgtMzEuNTU0LTg0Ljg4NywwLTkwLjM2M2MyOS41NzEtNS4xMzIsNjIuOTY2LTEzLjMzOSw5OS45MjgtMzIuMTU2CiAgYzMyLjY2OC01LjQyOSw2NC44MzUtMTIuNDQ2LDkyLjkzOS0zMy44NWM0OC4xMDYtMTQuNDY5LDExMS45MDMsMTYuMTEzLDIwNC4yNDEsMTQ5LjY5NWMzLjkyNiw1LjY4MSwxNS44MTksOS45NCw5LjUyNC02LjM1MQogIGMtMTUuODkzLTQxLjEyNS02OC4xNzYtOTMuMzI4LTkyLjEzLTEzMi4wODVjLTI0LjU4MS0zOS43NzQtMTQuMzQtNjEuMjQzLTM5Ljk1Ny05MS4yNDcKICBjLTIxLjMyNi0yNC45NzgtNDcuNTAyLTI1LjgwMy03Ny4zMzktMTcuMzY1Yy0yMy40NjEsNi42MzQtMzkuMjM0LTcuMTE3LTUyLjk4LTMxLjI3M0MzMTguNDIsODcuNTI1LDI2NS44MzgsNjQuOTI3LDIxMC4zMzMsNjUuMzMxCiAgeiBNNDQ1LjczMSwyMDMuMDFjNi4xMiwwLDExLjExMiw0LjkxOSwxMS4xMTIsMTEuMDM4YzAsNi4xMTktNC45OTQsMTEuMTExLTExLjExMiwxMS4xMTFzLTExLjAzOC00Ljk5NC0xMS4wMzgtMTEuMTExCiAgQzQzNC42OTMsMjA3LjkyOSw0MzkuNjEzLDIwMy4wMSw0NDUuNzMxLDIwMy4wMXoiLz4KPGZpbHRlciBpZD0icGljdHVyZUZpbHRlciIgPgogIDxmZUdhdXNzaWFuQmx1ciBzdGREZXZpYXRpb249IjE1IiAvPgo8L2ZpbHRlcj4KPC9zdmc+">
+    </body>
+</html>