Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pretty JSON

Browse Source
This commit is contained in:
printempw 2016-02-03 10:32:48 +08:00
parent 03b7e4e83b
commit 67d8587c9b
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ajax.php
View File

@ -3,7 +3,7 @@
* @Author: printempw * @Author: printempw
* @Date: 2016-01-16 23:01:33 * @Date: 2016-01-16 23:01:33
* @Last Modified by: prpr * @Last Modified by: prpr
* @Last Modified time: 2016-02-03 10:26:40 * @Last Modified time: 2016-02-03 10:29:58
* *
* All ajax requests will be handled here * All ajax requests will be handled here
*/ */
@ -77,20 +77,20 @@ if ($action == "login") {
if (checkFile()) { if (checkFile()) {
if ($file = utils::getValue('skin_file', $_FILES)) { if ($file = utils::getValue('skin_file', $_FILES)) {
if ($user->setTexture('skin', $file)) { if ($user->setTexture('skin', $file)) {
$json[0]['errno'] = 0; $json['skin']['errno'] = 0;
$json[0]['msg'] = "Skin uploaded successfully."; $json['skin']['msg'] = "Skin uploaded successfully.";
} else { } else {
$json[0]['errno'] = 1; $json['skin']['errno'] = 1;
$json[0]['msg'] = "Uncaught error."; $json['skin']['msg'] = "Uncaught error.";
} }
} }
if ($file = utils::getValue('cape_file', $_FILES)) { if ($file = utils::getValue('cape_file', $_FILES)) {
if ($user->setTexture('cape', $file)) { if ($user->setTexture('cape', $file)) {
$json[1]['errno'] = 0; $json['cape']['errno'] = 0;
$json[1]['msg'] = "Cape uploaded successfully."; $json['cape']['msg'] = "Cape uploaded successfully.";
} else { } else {
$json[1]['errno'] = 1; $json['cape']['errno'] = 1;
$json[1]['msg'] = "Uncaught error."; $json['cape']['msg'] = "Uncaught error.";
} }
} }
} }
@ -148,8 +148,8 @@ function checkFile() {
$json['msg'] = 'Skin file type error.'; $json['msg'] = 'Skin file type error.';
return false; return false;
} else { } else {
$json[0]['errno'] = 0; $json['skin']['errno'] = 0;
$json[0]['msg'] = 'No skin file selected.'; $json['skin']['msg'] = 'No skin file selected.';
} }
} }
@ -169,8 +169,8 @@ function checkFile() {
$json['msg'] = 'Cape file type error.'; $json['msg'] = 'Cape file type error.';
return false; return false;
} else { } else {
$json[1]['errno'] = 0; $json['cape']['errno'] = 0;
$json[1]['msg'] = 'No cape file selected.'; $json['cape']['msg'] = 'No cape file selected.';
} }
} }

12
assets/js/user.utils.js
View File

@ -2,7 +2,7 @@
* @Author: prpr * @Author: prpr
* @Date: 2016-01-21 13:56:40 * @Date: 2016-01-21 13:56:40
* @Last Modified by: prpr * @Last Modified by: prpr
* @Last Modified time: 2016-02-03 10:17:30 * @Last Modified time: 2016-02-03 10:29:24
*/ */
'use strict'; 'use strict';
@ -112,14 +112,14 @@ $("#upload").click(function(){
}, },
success: function(json) { success: function(json) {
console.log(json); console.log(json);
if (json[0].errno == 0 && json[1].errno == 0) { if (json['skin'].errno == 0 && json['cape'].errno == 0) {
showMsg("alert-success", "Successfully uploaded."); showMsg("alert-success", "Successfully uploaded.");
} }
if (json[0].errno != 0) { if (json['skin'].errno != 0) {
showMsg("alert-danger", "Error when uploading skin:\n"+json[0].msg); showMsg("alert-danger", "Error when uploading skin:\n"+json['skin'].msg);
} }
if (json[1].errno != 0) { if (json['cape'].errno != 0) {
showMsg("alert-danger", "Error when uploading cape:\n"+json[1].msg); showMsg("alert-danger", "Error when uploading cape:\n"+json['cape'].msg);
} }
} }
}); });