dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[*] Core: Upgrade of ajaxfileupload library

Browse Source
This commit is contained in:
rGaillard
2012-05-28 12:37:11 +00:00
parent 5da6effabb
commit fcf5b0a14b
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/uploadProductFile.php
+4 -4
View File
@@ -43,15 +43,15 @@ if (isset($_FILES['virtual_product_file']) AND is_uploaded_file($_FILES['virtual
if (!copy($file, _PS_DOWNLOAD_DIR_.$newfilename))
{
header('HTTP/1.1 500 Error');
echo '<return result="error" msg="No permissions to write in the download folder" filename="'.$filename.'" />';
echo '<return result="error" msg="No permissions to write in the download folder" filename="'.Tools::safeOutput($filename).'" />';
}
@unlink($file);
header('HTTP/1.1 200 OK');
echo '<return result="success" msg="'.$newfilename.'" filename="'.$filename.'" />';
echo '<return result="success" msg="'.Tools::safeOutput($newfilename).'" filename="'.Tools::safeOutput($filename).'" />';
}
else
{
header('HTTP/1.1 500 Error');
echo '<return result="error" msg="Could not upload file" filename="'.ProductDownload::getNewFilename().'" />';
}
echo '<return result="error" msg="Could not upload file" filename="'.Tools::safeOutput(ProductDownload::getNewFilename()).'" />';
}
admin-dev/uploadProductFileAttribute.php
+4 -4
View File
@@ -43,15 +43,15 @@ if (isset($_FILES['virtual_product_file_attribute']) && is_uploaded_file($_FILES
if (!copy($file, _PS_DOWNLOAD_DIR_.$newfilename))
{
header('HTTP/1.1 500 Error');
echo '<return result="error" msg="No permissions to write in the download folder" filename="'.$filename.'" />';
echo '<return result="error" msg="No permissions to write in the download folder" filename="'.Tools::safeOutput($filename).'" />';
}
@unlink($file);
header('HTTP/1.1 200 OK');
echo '<return result="success" msg="'.$newfilename.'" filename="'.$filename.'" />';
echo '<return result="success" msg="'.Tools::safeOutput($newfilename).'" filename="'.Tools::safeOutput($filename).'" />';
}
else
{
header('HTTP/1.1 500 Error');
echo '<return result="error" msg="Unknown error" filename="'.ProductDownload::getNewFilename().'" />';
}
echo '<return result="error" msg="Unknown error" filename="'.Tools::safeOutput(ProductDownload::getNewFilename()).'" />';
}
js/jquery/plugins/ajaxfileupload/jquery.ajaxfileupload.js
+5
View File
@@ -4,6 +4,7 @@
* v 1.0
*/
jQuery.extend({createUploadIframe:function(id,uri)
{var frameId='jUploadFrame'+id;if(window.ActiveXObject){var io=document.createElement('<iframe id="'+frameId+'" name="'+frameId+'" />');if(typeof uri=='boolean'){io.src='javascript:false';}
else if(typeof uri=='string'){io.src=uri;}}
@@ -51,3 +52,7 @@ return{abort:function(){}};},uploadHttpData:function(r,type){var data=!type;data
jQuery.globalEval(data);if(type=="json")
eval("data = "+data);if(type=="html")
jQuery("<div>").html(data).evalScripts();return data;}})
var is={ie:navigator.appName=='Microsoft Internet Explorer',java:navigator.javaEnabled(),ns:navigator.appName=='Netscape',ua:navigator.userAgent.toLowerCase(),version:parseFloat(navigator.appVersion.substr(21))||parseFloat(navigator.appVersion),win:navigator.platform=='Win32'}
is.mac=is.ua.indexOf('mac')>=0;if(is.ua.indexOf('opera')>=0){is.ie=is.ns=false;is.opera=true;}
if(is.ua.indexOf('gecko')>=0){is.ie=is.ns=false;is.gecko=true;}