vendor/assets/javascripts/webshims/shims/FlashCanvasPro/save.php in webshims-rails-1.11.6.1 vs vendor/assets/javascripts/webshims/shims/FlashCanvasPro/save.php in webshims-rails-1.12.0

- old
+ new

@@ -3,11 +3,11 @@ /** * Save the input as a PNG file * * PHP versions 4 and 5 * - * Copyright (c) 2010-2011 Shinya Muramatsu + * Copyright (c) 2010-2013 Shinya Muramatsu * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sublicense, @@ -24,19 +24,25 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * * @author Shinya Muramatsu <revulon@gmail.com> - * @copyright 2010-2011 Shinya Muramatsu + * @copyright 2010-2013 Shinya Muramatsu * @license http://www.opensource.org/licenses/mit-license.php MIT License * @link http://flashcanvas.net/ * @link http://code.google.com/p/flashcanvas/ */ if ($_SERVER['REQUEST_METHOD'] === 'POST') { + if (isset($_GET['filename'])) { + $filename = $_GET['filename']; + } else { + $filename = 'canvas.png'; + } + // Force download header('Content-Type: application/octet-stream'); - header('Content-Disposition: attachment; filename="canvas.png"'); + header('Content-Disposition: attachment; filename="' . $filename . '"'); if (isset($_POST['dataurl'])) { // Decode the base64-encoded data $data = $_POST['dataurl']; $data = substr($data, strpos($data, ',') + 1);