loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

File Upload AJAX

Browse source
This commit is contained in:
Eole 2016-05-09 22:39:49 +02:00
parent a7d79d60ab
commit 77ba8021bc
4 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/index.html
View file

@ -10,6 +10,7 @@
<link rel="stylesheet" href="./vendors/bootstrap/css/bootstrap.css"> <link rel="stylesheet" href="./vendors/bootstrap/css/bootstrap.css">
<link rel="stylesheet" href="./css/style.css"> <link rel="stylesheet" href="./css/style.css">
<link rel="stylesheet" href="./vendors/jointjs/css/joint.min.css"> <link rel="stylesheet" href="./vendors/jointjs/css/joint.min.css">
<link rel="stylesheet" href="./vendors/jquery-File-Upload/jquery.fileupload.css">
<link rel="stylesheet" href="./css/graph.css"> <link rel="stylesheet" href="./css/graph.css">
@ -70,6 +71,9 @@
<!-- Include JQuery --> <!-- Include JQuery -->
<script src="./vendors/jquery/jquery-2.2.0.min.js"></script> <script src="./vendors/jquery/jquery-2.2.0.min.js"></script>
<script src="./vendors/jquery-File-Upload/jquery.ui.widget.js"></script>
<script src="./vendors/jquery-File-Upload/jquery.iframe-transport.js"></script>
<script src="./vendors/jquery-File-Upload/jquery.fileupload.js"></script>
<script src="./vendors/jquery/dmuploader.min.js"></script> <script src="./vendors/jquery/dmuploader.min.js"></script>
<!-- Include Bootstrap --> <!-- Include Bootstrap -->

13
client/js/controllers/image/edit.js Normal file → Executable file
View file

@ -20,6 +20,17 @@ mainApp.controller('editImageCtrl', ['$scope', 'Image', 'Loading', 'Identity', '
$scope.axioms = axioms; $scope.axioms = axioms;
$('#editImageModal').modal('show'); $('#editImageModal').modal('show');
$("#fileupload").fileupload({
formData: {task: "image", token: Identity.getToken(), action: "uploadImage", id: $scope.data.id},
/* ... */
progressall: function (e, data) {
var progress = parseInt(data.loaded / data.total * 100, 10);
$('#progress .bar').css(
'width',
progress + '%'
);
}
});
}); });
$scope.applyEdition = function (id) { $scope.applyEdition = function (id) {
@ -34,4 +45,6 @@ mainApp.controller('editImageCtrl', ['$scope', 'Image', 'Loading', 'Identity', '
$scope.getToken = function () { $scope.getToken = function () {
return Identity.getToken(); return Identity.getToken();
} }
}]); }]);

8
client/partials/image/edit.html
View file

@ -34,7 +34,11 @@
</fieldset> </fieldset>
</form> </form>
<form action="../server/index.php" enctype="multipart/form-data" method="post" ng-if='image.status == "queued"'> <input id="fileupload" type="file" name="files" data-url="../server/index.php">
<div id="progress">
<div class="bar" style="width: 0%;"></div>
</div>
<!-- <form action="../server/index.php" enctype="multipart/form-data" method="post" ng-if='image.status == "queued"'>
<input type="hidden" name="task" value="image" /> <input type="hidden" name="task" value="image" />
<input type="hidden" name="token" value="{{ getToken()}}" /> <input type="hidden" name="token" value="{{ getToken()}}" />
<input type="hidden" name="action" value="uploadImage" /> <input type="hidden" name="action" value="uploadImage" />
@ -48,7 +52,7 @@
<input type="submit" value="Upload"/> <input type="submit" value="Upload"/>
</fieldset> </fieldset>
</form> </form> -->
<div class="modal-footer"> <div class="modal-footer">
<!--<a href="#" data-dismiss="modal" class="btn btn-default">Close</a>--> <!--<a href="#" data-dismiss="modal" class="btn btn-default">Close</a>-->

21
server/core/Image.php
View file

@ -377,7 +377,7 @@ class image implements Core{
} }
} }
} }
/** /**
* Upload an image * Upload an image
* *
@ -388,9 +388,9 @@ class image implements Core{
*/ */
private function uploadImage(){ private function uploadImage(){
$id = $this->app->getPostParam("id"); $id = $this->app->getPostParam("id");
$file_name = $_FILES['file']['name']; $file_name = $_FILES['files']['name'];
$file_error = $_FILES['file']['error']; $file_error = $_FILES['files']['error'];
$file_tmp = $_FILES['file']['tmp_name']; $file_tmp = $_FILES['files']['tmp_name'];
switch($file_error){ switch($file_error){
case UPLOAD_ERR_INI_SIZE: case UPLOAD_ERR_INI_SIZE:
@ -405,10 +405,15 @@ class image implements Core{
return; return;
} }
if( !is_uploaded_file($file_tmp) ) if( !is_uploaded_file($file_tmp) )
{ {
$this->app->setOutput("Error", "File Upload Error"); //$this->app->setOutput("Error", "File Upload Error");
return; file_put_contents(
} $file_tmp,
fopen("php://input", 'r'),
FILE_APPEND
);
}
if(!isset($id)){ if(!isset($id)){
$this->app->setOutput("Error", "Incorrect id parameter"); $this->app->setOutput("Error", "Incorrect id parameter");