From 138ac2425dc9bc5ee3908e2a08f3d3b35be66e97 Mon Sep 17 00:00:00 2001
From: Markus Warg <mw@it-sls.de>
Date: Thu, 12 Aug 2010 09:52:07 +0200
Subject: source code taken from cacert-20100803.tar.bz2

---
 includes/account_stuff.php | 2 +-
 includes/general_stuff.php | 8 ++++----
 includes/tverify_stuff.php | 8 ++++----
 pages/index/0.php          | 2 +-
 pages/index/3.php          | 3 +++
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/includes/account_stuff.php b/includes/account_stuff.php
index 39ae5ed..fa6757b 100644
--- a/includes/account_stuff.php
+++ b/includes/account_stuff.php
@@ -168,7 +168,7 @@ function hideall() {
   <div id="pageNav">
     <div class="relatedLinks">
       <h3>CAcert.org</h3>
-      <ul class="menu" id="home"><li><a href="index.php"><?=_("Go Home")?></a></li><li><a href="account.php?id=logout"><?=_("Logout")?></a></li></ul>
+      <ul class="menu" id="home"><li><a href="/index.php"><?=_("Go Home")?></a></li><li><a href="account.php?id=logout"><?=_("Logout")?></a></li></ul>
     </div>
     <div class="relatedLinks">
       <h3 class="pointer" onclick="explode('mydetails')">+ <?=_("My Details")?></h3>
diff --git a/includes/general_stuff.php b/includes/general_stuff.php
index 48d469d..2cf4d3a 100644
--- a/includes/general_stuff.php
+++ b/includes/general_stuff.php
@@ -46,7 +46,7 @@ google_color_border = "FFFFFF";
       <a href="https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=1"><?=_("Join")?></a>
       <? } ?>
       <a href="/policy/CAcertCommunityAgreement.php"><?=_("Community Agreement")?></a>
-      <a href="index.php?id=3"><?=_("Root Certificate")?></a>
+      <a href="/index.php?id=3"><?=_("Root Certificate")?></a>
     </div>
     <? if(array_key_exists('mconn',$_SESSION) && $_SESSION['mconn']) { ?>
     <div class="relatedLinks">
@@ -139,9 +139,9 @@ if(!function_exists("showfooter"))
 </a>
 </noscript>
 <!--ONESTAT SCRIPTCODE END--><? } ?>
-	<a href="index.php?id=12"><?=_("About Us")?></a> | <a href="index.php?id=13"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> |
-        <a href="index.php?id=10"><?=_("Privacy Policy")?></a> |
-        <a href="index.php?id=51"><?=_("Mission Statement")?></a> | <a href="index.php?id=11"><?=_("Contact Us")?></a> |
+	<a href="/index.php?id=12"><?=_("About Us")?></a> | <a href="/index.php?id=13"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> |
+        <a href="/index.php?id=10"><?=_("Privacy Policy")?></a> |
+        <a href="/index.php?id=51"><?=_("Mission Statement")?></a> | <a href="/index.php?id=11"><?=_("Contact Us")?></a> |
 	&copy;2002-<?=date("Y")?> <?=_("by CAcert")?></div>
 </div>  
 </body>             
diff --git a/includes/tverify_stuff.php b/includes/tverify_stuff.php
index 2053aaa..007f072 100644
--- a/includes/tverify_stuff.php
+++ b/includes/tverify_stuff.php
@@ -74,10 +74,10 @@ if(!function_exists("showfooter"))
 </a>
 </noscript>
 <!--ONESTAT SCRIPTCODE END--><? } ?>
-        <a href="index.php?id=12"><?=_("About Us")?></a> | <a href="index.php?id=13"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> |
-        <a href="index.php?id=10"><?=_("Privacy Policy")?></a> |
-        <a href="index.php?id=51"><?=_("Mission Statement")?></a> | <a href="index.php?id=11"><?=_("Contact Us")?></a> |
-        <a href="index.php?id=19"><?=_("Further Information")?></a> | &copy;2002-<?=date("Y")?> <?=_("by CAcert")?></div>
+        <a href="/index.php?id=12"><?=_("About Us")?></a> | <a href="/index.php?id=13"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> |
+        <a href="/index.php?id=10"><?=_("Privacy Policy")?></a> |
+        <a href="/index.php?id=51"><?=_("Mission Statement")?></a> | <a href="/index.php?id=11"><?=_("Contact Us")?></a> |
+        <a href="/index.php?id=19"><?=_("Further Information")?></a> | &copy;2002-<?=date("Y")?> <?=_("by CAcert")?></div>
 </div>  
 </body>             
 </html><?
diff --git a/pages/index/0.php b/pages/index/0.php
index 0a1d11e..d1d3fef 100644
--- a/pages/index/0.php
+++ b/pages/index/0.php
@@ -19,7 +19,7 @@
 
 <p><?=sprintf(_("If you want to have free certificates issued to you, join the %s CAcert Community %s."),"<a href=\"https://www.cacert.org/index.php?id=1\">","</a>")?></p>
 
-<p><?=sprintf(_("If you want to use certificates issued by CAcert, read the CAcert %s Disclaimer and Licence %s."),'<a href="/policy/NRPDisclaimerAndLicence.php">',"</a>")?>
+<p><?=sprintf(_("If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."),'<a href="/policy/RootDistributionLicense.php">',"</a>")?>
 <?=sprintf(_("This license applies to using the CAcert %s root keys %s."),'<a href="/index.php?id=3">','</a>')?></p>
 
 
diff --git a/pages/index/3.php b/pages/index/3.php
index 5b75815..ad493f2 100644
--- a/pages/index/3.php
+++ b/pages/index/3.php
@@ -15,6 +15,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */ ?>
+
+<p><?=sprintf(_("You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."),"<a href='/policy/RootDistributionLicense.php'>","</a>")?></p>
+
 <p>
 Class 1 <?=_("PKI Key")?><br>
 <a href="index.php?id=17"><?=_("Click here if you want to import the root certificate into Microsoft Internet Explorer 5.x/6.x")?></a><br>
-- 
cgit v1.2.1