před 10 roky · 65d84bcf97
--- a/data/pages/register.template
+++ b/data/pages/register.template
@@ -11,27 +11,36 @@
 
 	<div>
 
 		Password: <input name="password" type="password"/>
 
 	</div>
 
+	<div>
 
+		Verify Password: <input name="password1" type="password"/>
 
+	</div>
 
 	<input type="submit" value="register"/>
 
 	<input type="button" value="cancel" class="cancel"/>
 
 </form>
 
 <script>
 
 	$('form#register').submit(function(){
 
-		var data = $(this).serializeObject(),
 
-			State = History.getState();
 
-		for(var i in State.data){
 
-			data[i] = State.data;
 
-		}
 
-		data.type = 'action';
 
-		data.id = 'register';
 
-		apiCall(data,function(d){
 
-			if(!d.error){
 
-				setKey(d.key);
 
-				loadState('page-index');
 
-			}else{
 
-				setKey(null);
 
-				loadState('page-register');
 
+		var p0 = $(this).find('input[name=password]').val(),
 
+			p1 = $(this).find('input[name=password1]').val();
 
+		if(p0!=''&&p1!=''&&p0==p1){
 
+			var data = $(this).serializeObject(),
 
+				State = History.getState();
 
+			for(var i in State.data){
 
+				data[i] = State.data;
 
 			}
 
-		});
 
+			data.type = 'action';
 
+			data.id = 'register';
 
+			apiCall(data,function(d){
 
+				if(!d.error){
 
+					setKey(d.key);
 
+					loadState('page-index');
 
+				}else{
 
+					setKey(null);
 
+					loadState('page-register');
 
+				}
 
+			});
 
+		}else{
 
+			alert('The password must match!');
 
+		}
 
 		return false;
 
 	}).children('.cancel').click(function(){
 
 		loadState('page-index');
--- a/js/index.js
+++ b/js/index.js
@@ -37,9 +37,6 @@
 
 			$('#loading').show();
 
 			data.get = 'api';
 
 			data.timestamp = +new Date;
 
-			if(exists(State.data.key)){
 
-				data.key = State.data.key;
 
-			}
 
 			$.get(location.href,data,function(d){
 
 				if(exists(d['error'])){
 
 					error(d);
@@ -47,9 +44,9 @@
 
 					if(location.href.substr(location.href.lastIndexOf('/')+1) != d.state.url){
 
 						History.pushState(d.state.data,d.state.title,d.state.url);
 
 					}
 
-					if(exists(callback)){
 
-						callback(d);
 
-					}
 
+				}
 
+				if(exists(callback)){
 
+					callback(d);
 
 				}
 
 			},'json');
 
 		},
@@ -65,10 +62,9 @@
 
 				}else{
 
 					History.pushState(d.state.data,document.title,href);
 
 					getNewState();
 
-					if(exists(callback)){
 
-						callback(d);
 
-					}
 
-					console.log('loadState');
 
+				}
 
+				if(exists(callback)){
 
+					callback(d);
 
 				}
 
 			},'json');
 
 		},
@@ -84,15 +80,16 @@
 
 				}else{
 
 					History.replaceState(d.state.data,document.title,href);
 
 					getNewState();
 
-					if(exists(callback)){
 
-						callback();
 
-					}
 
+				}
 
+				if(exists(callback)){
 
+					callback(d);
 
 				}
 
 			},'json');
 
 		},
 
 		error = function(e){
 
-			e = '['+State.url+']'+e.error+"\n"+(exists(e.state)?JSON.stringify(e.state):'');
 
-			console.error(e);
 
+			e = '['+State.url+']'+e.error;
 
+			console.error(e+"\n"+(exists(e.state)?JSON.stringify(e.state):''));
 
+			alert(e);
 
 		},
 
 		getNewState = function(){
 
 			State = History.getState();
--- a/php/functions.php
+++ b/php/functions.php
@@ -11,6 +11,7 @@
 
 			$json['state'] = Array();
 
 		}
 
 		unset($_GET['password']);
 
+		unset($_GET['password1']);
 
 		if(!isset($json['state']['data'])){
 
 			$json['state']['data'] = $_GET;
 
 		}else{