diff --git a/post.php b/post.php index 3a3d1c0..123c0fc 100755 --- a/post.php +++ b/post.php @@ -3,7 +3,7 @@ require_once("function.php"); if (session_status() == PHP_SESSION_NONE) { session_start(); } -//var_dump($_POST); + $emailPatern = '/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/'; $pwPatern = '/^[a-z]{8,16}$/'; $loginPatern = '/^[a-z]{8,16}$/'; @@ -41,6 +41,7 @@ elseif (isset($_POST["newUser"],$_POST["datene"], $_POST["email"], $_POST["pw"]) if(userExist($_POST["login"])) { $ret["return"] = "userExist"; + $ret["register"] = false; } else { @@ -56,6 +57,7 @@ elseif (isset($_POST["newUser"],$_POST["datene"], $_POST["email"], $_POST["pw"]) )); $req->closeCursor(); $ret["return"] = true; + $ret["register"] = true; } } else diff --git a/script.js b/script.js index 4cef3f1..db736ca 100755 --- a/script.js +++ b/script.js @@ -62,7 +62,6 @@ $(function() { } }); $("body").on("keyup change", ".login input, input .login", function(e) { - console.log("hoo"); login = ltrim($(this).val()); input = $(this); td = $(this).parent(); diff --git a/script/login.js b/script/login.js new file mode 100644 index 0000000..87a9bb9 --- /dev/null +++ b/script/login.js @@ -0,0 +1,55 @@ +passwordPatern = /^[a-zA-Z0-9]{8,16}$/; +loginPatern = /^[a-z]{8,16}$/ +mailPatern = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; //https://emailregex.com/ +datePatern = /^\d{4}[\/\-](?:\d{1}|1[012]|0\d)[\/\-](?:\d{1}|[123]\d|0\d)/ + + +$(function() { + $('form').on('submit',function(e) { + e.preventDefault(); + var data = $(this).serialize(); + var url = $(this).attr('action') + if(url == "./post.php") + if (mailPatern.test($(".email input").val()) && passwordPatern.test($(".pw input").val()) && $(".pw2 input").val() == $(".pw input").val() && loginPatern.test($(".login input").val())) + { + + } + else { + swal("Oops", "Something wrong in the form ", "error"); + return false; + } + $.ajax({ + type: 'post', + url: url, + data: data, + dataType: "json", + success: function(data) { + console.log(data); + if (typeof(data.register) != "undefined" && data.register !== null) { + if (data.register) { + swal("Good job!", "You are registered !", "success"); + $('form').animate({ + height: "toggle", + opacity: "toggle" + }, "slow"); + } else { + swal("Oops", "Something wrong in the form : " + data.return, "error"); + } + + } else if (typeof(data.login) != "undefined" && data.login !== null) { + if(data.login) + { + swal("Good job!", "You are logged !\nYou're redirect in 5 seconds", "success"); + var delay = 5000; + setTimeout(function(){ window.location = "/bil/"; }, delay); + } + else + swal("Oops", "Something wrong in the form", "error"); + } + } + }); + // send xhr request + + }); + + }); diff --git a/views/login.html.twig b/views/login.html.twig index b6506a8..cc9d6b4 100755 --- a/views/login.html.twig +++ b/views/login.html.twig @@ -3,6 +3,7 @@ {% include 'header.html.twig' %} + diff --git a/views/table.html.twig b/views/table.html.twig index 0b16092..560d092 100755 --- a/views/table.html.twig +++ b/views/table.html.twig @@ -4,7 +4,7 @@ - +