diff options
author | Michael Tänzer <neo@nhng.de> | 2014-06-22 00:05:38 +0200 |
---|---|---|
committer | Michael Tänzer <neo@nhng.de> | 2014-06-22 00:05:38 +0200 |
commit | c964af896186794da5a9e8c6031563ea356ed7c6 (patch) | |
tree | 5699d65d3f8e930baecc60533e27731761af0795 /pages/wot | |
parent | 340a1c8a2b428ec72fcc6531c4ee458aab28de88 (diff) | |
parent | b6a4c69f26fcdbefeeef6922a80b842e28610741 (diff) | |
download | cacert-devel-c964af896186794da5a9e8c6031563ea356ed7c6.tar.gz cacert-devel-c964af896186794da5a9e8c6031563ea356ed7c6.tar.xz cacert-devel-c964af896186794da5a9e8c6031563ea356ed7c6.zip |
Merge branch 'bug-1226' into testserver-stable
Conflicts:
www/wot.php
Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'pages/wot')
-rw-r--r-- | pages/wot/5.php | 12 | ||||
-rw-r--r-- | pages/wot/6.php | 6 |
2 files changed, 9 insertions, 9 deletions
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 d48fc21..77844c6 100644 --- a/pages/wot/6.php +++ b/pages/wot/6.php @@ -24,9 +24,9 @@ if(!array_key_exists('notarise',$_SESSION['_config'])) } $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'] == 2) $methods = array('Face to Face Meeting', 'TTP-Assisted', 'TTP-TOPUP'); |