From ebf07fe127ed71500231185f69cd7ecd82754779 Mon Sep 17 00:00:00 2001 From: javimarinbergas Date: Sat, 6 Jan 2018 19:34:49 +0100 Subject: [PATCH 1/7] Register form and check We fixed some issues and, in this new version, we are now able to insert individuals as well as companies. --- register.php | 195 +++++++++++++++++++++++++++++++++++++++++++++++ registerCheck.js | 185 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 380 insertions(+) create mode 100644 register.php create mode 100644 registerCheck.js diff --git a/register.php b/register.php new file mode 100644 index 0000000..572564b --- /dev/null +++ b/register.php @@ -0,0 +1,195 @@ + + + + + + + + Register to OnTime + + + + $value){ + $insertCompany = $insertCompany . "'" . $value . "'" . ","; + } + $insertCompany = substr($insertCompany, 0, strlen($insertCompany) - 1); + $insertCompany = $insertCompany . ")"; + + + $result = @mysqli_query($dbc, $insertCompany); + } + + $insertParticular = " + INSERT INTO individuals (Name, Surname, email, telephone, EncryptedPassword, BusinessID) + VALUES ("; + foreach ($particular as $key=>$value){ + $insertParticular = $insertParticular . "'" . $value . "'" . ","; + } + + if (isset($_POST['companyID'])){ + $insertParticular = $insertParticular . "'" . $company['ID'] . "'"; + } + else { + $insertParticular = $insertParticular . "NULL"; + + } + + $insertParticular = $insertParticular . ")"; + //va bien + echo $insertParticular; + $result_par = @mysqli_query($dbc, $insertParticular); + var_dump($result_par); + if ($result_par){ + echo '

Thank you!

'; + } + + mysqli_close($dbc); + + } + } + ?> +
+
+ Individual's Data +
+ > + > + > + > + > + > +
+ +
+ Company's Data + + + + + +

Sectors +

"; + } + } + echo " + +
+ " + ?> + + + + + + + + + + diff --git a/registerCheck.js b/registerCheck.js new file mode 100644 index 0000000..df0dd2a --- /dev/null +++ b/registerCheck.js @@ -0,0 +1,185 @@ + var registerButton = GetByID('registerButton'); + + registerButton.onclick = function(){ + var errors = []; + var name = document.getElementsByName('Name')[0]; + var surname = document.getElementsByName('Surname')[0]; + var telephone = document.getElementsByName('telephone')[0]; + var email = document.getElementsByName('email')[0]; + var pass1 = document.getElementsByName('password1')[0]; + var pass2 = document.getElementsByName('password2')[0]; + name.style.border = '0px solid black'; + surname.style.border = '0px solid black'; + telephone.style.border = '0px solid black'; + email.style.border = '0px solid black'; + pass1.style.border = '0px solid black'; + pass2.style.border = '0px solid black'; + var checker = 0; + + if (name.value !== ""){ + if (name.value[0] !== name.value[0].toUpperCase()){ + errors.push('Your name must start with a capital letter.'); + name.style.border = '2px solid red'; + } + else { + checker++; + } + } + else { + name.style.border = '2px solid red'; + } + if (surname.value !== ""){ + if (surname.value[0] !== surname.value[0].toUpperCase()){ + errors.push('Your surname must start with a capital letter.'); + surname.style.border = '2px solid red'; + } + else { + checker++; + } + } + else { + surname.style.border = '2px solid red'; + } + if (telephone.value !== ""){ + if (isNaN(telephone.value)){ + telephone.style.border = '2px solid red'; + } + else { + checker++; + } + } + else { + telephone.style.border = '2px solid red'; + } + if (email.value !== ""){ + var checkedEmail = 0; + for (var x in email.value){ + if (email.value[x] == '@'){ + checkedEmail++; + } + else if (email.value[x] == '.'){ + checkedEmail++; + } + } + if (checkedEmail >= 2){ + checker++; + } + else { + email.style.border = '2px solid red'; + } + } + else { + email.style.border = '2px solid red'; + } + if (pass1.value !== "" && pass2.value !== ""){ + if (pass1.value !== pass2.value){ + errors.push('Passwords are not equal.'); + pass1.style.border = '2px solid red'; + pass2.style.border = '2px solid red'; + } + else { + checker++; + } + } + else { + pass1.style.border = '2px solid red'; + pass2.style.border = '2px solid red'; + } + var getparameters = location.search.substr(1).split("&"); + + for (var index = 0; index < getparameters.length; index++) { + var tmp = getparameters[index].split("="); + if (tmp[1] == 'company') var isCompany = true; + } + if (isCompany){ + var companyname = document.getElementsByName('companyName')[0]; + var companyID = document.getElementsByName('companyID')[0]; + var companytelephone = document.getElementsByName('companyTelephone')[0]; + var companyemail = document.getElementsByName('companyEmail')[0]; + var companySector = document.getElementsByName('sector')[0]; + + companyname.style.border = '0px solid black'; + companyID.style.border = '0px solid black'; + companytelephone.style.border = '0px solid black'; + companyemail.style.border = '0px solid black'; + companySector.style.border = '0px solid black'; + + if (companyname.value !== ""){ + if (companyname.value[0] !== companyname.value[0].toUpperCase()){ + errors.push('Your Company name must start with a capital letter.'); + companyname.style.border = '2px solid red'; + } + else { + checker++; + } + } + else{ + companyname.style.border = '2px solid red'; + } + + + if (companyID.value !== ""){ + //check for social security number + checker++; + } + else{ + companyID.style.border = '2px solid red'; + } + + + if (companytelephone.value !== ""){ + if (isNaN(companytelephone.value)){ + companytelephone.style.border = '2px solid red'; + } + else { + checker++; + } + } + else { + companytelephone.style.border = '2px solid red'; + } + + if (companyemail.value !== ""){ + var checkedEmail = 0; + for (var x in companyemail.value){ + if (email.value[x] == '@'){ + checkedEmail++; + } + else if (companyemail.value[x] == '.'){ + checkedEmail++; + } + } + if (checkedEmail >= 2){ + checker++; + } + else { + companyemail.style.border = '2px solid red'; + } + } + else { + companyemail.style.border = '2px solid red'; + } + + if (companySector.value !== ''){ + checker++; + } + else{ + companySector.style.border = '2px solid red'; + } + } + + if (isCompany){ + var totalcheck = 10; + } + else { + var totalcheck = 5; + } + + + if (checker == totalcheck){ + var forms = document.getElementsByTagName('form'); + for (var x in forms){ + forms[x].submit(); + } + } +} \ No newline at end of file From 772d225478dc86918e2c9ba89002aa9c583e572c Mon Sep 17 00:00:00 2001 From: javimarinbergas Date: Sat, 6 Jan 2018 19:35:09 +0100 Subject: [PATCH 2/7] Rename registerCheck.js to PHP/registerCheck.js --- registerCheck.js => PHP/registerCheck.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename registerCheck.js => PHP/registerCheck.js (97%) diff --git a/registerCheck.js b/PHP/registerCheck.js similarity index 97% rename from registerCheck.js rename to PHP/registerCheck.js index df0dd2a..8a91bcb 100644 --- a/registerCheck.js +++ b/PHP/registerCheck.js @@ -182,4 +182,4 @@ forms[x].submit(); } } -} \ No newline at end of file +} From 5800af1605fe5a8a644b6174875a42d39941f08e Mon Sep 17 00:00:00 2001 From: javimarinbergas Date: Sat, 6 Jan 2018 19:35:33 +0100 Subject: [PATCH 3/7] Rename register.php to PHP/register.php --- register.php => PHP/register.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename register.php => PHP/register.php (100%) diff --git a/register.php b/PHP/register.php similarity index 100% rename from register.php rename to PHP/register.php From 16cebd3dc79a764be214dab63bfe73d1b3090406 Mon Sep 17 00:00:00 2001 From: javimarinbergas Date: Sat, 6 Jan 2018 19:35:50 +0100 Subject: [PATCH 4/7] Rename PHP/registerCheck.js to JS/registerCheck.js --- {PHP => JS}/registerCheck.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {PHP => JS}/registerCheck.js (100%) diff --git a/PHP/registerCheck.js b/JS/registerCheck.js similarity index 100% rename from PHP/registerCheck.js rename to JS/registerCheck.js From 3911871696718896c6f010ef12c31e1012816c51 Mon Sep 17 00:00:00 2001 From: javimarinbergas Date: Tue, 9 Jan 2018 18:37:04 +0100 Subject: [PATCH 5/7] Add files via upload --- JS/registerCheck.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/JS/registerCheck.js b/JS/registerCheck.js index 9981c65..1fb1def 100644 --- a/JS/registerCheck.js +++ b/JS/registerCheck.js @@ -143,7 +143,7 @@ if (companyemail.value !== ""){ var checkedEmail = 0; for (var x in companyemail.value){ - if (email.value[x] == '@'){ + if (companyemail.value[x] == '@'){ checkedEmail++; } else if (companyemail.value[x] == '.'){ From 6d4e0fd989a2387bbc66b982a1ae2aa5c7ccb82c Mon Sep 17 00:00:00 2001 From: javimarinbergas Date: Tue, 9 Jan 2018 21:36:14 +0100 Subject: [PATCH 6/7] Basic Session Create Sessions in index.php and create main.php and read Session properties. --- PHP/index.php | 112 +++++++++++++++++++++++++++++++------------------- PHP/main.php | 21 ++++++++++ 2 files changed, 90 insertions(+), 43 deletions(-) create mode 100644 PHP/main.php diff --git a/PHP/index.php b/PHP/index.php index aa2fc68..59fd219 100644 --- a/PHP/index.php +++ b/PHP/index.php @@ -10,48 +10,74 @@ + '; + //Validate if in the DB the BusinessID field is Null or not: + if (is_null($login_result[1]['BusinessID'])){ + session_start(); + $_SESSION["individual"]=$login_result[1]['Name'] . " " . $login_result[1]['Surname']; + header("Location: main.php"); + } + else { + session_start(); + $_SESSION["company"]=$login_result[1]['Name'] . " " . $login_result[1]['Surname'] . " " . $login_result[1]['BusinessID']; + // lock $row + header("Location: main.php"); + } + + + + } + } + + - } // End of empty($errors) IF. - - // Return false and the errors: - return array(false, $errors); -} // End of check_login() function. ?>
@@ -67,11 +93,11 @@ function check_login($dbc, $email = '', $pass = '') {
OnTime - +
- +
- +

@@ -81,7 +107,7 @@ function check_login($dbc, $email = '', $pass = '') {
- +