summaryrefslogtreecommitdiff
path: root/pages
diff options
context:
space:
mode:
Diffstat (limited to 'pages')
-rw-r--r--pages/account/0.php32
-rw-r--r--pages/account/1.php16
-rw-r--r--pages/account/10.php52
-rw-r--r--pages/account/11.php27
-rw-r--r--pages/account/12.php79
-rw-r--r--pages/account/13.php111
-rw-r--r--pages/account/14.php27
-rw-r--r--pages/account/15.php15
-rw-r--r--pages/account/16.php64
-rw-r--r--pages/account/17.php6
-rw-r--r--pages/account/18.php126
-rw-r--r--pages/account/19.php32
-rw-r--r--pages/account/2.php49
-rw-r--r--pages/account/20.php40
-rw-r--r--pages/account/21.php19
-rw-r--r--pages/account/22.php110
-rw-r--r--pages/account/23.php15
-rw-r--r--pages/account/24.php23
-rw-r--r--pages/account/25.php55
-rw-r--r--pages/account/26.php30
-rw-r--r--pages/account/27.php40
-rw-r--r--pages/account/28.php19
-rw-r--r--pages/account/29.php29
-rw-r--r--pages/account/3.php114
-rw-r--r--pages/account/30.php29
-rw-r--r--pages/account/31.php19
-rw-r--r--pages/account/32.php46
-rw-r--r--pages/account/33.php29
-rw-r--r--pages/account/34.php25
-rw-r--r--pages/account/35.php74
-rw-r--r--pages/account/36.php18
-rw-r--r--pages/account/37.php5
-rw-r--r--pages/account/38.php2
-rw-r--r--pages/account/39.php5
-rw-r--r--pages/account/4.php2
-rw-r--r--pages/account/40.php50
-rw-r--r--pages/account/41.php49
-rw-r--r--pages/account/42.php14
-rw-r--r--pages/account/43.php663
-rw-r--r--pages/account/44.php25
-rw-r--r--pages/account/45.php8
-rw-r--r--pages/account/48.php14
-rw-r--r--pages/account/49.php73
-rw-r--r--pages/account/5.php95
-rw-r--r--pages/account/50.php20
-rw-r--r--pages/account/51.php19
-rw-r--r--pages/account/52.php57
-rw-r--r--pages/account/53.php26
-rw-r--r--pages/account/54.php119
-rw-r--r--pages/account/55.php68
-rw-r--r--pages/account/56.php26
-rw-r--r--pages/account/57.php64
-rw-r--r--pages/account/58.php30
-rw-r--r--pages/account/59.php202
-rw-r--r--pages/account/6.php44
-rw-r--r--pages/account/7.php18
-rw-r--r--pages/account/8.php18
-rw-r--r--pages/account/9.php37
-rw-r--r--pages/advertising/0.php32
-rw-r--r--pages/advertising/1.php15
-rw-r--r--pages/disputes/0.php14
-rw-r--r--pages/disputes/1.php16
-rw-r--r--pages/disputes/2.php16
-rw-r--r--pages/disputes/4.php20
-rw-r--r--pages/disputes/5.php16
-rw-r--r--pages/disputes/6.php20
-rw-r--r--pages/gpg/0.php16
-rw-r--r--pages/gpg/2.php65
-rw-r--r--pages/gpg/3.php15
-rw-r--r--pages/help/0.php5
-rw-r--r--pages/help/2.php5
-rw-r--r--pages/help/3.php5
-rw-r--r--pages/help/4.php5
-rw-r--r--pages/help/5.php5
-rw-r--r--pages/help/6.php5
-rw-r--r--pages/help/7.php5
-rw-r--r--pages/help/8.php5
-rw-r--r--pages/help/9.php5
-rw-r--r--pages/index/0.php47
-rw-r--r--pages/index/1.php110
-rw-r--r--pages/index/10.php2
-rw-r--r--pages/index/11.php50
-rw-r--r--pages/index/12.php5
-rw-r--r--pages/index/13.php21
-rw-r--r--pages/index/16.php42
-rw-r--r--pages/index/17.php12
-rw-r--r--pages/index/18.php7
-rw-r--r--pages/index/19.php5
-rw-r--r--pages/index/2.php4
-rw-r--r--pages/index/21.php14
-rw-r--r--pages/index/3.php38
-rw-r--r--pages/index/4.php37
-rw-r--r--pages/index/47.php42
-rw-r--r--pages/index/5.php24
-rw-r--r--pages/index/51.php30
-rw-r--r--pages/index/52.php18
-rw-r--r--pages/index/6.php33
-rw-r--r--pages/index/7.php22
-rw-r--r--pages/index/8.php5
-rw-r--r--pages/index/feed.rss21
-rw-r--r--pages/wot/0.php6
-rw-r--r--pages/wot/1.php53
-rw-r--r--pages/wot/10.php107
-rw-r--r--pages/wot/12.php65
-rw-r--r--pages/wot/13.php50
-rw-r--r--pages/wot/15.php2
-rw-r--r--pages/wot/2.php16
-rw-r--r--pages/wot/3.php40
-rw-r--r--pages/wot/4.php49
-rw-r--r--pages/wot/5.php48
-rw-r--r--pages/wot/6.php5
-rw-r--r--pages/wot/8.php24
-rw-r--r--pages/wot/9.php63
113 files changed, 2183 insertions, 2347 deletions
diff --git a/pages/account/0.php b/pages/account/0.php
index b9b150c..d059e1a 100644
--- a/pages/account/0.php
+++ b/pages/account/0.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,18 +15,18 @@
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>
diff --git a/pages/account/1.php b/pages/account/1.php
index f3cd1f2..b151e1c 100644
--- a/pages/account/1.php
+++ b/pages/account/1.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -18,18 +18,18 @@
<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>
diff --git a/pages/account/10.php b/pages/account/10.php
index 17999a7..afa4f3c 100644
--- a/pages/account/10.php
+++ b/pages/account/10.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -17,68 +17,66 @@
*/
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>
diff --git a/pages/account/11.php b/pages/account/11.php
index 5f94122..fbcc201 100644
--- a/pages/account/11.php
+++ b/pages/account/11.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -17,12 +17,11 @@
*/ ?>
<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 }
diff --git a/pages/account/12.php b/pages/account/12.php
index f4428aa..e137511 100644
--- a/pages/account/12.php
+++ b/pages/account/12.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,23 +15,22 @@
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`,
@@ -49,15 +48,15 @@
}
$query .= "ORDER BY `modified` desc";
//echo $query."<br>\n";
- $res = mysql_query($query);
- if(mysql_num_rows($res) <= 0)
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) <= 0)
{
?>
<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 {
- while($row = mysql_fetch_assoc($res))
+<?php } else {
+ while($row = mysqli_fetch_assoc($res))
{
if($row['timeleft'] > 0)
$verified = _("Valid");
@@ -71,42 +70,42 @@
$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>
diff --git a/pages/account/13.php b/pages/account/13.php
index ea28c0e..f238ef2 100644
--- a/pages/account/13.php
+++ b/pages/account/13.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,10 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<?
- $query = "select * from `users` where `id`='".intval($_SESSION['profile']['id'])."' and `users`.`deleted`=0";
- $res = mysql_query($query);
- $user = mysql_fetch_assoc($res);
+<?php $query = "select * from `users` where `id`='".intval($_SESSION['profile']['id'])."' and `users`.`deleted`=0";
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ $user = mysqli_fetch_assoc($res);
$year = intval(substr($user['dob'], 0, 4));
$month = intval(substr($user['dob'], 5, 2));
@@ -47,34 +46,33 @@
<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)
@@ -94,71 +91,71 @@
}
?>
</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>
diff --git a/pages/account/14.php b/pages/account/14.php
index 29aeb21..a2968a3 100644
--- a/pages/account/14.php
+++ b/pages/account/14.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,42 +15,41 @@
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>
diff --git a/pages/account/15.php b/pages/account/15.php
index 405cb44..31ef310 100644
--- a/pages/account/15.php
+++ b/pages/account/15.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,24 +15,23 @@
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
`domains`.`id`=`domaincerts`.`domid`";
- $res = mysql_query($query);
- if(mysql_num_rows($res) <= 0)
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) <= 0)
{
echo _("No such certificate attached to your account.");
showfooter();
exit;
}
- $row = mysql_fetch_assoc($res);
+ $row = mysqli_fetch_assoc($res);
$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>
diff --git a/pages/account/16.php b/pages/account/16.php
index 829897f..5e04d7b 100644
--- a/pages/account/16.php
+++ b/pages/account/16.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -20,35 +20,33 @@
<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)
diff --git a/pages/account/17.php b/pages/account/17.php
index 0d5c2c7..c1e6263 100644
--- a/pages/account/17.php
+++ b/pages/account/17.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -19,10 +19,10 @@
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>
diff --git a/pages/account/18.php b/pages/account/18.php
index ca0a3c8..0ecffb4 100644
--- a/pages/account/18.php
+++ b/pages/account/18.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -23,23 +23,23 @@ $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` ";
- $reso = mysql_query($query);
- if(mysql_num_rows($reso) >= 1){
- while($row = mysql_fetch_assoc($reso)){
+ $reso = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($reso) >= 1){
+ while($row = mysqli_fetch_assoc($reso)){
printf('<option value="%d"%s>%s</option>',$row['id'], $row['id'] == $orgfilterid ? " selected" : "" , $row['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`,
@@ -106,17 +105,17 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c
$query .= "ORDER BY `orginfo`.`O`, `oemail`.`CN`, `modified` desc";
break;
}
- $res = mysql_query($query);
- if(mysql_num_rows($res) <= 0)
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) <= 0)
{
?>
<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))
+ while($row = mysqli_fetch_assoc($res))
{
if ($row['O']<>$orgname) {
$orgname=$row['O'];?>
@@ -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')?>" />
-</form> \ No newline at end of file
+<input type="hidden" name="oldid" value="<?php echo $id?>">
+<input type="hidden" name="csrf" value="<?php echo make_csrf('clicerchange')?>" />
+</form>
diff --git a/pages/account/19.php b/pages/account/19.php
index d7259f3..9b87d6c 100644
--- a/pages/account/19.php
+++ b/pages/account/19.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,21 +15,20 @@
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
`org`.`orgid`=`orgemailcerts`.`orgid`";
- $res = mysql_query($query);
- if(mysql_num_rows($res) <= 0)
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) <= 0)
{
showheader(_("My CAcert.org Account!"));
echo _("No such certificate attached to your account.");
showfooter();
exit;
}
- $row = mysql_fetch_assoc($res);
+ $row = mysqli_fetch_assoc($res);
$crtname=escapeshellarg($row['crt_name']);
$cert = shell_exec("/usr/bin/openssl x509 -in $crtname");
@@ -59,15 +58,15 @@
} 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)
{
@@ -102,18 +100,18 @@
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;
}
diff --git a/pages/account/2.php b/pages/account/2.php
index 36421f9..f6a99ea 100644
--- a/pages/account/2.php
+++ b/pages/account/2.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -18,18 +18,17 @@
<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";
- $res = mysql_query($query);
- while($row = mysql_fetch_assoc($res))
+<?php $query = "select * from `email` where `memid`='".intval($_SESSION['profile']['id'])."' and `deleted`=0";
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ while($row = mysqli_fetch_assoc($res))
{
if($row['hash'] == "")
$verified = _("Verified");
@@ -37,25 +36,25 @@
$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>
diff --git a/pages/account/20.php b/pages/account/20.php
index 89bbc30..42cfc42 100644
--- a/pages/account/20.php
+++ b/pages/account/20.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -17,60 +17,58 @@
*/
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">
diff --git a/pages/account/21.php b/pages/account/21.php
index c5832b9..eed4b6a 100644
--- a/pages/account/21.php
+++ b/pages/account/21.php
@@ -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>
diff --git a/pages/account/22.php b/pages/account/22.php
index 7b7db2d..2f63b2b 100644
--- a/pages/account/22.php
+++ b/pages/account/22.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -23,23 +23,23 @@ $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` ";
- $reso = mysql_query($query);
- if(mysql_num_rows($reso) >= 1){
- while($row = mysql_fetch_assoc($reso)){
+ $reso = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($reso) >= 1){
+ while($row = mysqli_fetch_assoc($reso)){
printf('<option value="%d"%s>%s</option>',$row['id'], $row['id'] == $orgfilterid ? " selected" : "" , $row['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`,
@@ -109,16 +108,16 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_
//echo $query."<br>\n";
- $res = mysql_query($query);
- if(mysql_num_rows($res) <= 0)
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) <= 0)
{
?>
<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))
+ while($row = mysqli_fetch_assoc($res))
{
if ($row['O']<>$orgname) {
$orgname=$row['O'];?>
@@ -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>
diff --git a/pages/account/23.php b/pages/account/23.php
index 4255b47..08b18d1 100644
--- a/pages/account/23.php
+++ b/pages/account/23.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,24 +15,23 @@
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
`org`.`orgid`=`orgdomaincerts`.`orgid`";
- $res = mysql_query($query);
- if(mysql_num_rows($res) <= 0)
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) <= 0)
{
echo _("No such certificate attached to your account.");
showfooter();
exit;
}
- $row = mysql_fetch_assoc($res);
+ $row = mysqli_fetch_assoc($res);
$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>
diff --git a/pages/account/24.php b/pages/account/24.php
index 14a47c0..fe5b485 100644
--- a/pages/account/24.php
+++ b/pages/account/24.php
@@ -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'] = "";
@@ -28,26 +27,26 @@
<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">',
@@ -55,12 +54,12 @@
</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>
diff --git a/pages/account/25.php b/pages/account/25.php
index a70f608..19279ad 100644
--- a/pages/account/25.php
+++ b/pages/account/25.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -17,26 +17,25 @@
*/ ?>
<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']);
}
@@ -54,23 +53,23 @@
// Safe because $order_by only contains fixed strings
$query = sprintf("select * from `orginfo` ORDER BY %s", $order_by);
- $res = mysql_query($query);
- while($row = mysql_fetch_assoc($res))
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ while($row = mysqli_fetch_assoc($res))
{
- $r2 = mysql_query("select * from `org` where `orgid`='".intval($row['id'])."'");
- $admincount = mysql_num_rows($r2);
- $r2 = mysql_query("select * from `orgdomains` where `orgid`='".intval($row['id'])."'");
- $domcount = mysql_num_rows($r2);
+ $r2 = mysqli_query($_SESSION['mconn'], "select * from `org` where `orgid`='".intval($row['id'])."'");
+ $admincount = mysqli_num_rows($r2);
+ $r2 = mysqli_query($_SESSION['mconn'], "select * from `orgdomains` where `orgid`='".intval($row['id'])."'");
+ $domcount = mysqli_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>
diff --git a/pages/account/26.php b/pages/account/26.php
index f8b195d..b60bcc2 100644
--- a/pages/account/26.php
+++ b/pages/account/26.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,28 +15,26 @@
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'])."'";
- $row = mysql_fetch_assoc(mysql_query($query));
+<?php $query = "select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'";
+ $row = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], $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'])."'";
- $res = mysql_query($query);
- while($row = mysql_fetch_assoc($res))
+<?php $query = "select * from `orgdomains` where `orgid`='".intval($_REQUEST['orgid'])."'";
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ while($row = mysqli_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>
diff --git a/pages/account/27.php b/pages/account/27.php
index a1086d4..a2abc40 100644
--- a/pages/account/27.php
+++ b/pages/account/27.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,47 +15,47 @@
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'])."'"));
+ $row = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], "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>
diff --git a/pages/account/28.php b/pages/account/28.php
index 1212f9c..9fb5ae1 100644
--- a/pages/account/28.php
+++ b/pages/account/28.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,24 +15,23 @@
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'])."'";
- $row = mysql_fetch_assoc(mysql_query($query));
+<?php $query = "select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'";
+ $row = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], $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>
diff --git a/pages/account/29.php b/pages/account/29.php
index 4229b3b..cd6b0b7 100644
--- a/pages/account/29.php
+++ b/pages/account/29.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,32 +15,31 @@
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'])."'";
- $row = mysql_fetch_assoc(mysql_query($query));
+<?php $query = "select * from `orgdomains` where `id`='".intval($_REQUEST['domid'])."'";
+ $row = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], $query));
$query = "select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'";
- $org = mysql_fetch_assoc(mysql_query($query));
+ $org = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], $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>
diff --git a/pages/account/3.php b/pages/account/3.php
index cd62ce0..f222971 100644
--- a/pages/account/3.php
+++ b/pages/account/3.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -17,35 +17,34 @@
*/
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`=''";
- $res = mysql_query($query);
- while($row = mysql_fetch_assoc($res))
+<?php $query = "select * from `email` where `memid`='".intval($_SESSION['profile']['id'])."' and `deleted`=0 and `hash`=''";
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ while($row = mysqli_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">
diff --git a/pages/account/30.php b/pages/account/30.php
index 04ad229..d43abe8 100644
--- a/pages/account/30.php
+++ b/pages/account/30.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,32 +15,31 @@
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'])."'";
- $row = mysql_fetch_assoc(mysql_query($query));
+<?php $query = "select * from `orgdomains` where `id`='".intval($_REQUEST['domid'])."'";
+ $row = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], $query));
$query = "select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'";
- $org = mysql_fetch_assoc(mysql_query($query));
+ $org = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], $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>
diff --git a/pages/account/31.php b/pages/account/31.php
index 9f3d27e..3df4400 100644
--- a/pages/account/31.php
+++ b/pages/account/31.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,25 +15,24 @@
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'])."'";
- $org = mysql_fetch_assoc(mysql_query($query));
+<?php $query = "select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'";
+ $org = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], $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>
diff --git a/pages/account/32.php b/pages/account/32.php
index a05c927..4ae3185 100644
--- a/pages/account/32.php
+++ b/pages/account/32.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,38 +15,36 @@
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'])."'";
- $row = mysql_fetch_assoc(mysql_query($query));
+<?php $query = "select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'";
+ $row = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], $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'])."'";
- $res = mysql_query($query);
- while($row = mysql_fetch_assoc($res))
+<?php $query = "select * from `org` where `orgid`='".intval($_REQUEST['orgid'])."'";
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ while($row = mysqli_fetch_assoc($res))
{
- $user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".intval($row['memid'])."'"));
+ $user = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], "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>
diff --git a/pages/account/33.php b/pages/account/33.php
index 9e2f67a..3769372 100644
--- a/pages/account/33.php
+++ b/pages/account/33.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,9 +15,8 @@
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'])."'";
- $row = mysql_fetch_assoc(mysql_query($query));
+<?php $query = "select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'";
+ $row = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], $query));
// Reset session variables regarding OrgAdmin's, present empty form
if (array_key_exists('email',$_SESSION['_config'])) $_SESSION['_config']['email']="";
@@ -27,36 +26,36 @@
?>
<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>
diff --git a/pages/account/34.php b/pages/account/34.php
index b11bc7d..26d47f9 100644
--- a/pages/account/34.php
+++ b/pages/account/34.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,31 +15,30 @@
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'])."'";
- $row = mysql_fetch_assoc(mysql_query($query));
+<?php $query = "select * from `orgdomains` where `id`='".intval($_REQUEST['orgid'])."'";
+ $row = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], $query));
$query = "select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'";
- $org = mysql_fetch_assoc(mysql_query($query));
+ $org = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], $query));
$query = "select * from `users` where `id`='".intval($_REQUEST['memid'])."'";
- $user = mysql_fetch_assoc(mysql_query($query));
+ $user = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], $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>
diff --git a/pages/account/35.php b/pages/account/35.php
index 05c7f2b..83b6f77 100644
--- a/pages/account/35.php
+++ b/pages/account/35.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -18,86 +18,80 @@
<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'])."'";
-$res = mysql_query($query);
-while($row = mysql_fetch_assoc($res))
+$res = mysqli_query($_SESSION['mconn'], $query);
+while($row = mysqli_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);
- while($domain = mysql_fetch_assoc($res1))
+ $res1 = mysqli_query($_SESSION['mconn'], $query);
+ while($domain = mysqli_fetch_assoc($res1))
{
?>
<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);
- while($org = mysql_fetch_assoc($res2))
+ $res2 = mysqli_query($_SESSION['mconn'], $query);
+ while($org = mysqli_fetch_assoc($res2))
{
- $user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".intval($org['memid'])."'"));
+ $user = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], "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>
diff --git a/pages/account/36.php b/pages/account/36.php
index be0f590..e9400dd 100644
--- a/pages/account/36.php
+++ b/pages/account/36.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -18,18 +18,18 @@
<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>
diff --git a/pages/account/37.php b/pages/account/37.php
index 48c737a..c9b1b52 100644
--- a/pages/account/37.php
+++ b/pages/account/37.php
@@ -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>');
?>
diff --git a/pages/account/38.php b/pages/account/38.php
index 7caddb0..2bcb77c 100644
--- a/pages/account/38.php
+++ b/pages/account/38.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
diff --git a/pages/account/39.php b/pages/account/39.php
index 9e09bb8..dbceaa4 100644
--- a/pages/account/39.php
+++ b/pages/account/39.php
@@ -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>');
?>
diff --git a/pages/account/4.php b/pages/account/4.php
index 8ac8b65..eb90b65 100644
--- a/pages/account/4.php
+++ b/pages/account/4.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
diff --git a/pages/account/40.php b/pages/account/40.php
index a809595..f37548f 100644
--- a/pages/account/40.php
+++ b/pages/account/40.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -17,18 +17,18 @@
*/
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;
diff --git a/pages/account/41.php b/pages/account/41.php
index d61d8db..4398f6a 100644
--- a/pages/account/41.php
+++ b/pages/account/41.php
@@ -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,38 +39,36 @@ 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'])."'";
- $res = mysql_query($query);
- while($row = mysql_fetch_assoc($res))
+<?php $query = "select * from `addlang` where `userid`='".intval($_SESSION['profile']['id'])."'";
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ while($row = mysqli_fetch_assoc($res))
{
- $lang = mysql_fetch_assoc(mysql_query("select * from `languages` where `locale`='".mysql_escape_string($row['lang'])."'"));
+ $lang = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], "select * from `languages` where `locale`='".mysqli_real_escape_string($_SESSION['mconn'], $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`";
- $res = mysql_query($query);
- while($row = mysql_fetch_assoc($res))
+<?php $query = "select * from `languages` order by `locale`";
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ while($row = mysqli_fetch_assoc($res))
{
printf("<option value=\"%s\">[%s] %s (%s)</option>\n",
sanitizeHTML($row['locale']),
@@ -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>
diff --git a/pages/account/42.php b/pages/account/42.php
index 8decae4..63ff969 100644
--- a/pages/account/42.php
+++ b/pages/account/42.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,19 +15,19 @@
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>
diff --git a/pages/account/43.php b/pages/account/43.php
index c889ce3..1faf2a7 100644
--- a/pages/account/43.php
+++ b/pages/account/43.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -37,7 +37,7 @@ if(intval(array_key_exists('userid',$_REQUEST)?$_REQUEST['userid']:0) <= 0)
{
$_REQUEST['userid'] = 0;
- $emailsearch = $email = mysql_real_escape_string(stripslashes($_REQUEST['email']));
+ $emailsearch = $email = mysqli_real_escape_string($_SESSION['mconn'], stripslashes($_REQUEST['email']));
//Disabled to speed up the queries
//if(!strstr($email, "%"))
@@ -63,46 +63,43 @@ if(intval(array_key_exists('userid',$_REQUEST)?$_REQUEST['userid']:0) <= 0)
group by `users`.`id` limit 100";
}
// bug-975 ted+uli changes --- end
- $res = mysql_query($query);
- if(mysql_num_rows($res) > 1) {
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) > 1) {
?>
<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 = mysqli_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) {
+ if(mysqli_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."), mysqli_num_rows($res)); ?></td>
</tr>
-<?
- }
+<?php }
?>
</table><br><br>
-<?
- } elseif(mysql_num_rows($res) == 1) {
- $row = mysql_fetch_assoc($res);
+<?php
+ } elseif(mysqli_num_rows($res) == 1) {
+ $row = mysqli_fetch_assoc($res);
$_REQUEST['userid'] = $row['id'];
} else {
printf(_("No users found matching %s"), sanitizeHTML($email));
@@ -113,13 +110,13 @@ if(intval(array_key_exists('userid',$_REQUEST)?$_REQUEST['userid']:0) <= 0)
if(intval($_REQUEST['userid']) > 0) {
$userid = intval($_REQUEST['userid']);
$res =get_user_data($userid);
- if(mysql_num_rows($res) <= 0) {
+ if(mysqli_num_rows($res) <= 0) {
echo _("I'm sorry, the user you were looking for seems to have disappeared! Bad things are afoot!");
} else {
- $row = mysql_fetch_assoc($res);
+ $row = mysqli_fetch_assoc($res);
$query = "select sum(`points`) as `points` from `notary` where `to`='".intval($row['id'])."' and `deleted` = 0";
- $dres = mysql_query($query);
- $drow = mysql_fetch_assoc($dres);
+ $dres = mysqli_query($_SESSION['mconn'], $query);
+ $drow = mysqli_fetch_assoc($dres);
$alerts =get_alerts(intval($row['id']));
//display account data
@@ -132,11 +129,11 @@ if(intval($_REQUEST['userid']) > 0) {
} else {
$assurance = intval($_REQUEST['assurance']);
$trow = 0;
- $res = mysql_query("select `to` from `notary` where `id`='".intval($assurance)."' and `deleted` = 0");
+ $res = mysqli_query($_SESSION['mconn'], "select `to` from `notary` where `id`='".intval($assurance)."' and `deleted` = 0");
if ($res) {
- $trow = mysql_fetch_assoc($res);
+ $trow = mysqli_fetch_assoc($res);
if ($trow) {
- mysql_query("update `notary` set `deleted`=NOW() where `id`='".intval($assurance)."'");
+ mysqli_query($_SESSION['mconn'], "update `notary` set `deleted`=NOW() where `id`='".intval($assurance)."'");
fix_assurer_flag($trow['to']);
}
}
@@ -148,20 +145,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 +168,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 +216,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,231 +224,220 @@ 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="DataTD"><?php echo _("Change Password")?>:</td>
+ <td class="DataTD"><a href="account.php?id=44&amp;userid=<?php echo intval($row['id'])?>&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo _("Change Password")?></a></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Delete Account")?>:</td>
- <td class="DataTD"><a href="account.php?id=50&amp;userid=<?=intval($row['id'])?>&amp;csrf=<?=make_csrf('admdelaccount')?>&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=_("Delete Account")?></a></td>
+ <td class="DataTD"><?php echo _("Delete Account")?>:</td>
+ <td class="DataTD"><a href="account.php?id=50&amp;userid=<?php echo intval($row['id'])?>&amp;csrf=<?php echo make_csrf('admdelaccount')?>&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo _("Delete Account")?></a></td>
</tr>
- <?
- // This is intensionally a $_GET for audit purposes. DO NOT CHANGE!!!
+ <?php // This is intensionally a $_GET for audit purposes. DO NOT CHANGE!!!
if(array_key_exists('showlostpw',$_GET) && $_GET['showlostpw'] == "yes" && $ticketvalidation==true) {
if (!write_se_log($userid, $_SESSION['profile']['id'], 'SE view lost password information', $ticketno)) {
?>
<tr>
- <td class="DataTD" colspan="2"><?=_("Writing to the admin log failed. Can't continue.")?></td>
+ <td class="DataTD" colspan="2"><?php echo _("Writing to the admin log failed. Can't continue.")?></td>
</tr>
<tr>
- <td class="DataTD" colspan="2"><a href="account.php?id=43&amp;userid=<?=intval($row['id'])?>&amp;showlostpw=yes&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=_("Show Lost Password Details")?></a></td>
+ <td class="DataTD" colspan="2"><a href="account.php?id=43&amp;userid=<?php echo intval($row['id'])?>&amp;showlostpw=yes&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo _("Show Lost Password Details")?></a></td>
</tr>
- <?
- } else {
+ <?php } else {
?>
<tr>
- <td class="DataTD"><?=_("Lost Password")?> - Q1:</td>
- <td class="DataTD"><?=sanitizeHTML($row['Q1'])?></td>
+ <td class="DataTD"><?php echo _("Lost Password")?> - Q1:</td>
+ <td class="DataTD"><?php echo sanitizeHTML($row['Q1'])?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Lost Password")?> - A1:</td>
- <td class="DataTD"><?=sanitizeHTML($row['A1'])?></td>
+ <td class="DataTD"><?php echo _("Lost Password")?> - A1:</td>
+ <td class="DataTD"><?php echo sanitizeHTML($row['A1'])?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Lost Password")?> - Q2:</td>
- <td class="DataTD"><?=sanitizeHTML($row['Q2'])?></td>
+ <td class="DataTD"><?php echo _("Lost Password")?> - Q2:</td>
+ <td class="DataTD"><?php echo sanitizeHTML($row['Q2'])?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Lost Password")?> - A2:</td>
- <td class="DataTD"><?=sanitizeHTML($row['A2'])?></td>
+ <td class="DataTD"><?php echo _("Lost Password")?> - A2:</td>
+ <td class="DataTD"><?php echo sanitizeHTML($row['A2'])?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Lost Password")?> - Q3:</td>
- <td class="DataTD"><?=sanitizeHTML($row['Q3'])?></td>
+ <td class="DataTD"><?php echo _("Lost Password")?> - Q3:</td>
+ <td class="DataTD"><?php echo sanitizeHTML($row['Q3'])?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Lost Password")?> - A3:</td>
- <td class="DataTD"><?=sanitizeHTML($row['A3'])?></td>
+ <td class="DataTD"><?php echo _("Lost Password")?> - A3:</td>
+ <td class="DataTD"><?php echo sanitizeHTML($row['A3'])?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Lost Password")?> - Q4:</td>
- <td class="DataTD"><?=sanitizeHTML($row['Q4'])?></td>
+ <td class="DataTD"><?php echo _("Lost Password")?> - Q4:</td>
+ <td class="DataTD"><?php echo sanitizeHTML($row['Q4'])?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Lost Password")?> - A4:</td>
- <td class="DataTD"><?=sanitizeHTML($row['A4'])?></td>
+ <td class="DataTD"><?php echo _("Lost Password")?> - A4:</td>
+ <td class="DataTD"><?php echo sanitizeHTML($row['A4'])?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Lost Password")?> - Q5:</td>
- <td class="DataTD"><?=sanitizeHTML($row['Q5'])?></td>
+ <td class="DataTD"><?php echo _("Lost Password")?> - Q5:</td>
+ <td class="DataTD"><?php echo sanitizeHTML($row['Q5'])?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Lost Password")?> - A5:</td>
- <td class="DataTD"><?=sanitizeHTML($row['A5'])?></td>
+ <td class="DataTD"><?php echo _("Lost Password")?> - A5:</td>
+ <td class="DataTD"><?php echo sanitizeHTML($row['A5'])?></td>
</tr>
- <?
- }
+ <?php }
} elseif (array_key_exists('showlostpw',$_GET) && $_GET['showlostpw'] == "yes" && $ticketvalidation==false) {
?>
<tr>
- <td class="DataTD" colspan="2"><?=_('No access granted. Ticket number is missing')?></td>
+ <td class="DataTD" colspan="2"><?php echo _('No access granted. Ticket number is missing')?></td>
</tr>
<tr>
- <td class="DataTD" colspan="2"><a href="account.php?id=43&amp;userid=<?=intval($row['id'])?>&amp;showlostpw=yes&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=_("Show Lost Password Details")?></a></td>
+ <td class="DataTD" colspan="2"><a href="account.php?id=43&amp;userid=<?php echo intval($row['id'])?>&amp;showlostpw=yes&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo _("Show Lost Password Details")?></a></td>
</tr>
- <?
- } else {
+ <?php } else {
?>
<tr>
- <td class="DataTD" colspan="2"><a href="account.php?id=43&amp;userid=<?=intval($row['id'])?>&amp;showlostpw=yes&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=_("Show Lost Password Details")?></a></td>
+ <td class="DataTD" colspan="2"><a href="account.php?id=43&amp;userid=<?php echo intval($row['id'])?>&amp;showlostpw=yes&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo _("Show Lost Password Details")?></a></td>
</tr>
- <? }
+ <?php }
// list assurance points
?>
<tr>
- <td class="DataTD"><?=_("Assurance Points")?>:</td>
- <td class="DataTD"><?=intval($drow['points'])?></td>
+ <td class="DataTD"><?php echo _("Assurance Points")?>:</td>
+ <td class="DataTD"><?php echo intval($drow['points'])?></td>
</tr>
- <?
- // show account history
+ <?php // show account history
?>
<tr>
- <td class="DataTD" colspan="2"><a href="account.php?id=59&amp;oldid=43&amp;userid=<?=intval($row['id'])?>&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=_('Show account history')?></a></td>
+ <td class="DataTD" colspan="2"><a href="account.php?id=59&amp;oldid=43&amp;userid=<?php echo intval($row['id'])?>&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo _('Show account history')?></a></td>
</tr>
</table>
<br/>
- <?
- //list secondary email addresses
+ <?php //list secondary email addresses
$dres = get_email_addresses(intval($row['id']),$row['email']);
- if(mysql_num_rows($dres) > 0) {
+ if(mysqli_num_rows($dres) > 0) {
?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="5" class="title"><?=_("Alternate Verified Email Addresses")?></td>
+ <td colspan="5" class="title"><?php echo _("Alternate Verified Email Addresses")?></td>
</tr>
- <?
- while($drow = mysql_fetch_assoc($dres)) {
+ <?php
+ while($drow = mysqli_fetch_assoc($dres)) {
?>
<tr>
- <td class="DataTD"><?=_("Secondary Emails")?>:</td>
- <td class="DataTD"><?=sanitizeHTML($drow['email'])?></td>
+ <td class="DataTD"><?php echo _("Secondary Emails")?>:</td>
+ <td class="DataTD"><?php echo sanitizeHTML($drow['email'])?></td>
</tr>
- <?
- }
+ <?php }
?>
</table>
<br/>
- <?
- }
+ <?php }
// list of domains
$dres=get_domains(intval($row['id']));
- if(mysql_num_rows($dres) > 0) {
+ if(mysqli_num_rows($dres) > 0) {
?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="5" class="title"><?=_("Verified Domains")?></td>
+ <td colspan="5" class="title"><?php echo _("Verified Domains")?></td>
</tr>
- <?
- while($drow = mysql_fetch_assoc($dres)) {
+ <?php
+ while($drow = mysqli_fetch_assoc($dres)) {
?>
<tr>
- <td class="DataTD"><?=_("Domain")?>:</td>
- <td class="DataTD"><?=sanitizeHTML($drow['domain'])?></td>
+ <td class="DataTD"><?php echo _("Domain")?>:</td>
+ <td class="DataTD"><?php echo sanitizeHTML($drow['domain'])?></td>
</tr>
- <?
- }
+ <?php }
?>
</table>
<br/>
- <?
- }
+ <?php }
?>
- <? // Begin - Debug infos ?>
+ <?php // Begin - Debug infos ?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="2" class="title"><?=_("Account State")?></td>
+ <td colspan="2" class="title"><?php echo _("Account State")?></td>
</tr>
- <?
- // --- bug-975 begin ---
+ <?php // --- bug-975 begin ---
// potential db inconsistency like in a20110804.1
// Admin console -> don't list user account
// User login -> impossible
@@ -488,7 +471,7 @@ if(intval($_REQUEST['userid']) > 0) {
4. users.email = primary-email
--- Assurer, assure someone find user query
- select * from `users` where `email`='".mysql_real_escape_string(stripslashes($_POST['email']))."'
+ select * from `users` where `email`='".mysqli_real_escape_string($_SESSION['mconn'], $_POST['email']))."'
and `deleted`=0
=> requirements
1. users.deleted = 0
@@ -527,8 +510,8 @@ if(intval($_REQUEST['userid']) > 0) {
// current userid intval($row['id'])
$query = "select `email` as `uemail`, `deleted` as `udeleted`, `verified`, `locked`
from `users` where `id`='".intval($row['id'])."' ";
- $dres = mysql_query($query);
- $drow = mysql_fetch_assoc($dres);
+ $dres = mysqli_query($_SESSION['mconn'], $query);
+ $drow = mysqli_fetch_assoc($dres);
$uemail = $drow['uemail'];
$udeleted = $drow['udeleted'];
$uverified = $drow['verified'];
@@ -538,16 +521,16 @@ if(intval($_REQUEST['userid']) > 0) {
where `memid`='".intval($row['id'])."' and
`email` ='".$uemail."' and
`deleted` = 0";
- $dres = mysql_query($query);
- if ($drow = mysql_fetch_assoc($dres)) {
+ $dres = mysqli_query($_SESSION['mconn'], $query);
+ if ($drow = mysqli_fetch_assoc($dres)) {
$drow['edeleted'] = 0;
} else {
// try if there are deleted entries
$query = "select `hash`, `deleted` as `edeleted`, `email` as `eemail` from `email`
where `memid`='".intval($row['id'])."' and
`email` ='".$uemail."'";
- $dres = mysql_query($query);
- $drow = mysql_fetch_assoc($dres);
+ $dres = mysqli_query($_SESSION['mconn'], $query);
+ $drow = mysqli_fetch_assoc($dres);
}
if ($drow) {
@@ -582,52 +565,49 @@ if(intval($_REQUEST['userid']) > 0) {
// $inconsistencydisp = _("Yes");
?>
<tr>
- <td class="DataTD"><?=_("Account inconsistency")?>:</td>
- <td class="DataTD"><?=$inccause?><br>code: <?=intval($inconsistency)?></td>
+ <td class="DataTD"><?php echo _("Account inconsistency")?>:</td>
+ <td class="DataTD"><?php echo $inccause?><br>code: <?php echo intval($inconsistency)?></td>
</tr>
<tr>
<td colspan="2" class="DataTD" style="max-width: 75ex;">
- <?=_("Account inconsistency can cause problems in daily account operations and needs to be fixed manually through arbitration/critical team.")?>
+ <?php echo _("Account inconsistency can cause problems in daily account operations and needs to be fixed manually through arbitration/critical team.")?>
</td>
</tr>
- <?
- }
+ <?php }
// --- bug-975 end ---
?>
</table>
<br />
- <?
- // End - Debug infos
+ <?php // End - Debug infos
// certificate overview
?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="6" class="title"><?=_("Certificates")?></td>
+ <td colspan="6" class="title"><?php echo _("Certificates")?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Cert Type")?>:</td>
- <td class="DataTD"><?=_("Total")?></td>
- <td class="DataTD"><?=_("Valid")?></td>
- <td class="DataTD"><?=_("Expired")?></td>
- <td class="DataTD"><?=_("Revoked")?></td>
- <td class="DataTD"><?=_("Latest Expire")?></td>
+ <td class="DataTD"><?php echo _("Cert Type")?>:</td>
+ <td class="DataTD"><?php echo _("Total")?></td>
+ <td class="DataTD"><?php echo _("Valid")?></td>
+ <td class="DataTD"><?php echo _("Expired")?></td>
+ <td class="DataTD"><?php echo _("Revoked")?></td>
+ <td class="DataTD"><?php echo _("Latest Expire")?></td>
</tr>
<!-- server certificates -->
<tr>
- <td class="DataTD"><?=_("Server")?>:</td>
- <?
- $query = "
+ <td class="DataTD"><?php echo _("Server")?>:</td>
+ <?php $query = "
select COUNT(*) as `total`,
MAX(`domaincerts`.`expire`) as `maxexpire`
from `domains` inner join `domaincerts`
on `domains`.`id` = `domaincerts`.`domid`
where `domains`.`memid` = '".intval($row['id'])."'
";
- $dres = mysql_query($query);
- $drow = mysql_fetch_assoc($dres);
+ $dres = mysqli_query($_SESSION['mconn'], $query);
+ $drow = mysqli_fetch_assoc($dres);
$total = $drow['total'];
$maxexpire = "0000-00-00 00:00:00";
@@ -644,8 +624,8 @@ if(intval($_REQUEST['userid']) > 0) {
and `revoked` = '0000-00-00 00:00:00'
and `expire` > NOW()
";
- $dres = mysql_query($query);
- $drow = mysql_fetch_assoc($dres);
+ $dres = mysqli_query($_SESSION['mconn'], $query);
+ $drow = mysqli_fetch_assoc($dres);
$valid = $drow['valid'];
$query = "
@@ -655,8 +635,8 @@ if(intval($_REQUEST['userid']) > 0) {
where `domains`.`memid` = '".intval($row['id'])."'
and `expire` <= NOW()
";
- $dres = mysql_query($query);
- $drow = mysql_fetch_assoc($dres);
+ $dres = mysqli_query($_SESSION['mconn'], $query);
+ $drow = mysqli_fetch_assoc($dres);
$expired = $drow['expired'];
$query = "
@@ -666,34 +646,31 @@ if(intval($_REQUEST['userid']) > 0) {
where `domains`.`memid` = '".intval($row['id'])."'
and `revoked` != '0000-00-00 00:00:00'
";
- $dres = mysql_query($query);
- $drow = mysql_fetch_assoc($dres);
+ $dres = mysqli_query($_SESSION['mconn'], $query);
+ $drow = mysqli_fetch_assoc($dres);
$revoked = $drow['revoked'];
?>
- <td class="DataTD"><?=intval($total)?></td>
- <td class="DataTD"><?=intval($valid)?></td>
- <td class="DataTD"><?=intval($expired)?></td>
- <td class="DataTD"><?=intval($revoked)?></td>
- <td class="DataTD"><?=($maxexpire != "0000-00-00 00:00:00")?substr($maxexpire, 0, 10) : _("Pending")?></td>
- <?
- } else { // $total > 0
+ <td class="DataTD"><?php echo intval($total)?></td>
+ <td class="DataTD"><?php echo intval($valid)?></td>
+ <td class="DataTD"><?php echo intval($expired)?></td>
+ <td class="DataTD"><?php echo intval($revoked)?></td>
+ <td class="DataTD"><?php echo ($maxexpire != "0000-00-00 00:00:00")?substr($maxexpire, 0, 10) : _("Pending")?></td>
+ <?php } else { // $total > 0
?>
- <td colspan="5" class="DataTD"><?=_("None")?></td>
- <?
- }
+ <td colspan="5" class="DataTD"><?php echo _("None")?></td>
+ <?php }
?>
</tr>
<!-- client certificates -->
<tr>
- <td class="DataTD"><?=_("Client")?>:</td>
- <?
- $query = "
+ <td class="DataTD"><?php echo _("Client")?>:</td>
+ <?php $query = "
select COUNT(*) as `total`, MAX(`expire`) as `maxexpire`
from `emailcerts`
where `memid` = '".intval($row['id'])."'
";
- $dres = mysql_query($query);
- $drow = mysql_fetch_assoc($dres);
+ $dres = mysqli_query($_SESSION['mconn'], $query);
+ $drow = mysqli_fetch_assoc($dres);
$total = $drow['total'];
$maxexpire = "0000-00-00 00:00:00";
@@ -709,8 +686,8 @@ if(intval($_REQUEST['userid']) > 0) {
and `revoked` = '0000-00-00 00:00:00'
and `expire` > NOW()
";
- $dres = mysql_query($query);
- $drow = mysql_fetch_assoc($dres);
+ $dres = mysqli_query($_SESSION['mconn'], $query);
+ $drow = mysqli_fetch_assoc($dres);
$valid = $drow['valid'];
$query = "
@@ -719,8 +696,8 @@ if(intval($_REQUEST['userid']) > 0) {
where `memid` = '".intval($row['id'])."'
and `expire` <= NOW()
";
- $dres = mysql_query($query);
- $drow = mysql_fetch_assoc($dres);
+ $dres = mysqli_query($_SESSION['mconn'], $query);
+ $drow = mysqli_fetch_assoc($dres);
$expired = $drow['expired'];
$query = "
@@ -729,34 +706,31 @@ if(intval($_REQUEST['userid']) > 0) {
where `memid` = '".intval($row['id'])."'
and `revoked` != '0000-00-00 00:00:00'
";
- $dres = mysql_query($query);
- $drow = mysql_fetch_assoc($dres);
+ $dres = mysqli_query($_SESSION['mconn'], $query);
+ $drow = mysqli_fetch_assoc($dres);
$revoked = $drow['revoked'];
?>
- <td class="DataTD"><?=intval($total)?></td>
- <td class="DataTD"><?=intval($valid)?></td>
- <td class="DataTD"><?=intval($expired)?></td>
- <td class="DataTD"><?=intval($revoked)?></td>
- <td class="DataTD"><?=($maxexpire != "0000-00-00 00:00:00")?substr($maxexpire, 0, 10) : _("Pending")?></td>
- <?
- } else { // $total > 0
+ <td class="DataTD"><?php echo intval($total)?></td>
+ <td class="DataTD"><?php echo intval($valid)?></td>
+ <td class="DataTD"><?php echo intval($expired)?></td>
+ <td class="DataTD"><?php echo intval($revoked)?></td>
+ <td class="DataTD"><?php echo ($maxexpire != "0000-00-00 00:00:00")?substr($maxexpire, 0, 10) : _("Pending")?></td>
+ <?php } else { // $total > 0
?>
- <td colspan="5" class="DataTD"><?=_("None")?></td>
- <?
- }
+ <td colspan="5" class="DataTD"><?php echo _("None")?></td>
+ <?php }
?>
</tr>
<!-- gpg certificates -->
<tr>
- <td class="DataTD"><?=_("GPG")?>:</td>
- <?
- $query = "
+ <td class="DataTD"><?php echo _("GPG")?>:</td>
+ <?php $query = "
select COUNT(*) as `total`, MAX(`expire`) as `maxexpire`
from `gpg`
where `memid` = '".intval($row['id'])."'
";
- $dres = mysql_query($query);
- $drow = mysql_fetch_assoc($dres);
+ $dres = mysqli_query($_SESSION['mconn'], $query);
+ $drow = mysqli_fetch_assoc($dres);
$total = $drow['total'];
$maxexpire = "0000-00-00 00:00:00";
@@ -771,8 +745,8 @@ if(intval($_REQUEST['userid']) > 0) {
where `memid` = '".intval($row['id'])."'
and `expire` > NOW()
";
- $dres = mysql_query($query);
- $drow = mysql_fetch_assoc($dres);
+ $dres = mysqli_query($_SESSION['mconn'], $query);
+ $drow = mysqli_fetch_assoc($dres);
$valid = $drow['valid'];
$query = "
@@ -781,36 +755,33 @@ if(intval($_REQUEST['userid']) > 0) {
where `memid` = '".intval($row['id'])."'
and `expire` <= NOW()
";
- $dres = mysql_query($query);
- $drow = mysql_fetch_assoc($dres);
+ $dres = mysqli_query($_SESSION['mconn'], $query);
+ $drow = mysqli_fetch_assoc($dres);
$expired = $drow['expired'];
?>
- <td class="DataTD"><?=intval($total)?></td>
- <td class="DataTD"><?=intval($valid)?></td>
- <td class="DataTD"><?=intval($expired)?></td>
+ <td class="DataTD"><?php echo intval($total)?></td>
+ <td class="DataTD"><?php echo intval($valid)?></td>
+ <td class="DataTD"><?php echo intval($expired)?></td>
<td class="DataTD"></td>
- <td class="DataTD"><?=($maxexpire != "0000-00-00 00:00:00")?substr($maxexpire, 0, 10) : _("Pending")?></td>
- <?
- } else { // $total > 0
+ <td class="DataTD"><?php echo ($maxexpire != "0000-00-00 00:00:00")?substr($maxexpire, 0, 10) : _("Pending")?></td>
+ <?php } else { // $total > 0
?>
- <td colspan="5" class="DataTD"><?=_("None")?></td>
- <?
- }
+ <td colspan="5" class="DataTD"><?php echo _("None")?></td>
+ <?php }
?>
</tr>
<!-- org server certificates -->
<tr>
- <td class="DataTD"><a href="account.php?id=58&amp;userid=<?=intval($row['id'])?>"><?=_("Org Server")?></a>:</td>
- <?
- $query = "
+ <td class="DataTD"><a href="account.php?id=58&amp;userid=<?php echo intval($row['id'])?>"><?php echo _("Org Server")?></a>:</td>
+ <?php $query = "
select COUNT(*) as `total`,
MAX(`orgcerts`.`expire`) as `maxexpire`
from `orgdomaincerts` as `orgcerts` inner join `org`
on `orgcerts`.`orgid` = `org`.`orgid`
where `org`.`memid` = '".intval($row['id'])."'
";
- $dres = mysql_query($query);
- $drow = mysql_fetch_assoc($dres);
+ $dres = mysqli_query($_SESSION['mconn'], $query);
+ $drow = mysqli_fetch_assoc($dres);
$total = $drow['total'];
$maxexpire = "0000-00-00 00:00:00";
@@ -827,8 +798,8 @@ if(intval($_REQUEST['userid']) > 0) {
and `orgcerts`.`revoked` = '0000-00-00 00:00:00'
and `orgcerts`.`expire` > NOW()
";
- $dres = mysql_query($query);
- $drow = mysql_fetch_assoc($dres);
+ $dres = mysqli_query($_SESSION['mconn'], $query);
+ $drow = mysqli_fetch_assoc($dres);
$valid = $drow['valid'];
$query = "
@@ -838,8 +809,8 @@ if(intval($_REQUEST['userid']) > 0) {
where `org`.`memid` = '".intval($row['id'])."'
and `orgcerts`.`expire` <= NOW()
";
- $dres = mysql_query($query);
- $drow = mysql_fetch_assoc($dres);
+ $dres = mysqli_query($_SESSION['mconn'], $query);
+ $drow = mysqli_fetch_assoc($dres);
$expired = $drow['expired'];
$query = "
@@ -849,36 +820,33 @@ if(intval($_REQUEST['userid']) > 0) {
where `org`.`memid` = '".intval($row['id'])."'
and `orgcerts`.`revoked` != '0000-00-00 00:00:00'
";
- $dres = mysql_query($query);
- $drow = mysql_fetch_assoc($dres);
+ $dres = mysqli_query($_SESSION['mconn'], $query);
+ $drow = mysqli_fetch_assoc($dres);
$revoked = $drow['revoked'];
?>
- <td class="DataTD"><?=intval($total)?></td>
- <td class="DataTD"><?=intval($valid)?></td>
- <td class="DataTD"><?=intval($expired)?></td>
- <td class="DataTD"><?=intval($revoked)?></td>
- <td class="DataTD"><?=($maxexpire != "0000-00-00 00:00:00")?substr($maxexpire, 0, 10) : _("Pending")?></td>
- <?
- } else { // $total > 0
+ <td class="DataTD"><?php echo intval($total)?></td>
+ <td class="DataTD"><?php echo intval($valid)?></td>
+ <td class="DataTD"><?php echo intval($expired)?></td>
+ <td class="DataTD"><?php echo intval($revoked)?></td>
+ <td class="DataTD"><?php echo ($maxexpire != "0000-00-00 00:00:00")?substr($maxexpire, 0, 10) : _("Pending")?></td>
+ <?php } else { // $total > 0
?>
- <td colspan="5" class="DataTD"><?=_("None")?></td>
- <?
- }
+ <td colspan="5" class="DataTD"><?php echo _("None")?></td>
+ <?php }
?>
</tr>
<!-- org client certificates -->
<tr>
- <td class="DataTD"><?=_("Org Client")?>:</td>
- <?
- $query = "
+ <td class="DataTD"><?php echo _("Org Client")?>:</td>
+ <?php $query = "
select COUNT(*) as `total`,
MAX(`orgcerts`.`expire`) as `maxexpire`
from `orgemailcerts` as `orgcerts` inner join `org`
on `orgcerts`.`orgid` = `org`.`orgid`
where `org`.`memid` = '".intval($row['id'])."'
";
- $dres = mysql_query($query);
- $drow = mysql_fetch_assoc($dres);
+ $dres = mysqli_query($_SESSION['mconn'], $query);
+ $drow = mysqli_fetch_assoc($dres);
$total = $drow['total'];
$maxexpire = "0000-00-00 00:00:00";
@@ -895,8 +863,8 @@ if(intval($_REQUEST['userid']) > 0) {
and `orgcerts`.`revoked` = '0000-00-00 00:00:00'
and `orgcerts`.`expire` > NOW()
";
- $dres = mysql_query($query);
- $drow = mysql_fetch_assoc($dres);
+ $dres = mysqli_query($_SESSION['mconn'], $query);
+ $drow = mysqli_fetch_assoc($dres);
$valid = $drow['valid'];
$query = "
@@ -906,8 +874,8 @@ if(intval($_REQUEST['userid']) > 0) {
where `org`.`memid` = '".intval($row['id'])."'
and `orgcerts`.`expire` <= NOW()
";
- $dres = mysql_query($query);
- $drow = mysql_fetch_assoc($dres);
+ $dres = mysqli_query($_SESSION['mconn'], $query);
+ $drow = mysqli_fetch_assoc($dres);
$expired = $drow['expired'];
$query = "
@@ -917,53 +885,50 @@ if(intval($_REQUEST['userid']) > 0) {
where `org`.`memid` = '".intval($row['id'])."'
and `orgcerts`.`revoked` != '0000-00-00 00:00:00'
";
- $dres = mysql_query($query);
- $drow = mysql_fetch_assoc($dres);
+ $dres = mysqli_query($_SESSION['mconn'], $query);
+ $drow = mysqli_fetch_assoc($dres);
$revoked = $drow['revoked'];
?>
- <td class="DataTD"><?=intval($total)?></td>
- <td class="DataTD"><?=intval($valid)?></td>
- <td class="DataTD"><?=intval($expired)?></td>
- <td class="DataTD"><?=intval($revoked)?></td>
- <td class="DataTD"><?=($maxexpire != "0000-00-00 00:00:00")?substr($maxexpire, 0, 10) : _("Pending")?></td>
- <?
- } else { // $total > 0
+ <td class="DataTD"><?php echo intval($total)?></td>
+ <td class="DataTD"><?php echo intval($valid)?></td>
+ <td class="DataTD"><?php echo intval($expired)?></td>
+ <td class="DataTD"><?php echo intval($revoked)?></td>
+ <td class="DataTD"><?php echo ($maxexpire != "0000-00-00 00:00:00")?substr($maxexpire, 0, 10) : _("Pending")?></td>
+ <?php } else { // $total > 0
?>
- <td colspan="5" class="DataTD"><?=_("None")?></td>
- <?
- }
+ <td colspan="5" class="DataTD"><?php echo _("None")?></td>
+ <?php }
?>
</tr>
<tr>
<td colspan="6" class="title">
- <form method="post" action="account.php" onSubmit="if(!confirm('<?=_("Are you sure you want to revoke all private certificates?")?>')) return false;">
+ <form method="post" action="account.php" onSubmit="if(!confirm('<?php echo _("Are you sure you want to revoke all private certificates?")?>')) return false;">
<input type="hidden" name="action" value="revokecert">
<input type="hidden" name="oldid" value="43">
- <input type="hidden" name="userid" value="<?=intval($userid)?>">
- <input type="submit" value="<?=_('revoke certificates')?>">
- <input type="hidden" name="ticketno" value="<?=sanitizeHTML($ticketno)?>"/>
+ <input type="hidden" name="userid" value="<?php echo intval($userid)?>">
+ <input type="submit" value="<?php echo _('revoke certificates')?>">
+ <input type="hidden" name="ticketno" value="<?php echo sanitizeHTML($ticketno)?>"/>
</form>
</td>
</tr>
</table>
<br />
- <? // list assurances ?>
+ <?php // list assurances ?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
<td class="DataTD">
- <a href="account.php?id=43&amp;userid=<?=intval($row['id'])?>&amp;shownotary=assuredto&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=_("Show Assurances the user got")?></a>
- (<a href="account.php?id=43&amp;userid=<?=intval($row['id'])?>&amp;shownotary=assuredto15&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=_("New calculation")?></a>)
+ <a href="account.php?id=43&amp;userid=<?php echo intval($row['id'])?>&amp;shownotary=assuredto&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo _("Show Assurances the user got")?></a>
+ (<a href="account.php?id=43&amp;userid=<?php echo intval($row['id'])?>&amp;shownotary=assuredto15&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo _("New calculation")?></a>)
</td>
</tr>
<tr>
<td class="DataTD">
- <a href="account.php?id=43&amp;userid=<?=intval($row['id'])?>&amp;shownotary=assuredby&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=_("Show Assurances the user gave")?></a>
- (<a href="account.php?id=43&amp;userid=<?=intval($row['id'])?>&amp;shownotary=assuredby15&amp;ticketno=<?=sanitizeHTML($ticketno)?>"><?=_("New calculation")?></a>)
+ <a href="account.php?id=43&amp;userid=<?php echo intval($row['id'])?>&amp;shownotary=assuredby&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo _("Show Assurances the user gave")?></a>
+ (<a href="account.php?id=43&amp;userid=<?php echo intval($row['id'])?>&amp;shownotary=assuredby15&amp;ticketno=<?php echo sanitizeHTML($ticketno)?>"><?php echo _("New calculation")?></a>)
</td>
</tr>
</table>
- <?
- // if(array_key_exists('assuredto',$_GET) && $_GET['assuredto'] == "yes") {
+ <?php // if(array_key_exists('assuredto',$_GET) && $_GET['assuredto'] == "yes") {
function showassuredto($ticketno)
@@ -971,96 +936,90 @@ if(intval($_REQUEST['userid']) > 0) {
?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="8" class="title"><?=_("Assurance Points")?></td>
+ <td colspan="8" class="title"><?php echo _("Assurance Points")?></td>
</tr>
<tr>
- <td class="DataTD"><b><?=_("ID")?></b></td>
- <td class="DataTD"><b><?=_("Date")?></b></td>
- <td class="DataTD"><b><?=_("Who")?></b></td>
- <td class="DataTD"><b><?=_("Email")?></b></td>
- <td class="DataTD"><b><?=_("Points")?></b></td>
- <td class="DataTD"><b><?=_("Location")?></b></td>
- <td class="DataTD"><b><?=_("Method")?></b></td>
- <td class="DataTD"><b><?=_("Revoke")?></b></td>
+ <td class="DataTD"><b><?php echo _("ID")?></b></td>
+ <td class="DataTD"><b><?php echo _("Date")?></b></td>
+ <td class="DataTD"><b><?php echo _("Who")?></b></td>
+ <td class="DataTD"><b><?php echo _("Email")?></b></td>
+ <td class="DataTD"><b><?php echo _("Points")?></b></td>
+ <td class="DataTD"><b><?php echo _("Location")?></b></td>
+ <td class="DataTD"><b><?php echo _("Method")?></b></td>
+ <td class="DataTD"><b><?php echo _("Revoke")?></b></td>
</tr>
- <?
- $query = "select * from `notary` where `to`='".intval($_GET['userid'])."' and `deleted` = 0";
- $dres = mysql_query($query);
+ <?php $query = "select * from `notary` where `to`='".intval($_GET['userid'])."' and `deleted` = 0";
+ $dres = mysqli_query($_SESSION['mconn'], $query);
$points = 0;
- while($drow = mysql_fetch_assoc($dres)) {
- $fromuser = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".intval($drow['from'])."'"));
+ while($drow = mysqli_fetch_assoc($dres)) {
+ $fromuser = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], "select * from `users` where `id`='".intval($drow['from'])."'"));
$points += $drow['points'];
?>
<tr>
- <td class="DataTD"><?=$drow['id']?></td>
- <td class="DataTD"><?=sanitizeHTML($drow['date'])?></td>
- <td class="DataTD"><a href="wot.php?id=9&amp;userid=<?=intval($drow['from'])?>"><?=sanitizeHTML($fromuser['fname'])." ".sanitizeHTML($fromuser['lname'])?></td>
- <td class="DataTD"><a href="account.php?id=43&amp;userid=<?=intval($drow['from'])?>"><?=sanitizeHTML($fromuser['email'])?></a></td>
- <td class="DataTD"><?=intval($drow['points'])?></td>
- <td class="DataTD"><?=sanitizeHTML($drow['location'])?></td>
- <td class="DataTD"><?=sanitizeHTML($drow['method'])?></td>
- <td class="DataTD"><a href="account.php?id=43&amp;userid=<?=intval($drow['to'])?>&amp;assurance=<?=intval($drow['id'])?>&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;?"),intval($drow['id']))?>');"><?=_("Revoke")?></a></td>
+ <td class="DataTD"><?php echo $drow['id']?></td>
+ <td class="DataTD"><?php echo sanitizeHTML($drow['date'])?></td>
+ <td class="DataTD"><a href="wot.php?id=9&amp;userid=<?php echo intval($drow['from'])?>"><?php echo sanitizeHTML($fromuser['fname'])." ".sanitizeHTML($fromuser['lname'])?></td>
+ <td class="DataTD"><a href="account.php?id=43&amp;userid=<?php echo intval($drow['from'])?>"><?php echo sanitizeHTML($fromuser['email'])?></a></td>
+ <td class="DataTD"><?php echo intval($drow['points'])?></td>
+ <td class="DataTD"><?php echo sanitizeHTML($drow['location'])?></td>
+ <td class="DataTD"><?php echo sanitizeHTML($drow['method'])?></td>
+ <td class="DataTD"><a href="account.php?id=43&amp;userid=<?php echo intval($drow['to'])?>&amp;assurance=<?php echo intval($drow['id'])?>&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;?"),intval($drow['id']))?>');"><?php echo _("Revoke")?></a></td>
</tr>
- <?
- }
+ <?php }
?>
<tr>
- <td class="DataTD" colspan="4"><b><?=_("Total Points")?>:</b></td>
- <td class="DataTD"><?=intval($points)?></td>
+ <td class="DataTD" colspan="4"><b><?php echo _("Total Points")?>:</b></td>
+ <td class="DataTD"><?php echo intval($points)?></td>
<td class="DataTD" colspan="3">&nbsp;</td>
</tr>
</table>
- <?
- }
+ <?php }
function showassuredby($ticketno)
{
?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="8" class="title"><?=_("Assurance Points The User Issued")?></td>
+ <td colspan="8" class="title"><?php echo _("Assurance Points The User Issued")?></td>
</tr>
<tr>
- <td class="DataTD"><b><?=_("ID")?></b></td>
- <td class="DataTD"><b><?=_("Date")?></b></td>
- <td class="DataTD"><b><?=_("Who")?></b></td>
- <td class="DataTD"><b><?=_("Email")?></b></td>
- <td class="DataTD"><b><?=_("Points")?></b></td>
- <td class="DataTD"><b><?=_("Location")?></b></td>
- <td class="DataTD"><b><?=_("Method")?></b></td>
- <td class="DataTD"><b><?=_("Revoke")?></b></td>
+ <td class="DataTD"><b><?php echo _("ID")?></b></td>
+ <td class="DataTD"><b><?php echo _("Date")?></b></td>
+ <td class="DataTD"><b><?php echo _("Who")?></b></td>
+ <td class="DataTD"><b><?php echo _("Email")?></b></td>
+ <td class="DataTD"><b><?php echo _("Points")?></b></td>
+ <td class="DataTD"><b><?php echo _("Location")?></b></td>
+ <td class="DataTD"><b><?php echo _("Method")?></b></td>
+ <td class="DataTD"><b><?php echo _("Revoke")?></b></td>
</tr>
- <?
- $query = "select * from `notary` where `from`='".intval($_GET['userid'])."' and `deleted` = 0";
- $dres = mysql_query($query);
+ <?php $query = "select * from `notary` where `from`='".intval($_GET['userid'])."' and `deleted` = 0";
+ $dres = mysqli_query($_SESSION['mconn'], $query);
$points = 0;
- while($drow = mysql_fetch_assoc($dres)) {
- $fromuser = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".intval($drow['to'])."'"));
+ while($drow = mysqli_fetch_assoc($dres)) {
+ $fromuser = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], "select * from `users` where `id`='".intval($drow['to'])."'"));
$points += intval($drow['points']);
?>
<tr>
- <td class="DataTD"><?=intval($drow['id'])?></td>
- <td class="DataTD"><?=$drow['date']?></td>
- <td class="DataTD"><a href="wot.php?id=9&userid=<?=intval($drow['to'])?>"><?=sanitizeHTML($fromuser['fname']." ".$fromuser['lname'])?></td>
- <td class="DataTD"><a href="account.php?id=43&amp;userid=<?=intval($drow['to'])?>"><?=sanitizeHTML($fromuser['email'])?></a></td>
- <td class="DataTD"><?=intval($drow['points'])?></td>
- <td class="DataTD"><?=sanitizeHTML($drow['location'])?></td>
- <td class="DataTD"><?=sanitizeHTML($drow['method'])?></td>
- <td class="DataTD"><a href="account.php?id=43&userid=<?=intval($drow['from'])?>&assurance=<?=intval($drow['id'])?>&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;?"),intval($drow['id']))?>');"><?=_("Revoke")?></a></td>
+ <td class="DataTD"><?php echo intval($drow['id'])?></td>
+ <td class="DataTD"><?php echo $drow['date']?></td>
+ <td class="DataTD"><a href="wot.php?id=9&userid=<?php echo intval($drow['to'])?>"><?php echo sanitizeHTML($fromuser['fname']." ".$fromuser['lname'])?></td>
+ <td class="DataTD"><a href="account.php?id=43&amp;userid=<?php echo intval($drow['to'])?>"><?php echo sanitizeHTML($fromuser['email'])?></a></td>
+ <td class="DataTD"><?php echo intval($drow['points'])?></td>
+ <td class="DataTD"><?php echo sanitizeHTML($drow['location'])?></td>
+ <td class="DataTD"><?php echo sanitizeHTML($drow['method'])?></td>
+ <td class="DataTD"><a href="account.php?id=43&userid=<?php echo intval($drow['from'])?>&assurance=<?php echo intval($drow['id'])?>&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;?"),intval($drow['id']))?>');"><?php echo _("Revoke")?></a></td>
</tr>
- <?
- }
+ <?php }
?>
<tr>
- <td class="DataTD" colspan="4"><b><?=_("Total Points")?>:</b></td>
- <td class="DataTD"><?=intval($points)?></td>
+ <td class="DataTD" colspan="4"><b><?php echo _("Total Points")?>:</b></td>
+ <td class="DataTD"><?php echo intval($points)?></td>
<td class="DataTD" colspan="3">&nbsp;</td>
</tr>
</table>
<?} ?>
<br/><br/>
-<?
-} }
+<?php } }
if(isset($_GET['shownotary'])) {
switch($_GET['shownotary']) {
diff --git a/pages/account/44.php b/pages/account/44.php
index 718f0e0..378335c 100644
--- a/pages/account/44.php
+++ b/pages/account/44.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -18,9 +18,8 @@
if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "") {
?>
- <div style="color: orange;">ERROR: <?=$_SESSION['_config']['error']?></div>
- <?
- unset($_SESSION['_config']['error']);
+ <div style="color: orange;">ERROR: <?php echo $_SESSION['_config']['error']?></div>
+ <?php unset($_SESSION['_config']['error']);
}
$ticketno = "";
@@ -39,21 +38,21 @@ if (!valid_ticket_number($ticketno)) {
<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"><?=_("Change Password")?></td>
+ <td colspan="2" class="title"><?php echo _("Change Password")?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Email")?>:</td>
- <td class="DataTD"><b><?=sanitizeHTML($_REQUEST['email'])?></b></td>
+ <td class="DataTD"><?php echo _("Email")?>:</td>
+ <td class="DataTD"><b><?php echo sanitizeHTML($_REQUEST['email'])?></b></td>
</tr>
<tr>
- <td class="DataTD"><?=_("New Password")?>:</td>
- <td class="DataTD"><input type="text" name="newpass" value="<?=array_key_exists('newpass',$_REQUEST)?sanitizeHTML($_REQUEST['newpass']):""?>"></td>
+ <td class="DataTD"><?php echo _("New Password")?>:</td>
+ <td class="DataTD"><input type="text" name="newpass" value="<?php echo array_key_exists('newpass',$_REQUEST)?sanitizeHTML($_REQUEST['newpass']):""?>"></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="userid" value="<?=intval($_REQUEST['userid'])?>">
-<input type="hidden" name="oldid" value="<?=intval($id)?>">
-<input type="hidden" name="ticketno" value="<?=sanitizeHTML($ticketno)?>"/>
+<input type="hidden" name="userid" value="<?php echo intval($_REQUEST['userid'])?>">
+<input type="hidden" name="oldid" value="<?php echo intval($id)?>">
+<input type="hidden" name="ticketno" value="<?php echo sanitizeHTML($ticketno)?>"/>
</form>
diff --git a/pages/account/45.php b/pages/account/45.php
index 23bce9d..226a0e5 100644
--- a/pages/account/45.php
+++ b/pages/account/45.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,9 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<p><?=_("Paste your CSR below...")?></p>
+<p><?php echo _("Paste your CSR below...")?></p>
<form method="post" action="account.php">
<textarea name="CSR" cols="80" rows="15"></textarea><br>
-<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>
diff --git a/pages/account/48.php b/pages/account/48.php
index 8cdd7ac..c9711f4 100644
--- a/pages/account/48.php
+++ b/pages/account/48.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,19 +15,19 @@
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 by Domain")?></td>
+ <td colspan="2" class="title"><?php echo _("Find User by Domain")?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Domain")?>:</td>
- <td class="DataTD"><input type="text" name="domain" value="<?=array_key_exists('domain',$_POST)?sanitizeHTML($_POST['domain']):''?>"></td>
+ <td class="DataTD"><?php echo _("Domain")?>:</td>
+ <td class="DataTD"><input type="text" name="domain" value="<?php echo array_key_exists('domain',$_POST)?sanitizeHTML($_POST['domain']):''?>"></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>
diff --git a/pages/account/49.php b/pages/account/49.php
index 0218fa0..3478fcb 100644
--- a/pages/account/49.php
+++ b/pages/account/49.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,11 +15,10 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<?
- $userid=0; if(array_key_exists('userid',$_GET)) $userid=intval($_GET['userid']);
+<?php $userid=0; if(array_key_exists('userid',$_GET)) $userid=intval($_GET['userid']);
if($userid <= 0)
{
- $domainsearch = $domain = mysql_escape_string(stripslashes($_POST['domain']));
+ $domainsearch = $domain = mysqli_real_escape_string($_SESSION['mconn'], stripslashes($_POST['domain']));
if(!strstr($domain, "%"))
$domainsearch = "%$domain%";
if(preg_match("/^\d+$/",$domain))
@@ -30,76 +29,74 @@
`domains`.`deleted`=0 and `users`.`deleted`=0 and
`users`.`verified`=1
group by `users`.`id` limit 100";
- $res = mysql_query($query);
- if(mysql_num_rows($res) >= 1) { ?>
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) >= 1) { ?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="5" class="title"><?=_("Select Specific User Account Details")?></td>
+ <td colspan="5" class="title"><?php echo _("Select Specific User Account Details")?></td>
</tr>
-<?
- while($row = mysql_fetch_assoc($res))
+<?php
+ while($row = mysqli_fetch_assoc($res))
{ ?>
<tr>
- <td class="DataTD"><?=_("Domain")?>:</td>
- <td class="DataTD"><?=$row['domid']?></td>
- <td class="DataTD"><a href="account.php?id=43&amp;userid=<?=$row['id']?>"><?=sanitizeHTML($row['domain'])?></a></td>
+ <td class="DataTD"><?php echo _("Domain")?>:</td>
+ <td class="DataTD"><?php echo $row['domid']?></td>
+ <td class="DataTD"><a href="account.php?id=43&amp;userid=<?php echo $row['id']?>"><?php echo sanitizeHTML($row['domain'])?></a></td>
</tr>
-<? } if(mysql_num_rows($res) >= 100) { ?>
+<?php } if(mysqli_num_rows($res) >= 100) { ?>
<tr>
- <td class="DataTD" colspan="3"><?=_("Only the first 100 rows are displayed.")?></td>
+ <td class="DataTD" colspan="3"><?php echo _("Only the first 100 rows are displayed.")?></td>
</tr>
-<? } else { ?>
+<?php } else { ?>
<tr>
- <td class="DataTD" colspan="3"><? printf(_("%s rows displayed."), mysql_num_rows($res)); ?></td>
+ <td class="DataTD" colspan="3"><?php printf(_("%s rows displayed."), mysqli_num_rows($res)); ?></td>
</tr>
-<? } ?>
+<?php } ?>
</table><br><br>
-<? } elseif(mysql_num_rows($res) == 1) {
- $row = mysql_fetch_assoc($res);
+<? } elseif(mysqli_num_rows($res) == 1) {
+ $row = mysqli_fetch_assoc($res);
$_GET['userid'] = intval($row['id']);
} else {
?><table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
<td colspan="5" class="title"><?printf(_("No personal domains found matching %s"), sanitizeHTML($domain));?></td>
</tr>
- </table><br><br><?
- }
+ </table><br><br><?php }
$query = "select `orgid`,`domain`,`id` from `orgdomains` where `domain` like '$domainsearch' or `id`='$domain' limit 100";
- $res = mysql_query($query);
- if(mysql_num_rows($res) >= 1) { ?>
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) >= 1) { ?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="5" class="title"><?=_("Select Specific Organisation Account Details")?></td>
+ <td colspan="5" class="title"><?php echo _("Select Specific Organisation Account Details")?></td>
</tr>
-<?
- while($row = mysql_fetch_assoc($res))
+<?php
+ while($row = mysqli_fetch_assoc($res))
{ ?>
<tr>
- <td class="DataTD"><?=_("Domain")?>:</td>
- <td class="DataTD"><?=$row['id']?></td>
- <td class="DataTD"><a href="account.php?id=26&amp;orgid=<?=intval($row['orgid'])?>"><?=sanitizeHTML($row['domain'])?></a></td>
+ <td class="DataTD"><?php echo _("Domain")?>:</td>
+ <td class="DataTD"><?php echo $row['id']?></td>
+ <td class="DataTD"><a href="account.php?id=26&amp;orgid=<?php echo intval($row['orgid'])?>"><?php echo sanitizeHTML($row['domain'])?></a></td>
</tr>
-<? } if(mysql_num_rows($res) >= 100) { ?>
+<?php } if(mysqli_num_rows($res) >= 100) { ?>
<tr>
- <td class="DataTD" colspan="3"><?=_("Only the first 100 rows are displayed.")?></td>
+ <td class="DataTD" colspan="3"><?php echo _("Only the first 100 rows are displayed.")?></td>
</tr>
-<? } else { ?>
+<?php } else { ?>
<tr>
- <td class="DataTD" colspan="3"><? printf(_("%s rows displayed."), mysql_num_rows($res)); ?></td>
+ <td class="DataTD" colspan="3"><?php printf(_("%s rows displayed."), mysqli_num_rows($res)); ?></td>
</tr>
-<? } ?>
+<?php } ?>
</table><br><br>
-<? } elseif(mysql_num_rows($res) == 1) {
- $row = mysql_fetch_assoc($res);
+<? } elseif(mysqli_num_rows($res) == 1) {
+ $row = mysqli_fetch_assoc($res);
$_GET['userid'] = intval($row['id']);
} else {
?><table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
<td colspan="5" class="title"><?printf(_("No organisational domains found matching %s"), sanitizeHTML($domain));?></td>
</tr>
- </table><br><br><?
- }
+ </table><br><br><?php }
}
if($userid > 0)
diff --git a/pages/account/5.php b/pages/account/5.php
index efed0ab..17fecaa 100644
--- a/pages/account/5.php
+++ b/pages/account/5.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,23 +15,22 @@
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="10" class="title"><?=_("Client Certificates")?> - <a href="account.php?id=5&amp;viewall=<?=intval(!$viewall)?>"><?=$viewall?_("Hide old certificates"):_("View all certificates")?></a></td>
+ <td colspan="10" class="title"><?php echo _("Client Certificates")?> - <a href="account.php?id=5&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"><?=_("Email Address")?></td>
- <td class="DataTD"><?=_("SerialNumber")?></td>
- <td class="DataTD"><?=_("Revoked")?></td>
- <td class="DataTD"><?=_("Expires")?></td>
- <td class="DataTD"><?=_("Login")?></td>
- <td colspan="2" class="DataTD"><?=_("Comment *")?></td>
-<?
- $query = "select UNIX_TIMESTAMP(`emailcerts`.`created`) as `created`,
+ <td class="DataTD"><?php echo _("Renew/Revoke/Delete")?></td>
+ <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>
+ <td colspan="2" class="DataTD"><?php echo _("Comment *")?></td>
+<?php $query = "select UNIX_TIMESTAMP(`emailcerts`.`created`) as `created`,
UNIX_TIMESTAMP(`emailcerts`.`expire`) - UNIX_TIMESTAMP() as `timeleft`,
UNIX_TIMESTAMP(`emailcerts`.`expire`) as `expired`,
`emailcerts`.`expire`,
@@ -53,15 +52,15 @@
$query .= " HAVING `timeleft` > 0 or `expire` = 0 ";
$query .= " ORDER BY `modified` desc";
// echo $query."<br>\n";
- $res = mysql_query($query);
- if(mysql_num_rows($res) <= 0)
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) <= 0)
{
?>
<tr>
- <td colspan="10" class="DataTD"><?=_("No client certificates are currently listed.")?></td>
+ <td colspan="10" class="DataTD"><?php echo _("No client certificates are currently listed.")?></td>
</tr>
-<? } else {
- while($row = mysql_fetch_assoc($res))
+<?php } else {
+ while($row = mysqli_fetch_assoc($res))
{
if($row['timeleft'] > 0)
$verified = _("Valid");
@@ -75,53 +74,53 @@
$row['revoke'] = _("Not Revoked");
?>
<tr>
-<? if($verified != _("Pending") && $verified != _("Revoked")) { ?>
- <td class="DataTD"><input type="checkbox" name="revokeid[]" value="<?=intval($row['id'])?>"></td>
- <td class="DataTD"><?=$verified?></td>
- <td class="DataTD"><a href="account.php?id=6&amp;cert=<?=intval($row['id'])?>"><?=(trim($row['CN'])=="" ? _("empty") : sanitizeHTML($row['CN']))?></a></td>
-<? } else if($verified != _("Revoked")) { ?>
- <td class="DataTD"><input type="checkbox" name="delid[]" value="<?=intval($row['id'])?>"></td>
- <td class="DataTD"><?=$verified?></td>
- <td class="DataTD"><?=(trim($row['CN'])=="" ? _("empty") : sanitizeHTML($row['CN']))?></td>
-<? } else { ?>
+<?php if($verified != _("Pending") && $verified != _("Revoked")) { ?>
+ <td class="DataTD"><input type="checkbox" name="revokeid[]" value="<?php echo intval($row['id'])?>"></td>
+ <td class="DataTD"><?php echo $verified?></td>
+ <td class="DataTD"><a href="account.php?id=6&amp;cert=<?php echo intval($row['id'])?>"><?php echo (trim($row['CN'])=="" ? _("empty") : sanitizeHTML($row['CN']))?></a></td>
+<?php } else if($verified != _("Revoked")) { ?>
+ <td class="DataTD"><input type="checkbox" name="delid[]" value="<?php echo intval($row['id'])?>"></td>
+ <td class="DataTD"><?php echo $verified?></td>
+ <td class="DataTD"><?php echo (trim($row['CN'])=="" ? _("empty") : sanitizeHTML($row['CN']))?></td>
+<?php } else { ?>
<td class="DataTD">&nbsp;</td>
- <td class="DataTD"><?=$verified?></td>
- <td class="DataTD"><?=(trim($row['CN'])=="" ? _("empty") : sanitizeHTML($row['CN']))?></td>
-<? } ?>
- <td class="DataTD"><?=sanitizeHTML($row['serial'])?></td>
- <td class="DataTD"><?=sanitizeHTML($row['revoke'])?></td>
- <td class="DataTD"><?=sanitizeHTML($row['expire'])?></td>
+ <td class="DataTD"><?php echo $verified?></td>
+ <td class="DataTD"><?php echo (trim($row['CN'])=="" ? _("empty") : sanitizeHTML($row['CN']))?></td>
+<?php } ?>
+ <td class="DataTD"><?php echo sanitizeHTML($row['serial'])?></td>
+ <td class="DataTD"><?php echo sanitizeHTML($row['revoke'])?></td>
+ <td class="DataTD"><?php echo sanitizeHTML($row['expire'])?></td>
<td class="DataTD">
- <input type="checkbox" name="disablelogin_<?=intval($row['id'])?>" value="1" <?=$row['disablelogin']?"":'checked="checked"'?>/>
- <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"'?>/>
+ <input type="hidden" name="cert_<?php echo intval($row['id'])?>" value="1" />
</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>
+ <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="9">
- <a href="account.php?id=5&amp;viewall=<?=intval(!$viewall)?>"><b><?=$viewall?_("Hide old certificates"):_("View all certificates")?></b></a>
+ <a href="account.php?id=5&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="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="5"><input type="submit" name="renew" value="<?=_("Renew")?>" />&#160;&#160;&#160;&#160;
- <input type="submit" name="revoke" value="<?=_("Revoke/Delete")?>" /></td>
+ <td class="DataTD" colspan="5"><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="4"><input type="submit" name="change" value="<?=_("Change settings")?>" /> </td>
+ <td class="DataTD" colspan="4"><input type="submit" name="change" value="<?php echo _("Change settings")?>" /> </td>
</tr>
-<? } ?>
+<?php } ?>
</table>
-<input type="hidden" name="oldid" value="<?=intval($id)?>" />
-<input type="hidden" name="csrf" value="<?=make_csrf('clicerchange')?>" />
+<input type="hidden" name="oldid" value="<?php echo intval($id)?>" />
+<input type="hidden" name="csrf" value="<?php echo make_csrf('clicerchange')?>" />
</form>
-<p><?=_("From here you can delete pending requests, or revoke valid certificates.")?></p>
-<p><?=_("Login").": "._("By allowing certificate login, this certificate can be used to login into your account at https://secure.cacert.org/ .")?></p>
+<p><?php echo _("From here you can delete pending requests, or revoke valid certificates.")?></p>
+<p><?php echo _("Login").": "._("By allowing certificate login, this certificate can be used to login into your account at https://secure.cacert.org/ .")?></p>
diff --git a/pages/account/50.php b/pages/account/50.php
index a4c2413..1e2a12f 100644
--- a/pages/account/50.php
+++ b/pages/account/50.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,27 +15,27 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<? if($_SESSION['_config']['error'] != "") { ?><div color="orange">ERROR: <?=$_SESSION['_config']['error']?></div><? unset($_SESSION['_config']['error']); } ?>
+<?php if($_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"><?=_("Delete Account")?></td>
+ <td colspan="2" class="title"><?php echo _("Delete Account")?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Email")?>:</td>
- <td class="DataTD"><b><?=sanitizeHTML($_REQUEST['email'])?></b></td>
+ <td class="DataTD"><?php echo _("Email")?>:</td>
+ <td class="DataTD"><b><?php echo sanitizeHTML($_REQUEST['email'])?></b></td>
</tr>
<tr>
- <td class="DataTD"><?=_("New Username from arbitration number + sequence number a20xxyyzz.a.b")?>:</td>
+ <td class="DataTD"><?php echo _("New Username from arbitration number + sequence number a20xxyyzz.a.b")?>:</td>
<td class="DataTD"><input type="text" name="arbitrationno"></td>
</tr>
<tr>
- <td class="DataTD" colspan="2"><?=_("Are you sure you want to delete this user, while not actually deleting the account it will completely disable it and revoke any/all certificates currently issued.")?></td>
+ <td class="DataTD" colspan="2"><?php echo _("Are you sure you want to delete this user, while not actually deleting the account it will completely disable it and revoke any/all certificates currently issued.")?></td>
</tr>
<tr>
- <td class="DataTD" colspan="2"><input type="submit" name="cancel" value="<?=_("No")?>"> <input type="submit" name="process" value="<?=_("Yes")?>"></td>
+ <td class="DataTD" colspan="2"><input type="submit" name="cancel" value="<?php echo _("No")?>"> <input type="submit" name="process" value="<?php echo _("Yes")?>"></td>
</tr>
</table>
-<input type="hidden" name="userid" value="<?=intval($_REQUEST['userid'])?>">
-<input type="hidden" name="oldid" value="<?=$id?>">
+<input type="hidden" name="userid" value="<?php echo intval($_REQUEST['userid'])?>">
+<input type="hidden" name="oldid" value="<?php echo $id?>">
</form>
diff --git a/pages/account/51.php b/pages/account/51.php
index 7273840..cfe8d7f 100644
--- a/pages/account/51.php
+++ b/pages/account/51.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,17 +15,16 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<? if($_SESSION['profile']['tverify'] <= 0) { echo _("You don't have access to this area."); } else { ?>
-<?
- $uid = intval($_GET['photoid']);
+<?php if($_SESSION['profile']['tverify'] <= 0) { echo _("You don't have access to this area."); } else { ?>
+<?php $uid = intval($_GET['photoid']);
$query = "select * from `tverify` where `id`='$uid' and `modified`=0";
- $res = mysql_query($query);
- if(mysql_num_rows($res) > 0) { ?>
-<img src="account.php?id=51&amp;photoid=<?=$uid ?>&amp;img=show" border="0" width="800">
-<? } else {
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) > 0) { ?>
+<img src="account.php?id=51&amp;photoid=<?php echo $uid ?>&amp;img=show" border="0" width="800">
+<?php } else {
$query = "select * from `tverify` where `id`='$uid' and `modified`=1";
- $res = mysql_query($query);
- if(mysql_num_rows($res) > 0)
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) > 0)
{
echo _("This UID has already been voted on.");
} else {
diff --git a/pages/account/52.php b/pages/account/52.php
index 6c00c26..f7210e0 100644
--- a/pages/account/52.php
+++ b/pages/account/52.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -21,13 +21,13 @@ if($_SESSION['profile']['tverify'] <= 0) {
} else {
$uid = intval($_GET['uid']);
$query = "select * from `tverify` where `id`='".intval($uid)."' and `modified`=0";
- $res = mysql_query($query);
- if(mysql_num_rows($res) > 0) {
- $row = mysql_fetch_assoc($res);
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) > 0) {
+ $row = mysqli_fetch_assoc($res);
$memid = intval($row['memid']);
$query2 = "select * from `tverify-vote` where `tverify`='".intval($uid)."' and `memid`='".intval($_SESSION['profile']['id'])."'";
- $rc2 = mysql_num_rows(mysql_query($query2));
+ $rc2 = mysqli_num_rows(mysqli_query($_SESSION['mconn'], $query2));
if($rc2 > 0) {
showheader(_("My CAcert.org Account!"));
echo _("You have already voted on this request.");
@@ -36,9 +36,9 @@ if($_SESSION['profile']['tverify'] <= 0) {
}
$query = "select sum(`points`) as `points` from `notary` where `to`='".intval($memid)."' and `deleted` = 0";
- $notary = mysql_fetch_assoc(mysql_query($query));
+ $notary = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], $query));
$query = "select * from `users` where `id`='".intval($memid)."'";
- $user = mysql_fetch_assoc(mysql_query($query));
+ $user = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], $query));
$tobe = 50 - $notary['points'];
if($row['URL'] != '' && $row['photoid'] != '') {
$tobe = 150 - $notary['points'];
@@ -49,33 +49,32 @@ if($_SESSION['profile']['tverify'] <= 0) {
$tobe = 0;
}
?>
-<?=_("Request Details")?>:<br>
-<?=_("Name on file")?>: <?=sanitizeHTML($user['fname']." ".$user['mname']." ".$user['lname']." ".$user['suffix'])?><br>
-<?=_("Primary email address")?>: <?=sanitizeHTML($user['email'])." (".intval($user['id']).")"?><br>
-<?=_("Certificate Subject")?>: <?=sanitizeHTML($row['CN'])?><br>
+<?php echo _("Request Details")?>:<br>
+<?php echo _("Name on file")?>: <?php echo sanitizeHTML($user['fname']." ".$user['mname']." ".$user['lname']." ".$user['suffix'])?><br>
+<?php echo _("Primary email address")?>: <?php echo sanitizeHTML($user['email'])." (".intval($user['id']).")"?><br>
+<?php echo _("Certificate Subject")?>: <?php echo sanitizeHTML($row['CN'])?><br>
<? if($row['URL'] != '') { ?>
-<?=_("Notary URL")?>: <a href="<?=$row['URL']?>"><?=$row['URL']?></a><br>
+<?php echo _("Notary URL")?>: <a href="<?php echo $row['URL']?>"><?php echo $row['URL']?></a><br>
<? } ?>
<? if($row['photoid'] != '') { ?>
-<?=_("Photo ID URL")?>: <a href="/account.php?id=51&amp;photoid=<?=intval($row['id'])?>"><?=_("Here")?></a><br>
+<?php echo _("Photo ID URL")?>: <a href="/account.php?id=51&amp;photoid=<?php echo intval($row['id'])?>"><?php echo _("Here")?></a><br>
<? } ?>
-<?=_("Current Points")?>: <?=intval($notary['points'])?><br>
-<?=_("Potential Points")?>: <?=intval($tobe)?><br>
-<?=_("Date of Birth")?>: <?=$user['dob']?> (YYYY-MM-DD)<br>
+<?php echo _("Current Points")?>: <?php echo intval($notary['points'])?><br>
+<?php echo _("Potential Points")?>: <?php echo intval($tobe)?><br>
+<?php echo _("Date of Birth")?>: <?php echo $user['dob']?> (YYYY-MM-DD)<br>
<br>
<form method="post" action="account.php">
-<?=_("Comment")?>: <input type="text" name="comment"><br>
-<input type="submit" name="agree" value="<?=_("I agree with this Application")?>">
-<input type="submit" name="disagree" value="<?=_("I don't agree with this Application")?>">
-<input type="hidden" name="oldid" value="<?=intval($_GET['id'])?>">
-<input type="hidden" name="uid" value="<?=intval($uid)?>">
+<?php echo _("Comment")?>: <input type="text" name="comment"><br>
+<input type="submit" name="agree" value="<?php echo _("I agree with this Application")?>">
+<input type="submit" name="disagree" value="<?php echo _("I don't agree with this Application")?>">
+<input type="hidden" name="oldid" value="<?php echo intval($_GET['id'])?>">
+<input type="hidden" name="uid" value="<?php echo intval($uid)?>">
</form>
-<?
- } else {
+<?php } else {
$query = "select * from `tverify` where `id`='".intval($uid)."' and `modified`=1";
- $res = mysql_query($query);
- if(mysql_num_rows($res) > 0) {
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) > 0) {
echo _("This UID has already been voted on.")."<br/>";
} else {
if($uid) echo _("Unable to locate a valid request for that UID.")."<br/>";
@@ -83,13 +82,13 @@ if($_SESSION['profile']['tverify'] <= 0) {
// Search for open requests:
$query = "select * from `tverify` where `modified`=0";
- $res = mysql_query($query);
- if(mysql_num_rows($res) > 0) {
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) > 0) {
echo "<br/>"._("The following requests are still open:")."<br/><ul>";
- while($row = mysql_fetch_assoc($res)) {
+ while($row = mysqli_fetch_assoc($res)) {
$uid=intval($row['id']);
$query3 = "select * from `tverify-vote` where `tverify`='".intval($uid)."' and `memid`='".intval($_SESSION['profile']['id'])."'";
- $rc3 = mysql_num_rows(mysql_query($query3));
+ $rc3 = mysqli_num_rows(mysqli_query($_SESSION['mconn'], $query3));
if($rc3 <= 0)
{
echo "<li><a href='account.php?id=52&amp;uid=".intval($row['id'])."'>".intval($row['id'])."</a></li>\n";
diff --git a/pages/account/53.php b/pages/account/53.php
index cc9e2d6..de0a468 100644
--- a/pages/account/53.php
+++ b/pages/account/53.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,8 +15,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<?
- $town = array_key_exists('town',$_REQUEST)?mysql_escape_string(stripslashes($_REQUEST['town'])):"";
+<?php
+ $town = array_key_exists('town',$_REQUEST)?mysqli_real_escape_string($_SESSION['mconn'], stripslashes($_REQUEST['town'])):"";
$regid = array_key_exists('regid',$_REQUEST)?intval($_REQUEST['regid']):0;
$ccid = array_key_exists('ccid',$_REQUEST)?intval($_REQUEST['ccid']):0;
$start = array_key_exists('start',$_REQUEST)?intval($_REQUEST['start']):0;
@@ -29,7 +29,7 @@
if($regid > 0)
{
- $reg = mysql_fetch_assoc(mysql_query("select * from `regions` where `id`='$regid'"));
+ $reg = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], "select * from `regions` where `id`='$regid'"));
$display = "<ul class='top'>\n<li>\n".
"<a href='account.php?id=53&amp;regid=$regid'>".sanitizeHTML($reg['name'])."</a> - <a href='account.php?action=add&amp;id=54&amp;regid=$regid'>"._("Add")."</a>\n".
$display;
@@ -38,7 +38,7 @@
if($ccid > 0)
{
- $cnt = mysql_fetch_assoc(mysql_query("select * from `countries` where `id`='$ccid'"));
+ $cnt = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], "select * from `countries` where `id`='$ccid'"));
$display = "<ul class='top'>\n<li>\n".
"<a href='account.php?id=53&amp;ccid=$ccid'>".sanitizeHTML($cnt['name'])."</a> - <a href='account.php?action=add&amp;id=54&amp;ccid=$ccid'>"._("Add")."</a>\n".
$display;
@@ -51,16 +51,16 @@
{
echo "<ul>\n";
$query = "select * from `countries` order by `name`";
- $res = mysql_query($query);
- while($row = mysql_fetch_assoc($res))
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ while($row = mysqli_fetch_assoc($res))
echo "<li><a href='account.php?id=53&amp;ccid=".intval($row['id'])."'>".sanitizeHTML($row['name'])."</a></li>\n";
echo "</ul>\n</li>\n</ul></div>\n<br>\n";
} elseif($regid <= 0) {
echo "<ul>\n";
$query = "select * from `regions` where `ccid`='$ccid' order by `name`";
- $res = mysql_query($query);
- while($row = mysql_fetch_assoc($res))
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ while($row = mysqli_fetch_assoc($res))
{
echo "<li>( <a href='account.php?action=edit&amp;id=54&regid=".intval($row['id'])."'>"._("edit")."</a> |";
echo " <a href='account.php?action=delete&amp;id=53&regid=".intval($row['id'])."'";
@@ -74,11 +74,11 @@
if($town != "")
{
$query = "select * from `locations` where `regid`='$regid' and `name` < '$town'";
- $start = mysql_num_rows(mysql_query($query));
+ $start = mysqli_num_rows(mysqli_query($_SESSION['mconn'], $query));
}
$query = "select * from `locations` where `regid`='$regid' order by `name` limit $start, $limit";
- $res = mysql_query($query);
- while($row = mysql_fetch_assoc($res))
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ while($row = mysqli_fetch_assoc($res))
{
echo "<li>( <a href='account.php?action=move&amp;id=54&amp;locid=".intval($row['id'])."'>"._("move")."</a> |";
echo " <a href='account.php?action=aliases&amp;id=54&amp;locid=".intval($row['id'])."'>"._("aliases")."</a> |";
@@ -89,7 +89,7 @@
echo "</ul>\n</li>\n</ul>\n</li>\n</ul></div>\n<br>\n";
$st="";$prev="";$end="";$next="";
- $rc = mysql_num_rows(mysql_query("select * from `locations` where `regid`='$regid'"));
+ $rc = mysqli_num_rows(mysqli_query($_SESSION['mconn'], "select * from `locations` where `regid`='$regid'"));
if($start > 0)
{
$prev = $start - $limit;
diff --git a/pages/account/54.php b/pages/account/54.php
index 753b4af..2781600 100644
--- a/pages/account/54.php
+++ b/pages/account/54.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,81 +15,81 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<?
+<?php
$ccid = array_key_exists('ccid',$_REQUEST)?intval($_REQUEST['ccid']):0;
$regid = array_key_exists('regid',$_REQUEST)?intval($_REQUEST['regid']):0;
$locid = array_key_exists('locid',$_REQUEST)?intval($_REQUEST['locid']):0;
- $name = array_key_exists('name',$_REQUEST)?mysql_escape_string($_REQUEST['name']):"";
+ $name = array_key_exists('name',$_REQUEST)?mysqli_real_escape_string($_SESSION['mconn'],$_REQUEST['name']):"";
if($ccid > 0 && $_REQUEST['action'] == "add") { ?>
<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 Region")?></td>
+ <td colspan="2" class="title"><?php echo _("Add Region")?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Region")?>:</td>
- <td class="DataTD"><input type="text" name="name" value="<?=sanitizeHTML($name)?>"></td>
+ <td class="DataTD"><?php echo _("Region")?>:</td>
+ <td class="DataTD"><input type="text" name="name" value="<?php echo sanitizeHTML($name)?>"></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="action" value="add">
-<input type="hidden" name="ccid" value="<?=$ccid?>">
+<input type="hidden" name="ccid" value="<?php echo $ccid?>">
<input type="hidden" name="oldid" value="54">
</form>
-<? } if($regid > 0 && $_REQUEST['action'] == "edit") {
+<?php } if($regid > 0 && $_REQUEST['action'] == "edit") {
$query = "select * from `regions` where `id`='$regid' order by `name`";
- $row = mysql_fetch_assoc(mysql_query($query));
+ $row = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], $query));
$name = $row['name'];
?>
<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 Region")?></td>
+ <td colspan="2" class="title"><?php echo _("Edit Region")?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Region")?>:</td>
- <td class="DataTD"><input type="text" name="name" value="<?=sanitizeHTML($name)?>"></td>
+ <td class="DataTD"><?php echo _("Region")?>:</td>
+ <td class="DataTD"><input type="text" name="name" value="<?php echo sanitizeHTML($name)?>"></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="action" value="edit">
-<input type="hidden" name="regid" value="<?=$regid?>">
+<input type="hidden" name="regid" value="<?php echo $regid?>">
<input type="hidden" name="oldid" value="54">
</form>
-<? } if($regid > 0 && $_REQUEST['action'] == "add") { ?>
+<?php } if($regid > 0 && $_REQUEST['action'] == "add") { ?>
<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 Location")?></td>
+ <td colspan="2" class="title"><?php echo _("Add Location")?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Location")?>:</td>
- <td class="DataTD"><input type="text" name="name" value="<?=sanitizeHTML($name)?>"></td>
+ <td class="DataTD"><?php echo _("Location")?>:</td>
+ <td class="DataTD"><input type="text" name="name" value="<?php echo sanitizeHTML($name)?>"></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Longitude")?>:</td>
- <td class="DataTD"><input type="text" name="longitude" value="<?=array_key_exists('longitude',$_REQUEST)?sanitizeHTML($_REQUEST['longitude']):""?>"></td>
+ <td class="DataTD"><?php echo _("Longitude")?>:</td>
+ <td class="DataTD"><input type="text" name="longitude" value="<?php echo array_key_exists('longitude',$_REQUEST)?sanitizeHTML($_REQUEST['longitude']):""?>"></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Latitude")?>:</td>
- <td class="DataTD"><input type="text" name="latitude" value="<?=array_key_exists('latitude',$_REQUEST)?sanitizeHTML($_REQUEST['latitude']):""?>"></td>
+ <td class="DataTD"><?php echo _("Latitude")?>:</td>
+ <td class="DataTD"><input type="text" name="latitude" value="<?php echo array_key_exists('latitude',$_REQUEST)?sanitizeHTML($_REQUEST['latitude']):""?>"></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="action" value="add">
-<input type="hidden" name="regid" value="<?=$regid?>">
+<input type="hidden" name="regid" value="<?php echo $regid?>">
<input type="hidden" name="oldid" value="54">
</form>
-<? } if($locid > 0 && $_REQUEST['action'] == "edit") {
+<?php } if($locid > 0 && $_REQUEST['action'] == "edit") {
$query = "select * from `locations` where `id`='$locid'";
- $row = mysql_fetch_assoc(mysql_query($query));
+ $row = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], $query));
if($name == "")
$name = $row['name'];
@@ -101,56 +101,56 @@
<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 Location")?></td>
+ <td colspan="2" class="title"><?php echo _("Edit Location")?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Location")?>:</td>
- <td class="DataTD"><input type="text" name="name" value="<?=sanitizeHTML($name)?>"></td>
+ <td class="DataTD"><?php echo _("Location")?>:</td>
+ <td class="DataTD"><input type="text" name="name" value="<?php echo sanitizeHTML($name)?>"></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Longitude")?>:</td>
- <td class="DataTD"><input type="text" name="longitude" value="<?=sanitizeHTML($_REQUEST['longitude'])?>"></td>
+ <td class="DataTD"><?php echo _("Longitude")?>:</td>
+ <td class="DataTD"><input type="text" name="longitude" value="<?php echo sanitizeHTML($_REQUEST['longitude'])?>"></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Latitude")?>:</td>
- <td class="DataTD"><input type="text" name="latitude" value="<?=sanitizeHTML($_REQUEST['latitude'])?>"></td>
+ <td class="DataTD"><?php echo _("Latitude")?>:</td>
+ <td class="DataTD"><input type="text" name="latitude" value="<?php echo sanitizeHTML($_REQUEST['latitude'])?>"></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="action" value="edit">
-<input type="hidden" name="locid" value="<?=$locid?>">
+<input type="hidden" name="locid" value="<?php echo $locid?>">
<input type="hidden" name="oldid" value="54">
</form>
-<? } if($locid > 0 && $_REQUEST['action'] == "aliases") {
+<?php } if($locid > 0 && $_REQUEST['action'] == "aliases") {
$query = "select * from `localias` where `locid`='".intval($locid)."'";
- $res = mysql_query($query);
- $rc = mysql_num_rows($res);
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ $rc = mysqli_num_rows($res);
?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="2" class="title"><?=_("Location Aliases")?> - <a href="javascript:Show_Stuff()"><?=_("Add")?></a></td>
+ <td colspan="2" class="title"><?php echo _("Location Aliases")?> - <a href="javascript:Show_Stuff()"><?php echo _("Add")?></a></td>
</tr>
<tr ID="display1">
<td colspan="2" class="DataTD">
<form method="post" action="account.php" ACCEPTCHARSET="utf-8">
- <?=_("Location Alias")?>: <input type="text" name="name"> <input type="submit" value="Add">
+ <?php echo _("Location Alias")?>: <input type="text" name="name"> <input type="submit" value="Add">
<input type="hidden" name="action" value="alias">
- <input type="hidden" name="locid" value="<?=intval($locid)?>">
+ <input type="hidden" name="locid" value="<?php echo intval($locid)?>">
<input type="hidden" name="oldid" value="54">
</form>
</td>
</tr>
-<?
- while($row = mysql_fetch_assoc($res))
+<?php
+ while($row = mysqli_fetch_assoc($res))
{
?>
<tr>
- <td class="DataTD"><?=$row['name']?></td>
- <td class="DataTD"><a href="account.php?id=54&amp;locid=<?=$locid?>&amp;name=<?=($row['name'])?>&amp;action=delalias" onclick="return confirm('Are you sure you want to delete this location alias?');"><?=_("Delete")?></td>
+ <td class="DataTD"><?php echo $row['name']?></td>
+ <td class="DataTD"><a href="account.php?id=54&amp;locid=<?php echo $locid?>&amp;name=<?php echo ($row['name'])?>&amp;action=delalias" onclick="return confirm('Are you sure you want to delete this location alias?');"><?php echo _("Delete")?></td>
</tr>
-<? } ?>
+<?php } ?>
</table>
<script language="JavaScript" type="text/javascript">
<!--
@@ -167,27 +167,26 @@ function Show_Stuff()
document.getElementById("display1").style.display = "none";
-->
</script>
-<? } if($locid > 0 && $_REQUEST['action'] == "move") {
+<?php } if($locid > 0 && $_REQUEST['action'] == "move") {
$query = "select * from `locations` where `id`='$locid'";
- $row = mysql_fetch_assoc(mysql_query($query));
+ $row = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], $query));
$newreg = $_REQUEST['newreg'] = $row['regid'];
?>
<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"><?=_("Move Location")?></td>
+ <td colspan="2" class="title"><?php echo _("Move Location")?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Location")?>:</td>
- <td class="DataTD"><?=$row['name']?></td>
+ <td class="DataTD"><?php echo _("Location")?>:</td>
+ <td class="DataTD"><?php echo $row['name']?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Set Region")?>:</td>
+ <td class="DataTD"><?php echo _("Set Region")?>:</td>
<td class="DataTD"><select name="newreg">
-<?
- $query = "select * from `regions` where `ccid`='".intval($row['ccid'])."' order by `name`";
- $res = mysql_query($query);
- while($row = mysql_fetch_assoc($res))
+<?php $query = "select * from `regions` where `ccid`='".intval($row['ccid'])."' order by `name`";
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ while($row = mysqli_fetch_assoc($res))
{
echo "<option value='".intval($row['id'])."'";
if($_REQUEST['newreg'] == $row['id'])
@@ -198,12 +197,12 @@ document.getElementById("display1").style.display = "none";
</select></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="action" value="move">
-<input type="hidden" name="locid" value="<?=$locid?>">
+<input type="hidden" name="locid" value="<?php echo $locid?>">
<input type="hidden" name="oldid" value="54">
</form>
-<? } ?>
+<?php } ?>
diff --git a/pages/account/55.php b/pages/account/55.php
index 24cc86d..0ce7e86 100644
--- a/pages/account/55.php
+++ b/pages/account/55.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,78 +15,72 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<?
- if ($_SESSION['profile']['admin'] != 1 || !array_key_exists('userid',$_REQUEST) || intval($_REQUEST['userid']) < 1) {
+<?php if ($_SESSION['profile']['admin'] != 1 || !array_key_exists('userid',$_REQUEST) || intval($_REQUEST['userid']) < 1) {
$user_id = intval($_SESSION['profile']['id']);
?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="5" class="title"><?=_("Your passed Tests")?></td>
+ <td colspan="5" class="title"><?php echo _("Your passed Tests")?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("The list of tests you did pass at").' <a href="https://cats.cacert.org/">https://cats.cacert.org/</a>'?></td>
+ <td class="DataTD"><?php echo _("The list of tests you did pass at").' <a href="https://cats.cacert.org/">https://cats.cacert.org/</a>'?></td>
</tr>
</table>
-<?
- } else {
+<?php } else {
$user_id = intval($_REQUEST['userid']);
$query = "select * from `users` where `id`='$user_id' and `users`.`deleted`=0";
- $res = mysql_query($query);
- if(mysql_num_rows($res) <= 0)
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) <= 0)
{
echo _("I'm sorry, the user you were looking for seems to have disappeared! Bad things are afoot!");
} else {
- $row = mysql_fetch_assoc($res);
+ $row = mysqli_fetch_assoc($res);
}
?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="5" class="title"><?=_("Passed Tests of")." ".sanitizeHTML($row['fname'])." ".sanitizeHTML($row['mname'])." ".sanitizeHTML($row['lname'])?></td>
+ <td colspan="5" class="title"><?php echo _("Passed Tests of")." ".sanitizeHTML($row['fname'])." ".sanitizeHTML($row['mname'])." ".sanitizeHTML($row['lname'])?></td>
</tr>
</table>
-<?
- }
+<?php }
?>
<br>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td class="DataTD"><b><?=_("Date")?></b></td>
- <td class="DataTD"><b><?=_("Test")?></b></td>
- <td class="DataTD"><b><?=_("Variant")?></b></td>
+ <td class="DataTD"><b><?php echo _("Date")?></b></td>
+ <td class="DataTD"><b><?php echo _("Test")?></b></td>
+ <td class="DataTD"><b><?php echo _("Variant")?></b></td>
</tr>
-<?
- $query = "SELECT `CP`.`pass_date`, `CT`.`type_text`, `CV`.`test_text` ".
+<?php $query = "SELECT `CP`.`pass_date`, `CT`.`type_text`, `CV`.`test_text` ".
" FROM `cats_passed` AS CP, `cats_variant` AS CV, `cats_type` AS CT ".
" WHERE `CP`.`variant_id`=`CV`.`id` AND `CV`.`type_id`=`CT`.`id` AND `CP`.`user_id` ='".intval($user_id)."'".
" ORDER BY `CP`.`pass_date`";
- $res = mysql_query($query);
+ $res = mysqli_query($_SESSION['mconn'], $query);
$HaveTest=0;
- while($row = mysql_fetch_array($res, MYSQL_NUM))
+ while($row = mysqli_fetch_array($res, MYSQL_NUM))
{
if ($row[1] == "Assurer Challenge") {
$HaveTest=1;
}
?>
<tr>
- <td class="DataTD"><?=sanitizeHTML($row[0])?></td>
- <td class="DataTD"><?=sanitizeHTML($row[1])?></td>
- <td class="DataTD"><?=sanitizeHTML($row[2])?></td>
+ <td class="DataTD"><?php echo sanitizeHTML($row[0])?></td>
+ <td class="DataTD"><?php echo sanitizeHTML($row[1])?></td>
+ <td class="DataTD"><?php echo sanitizeHTML($row[2])?></td>
</tr>
-<? }
+<?php }
?>
</table>
<br>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
-<?
- if ($_SESSION['profile']['admin'] == 1 && array_key_exists('userid',$_REQUEST) && intval($_REQUEST['userid']) > 0) {
+<?php if ($_SESSION['profile']['admin'] == 1 && array_key_exists('userid',$_REQUEST) && intval($_REQUEST['userid']) > 0) {
?>
- <tr><td colspan="3" class="DataTD"><a href="account.php?id=43&amp;userid=<?=intval($user_id)?>">back</a></td></tr>
-<?
- } else {
+ <tr><td colspan="3" class="DataTD"><a href="account.php?id=43&amp;userid=<?php echo intval($user_id)?>">back</a></td></tr>
+<?php } else {
$query = '
SELECT `u`.`id`,
`u`.`assurer`,
@@ -99,22 +93,22 @@
AND `n`.`deleted` = 0
GROUP BY `u`.`id`, `u`.`assurer`
';
- $res = mysql_query($query);
+ $res = mysqli_query($_SESSION['mconn'], $query);
if (!$res) {
print '<td colspan="3" class="DataTD">'._('Internal Error').'</td>'."\n";
} else {
- $row = mysql_fetch_array($res, MYSQL_NUM);
+ $row = mysqli_fetch_array($res, MYSQL_NUM);
if ($HaveTest && ($row[2]>=100)) {
if (!$row[1]) {
// This should not happen...
fix_assurer_flag($_SESSION['profile']['id']);
}
-?> <td colspan="3" class="DataTD"><?=_("You have passed the Assurer Challenge and collected at least 100 Assurance Points, you are an Assurer.")?></td>
-<? } elseif (($row[2]>=100) && !$HaveTest) {
-?> <td colspan="3" class="DataTD"><?=_("You have at least 100 Assurance Points, if you want to become an assurer try the ").'<a href="https://cats.cacert.org">'._("Assurer Challenge").'</a>!'?></td>
-<? } elseif ($HaveTest && ($row[2]<100)) {
-?> <td colspan="3" class="DataTD"><?=_("You have passed the Assurer Challenge, but to become an Assurer you still have to reach 100 Assurance Points!")?></td>
-<? }
+?> <td colspan="3" class="DataTD"><?php echo _("You have passed the Assurer Challenge and collected at least 100 Assurance Points, you are an Assurer.")?></td>
+<?php } elseif (($row[2]>=100) && !$HaveTest) {
+?> <td colspan="3" class="DataTD"><?php echo _("You have at least 100 Assurance Points, if you want to become an assurer try the ").'<a href="https://cats.cacert.org">'._("Assurer Challenge").'</a>!'?></td>
+<?php } elseif ($HaveTest && ($row[2]<100)) {
+?> <td colspan="3" class="DataTD"><?php echo _("You have passed the Assurer Challenge, but to become an Assurer you still have to reach 100 Assurance Points!")?></td>
+<?php }
}
}
?> </tr>
diff --git a/pages/account/56.php b/pages/account/56.php
index cabe8e0..e6c3dd7 100644
--- a/pages/account/56.php
+++ b/pages/account/56.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,27 +15,25 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<?=_("List of Organisation Assurers:")?>
+<?php echo _("List of Organisation Assurers:")?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="1" class="title"><?=_("Name")?></td>
- <td colspan="1" class="title"><?=_("Email")?></td>
- <td colspan="1" class="title"><?=_("Country")?></td>
+ <td colspan="1" class="title"><?php echo _("Name")?></td>
+ <td colspan="1" class="title"><?php echo _("Email")?></td>
+ <td colspan="1" class="title"><?php echo _("Country")?></td>
</tr>
- <?
- $query = "select users.fname,users.lname,users.email, countries.name from users left join countries on users.ccid=countries.id where orgadmin=1;";
- $res = mysql_query($query);
- while($row = mysql_fetch_assoc($res))
+ <?php $query = "select users.fname,users.lname,users.email, countries.name from users left join countries on users.ccid=countries.id where orgadmin=1;";
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ while($row = mysqli_fetch_assoc($res))
{
?>
<tr>
- <td><?=sanitizeHTML($row['fname'])." ".sanitizeHTML($row['lname'])?></td>
- <td><a href="mailto:<?=sanitizeHTML($row['email'])?>"><?=sanitizeHTML($row['email'])?></a></td>
- <td><?=sanitizeHTML($row['name'])?></td>
+ <td><?php echo sanitizeHTML($row['fname'])." ".sanitizeHTML($row['lname'])?></td>
+ <td><a href="mailto:<?php echo sanitizeHTML($row['email'])?>"><?php echo sanitizeHTML($row['email'])?></a></td>
+ <td><?php echo sanitizeHTML($row['name'])?></td>
</tr>
- <?
- }
+ <?php }
?>
</table>
diff --git a/pages/account/57.php b/pages/account/57.php
index 9db7ccf..225b60c 100644
--- a/pages/account/57.php
+++ b/pages/account/57.php
@@ -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
*/ ?>
-<?
- include_once($_SESSION['_config']['filepath'].'/includes/notary.inc.php');
+<?php include_once($_SESSION['_config']['filepath'].'/includes/notary.inc.php');
if ($_SESSION['profile']['admin'] != 1 || !array_key_exists('userid',$_REQUEST) || intval($_REQUEST['userid']) < 1) {
@@ -25,16 +24,16 @@
} else {
$user_id = intval($_REQUEST['userid']);
$query = "select * from `users` where `id`='$user_id' and `users`.`deleted`=0";
- $res = mysql_query($query);
- if(mysql_num_rows($res) <= 0)
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) <= 0)
{
echo _("I'm sorry, the user you were looking for seems to have disappeared! Bad things are afoot!");
} else {
- $row = mysql_fetch_assoc($res);
+ $row = mysqli_fetch_assoc($res);
?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="5" class="title"><?=_('CCA agreement of').' '.sanitizeHTML($row['fname']).' '.sanitizeHTML($row['mname']).' '.sanitizeHTML($row['lname'])?></td>
+ <td colspan="5" class="title"><?php echo _('CCA agreement of').' '.sanitizeHTML($row['fname']).' '.sanitizeHTML($row['mname']).' '.sanitizeHTML($row['lname'])?></td>
</tr>
</table>
@@ -42,13 +41,12 @@
<br>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td class="DataTD"><b><?=_('CCA type')?></b></td>
- <td class="DataTD"><b><?=_('Date')?></b></td>
- <td class="DataTD"><b><?=_('Method')?></b></td>
- <td class="DataTD"><b><?=_('Type')?></b></td>
+ <td class="DataTD"><b><?php echo _('CCA type')?></b></td>
+ <td class="DataTD"><b><?php echo _('Date')?></b></td>
+ <td class="DataTD"><b><?php echo _('Method')?></b></td>
+ <td class="DataTD"><b><?php echo _('Type')?></b></td>
</tr>
-<?
- $data=get_first_user_agreement($user_id, 'CCA', 1);
+<?php $data=get_first_user_agreement($user_id, 'CCA', 1);
if (!isset($data['active'])){
$type='';
}else{
@@ -56,13 +54,12 @@
}
?>
<tr>
- <td class="DataTD"><?=_('First active CCA')?></td>
- <td class="DataTD"><?=isset($data['date'])?$data['date']:''?></td>
- <td class="DataTD"><?=isset($data['method'])?$data['method']:''?></td>
- <td class="DataTD"><?=$type?></td>
+ <td class="DataTD"><?php echo _('First active CCA')?></td>
+ <td class="DataTD"><?php echo isset($data['date'])?$data['date']:''?></td>
+ <td class="DataTD"><?php echo isset($data['method'])?$data['method']:''?></td>
+ <td class="DataTD"><?php echo $type?></td>
</tr>
-<?
- $data=get_first_user_agreement($user_id, 'CCA', 0);
+<?php $data=get_first_user_agreement($user_id, 'CCA', 0);
if (!isset($data['active'])){
$type="";
}else{
@@ -70,13 +67,12 @@
}
?>
<tr>
- <td class="DataTD"><?=_('First passive CCA')?></td>
- <td class="DataTD"><?=isset($data['date'])?$data['date']:''?></td>
- <td class="DataTD"><?=isset($data['method'])?$data['method']:''?></td>
- <td class="DataTD"><?=$type?></td>
+ <td class="DataTD"><?php echo _('First passive CCA')?></td>
+ <td class="DataTD"><?php echo isset($data['date'])?$data['date']:''?></td>
+ <td class="DataTD"><?php echo isset($data['method'])?$data['method']:''?></td>
+ <td class="DataTD"><?php echo $type?></td>
</tr>
-<?
- $data=get_last_user_agreement($user_id, 'CCA');
+<?php $data=get_last_user_agreement($user_id, 'CCA');
if (!isset($data['active'])){
$type="";
}elseif($data['active']==1){
@@ -86,22 +82,20 @@
}
?>
<tr>
- <td class="DataTD"><?=_('Last CCA')?></td>
- <td class="DataTD"><?=isset($data['date'])?$data['date']:''?></td>
- <td class="DataTD"><?=isset($data['method'])?$data['method']:''?></td>
- <td class="DataTD"><?=$type?></td>
+ <td class="DataTD"><?php echo _('Last CCA')?></td>
+ <td class="DataTD"><?php echo isset($data['date'])?$data['date']:''?></td>
+ <td class="DataTD"><?php echo isset($data['method'])?$data['method']:''?></td>
+ <td class="DataTD"><?php echo $type?></td>
</tr>
</table>
<br>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
-<?
- if ($_SESSION['profile']['admin'] == 1 && array_key_exists('userid',$_REQUEST) && intval($_REQUEST['userid']) > 0) {
+<?php if ($_SESSION['profile']['admin'] == 1 && array_key_exists('userid',$_REQUEST) && intval($_REQUEST['userid']) > 0) {
?>
- <tr><td colspan="3" class="DataTD"><a href="account.php?id=43&amp;userid=<?=intval($user_id)?>">back</a></td></tr>
-<? }
+ <tr><td colspan="3" class="DataTD"><a href="account.php?id=43&amp;userid=<?php echo intval($user_id)?>">back</a></td></tr>
+<?php }
?> </table>
-<?
- }
+<?php }
}
?>
diff --git a/pages/account/58.php b/pages/account/58.php
index af26b70..4a9d3ca 100644
--- a/pages/account/58.php
+++ b/pages/account/58.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -21,34 +21,34 @@ if ($_SESSION['profile']['admin'] != 1 || !array_key_exists('userid',$_REQUEST)
} else {
$user_id = intval($_REQUEST['userid']);
$query = "select `users`.`fname`, `users`.`mname`, `users`.`lname` from `users` where `id`='$user_id' and `users`.`deleted`=0";
- $res = mysql_query($query);
- if(mysql_num_rows($res) != 1){
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) != 1){
echo _("I'm sorry, the user you were looking for seems to have disappeared! Bad things are afoot!");
} else {
- if ($row = mysql_fetch_assoc($res)){
+ if ($row = mysqli_fetch_assoc($res)){
$username=sanitizeHTML($row['fname']).' '.sanitizeHTML($row['mname']).' '.sanitizeHTML($row['lname']);
$query = "select `orginfo`.`o`, `org`.`masteracc`
FROM `orginfo`, `org`
WHERE `orginfo`.`id` = `org`.`orgid`
AND `org`.`memid`='$user_id' order by `orginfo`.`o`";
- $res1 = mysql_query($query);?>
- <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"><?
- if (mysql_num_rows($res1) <= 0) {?>
+ $res1 = mysqli_query($_SESSION['mconn'], $query);?>
+ <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"><?php
+ if (mysqli_num_rows($res1) <= 0) {?>
<tr>
- <td colspan="2" class="title"><?=sprintf(_('%s is not listed as Organisation Administrator'), $username)?></td>
+ <td colspan="2" class="title"><?php echo sprintf(_('%s is not listed as Organisation Administrator'), $username)?></td>
</tr>
<?}else{?>
<tr>
- <td colspan="2" class="title"><?=sprintf(_('%s is listed as Organisation Administrator for:'), $username)?></td>
+ <td colspan="2" class="title"><?php echo sprintf(_('%s is listed as Organisation Administrator for:'), $username)?></td>
</tr>
<tr>
- <td class="DataTD"><b><?=_('Organisation')?></b></td>
- <td class="DataTD"><b><?=_('Masteraccount')?></b></td>
- </tr><?
- while($drow = mysql_fetch_assoc($res1)){?>
+ <td class="DataTD"><b><?php echo _('Organisation')?></b></td>
+ <td class="DataTD"><b><?php echo _('Masteraccount')?></b></td>
+ </tr><?php
+ while($drow = mysqli_fetch_assoc($res1)){?>
<tr>
- <td class="DataTD"><?=$drow['o']?></td>
- <td class="DataTD"><?=$drow['masteracc'] ? _("Yes") : _("No") ?></td>
+ <td class="DataTD"><?php echo $drow['o']?></td>
+ <td class="DataTD"><?php echo $drow['masteracc'] ? _("Yes") : _("No") ?></td>
</tr>
<?}
}
diff --git a/pages/account/59.php b/pages/account/59.php
index 1c73ae5..98016fe 100644
--- a/pages/account/59.php
+++ b/pages/account/59.php
@@ -21,13 +21,13 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
$userid = intval($_REQUEST['userid']);
$res = get_user_data($userid);
-if (mysql_num_rows($res) <= 0)
+if (mysqli_num_rows($res) <= 0)
{
echo _("I'm sorry, the user you were looking for seems to have disappeared! Bad things are afoot!");
exit;
}
-$user = mysql_fetch_assoc($res);
+$user = mysqli_fetch_assoc($res);
$fname = $user['fname'];
$mname = $user['mname'];
@@ -85,177 +85,168 @@ if ($userid != $_SESSION['profile']['id']) {
<td colspan="2" class="title"><?printf(_('Account history of %s'),$username)?></td>
</tr>
<tr>
- <td colspan="2" class="title"><?=_('User actions')?></td>
+ <td colspan="2" class="title"><?php echo _('User actions')?></td>
</tr>
<tr>
- <td class="DataTD"><?=_('User name')?></td>
- <td class="DataTD"><?=sanitizeHTML($username)?></td>
+ <td class="DataTD"><?php echo _('User name')?></td>
+ <td class="DataTD"><?php echo sanitizeHTML($username)?></td>
</tr>
<tr>
- <td class="DataTD"><?=_('Date of Birth')?></td>
- <td class="DataTD"><?=sanitizeHTML($dob)?></td>
+ <td class="DataTD"><?php echo _('Date of Birth')?></td>
+ <td class="DataTD"><?php echo sanitizeHTML($dob)?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Is Assurer")?>:</td>
- <td class="DataTD"><?= ($user['assurer']==0)? _('No'):_('Yes')?></td>
+ <td class="DataTD"><?php echo _("Is Assurer")?>:</td>
+ <td class="DataTD"><?php echo ($user['assurer']==0)? _('No'):_('Yes')?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Blocked Assurer")?>:</td>
- <td class="DataTD"><?= ($user['assurer_blocked']==0)? _('No'):_('Yes')?></td>
+ <td class="DataTD"><?php echo _("Blocked Assurer")?>:</td>
+ <td class="DataTD"><?php echo ($user['assurer_blocked']==0)? _('No'):_('Yes')?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Account Locking")?>:</td>
- <td class="DataTD"><?= ($user['locked']==0)? _('No'):_('Yes')?></td>
+ <td class="DataTD"><?php echo _("Account Locking")?>:</td>
+ <td class="DataTD"><?php echo ($user['locked']==0)? _('No'):_('Yes')?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Code Signing")?>:</td>
- <td class="DataTD"><?= ($user['codesign']==0)? _('No'):_('Yes')?></td>
+ <td class="DataTD"><?php echo _("Code Signing")?>:</td>
+ <td class="DataTD"><?php echo ($user['codesign']==0)? _('No'):_('Yes')?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Org Assurer")?>:</td>
- <td class="DataTD"><?= ($user['orgadmin']==0)? _('No'):_('Yes')?></td>
+ <td class="DataTD"><?php echo _("Org Assurer")?>:</td>
+ <td class="DataTD"><?php echo ($user['orgadmin']==0)? _('No'):_('Yes')?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("TTP Admin")?>:</td>
- <td class="DataTD"><?= $user['ttpadmin']._(' - 0 = none, 1 = TTP Admin, 2 = TTP TOPUP admin')?></td>
+ <td class="DataTD"><?php echo _("TTP Admin")?>:</td>
+ <td class="DataTD"><?php echo $user['ttpadmin']._(' - 0 = none, 1 = TTP Admin, 2 = TTP TOPUP admin')?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Location Admin")?>:</td>
- <td class="DataTD"><?= ($user['locadmin']==0)? _('No'):_('Yes')?></td>
+ <td class="DataTD"><?php echo _("Location Admin")?>:</td>
+ <td class="DataTD"><?php echo ($user['locadmin']==0)? _('No'):_('Yes')?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Admin")?>:</td>
- <td class="DataTD"><?= ($user['admin']==0)? _('No'):_('Yes')?></td>
+ <td class="DataTD"><?php echo _("Admin")?>:</td>
+ <td class="DataTD"><?php echo ($user['admin']==0)? _('No'):_('Yes')?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Ad Admin")?>:</td>
- <td class="DataTD"><?= $user['adadmin']._(' - 0 = none, 1 = submit, 2 = approve')?></td>
+ <td class="DataTD"><?php echo _("Ad Admin")?>:</td>
+ <td class="DataTD"><?php echo $user['adadmin']._(' - 0 = none, 1 = submit, 2 = approve')?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("General Announcements")?>:</td>
- <td class="DataTD"><?= ($alerts['general']==0)? _('No'):_('Yes')?></td>
+ <td class="DataTD"><?php echo _("General Announcements")?>:</td>
+ <td class="DataTD"><?php echo ($alerts['general']==0)? _('No'):_('Yes')?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Country Announcements")?>:</td>
- <td class="DataTD"><?= ($alerts['country']==0)? _('No'):_('Yes')?></td>
+ <td class="DataTD"><?php echo _("Country Announcements")?>:</td>
+ <td class="DataTD"><?php echo ($alerts['country']==0)? _('No'):_('Yes')?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Regional Announcements")?>:</td>
- <td class="DataTD"><?= ($alerts['regional']==0)? _('No'):_('Yes')?></td>
+ <td class="DataTD"><?php echo _("Regional Announcements")?>:</td>
+ <td class="DataTD"><?php echo ($alerts['regional']==0)? _('No'):_('Yes')?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Within 200km Announcements")?>:</td>
- <td class="DataTD"><?= ($alerts['radius']==0)? _('No'):_('Yes')?></td>
+ <td class="DataTD"><?php echo _("Within 200km Announcements")?>:</td>
+ <td class="DataTD"><?php echo ($alerts['radius']==0)? _('No'):_('Yes')?></td>
</tr>
</table>
<br/>
-<?
-
+<?php
// Email addresses
$dres = get_email_addresses($userid,'',1);
?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="3" class="title"><?=_('Email addresses')?></td>
+ <td colspan="3" class="title"><?php echo _('Email addresses')?></td>
</tr>
-<?
-if (mysql_num_rows($dres) > 0) {
+<?php
+if (mysqli_num_rows($dres) > 0) {
output_log_email_header();
- while ($drow = mysql_fetch_assoc($dres))
+ while ($drow = mysqli_fetch_assoc($dres))
{
output_log_email($drow,$email);
}
} else {
?>
<tr>
- <td colspan="3" ><?=_('no entry available')?></td>
+ <td colspan="3" ><?php echo _('no entry available')?></td>
</tr>
- <?
-}
+ <?php }
?>
</table>
<br/>
-<?
-
+<?php
// Domains
$dres = get_domains($userid, 1);
?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="3" class="title"><?=_('Domains')?></td>
+ <td colspan="3" class="title"><?php echo _('Domains')?></td>
</tr>
<?
-if (mysql_num_rows($dres) > 0) {
+if (mysqli_num_rows($dres) > 0) {
output_log_domains_header();
- while ($drow = mysql_fetch_assoc($dres))
+ while ($drow = mysqli_fetch_assoc($dres))
{
output_log_domains($drow);
}
} else {
?>
<tr>
- <td colspan="3" ><?=_('no entry available')?></td>
+ <td colspan="3" ><?php echo _('no entry available')?></td>
</tr>
- <?
-}
+ <?php }
?>
</table>
<br/>
-<?
-// Trainings
+<?php // Trainings
$dres = get_training_results($userid);
?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="3" class="title"><?=_('Trainings')?></td>
+ <td colspan="3" class="title"><?php echo _('Trainings')?></td>
</tr>
-<?
-if (mysql_num_rows($dres) > 0) {
+<?php
+if (mysqli_num_rows($dres) > 0) {
output_log_training_header();
- while ($drow = mysql_fetch_assoc($dres))
+ while ($drow = mysqli_fetch_assoc($dres))
{
output_log_training($drow);
}
} else {
?>
<tr>
- <td colspan="3" ><?=_('no entry available')?></td>
+ <td colspan="3" ><?php echo _('no entry available')?></td>
</tr>
- <?
-}
+ <?php }
?>
</table>
<br/>
-<?
-// User Agreements
+<?php // User Agreements
$dres = get_user_agreements($userid);
?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="4" class="title"><?=_('User agreements')?></td>
+ <td colspan="4" class="title"><?php echo _('User agreements')?></td>
</tr>
-<?
-if (mysql_num_rows($dres) > 0) {
+<?php
+if (mysqli_num_rows($dres) > 0) {
output_log_agreement_header();
- while ($drow = mysql_fetch_assoc($dres))
+ while ($drow = mysqli_fetch_assoc($dres))
{
output_log_agreement($drow);
}
} else {
?>
<tr>
- <td colspan="4" ><?=_('no entry available')?></td>
+ <td colspan="4" ><?php echo _('no entry available')?></td>
</tr>
- <?
-}
+ <?php }
?>
</table>
<br/>
-<?
-// Client Certificates
+<?php // Client Certificates
$dres = get_client_certs($userid, 1);
$colspan=8;
if (1 == $support) {
@@ -264,28 +255,26 @@ if (1 == $support) {
?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="<?=$colspan?>" class="title"><?=_('Client certificates')?></td>
+ <td colspan="<?php echo $colspan?>" class="title"><?php echo _('Client certificates')?></td>
</tr>
-<?
-if (mysql_num_rows($dres) > 0) {
+<?php
+if (mysqli_num_rows($dres) > 0) {
output_client_cert_header($support);
- while ($drow = mysql_fetch_assoc($dres))
+ while ($drow = mysqli_fetch_assoc($dres))
{
output_client_cert($drow,$support);
}
} else {
?>
<tr>
- <td colspan="<?=$colspan?>" ><?=_('no entry available')?></td>
+ <td colspan="<?php echo $colspan?>" ><?php echo _('no entry available')?></td>
</tr>
- <?
-}
+ <?php }
?>
</table>
<br/>
-<?
-// Server Certificates
+<?php // Server Certificates
$dres = get_server_certs($userid,1);
$colspan = 7;
if (1 == $support) {
@@ -294,28 +283,26 @@ if (1 == $support) {
?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="<?=$colspan?>" class="title"><?=_('Server certificates')?></td>
+ <td colspan="<?php echo $colspan?>" class="title"><?php echo _('Server certificates')?></td>
</tr>
-<?
-if (mysql_num_rows($dres) > 0) {
+<?php
+if (mysqli_num_rows($dres) > 0) {
output_server_certs_header($support);
- while ($drow = mysql_fetch_assoc($dres))
+ while ($drow = mysqli_fetch_assoc($dres))
{
output_server_certs($drow,$support);
}
} else {
?>
<tr>
- <td colspan="<?=$colspan?>" ><?=_('no entry available')?></td>
+ <td colspan="<?php echo $colspan?>" ><?php echo _('no entry available')?></td>
</tr>
- <?
-}
+ <?php }
?>
</table>
<br/>
-<?
-// GPG Certificates
+<?php // GPG Certificates
$dres = get_gpg_certs($userid,1);
$colspan = 6;
if (1 == $support) {
@@ -324,33 +311,29 @@ if (1 == $support) {
?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="<?=$colspan?>" class="title"><?=_('GPG/PGP certificates')?></td>
+ <td colspan="<?php echo $colspan?>" class="title"><?php echo _('GPG/PGP certificates')?></td>
</tr>
-<?
-if (mysql_num_rows($dres) > 0) {
+<?php
+if (mysqli_num_rows($dres) > 0) {
output_gpg_certs_header($support);
- while ($drow = mysql_fetch_assoc($dres))
+ while ($drow = mysqli_fetch_assoc($dres))
{
output_gpg_certs($drow, $support);
}
} else {
?>
<tr>
- <td colspan="<?=$colspan?>" ><?=_('no entry available')?></td>
+ <td colspan="<?php echo $colspan?>" ><?php echo _('no entry available')?></td>
</tr>
- <?
-}?>
+ <?php }?>
</table>
<br/>
-<?
-
+<?php
output_given_assurances($userid, $support, $ticketno, 1);
-?><br/><?
-
+?><br/><?php
output_received_assurances($userid, $support, $ticketno, 1);
-?><br/><?
-
+?><br/><?php
$dres = get_se_log($userid);
$colspan = 2;
if (1 == $support) {
@@ -359,26 +342,25 @@ if (1 == $support) {
?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="<?=$colspan?>" class="title"><?=_('Admin log')?></td>
+ <td colspan="<?php echo $colspan?>" class="title"><?php echo _('Admin log')?></td>
</tr>
-<?
-if (mysql_num_rows($dres) > 0) {
+<?php
+if (mysqli_num_rows($dres) > 0) {
output_log_se_header($support);
- while ($drow = mysql_fetch_assoc($dres))
+ while ($drow = mysqli_fetch_assoc($dres))
{
output_log_se($drow,$support);
}
} else {
?>
<tr>
- <td colspan="<?=$colspan?>" ><?=_('no entry available')?></td>
+ <td colspan="<?php echo $colspan?>" ><?php echo _('no entry available')?></td>
</tr>
- <?
-}
+ <?php }
?>
<tr>
- <td colspan="<?=$colspan?>" >
- <a href="account.php?id=<?=$oldid?intval($oldid):($support?43:13)?>&amp;userid=<?=intval($userid)?>"><?= _('Back to previous page.')?></a>
+ <td colspan="<?php echo $colspan?>" >
+ <a href="account.php?id=<?php echo $oldid?intval($oldid):($support?43:13)?>&amp;userid=<?php echo intval($userid)?>"><?php echo _('Back to previous page.')?></a>
</td>
</tr>
diff --git a/pages/account/6.php b/pages/account/6.php
index de8d1a3..97acd7f 100644
--- a/pages/account/6.php
+++ b/pages/account/6.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -39,14 +39,14 @@ $query = "select UNIX_TIMESTAMP(`emailcerts`.`created`) as `created`,
where `emailcerts`.`id`='$certid' and
`emailcerts`.`memid`='".intval($_SESSION['profile']['id'])."'";
-$res = mysql_query($query);
-if(mysql_num_rows($res) <= 0) {
+$res = mysqli_query($_SESSION['mconn'], $query);
+if(mysqli_num_rows($res) <= 0) {
showheader(_("My CAcert.org Account!"));
echo _("No such certificate attached to your account.");
showfooter();
exit;
}
-$row = mysql_fetch_assoc($res);
+$row = mysqli_fetch_assoc($res);
if (array_key_exists('format', $_REQUEST)) {
@@ -117,10 +117,9 @@ if (array_key_exists('format', $_REQUEST)) {
?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="2" class="title"><?=_("Information about the certificate")?></td>
+ <td colspan="2" class="title"><?php echo _("Information about the certificate")?></td>
</tr>
-<?
- if($row['timeleft'] > 0)
+<?php if($row['timeleft'] > 0)
$verified = _("Valid");
if($row['timeleft'] < 0)
$verified = _("Expired");
@@ -132,37 +131,36 @@ if (array_key_exists('format', $_REQUEST)) {
$row['revoke'] = _("Not Revoked");
?>
<tr>
- <td class="DataTD"><?=_("Status")?></td>
- <td class="DataTD"><?=$verified?></td>
+ <td class="DataTD"><?php echo _("Status")?></td>
+ <td class="DataTD"><?php echo $verified?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Email Address")?></td>
- <td class="DataTD"><?=(trim($row['CN'])=="" ? _("empty") : sanitizeHTML($row['CN']))?></td>
+ <td class="DataTD"><?php echo _("Email Address")?></td>
+ <td class="DataTD"><?php echo (trim($row['CN'])=="" ? _("empty") : sanitizeHTML($row['CN']))?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("SerialNumber")?></td>
- <td class="DataTD"><?=sanitizeHTML($row['serial'])?></td>
+ <td class="DataTD"><?php echo _("SerialNumber")?></td>
+ <td class="DataTD"><?php echo sanitizeHTML($row['serial'])?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Revoked")?></td>
- <td class="DataTD"><?=$row['revoke']?></td>
+ <td class="DataTD"><?php echo _("Revoked")?></td>
+ <td class="DataTD"><?php echo $row['revoke']?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Expires")?></td>
- <td class="DataTD"><?=$row['expire']?></td>
+ <td class="DataTD"><?php echo _("Expires")?></td>
+ <td class="DataTD"><?php echo $row['expire']?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Login")?></td>
+ <td class="DataTD"><?php echo _("Login")?></td>
<td class="DataTD">
- <input type="checkbox" name="disablelogin" disabled="disabled" value="1" <?=$row['disablelogin']?"":"checked='checked'"?>/>
+ <input type="checkbox" name="disablelogin" disabled="disabled" value="1" <?php echo $row['disablelogin']?"":"checked='checked'"?>/>
</td>
</tr>
<tr>
- <td class="DataTD"><?=_("Comment")?></td>
- <td class="DataTD"><?=htmlspecialchars($row['description'])?></td>
+ <td class="DataTD"><?php echo _("Comment")?></td>
+ <td class="DataTD"><?php echo htmlspecialchars($row['description'])?></td>
</tr>
</table>
-<?
- showfooter();
+<?php showfooter();
exit;
}
diff --git a/pages/account/7.php b/pages/account/7.php
index 564fd6d..e00bd85 100644
--- a/pages/account/7.php
+++ b/pages/account/7.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,22 +15,22 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<p><?=_("Please Note: You only need to enter the main part of your domain, eg. mydomain.com rather then www.mydomain.com. Once you have verified your domain you are able to enter any sub-domain, such as www.mydomain.com or www.this.is.mydomain.com as the system checks from right to left, rather then specific hostnames when you upload a CSR to the system.")?></p>
+<p><?php echo _("Please Note: You only need to enter the main part of your domain, eg. mydomain.com rather then www.mydomain.com. Once you have verified your domain you are able to enter any sub-domain, such as www.mydomain.com or www.this.is.mydomain.com as the system checks from right to left, rather then specific hostnames when you upload a CSR to the system.")?></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"><?=_("Add Domain")?></td>
+ <td colspan="2" class="title"><?php echo _("Add Domain")?></td>
</tr>
<tr>
- <td class="DataTD" width="125"><?=_("Domain")?>: </td>
- <td class="DataTD" width="125"><input type="text" name="newdomain" value="<?=array_key_exists('newdomain',$_GET)?sanitizeHTML($_GET['newdomain']):''?>"></td>
+ <td class="DataTD" width="125"><?php echo _("Domain")?>: </td>
+ <td class="DataTD" width="125"><input type="text" name="newdomain" value="<?php echo array_key_exists('newdomain',$_GET)?sanitizeHTML($_GET['newdomain']):''?>"></td>
</tr>
<tr>
- <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("I own or am authorised to control this domain")?>"/></td>
+ <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?php echo _("I own or am authorised to control this domain")?>"/></td>
</tr>
</table>
-<input type="hidden" name="oldid" value="<?=$id?>">
-<input type="hidden" name="csrf" value="<?=make_csrf('adddomain')?>" />
+<input type="hidden" name="oldid" value="<?php echo $id?>">
+<input type="hidden" name="csrf" value="<?php echo make_csrf('adddomain')?>" />
</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>
diff --git a/pages/account/8.php b/pages/account/8.php
index 79448d1..e3f0777 100644
--- a/pages/account/8.php
+++ b/pages/account/8.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -19,20 +19,20 @@
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="2" class="title"><?=_("Please choose an authority email address")?></td>
+ <td colspan="2" class="title"><?php echo _("Please choose an authority email address")?></td>
</tr>
-<? $tagged=0;
+<?php $tagged=0;
if(is_array($_SESSION['_config']['addy']))
foreach($_SESSION['_config']['addy'] as $add) { ?>
<tr>
- <td class="DataTD" width="75"><input type="radio" name="authaddy" value="<?=$add?>"<? if($tagged == 0) { echo " checked=\"checked\""; $tagged = 1; } ?> /></td>
- <td class="DataTD" width="175"><?=$add?></td>
+ <td class="DataTD" width="75"><input type="radio" name="authaddy" value="<?php echo $add?>"<?php if($tagged == 0) { echo " checked=\"checked\""; $tagged = 1; } ?> /></td>
+ <td class="DataTD" width="175"><?php echo $add?></td>
</tr>
-<? } ?>
+<?php } ?>
<tr>
- <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Probe")?>"></td>
+ <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?php echo _("Probe")?>"></td>
</tr>
</table>
-<input type="hidden" name="csrf" value="<?=make_csrf('ctcinfo')?>" />
-<input type="hidden" name="oldid" value="<?=$id?>" />
+<input type="hidden" name="csrf" value="<?php echo make_csrf('ctcinfo')?>" />
+<input type="hidden" name="oldid" value="<?php echo $id?>" />
</form>
diff --git a/pages/account/9.php b/pages/account/9.php
index 1be45f5..b26e83a 100644
--- a/pages/account/9.php
+++ b/pages/account/9.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -18,24 +18,23 @@
<form method="post" action="account.php">
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="3" class="title"><?=_("Domains")?></td>
+ <td colspan="3" class="title"><?php echo _("Domains")?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Delete")?></td>
- <td class="DataTD"><?=_("Status")?></td>
- <td class="DataTD"><?=_("Address")?></td>
+ <td class="DataTD"><?php echo _("Delete")?></td>
+ <td class="DataTD"><?php echo _("Status")?></td>
+ <td class="DataTD"><?php echo _("Address")?></td>
-<?
- $query = "select * from `domains` where `memid`='".intval($_SESSION['profile']['id'])."' and `deleted`=0";
- $res = mysql_query($query);
- if(mysql_num_rows($res) <= 0)
+<?php $query = "select * from `domains` where `memid`='".intval($_SESSION['profile']['id'])."' and `deleted`=0";
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) <= 0)
{
?>
<tr>
- <td colspan="3" class="DataTD"><?=_("No domains are currently listed.")?></td>
+ <td colspan="3" class="DataTD"><?php echo _("No domains are currently listed.")?></td>
</tr>
-<? } else {
- while($row = mysql_fetch_assoc($res))
+<?php } else {
+ while($row = mysqli_fetch_assoc($res))
{
if($row['hash'] == "")
$verified = _("Verified");
@@ -43,15 +42,15 @@
$verified = _("Unverified");
?>
<tr>
- <td class="DataTD"><input type="checkbox" name="delid[]" value="<?=intval($row['id'])?>"></td>
- <td class="DataTD"><?=$verified?></td>
- <td class="DataTD"><?=sanitizeHTML($row['domain'])?></td>
+ <td class="DataTD"><input type="checkbox" name="delid[]" value="<?php echo intval($row['id'])?>"></td>
+ <td class="DataTD"><?php echo $verified?></td>
+ <td class="DataTD"><?php echo sanitizeHTML($row['domain'])?></td>
</tr>
-<? } ?>
+<?php } ?>
<tr>
- <td class="DataTD" colspan="3"><input type="submit" name="process" value="<?=_("Delete")?>"></td>
+ <td class="DataTD" colspan="3"><input type="submit" name="process" value="<?php echo _("Delete")?>"></td>
</tr>
-<? } ?>
+<?php } ?>
</table>
-<input type="hidden" name="oldid" value="<?=$id?>">
+<input type="hidden" name="oldid" value="<?php echo $id?>">
</form>
diff --git a/pages/advertising/0.php b/pages/advertising/0.php
index 0404a5e..858b902 100644
--- a/pages/advertising/0.php
+++ b/pages/advertising/0.php
@@ -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
*/ ?>
-<?
- $tdcols = 6;
+<?php $tdcols = 6;
if($_SESSION['profile']['adadmin'] == 2)
$tdcols++;
@@ -24,13 +23,13 @@
{
$approve = intval($_REQUEST['approve']);
$query = "select * from `advertising` where `id`='$approve' and `expires`='0000-00-00 00:00:00'";
- $res = mysql_query($query);
- if(mysql_num_rows($res) > 0)
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) > 0)
{
- $row = mysql_fetch_assoc($res);
+ $row = mysqli_fetch_assoc($res);
$end = date("Y-m-d H:i:s", mktime(date("H"), date("i"), date("s"), date("m")+$row['months'], date("d"), date("Y")));
$query = "update `advertising` set `expires`='$end', `active`=1, `approvedby`='".$_SESSION['profile']['id']."' where `id`='$approve'";
- mysql_query($query);
+ mysqli_query($_SESSION['mconn'],$query);
echo "<p>The ad was approved and is now active.</p>\n";
}
}
@@ -38,13 +37,13 @@
{
$deactive = intval($_REQUEST['deactive']);
$query = "select * from `advertising` where `id`='$deactive'";
- $res = mysql_query($query);
- if(mysql_num_rows($res) > 0)
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) > 0)
{
- $row = mysql_fetch_assoc($res);
+ $row = mysqli_fetch_assoc($res);
$end = date("Y-m-d H:i:s", mktime(date("H"), date("i"), date("s"), date("m")+$row['months'], date("d"), date("Y")));
$query = "update `advertising` set `active`=0 where `id`='$deactive'";
- mysql_query($query);
+ mysqli_query($_SESSION['mconn'], $query);
echo "<p>The ad was deactivated and is now inactive.</p>\n";
}
}
@@ -52,7 +51,7 @@
?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="500">
<tr>
- <td colspan="<?=$tdcols?>" class="title"><?=_("View Advertising")?> <a href="advertising.php?id=<?=$id?>&showall=1"><?=_("Show All")?></a></td>
+ <td colspan="<?php echo $tdcols?>" class="title"><?php echo _("View Advertising")?> <a href="advertising.php?id=<?php echo $id?>&showall=1"><?php echo _("Show All")?></a></td>
</tr>
<tr>
<td class="DataTD">ID</td>
@@ -61,16 +60,15 @@
<td class="DataTD">Expires</td>
<td class="DataTD">Edit</td>
<td class="DataTD">Disable</td>
-<? if($_SESSION['profile']['adadmin'] == 2) { echo "\t<td class='DataTD'>Approve</td>\n"; }
+<?php if($_SESSION['profile']['adadmin'] == 2) { echo "\t<td class='DataTD'>Approve</td>\n"; }
?> </tr>
-<?
- $query = "select *,UNIX_TIMESTAMP(`expires`)-UNIX_TIMESTAMP(NOW()) as `timeleft` from `advertising` where `replaced`=0 ";
+<?php $query = "select *,UNIX_TIMESTAMP(`expires`)-UNIX_TIMESTAMP(NOW()) as `timeleft` from `advertising` where `replaced`=0 ";
if(!array_key_exists('showall',$_REQUEST) || $_REQUEST['showall'] != 1)
$query .= "and `active`=1 having `timeleft` > 0 ";
$query .= "order by `id` desc";
- $res = mysql_query($query);
- while($row = mysql_fetch_assoc($res))
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ while($row = mysqli_fetch_assoc($res))
{
if($row['expires'] == "0000-00-00 00:00:00")
$status = "Pending";
diff --git a/pages/advertising/1.php b/pages/advertising/1.php
index 5de2ad3..8254038 100644
--- a/pages/advertising/1.php
+++ b/pages/advertising/1.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,16 +15,15 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<? global $errmsg, $link, $title, $months; if($errmsg != "") { ?><p style="color:red"><?=$errmsg?></p><? } ?>
+<?php global $errmsg, $link, $title, $months; if($errmsg != "") { ?><p style="color:red"><?php echo $errmsg?></p><?php } ?>
<form method="post" action="advertising.php" ACCEPTCHARSET="utf-8">
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="6" class="title"><?=_("New Advertisement")?></td>
+ <td colspan="6" class="title"><?php echo _("New Advertisement")?></td>
</tr>
- <tr><td class='DataTD'>Link Title:</td><td class='DataTD'><input type="text" name="title" value="<?=$title?>"></td></tr>
- <tr><td class='DataTD'>URL:</td><td class='DataTD'><input type="text" name="link" value="<?=$link?>"></td></tr>
- <tr><td class='DataTD'>Months:</td><td class='DataTD'><select name="months"><?
- for($i = 1; $i <= 12; $i++)
+ <tr><td class='DataTD'>Link Title:</td><td class='DataTD'><input type="text" name="title" value="<?php echo $title?>"></td></tr>
+ <tr><td class='DataTD'>URL:</td><td class='DataTD'><input type="text" name="link" value="<?php echo $link?>"></td></tr>
+ <tr><td class='DataTD'>Months:</td><td class='DataTD'><select name="months"><?php for($i = 1; $i <= 12; $i++)
{
echo "<option value='$i'";
if($months == $i)
@@ -34,5 +33,5 @@
?></td></tr>
<tr><td class='DataTD' colspan='2'><input type="submit" name="process" value="Submit New Advertisment"></tr>
</table>
-<input type="hidden" name="oldid" value="<?=$id?>">
+<input type="hidden" name="oldid" value="<?php echo $id?>">
</form>
diff --git a/pages/disputes/0.php b/pages/disputes/0.php
index 89da7cf..40b7580 100644
--- a/pages/disputes/0.php
+++ b/pages/disputes/0.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,10 +15,10 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<H3><?=_("Disputes and Abuse Reporting")?></H3>
-<p><?=_("Please select the most appropriate section to report your problem.")?></p>
-<H4><?=_("Disputes")?></H4>
-<p><?=_("If you want to dispute who has control of your email address or domain, select 'Dispute Email' or 'Dispute Domain' on the right hand side.")?></p>
-<H4><?=_("Abuses")?></H4>
-<p><?=_("If you would like to report an abuse of our certificates that breaches our policies please select the Abuse menu on the right.")?></p>
+<H3><?php echo _("Disputes and Abuse Reporting")?></H3>
+<p><?php echo _("Please select the most appropriate section to report your problem.")?></p>
+<H4><?php echo _("Disputes")?></H4>
+<p><?php echo _("If you want to dispute who has control of your email address or domain, select 'Dispute Email' or 'Dispute Domain' on the right hand side.")?></p>
+<H4><?php echo _("Abuses")?></H4>
+<p><?php echo _("If you would like to report an abuse of our certificates that breaches our policies please select the Abuse menu on the right.")?></p>
diff --git a/pages/disputes/1.php b/pages/disputes/1.php
index 7395b34..1777f53 100644
--- a/pages/disputes/1.php
+++ b/pages/disputes/1.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,21 +15,21 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<H3><?=_("Email Dispute")?></H3>
-<p><?=_("If your dispute is successful you will have the email address removed from the system, you will need add the email address as per usual afterwards. The email will be removed from the current account and any certificates will be revoked.")?></p>
+<H3><?php echo _("Email Dispute")?></H3>
+<p><?php echo _("If your dispute is successful you will have the email address removed from the system, you will need add the email address as per usual afterwards. The email will be removed from the current account and any certificates will be revoked.")?></p>
<form method="post" action="disputes.php">
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="2" class="title"><?=_("Which Email?")?></td>
+ <td colspan="2" class="title"><?php echo _("Which Email?")?></td>
</tr>
<tr>
- <td class="DataTD" width="125"><?=_("Email Address")?>: </td>
+ <td class="DataTD" width="125"><?php echo _("Email Address")?>: </td>
<td class="DataTD" width="125"><input type="text" name="dispute" value=""></td>
</tr>
<tr>
- <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("File Dispute")?>"></td>
+ <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?php echo _("File Dispute")?>"></td>
</tr>
</table>
-<input type="hidden" name="oldid" value="<?=$id?>">
-<input type="hidden" name="csrf" value="<?=make_csrf('emaildispute')?>" />
+<input type="hidden" name="oldid" value="<?php echo $id?>">
+<input type="hidden" name="csrf" value="<?php echo make_csrf('emaildispute')?>" />
</form>
diff --git a/pages/disputes/2.php b/pages/disputes/2.php
index 717823e..ca3928b 100644
--- a/pages/disputes/2.php
+++ b/pages/disputes/2.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,22 +15,22 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<H3><?=_("Domain Dispute")?></H3>
-<p><?=_("If your dispute is successful the domain will be removed from the current account and any certificates will be revoked.")?></p>
+<H3><?php echo _("Domain Dispute")?></H3>
+<p><?php echo _("If your dispute is successful the domain will be removed from the current account and any certificates will be revoked.")?></p>
<form method="post" action="disputes.php">
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="2" class="title"><?=_("Dispute Domain")?></td>
+ <td colspan="2" class="title"><?php echo _("Dispute Domain")?></td>
</tr>
<tr>
- <td class="DataTD" width="125"><?=_("Domain")?>: </td>
+ <td class="DataTD" width="125"><?php echo _("Domain")?>: </td>
<td class="DataTD" width="125"><input type="text" name="dispute"></td>
</tr>
<tr>
- <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("File Dispute")?>"></td>
+ <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?php echo _("File Dispute")?>"></td>
</tr>
</table>
-<input type="hidden" name="oldid" value="<?=$id?>">
-<input type="hidden" name="csrf" value="<?=make_csrf('domaindispute')?>" />
+<input type="hidden" name="oldid" value="<?php echo $id?>">
+<input type="hidden" name="csrf" value="<?php echo make_csrf('domaindispute')?>" />
</form>
diff --git a/pages/disputes/4.php b/pages/disputes/4.php
index 7016a66..6aaa921 100644
--- a/pages/disputes/4.php
+++ b/pages/disputes/4.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,28 +15,28 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<H3><?=_("Email Dispute")?></H3>
-<p><? printf(_("Currently the email '%s' is in dispute, you have been sent an email to resolve the issue, below you have the option to accept, reject or report the request as fraudulent."), sanitizeHTML($_SESSION['_config']['email'])); ?></p>
+<H3><?php echo _("Email Dispute")?></H3>
+<p><?php printf(_("Currently the email '%s' is in dispute, you have been sent an email to resolve the issue, below you have the option to accept, reject or report the request as fraudulent."), sanitizeHTML($_SESSION['_config']['email'])); ?></p>
<form method="post" action="disputes.php">
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="2" class="title"><?=_("Email Dispute")?></td>
+ <td colspan="2" class="title"><?php echo _("Email Dispute")?></td>
</tr>
<tr>
- <td class="DataTD" colspan="2"><input type="radio" name="action" value="reject" checked> <?=_("Reject Dispute")?></td>
+ <td class="DataTD" colspan="2"><input type="radio" name="action" value="reject" checked> <?php echo _("Reject Dispute")?></td>
</tr>
<tr>
- <td class="DataTD" colspan="2"><input type="radio" name="action" value="accept"> <?=_("Accept Dispute")?></td>
+ <td class="DataTD" colspan="2"><input type="radio" name="action" value="accept"> <?php echo _("Accept Dispute")?></td>
</tr>
<tr>
- <td class="DataTD" colspan="2"><input type="radio" name="action" value="abuse"> <?=_("Report Dispute as Abuse")?></td>
+ <td class="DataTD" colspan="2"><input type="radio" name="action" value="abuse"> <?php echo _("Report Dispute as Abuse")?></td>
</tr>
<tr>
- <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Update Dispute")?>"></td>
+ <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?php echo _("Update Dispute")?>"></td>
</tr>
</table>
<input type="hidden" name="type" value="reallyemail">
-<input type="hidden" name="emailid" value="<?=intval($_REQUEST['emailid'])?>">
-<input type="hidden" name="hash" value="<?=sanitizeHTML($_REQUEST['hash'])?>">
+<input type="hidden" name="emailid" value="<?php echo intval($_REQUEST['emailid'])?>">
+<input type="hidden" name="hash" value="<?php echo sanitizeHTML($_REQUEST['hash'])?>">
</form>
diff --git a/pages/disputes/5.php b/pages/disputes/5.php
index 7212bae..fa4906d 100644
--- a/pages/disputes/5.php
+++ b/pages/disputes/5.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -19,20 +19,20 @@
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="2" class="title"><?=_("Please choose an authority email address")?></td>
+ <td colspan="2" class="title"><?php echo _("Please choose an authority email address")?></td>
</tr>
-<? $tagged=0;
+<?php $tagged=0;
if(is_array($_SESSION['_config']['addy']))
foreach($_SESSION['_config']['addy'] as $add) { ?>
<tr>
- <td class="DataTD" width="75"><input type="radio" name="authaddy" value="<?=$add?>"<? if($tagged == 0) { echo " checked='checked'"; $tagged = 1; } ?>></td>
- <td class="DataTD" width="175"><?=$add?></td>
+ <td class="DataTD" width="75"><input type="radio" name="authaddy" value="<?php echo $add?>"<?php if($tagged == 0) { echo " checked='checked'"; $tagged = 1; } ?>></td>
+ <td class="DataTD" width="175"><?php echo $add?></td>
</tr>
-<? } ?>
+<?php } ?>
<tr>
- <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Update Dispute")?>"></td>
+ <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?php echo _("Update Dispute")?>"></td>
</tr>
</table>
-<input type="hidden" name="oldid" value="<?=$id?>">
+<input type="hidden" name="oldid" value="<?php echo $id?>">
</form>
diff --git a/pages/disputes/6.php b/pages/disputes/6.php
index 159ff6f..818fb7c 100644
--- a/pages/disputes/6.php
+++ b/pages/disputes/6.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,28 +15,28 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<H3><?=_("Domain Dispute")?></H3>
-<p><? printf(_("Currently the domain '%s' is in dispute, you have been sent an email to resolve the issue, below you have the option to accept, reject or report the request as fraudulent."), sanitizeHTML($_SESSION['_config']['domain'])); ?></p>
+<H3><?php echo _("Domain Dispute")?></H3>
+<p><?php printf(_("Currently the domain '%s' is in dispute, you have been sent an email to resolve the issue, below you have the option to accept, reject or report the request as fraudulent."), sanitizeHTML($_SESSION['_config']['domain'])); ?></p>
<form method="post" action="disputes.php">
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="2" class="title"><?=_("Domain Dispute")?></td>
+ <td colspan="2" class="title"><?php echo _("Domain Dispute")?></td>
</tr>
<tr>
- <td class="DataTD" colspan="2"><input type="radio" name="action" value="reject" checked> <?=_("Reject Dispute")?></td>
+ <td class="DataTD" colspan="2"><input type="radio" name="action" value="reject" checked> <?php echo _("Reject Dispute")?></td>
</tr>
<tr>
- <td class="DataTD" colspan="2"><input type="radio" name="action" value="accept"> <?=_("Accept Dispute")?></td>
+ <td class="DataTD" colspan="2"><input type="radio" name="action" value="accept"> <?php echo _("Accept Dispute")?></td>
</tr>
<tr>
- <td class="DataTD" colspan="2"><input type="radio" name="action" value="abuse"> <?=_("Report Dispute as Abuse")?></td>
+ <td class="DataTD" colspan="2"><input type="radio" name="action" value="abuse"> <?php echo _("Report Dispute as Abuse")?></td>
</tr>
<tr>
- <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Update Dispute")?>"></td>
+ <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?php echo _("Update Dispute")?>"></td>
</tr>
</table>
<input type="hidden" name="type" value="reallydomain">
-<input type="hidden" name="domainid" value="<?=intval($_REQUEST['domainid'])?>">
-<input type="hidden" name="hash" value="<?=sanitizeHTML($_REQUEST['hash'])?>">
+<input type="hidden" name="domainid" value="<?php echo intval($_REQUEST['domainid'])?>">
+<input type="hidden" name="hash" value="<?php echo sanitizeHTML($_REQUEST['hash'])?>">
</form>
diff --git a/pages/gpg/0.php b/pages/gpg/0.php
index a11c4bf..30d995c 100644
--- a/pages/gpg/0.php
+++ b/pages/gpg/0.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -17,13 +17,13 @@
*/
include_once("../includes/shutdown.php");
?>
-<p><?=_("Paste your own public OpenPGP key below. It should not contain a picture. CAcert will sign your key after submission.")?></p>
+<p><?php echo _("Paste your own public OpenPGP key below. It should not contain a picture. CAcert will sign your key after submission.")?></p>
<form method="post" action="gpg.php">
-<p><?=_("Optional comment, only used in the certificate overview")?><br />
+<p><?php echo _("Optional comment, only used in the certificate overview")?><br />
<input type="text" name="description" maxlength="80" size=80 /></p>
-<textarea name="CSR" cols="80" rows="15"><?=array_key_exists('CSR',$_POST)?strip_tags($_POST['CSR']):""?></textarea><br />
-<p><input type="checkbox" name="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.")?></p>
-<input type="submit" name="process" value="<?=_("Submit")?>" />
-<input type="hidden" name="oldid" value="<?=$id?>" />
+<textarea name="CSR" cols="80" rows="15"><?php echo array_key_exists('CSR',$_POST)?strip_tags($_POST['CSR']):""?></textarea><br />
+<p><input type="checkbox" name="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.")?></p>
+<input type="submit" name="process" value="<?php echo _("Submit")?>" />
+<input type="hidden" name="oldid" value="<?php echo $id?>" />
</form>
diff --git a/pages/gpg/2.php b/pages/gpg/2.php
index 84e11d2..3e21496 100644
--- a/pages/gpg/2.php
+++ b/pages/gpg/2.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -18,30 +18,29 @@
<form method="post" action="gpg.php">
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="6" class="title"><?=_("OpenPGP Keys")?></td>
+ <td colspan="6" class="title"><?php echo _("OpenPGP Keys")?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Status")?></td>
- <td class="DataTD"><?=_("Email Address")?></td>
- <td class="DataTD"><?=_("Expires")?></td>
- <td class="DataTD"><?=_("Key ID")?></td>
- <td colspan="2" class="DataTD"><?=_("Comment *")?></td>
-<?
- $query = "select UNIX_TIMESTAMP(`issued`) as `issued`,
+ <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>
+ <td colspan="2" class="DataTD"><?php echo _("Comment *")?></td>
+<?php $query = "select UNIX_TIMESTAMP(`issued`) as `issued`,
UNIX_TIMESTAMP(`expire`) - UNIX_TIMESTAMP() as `timeleft`,
UNIX_TIMESTAMP(`expire`) as `expired`,
`expire`, `id`, `level`,
`email`,`keyid`,`description` from `gpg` where `memid`='".intval($_SESSION['profile']['id'])."'
ORDER BY `issued` desc";
- $res = mysql_query($query);
- if(mysql_num_rows($res) <= 0)
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) <= 0)
{
?>
<tr>
- <td colspan="6" class="DataTD"><?=_("No OpenPGP keys are currently listed.")?></td>
+ <td colspan="6" class="DataTD"><?php echo _("No OpenPGP keys are currently listed.")?></td>
</tr>
-<? } else {
- while($row = mysql_fetch_assoc($res))
+<?php } else {
+ while($row = mysqli_fetch_assoc($res))
{
$verified = '';
if($row['timeleft'] > 0)
@@ -52,31 +51,31 @@
$verified = _("Pending");
?>
<tr>
-<? if($verified == _("Valid")) { ?>
- <td class="DataTD"><?=$verified?></td>
- <td class="DataTD"><a href="gpg.php?id=3&amp;cert=<?=intval($row['id'])?>"><?=sanitizeHTML($row['email'])?></a></td>
-<? } else if($verified == _("Pending")) { ?>
- <td class="DataTD"><?=$verified?></td>
- <td class="DataTD"><?=sanitizeHTML($row['email'])?></td>
-<? } else { ?>
- <td class="DataTD"><?=$verified?></td>
- <td class="DataTD"><a href="gpg.php?id=3&amp;cert=<?=intval($row['id'])?>"><?=sanitizeHTML($row['email'])?></a></td>
-<? } ?>
- <td class="DataTD"><?=$row['expire']?></td>
- <td class="DataTD"><a href="gpg.php?id=3&amp;cert=<?=intval($row['id'])?>"><?=sanitizeHTML($row['keyid'])?></a></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 if($verified == _("Valid")) { ?>
+ <td class="DataTD"><?php echo $verified?></td>
+ <td class="DataTD"><a href="gpg.php?id=3&amp;cert=<?php echo intval($row['id'])?>"><?php echo sanitizeHTML($row['email'])?></a></td>
+<?php } else if($verified == _("Pending")) { ?>
+ <td class="DataTD"><?php echo $verified?></td>
+ <td class="DataTD"><?php echo sanitizeHTML($row['email'])?></td>
+<?php } else { ?>
+ <td class="DataTD"><?php echo $verified?></td>
+ <td class="DataTD"><a href="gpg.php?id=3&amp;cert=<?php echo intval($row['id'])?>"><?php echo sanitizeHTML($row['email'])?></a></td>
+<?php } ?>
+ <td class="DataTD"><?php echo $row['expire']?></td>
+ <td class="DataTD"><a href="gpg.php?id=3&amp;cert=<?php echo intval($row['id'])?>"><?php echo sanitizeHTML($row['keyid'])?></a></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 } ?>
+<?php } ?>
<tr>
<td class="DataTD" colspan="6">
- <?=_('* 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="change" value="<?=_("Change settings")?>" /> </td>
+ <td class="DataTD" colspan="6"><input type="submit" name="change" value="<?php echo _("Change settings")?>" /> </td>
</tr>
</table>
-<input type="hidden" name="oldid" value="<?=intval($id)?>" />
+<input type="hidden" name="oldid" value="<?php echo intval($id)?>" />
</form>
diff --git a/pages/gpg/3.php b/pages/gpg/3.php
index d9f54fb..2ca7bd8 100644
--- a/pages/gpg/3.php
+++ b/pages/gpg/3.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,19 +15,18 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<?
- $certid = intval($_REQUEST['cert']);
+<?php $certid = intval($_REQUEST['cert']);
$query = "select * from `gpg` where `id`='$certid' and `memid`='".intval($_SESSION['profile']['id'])."'";
- $res = mysql_query($query);
- if(mysql_num_rows($res) <= 0)
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) <= 0)
{
echo _("No such OpenPGP key attached to your account.");
showfooter();
exit;
}
- $row = mysql_fetch_assoc($res);
+ $row = mysqli_fetch_assoc($res);
?>
-<h3><?=_("Below is your OpenPGP key")?></h3>
+<h3><?php echo _("Below is your OpenPGP key")?></h3>
<pre>
-<? readfile($row['crt']); ?>
+<?php readfile($row['crt']); ?>
</pre>
diff --git a/pages/help/0.php b/pages/help/0.php
index 7aa9d3b..bd2c688 100644
--- a/pages/help/0.php
+++ b/pages/help/0.php
@@ -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/HELP/0">', '</a>');
?>
diff --git a/pages/help/2.php b/pages/help/2.php
index a03a773..5156171 100644
--- a/pages/help/2.php
+++ b/pages/help/2.php
@@ -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/HELP/2">', '</a>');
?>
diff --git a/pages/help/3.php b/pages/help/3.php
index 8cdeb08..6fcf01b 100644
--- a/pages/help/3.php
+++ b/pages/help/3.php
@@ -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/HELP/3">', '</a>');
?>
diff --git a/pages/help/4.php b/pages/help/4.php
index 248564c..d486e1a 100644
--- a/pages/help/4.php
+++ b/pages/help/4.php
@@ -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/HELP/4">', '</a>');
?>
diff --git a/pages/help/5.php b/pages/help/5.php
index 604febc..be005bc 100644
--- a/pages/help/5.php
+++ b/pages/help/5.php
@@ -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/HELP/5">', '</a>');
?>
diff --git a/pages/help/6.php b/pages/help/6.php
index 5308e93..3bc3297 100644
--- a/pages/help/6.php
+++ b/pages/help/6.php
@@ -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/HELP/6">', '</a>');
?>
diff --git a/pages/help/7.php b/pages/help/7.php
index 73e18da..1639efb 100644
--- a/pages/help/7.php
+++ b/pages/help/7.php
@@ -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/HELP/7">', '</a>');
?>
diff --git a/pages/help/8.php b/pages/help/8.php
index 41c4959..8c92ecc 100644
--- a/pages/help/8.php
+++ b/pages/help/8.php
@@ -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/HELP/8">', '</a>');
?>
diff --git a/pages/help/9.php b/pages/help/9.php
index d6fdc39..684845c 100644
--- a/pages/help/9.php
+++ b/pages/help/9.php
@@ -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/HELP/9">', '</a>');
?>
diff --git a/pages/index/0.php b/pages/index/0.php
index 6cca117..06c877a 100644
--- a/pages/index/0.php
+++ b/pages/index/0.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,25 +15,24 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<h3><?=_("Are you new to CAcert?")?></h3>
+<h3><?php echo _("Are you new to CAcert?")?></h3>
-<p><?=_("CAcert.org is a community-driven Certificate Authority that issues certificates to the public at large for free.")?></p>
+<p><?php echo _("CAcert.org is a community-driven Certificate Authority that issues certificates to the public at large for free.")?></p>
-<p><?=_("CAcert's goal is to promote awareness and education on computer security through the use of encryption, specifically by providing cryptographic certificates. These certificates can be used to digitally sign and encrypt email, authenticate and authorize users connecting to websites and secure data transmission over the internet. Any application that supports the Secure Socket Layer Protocol (SSL or TLS) can make use of certificates signed by CAcert, as can any application that uses X.509 certificates, e.g. for encryption or code signing and document signatures.")?></p>
+<p><?php echo _("CAcert's goal is to promote awareness and education on computer security through the use of encryption, specifically by providing cryptographic certificates. These certificates can be used to digitally sign and encrypt email, authenticate and authorize users connecting to websites and secure data transmission over the internet. Any application that supports the Secure Socket Layer Protocol (SSL or TLS) can make use of certificates signed by CAcert, as can any application that uses X.509 certificates, e.g. for encryption or code signing and document signatures.")?></p>
-<p><?=sprintf(_("If you want to have free certificates issued to you, %s join the CAcert Community %s."),'<a href="https://www.cacert.org/index.php?id=1">', '</a>')?></p>
+<p><?php echo sprintf(_("If you want to have free certificates issued to you, %s join the CAcert Community %s."),'<a href="https://www.cacert.org/index.php?id=1">', '</a>')?></p>
-<p><?=sprintf(_("If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."),'<a href="/policy/RootDistributionLicense.html">',"</a>")?>
-<?=sprintf(_("This license applies to using the CAcert %s root keys %s."),'<a href="/index.php?id=3">','</a>')?></p>
+<p><?php echo sprintf(_("If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."),'<a href="/policy/RootDistributionLicense.html">',"</a>")?>
+<?php echo sprintf(_("This license applies to using the CAcert %s root keys %s."),'<a href="/index.php?id=3">','</a>')?></p>
-<? if(!array_key_exists('mconn',$_SESSION) || !$_SESSION['mconn']) echo "<font size='+1'>"._("Most CAcert functions are currently unavailable. Please come back later.")."</font>";?>
+<?php if(!array_key_exists('mconn',$_SESSION) || !$_SESSION['mconn']) echo "<font size='+1'>"._("Most CAcert functions are currently unavailable. Please come back later.")."</font>";?>
<div class="newsbox">
-<?
- printf("<p id='lnews'>%s</p>\n\n",_('Latest News'));
+<?php printf("<p id='lnews'>%s</p>\n\n",_('Latest News'));
$xml = "/www/pages/index/feed.rss"; // FIXME: use relative path to allow operation with different document root
$dom = new DOMDocument();
@@ -79,40 +78,40 @@
}
?>
-[ <a href="http://blog.CAcert.org/"><?=_('More News Items')?></a> ]
+[ <a href="http://blog.CAcert.org/"><?php echo _('More News Items')?></a> ]
</div>
<hr/>
-<h3><?=_("For CAcert Community Members")?></h3>
+<h3><?php echo _("For CAcert Community Members")?></h3>
-<p><?=sprintf(_("Have you passed the CAcert %s Assurer Challenge %s yet?"),'<a href="http://wiki.cacert.org/wiki/AssurerChallenge">','</a>')?></p>
+<p><?php echo sprintf(_("Have you passed the CAcert %s Assurer Challenge %s yet?"),'<a href="http://wiki.cacert.org/wiki/AssurerChallenge">','</a>')?></p>
-<p><?=sprintf(_("Have you read the CAcert %sCommunity Agreement%s yet?"),'<a href="/policy/CAcertCommunityAgreement.html">','</a>')?></p>
+<p><?php echo sprintf(_("Have you read the CAcert %sCommunity Agreement%s yet?"),'<a href="/policy/CAcertCommunityAgreement.html">','</a>')?></p>
-<p><?=sprintf(_("For general documentation and help, please visit the CAcert %sWiki Documentation site %s."),'<a href="http://wiki.CAcert.org">','</a>')?>
-<?=sprintf(_("For specific policies, see the CAcert %sApproved Policies page%s."),'<a href="/policy/">',"</a>")?></p>
+<p><?php echo sprintf(_("For general documentation and help, please visit the CAcert %sWiki Documentation site %s."),'<a href="http://wiki.CAcert.org">','</a>')?>
+<?php echo sprintf(_("For specific policies, see the CAcert %sApproved Policies page%s."),'<a href="/policy/">',"</a>")?></p>
-<h3><?=_("Do you want to help CAcert?")?></h3>
-<b><?=_("We are facing an uphill battle to fund this service and could do with your help?")?></b><br/>
+<h3><?php echo _("Do you want to help CAcert?")?></h3>
+<b><?php echo _("We are facing an uphill battle to fund this service and could do with your help?")?></b><br/>
-<?=_("If you can, please donate.")?><br />
-<?=_("AU$50 per year for this button")?><br />
+<?php echo _("If you can, please donate.")?><br />
+<?php echo _("AU$50 per year for this button")?><br />
<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
<input type="hidden" name="cmd" value="_s-xclick">
<input type="image" src="/images/payment2a.png" border="0" name="submit" alt="PayPal">
<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----MIIHsQYJKoZIhvcNAQcEoIIHojCCB54CAQExggEwMIIBLAIBADCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJKoZIhvcNAQEBBQAEgYBxGkBs/mmEZRh6K8mwoFJtMp+osc6AkkbKTcC9vaFbZNIDEYXCuhGWEoAZDXXZDO+AhMezeG0ug87wjDMKFkI5g5ma8uGlhQvZ6Qu1Ra8zeL9iUUk6uPpiq1h2kjD0C9CgoZmrHpKB+T8+EXFG5PISbwqqoE8OOavsxMNGhTzxJzELMAkGBSsOAwIaBQAwggEtBgkqhkiG9w0BBwEwFAYIKoZIhvcNAwcECPQ/Y13nrcTCgIIBCOLwLR4pRGnq0o5O9jGmhbF2+u56cBWCoRbZGcgoQqHXgdPKTS4EkXmu1wvLa5Y4XTgL6HUVavYViJAONgLkVyktAHlkl5XPycaAuTL4NyXCJf1VjscXS7tPv0CZ8w2JU5MlzsQ8w0UTQF0+4WDpcsj+klTlO5KyyWMaScZBsziGndfeyfO6Navv3Z5SiHb92D/i9Xf4wZaex6pX3u14WPsczTkUpne6qXmgwPS7jG+oPjWPrPRCHpe/wn3P/AC1WyHzr4X8YxR9+2gbjmyE+2RwS5vqFKcApNxuoAAtLoS2IKGg872PJUctAZEoPt2FCwisFwf170tc9gb1dtRe6KymAMRr6TDM6aCCA4cwggODMIIC7KADAgECAgEAMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbTAeFw0wNDAyMTMxMDEzMTVaFw0zNTAyMTMxMDEzMTVaMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwUdO3fxEzEtcnI7ZKZL412XvZPugoni7i7D7prCe0AtaHTc97CYgm7NsAtJyxNLixmhLV8pyIEaiHXWAh8fPKW+R017+EmXrr9EaquPmsVvTywAAE1PMNOKqo2kl4Gxiz9zZqIajOm1fZGWcGS0f5JQ2kBqNbvbg2/Za+GJ/qwUCAwEAAaOB7jCB6zAdBgNVHQ4EFgQUlp98u8ZvF71ZP1LXChvsENZklGswgbsGA1UdIwSBszCBsIAUlp98u8ZvF71ZP1LXChvsENZklGuhgZSkgZEwgY4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFsIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRwwGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAgV86VpqAWuXvX6Oro4qJ1tYVIT5DgWpE692Ag422H7yRIr/9j/iKG4Thia/Oflx4TdL+IFJBAyPK9v6zZNZtBgPBynXb048hsP16l2vi0k5Q2JKiPDsEfBhGI+HnxLXEaUWAcVfCsQFvd2A1sxRr67ip5y2wwBelUecP3AjJ+YcxggGaMIIBlgIBATCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwCQYFKw4DAhoFAKBdMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTA4MDUwMjA0NDIyOFowIwYJKoZIhvcNAQkEMRYEFHfXhKQoFxBqqG6q/87VmWf4364dMA0GCSqGSIb3DQEBAQUABIGAwPUhL0gvCMysU8a9lqGuYdNm54FYsogI2LXv6vNHKc5/xTHJ65LSV8mhmyWwxL8fUDu8IHOZbccSipiUaQTsPr57tRrwmXOV+7VC/NIciK1ulwvWwazcvP96fdr9B5OqxjxDz8AsEcXnRjFm4LehsdnP9Z9B/Z9/nwT6htjxyO0=-----END PKCS7-----
">
</form>
-<?=_("or a one off donation for this button whatever you can afford to help")?>
+<?php echo _("or a one off donation for this button whatever you can afford to help")?>
<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
<input type="hidden" name="cmd" value="_s-xclick">
<input type="image" src="/images/payment2a.png" border="0" name="submit" alt="Make payments with PayPal">
<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----MIIHRwYJKoZIhvcNAQcEoIIHODCCBzQCAQExggEwMIIBLAIBADCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJKoZIhvcNAQEBBQAEgYCA1pOad7SD8OtSdvHxI3CItmi2sb2eq/1UZbQboNkJTwlaTbTZfoWzBuFmimBR/Qz21Z+L7wFa7XxfhwRLC4V/X4uTJVAIDaKsdTXFNx51EMu+LyiP1O+7GxcdNR7njwvndIaHN0HZIdidpG8jFPP/8ZsLaPe2/Dh2S7344wSuUDELMAkGBSsOAwIaBQAwgcQGCSqGSIb3DQEHATAUBggqhkiG9w0DBwQIYn0dsk7tIRmAgaBNejWqE2RRr+Tsb3fVlcbuG98Bq+zaMO5g8n8i3DnBjIoSJNb+ZuSj53oWrh/+HCY4EY1Rg3qHiUSMOS/o9k75UR7C+ez0R9tmZ2eQrdxlqTVuvENRA0W5z6iTJYog5XhMoKScOFUBaIr9zxjETUY2Y1V3X8qRFIe0YWlYRYbePs2p/IDatirUFhOJSff0ancU2GZULRy0PiZHtzbm8Gy/oIIDhzCCA4MwggLsoAMCAQICAQAwDQYJKoZIhvcNAQEFBQAwgY4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFsIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRwwGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tMB4XDTA0MDIxMzEwMTMxNVoXDTM1MDIxMzEwMTMxNVowgY4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFsIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRwwGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBR07d/ETMS1ycjtkpkvjXZe9k+6CieLuLsPumsJ7QC1odNz3sJiCbs2wC0nLE0uLGaEtXynIgRqIddYCHx88pb5HTXv4SZeuv0Rqq4+axW9PLAAATU8w04qqjaSXgbGLP3NmohqM6bV9kZZwZLR/klDaQGo1u9uDb9lr4Yn+rBQIDAQABo4HuMIHrMB0GA1UdDgQWBBSWn3y7xm8XvVk/UtcKG+wQ1mSUazCBuwYDVR0jBIGzMIGwgBSWn3y7xm8XvVk/UtcKG+wQ1mSUa6GBlKSBkTCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb22CAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQCBXzpWmoBa5e9fo6ujionW1hUhPkOBakTr3YCDjbYfvJEiv/2P+IobhOGJr85+XHhN0v4gUkEDI8r2/rNk1m0GA8HKddvTjyGw/XqXa+LSTlDYkqI8OwR8GEYj4efEtcRpRYBxV8KxAW93YDWzFGvruKnnLbDAF6VR5w/cCMn5hzGCAZowggGWAgEBMIGUMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbQIBADAJBgUrDgMCGgUAoF0wGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDcxMTAzMDcxMDI1WjAjBgkqhkiG9w0BCQQxFgQU8tPwGUvNb8eYe8Pfhe9YutgXm/YwDQYJKoZIhvcNAQEBBQAEgYBpwhhgz5ED5qxBosfMaifzIr2anV5ScQqqQbC1hphWBQ4e2PT5+TQWCcQkrTh2UTp3vC81Y8vYZ+fussa+zPBE8DmeFDfzpLJo+TQHZUiKxWUDu6drv3o3mV3VjAkaqIhAdubhEOxj2bbKND3IRT1lfIVVSUipndKzRjukZJK39A==-----END PKCS7-----
">
</form>
-<p><?=_("If you are located in Australia, use bank transfer instead.")?></p>
+<p><?php echo _("If you are located in Australia, use bank transfer instead.")?></p>
-<p><?=_("CAcert bank account details:")?></p>
+<p><?php echo _("CAcert bank account details:")?></p>
<ul class="no_indent">
<li>Account Name: CAcert Inc</li>
<li>SWIFT: WPACAU2S</li>
@@ -121,4 +120,4 @@
</ul>
<br /><br />
-<?=_("If you want to participate in CAcert.org, have a look")?> <a href="http://wiki.cacert.org/wiki/HelpingCAcert"><?=_("here")?></a> <?=_("and")?> <a href="http://wiki.cacert.org/wiki/SystemTasks"><?=_("here")?></a>.
+<?php echo _("If you want to participate in CAcert.org, have a look")?> <a href="http://wiki.cacert.org/wiki/HelpingCAcert"><?php echo _("here")?></a> <?php echo _("and")?> <a href="http://wiki.cacert.org/wiki/SystemTasks"><?php echo _("here")?></a>.
diff --git a/pages/index/1.php b/pages/index/1.php
index 0f63e7b..d22339a 100644
--- a/pages/index/1.php
+++ b/pages/index/1.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,54 +15,53 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<p><?=_("By joining CAcert and becoming a member, you agree to the CAcert Community Agreement. Please take a moment now to read that and agree to it; this will be required to complete the process of joining.")?></p>
-<p><?=_("Warning! This site requires cookies to be enabled to ensure your privacy and security. This site uses session cookies to store temporary values to prevent people from copying and pasting the session ID to someone else exposing their account, personal details and identity theft as a result.")?></p>
+<p><?php echo _("By joining CAcert and becoming a member, you agree to the CAcert Community Agreement. Please take a moment now to read that and agree to it; this will be required to complete the process of joining.")?></p>
+<p><?php echo _("Warning! This site requires cookies to be enabled to ensure your privacy and security. This site uses session cookies to store temporary values to prevent people from copying and pasting the session ID to someone else exposing their account, personal details and identity theft as a result.")?></p>
<p style="border:dotted 1px #900;padding:0.3em;background-color:#ffe;">
-<b><?=_("Note: Please enter your date of birth and names as they are written in your official documents.")?></b><br /><br />
-<?=_("Because CAcert is a certificate authority (CA) people rely on us knowing about the identity of the users of our certificates. So even as we value privacy very much, we need to collect at least some basic information about our members. This is especially the case for everybody who wants to take part in our web of trust.")?>
-<?=_("Your private information will be used for internal procedures only and will not be shared with third parties.")?>
+<b><?php echo _("Note: Please enter your date of birth and names as they are written in your official documents.")?></b><br /><br />
+<?php echo _("Because CAcert is a certificate authority (CA) people rely on us knowing about the identity of the users of our certificates. So even as we value privacy very much, we need to collect at least some basic information about our members. This is especially the case for everybody who wants to take part in our web of trust.")?>
+<?php echo _("Your private information will be used for internal procedures only and will not be shared with third parties.")?>
</p>
<p style="border:dotted 1px #900;padding:0.3em;background-color:#ffe;">
-<?=_("A proper password wouldn't match your name or email at all, it contains at least 1 lower case letter, 1 upper case letter, a number, white space and a misc symbol. You get additional security for being over 15 characters and a second additional point for having it over 30. The system starts reducing security if you include any section of your name, or password or email address or if it matches a word from the english dictionary...")?><br><br>
-<b><?=_("Note: White spaces at the beginning and end of a password will be removed.")?></b>
+<?php echo _("A proper password wouldn't match your name or email at all, it contains at least 1 lower case letter, 1 upper case letter, a number, white space and a misc symbol. You get additional security for being over 15 characters and a second additional point for having it over 30. The system starts reducing security if you include any section of your name, or password or email address or if it matches a word from the english dictionary...")?><br><br>
+<b><?php echo _("Note: White spaces at the beginning and end of a password will be removed.")?></b>
</p>
<form method="post" action="index.php" autocomplete="off">
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="400">
<tr>
- <td colspan="3" class="title"><?=_("My Details")?></td>
+ <td colspan="3" class="title"><?php echo _("My Details")?></td>
</tr>
<tr>
- <td class="DataTD" width="125"><?=_("First Name")?>: </td>
- <td class="DataTD" width="125"><input type="text" name="fname" size="30" value="<?=array_key_exists('fname',$_REQUEST)?sanitizeHTML($_REQUEST['fname']):""?>" autocomplete="off"></td>
- <td rowspan="4" class="DataTD" width="125"><? printf(_("Help on Names %sin the wiki%s"),'<a href="//wiki.cacert.org/FAQ/HowToEnterNamesInJoinForm" target="_blank">','</a>')?></td>
+ <td class="DataTD" width="125"><?php echo _("First Name")?>: </td>
+ <td class="DataTD" width="125"><input type="text" name="fname" size="30" value="<?php echo array_key_exists('fname',$_REQUEST)?sanitizeHTML($_REQUEST['fname']):""?>" autocomplete="off"></td>
+ <td rowspan="4" class="DataTD" width="125"><?php printf(_("Help on Names %sin the wiki%s"),'<a href="//wiki.cacert.org/FAQ/HowToEnterNamesInJoinForm" target="_blank">','</a>')?></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" size="30" value="<?=array_key_exists('mname',$_REQUEST)?sanitizeHTML($_REQUEST['mname']):""?>" autocomplete="off"></td>
+ <td class="DataTD"><input type="text" name="mname" size="30" value="<?php echo array_key_exists('mname',$_REQUEST)?sanitizeHTML($_REQUEST['mname']):""?>" autocomplete="off"></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Last Name")?>: </td>
- <td class="DataTD"><input type="text" name="lname" size="30" value="<?=array_key_exists('lname',$_REQUEST)?sanitizeHTML($_REQUEST['lname']):""?>" autocomplete="off"></td>
+ <td class="DataTD"><?php echo _("Last Name")?>: </td>
+ <td class="DataTD"><input type="text" name="lname" size="30" value="<?php echo array_key_exists('lname',$_REQUEST)?sanitizeHTML($_REQUEST['lname']):""?>" autocomplete="off"></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Suffix")?><br>
- (<?=_("optional")?>)</td>
- <td class="DataTD"><input type="text" name="suffix" size="30" value="<?=array_key_exists('suffix',$_REQUEST)?sanitizeHTML($_REQUEST['suffix']):""?>" autocomplete="off"><br><?=sprintf(_("Please only write Name Suffixes into this field."))?></td>
+ <td class="DataTD"><?php echo _("Suffix")?><br>
+ (<?php echo _("optional")?>)</td>
+ <td class="DataTD"><input type="text" name="suffix" size="30" value="<?php echo array_key_exists('suffix',$_REQUEST)?sanitizeHTML($_REQUEST['suffix']):""?>" autocomplete="off"><br><?php echo sprintf(_("Please only write Name Suffixes into this field."))?></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(array_key_exists('day',$_SESSION['signup']) && $_SESSION['signup']['day'] == $i)
@@ -72,8 +71,7 @@
?>
</select>
<select name="month">
-<?
- for($i = 1; $i <= 12; $i++)
+<?php for($i = 1; $i <= 12; $i++)
{
echo "<option value='$i'";
if(array_key_exists('month',$_SESSION['signup']) && $_SESSION['signup']['month'] == $i)
@@ -82,96 +80,96 @@
}
?>
</select>
- <input type="text" name="year" value="<?=array_key_exists('year',$_SESSION['signup']) ? sanitizeHTML($_SESSION['signup']['year']):""?>" size="4" autocomplete="off"></nobr>
+ <input type="text" name="year" value="<?php echo array_key_exists('year',$_SESSION['signup']) ? sanitizeHTML($_SESSION['signup']['year']):""?>" size="4" autocomplete="off"></nobr>
</td>
<td class="DataTD">&nbsp;</td>
</tr>
<tr>
- <td class="DataTD"><?=_("Email Address")?>: </td>
- <td class="DataTD"><input type="text" name="email" size="30" value="<?=array_key_exists('email',$_REQUEST)?sanitizeHTML($_REQUEST['email']):""?>" autocomplete="off"></td>
- <td class="DataTD"><?=_("I own or am authorised to control this email address")?></td>
+ <td class="DataTD"><?php echo _("Email Address")?>: </td>
+ <td class="DataTD"><input type="text" name="email" size="30" value="<?php echo array_key_exists('email',$_REQUEST)?sanitizeHTML($_REQUEST['email']):""?>" autocomplete="off"></td>
+ <td class="DataTD"><?php echo _("I own or am authorised to control this email address")?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Pass Phrase")?><font color="red">*</font>: </td>
+ <td class="DataTD"><?php echo _("Pass Phrase")?><font color="red">*</font>: </td>
<td class="DataTD"><input type="password" name="pword1" size="30" autocomplete="off"></td>
<td class="DataTD" rowspan="2">&nbsp;</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" size="30" autocomplete="off"></td>
</tr>
<tr>
- <td class="DataTD" colspan="3"><font color="red">*</font><?=_("Please note, in the interests of good security, the pass phrase must be made up of an upper case letter, lower case letter, number and symbol.")?></td>
+ <td class="DataTD" colspan="3"><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.")?></td>
</tr>
<tr>
- <td class="DataTD" colspan="3"><?=_("Lost Pass Phrase Questions - Please enter five questions and your responses to be used for security verification.")?></td>
+ <td class="DataTD" colspan="3"><?php echo _("Lost Pass Phrase Questions - Please enter five questions and your responses to be used for security verification.")?></td>
</tr>
<tr>
<td class="DataTD">&nbsp;</td>
- <td class="DataTD"><?=_("Question")?></td>
- <td class="DataTD"><?=_("Answer")?></td>
+ <td class="DataTD"><?php echo _("Question")?></td>
+ <td class="DataTD"><?php echo _("Answer")?></td>
</tr>
<tr>
<td class="DataTD">1)</td>
- <td class="DataTD"><input type="text" name="Q1" size="30" value="<?=array_key_exists('Q1',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q1']):""?>"></td>
- <td class="DataTD"><input type="text" name="A1" size="30" value="<?=array_key_exists('A1',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A1']):""?>" autocomplete="off"></td>
+ <td class="DataTD"><input type="text" name="Q1" size="30" value="<?php echo array_key_exists('Q1',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q1']):""?>"></td>
+ <td class="DataTD"><input type="text" name="A1" size="30" value="<?php echo array_key_exists('A1',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A1']):""?>" autocomplete="off"></td>
</tr>
<tr>
<td class="DataTD">2)</td>
- <td class="DataTD"><input type="text" name="Q2" size="30" value="<?=array_key_exists('Q2',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q2']):""?>"></td>
- <td class="DataTD"><input type="text" name="A2" size="30" value="<?=array_key_exists('A2',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A2']):""?>" autocomplete="off"></td>
+ <td class="DataTD"><input type="text" name="Q2" size="30" value="<?php echo array_key_exists('Q2',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q2']):""?>"></td>
+ <td class="DataTD"><input type="text" name="A2" size="30" value="<?php echo array_key_exists('A2',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A2']):""?>" autocomplete="off"></td>
</tr>
<tr>
<td class="DataTD">3)</td>
- <td class="DataTD"><input type="text" name="Q3" size="30" value="<?=array_key_exists('Q3',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q3']):""?>"></td>
- <td class="DataTD"><input type="text" name="A3" size="30"value="<?=array_key_exists('A3',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A3']):""?>" autocomplete="off"></td>
+ <td class="DataTD"><input type="text" name="Q3" size="30" value="<?php echo array_key_exists('Q3',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q3']):""?>"></td>
+ <td class="DataTD"><input type="text" name="A3" size="30"value="<?php echo array_key_exists('A3',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A3']):""?>" autocomplete="off"></td>
</tr>
<tr>
<td class="DataTD">4)</td>
- <td class="DataTD"><input type="text" name="Q4" size="30"" value="<?=array_key_exists('Q4',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q4']):""?>"></td>
- <td class="DataTD"><input type="text" name="A4" size="30" value="<?=array_key_exists('A4',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A4']):""?>" autcomplete="off"></td>
+ <td class="DataTD"><input type="text" name="Q4" size="30"" value="<?php echo array_key_exists('Q4',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q4']):""?>"></td>
+ <td class="DataTD"><input type="text" name="A4" size="30" value="<?php echo array_key_exists('A4',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A4']):""?>" autcomplete="off"></td>
</tr>
<tr>
<td class="DataTD">5)</td>
- <td class="DataTD"><input type="text" name="Q5" size="30" value="<?=array_key_exists('Q5',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q5']):""?>"></td>
- <td class="DataTD"><input type="text" name="A5" size="30" value="<?=array_key_exists('A5',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A5']):""?>" autocomplete="off"></td>
+ <td class="DataTD"><input type="text" name="Q5" size="30" value="<?php echo array_key_exists('Q5',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q5']):""?>"></td>
+ <td class="DataTD"><input type="text" name="A5" size="30" value="<?php echo array_key_exists('A5',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A5']):""?>" autocomplete="off"></td>
</tr>
<tr>
- <td class="DataTD" colspan="3"><?=_("It's possible to get notifications of up and coming events and even just general announcements, untick any notifications you don't wish to receive. For country, regional and radius notifications to work you must choose your location once you've verified your account and logged in.")?></td>
+ <td class="DataTD" colspan="3"><?php echo _("It's possible to get notifications of up and coming events and even just general announcements, untick any notifications you don't wish to receive. For country, regional and radius notifications to work you must choose your location once you've verified your account and logged in.")?></td>
</tr>
<tr>
- <td class="DataTD" valign="top"><?=_("Alert me if")?>: </td>
+ <td class="DataTD" valign="top"><?php echo _("Alert me if")?>: </td>
<td class="DataTD" align="left">
- <input type="checkbox" name="general" value="1" <?=array_key_exists('general',$_SESSION['signup'])? ($_SESSION['signup']['general'] == "0" ?"":"checked=\"checked\""):"checked=\"checked\"" ?>><?=_("General Announcements")?><br>
- <input type="checkbox" name="country" value="1" <?=array_key_exists('country',$_SESSION['signup'])? ($_SESSION['signup']['country'] == "0" ?"":"checked=\"checked\""):"checked=\"checked\"" ?>><?=_("Country Announcements")?><br>
- <input type="checkbox" name="regional" value="1" <?=array_key_exists('regional',$_SESSION['signup'])? ($_SESSION['signup']['regional'] == "0" ?"":"checked=\"checked\""):"checked=\"checked\"" ?>><?=_("Regional Announcements")?><br>
- <input type="checkbox" name="radius" value="1" <?=array_key_exists('radius',$_SESSION['signup'])? ($_SESSION['signup']['radius'] == "0" ?"":"checked=\"checked\""):"checked=\"checked\"" ?>><?=_("Within 200km Announcements")?></td>
+ <input type="checkbox" name="general" value="1" <?php echo array_key_exists('general',$_SESSION['signup'])? ($_SESSION['signup']['general'] == "0" ?"":"checked=\"checked\""):"checked=\"checked\"" ?>><?php echo _("General Announcements")?><br>
+ <input type="checkbox" name="country" value="1" <?php echo array_key_exists('country',$_SESSION['signup'])? ($_SESSION['signup']['country'] == "0" ?"":"checked=\"checked\""):"checked=\"checked\"" ?>><?php echo _("Country Announcements")?><br>
+ <input type="checkbox" name="regional" value="1" <?php echo array_key_exists('regional',$_SESSION['signup'])? ($_SESSION['signup']['regional'] == "0" ?"":"checked=\"checked\""):"checked=\"checked\"" ?>><?php echo _("Regional Announcements")?><br>
+ <input type="checkbox" name="radius" value="1" <?php echo array_key_exists('radius',$_SESSION['signup'])? ($_SESSION['signup']['radius'] == "0" ?"":"checked=\"checked\""):"checked=\"checked\"" ?>><?php echo _("Within 200km Announcements")?></td>
<td class="DataTD">&nbsp;</td>
</tr>
<tr>
- <td class="DataTD" colspan="3"><?=_("When you click on next, we will send a confirmation email to the email address you have entered above.")?></td>
+ <td class="DataTD" colspan="3"><?php echo _("When you click on next, we will send a confirmation email to the email address you have entered above.")?></td>
</tr>
<tr>
- <td class="DataTD" colspan="3"><input type="checkbox" name="cca_agree" value="1" <?=array_key_exists('cca_agree',$_SESSION['signup'])? ($_SESSION['signup']['cca_agree'] == "1" ?"checked=\"checked\"":""):"" ?> ><?=_("I agree to the terms and conditions of the CAcert Community Agreement")?>: <a href="/policy/CAcertCommunityAgreement.html">http://www.cacert.org/policy/CAcertCommunityAgreement.html</a></td>
+ <td class="DataTD" colspan="3"><input type="checkbox" name="cca_agree" value="1" <?php echo array_key_exists('cca_agree',$_SESSION['signup'])? ($_SESSION['signup']['cca_agree'] == "1" ?"checked=\"checked\"":""):"" ?> ><?php echo _("I agree to the terms and conditions of the CAcert Community Agreement")?>: <a href="/policy/CAcertCommunityAgreement.html">http://www.cacert.org/policy/CAcertCommunityAgreement.html</a></td>
</tr>
<tr>
- <td class="DataTD" colspan="3"><input type="submit" name="process" value="<?=_("Next")?>"></td>
+ <td class="DataTD" colspan="3"><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>
diff --git a/pages/index/10.php b/pages/index/10.php
index 7dd8200..945d3c1 100644
--- a/pages/index/10.php
+++ b/pages/index/10.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
diff --git a/pages/index/11.php b/pages/index/11.php
index d1ef4df..b8d2a59 100644
--- a/pages/index/11.php
+++ b/pages/index/11.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -17,18 +17,18 @@
*/
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="index.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,16 +57,16 @@ 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 issues: You can use the above contact form for sensitive information. You can email us to support@cacert.org. You can file a bugreport on %s and mark it as private."),"<a href='https://bugs.cacert.org/'>bugs.cacert.org</a>")?></p>
+<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 support@cacert.org. You can file a bugreport on %s and mark it as private."),"<a href='https://bugs.cacert.org/'>bugs.cacert.org</a>")?></p>
<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;
diff --git a/pages/index/12.php b/pages/index/12.php
index 48c737a..c9b1b52 100644
--- a/pages/index/12.php
+++ b/pages/index/12.php
@@ -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>');
?>
diff --git a/pages/index/13.php b/pages/index/13.php
index 612422f..2ab1f13 100644
--- a/pages/index/13.php
+++ b/pages/index/13.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,23 +15,22 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<H3><?=_("Donations")?></H3><br>
+<H3><?php echo _("Donations")?></H3><br>
-<h4><?=_("If I'd like to donate to CAcert Inc., how can I do it?")?></h4>
+<h4><?php echo _("If I'd like to donate to CAcert Inc., how can I do it?")?></h4>
<p>
-<?
-printf(_("CAcert Inc. is a non-profit association which is legally able to accept donations. CAcert adheres to %sstrict guidelines%s about how this money can to be used. If you'd like to make a donation, you can do so via"),
+<?php printf(_("CAcert Inc. is a non-profit association which is legally able to accept donations. CAcert adheres to %sstrict guidelines%s about how this money can to be used. If you'd like to make a donation, you can do so via"),
'<a href="//wiki.cacert.org/FAQ/DonationsGuideline">', '</a>');
?>
<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
<input type="hidden" name="cmd" value="_s-xclick">
-<input type="image" src="/images/payment2.png" border="0" name="submit" alt="<?=_("CAcert Donation through PayPal")?>">
+<input type="image" src="/images/payment2.png" border="0" name="submit" alt="<?php echo _("CAcert Donation through PayPal")?>">
<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----MIIHRwYJKoZIhvcNAQcEoIIHODCCBzQCAQExggEwMIIBLAIBADCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJKoZIhvcNAQEBBQAEgYCA1pOad7SD8OtSdvHxI3CItmi2sb2eq/1UZbQboNkJTwlaTbTZfoWzBuFmimBR/Qz21Z+L7wFa7XxfhwRLC4V/X4uTJVAIDaKsdTXFNx51EMu+LyiP1O+7GxcdNR7njwvndIaHN0HZIdidpG8jFPP/8ZsLaPe2/Dh2S7344wSuUDELMAkGBSsOAwIaBQAwgcQGCSqGSIb3DQEHATAUBggqhkiG9w0DBwQIYn0dsk7tIRmAgaBNejWqE2RRr+Tsb3fVlcbuG98Bq+zaMO5g8n8i3DnBjIoSJNb+ZuSj53oWrh/+HCY4EY1Rg3qHiUSMOS/o9k75UR7C+ez0R9tmZ2eQrdxlqTVuvENRA0W5z6iTJYog5XhMoKScOFUBaIr9zxjETUY2Y1V3X8qRFIe0YWlYRYbePs2p/IDatirUFhOJSff0ancU2GZULRy0PiZHtzbm8Gy/oIIDhzCCA4MwggLsoAMCAQICAQAwDQYJKoZIhvcNAQEFBQAwgY4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFsIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRwwGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tMB4XDTA0MDIxMzEwMTMxNVoXDTM1MDIxMzEwMTMxNVowgY4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFsIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRwwGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBR07d/ETMS1ycjtkpkvjXZe9k+6CieLuLsPumsJ7QC1odNz3sJiCbs2wC0nLE0uLGaEtXynIgRqIddYCHx88pb5HTXv4SZeuv0Rqq4+axW9PLAAATU8w04qqjaSXgbGLP3NmohqM6bV9kZZwZLR/klDaQGo1u9uDb9lr4Yn+rBQIDAQABo4HuMIHrMB0GA1UdDgQWBBSWn3y7xm8XvVk/UtcKG+wQ1mSUazCBuwYDVR0jBIGzMIGwgBSWn3y7xm8XvVk/UtcKG+wQ1mSUa6GBlKSBkTCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb22CAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQCBXzpWmoBa5e9fo6ujionW1hUhPkOBakTr3YCDjbYfvJEiv/2P+IobhOGJr85+XHhN0v4gUkEDI8r2/rNk1m0GA8HKddvTjyGw/XqXa+LSTlDYkqI8OwR8GEYj4efEtcRpRYBxV8KxAW93YDWzFGvruKnnLbDAF6VR5w/cCMn5hzGCAZowggGWAgEBMIGUMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbQIBADAJBgUrDgMCGgUAoF0wGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDcxMTAzMDcxMDI1WjAjBgkqhkiG9w0BCQQxFgQU8tPwGUvNb8eYe8Pfhe9YutgXm/YwDQYJKoZIhvcNAQEBBQAEgYBpwhhgz5ED5qxBosfMaifzIr2anV5ScQqqQbC1hphWBQ4e2PT5+TQWCcQkrTh2UTp3vC81Y8vYZ+fussa+zPBE8DmeFDfzpLJo+TQHZUiKxWUDu6drv3o3mV3VjAkaqIhAdubhEOxj2bbKND3IRT1lfIVVSUipndKzRjukZJK39A==-----END PKCS7-----">
</form>
-<p><?=_("If you are located in Australia, please use bank transfer instead:")?></p>
+<p><?php echo _("If you are located in Australia, please use bank transfer instead:")?></p>
<pre>
Account Name: CAcert Inc
@@ -40,16 +39,16 @@ BSB: 032073
Account No.: 180264
</pre>
-<p><?=_("ANY amount will be appreciated - the more funding CAcert receives, the sooner it can achieve the goals of the community.")?></p>
+<p><?php echo _("ANY amount will be appreciated - the more funding CAcert receives, the sooner it can achieve the goals of the community.")?></p>
-<p><?=_("Thank you very much for your support, your donations help CAcert to continue to operate.")?></p>
+<p><?php echo _("Thank you very much for your support, your donations help CAcert to continue to operate.")?></p>
-<h3><?=_("Using Our Affiliate Partners")?></h3>
+<h3><?php echo _("Using Our Affiliate Partners")?></h3>
<h4>Booking.com</h4>
-<p><?=_("If you do any trips where you need accommodation why not book via booking.com?")?></p>
+<p><?php echo _("If you do any trips where you need accommodation why not book via booking.com?")?></p>
<p><?php
printf(_("For any booking done over %s started from this page CAcert gets a share of the provision. You do not pay more but you will support CAcert."),
diff --git a/pages/index/16.php b/pages/index/16.php
index ba3b4ed..8c94a79 100644
--- a/pages/index/16.php
+++ b/pages/index/16.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -16,40 +16,40 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<p><?=sprintf(_("You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."),"<a href='/policy/RootDistributionLicense.html'>","</a>")?></p>
+<p><?php echo sprintf(_("You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."),"<a href='/policy/RootDistributionLicense.html'>","</a>")?></p>
<p>
-Class 1 <?=_("PKI Key")?><br>
-<a href="index.php?id=17"><?=_("Click here if you want to import the root certificate into Microsoft Internet Explorer 5.x/6.x")?></a><br>
-<a href="certs/root.crt"><?=_("Root Certificate (PEM Format)")?></a><br>
-<a href="certs/root.der"><?=_("Root Certificate (DER Format)")?></a><br>
-<a href="certs/root.txt"><?=_("Root Certificate (Text Format)")?></a><br>
-<a href="<?=$_SERVER['HTTPS']?"https":"http"?>://crl.cacert.org/revoke.crl">CRL</a><br>
-<?=_("Fingerprint")?> SHA1: 13:5C:EC:36:F4:9C:B8:E9:3B:1A:B2:70:CD:80:88:46:76:CE:8F:33<br/>
-<?=_("Fingerprint")?> MD5: A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B<br/>
+Class 1 <?php echo _("PKI Key")?><br>
+<a href="index.php?id=17"><?php echo _("Click here if you want to import the root certificate into Microsoft Internet Explorer 5.x/6.x")?></a><br>
+<a href="certs/root.crt"><?php echo _("Root Certificate (PEM Format)")?></a><br>
+<a href="certs/root.der"><?php echo _("Root Certificate (DER Format)")?></a><br>
+<a href="certs/root.txt"><?php echo _("Root Certificate (Text Format)")?></a><br>
+<a href="<?php echo $_SERVER['HTTPS']?"https":"http"?>://crl.cacert.org/revoke.crl">CRL</a><br>
+<?php echo _("Fingerprint")?> SHA1: 13:5C:EC:36:F4:9C:B8:E9:3B:1A:B2:70:CD:80:88:46:76:CE:8F:33<br/>
+<?php echo _("Fingerprint")?> MD5: A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B<br/>
</p>
<p>
-Class 3 <?=_("PKI Key")?><br>
-<a href="certs/class3.crt"><?=_("Intermediate Certificate (PEM Format)")?></a><br/>
-<a href="certs/class3.der"><?=_("Intermediate Certificate (DER Format)")?></a><br/>
-<a href="certs/class3.txt"><?=_("Intermediate Certificate (Text Format)")?></a><br/>
-<a href="<?=$_SERVER['HTTPS']?"https":"http"?>://crl.cacert.org/class3-revoke.crl">CRL</a><br/>
+Class 3 <?php echo _("PKI Key")?><br>
+<a href="certs/class3.crt"><?php echo _("Intermediate Certificate (PEM Format)")?></a><br/>
+<a href="certs/class3.der"><?php echo _("Intermediate Certificate (DER Format)")?></a><br/>
+<a href="certs/class3.txt"><?php echo _("Intermediate Certificate (Text Format)")?></a><br/>
+<a href="<?php echo $_SERVER['HTTPS']?"https":"http"?>://crl.cacert.org/class3-revoke.crl">CRL</a><br/>
<?php /*
class3 subroot fingerprint updated: 2011-05-23 class3 Re-sign project
https://wiki.cacert.org/Roots/Class3ResignProcedure/Migration
*/ ?>
-<?=_("Fingerprint")?> SHA1: AD:7C:3F:64:FC:44:39:FE:F4:E9:0B:E8:F4:7C:6C:FA:8A:AD:FD:CE<br/>
-<?=_("Fingerprint")?> MD5: F7:25:12:82:4E:67:B5:D0:8D:92:B7:7C:0B:86:7A:42<br/>
+<?php echo _("Fingerprint")?> SHA1: AD:7C:3F:64:FC:44:39:FE:F4:E9:0B:E8:F4:7C:6C:FA:8A:AD:FD:CE<br/>
+<?php echo _("Fingerprint")?> MD5: F7:25:12:82:4E:67:B5:D0:8D:92:B7:7C:0B:86:7A:42<br/>
</p>
<p>
-<?=_("GPG Key")?><br>
-<a href="certs/cacert.asc"><?=_("CAcert's GPG Key")?></a><br>
+<?php echo _("GPG Key")?><br>
+<a href="certs/cacert.asc"><?php echo _("CAcert's GPG Key")?></a><br>
</p>
<p>
-<?=_("PKI finger/thumb print signed by the CAcert GPG Key")?><br>
+<?php echo _("PKI finger/thumb print signed by the CAcert GPG Key")?><br>
<pre>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
@@ -85,7 +85,7 @@ TG1yj+lkktROGGyn0hJ5SbM=
</p>
<p>
-<? printf(_('An overview over all CA certificates ever issued can be found in '.
+<?php printf(_('An overview over all CA certificates ever issued can be found in '.
'%sthe wiki%s.'),
'<a href="//wiki.cacert.org/Roots/StateOverview">',
'</a>') ?>
diff --git a/pages/index/17.php b/pages/index/17.php
index 99fbee3..db5b694 100644
--- a/pages/index/17.php
+++ b/pages/index/17.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,13 +15,13 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<?
+<?php
include("../includes/general_stuff.php");
?>
<html>
<head>
-<title><?=_("Install CAcert Root using CEnroll Active-X component and PKCS-7")?></title>
+<title><?php echo _("Install CAcert Root using CEnroll Active-X component and PKCS-7")?></title>
<link rel="stylesheet" href="styles/default.css" type="text/css">
</head>
@@ -131,8 +131,8 @@ Sub InstallCert
</SCRIPT>
<body LANGUAGE="VBScript" ONLOAD="InstallCert">
-<? showbodycontent("CAcert.org",""); ?>
-<p><?=_("Install a Root Certificate using Internet Explorer and the CEnroll ActiveX control. This avoids the Microsoft Certificate Installation wizard and all of its complexity and extra screens for users. This however will ONLY work for Microsoft Internet Explorer.")?></p>
-<? showfooter(); ?>
+<?php showbodycontent("CAcert.org",""); ?>
+<p><?php echo _("Install a Root Certificate using Internet Explorer and the CEnroll ActiveX control. This avoids the Microsoft Certificate Installation wizard and all of its complexity and extra screens for users. This however will ONLY work for Microsoft Internet Explorer.")?></p>
+<?php showfooter(); ?>
diff --git a/pages/index/18.php b/pages/index/18.php
index d67ce6e..94e6696 100644
--- a/pages/index/18.php
+++ b/pages/index/18.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,11 +15,10 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<?
- $errmsg = _("The CAcert root certificate was successfully installed");
+<?php $errmsg = _("The CAcert root certificate was successfully installed");
if(array_key_exists('errid',$_REQUEST) && $_REQUEST['errid'] == 1)
$errmsg = _("Can't start the CEnroll control:").' '.substr(strip_tags(array_key_exists('hex',$_REQUEST)?$_REQUEST['hex']:""), 0, 5);
if(array_key_exists('errid',$_REQUEST) && $_REQUEST['errid'] == 2)
$errmsg = _("Problems were detected with the CAcert root certificate download error:").' '.substr(strip_tags(array_key_exists('hex',$_REQUEST)?$_REQUEST['hex']:""), 0, 5);
?>
-<p><?=$errmsg?></p>
+<p><?php echo $errmsg?></p>
diff --git a/pages/index/19.php b/pages/index/19.php
index b44960d..b247b9c 100644
--- a/pages/index/19.php
+++ b/pages/index/19.php
@@ -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/Privileges">', '</a>');
?>
diff --git a/pages/index/2.php b/pages/index/2.php
index 1c057e9..61776e1 100644
--- a/pages/index/2.php
+++ b/pages/index/2.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -16,5 +16,5 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
<p>
-<?=_("Your information has been submitted into our system. You will now be sent an email with a web link, you need to open that link in your web browser within 24 hours or your information will be removed from our system!")?>
+<?php echo _("Your information has been submitted into our system. You will now be sent an email with a web link, you need to open that link in your web browser within 24 hours or your information will be removed from our system!")?>
</p>
diff --git a/pages/index/21.php b/pages/index/21.php
index f07bbb8..ddbc7e1 100644
--- a/pages/index/21.php
+++ b/pages/index/21.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -25,27 +25,27 @@ page called from the following pages
e. https://wiki.cacert.org/Brain/CAcertInc [^]
*/ ?>
-<h3><?=_("For CAcert Association Members")?></h3>
+<h3><?php echo _("For CAcert Association Members")?></h3>
-<p><b><?=_("Have you paid your CAcert Association membership fees for the year?")?></b></p>
+<p><b><?php echo _("Have you paid your CAcert Association membership fees for the year?")?></b></p>
-<p><?=_("If not then select this PayPal button to establish annual payment of your 10 EUR membership fee.")?></p>
+<p><?php echo _("If not then select this PayPal button to establish annual payment of your 10 EUR membership fee.")?></p>
<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
<input type="hidden" name="cmd" value="_s-xclick">
<input type="hidden" name="hosted_button_id" value="AMCDNMBBDXGA2">
<input type="image" src="/images/btn_subscribeCC_LG.gif" border="0" name="submit" alt="Subscription payment for membership fee">
</form>
-<p><?=_("To do a single 10 EUR membership fee payment, please use this button:")?></p>
+<p><?php echo _("To do a single 10 EUR membership fee payment, please use this button:")?></p>
<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
<input type="hidden" name="cmd" value="_s-xclick">
<input type="hidden" name="hosted_button_id" value="8F4WL72WX857J">
<input type="image" src="/images/btn_paynowCC_LG.gif" border="0" name="submit" alt="Single payment for membership fee">
</form>
-<p><?=_("If you are located in Australia, you can use bank transfer instead and pay the equivalent of 10 EUR in AUD.")?></p>
+<p><?php echo _("If you are located in Australia, you can use bank transfer instead and pay the equivalent of 10 EUR in AUD.")?></p>
-<p><?=_("Please also include your name in the transaction so we know who it came from and send an email to secretary at cacert dot org with the details:")?></p>
+<p><?php echo _("Please also include your name in the transaction so we know who it came from and send an email to secretary at cacert dot org with the details:")?></p>
<ul>
<li>Account Name: CAcert Inc</li>
diff --git a/pages/index/3.php b/pages/index/3.php
index 044d4fd..df29c5f 100644
--- a/pages/index/3.php
+++ b/pages/index/3.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -16,34 +16,34 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<p><?=sprintf(_("You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."),"<a href='/policy/RootDistributionLicense.html'>","</a>")?></p>
+<p><?php echo sprintf(_("You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."),"<a href='/policy/RootDistributionLicense.html'>","</a>")?></p>
-<h3><?=_("Class 1 PKI Key")?></h3>
+<h3><?php echo _("Class 1 PKI Key")?></h3>
<ul class="no_indent">
- <li><a href="certs/root_X0F.crt"><?=_("Root Certificate (PEM Format)")?></a></li>
- <li><a href="certs/root_X0F.der"><?=_("Root Certificate (DER Format)")?></a></li>
- <li><a href="certs/root_X0F.txt"><?=_("Root Certificate (Text Format)")?></a></li>
- <li><a href="<?=$_SERVER['HTTPS']?"https":"http"?>://crl.cacert.org/revoke.crl">CRL</a></li>
+ <li><a href="certs/root.crt"><?php echo _("Root Certificate (PEM Format)")?></a></li>
+ <li><a href="certs/root.der"><?php echo _("Root Certificate (DER Format)")?></a></li>
+ <li><a href="certs/root.txt"><?php echo _("Root Certificate (Text Format)")?></a></li>
+ <li><a href="<?php echo $_SERVER['HTTPS']?"https":"http"?>://crl.cacert.org/revoke.crl">CRL</a></li>
<li><?=_("SHA256 fingerprint:")?> 07ED BD82 4A49 88CF EF42 15DA 20D4 8C2B 41D7 1529 D7C9 00F5 7092 6F27 7CC2 30C5</li>
</ul>
-<h3><?=_("Class 3 PKI Key")?></h3>
+<h3><?php echo _("Class 3 PKI Key")?></h3>
<ul class="no_indent">
- <li><a href="certs/class3_X0E.crt"><?=_("Intermediate Certificate (PEM Format)")?></a></li>
- <li><a href="certs/class3_X0E.der"><?=_("Intermediate Certificate (DER Format)")?></a></li>
- <li><a href="certs/class3_X0E.txt"><?=_("Intermediate Certificate (Text Format)")?></a></li>
- <li><a href="<?=$_SERVER['HTTPS']?"https":"http"?>://crl.cacert.org/class3-revoke.crl">CRL</a></li>
+ <li><a href="certs/class3.crt"><?php echo _("Intermediate Certificate (PEM Format)")?></a></li>
+ <li><a href="certs/class3.der"><?php echo _("Intermediate Certificate (DER Format)")?></a></li>
+ <li><a href="certs/class3.txt"><?php echo _("Intermediate Certificate (Text Format)")?></a></li>
+ <li><a href="<?php echo $_SERVER['HTTPS']?"https":"http"?>://crl.cacert.org/class3-revoke.crl">CRL</a></li>
<li><?=_("SHA256 fingerprint:")?> F687 3D70 D675 96C2 ACBA 3440 1E69 738B 5270 1DD6 AB06 B497 49BC 5515 0936 D544</li>
</ul>
-<h3><?=_("GPG Key")?></h3>
+<h3><?php echo _("GPG Key")?></h3>
<ul class="no_indent">
- <li><a href="certs/cacert.asc"><?=_("CAcert's GPG Key")?></a></li>
- <li><?=_("GPG Key ID:")?> 0x65D0FD58</li>
- <li><?=_("Fingerprint:")?> A31D 4F81 EF4E BD07 B456 FA04 D2BB 0D01 65D0 FD58</li>
+ <li><a href="certs/cacert.asc"><?php echo _("CAcert's GPG Key")?></a></li>
+ <li><?php echo _("GPG Key ID:")?> 0x65D0FD58</li>
+ <li><?php echo _("Fingerprint:")?> A31D 4F81 EF4E BD07 B456 FA04 D2BB 0D01 65D0 FD58</li>
</ul>
-<h4><?=_("PKI fingerprint signed by the CAcert GPG Key")?></h4>
+<h4><?php echo _("PKI fingerprint signed by the CAcert GPG Key")?></h4>
<pre>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
@@ -77,9 +77,9 @@ TG1yj+lkktROGGyn0hJ5SbM=
-----END PGP SIGNATURE-----
</pre>
-<h3><?=_("History")?></h3>
+<h3><?php echo _("History")?></h3>
<p>
-<? printf(_('An overview over all CA certificates ever issued can be found in '.
+<?php printf(_('An overview over all CA certificates ever issued can be found in '.
'%sthe wiki%s.'),
'<a href="//wiki.cacert.org/Roots/StateOverview">',
'</a>') ?>
diff --git a/pages/index/4.php b/pages/index/4.php
index 384ea56..cd472a2 100644
--- a/pages/index/4.php
+++ b/pages/index/4.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -16,17 +16,16 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<?
- if(!array_key_exists('mconn',$_SESSION) || !$_SESSION['mconn'])
+<?php if(!array_key_exists('mconn',$_SESSION) || !$_SESSION['mconn'])
{
echo _("This function is currently unavailable. Please come back later.");
exit;
}
?>
-<? if($_SESSION['_config']['hostname'] == $_SESSION['_config']['securehostname']) { ?>
-<p><?=sprintf(_("Warning! You've attempted to log into the system with a client certificate, but the login failed due to the certificate being expired, revoked, disabled for certificate login, or simply not valid for this site. You can login using your email/pass phrase to get a new certificate, by clicking on %sPassword Login%s on the right side of this page."),"<a href='https://".$_SESSION['_config']['normalhostname']."/index.php?id=4'>", "</a>")?></p>
-<? } else { ?>
+<?php if($_SESSION['_config']['hostname'] == $_SESSION['_config']['securehostname']) { ?>
+<p><?php echo sprintf(_("Warning! You've attempted to log into the system with a client certificate, but the login failed due to the certificate being expired, revoked, disabled for certificate login, or simply not valid for this site. You can login using your email/pass phrase to get a new certificate, by clicking on %sPassword Login%s on the right side of this page."),"<a href='https://".$_SESSION['_config']['normalhostname']."/index.php?id=4'>", "</a>")?></p>
+<?php } else { ?>
<style>
.box2 {width:100%;text-align:center;}
.box {background:#F5F7F7;border:2px solid #cccccc;margin:0px auto;height:auto;width:300px;padding:1em;}
@@ -38,22 +37,22 @@ h1 {font-size:1.9em;text-align:center;}
</style>
<div class='box2'>
<div class='box'>
-<form action='index.php' method='post'<? if(array_key_exists("noauto",$_REQUEST) && $_REQUEST['noauto'] == 1) echo " autocomplete='off'"; ?>>
-<? if(array_key_exists("noauto",$_REQUEST) && $_REQUEST['noauto'] == 1) { ?><input type="hidden" name="noauto" value="1"><? } ?>
-<h1><?=_("Login")?></h1>
-<p class='smalltext'><?=_("Warning! This site requires cookies to be enabled to ensure your privacy and security. This site uses session cookies to store temporary values to prevent people from copying and pasting the session ID to someone else exposing their account, personal details and identity theft as a result.")?></p>
-<label for="email"><?=_("Email Address")?>:</label><input type='text' name="email" value="<?=sanitizeHTML(array_key_exists("email",$_REQUEST)?$_REQUEST['email']:"")?>" <? if(array_key_exists('notauto',$_REQUEST) && $_REQUEST['noauto'] == 1) echo " autocomplete='off'"; ?>/><br />
-<label for="pword"><?=_("Pass Phrase")?>:</label><input type='password' name='pword' autocomplete="off"/><br />
-<input type='submit' name="process" value="<?=_("Login")?>" /><br /><br />
-<a href='https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=4'><?=_("Password Login")?></a> -
-<a href='https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=5'><?=_("Lost Password")?></a> -
-<a href='https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=4&amp;noauto=1'><?=_("Net Cafe Login")?></a><br />
-<p class='smalltext'><?=sprintf(_("If you are having trouble with your username or password, please visit our %swiki page%s for more information"), "<a href='http://wiki.cacert.org/wiki/FAQ/LostPasswordOrAccount' target='_new'>", "</a>");?></p>
-<input type="hidden" name="oldid" value="<?=$id?>">
+<form action='index.php' method='post'<?php if(array_key_exists("noauto",$_REQUEST) && $_REQUEST['noauto'] == 1) echo " autocomplete='off'"; ?>>
+<?php if(array_key_exists("noauto",$_REQUEST) && $_REQUEST['noauto'] == 1) { ?><input type="hidden" name="noauto" value="1"><?php } ?>
+<h1><?php echo _("Login")?></h1>
+<p class='smalltext'><?php echo _("Warning! This site requires cookies to be enabled to ensure your privacy and security. This site uses session cookies to store temporary values to prevent people from copying and pasting the session ID to someone else exposing their account, personal details and identity theft as a result.")?></p>
+<label for="email"><?php echo _("Email Address")?>:</label><input type='text' name="email" value="<?php echo sanitizeHTML(array_key_exists("email",$_REQUEST)?$_REQUEST['email']:"")?>" <?php if(array_key_exists('notauto',$_REQUEST) && $_REQUEST['noauto'] == 1) echo " autocomplete='off'"; ?>/><br />
+<label for="pword"><?php echo _("Pass Phrase")?>:</label><input type='password' name='pword' autocomplete="off"/><br />
+<input type='submit' name="process" value="<?php echo _("Login")?>" /><br /><br />
+<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><br />
+<p class='smalltext'><?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>
+<input type="hidden" name="oldid" value="<?php echo $id?>">
</form>
</div>
</div>
-<? }
+<?php }
if(array_key_exists("oldlocation",$_SESSION['_config']) && $_SESSION['_config']['oldlocation']!="")
{
echo "<br/><center>"._("If you want to use certificate login instead of username+password, please")." <a href='https://secure.cacert.org/".sanitizeHTML($_SESSION['_config']['oldlocation'])."'>"._("click here")."</a></center>";
diff --git a/pages/index/47.php b/pages/index/47.php
index 7046934..a1f1aa5 100644
--- a/pages/index/47.php
+++ b/pages/index/47.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,44 +15,42 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<h3><?=_("CAcert Public Relations materials")?></h3>
+<h3><?php echo _("CAcert Public Relations materials")?></h3>
-<p><?=_("On this page you find materials that can be used for CAcert publicity")?>
-<br /><?=sprintf(_("Use of these materials is subject to the rules described in the %s."), "<a href='http://svn.cacert.org/CAcert/PR/CAcert_Styleguide.pdf'>CAcert Style Guide</a>")?></p>
+<p><?php echo _("On this page you find materials that can be used for CAcert publicity")?>
+<br /><?php echo sprintf(_("Use of these materials is subject to the rules described in the %s."), "<a href='http://svn.cacert.org/CAcert/PR/CAcert_Styleguide.pdf'>CAcert Style Guide</a>")?></p>
-<h5><?=_("CAcert logos")?></h4>
+<h5><?php echo _("CAcert logos")?></h4>
-<p><?=sprintf(_("Here you find a number of logos to use in documents or to add to your website. Help CAcert to get some publicity by using a logo to link back to %s or to indicate that you or your website are using a CAcert certificates for security and privacy."), "<a href='http://www.cacert.org'>http://www.cacert.org</a>")?></p>
+<p><?php echo sprintf(_("Here you find a number of logos to use in documents or to add to your website. Help CAcert to get some publicity by using a logo to link back to %s or to indicate that you or your website are using a CAcert certificates for security and privacy."), "<a href='http://www.cacert.org'>http://www.cacert.org</a>")?></p>
-<p><?=_("As described in the Style Guide, the monochrome version of the logo must be used in situations where the logo colours cannot be reproduced correctly.")?></p>
+<p><?php echo _("As described in the Style Guide, the monochrome version of the logo must be used in situations where the logo colours cannot be reproduced correctly.")?></p>
-<p><?=_("CAcert Logo, Encapsulated PostScript (EPS) format")?>
+<p><?php echo _("CAcert Logo, Encapsulated PostScript (EPS) format")?>
<br />&nbsp;&nbsp;&nbsp;&nbsp;|
-<a href="http://svn.cacert.org/CAcert/PR/Logos/CAcert-logo-colour.eps"><?=_("Colour version")?></a> |
-<a href="http://svn.cacert.org/CAcert/PR/Logos/CAcert-logo-mono.eps"><?=_("Monochrome version")?></a> |
+<a href="http://svn.cacert.org/CAcert/PR/Logos/CAcert-logo-colour.eps"><?php echo _("Colour version")?></a> |
+<a href="http://svn.cacert.org/CAcert/PR/Logos/CAcert-logo-mono.eps"><?php echo _("Monochrome version")?></a> |
</p>
-<p><?=_("CAcert Logo, colour version, PNG format")?>
-<? $px = array("100x24", "120x28", "150x35", "180x42", "210x49", "270x62", "330x76", "390x90", "470x108", "560x128", "680x156", "820x188", "1000x229") ?>
+<p><?php echo _("CAcert Logo, colour version, PNG format")?>
+<?php $px = array("100x24", "120x28", "150x35", "180x42", "210x49", "270x62", "330x76", "390x90", "470x108", "560x128", "680x156", "820x188", "1000x229") ?>
<br>&nbsp;&nbsp;&nbsp;&nbsp;|
-<?
-foreach ( $px as $i ) {
+<?php foreach ( $px as $i ) {
$w = substr($i, 0, strcspn($i,"x"));
if ( $w != "100" ) {
printf(" | ");
}
-?><a href="http://svn.cacert.org/CAcert/PR/Logos/CAcert-logo-colour-<?=$w?>.png"><?=$i?></a>
-<? } ?> |</p>
+?><a href="http://svn.cacert.org/CAcert/PR/Logos/CAcert-logo-colour-<?php echo $w?>.png"><?php echo $i?></a>
+<?php } ?> |</p>
-<p><?=_("CAcert Logo, monochrome version, PNG format")?>
-<? $px = array("100x24", "120x28", "150x35", "180x42", "210x49", "270x63", "330x76", "390x90", "470x108", "560x129", "680x157", "820x189", "1000x230") ?>
+<p><?php echo _("CAcert Logo, monochrome version, PNG format")?>
+<?php $px = array("100x24", "120x28", "150x35", "180x42", "210x49", "270x63", "330x76", "390x90", "470x108", "560x129", "680x157", "820x189", "1000x230") ?>
<br>&nbsp;&nbsp;&nbsp;&nbsp;|
-<?
-foreach ( $px as $i ) {
+<?php foreach ( $px as $i ) {
$w = substr($i, 0, strcspn($i,"x"));
if ( $w != "100" ) {
printf(" | ");
}
-?><a href="http://svn.cacert.org/CAcert/PR/Logos/CAcert-logo-mono-<?=$w?>.png"><?=$i?></a>
-<? } ?> |</p>
+?><a href="http://svn.cacert.org/CAcert/PR/Logos/CAcert-logo-mono-<?php echo $w?>.png"><?php echo $i?></a>
+<?php } ?> |</p>
diff --git a/pages/index/5.php b/pages/index/5.php
index 20e868f..871b423 100644
--- a/pages/index/5.php
+++ b/pages/index/5.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -18,26 +18,24 @@
<form method="post" action="index.php" autocomplete="off">
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="2" class="title"><?=_("Lost Pass Phrase")?></td>
+ <td colspan="2" class="title"><?php echo _("Lost Pass Phrase")?></td>
</tr>
<tr>
- <td class="DataTD" width="125"><?=_("Email Address (primary)")?>: </td>
+ <td class="DataTD" width="125"><?php echo _("Email Address (primary)")?>: </td>
<td class="DataTD" width="125"><input type="text" name="email" autocomplete="off"></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>$i</option>";
}
?>
</select>
<select name="month">
-<?
- for($i = 1; $i <= 12; $i++)
+<?php for($i = 1; $i <= 12; $i++)
{
echo "<option value='$i'";
echo ">".ucwords(strftime("%B", mktime(0,0,0,$i,1,date("Y"))))."</option>";
@@ -48,15 +46,15 @@
</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>
-<p><?=_("Due to the increasing number of people that haven't been able to recover their passwords via the lost password form, there are now two other options available. 1.) If you don't care about your account you can signup under a new account and file dispute forms to recover your email accounts and domains. 2.) If you would like to recover your password via help from support staff, this requires a small payment to cover a real person's time to verify your claim of ownership on an account. After you pay the required fee you will have to contact the proper person to arrange the verification. Click the payment button below to continue.")." "?><? printf(_("Alternatively visit our %sinformation page%s on this subject for more details."), "<a href='http://wiki.cacert.org/wiki/FAQ/LostPasswordOrAccount'>", "</a>")?></p>
+<p><?php echo _("Due to the increasing number of people that haven't been able to recover their passwords via the lost password form, there are now two other options available. 1.) If you don't care about your account you can signup under a new account and file dispute forms to recover your email accounts and domains. 2.) If you would like to recover your password via help from support staff, this requires a small payment to cover a real person's time to verify your claim of ownership on an account. After you pay the required fee you will have to contact the proper person to arrange the verification. Click the payment button below to continue.")." "?><?php printf(_("Alternatively visit our %sinformation page%s on this subject for more details."), "<a href='http://wiki.cacert.org/wiki/FAQ/LostPasswordOrAccount'>", "</a>")?></p>
<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
<input type="hidden" name="cmd" value="_s-xclick">
-<input type="image" src="/images/payment2.png" border="0" name="submit" alt="<?=_("Password Reset Payment through PayPal")?>">
+<input type="image" src="/images/payment2.png" border="0" name="submit" alt="<?php echo _("Password Reset Payment through PayPal")?>">
<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----MIIHXwYJKoZIhvcNAQcEoIIHUDCCB0wCAQExggEwMIIBLAIBADCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJKoZIhvcNAQEBBQAEgYCg4ipewtpqKr0/2Qmm+yA+cFBzyJw9Dyji8gSugFeDCXpe2GE567JCICjSR2hdJAWTTJzDet3QCb5URlWuCXjsDuTRl08CI7FqdgmjdxNuFqBUYadnWziNHkMwL4dDHYPnhptQhjwySAmjPVhDSfXCdOWu7ASHYYSr37Re3VznaDELMAkGBSsOAwIaBQAwgdwGCSqGSIb3DQEHATAUBggqhkiG9w0DBwQIHFbtKcAC8BqAgbjEkhFkoMxpMSJ/lXYttkQ36//QrIM+ZXNK2g1giWjRPGRQoMW+4heyhbIO7z4LeRyg/3faAn4elm8b/vlAQY2eFnEICs22VsNr/JjXIQ9ZMHw/kzjPMXpqTUNnLCri5H+Mn/3pYsQNbrmRPxbkj3CXQWp6KpgkXCAHCR+yFgYnPy/7IC77IOacL53RcxB13mvGaQUW2o2gDUFgnZUYorK9OGhjp51WLCy+I0+8TJP//18TdHhc8doqoIIDhzCCA4MwggLsoAMCAQICAQAwDQYJKoZIhvcNAQEFBQAwgY4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFsIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRwwGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tMB4XDTA0MDIxMzEwMTMxNVoXDTM1MDIxMzEwMTMxNVowgY4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFsIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRwwGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBR07d/ETMS1ycjtkpkvjXZe9k+6CieLuLsPumsJ7QC1odNz3sJiCbs2wC0nLE0uLGaEtXynIgRqIddYCHx88pb5HTXv4SZeuv0Rqq4+axW9PLAAATU8w04qqjaSXgbGLP3NmohqM6bV9kZZwZLR/klDaQGo1u9uDb9lr4Yn+rBQIDAQABo4HuMIHrMB0GA1UdDgQWBBSWn3y7xm8XvVk/UtcKG+wQ1mSUazCBuwYDVR0jBIGzMIGwgBSWn3y7xm8XvVk/UtcKG+wQ1mSUa6GBlKSBkTCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb22CAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQCBXzpWmoBa5e9fo6ujionW1hUhPkOBakTr3YCDjbYfvJEiv/2P+IobhOGJr85+XHhN0v4gUkEDI8r2/rNk1m0GA8HKddvTjyGw/XqXa+LSTlDYkqI8OwR8GEYj4efEtcRpRYBxV8KxAW93YDWzFGvruKnnLbDAF6VR5w/cCMn5hzGCAZowggGWAgEBMIGUMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbQIBADAJBgUrDgMCGgUAoF0wGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDcxMTAzMDcxODU0WjAjBgkqhkiG9w0BCQQxFgQU6zx/ENl4VZxj/FUJgc/v+QvLOmMwDQYJKoZIhvcNAQEBBQAEgYA83CAevt42eBbktt6UtfDqsa4Lw7TwrBLVGsXwsxIkYLaUBXzaMZ/ept2qLUksjnTklC39skjTIp6HqRaoJ6Tnt98J+bkntVnUk2YrGZ1E2Zynz2xA/WBvXQo4R+dwxbqawf28DLgR935tBfDipv1A4Ay1yoULknnEACUH+Qk4Ig==-----END PKCS7-----">
</form>
diff --git a/pages/index/51.php b/pages/index/51.php
index 69abcb6..c5c3bcd 100644
--- a/pages/index/51.php
+++ b/pages/index/51.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,23 +15,23 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<H3><?=_("CAcert.org Mission Statement")?></H3>
+<H3><?php echo _("CAcert.org Mission Statement")?></H3>
-<p><?=_("To create a Non-Profit Certificate Authority; an alternative to the commercial CAs.")?></p>
+<p><?php echo _("To create a Non-Profit Certificate Authority; an alternative to the commercial CAs.")?></p>
-<h3><?=_("Who?")?></h3>
-<p><?=_("Core members of CAcert generally have a strong information technology and security background, and a stronger desire to give back to the community.")?></p>
-<p><?=_("Many are just the users of the system who by just making use of the project contribute to the wider community by word-of-mouth.")?></p>
+<h3><?php echo _("Who?")?></h3>
+<p><?php echo _("Core members of CAcert generally have a strong information technology and security background, and a stronger desire to give back to the community.")?></p>
+<p><?php echo _("Many are just the users of the system who by just making use of the project contribute to the wider community by word-of-mouth.")?></p>
-<h3><?=_("Why?")?></h3>
-<p><?=_("Many people are currently dissatisfied with the commercial offerings. Many people wish only to connect or share with people they know, or simply secure their webmail from people potentially sniffing their traffic. Why subscribe to a service that is not structured to handle this, and furthermore charges a king's ransom for the privilege?")?></p>
-<p><?=_("CAcert Inc., as a community-based project, is not driven by profits - it is driven by the community's desire for privacy and security.")?></p>
+<h3><?php echo _("Why?")?></h3>
+<p><?php echo _("Many people are currently dissatisfied with the commercial offerings. Many people wish only to connect or share with people they know, or simply secure their webmail from people potentially sniffing their traffic. Why subscribe to a service that is not structured to handle this, and furthermore charges a king's ransom for the privilege?")?></p>
+<p><?php echo _("CAcert Inc., as a community-based project, is not driven by profits - it is driven by the community's desire for privacy and security.")?></p>
-<h3><?=_("How?")?></h3>
-<p><?=_("Based on OpenSSL, PHP, a little bit of C and MySQL, we were able to build not only a free certificate authority that could verify your email address or domain, but actually build in a highly effective trust model. Our model goes further than that used by some commercial CAs to prove your identity.")?></p>
+<h3><?php echo _("How?")?></h3>
+<p><?php echo _("Based on OpenSSL, PHP, a little bit of C and MySQL, we were able to build not only a free certificate authority that could verify your email address or domain, but actually build in a highly effective trust model. Our model goes further than that used by some commercial CAs to prove your identity.")?></p>
-<h3><?=_("When and Where?")?></h3>
-<p><?=_("Right now it's happening all around you - there are secured websites and email protocols being protected and trusted by people, signed by CAcert.")?></p>
+<h3><?php echo _("When and Where?")?></h3>
+<p><?php echo _("Right now it's happening all around you - there are secured websites and email protocols being protected and trusted by people, signed by CAcert.")?></p>
-<h3><?=_("So what can I do to help the cause?")?></h3>
-<p><?=_("The simplest and most effective thing you can do is spread the word, by telling your friends, colleagues and relatives about us and join.")?></p>
+<h3><?php echo _("So what can I do to help the cause?")?></h3>
+<p><?php echo _("The simplest and most effective thing you can do is spread the word, by telling your friends, colleagues and relatives about us and join.")?></p>
diff --git a/pages/index/52.php b/pages/index/52.php
index 0926780..e928adf 100644
--- a/pages/index/52.php
+++ b/pages/index/52.php
@@ -19,15 +19,15 @@
?>
<div style="text-align: center;">
- <h1><?=_('CAcert Community Agreement Acceptance')?></h1>
- <p><?=sprintf(_('To get access to your account your agreement to the %s CAcert Community Agreement %s (CCA) is required.'),'<a href="/policy/CAcertCommunityAgreement.php">', '</a>')?></p>
- <p><?=_('Every member, who has agreed to the CCA, should be able to rely on the fact that every other user of CAcert has also agreed to the CCA and that the same rules apply to everybody. Moreover it is a basic requirement for the audit to be able to tell who has accepted our rules.')?></p>
- <p><?=_('Originally the acceptance was not recorded. Up until now, we do not have your agreement on record. Once you have accepted the CCA (again) your agreement is recorded and you will not need to do this step again.')?></p>
- <p><?=sprintf(_('If you do not wish to accept the CCA you should consider to ask for the closing of your account as you will not be able to access our system. In this case please send an email to support (%s).'),'<a href="mailto:support@cacert.org">support@cacert.org</a>')?></p>
- <p><?=_('If you do not want to decide about the acceptance of the CCA now, you can come back at any time.')?></p>
+ <h1><?php echo _('CAcert Community Agreement Acceptance')?></h1>
+ <p><?php echo sprintf(_('To get access to your account your agreement to the %s CAcert Community Agreement %s (CCA) is required.'),'<a href="/policy/CAcertCommunityAgreement.php">', '</a>')?></p>
+ <p><?php echo _('Every member, who has agreed to the CCA, should be able to rely on the fact that every other user of CAcert has also agreed to the CCA and that the same rules apply to everybody. Moreover it is a basic requirement for the audit to be able to tell who has accepted our rules.')?></p>
+ <p><?php echo _('Originally the acceptance was not recorded. Up until now, we do not have your agreement on record. Once you have accepted the CCA (again) your agreement is recorded and you will not need to do this step again.')?></p>
+ <p><?php echo sprintf(_('If you do not wish to accept the CCA you should consider to ask for the closing of your account as you will not be able to access our system. In this case please send an email to support (%s).'),'<a href="mailto:support@cacert.org">support@cacert.org</a>')?></p>
+ <p><?php echo _('If you do not want to decide about the acceptance of the CCA now, you can come back at any time.')?></p>
<form method="post" action="index.php">
- <input type="submit" name="agree" value="<?=_('I agree to the CCA')?>">
- <input type="submit" name="disagree" value="<?=_('I do not want to accept the CCA')?>">
- <input type="hidden" name="oldid" value="<?=$id?>">
+ <input type="submit" name="agree" value="<?php echo _('I agree to the CCA')?>">
+ <input type="submit" name="disagree" value="<?php echo _('I do not want to accept the CCA')?>">
+ <input type="hidden" name="oldid" value="<?php echo $id?>">
</form>
</div>
diff --git a/pages/index/6.php b/pages/index/6.php
index fe57d81..02aff51 100644
--- a/pages/index/6.php
+++ b/pages/index/6.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -16,16 +16,15 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
<p style="border:dotted 1px #900;padding:0.3em;background-color:#ffe;">
-<?=_("A proper password wouldn't match your name or email at all, it contains at least 1 lower case letter, 1 upper case letter, a number, white space and a misc symbol. You get additional security for being over 15 characters and a second additional point for having it over 30. The system starts reducing security if you include any section of your name, or password or email address or if it matches a word from the english dictionary...")?>
+<?php echo _("A proper password wouldn't match your name or email at all, it contains at least 1 lower case letter, 1 upper case letter, a number, white space and a misc symbol. You get additional security for being over 15 characters and a second additional point for having it over 30. The system starts reducing security if you include any section of your name, or password or email address or if it matches a word from the english dictionary...")?>
</p>
<form method="post" action="index.php" autocomplete="off">
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="350">
<tr>
- <td colspan="2" class="title"><?=_("Lost Pass Phrase - Step 2")?></td>
+ <td colspan="2" class="title"><?php echo _("Lost Pass Phrase - Step 2")?></td>
</tr>
-<?
- srand ((double) microtime() * 1000000);
+<?php srand ((double) microtime() * 1000000);
$num2 = $nums = array();
for($i = 1; $i <= 5; $i++)
{
@@ -73,28 +72,28 @@
continue;
?>
<tr>
- <td class="DataTD"><?=$_SESSION['lostpw']['user'][$q]?></td>
- <td class="DataTD"><input type="text" name="<?=$a?>" autocomplete="off">
- <input type="hidden" name="<?=$q?>" value="<?=sanitizeHTML($_SESSION['lostpw']['user'][$q])?>"></td>
+ <td class="DataTD"><?php echo $_SESSION['lostpw']['user'][$q]?></td>
+ <td class="DataTD"><input type="text" name="<?php echo $a?>" autocomplete="off">
+ <input type="hidden" name="<?php echo $q?>" value="<?php echo sanitizeHTML($_SESSION['lostpw']['user'][$q])?>"></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="newpass1" autocomplete="off"></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Repeat")?><font color="red">*</font>: </td>
+ <td class="DataTD"><?php echo _("Repeat")?><font color="red">*</font>: </td>
<td class="DataTD"><input type="password" name="newpass2" autocomplete="off"></td>
</tr>
<tr>
- <td class="DataTD" colspan="2"><font color="red">*</font><?=_("Please note, in the interests of good security, the pass phrase must be made up of an upper case letter, lower case letter, number and symbol.")?></td>
+ <td class="DataTD" colspan="2"><font color="red">*</font><?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.")?></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>
-<? } else { ?>
-<p><?=_("You do not have enough/any lost password questions set. You will not be able to continue to reset your password via this method.")?></p>
-<? } ?>
+<?php } else { ?>
+<p><?php echo _("You do not have enough/any lost password questions set. You will not be able to continue to reset your password via this method.")?></p>
+<?php } ?>
diff --git a/pages/index/7.php b/pages/index/7.php
index bc6db44..cc6c6ad 100644
--- a/pages/index/7.php
+++ b/pages/index/7.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,16 +15,16 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<h3><?=_("Credits")?></h3>
+<h3><?php echo _("Credits")?></h3>
-<p><?=_("Many people to thank, if you've had a large input with the CAcert project with code, documentation, translations, or assurances and would like recognition let me know.")?></p>
-<p><?=_("The list of names are in no sense of order")?></p>
+<p><?php echo _("Many people to thank, if you've had a large input with the CAcert project with code, documentation, translations, or assurances and would like recognition let me know.")?></p>
+<p><?php echo _("The list of names are in no sense of order")?></p>
<ul style="padding-left: 0; margin-left: 10em; border-left: none; text-indent: -8em;">
-<li>Christian Barmala - <?=_("Put a lot of effort convincing people in Germany to signup and be assured, he started work on a new RFC compliant CPS, spent countless hours helping with tech support, and so much more")?></li>
-<li>Guillaume Romagny - <?=_("He's constantly helping out on the support list, building up documentation and all round nice guy, he was even offered a free book and turned down the offer until there is a book on CAcert available!")?></li>
-<li>Adam Butler - <?=_("For much of the art work that exists on the website, t-shirt designs, much of the organisational work for Usenix '04, as well as a few published articles and written documents.")?></li>
-<li>Philipp Gühring - <?=_("Has put so much effort into CAcert I don't know where to begin, he managed to get the CPS Christian had started up to draft status, he has given countless hours to assuring people and attending conferences to help spread the word")?></li>
-<li>Evaldo Gardenali - <?=_("Has put a lot of time and effort into promoting and assuring people in Brazil and South America, and for helping to translate this site into Portuguese")?></li>
-<li>Ben Pollinger - <?=_("Did a substantial amount of work on the previous website design, and has been floating about on the mailing lists often giving invaluble insight into what we should be doing better.")?></li>
-<li>William Amaral - <?=_("Has been involved in translating this website into Portuguese")?></li>
+<li>Christian Barmala - <?php echo _("Put a lot of effort convincing people in Germany to signup and be assured, he started work on a new RFC compliant CPS, spent countless hours helping with tech support, and so much more")?></li>
+<li>Guillaume Romagny - <?php echo _("He's constantly helping out on the support list, building up documentation and all round nice guy, he was even offered a free book and turned down the offer until there is a book on CAcert available!")?></li>
+<li>Adam Butler - <?php echo _("For much of the art work that exists on the website, t-shirt designs, much of the organisational work for Usenix '04, as well as a few published articles and written documents.")?></li>
+<li>Philipp G�hring - <?php echo _("Has put so much effort into CAcert I don't know where to begin, he managed to get the CPS Christian had started up to draft status, he has given countless hours to assuring people and attending conferences to help spread the word")?></li>
+<li>Evaldo Gardenali - <?php echo _("Has put a lot of time and effort into promoting and assuring people in Brazil and South America, and for helping to translate this site into Portuguese")?></li>
+<li>Ben Pollinger - <?php echo _("Did a substantial amount of work on the previous website design, and has been floating about on the mailing lists often giving invaluble insight into what we should be doing better.")?></li>
+<li>William Amaral - <?php echo _("Has been involved in translating this website into Portuguese")?></li>
</ul>
diff --git a/pages/index/8.php b/pages/index/8.php
index 4d515a6..1ba448a 100644
--- a/pages/index/8.php
+++ b/pages/index/8.php
@@ -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/Board">', '</a>');
?>
diff --git a/pages/index/feed.rss b/pages/index/feed.rss
new file mode 100644
index 0000000..40f26b5
--- /dev/null
+++ b/pages/index/feed.rss
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- generator="WordPress/2.5.1" -->
+<rss version="0.92">
+ <channel>
+ <title>CAcert NEWS Blog</title>
+ <link>http://blog.cacert.org</link>
+ <description>CAcert NEWS and up coming events.</description>
+ <lastBuildDate>Fri, 20 Aug 2010 11:54:30 +0000</lastBuildDate>
+ <docs>http://backend.userland.com/rss092</docs>
+ <language>en</language>
+
+ <item>
+ <title>Testcampaign 1260 and children</title>
+ <description>
+ This is the branch to test bug-1260 and its children.
+
+ Merged in children are bug-1442 and bug-1444.
+ </description>
+ <link>https://bugs.cacert.org/view.php?id=1260</link>
+ </item>
+ </channel>
+</rss>
diff --git a/pages/wot/0.php b/pages/wot/0.php
index 465a3ac..cf96d95 100644
--- a/pages/wot/0.php
+++ b/pages/wot/0.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,7 +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
*/ ?>
-<h3><?=_("CAcert Web of Trust")?></h3>
+<h3><?php echo _("CAcert Web of Trust")?></h3>
-<p><?=_("CAcert.org was designed to be by the community for the community, and instead of placing all the labour on a central authority and in turn increasing the cost of certificates, the idea was to get community in conjunction with this website to have trust maintained in a dispersed and automated manner!")?></p>
+<p><?php echo _("CAcert.org was designed to be by the community for the community, and instead of placing all the labour on a central authority and in turn increasing the cost of certificates, the idea was to get community in conjunction with this website to have trust maintained in a dispersed and automated manner!")?></p>
diff --git a/pages/wot/1.php b/pages/wot/1.php
index 9047f27..c1ae56c 100644
--- a/pages/wot/1.php
+++ b/pages/wot/1.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -16,7 +16,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
- $res=mysql_fetch_assoc(mysql_query("select sum(acount) as summe from countries"));
+ $res=mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], "select sum(acount) as summe from countries"));
$total1 =$res['summe'];
$locid=array_key_exists('locid',$_REQUEST)?intval($_REQUEST['locid']):0;
@@ -29,7 +29,7 @@
$display = "";
if($locid > 0)
{
- $loc = mysql_fetch_assoc(mysql_query("select * from `locations` where `id`='".$locid."'"));
+ $loc = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], "select * from `locations` where `id`='".$locid."'"));
$display = "<ul class='top'>\n<li>\n".
"<a href='wot.php?id=1&locid=".$locid."'>".$loc['name']." ("._("Listed").": ".$loc['acount'].")</a>\n".
$display;
@@ -38,7 +38,7 @@
if($regid > 0)
{
- $reg = mysql_fetch_assoc(mysql_query("select * from `regions` where `id`='".$regid."'"));
+ $reg = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], "select * from `regions` where `id`='".$regid."'"));
$display = "<ul class='top'>\n<li>\n".
"<a href='wot.php?id=1&regid=".$regid."'>".$reg['name']." ("._("Listed").": ".$reg['acount'].")</a>\n".
$display;
@@ -47,7 +47,7 @@
if($ccid > 0)
{
- $cnt = mysql_fetch_assoc(mysql_query("select * from `countries` where `id`='".$ccid."'"));
+ $cnt = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], "select * from `countries` where `id`='".$ccid."'"));
$display = "<ul class='top'>\n<li>\n".
"<a href='wot.php?id=1&ccid=".$ccid."'>".$cnt['name']." ("._("Listed").": ".$cnt['acount'].")</a>\n".
$display;
@@ -60,8 +60,8 @@
{
echo "<ul>\n";
$query = "select * from countries where acount>0 order by `name`";
- $res = mysql_query($query);
- while($row = mysql_fetch_assoc($res))
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ while($row = mysqli_fetch_assoc($res))
{
echo "<li><a href='wot.php?id=1&ccid=".$row['id']."'>".$row['name']." ("._("Listed").": ".$row['acount'].")</a></li>\n";
}
@@ -69,8 +69,8 @@
} elseif($ccid > 0 && $regid <= 0 && $locid <= 0) {
echo "<ul>\n";
$query = "select * from regions where ccid='".$ccid."' and acount>0 order by `name`";
- $res = mysql_query($query);
- while($row = mysql_fetch_assoc($res))
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ while($row = mysqli_fetch_assoc($res))
{
echo "<li><a href='wot.php?id=1&regid=".$row['id']."'>".$row['name']." ("._("Listed").": ".$row['acount'].")</a></li>\n";
}
@@ -78,8 +78,8 @@
} elseif($regid > 0 && $locid <= 0) {
echo "<ul>\n";
$query = "select * from locations where regid='".$regid."' and acount>0 order by `name`";
- $res = mysql_query($query);
- while($row = mysql_fetch_assoc($res))
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ while($row = mysqli_fetch_assoc($res))
{
echo "<li><a href='wot.php?id=1&locid=".$row['id']."'>".$row['name']." ("._("Listed").": ".$row['acount'].")</a></li>\n";
}
@@ -93,31 +93,30 @@
`ccid`='".$ccid."' and `regid`='".$regid."' and
`locid`='".$locid."' and `users`.`id`=`notary`.`to` and `notary`.`deleted`=0
group by `notary`.`to` HAVING SUM(`points`) >= 100 order by `points` desc";
- $list = mysql_query($query);
- if(mysql_num_rows($list) > 0)
+ $list = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($list) > 0)
{
?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="550">
<tr>
- <td class="title"><?=_("Name")?></td>
- <td class="title"><?=_("Max Points")?></td>
- <td class="title"><?=_("Contact Details")?></td>
- <td class="title"><?=_("Email Assurer")?></td>
- <td class="title"><?=_("Assurer Challenge")?></td>
+ <td class="title"><?php echo _("Name")?></td>
+ <td class="title"><?php echo _("Max Points")?></td>
+ <td class="title"><?php echo _("Contact Details")?></td>
+ <td class="title"><?php echo _("Email Assurer")?></td>
+ <td class="title"><?php echo _("Assurer Challenge")?></td>
</tr>
-<? while($row = mysql_fetch_assoc($list)) { ?>
+<? while($row = mysqli_fetch_assoc($list)) { ?>
<tr>
- <td class="DataTD" width="100"><nobr><?=sanitizeHTML($row['fname'])?> <?=substr($row['lname'], 0, 1)?>.</nobr></td>
- <td class="DataTD"><?=maxpoints($row['id'])?></td>
- <td class="DataTD"><?=sanitizeHTML($row['contactinfo'])?></td>
- <td class="DataTD"><a href="wot.php?id=9&amp;userid=<?=intval($row['id'])?>"><?=_("Email Me")?></a></td>
- <td class="DataTD"><?=$row['assurer']?_("Yes"):("<font color=\"#ff0000\">"._("Not yet!")."</font>")?></td>
+ <td class="DataTD" width="100"><nobr><?php echo sanitizeHTML($row['fname'])?> <?php echo substr($row['lname'], 0, 1)?>.</nobr></td>
+ <td class="DataTD"><?php echo maxpoints($row['id'])?></td>
+ <td class="DataTD"><?php echo sanitizeHTML($row['contactinfo'])?></td>
+ <td class="DataTD"><a href="wot.php?id=9&amp;userid=<?php echo intval($row['id'])?>"><?php echo _("Email Me")?></a></td>
+ <td class="DataTD"><?php echo $row['assurer']?_("Yes"):("<font color=\"#ff0000\">"._("Not yet!")."</font>")?></td>
</tr>
-<?
- }
+<?php }
}
?>
</table>
<br>
-<? } ?>
+<?php } ?>
diff --git a/pages/wot/10.php b/pages/wot/10.php
index b5e146c..2156628 100644
--- a/pages/wot/10.php
+++ b/pages/wot/10.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,21 +15,20 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<?
- $thawte = false;
+<?php $thawte = false;
?>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="5" class="title"><?=_("Assurer Ranking")?></td>
+ <td colspan="5" class="title"><?php echo _("Assurer Ranking")?></td>
</tr>
<tr>
<?// the rank calculation is not adjusted to the new deletion method
$query = "SELECT `users`. *, count(*) AS `list` FROM `users`, `notary`
WHERE `users`.`id` = `notary`.`from` AND `notary`.`from` != `notary`.`to`
AND `from`='".intval($_SESSION['profile']['id'])."' GROUP BY `notary`.`from`";
- $res = mysql_query($query);
- $row = mysql_fetch_assoc($res);
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ $row = mysqli_fetch_assoc($res);
$rc = intval($row['list']);
/*
$query = "SELECT `users`. *, count(*) AS `list` FROM `users`, `notary`
@@ -40,61 +39,58 @@
inner join `notary` on `users`.`id` = `notary`.`from`
GROUP BY `notary`.`from` HAVING count(*) > '$rc'";
- $rank = mysql_num_rows(mysql_query($query)) + 1;
+ $rank = mysqli_num_rows(mysqli_query($_SESSION['mconn'], $query)) + 1;
?>
- <td class="DataTD"><?=sprintf(_("You have made %s assurances which ranks you as the #%s top assurer."), intval($rc), intval($rank))?></td>
+ <td class="DataTD"><?php echo sprintf(_("You have made %s assurances which ranks you as the #%s top assurer."), intval($rc), intval($rank))?></td>
</tr>
</table>
<center>
<br>
-<?=sprintf(_("The calculation of points will be changed in the near future. Please check the %s new calculation %s"), "<a href='/wot.php?id=15'>", "</a>")?>
+<?php echo sprintf(_("The calculation of points will be changed in the near future. Please check the %s new calculation %s"), "<a href='/wot.php?id=15'>", "</a>")?>
<br>
</center>
<br>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="6" class="title"><?=_("Your Assurance Points")?></td>
+ <td colspan="6" class="title"><?php echo _("Your Assurance Points")?></td>
</tr>
<tr>
- <td class="DataTD"><b><?=_("ID")?></b></td>
- <td class="DataTD"><b><?=_("Date")?></b></td>
- <td class="DataTD"><b><?=_("Who")?></b></td>
- <td class="DataTD"><b><?=_("Points")?></b></td>
- <td class="DataTD"><b><?=_("Location")?></b></td>
- <td class="DataTD"><b><?=_("Method")?></b></td>
+ <td class="DataTD"><b><?php echo _("ID")?></b></td>
+ <td class="DataTD"><b><?php echo _("Date")?></b></td>
+ <td class="DataTD"><b><?php echo _("Who")?></b></td>
+ <td class="DataTD"><b><?php echo _("Points")?></b></td>
+ <td class="DataTD"><b><?php echo _("Location")?></b></td>
+ <td class="DataTD"><b><?php echo _("Method")?></b></td>
</tr>
-<?
- $query = "select `id`, `date`, `from`, `points`, `location`, `method` from `notary` where `to`='".intval($_SESSION['profile']['id'])."' and `deleted`=0";
- $res = mysql_query($query);
- while($row = mysql_fetch_assoc($res))
+<?php $query = "select `id`, `date`, `from`, `points`, `location`, `method` from `notary` where `to`='".intval($_SESSION['profile']['id'])."' and `deleted`=0";
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ while($row = mysqli_fetch_assoc($res))
{
- $fromuser = mysql_fetch_assoc(mysql_query("select `fname`, `lname` from `users` where `id`='".intval($row['from'])."'"));
+ $fromuser = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], "select `fname`, `lname` from `users` where `id`='".intval($row['from'])."'"));
?>
<tr>
- <td class="DataTD"><?=intval($row['id'])?></td>
- <td class="DataTD"><?=$row['date']?></td>
- <td class="DataTD"><a href="wot.php?id=9&amp;userid=<?=intval($row['from'])?>"><?=sanitizeHTML(trim($fromuser['fname']." ".$fromuser['lname']))?></td>
- <td class="DataTD"><?=intval($row['points'])?></td>
- <td class="DataTD"><?=sanitizeHTML($row['location'])?></td>
- <td class="DataTD"><?=_(sprintf("%s", $row['method']))?></td>
+ <td class="DataTD"><?php echo intval($row['id'])?></td>
+ <td class="DataTD"><?php echo $row['date']?></td>
+ <td class="DataTD"><a href="wot.php?id=9&amp;userid=<?php echo intval($row['from'])?>"><?php echo sanitizeHTML(trim($fromuser['fname']." ".$fromuser['lname']))?></td>
+ <td class="DataTD"><?php echo intval($row['points'])?></td>
+ <td class="DataTD"><?php echo sanitizeHTML($row['location'])?></td>
+ <td class="DataTD"><?php echo _(sprintf("%s", $row['method']))?></td>
</tr>
-<?
- $thawte = ($row['method'] == "Thawte Points Transfer") || $thawte;
+<?php $thawte = ($row['method'] == "Thawte Points Transfer") || $thawte;
} ?>
<tr>
- <td class="DataTD" colspan="3"><b><?=_("Total Points")?>:</b></td>
- <td class="DataTD"><?=intval($_SESSION['profile']['points'])?></td>
+ <td class="DataTD" colspan="3"><b><?php echo _("Total Points")?>:</b></td>
+ <td class="DataTD"><?php echo intval($_SESSION['profile']['points'])?></td>
<td class="DataTD" colspan="2">&nbsp;</td>
</tr>
</table>
-<?
-if ($thawte)
+<?php if ($thawte)
{
?>
<br>
<center>
<strong style='color: red'>
-<?=_("Your Thawte-Points will be revoked in the near future. Please check new calculation!");?>
+<?php echo _("Your Thawte-Points will be revoked in the near future. Please check new calculation!");?>
<br>
</strong>
</center>
@@ -102,23 +98,22 @@ if ($thawte)
<br>
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="6" class="title"><?=_("Assurance Points You Issued")?></td>
+ <td colspan="6" class="title"><?php echo _("Assurance Points You Issued")?></td>
</tr>
<tr>
- <td class="DataTD"><b><?=_("ID")?></b></td>
- <td class="DataTD"><b><?=_("Date")?></b></td>
- <td class="DataTD"><b><?=_("Who")?></b></td>
- <td class="DataTD"><b><?=_("Points")?></b></td>
- <td class="DataTD"><b><?=_("Location")?></b></td>
- <td class="DataTD"><b><?=_("Method")?></b></td>
+ <td class="DataTD"><b><?php echo _("ID")?></b></td>
+ <td class="DataTD"><b><?php echo _("Date")?></b></td>
+ <td class="DataTD"><b><?php echo _("Who")?></b></td>
+ <td class="DataTD"><b><?php echo _("Points")?></b></td>
+ <td class="DataTD"><b><?php echo _("Location")?></b></td>
+ <td class="DataTD"><b><?php echo _("Method")?></b></td>
</tr>
-<?
- $points = 0;
+<?php $points = 0;
$query = "select `id`, `date`, `points`, `to`, `location`, `method` from `notary` where `from`='".intval($_SESSION['profile']['id'])."' and `to`!='".intval($_SESSION['profile']['id'])."' and `deleted`=0" ;
- $res = mysql_query($query);
- while($row = mysql_fetch_assoc($res))
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ while($row = mysqli_fetch_assoc($res))
{
- $fromuser = mysql_fetch_assoc(mysql_query("select `fname`, `lname` from `users` where `id`='".intval($row['to'])."'"));
+ $fromuser = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], "select `fname`, `lname` from `users` where `id`='".intval($row['to'])."'"));
$points += intval($row['points']);
$name = trim($fromuser['fname']." ".$fromuser['lname']);
if($name == "")
@@ -127,19 +122,19 @@ if ($thawte)
$name = "<a href='wot.php?id=9&amp;userid=".intval($row['to'])."'>".sanitizeHTML($name)."</a>";
?>
<tr>
- <td class="DataTD"><?=intval($row['id'])?></td>
- <td class="DataTD"><?=$row['date']?></td>
- <td class="DataTD"><?=$name?></td>
- <td class="DataTD"><?=intval($row['points'])?></td>
- <td class="DataTD"><?=sanitizeHTML($row['location'])?></td>
- <td class="DataTD"><?=$row['method']==""?"":_(sprintf("%s", $row['method']))?></td>
+ <td class="DataTD"><?php echo intval($row['id'])?></td>
+ <td class="DataTD"><?php echo $row['date']?></td>
+ <td class="DataTD"><?php echo $name?></td>
+ <td class="DataTD"><?php echo intval($row['points'])?></td>
+ <td class="DataTD"><?php echo sanitizeHTML($row['location'])?></td>
+ <td class="DataTD"><?php echo $row['method']==""?"":_(sprintf("%s", $row['method']))?></td>
</tr>
-<? } ?>
+<?php } ?>
<tr>
- <td class="DataTD" colspan="3"><b><?=_("Total Points Issued")?>:</b></td>
- <td class="DataTD"><?=intval($points)?></td>
+ <td class="DataTD" colspan="3"><b><?php echo _("Total Points Issued")?>:</b></td>
+ <td class="DataTD"><?php echo intval($points)?></td>
<td class="DataTD" colspan="2">&nbsp;</td>
</tr>
</table>
-<p>[ <a href='javascript:history.go(-1)'><?=_("Go Back")?></a> ]</p>
+<p>[ <a href='javascript:history.go(-1)'><?php echo _("Go Back")?></a> ]</p>
diff --git a/pages/wot/12.php b/pages/wot/12.php
index a0bbf50..3a66942 100644
--- a/pages/wot/12.php
+++ b/pages/wot/12.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -16,7 +16,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<? if(!array_key_exists('location',$_REQUEST) || $_REQUEST['location'] == "") { ?>
+<?php if(!array_key_exists('location',$_REQUEST) || $_REQUEST['location'] == "") { ?>
<script language="javascript" src="/ac.js"></script>
<script language="javascript">
<!--
@@ -25,17 +25,16 @@ function oncomplete() {
}
// -->
</script>
-<p><?=_("Please enter your town or suburb name, followed by region or state or province and then the country (please separate by commas)")?><br />
-<?=_("eg Sydney, New South Wales, Australia")?></p>
-<p><?=_("This is an AJAX form which depends heavily on javascript for auto-complete functionality and while it will work without javascript the usability will be heavily degraded.")?></p>
+<p><?php echo _("Please enter your town or suburb name, followed by region or state or province and then the country (please separate by commas)")?><br />
+<?php echo _("eg Sydney, New South Wales, Australia")?></p>
+<p><?php echo _("This is an AJAX form which depends heavily on javascript for auto-complete functionality and while it will work without javascript the usability will be heavily degraded.")?></p>
<form name="f" action="wot.php" method="post">
<input type='hidden' name='oldid' value='12' />
<table>
<tr>
- <td align=right valign=middle><?=_("Maximum Distance:")?></td>
+ <td align=right valign=middle><?php echo _("Maximum Distance:")?></td>
<td><select name="maxdist">
-<?
- $arr = array(10, 25, 50, 100, 250, 500, 1000);
+<?php $arr = array(10, 25, 50, 100, 250, 500, 1000);
foreach($arr as $val)
{
echo "<option value='$val'";
@@ -47,7 +46,7 @@ function oncomplete() {
</td>
</tr>
<tr>
- <td align=right valign=middle><?=_("Location:")?></td>
+ <td align=right valign=middle><?php echo _("Location:")?></td>
<td><input autocomplete="off" type="text" id="location" name="location" value="" size="50" /> <input type="submit" name="process" value="Go"></td>
</tr>
</table>
@@ -60,31 +59,31 @@ ac1.enable_unicode();
document.f.location.focus();
// -->
</script>
-<? } else {
+<?php } else {
if(intval($_REQUEST['location']) == 0)
{
$bits = explode(",", $_REQUEST['location']);
- $loc = trim(mysql_escape_string($bits['0']));
- $reg = ""; if(array_key_exists('1',$bits)) $reg=trim(mysql_escape_string($bits['1']));
- $ccname = ""; if(array_key_exists('2',$bits)) $ccname=trim(mysql_escape_string($bits['2']));
+ $loc = trim(mysqli_real_escape_string($_SESSION['mconn'], $bits['0']));
+ $reg = ""; if(array_key_exists('1',$bits)) $reg=trim(mysqli_real_escape_string($_SESSION['mconn'], $bits['1']));
+ $ccname = ""; if(array_key_exists('2',$bits)) $ccname=trim(mysqli_real_escape_string($_SESSION['mconn'], $bits['2']));
$query = "select `locations`.`id` as `locid` from `locations`, `regions`, `countries` where
`locations`.`name` like '$loc%' and `regions`.`name` like '$reg%' and `countries`.`name` like '$ccname%' and
`locations`.`regid`=`regions`.`id` and `locations`.`ccid`=`countries`.`id`
order by `locations`.`name` limit 1";
- $res = mysql_query($query);
- if($reg != "" && $ccname == "" && mysql_num_rows($res) <= 0)
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if($reg != "" && $ccname == "" && mysqli_num_rows($res) <= 0)
{
$query = "select `locations`.`id` as `locid` from `locations`, `regions`, `countries` where
`locations`.`name` like '$loc%' and `countries`.`name` like '$reg%' and
`locations`.`regid`=`regions`.`id` and `locations`.`ccid`=`countries`.`id`
order by `locations`.`name` limit 1";
- $res = mysql_query($query);
+ $res = mysqli_query($_SESSION['mconn'], $query);
}
- if(mysql_num_rows($res) <= 0)
+ if(mysqli_num_rows($res) <= 0)
die(_("Unable to find suitable location"));
- $row = mysql_fetch_assoc($res);
+ $row = mysqli_fetch_assoc($res);
$_REQUEST['location'] = $row['locid'];
}
@@ -92,7 +91,7 @@ document.f.location.focus();
$locid = intval($_REQUEST['location']);
$query = "select * from `locations` where `id`='$locid'";
- $loc = mysql_fetch_assoc(mysql_query($query));
+ $loc = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], $query));
if($maxdist <= 10)
{
$query = "SELECT ROUND(6378.137 * ACOS(0.9999999*((SIN(PI() * $loc[lat] / 180) * SIN(PI() * `locations`.`lat` / 180)) + (COS(PI() * $loc[lat] / 180 ) *
@@ -108,28 +107,28 @@ document.f.location.focus();
`users`.`assurer` = 1 AND `users`.`listme` = 1 HAVING `distance` <= '$maxdist' ORDER BY `distance` LIMIT 50";
//echo $query;
}
- $res = mysql_query($query);
+ $res = mysqli_query($_SESSION['mconn'], $query);
?><table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="700">
<tr>
- <td class="title"><?=_("Name")?></td>
- <td class="title"><?=_("Distance")?></td>
- <td class="title"><?=_("Max Points")?></td>
- <td class="title"><?=_("Contact Details")?></td>
- <td class="title"><?=_("Email Assurer")?></td>
+ <td class="title"><?php echo _("Name")?></td>
+ <td class="title"><?php echo _("Distance")?></td>
+ <td class="title"><?php echo _("Max Points")?></td>
+ <td class="title"><?php echo _("Contact Details")?></td>
+ <td class="title"><?php echo _("Email Assurer")?></td>
</tr>
-<? while($row = mysql_fetch_assoc($res))
+<? while($row = mysqli_fetch_assoc($res))
{
$points = maxpoints($row['uid']);
if($points > 35)
$points = 35;
?>
<tr>
- <td class="DataTD" width="100"><nobr><?=$row['name']?></nobr></td>
- <td class="DataTD"><?=$row['distance']?>km</td>
- <td class="DataTD"><?=$points?></td>
- <td class="DataTD"><?=$row['contactinfo']?></td>
- <td class="DataTD"><a href="wot.php?id=9&amp;userid=<?=$row['uid']?>"><?=_("Email Me")?></a></td>
+ <td class="DataTD" width="100"><nobr><?php echo $row['name']?></nobr></td>
+ <td class="DataTD"><?php echo $row['distance']?>km</td>
+ <td class="DataTD"><?php echo $points?></td>
+ <td class="DataTD"><?php echo $row['contactinfo']?></td>
+ <td class="DataTD"><a href="wot.php?id=9&amp;userid=<?php echo $row['uid']?>"><?php echo _("Email Me")?></a></td>
</tr>
-<? } ?>
+<?php } ?>
</table>
-<? } ?>
+<?php } ?>
diff --git a/pages/wot/13.php b/pages/wot/13.php
index eac7e18..4a79452 100644
--- a/pages/wot/13.php
+++ b/pages/wot/13.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -21,40 +21,40 @@ if(array_key_exists('location',$_REQUEST) && $_REQUEST['location'] != "") {
{
$bits = explode(",", $_REQUEST['location']);
- $loc = trim(mysql_escape_string($bits['0']));
- $reg = ''; if(array_key_exists('1',$bits)) $reg=trim(mysql_escape_string($bits['1']));
- $ccname = ''; if(array_key_exists('2',$bits)) $ccname=trim(mysql_escape_string($bits['2']));
+ $loc = trim(mysqli_real_escape_string($_SESSION['mconn'], $bits['0']));
+ $reg = ''; if(array_key_exists('1',$bits)) $reg=trim(mysqli_real_escape_string($_SESSION['mconn'], $bits['1']));
+ $ccname = ''; if(array_key_exists('2',$bits)) $ccname=trim(mysqli_real_escape_string($_SESSION['mconn'], $bits['2']));
$query = "select `locations`.`id` as `locid` from `locations`, `regions`, `countries` where
`locations`.`name` like '$loc%' and `regions`.`name` like '$reg%' and `countries`.`name` like '$ccname%' and
`locations`.`regid`=`regions`.`id` and `locations`.`ccid`=`countries`.`id`
order by `locations`.`name` limit 1";
- $res = mysql_query($query);
- if($reg != "" && $ccname == "" && mysql_num_rows($res) <= 0)
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if($reg != "" && $ccname == "" && mysqli_num_rows($res) <= 0)
{
$query = "select `locations`.`id` as `locid` from `locations`, `regions`, `countries` where
`locations`.`name` like '$loc%' and `countries`.`name` like '$reg%' and
`locations`.`regid`=`regions`.`id` and `locations`.`ccid`=`countries`.`id`
order by `locations`.`name` limit 1";
- $res = mysql_query($query);
+ $res = mysqli_query($_SESSION['mconn'], $query);
}
- if(mysql_num_rows($res) <= 0)
+ if(mysqli_num_rows($res) <= 0)
die("Unable to find suitable location");
- $row = mysql_fetch_assoc($res);
+ $row = mysqli_fetch_assoc($res);
$_REQUEST['location'] = $row['locid'];
}
$locid = intval($_REQUEST['location']);
$query = "select * from `locations` where `id`='$locid'";
- $res = mysql_query($query);
- if(mysql_num_rows($res) > 0)
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ if(mysqli_num_rows($res) > 0)
{
- $loc = mysql_fetch_assoc($res);
+ $loc = mysqli_fetch_assoc($res);
$_SESSION['profile']['ccid'] = $loc['ccid'];
$_SESSION['profile']['regid'] = $loc['regid'];
$_SESSION['profile']['locid'] = $loc['id'];
$query = "update `users` set `locid`='$loc[id]', `regid`='$loc[regid]', `ccid`='$loc[ccid]' where `id`='".$_SESSION['profile']['id']."'";
- mysql_query($query);
+ mysqli_query($_SESSION['mconn'], $query);
echo "<p>"._("Your location has been updated")."</p>\n";
} else {
echo "<p>"._("I was unable to match your location with places in my database.")."</p>\n";
@@ -62,14 +62,14 @@ if(array_key_exists('location',$_REQUEST) && $_REQUEST['location'] != "") {
}
$query = "select `name` from `locations` where `id`='".$_SESSION['profile']['locid']."'";
- $res = mysql_query($query);
- $loc = mysql_fetch_assoc($res);
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ $loc = mysqli_fetch_assoc($res);
$query = "select `name` from `regions` where `id`='".$_SESSION['profile']['regid']."'";
- $res = mysql_query($query);
- $reg = mysql_fetch_assoc($res);
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ $reg = mysqli_fetch_assoc($res);
$query = "select `name` from `countries` where `id`='".$_SESSION['profile']['ccid']."'";
- $res = mysql_query($query);
- $cc = mysql_fetch_assoc($res);
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ $cc = mysqli_fetch_assoc($res);
?>
<script language="javascript" src="/ac.js"></script>
<script language="javascript">
@@ -79,16 +79,16 @@ function oncomplete() {
}
// -->
</script>
-<p><?=_("Please enter your town or suburb name, followed by region or state or province and then the country (please separate by commas)")?><br />
-<?=_("eg Sydney, New South Wales, Australia")?></p>
-<p><?=_("This is an AJAX form which depends heavily on javascript for auto-complete functionality and while it will work without javascript the usability will be heavily degraded.")?></p>
-<p><?=sprintf(_("Your current location is set as: %s"), "$loc[name], $reg[name], $cc[name]")?></p>
+<p><?php echo _("Please enter your town or suburb name, followed by region or state or province and then the country (please separate by commas)")?><br />
+<?php echo _("eg Sydney, New South Wales, Australia")?></p>
+<p><?php echo _("This is an AJAX form which depends heavily on javascript for auto-complete functionality and while it will work without javascript the usability will be heavily degraded.")?></p>
+<p><?php echo sprintf(_("Your current location is set as: %s"), "$loc[name], $reg[name], $cc[name]")?></p>
<form name="f" action="wot.php" method="post">
<input type='hidden' name='id' value='13' />
<table>
<tr>
- <td align=right valign=middle><?=_("Location:")?></td>
- <td><input autocomplete="off" type="text" id="location" name="location" value="" size="50" /> <?=_("(hit enter to submit)")?></td>
+ <td align=right valign=middle><?php echo _("Location:")?></td>
+ <td><input autocomplete="off" type="text" id="location" name="location" value="" size="50" /> <?php echo _("(hit enter to submit)")?></td>
</tr>
</table>
diff --git a/pages/wot/15.php b/pages/wot/15.php
index c1f3e0f..80e5512 100644
--- a/pages/wot/15.php
+++ b/pages/wot/15.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2011 CAcert Inc.
diff --git a/pages/wot/2.php b/pages/wot/2.php
index eda77bb..75fc1ee 100644
--- a/pages/wot/2.php
+++ b/pages/wot/2.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -16,18 +16,18 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<h3><?=_('To become an Assurer')?></h3>
+<h3><?php echo _('To become an Assurer')?></h3>
-<p><?=_('To become a CAcert Assurer you need to fulfill the following requirements:')?></p>
+<p><?php echo _('To become a CAcert Assurer you need to fulfill the following requirements:')?></p>
<ol>
- <li><?=_('You have to reach 100 Assurance points')?></li>
- <li><?=_('You have to pass the CATS test')?></li>
+ <li><?php echo _('You have to reach 100 Assurance points')?></li>
+ <li><?php echo _('You have to pass the CATS test')?></li>
</ol>
-<p><?=_('To reach 100 Assurance Points you have to meet with assurers who assure you under the CAcert Assurance Programme according to Assurance Policy. During the face to face meeting you need to show at least one governmental issued photo ID.')?></p>
+<p><?php echo _('To reach 100 Assurance Points you have to meet with assurers who assure you under the CAcert Assurance Programme according to Assurance Policy. During the face to face meeting you need to show at least one governmental issued photo ID.')?></p>
-<p><?=sprintf(_('The 2nd requirement in becoming assurer is to pass the CAcert Assurer Challenge, which can be started at %s. For more information explore the wiki regarding the %s.'),'<a href="https://cats.cacert.org">https://cats.cacert.org</a>','<a href="//wiki.cacert.org/AssurerChallenge">Assurer Challenge</a>')?><p>
+<p><?php echo sprintf(_('The 2nd requirement in becoming assurer is to pass the CAcert Assurer Challenge, which can be started at %s. For more information explore the wiki regarding the %s.'),'<a href="https://cats.cacert.org">https://cats.cacert.org</a>','<a href="//wiki.cacert.org/AssurerChallenge">Assurer Challenge</a>')?><p>
-<p><?=sprintf(_('In case you cannot meet an Assurer (eg there are not many assurer in your area) you can be assured under the alternate %sTTP-assisted-assurance programme%s. Read the pages %s for the basic way how the TTP-assisted-assurance programme works for you and %s whether the TTP programme affects the country where you are located.'),'<a href="/wot.php?id=4">', '</a>','<a href="//wiki.cacert.org/TTP/TTPuser">TTPuser</a>','<a href="//wiki.cacert.org/TTP/TTPAL">TTPAL</a>')?> </p>
+<p><?php echo sprintf(_('In case you cannot meet an Assurer (eg there are not many assurer in your area) you can be assured under the alternate %sTTP-assisted-assurance programme%s. Read the pages %s for the basic way how the TTP-assisted-assurance programme works for you and %s whether the TTP programme affects the country where you are located.'),'<a href="/wot.php?id=4">', '</a>','<a href="//wiki.cacert.org/TTP/TTPuser">TTPuser</a>','<a href="//wiki.cacert.org/TTP/TTPAL">TTPAL</a>')?> </p>
diff --git a/pages/wot/3.php b/pages/wot/3.php
index 0864ffd..2c6af90 100644
--- a/pages/wot/3.php
+++ b/pages/wot/3.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,33 +15,33 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<h3><?=_("CAcert Web of Trust Rules")?></h3>
+<h3><?php echo _("CAcert Web of Trust Rules")?></h3>
-<p><?=_("It is essential that CAcert Assurers understand and follow the rules below to ensure that applicants for assurance are suitably identified, which, in turn, maintains trust in the system.")?></p>
+<p><?php echo _("It is essential that CAcert Assurers understand and follow the rules below to ensure that applicants for assurance are suitably identified, which, in turn, maintains trust in the system.")?></p>
-<p><?=_("Contact")?><br>
+<p><?php echo _("Contact")?><br>
<br>
-* <?=_("You must meet the applicant in person;")?><br>
-* <?=_("You must sight at least one form of government issued photo identification. It's preferable if 2 forms of Government issued photo ID are presented, as less points may be issued if there is any doubt on the person by the person issuing points;")?><br>
-* <?=_("Complete the assurance form if the applicant has not already done so. Ensure that all information matches.")?><br>
+* <?php echo _("You must meet the applicant in person;")?><br>
+* <?php echo _("You must sight at least one form of government issued photo identification. It's preferable if 2 forms of Government issued photo ID are presented, as less points may be issued if there is any doubt on the person by the person issuing points;")?><br>
+* <?php echo _("Complete the assurance form if the applicant has not already done so. Ensure that all information matches.")?><br>
</p>
-<p><?=_("Processing")?><br>
-<?=_("After the meeting, visit the CAcert Web site's make an Assurance page and:")?><br>
+<p><?php echo _("Processing")?><br>
+<?php echo _("After the meeting, visit the CAcert Web site's make an Assurance page and:")?><br>
<br>
-* <?=_("Enter the applicant's email address;")?><br>
-* <?=_("Compare the online information to the information recorded on the paper form;")?><br>
-* <?=_("If, and only if, the two match completely - you may award trust points up to the maximum points you are able to allocate;")?><br>
+* <?php echo _("Enter the applicant's email address;")?><br>
+* <?php echo _("Compare the online information to the information recorded on the paper form;")?><br>
+* <?php echo _("If, and only if, the two match completely - you may award trust points up to the maximum points you are able to allocate;")?><br>
</p>
-<p><?=_("Privacy")?><br>
-<?=_("It is imperative that you maintain the confidentiality and privacy of the applicant, and never disclose the information obtained without the applicant's consent.")?></p>
+<p><?php echo _("Privacy")?><br>
+<?php echo _("It is imperative that you maintain the confidentiality and privacy of the applicant, and never disclose the information obtained without the applicant's consent.")?></p>
-<p><?=_("Fees")?><br>
-<?=_("You may charge a fee for your expenses if the applicant has been advised of the amount prior to the meeting.")?></p>
+<p><?php echo _("Fees")?><br>
+<?php echo _("You may charge a fee for your expenses if the applicant has been advised of the amount prior to the meeting.")?></p>
-<p><?=_("Liability")?><br>
-<?=_("A CAcert Assurer who knowingly, or reasonably ought to have known, assures an applicant contrary to this policy may be held liable.")?></p>
+<p><?php echo _("Liability")?><br>
+<?php echo _("A CAcert Assurer who knowingly, or reasonably ought to have known, assures an applicant contrary to this policy may be held liable.")?></p>
-<p><?=_("Assurance Points")?><br>
-<?=_("CAcert may, from time to time, alter the amount of Assurance Points that a class of assurer may assign as is necessary to effect a policy or rule change. We may also alter the amount of Assurance Points available to an individual, or new class of assurer, should another policy of CAcert require this.")?></p>
+<p><?php echo _("Assurance Points")?><br>
+<?php echo _("CAcert may, from time to time, alter the amount of Assurance Points that a class of assurer may assign as is necessary to effect a policy or rule change. We may also alter the amount of Assurance Points available to an individual, or new class of assurer, should another policy of CAcert require this.")?></p>
diff --git a/pages/wot/4.php b/pages/wot/4.php
index 628e6a5..005db2c 100644
--- a/pages/wot/4.php
+++ b/pages/wot/4.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -18,32 +18,31 @@
require_once(dirname(__FILE__).'/../../includes/notary.inc.php');
?>
-<h3><?=_("Trusted Third Parties")?></h3>
+<h3><?php echo _("Trusted Third Parties")?></h3>
-<p><?=_("The Trusted Third Party (TTP) programme is intended to be used in areas without many CAcert Assurers.")?></p>
+<p><?php echo _("The Trusted Third Party (TTP) programme is intended to be used in areas without many CAcert Assurers.")?></p>
-<p><?=_("A Trusted Third Party (TTP) is simply someone in your country that is responsible for witnessing signatures and ID documents. This role is covered by many different titles such as public notary, justice of the peace and so on.")?></p>
+<p><?php echo _("A Trusted Third Party (TTP) is simply someone in your country that is responsible for witnessing signatures and ID documents. This role is covered by many different titles such as public notary, justice of the peace and so on.")?></p>
-<p><?=_("With the TTP programme you can potentially gain assurance up to a maximum of 100 assurance points.")?></p>
+<p><?php echo _("With the TTP programme you can potentially gain assurance up to a maximum of 100 assurance points.")?></p>
-<p><?=_("Currently CAcert has only developed the TTP programme to the level that you can gain 70 assurance points by TTP assurances.") ?></p>
+<p><?php echo _("Currently CAcert has only developed the TTP programme to the level that you can gain 70 assurance points by TTP assurances.") ?></p>
-<p><?=_("We are working to develop a process that will fill the gap of the missing 30 assurance points to allow you to get the maximum 100 assurance points.")?> </p>
+<p><?php echo _("We are working to develop a process that will fill the gap of the missing 30 assurance points to allow you to get the maximum 100 assurance points.")?> </p>
-<p><?=_("In the meanwhile you would need to close this gap with face to face assurances with CAcert Assurers. Think not only travelling to populated countries, but also remember that assurers may occasionally visit your country or area.")?></p>
+<p><?php echo _("In the meanwhile you would need to close this gap with face to face assurances with CAcert Assurers. Think not only travelling to populated countries, but also remember that assurers may occasionally visit your country or area.")?></p>
-<p><?=sprintf(_("If you are interested in the TTP programme, read the pages %s for the basic way how the TTP programme works for you, and %s whether the TTP programme affects the country where you are located."),"<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>")?> </p>
+<p><?php echo sprintf(_("If you are interested in the TTP programme, read the pages %s for the basic way how the TTP programme works for you, and %s whether the TTP programme affects the country where you are located."),"<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>")?> </p>
-<?
-// test for points <100
+<?php // test for points <100
if ($_SESSION['profile']['points']<100){
// test for TTP assurances
if (get_number_of_ttpassurances(intval($_SESSION['profile']['id']))<2){?>
- <p><?=_("If you want to ask for TTP assurances fill out the missing data and send the request to support@cacert.org to start the process. CAcert will then inform you about the next steps.")?></p>
+ <p><?php echo _("If you want to ask for TTP assurances fill out the missing data and send the request to support@cacert.org to start the process. CAcert will then inform you about the next steps.")?></p>
<form method="post" action="wot.php">
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td class="DataTD"><?=_("Country where you want to visit the TTP")?></td>
+ <td class="DataTD"><?php echo _("Country where you want to visit the TTP")?></td>
<td class="DataTD"><select size="1" name="country">
<option>Australia</option>
<option>Puerto Rico</option>
@@ -51,32 +50,30 @@ if ($_SESSION['profile']['points']<100){
</select></td>
</tr>
<tr>
- <td class="DataTD"><?=_("I want to take part in the TTP Topup programme")?></td>
+ <td class="DataTD"><?php echo _("I want to take part in the TTP Topup programme")?></td>
<td class="DataTD"><input type="checkbox" name="ttptopup" value="1"></td>
</tr>
<tr>
<td colspan="2" >
- <input type="hidden" name="oldid" value="<?=intval($id)?>">
- <input type="submit" name="ttp" value="<?=_("I need a TTP assurance")?>">
+ <input type="hidden" name="oldid" value="<?php echo intval($id)?>">
+ <input type="submit" name="ttp" value="<?php echo _("I need a TTP assurance")?>">
</td>
</tr>
</table>
</form>
-<? //"
+<?php //"
} else {
/* As soon as the TPP TOPUP Programme is established this routine should be used
- <p><?=_("As you have already got 2 TTP assurances you can only take part in the TTP TOPUP programme. If you want to ask for the TTP TOPUP programme use the submit button to send the request to support@cacert.org to start the process. CAcert will then inform you about the next steps.")?></p>
+ <p><?php echo _("As you have already got 2 TTP assurances you can only take part in the TTP TOPUP programme. If you want to ask for the TTP TOPUP programme use the submit button to send the request to support@cacert.org to start the process. CAcert will then inform you about the next steps.")?></p>
<form method="post" action="wot.php">
- <input type="hidden" name="oldid" value="<?=intval($id)?>">
- <input type="submit" name="ttptopup" value="<?=_("I need a TTP TOPUP")?>">
+ <input type="hidden" name="oldid" value="<?php echo intval($id)?>">
+ <input type="submit" name="ttptopup" value="<?php echo _("I need a TTP TOPUP")?>">
</form>
*/
?>
- <p><?=_("We are working to develop the TTP TOPUP process to be able to fill the gap of the missing 30 assurance points to 100 assurance points. Meanwhile you have to close this gap with face to face assurances from CAcert Assurers. Think not only travelling to populated countries, but as well to assurers visiting your country or area.")?></p>
-<?
- }
+ <p><?php echo _("We are working to develop the TTP TOPUP process to be able to fill the gap of the missing 30 assurance points to 100 assurance points. Meanwhile you have to close this gap with face to face assurances from CAcert Assurers. Think not only travelling to populated countries, but as well to assurers visiting your country or area.")?></p>
+<?php }
} else {
?>
- <p><?=_("You reached the maximum points that can be granted by the TTP programme and therefore you cannot take part in the TTP programme any more.")?></p>
-<?
-}
+ <p><?php echo _("You reached the maximum points that can be granted by the TTP programme and therefore you cannot take part in the TTP programme any more.")?></p>
+<?php }
diff --git a/pages/wot/5.php b/pages/wot/5.php
index 565dd6a..d73cc1d 100644
--- a/pages/wot/5.php
+++ b/pages/wot/5.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -18,11 +18,10 @@
include_once("../includes/shutdown.php");
require_once("../includes/lib/l10n.php");
?>
-<?
- if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "")
+<?php if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "")
{
?><font color="orange" size="+1">
- <? echo _("ERROR").": ".$_SESSION['_config']['error'] ?>
+ <?php echo _("ERROR").": ".$_SESSION['_config']['error'] ?>
</font>
<?unset($_SESSION['_config']['error']);
}
@@ -37,12 +36,11 @@
$_SESSION['assuresomeone']['day'] = 0;
}
?>
-<? if(array_key_exists('noemailfound',$_SESSION['_config']) && $_SESSION['_config']['noemailfound'] == 1) { ?>
+<?php if(array_key_exists('noemailfound',$_SESSION['_config']) && $_SESSION['_config']['noemailfound'] == 1) { ?>
<form method="post" action="wot.php">
-<input type="hidden" name="email" value="<?=sanitizeHTML($_POST['email'])?>"><br>
+<input type="hidden" name="email" value="<?php echo sanitizeHTML($_POST['email'])?>"><br>
<select name="reminder-lang">
-<?
- if($_SESSION['_config']['reminder-lang'] == "")
+<?php if($_SESSION['_config']['reminder-lang'] == "")
$_SESSION['_config']['reminder-lang'] = L10n::get_translation();
foreach(L10n::$translations as $key => $val)
{
@@ -53,32 +51,31 @@
}
?>
</select><br>
-<input type="hidden" name="oldid" value="<?=$id?>">
-<input type="submit" name="reminder" value="<?=_("Send reminder notice")?>">
+<input type="hidden" name="oldid" value="<?php echo $id?>">
+<input type="submit" name="reminder" value="<?php echo _("Send reminder notice")?>">
</form>
-<? unset($_SESSION['_config']['noemailfound']); } ?>
+<?php unset($_SESSION['_config']['noemailfound']); } ?>
<form method="post" action="wot.php" name="form1">
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="2" class="title"><?=_("Assure Someone")?></td>
+ <td colspan="2" class="title"><?php echo _("Assure Someone")?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Email")?>:</td>
-<? if(array_key_exists('remindersent',$_SESSION['_config']) && $_SESSION['_config']['remindersent'] == 1) { unset($_SESSION['_config']['remindersent']) ?>
+ <td class="DataTD"><?php echo _("Email")?>:</td>
+<?php if(array_key_exists('remindersent',$_SESSION['_config']) && $_SESSION['_config']['remindersent'] == 1) { unset($_SESSION['_config']['remindersent']) ?>
<td class="DataTD"><input type="text" name="email" id="email" value=""></td>
-<? } else { ?>
- <td class="DataTD"><input type="text" name="email" id="email" value="<?=array_key_exists('email',$_POST)?sanitizeHTML($_POST['email']):""?>"></td>
-<? } ?>
+<?php } else { ?>
+ <td class="DataTD"><input type="text" name="email" id="email" value="<?php echo array_key_exists('email',$_POST)?sanitizeHTML($_POST['email']):""?>"></td>
+<?php } ?>
</tr>
<tr>
<td class="DataTD">
- <?=_("Date of Birth")?><br/>
- (<?=_("yyyy/mm/dd")?>)</td>
+ <?php echo _("Date of Birth")?><br/>
+ (<?php echo _("yyyy/mm/dd")?>)</td>
<td class="DataTD">
- <input type="text" name="year" value="<?=array_key_exists('year',$_SESSION['assuresomeone']) && intval($_SESSION['assuresomeone']['year']) >= 1900 ? intval($_SESSION['assuresomeone']['year']):''?>" size="4" autocomplete="off"></nobr>
+ <input type="text" name="year" value="<?php echo array_key_exists('year',$_SESSION['assuresomeone']) && intval($_SESSION['assuresomeone']['year']) >= 1900 ? intval($_SESSION['assuresomeone']['year']):''?>" size="4" autocomplete="off"></nobr>
<select name="month">
-<?
-for($i = 1; $i <= 12; $i++)
+<?php for($i = 1; $i <= 12; $i++)
{
echo "<option value='$i'";
if(array_key_exists('month',$_SESSION['assuresomeone']) && intval($_SESSION['assuresomeone']['month']) === $i)
@@ -88,8 +85,7 @@ for($i = 1; $i <= 12; $i++)
?>
</select>
<select name="day">
-<?
-for($i = 1; $i <= 31; $i++)
+<?php for($i = 1; $i <= 31; $i++)
{
echo "<option";
if(array_key_exists('day',$_SESSION['assuresomeone']) && intval($_SESSION['assuresomeone']['day']) === $i)
@@ -102,10 +98,10 @@ for($i = 1; $i <= 31; $i++)
</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">
//<![CDATA[
diff --git a/pages/wot/6.php b/pages/wot/6.php
index 39605f3..78b62a3 100644
--- a/pages/wot/6.php
+++ b/pages/wot/6.php
@@ -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
*/ ?>
-<?
-
+<?php
if(!array_key_exists('notarise',$_SESSION['_config']))
{
echo "Error: No user data found.";
diff --git a/pages/wot/8.php b/pages/wot/8.php
index af67d0b..ba45df0 100644
--- a/pages/wot/8.php
+++ b/pages/wot/8.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -15,30 +15,30 @@
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'] != "") { ?><font color="#ff0000">ERROR: <?=$_SESSION['_config']['error']?></font><? unset($_SESSION['_config']['error']); } ?>
+<?php if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "") { ?><font color="#ff0000">ERROR: <?php echo $_SESSION['_config']['error']?></font><?php unset($_SESSION['_config']['error']); } ?>
<form method="post" action="wot.php">
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="2" class="title"><?=_("My Listing")?></td>
+ <td colspan="2" class="title"><?php echo _("My Listing")?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Directory Listing")?>:</td>
+ <td class="DataTD"><?php echo _("Directory Listing")?>:</td>
<td class="DataTD" align="left">
<select name="listme">
- <option value="0"><?=_("I don't want to be listed")?></option>
- <option value="1"<? if($_SESSION['profile']['listme'] == 1) echo " selected"; ?>><?=_("I want to be listed")?></option>
+ <option value="0"><?php echo _("I don't want to be listed")?></option>
+ <option value="1"<?php if($_SESSION['profile']['listme'] == 1) echo " selected"; ?>><?php echo _("I want to be listed")?></option>
</select>
</td>
</tr>
<tr>
- <td class="DataTD"><?=_("Contact information")?>:</td>
- <td class="DataTD"><textarea name="contactinfo" cols="40" rows="5" wrap="virtual"><?=$_SESSION['profile']['contactinfo']?></textarea></td>
+ <td class="DataTD"><?php echo _("Contact information")?>:</td>
+ <td class="DataTD"><textarea name="contactinfo" cols="40" rows="5" wrap="virtual"><?php echo $_SESSION['profile']['contactinfo']?></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="<?=$id?>">
-<input type="hidden" name="csrf" value="<?=make_csrf('chgcontact')?>" />
+<input type="hidden" name="oldid" value="<?php echo $id?>">
+<input type="hidden" name="csrf" value="<?php echo make_csrf('chgcontact')?>" />
</form>
-<p><?=_("Please note: All html will be stripped from the contact information box, a link to an email form will automatically be inserted to ensure your privacy.")?></p>
+<p><?php echo _("Please note: All html will be stripped from the contact information box, a link to an email form will automatically be inserted to ensure your privacy.")?></p>
diff --git a/pages/wot/9.php b/pages/wot/9.php
index 20f2c6d..75d6acf 100644
--- a/pages/wot/9.php
+++ b/pages/wot/9.php
@@ -1,4 +1,4 @@
-<? /*
+<?php /*
LibreSSL - CAcert web application
Copyright (C) 2004-2008 CAcert Inc.
@@ -19,15 +19,15 @@
require_once($_SESSION['_config']['filepath'].'/includes/lib/l10n.php');
- $res = mysql_query("select * from `users` where `id`='".intval($_REQUEST['userid'])."' and `listme`='1'");
- if(mysql_num_rows($res) <= 0)
+ $res = mysqli_query($_SESSION['mconn'], "select * from `users` where `id`='".intval($_REQUEST['userid'])."' and `listme`='1'");
+ if(mysqli_num_rows($res) <= 0)
{
echo _("Sorry, I was unable to locate that user, the person doesn't wish to be contacted, or isn't an assurer.");
} else {
- $user = mysql_fetch_array($res);
+ $user = mysqli_fetch_array($res);
$userlang = L10n::normalise_translation($user['language']);
- $points = mysql_num_rows(mysql_query("select sum(`points`) as `total` from `notary`
+ $points = mysqli_num_rows(mysqli_query($_SESSION['mconn'], "select sum(`points`) as `total` from `notary`
where `to`='".intval($user['id'])."' and `deleted`=0 group by `to` HAVING SUM(`points`) > 0"));
if($points <= 0) {
echo _("Sorry, I was unable to locate that user.");
@@ -35,50 +35,49 @@
$_SESSION['_config']['pagehash'] = md5(date("U"));
?>
-<? if($_SESSION['_config']['error'] != "") { ?><font color="#ff0000" size="+1">ERROR: <?=$_SESSION['_config']['error']?></font><? unset($_SESSION['_config']['error']); } ?>
+<?php if($_SESSION['_config']['error'] != "") { ?><font color="#ff0000" size="+1">ERROR: <?php echo $_SESSION['_config']['error']?></font><?php unset($_SESSION['_config']['error']); } ?>
<form method="post" action="wot.php">
-<input type="hidden" name="userid" value="<?=intval($user['id'])?>">
+<input type="hidden" name="userid" value="<?php echo intval($user['id'])?>">
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="2" class="title"><?=_("Contact Assurer")?></td>
+ <td colspan="2" class="title"><?php echo _("Contact Assurer")?></td>
</tr>
<tr>
- <td class="DataTD"><?=_("To")?>:</td>
- <td class="DataTD" align="left"><?=sanitizeHTML(trim($user['fname'].' '.substr($user['lname'], 0, 1)))?></td>
+ <td class="DataTD"><?php echo _("To")?>:</td>
+ <td class="DataTD" align="left"><?php echo sanitizeHTML(trim($user['fname'].' '.substr($user['lname'], 0, 1)))?></td>
</tr>
-<? if($userlang != "") { ?>
+<?php if($userlang != "") { ?>
<tr>
- <td class="DataTD"><?=_("Language")?>:</td>
- <td class="DataTD" align="left"><? printf(_("%s prefers to be contacted in %s"), sanitizeHTML($user['fname']), L10n::$translations[$userlang]) ?></td>
+ <td class="DataTD"><?php echo _("Language")?>:</td>
+ <td class="DataTD" align="left"><?php printf(_("%s prefers to be contacted in %s"), sanitizeHTML($user['fname']), L10n::$translations[$userlang]) ?></td>
</tr>
-<? } ?>
-<?
- $query = "select * from `addlang` where `userid`='".intval($user['id'])."'";
- $res = mysql_query($query);
- while($row = mysql_fetch_assoc($res))
+<?php } ?>
+<?php $query = "select * from `addlang` where `userid`='".intval($user['id'])."'";
+ $res = mysqli_query($_SESSION['mconn'], $query);
+ while($row = mysqli_fetch_assoc($res))
{
- $lang = mysql_fetch_assoc(mysql_query("select * from `languages` where `locale`='".mysql_real_escape_string($row['lang'])."'"));
+ $lang = mysqli_fetch_assoc(mysqli_query($_SESSION['mconn'], "select * from `languages` where `locale`='".mysqli_real_escape_string($_SESSION['mconn'], $row['lang'])."'"));
?>
<tr>
- <td class="DataTD"><?=_("Additional Language")?>:</td>
- <td class="DataTD" align="left"><? printf(_("%s will also accept email in %s - %s"), sanitizeHTML($user['fname']), $lang['lang'], $lang['country']) ?></td>
+ <td class="DataTD"><?php echo _("Additional Language")?>:</td>
+ <td class="DataTD" align="left"><?php printf(_("%s will also accept email in %s - %s"), sanitizeHTML($user['fname']), $lang['lang'], $lang['country']) ?></td>
</tr>
-<? } ?>
+<?php } ?>
<tr>
- <td class="DataTD"><?=_("Subject")?>:</td>
- <td class="DataTD" align="left"><input type="text" name="subject" value="<?=sanitizeHTML($_POST['subject'])?>"></td>
+ <td class="DataTD"><?php echo _("Subject")?>:</td>
+ <td class="DataTD" align="left"><input type="text" name="subject" value="<?php echo sanitizeHTML($_POST['subject'])?>"></td>
</tr>
<tr>
- <td class="DataTD"><?=_("Message")?>:</td>
- <td class="DataTD"><textarea name="message" cols="40" rows="5" wrap="virtual"><?=sanitizeHTML($_POST['message'])?></textarea></td>
+ <td class="DataTD"><?php echo _("Message")?>:</td>
+ <td class="DataTD"><textarea name="message" cols="40" rows="5" wrap="virtual"><?php echo sanitizeHTML($_POST['message'])?></textarea></td>
</tr>
<tr>
- <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Send")?>"></td>
+ <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?php echo _("Send")?>"></td>
</tr>
</table>
-<input type="hidden" name="pageid" value="<?=$_SESSION['_config']['pagehash']?>">
-<input type="hidden" name="userid" value="<?=intval($_REQUEST['userid'])?>">
-<input type="hidden" name="oldid" value="<?=intval($id)?>">
+<input type="hidden" name="pageid" value="<?php echo $_SESSION['_config']['pagehash']?>">
+<input type="hidden" name="userid" value="<?php echo intval($_REQUEST['userid'])?>">
+<input type="hidden" name="oldid" value="<?php echo intval($id)?>">
</form>
-<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 } } ?>