First commit of tag changes. bug-1444
authorbdmc <bdmc@buadh-brath.com>
Tue, 30 Oct 2018 15:08:05 +0000 (11:08 -0400)
committerbdmc <bdmc@buadh-brath.com>
Tue, 30 Oct 2018 15:08:05 +0000 (11:08 -0400)
Changed <?= into <?php echo
Changed <? into <?php

203 files changed:
cgi-bin/siteseal.cgi
includes/about_menu.php
includes/account.php
includes/account_stuff.php
includes/general.php
includes/general_stuff.php
includes/keygen.php
includes/lib/general.php
includes/loggedin.php
includes/mysql.php.sample
includes/notary.inc.php
includes/shutdown.php
includes/sponsorinfo.php
includes/tverify_stuff.php
pages/account/0.php
pages/account/1.php
pages/account/10.php
pages/account/11.php
pages/account/12.php
pages/account/13.php
pages/account/14.php
pages/account/15.php
pages/account/16.php
pages/account/17.php
pages/account/18.php
pages/account/19.php
pages/account/2.php
pages/account/20.php
pages/account/21.php
pages/account/22.php
pages/account/23.php
pages/account/24.php
pages/account/25.php
pages/account/26.php
pages/account/27.php
pages/account/28.php
pages/account/29.php
pages/account/3.php
pages/account/30.php
pages/account/31.php
pages/account/32.php
pages/account/33.php
pages/account/34.php
pages/account/35.php
pages/account/36.php
pages/account/37.php
pages/account/38.php
pages/account/39.php
pages/account/4.php
pages/account/40.php
pages/account/41.php
pages/account/42.php
pages/account/43.php
pages/account/44.php
pages/account/45.php
pages/account/48.php
pages/account/49.php
pages/account/5.php
pages/account/50.php
pages/account/51.php
pages/account/52.php
pages/account/53.php
pages/account/54.php
pages/account/55.php
pages/account/56.php
pages/account/57.php
pages/account/58.php
pages/account/59.php
pages/account/6.php
pages/account/7.php
pages/account/8.php
pages/account/9.php
pages/advertising/0.php
pages/advertising/1.php
pages/disputes/0.php
pages/disputes/1.php
pages/disputes/2.php
pages/disputes/4.php
pages/disputes/5.php
pages/disputes/6.php
pages/gpg/0.php
pages/gpg/2.php
pages/gpg/3.php
pages/help/0.php
pages/help/2.php
pages/help/3.php
pages/help/4.php
pages/help/5.php
pages/help/6.php
pages/help/7.php
pages/help/8.php
pages/help/9.php
pages/index/0.php
pages/index/1.php
pages/index/10.php
pages/index/11.php
pages/index/12.php
pages/index/13.php
pages/index/16.php
pages/index/17.php
pages/index/18.php
pages/index/19.php
pages/index/2.php
pages/index/21.php
pages/index/3.php
pages/index/4.php
pages/index/47.php
pages/index/5.php
pages/index/51.php
pages/index/52.php
pages/index/6.php
pages/index/7.php
pages/index/8.php
pages/wot/0.php
pages/wot/1.php
pages/wot/10.php
pages/wot/12.php
pages/wot/13.php
pages/wot/15.php
pages/wot/2.php
pages/wot/3.php
pages/wot/4.php
pages/wot/5.php
pages/wot/6.php
pages/wot/8.php
pages/wot/9.php
scripts/49de-lt2013-berlin-mail.php.txt
scripts/50de-ate-luebeck-mail.php.txt
scripts/51at-ate-graz-mail.php.txt
scripts/52at-ate-wien-mail.php.txt
scripts/53de-ate-amberg-mail.php.txt
scripts/54at-ate-linz-mail.php.txt
scripts/55de-ate-wiesbaden-mail.php.txt
scripts/56at-ate-oberwart-mail.php.txt
scripts/57at-ate-graz-mail.php.txt
scripts/58at-ate-wien-mail.php.txt
scripts/59de-ate-freiburg-mail.php.txt
scripts/60de-ate-bremen-mail.php.txt
scripts/61de-ate-dresden-mail.php.txt
scripts/62de-froscon2015-mail.php.txt
scripts/63dk-ate-nykobing-mail.php.txt
scripts/addpoints.php
scripts/assurer.php
scripts/clientcerts.php
scripts/consistence.php
scripts/country.php
scripts/cron/removedead.php
scripts/cron/updatesort.php
scripts/gpgcerts.php
scripts/gpgcheck3.php
scripts/gpgfillmissingemail.php
scripts/gpgfillmissingkeyid.php
scripts/mailing archive/45au-ate-melbourne-mail.php.txt
scripts/mailing archive/46us-ate-raleigh-mail.php.txt
scripts/mailing archive/47us-fudcon-lawrence-mail.php.txt
scripts/mailing archive/48de-ate-kiel-mail.php.txt
scripts/mailing archive/oa01-allowance.php.txt
scripts/mailing archive/oa02-orgainformation.php.txt
scripts/mass-revoke.php
scripts/newsletter.php
scripts/newslettercebit.php
scripts/notify.php
scripts/oa03-csr_org_client_cert.php.txt
scripts/scanforexponents.php
scripts/send_thawte.php.txt
scripts/servercerts.php
stamp/certdet.php
stamp/common.php
stamp/displogo.php
stamp/index.php
stamp/report.php
tverify/index.php
tverify/index/0.php
tverify/index/1.php
www/.htaccess
www/ac.php
www/account.php
www/advertising.php
www/analyse.php
www/api/ccsr.php
www/api/cemails.php
www/api/edu.php
www/api/index.php
www/cap.php
www/cats/cats_import.php
www/disputes.php
www/error403.php
www/error404.php
www/gpg.php
www/help.php
www/index.php
www/logos.php
www/news.php
www/policy/index.php
www/rss.php
www/sealgen.php
www/sqldump.php
www/src-lic.php
www/stats.php
www/ttp.php
www/tverify/seclayer.php
www/verify.php
www/wot.php

index ac28697..b15f310 100755 (executable)
@@ -1,6 +1,5 @@
 #!/usr/bin/php -q
-<?
-/**
+<?php /**
  * check site seal
  *
  * @package org.cacert.framework
@@ -34,59 +33,59 @@ header("Content-Disposition: inline; filename=\"siteseal.js\"");
 
 ?>
 
-var <?=$var1?> = window.location.href;
-<? // var <?=$var2?> = '<?=$http?>://www.cacert.org/certdetails.php?referer=' + <?=$var1?>; ?>
-var <?=$var2?> = '<?=$http?>://www.cacert.org';
-var <?=$var3?> = (new Date()).getTimezoneOffset();
+var <?php echo $var1?> = window.location.href;
+<?php // var <?php echo $var2?> = '<?php echo $http?>://www.cacert.org/certdetails.php?referer=' + <?php echo $var1?>; ?>
+var <?php echo $var2?> = '<?php echo $http?>://www.cacert.org';
+var <?php echo $var3?> = (new Date()).getTimezoneOffset();
 
-var <?=$var4?> = navigator.userAgent.toLowerCase();
-var <?=$var5?> = false;
-if (<?=$var4?>.indexOf("msid") != 1) {
-  <?=$var5?> = (<?=$var4?>.indexOf("msie 5") == -1 && <?=$var4?>.indexOf("msie 6") == -1);
+var <?php echo $var4?> = navigator.userAgent.toLowerCase();
+var <?php echo $var5?> = false;
+if (<?php echo $var4?>.indexOf("msid") != 1) {
+  <?php echo $var5?> = (<?php echo $var4?>.indexOf("msie 5") == -1 && <?php echo $var4?>.indexOf("msie 6") == -1);
 }
 
-function <?=$var6?>(e) {
+function <?php echo $var6?>(e) {
   if (document.addEventListener) {
-    if (e.target.name == '<?=$var7?>') {
-      <?=$var8?>();
+    if (e.target.name == '<?php echo $var7?>') {
+      <?php echo $var8?>();
       return false;
     }
   } else if (document.captureEvents) {
     if (e.target.toString().indexOf('certdetails') != -1) {
-      <?=$var8?>();
+      <?php echo $var8?>();
       return false;
     }
   }
   return true;
 }
 
-function <?=$var9?>() {
+function <?php echo $var9?>() {
   if (event.button == 1) {
-    if (<?=$var5?>) {
+    if (<?php echo $var5?>) {
       return true;
     } else {
-      <?=$var8?>();
+      <?php echo $var8?>();
       return false;
     }
   } else if (event.button == 2) {
-    <?=$var8?>();
+    <?php echo $var8?>();
     return false;
   }
 }
 
-function <?=$var8?>() {
-  cacertWindow = window.open(<?=$var2?>, '<?=$var10?>', config='height=420,width=523,toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,directories=no,status=yes');
+function <?php echo $var8?>() {
+  cacertWindow = window.open(<?php echo $var2?>, '<?php echo $var10?>', config='height=420,width=523,toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,directories=no,status=yes');
   cacertWindow.focus();
 }
 
 if (document.addEventListener) {
-  document.addEventListener('mouseup', <?=$var6?>, true);
+  document.addEventListener('mouseup', <?php echo $var6?>, true);
 } else {
   if (document.layers) {
     document.captureEvents(Event.MOUSEDOWN);
-    document.onmousedown=<?=$var6?>;
+    document.onmousedown=<?php echo $var6?>;
   }
 }
 
-document.write("<a href='" + <?=$var2?> + "' target='<?=$var10?>'  tabindex='-1' onmousedown='<?=$var9?>(); return false;'><img name='<?=$var7?>' border='0' src='<?=$http?>://www.cacert.org/sealgen.php?cert=<?=$cert?>&referer=" + <?=$var1?> + "' alt='Click to verify' oncontextmenu='return false;' /></a>"); ?>
+document.write("<a href='" + <?php echo $var2?> + "' target='<?php echo $var10?>'  tabindex='-1' onmousedown='<?php echo $var9?>(); return false;'><img name='<?php echo $var7?>' border='0' src='<?php echo $http?>://www.cacert.org/sealgen.php?cert=<?php echo $cert?>&referer=" + <?php echo $var1?> + "' alt='Click to verify' oncontextmenu='return false;' /></a>"); ?>
 
index f34a274..23e4cb4 100644 (file)
@@ -1,19 +1,19 @@
     <div class="relatedLinks">
-      <h3 class="pointer" onclick="explode('misc')">+ <?=_("About CAcert.org")?></h3>
+      <h3 class="pointer" onclick="explode('misc')">+ <?php echo _("About CAcert.org")?></h3>
       <ul class="menu" id="misc">
-        <li><a href="http://blog.cacert.org/"><?=_("CAcert News")?></a></li>
-       <li><a href="http://wiki.CAcert.org/"><?=_("Wiki Documentation")?></a></li>
-       <li><a href="/policy/"><?=_("Policies")?></a></li>
-       <li><a href="//wiki.cacert.org/FAQ/Privileges"><?=_("Point System")?></a></li>
-       <li><a href="http://bugs.CAcert.org/"><?=_("Bug Database")?></a></li>
-<? //  <li><a href="/index.php?id=47"><  = _ ("PR Materials" )  > </a></li> ?>
-<? //  <li><a href="/logos.php">< ? = _ ( " CAcert Logos " ) ? > </a></li> ?>
-<? if(array_key_exists('mconn',$_SESSION) && $_SESSION['mconn']) { ?>  <li><a href="/stats.php"><?=_("CAcert Statistics")?></a></li> <? } ?>
-       <li><a href="http://blog.CAcert.org/feed/"><?=_("RSS News Feed")?></a></li>
-<? //- <li><a href="/index.php?id=7"> < ? = _ ( " Credits " ) ? > </a></li> ?>
-       <li><a href="//wiki.cacert.org/Board"><?=_("CAcert Board")?></a></li>
-       <li><a href="https://lists.cacert.org/wws"><?=_("Mailing Lists")?></a></li>
-       <li><a href="/src-lic.php"><?=_("Sourcecode")?></a></li>
+        <li><a href="http://blog.cacert.org/"><?php echo _("CAcert News")?></a></li>
+       <li><a href="http://wiki.CAcert.org/"><?php echo _("Wiki Documentation")?></a></li>
+       <li><a href="/policy/"><?php echo _("Policies")?></a></li>
+       <li><a href="//wiki.cacert.org/FAQ/Privileges"><?php echo _("Point System")?></a></li>
+       <li><a href="http://bugs.CAcert.org/"><?php echo _("Bug Database")?></a></li>
+<?php //       <li><a href="/index.php?id=47"><  = _ ("PR Materials" )  > </a></li> ?>
+<?php //       <li><a href="/logos.php">< ? = _ ( " CAcert Logos " ) ? > </a></li> ?>
+<?php if(array_key_exists('mconn',$_SESSION) && $_SESSION['mconn']) { ?>       <li><a href="/stats.php"><?php echo _("CAcert Statistics")?></a></li> <?php } ?>
+       <li><a href="http://blog.CAcert.org/feed/"><?php echo _("RSS News Feed")?></a></li>
+<?php //-      <li><a href="/index.php?id=7"> < ? = _ ( " Credits " ) ? > </a></li> ?>
+       <li><a href="//wiki.cacert.org/Board"><?php echo _("CAcert Board")?></a></li>
+       <li><a href="https://lists.cacert.org/wws"><?php echo _("Mailing Lists")?></a></li>
+       <li><a href="/src-lic.php"><?php echo _("Sourcecode")?></a></li>
       </ul>
     </div>
 
index 6dacf2d..9409efe 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
index 0fda2f1..3b92d2a 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
 ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-<title><?=$title?></title>
-<? if(array_key_exists('header',$_SESSION) && $_SESSION['_config']['header'] != "") { ?><?=$_SESSION['_config']['header']?><? } ?>
+<title><?php echo $title?></title>
+<?php if(array_key_exists('header',$_SESSION) && $_SESSION['_config']['header'] != "") { ?><?php echo $_SESSION['_config']['header']?><?php } ?>
 <link rel="stylesheet" href="/styles/default.css" type="text/css" />
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <script language="JavaScript" type="text/javascript">
@@ -164,71 +164,69 @@ function hideall() {
 }
 </script>
 </head>
-<body onload="hideall(); explode('home');<?=$expand?>">
+<body onload="hideall(); explode('home');<?php echo $expand?>">
  <div id="pagecell1">
   <div id="pageName"><br>
-    <div id="pageLogo"><a href="http://<?=$_SESSION['_config']['normalhostname']?>"><img src="/images/cacert4.png" border="0" alt="CAcert.org logo"></a></div>
-    <div id="googlead"><h2><?=_("Free digital certificates!")?></h2></div>
+    <div id="pageLogo"><a href="http://<?php echo $_SESSION['_config']['normalhostname']?>"><img src="/images/cacert4.png" border="0" alt="CAcert.org logo"></a></div>
+    <div id="googlead"><h2><?php echo _("Free digital certificates!")?></h2></div>
   </div>
   <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"><?php echo _("Go Home")?></a></li><li><a href="account.php?id=logout"><?php echo _("Logout")?></a></li></ul>
     </div>
     <div class="relatedLinks">
-      <h3 class="pointer" onclick="explode('mydetails')">+ <?=_("My Details")?></h3>
-      <ul class="menu" id="mydetails"><li><a href="account.php?id=13"><?=_("View/Edit")?></a></li><li><a href="account.php?id=14"><?=_("Change Password")?></a></li><li><a href="account.php?id=41"><?=_("Default Language")?></a></li><li><a href="wot.php?id=8"><?=_("My Listing")?></a></li><li><a href="wot.php?id=13"><?=_("My Location")?></a></li><li><a href="account.php?id=36"><?=_("My Alert Settings")?></a></li><li><a href="account.php?id=55"><?=_("My Trainings")?></a></li><li><a href="wot.php?id=10"><?=_("My Points")?></a></li><?
-/* to delete
+      <h3 class="pointer" onclick="explode('mydetails')">+ <?php echo _("My Details")?></h3>
+      <ul class="menu" id="mydetails"><li><a href="account.php?id=13"><?php echo _("View/Edit")?></a></li><li><a href="account.php?id=14"><?php echo _("Change Password")?></a></li><li><a href="account.php?id=41"><?php echo _("Default Language")?></a></li><li><a href="wot.php?id=8"><?php echo _("My Listing")?></a></li><li><a href="wot.php?id=13"><?php echo _("My Location")?></a></li><li><a href="account.php?id=36"><?php echo _("My Alert Settings")?></a></li><li><a href="account.php?id=55"><?php echo _("My Trainings")?></a></li><li><a href="wot.php?id=10"><?php echo _("My Points")?></a></li><?php /* to delete
        if($_SESSION['profile']['id'] == 1 || $_SESSION['profile']['id'] == 5897)
                echo "<li><a href='sqldump.php'>SQL Dump</a></li>";
 */
        ?></ul>
     </div>
     <div class="relatedLinks">
-      <h3 class="pointer" onclick="explode('emailacc')">+ <?=_("Email Accounts")?></h3>
-      <ul class="menu" id="emailacc"><li><a href="account.php?id=1"><?=_("Add")?></a></li><li><a href="account.php?id=2"><?=_("View")?></a></li></ul>
+      <h3 class="pointer" onclick="explode('emailacc')">+ <?php echo _("Email Accounts")?></h3>
+      <ul class="menu" id="emailacc"><li><a href="account.php?id=1"><?php echo _("Add")?></a></li><li><a href="account.php?id=2"><?php echo _("View")?></a></li></ul>
     </div>
     <div class="relatedLinks">
-      <h3 class="pointer" onclick="explode('clicerts')">+ <?=_("Client Certificates")?></h3>
-      <ul class="menu" id="clicerts"><li><a href="account.php?id=3"><?=_("New")?></a></li><li><a href="account.php?id=5"><?=_("View")?></a></li></ul>
+      <h3 class="pointer" onclick="explode('clicerts')">+ <?php echo _("Client Certificates")?></h3>
+      <ul class="menu" id="clicerts"><li><a href="account.php?id=3"><?php echo _("New")?></a></li><li><a href="account.php?id=5"><?php echo _("View")?></a></li></ul>
     </div>
-<? if($_SESSION['profile']['points'] >= 50) { ?>
+<?php if($_SESSION['profile']['points'] >= 50) { ?>
     <div class="relatedLinks">
-      <h3 class="pointer" onclick="explode('gpg')">+ <?=_("GPG/PGP Keys")?></h3>
-      <ul class="menu" id="gpg"><li><a href="gpg.php?id=0"><?=_("New")?></a></li><li><a href="gpg.php?id=2"><?=_("View")?></a></li></ul>
+      <h3 class="pointer" onclick="explode('gpg')">+ <?php echo _("GPG/PGP Keys")?></h3>
+      <ul class="menu" id="gpg"><li><a href="gpg.php?id=0"><?php echo _("New")?></a></li><li><a href="gpg.php?id=2"><?php echo _("View")?></a></li></ul>
     </div>
-<? } ?>
+<?php } ?>
     <div class="relatedLinks">
-      <h3 class="pointer" onclick="explode('domains')">+ <?=_("Domains")?></h3>
-      <ul class="menu" id="domains"><li><a href="account.php?id=7"><?=_("Add")?></a></li><li><a href="account.php?id=9"><?=_("View")?></a></li></ul>
+      <h3 class="pointer" onclick="explode('domains')">+ <?php echo _("Domains")?></h3>
+      <ul class="menu" id="domains"><li><a href="account.php?id=7"><?php echo _("Add")?></a></li><li><a href="account.php?id=9"><?php echo _("View")?></a></li></ul>
     </div>
     <div class="relatedLinks">
-      <h3 class="pointer" onclick="explode('servercert')">+ <?=_("Server Certificates")?></h3>
-      <ul class="menu" id="servercert"><li><a href="account.php?id=10"><?=_("New")?></a></li><li><a href="account.php?id=12"><?=_("View")?></a></li></ul>
+      <h3 class="pointer" onclick="explode('servercert')">+ <?php echo _("Server Certificates")?></h3>
+      <ul class="menu" id="servercert"><li><a href="account.php?id=10"><?php echo _("New")?></a></li><li><a href="account.php?id=12"><?php echo _("View")?></a></li></ul>
     </div>
-<? if(mysql_num_rows(mysql_query("select * from `org` where `memid`='".intval($_SESSION['profile']['id'])."'")) > 0 || $_SESSION['profile']['orgadmin'] == 1) { ?>
+<?php if(mysql_num_rows(mysql_query("select * from `org` where `memid`='".intval($_SESSION['profile']['id'])."'")) > 0 || $_SESSION['profile']['orgadmin'] == 1) { ?>
     <div class="relatedLinks">
-      <h3 class="pointer" onclick="explode('clientorg')">+ <?=_("Org Client Certs")?></h3>
-      <ul class="menu" id="clientorg"><li><a href="account.php?id=16"><?=_("New")?></a></li><li><a href="account.php?id=18"><?=_("View")?></a></li></ul>
+      <h3 class="pointer" onclick="explode('clientorg')">+ <?php echo _("Org Client Certs")?></h3>
+      <ul class="menu" id="clientorg"><li><a href="account.php?id=16"><?php echo _("New")?></a></li><li><a href="account.php?id=18"><?php echo _("View")?></a></li></ul>
     </div>
     <div class="relatedLinks">
-      <h3 class="pointer" onclick="explode('serverorg')">+ <?=_("Org Server Certs")?></h3>
-      <ul class="menu" id="serverorg"><li><a href="account.php?id=20"><?=_("New")?></a></li><li><a href="account.php?id=22"><?=_("View")?></a></li></ul>
+      <h3 class="pointer" onclick="explode('serverorg')">+ <?php echo _("Org Server Certs")?></h3>
+      <ul class="menu" id="serverorg"><li><a href="account.php?id=20"><?php echo _("New")?></a></li><li><a href="account.php?id=22"><?php echo _("View")?></a></li></ul>
     </div>
-<? } ?>
-<? if(mysql_num_rows(mysql_query("select * from `org` where `memid`='".intval($_SESSION['profile']['id'])."'")) > 0 || $_SESSION['profile']['orgadmin'] == 1) { ?>
+<?php } ?>
+<?php if(mysql_num_rows(mysql_query("select * from `org` where `memid`='".intval($_SESSION['profile']['id'])."'")) > 0 || $_SESSION['profile']['orgadmin'] == 1) { ?>
     <div class="relatedLinks">
-      <h3 class="pointer" onclick="explode('orgadmin')">+ <?=_("Org Admin")?></h3>
-      <ul class="menu" id="orgadmin"><? if($_SESSION['profile']['orgadmin'] == 1) { ?><li><a href="account.php?id=24"><?=_("New Organisation")?></a></li><li><a href="account.php?id=25"><?=_("View Organisations")?></a></li><? } ?><li><a href="account.php?id=35"><?=_("View")?></a></li></ul>
+      <h3 class="pointer" onclick="explode('orgadmin')">+ <?php echo _("Org Admin")?></h3>
+      <ul class="menu" id="orgadmin"><?php if($_SESSION['profile']['orgadmin'] == 1) { ?><li><a href="account.php?id=24"><?php echo _("New Organisation")?></a></li><li><a href="account.php?id=25"><?php echo _("View Organisations")?></a></li><?php } ?><li><a href="account.php?id=35"><?php echo _("View")?></a></li></ul>
     </div>
-<? } ?>
+<?php } ?>
     <div class="relatedLinks">
-      <h3 class="pointer" onclick="explode('WoT')">+ <?=_("CAcert Web of Trust")?></h3>
-      <ul class="menu" id="WoT"><li><a href="wot.php?id=0"><?=_("About")?></a></li><li><a href="wot.php?id=12"><?=_("Find an Assurer")?></a></li><li><a href="wot.php?id=3"><?=_("Rules")?></a></li><li><? if($_SESSION['profile']['assurer'] != 1) { ?><a href="wot.php?id=2"><?=_("Becoming an Assurer")?></a><? } else { ?><a href="wot.php?id=5"><?=_("Assure Someone")?></a><? } ?></li><li><a href="wot.php?id=4"><?=_("Trusted ThirdParties")?></a></li><? if($_SESSION['profile']['points'] >= 500) { ?><li><a href="wot.php?id=11"><div style="white-space:nowrap"><?=_("Organisation Assurance")?></div></a></li><? } ?></ul>
+      <h3 class="pointer" onclick="explode('WoT')">+ <?php echo _("CAcert Web of Trust")?></h3>
+      <ul class="menu" id="WoT"><li><a href="wot.php?id=0"><?php echo _("About")?></a></li><li><a href="wot.php?id=12"><?php echo _("Find an Assurer")?></a></li><li><a href="wot.php?id=3"><?php echo _("Rules")?></a></li><li><?php if($_SESSION['profile']['assurer'] != 1) { ?><a href="wot.php?id=2"><?php echo _("Becoming an Assurer")?></a><?php } else { ?><a href="wot.php?id=5"><?php echo _("Assure Someone")?></a><?php } ?></li><li><a href="wot.php?id=4"><?php echo _("Trusted ThirdParties")?></a></li><?php if($_SESSION['profile']['points'] >= 500) { ?><li><a href="wot.php?id=11"><div style="white-space:nowrap"><?php echo _("Organisation Assurance")?></div></a></li><?php } ?></ul>
     </div>
     <div class="relatedLinks">
-      <h3 class="pointer" onclick="explode('WoTForms')">+ <?=_("CAP Forms")?></h3><?
-        $name = $_SESSION['profile']['fname']." ".$_SESSION['profile']['mname']." ".$_SESSION['profile']['lname']." ".$_SESSION['profile']['suffix'];
+      <h3 class="pointer" onclick="explode('WoTForms')">+ <?php echo _("CAP Forms")?></h3><?php         $name = $_SESSION['profile']['fname']." ".$_SESSION['profile']['mname']." ".$_SESSION['profile']['lname']." ".$_SESSION['profile']['suffix'];
         while(strstr($name, "  "))
                 $name = str_replace("  ", " ", $name);
         $extra = "?name=".urlencode($name);
@@ -238,57 +236,55 @@ function hideall() {
        $extra2 = "?assurer=".urlencode($name)."&amp;date=now&amp;maxpoints=".maxpoints();
 ?>
       <ul class="menu" id="WoTForms">
-         <li><a href="/cap.php<?=$extra?>">A4 - <?=_("WoT Form")?></a></li>
-        <li><a href="/cap.php<?=$extra?>&amp;format=letter">US - <?=_("WoT Form")?></a></li>
-       <? /* <li><div style="white-space:nowrap"><a href="/ttp.php<?=$extra?>">A4 - <?=_("TTP Form")?></a></div></li>
-        <li><div style="white-space:nowrap"><a href="/ttp.php<?=$extra?>&amp;format=letter">US - <?=_("TTP Form")?></a></div></li> */
+         <li><a href="/cap.php<?php echo $extra?>">A4 - <?php echo _("WoT Form")?></a></li>
+        <li><a href="/cap.php<?php echo $extra?>&amp;format=letter">US - <?php echo _("WoT Form")?></a></li>
+       <?php /* <li><div style="white-space:nowrap"><a href="/ttp.php<?php echo $extra?>">A4 - <?php echo _("TTP Form")?></a></div></li>
+        <li><div style="white-space:nowrap"><a href="/ttp.php<?php echo $extra?>&amp;format=letter">US - <?php echo _("TTP Form")?></a></div></li> */
        ?>
-        <? if($_SESSION['profile']['points'] > 100) { ?><li><div style="white-space:nowrap"><a href="/cap.php<?=$extra2?>">A4 - <?=_("Assurance Form")?></a></div></li>
-        <li><div style="white-space:nowrap"><a href="/cap.php<?=$extra2?>&amp;format=letter">US - <?=_("Assurance Form")?></a></div></li>
-        <? } ?>
-        <? /*
-         <li><div style="white-space:nowrap"><a href="/ttp.php">A4 - <?=_("Blank TTP Form")?></a></div></li>
-         <li><div style="white-space:nowrap"><a href="/ttp.php?&amp;format=letter">US - <?=_("Blank TTP Form")?></a></div></li>
+        <?php if($_SESSION['profile']['points'] > 100) { ?><li><div style="white-space:nowrap"><a href="/cap.php<?php echo $extra2?>">A4 - <?php echo _("Assurance Form")?></a></div></li>
+        <li><div style="white-space:nowrap"><a href="/cap.php<?php echo $extra2?>&amp;format=letter">US - <?php echo _("Assurance Form")?></a></div></li>
+        <?php } ?>
+        <?php /*
+         <li><div style="white-space:nowrap"><a href="/ttp.php">A4 - <?php echo _("Blank TTP Form")?></a></div></li>
+         <li><div style="white-space:nowrap"><a href="/ttp.php?&amp;format=letter">US - <?php echo _("Blank TTP Form")?></a></div></li>
         */ ?>
-        <li><div style="white-space:nowrap"><a href="/cap.php">A4 - <?=_("Blank CAP Form")?></a></div></li>
-        <li><div style="white-space:nowrap"><a href="/cap.php?&amp;format=letter">US - <?=_("Blank CAP Form")?></a></div></li></ul>
+        <li><div style="white-space:nowrap"><a href="/cap.php">A4 - <?php echo _("Blank CAP Form")?></a></div></li>
+        <li><div style="white-space:nowrap"><a href="/cap.php?&amp;format=letter">US - <?php echo _("Blank CAP Form")?></a></div></li></ul>
     </div>
-<? if($_SESSION['profile']['admin'] == 1 || $_SESSION['profile']['locadmin'] == 1) { ?>
+<?php if($_SESSION['profile']['admin'] == 1 || $_SESSION['profile']['locadmin'] == 1) { ?>
     <div class="relatedLinks">
-      <h3 class="pointer" onclick="explode('sysadmin')">+ <?=_("System Admin")?></h3>
-      <ul class="menu" id="sysadmin"><? if($_SESSION['profile']['admin'] == 1) { ?><li><a href="account.php?id=42"><?=_("Find User")?></a></li><li><a href="account.php?id=48"><?=_("Find Domain")?></a></li><? } if($_SESSION['profile']['locadmin'] == 1) { ?><li><a href="account.php?id=53"><?=_("Location DB")?></a></li><? } ?></ul>
+      <h3 class="pointer" onclick="explode('sysadmin')">+ <?php echo _("System Admin")?></h3>
+      <ul class="menu" id="sysadmin"><?php if($_SESSION['profile']['admin'] == 1) { ?><li><a href="account.php?id=42"><?php echo _("Find User")?></a></li><li><a href="account.php?id=48"><?php echo _("Find Domain")?></a></li><?php } if($_SESSION['profile']['locadmin'] == 1) { ?><li><a href="account.php?id=53"><?php echo _("Location DB")?></a></li><?php } ?></ul>
     </div>
-<? } ?>
+<?php } ?>
     <div class="relatedLinks">
-      <h3 class="pointer" onclick="explode('disputes')">+ <?=_("Disputes/Abuses")?></h3>
-      <ul class="menu" id="disputes"><li><a href="disputes.php?id=0"><?=_("More Information")?></a></li><li><a href="disputes.php?id=1"><?=_("Email Dispute")?></a></li><li><a href="disputes.php?id=2"><?=_("Domain Dispute")?></a></li><? if($_SESSION['profile']['admin'] == 1) { ?><li><a href="disputes.php?id=3"><?=_("Abuses")?></a></li><? } ?></ul>
+      <h3 class="pointer" onclick="explode('disputes')">+ <?php echo _("Disputes/Abuses")?></h3>
+      <ul class="menu" id="disputes"><li><a href="disputes.php?id=0"><?php echo _("More Information")?></a></li><li><a href="disputes.php?id=1"><?php echo _("Email Dispute")?></a></li><li><a href="disputes.php?id=2"><?php echo _("Domain Dispute")?></a></li><?php if($_SESSION['profile']['admin'] == 1) { ?><li><a href="disputes.php?id=3"><?php echo _("Abuses")?></a></li><?php } ?></ul>
     </div>
-<? if($_SESSION['profile']['adadmin'] >= 1) { ?>
+<?php if($_SESSION['profile']['adadmin'] >= 1) { ?>
     <div class="relatedLinks">
-      <h3 class="pointer" onclick="explode('advertising')">+ <?=_("Advertising")?></h3>
-      <ul class="menu" id="advertising"><li><a href="advertising.php?id=1"><?=_("New Ad")?></a></li><li><a href="advertising.php?id=0"><?=_("View Ads")?></a></li></ul>
+      <h3 class="pointer" onclick="explode('advertising')">+ <?php echo _("Advertising")?></h3>
+      <ul class="menu" id="advertising"><li><a href="advertising.php?id=1"><?php echo _("New Ad")?></a></li><li><a href="advertising.php?id=0"><?php echo _("View Ads")?></a></li></ul>
     </div>
-<? } ?>
-    <? include("about_menu.php"); ?>
+<?php } ?>
+    <?php include("about_menu.php"); ?>
   </div>
   <div id="content">
     <div class="story">
-      <h3><?=$title2?></h3>
-<? if($_SESSION['_config']['errmsg'] != "") { ?>
-<p><font color="#ff0000" size="+2"><? echo $_SESSION['_config']['errmsg']; $_SESSION['_config']['errmsg'] = ""; ?> </font></p>
-<? } ?>
-<?
-       }
+      <h3><?php echo $title2?></h3>
+<?php if($_SESSION['_config']['errmsg'] != "") { ?>
+<p><font color="#ff0000" size="+2"><?php echo $_SESSION['_config']['errmsg']; $_SESSION['_config']['errmsg'] = ""; ?> </font></p>
+<?php } ?>
+<?php  }
 
        function showfooter()
        {
 ?>
       </div>
     </div>
-  <div id="siteInfo"><a href="//wiki.cacert.org/FAQ/AboutUs"><?=_("About Us")?></a> | <a href="account.php?id=38"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> |
-       <a href="/policy/PrivacyPolicy.html"><?=_("Privacy Policy")?></a> | <a href="account.php?id=40"><?=_("Contact Us")?></a>
-               | &copy;2002-<?=date("Y")?> <?=_("by CAcert")?></div>
+  <div id="siteInfo"><a href="//wiki.cacert.org/FAQ/AboutUs"><?php echo _("About Us")?></a> | <a href="account.php?id=38"><?php echo _("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?php echo _("Association Membership")?></a> |
+       <a href="/policy/PrivacyPolicy.html"><?php echo _("Privacy Policy")?></a> | <a href="account.php?id=40"><?php echo _("Contact Us")?></a>
+               | &copy;2002-<?php echo date("Y")?> <?php echo _("by CAcert")?></div>
 </div>
 </body>
-</html><?
-       }
+</html><?php   }
index 2eef65e..50bb228 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
index 10c4e0a..91b6eb5 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
@@ -24,8 +24,8 @@ if(!function_exists("showheader"))
        {
 ?> <div id="pagecell1">
   <div id="pageName"><br>
-    <div id="pageLogo"><a href="http://<?=$_SESSION['_config']['normalhostname']?>"><img src="/images/cacert4.png" border="0" alt="CAcert.org logo"></a></div>
-<div id="googlead"><? if(!array_key_exists('HTTPS',$_SERVER) || $_SERVER['HTTPS'] != "on") { ?><script type="text/javascript">
+    <div id="pageLogo"><a href="http://<?php echo $_SESSION['_config']['normalhostname']?>"><img src="/images/cacert4.png" border="0" alt="CAcert.org logo"></a></div>
+<div id="googlead"><?php if(!array_key_exists('HTTPS',$_SERVER) || $_SERVER['HTTPS'] != "on") { ?><script type="text/javascript">
 <!--
 google_ad_client = "pub-0959373285729680";
 google_alternate_ad_url = "http://www.cacert.org/";
@@ -38,52 +38,50 @@ google_color_text = "000000";
 google_color_border = "FFFFFF";
 //-->
 </script>
-<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script><? } else {
-?><h2><?=_("Free digital certificates!")?></h2><? } ?></div>
+<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script><?php } else {
+?><h2><?php echo _("Free digital certificates!")?></h2><?php } ?></div>
   </div>
   <div id="pageNav">
     <div class="relatedLinks">
-      <h3><?=_("Join CAcert.org")?></h3>
-      <? if(array_key_exists('mconn',$_SESSION) && $_SESSION['mconn']) { ?>
-      <a href="https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=1"><?=_("Join")?></a>
-      <? } ?>
-      <a href="/policy/CAcertCommunityAgreement.html"><?=_("Community Agreement")?></a>
-      <a href="/index.php?id=3"><?=_("Root Certificate")?></a>
+      <h3><?php echo _("Join CAcert.org")?></h3>
+      <?php if(array_key_exists('mconn',$_SESSION) && $_SESSION['mconn']) { ?>
+      <a href="https://<?php echo $_SESSION['_config']['normalhostname']?>/index.php?id=1"><?php echo _("Join")?></a>
+      <?php } ?>
+      <a href="/policy/CAcertCommunityAgreement.html"><?php echo _("Community Agreement")?></a>
+      <a href="/index.php?id=3"><?php echo _("Root Certificate")?></a>
     </div>
-    <? if(array_key_exists('mconn',$_SESSION) && $_SESSION['mconn']) { ?>
+    <?php if(array_key_exists('mconn',$_SESSION) && $_SESSION['mconn']) { ?>
     <div class="relatedLinks">
-      <h3 class="pointer"><?=_("My Account")?></h3>
-      <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>
-      <a href="https://<?=$_SESSION['_config']['securehostname']?>/index.php?id=4"><?=_("Certificate Login")?></a>
+      <h3 class="pointer"><?php echo _("My Account")?></h3>
+      <a href="https://<?php echo $_SESSION['_config']['normalhostname']?>/index.php?id=4"><?php echo _("Password Login")?></a>
+      <a href="https://<?php echo $_SESSION['_config']['normalhostname']?>/index.php?id=5"><?php echo _("Lost Password")?></a>
+      <a href="https://<?php echo $_SESSION['_config']['normalhostname']?>/index.php?id=4&amp;noauto=1"><?php echo _("Net Cafe Login")?></a>
+      <a href="https://<?php echo $_SESSION['_config']['securehostname']?>/index.php?id=4"><?php echo _("Certificate Login")?></a>
     </div>
-    <? } ?>
-    <? include("about_menu.php"); ?>
+    <?php } ?>
+    <?php include("about_menu.php"); ?>
     <div class="relatedLinks">
-      <h3 class="pointer" onclick="explode('trans')">+ <?=_("Translations")?></h3>
-      <ul class="menu" id="trans"><? foreach(L10n::$translations as $key => $val) { ?><li><a href="<?=$_SERVER['SCRIPT_NAME']?>?id=<?=intval(array_key_exists('id',$_REQUEST)?$_REQUEST['id']:0)?>&amp;lang=<?=$key?>"><?=$val?></a></li><? } ?></ul>
+      <h3 class="pointer" onclick="explode('trans')">+ <?php echo _("Translations")?></h3>
+      <ul class="menu" id="trans"><?php foreach(L10n::$translations as $key => $val) { ?><li><a href="<?php echo $_SERVER['SCRIPT_NAME']?>?id=<?php echo intval(array_key_exists('id',$_REQUEST)?$_REQUEST['id']:0)?>&amp;lang=<?php echo $key?>"><?php echo $val?></a></li><?php } ?></ul>
     </div>
-    <? if(array_key_exists('mconn',$_SESSION) && $_SESSION['mconn']) { ?>
+    <?php if(array_key_exists('mconn',$_SESSION) && $_SESSION['mconn']) { ?>
     <div class="relatedLinks">
-      <h3 class="pointer" onclick="explode('recom')"><?=_("Advertising")?></h3>
-      <ul class="menu" id="recom"><?
-       $query = "select * from `advertising` where `expires`>NOW() and `active`=1";
+      <h3 class="pointer" onclick="explode('recom')"><?php echo _("Advertising")?></h3>
+      <ul class="menu" id="recom"><?php        $query = "select * from `advertising` where `expires`>NOW() and `active`=1";
        $res = mysql_query($query);
        while($row = mysql_fetch_assoc($res))
                echo "<li><a href='$row[link]' target='_blank'>$row[title]</a></li>";
 ?></ul>
     </div>
-    <? } ?>
+    <?php } ?>
   </div>
   <div id="content">
     <div class="story">
-<? if($title2!="") echo "<h3>$title2</h3>"; ?>
-<? if($_SESSION['_config']['errmsg'] != "") { ?>
-<p><font color="#ff0000" size="+2"><? echo $_SESSION['_config']['errmsg']; $_SESSION['_config']['errmsg'] = ""; ?> </font></p>
-<? } ?>
-<?
-
+<?php if($title2!="") echo "<h3>$title2</h3>"; ?>
+<?php if($_SESSION['_config']['errmsg'] != "") { ?>
+<p><font color="#ff0000" size="+2"><?php echo $_SESSION['_config']['errmsg']; $_SESSION['_config']['errmsg'] = ""; ?> </font></p>
+<?php } ?>
+<?php
        }
 
        function showheader($title = "CAcert.org", $title2 = "")
@@ -93,8 +91,8 @@ google_color_border = "FFFFFF";
 ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-<title><?=$title?></title>
-<? if(array_key_exists("header",$_SESSION['_config']) && $_SESSION['_config']['header'] != "") { ?><?=$_SESSION['_config']['header']?><? } ?>
+<title><?php echo $title?></title>
+<?php if(array_key_exists("header",$_SESSION['_config']) && $_SESSION['_config']['header'] != "") { ?><?php echo $_SESSION['_config']['header']?><?php } ?>
 <link rel="stylesheet" href="/styles/default.css" type="text/css">
 <link href="http://blog.CAcert.org/feed/" rel="alternate" type="application/rss+xml" title="rss">
 <script language="JavaScript" type="text/javascript">
@@ -119,8 +117,7 @@ function hideall() {
 </script>
 </head>
 <body onload="hideall();">
-<?
-               showbodycontent($title,$title2);
+<?php          showbodycontent($title,$title2);
        }
 }
 
@@ -131,15 +128,14 @@ if(!function_exists("showfooter"))
 ?>
       </div>
     </div>
-  <? include("sponsorinfo.php") ?>
+  <?php include("sponsorinfo.php") ?>
   <div id="siteInfo">
-       <a href="//wiki.cacert.org/FAQ/AboutUs"><?=_("About Us")?></a> | <a href="/index.php?id=13"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> |
-        <a href="/policy/PrivacyPolicy.html"><?=_("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>
+       <a href="//wiki.cacert.org/FAQ/AboutUs"><?php echo _("About Us")?></a> | <a href="/index.php?id=13"><?php echo _("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?php echo _("Association Membership")?></a> |
+        <a href="/policy/PrivacyPolicy.html"><?php echo _("Privacy Policy")?></a> |
+        <a href="/index.php?id=51"><?php echo _("Mission Statement")?></a> | <a href="/index.php?id=11"><?php echo _("Contact Us")?></a> |
+       &copy;2002-<?php echo date("Y")?> <?php echo _("by CAcert")?></div>
 </div>
 </body>
-</html><?
-       }
+</html><?php   }
 }
 ?>
index 15dee8a..a7db1ea 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2011  CAcert Inc.
 
 if (array_key_exists('HTTP_USER_AGENT',$_SERVER) && strstr($_SERVER['HTTP_USER_AGENT'], "MSIE")) { ?>
 
        <noscript>
-               <p><?=_('You have to enable JavaScript to generate certificates in the browser.')?></p>
-               <p><?=_('If you don\'t want to do that for any reason, you can use '.
+               <p><?php echo _('You have to enable JavaScript to generate certificates in the browser.')?></p>
+               <p><?php echo _('If you don\'t want to do that for any reason, you can use '.
                        'manually created certificate requests instead.')?></p>
        </noscript>
 
        <div id="noActiveX" style="color:red">
-               <p><?=_('Could not initialize ActiveX object required for certificate generation.')?></p>
-               <p><?=_('You have to enable ActiveX for this to work. On Windows Vista, Windows 7 and '.
+               <p><?php echo _('Could not initialize ActiveX object required for certificate generation.')?></p>
+               <p><?php echo _('You have to enable ActiveX for this to work. On Windows Vista, Windows 7 and '.
                        'later versions you have to add this website to the list of trusted sites '.
                        'in the internet settings.')?></p>
                <p><?php
@@ -43,29 +43,29 @@ if (array_key_exists('HTTP_USER_AGENT',$_SERVER) && strstr($_SERVER['HTTP_USER_A
 
        <form method="post" style="display:none" action="account.php"
                        id="CertReqForm">
-               <input type="hidden" name="oldid" value="<?=intval($id)?>" />
+               <input type="hidden" name="oldid" value="<?php echo intval($id)?>" />
                <input type="hidden" id="CSR" name="CSR" />
                <input type="hidden" name="keytype" value="MS" />
 
-               <p><?=_('Security level')?>:
+               <p><?php echo _('Security level')?>:
                        <select id="SecurityLevel">
-                               <option value="high" selected="selected"><?=_('High')?></option>
-                               <option value="medium"><?=_('Medium')?></option>
-                               <option value="custom"><?=_('Custom')?>&hellip;</option>
+                               <option value="high" selected="selected"><?php echo _('High')?></option>
+                               <option value="medium"><?php echo _('Medium')?></option>
+                               <option value="custom"><?php echo _('Custom')?>&hellip;</option>
                        </select>
                </p>
 
                <fieldset id="customSettings" style="display:none">
-                       <legend><?=_('Custom Parameters')?></legend>
+                       <legend><?php echo _('Custom Parameters')?></legend>
 
-                       <p><?=_('Cryptography Provider')?>:
+                       <p><?php echo _('Cryptography Provider')?>:
                                <select id="CspProvider"></select>
                        </p>
-                       <p><?=_('Algorithm')?>: <select id="algorithm"></select></p>
-                       <p><?=_('Keysize')?>:
+                       <p><?php echo _('Algorithm')?>: <select id="algorithm"></select></p>
+                       <p><?php echo _('Keysize')?>:
                                <input id="keySize" type="number" />
-                               <?=_('Minimum Size')?>: <span id="keySizeMin"></span>,
-                               <?=_('Maximum Size')?>: <span id="keySizeMax"></span>,
+                               <?php echo _('Minimum Size')?>: <span id="keySizeMin"></span>,
+                               <?php echo _('Maximum Size')?>: <span id="keySizeMax"></span>,
                                <?php
                                // TRANSLATORS: this specifies the step between two valid key
                                // sizes. E.g. if the step is 512 and the minimum is 1024 and
@@ -79,33 +79,33 @@ if (array_key_exists('HTTP_USER_AGENT',$_SERVER) && strstr($_SERVER['HTTP_USER_A
                        </p>
                </fieldset>
 
-               <p><input type="submit" id="GenReq" name="GenReq" value="<?=_('Create Certificate')?>" /></p>
+               <p><input type="submit" id="GenReq" name="GenReq" value="<?php echo _('Create Certificate')?>" /></p>
                <p id="generatingKeyNotice" style="display:none">
-                       <?=_('Generating your key. Please wait')?>&hellip;</p>
+                       <?php echo _('Generating your key. Please wait')?>&hellip;</p>
        </form>
 
        <!-- Error messages used in the JavaScript. Defined here so they can be
        translated without passing the JavaScript code through PHP -->
        <p id="createRequestErrorChooseAlgorithm" style="display:none">
-               <?=_('Could not generate certificate request. Probably you need to '.
+               <?php echo _('Could not generate certificate request. Probably you need to '.
                        'choose a different algorithm.')?>
        </p>
        <p id="createRequestErrorConfirmDialogue" style="display:none">
-               <?=_('Could not generate certificate request. Please confirm the '.
+               <?php echo _('Could not generate certificate request. Please confirm the '.
                        'dialogue if you are asked if you want to generate the key.')?>
        </p>
        <p id="createRequestErrorConnectDevice" style="display:none">
-               <?=_('Could not generate certificate request. Please make sure the '.
+               <?php echo _('Could not generate certificate request. Please make sure the '.
                        'cryptography device (e.g. the smartcard) is connected.')?>
        </p>
        <p id="createRequestError" style="display:none">
-               <?=_('Could not generate certificate request.')?>
+               <?php echo _('Could not generate certificate request.')?>
        </p>
        <p id="invalidKeySizeError" style="display:none">
-               <?=_('You have specified an invalid key size')?>
+               <?php echo _('You have specified an invalid key size')?>
        </p>
        <p id="unsupportedPlatformError" style="display:none">
-               <?=_('Could not initialize the cryptographic module for your '.
+               <?php echo _('Could not initialize the cryptographic module for your '.
                        'platform. Currently we support Microsoft Windows XP, Vista '.
                        'and 7. If you\'re using one of these platforms and see this '.
                        'error message anyway you might have to enable ActiveX as '.
@@ -115,14 +115,14 @@ if (array_key_exists('HTTP_USER_AGENT',$_SERVER) && strstr($_SERVER['HTTP_USER_A
 
        <script type="text/javascript" src="keygenIE.js"></script>
 
-<? } else { ?>
+<?php } else { ?>
        <p>
                <form method="post" action="account.php">
                        <input type="hidden" name="keytype" value="NS">
-                       <?=_("Keysize:")?> <keygen name="SPKAC" challenge="<? $_SESSION['spkac_hash']=make_hash(); echo $_SESSION['spkac_hash']; ?>">
+                       <?php echo _("Keysize:")?> <keygen name="SPKAC" challenge="<?php $_SESSION['spkac_hash']=make_hash(); echo $_SESSION['spkac_hash']; ?>">
 
-                       <input type="submit" name="submit" value="<?=_("Generate key pair within browser")?>">
-                       <input type="hidden" name="oldid" value="<?=intval($id)?>">
+                       <input type="submit" name="submit" value="<?php echo _("Generate key pair within browser")?>">
+                       <input type="hidden" name="oldid" value="<?php echo intval($id)?>">
                </form>
        </p>
-<? }
+<?php }
index 127c6b7..1d1eb76 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2011  CAcert Inc.
 
index c14f8c2..b876980 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
index 77be95f..615f958 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
index 3b8e736..48c4511 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2011  CAcert Inc.
 
@@ -333,18 +333,17 @@ define('THAWTE_REVOCATION_DATETIME', '2010-11-16 00:00:00');
 ?>
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
        <tr>
-               <td class="title"><?=_("Assurer Ranking")?></td>
+               <td class="title"><?php echo _("Assurer Ranking")?></td>
        </tr>
        <tr>
-               <td class="DataTD"><?=sprintf(_("You have made %s assurances which ranks you as the #%s top assurer."), intval($num_of_assurances), intval($rank_of_assurer) )?></td>
+               <td class="DataTD"><?php echo sprintf(_("You have made %s assurances which ranks you as the #%s top assurer."), intval($num_of_assurances), intval($rank_of_assurer) )?></td>
        </tr>
        <tr>
-               <td class="DataTD"><?=sprintf(_("You have received %s assurances which ranks you as the #%s top assuree."), intval($num_of_assurees), intval($rank_of_assuree) )?></td>
+               <td class="DataTD"><?php echo sprintf(_("You have received %s assurances which ranks you as the #%s top assuree."), intval($num_of_assurees), intval($rank_of_assuree) )?></td>
        </tr>
 </table>
 <br/>
-<?
-       }
+<?php  }
 
        /**
         * Render header for the assurance table (same for given/received)
@@ -368,36 +367,31 @@ define('THAWTE_REVOCATION_DATETIME', '2010-11-16 00:00:00');
 ?>
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
        <tr>
-               <td colspan="<?=$colspan?>" class="title"><?=$title?></td>
+               <td colspan="<?php echo $colspan?>" class="title"><?php echo $title?></td>
        </tr>
        <tr>
-               <td class="DataTD"><strong><?=_("ID")?></strong></td>
-               <td class="DataTD"><strong><?=_("Date")?></strong></td>
-<?
-               if ($support == 1)
+               <td class="DataTD"><strong><?php echo _("ID")?></strong></td>
+               <td class="DataTD"><strong><?php echo _("Date")?></strong></td>
+<?php          if ($support == 1)
                {
 ?>
-               <td class="DataTD"><strong><?=_("When")?></strong></td>
-               <td class="DataTD"><strong><?=_("Email")?></strong></td>
-<?
-               }
+               <td class="DataTD"><strong><?php echo _("When")?></strong></td>
+               <td class="DataTD"><strong><?php echo _("Email")?></strong></td>
+<?php          }
 ?>
-               <td class="DataTD"><strong><?=_("Who")?></strong></td>
-               <td class="DataTD"><strong><?=_("Points")?></strong></td>
-               <td class="DataTD"><strong><?=_("Location")?></strong></td>
-               <td class="DataTD"><strong><?=_("Method")?></strong></td>
-               <td class="DataTD"><strong><?=_("Experience Points")?></strong></td>
-<?
-               if ($log == 1)
+               <td class="DataTD"><strong><?php echo _("Who")?></strong></td>
+               <td class="DataTD"><strong><?php echo _("Points")?></strong></td>
+               <td class="DataTD"><strong><?php echo _("Location")?></strong></td>
+               <td class="DataTD"><strong><?php echo _("Method")?></strong></td>
+               <td class="DataTD"><strong><?php echo _("Experience Points")?></strong></td>
+<?php          if ($log == 1)
                {
 ?>
-               <td class="DataTD"><strong><?=_("Revoked")?></strong></td>
-<?
-               }
+               <td class="DataTD"><strong><?php echo _("Revoked")?></strong></td>
+<?php          }
 ?>
        </tr>
-<?
-       }
+<?php  }
 
        /**
         * Render footer for the assurance table (same for given/received)
@@ -418,24 +412,21 @@ define('THAWTE_REVOCATION_DATETIME', '2010-11-16 00:00:00');
        {
 ?>
        <tr>
-               <td colspan="<?=($support == 1) ? 5 : 3 ?>" class="DataTD"><strong><?=$points_txt?>:</strong></td>
-               <td class="DataTD"><?=intval($sumpoints)?></td>
+               <td colspan="<?php echo ($support == 1) ? 5 : 3 ?>" class="DataTD"><strong><?php echo $points_txt?>:</strong></td>
+               <td class="DataTD"><?php echo intval($sumpoints)?></td>
                <td class="DataTD">&nbsp;</td>
-               <td class="DataTD"><strong><?=$experience_txt?>:</strong></td>
-               <td class="DataTD"><?=intval($sumexperience)?></td>
-<?
-               if ($log == 1)
+               <td class="DataTD"><strong><?php echo $experience_txt?>:</strong></td>
+               <td class="DataTD"><?php echo intval($sumexperience)?></td>
+<?php          if ($log == 1)
                {
 ?>
                <td class="DataTD">&nbsp;</td>
-<?
-               }
+<?php          }
 ?>
        </tr>
 </table>
 <br/>
-<?
-       }
+<?php  }
 
        /**
         * Render an assurance for a view
@@ -489,80 +480,70 @@ define('THAWTE_REVOCATION_DATETIME', '2010-11-16 00:00:00');
                }
 ?>
        <tr>
-               <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$assuranceid?><?=$emclose?></td>
-               <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$date?><?=$emclose?></td>
-<?
-               if ($support == 1)
+               <td class="DataTD" <?php echo $tdstyle?>><?php echo $emopen?><?php echo $assuranceid?><?php echo $emclose?></td>
+               <td class="DataTD" <?php echo $tdstyle?>><?php echo $emopen?><?php echo $date?><?php echo $emclose?></td>
+<?php          if ($support == 1)
                {
 ?>
-               <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$when?><?=$emclose?></td>
-               <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$email?><?=$emclose?></td>
-<?
-               }
+               <td class="DataTD" <?php echo $tdstyle?>><?php echo $emopen?><?php echo $when?><?php echo $emclose?></td>
+               <td class="DataTD" <?php echo $tdstyle?>><?php echo $emopen?><?php echo $email?><?php echo $emclose?></td>
+<?php          }
 ?>
-               <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$name?><?=$emclose?></td>
-               <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$revoked ? sprintf("<strong style='color: red'>%s</strong>",_("Revoked")) : $awarded?><?=$emclose?></td>
-               <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=sanitizeHTML($location)?><?=$emclose?></td>
-               <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$method?><?=$emclose?></td>
-               <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$experience?$experience:'&nbsp;'?><?=$emclose?></td>
-<?
-               if ($log == 1)
+               <td class="DataTD" <?php echo $tdstyle?>><?php echo $emopen?><?php echo $name?><?php echo $emclose?></td>
+               <td class="DataTD" <?php echo $tdstyle?>><?php echo $emopen?><?php echo $revoked ? sprintf("<strong style='color: red'>%s</strong>",_("Revoked")) : $awarded?><?php echo $emclose?></td>
+               <td class="DataTD" <?php echo $tdstyle?>><?php echo $emopen?><?php echo sanitizeHTML($location)?><?php echo $emclose?></td>
+               <td class="DataTD" <?php echo $tdstyle?>><?php echo $emopen?><?php echo $method?><?php echo $emclose?></td>
+               <td class="DataTD" <?php echo $tdstyle?>><?php echo $emopen?><?php echo $experience?$experience:'&nbsp;'?><?php echo $emclose?></td>
+<?php          if ($log == 1)
                {
                        if ($revoked == true)
                        {
 ?>
-               <td class="DataTD" <?=$tdstyle?>><?=$assurance['deleted']?></td>
-<?
-                       } elseif ($support == 1) {
+               <td class="DataTD" <?php echo $tdstyle?>><?php echo $assurance['deleted']?></td>
+<?php                  } elseif ($support == 1) {
 ?>
-               <td class="DataTD" <?=$tdstyle?>><?=$emopen?><a href="account.php?id=43&amp;userid=<?=intval($userid)?>&amp;assurance=<?=intval($assuranceid)?>&amp;csrf=<?=make_csrf('admdelassurance')?>&amp;ticketno=<?=sanitizeHTML($ticketno)?>" onclick="return confirm('<?=sprintf(_("Are you sure you want to revoke the assurance with ID &quot;%s&quot;?"),$assuranceid)?>');"><?=_("Revoke")?></a><?=$emclose?></td>
-<?
-                       } else {
+               <td class="DataTD" <?php echo $tdstyle?>><?php echo $emopen?><a href="account.php?id=43&amp;userid=<?php echo intval($userid)?>&amp;assurance=<?php echo intval($assuranceid)?>&amp;csrf=<?php echo make_csrf('admdelassurance')?>&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>" onclick="return confirm('<?php echo sprintf(_("Are you sure you want to revoke the assurance with ID &quot;%s&quot;?"),$assuranceid)?>');"><?php echo _("Revoke")?></a><?php echo $emclose?></td>
+<?php                  } else {
 ?>
-               <td class="DataTD" <?=$tdstyle?>>&nbsp;</td>
-<?
-                       }
+               <td class="DataTD" <?php echo $tdstyle?>>&nbsp;</td>
+<?php                  }
                }
 ?>
        </tr>
-<?
-       }
+<?php  }
 
        function output_summary_header()
        {
 ?>
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
        <tr>
-               <td colspan="4" class="title"><?=_("Summary of your Points")?></td>
+               <td colspan="4" class="title"><?php echo _("Summary of your Points")?></td>
        </tr>
        <tr>
-               <td class="DataTD"><strong><?=_("Description")?></strong></td>
-               <td class="DataTD"><strong><?=_("Points")?></strong></td>
-               <td class="DataTD"><strong><?=_("Countable Points")?></strong></td>
-               <td class="DataTD"><strong><?=_("Remark")?></strong></td>
+               <td class="DataTD"><strong><?php echo _("Description")?></strong></td>
+               <td class="DataTD"><strong><?php echo _("Points")?></strong></td>
+               <td class="DataTD"><strong><?php echo _("Countable Points")?></strong></td>
+               <td class="DataTD"><strong><?php echo _("Remark")?></strong></td>
     </tr>
-<?
-       }
+<?php  }
 
        function output_summary_footer()
        {
 ?>
 </table>
 <br/>
-<?
-       }
+<?php  }
 
        function output_summary_row($title,$points,$points_countable,$remark)
        {
 ?>
        <tr>
-               <td class="DataTD"><strong><?=$title?></strong></td>
-               <td class="DataTD"><?=$points?></td>
-               <td class="DataTD"><?=$points_countable?></td>
-               <td class="DataTD"><?=$remark?></td>
+               <td class="DataTD"><strong><?php echo $title?></strong></td>
+               <td class="DataTD"><?php echo $points?></td>
+               <td class="DataTD"><?php echo $points_countable?></td>
+               <td class="DataTD"><?php echo $remark?></td>
        </tr>
-<?
-       }
+<?php  }
 
 
 // ************* output given assurances ******************
@@ -840,9 +821,8 @@ define('THAWTE_REVOCATION_DATETIME', '2010-11-16 00:00:00');
        function output_end_of_page()
        {
 ?>
-       <p>[ <a href='javascript:history.go(-1)'><?=_("Go Back")?></a> ]</p>
-<?
-       }
+       <p>[ <a href='javascript:history.go(-1)'><?php echo _("Go Back")?></a> ]</p>
+<?php  }
 
        //functions to do with recording user agreements
        /**
@@ -1004,87 +984,78 @@ function get_user_agreements($memid, $type=null, $active=null){
 <form method="post" action="wot.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="600">
        <tr>
-               <td colspan="2" class="title"><?=$confirmation?></td>
+               <td colspan="2" class="title"><?php echo $confirmation?></td>
        </tr>
        <tr>
-               <td class="DataTD" colspan="2" align="left"><?=$checkname?></td>
+               <td class="DataTD" colspan="2" align="left"><?php echo $checkname?></td>
        </tr>
-<?
-       }
+<?php  }
 
        function AssureTextLine($field1,$field2)
        {
 ?>
        <tr>
-               <td class="DataTD"><?=$field1.(empty($field1)?'':':')?></td>
-               <td class="DataTD"><?=$field2?></td>
+               <td class="DataTD"><?php echo $field1.(empty($field1)?'':':')?></td>
+               <td class="DataTD"><?php echo $field2?></td>
        </tr>
-<?
-       }
+<?php  }
 
        function AssureBoxLine($type,$text,$checked)
        {
 ?>
        <tr>
-               <td class="DataTD"><input type="checkbox" name="<?=$type?>" value="1" <?=$checked?"checked":""?>></td>
-               <td class="DataTD"><?=$text?></td>
+               <td class="DataTD"><input type="checkbox" name="<?php echo $type?>" value="1" <?php echo $checked?"checked":""?>></td>
+               <td class="DataTD"><?php echo $text?></td>
        </tr>
-<?
-       }
+<?php  }
 
        function AssureMethodLine($text,$methods,$remark)
        {
                if (count($methods) != 1) {
 ?>
        <tr>
-               <td class="DataTD"><?=$text.(empty($text)?'':':')?></td>
+               <td class="DataTD"><?php echo $text.(empty($text)?'':':')?></td>
                <td class="DataTD">
                        <select name="method">
-<?
-                       foreach($methods as $val) {
+<?php                  foreach($methods as $val) {
 ?>
-                               <option value="<?=$val?>"><?=$val?></option>
-<?
-                       }
+                               <option value="<?php echo $val?>"><?php echo $val?></option>
+<?php                  }
 ?>
                        </select>
                        <br />
-                       <?=$remark?>
+                       <?php echo $remark?>
                </td>
        </tr>
-<?
-               } else {
+<?php          } else {
 ?>
-       <input type="hidden" name="method" value="<?=$methods[0]?>" />
-<?
-               }
+       <input type="hidden" name="method" value="<?php echo $methods[0]?>" />
+<?php          }
        }
 
        function AssureInboxLine($type,$field,$value,$description)
        {
 ?>
        <tr>
-               <td class="DataTD"><?=$field.(empty($field)?'':':')?></td>
-               <td class="DataTD"><input type="text" name="<?=$type?>" value="<?=$value?>"><?=$description?></td>
+               <td class="DataTD"><?php echo $field.(empty($field)?'':':')?></td>
+               <td class="DataTD"><input type="text" name="<?php echo $type?>" value="<?php echo $value?>"><?php echo $description?></td>
        </tr>
-<?
-       }
+<?php  }
 
        function AssureFoot($oldid,$confirm)
        {
 ?>
        <tr>
                <td class="DataTD" colspan="2">
-                       <input type="submit" name="process" value="<?=$confirm?>" />
-                       <input type="submit" name="cancel" value="<?=_("Cancel")?>" />
+                       <input type="submit" name="process" value="<?php echo $confirm?>" />
+                       <input type="submit" name="cancel" value="<?php echo _("Cancel")?>" />
                </td>
        </tr>
 </table>
-<input type="hidden" name="pagehash" value="<?=$_SESSION['_config']['wothash']?>" />
-<input type="hidden" name="oldid" value="<?=$oldid?>" />
+<input type="hidden" name="pagehash" value="<?php echo $_SESSION['_config']['wothash']?>" />
+<input type="hidden" name="oldid" value="<?php echo $oldid?>" />
 </form>
-<?
-       }
+<?php  }
 
        function account_email_delete($mailid){
        //deletes an email entry from an acount
@@ -1622,13 +1593,12 @@ function get_gpg_certs($userid, $viewall=0){
 function output_log_email_header(){
        ?>
        <tr>
-               <td class="DataTD bold"><?= _("Email, primary bold") ?></td>
-               <td class="DataTD bold"><?= _("Created") ?></td>
-               <td class="DataTD bold"><?= _("Deleted") ?></td>
+               <td class="DataTD bold"><?php echo _("Email, primary bold") ?></td>
+               <td class="DataTD bold"><?php echo _("Created") ?></td>
+               <td class="DataTD bold"><?php echo _("Deleted") ?></td>
        </tr>
 
-       <?
-}
+       <?php }
 /**
  * Show all email data for the admin log
  * @param array  $row - associative array containing the column data
@@ -1643,12 +1613,11 @@ function output_log_email($row, $primary){
        }
        ?>
        <tr>
-               <td class="DataTD<?=$style?>"><?=$row['email']?></td>
-               <td class="DataTD<?=$style?>"><?=$row['created']?></td>
-               <td class="DataTD<?=$style?>"><?=$row['deleted']?></td>
+               <td class="DataTD<?php echo $style?>"><?php echo $row['email']?></td>
+               <td class="DataTD<?php echo $style?>"><?php echo $row['created']?></td>
+               <td class="DataTD<?php echo $style?>"><?php echo $row['deleted']?></td>
        </tr>
-       <?
-}
+       <?php }
 
 /**
  * Show the table header to the domains table for the admin log
@@ -1656,13 +1625,12 @@ function output_log_email($row, $primary){
 function output_log_domains_header(){
        ?>
        <tr>
-               <td class="DataTD bold"><?= _("Domain") ?></td>
-               <td class="DataTD bold"><?= _("Created") ?></td>
-               <td class="DataTD bold"><?= _("Deleted") ?></td>
+               <td class="DataTD bold"><?php echo _("Domain") ?></td>
+               <td class="DataTD bold"><?php echo _("Created") ?></td>
+               <td class="DataTD bold"><?php echo _("Deleted") ?></td>
        </tr>
 
-       <?
-}
+       <?php }
 
 /**
  * Show the domain data for the admin log
@@ -1675,12 +1643,11 @@ function output_log_domains($row){
        }
        ?>
        <tr>
-               <td class="DataTD<?=$italic?>"><?=$row['domain']?></td>
-               <td class="DataTD<?=$italic?>"><?=$row['created']?></td>
-               <td class="DataTD<?=$italic?>"><?=$row['deleted']?></td>
+               <td class="DataTD<?php echo $italic?>"><?php echo $row['domain']?></td>
+               <td class="DataTD<?php echo $italic?>"><?php echo $row['created']?></td>
+               <td class="DataTD<?php echo $italic?>"><?php echo $row['deleted']?></td>
        </tr>
-       <?
-}
+       <?php }
 
 /**
  * Show the table header to the user agreement table for the admin log
@@ -1688,13 +1655,12 @@ function output_log_domains($row){
 function output_log_agreement_header(){
        ?>
        <tr>
-               <td class="DataTD bold"><?= _("Agreement") ?></td>
-               <td class="DataTD bold"><?= _("Date") ?></td>
-               <td class="DataTD bold"><?= _("Method") ?></td>
-               <td class="DataTD bold"><?= _("Active ") ?></td>
+               <td class="DataTD bold"><?php echo _("Agreement") ?></td>
+               <td class="DataTD bold"><?php echo _("Date") ?></td>
+               <td class="DataTD bold"><?php echo _("Method") ?></td>
+               <td class="DataTD bold"><?php echo _("Active ") ?></td>
        </tr>
-       <?
-}
+       <?php }
 
 /**
  * Show the agreement data for the admin log
@@ -1703,13 +1669,12 @@ function output_log_agreement_header(){
 function output_log_agreement($row){
        ?>
        <tr>
-               <td class="DataTD" ><?=$row['document']?></td>
-               <td class="DataTD" ><?=$row['date']?></td>
-               <td class="DataTD" ><?=$row['method']?></td>
-               <td class="DataTD"><?= ($row['active']==0)? _('passive'):_('active')?></td>
+               <td class="DataTD" ><?php echo $row['document']?></td>
+               <td class="DataTD" ><?php echo $row['date']?></td>
+               <td class="DataTD" ><?php echo $row['method']?></td>
+               <td class="DataTD"><?php echo ($row['active']==0)? _('passive'):_('active')?></td>
        </tr>
-       <?
-}
+       <?php }
 
 /**
  * Show the table header to the training table
@@ -1718,12 +1683,11 @@ function output_log_training_header(){
        //should be entered in account/55.php
        ?>
        <tr>
-               <td class="DataTD bold"><?= _("Agreement") ?></td>
-               <td class="DataTD bold"><?= _("Test") ?></td>
-               <td class="DataTD bold"><?= _("Variant") ?></td>
+               <td class="DataTD bold"><?php echo _("Agreement") ?></td>
+               <td class="DataTD bold"><?php echo _("Test") ?></td>
+               <td class="DataTD bold"><?php echo _("Variant") ?></td>
        </tr>
-       <?
-}
+       <?php }
 
 /**
  * Show the training data
@@ -1733,12 +1697,11 @@ function output_log_training($row){
        //should be entered in account/55.php
        ?>
        <tr>
-               <td class="DataTD"><?=$row['pass_date']?></td>
-               <td class="DataTD"><?=$row['type_text']?></td>
-               <td class="DataTD"><?=$row['test_text']?></td>
+               <td class="DataTD"><?php echo $row['pass_date']?></td>
+               <td class="DataTD"><?php echo $row['type_text']?></td>
+               <td class="DataTD"><?php echo $row['test_text']?></td>
        </tr>
-       <?
-}
+       <?php }
 
 /**
  * Show the table header to the SE log table for the admin log
@@ -1747,19 +1710,16 @@ function output_log_training($row){
 function output_log_se_header($support=0){
        ?>
        <tr>
-               <td class="DataTD bold"><?= _("Date") ?></td>
-               <td class="DataTD bold"><?= _("Type") ?></td>
-               <?
-               if (1 == $support) {
+               <td class="DataTD bold"><?php echo _("Date") ?></td>
+               <td class="DataTD bold"><?php echo _("Type") ?></td>
+               <?php           if (1 == $support) {
                        ?>
-                       <td class="DataTD bold"><?= _("Information") ?></td>
-                       <td class="DataTD bold"><?= _("Admin") ?></td>
-                       <?
-               }
+                       <td class="DataTD bold"><?php echo _("Information") ?></td>
+                       <td class="DataTD bold"><?php echo _("Admin") ?></td>
+                       <?php           }
                ?>
        </tr>
-       <?
-}
+       <?php }
 
 /**
  * Show the SE log data for the admin log
@@ -1770,19 +1730,16 @@ function output_log_se($row, $support=0){
        //should be entered in account/55.php
        ?>
        <tr>
-               <td class="DataTD"><?=$row['when']?></td>
-               <td class="DataTD"><?=$row['type']?></td>
-               <?
-               if (1 == $support) {
+               <td class="DataTD"><?php echo $row['when']?></td>
+               <td class="DataTD"><?php echo $row['type']?></td>
+               <?php           if (1 == $support) {
                        ?>
-                       <td class="DataTD"><?=$row['information']?></td>
-                       <td class="DataTD"><?=$row['fname'].' '.$row['lname']?></td>
-                       <?
-               }
+                       <td class="DataTD"><?php echo $row['information']?></td>
+                       <td class="DataTD"><?php echo $row['fname'].' '.$row['lname']?></td>
+                       <?php           }
                ?>
        </tr>
-       <?
-}
+       <?php }
 
 /**
  * Shows the table header to the client cert table
@@ -1793,29 +1750,24 @@ function output_client_cert_header($support=0, $readonly=true){
        //should be added to account/5.php
        ?>
        <tr>
-               <?
-               if (!$readonly) {
+               <?php           if (!$readonly) {
                        ?>
-                       <td class="DataTD"><?=_("Renew/Revoke/Delete")?></td>
-                       <?
-               }
+                       <td class="DataTD"><?php echo _("Renew/Revoke/Delete")?></td>
+                       <?php           }
                ?>
-               <td class="DataTD"><?=_("Status")?></td>
-               <td class="DataTD"><?=_("Email Address")?></td>
-               <td class="DataTD"><?=_("SerialNumber")?></td>
-               <td class="DataTD"><?=_("Revoked")?></td>
-               <td class="DataTD"><?=_("Expires")?></td>
-               <td class="DataTD"><?=_("Login")?></td>
-               <?
-               if (1 != $support) {
+               <td class="DataTD"><?php echo _("Status")?></td>
+               <td class="DataTD"><?php echo _("Email Address")?></td>
+               <td class="DataTD"><?php echo _("SerialNumber")?></td>
+               <td class="DataTD"><?php echo _("Revoked")?></td>
+               <td class="DataTD"><?php echo _("Expires")?></td>
+               <td class="DataTD"><?php echo _("Login")?></td>
+               <?php           if (1 != $support) {
                        ?>
-                       <td colspan="2" class="DataTD"><?=_("Comment *")?></td>
-                       <?
-               }
+                       <td colspan="2" class="DataTD"><?php echo _("Comment *")?></td>
+                       <?php           }
                ?>
        </tr>
-       <?
-}
+       <?php }
 
 /**
  * Show the client cert data
@@ -1844,76 +1796,65 @@ function output_client_cert($row, $support=0, $readonly=true){
 
        ?>
        <tr>
-       <?
-       if (!$readonly) {
+       <?php   if (!$readonly) {
                if ($verified === _("Pending")) {
                        ?>
                        <td class="DataTD">
-                               <input type="checkbox" name="delid[]" value="<?=intval($row['id'])?>">
+                               <input type="checkbox" name="delid[]" value="<?php echo intval($row['id'])?>">
                        </td>
-                       <?
-
+                       <?php
                } elseif ($verified === _("Revoked")) {
                        ?>
                        <td class="DataTD">&nbsp;</td>
-                       <?
-
+                       <?php
                } else {
                        ?>
                        <td class="DataTD">
-                               <input type="checkbox" name="revokeid[]" value="<?=intval($row['id'])?>">
+                               <input type="checkbox" name="revokeid[]" value="<?php echo intval($row['id'])?>">
                        </td>
-                       <?
-               }
+                       <?php           }
        }
 
        ?>
-       <td class="DataTD"><?=$verified?></td>
-       <?
-
+       <td class="DataTD"><?php echo $verified?></td>
+       <?php
        if ($verified === _("Pending")) {
                ?>
-               <td class="DataTD"><?=(trim($row['CN'])=="" ? _("empty") : htmlspecialchars($row['CN']))?></td>
-               <?
-       } else {
+               <td class="DataTD"><?php echo (trim($row['CN'])=="" ? _("empty") : htmlspecialchars($row['CN']))?></td>
+               <?php   } else {
                ?>
                <td class="DataTD">
-                       <a href="account.php?id=6&amp;cert=<?=intval($row['id'])?>">
-                               <?=(trim($row['CN'])=="" ? _("empty") : htmlspecialchars($row['CN']))?>
+                       <a href="account.php?id=6&amp;cert=<?php echo intval($row['id'])?>">
+                               <?php echo (trim($row['CN'])=="" ? _("empty") : htmlspecialchars($row['CN']))?>
                        </a>
                </td>
-               <?
-       }
+               <?php   }
 
        ?>
-       <td class="DataTD"><?=$row['serial']?></td>
-       <td class="DataTD"><?=$row['revoke']?></td>
-       <td class="DataTD"><?=$row['expire']?></td>
+       <td class="DataTD"><?php echo $row['serial']?></td>
+       <td class="DataTD"><?php echo $row['revoke']?></td>
+       <td class="DataTD"><?php echo $row['expire']?></td>
        <td class="DataTD">
-               <input type="checkbox" name="disablelogin_<?=intval($row['id'])?>" value="1" <?=$row['disablelogin']?"":"checked='checked'"?> <?=$readonly?'disabled="disabled"':''?>/>
-               <input type="hidden" name="cert_<?=intval($row['id'])?>" value="1" />
+               <input type="checkbox" name="disablelogin_<?php echo intval($row['id'])?>" value="1" <?php echo $row['disablelogin']?"":"checked='checked'"?> <?php echo $readonly?'disabled="disabled"':''?>/>
+               <input type="hidden" name="cert_<?php echo intval($row['id'])?>" value="1" />
        </td>
-       <?
-
+       <?php
        if (1 != $support) {
                ?>
                <td class="DataTD">
-                       <input name="comment_<?=intval($row['id'])?>" type="text" value="<?=htmlspecialchars($row['description'])?>" />
+                       <input name="comment_<?php echo intval($row['id'])?>" type="text" value="<?php echo htmlspecialchars($row['description'])?>" />
                </td>
-               <?
-               if (!$readonly) {
+               <?php           if (!$readonly) {
                        ?>
                        <td class="DataTD">
-                               <input type="checkbox" name="check_comment_<?=intval($row['id'])?>" />
+                               <input type="checkbox" name="check_comment_<?php echo intval($row['id'])?>" />
                        </td>
-                       <?
-               }
+                       <?php           }
        }
 
        ?>
        </tr>
-       <?
-}
+       <?php }
 
 /**
  * Show the table header to the server cert table
@@ -1924,28 +1865,23 @@ function output_server_certs_header($support=0, $readonly=true){
        //should be entered in account/12.php
        ?>
        <tr>
-       <?
-               if (!$readonly) {
+       <?php           if (!$readonly) {
                        ?>
-                       <td class="DataTD"><?=_("Renew/Revoke/Delete")?></td>
-                       <?
-               }
+                       <td class="DataTD"><?php echo _("Renew/Revoke/Delete")?></td>
+                       <?php           }
                ?>
-               <td class="DataTD"><?=_("Status")?></td>
-               <td class="DataTD"><?=_("CommonName")?></td>
-               <td class="DataTD"><?=_("SerialNumber")?></td>
-               <td class="DataTD"><?=_("Revoked")?></td>
-               <td class="DataTD"><?=_("Expires")?></td>
-               <?
-               if (1 != $support) {
+               <td class="DataTD"><?php echo _("Status")?></td>
+               <td class="DataTD"><?php echo _("CommonName")?></td>
+               <td class="DataTD"><?php echo _("SerialNumber")?></td>
+               <td class="DataTD"><?php echo _("Revoked")?></td>
+               <td class="DataTD"><?php echo _("Expires")?></td>
+               <?php           if (1 != $support) {
                        ?>
-                       <td colspan="2" class="DataTD"><?=_("Comment *")?></td>
-                       <?
-               }
+                       <td colspan="2" class="DataTD"><?php echo _("Comment *")?></td>
+                       <?php           }
        ?>
        </tr>
-       <?
-}
+       <?php }
 
 /**
  * Show the server cert data
@@ -1974,70 +1910,59 @@ function output_server_certs($row, $support=0, $readonly=true){
 
        ?>
        <tr>
-       <?
-       if (!$readonly) {
+       <?php   if (!$readonly) {
                if ($verified === _("Pending")) {
                        ?>
                        <td class="DataTD">
-                               <input type="checkbox" name="delid[]" value="<?=intval($row['id'])?>"/>
+                               <input type="checkbox" name="delid[]" value="<?php echo intval($row['id'])?>"/>
                        </td>
-                       <?
-               } elseif($verified === _("Revoked")) {
+                       <?php           } elseif($verified === _("Revoked")) {
                        ?>
                        <td class="DataTD">&nbsp;</td>
-                       <?
-               } else {
+                       <?php           } else {
                        ?>
                        <td class="DataTD">
-                               <input type="checkbox" name="revokeid[]" value="<?=intval($row['id'])?>"/>
+                               <input type="checkbox" name="revokeid[]" value="<?php echo intval($row['id'])?>"/>
                        </td>
-                       <?
-               }
+                       <?php           }
        }
 
        ?>
-       <td class="DataTD"><?=$verified?></td>
-       <?
-
+       <td class="DataTD"><?php echo $verified?></td>
+       <?php
        if ($verified === _("Pending")) {
                ?>
-               <td class="DataTD"><?=htmlspecialchars($row['CN'])?></td>
-               <?
-       } else {
+               <td class="DataTD"><?php echo htmlspecialchars($row['CN'])?></td>
+               <?php   } else {
                ?>
                <td class="DataTD">
-                       <a href="account.php?id=15&amp;cert=<?=intval($row['id'])?>">
-                               <?=htmlspecialchars($row['CN'])?>
+                       <a href="account.php?id=15&amp;cert=<?php echo intval($row['id'])?>">
+                               <?php echo htmlspecialchars($row['CN'])?>
                        </a>
                </td>
-               <?
-       }
+               <?php   }
 
        ?>
-       <td class="DataTD"><?=$row['serial']?></td>
-       <td class="DataTD"><?=$row['revoke']?></td>
-       <td class="DataTD"><?=$row['expire']?></td>
-       <?
-
+       <td class="DataTD"><?php echo $row['serial']?></td>
+       <td class="DataTD"><?php echo $row['revoke']?></td>
+       <td class="DataTD"><?php echo $row['expire']?></td>
+       <?php
        if (1 != $support) {
                ?>
                <td class="DataTD">
-                       <input name="comment_<?=intval($row['id'])?>" type="text" value="<?=htmlspecialchars($row['description'])?>" />
+                       <input name="comment_<?php echo intval($row['id'])?>" type="text" value="<?php echo htmlspecialchars($row['description'])?>" />
                </td>
-               <?
-               if (!$readonly) {
+               <?php           if (!$readonly) {
                        ?>
                        <td class="DataTD">
-                               <input type="checkbox" name="check_comment_<?=intval($row['id'])?>" />
+                               <input type="checkbox" name="check_comment_<?php echo intval($row['id'])?>" />
                        </td>
-                       <?
-               }
+                       <?php           }
        }
 
        ?>
        </tr>
-       <?
-}
+       <?php }
 
 /**
  * Show the table header to the gpg cert table
@@ -2048,20 +1973,17 @@ function output_gpg_certs_header($support=0, $readonly=true){
        // $readonly is currently ignored but kept for consistency
        ?>
        <tr>
-               <td class="DataTD"><?=_("Status")?></td>
-               <td class="DataTD"><?=_("Email Address")?></td>
-               <td class="DataTD"><?=_("Expires")?></td>
-               <td class="DataTD"><?=_("Key ID")?></td>
-               <?
-               if (1 != $support) {
+               <td class="DataTD"><?php echo _("Status")?></td>
+               <td class="DataTD"><?php echo _("Email Address")?></td>
+               <td class="DataTD"><?php echo _("Expires")?></td>
+               <td class="DataTD"><?php echo _("Key ID")?></td>
+               <?php           if (1 != $support) {
                        ?>
-                       <td colspan="2" class="DataTD"><?=_("Comment *")?></td>
-                       <?
-               }
+                       <td colspan="2" class="DataTD"><?php echo _("Comment *")?></td>
+                       <?php           }
        ?>
        </tr>
-       <?
-}
+       <?php }
 
 /**
  * Show the gpg cert data
@@ -2084,57 +2006,48 @@ function output_gpg_certs($row, $support=0, $readonly=true){
 
        ?>
        <tr>
-               <td class="DataTD"><?=$verified?></td>
-       <?
-
+               <td class="DataTD"><?php echo $verified?></td>
+       <?php
        if($verified == _("Pending")) {
                ?>
-               <td class="DataTD"><?=htmlspecialchars($row['email'])?></td>
-               <?
-       } else {
+               <td class="DataTD"><?php echo htmlspecialchars($row['email'])?></td>
+               <?php   } else {
                ?>
                <td class="DataTD">
-                       <a href="gpg.php?id=3&amp;cert=<?=intval($row['id'])?>">
-                               <?=htmlspecialchars($row['email'])?>
+                       <a href="gpg.php?id=3&amp;cert=<?php echo intval($row['id'])?>">
+                               <?php echo htmlspecialchars($row['email'])?>
                        </a>
                </td>
-               <?
-       }
+               <?php   }
 
        ?>
-       <td class="DataTD"><?=$row['expire']?></td>
-       <?
-
+       <td class="DataTD"><?php echo $row['expire']?></td>
+       <?php
        if($verified == _("Pending")) {
                ?>
-               <td class="DataTD"><?=htmlspecialchars($row['keyid'])?></td>
-               <?
-       } else {
+               <td class="DataTD"><?php echo htmlspecialchars($row['keyid'])?></td>
+               <?php   } else {
                ?>
                <td class="DataTD">
-                       <a href="gpg.php?id=3&amp;cert=<?=intval($row['id'])?>">
-                               <?=htmlspecialchars($row['keyid'])?>
+                       <a href="gpg.php?id=3&amp;cert=<?php echo intval($row['id'])?>">
+                               <?php echo htmlspecialchars($row['keyid'])?>
                        </a>
                </td>
-               <?
-       }
+               <?php   }
 
        if (1 != $support) {
                ?>
                <td class="DataTD">
-                       <input name="comment_<?=intval($row['id'])?>" type="text" value="<?=htmlspecialchars($row['description'])?>" />
+                       <input name="comment_<?php echo intval($row['id'])?>" type="text" value="<?php echo htmlspecialchars($row['description'])?>" />
                </td>
-               <?
-               if (!$readonly) {
+               <?php           if (!$readonly) {
                        ?>
                        <td class="DataTD">
-                               <input type="checkbox" name="check_comment_<?=intval($row['id'])?>" />
+                               <input type="checkbox" name="check_comment_<?php echo intval($row['id'])?>" />
                        </td>
-                       <?
-               }
+                       <?php           }
        }
 
        ?>
        </tr>
-       <?
-}
+       <?php }
index 4ceaf25..6d2d175 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
@@ -21,9 +21,8 @@
 
        if(0)
        { ?>
-               <font color="#ff0000"><? printf(_("This function is currently disabled. Please visit %s for more information."),
+               <font color="#ff0000"><?php printf(_("This function is currently disabled. Please visit %s for more information."),
                        "<a target='_blank' href='http://wiki.cacert.org/wiki/ClientSecurity'>http://wiki.cacert.org/wiki/ClientSecurity</a>")?></font>
-<?
-               exit;
+<?php          exit;
        }
 ?>
index 3ed216a..59edfaf 100644 (file)
@@ -1,5 +1,5 @@
   <div class="sponsorinfo">
-    <?=_("CAcert operations are sponsored by")?>
+    <?php echo _("CAcert operations are sponsored by")?>
     <a href="http://www.bit.nl/" target="_blank"><img class="sponsorlogo" src="/images/bit.png" alt="[BIT logo]" border="0"></a>
     <a href="http://www.tunix.nl/" target="_blank"><img class="sponsorlogo" src="/images/tunix.png" alt="[TUNIX logo]" border="0"></a>
     <a href="http://www.nlnet.nl/" target="_blank"><img class="sponsorlogo" src="/images/nlnet.png" alt="[NLnet logo]" border="0"></a>
index 93f7c32..bfdb27f 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
@@ -24,38 +24,37 @@ if(!function_exists("showheader"))
 ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-<title><?=$title?></title>
-<? if($_SESSION['_config']['header'] != "") { ?><?=$_SESSION['_config']['header']?><? } ?>
+<title><?php echo $title?></title>
+<?php if($_SESSION['_config']['header'] != "") { ?><?php echo $_SESSION['_config']['header']?><?php } ?>
 <link rel="stylesheet" href="/styles/default.css" type="text/css">
 <link href="http://my.rsscache.com/www.cacert.org/rss.php" rel="alternate" type="application/rss+xml" title="rss">
 </head>
 <body>
  <div id="pagecell1">
   <div id="pageName"><br>
-    <h2><a href="http://<?=$_SESSION['_config']['normalhostname']?>"><img src="https://www.CAcert.org/images/cacert4.png" border="0" alt="CAcert.org logo"></a></h2>
-<div id="googlead"><h2><?=_("Free digital certificates!")?></h2></div>
+    <h2><a href="http://<?php echo $_SESSION['_config']['normalhostname']?>"><img src="https://www.CAcert.org/images/cacert4.png" border="0" alt="CAcert.org logo"></a></h2>
+<div id="googlead"><h2><?php echo _("Free digital certificates!")?></h2></div>
   </div>
   <div id="pageNav">
     <div class="relatedLinks">
-      <h3><?=_("Join CAcert.org")?></h3>
-      <a href="http://<?=$_SESSION['_config']['normalhostname']?>/"><?=_("Main Website")?></a> 
-      <a href="https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=1"><?=_("Join")?></a> 
+      <h3><?php echo _("Join CAcert.org")?></h3>
+      <a href="http://<?php echo $_SESSION['_config']['normalhostname']?>/"><?php echo _("Main Website")?></a>
+      <a href="https://<?php echo $_SESSION['_config']['normalhostname']?>/index.php?id=1"><?php echo _("Join")?></a>
     </div>
     <div class="relatedLinks">
-      <h3><?=_("My Account")?></h3>
-      <a href="https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=4"><?=_("Normal Login")?></a> 
-      <a href="https://<?=$_SESSION['_config']['securehostname']?>/index.php?id=4"><?=_("Cert Login")?></a>
-      <a href="https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=5"><?=_("Lost Password")?></a>
+      <h3><?php echo _("My Account")?></h3>
+      <a href="https://<?php echo $_SESSION['_config']['normalhostname']?>/index.php?id=4"><?php echo _("Normal Login")?></a>
+      <a href="https://<?php echo $_SESSION['_config']['securehostname']?>/index.php?id=4"><?php echo _("Cert Login")?></a>
+      <a href="https://<?php echo $_SESSION['_config']['normalhostname']?>/index.php?id=5"><?php echo _("Lost Password")?></a>
     </div>
   </div>
   <div id="content">
     <div class="story">
-      <h3><?=$title2?></h3>
-<? if($_SESSION['_config']['errmsg'] != "") { ?>
-<p><font color="#ff0000" size="+2"><? echo $_SESSION['_config']['errmsg']; $_SESSION['_config']['errmsg'] = ""; ?> </font></p>
-<? } ?>
-<?
-       }
+      <h3><?php echo $title2?></h3>
+<?php if($_SESSION['_config']['errmsg'] != "") { ?>
+<p><font color="#ff0000" size="+2"><?php echo $_SESSION['_config']['errmsg']; $_SESSION['_config']['errmsg'] = ""; ?> </font></p>
+<?php } ?>
+<?php  }
 }
 
 if(!function_exists("showfooter"))
@@ -66,13 +65,12 @@ if(!function_exists("showfooter"))
       </div>
     </div>
   <div id="siteInfo">
-        <a href="//wiki.cacert.org/FAQ/AboutUs"><?=_("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="//wiki.cacert.org/FAQ/AboutUs"><?php echo _("About Us")?></a> | <a href="/index.php?id=13"><?php echo _("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?php echo _("Association Membership")?></a> |
+        <a href="/index.php?id=10"><?php echo _("Privacy Policy")?></a> |
+        <a href="/index.php?id=51"><?php echo _("Mission Statement")?></a> | <a href="/index.php?id=11"><?php echo _("Contact Us")?></a> |
+        <a href="/index.php?id=19"><?php echo _("Further Information")?></a> | &copy;2002-<?php echo date("Y")?> <?php echo _("by CAcert")?></div>
 </div>  
 </body>             
-</html><?
-       }
+</html><?php   }
 }
 ?>
index b9b150c..d059e1a 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */ ?>
-<H3><?=_("My Account")?></H3>
-<p><?=_("Welcome to your account section of the website. Below is a description of the different sections and what they're for.")?></p>
-<H4><?=_("CAcert.org")?></H4>
-<p><?=_("If you would like to view news items or change languages you can click the logout or go home links. Go home doesn't log you out of the system, just returns you to the front of the website. Logout logs you out of the system.")?></p>
-<H4><?=_("My Details")?></H4>
-<p><?=_("In this section you will be able to edit your personal information (if you haven't been assured), update your pass phrase, and lost pass phrase questions. You will also be able to set your location for the Web of Trust, it also effects the email announcement settings which among other things can be set to notify you if you're within 200km of a planned assurance event. You'll also be able to set additional contact information when you become fully trusted, so others can contact you to meet up outside official events.")?></p>
-<h4><?=_("Email Accounts and Client Certificates")?></h4>
-<p><?=_("The email account section is for adding/updating/removing email accounts which can be used to issue client certificates against. The client certificate section steps you through generating a certificate signing request for one or more emails you've registered in the email account section.")?></p>
-<h4><?=_("Domains and Server Certificates.")?></h4>
-<p><?=_("Before you can start issuing certificates for your website, irc server, smtp server, pop3, imap etc you will need to add domains to your account under the domain menu. You can also remove domains from here as well. Once you've added a domain you are free then to go into the Server Certificate section and start pasting CSR into the website and have the website return you a valid certificate for up to 2 years if you have 50 trust points, or 6 months for no trust points.")?></p>
-<h4><?=_("Org Client and Server Certificates")?></h4>
-<p><?=_("Once you have verified your company you will see these menu options. They allow you to issue as many certificates as you like without proving individual email accounts as you like, further more you are able to get your company details on the certificate.")?></p>
-<h4><?=_("CAcert Web of Trust")?></h4>
-<p><?=_("The Web of Trust system CAcert uses is similar to that many involved with GPG/PGP use, they hold face to face meetings to verify each others photo identities match their GPG/PGP key information. CAcert differs however in that we have modified things to work within the PKI framework, for you to gain trust in the system you must first locate someone already trusted. The trust person depending how many people they've trusted or meet before will determine how many points they can issue to you (the number of points they can issue is listed in the locate assurer section). Once you've met up you can show your ID and you will need to fill out a CAP form which the person assuring your details must retain for verification reasons.")?></p>
-<p><b><?=sprintf(_("For information about the TTP-assisted-assurance program please read %s"),"<a href='//wiki.cacert.org/TTP/TTPuser'>https://wiki.cacert.org/TTP/TTPuser</a>","<a href='//wiki.cacert.org/TTP/TTPAL'>https://wiki.cacert.org/TTP/TTPAL</a>")?></b></p>
+<H3><?php echo _("My Account")?></H3>
+<p><?php echo _("Welcome to your account section of the website. Below is a description of the different sections and what they're for.")?></p>
+<H4><?php echo _("CAcert.org")?></H4>
+<p><?php echo _("If you would like to view news items or change languages you can click the logout or go home links. Go home doesn't log you out of the system, just returns you to the front of the website. Logout logs you out of the system.")?></p>
+<H4><?php echo _("My Details")?></H4>
+<p><?php echo _("In this section you will be able to edit your personal information (if you haven't been assured), update your pass phrase, and lost pass phrase questions. You will also be able to set your location for the Web of Trust, it also effects the email announcement settings which among other things can be set to notify you if you're within 200km of a planned assurance event. You'll also be able to set additional contact information when you become fully trusted, so others can contact you to meet up outside official events.")?></p>
+<h4><?php echo _("Email Accounts and Client Certificates")?></h4>
+<p><?php echo _("The email account section is for adding/updating/removing email accounts which can be used to issue client certificates against. The client certificate section steps you through generating a certificate signing request for one or more emails you've registered in the email account section.")?></p>
+<h4><?php echo _("Domains and Server Certificates.")?></h4>
+<p><?php echo _("Before you can start issuing certificates for your website, irc server, smtp server, pop3, imap etc you will need to add domains to your account under the domain menu. You can also remove domains from here as well. Once you've added a domain you are free then to go into the Server Certificate section and start pasting CSR into the website and have the website return you a valid certificate for up to 2 years if you have 50 trust points, or 6 months for no trust points.")?></p>
+<h4><?php echo _("Org Client and Server Certificates")?></h4>
+<p><?php echo _("Once you have verified your company you will see these menu options. They allow you to issue as many certificates as you like without proving individual email accounts as you like, further more you are able to get your company details on the certificate.")?></p>
+<h4><?php echo _("CAcert Web of Trust")?></h4>
+<p><?php echo _("The Web of Trust system CAcert uses is similar to that many involved with GPG/PGP use, they hold face to face meetings to verify each others photo identities match their GPG/PGP key information. CAcert differs however in that we have modified things to work within the PKI framework, for you to gain trust in the system you must first locate someone already trusted. The trust person depending how many people they've trusted or meet before will determine how many points they can issue to you (the number of points they can issue is listed in the locate assurer section). Once you've met up you can show your ID and you will need to fill out a CAP form which the person assuring your details must retain for verification reasons.")?></p>
+<p><b><?php echo sprintf(_("For information about the TTP-assisted-assurance program please read %s"),"<a href='//wiki.cacert.org/TTP/TTPuser'>https://wiki.cacert.org/TTP/TTPuser</a>","<a href='//wiki.cacert.org/TTP/TTPAL'>https://wiki.cacert.org/TTP/TTPAL</a>")?></b></p>
index f3cd1f2..b151e1c 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="2" class="title"><?=_("Add Email")?></td>
+    <td colspan="2" class="title"><?php echo _("Add Email")?></td>
   </tr>
 
   <tr>
-    <td class="DataTD" width="125"><?=_("Email Address")?>: </td>
-    <td class="DataTD" width="125"><input type="text" name="newemail" value="<?=array_key_exists('newemail',$_SESSION['profile'])?sanitizeHTML($_SESSION['profile']['newemail']):''?>"></td>
+    <td class="DataTD" width="125"><?php echo _("Email Address")?>: </td>
+    <td class="DataTD" width="125"><input type="text" name="newemail" value="<?php echo array_key_exists('newemail',$_SESSION['profile'])?sanitizeHTML($_SESSION['profile']['newemail']):''?>"></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("I own or am authorised to control this email address")?>"/></td>
+    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?php echo _("I own or am authorised to control this email address")?>"/></td>
   </tr>
 </table>     
-<input type="hidden" name="oldid" value="<?=$id?>">
-<input type="hidden" name="csrf" value="<?=make_csrf('addemail')?>" />
+<input type="hidden" name="oldid" value="<?php echo $id?>">
+<input type="hidden" name="csrf" value="<?php echo make_csrf('addemail')?>" />
 </form> 
-<p><?=_("Currently we only issue certificates for Punycode domains if the person requesting them has code signing attributes attached to their account, as these have potentially slightly higher security risk.")?></p>
+<p><?php echo _("Currently we only issue certificates for Punycode domains if the person requesting them has code signing attributes attached to their account, as these have potentially slightly higher security risk.")?></p>
index 17999a7..afa4f3c 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
 */
        include_once("../includes/shutdown.php");
 ?>
-<h3><?=_("CAcert Certificate Acceptable Use Policy")?></h3>
-<p><?=_("Once you decide to subscribe for an SSL Server Certificate you will need to complete this agreement. Please read it carefully. Your Certificate Request can only be processed with your acceptance and understanding of this agreement.")?></p>
+<h3><?php echo _("CAcert Certificate Acceptable Use Policy")?></h3>
+<p><?php echo _("Once you decide to subscribe for an SSL Server Certificate you will need to complete this agreement. Please read it carefully. Your Certificate Request can only be processed with your acceptance and understanding of this agreement.")?></p>
 
-<p><?=_("I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors.")?></p>
+<p><?php echo _("I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors.")?></p>
 
-<p><?=_("CAcert Inc.'s public certification services are governed by a CPS as amended from time to time which is incorporated into this Agreement by reference. The Subscriber will use the SSL Server Certificate in accordance with CAcert Inc.'s CPS and supporting documentation published at")?> <a href="http://www.cacert.org/policy/">http://www.cacert.org/policy/</a></p>
+<p><?php echo _("CAcert Inc.'s public certification services are governed by a CPS as amended from time to time which is incorporated into this Agreement by reference. The Subscriber will use the SSL Server Certificate in accordance with CAcert Inc.'s CPS and supporting documentation published at")?> <a href="http://www.cacert.org/policy/">http://www.cacert.org/policy/</a></p>
 
-<p><?=_("If the Subscriber's name and/or domain name registration change the subscriber will immediately inform CAcert Inc. who shall revoke the digital certificate. When the Digital Certificate expires or is revoked the company will permanently remove the certificate from the server on which it is installed and will not use it for any purpose thereafter. The person responsible for key management and security is fully authorized to install and utilize the certificate to represent this organization's electronic presence.")?></p>
+<p><?php echo _("If the Subscriber's name and/or domain name registration change the subscriber will immediately inform CAcert Inc. who shall revoke the digital certificate. When the Digital Certificate expires or is revoked the company will permanently remove the certificate from the server on which it is installed and will not use it for any purpose thereafter. The person responsible for key management and security is fully authorized to install and utilize the certificate to represent this organization's electronic presence.")?></p>
 
-<p><b>*** <?=_("Please note: All information on your certificate will be removed except the CommonName and SubjectAltName field, this is because it's an automated service and cannot automatically verify other details on your certificates are valid or not.")?> ***</b></p>
-<p><?=_("If you are a valid organisation and would like the organisation name in the certificates you can apply for an organisation assurance. Contact us via support@cacert.org for more information.")?></p>
+<p><b>*** <?php echo _("Please note: All information on your certificate will be removed except the CommonName and SubjectAltName field, this is because it's an automated service and cannot automatically verify other details on your certificates are valid or not.")?> ***</b></p>
+<p><?php echo _("If you are a valid organisation and would like the organisation name in the certificates you can apply for an organisation assurance. Contact us via support@cacert.org for more information.")?></p>
 
 <form method="post" action="account.php">
-<p><label for="description"><?=_("Optional comment, only used in the certificate overview")?></label><br />
+<p><label for="description"><?php echo _("Optional comment, only used in the certificate overview")?></label><br />
        <input type="text" id="description" name="description" maxlength="80" size="80" />
 </p>
-<p><label for="CSR"><?=_("Paste your CSR (Certificate Signing Request) below...")?></label><br />
+<p><label for="CSR"><?php echo _("Paste your CSR (Certificate Signing Request) below...")?></label><br />
        <textarea id="CSR" name="CSR" cols="80" rows="15"></textarea>
 </p>
 
 <fieldset>
 <legend>
        <input type="checkbox" id="expertbox" onchange="showExpert(this.checked)" style="display:none" />
-       <label for="expertbox"><?=_("Advanced Options")?></label>
+       <label for="expertbox"><?php echo _("Advanced Options")?></label>
 </legend>
 <div id="advanced_options">
 
-<? if($_SESSION['profile']['points'] >= 50) { ?>
+<?php if($_SESSION['profile']['points'] >= 50) { ?>
 <ul class="no_indent">
        <li>
                <input type="radio" id="root1" name="rootcert" value="1" />
-               <label for="root1"><?=_("Sign by class 1 root certificate")?></label>
+               <label for="root1"><?php echo _("Sign by class 1 root certificate")?></label>
        </li>
        <li>
                <input type="radio" id="root2" name="rootcert" value="2" checked="checked" />
-               <label for="root2"><?=_("Sign by class 3 root certificate")?></label>
+               <label for="root2"><?php echo _("Sign by class 3 root certificate")?></label>
        </li>
 </ul>
-<p><?=_("Please note: The class 3 root certificate needs to be setup in your webserver as a chained certificate, while slightly more complicated to setup, this root certificate is more likely to be trusted by more people.")?></p>
-<? } ?>
+<p><?php echo _("Please note: The class 3 root certificate needs to be setup in your webserver as a chained certificate, while slightly more complicated to setup, this root certificate is more likely to be trusted by more people.")?></p>
+<?php } ?>
 
-<p class="attach_ul"><?=_("Hash algorithm used when signing the certificate:")?></p>
+<p class="attach_ul"><?php echo _("Hash algorithm used when signing the certificate:")?></p>
 <ul class="no_indent">
-<?
-foreach (HashAlgorithms::getInfo() as $algorithm => $display_info) {
+<?php foreach (HashAlgorithms::getInfo() as $algorithm => $display_info) {
 ?>
        <li>
-               <input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(HashAlgorithms::$default === $algorithm)?'checked="checked"':''?> />
-               <label for="hash_alg_<?=$algorithm?>"><?=$display_info['name']?><?=$display_info['info']?' - '.$display_info['info']:''?></label>
+               <input type="radio" id="hash_alg_<?php echo $algorithm?>" name="hash_alg" value="<?php echo $algorithm?>" <?php echo (HashAlgorithms::$default === $algorithm)?'checked="checked"':''?> />
+               <label for="hash_alg_<?php echo $algorithm?>"><?php echo $display_info['name']?><?php echo $display_info['info']?' - '.$display_info['info']:''?></label>
        </li>
-<?
-}
+<?php }
 ?>
 </ul>
 
 </div>
 </fieldset>
 
-<p><input type="checkbox" id="CCA" name="CCA" /> <label for="CCA"><strong><?=sprintf(_("I accept the CAcert Community Agreement (%s)."),"<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>")?></strong><br />
-  <?=_("Please note: You need to accept the CCA to proceed.")?></label></p>
-<input type="submit" name="process" value="<?=_("Submit")?>" />
-<input type="hidden" name="oldid" value="<?=$id?>" />
+<p><input type="checkbox" id="CCA" name="CCA" /> <label for="CCA"><strong><?php echo sprintf(_("I accept the CAcert Community Agreement (%s)."),"<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>")?></strong><br />
+  <?php echo _("Please note: You need to accept the CCA to proceed.")?></label></p>
+<input type="submit" name="process" value="<?php echo _("Submit")?>" />
+<input type="hidden" name="oldid" value="<?php echo $id?>" />
 </form>
 
 
index 5f94122..fbcc201 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
 */ ?>
 
 <p>
-<?=_("Please make sure the following details are correct before proceeding ".
+<?php echo _("Please make sure the following details are correct before proceeding ".
                "any further.")?>
 </p>
 
-<p><?
-if (is_array($_SESSION['_config']['rows'])) {
+<p><?php if (is_array($_SESSION['_config']['rows'])) {
        foreach ($_SESSION['_config']['rows'] as $row) {
                echo _("CommonName"), ": $row<br>\n";
        }
@@ -36,12 +35,11 @@ if (is_array($_SESSION['_config']['altrows'])) {
 ?></p>
 
 <p>
-<?=_("No additional information will be included on certificates because it ".
+<?php echo _("No additional information will be included on certificates because it ".
                "can not be automatically checked by the system.")?>
 </p>
 
-<p><?
-if (array_key_exists('rejected',$_SESSION['_config']) &&
+<p><?php if (array_key_exists('rejected',$_SESSION['_config']) &&
                is_array($_SESSION['_config']['rejected'])) {
        echo _("The following hostnames were rejected because the system couldn't ".
                        "link them to your account, if they are valid please verify the ".
@@ -54,22 +52,19 @@ if (array_key_exists('rejected',$_SESSION['_config']) &&
 }
 ?></p>
 
-<?
-if (is_array($_SESSION['_config']['rows']) ||
+<?php if (is_array($_SESSION['_config']['rows']) ||
                is_array($_SESSION['_config']['altrows'])) {
        ?>
        <form method="post" action="account.php">
                <p>
-                       <input type="submit" name="process" value="<?=_("Submit")?>">
-                       <input type="hidden" name="oldid" value="<?=$id?>">
+                       <input type="submit" name="process" value="<?php echo _("Submit")?>">
+                       <input type="hidden" name="oldid" value="<?php echo $id?>">
                </p>
        </form>
-       <?
-} else {
+       <?php } else {
        ?>
        <p>
-               <b><?=_("Unable to continue as no valid commonNames or ".
+               <b><?php echo _("Unable to continue as no valid commonNames or ".
                                "subjectAltNames were present on your certificate request.")?></b>
        </p>
-       <?
-}
+       <?php }
index f4428aa..3a04e45 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */ ?>
-<? $viewall=0; if(array_key_exists('viewall',$_REQUEST)) $viewall=intval($_REQUEST['viewall']); ?>
+<?php $viewall=0; if(array_key_exists('viewall',$_REQUEST)) $viewall=intval($_REQUEST['viewall']); ?>
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="8" class="title"><?=_("Domain Certificates")?> - <a href="account.php?id=12&amp;viewall=<?=intval(!$viewall)?>"><?=$viewall?_("Hide old certificates"):_("View all certificates")?></a></td>
+    <td colspan="8" class="title"><?php echo _("Domain Certificates")?> - <a href="account.php?id=12&amp;viewall=<?php echo intval(!$viewall)?>"><?php echo $viewall?_("Hide old certificates"):_("View all certificates")?></a></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Renew/Revoke/Delete")?></td>
-    <td class="DataTD"><?=_("Status")?></td>
-    <td class="DataTD"><?=_("CommonName")?></td>
-    <td class="DataTD"><?=_("SerialNumber")?></td>
-    <td class="DataTD"><?=_("Revoked")?></td>
-    <td class="DataTD"><?=_("Expires")?></td>
-    <td colspan="2" class="DataTD"><?=_("Comment *")?></td>
+    <td class="DataTD"><?php echo _("Renew/Revoke/Delete")?></td>
+    <td class="DataTD"><?php echo _("Status")?></td>
+    <td class="DataTD"><?php echo _("CommonName")?></td>
+    <td class="DataTD"><?php echo _("SerialNumber")?></td>
+    <td class="DataTD"><?php echo _("Revoked")?></td>
+    <td class="DataTD"><?php echo _("Expires")?></td>
+    <td colspan="2" class="DataTD"><?php echo _("Comment *")?></td>
   </tr>
-<?
-       $query = "select UNIX_TIMESTAMP(`domaincerts`.`created`) as `created`,
+<?php  $query = "select UNIX_TIMESTAMP(`domaincerts`.`created`) as `created`,
                        UNIX_TIMESTAMP(`domaincerts`.`expire`) - UNIX_TIMESTAMP() as `timeleft`,
                        UNIX_TIMESTAMP(`domaincerts`.`expire`) as `expired`,
                        `domaincerts`.`expire`,
@@ -54,9 +53,9 @@
        {
 ?>
   <tr>
-    <td colspan="8" class="DataTD"><?=_("No certificates are currently listed.")?></td>
+    <td colspan="8" class="DataTD"><?php echo _("No certificates are currently listed.")?></td>
   </tr>
-<? } else {
+<?php } else {
        while($row = mysql_fetch_assoc($res))
        {
                if($row['timeleft'] > 0)
                        $row['revoke'] = _("Not Revoked");
 ?>
   <tr>
-<? if($verified != _("Pending") && $verified != _("Revoked")) { ?>
-    <td class="DataTD"><input type="checkbox" name="revokeid[]" value="<?=intval($row['id'])?>"/></td>
-<? } else if($verified != _("Revoked")) { ?>
-    <td class="DataTD"><input type="checkbox" name="delid[]" value="<?=intval($row['id'])?>"/></td>
-<? } else { ?>
+<?php if($verified != _("Pending") && $verified != _("Revoked")) { ?>
+    <td class="DataTD"><input type="checkbox" name="revokeid[]" value="<?php echo intval($row['id'])?>"/></td>
+<?php } else if($verified != _("Revoked")) { ?>
+    <td class="DataTD"><input type="checkbox" name="delid[]" value="<?php echo intval($row['id'])?>"/></td>
+<?php } else { ?>
     <td class="DataTD">&nbsp;</td>
-<? } ?>
-    <td class="DataTD"><?=$verified?></td>
-    <td class="DataTD"><a href="account.php?id=15&amp;cert=<?=intval($row['id'])?>"><?=htmlspecialchars($row['CN'])?></a></td>
-    <td class="DataTD"><?=$row['serial']?></td>
-    <td class="DataTD"><?=$row['revoke']?></td>
-    <td class="DataTD"><?=$row['expire']?></td>
-    <td class="DataTD"><input name="comment_<?=intval($row['id'])?>" type="text" value="<?=htmlspecialchars($row['description'])?>" /></td>
-    <td class="DataTD"><input type="checkbox" name="check_comment_<?=intval($row['id'])?>" /></td>
+<?php } ?>
+    <td class="DataTD"><?php echo $verified?></td>
+    <td class="DataTD"><a href="account.php?id=15&amp;cert=<?php echo intval($row['id'])?>"><?php echo htmlspecialchars($row['CN'])?></a></td>
+    <td class="DataTD"><?php echo $row['serial']?></td>
+    <td class="DataTD"><?php echo $row['revoke']?></td>
+    <td class="DataTD"><?php echo $row['expire']?></td>
+    <td class="DataTD"><input name="comment_<?php echo intval($row['id'])?>" type="text" value="<?php echo htmlspecialchars($row['description'])?>" /></td>
+    <td class="DataTD"><input type="checkbox" name="check_comment_<?php echo intval($row['id'])?>" /></td>
   </tr>
-<? } ?>
+<?php } ?>
   <tr>
     <td class="DataTD" colspan="8">
-      <a href="account.php?id=12&amp;viewall=<?=intval(!$viewall)?>"><b><?=$viewall?_("Hide old certificates"):_("View all certificates")?></b></a>
+      <a href="account.php?id=12&amp;viewall=<?php echo intval(!$viewall)?>"><b><?php echo $viewall?_("Hide old certificates"):_("View all certificates")?></b></a>
     </td>
   </tr>
   <tr>
     <td class="DataTD" colspan="8">
-      <?=_('* Comment is NOT included in the certificate as it is intended for your personal reference only. To change the comment tick the checkbox and hit "Change Settings".')?>
+      <?php echo _('* Comment is NOT included in the certificate as it is intended for your personal reference only. To change the comment tick the checkbox and hit "Change Settings".')?>
     </td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="6"><input type="submit" name="renew" value="<?=_("Renew")?>"/>&#160;&#160;&#160;&#160;
-           <input type="submit" name="revoke" value="<?=_("Revoke/Delete")?>"></td>
-       <td class="DataTD" colspan="2"><input type="submit" name="change" value="<?=_("Change settings")?>"/> </td>
+    <td class="DataTD" colspan="6"><input type="submit" name="renew" value="<?php echo _("Renew")?>"/>&#160;&#160;&#160;&#160;
+           <input type="submit" name="revoke" value="<?php echo _("Revoke/Delete")?>"></td>
+       <td class="DataTD" colspan="2"><input type="submit" name="change" value="<?php echo _("Change settings")?>"/> </td>
   </tr>
-<? } ?>
+<?php } ?>
   <tr>
-    <td class="DataTD" colspan="8"><?=_("From here you can delete pending requests, or revoke valid certificates.")?></td>
+    <td class="DataTD" colspan="8"><?php echo _("From here you can delete pending requests, or revoke valid certificates.")?></td>
   </tr>
 </table>
-<input type="hidden" name="oldid" value="<?=intval($id)?>"/>
-<input type="hidden" name="csrf" value="<?=make_csrf('srvcerchange')?>"/>
+<input type="hidden" name="oldid" value="<?php echo intval($id)?>"/>
+<input type="hidden" name="csrf" value="<?php echo make_csrf('srvcerchange')?>"/>
 </form>
index ea28c0e..2bedd43 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
@@ -15,8 +15,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */ ?>
-<?
-  $query = "select * from `users` where `id`='".intval($_SESSION['profile']['id'])."' and `users`.`deleted`=0";
+<?php   $query = "select * from `users` where `id`='".intval($_SESSION['profile']['id'])."' and `users`.`deleted`=0";
   $res = mysql_query($query);
   $user = mysql_fetch_assoc($res);
 
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="400">
   <tr>
-    <td colspan="2" class="title"><?=_("My Details")?></td>
+    <td colspan="2" class="title"><?php echo _("My Details")?></td>
   </tr>
-<? if($_SESSION['profile']['points'] == 0) { ?>
+<?php if($_SESSION['profile']['points'] == 0) { ?>
   <tr>
-    <td class="DataTD" width="125"><?=_("First Name")?>: </td>
-    <td class="DataTD" width="125"><input type="text" name="fname" value="<?=sanitizeHTML($user['fname'])?>"></td>
+    <td class="DataTD" width="125"><?php echo _("First Name")?>: </td>
+    <td class="DataTD" width="125"><input type="text" name="fname" value="<?php echo sanitizeHTML($user['fname'])?>"></td>
   </tr>
   <tr>
-    <td class="DataTD" valign="top"><?=_("Middle Name(s)")?><br>
-      (<?=_("optional")?>)
+    <td class="DataTD" valign="top"><?php echo _("Middle Name(s)")?><br>
+      (<?php echo _("optional")?>)
     </td>
-    <td class="DataTD"><input type="text" name="mname" value="<?=sanitizeHTML($user['mname'])?>"></td>
+    <td class="DataTD"><input type="text" name="mname" value="<?php echo sanitizeHTML($user['mname'])?>"></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Last Name")?>: </td>
-    <td class="DataTD"><input type="text" name="lname" value="<?=sanitizeHTML($user['lname'])?>"></td>
+    <td class="DataTD"><?php echo _("Last Name")?>: </td>
+    <td class="DataTD"><input type="text" name="lname" value="<?php echo sanitizeHTML($user['lname'])?>"></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Suffix")?><br>
-      (<?=_("optional")?>)</td>
-    <td class="DataTD"><input type="text" name="suffix" value="<?=sanitizeHTML($user['suffix'])?>"></td>
+    <td class="DataTD"><?php echo _("Suffix")?><br>
+      (<?php echo _("optional")?>)</td>
+    <td class="DataTD"><input type="text" name="suffix" value="<?php echo sanitizeHTML($user['suffix'])?>"></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Date of Birth")?><br>
-           (<?=_("dd/mm/yyyy")?>)</td>
+    <td class="DataTD"><?php echo _("Date of Birth")?><br>
+           (<?php echo _("dd/mm/yyyy")?>)</td>
     <td class="DataTD"><nobr><select name="day">
-<?
-  for($i = 1; $i <= 31; $i++)
+<?php   for($i = 1; $i <= 31; $i++)
   {
     echo "<option";
     if($day == $i)
@@ -84,8 +82,7 @@
 ?>
     </select>
     <select name="month">
-<?
-  for($i = 1; $i <= 12; $i++)
+<?php   for($i = 1; $i <= 12; $i++)
   {
     echo "<option value='$i'";
     if($month == $i)
   }
 ?>
     </select>
-    <input type="text" name="year" value="<?=$year?>" size="4"></nobr>
+    <input type="text" name="year" value="<?php echo $year?>" size="4"></nobr>
     </td>
   </tr>
-<? } else { ?>
+<?php } else { ?>
   <tr>
-    <td class="DataTD" width="125"><?=_("First Name")?>: </td>
-    <td class="DataTD" width="125"><?=sanitizeHTML($user['fname'])?></td>
+    <td class="DataTD" width="125"><?php echo _("First Name")?>: </td>
+    <td class="DataTD" width="125"><?php echo sanitizeHTML($user['fname'])?></td>
   </tr>
   <tr>
-    <td class="DataTD" valign="top"><?=_("Middle Name(s)")?><br>
-      (<?=_("optional")?>)
+    <td class="DataTD" valign="top"><?php echo _("Middle Name(s)")?><br>
+      (<?php echo _("optional")?>)
     </td>
-    <td class="DataTD"><?=sanitizeHTML($user['mname'])?></td>
+    <td class="DataTD"><?php echo sanitizeHTML($user['mname'])?></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Last Name")?>: </td>
-    <td class="DataTD"><?=sanitizeHTML($user['lname'])?></td>
+    <td class="DataTD"><?php echo _("Last Name")?>: </td>
+    <td class="DataTD"><?php echo sanitizeHTML($user['lname'])?></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Suffix")?><br>
-      (<?=_("optional")?>)</td>
-    <td class="DataTD"><?=sanitizeHTML($user['suffix'])?></td>
+    <td class="DataTD"><?php echo _("Suffix")?><br>
+      (<?php echo _("optional")?>)</td>
+    <td class="DataTD"><?php echo sanitizeHTML($user['suffix'])?></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Date of Birth")?><br>
-      (<?=_("dd/mm/yyyy")?>)</td>
-    <td class="DataTD"><?=$day?> <?=ucwords(recode("utf-8..html", strftime("%B", mktime(0,0,0,$month,1,1))))?> <?=$year?></td>
+    <td class="DataTD"><?php echo _("Date of Birth")?><br>
+      (<?php echo _("dd/mm/yyyy")?>)</td>
+    <td class="DataTD"><?php echo $day?> <?php echo ucwords(recode("utf-8..html", strftime("%B", mktime(0,0,0,$month,1,1))))?> <?php echo $year?></td>
   </tr>
-<? } ?>
+<?php } ?>
   <tr>
-    <td colspan="2" class="title"><a href="account.php?id=59&amp;oldid=13&amp;userid=<?=intval($_SESSION['profile']['id'])?>"><?=_('Show account history')?></a></td>
+    <td colspan="2" class="title"><a href="account.php?id=59&amp;oldid=13&amp;userid=<?php echo intval($_SESSION['profile']['id'])?>"><?php echo _('Show account history')?></a></td>
   </tr>
   <tr>
-    <td colspan="2" class="title"><a href="account.php?id=13&amp;showdetails=<?=intval(!$showdetails)?>"><?=_("View secret question & answers")?></a></td>
+    <td colspan="2" class="title"><a href="account.php?id=13&amp;showdetails=<?php echo intval(!$showdetails)?>"><?php echo _("View secret question & answers")?></a></td>
   </tr>
-  <? if($showdetails){ ?>
+  <?php if($showdetails){ ?>
   <tr>
-    <td class="DataTD" colspan="2"><?=_("Lost Pass Phrase Questions")?></td>
+    <td class="DataTD" colspan="2"><?php echo _("Lost Pass Phrase Questions")?></td>
   </tr>
   <tr>
-    <td class="DataTD">1)&nbsp;<input type="text" name="Q1" size="15" value="<?=sanitizeHTML($user['Q1'])?>"></td>
-    <td class="DataTD"><input type="text" name="A1" value="<?=sanitizeHTML($user['A1'])?>"></td>
+    <td class="DataTD">1)&nbsp;<input type="text" name="Q1" size="15" value="<?php echo sanitizeHTML($user['Q1'])?>"></td>
+    <td class="DataTD"><input type="text" name="A1" value="<?php echo sanitizeHTML($user['A1'])?>"></td>
   </tr>
   <tr>
-    <td class="DataTD">2)&nbsp;<input type="text" name="Q2" size="15" value="<?=sanitizeHTML($user['Q2'])?>"></td>
-    <td class="DataTD"><input type="text" name="A2" value="<?=sanitizeHTML($user['A2'])?>"></td>
+    <td class="DataTD">2)&nbsp;<input type="text" name="Q2" size="15" value="<?php echo sanitizeHTML($user['Q2'])?>"></td>
+    <td class="DataTD"><input type="text" name="A2" value="<?php echo sanitizeHTML($user['A2'])?>"></td>
   </tr>
   <tr>
-    <td class="DataTD">3)&nbsp;<input type="text" name="Q3" size="15" value="<?=sanitizeHTML($user['Q3'])?>"></td>
-    <td class="DataTD"><input type="text" name="A3" value="<?=sanitizeHTML($user['A3'])?>"></td>
+    <td class="DataTD">3)&nbsp;<input type="text" name="Q3" size="15" value="<?php echo sanitizeHTML($user['Q3'])?>"></td>
+    <td class="DataTD"><input type="text" name="A3" value="<?php echo sanitizeHTML($user['A3'])?>"></td>
   </tr>
   <tr>
-    <td class="DataTD">4)&nbsp;<input type="text" name="Q4" size="15" value="<?=sanitizeHTML($user['Q4'])?>"></td>
-    <td class="DataTD"><input type="text" name="A4" value="<?=sanitizeHTML($user['A4'])?>"></td>
+    <td class="DataTD">4)&nbsp;<input type="text" name="Q4" size="15" value="<?php echo sanitizeHTML($user['Q4'])?>"></td>
+    <td class="DataTD"><input type="text" name="A4" value="<?php echo sanitizeHTML($user['A4'])?>"></td>
   </tr>
   <tr>
-    <td class="DataTD">5)&nbsp;<input type="text" name="Q5" size="15" value="<?=sanitizeHTML($user['Q5'])?>"></td>
-    <td class="DataTD"><input type="text" name="A5" value="<?=sanitizeHTML($user['A5'])?>"></td>
+    <td class="DataTD">5)&nbsp;<input type="text" name="Q5" size="15" value="<?php echo sanitizeHTML($user['Q5'])?>"></td>
+    <td class="DataTD"><input type="text" name="A5" value="<?php echo sanitizeHTML($user['A5'])?>"></td>
   </tr>
   <tr>
   <input type="hidden" name="showdetails" value="1" />
-  <? } ?>
-    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Update")?>"></td>
+  <?php } ?>
+    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?php echo _("Update")?>"></td>
   </tr>
 </table>
-<input type="hidden" name="csrf" value="<?=make_csrf('perschange')?>" />
-<input type="hidden" name="oldid" value="<?=intval($id)?>">
+<input type="hidden" name="csrf" value="<?php echo make_csrf('perschange')?>" />
+<input type="hidden" name="oldid" value="<?php echo intval($id)?>">
 </form>
index 29aeb21..a2968a3 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */ ?>
-<?
-       if (intval($_REQUEST['force']) === 1)
+<?php  if (intval($_REQUEST['force']) === 1)
 {
 ?>
 
 <p style="border:dotted 1px #900;padding:0.3em;bold;color:#ffffff;background-color:#ff0000;"><strong><center>
-<?=_("For your own security you should change your pass phrase immediately!"); ?></center></strong>
+<?php echo _("For your own security you should change your pass phrase immediately!"); ?></center></strong>
 </p>
 <?}?>
 
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="400">
   <tr>
-    <td colspan="2" class="title"><?=_("Change Pass Phrase")?></td>
+    <td colspan="2" class="title"><?php echo _("Change Pass Phrase")?></td>
   </tr>
-<? if($_SESSION['_config']['hostname'] != $_SESSION['_config']['securehostname']) { ?>
+<?php if($_SESSION['_config']['hostname'] != $_SESSION['_config']['securehostname']) { ?>
   <tr>
-    <td class="DataTD"><?=_("Old Pass Phrase")?>: </td>
+    <td class="DataTD"><?php echo _("Old Pass Phrase")?>: </td>
     <td class="DataTD"><input type="password" name="oldpassword"></td>
   </tr>
-<? } ?>
+<?php } ?>
   <tr>
-    <td class="DataTD"><?=_("New Pass Phrase")?><font color="red">*</font>: </td>
+    <td class="DataTD"><?php echo _("New Pass Phrase")?><font color="red">*</font>: </td>
     <td class="DataTD"><input type="password" name="pword1"></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Pass Phrase Again")?><font color="red">*</font>: </td>
+    <td class="DataTD"><?php echo _("Pass Phrase Again")?><font color="red">*</font>: </td>
     <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 (all white spaces at the beginning and end are removed).")?></td>
+    <td class="DataTD" colspan="2"><font color="red">*</font><?php echo _("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>
+    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?php echo _("Update Pass Phrase")?>"></td>
   </tr>
 </table>
-<input type="hidden" name="csrf" value="<?=make_csrf('pwchange')?>" />
-<input type="hidden" name="oldid" value="<?=$id?>">
+<input type="hidden" name="csrf" value="<?php echo make_csrf('pwchange')?>" />
+<input type="hidden" name="oldid" value="<?php echo $id?>">
 </form>
index 405cb44..5ee4cc2 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
@@ -15,8 +15,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */ ?>
-<?
-       $certid = 0; if(array_key_exists('cert',$_REQUEST)) $certid=intval($_REQUEST['cert']);
+<?php  $certid = 0; if(array_key_exists('cert',$_REQUEST)) $certid=intval($_REQUEST['cert']);
 
        $query = "select * from `domaincerts`,`domains` where `domaincerts`.`id`='$certid' and
                        `domains`.`memid`='".intval($_SESSION['profile']['id'])."' and
@@ -32,7 +31,7 @@
         $crtname=escapeshellarg($row['crt_name']);
        $cert = shell_exec("/usr/bin/openssl x509 -in $crtname");
 ?>
-<h3><?=_("Below is your Server Certificate")?></h3>
+<h3><?php echo _("Below is your Server Certificate")?></h3>
 <pre>
-<?=$cert?>
+<?php echo $cert?>
 </pre>
index 829897f..5e04d7b 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="2" class="title"><?=_("New Client Certificate")?></td>
+    <td colspan="2" class="title"><?php echo _("New Client Certificate")?></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Add")?></td>
-    <td class="DataTD"><?=_("Address")?></td>
-<?
-if (array_key_exists('emails',$_SESSION['_config']) && is_array($_SESSION['_config']['emails'])) {
+    <td class="DataTD"><?php echo _("Add")?></td>
+    <td class="DataTD"><?php echo _("Address")?></td>
+<?php if (array_key_exists('emails',$_SESSION['_config']) && is_array($_SESSION['_config']['emails'])) {
        $i = 1;
        foreach($_SESSION['_config']['emails'] as $val) {
 ?>
   <tr>
-    <td class="DataTD"><label for="email<?=$i?>"><?=_("Email")?></label></td>
-    <td class="DataTD"><input type="text" id="email<?=$i?>" name="emails[]" value="<?=$val?>"/></td>
+    <td class="DataTD"><label for="email<?php echo $i?>"><?php echo _("Email")?></label></td>
+    <td class="DataTD"><input type="text" id="email<?php echo $i?>" name="emails[]" value="<?php echo $val?>"/></td>
   </tr>
-<?
-               $i++;
+<?php          $i++;
        }
 } ?>
   <tr>
-    <td class="DataTD"><label for="email0"><?=_("Email")?></td>
+    <td class="DataTD"><label for="email0"><?php echo _("Email")?></td>
     <td class="DataTD"><input type="text" id="email0" name="emails[]"/></td>
   </tr>
   <tr>
-    <td class="DataTD"><label for="name"><?=_("Name")?></label></td>
-    <td class="DataTD"><input type="text" id="name" name="name" value="<?=array_key_exists('name',$_SESSION['_config'])?($_SESSION['_config']['name']):''?>"/></td>
+    <td class="DataTD"><label for="name"><?php echo _("Name")?></label></td>
+    <td class="DataTD"><input type="text" id="name" name="name" value="<?php echo array_key_exists('name',$_SESSION['_config'])?($_SESSION['_config']['name']):''?>"/></td>
   </tr>
   <tr>
-    <td class="DataTD"><label for="OU"><?=_("Department")?></label></td>
-    <td class="DataTD"><input type="text" id="OU" name="OU" value="<?=array_key_exists('OU',$_SESSION['_config'])?(sanitizeHTML($_SESSION['_config']['OU'])):''?>"/></td>
+    <td class="DataTD"><label for="OU"><?php echo _("Department")?></label></td>
+    <td class="DataTD"><input type="text" id="OU" name="OU" value="<?php echo array_key_exists('OU',$_SESSION['_config'])?(sanitizeHTML($_SESSION['_config']['OU'])):''?>"/></td>
   </tr>
 
   <tr name="expertoff" style="display:none">
@@ -56,55 +54,53 @@ if (array_key_exists('emails',$_SESSION['_config']) && is_array($_SESSION['_conf
       <input type="checkbox" id="expertbox" name="expertbox" onchange="showExpert(this.checked)" />
     </td>
     <td class="DataTD">
-      <label for="expertbox"><?=_("Show advanced options")?></label>
+      <label for="expertbox"><?php echo _("Show advanced options")?></label>
     </td>
   </tr>
   <tr name="expert">
     <td class="DataTD" colspan="2" align="left">
-        <input type="radio" id="root1" name="rootcert" value="1" /> <label for="root1"><?=_("Sign by class 1 root certificate")?></label><br />
-        <input type="radio" id="root2" name="rootcert" value="2" checked="checked" /> <label for="root2"><?=_("Sign by class 3 root certificate")?></label><br />
-        <?=str_replace("\n", "<br>\n", wordwrap(_("Please note: If you use a certificate signed by the class 3 root, the class 3 root certificate needs to be imported into your email program as well as the class 1 root certificate so your email program can build a full trust path chain."), 60))?>
+        <input type="radio" id="root1" name="rootcert" value="1" /> <label for="root1"><?php echo _("Sign by class 1 root certificate")?></label><br />
+        <input type="radio" id="root2" name="rootcert" value="2" checked="checked" /> <label for="root2"><?php echo _("Sign by class 3 root certificate")?></label><br />
+        <?php echo str_replace("\n", "<br>\n", wordwrap(_("Please note: If you use a certificate signed by the class 3 root, the class 3 root certificate needs to be imported into your email program as well as the class 1 root certificate so your email program can build a full trust path chain."), 60))?>
     </td>
   </tr>
 
   <tr name="expert">
     <td class="DataTD" colspan="2" align="left">
-      <?=_("Hash algorithm used when signing the certificate:")?><br />
-      <?
-      foreach (HashAlgorithms::getInfo() as $algorithm => $display_info) {
+      <?php echo _("Hash algorithm used when signing the certificate:")?><br />
+      <?php       foreach (HashAlgorithms::getInfo() as $algorithm => $display_info) {
       ?>
-        <input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(HashAlgorithms::$default === $algorithm)?'checked="checked"':''?> />
-        <label for="hash_alg_<?=$algorithm?>"><?=$display_info['name']?><?=$display_info['info']?' - '.$display_info['info']:''?></label><br />
-      <?
-      }
+        <input type="radio" id="hash_alg_<?php echo $algorithm?>" name="hash_alg" value="<?php echo $algorithm?>" <?php echo (HashAlgorithms::$default === $algorithm)?'checked="checked"':''?> />
+        <label for="hash_alg_<?php echo $algorithm?>"><?php echo $display_info['name']?><?php echo $display_info['info']?' - '.$display_info['info']:''?></label><br />
+      <?php       }
       ?>
     </td>
   </tr>
 
-<? if($_SESSION['profile']['codesign'] && $_SESSION['profile']['points'] >= 100) { ?>
+<?php if($_SESSION['profile']['codesign'] && $_SESSION['profile']['points'] >= 100) { ?>
   <tr name="expert">
     <td class="DataTD" colspan="2" align="left">
       <input type="checkbox" id="codesign" name="codesign" value="1" />
-      <label for="codesign"><?=_("Code Signing")?></label>
+      <label for="codesign"><?php echo _("Code Signing")?></label>
     </td>
   </tr>
-<? } ?>
+<?php } ?>
   <tr>
     <td class="DataTD" colspan="2" align="left">
-      <label for="description"><?=_("Optional comment, only used in the certificate overview")?></label><br />
+      <label for="description"><?php echo _("Optional comment, only used in the certificate overview")?></label><br />
       <input type="text" id="description" name="description" maxlength="80" size="80" />
     </td>
   </tr>
   <tr>
     <td class="DataTD" colspan="2">
-      <input type="submit" name="add_email" value="<?=_("Add Another Email Address")?>">
-      <input type="submit" name="process" value="<?=_("Next")?>" />
+      <input type="submit" name="add_email" value="<?php echo _("Add Another Email Address")?>">
+      <input type="submit" name="process" value="<?php echo _("Next")?>" />
     </td>
   </tr>
 </table>
-<input type="hidden" name="oldid" value="<?=$id?>">
+<input type="hidden" name="oldid" value="<?php echo $id?>">
 </form>
-<?=_("Please fill out the form, when all data is entered and you click \"Next\" you can add either a CSR (certificate signing request) or create a new key with your browser. Even in the case that a CSR is given the data from this form will be used for the certificate. Only the public key information of the CSR will be copied.")?>
+<?php echo _("Please fill out the form, when all data is entered and you click \"Next\" you can add either a CSR (certificate signing request) or create a new key with your browser. Even in the case that a CSR is given the data from this form will be used for the certificate. Only the public key information of the CSR will be copied.")?>
 
 <script language="javascript">
 function showExpert(a)
index 0d5c2c7..c1e6263 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
 require_once($_SESSION['_config']['filepath'].'/includes/keygen.php');
 
 ?>
- -- <?=_("or")?> --
+ -- <?php echo _("or")?> --
                <form method="post" action="account.php">
                        <input type="hidden" name="keytype" value="VI">
                        <textarea rows="20" cols="40" name="CSR"></textarea>
-                       <input type="submit" name="submit" value="<?=_("Submit CSR")?>">
+                       <input type="submit" name="submit" value="<?php echo _("Submit CSR")?>">
                        <input type="hidden" name="oldid" value="17">
                </form>
index ca0a3c8..f9d8eb6 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
@@ -23,17 +23,17 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="9" class="title"><?=_("Organisation Client Certificates")?> </td>
+    <td colspan="9" class="title"><?php echo _("Organisation Client Certificates")?> </td>
   </tr>
   <tr>
-    <td colspan="9" class="title"><?=_("Filter/Sorting")?></td>
+    <td colspan="9" class="title"><?php echo _("Filter/Sorting")?></td>
   </tr>
     <tr>
-      <td class="DataTD"><?=_("Organisation")?></td>
+      <td class="DataTD"><?php echo _("Organisation")?></td>
       <td colspan="8" class="DataTD" >
         <select name="orgfilterid">
-           <?=sprintf('<option value="%d"%s>%s</option>',0, 0 == $orgfilterid ? " selected" : "" ,_("All")) ?>
-<?  $query = "select `orginfo`.`O`, `orginfo`.`id`
+           <?php echo sprintf('<option value="%d"%s>%s</option>',0, 0 == $orgfilterid ? " selected" : "" ,_("All")) ?>
+<?php  $query = "select `orginfo`.`O`, `orginfo`.`id`
       from `org`, `orginfo`
       where `org`.`memid`='".intval($_SESSION['profile']['id'])."' and `orginfo`.`id` = `org`.`orgid`
       ORDER BY `orginfo`.`O` ";
@@ -47,34 +47,33 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c
     </td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Sorting")?></td>
+    <td class="DataTD"><?php echo _("Sorting")?></td>
     <td colspan="8" class="DataTD" >
       <select name="sorting">
-        <?=sprintf('<option value="%d"%s>%s</option>',0, 0 == $sorting ? " selected" : "" ,_("expire date (desc)")) ?>
-        <?=sprintf('<option value="%d"%s>%s</option>',1, 1 == $sorting ? " selected" : "" ,_("OU, expire date (desc)")) ?>
-        <?=sprintf('<option value="%d"%s>%s</option>',2, 2 == $sorting ? " selected" : "" ,_("Common name, expire date (desc)")) ?>
+        <?php echo sprintf('<option value="%d"%s>%s</option>',0, 0 == $sorting ? " selected" : "" ,_("expire date (desc)")) ?>
+        <?php echo sprintf('<option value="%d"%s>%s</option>',1, 1 == $sorting ? " selected" : "" ,_("OU, expire date (desc)")) ?>
+        <?php echo sprintf('<option value="%d"%s>%s</option>',2, 2 == $sorting ? " selected" : "" ,_("Common name, expire date (desc)")) ?>
       </select>
     </td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Certificate status")?></td>
+    <td class="DataTD"><?php echo _("Certificate status")?></td>
     <td colspan="8" class="DataTD" >
       <select name="status">
-        <?=sprintf('<option value="%d"%s>%s</option>',0, 0 == $status ? " selected" : "" ,_("Current/Active")) ?>
-        <?=sprintf('<option value="%d"%s>%s</option>',1, 1 == $status ? " selected" : "" ,_("All")) ?>
+        <?php echo sprintf('<option value="%d"%s>%s</option>',0, 0 == $status ? " selected" : "" ,_("Current/Active")) ?>
+        <?php echo sprintf('<option value="%d"%s>%s</option>',1, 1 == $status ? " selected" : "" ,_("All")) ?>
       </select>
     </td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="9"><input type="submit" name="reset" value="<?=_("Reset")?>" />&nbsp;&nbsp;&nbsp;&nbsp;
-      <input type="submit" name="filter" value="<?=_("Apply filter/sort")?>" /></td>
+    <td class="DataTD" colspan="9"><input type="submit" name="reset" value="<?php echo _("Reset")?>" />&nbsp;&nbsp;&nbsp;&nbsp;
+      <input type="submit" name="filter" value="<?php echo _("Apply filter/sort")?>" /></td>
   </tr>
   <tr>
     <td colspan="9" class="DataTD"> </td>
   </tr>
 
-<?
-  $query = "select UNIX_TIMESTAMP(`oemail`.`created`) as `created`,
+<?php   $query = "select UNIX_TIMESTAMP(`oemail`.`created`) as `created`,
       UNIX_TIMESTAMP(`oemail`.`expire`) - UNIX_TIMESTAMP() as `timeleft`,
       UNIX_TIMESTAMP(`oemail`.`expire`) as `expired`,
       `oemail`.`expire` as `expires`, `oemail`.`revoked` as `revoke`,
@@ -112,9 +111,9 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c
 ?>
 
   <tr>
-    <td colspan="9" class="DataTD"><?=_("No client certificates are currently listed.")?></td>
+    <td colspan="9" class="DataTD"><?php echo _("No client certificates are currently listed.")?></td>
   </tr>
-<? } else {
+<?php } else {
   $orgname='';
   while($row = mysql_fetch_assoc($res))
   {
@@ -124,20 +123,19 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c
     <td colspan="9" class="title"></td>
   </tr>
   <tr>
-    <td colspan="9" class="title"><? printf(_("Certificates for %s"), $orgname)?> </td>
+    <td colspan="9" class="title"><?php printf(_("Certificates for %s"), $orgname)?> </td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("OU/Department")?></td>
-    <td class="DataTD"><?=_("Renew/Revoke/Delete")?></td>
-    <td class="DataTD"><?=_("Status")?></td>
-    <td class="DataTD"><?=_("CommonName")?></td>
-    <td class="DataTD"><?=_("SerialNumber")?></td>
-    <td class="DataTD"><?=_("Revoked")?></td>
-    <td class="DataTD"><?=_("Expires")?></td>
-    <td colspan="2" class="DataTD"><?=_("Comment *")?></td>
+    <td class="DataTD"><?php echo _("OU/Department")?></td>
+    <td class="DataTD"><?php echo _("Renew/Revoke/Delete")?></td>
+    <td class="DataTD"><?php echo _("Status")?></td>
+    <td class="DataTD"><?php echo _("CommonName")?></td>
+    <td class="DataTD"><?php echo _("SerialNumber")?></td>
+    <td class="DataTD"><?php echo _("Revoked")?></td>
+    <td class="DataTD"><?php echo _("Expires")?></td>
+    <td colspan="2" class="DataTD"><?php echo _("Comment *")?></td>
   </tr>
-      <?
-    }
+      <?php     }
     if($row['timeleft'] > 0)
       $verified = _("Valid");
     if($row['timeleft'] < 0)
@@ -150,42 +148,42 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c
       $row['revoke'] = _("Not Revoked");
 ?>
   <tr>
-    <td class="DataTD"><?=$row['ou']?></td>
-    <? if($verified == _("Valid") || $verified == _("Expired")) { ?>
-    <td class="DataTD"><input type="checkbox" name="revokeid[]" value="<?=$row['id']?>"></td>
-    <td class="DataTD"><?=$verified?></td>
-    <td class="DataTD"><a href="account.php?id=19&cert=<?=$row['id']?>"><?=$row['CN']?></a></td>
-<? } else if($verified == _("Pending")) { ?>
-    <td class="DataTD"><input type="checkbox" name="delid[]" value="<?=$row['id']?>"></td>
-    <td class="DataTD"><?=$verified?></td>
-    <td class="DataTD"><?=$row['CN']?></td>
-<? } else { ?>
+    <td class="DataTD"><?php echo $row['ou']?></td>
+    <?php if($verified == _("Valid") || $verified == _("Expired")) { ?>
+    <td class="DataTD"><input type="checkbox" name="revokeid[]" value="<?php echo $row['id']?>"></td>
+    <td class="DataTD"><?php echo $verified?></td>
+    <td class="DataTD"><a href="account.php?id=19&cert=<?php echo $row['id']?>"><?php echo $row['CN']?></a></td>
+<?php } else if($verified == _("Pending")) { ?>
+    <td class="DataTD"><input type="checkbox" name="delid[]" value="<?php echo $row['id']?>"></td>
+    <td class="DataTD"><?php echo $verified?></td>
+    <td class="DataTD"><?php echo $row['CN']?></td>
+<?php } else { ?>
     <td class="DataTD">&nbsp;</td>
-    <td class="DataTD"><?=$verified?></td>
-    <td class="DataTD"><a href="account.php?id=19&cert=<?=$row['id']?>"><?=$row['CN']?></a></td>
-<? } ?>
-    <td class="DataTD"><?=$row['serial']?></td>
-    <td class="DataTD"><?=$row['revoke']?></td>
-    <td class="DataTD"><?=$row['expires']?></td>
-    <td class="DataTD"><input name="comment_<?=$row['id']?>" type="text" value="<?=htmlspecialchars($row['description'])?>" /></td>
-    <td class="DataTD"><input type="checkbox" name="check_comment_<?=$row['id']?>" /></td>
+    <td class="DataTD"><?php echo $verified?></td>
+    <td class="DataTD"><a href="account.php?id=19&cert=<?php echo $row['id']?>"><?php echo $row['CN']?></a></td>
+<?php } ?>
+    <td class="DataTD"><?php echo $row['serial']?></td>
+    <td class="DataTD"><?php echo $row['revoke']?></td>
+    <td class="DataTD"><?php echo $row['expires']?></td>
+    <td class="DataTD"><input name="comment_<?php echo $row['id']?>" type="text" value="<?php echo htmlspecialchars($row['description'])?>" /></td>
+    <td class="DataTD"><input type="checkbox" name="check_comment_<?php echo $row['id']?>" /></td>
   </tr>
-<? } ?>
+<?php } ?>
   <tr>
     <td class="DataTD" colspan="9">
-      <?=_('* Comment is NOT included in the certificate as it is intended for your personal reference only. To change the comment tick the checkbox and hit "Change Settings".')?>
+      <?php echo _('* Comment is NOT included in the certificate as it is intended for your personal reference only. To change the comment tick the checkbox and hit "Change Settings".')?>
     </td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="6"><input type="submit" name="renew" value="<?=_("Renew")?>">&#160;&#160;&#160;&#160;
-          <input type="submit" name="revoke" value="<?=_("Revoke/Delete")?>"></td>
-    <td class="DataTD" colspan="2"><input type="submit" name="change" value="<?=_("Change settings")?>"> </td>
+    <td class="DataTD" colspan="6"><input type="submit" name="renew" value="<?php echo _("Renew")?>">&#160;&#160;&#160;&#160;
+          <input type="submit" name="revoke" value="<?php echo _("Revoke/Delete")?>"></td>
+    <td class="DataTD" colspan="2"><input type="submit" name="change" value="<?php echo _("Change settings")?>"> </td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="9"><?=_("From here you can delete pending requests, or revoke valid certificates.")?></td>
+    <td class="DataTD" colspan="9"><?php echo _("From here you can delete pending requests, or revoke valid certificates.")?></td>
   </tr>
-<? } ?>
+<?php } ?>
 </table>
-<input type="hidden" name="oldid" value="<?=$id?>">
-<input type="hidden" name="csrf" value="<?=make_csrf('clicerchange')?>" />
+<input type="hidden" name="oldid" value="<?php echo $id?>">
+<input type="hidden" name="csrf" value="<?php echo make_csrf('clicerchange')?>" />
 </form>
\ No newline at end of file
index d7259f3..fbf8227 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
@@ -15,8 +15,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */ ?>
-<?
-       $certid = 0; if(array_key_exists('cert',$_REQUEST)) $certid=intval($_REQUEST['cert']);
+<?php  $certid = 0; if(array_key_exists('cert',$_REQUEST)) $certid=intval($_REQUEST['cert']);
 
        $query = "select * from `orgemailcerts`,`org` where `orgemailcerts`.`id`='".intval($certid)."' and
                        `org`.`memid`='".intval($_SESSION['profile']['id'])."' and
        } else {
                showheader(_("My CAcert.org Account!"));
 ?>
-<h3><?=_("Installing your certificate")?></h3>
+<h3><?php echo _("Installing your certificate")?></h3>
 
-<p><?=_("Hit the 'Install your Certificate' button below to install the certificate into MS IE 5.x and above.")?>
+<p><?php echo _("Hit the 'Install your Certificate' button below to install the certificate into MS IE 5.x and above.")?>
 
 <OBJECT classid="clsid:127698e4-e730-4e5c-a2b1-21490a70c8a1" codebase="/xenroll.cab#Version=5,131,3659,0" id="cec">
-<?=_("You must enable ActiveX for this to work.")?>
+<?php echo _("You must enable ActiveX for this to work.")?>
 </OBJECT>
 <FORM >
-<INPUT TYPE=BUTTON NAME="CertInst" VALUE="<?=_("Install Your Certificate")?>">
+<INPUT TYPE=BUTTON NAME="CertInst" VALUE="<?php echo _("Install Your Certificate")?>">
 </FORM>
 
 </P>
@@ -75,8 +74,7 @@
 <SCRIPT LANGUAGE=VBS>
    Sub CertInst_OnClick
       certchain  = _
-<?
-       $lines = explode("\n", $cert);
+<?php  $lines = explode("\n", $cert);
        if(is_array($lines))
        foreach($lines as $line)
        {
       err.clear
       cec.acceptPKCS7(certchain)
       if err.number <> 0 then
-         errorMsg = "<?=_("Certificate installation failed!")?>" & chr(13) & chr(10) & _
+         errorMsg = "<?php echo _("Certificate installation failed!")?>" & chr(13) & chr(10) & _
                         "(Error code " & err.number & ")"
-         msgRes   = MsgBox(errorMsg, 0, "<?=_("Certificate Installation Error")?>")
+         msgRes   = MsgBox(errorMsg, 0, "<?php echo _("Certificate Installation Error")?>")
       else
-         okMsg    = "<?=_("Personal Certificate Installed.")?>" & chr(13) & chr(10) & _
+         okMsg    = "<?php echo _("Personal Certificate Installed.")?>" & chr(13) & chr(10) & _
                         "See Tools->Internet Options->Content->Certificates"
-         msgRes   = MsgBox(okMsg, 0, "<?=_("Certificate Installation Complete!")?>")
+         msgRes   = MsgBox(okMsg, 0, "<?php echo _("Certificate Installation Complete!")?>")
       end if
    End Sub
 </SCRIPT>
 
-<? 
+<?php
                showfooter();
                exit;
        }
index 36421f9..57f3392 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="4" class="title"><?=_("Email Accounts")?></td>
+    <td colspan="4" class="title"><?php echo _("Email Accounts")?></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Default")?></td>
-    <td class="DataTD"><?=_("Status")?></td>
-    <td class="DataTD"><?=_("Delete")?></td>
-    <td class="DataTD"><?=_("Address")?></td>
+    <td class="DataTD"><?php echo _("Default")?></td>
+    <td class="DataTD"><?php echo _("Status")?></td>
+    <td class="DataTD"><?php echo _("Delete")?></td>
+    <td class="DataTD"><?php echo _("Address")?></td>
 
-<?
-       $query = "select * from `email` where `memid`='".intval($_SESSION['profile']['id'])."' and `deleted`=0";
+<?php  $query = "select * from `email` where `memid`='".intval($_SESSION['profile']['id'])."' and `deleted`=0";
        $res = mysql_query($query);
        while($row = mysql_fetch_assoc($res))
        {
                        $verified = _("Unverified");
 ?>
   <tr>
-    <td class="DataTD"><? if($row['hash'] == "") { ?><input type="radio" name="emailid" value="<?=$row['id']?>"
-       <? if($row['email'] == $_SESSION['profile']['email']) echo " checked"; ?>><? } else { echo "&nbsp;"; } ?></td>
-    <td class="DataTD"><?=$verified?></td>
-<? if($row['email'] == $_SESSION['profile']['email']) { ?>
-    <td class="DataTD"><?=_("N/A")?></td>
-<? } else { ?>
-    <td class="DataTD"><input type="checkbox" name="delid[]" value="<?=$row['id']?>"></td>
-<? } ?>
-    <td class="DataTD"><?=sanitizeHTML($row['email'])?></td>
+    <td class="DataTD"><?php if($row['hash'] == "") { ?><input type="radio" name="emailid" value="<?php echo $row['id']?>"
+       <?php if($row['email'] == $_SESSION['profile']['email']) echo " checked"; ?>><?php } else { echo "&nbsp;"; } ?></td>
+    <td class="DataTD"><?php echo $verified?></td>
+<?php if($row['email'] == $_SESSION['profile']['email']) { ?>
+    <td class="DataTD"><?php echo _("N/A")?></td>
+<?php } else { ?>
+    <td class="DataTD"><input type="checkbox" name="delid[]" value="<?php echo $row['id']?>"></td>
+<?php } ?>
+    <td class="DataTD"><?php echo sanitizeHTML($row['email'])?></td>
   </tr>
-<? } ?>
+<?php } ?>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="makedefault" value="<?=_("Make Default")?>"></td>
-    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Delete")?>"></td>
+    <td class="DataTD" colspan="2"><input type="submit" name="makedefault" value="<?php echo _("Make Default")?>"></td>
+    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?php echo _("Delete")?>"></td>
   </tr>
 </table>
-<input type="hidden" name="oldid" value="<?=$id?>">
-<input type="hidden" name="csrf" value="<?=make_csrf('chgdef')?>" />
+<input type="hidden" name="oldid" value="<?php echo $id?>">
+<input type="hidden" name="csrf" value="<?php echo make_csrf('chgdef')?>" />
 </form>
 <p>
-<?=_("Please Note: You can not set an unverified account as a default account, and you can not remove a default account. To remove the default account you must set another verified account as the default.")?>
+<?php echo _("Please Note: You can not set an unverified account as a default account, and you can not remove a default account. To remove the default account you must set another verified account as the default.")?>
 </p>
index 89bbc30..42cfc42 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
 */
        include_once("../includes/shutdown.php");
 ?>
-<h3><?=_("CAcert Certificate Acceptable Use Policy")?></h3>
-<p><?=_("Once you decide to subscribe for an SSL Server Certificate you will need to complete this agreement. Please read it carefully. Your Certificate Request can only be processed with your acceptance and understanding of this agreement.")?></p>
+<h3><?php echo _("CAcert Certificate Acceptable Use Policy")?></h3>
+<p><?php echo _("Once you decide to subscribe for an SSL Server Certificate you will need to complete this agreement. Please read it carefully. Your Certificate Request can only be processed with your acceptance and understanding of this agreement.")?></p>
 
-<p><?=_("I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors.")?></p>
+<p><?php echo _("I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors.")?></p>
 
-<p><?=_("CAcert Inc.'s public certification services are governed by a CPS as amended from time to time which is incorporated into this Agreement by reference. The Subscriber will use the SSL Server Certificate in accordance with CAcert Inc.'s CPS and supporting documentation published at")?> <a href="http://www.cacert.org/policy/">http://www.cacert.org/policy/</a></p>
+<p><?php echo _("CAcert Inc.'s public certification services are governed by a CPS as amended from time to time which is incorporated into this Agreement by reference. The Subscriber will use the SSL Server Certificate in accordance with CAcert Inc.'s CPS and supporting documentation published at")?> <a href="http://www.cacert.org/policy/">http://www.cacert.org/policy/</a></p>
 
-<p><?=_("If the Subscriber's name and/or domain name registration change the subscriber will immediately inform CAcert Inc. who shall revoke the digital certificate. When the Digital Certificate expires or is revoked the company will permanently remove the certificate from the server on which it is installed and will not use it for any purpose thereafter. The person responsible for key management and security is fully authorized to install and utilize the certificate to represent this organization's electronic presence.")?></p>
+<p><?php echo _("If the Subscriber's name and/or domain name registration change the subscriber will immediately inform CAcert Inc. who shall revoke the digital certificate. When the Digital Certificate expires or is revoked the company will permanently remove the certificate from the server on which it is installed and will not use it for any purpose thereafter. The person responsible for key management and security is fully authorized to install and utilize the certificate to represent this organization's electronic presence.")?></p>
 
 <form method="post" action="account.php">
-<p><label for="description"><?=_("Optional comment, only used in the certificate overview")?></label><br />
+<p><label for="description"><?php echo _("Optional comment, only used in the certificate overview")?></label><br />
        <input type="text" id="description" name="description" maxlength="80" size="80" />
 </p>
-<p><label for="CSR"><?=_("Paste your CSR (Certificate Signing Request) below...")?></label><br />
+<p><label for="CSR"><?php echo _("Paste your CSR (Certificate Signing Request) below...")?></label><br />
        <textarea id="CSR" name="CSR" cols="80" rows="15"></textarea>
 </p>
 
 <fieldset>
 <legend>
        <input type="checkbox" id="expertbox" onchange="showExpert(this.checked)" style="display:none" />
-       <label for="expertbox"><?=_("Advanced Options")?></label>
+       <label for="expertbox"><?php echo _("Advanced Options")?></label>
 </legend>
 <div id="advanced_options">
 <ul class="no_indent">
        <li>
                <input type="radio" id="root1" name="rootcert" value="1" />
-               <label for="root1"><?=_("Sign by class 1 root certificate")?></label>
+               <label for="root1"><?php echo _("Sign by class 1 root certificate")?></label>
        </li>
        <li>
                <input type="radio" id="root2" name="rootcert" value="2" checked="checked" />
-               <label for="root2"><?=_("Sign by class 3 root certificate")?></label>
+               <label for="root2"><?php echo _("Sign by class 3 root certificate")?></label>
        </li>
 </ul>
-<p><?=_("Please note: The class 3 root certificate needs to be setup in your webserver as a chained certificate, while slightly more complicated to setup, this root certificate is more likely to be trusted by more people.")?></p>
+<p><?php echo _("Please note: The class 3 root certificate needs to be setup in your webserver as a chained certificate, while slightly more complicated to setup, this root certificate is more likely to be trusted by more people.")?></p>
 
-<p class="attach_ul"><?=_("Hash algorithm used when signing the certificate:")?></p>
+<p class="attach_ul"><?php echo _("Hash algorithm used when signing the certificate:")?></p>
 <ul class="no_indent">
-<?
-foreach (HashAlgorithms::getInfo() as $algorithm => $display_info) {
+<?php foreach (HashAlgorithms::getInfo() as $algorithm => $display_info) {
 ?>
        <li>
-               <input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(HashAlgorithms::$default === $algorithm)?'checked="checked"':''?> />
-               <label for="hash_alg_<?=$algorithm?>"><?=$display_info['name']?><?=$display_info['info']?' - '.$display_info['info']:''?></label>
+               <input type="radio" id="hash_alg_<?php echo $algorithm?>" name="hash_alg" value="<?php echo $algorithm?>" <?php echo (HashAlgorithms::$default === $algorithm)?'checked="checked"':''?> />
+               <label for="hash_alg_<?php echo $algorithm?>"><?php echo $display_info['name']?><?php echo $display_info['info']?' - '.$display_info['info']:''?></label>
        </li>
-<?
-}
+<?php }
 ?>
 </ul>
 
 </div>
 </fieldset>
 
-<input type="submit" name="process" value="<?=_("Submit")?>" />
-<input type="hidden" name="oldid" value="<?=$id?>" />
+<input type="submit" name="process" value="<?php echo _("Submit")?>" />
+<input type="hidden" name="oldid" value="<?php echo $id?>" />
 </form>
 
 <script language="javascript">
index c5832b9..eed4b6a 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
@@ -23,12 +23,11 @@ if ($org['id'] <= 0) {
 ?>
 
 <p>
-<?=_("Please make sure the following details are correct before proceeding ".
+<?php echo _("Please make sure the following details are correct before proceeding ".
                "any further.")?>
 </p>
 
-<p><?
-if (is_array($_SESSION['_config']['rows'])) {
+<p><?php if (is_array($_SESSION['_config']['rows'])) {
        foreach ($_SESSION['_config']['rows'] as $row) {
                echo _("CommonName"), ": $row<br>\n";
        }
@@ -49,22 +48,20 @@ echo _("Country"), ": {$org['C']}<br>\n";
 
 <form method="post" action="account.php">
        <p>
-               <input type="submit" name="process" value="<?=_("Submit")?>">
-               <input type="hidden" name="oldid" value="<?=$id?>">
+               <input type="submit" name="process" value="<?php echo _("Submit")?>">
+               <input type="hidden" name="oldid" value="<?php echo $id?>">
        </p>
 
-       <?
-       if ($_SESSION['profile']['admin'] == 1) {
+       <?php   if ($_SESSION['profile']['admin'] == 1) {
                ?>
                <p>
                        <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
                        <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
                        <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
                        <input type="checkbox" name="ocspcert" value="OCSPCert"/>
-                               <?=_("OCSP certificate")?>
+                               <?php echo _("OCSP certificate")?>
                </p>
-               <?
-       }
+               <?php   }
        ?>
 
 </form>
index 7b7db2d..2768bf0 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
@@ -23,17 +23,17 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="8" class="title"><?=_("Organisation Server Certificates")?> </td>
+    <td colspan="8" class="title"><?php echo _("Organisation Server Certificates")?> </td>
   </tr>
   <tr>
-    <td colspan="8" class="title"><?=_("Filter/Sorting")?></td>
+    <td colspan="8" class="title"><?php echo _("Filter/Sorting")?></td>
   </tr>
     <tr>
-      <td class="DataTD"><?=_("Organisation")?></td>
+      <td class="DataTD"><?php echo _("Organisation")?></td>
       <td colspan="7" class="DataTD" >
         <select name="dorgfilterid">
-          <?=sprintf('<option value="%d"%s>%s</option>',0, 0 == $orgfilterid ? " selected" : "" ,_("All")) ?>
-<?  $query = "select `orginfo`.`O`, `orginfo`.`id`
+          <?php echo sprintf('<option value="%d"%s>%s</option>',0, 0 == $orgfilterid ? " selected" : "" ,_("All")) ?>
+<?php  $query = "select `orginfo`.`O`, `orginfo`.`id`
       from `org`, `orginfo`
       where `org`.`memid`='".intval($_SESSION['profile']['id'])."' and `orginfo`.`id` = `org`.`orgid`
       ORDER BY `orginfo`.`O` ";
@@ -47,34 +47,33 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_
     </td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Sorting")?></td>
+    <td class="DataTD"><?php echo _("Sorting")?></td>
     <td colspan="7" class="DataTD" >
       <select name="dsorting">
-        <?=sprintf('<option value="%d"%s>%s</option>',0, 0 == $sorting ? " selected" : "" ,_("expire date (desc)")) ?>
-        <?=sprintf('<option value="%d"%s>%s</option>',1, 1 == $sorting ? " selected" : "" ,_("Common name, expire date (desc)")) ?>
+        <?php echo sprintf('<option value="%d"%s>%s</option>',0, 0 == $sorting ? " selected" : "" ,_("expire date (desc)")) ?>
+        <?php echo sprintf('<option value="%d"%s>%s</option>',1, 1 == $sorting ? " selected" : "" ,_("Common name, expire date (desc)")) ?>
       </select>
     </td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Certificate status")?></td>
+    <td class="DataTD"><?php echo _("Certificate status")?></td>
     <td colspan="7" class="DataTD" >
       <select name="dstatus">
-        <?=sprintf('<option value="%d"%s>%s</option>',0, 0 == $status ? " selected" : "" ,_("Current/Active")) ?>
-        <?=sprintf('<option value="%d"%s>%s</option>',1, 1 == $status ? " selected" : "" ,_("All")) ?>
+        <?php echo sprintf('<option value="%d"%s>%s</option>',0, 0 == $status ? " selected" : "" ,_("Current/Active")) ?>
+        <?php echo sprintf('<option value="%d"%s>%s</option>',1, 1 == $status ? " selected" : "" ,_("All")) ?>
       </select>
     </td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="8"><input type="submit" name="reset" value="<?=_("Reset")?>" />&nbsp;&nbsp;&nbsp;&nbsp;
-      <input type="submit" name="filter" value="<?=_("Apply filter/sort")?>" /></td>
+    <td class="DataTD" colspan="8"><input type="submit" name="reset" value="<?php echo _("Reset")?>" />&nbsp;&nbsp;&nbsp;&nbsp;
+      <input type="submit" name="filter" value="<?php echo _("Apply filter/sort")?>" /></td>
   </tr>
   <tr>
     <td colspan="9" class="DataTD"> </td>
   </tr>
 
 
-<?
-  $query = "select UNIX_TIMESTAMP(`orgdomaincerts`.`created`) as `created`,
+<?php   $query = "select UNIX_TIMESTAMP(`orgdomaincerts`.`created`) as `created`,
       UNIX_TIMESTAMP(`orgdomaincerts`.`expire`) - UNIX_TIMESTAMP() as `timeleft`,
       UNIX_TIMESTAMP(`orgdomaincerts`.`expire`) as `expired`,
       `orgdomaincerts`.`expire` as `expires`, `revoked` as `revoke`,
@@ -114,9 +113,9 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_
   {
 ?>
   <tr>
-    <td colspan="8" class="DataTD"><?=_("No domains are currently listed.")?></td>
+    <td colspan="8" class="DataTD"><?php echo _("No domains are currently listed.")?></td>
   </tr>
-<? } else {
+<?php } else {
   $orgname='';
   while($row = mysql_fetch_assoc($res))
   {
@@ -126,19 +125,18 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_
     <td colspan="9" class="title"></td>
   </tr>
   <tr>
-    <td colspan="9" class="title"><? printf(_("Certificates for %s"), $orgname)?> </td>
+    <td colspan="9" class="title"><?php printf(_("Certificates for %s"), $orgname)?> </td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Renew/Revoke/Delete")?></td>
-    <td class="DataTD"><?=_("Status")?></td>
-    <td class="DataTD"><?=_("CommonName")?></td>
-    <td class="DataTD"><?=_("SerialNumber")?></td>
-    <td class="DataTD"><?=_("Revoked")?></td>
-    <td class="DataTD"><?=_("Expires")?></td>
-    <td colspan="2" class="DataTD"><?=_("Comment *")?></td>
+    <td class="DataTD"><?php echo _("Renew/Revoke/Delete")?></td>
+    <td class="DataTD"><?php echo _("Status")?></td>
+    <td class="DataTD"><?php echo _("CommonName")?></td>
+    <td class="DataTD"><?php echo _("SerialNumber")?></td>
+    <td class="DataTD"><?php echo _("Revoked")?></td>
+    <td class="DataTD"><?php echo _("Expires")?></td>
+    <td colspan="2" class="DataTD"><?php echo _("Comment *")?></td>
   </tr>
-      <?
-    }
+      <?php     }
     if($row['timeleft'] > 0)
       $verified = _("Valid");
     if($row['timeleft'] < 0)
@@ -151,38 +149,38 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_
                         $row['revoke'] = _("Not Revoked");
 ?>
   <tr>
-<? if($verified == _("Valid") || $verified == _("Expired")) { ?>
-    <td class="DataTD"><input type="checkbox" name="revokeid[]" value="<?=$row['id']?>"></td>
-<? } else if($verified == _("Pending")) { ?>
-    <td class="DataTD"><input type="checkbox" name="delid[]" value="<?=$row['id']?>"></td>
-<? } else { ?>
+<?php if($verified == _("Valid") || $verified == _("Expired")) { ?>
+    <td class="DataTD"><input type="checkbox" name="revokeid[]" value="<?php echo $row['id']?>"></td>
+<?php } else if($verified == _("Pending")) { ?>
+    <td class="DataTD"><input type="checkbox" name="delid[]" value="<?php echo $row['id']?>"></td>
+<?php } else { ?>
     <td class="DataTD">&nbsp;</td>
-<? } ?>
-    <td class="DataTD"><?=$verified?></td>
-    <td class="DataTD"><a href="account.php?id=23&cert=<?=$row['id']?>"><?=$row['CN']?></a></td>
-    <td class="DataTD"><?=$row['serial']?></td>
-    <td class="DataTD"><?=$row['revoke']?></td>
-    <td class="DataTD"><?=$row['expires']?></td>
-    <td class="DataTD"><input name="comment_<?=$row['id']?>" type="text" value="<?=htmlspecialchars($row['description'])?>" /></td>
-    <td class="DataTD"><input type="checkbox" name="check_comment_<?=$row['id']?>" /></td>
+<?php } ?>
+    <td class="DataTD"><?php echo $verified?></td>
+    <td class="DataTD"><a href="account.php?id=23&cert=<?php echo $row['id']?>"><?php echo $row['CN']?></a></td>
+    <td class="DataTD"><?php echo $row['serial']?></td>
+    <td class="DataTD"><?php echo $row['revoke']?></td>
+    <td class="DataTD"><?php echo $row['expires']?></td>
+    <td class="DataTD"><input name="comment_<?php echo $row['id']?>" type="text" value="<?php echo htmlspecialchars($row['description'])?>" /></td>
+    <td class="DataTD"><input type="checkbox" name="check_comment_<?php echo $row['id']?>" /></td>
   </tr>
-<? } ?>
+<?php } ?>
   <tr>
     <td class="DataTD" colspan="8">
-      <?=_('* Comment is NOT included in the certificate as it is intended for your personal reference only. To change the comment tick the checkbox and hit "Change Settings".')?>
+      <?php echo _('* Comment is NOT included in the certificate as it is intended for your personal reference only. To change the comment tick the checkbox and hit "Change Settings".')?>
     </td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="6"><input type="submit" name="renew" value="<?=_("Renew")?>" />&#160;&#160;&#160;&#160;
-      <input type="submit" name="revoke" value="<?=_("Revoke/Delete")?>" /></td>
-    <td class="DataTD" colspan="2"><input type="submit" name="change" value="<?=_("Change settings")?>" /> </td>
+    <td class="DataTD" colspan="6"><input type="submit" name="renew" value="<?php echo _("Renew")?>" />&#160;&#160;&#160;&#160;
+      <input type="submit" name="revoke" value="<?php echo _("Revoke/Delete")?>" /></td>
+    <td class="DataTD" colspan="2"><input type="submit" name="change" value="<?php echo _("Change settings")?>" /> </td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="9"><?=_("From here you can delete pending requests, or revoke valid certificates.")?></td>
+    <td class="DataTD" colspan="9"><?php echo _("From here you can delete pending requests, or revoke valid certificates.")?></td>
   </tr>
-<? } ?>
+<?php } ?>
 </table>
-<input type="hidden" name="oldid" value="<?=$id?>" />
-<input type="hidden" name="csrf" value="<?=make_csrf('orgsrvcerchange')?>" />
+<input type="hidden" name="oldid" value="<?php echo $id?>" />
+<input type="hidden" name="csrf" value="<?php echo make_csrf('orgsrvcerchange')?>" />
 </form>
 
index 4255b47..8575cf3 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
@@ -15,8 +15,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */ ?>
-<?
-       $certid = 0; if(array_key_exists('cert',$_REQUEST)) $certid=intval($_REQUEST['cert']);
+<?php  $certid = 0; if(array_key_exists('cert',$_REQUEST)) $certid=intval($_REQUEST['cert']);
 
        $query = "select * from `orgdomaincerts`,`org` where `orgdomaincerts`.`id`='$certid' and
                        `org`.`memid`='".intval($_SESSION['profile']['id'])."' and
@@ -32,7 +31,7 @@
         $crtname=escapeshellarg($row['crt_name']);
        $cert = shell_exec("/usr/bin/openssl x509 -in $crtname");
 ?>
-<h3><?=_("Below is your Server Certificate")?></h3>
+<h3><?php echo _("Below is your Server Certificate")?></h3>
 <pre>
-<?=$cert?>
+<?php echo $cert?>
 </pre>
index 14a47c0..fe5b485 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
@@ -15,8 +15,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */ ?>
-<?
-       // Reset session variables regarding Org's, present empty form  
+<?php  // Reset session variables regarding Org's, present empty form
        if (array_key_exists('O',$_SESSION['_config']))         $_SESSION['_config']['O'] = "";
   if (array_key_exists('contact',$_SESSION['_config']))   $_SESSION['_config']['contact'] = "";        
   if (array_key_exists('L',$_SESSION['_config']))         $_SESSION['_config']['L'] = "";
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="2" class="title"><?=_("New Organisation")?></td>
+    <td colspan="2" class="title"><?php echo _("New Organisation")?></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Organisation Name")?>:</td>
+    <td class="DataTD"><?php echo _("Organisation Name")?>:</td>
     <td class="DataTD"><input type="text" name="O" value="" maxlength="50" size="90"></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Contact Email")?>:</td>
+    <td class="DataTD"><?php echo _("Contact Email")?>:</td>
     <td class="DataTD"><input type="text" name="contact" value="" size="90"></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Town/Suburb")?>:</td>
+    <td class="DataTD"><?php echo _("Town/Suburb")?>:</td>
     <td class="DataTD"><input type="text" name="L" value="" size="90"></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("State/Province")?>:</td>
+    <td class="DataTD"><?php echo _("State/Province")?>:</td>
     <td class="DataTD"><input type="text" name="ST" value="" size="90"></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Country")?>:</td>
+    <td class="DataTD"><?php echo _("Country")?>:</td>
     <td class="DataTD"><input type="text" name="C" value="" size="5">
         <?php printf(_('(2 letter %s ISO code %s )'),
             '<a href="http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm">',
     </td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Comments")?>:</td>
+    <td class="DataTD"><?php echo _("Comments")?>:</td>
     <td class="DataTD"><textarea name="comments" cols="60" rows="10"></textarea></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Next")?>"></td>
+    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?php echo _("Next")?>"></td>
   </tr>
 </table>
-<input type="hidden" name="oldid" value="<?=$id?>">
+<input type="hidden" name="oldid" value="<?php echo $id?>">
 </form>
index a70f608..11cb2c8 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
 */ ?>
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="700">
   <tr>
-    <td colspan="5" class="title"><?=_("Organisations")?></td>
+    <td colspan="5" class="title"><?php echo _("Organisations")?></td>
   </tr>
 
 <tr>
-  <td colspan="5" class="title"><?=_("Order by:")?>
-    <a href="account.php?id=25"><?=_("Id")?></a> -
-    <a href="account.php?id=25&amp;ord=1"><?=_("Country")?></a> -
-    <a href="account.php?id=25&amp;ord=2"><?=_("Name")?></a>
+  <td colspan="5" class="title"><?php echo _("Order by:")?>
+    <a href="account.php?id=25"><?php echo _("Id")?></a> -
+    <a href="account.php?id=25&amp;ord=1"><?php echo _("Country")?></a> -
+    <a href="account.php?id=25&amp;ord=2"><?php echo _("Name")?></a>
   </td>
 </tr>
 
   <tr>
-    <td class="DataTD" width="350"><?=_("Organisation")?></td>
-    <td class="DataTD"><?=_("Domains")?></td>
-    <td class="DataTD"><?=_("Admins")?></td>
-    <td class="DataTD"><?=_("Edit")?></td>
-    <td class="DataTD"><?=_("Delete")?></td>
+    <td class="DataTD" width="350"><?php echo _("Organisation")?></td>
+    <td class="DataTD"><?php echo _("Domains")?></td>
+    <td class="DataTD"><?php echo _("Admins")?></td>
+    <td class="DataTD"><?php echo _("Edit")?></td>
+    <td class="DataTD"><?php echo _("Delete")?></td>
   </tr>
-<?
-       $order = 0;
+<?php  $order = 0;
        if (array_key_exists('ord',$_REQUEST)) {
                $order = intval($_REQUEST['ord']);
        }
                $domcount = mysql_num_rows($r2);
 ?>
   <tr>
-    <td class="DataTD"><?=htmlspecialchars($row['O'])?>, <?=htmlspecialchars($row['ST'])?> <?=htmlspecialchars($row['C'])?></td>
-    <td class="DataTD"><a href="account.php?id=26&amp;orgid=<?=intval($row['id'])?>"><?=_("Domains")?> (<?=$domcount?>)</a></td>
-    <td class="DataTD"><a href="account.php?id=32&amp;orgid=<?=$row['id']?>"><?=_("Admins")?> (<?=$admincount?>)</a></td>
-    <td class="DataTD"><a href="account.php?id=27&amp;orgid=<?=$row['id']?>"><?=_("Edit")?></a></td>
-    <td class="DataTD"><a href="account.php?id=31&amp;orgid=<?=$row['id']?>"><?=_("Delete")?></a></td>
-    <? if(array_key_exists('viewcomment',$_REQUEST) && $_REQUEST['viewcomment']!='') { ?>
-    <td class="DataTD"><?=sanitizeHTML($row['comments'])?></td>
-    <? } ?>
+    <td class="DataTD"><?php echo htmlspecialchars($row['O'])?>, <?php echo htmlspecialchars($row['ST'])?> <?php echo htmlspecialchars($row['C'])?></td>
+    <td class="DataTD"><a href="account.php?id=26&amp;orgid=<?php echo intval($row['id'])?>"><?php echo _("Domains")?> (<?php echo $domcount?>)</a></td>
+    <td class="DataTD"><a href="account.php?id=32&amp;orgid=<?php echo $row['id']?>"><?php echo _("Admins")?> (<?php echo $admincount?>)</a></td>
+    <td class="DataTD"><a href="account.php?id=27&amp;orgid=<?php echo $row['id']?>"><?php echo _("Edit")?></a></td>
+    <td class="DataTD"><a href="account.php?id=31&amp;orgid=<?php echo $row['id']?>"><?php echo _("Delete")?></a></td>
+    <?php if(array_key_exists('viewcomment',$_REQUEST) && $_REQUEST['viewcomment']!='') { ?>
+    <td class="DataTD"><?php echo sanitizeHTML($row['comments'])?></td>
+    <?php } ?>
   </tr>
-<? } ?>
+<?php } ?>
 </table>
index f8b195d..f684ed9 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */ ?>
-<?
-       $query = "select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'";
+<?php  $query = "select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'";
        $row = mysql_fetch_assoc(mysql_query($query));
 ?>
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="400">
   <tr>
-    <td colspan="3" class="title"><? printf(_("%s's Domains"), $row['O']); ?> (<a href="account.php?id=28&amp;orgid=<?=intval($row['id'])?>"><?=_("Add")?></a>)</td>
+    <td colspan="3" class="title"><?php printf(_("%s's Domains"), $row['O']); ?> (<a href="account.php?id=28&amp;orgid=<?php echo intval($row['id'])?>"><?php echo _("Add")?></a>)</td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Domain")?></td>
-    <td class="DataTD"><?=_("Edit")?></td>
-    <td class="DataTD"><?=_("Delete")?></td>
+    <td class="DataTD"><?php echo _("Domain")?></td>
+    <td class="DataTD"><?php echo _("Edit")?></td>
+    <td class="DataTD"><?php echo _("Delete")?></td>
   </tr>
-<?
-       $query = "select * from `orgdomains` where `orgid`='".intval($_REQUEST['orgid'])."'";
+<?php  $query = "select * from `orgdomains` where `orgid`='".intval($_REQUEST['orgid'])."'";
        $res = mysql_query($query);
        while($row = mysql_fetch_assoc($res))
        { ?>
   <tr>
-    <td class="DataTD"><?=sanitizeHTML($row['domain'])?></a></td>
-    <td class="DataTD"><a href="account.php?id=29&amp;orgid=<?=intval($row['orgid'])?>&amp;domid=<?=intval($row['id'])?>"><?=_("Edit")?></a></td>
-    <td class="DataTD"><a href="account.php?id=30&amp;orgid=<?=intval($row['orgid'])?>&amp;domid=<?=intval($row['id'])?>"><?=_("Delete")?></a></td>
+    <td class="DataTD"><?php echo sanitizeHTML($row['domain'])?></a></td>
+    <td class="DataTD"><a href="account.php?id=29&amp;orgid=<?php echo intval($row['orgid'])?>&amp;domid=<?php echo intval($row['id'])?>"><?php echo _("Edit")?></a></td>
+    <td class="DataTD"><a href="account.php?id=30&amp;orgid=<?php echo intval($row['orgid'])?>&amp;domid=<?php echo intval($row['id'])?>"><?php echo _("Delete")?></a></td>
   </tr>
-<? } ?>
+<?php } ?>
 </table>
index a1086d4..0950c70 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */ ?>
-<?
-       $row = mysql_fetch_assoc(mysql_query("select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'"));
+<?php  $row = mysql_fetch_assoc(mysql_query("select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'"));
 ?>
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="2" class="title"><?=_("Edit Organisation")?></td>
+    <td colspan="2" class="title"><?php echo _("Edit Organisation")?></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Organisation Name")?>:</td>
-    <td class="DataTD"><input type="text" name="O" value="<?=$row['O']?>" size="90"></td>
+    <td class="DataTD"><?php echo _("Organisation Name")?>:</td>
+    <td class="DataTD"><input type="text" name="O" value="<?php echo $row['O']?>" size="90"></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Contact Email")?>:</td>
-    <td class="DataTD"><input type="text" name="contact" value="<?=($row['contact'])?>" size="90"></td>
+    <td class="DataTD"><?php echo _("Contact Email")?>:</td>
+    <td class="DataTD"><input type="text" name="contact" value="<?php echo ($row['contact'])?>" size="90"></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Town/Suburb")?>:</td>
-    <td class="DataTD"><input type="text" name="L" value="<?=($row['L'])?>" size="90"></td>
+    <td class="DataTD"><?php echo _("Town/Suburb")?>:</td>
+    <td class="DataTD"><input type="text" name="L" value="<?php echo ($row['L'])?>" size="90"></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("State/Province")?>:</td>
-    <td class="DataTD"><input type="text" name="ST" value="<?=($row['ST'])?>" size="90"></td>
+    <td class="DataTD"><?php echo _("State/Province")?>:</td>
+    <td class="DataTD"><input type="text" name="ST" value="<?php echo ($row['ST'])?>" size="90"></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Country")?>:</td>
-    <td class="DataTD"><input type="text" name="C" value="<?=($row['C'])?>" size="5">
+    <td class="DataTD"><?php echo _("Country")?>:</td>
+    <td class="DataTD"><input type="text" name="C" value="<?php echo ($row['C'])?>" size="5">
         <?php printf(_('(2 letter %s ISO code %s )'),
             '<a href="http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm">',
             '</a>')?>
     </td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Comments")?>:</td>
-    <td class="DataTD"><textarea name="comments" cols=60 rows=10><?=($row['comments'])?></textarea></td>
+    <td class="DataTD"><?php echo _("Comments")?>:</td>
+    <td class="DataTD"><textarea name="comments" cols=60 rows=10><?php echo ($row['comments'])?></textarea></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Update")?>"></td>
+    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?php echo _("Update")?>"></td>
   </tr>
 </table>
-<input type="hidden" name="oldid" value="<?=intval($id)?>">
-<input type="hidden" name="orgid" value="<?=intval($_REQUEST['orgid'])?>">
-<input type="hidden" name="csrf" value="<?=make_csrf('orgdetchange')?>" />
+<input type="hidden" name="oldid" value="<?php echo intval($id)?>">
+<input type="hidden" name="orgid" value="<?php echo intval($_REQUEST['orgid'])?>">
+<input type="hidden" name="csrf" value="<?php echo make_csrf('orgdetchange')?>" />
 </form>
index 1212f9c..923a463 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */ ?>
-<?
-       $query = "select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'";
+<?php  $query = "select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'";
        $row = mysql_fetch_assoc(mysql_query($query));
 ?>
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="2" class="title"><? printf(_("New Domain for %s"), sanitizeHTML($row['O'])); ?></td>
+    <td colspan="2" class="title"><?php printf(_("New Domain for %s"), sanitizeHTML($row['O'])); ?></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Domain")?>:</td>
-    <td class="DataTD"><input type="text" name="domainname" value="<?=array_key_exists('domain',$_SESSION['_config'])?sanitizeHTML($_SESSION['_config']['domain']):""?>"></td>
+    <td class="DataTD"><?php echo _("Domain")?>:</td>
+    <td class="DataTD"><input type="text" name="domainname" value="<?php echo array_key_exists('domain',$_SESSION['_config'])?sanitizeHTML($_SESSION['_config']['domain']):""?>"></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Add")?>"></td>
+    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?php echo _("Add")?>"></td>
   </tr>
 </table>
-<input type="hidden" name="oldid" value="<?=intval($id)?>">
-<input type="hidden" name="orgid" value="<?=intval($_REQUEST['orgid'])?>">
+<input type="hidden" name="oldid" value="<?php echo intval($id)?>">
+<input type="hidden" name="orgid" value="<?php echo intval($_REQUEST['orgid'])?>">
 
 </form>
index 4229b3b..f7e7d80 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */ ?>
-<?
-       $query = "select * from `orgdomains` where `id`='".intval($_REQUEST['domid'])."'";
+<?php  $query = "select * from `orgdomains` where `id`='".intval($_REQUEST['domid'])."'";
        $row = mysql_fetch_assoc(mysql_query($query));
        $query = "select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'";
        $org = mysql_fetch_assoc(mysql_query($query));
 
        $_SESSION['_config']['domain'] = $row['domain'];
 ?>
-<h3><?=_("Warning!")?></h3>
-<p><?=_("Hitting update will also revoke all existing certificates issued under this domain")?></p>
+<h3><?php echo _("Warning!")?></h3>
+<p><?php echo _("Hitting update will also revoke all existing certificates issued under this domain")?></p>
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="2" class="title"><? printf(_("Update Domain for %s"), ($org['O'])); ?></td>
+    <td colspan="2" class="title"><?php printf(_("Update Domain for %s"), ($org['O'])); ?></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Domain")?>:</td>
-    <td class="DataTD"><input type="text" name="domainname" value="<?=sanitizeHTML($_SESSION['_config']['domain'])?>"></td>
+    <td class="DataTD"><?php echo _("Domain")?>:</td>
+    <td class="DataTD"><input type="text" name="domainname" value="<?php echo sanitizeHTML($_SESSION['_config']['domain'])?>"></td>
   </tr>
   <tr>
-    <td class="DataTD"><input type="submit" name="cancel" value="<?=_("Cancel")?>"></td>
-    <td class="DataTD"><input type="submit" name="process" value="<?=_("Update")?>"></td>
+    <td class="DataTD"><input type="submit" name="cancel" value="<?php echo _("Cancel")?>"></td>
+    <td class="DataTD"><input type="submit" name="process" value="<?php echo _("Update")?>"></td>
   </tr>
 </table>
-<input type="hidden" name="oldid" value="<?=intval($id)?>">
-<input type="hidden" name="orgid" value="<?=intval($_REQUEST['orgid'])?>">
-<input type="hidden" name="domid" value="<?=intval($_REQUEST['domid'])?>">
+<input type="hidden" name="oldid" value="<?php echo intval($id)?>">
+<input type="hidden" name="orgid" value="<?php echo intval($_REQUEST['orgid'])?>">
+<input type="hidden" name="domid" value="<?php echo intval($_REQUEST['domid'])?>">
 
 </form>
index cd62ce0..0447679 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
 */
        include_once("../includes/shutdown.php");
 ?>
-<h3><?=_("CAcert Certificate Acceptable Use Policy")?></h3>
-<p><?=_("Once you decide to subscribe for an SSL Server Certificate you will need to complete this agreement. Please read it carefully. Your Certificate Request can only be processed with your acceptance and understanding of this agreement.")?></p>
+<h3><?php echo _("CAcert Certificate Acceptable Use Policy")?></h3>
+<p><?php echo _("Once you decide to subscribe for an SSL Server Certificate you will need to complete this agreement. Please read it carefully. Your Certificate Request can only be processed with your acceptance and understanding of this agreement.")?></p>
 
-<p><?=_("I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors.")?></p>
+<p><?php echo _("I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors.")?></p>
 
-<p><?=_("CAcert Inc.'s public certification services are governed by a CPS as amended from time to time which is incorporated into this Agreement by reference. The Subscriber will use the SSL Server Certificate in accordance with CAcert Inc.'s CPS and supporting documentation published at")?> <a href="http://www.cacert.org/cps.php">http://www.cacert.org/cps.php</a></p>
+<p><?php echo _("CAcert Inc.'s public certification services are governed by a CPS as amended from time to time which is incorporated into this Agreement by reference. The Subscriber will use the SSL Server Certificate in accordance with CAcert Inc.'s CPS and supporting documentation published at")?> <a href="http://www.cacert.org/cps.php">http://www.cacert.org/cps.php</a></p>
 
-<p><?=_("If the Subscriber's name and/or domain name registration change the subscriber will immediately inform CAcert Inc. who shall revoke the digital certificate. When the Digital Certificate expires or is revoked the company will permanently remove the certificate from the server on which it is installed and will not use it for any purpose thereafter. The person responsible for key management and security is fully authorized to install and utilize the certificate to represent this organization's electronic presence.")?></p>
+<p><?php echo _("If the Subscriber's name and/or domain name registration change the subscriber will immediately inform CAcert Inc. who shall revoke the digital certificate. When the Digital Certificate expires or is revoked the company will permanently remove the certificate from the server on which it is installed and will not use it for any purpose thereafter. The person responsible for key management and security is fully authorized to install and utilize the certificate to represent this organization's electronic presence.")?></p>
 
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="2" class="title"><?=_("New Client Certificate")?></td>
+    <td colspan="2" class="title"><?php echo _("New Client Certificate")?></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Add")?></td>
-    <td class="DataTD"><?=_("Address")?></td>
+    <td class="DataTD"><?php echo _("Add")?></td>
+    <td class="DataTD"><?php echo _("Address")?></td>
   </tr>
 
-<?
-       $query = "select * from `email` where `memid`='".intval($_SESSION['profile']['id'])."' and `deleted`=0 and `hash`=''";
+<?php  $query = "select * from `email` where `memid`='".intval($_SESSION['profile']['id'])."' and `deleted`=0 and `hash`=''";
        $res = mysql_query($query);
        while($row = mysql_fetch_assoc($res))
        { ?>
   <tr>
-    <td class="DataTD"><input type="checkbox" id="addid<?=intval($row['id'])?>" name="addid[]" value="<?=intval($row['id'])?>"></td>
-    <td class="DataTD" align="left"><label for="addid<?=intval($row['id'])?>"><?=sanitizeHTML($row['email'])?></label></td>
+    <td class="DataTD"><input type="checkbox" id="addid<?php echo intval($row['id'])?>" name="addid[]" value="<?php echo intval($row['id'])?>"></td>
+    <td class="DataTD" align="left"><label for="addid<?php echo intval($row['id'])?>"><?php echo sanitizeHTML($row['email'])?></label></td>
   </tr>
-<? }
+<?php }
 if($_SESSION['profile']['points'] >= 50)
 {
        $fname = $_SESSION['profile']['fname'];
@@ -56,39 +55,39 @@ if($_SESSION['profile']['points'] >= 50)
   <tr>
     <td class="DataTD" colspan="2" align="left">
       <input type="radio" id="incname0" name="incname" value="0" checked="checked" />
-        <label for="incname0"><?=_("No Name")?></label><br />
-      <? if($fname && $lname) { ?>
+        <label for="incname0"><?php echo _("No Name")?></label><br />
+      <?php if($fname && $lname) { ?>
         <input type="radio" id="incname1" name="incname" value="1" />
-        <label for="incname1"><?=_("Include")?> '<?=$fname." ".$lname?>'</label><br />
-      <? } ?>
-      <? if($fname && $mname && $lname) { ?>
+        <label for="incname1"><?php echo _("Include")?> '<?php echo $fname." ".$lname?>'</label><br />
+      <?php } ?>
+      <?php if($fname && $mname && $lname) { ?>
         <input type="radio" id="incname2" name="incname" value="2" />
-        <label for="incname2"><?=_("Include")?> '<?=$fname." ".$mname." ".$lname?>'</label><br />
-      <? } ?>
-      <? if($fname && $lname && $suffix) { ?>
+        <label for="incname2"><?php echo _("Include")?> '<?php echo $fname." ".$mname." ".$lname?>'</label><br />
+      <?php } ?>
+      <?php if($fname && $lname && $suffix) { ?>
         <input type="radio" id="incname3" name="incname" value="3" />
-        <label for="incname3"><?=_("Include")?> '<?=$fname." ".$lname." ".$suffix?>'</label><br />
-      <? } ?>
-      <? if($fname && $mname && $lname && $suffix) { ?>
+        <label for="incname3"><?php echo _("Include")?> '<?php echo $fname." ".$lname." ".$suffix?>'</label><br />
+      <?php } ?>
+      <?php if($fname && $mname && $lname && $suffix) { ?>
         <input type="radio" id="incname4" name="incname" value="4" />
-        <label for="incname4"><?=_("Include")?> '<?=$fname." ".$mname." ".$lname." ".$suffix?>'</label><br />
-      <? } ?>
+        <label for="incname4"><?php echo _("Include")?> '<?php echo $fname." ".$mname." ".$lname." ".$suffix?>'</label><br />
+      <?php } ?>
     </td>
   </tr>
-<? } ?>
+<?php } ?>
 
   <tr>
     <td class="DataTD">
       <input type="checkbox" id="login" name="login" value="1" checked="checked" />
     </td>
     <td class="DataTD" align="left">
-      <label for="login"><?=_("Enable certificate login with this certificate")?><br />
-      <?=_("By allowing certificate login, this certificate can be used to login into this account at https://secure.cacert.org/ .")?></label>
+      <label for="login"><?php echo _("Enable certificate login with this certificate")?><br />
+      <?php echo _("By allowing certificate login, this certificate can be used to login into this account at https://secure.cacert.org/ .")?></label>
     </td>
   </tr>
   <tr>
     <td class="DataTD" colspan="2" align="left">
-      <label for="description"><?=_("Optional comment, only used in the certificate overview")?></label><br />
+      <label for="description"><?php echo _("Optional comment, only used in the certificate overview")?></label><br />
       <input type="text" id="description" name="description" maxlength="100" size="100" />
     </td>
   </tr>
@@ -98,63 +97,60 @@ if($_SESSION['profile']['points'] >= 50)
       <input type="checkbox" id="expertbox" name="expertbox" onchange="showExpert(this.checked)" />
     </td>
     <td class="DataTD" align="left">
-      <label for="expertbox"><?=_("Show advanced options")?></label>
+      <label for="expertbox"><?php echo _("Show advanced options")?></label>
     </td>
   </tr>
 
-<?
-if($_SESSION['profile']['points'] >= 50)
+<?php if($_SESSION['profile']['points'] >= 50)
 {
 ?>
   <tr name="expert">
     <td class="DataTD" colspan="2" align="left">
-      <input type="radio" id="root1" name="rootcert" value="1" /> <label for="root1"><?=_("Sign by class 1 root certificate")?></label><br />
-      <input type="radio" id="root2" name="rootcert" value="2" checked="checked" /> <label for="root2"><?=_("Sign by class 3 root certificate")?></label><br />
-      <?=str_replace("\n", "<br />\n", wordwrap(_("Please note: If you use a certificate signed by the class 3 root, the class 3 root certificate needs to be imported into your email program as well as the class 1 root certificate so your email program can build a full trust path chain."), 125))?>
+      <input type="radio" id="root1" name="rootcert" value="1" /> <label for="root1"><?php echo _("Sign by class 1 root certificate")?></label><br />
+      <input type="radio" id="root2" name="rootcert" value="2" checked="checked" /> <label for="root2"><?php echo _("Sign by class 3 root certificate")?></label><br />
+      <?php echo str_replace("\n", "<br />\n", wordwrap(_("Please note: If you use a certificate signed by the class 3 root, the class 3 root certificate needs to be imported into your email program as well as the class 1 root certificate so your email program can build a full trust path chain."), 125))?>
     </td>
   </tr>
-<? } ?>
+<?php } ?>
 
   <tr name="expert">
     <td class="DataTD" colspan="2" align="left">
-      <?=_("Hash algorithm used when signing the certificate:")?><br />
-      <?
-      foreach (HashAlgorithms::getInfo() as $algorithm => $display_info) {
+      <?php echo _("Hash algorithm used when signing the certificate:")?><br />
+      <?php       foreach (HashAlgorithms::getInfo() as $algorithm => $display_info) {
       ?>
-        <input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(HashAlgorithms::$default === $algorithm)?'checked="checked"':''?> />
-        <label for="hash_alg_<?=$algorithm?>"><?=$display_info['name']?><?=$display_info['info']?' - '.$display_info['info']:''?></label><br />
-      <?
-      }
+        <input type="radio" id="hash_alg_<?php echo $algorithm?>" name="hash_alg" value="<?php echo $algorithm?>" <?php echo (HashAlgorithms::$default === $algorithm)?'checked="checked"':''?> />
+        <label for="hash_alg_<?php echo $algorithm?>"><?php echo $display_info['name']?><?php echo $display_info['info']?' - '.$display_info['info']:''?></label><br />
+      <?php       }
       ?>
     </td>
   </tr>
 
-<? if($_SESSION['profile']['points'] >= 100 && $_SESSION['profile']['codesign'] > 0) { ?>
+<?php if($_SESSION['profile']['points'] >= 100 && $_SESSION['profile']['codesign'] > 0) { ?>
   <tr name="expert">
     <td class="DataTD">
       <input type="checkbox" id="codesign" name="codesign" value="1" />
     </td>
     <td class="DataTD" align="left">
-      <label for="codesign"><?=_("Code Signing")?><br />
-      <?=_("Please note: By ticking this box you will automatically have your name included in the certificate.")?></label>
+      <label for="codesign"><?php echo _("Code Signing")?><br />
+      <?php echo _("Please note: By ticking this box you will automatically have your name included in the certificate.")?></label>
     </td>
   </tr>
-<? } ?>
+<?php } ?>
 
   <tr name="expert">
     <td class="DataTD">
       <input type="checkbox" id="SSO" name="SSO" value="1" />
     </td>
     <td class="DataTD" align="left">
-      <label for="SSO"><?=_("Add Single Sign On ID Information")?><br />
-      <?=str_replace("\n", "<br>\n", wordwrap(_("By adding Single Sign On (SSO) ID information to your certificates this could be used to track you, you can also issue certificates with no email addresses that are useful only for Authentication. Please see a more detailed description on our WIKI about it."), 125))?>
-      <a href="http://wiki.cacert.org/wiki/SSO"><?=_("SSO WIKI Entry")?></a></label>
+      <label for="SSO"><?php echo _("Add Single Sign On ID Information")?><br />
+      <?php echo str_replace("\n", "<br>\n", wordwrap(_("By adding Single Sign On (SSO) ID information to your certificates this could be used to track you, you can also issue certificates with no email addresses that are useful only for Authentication. Please see a more detailed description on our WIKI about it."), 125))?>
+      <a href="http://wiki.cacert.org/wiki/SSO"><?php echo _("SSO WIKI Entry")?></a></label>
     </td>
   </tr>
 
   <tr name="expert">
     <td class="DataTD" colspan="2">
-      <label for="optionalCSR"><?=_("Optional Client CSR, no information on the certificate will be used")?></label><br />
+      <label for="optionalCSR"><?php echo _("Optional Client CSR, no information on the certificate will be used")?></label><br />
       <textarea id="optionalCSR" name="optionalCSR" cols="80" rows="5"></textarea>
     </td>
   </tr>
@@ -165,15 +161,15 @@ if($_SESSION['profile']['points'] >= 50)
       <input type="checkbox" id="CCA" name="CCA" />
     </td>
     <td class="DataTD" align="left">
-      <label for="CCA"><strong><?=sprintf(_("I accept the CAcert Community Agreement (%s)."),"<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>")?></strong><br />
-      <?=_("Please note: You need to accept the CCA to proceed.")?></label>
+      <label for="CCA"><strong><?php echo sprintf(_("I accept the CAcert Community Agreement (%s)."),"<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>")?></strong><br />
+      <?php echo _("Please note: You need to accept the CCA to proceed.")?></label>
     </td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Next")?>" /></td>
+    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?php echo _("Next")?>" /></td>
   </tr>
 </table>
-<input type="hidden" name="oldid" value="<?=$id?>" />
+<input type="hidden" name="oldid" value="<?php echo $id?>" />
 </form>
 
 <script language="javascript">
index 04ad229..0c6d60f 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */ ?>
-<?
-       $query = "select * from `orgdomains` where `id`='".intval($_REQUEST['domid'])."'";
+<?php  $query = "select * from `orgdomains` where `id`='".intval($_REQUEST['domid'])."'";
        $row = mysql_fetch_assoc(mysql_query($query));
        $query = "select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'";
        $org = mysql_fetch_assoc(mysql_query($query));
 
        $_SESSION['_config']['domain'] = $row['domain'];
 ?>
-<h3><?=_("Warning!")?></h3>
-<p><?=_("Hitting delete will also revoke all existing certificates issued under this domain")?></p>
+<h3><?php echo _("Warning!")?></h3>
+<p><?php echo _("Hitting delete will also revoke all existing certificates issued under this domain")?></p>
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="2" class="title"><? printf(_("Delete Domain for %s"), ($org['O'])); ?></td>
+    <td colspan="2" class="title"><?php printf(_("Delete Domain for %s"), ($org['O'])); ?></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><? printf(_("Are you really sure you want to remove %s and all certificates issued under this domain?"), sanitizeHTML($row['domain'])); ?></td>
+    <td class="DataTD" colspan="2"><?php printf(_("Are you really sure you want to remove %s and all certificates issued under this domain?"), sanitizeHTML($row['domain'])); ?></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="cancel" value="<?=_("Cancel")?>">
-               <input type="submit" name="process" value="<?=_("Delete")?>"></td>
+    <td class="DataTD" colspan="2"><input type="submit" name="cancel" value="<?php echo _("Cancel")?>">
+               <input type="submit" name="process" value="<?php echo _("Delete")?>"></td>
   </tr>
 </table>
-<input type="hidden" name="oldid" value="<?=intval($id)?>">
-<input type="hidden" name="orgid" value="<?=intval($_REQUEST['orgid'])?>">
-<input type="hidden" name="domain" value="<?=sanitizeHTML($row['domain'])?>">
-<input type="hidden" name="domid" value="<?=intval($_REQUEST['domid'])?>">
+<input type="hidden" name="oldid" value="<?php echo intval($id)?>">
+<input type="hidden" name="orgid" value="<?php echo intval($_REQUEST['orgid'])?>">
+<input type="hidden" name="domain" value="<?php echo sanitizeHTML($row['domain'])?>">
+<input type="hidden" name="domid" value="<?php echo intval($_REQUEST['domid'])?>">
 
 </form>
index 9f3d27e..0af27c6 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */ ?>
-<?
-       $query = "select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'";
+<?php  $query = "select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'";
        $org = mysql_fetch_assoc(mysql_query($query));
 
 ?>
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="2" class="title"><? printf(_("Delete Organisation"), ($org['O'])); ?></td>
+    <td colspan="2" class="title"><?php printf(_("Delete Organisation"), ($org['O'])); ?></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><? printf(_("Are you really sure you want to remove %s and all certificates issued under this organisation?"), sanitizeHTML($org['O'])); ?></td>
+    <td class="DataTD" colspan="2"><?php printf(_("Are you really sure you want to remove %s and all certificates issued under this organisation?"), sanitizeHTML($org['O'])); ?></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="cancel" value="<?=_("Cancel")?>">
-               <input type="submit" name="process" value="<?=_("Delete")?>"></td>
+    <td class="DataTD" colspan="2"><input type="submit" name="cancel" value="<?php echo _("Cancel")?>">
+               <input type="submit" name="process" value="<?php echo _("Delete")?>"></td>
   </tr>
 </table>
-<input type="hidden" name="oldid" value="<?=intval($id)?>">
-<input type="hidden" name="orgid" value="<?=intval($_REQUEST['orgid'])?>">
+<input type="hidden" name="oldid" value="<?php echo intval($id)?>">
+<input type="hidden" name="orgid" value="<?php echo intval($_REQUEST['orgid'])?>">
 
 </form>
index a05c927..83e7c20 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */ ?>
-<?
-       $query = "select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'";
+<?php  $query = "select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'";
        $row = mysql_fetch_assoc(mysql_query($query));
 ?>
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="500">
   <tr>
-    <td colspan="5" class="title"><? printf(_("%s's Administrators"), $row['O']); ?> (<a href="account.php?id=33&amp;orgid=<?=$row['id']?>"><?=_("Add")?></a>)</td>
+    <td colspan="5" class="title"><?php printf(_("%s's Administrators"), $row['O']); ?> (<a href="account.php?id=33&amp;orgid=<?php echo $row['id']?>"><?php echo _("Add")?></a>)</td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Administrator")?></td>
-    <td class="DataTD"><?=_("Master Account")?></td>
-    <td class="DataTD"><?=_("Department")?></td>
-    <td class="DataTD"><?=_("Comments")?></td>
-    <td class="DataTD"><?=_("Delete")?></td>
+    <td class="DataTD"><?php echo _("Administrator")?></td>
+    <td class="DataTD"><?php echo _("Master Account")?></td>
+    <td class="DataTD"><?php echo _("Department")?></td>
+    <td class="DataTD"><?php echo _("Comments")?></td>
+    <td class="DataTD"><?php echo _("Delete")?></td>
   </tr>
-<?
-       $query = "select * from `org` where `orgid`='".intval($_REQUEST['orgid'])."'";
+<?php  $query = "select * from `org` where `orgid`='".intval($_REQUEST['orgid'])."'";
        $res = mysql_query($query);
        while($row = mysql_fetch_assoc($res))
        {
                $user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".intval($row['memid'])."'"));
 ?>
   <tr>
-    <td class="DataTD"><a href='mailto:<?=sanitizeHTML($user['email'])?>'><?=sanitizeHTML($user['fname'])?> <?=sanitizeHTML($user['lname'])?></a></td>
-    <td class="DataTD"><?=($row['masteracc'])?></a></td>
-    <td class="DataTD"><?=sanitizeHTML($row['OU'])?></a></td>
-    <td class="DataTD"><?=sanitizeHTML($row['comments'])?></a></td>
-<? if($row['masteracc'] == 0 || $_SESSION['profile']['orgadmin'] == 1) { ?>
-    <td class="DataTD"><a href="account.php?id=34&amp;orgid=<?=$row['orgid']?>&amp;memid=<?=$row['memid']?>"><?=_("Delete")?></a></td>
-<? } else { ?>
+    <td class="DataTD"><a href='mailto:<?php echo sanitizeHTML($user['email'])?>'><?php echo sanitizeHTML($user['fname'])?> <?php echo sanitizeHTML($user['lname'])?></a></td>
+    <td class="DataTD"><?php echo ($row['masteracc'])?></a></td>
+    <td class="DataTD"><?php echo sanitizeHTML($row['OU'])?></a></td>
+    <td class="DataTD"><?php echo sanitizeHTML($row['comments'])?></a></td>
+<?php if($row['masteracc'] == 0 || $_SESSION['profile']['orgadmin'] == 1) { ?>
+    <td class="DataTD"><a href="account.php?id=34&amp;orgid=<?php echo $row['orgid']?>&amp;memid=<?php echo $row['memid']?>"><?php echo _("Delete")?></a></td>
+<?php } else { ?>
     <td class="DataTD">N/A</td>
-<? } ?>
+<?php } ?>
   </tr>
-<? } ?>
+<?php } ?>
 </table>
index 9e2f67a..f5fd5bc 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
@@ -15,8 +15,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */ ?>
-<?
-       $query = "select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'";
+<?php  $query = "select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'";
        $row = mysql_fetch_assoc(mysql_query($query));
        
        // Reset session variables regarding OrgAdmin's, present empty form
        
 ?>
 <form method="post" action="account.php">
-<input type="hidden" name="orgid" value="<?=intval($_REQUEST['orgid'])?>">
+<input type="hidden" name="orgid" value="<?php echo intval($_REQUEST['orgid'])?>">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="2" class="title"><? printf(_("New Admin for %s"), ($row['O'])); ?></td>
+    <td colspan="2" class="title"><?php printf(_("New Admin for %s"), ($row['O'])); ?></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Email")?>:</td>
+    <td class="DataTD"><?php echo _("Email")?>:</td>
     <td class="DataTD"><input type="text" name="email" value=""></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Department")?>:</td>
+    <td class="DataTD"><?php echo _("Department")?>:</td>
     <td class="DataTD"><input type="text" name="OU" value=""></td>
   </tr>
-<? if($_SESSION['profile']['orgadmin'] == 1) { ?>
+<?php if($_SESSION['profile']['orgadmin'] == 1) { ?>
   <tr>
-    <td class="DataTD"><?=_("Master Account")?>:</td>
+    <td class="DataTD"><?php echo _("Master Account")?>:</td>
     <td class="DataTD"><select name="masteracc">
                <option value="0">No</option>     // make default option as of SA telco 2011-08-02 on bug 966
                <option value="1">Yes</option>
        </select></td>
   </tr>
-<? } ?>
+<?php } ?>
   <tr>
-    <td class="DataTD"><?=_("Comments")?>:</td>
+    <td class="DataTD"><?php echo _("Comments")?>:</td>
     <td class="DataTD"><textarea name="comments" cols="30" rows="5"></textarea></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Add")?>"></td>
+    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?php echo _("Add")?>"></td>
   </tr>
 </table>
-<input type="hidden" name="oldid" value="<?=$id?>">
-<input type="hidden" name="csrf" value="<?=make_csrf('orgadmadd')?>" />
+<input type="hidden" name="oldid" value="<?php echo $id?>">
+<input type="hidden" name="csrf" value="<?php echo make_csrf('orgadmadd')?>" />
 </form>
index b11bc7d..247faaf 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
@@ -15,8 +15,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */ ?>
-<?
-       $query = "select * from `orgdomains` where `id`='".intval($_REQUEST['orgid'])."'";
+<?php  $query = "select * from `orgdomains` where `id`='".intval($_REQUEST['orgid'])."'";
        $row = mysql_fetch_assoc(mysql_query($query));
        $query = "select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'";
        $org = mysql_fetch_assoc(mysql_query($query));
        $_SESSION['_config']['domain'] = $row['domain'];
 ?>
 <form method="post" action="account.php">
-<input type="hidden" name="memid" value="<?=intval($_REQUEST['memid'])?>">
+<input type="hidden" name="memid" value="<?php echo intval($_REQUEST['memid'])?>">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="2" class="title"><? printf(_("Delete Admin for %s"), ($org['O'])); ?></td>
+    <td colspan="2" class="title"><?php printf(_("Delete Admin for %s"), ($org['O'])); ?></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><? printf(_("Are you really sure you want to remove %s from administering this organisation?"), sanitizeHTML($user['fname'])." ".sanitizeHTML($user['lname'])); ?></td>
+    <td class="DataTD" colspan="2"><?php printf(_("Are you really sure you want to remove %s from administering this organisation?"), sanitizeHTML($user['fname'])." ".sanitizeHTML($user['lname'])); ?></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="cancel" value="<?=_("Cancel")?>">
-               <input type="submit" name="process" value="<?=_("Delete")?>"></td>
+    <td class="DataTD" colspan="2"><input type="submit" name="cancel" value="<?php echo _("Cancel")?>">
+               <input type="submit" name="process" value="<?php echo _("Delete")?>"></td>
   </tr>
 </table>
-<input type="hidden" name="oldid" value="<?=intval($id)?>">
-<input type="hidden" name="orgid" value="<?=intval($_REQUEST['orgid'])?>">
+<input type="hidden" name="oldid" value="<?php echo intval($id)?>">
+<input type="hidden" name="orgid" value="<?php echo intval($_REQUEST['orgid'])?>">
 
 </form>
index 05c7f2b..45fa6b2 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
@@ -18,8 +18,7 @@
 
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="400">
 
-<?
-$query = "select *
+<?php $query = "select *
                        from `orginfo`,`org`
                        where `orginfo`.`id`=`org`.`orgid`
                        and `org`.`memid`='".intval($_SESSION['profile']['id'])."'";
@@ -29,30 +28,29 @@ while($row = mysql_fetch_assoc($res))
 {
        ?>
        <tr>
-               <td colspan="3" class="title"><?=_("Organisation")?></td>
+               <td colspan="3" class="title"><?php echo _("Organisation")?></td>
        </tr>
        <tr>
-               <td class="DataTD"><?=_("Organisation Name")?>:</td>
-               <td colspan="2" class="DataTD" ><b><?=$row['O']?></b></td>
+               <td class="DataTD"><?php echo _("Organisation Name")?>:</td>
+               <td colspan="2" class="DataTD" ><b><?php echo $row['O']?></b></td>
        </tr>
        <tr>
-               <td class="DataTD"><?=_("Contact Email")?>:</td>
-               <td colspan="2" class="DataTD"><?=($row['contact'])?></td>
+               <td class="DataTD"><?php echo _("Contact Email")?>:</td>
+               <td colspan="2" class="DataTD"><?php echo ($row['contact'])?></td>
        </tr>
        <tr>
-               <td class="DataTD"><?=_("Town/Suburb")?>:</td>
-               <td colspan="2" class="DataTD"><?=($row['L'])?></td>
+               <td class="DataTD"><?php echo _("Town/Suburb")?>:</td>
+               <td colspan="2" class="DataTD"><?php echo ($row['L'])?></td>
        </tr>
        <tr>
-               <td class="DataTD"><?=_("State/Province")?>:</td>
-               <td colspan="2" class="DataTD"><?=($row['ST'])?></td>
+               <td class="DataTD"><?php echo _("State/Province")?>:</td>
+               <td colspan="2" class="DataTD"><?php echo ($row['ST'])?></td>
        </tr>
        <tr>
-               <td class="DataTD"><?=_("Country")?>:</td>
-               <td colspan="2" class="DataTD"><?=($row['C'])?></td>
+               <td class="DataTD"><?php echo _("Country")?>:</td>
+               <td colspan="2" class="DataTD"><?php echo ($row['C'])?></td>
        </tr>
-       <?
-       
+       <?php
        //domain info
        $query = "select `domain` from `orgdomains` where `orgid`='".intval($row['id'])."'";
        $res1 = mysql_query($query);
@@ -60,20 +58,18 @@ while($row = mysql_fetch_assoc($res))
        {
                ?>
                <tr>
-                       <td class="DataTD"><?=_("Domain")?></td>
-                       <td colspan="2" class="DataTD"><?=sanitizeHTML($domain['domain'])?></td>
+                       <td class="DataTD"><?php echo _("Domain")?></td>
+                       <td colspan="2" class="DataTD"><?php echo sanitizeHTML($domain['domain'])?></td>
                </tr>
-               <?
-       }
+               <?php   }
        
        ?>
        <tr>
-               <td class="DataTD"><?=_("Administrator")?></td>
-               <td class="DataTD"><?=_("Master Account")?></td>
-               <td class="DataTD"><?=_("Department")?></td>
+               <td class="DataTD"><?php echo _("Administrator")?></td>
+               <td class="DataTD"><?php echo _("Master Account")?></td>
+               <td class="DataTD"><?php echo _("Department")?></td>
        </tr>
-       <?
-       
+       <?php
        //org admins
        $query = "select * from `org` where `orgid`='".intval($row['id'])."'";
        $res2 = mysql_query($query);
@@ -82,22 +78,20 @@ while($row = mysql_fetch_assoc($res))
                $user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".intval($org['memid'])."'"));
                ?> 
                <tr>
-                       <td class="DataTD"><a href='mailto:<?=$user['email']?>'><?=($user['fname'])?> <?=($user['lname'])?></a></td>
-                       <td class="DataTD"><?=($org['masteracc'])?></td>
-                       <td class="DataTD"><?=($org['OU'])?></td>
+                       <td class="DataTD"><a href='mailto:<?php echo $user['email']?>'><?php echo ($user['fname'])?> <?php echo ($user['lname'])?></a></td>
+                       <td class="DataTD"><?php echo ($org['masteracc'])?></td>
+                       <td class="DataTD"><?php echo ($org['OU'])?></td>
                </tr>
-               <?
-               
+               <?php
                if(intval($org['masteracc']) === 1 &&
                                 intval($org['memid']) === intval($_SESSION['profile']['id']))
                { 
                        $master="account.php?id=32&amp;orgid=".intval($row['id']);
                        ?>
                        <tr>
-                               <td colspan="3" class="DataTD"><a href="<?=$master ?>"><?=_("Edit")?></a></td>
+                               <td colspan="3" class="DataTD"><a href="<?php echo $master ?>"><?php echo _("Edit")?></a></td>
                        </tr>
-                       <?
-               }
+                       <?php           }
        } 
 } ?>
 </table>
index be0f590..e9400dd 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="400">
   <tr>
-    <td colspan="2" class="title"><?=_("My Alert Settings")?></td>
+    <td colspan="2" class="title"><?php echo _("My Alert Settings")?></td>
   </tr>
   <tr>
-    <td class="DataTD" valign="top"><b><?=_("Alert me if")?></b>: </td>
-    <td class="DataTD" align="left"><input type="checkbox" name="general" value="1"<? if(array_key_exists('general',$_REQUEST) && $_REQUEST['general']) echo " checked='checked'"; ?>><?=_("General Announcements")?><br>
-       <input type="checkbox" name="country" value="1"<? if(array_key_exists('country',$_REQUEST) && $_REQUEST['country']) echo " checked='checked'"; ?>><?=_("Country Announcements")?><br>
-       <input type="checkbox" name="regional" value="1"<? if(array_key_exists('regional',$_REQUEST) && $_REQUEST['regional']) echo " checked='checked'"; ?>><?=_("Regional Announcements")?><br>
-       <input type="checkbox" name="radius" value="1"<? if(array_key_exists('radius',$_REQUEST) && $_REQUEST['radius']) echo " checked='checked'"; ?>><?=_("Within 200km Announcements")?></td>
+    <td class="DataTD" valign="top"><b><?php echo _("Alert me if")?></b>: </td>
+    <td class="DataTD" align="left"><input type="checkbox" name="general" value="1"<?php if(array_key_exists('general',$_REQUEST) && $_REQUEST['general']) echo " checked='checked'"; ?>><?php echo _("General Announcements")?><br>
+       <input type="checkbox" name="country" value="1"<?php if(array_key_exists('country',$_REQUEST) && $_REQUEST['country']) echo " checked='checked'"; ?>><?php echo _("Country Announcements")?><br>
+       <input type="checkbox" name="regional" value="1"<?php if(array_key_exists('regional',$_REQUEST) && $_REQUEST['regional']) echo " checked='checked'"; ?>><?php echo _("Regional Announcements")?><br>
+       <input type="checkbox" name="radius" value="1"<?php if(array_key_exists('radius',$_REQUEST) && $_REQUEST['radius']) echo " checked='checked'"; ?>><?php echo _("Within 200km Announcements")?></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Update My Settings")?>"></td>
+    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?php echo _("Update My Settings")?>"></td>
   </tr>
 </table>
-<input type="hidden" name="oldid" value="<?=$id?>">
+<input type="hidden" name="oldid" value="<?php echo $id?>">
 </form>
index 48c737a..c9b1b52 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
@@ -16,8 +16,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */ ?>
 <p style="background-color: #FF8080; font-size: 150%">
-<?
-printf(_("This page has been moved to the %swiki%s. Please update your ".
+<?php printf(_("This page has been moved to the %swiki%s. Please update your ".
                "bookmarks and report any broken links."),
        '<a href="//wiki.cacert.org/FAQ/AboutUs">', '</a>');
 ?>
index 7caddb0..2bcb77c 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
index 9e09bb8..dbceaa4 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
@@ -16,8 +16,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */ ?>
 <p style="background-color: #FF8080; font-size: 150%">
-<?
-printf(_('This page has been moved to the %spolicy directory%s. Please update '.
+<?php printf(_('This page has been moved to the %spolicy directory%s. Please update '.
                'your bookmarks and report any broken links.'),
        '<a href="/policy/PrivacyPolicy.html">', '</a>');
 ?>
index 8ac8b65..eb90b65 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
index a809595..f37548f 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
 */
 if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['secrethash'] = md5(date("YmdHis").rand(0, intval(date("u"))));
 ?>
-<H3><?=_("Contact Us")?></H3>
+<H3><?php echo _("Contact Us")?></H3>
 
-<p><b><?=_("General Questions")?></b></p>
-<p><b><?=_("PLEASE NOTE: Due to the large amounts of support questions, incorrectly directed emails may be over looked, this is a volunteer effort and directing general questions to the right place will help everyone, including yourself as you will get a reply quicker.")?></b></p>
-<p><b><?=_("If you are contacting us about advertising, please use the form at the bottom of the website, the first contact form is not the correct place.")?></b></p>
-<p><?=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>
-<p><?=_("Before contacting us, be sure to read the information on our official and unofficial HowTo and FAQ pages.")?> - <a href="//wiki.cacert.org/HELP/"><?=_("Go here for more details.")?></a></p>
-<p><?=_("General questions about CAcert should be sent to the general support list, please send all emails in ENGLISH only, this list has many more volunteers then those directly involved with the running of the website, everyone on the mailing list understands english, even if this isn't their native language this will increase your chance at a competent reply. While it's best if you sign up to the mailing list to get replied to, you don't have to, but please make sure you note this in your email, otherwise it might seem like you didn't get a reply to your question.")?></p>
-<p><a href="https://lists.cacert.org/wws/info/cacert-support"><?=_("Click here to go to the Support List")?></a></p>
-<p><?=_("You can alternatively use the form below, however joining the list is the prefered option to support your queries")?></p>
+<p><b><?php echo _("General Questions")?></b></p>
+<p><b><?php echo _("PLEASE NOTE: Due to the large amounts of support questions, incorrectly directed emails may be over looked, this is a volunteer effort and directing general questions to the right place will help everyone, including yourself as you will get a reply quicker.")?></b></p>
+<p><b><?php echo _("If you are contacting us about advertising, please use the form at the bottom of the website, the first contact form is not the correct place.")?></b></p>
+<p><?php echo 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>
+<p><?php echo _("Before contacting us, be sure to read the information on our official and unofficial HowTo and FAQ pages.")?> - <a href="//wiki.cacert.org/HELP/"><?php echo _("Go here for more details.")?></a></p>
+<p><?php echo _("General questions about CAcert should be sent to the general support list, please send all emails in ENGLISH only, this list has many more volunteers then those directly involved with the running of the website, everyone on the mailing list understands english, even if this isn't their native language this will increase your chance at a competent reply. While it's best if you sign up to the mailing list to get replied to, you don't have to, but please make sure you note this in your email, otherwise it might seem like you didn't get a reply to your question.")?></p>
+<p><a href="https://lists.cacert.org/wws/info/cacert-support"><?php echo _("Click here to go to the Support List")?></a></p>
+<p><?php echo _("You can alternatively use the form below, however joining the list is the prefered option to support your queries")?></p>
 <form method="post" action="account.php" name="form1">
-  <input type="hidden" name="oldid" value="<?=$id?>">
+  <input type="hidden" name="oldid" value="<?php echo $id?>">
 <!--   <input type="hidden" name="support" value="yes"> --> 
   <input type="hidden" name="secrethash2" value="">
   <p class="robotic" id="pot">
@@ -36,18 +36,18 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s
     <input name="robotest" type="text" id="robotest" class="robotest" />
   </p>
 <table border="0">
-    <tr><td width="100"><?=_("Your Name")?>:</td><td width="100"><input type="text" name="who"></td><td width="100"></td><td width="100"></td>
-    <tr><td width="100"><?=_("Your Email")?>:</td><td colspan="3"><input type="text" name="email"></td>
-    <tr><td width="100"><?=_("Subject")?>:</td><td colspan="3"><input type="text" name="subject"></td></tr>
-    <tr><td width="100" valign="top"><?=_("Message")?>:</td><td colspan="3"><textarea name="message" cols="70" rows="10"></textarea></td></tr>
+    <tr><td width="100"><?php echo _("Your Name")?>:</td><td width="100"><input type="text" name="who"></td><td width="100"></td><td width="100"></td>
+    <tr><td width="100"><?php echo _("Your Email")?>:</td><td colspan="3"><input type="text" name="email"></td>
+    <tr><td width="100"><?php echo _("Subject")?>:</td><td colspan="3"><input type="text" name="subject"></td></tr>
+    <tr><td width="100" valign="top"><?php echo _("Message")?>:</td><td colspan="3"><textarea name="message" cols="70" rows="10"></textarea></td></tr>
 
     <tr>
-      <td colspan="2"><font color="#ff0000"><?=_("Warning: Please do not use \"send to mailing list\" when you entered confidential data. The request is being sent to a public mailinglist.")?></font></td>
-      <td colspan="2"><?=_("For confidential data use \"send to support\".")?></td>
+      <td colspan="2"><font color="#ff0000"><?php echo _("Warning: Please do not use \"send to mailing list\" when you entered confidential data. The request is being sent to a public mailinglist.")?></font></td>
+      <td colspan="2"><?php echo _("For confidential data use \"send to support\".")?></td>
     </tr>
     <tr>
-      <td colspan="2"><input type="submit" name="process[0]" value="<?=_("Send to mailing list")?>"></td>
-      <td colspan="2"><input type="submit" name="process[1]" value="<?=_("Send to support")?>"></td>
+      <td colspan="2"><input type="submit" name="process[0]" value="<?php echo _("Send to mailing list")?>"></td>
+      <td colspan="2"><input type="submit" name="process[1]" value="<?php echo _("Send to support")?>"></td>
     </tr>
   </table>
 </form>
@@ -57,12 +57,12 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s
 <p><b>Secure IRC</b></p>
 <p><a href="ircs://irc.CAcert.org:7000/CAcert">ircs://irc.CAcert.org:7000/CAcert</a></p>
 
-<p><b><?=_("Other Mailing Lists")?></b></p>
-<p><?=_("There are a number of other mailing lists CAcert runs, some are general discussion, others are technical (such as the development list) or platform specific help (such as the list for Apple Mac users)")?></p>
-<p><a href="http://lists.cacert.org/"><?=_("Click here to view all lists available")?></a></p>
+<p><b><?php echo _("Other Mailing Lists")?></b></p>
+<p><?php echo _("There are a number of other mailing lists CAcert runs, some are general discussion, others are technical (such as the development list) or platform specific help (such as the list for Apple Mac users)")?></p>
+<p><a href="http://lists.cacert.org/"><?php echo _("Click here to view all lists available")?></a></p>
 
-<p><b><?=_("Security Issues")?></b></p>
-<p><?=sprintf(_("Please use any of the following ways to report security ".
+<p><b><?php echo _("Security Issues")?></b></p>
+<p><?php echo sprintf(_("Please use any of the following ways to report security ".
        "issues: You can use the above contact form for sensitive information. ".
        "You can email us to %s. You can file a bugreport on %s and mark it as ".
        "private."),
@@ -73,7 +73,7 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s
 
 <script type="text/javascript">
 <!--
-       var pagehash = '<?=$_SESSION['_config']['secrethash']?>';
+       var pagehash = '<?php echo $_SESSION['_config']['secrethash']?>';
 
        document.form1.secrethash2.value = pagehash;
        document.form2.secrethash2.value = pagehash;
index d61d8db..979c6bd 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
@@ -22,13 +22,12 @@ require_once($_SESSION['_config']['filepath'].'/includes/lib/l10n.php');
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="400">
   <tr>
-    <td colspan="2" class="title"><?=_("My Language Settings")?></td>
+    <td colspan="2" class="title"><?php echo _("My Language Settings")?></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("My preferred language")?>:</td>
+    <td class="DataTD"><?php echo _("My preferred language")?>:</td>
     <td class="DataTD"><select name="lang">
-<?
-       foreach(L10n::$translations as $key => $val)
+<?php  foreach(L10n::$translations as $key => $val)
        {
                echo "<option value='$key'";
                if($key == L10n::get_translation())
@@ -40,36 +39,34 @@ require_once($_SESSION['_config']['filepath'].'/includes/lib/l10n.php');
     </td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Update")?>"></td>
+    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?php echo _("Update")?>"></td>
   </tr>
 </table>
-<input type="hidden" name="oldid" value="<?=$id?>">
+<input type="hidden" name="oldid" value="<?php echo $id?>">
 <input type="hidden" name="action" value="default">
-<input type="hidden" name="csrf" value="<?=make_csrf('mainlang')?>" />
+<input type="hidden" name="csrf" value="<?php echo make_csrf('mainlang')?>" />
 </form>
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="400">
   <tr>
-    <td colspan="2" class="title"><?=_("Additional Language Preferences")?></td>
+    <td colspan="2" class="title"><?php echo _("Additional Language Preferences")?></td>
   </tr>
-<?
-       $query = "select * from `addlang` where `userid`='".intval($_SESSION['profile']['id'])."'";
+<?php  $query = "select * from `addlang` where `userid`='".intval($_SESSION['profile']['id'])."'";
        $res = mysql_query($query);
        while($row = mysql_fetch_assoc($res))
        {
                $lang = mysql_fetch_assoc(mysql_query("select * from `languages` where `locale`='".mysql_escape_string($row['lang'])."'"));
 ?>
   <tr>
-    <td class="DataTD"><?=_("Additional Language")?>:</td>
-    <td class="DataTD" align="left"><? echo "${lang['lang']} - ${lang['country']}"; ?>
-               <a href="account.php?oldid=41&amp;action=dellang&amp;remove=<?=$row['lang']?>&amp;csrf=<?=make_csrf('seclang')?>"><?=_("Delete")?></a></td>
+    <td class="DataTD"><?php echo _("Additional Language")?>:</td>
+    <td class="DataTD" align="left"><?php echo "${lang['lang']} - ${lang['country']}"; ?>
+               <a href="account.php?oldid=41&amp;action=dellang&amp;remove=<?php echo $row['lang']?>&amp;csrf=<?php echo make_csrf('seclang')?>"><?php echo _("Delete")?></a></td>
   </tr>
-<? } ?>
+<?php } ?>
   <tr>
-    <td class="DataTD"><?=_("Secondary languages")?>:</td>
+    <td class="DataTD"><?php echo _("Secondary languages")?>:</td>
     <td class="DataTD"><select name="addlang">
-<?
-       $query = "select * from `languages` order by `locale`";
+<?php  $query = "select * from `languages` order by `locale`";
        $res = mysql_query($query);
        while($row = mysql_fetch_assoc($res))
        {
@@ -85,10 +82,10 @@ require_once($_SESSION['_config']['filepath'].'/includes/lib/l10n.php');
     </td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Add")?>"></td>
+    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?php echo _("Add")?>"></td>
   </tr>
 </table>
-<input type="hidden" name="oldid" value="<?=$id?>">
+<input type="hidden" name="oldid" value="<?php echo $id?>">
 <input type="hidden" name="action" value="addsec">
-<input type="hidden" name="csrf" value="<?=make_csrf('seclang')?>" />
+<input type="hidden" name="csrf" value="<?php echo make_csrf('seclang')?>" />
 </form>
index 8decae4..63ff969 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */ ?>
-<? if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "") { ?><div color="orange">ERROR: <?=$_SESSION['_config']['error']?></div><? unset($_SESSION['_config']['error']); } ?>
+<?php if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "") { ?><div color="orange">ERROR: <?php echo $_SESSION['_config']['error']?></div><?php unset($_SESSION['_config']['error']); } ?>
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="2" class="title"><?=_("Find User")?></td>
+    <td colspan="2" class="title"><?php echo _("Find User")?></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Email")?>:</td>
-    <td class="DataTD"><input type="text" name="email" value="<?=array_key_exists('email',$_POST)?sanitizeHTML($_POST['email']):''?>" size="30" title="<?=_("use % as wildcard")?>"></td>
+    <td class="DataTD"><?php echo _("Email")?>:</td>
+    <td class="DataTD"><input type="text" name="email" value="<?php echo array_key_exists('email',$_POST)?sanitizeHTML($_POST['email']):''?>" size="30" title="<?php echo _("use % as wildcard")?>"></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Next")?>"></td>
+    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?php echo _("Next")?>"></td>
   </tr>
 </table>
-<input type="hidden" name="oldid" value="<?=$id?>">
+<input type="hidden" name="oldid" value="<?php echo $id?>">
 </form>
index c889ce3..be5d963 100644 (file)
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
     LibreSSL - CAcert web application
     Copyright (C) 2004-2008  CAcert Inc.
 
@@ -68,40 +68,35 @@ if(intval(array_key_exists('userid',$_REQUEST)?$_REQUEST['userid']:0) <= 0)
 ?>
         <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
             <tr>
-                <td colspan="5" class="title"><?=_("Select Specific Account Details")?></td>
+                <td colspan="5" class="title"><?php echo _("Select Specific Account Details")?></td>
             </tr>
             <tr>
-                <td class="DataTD"><?=_("User ID")?></td>
-                <td class="DataTD"><?=_("Email")?></td>
+                <td class="DataTD"><?php echo _("User ID")?></td>
+                <td class="DataTD"><?php echo _("Email")?></td>
             </tr>
-<?
-        while($row = mysql_fetch_assoc($res))
+<?php         while($row = mysql_fetch_assoc($res))
         {
 ?>
             <tr>
-                <td class="DataTD"><a href="account.php?id=43&amp;userid=<?=intval($row['id'])?>"><?=intval($row['id'])?></a></td>
-                <td class="DataTD"><a href="account.php?id=43&amp;userid=<?=intval($row['id'])?>"><?=sanitizeHTML($row['email'])?></a></td>
+                <td class="DataTD"><a href="account.php?id=43&amp;userid=<?php echo intval($row['id'])?>"><?php echo intval($row['id'])?></a></td>
+                <td class="DataTD"><a href="account.php?id=43&amp;userid=<?php echo intval($row['id'])?>"><?php echo sanitizeHTML($row['email'])?></a></td>
             </tr>
-<?
-        }
+<?php         }
 
         if(mysql_num_rows($res) >= 100) {
 ?>
             <tr>
-                <td class="DataTD" colspan="2"><?=_("Only the first 100 rows are displayed.")?></td>
+                <td class="DataTD" colspan="2"><?php echo _("Only the first 100 rows are displayed.")?></td>
             </tr>
-<?
-        } else {
+<?php         } else {
 ?>
             <tr>
-                <td class="DataTD" colspan="2"><? printf(_("%s rows displayed."), mysql_num_rows($res)); ?></td>
+                <td class="DataTD" colspan="2"><?php printf(_("%s rows displayed."), mysql_num_rows($res)); ?></td>
             </tr>
-<?
-        }
+<?php         }
 ?>
         </table><br><br>
-<?
-    } elseif(mysql_num_rows($res) == 1) {
+<?php     } elseif(mysql_num_rows($res) == 1) {
         $row = mysql_fetch_assoc($res);
         $_REQUEST['userid'] = $row['id'];
     } else {
@@ -148,20 +143,20 @@ if(intval($_REQUEST['userid']) > 0) {
 //Ticket number
 ?>
 
-<form method="post" action="account.php?id=43&userid=<?=intval($_REQUEST['userid'])?>">
+<form method="post" action="account.php?id=43&userid=<?php echo intval($_REQUEST['userid'])?>">
     <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
         <tr>
-            <td colspan="2" class="title"><?=_('Ticket handling') ?></td>
+            <td colspan="2" class="title"><?php echo _('Ticket handling') ?></td>
         </tr>
         <tr>
-            <td class="DataTD"><?=_('Ticket no')?>:</td>
-            <td class="DataTD"><input type="text" name="ticketno" value="<?=sanitizeHTML($ticketno)?>"/></td>
+            <td class="DataTD"><?php echo _('Ticket no')?>:</td>
+            <td class="DataTD"><input type="text" name="ticketno" value="<?php echo sanitizeHTML($ticketno)?>"/></td>
         </tr>
         <tr>
-            <td colspan="2" class="DataTDError"><?=$ticketmsg?></td><?php $_SESSION['ticketmsg']='' ?>
+            <td colspan="2" class="DataTDError"><?php echo $ticketmsg?></td><?php $_SESSION['ticketmsg']='' ?>
         </tr>
         <tr>
-            <td colspan="2" ><input type="submit" value="<?=_('Set ticket number') ?>"></td>
+            <td colspan="2" ><input type="submit" value="<?php echo _('Set ticket number') ?>"></td>
         </tr>
     </table>
 </form>
@@ -171,47 +166,45 @@ if(intval($_REQUEST['userid']) > 0) {
 <!-- display data table -->
     <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
         <tr>
-            <td colspan="5" class="title"><? printf(_("%s's Account Details"), sanitizeHTML($row['email'])); ?></td>
+            <td colspan="5" class="title"><?php printf(_("%s's Account Details"), sanitizeHTML($row['email'])); ?></td>
         </tr>
         <tr>
-            <td class="DataTD"><?=_("Email")?>:</td>
-            <td class="DataTD"><?=sanitizeHTML($row['email'])?></td>
+            <td class="DataTD"><?php echo _("Email")?>:</td>
+            <td class="DataTD"><?php echo sanitizeHTML($row['email'])?></td>
         </tr>
         <tr>
-            <td class="DataTD"><?=_("First Name")?>:</td>
-            <td class="DataTD"><form method="post" action="account.php" onSubmit="if(!confirm('<?=_("Are you sure you want to modify this DOB and/or last name?")?>')) return false;">
-                <input type="hidden" name="csrf" value="<?=make_csrf('admchangepers')?>" />
-                <input type="text" name="fname" value="<?=sanitizeHTML($row['fname'])?>">
+            <td class="DataTD"><?php echo _("First Name")?>:</td>
+            <td class="DataTD"><form method="post" action="account.php" onSubmit="if(!confirm('<?php echo _("Are you sure you want to modify this DOB and/or last name?")?>')) return false;">
+                <input type="hidden" name="csrf" value="<?php echo make_csrf('admchangepers')?>" />
+                <input type="text" name="fname" value="<?php echo sanitizeHTML($row['fname'])?>">
             </td>
         </tr>
         <tr>
-            <td class="DataTD"><?=_("Middle Name")?>:</td>
-            <td class="DataTD"><input type="text" name="mname" value="<?=sanitizeHTML($row['mname'])?>"></td>
+            <td class="DataTD"><?php echo _("Middle Name")?>:</td>
+            <td class="DataTD"><input type="text" name="mname" value="<?php echo sanitizeHTML($row['mname'])?>"></td>
         </tr>
         <tr>
-            <td class="DataTD"><?=_("Last Name")?>:</td>
+            <td class="DataTD"><?php echo _("Last Name")?>:</td>
             <td class="DataTD">  <input type="hidden" name="oldid" value="43">
                 <input type="hidden" name="action" value="updatedob">
-                <input type="hidden" name="userid" value="<?=intval($userid)?>">
-                <input type="text" name="lname" value="<?=sanitizeHTML($row['lname'])?>">
+                <input type="hidden" name="userid" value="<?php echo intval($userid)?>">
+                <input type="text" name="lname" value="<?php echo sanitizeHTML($row['lname'])?>">
             </td>
         </tr>
         <tr>
-            <td class="DataTD"><?=_("Suffix")?>:</td>
-            <td class="DataTD"><input type="text" name="suffix" value="<?=sanitizeHTML($row['suffix'])?>"></td>
+            <td class="DataTD"><?php echo _("Suffix")?>:</td>
+            <td class="DataTD"><input type="text" name="suffix" value="<?php echo sanitizeHTML($row['suffix'])?>"></td>
         </tr>
         <tr>
-            <td class="DataTD"><?=_("Date of Birth")?>:</td>
+            <td class="DataTD"><?php echo _("Date of Birth")?>:</td>
             <td class="DataTD">
-                <?
-                $year = intval(substr($row['dob'], 0, 4));
+                <?php                 $year = intval(substr($row['dob'], 0, 4));
                 $month = intval(substr($row['dob'], 5, 2));
                 $day = intval(substr($row['dob'], 8, 2));
     ?>
                 <nobr>
                         <select name="day">
-    <?
-                for($i = 1; $i <= 31; $i++) {
+    <?php                 for($i = 1; $i <= 31; $i++) {
                     echo "<option";
                     if($day == $i) {
                         echo " selected='selected'";
@@ -221,8 +214,7 @@ if(intval($_REQUEST['userid']) > 0) {
     ?>
                         </select>
                         <select name="month">
-    <?
-                for($i = 1; $i <= 12; $i++) {
+    <?php                 for($i = 1; $i <= 12; $i++) {
                     echo "<option value='$i'";
                     if($month == $i)
                             echo " selected='selected'";
@@ -230,199 +222,190 @@ if(intval($_REQUEST['userid']) > 0) {
                 }
     ?>
                         </select>
-                        <input type="text" name="year" value="<?=$year?>" size="4">
+                        <input type="text" name="year" value="<?php echo $year?>" size="4">
                         <input type="submit" value="Go">
-                        <input type="hidden" name="ticketno" value="<?=sanitizeHTML($ticketno)?>"/>
+                        <input type="hidden" name="ticketno" value="<?php echo sanitizeHTML($ticketno)?>"/>
                     </form>
                 </nobr>
             </td>
         </tr>
 
-    <? // list of flags ?>
+    <?php // list of flags ?>
         <tr>
-            <td class="DataTD"><?=_("CCA accepted")?>:</td>
-            <td class="DataTD"><a href="account.php?id=57&amp;userid=<?=intval($row['id'])?>"><?=intval(get_user_agreement_status($row['id'], 'CCA')) ? _("Yes") : _("No") ?></a></td>
+            <td class="DataTD"><?php echo _("CCA accepted")?>:</td>
+            <td class="DataTD"><a href="account.php?id=57&amp;userid=<?php echo intval($row['id'])?>"><?php echo intval(get_user_agreement_status($row['id'], 'CCA')) ? _("Yes") : _("No") ?></a></td>
         </tr>
         <tr>
-            <td class="DataTD"><?=_("Trainings")?>:</td>
-            <td class="DataTD"><a href="account.php?id=55&amp;userid=<?=intval($row['id'])?>">show</a></td>
+            <td class="DataTD"><?php echo _("Trainings")?>:</td>
+            <td class="DataTD"><a href="account.php?id=55&amp;userid=<?php echo intval($row['id'])?>">show</a></td>
         </tr>
         <tr>
-            <td class="DataTD"><?=_("Is Assurer")?>:</td>
-            <td class="DataTD"><a href="account.php?id=43&amp;assurer=<?=intval($row['id'])?>&amp;csrf=<?=make_csrf('admsetassuret')?>&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=intval($row['assurer'])?></a></td>
+            <td class="DataTD"><?php echo _("Is Assurer")?>:</td>
+            <td class="DataTD"><a href="account.php?id=43&amp;assurer=<?php echo intval($row['id'])?>&amp;csrf=<?php echo make_csrf('admsetassuret')?>&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo intval($row['assurer'])?></a></td>
         </tr>
         <tr>
-            <td class="DataTD"><?=_("Blocked Assurer")?>:</td>
-            <td class="DataTD"><a href="account.php?id=43&amp;assurer_blocked=<?=intval($row['id'])?>&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=intval($row['assurer_blocked'])?></a></td>
+            <td class="DataTD"><?php echo _("Blocked Assurer")?>:</td>
+            <td class="DataTD"><a href="account.php?id=43&amp;assurer_blocked=<?php echo intval($row['id'])?>&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo intval($row['assurer_blocked'])?></a></td>
         </tr>
         <tr>
-            <td class="DataTD"><?=_("Account Locking")?>:</td>
-            <td class="DataTD"><a href="account.php?id=43&amp;locked=<?=intval($row['id'])?>&amp;csrf=<?=make_csrf('admactlock')?>&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=intval($row['locked'])?></a></td>
+            <td class="DataTD"><?php echo _("Account Locking")?>:</td>
+            <td class="DataTD"><a href="account.php?id=43&amp;locked=<?php echo intval($row['id'])?>&amp;csrf=<?php echo make_csrf('admactlock')?>&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo intval($row['locked'])?></a></td>
         </tr>
         <tr>
-            <td class="DataTD"><?=_("Code Signing")?>:</td>
-            <td class="DataTD"><a href="account.php?id=43&amp;codesign=<?=intval($row['id'])?>&amp;csrf=<?=make_csrf('admcodesign')?>&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=intval($row['codesign'])?></a></td>
+            <td class="DataTD"><?php echo _("Code Signing")?>:</td>
+            <td class="DataTD"><a href="account.php?id=43&amp;codesign=<?php echo intval($row['id'])?>&amp;csrf=<?php echo make_csrf('admcodesign')?>&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo intval($row['codesign'])?></a></td>
         </tr>
         <tr>
-            <td class="DataTD"><?=_("Org Assurer")?>:</td>
-            <td class="DataTD"><a href="account.php?id=43&amp;orgadmin=<?=intval($row['id'])?>&amp;csrf=<?=make_csrf('admorgadmin')?>&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=intval($row['orgadmin'])?></a></td>
+            <td class="DataTD"><?php echo _("Org Assurer")?>:</td>
+            <td class="DataTD"><a href="account.php?id=43&amp;orgadmin=<?php echo intval($row['id'])?>&amp;csrf=<?php echo make_csrf('admorgadmin')?>&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo intval($row['orgadmin'])?></a></td>
         </tr>
         <tr>
-            <td class="DataTD"><?=_("TTP Admin")?>:</td>
-            <td class="DataTD"><a href="account.php?id=43&amp;ttpadmin=<?=intval($row['id'])?>&amp;csrf=<?=make_csrf('admttpadmin')?>&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=intval($row['ttpadmin'])?></a></td>
+            <td class="DataTD"><?php echo _("TTP Admin")?>:</td>
+            <td class="DataTD"><a href="account.php?id=43&amp;ttpadmin=<?php echo intval($row['id'])?>&amp;csrf=<?php echo make_csrf('admttpadmin')?>&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo intval($row['ttpadmin'])?></a></td>
         </tr>
         <tr>
-            <td class="DataTD"><?=_("Location Admin")?>:</td>
-            <td class="DataTD"><a href="account.php?id=43&amp;locadmin=<?=intval($row['id'])?>&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=$row['locadmin']?></a></td>
+            <td class="DataTD"><?php echo _("Location Admin")?>:</td>
+            <td class="DataTD"><a href="account.php?id=43&amp;locadmin=<?php echo intval($row['id'])?>&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo $row['locadmin']?></a></td>
         </tr>
         <tr>
-            <td class="DataTD"><?=_("Admin")?>:</td>
-            <td class="DataTD"><a href="account.php?id=43&amp;admin=<?=intval($row['id'])?>&amp;csrf=<?=make_csrf('admsetadmin')?>&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=intval($row['admin'])?></a></td>
+            <td class="DataTD"><?php echo _("Admin")?>:</td>
+            <td class="DataTD"><a href="account.php?id=43&amp;admin=<?php echo intval($row['id'])?>&amp;csrf=<?php echo make_csrf('admsetadmin')?>&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo intval($row['admin'])?></a></td>
         </tr>
         <tr>
-            <td class="DataTD"><?=_("Ad Admin")?>:</td>
-            <td class="DataTD"><a href="account.php?id=43&amp;adadmin=<?=intval($row['id'])?>&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=intval($row['adadmin'])?></a> (0 = none, 1 = submit, 2 = approve)</td>
+            <td class="DataTD"><?php echo _("Ad Admin")?>:</td>
+            <td class="DataTD"><a href="account.php?id=43&amp;adadmin=<?php echo intval($row['id'])?>&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo intval($row['adadmin'])?></a> (0 = none, 1 = submit, 2 = approve)</td>
         </tr>
     <!-- presently not needed
         <tr>
-            <td class="DataTD"><?=_("Tverify Account")?>:</td>
-            <td class="DataTD"><a href="account.php?id=43&amp;tverify=<?=intval($row['id'])?>&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=intval($row['tverify'])?></a></td>
+            <td class="DataTD"><?php echo _("Tverify Account")?>:</td>
+            <td class="DataTD"><a href="account.php?id=43&amp;tverify=<?php echo intval($row['id'])?>&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo intval($row['tverify'])?></a></td>
         </tr>
     -->
         <tr>
-            <td class="DataTD"><?=_("General Announcements")?>:</td>
-            <td class="DataTD"><a href="account.php?id=43&amp;general=<?=intval($row['id'])?>&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=intval($alerts['general'])?></a></td>
+            <td class="DataTD"><?php echo _("General Announcements")?>:</td>
+            <td class="DataTD"><a href="account.php?id=43&amp;general=<?php echo intval($row['id'])?>&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo intval($alerts['general'])?></a></td>
         </tr>
         <tr>
-            <td class="DataTD"><?=_("Country Announcements")?>:</td>
-            <td class="DataTD"><a href="account.php?id=43&amp;country=<?=intval($row['id'])?>&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=intval($alerts['country'])?></a></td>
+            <td class="DataTD"><?php echo _("Country Announcements")?>:</td>
+            <td class="DataTD"><a href="account.php?id=43&amp;country=<?php echo intval($row['id'])?>&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo intval($alerts['country'])?></a></td>
         </tr>
         <tr>
-            <td class="DataTD"><?=_("Regional Announcements")?>:</td>
-            <td class="DataTD"><a href="account.php?id=43&amp;regional=<?=intval($row['id'])?>&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=intval($alerts['regional'])?></a></td>
+            <td class="DataTD"><?php echo _("Regional Announcements")?>:</td>
+            <td class="DataTD"><a href="account.php?id=43&amp;regional=<?php echo intval($row['id'])?>&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo intval($alerts['regional'])?></a></td>
         </tr>
         <tr>
-            <td class="DataTD"><?=_("Within 200km Announcements")?>:</td>
-            <td class="DataTD"><a href="account.php?id=43&amp;radius=<?=intval($row['id'])?>&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=intval($alerts['radius'])?></a></td>
+            <td class="DataTD"><?php echo _("Within 200km Announcements")?>:</td>
+            <td class="DataTD"><a href="account.php?id=43&amp;radius=<?php echo intval($row['id'])?>&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo intval($alerts['radius'])?></a></td>
         </tr>
-    <? //change password, view secret questions and delete account section ?>
+    <?php //change password, view secret questions and delete account section ?>
         <tr>
-            <td class="DataTD"><?=_("Change Password")?>:</td>
-            <td class="DataTD"><a href="account.php?id=44&amp;userid=<?=intval($row['id'])?>&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=_("Change Password")?></a></td>
+            <td class="Da