Adds address fields and zipcode endpoint
This commit is contained in:
nikolark committed
1 parent
1e1d7d3d88
commit
7b92cbb755
9 files changed
+10472
-6
No files matched your search
@@ -47,6 +47,8 @@ if( !check_token($user, $_GET['token'], SECRET_KEY)) {
|
||||
// empty default form values
|
||||
$validation_errors = "";
|
||||
$username = "";
|
||||
$street = "";
|
||||
$zipcode = "";
|
||||
$password = "";
|
||||
$newsletter_checked = " checked";
|
||||
|
||||
@@ -60,6 +62,8 @@ if( isset($_POST['submit']) ) {
|
||||
/* Refill form values*/
|
||||
$username = $_POST['username'];
|
||||
$password = $_POST['password'];
|
||||
$street = $_POST['street'];
|
||||
$zipcode = $_POST['zipcode'];
|
||||
$newsletter_checked = isset($_POST['newsletter']) ? " checked" : "";
|
||||
}
|
||||
if($data !== NULL) {
|
||||
@@ -123,6 +127,12 @@ if( isset($_POST['submit']) ) {
|
||||
<div class="form-row">
|
||||
<label for="id_birthdate_day">Fødselsdato:</label><?php date_picker("id_birthdate"); ?>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<label for="id_street">Gateadresse:</label><input id="id_street" type="text" name="street" placeholder="Gateadresse" value="<?php echo $street; ?>" />
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<label for="id_zipcode">Postnummer:</label><input id="id_zipcode" type="text" name="zipcode" placeholder="Postnummer" value="<?php echo $zipcode; ?>" maxlength="5"/><div class="area-wrap"></div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<label for="id_place_of_study">Studiested:</label><?php institutions(); ?>
|
||||
</div>
|
||||
|
||||
@@ -1 +1 @@
|
||||
/*! normalize.css v3.0.1 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;}body{margin:0;}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block;}audio,canvas,progress,video{display:inline-block;vertical-align:baseline;}audio:not([controls]){display:none;height:0;}[hidden],template{display:none;}a{background:transparent;}a:active,a:hover{outline:0;}abbr[title]{border-bottom:1px dotted;}b,strong{font-weight:bold;}dfn{font-style:italic;}h1{font-size:2em;margin:0.67em 0;}mark{background:#ff0;color:#000;}small{font-size:80%;}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;}sup{top:-0.5em;}sub{bottom:-0.25em;}img{border:0;}svg:not(:root){overflow:hidden;}figure{margin:1em 40px;}hr{-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;height:0;}pre{overflow:auto;}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em;}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0;}button{overflow:visible;}button,select{text-transform:none;}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;}button[disabled],html input[disabled]{cursor:default;}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0;}input{line-height:normal;}input[type="checkbox"],input[type="radio"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0;}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto;}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em;}legend{border:0;padding:0;}textarea{overflow:auto;}optgroup{font-weight:bold;}table{border-collapse:collapse;border-spacing:0;}td,th{padding:0;}meta.foundation-version{font-family:"/5.2.3/";}meta.foundation-mq-small{font-family:"/only screen/";width:0em;}meta.foundation-mq-medium{font-family:"/only screen and (min-width:40.063em)/";width:40.063em;}meta.foundation-mq-large{font-family:"/only screen and (min-width:64.063em)/";width:64.063em;}meta.foundation-mq-xlarge{font-family:"/only screen and (min-width:90.063em)/";width:90.063em;}meta.foundation-mq-xxlarge{font-family:"/only screen and (min-width:120.063em)/";width:120.063em;}meta.foundation-data-attribute-namespace{font-family:false;}html,body{height:100%;}*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}html,body{font-size:100%;}body{background:#fff;color:#222;padding:0;margin:0;font-family:"Helvetica Neue","Helvetica",Helvetica,Arial,sans-serif;font-weight:normal;font-style:normal;line-height:1;position:relative;cursor:default;}a:hover{cursor:pointer;}img{max-width:100%;height:auto;}img{-ms-interpolation-mode:bicubic;}#map_canvas img,#map_canvas embed,#map_canvas object,.map_canvas img,.map_canvas embed,.map_canvas object{max-width:none !important;}.left{float:left !important;}.right{float:right !important;}.clearfix:before,.clearfix:after{content:" ";display:table;}.clearfix:after{clear:both;}.hide{display:none;}.antialiased{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;}img{display:inline-block;vertical-align:middle;}textarea{height:auto;min-height:50px;}select{width:100%;}.row{width:100%;margin-left:auto;margin-right:auto;margin-top:0;margin-bottom:0;max-width:62.5rem;}.row:before,.row:after{content:" ";display:table;}.row:after{clear:both;}.row.collapse>.column,.row.collapse>.columns{padding-left:0;padding-right:0;}.row.collapse .row{margin-left:0;margin-right:0;}.row .row{width:auto;margin-left:-0.9375rem;margin-right:-0.9375rem;margin-top:0;margin-bottom:0;max-width:none;}.row .row:before,.row .row:after{content:" ";display:table;}.row .row:after{clear:both;}.row .row.collapse{width:auto;margin:0;max-width:none;}.row .row.collapse:before,.row .row.collapse:after{content:" ";display:table;}.row .row.collapse:after{clear:both;}.column,.columns{padding-left:0.9375rem;padding-right:0.9375rem;width:100%;float:left;}@media only screen{.small-push-0{position:relative;left:0%;right:auto;}.small-pull-0{position:relative;right:0%;left:auto;}.small-push-1{position:relative;left:8.3333333333%;right:auto;}.small-pull-1{position:relative;right:8.3333333333%;left:auto;}.small-push-2{position:relative;left:16.6666666667%;right:auto;}.small-pull-2{position:relative;right:16.6666666667%;left:auto;}.small-push-3{position:relative;left:25%;right:auto;}.small-pull-3{position:relative;right:25%;left:auto;}.small-push-4{position:relative;left:33.3333333333%;right:auto;}.small-pull-4{position:relative;right:33.3333333333%;left:auto;}.small-push-5{positLine truncated
|
||||
/*! normalize.css v3.0.1 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;}body{margin:0;}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block;}audio,canvas,progress,video{display:inline-block;vertical-align:baseline;}audio:not([controls]){display:none;height:0;}[hidden],template{display:none;}a{background:transparent;}a:active,a:hover{outline:0;}abbr[title]{border-bottom:1px dotted;}b,strong{font-weight:bold;}dfn{font-style:italic;}h1{font-size:2em;margin:0.67em 0;}mark{background:#ff0;color:#000;}small{font-size:80%;}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;}sup{top:-0.5em;}sub{bottom:-0.25em;}img{border:0;}svg:not(:root){overflow:hidden;}figure{margin:1em 40px;}hr{-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;height:0;}pre{overflow:auto;}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em;}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0;}button{overflow:visible;}button,select{text-transform:none;}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;}button[disabled],html input[disabled]{cursor:default;}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0;}input{line-height:normal;}input[type="checkbox"],input[type="radio"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0;}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto;}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em;}legend{border:0;padding:0;}textarea{overflow:auto;}optgroup{font-weight:bold;}table{border-collapse:collapse;border-spacing:0;}td,th{padding:0;}meta.foundation-version{font-family:"/5.2.3/";}meta.foundation-mq-small{font-family:"/only screen/";width:0em;}meta.foundation-mq-medium{font-family:"/only screen and (min-width:40.063em)/";width:40.063em;}meta.foundation-mq-large{font-family:"/only screen and (min-width:64.063em)/";width:64.063em;}meta.foundation-mq-xlarge{font-family:"/only screen and (min-width:90.063em)/";width:90.063em;}meta.foundation-mq-xxlarge{font-family:"/only screen and (min-width:120.063em)/";width:120.063em;}meta.foundation-data-attribute-namespace{font-family:false;}html,body{height:100%;}*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}html,body{font-size:100%;}body{background:#fff;color:#222;padding:0;margin:0;font-family:"Helvetica Neue","Helvetica",Helvetica,Arial,sans-serif;font-weight:normal;font-style:normal;line-height:1;position:relative;cursor:default;}a:hover{cursor:pointer;}img{max-width:100%;height:auto;}img{-ms-interpolation-mode:bicubic;}#map_canvas img,#map_canvas embed,#map_canvas object,.map_canvas img,.map_canvas embed,.map_canvas object{max-width:none !important;}.left{float:left !important;}.right{float:right !important;}.clearfix:before,.clearfix:after{content:" ";display:table;}.clearfix:after{clear:both;}.hide{display:none;}.antialiased{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;}img{display:inline-block;vertical-align:middle;}textarea{height:auto;min-height:50px;}select{width:100%;}.row{width:100%;margin-left:auto;margin-right:auto;margin-top:0;margin-bottom:0;max-width:62.5rem;}.row:before,.row:after{content:" ";display:table;}.row:after{clear:both;}.row.collapse>.column,.row.collapse>.columns{padding-left:0;padding-right:0;}.row.collapse .row{margin-left:0;margin-right:0;}.row .row{width:auto;margin-left:-0.9375rem;margin-right:-0.9375rem;margin-top:0;margin-bottom:0;max-width:none;}.row .row:before,.row .row:after{content:" ";display:table;}.row .row:after{clear:both;}.row .row.collapse{width:auto;margin:0;max-width:none;}.row .row.collapse:before,.row .row.collapse:after{content:" ";display:table;}.row .row.collapse:after{clear:both;}.column,.columns{padding-left:0.9375rem;padding-right:0.9375rem;width:100%;float:left;}@media only screen{.small-push-0{position:relative;left:0%;right:auto;}.small-pull-0{position:relative;right:0%;left:auto;}.small-push-1{position:relative;left:8.3333333333%;right:auto;}.small-pull-1{position:relative;right:8.3333333333%;left:auto;}.small-push-2{position:relative;left:16.6666666667%;right:auto;}.small-pull-2{position:relative;right:16.6666666667%;left:auto;}.small-push-3{position:relative;left:25%;right:auto;}.small-pull-3{position:relative;right:25%;left:auto;}.small-push-4{position:relative;left:33.3333333333%;right:auto;}.small-pull-4{position:relative;right:33.3333333333%;left:auto;}.small-push-5{positLine truncated
|
||||
@@ -7,9 +7,8 @@
|
||||
<link href='//fonts.googleapis.com/css?family=Arvo:700' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" type="text/css" media="all" href="css/style.css" />
|
||||
|
||||
<!--<script src="js/jquery-1.11.0.js"></script>
|
||||
<script src="bower_components/foundation/js/foundation.js"></script>
|
||||
<script src="js/app.js"></script>-->
|
||||
<script src="js/jquery-1.11.0.js"></script>
|
||||
<script src="js/activate.js"></script>
|
||||
|
||||
<!-- GA? -->
|
||||
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
/* global $, document */
|
||||
|
||||
function lookup_area(query) {
|
||||
var area = $('.area-wrap');
|
||||
$.getJSON('/api/zipcode.php', {q: query}, function(data) {
|
||||
console.log(data);
|
||||
area.html(data.result);
|
||||
});
|
||||
}
|
||||
$(document).ready(function() {
|
||||
var zipcode_field = $('input[name=zipcode]');
|
||||
if(zipcode_field.val().length !== 0) {
|
||||
lookup_area(zipcode_field.val());
|
||||
}
|
||||
|
||||
zipcode_field.on('keyup', function(event) {
|
||||
var query = event.target.value;
|
||||
lookup_area(query);
|
||||
});
|
||||
});
|
||||
Vendored
+10337
File diff suppressed because it is too large.
Load diff
@@ -343,6 +343,21 @@ function update_user_groups($data) {
|
||||
}
|
||||
return true;
|
||||
}
|
||||
function update_user_address($data) {
|
||||
global $conn;
|
||||
|
||||
$address = array(
|
||||
'user_id' => $data['userid'],
|
||||
'street' => $data['street'],
|
||||
'zipcode' => $data['zipcode']
|
||||
);
|
||||
$res = $conn->autoExecute('din_useraddressno', $address, DB_AUTOQUERY_INSERT);
|
||||
|
||||
if (DB::isError($res)) {
|
||||
// allready exists is fine
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function valid_date($date) {
|
||||
// try parsing
|
||||
@@ -410,12 +425,20 @@ function validate_activation_form($data) {
|
||||
if( !is_numeric($data['place_of_study']) ) {
|
||||
throw new ValidationException("Ugyldig studiested");
|
||||
}
|
||||
// address
|
||||
if( strlen($data['street']) == 0) {
|
||||
$data['street'] = '-';
|
||||
}
|
||||
if( !is_numeric($data['zipcode']) ) {
|
||||
throw new ValidationException("Ugyldig postnummer, må være et tall");
|
||||
}
|
||||
|
||||
return $data;
|
||||
}
|
||||
function save_activation_form($data) {
|
||||
update_user($data);
|
||||
update_user_groups($data);
|
||||
update_user_address($data);
|
||||
|
||||
log_userupdate($data['userid'], "Membership activated.");
|
||||
|
||||
|
||||
@@ -118,6 +118,14 @@ body {
|
||||
width: 23.333333333333%;
|
||||
}
|
||||
}
|
||||
input[name=zipcode],
|
||||
.area-wrap {
|
||||
width: 33.33333%;
|
||||
}
|
||||
.area-wrap {
|
||||
display: inline-block;
|
||||
padding-left: 4px;
|
||||
}
|
||||
label[for=id_newsletter] {
|
||||
border-bottom: 0;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"firstname": "Üve",
|
||||
"lastname": "Bårdvigsen Røed",
|
||||
"email": "aaaabazbasdfbfffaaaaaba@aaa44za.com",
|
||||
"email": "abaabazbasdfbfffaaaaaba@aaa44za.com",
|
||||
"birthdate": "1983-01-01",
|
||||
"phone": "+4743989787"
|
||||
"phone": "+4744989787"
|
||||
}
|
||||
Reference in new issue
Block a user