diff --git a/includes/account.php b/includes/account.php index 35ec0ac..96ec483 100644 --- a/includes/account.php +++ b/includes/account.php @@ -1859,7 +1859,7 @@ if($id == 33 && $_SESSION['profile']['admin'] != 1) { - $orgid = intval($_REQUEST['orgid']); + $orgid = intval($_SESSION['_config']['orgid']); $query = "select * from `org` where `orgid`='$orgid' and `memid`='".$_SESSION['profile']['id']."' and `masteracc`='1'"; $res = mysql_query($query); if(mysql_num_rows($res) <= 0) @@ -1885,27 +1885,25 @@ $_SESSION['_config']['errmsg'] = sprintf(_("Wasn't able to match '%s' against any user in the system"), $_REQUEST['email']); } else { $row = mysql_fetch_assoc($res); - mysql_query("insert into `org` set `memid`='".$row['id']."', `orgid`='".intval($_REQUEST['orgid'])."', + mysql_query("insert into `org` set `memid`='".$row['id']."', `orgid`='".intval($_SESSION['_config']['orgid'])."', `masteracc`='$masteracc', `OU`='$OU', `comments`='$comments'"); } } if(($oldid == 34 || $id == 34) && $_SESSION['profile']['admin'] != 1) { - $orgid = intval($_REQUEST['orgid']); - $memid = intval($_REQUEST['memid']); + $orgid = intval($_SESSION['_config']['orgid']); $res = mysql_query("select * from `org` where `orgid`='$orgid' and `memid`='".$_SESSION['profile']['id']."' and `masteracc`='1'"); if(mysql_num_rows($res) <= 0) - { $id = 32; - } } if($oldid == 34 && $_REQUEST['process'] != "") { - $orgid = intval($_REQUEST['orgid']); + $orgid = intval($_SESSION['_config']['orgid']); $memid = intval($_REQUEST['memid']); - mysql_query("delete from `org` where `orgid`='$orgid' and memid`='".$_SESSION['_config']['memid']."'"); + $query = "delete from `org` where `orgid`='$orgid' and `memid`='$memid'"; + mysql_query($query); } if($oldid == 34 || $oldid == 33) diff --git a/includes/general.php b/includes/general.php index 611c73e..a9e9922 100644 --- a/includes/general.php +++ b/includes/general.php @@ -34,7 +34,8 @@ if($_SERVER['HTTP_HOST'] != $_SESSION['_config']['normalhostname'] && $_SERVER['HTTP_HOST'] != $_SESSION['_config']['securehostname'] && - $_SERVER['HTTP_HOST'] != $_SESSION['_config']['tverify']) + $_SERVER['HTTP_HOST'] != $_SESSION['_config']['tverify'] && + $_SERVER['HTTP_HOST'] != "stamp.cacert.org") { if($_SERVER['HTTPS'] == "on") header("location: https://".$_SESSION['_config']['normalhostname']); @@ -45,6 +46,7 @@ if(($_SERVER['HTTP_HOST'] == $_SESSION['_config']['securehostname'] || $_SERVER['HTTP_HOST'] == $_SESSION['_config']['tverify']) && + $_SERVER['HTTP_HOST'] != "stamp.cacert.org" && $_SERVER['HTTPS'] != "on") { header("location: https://".$_SERVER['HTTP_HOST']); diff --git a/includes/mysql.php.sample b/includes/mysql.php.sample index d40b777..91978b4 100644 --- a/includes/mysql.php.sample +++ b/includes/mysql.php.sample @@ -18,6 +18,7 @@ $_SESSION['_config']['securehostname'] = "secure.cacert.org"; $_SESSION['_config']['normalhostname'] = "www.cacert.org"; + $_SESSION['_config']['tverify'] = "tverify.cacert.org"; function sendmail($to, $subject, $message, $from, $replyto = "", $toname = "", $fromname = "") { diff --git a/pages/account/26.php b/pages/account/26.php index be02d1e..2eb8fec 100644 --- a/pages/account/26.php +++ b/pages/account/26.php @@ -13,7 +13,7 @@ PARTICULAR PURPOSE. See the License for more details. */ ?> @@ -26,7 +26,7 @@ diff --git a/pages/account/32.php b/pages/account/32.php index 3695a4e..3252a1f 100644 --- a/pages/account/32.php +++ b/pages/account/32.php @@ -28,7 +28,7 @@ - + diff --git a/pages/account/33.php b/pages/account/33.php index 9adadbc..6aed3a5 100644 --- a/pages/account/33.php +++ b/pages/account/33.php @@ -14,7 +14,7 @@ PARTICULAR PURPOSE. See the License for more details. */ ?> diff --git a/pages/account/34.php b/pages/account/34.php index bb3c008..8f9d45f 100644 --- a/pages/account/34.php +++ b/pages/account/34.php @@ -13,9 +13,9 @@ PARTICULAR PURPOSE. See the License for more details. */ ?> -
N/A
diff --git a/stamp/.htaccess b/stamp/.htaccess new file mode 100644 index 0000000..bb5fe0e --- /dev/null +++ b/stamp/.htaccess @@ -0,0 +1,5 @@ +php_value auto_prepend_file /www/includes/general.php +php_value output_buffering 1 +errordocument 404 /error404.php +errordocument 403 /error403.php +errordocument 401 /error401.php diff --git a/stamp/certdet.php b/stamp/certdet.php new file mode 100644 index 0000000..c665dc6 --- /dev/null +++ b/stamp/certdet.php @@ -0,0 +1,97 @@ + + + +CAcert.org Certificate Details! + + + +
+

+

://www.cacert.org"> + ://www.cacert.org/images/cacert3.png" border="0" alt="CAcert.org logo">

+ + + +
+
+
+

SSL Certificate Details for

+ +

+ Status: Valid
+ Valid From: GMT
+ Valid To: GMT
+ Subject:
+ Organisation: N/A
+ Verification: = 50) { echo "Person had been assured at time of issue with at least 50 points."; } + else if($org == 1) { ?>This organisation was assured at the time the certificate was issued.

+ +

This site has potentially abused CAcert logos and Copyrights, please report it so we may further investigate.

+ +

Problem with this site? Please report it

+
+
+ + diff --git a/stamp/displogo.php b/stamp/displogo.php new file mode 100644 index 0000000..4ad092f --- /dev/null +++ b/stamp/displogo.php @@ -0,0 +1,53 @@ + diff --git a/stamp/images/CAverify.png b/stamp/images/CAverify.png new file mode 100644 index 0000000..ab5c1ea Binary files /dev/null and b/stamp/images/CAverify.png differ diff --git a/stamp/index.php b/stamp/index.php new file mode 100644 index 0000000..82083b5 --- /dev/null +++ b/stamp/index.php @@ -0,0 +1,37 @@ + + + +CAcert.org Site Stamp HOWTO! + + + +
+

+

://www.cacert.org"> + ://www.cacert.org/images/cacert3.png" border="0" alt="CAcert.org logo">

+ + + +
+
+
+

CAcert.org Site Stamp HOWTO!

+

The CAcert Site Stamp Programme is a very useful tool for site owners everywhere, it allows you yet another option to prevent people + from stealing your content or making a fake site to pretend to be your site to carry out a phishing attack against your customers.

+

To add the CAcert logo to your site you need to register for a CAcert server certificate, then add the + following line somewhere on your website:

+

<script type="text/javascript" src="http<? if($_SERVER['HTTPS']=="on") { echo "s"; } ?>://stamp.cacert.org/showlogo.php"></script>

+ +
+
+ + diff --git a/stamp/report.php b/stamp/report.php new file mode 100644 index 0000000..f9125bc --- /dev/null +++ b/stamp/report.php @@ -0,0 +1,95 @@ +\n"; + $body .= "URL: $refer\n"; + $body .= "Reason: $reason\n"; + $body .= "Comment: $comment\n"; + + sendmail("cacert-abuse@lists.cacert.org,$email", "[CAcert.org] Abuse Report.", $body, "website@cacert.org", "", "", "CAcert Website"); + } + +?> + + +CAcert.org Abuse Report! + + + +
+

+

://www.cacert.org"> + ://www.cacert.org/images/cacert3.png" border="0" alt="CAcert.org logo">

+ + + +
+
+
+

Report abuse for

+ +


+ +
+
+
+
+

+
+ + +

We thank you for your attention to detail, your report has been accepted and we will tend to your report as soon as humanly possible. You will receive a confirmation of your report by email.

+ +
+
+ + diff --git a/stamp/showlogo.php b/stamp/showlogo.php new file mode 100644 index 0000000..8450f79 --- /dev/null +++ b/stamp/showlogo.php @@ -0,0 +1,13 @@ + +var curDateTime = new Date(); +var tz = -(curDateTime.getTimezoneOffset()/60); +document.write(""); +document.write(""); +document.write(""); diff --git a/stamp/style.css b/stamp/style.css new file mode 100644 index 0000000..c0e4422 --- /dev/null +++ b/stamp/style.css @@ -0,0 +1,619 @@ +/***********************************************/ +/* emx_nav_right.css */ +/* Use with template Halo_rightNav.html */ +/***********************************************/ + +/***********************************************/ +/* HTML tag styles */ +/***********************************************/ +body{ + font-family: Arial,sans-serif; + color: #333333; + line-height: 1.166; + margin: 0px; + padding: 0px; + background: #cccccc; +/* url("/siteimages/bg_grad.jpg") fixed; */ +} + +/******* hyperlink and anchor tag styles *******/ + +a:link, a:visited{ + color: #005FA9; + text-decoration: none; +} + +a:hover{ + text-decoration: underline; +} + +/************** header tag styles **************/ + +h1{ + font: bold 120% Arial,sans-serif; + color: #334d55; + margin: 0px; + padding: 0px; +} + +h2{ + font: bold 114% Arial,sans-serif; + color: #006699; + margin: 0px; + padding: 0px; +} + +h3{ + font: bold 100% Arial,sans-serif; + color: #334d55; + margin: 0px; + padding: 0px; + cursor: pointer; +/* cursor: hand; */ +} + +h4{ + font: bold 100% Arial,sans-serif; + color: #333333; + margin: 0px; + padding: 0px; +} + +h5{ + font: 100% Arial,sans-serif; + color: #334d55; + margin: 0px; + padding: 0px; +} + + +/*************** list tag styles ***************/ + +ul.menu { +list-style: none; +margin :0px 0px 0px 15px; +padding-left: 5px; +border-left: 1px dotted #000; +} + +ul.top { +list-style: none; +margin: 0px 0px 0px 15px; +padding-left: 5px; +border-left: 0px; +} + +ul { +list-style: none; +margin: 0px 0px 0px 15px; +padding-left: 5px; +border-left: 1px dotted #000; +} + +/***********************************************/ +/* Layout Divs */ +/***********************************************/ +#pagecell1{ + position:absolute; + top: 2%; + left: 2%; + right: 2%; + width: 96%; + background-color: #ffffff; +} + +#tl { + position:absolute; + top: -1px; + left: -1px; + margin: 0px; + padding: 0px; + z-index: 100; +} + +#tr { + position:absolute; + top: -1px; + right: -1px; + margin: 0px; + padding: 0px; + z-index: 100; +} + +#masthead{ + position: absolute; + top: 0px; + left: 2%; + right: 2%; + width:95.6%; + +} + +#pageNav{ + float: right; + width:178px; + padding: 0px; + background-color: #F5f7f7; + border-left: 1px solid #cccccc; + font: small Verdana,sans-serif; +} + +#content{ + padding: 0px 10px 0px 0px; + margin:0px 0px 0px 0px; +} + + +/***********************************************/ +/* Component Divs */ +/***********************************************/ +#siteName{ + margin: 0px; + padding: 16px 0px 8px 0px; + color: #ffffff; + font-weight: normal; +} + +/************** utility styles *****************/ + +#utility{ + font: 75% Verdana,sans-serif; + position: absolute; + top: 16px; + right: 0px; + color: #919999; +} + +#utility a{ + color: #ffffff; +} + +#utility a:hover{ + text-decoration: underline; +} + +/************** pageName styles ****************/ + +#pageName{ + padding: 0px 0px 14px 10px; + margin: 0px; + border-bottom:1px solid #ccd2d2; +} + +#pageName h2{ + font: bold 175% Arial,sans-serif; + color: #000000; + margin:0px; + padding: 0px; +} + +/************* globalNav styles ****************/ + +#globalNav{ +position: relative; +width: 100%; +min-width: 640px; +height: 32px; +color: #cccccc; +padding: 0px; +margin: 0px; +background-image: url("siteimages/glbnav_background.gif"); +} + +#globalNav img{ + margin-bottom: -4px; + +} + +#gnl { + position: absolute; + top: 0px; + left:0px; +} + +#gnr { + position: absolute; + top: 0px; + right:0px; +} + +#globalLink{ + position: absolute; + top: 6px; + height: 22px; + min-width: 640px; + padding: 0px; + margin: 0px; + left: 10px; + z-index: 100; +} + + +a.glink, a.glink:visited{ + font-size: small; + color: #000000; + font-weight: bold; + margin: 0px; + padding: 2px 5px 4px 5px; + border-right: 1px solid #8FB8BC; +} + +a.glink:hover{ + background-image: url("siteimages/glblnav_selected.gif"); + text-decoration: none; +} + +.skipLinks {display: none;} + +/************ subglobalNav styles **************/ + +.subglobalNav{ + position: absolute; + top: 84px; + left: 0px; + /*width: 100%;*/ + min-width: 640px; + height: 20px; + padding: 0px 0px 0px 10px; + visibility: hidden; + color: #ffffff; +} + +.subglobalNav a:link, .subglobalNav a:visited { + font-size: 80%; + color: #ffffff; +} + +.subglobalNav a:hover{ + color: #cccccc; +} + +/*************** search styles *****************/ +/* +#listshow { + z-order: 101; +} +*/ +#search{ + position: absolute; + top: 125px; + right: 0px; +} + +#search form { + position: absolute; + top: 125px; + right: 300px; +} +#search input { + font-size: 11px; +} + +#search1{ + position: absolute; + top: 85px; + right: 300px; +} + +#search2{ + position: absolute; + top: 100px; + right: 300px; +} + +#search3{ + position: absolute; + top: 85px; + right: 240px; +} + +#search4{ + position: absolute; + top: 100px; + right: 226px; +} + +#googlead{ + position: absolute; + top: 5px; + right: 5px; + z-index: 101; +} + +#search input{ + font-size: 70%; + margin: 0px 0px 0px 10px; + } + +#search a:link, #search a:visited { + font-size: 80%; + font-weight: bold; + +} + +#search a:hover{ + margin: 0px; +} + + +/************* breadCrumb styles ***************/ + +#breadCrumb{ + padding: 5px 0px 5px 10px; + font: small Verdana,sans-serif; + color: #AAAAAA; +} + +#breadCrumb a{ + color: #AAAAAA; +} + +#breadCrumb a:hover{ + color: #005FA9; + text-decoration: underline; +} + + +/************** feature styles *****************/ + +.feature{ + padding: 0px 0px 10px 10px; + font-size: 80%; + min-height: 200px; + height: 200px; +} +html>body .feature {height: auto;} + +.feature h3{ + font: bold 175% Arial,sans-serif; + color: #000000; + padding: 30px 0px 5px 0px; +} + +.feature img{ + float: left; + padding: 0px 10px 0px 0px; +} + + +/*************** story styles ******************/ + +.story { + padding: 10px 0px 0px 10px; + font-size: 80%; + min-height: 272px; +} + +.story h3{ + font: bold 125% Arial,sans-serif; + color: #000000; +} + +.story p { + padding: 0px 0px 10px 0px; +} + +.story a.capsule{ + font: bold 1em Arial,sans-serif; + color: #005FA9; + display:block; + padding-bottom: 5px; +} + +.story a.capsule:hover{ + text-decoration: underline; +} + +td.storyLeft{ + padding-right: 12px; +} + + +/************** siteInfo styles ****************/ + +#siteInfo{ + clear: both; + border-top: 1px solid #cccccc; + font-size: small; + color: #cccccc; + padding: 10px 10px 10px 10px; +} + +/************ sectionLinks styles **************/ + +#sectionLinks{ + margin: 0px; + padding: 0px; + +} + +#sectionLinks h3{ + padding: 10px 0px 2px 10px; + border-bottom: 1px solid #cccccc; +} + +#sectionLinks a:link, #sectionLinks a:visited { + display: block; + border-top: 1px solid #ffffff; + border-bottom: 1px solid #cccccc; + background-image: url("siteimages/bg_nav.jpg"); + font-weight: bold; + padding: 3px 0px 3px 10px; + color: #21536A; +} + +#sectionLinks a:hover{ + border-top: 1px solid #cccccc; + background-color: #DDEEFF; + background-image: none; + font-weight: bold; + text-decoration: none; +} + + +/************* relatedLinks styles **************/ + +.relatedLinks{ + margin: 0px; + padding: 0px 0px 10px 10px; + border-bottom: 1px solid #cccccc; +} + +.relatedLinks h3{ + padding: 10px 0px 2px 0px; +} + +.relatedLinks a{ + display: block; +} + + +/**************** advert styles *****************/ + +#advert{ + padding: 10px; +} + +#advert img{ + display: block; +} + +/********************* end **********************/ + +.DataTD input, .DataTD textarea { + FONT-SIZE: 92%; +} + +.DataTD select, .DataTD option { + FONT-SIZE: 92%; +} + +.DataTD { + background-color: #E2E2E2; + border-style: inset; + border-width: 1px; + FONT-SIZE: 8pt; + COLOR: #000000; + FONT-FAMILY: Arial, Tahoma, Verdana, Helvetica, sans-serif; + + background: #ffffff; + padding: 1px 5px 1px 5px; + border: 1px #CFCFCF solid; + border-left: 1px #CFCFCF dotted; + border-right: 1px #CFCFCF dotted; +} + +.DataTDGrey { + background-color: #EFEDED; + border-style: inset; + border-width: 1px; + FONT-SIZE: 8pt; + COLOR: #000000; + FONT-FAMILY: Arial, Tahoma, Verdana, Helvetica, sans-serif; + + padding: 1px 5px 1px 5px; + border: 1px #CFCFCF solid; + border-left: 1px #CFCFCF dotted; + border-right: 1px #CFCFCF dotted; +} + +.DataTDNotDotted { + background-color: #E2E2E2; + border-style: inset; + border-width: 1px; + FONT-SIZE: 8pt; + COLOR: #000000; + FONT-FAMILY: Arial, Tahoma, Verdana, Helvetica, sans-serif; + + background: #ffffff; + padding: 1px 5px 1px 5px; + border: 1px #CFCFCF solid; + border-left: 1px #CFCFCF solid; + border-right: 1px #CFCFCF solid; +} + +.wrapper { + border-collapse: collapse; + font-family: verdana, sans-serif; + font-size: 11px; + text-align: center; +} + +td.greytxt { + color: #CCCCCC; + font-size: smaller; + text-align: right; + vertical-align: bottom; +} + +.title { + background: #E2E2E2; + font-weight:BOLD; + padding: 1px 5px 1px 5px; + border: 1px solid #CFCFCF; + border-bottom: 3px double #CFCFCF; + border-top: 1px solid #656565; + text-align: center; +} + +.errmsg { + font-weight: BOLD; + color: #FF0000; +} + +.ac_menu +{ + border:1px solid black +} +.ac_normal +{ + background-color:#ffffff; + cursor:pointer; +} +.ac_highlight +{ + background-color:#3366cc; + color:white; + cursor:pointer; +} +.ac_normal .a +{ + font-size:13px; + color:black; +} +.ac_highlight .a +{ + font-size:13px; +} +.ac_normal .d +{ + float:right; + font-size:10px; + color:green; +} +.ac_highlight .d +{ + float:right; + font-size:10px; +} + +br { + clear: left; +} + +label { + font-size: 90%; +} + +label,input,select { + display: block; + width: 150px; + float: left; + margin-bottom: 10px; +} + +label { + text-align: right; + width: 75px; + padding-right: 20px; +}