add option to add file from url
This commit is contained in:
parent
cf5d63f0ab
commit
018f0c4b72
|
@ -6,15 +6,35 @@ require_once('../../lib/base.php');
|
||||||
OC_JSON::checkLoggedIn();
|
OC_JSON::checkLoggedIn();
|
||||||
|
|
||||||
// Get the params
|
// Get the params
|
||||||
$dir = isset( $_GET['dir'] ) ? stripslashes($_GET['dir']) : '';
|
$dir = isset( $_POST['dir'] ) ? stripslashes($_POST['dir']) : '';
|
||||||
$filename = isset( $_GET['filename'] ) ? stripslashes($_GET['filename']) : '';
|
$filename = isset( $_POST['filename'] ) ? stripslashes($_POST['filename']) : '';
|
||||||
$content = isset( $_GET['content'] ) ? $_GET['content'] : '';
|
$content = isset( $_POST['content'] ) ? $_POST['content'] : '';
|
||||||
|
$source = isset( $_POST['source'] ) ? stripslashes($_POST['source']) : '';
|
||||||
|
|
||||||
if($filename == '') {
|
if($filename == '') {
|
||||||
OC_JSON::error(array("data" => array( "message" => "Empty Filename" )));
|
OC_JSON::error(array("data" => array( "message" => "Empty Filename" )));
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if($source){
|
||||||
|
if(substr($source,0,8)!='https://' and substr($source,0,7)!='http://'){
|
||||||
|
OC_JSON::error(array("data" => array( "message" => "Not a valid source" )));
|
||||||
|
exit();
|
||||||
|
}
|
||||||
|
$sourceStream=fopen($source,'rb');
|
||||||
|
$target=$dir.'/'.$filename;
|
||||||
|
$result=OC_Filesystem::file_put_contents($target,$sourceStream);
|
||||||
|
if($result){
|
||||||
|
$mime=OC_Filesystem::getMimetype($target);
|
||||||
|
OC_JSON::success(array("data" => array('mime'=>$mime)));
|
||||||
|
exit();
|
||||||
|
}else{
|
||||||
|
OC_JSON::error(array("data" => array( "message" => "Error while downloading ".$source. ' to '.$target )));
|
||||||
|
exit();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
if(OC_Files::newFile($dir, $filename, 'file')) {
|
if(OC_Files::newFile($dir, $filename, 'file')) {
|
||||||
if($content){
|
if($content){
|
||||||
OC_Filesystem::file_put_contents($dir.'/'.$filename,$content);
|
OC_Filesystem::file_put_contents($dir.'/'.$filename,$content);
|
||||||
|
|
|
@ -6,8 +6,8 @@ require_once('../../lib/base.php');
|
||||||
OC_JSON::checkLoggedIn();
|
OC_JSON::checkLoggedIn();
|
||||||
|
|
||||||
// Get the params
|
// Get the params
|
||||||
$dir = isset( $_GET['dir'] ) ? stripslashes($_GET['dir']) : '';
|
$dir = isset( $_POST['dir'] ) ? stripslashes($_POST['dir']) : '';
|
||||||
$foldername = isset( $_GET['foldername'] ) ? stripslashes($_GET['foldername']) : '';
|
$foldername = isset( $_POST['foldername'] ) ? stripslashes($_POST['foldername']) : '';
|
||||||
|
|
||||||
if(trim($foldername) == '') {
|
if(trim($foldername) == '') {
|
||||||
OC_JSON::error(array("data" => array( "message" => "Empty Foldername" )));
|
OC_JSON::error(array("data" => array( "message" => "Empty Foldername" )));
|
||||||
|
|
|
@ -127,20 +127,6 @@ $(document).ready(function() {
|
||||||
procesSelection();
|
procesSelection();
|
||||||
});
|
});
|
||||||
|
|
||||||
$('#file_newfolder_form').submit(function(event) {
|
|
||||||
event.preventDefault();
|
|
||||||
$.ajax({
|
|
||||||
url: 'ajax/newfolder.php',
|
|
||||||
data: "dir="+$('#dir').val()+"&foldername="+$('#file_newfolder_name').val(),
|
|
||||||
complete: function(data){boolOperationFinished(data, function(){
|
|
||||||
var date=new Date();
|
|
||||||
FileList.addDir($('#file_newfolder_name').val(),0,date);
|
|
||||||
$('#file_newfolder_name').val('New Folder');
|
|
||||||
$('#file_newfolder_name').blur();
|
|
||||||
});}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
$('#file_newfolder_name').click(function(){
|
$('#file_newfolder_name').click(function(){
|
||||||
if($('#file_newfolder_name').val() == 'New Folder'){
|
if($('#file_newfolder_name').val() == 'New Folder'){
|
||||||
$('#file_newfolder_name').val('');
|
$('#file_newfolder_name').val('');
|
||||||
|
@ -312,10 +298,10 @@ $(document).ready(function() {
|
||||||
var name=$(this).val();
|
var name=$(this).val();
|
||||||
switch(type){
|
switch(type){
|
||||||
case 'file':
|
case 'file':
|
||||||
$.ajax({
|
$.post(
|
||||||
url: OC.filePath('files','ajax','newfile.php'),
|
OC.filePath('files','ajax','newfile.php'),
|
||||||
data: "dir="+encodeURIComponent($('#dir').val())+"&filename="+encodeURIComponent(name)+'&content=%20%0A',
|
{dir:$('#dir').val(),filename:name,content:" \n"},
|
||||||
complete: function(data){boolOperationFinished(data, function(){
|
function(data){
|
||||||
var date=new Date();
|
var date=new Date();
|
||||||
FileList.addFile(name,0,date);
|
FileList.addFile(name,0,date);
|
||||||
var tr=$('tr').filterAttr('data-file',name);
|
var tr=$('tr').filterAttr('data-file',name);
|
||||||
|
@ -323,18 +309,49 @@ $(document).ready(function() {
|
||||||
getMimeIcon('text/plain',function(path){
|
getMimeIcon('text/plain',function(path){
|
||||||
tr.find('td.filename').attr('style','background-image:url('+path+')');
|
tr.find('td.filename').attr('style','background-image:url('+path+')');
|
||||||
});
|
});
|
||||||
});}
|
}
|
||||||
});
|
);
|
||||||
break;
|
break;
|
||||||
case 'folder':
|
case 'folder':
|
||||||
$.ajax({
|
$.post(
|
||||||
url: OC.filePath('files','ajax','newfolder.php'),
|
OC.filePath('files','ajax','newfolder.php'),
|
||||||
data: "dir="+encodeURIComponent($('#dir').val())+"&foldername="+encodeURIComponent(name),
|
{dir:$('#dir').val(),foldername:name},
|
||||||
complete: function(data){boolOperationFinished(data, function(){
|
function(data){
|
||||||
var date=new Date();
|
var date=new Date();
|
||||||
FileList.addDir(name,0,date);
|
FileList.addDir(name,0,date);
|
||||||
});}
|
}
|
||||||
|
);
|
||||||
|
break;
|
||||||
|
case 'web':
|
||||||
|
if(name.substr(0,8)!='https://' && name.substr(0,7)!='http://'){
|
||||||
|
name='http://'.name;
|
||||||
|
}
|
||||||
|
var localName=name;
|
||||||
|
if(localName.substr(localName.length-1,1)=='/'){//strip /
|
||||||
|
localName=localName.substr(0,localName.length-1)
|
||||||
|
}
|
||||||
|
if(localName.indexOf('/')){//use last part of url
|
||||||
|
localName=localName.split('/').pop();
|
||||||
|
}else{//or the domain
|
||||||
|
localName=(localName.match(/:\/\/(.[^/]+)/)[1]).replace('www.','');
|
||||||
|
}
|
||||||
|
$.post(
|
||||||
|
OC.filePath('files','ajax','newfile.php'),
|
||||||
|
{dir:$('#dir').val(),source:name,filename:localName},
|
||||||
|
function(result){
|
||||||
|
if(result.status == 'success'){
|
||||||
|
var date=new Date();
|
||||||
|
FileList.addFile(localName,0,date);
|
||||||
|
var tr=$('tr').filterAttr('data-file',localName);
|
||||||
|
tr.data('mime',result.data.mime);
|
||||||
|
getMimeIcon(result.data.mime,function(path){
|
||||||
|
tr.find('td.filename').attr('style','background-image:url('+path+')');
|
||||||
});
|
});
|
||||||
|
}else{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
var li=$(this).parent();
|
var li=$(this).parent();
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
<ul class="popup popupTop">
|
<ul class="popup popupTop">
|
||||||
<li style="background-image:url('<?php echo mimetype_icon('text/plain') ?>')" data-type='file'><p><?php echo $l->t('Text file');?></p></li>
|
<li style="background-image:url('<?php echo mimetype_icon('text/plain') ?>')" data-type='file'><p><?php echo $l->t('Text file');?></p></li>
|
||||||
<li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='folder'><p><?php echo $l->t('Folder');?></p></li>
|
<li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='folder'><p><?php echo $l->t('Folder');?></p></li>
|
||||||
|
<li style="background-image:url('<?php echo image_path('core','actions/public.png') ?>')" data-type='web'><p><?php echo $l->t('From url');?></p></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div class="file_upload_wrapper svg">
|
<div class="file_upload_wrapper svg">
|
||||||
|
|
Loading…
Reference in New Issue