From 3c4689fce2bd493f35516ebf0c247fa1a31f866b Mon Sep 17 00:00:00 2001
From: Carles Tubio <c@rles-tub.io>
Date: Sat, 9 Jan 2016 23:37:42 +0000
Subject: [PATCH 1/3] Show error message in red, only once, and inside the
 correct form.

---
 pool/page_reg.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pool/page_reg.php b/pool/page_reg.php
index f9c01d04..3728661d 100644
--- a/pool/page_reg.php
+++ b/pool/page_reg.php
@@ -34,8 +34,8 @@ Your miner password should be '<b>x</b>' and <b>must not</b> use your login pass
  $pg .= '<table cellpadding=5 cellspacing=0 border=1><tr><td class=dc>';
 
  $pg .= '<h1>Login</h1>';
- if (isset($data['data']['error']))
-	$pg .= "<br><b>".$data['data']['error']." - please try again</b><br><br>";
+ if (isset($data['data']['error']) && !isset($_POST['pass2']))
+	$pg .= "<br><b style='color:red'>".$data['data']['error']." - please try again</b><br><br>";
  $pg .= makeForm('');
  $pg .= "
 <table>
@@ -55,8 +55,8 @@ Your miner password should be '<b>x</b>' and <b>must not</b> use your login pass
  $pg.= '</td></tr><tr><td class=dc>';
 
  $pg .= '<h1>Register</h1>';
- if (isset($data['data']['error']))
-	$pg .= "<br><b>".$data['data']['error']." - please try again</b><br><br>";
+ if (isset($data['data']['error']) && isset($_POST['pass2']))
+	$pg .= "<br><b style='color:red'>".$data['data']['error']." - please try again</b><br><br>";
  $pg .= makeForm('');
  $pg .= "
 <table>

From e4b94930375af20b244fca1fb5fd80291a64456e Mon Sep 17 00:00:00 2001
From: Carles Tubio <c@rles-tub.io>
Date: Sun, 24 Jan 2016 23:32:15 +0000
Subject: [PATCH 2/3] Fixed style in error msg

---
 pool/page_reg.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pool/page_reg.php b/pool/page_reg.php
index 3728661d..5b50894f 100644
--- a/pool/page_reg.php
+++ b/pool/page_reg.php
@@ -35,7 +35,7 @@ Your miner password should be '<b>x</b>' and <b>must not</b> use your login pass
 
  $pg .= '<h1>Login</h1>';
  if (isset($data['data']['error']) && !isset($_POST['pass2']))
-	$pg .= "<br><b style='color:red'>".$data['data']['error']." - please try again</b><br><br>";
+	$pg .= "<br><span class=err>".$data['data']['error']." - please try again</span><br><br>";
  $pg .= makeForm('');
  $pg .= "
 <table>
@@ -56,7 +56,7 @@ Your miner password should be '<b>x</b>' and <b>must not</b> use your login pass
 
  $pg .= '<h1>Register</h1>';
  if (isset($data['data']['error']) && isset($_POST['pass2']))
-	$pg .= "<br><b style='color:red'>".$data['data']['error']." - please try again</b><br><br>";
+	$pg .= "<br><span class=err>".$data['data']['error']." - please try again</span><br><br>";
  $pg .= makeForm('');
  $pg .= "
 <table>

From 879294fe1a0c9e28eb9e01dfc02924fc86c2d94e Mon Sep 17 00:00:00 2001
From: Con Kolivas <kernel@kolivas.org>
Date: Wed, 27 Jan 2016 21:47:44 +1100
Subject: [PATCH 3/3] Correctly handle existing instance running

---
 src/ckpool.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/ckpool.c b/src/ckpool.c
index 0102755b..1d12b271 100644
--- a/src/ckpool.c
+++ b/src/ckpool.c
@@ -2126,6 +2126,8 @@ int main(int argc, char **argv)
 		}
 	}
 
+	if (!ckp.handover)
+		manage_old_child(&ckp, &ckp.main);
 	write_namepid(&ckp.main);
 	open_process_sock(&ckp, &ckp.main, &ckp.main.us);
 	launch_logger(&ckp.main);