source code taken from cacert-20090926.tar.bz2

9 files changed, 25 insertions, 22 deletions

diff --git a/cacert/pages/account/14.php b/cacert/pages/account/14.php
index 948d5f7..342ab46 100644
--- a/cacert/pages/account/14.php
+++ b/cacert/pages/account/14.php
@@ -35,7 +35,7 @@
     <td class="DataTD"><input type="password" name="pword2"></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><font color="red">*</font><?=_("Please note, in the interests of good security, the pass phrase must be made up of an upper case letter, lower case letter, number and symbol.")?></td>
+    <td class="DataTD" colspan="2"><font color="red">*</font><?=_("Please note, in the interests of good security, the pass phrase must be made up of an upper case letter, lower case letter, number and symbol (all white spaces at the beginning and end are removed).")?></td>
   </tr>
   <tr>
     <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Update Pass Phrase")?>"></td>
diff --git a/cacert/pages/account/CVS/Entries b/cacert/pages/account/CVS/Entries
index 2975af1..9ebbf4d 100644
--- a/cacert/pages/account/CVS/Entries
+++ b/cacert/pages/account/CVS/Entries
@@ -20,7 +20,6 @@
 /31.php/1.6/Thu Sep  4 13:54:37 2008//
 /44.php/1.5/Fri Sep  5 15:50:04 2008//
 /13.php/1.12/Sun Sep  7 22:20:30 2008//
-/14.php/1.4/Sun Sep  7 22:20:30 2008//
 /2.php/1.7/Sun Sep  7 22:20:30 2008//
 /27.php/1.7/Sun Sep  7 22:20:30 2008//
 /33.php/1.12/Sun Sep  7 22:20:30 2008//
@@ -52,4 +51,6 @@
 /50.php/1.5/Sun May 31 16:50:59 2009//
 /3.php/1.16/Thu Jun 25 20:09:31 2009//
 /55.php/1.8/Thu Jun 25 20:09:31 2009//
+/14.php/1.5/Mon Sep  7 22:36:31 2009//
+/56.php/1.2/Sun Sep  6 18:46:20 2009//
 D
diff --git a/cacert/pages/index/0.php b/cacert/pages/index/0.php
index 18d6d92..0a1d11e 100644
--- a/cacert/pages/index/0.php
+++ b/cacert/pages/index/0.php
@@ -46,7 +46,7 @@
 	$fp = @fopen("/www/pages/index/feed.rss", "r");
 	if($fp)
 	{
-		echo '<p><u>'._('Latest News').'</u></p>';
+		echo '<p id="lnews">'._('Latest News').'</p>';
 
 
 		while(!feof($fp))
diff --git a/cacert/pages/index/1.php b/cacert/pages/index/1.php
index 9c1a0b9..c5b181e 100644
--- a/cacert/pages/index/1.php
+++ b/cacert/pages/index/1.php
@@ -20,7 +20,8 @@
 <p style="border:dotted 1px #900;padding:0.3em;background-color:#ffe;">
 <b><?=_("In light of the number of people having issues with making up a password we have the following suggestions:")?></b><br><br>
 <?=_("To get a password that will work, we suggest the following example")?>: Fr3d Sm|7h<br><br>
-<?=_("This wouldn't match your name or email at all, it contains at least 1 lower case letter, 1 upper case letter, a number, white space and a misc symbol. You get additional security for being over 15 characters and a second additional point for having it over 30. The system starts reducing security if you include any section of your name, or password or email address or if it matches a word from the english dictionary...")?>
+<?=_("This wouldn't match your name or email at all, it contains at least 1 lower case letter, 1 upper case letter, a number, white space and a misc symbol. You get additional security for being over 15 characters and a second additional point for having it over 30. The system starts reducing security if you include any section of your name, or password or email address or if it matches a word from the english dictionary...")?><br><br>
+<b><?=_("Note: White spaces at the beginning and end of a password will be removed.")?></b>
 </p>
 
 <form method="post" action="index.php" autocomplete="off">
diff --git a/cacert/pages/index/21.php b/cacert/pages/index/21.php
index 66e3610..ae55e9c 100644
--- a/cacert/pages/index/21.php
+++ b/cacert/pages/index/21.php
@@ -36,7 +36,7 @@
 
 <p><?=_("If you are located in Australia, you can use bank transfer instead and pay the equivalent of US$10 in AU$.")?></p>
 
-<p><?=_("Please also include Your name in the transaction so we know who it came from or send an email to robert at cacert dot org with the details:")?></p>
+<p><?=_("Please also include your name in the transaction so we know who it came from and send an email to ernestine at cacert dot org with the details:")?></p>
 
 <ul>
 <li>Account Name: CAcert Inc</li>
diff --git a/cacert/pages/index/4.php b/cacert/pages/index/4.php
index fa58279..ffbfe26 100644
--- a/cacert/pages/index/4.php
+++ b/cacert/pages/index/4.php
@@ -45,9 +45,9 @@ h1 {font-size:1.9em;text-align:center;}
 <label for="email"><?=_("Email Address")?>:</label><input type='text' name="email" value="<?=sanitizeHTML(array_key_exists("email",$_REQUEST)?$_REQUEST['email']:"")?>" <? if(array_key_exists('notauto',$_REQUEST) && $_REQUEST['noauto'] == 1) echo " autocomplete='off'"; ?>/><br />
 <label for="pword"><?=_("Pass Phrase")?>:</label><input type='password' name='pword' autocomplete="off"/><br />
 <input type='submit' name="process" value="<?=_("Login")?>" /><br /><br />
-<a href='https://www.cacert.org/index.php?id=4'><?=_("Password Login")?></a> - 
-<a href='https://www.cacert.org/index.php?id=5'><?=_("Lost Password")?></a> - 
-<a href='https://www.cacert.org/index.php?id=4&amp;noauto=1'><?=_("Net Cafe Login")?></a><br />
+<a href='https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=4'><?=_("Password Login")?></a> - 
+<a href='https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=5'><?=_("Lost Password")?></a> - 
+<a href='https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=4&amp;noauto=1'><?=_("Net Cafe Login")?></a><br />
 <p class='smalltext'><?=sprintf(_("If you are having trouble with your username or password, please visit our %swiki page%s for more information"), "<a href='http://wiki.cacert.org/wiki/FAQ/LostPasswordOrAccount' target='_new'>", "</a>");?></p>
 <input type="hidden" name="oldid" value="<?=$id?>">
 </form>
diff --git a/cacert/pages/index/5.php b/cacert/pages/index/5.php
index b8234d8..20e868f 100644
--- a/cacert/pages/index/5.php
+++ b/cacert/pages/index/5.php
@@ -21,7 +21,7 @@
     <td colspan="2" class="title"><?=_("Lost Pass Phrase")?></td>
   </tr>
   <tr>
-    <td class="DataTD" width="125"><?=_("Email Address")?>: </td>
+    <td class="DataTD" width="125"><?=_("Email Address (primary)")?>: </td>
     <td class="DataTD" width="125"><input type="text" name="email" autocomplete="off"></td>
   </tr>
   <tr>
diff --git a/cacert/pages/index/8.php b/cacert/pages/index/8.php
index 370e6d1..368760b 100644
--- a/cacert/pages/index/8.php
+++ b/cacert/pages/index/8.php
@@ -17,11 +17,12 @@
 */ ?>
 <p><b><? printf(_("The current %s board, and roles."), "CAcert Inc."); ?></b></p>
 <p>
-Teus Hagen - <?=_("President")?><br/>
-Evaldo Gardenali - <?=_("Vice-President")?><br/>
-Robert Cruikshank - <?=_("Treasurer")?>, <?=_("Public Officer")?><br/>
-Guillaume Romagny - <?=_("Secretary")?><br/>
-Philipp Dunkel - <?=_("member")?><br/>
-Greg Stark - <?=_("member")?><br/>
-Alejandro Mery Pellegrini - <?=_("member")?><br/>
+Nick Bebout - <?=_("President")?><br/>
+Mark Lipscombe - <?=_("Vice-President")?><br/>
+Philipp Dunkel - <?=_("Secretary")?><br/>
+Ernestine Schwob - <?=_("Treasurer")?><br/>
+Andreas B&uuml;rki - <?=_("member")?><br/>
+Guillaume Romagny - <?=_("member")?><br/>
+Ian Grigg - <?=_("member")?><br/>
+Robert Cruikshank - <?=_("Public Officer")?><br/>
 </p>
diff --git a/cacert/pages/index/CVS/Entries b/cacert/pages/index/CVS/Entries
index 31f6b75..e71cfda 100644
--- a/cacert/pages/index/CVS/Entries
+++ b/cacert/pages/index/CVS/Entries
@@ -10,12 +10,12 @@
 /17.php/1.10/Mon Aug 25 21:04:26 2008//
 /18.php/1.6/Mon Aug 25 21:04:26 2008//
 /19.php/1.6/Sun Sep  7 22:20:30 2008//
-/5.php/1.14/Tue Oct  7 16:49:50 2008//
 /6.php/1.12/Tue Oct  7 16:49:50 2008//
-/21.php/1.2/Wed Oct 22 11:07:56 2008//
-/8.php/1.11/Wed Mar  4 22:36:27 2009//
-/1.php/1.17/Sun Mar 22 00:39:32 2009//
 /11.php/1.24/Fri Apr 10 23:09:07 2009//
-/0.php/1.30/Sun May 31 16:50:59 2009//
-/4.php/1.21/Sun May 31 16:50:59 2009//
+/1.php/1.18/Mon Sep  7 22:36:32 2009//
+/21.php/1.3/Mon Sep  7 22:36:32 2009//
+/5.php/1.15/Mon Sep  7 22:36:32 2009//
+/8.php/1.13/Tue Sep  8 20:29:25 2009//
+/4.php/1.22/Sat Sep 19 23:32:57 2009//
+/0.php/1.31/Mon Sep 21 18:28:22 2009//
 D