From 461cb4fa36ea02a5e83a1c8af93c916c2bacecce Mon Sep 17 00:00:00 2001
From: INOPIAE <inopiae@cacert.org>
Date: Sun, 26 Jan 2014 15:25:08 +0100
Subject: bug 1226: added dob to form assure someone wot/5.php, implemented
 check for dob match to account in not ttpadmin

---
 pages/wot/5.php | 47 ++++++++++++++++++++++++++++++++++++++++++++---
 pages/wot/6.php |  3 +++
 2 files changed, 47 insertions(+), 3 deletions(-)

(limited to 'pages/wot')

diff --git a/pages/wot/5.php b/pages/wot/5.php
index c1a6438..a9c3dcb 100644
--- a/pages/wot/5.php
+++ b/pages/wot/5.php
@@ -18,14 +18,24 @@
 	include_once("../includes/shutdown.php");
 	require_once("../includes/lib/l10n.php");
 ?>
-<? 
-  if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "") 
+<?
+  if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "")
   {
     ?><font color="orange" size="+1">
       <? echo _("ERROR").": ".$_SESSION['_config']['error'] ?>
     </font>
     <?unset($_SESSION['_config']['error']);
-  } 
+  }
+
+  if (!isset($_SESSION['assuresomeone']['year'])) {
+      $_SESSION['assuresomeone']['year'] = '';
+  }
+  if (!isset($_SESSION['assuresomeone']['month'])) {
+      $_SESSION['assuresomeone']['month'] = '';
+  }
+  if (!isset($_SESSION['assuresomeone']['day'])) {
+      $_SESSION['assuresomeone']['day'] = '';
+  }
 ?>
 <? if(array_key_exists('noemailfound',$_SESSION['_config']) && $_SESSION['_config']['noemailfound'] == 1) { ?>
 <form method="post" action="wot.php">
@@ -60,6 +70,37 @@
     <td class="DataTD"><input type="text" name="email" id="email" value="<?=array_key_exists('email',$_POST)?sanitizeHTML($_POST['email']):""?>"></td>
 <? } ?>
   </tr>
+    <tr>
+    <td class="DataTD">
+        <?=_("Date of Birth")?><br/>
+        (<?=_("yyyy/mm/dd")?>)</td>
+    <td class="DataTD">
+        <input type="text" name="year" value="<?=array_key_exists('year',$_SESSION['assuresomeone']) ? sanitizeHTML($_SESSION['assuresomeone']['year']):""?>" size="4" autocomplete="off"></nobr>
+        <select name="month">
+<?
+for($i = 1; $i <= 12; $i++)
+{
+    echo "<option value='$i'";
+    if(array_key_exists('month',$_SESSION['assuresomeone']) && $_SESSION['assuresomeone']['month'] == $i)
+        echo " selected=\"selected\"";
+    echo ">".ucwords(strftime("%B", mktime(0,0,0,$i,1,date("Y"))))." ($i)</option>\n";
+}
+?>
+        </select>
+        <select name="day">
+<?
+for($i = 1; $i <= 31; $i++)
+{
+    echo "<option";
+    if(array_key_exists('day',$_SESSION['assuresomeone']) && $_SESSION['assuresomeone']['day'] == $i)
+        echo " selected=\"selected\"";
+    echo ">$i</option>";
+}
+?>
+        </select>
+    </td>
+  </tr>
+
   <tr>
     <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Next")?>"></td>
   </tr>
diff --git a/pages/wot/6.php b/pages/wot/6.php
index a565aa7..6934d0f 100644
--- a/pages/wot/6.php
+++ b/pages/wot/6.php
@@ -24,6 +24,9 @@
 	}
 
 	$row = $_SESSION['_config']['notarise'];
+	$_SESSION['assuresomeone']['year'] = '';
+	$_SESSION['assuresomeone']['month'] = '';
+	$_SESSION['assuresomeone']['day'] = '';
 
 	if($_SESSION['profile']['ttpadmin'] == 1)
 //		$methods = array("Face to Face Meeting", "Trusted 3rd Parties", "TopUP");
-- 
cgit v1.2.1


From 7fbd25520ae6d4920453961728b115d8a974eb97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=A4nzer?= <neo@nhng.de>
Date: Sat, 21 Jun 2014 23:56:28 +0200
Subject: bug 1226: Treat the date values as integer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michael Tänzer <neo@nhng.de>
---
 pages/wot/5.php | 12 ++++++------
 pages/wot/6.php |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'pages/wot')

diff --git a/pages/wot/5.php b/pages/wot/5.php
index a9c3dcb..7fdd1c5 100644
--- a/pages/wot/5.php
+++ b/pages/wot/5.php
@@ -28,13 +28,13 @@
   }
 
   if (!isset($_SESSION['assuresomeone']['year'])) {
-      $_SESSION['assuresomeone']['year'] = '';
+      $_SESSION['assuresomeone']['year'] = 0;
   }
   if (!isset($_SESSION['assuresomeone']['month'])) {
-      $_SESSION['assuresomeone']['month'] = '';
+      $_SESSION['assuresomeone']['month'] = 0;
   }
   if (!isset($_SESSION['assuresomeone']['day'])) {
-      $_SESSION['assuresomeone']['day'] = '';
+      $_SESSION['assuresomeone']['day'] = 0;
   }
 ?>
 <? if(array_key_exists('noemailfound',$_SESSION['_config']) && $_SESSION['_config']['noemailfound'] == 1) { ?>
@@ -75,13 +75,13 @@
         <?=_("Date of Birth")?><br/>
         (<?=_("yyyy/mm/dd")?>)</td>
     <td class="DataTD">
-        <input type="text" name="year" value="<?=array_key_exists('year',$_SESSION['assuresomeone']) ? sanitizeHTML($_SESSION['assuresomeone']['year']):""?>" size="4" autocomplete="off"></nobr>
+        <input type="text" name="year" value="<?=array_key_exists('year',$_SESSION['assuresomeone']) && intval($_SESSION['assuresomeone']['year']) !== 0 ? intval($_SESSION['assuresomeone']['year']):''?>" size="4" autocomplete="off"></nobr>
         <select name="month">
 <?
 for($i = 1; $i <= 12; $i++)
 {
     echo "<option value='$i'";
-    if(array_key_exists('month',$_SESSION['assuresomeone']) && $_SESSION['assuresomeone']['month'] == $i)
+    if(array_key_exists('month',$_SESSION['assuresomeone']) && intval($_SESSION['assuresomeone']['month']) === $i)
         echo " selected=\"selected\"";
     echo ">".ucwords(strftime("%B", mktime(0,0,0,$i,1,date("Y"))))." ($i)</option>\n";
 }
@@ -92,7 +92,7 @@ for($i = 1; $i <= 12; $i++)
 for($i = 1; $i <= 31; $i++)
 {
     echo "<option";
-    if(array_key_exists('day',$_SESSION['assuresomeone']) && $_SESSION['assuresomeone']['day'] == $i)
+    if(array_key_exists('day',$_SESSION['assuresomeone']) && intval($_SESSION['assuresomeone']['day']) === $i)
         echo " selected=\"selected\"";
     echo ">$i</option>";
 }
diff --git a/pages/wot/6.php b/pages/wot/6.php
index 6934d0f..200a526 100644
--- a/pages/wot/6.php
+++ b/pages/wot/6.php
@@ -24,9 +24,9 @@
 	}
 
 	$row = $_SESSION['_config']['notarise'];
-	$_SESSION['assuresomeone']['year'] = '';
-	$_SESSION['assuresomeone']['month'] = '';
-	$_SESSION['assuresomeone']['day'] = '';
+	$_SESSION['assuresomeone']['year'] = 0;
+	$_SESSION['assuresomeone']['month'] = 0;
+	$_SESSION['assuresomeone']['day'] = 0;
 
 	if($_SESSION['profile']['ttpadmin'] == 1)
 //		$methods = array("Face to Face Meeting", "Trusted 3rd Parties", "TopUP");
-- 
cgit v1.2.1


From 92e73d70093e44747edfbb7c731445dd74bc864a Mon Sep 17 00:00:00 2001
From: Benny Baumann <BenBE@geshi.org>
Date: Sun, 22 Jun 2014 00:45:15 +0200
Subject: bug 1226: Only consider values above 1900 as the year when returning
 a pre-filled form

---
 pages/wot/5.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pages/wot')

diff --git a/pages/wot/5.php b/pages/wot/5.php
index 7fdd1c5..565dd6a 100644
--- a/pages/wot/5.php
+++ b/pages/wot/5.php
@@ -75,7 +75,7 @@
         <?=_("Date of Birth")?><br/>
         (<?=_("yyyy/mm/dd")?>)</td>
     <td class="DataTD">
-        <input type="text" name="year" value="<?=array_key_exists('year',$_SESSION['assuresomeone']) && intval($_SESSION['assuresomeone']['year']) !== 0 ? intval($_SESSION['assuresomeone']['year']):''?>" size="4" autocomplete="off"></nobr>
+        <input type="text" name="year" value="<?=array_key_exists('year',$_SESSION['assuresomeone']) && intval($_SESSION['assuresomeone']['year']) >= 1900 ? intval($_SESSION['assuresomeone']['year']):''?>" size="4" autocomplete="off"></nobr>
         <select name="month">
 <?
 for($i = 1; $i <= 12; $i++)
-- 
cgit v1.2.1