diff --git a/ajax.php b/ajax.php index 5d789d90..d645019d 100644 --- a/ajax.php +++ b/ajax.php @@ -3,7 +3,7 @@ * @Author: printempw * @Date: 2016-01-16 23:01:33 * @Last Modified by: prpr - * @Last Modified time: 2016-01-17 15:14:43 + * @Last Modified time: 2016-01-17 15:51:42 * * All ajax requests will be handled here */ @@ -84,7 +84,7 @@ if ($action == "login") { } else if ($action == "upload") { if ($_SESSION['token'] == $user -> getToken()) { if (checkFile()) { - if ($file = $_FILES['skin_file']) { + if ($file = getValue('skin_file', $_FILES)) { if ($user -> setTexture('skin', $file)) { $json[0]['errno'] = 0; $json[0]['msg'] = "Skin uploaded successfully."; @@ -93,7 +93,7 @@ if ($action == "login") { $json[0]['msg'] = "Uncaught error."; } } - if ($file = $_FILES['cape_file']) { + if ($file = getValue('cape_file', $_FILES)) { if ($user -> setTexture('cape', $file)) { $json[1]['errno'] = 0; $json[1]['msg'] = "Cape uploaded successfully."; @@ -136,7 +136,7 @@ function checkInput() { function checkFile() { global $json; - if (!($_FILES['skin_file'] || $_FILES['cape_file'])) { + if (!(getValue('skin_file', $_FILES) || getValue('cape_file', $_FILES))) { $json['errno'] = 1; $json['msg'] = "No input file selected."; return false; @@ -144,36 +144,42 @@ function checkFile() { /** * Check for skin_file */ - if (($_FILES["skin_file"]["type"] == "image/png") || ($_FILES["skin_file"]["type"] == "image/x-png")) { + if ((getValue('skin_file', $_FILES)["type"] == "image/png") || (getValue('skin_file', $_FILES)["type"] == "image/x-png")) { // if error occured while uploading file - if ($_FILES["skin_file"]["error"] > 0) { + if (getValue('skin_file', $_FILES)["error"] > 0) { $json['errno'] = 1; - $json['msg'] = $_FILES["skin_file"]["error"]; + $json['msg'] = getValue('skin_file', $_FILES)["error"]; return false; } } else { - if ($_FILES["skin_file"]) { + if (getValue('skin_file', $_FILES)) { $json['errno'] = 1; $json['msg'] = 'Skin file type error.'; return false; + } else { + $json[0]['errno'] = 0; + $json[0]['msg'] = 'No skin file selected.'; } } /** * Check for cape_file */ - if (($_FILES["cape_file"]["type"] == "image/png") || ($_FILES["cape_file"]["type"] == "image/x-png")) { + if ((getValue('cape_file', $_FILES)["type"] == "image/png") || (getValue('cape_file', $_FILES)["type"] == "image/x-png")) { // if error occured while uploading file - if ($_FILES["cape_file"]["error"] > 0) { + if (getValue('cape_file', $_FILES)["error"] > 0) { $json['errno'] = 1; - $json['msg'] = $_FILES["cape_file"]["error"]; + $json['msg'] = getValue('cape_file', $_FILES)["error"]; return false; } } else { - if ($_FILES["cape_file"]) { + if (getValue('cape_file', $_FILES)) { $json['errno'] = 1; $json['msg'] = 'Cape file type error.'; return false; + } else { + $json[1]['errno'] = 0; + $json[1]['msg'] = 'No cape file selected.'; } } diff --git a/assets/js/ajax.js b/assets/js/ajax.js index 2d21dc87..37b63beb 100755 --- a/assets/js/ajax.js +++ b/assets/js/ajax.js @@ -56,7 +56,7 @@ $("body").on("click", "#login", function(){ docCookies.setItem("token", json.token, 604800, '/'); } showMsg("alert-success", "Logging succeed!"); - // window.setTimeout("window.location = './user.php'", 1000); + window.setTimeout("window.location = './user/index.php'", 1000); } else { showMsg("alert-danger", json.msg); } diff --git a/assets/js/skin_utils.js b/assets/js/skin_utils.js index a0518eef..0fea4872 100755 --- a/assets/js/skin_utils.js +++ b/assets/js/skin_utils.js @@ -107,13 +107,14 @@ $("#upload").click(function(){ showMsg("alert-info", "Uploading..."); }, success: function(json) { + console.log(json); if (json[0].errno == 0 && json[1].errno == 0) { showMsg("alert-success", "Successfully uploaded."); } - if (json[0].success != 0) { + if (json[0].errno != 0) { showMsg("alert-danger", "Error when uploading skin:\n"+json[0].msg); } - if (json[1].success != 0) { + if (json[1].errno != 0) { showMsg("alert-danger", "Error when uploading cape:\n"+json[1].msg); } } diff --git a/textures/2911438e8282d40e6d64fbefd076eef0a901cb90d3deae4057fec60c66eb93d2 b/textures/2911438e8282d40e6d64fbefd076eef0a901cb90d3deae4057fec60c66eb93d2 deleted file mode 100644 index 4733ad34..00000000 Binary files a/textures/2911438e8282d40e6d64fbefd076eef0a901cb90d3deae4057fec60c66eb93d2 and /dev/null differ diff --git a/textures/3274a00cd690d586ee1bee8510fb31da05c53482af23fab7dbfc5bdf9fce2808 b/textures/3274a00cd690d586ee1bee8510fb31da05c53482af23fab7dbfc5bdf9fce2808 deleted file mode 100644 index 6a312728..00000000 Binary files a/textures/3274a00cd690d586ee1bee8510fb31da05c53482af23fab7dbfc5bdf9fce2808 and /dev/null differ diff --git a/textures/c544bea6f7f0cdd29d9d9d81c7d782a9242acc0315159622e9decbc63729d806 b/textures/c544bea6f7f0cdd29d9d9d81c7d782a9242acc0315159622e9decbc63729d806 deleted file mode 100644 index f1b3a935..00000000 Binary files a/textures/c544bea6f7f0cdd29d9d9d81c7d782a9242acc0315159622e9decbc63729d806 and /dev/null differ diff --git a/user/index.php b/user/index.php index e202be5a..38cd1287 100644 --- a/user/index.php +++ b/user/index.php @@ -1,13 +1,35 @@ window.location = './index.php?msg=Illegal access. Please login.';"; -}?> +session_start(); +$dir = dirname(dirname(__FILE__)); + +function __autoload($classname) { + global $dir; + $filename = "$dir/includes/". $classname .".class.php"; + include_once($filename); +} + +function getValue($key, $array) { + if (array_key_exists($key, $array)) { + return $array[$key]; + } + return false; +} +if ($uname = getValue('uname', $_SESSION)) { + $user = new user($uname); + if (getValue('token', $_SESSION) != $user -> getToken()) { + header('Location: ../index.php?msg=Invalid token. Please login.'); + } +} else { + header('Location: ../index.php?msg=Illegal access. Please login.'); +} + +?> Upload - Blessing Skin Server 0.1 - - + + @@ -15,7 +37,7 @@ if (!$_COOKIE["token"] && !$_COOKIE["uname"]) {