diff --git a/assets/js/login_utils.js b/assets/js/login_utils.js index b73663b6..04c50015 100755 --- a/assets/js/login_utils.js +++ b/assets/js/login_utils.js @@ -3,11 +3,11 @@ $(document).ready(function(){ if (docCookies.hasItem("uname") && docCookies.hasItem("token") && $("#login-reg").html() == 'Register') { checkToken(docCookies.getItem("token"),function(json) { if (json.success == 1) { - showMsg("alert-success", json.msg); - window.location = "./user.php"; - } else { - showMsg("alert-danger", json.msg); - } + showMsg("alert-success", json.msg); + window.location = "./user.php"; + } else { + showMsg("alert-danger", json.msg); + } }); } }); @@ -15,34 +15,34 @@ $(document).ready(function(){ $('body').css('height', document.documentElement.clientHeight); function showMsg(type, msg) { - $("#msg").removeClass().addClass("alert").addClass(type).html(msg); + $("#msg").removeClass().addClass("alert").addClass(type).html(msg); } $("body").on("click", "#login-reg", function(){ - if ($("#login-reg").html() == 'Register') { - $(".login-container").fadeOut(500); - window.setTimeout("$('#login-reg').html('Login');changeForm(1)", 500); - $(".login-container").fadeIn(500); - } else { - $(".login-container").fadeOut(500); - window.setTimeout("$('#login-reg').html('Register');changeForm(0)", 500); - $(".login-container").fadeIn(500); - } + if ($("#login-reg").html() == 'Register') { + $(".login-container").fadeOut(500); + window.setTimeout("$('#login-reg').html('Login');changeForm(1)", 500); + $(".login-container").fadeIn(500); + } else { + $(".login-container").fadeOut(500); + window.setTimeout("$('#login-reg').html('Register');changeForm(0)", 500); + $(".login-container").fadeIn(500); + } }); function changeForm(code){ $("#msg").addClass("hide"); - if (code == 1) { - $(".login-title").html('Register'); - $("#confirm-passwd").show(); - $(".login-group").html(''); - window.history.pushState(null, null, "./index.php?action=register"); - document.title = "Register - Blessing Skin Server 0.1"; - } else { - $(".login-title").html('Login'); - $("#confirm-passwd").hide(); - $(".login-group").html('
Remember me
'); - window.history.pushState(null, null, "./index.php?action=login"); - document.title = "Login - Blessing Skin Server 0.1"; - } + if (code == 1) { + $(".login-title").html('Register'); + $("#confirm-passwd").show(); + $(".login-group").html(''); + window.history.pushState(null, null, "./index.php?action=register"); + document.title = "Register - Blessing Skin Server 0.1"; + } else { + $(".login-title").html('Login'); + $("#confirm-passwd").hide(); + $(".login-group").html('
Remember me
'); + window.history.pushState(null, null, "./index.php?action=login"); + document.title = "Login - Blessing Skin Server 0.1"; + } } diff --git a/includes/user.class.php b/includes/user.class.php new file mode 100644 index 00000000..8787db03 --- /dev/null +++ b/includes/user.class.php @@ -0,0 +1,63 @@ + $uname = $uname; + if (utils::select('username', $this -> $uname)['uid'] == 1) { + $this -> $is_admin = true; + } + if (utils::select('username', $this -> $uname)['password'] !== "") { + $this -> $password = utils::select('username', $this -> $uname)['password']; + $this -> $is_registered = true; + $this -> $token = md5($this -> $uname.$this -> $password.SALT); + } + } + + public function checkPasswd($raw_passwd) { + if ($raw_passwd == $this -> $password) { + return true; + } else { + return false; + } + } + + public function getToken() { + return $this -> $token; + } + + public function register($passwd, $ip) { + if (utils::insert([$this -> $uname, $passwd, $ip])) { + return true; + } else { + return false; + } + } + + public function getTexture($type) { + if ($type == "skin") { + return utils::select('username', $this -> $uname)['skin_hash']; + } else if ($type == "cape") { + return utils::select('username', $this -> $uname)['cape_hash']; + } + return false; + } + + public function setTexture($type, $file) { + $hash = utils::upload($file); + if ($type == "skin") { + return utils::update($this -> $uname, 'skin_hash', $hash); + } else if ($type == "cape") { + return utils::update($this -> $uname, 'cape_hash', $hash); + } + return false; + } + +} +?> diff --git a/includes/utils.class.php b/includes/utils.class.php new file mode 100644 index 00000000..173c3ac6 --- /dev/null +++ b/includes/utils.class.php @@ -0,0 +1,56 @@ + diff --git a/uploads/cape/admin.png b/uploads/cape/admin.png deleted file mode 100644 index ba732216..00000000 Binary files a/uploads/cape/admin.png and /dev/null differ diff --git a/uploads/skin/admin.png b/uploads/skin/admin.png deleted file mode 100644 index 175a0414..00000000 Binary files a/uploads/skin/admin.png and /dev/null differ diff --git a/uploads/skin/mkkl5.png b/uploads/skin/mkkl5.png deleted file mode 100644 index 86245b68..00000000 Binary files a/uploads/skin/mkkl5.png and /dev/null differ