diff options
91 files changed, 4348 insertions, 1153 deletions
diff --git a/CommModule/client.pl b/CommModule/client.pl index 323ee27..bf92b27 100755 --- a/CommModule/client.pl +++ b/CommModule/client.pl @@ -595,7 +595,7 @@ sub OpenPGPextractExpiryDate ($) # Sets the locale according to the users preferred language sub setUsersLanguage($) { - my $lang="de_DE"; + my $lang="en_US"; print "Searching for the language of the user $_[0]\n"; my @a=$dbh->selectrow_array("select language from users where id='".int($_[0])."'"); $lang = $1 if($a[0]=~m/(\w+_[\w.@]+)/); @@ -887,7 +887,7 @@ sub HandleCerts($$) my $body = _("Hi")." $user{fname},\n\n"; $body .= sprintf(_("You can collect your certificate for %s by going to the following location:")."\n\n", $row{'email'}.$row{'CN'}); $body .= "https://www.cacert.org/account.php?id=".($server?"15":"6")."&cert=$row{id}\n\n"; - $body .= _("If you have not imported CAcert´s root certificate, please go to:")."\n"; + $body .= _("If you have not imported CAcert's root certificate, please go to:")."\n"; $body .= "https://www.cacert.org/index.php?id=3\n"; $body .= "Root cert fingerprint = A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B\n"; $body .= "Root cert fingerprint = 135C EC36 F49C B8E9 3B1A B270 CD80 8846 76CE 8F33\n\n"; diff --git a/CommModule/server.pl b/CommModule/server.pl index eb5113a..c70bc9a 100755 --- a/CommModule/server.pl +++ b/CommModule/server.pl @@ -502,9 +502,28 @@ sub SignX509($$$$$$$$) { open OUT,">$wid/extfile"; print OUT "basicConstraints = critical, CA:FALSE\n"; + print OUT "keyUsage = critical, digitalSignature, keyEncipherment, keyAgreement\n"; print OUT "extendedKeyUsage = clientAuth, serverAuth, nsSGC, msSGC\n"; - print OUT "keyUsage = digitalSignature, keyEncipherment\n"; print OUT "authorityInfoAccess = OCSP;URI:$OCSPUrl\n"; + + my $CRLUrl=""; + if($root==0) + { + $CRLUrl="http://crl.cacert.org/revoke.crl"; + } + elsif($root==1) + { + $CRLUrl="http://crl.cacert.org/class3-revoke.crl"; + } + elsif($root==2) + { + $CRLUrl="http://crl.cacert.org/class3s-revoke.crl"; + } + else + { + $CRLUrl="http://crl.cacert.org/root${root}.crl"; + } + print OUT "crlDistributionPoints = URI:${CRLUrl}\n"; print OUT "subjectAltName = $san\n" if(length($san)); close OUT; $extfile=" -extfile $wid/extfile "; diff --git a/Makefile b/Makefile deleted file mode 100644 index 914d979..0000000 --- a/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -all: - xgettext -s -o messages.po --no-wrap --foreign-user includes/*.php www/*.php pages/account/*.php pages/index/*.php pages/wot/*.php pages/gpg/*.php pages/disputes/*.php pages/help/*.php pages/disputes/*.php scripts/removedead.php - perl cacertupload.pl - cd locale; php make.php - -other: all - cat messages.po|sed "s/CHARSET/iso-8859-1/"|sed "s/PACKAGE VERSION/CAcert/"|sed "s/This file is put in the public domain./This file is distributed under the same license as the CAcert package./"|sed "s/# SOME DESCRIPTIVE TITLE.//" > messages.po diff --git a/cacertupload.pl b/cacertupload.pl deleted file mode 100755 index 991570b..0000000 --- a/cacertupload.pl +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/perl - -#LibreSSL - CAcert web application -#Copyright (C) 2004-2008 CAcert Inc. -# -#This program is free software; you can redistribute it and/or modify -#it under the terms of the GNU General Public License as published by -#the Free Software Foundation; version 2 of the License. -# -#This program is distributed in the hope that it will be useful, -#but WITHOUT ANY WARRANTY; without even the implied warranty of -#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -#GNU General Public License for more details. -# -#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 - -use LWP::UserAgent; -$ua = LWP::UserAgent->new(agent => 'Translingo Client 1.0'); -use HTTP::Request::Common qw(POST); - -my $translingo_password; -my $translingo_account; - -# Read Account&Password from file -eval `cat password.dat`; - -$ua->cookie_jar({}); -$ua->timeout(10000); - -my $req = POST 'http://translingo.cacert.org/login.php', -[ -]; -# ggf. Referer faken -$req->referer('http://translingo.cacert.org/'); - $ua->request($req)->as_string; - -# 1.Test - Umgebung -my $req = POST 'http://translingo.cacert.org/login.php', -[ - username => $translingo_account, - password => $translingo_password, - submit => 'Login', -]; -# ggf. Referer faken -$req->referer('http://translingo.cacert.org/'); -$ua->request($req)->as_string; - -# 2.Test - FileUpload -my $req = POST 'http://translingo.cacert.org/upload.php', -Content_Type => 'form-data', -Content => [ - project => '1', - fileformat => '1', - pofile => ["messages.po" => "messages.po", 'Content_Type' => "application/x-gettext"], -]; -print $ua->request($req)->as_string; - diff --git a/includes/account.php b/includes/account.php index e64f360..a0d03d8 100644 --- a/includes/account.php +++ b/includes/account.php @@ -16,6 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ require_once("../includes/loggedin.php"); + require_once("../includes/lib/l10n.php"); loadem("account"); @@ -35,6 +36,12 @@ exit; } + if ($process == _("Cancel")) + { + // General reset CANCEL process requests + $process = ""; + } + if($id == 45 || $id == 46 || $oldid == 45 || $oldid == 46) { @@ -2198,7 +2205,7 @@ $orgid = 0; } - if($oldid == 31 && $process != _("Cancel")) + if($oldid == 31 && $process != "") { $query = "select * from `orgdomains` where `orgid`='".intval($_SESSION['_config']['orgid'])."'"; $dres = mysql_query($query); @@ -2282,8 +2289,21 @@ $_SESSION['_config']['errmsg'] = sprintf(_("Wasn't able to match '%s' against any user in the system"), sanitizeHTML($_REQUEST['email'])); } else { $row = mysql_fetch_assoc($res); - mysql_query("insert into `org` set `memid`='".intval($row['id'])."', `orgid`='".intval($_SESSION['_config']['orgid'])."', - `masteracc`='$masteracc', `OU`='$OU', `comments`='$comments'"); + if ( !is_assurer(intval($row['id'])) ) + { + $id = $oldid;
+ $oldid=0;
+ $_SESSION['_config']['errmsg'] = + _("The user is not an Assurer yet"); + } else { + mysql_query( + "insert into `org` + set `memid`='".intval($row['id'])."', + `orgid`='".intval($_SESSION['_config']['orgid'])."', + `masteracc`='$masteracc', + `OU`='$OU', + `comments`='$comments'"); + } } } @@ -2345,7 +2365,7 @@ { csrf_check("mainlang"); $lang = mysql_real_escape_string($_REQUEST['lang']); - foreach($_SESSION['_config']['translations'] as $key => $val) + foreach(L10n::$translations as $key => $val) { if($key == $lang) { diff --git a/includes/account_stuff.php b/includes/account_stuff.php index b6fdd7a..108bd57 100644 --- a/includes/account_stuff.php +++ b/includes/account_stuff.php @@ -277,7 +277,7 @@ function hideall() { ?> </div> </div> - <div id="siteInfo"><a href="account.php?id=37"><?=_("About Us")?></a> | <a href="account.php?id=38"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> | + <div id="siteInfo"><a href="//wiki.cacert.org/FAQ/AboutUs"><?=_("About Us")?></a> | <a href="account.php?id=38"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> | <a href="/policy/PrivacyPolicy.html"><?=_("Privacy Policy")?></a> | <a href="account.php?id=40"><?=_("Contact Us")?></a> | ©2002-<?=date("Y")?> <?=_("by CAcert")?></div> </div> diff --git a/includes/general.php b/includes/general.php index ebdf20e..9e2b131 100644 --- a/includes/general.php +++ b/includes/general.php @@ -39,6 +39,7 @@ require_once($_SESSION['_config']['filepath']."/includes/mysql.php"); require_once($_SESSION['_config']['filepath'].'/includes/lib/account.php'); + require_once($_SESSION['_config']['filepath'].'/includes/lib/l10n.php'); if(array_key_exists('HTTP_HOST',$_SERVER) && $_SERVER['HTTP_HOST'] != $_SESSION['_config']['normalhostname'] && @@ -70,122 +71,8 @@ } } - $lang = ""; - if(array_key_exists("lang",$_REQUEST)) - $lang=mysql_escape_string(substr(trim($_REQUEST['lang']), 0, 5)); - if($lang != "") - $_SESSION['_config']['language'] = $lang; - - //if($_SESSION['profile']['id'] == 1 && 1 == 2) - // echo $_SESSION['_config']['language']; - - $_SESSION['_config']['translations'] = array( - "ar_JO" => "العربية", - "bg_BG" => "Български", - "cs_CZ" => "Čeština", - "da_DK" => "Dansk", - "de_DE" => "Deutsch", - "el_GR" => "Ελληνικά", - "en_AU" => "English", - "eo_EO" => "Esperanto", - "es_ES" => "Español", - "fa_IR" => "Farsi", - "fi_FI" => "Suomi", - "fr_FR" => "Français", - "he_IL" => "עברית", - "hr_HR" => "Hrvatski", - "hu_HU" => "Magyar", - "is_IS" => "Íslenska", - "it_IT" => "Italiano", - "ja_JP" => "日本語", - "ka_GE" => "Georgian", - "nl_NL" => "Nederlands", - "pl_PL" => "Polski", - "pt_PT" => "Português", - "pt_BR" => "Português Brasileiro", - "ru_RU" => "Русский", - "ro_RO" => "Română", - "sv_SE" => "Svenska", - "tr_TR" => "Türkçe", - "zh_CN" => "中文(简体)"); - - $value=array(); - - if(!(array_key_exists('language',$_SESSION['_config']) && $_SESSION['_config']['language'] != "")) - { - $bits = explode(",", strtolower(str_replace(" ", "", mysql_real_escape_string(array_key_exists('HTTP_ACCEPT_LANGUAGE',$_SERVER)?$_SERVER['HTTP_ACCEPT_LANGUAGE']:"")))); - foreach($bits as $lang) - { - $b = explode(";", $lang); - if(count($b)>1 && substr($b[1], 0, 2) == "q=") - $c = floatval(substr($b[1], 2)); - else - $c = 1; - $value["$c"] = trim($b[0]); - } - - krsort($value); - - reset($value); - - foreach($value as $key => $val) - { - $val = substr(escapeshellarg($val), 1, -1); - $short = substr($val, 0, 2); - if($val == "en" || $short == "en") - { - $_SESSION['_config']['language'] = "en"; - break; - } - if(file_exists($_SESSION['_config']['filepath']."/locale/$val/LC_MESSAGES/messages.mo")) - { - $_SESSION['_config']['language'] = $val; - break; - } - if(file_exists($_SESSION['_config']['filepath']."/locale/$short/LC_MESSAGES/messages.mo")) - { - $_SESSION['_config']['language'] = $short; - break; - } - } - } - if(!array_key_exists('_config',$_SESSION) || !array_key_exists('language',$_SESSION['_config']) || strlen($_SESSION['_config']['language']) != 5) - { - $lang = array_key_exists('language',$_SESSION['_config'])?$_SESSION['_config']['language']:""; - $_SESSION['_config']['language'] = "en_AU"; - foreach($_SESSION['_config']['translations'] as $key => $val) - { - if(substr($lang, 0, 2) == substr($key, 0, 2)) - { - $_SESSION['_config']['language'] = $val; - break; - } - } - } - - $_SESSION['_config']['recode'] = "html..latin-1"; - if($_SESSION['_config']['language'] == "zh_CN") - { - $_SESSION['_config']['recode'] = "html..gb2312"; - } else if($_SESSION['_config']['language'] == "pl_PL" || $_SESSION['_config']['language'] == "hu_HU") { - $_SESSION['_config']['recode'] = "html..ISO-8859-2"; - } else if($_SESSION['_config']['language'] == "ja_JP") { - $_SESSION['_config']['recode'] = "html..SHIFT-JIS"; - } else if($_SESSION['_config']['language'] == "ru_RU") { - $_SESSION['_config']['recode'] = "html..ISO-8859-5"; - } else if($_SESSION['_config']['language'] == "lt_LT") { - $_SESSION['_config']['recode'] = "html..ISO-8859-13"; - } - - putenv("LANG=".$_SESSION['_config']['language']); - setlocale(LC_ALL, $_SESSION['_config']['language']); - $domain = 'messages'; - bindtextdomain($domain, $_SESSION['_config']['filepath']."/locale"); - textdomain($domain); - - //if($_SESSION['profile']['id'] == -1) - // echo $_SESSION['_config']['language']." - ".$_SESSION['_config']['filepath']."/locale"; - + L10n::detect_language(); + L10n::init_gettext(); if(array_key_exists('profile',$_SESSION) && is_array($_SESSION['profile']) && array_key_exists('id',$_SESSION['profile']) && $_SESSION['profile']['id'] > 0) { @@ -600,10 +487,6 @@ return(0); } - if($points >= 300) - return(200); - if($points >= 200) - return(150); if($points >= 150) return(35); if($points >= 140) @@ -632,14 +515,6 @@ return(utf8_decode($data)); } - function screenshot($img) - { - if(file_exists("../screenshots/".$_SESSION['_config']['language']."/$img")) - return("/screenshots/".$_SESSION['_config']['language']."/$img"); - else - return("/screenshots/en/$img"); - } - function signmail($to, $subject, $message, $from, $replyto = "") { if($replyto == "") @@ -919,10 +794,13 @@ if($newlayout) { $name="../$type/$kind/".intval($id/1000)."/$kind-".intval($id).".$type"; - mkdir("../csr/$kind",0777); - mkdir("../crt/$kind",0777); - mkdir("../csr/$kind/".intval($id/1000)); - mkdir("../crt/$kind/".intval($id/1000)); + if (!is_dir("../csr")) { mkdir("../csr",0777); } + if (!is_dir("../crt")) { mkdir("../crt",0777); } + + if (!is_dir("../csr/$kind")) { mkdir("../csr/$kind",0777); } + if (!is_dir("../crt/$kind")) { mkdir("../crt/$kind",0777); } + if (!is_dir("../csr/$kind/".intval($id/1000))) { mkdir("../csr/$kind/".intval($id/1000)); } + if (!is_dir("../crt/$kind/".intval($id/1000))) { mkdir("../crt/$kind/".intval($id/1000)); } } return $name; } diff --git a/includes/general_stuff.php b/includes/general_stuff.php index 088c39e..4c1bd30 100644 --- a/includes/general_stuff.php +++ b/includes/general_stuff.php @@ -16,6 +16,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +require_once($_SESSION['_config']['filepath'].'/includes/lib/l10n.php'); + if(!function_exists("showheader")) { function showbodycontent($title = "CAcert.org", $title2 = "") @@ -60,7 +62,7 @@ google_color_border = "FFFFFF"; <? include("about_menu.php"); ?> <div class="relatedLinks"> <h3 class="pointer" onclick="explode('trans')">+ <?=_("Translations")?></h3> - <ul class="menu" id="trans"><? foreach($_SESSION['_config']['translations'] as $key => $val) { ?><li><a href="<?=$_SERVER['SCRIPT_NAME']?>?id=<?=intval(array_key_exists('id',$_REQUEST)?$_REQUEST['id']:0)?>&lang=<?=$key?>"><?=$val?></a></li><? } ?></ul> + <ul class="menu" id="trans"><? foreach(L10n::$translations as $key => $val) { ?><li><a href="<?=$_SERVER['SCRIPT_NAME']?>?id=<?=intval(array_key_exists('id',$_REQUEST)?$_REQUEST['id']:0)?>&lang=<?=$key?>"><?=$val?></a></li><? } ?></ul> </div> <? if(array_key_exists('mconn',$_SESSION) && $_SESSION['mconn']) { ?> <div class="relatedLinks"> @@ -131,7 +133,7 @@ if(!function_exists("showfooter")) </div> <? include("sponsorinfo.php") ?> <div id="siteInfo"> - <a href="/index.php?id=12"><?=_("About Us")?></a> | <a href="/index.php?id=13"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> | + <a href="//wiki.cacert.org/FAQ/AboutUs"><?=_("About Us")?></a> | <a href="/index.php?id=13"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> | <a href="/policy/PrivacyPolicy.html"><?=_("Privacy Policy")?></a> | <a href="/index.php?id=51"><?=_("Mission Statement")?></a> | <a href="/index.php?id=11"><?=_("Contact Us")?></a> | ©2002-<?=date("Y")?> <?=_("by CAcert")?></div> diff --git a/includes/lib/account.php b/includes/lib/account.php index f7a24fa..c7697ce 100644 --- a/includes/lib/account.php +++ b/includes/lib/account.php @@ -19,6 +19,8 @@ function fix_assurer_flag($userID) { + // If requirements for assurers are modified see also scripts/cron/updatesort.php + // Update Assurer-Flag on users table if 100 points. // Should the number of points be SUM(points) or SUM(awarded)? $query = mysql_query('UPDATE `users` AS `u` SET `assurer` = 1 WHERE '. @@ -29,11 +31,11 @@ function fix_assurer_flag($userID) '(SELECT SUM(`points`) FROM `notary` AS `n` WHERE `n`.`to` = `u`.`id` '. 'AND (`n`.`expire` > now() OR `n`.`expire` IS NULL)) >= 100'); // Challenge has been passed and non-expired points >= 100 - + if (!$query) { return false; } - + // Reset flag if requirements are not met $query = mysql_query('UPDATE `users` AS `u` SET `assurer` = 0 WHERE '. '`u`.`id` = \''.(int)intval($userID).'\' AND '. @@ -42,10 +44,10 @@ function fix_assurer_flag($userID) 'AND `cp`.`user_id` = `u`.`id`) OR '. '(SELECT SUM(`points`) FROM `notary` AS `n` WHERE `n`.`to` = `u`.`id` '. 'AND (`n`.`expire` > now() OR `n`.`expire` IS NULL)) < 100)'); - + if (!$query) { return false; } - + return true; }
\ No newline at end of file diff --git a/includes/lib/l10n.php b/includes/lib/l10n.php new file mode 100644 index 0000000..85b7aff --- /dev/null +++ b/includes/lib/l10n.php @@ -0,0 +1,343 @@ +<?php /* + LibreSSL - CAcert web application + Copyright (C) 2004-2011 CAcert Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + 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 +*/ + +/** + * This class provides some functions for language handling + */ +class L10n { + /** + * These are tranlations we currently support. + * + * If another translation is added, it doesn't suffice to have gettext set + * up, you also need to add it here, because it acts as a white list. + * + * @var array("ISO-language code" => "native name of the language") + */ + public static $translations = array( + "ar" => "العربية", + "bg" => "Български", + "cs" => "Čeština", + "da" => "Dansk", + "de" => "Deutsch", + "el" => "Ελληνικά", + "en" => "English", + "es" => "Español", + "fi" => "Suomi", + "fr" => "Français", + "hu" => "Magyar", + "it" => "Italiano", + "ja" => "日本語", + "lv" => "Latviešu", + "nl" => "Nederlands", + "pl" => "Polski", + "pt" => "Português", + "pt-br" => "Português Brasileiro", + "ru" => "Русский", + "sv" => "Svenska", + "tr" => "Türkçe", + "zh-cn" => "中文(简体)", + "zh-tw" => "中文(臺灣)", + ); + + /** + * setlocale needs a language + region code for whatever reason so here's + * the mapping from a translation code to locales with the region that + * seemed the most common for this language + * + * You probably never need this. Use {@link set_translation()} to change the + * language instead of manually calling setlocale(). + * + * @var array(string => string) + */ + private static $locales = array( + "ar" => "ar_JO", + "bg" => "bg_BG", + "cs" => "cs_CZ", + "da" => "da_DK", + "de" => "de_DE", + "el" => "el_GR", + "en" => "en_US", + "es" => "es_ES", + "fa" => "fa_IR", + "fi" => "fi_FI", + "fr" => "fr_FR", + "he" => "he_IL", + "hr" => "hr_HR", + "hu" => "hu_HU", + "id" => "id_ID", + "is" => "is_IS", + "it" => "it_IT", + "ja" => "ja_JP", + "ka" => "ka_GE", + "ko" => "ko_KR", + "lv" => "lv_LV", + "nb" => "nb_NO", + "nl" => "nl_NL", + "pl" => "pl_PL", + "pt" => "pt_PT", + "pt-br" => "pt_BR", + "ro" => "ro_RO", + "ru" => "ru_RU", + "sl" => "sl_SI", + "sv" => "sv_SE", + "th" => "th_TH", + "tr" => "tr_TR", + "uk" => "uk_UA", + "zh-cn" => "zh_CN", + "zh-tw" => "zh_TW", + ); + + /** + * Auto-detects the language that should be used and sets it. Only works for + * HTTP, not in a command line script. + * + * Priority: + * <ol> + * <li>explicit parameter "lang" passed in HTTP (e.g. via GET)</li> + * <li>existing setting in the session (stick to the setting we had before) + * </li> + * <li>auto-detect via the HTTP Accept-Language header sent by the user + * agent</li> + * </ol> + */ + public static function detect_language() { + if ( (self::get_translation() != "") + // already set in the session? + && + !(array_key_exists("lang", $_REQUEST) && + trim($_REQUEST["lang"]) != "") + // explicit parameter? + ) + { + if ( self::set_translation(self::get_translation()) ) { + return; + } + } + + + $languages = array(); + + // parse Accept-Language header + if (array_key_exists('HTTP_ACCEPT_LANGUAGE', $_SERVER)) { + $bits = explode(",", strtolower( + str_replace(" ", "", $_SERVER['HTTP_ACCEPT_LANGUAGE']) + )); + foreach($bits as $lang) + { + $b = explode(";", $lang); + if(count($b)>1 && substr($b[1], 0, 2) == "q=") + $c = floatval(substr($b[1], 2)); + else + $c = 1; + + if ($c != 0) + { + $languages[trim($b[0])] = $c; + } + } + } + + // check if there is an explicit language given as parameter + if(array_key_exists("lang",$_REQUEST) && trim($_REQUEST["lang"]) != "") + { + // higher priority than those values in the header + $languages[strtolower(trim($_REQUEST["lang"]))] = 2.0; + } + + arsort($languages, SORT_NUMERIC); + + // this is used to be compatible with browsers like internet + // explorer which only provide the language code including the + // region not without. Also handles the fallback to English (qvalues + // may only have three digits after the .) + $fallbacks = array("en" => 0.0005); + + foreach($languages as $lang => $qvalue) + { + // ignore any non-conforming values (that's why we don't need to + // mysql_real_escape() or escapeshellarg(), but take care of + // the '*') + // spec: ( ( 1*8ALPHA *( "-" 1*8ALPHA ) ) | "*" ) + if ( preg_match('/^(?:([a-zA-Z]{1,8})(?:-[a-zA-Z]{1,8})*|\*)$/', + $lang, $matches) !== 1 ) { + continue; + } + $lang_prefix = $matches[1]; // usually two-letter language code + $fallbacks[$lang_prefix] = $qvalue; + + $chosen_translation = ""; + if ($lang === '*') { + // According to the standard '*' matches anything but any + // language explicitly specified. So in theory if there + // was an explicit mention of "en" with a lower priority + // this would be incorrect, but that's too much trouble. + $chosen_translation = "en"; + } else { + $lang_length = strlen($lang); + foreach (self::$translations as $translation => $ignore) + { + // May match exactly or on every '-' + if ( $translation === $lang || + substr($translation, 0, $lang_length + 1) + === $lang.'-' + ) + { + $chosen_translation = $translation; + break; + } + } + } + + if ($chosen_translation !== "") + { + if (self::set_translation($chosen_translation)) { + return; + } + } + } + + // No translation found yet => try the prefixes + arsort($fallbacks, SORT_NUMERIC); + foreach ($fallbacks as $lang => $qvalue) { + if (self::set_translation($lang)) { + return; + } + } + + // should not get here, as the fallback of "en" is provided and that + // should always work => log an error + trigger_error("L10n::detect_language(): could not set language", + E_USER_WARNING); + } + + /** + * Get the set translation + * + * @return string + * a translation code or the empty string if not set + */ + public static function get_translation() { + if (array_key_exists('language', $_SESSION['_config'])) { + return $_SESSION['_config']['language']; + } else { + return ""; + } + } + + /** + * Set the translation to use. + * + * @param string $translation_code + * the translation code as specified in the keys of {@link $translations} + * + * @return bool + * <ul> + * <li>true if the translation has been set successfully</li> + * <li>false if the $translation_code was not contained in the white + * list or could not be set for other reasons (e.g. setlocale() + * failed because the locale has not been set up on the system - + * details will be logged)</li> + * </ul> + */ + public static function set_translation($translation_code) { + // check $translation_code against whitelist + if ( !array_key_exists($translation_code, self::$translations) ) { + // maybe it's a locale as previously used in the system? e.g. en_AU + if ( preg_match('/^([a-z][a-z])_([A-Z][A-Z])$/', $translation_code, + $matches) !== 1 ) { + return false; + } + + $lang_code = $matches[1]; + $region_code = strtolower($matches[2]); + + if ( array_key_exists("${lang_code}-${region_code}", + self::$translations) ) { + $translation_code = "${lang_code}-${region_code}"; + } elseif ( array_key_exists($lang_code, self::$translations) ) { + $translation_code = $lang_code; + } else { + return false; + } + } + + // map translation to locale + if ( !array_key_exists($translation_code, self::$locales) ) { + // weird. maybe you added a translation but haven't added a + // translation to locale mapping in self::locales? + trigger_error("L10n::set_translation(): could not map the ". + "translation $translation_code to a locale", E_USER_WARNING); + return false; + } + $locale = self::$locales[$translation_code]; + + // set up locale + if ( !putenv("LANG=$locale") ) { + trigger_error("L10n::set_translation(): could not set the ". + "environment variable LANG to $locale", E_USER_WARNING); + return false; + } + if ( !setlocale(LC_ALL, $locale) ) { + trigger_error("L10n::set_translation(): could not setlocale() ". + "LC_ALL to $locale", E_USER_WARNING); + return false; + } + + + // only set if we're running in a server not in a script + if (isset($_SESSION)) { + // save the setting + $_SESSION['_config']['language'] = $translation_code; + + + // Set up the recode settings needed e.g. in PDF creation + $_SESSION['_config']['recode'] = "html..latin-1"; + + if($translation_code === "zh-cn" || $translation_code === "zh-tw") + { + $_SESSION['_config']['recode'] = "html..gb2312"; + + } else if($translation_code === "pl" || $translation_code === "hu") { + $_SESSION['_config']['recode'] = "html..ISO-8859-2"; + + } else if($translation_code === "ja") { + $_SESSION['_config']['recode'] = "html..SHIFT-JIS"; + + } else if($translation_code === "ru") { + $_SESSION['_config']['recode'] = "html..ISO-8859-5"; + + } else if($translation_code == "lt") { // legacy, keep for reference + $_SESSION['_config']['recode'] = "html..ISO-8859-13"; + + } + } + + return true; + } + + /** + * Sets up the text domain used by gettext + * + * @param string $domain + * the gettext domain that should be used, defaults to "messages" + */ + public static function init_gettext($domain = 'messages') { + bindtextdomain($domain, $_SESSION['_config']['filepath'].'/locale'); + textdomain($domain); + } +}
\ No newline at end of file diff --git a/includes/loggedin.php b/includes/loggedin.php index bf6b455..5734fad 100644 --- a/includes/loggedin.php +++ b/includes/loggedin.php @@ -17,6 +17,7 @@ */ include_once("../includes/lib/general.php"); + require_once("../includes/lib/l10n.php"); if($_SERVER['HTTP_HOST'] == $_SESSION['_config']['securehostname'] && $_SESSION['profile']['id'] > 0 && $_SESSION['profile']['loggedin'] != 0) { @@ -110,18 +111,12 @@ if($_SESSION['profile']['language'] == "") { - $query = "update `users` set `language`='".$_SESSION['_config']['language']."' + $query = "update `users` set `language`='".L10n::get_translation()."' where `id`='".$_SESSION['profile']['id']."'"; mysql_query($query); } else { - $_SESSION['_config']['language'] = $_SESSION['profile']['language']; - - putenv("LANG=".$_SESSION['_config']['language']); - setlocale(LC_ALL, $_SESSION['_config']['language']); - - $domain = 'messages'; - bindtextdomain("$domain", $_SESSION['_config']['filepath']."/locale"); - textdomain("$domain"); + L10n::set_translation($_SESSION['profile']['language']); + L10n::init_gettext(); } } diff --git a/includes/notary.inc.php b/includes/notary.inc.php new file mode 100644 index 0000000..cc0e0eb --- /dev/null +++ b/includes/notary.inc.php @@ -0,0 +1,605 @@ +<? /* + LibreSSL - CAcert web application + Copyright (C) 2004-2011 CAcert Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + 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 +*/ + + function query_init ($query) + { + return mysql_query($query); + } + + function query_getnextrow ($res) + { + $row1 = mysql_fetch_assoc($res); + return $row1; + } + + function query_get_number_of_rows ($resultset) + { + return intval(mysql_num_rows($resultset)); + } + + function get_number_of_assurances ($userid) + { + $res = query_init ("SELECT count(*) AS `list` FROM `notary` + WHERE `method` = 'Face to Face Meeting' AND `from`='".intval($userid)."' "); + $row = query_getnextrow($res); + + return intval($row['list']); + } + + function get_number_of_assurees ($userid) + { + $res = query_init ("SELECT count(*) AS `list` FROM `notary` + WHERE `method` = 'Face to Face Meeting' AND `to`='".intval($userid)."' "); + $row = query_getnextrow($res); + + return intval($row['list']); + } + + function get_top_assurer_position ($no_of_assurances) + { + $res = query_init ("SELECT count(*) AS `list` FROM `notary` + WHERE `method` = 'Face to Face Meeting' + GROUP BY `from` HAVING count(*) > '".intval($no_of_assurances)."'"); + return intval(query_get_number_of_rows($res)+1); + } + + function get_top_assuree_position ($no_of_assurees) + { + $res = query_init ("SELECT count(*) AS `list` FROM `notary` + WHERE `method` = 'Face to Face Meeting' + GROUP BY `to` HAVING count(*) > '".intval($no_of_assurees)."'"); + return intval(query_get_number_of_rows($res)+1); + } + + function get_given_assurances ($userid) + { + $res = query_init ("select * from `notary` where `from`='".intval($userid)."' and `from` != `to` order by `id` asc"); + return $res; + } + + function get_received_assurances ($userid) + { + $res = query_init ("select * from `notary` where `to`='".intval($userid)."' and `from` != `to` order by `id` asc "); + return $res; + } + + function get_given_assurances_summary ($userid) + { + $res = query_init ("select count(*) as number,points,awarded,method from notary where `from`='".intval($userid)."' group by points,awarded,method"); + return $res; + } + + function get_received_assurances_summary ($userid) + { + $res = query_init ("select count(*) as number,points,awarded,method from notary where `to`='".intval($userid)."' group by points,awarded,method"); + return $res; + } + + function get_user ($userid) + { + $res = query_init ("select * from `users` where `id`='".intval($userid)."'"); + return mysql_fetch_assoc($res); + } + + function get_cats_state ($userid) + { + + $res = query_init ("select * from `cats_passed` inner join `cats_variant` on `cats_passed`.`variant_id` = `cats_variant`.`id` and `cats_variant`.`type_id` = 1 + WHERE `cats_passed`.`user_id` = '".intval($userid)."'"); + return mysql_num_rows($res); + } + + function calc_experience ($row,&$points,&$experience,&$sum_experience,&$revoked) + { + $apoints = max($row['points'],$row['awarded']); + $points += $apoints; + $experience = " "; + $revoked = false; # to be coded later (after DB-upgrade) + if ($row['method'] == "Face to Face Meeting") + { + $sum_experience = $sum_experience +2; + $experience = "2"; + } + return $apoints; + } + + function calc_assurances ($row,&$points,&$experience,&$sumexperience,&$awarded,&$revoked) + { + $awarded = calc_points($row); + $revoked = false; + + if ($awarded > 100) + { + $experience = $awarded - 100; // needs to be fixed in the future (limit 50 pts and/or no experience if pts > 100) + $awarded = 100; + } + else + $experience = 0; + + switch ($row['method']) + { + case 'Thawte Points Transfer': + case 'CT Magazine - Germany': + case 'Temporary Increase': // Current usage of 'Temporary Increase' may break audit aspects, needs to be reimplemented + $awarded=sprintf("<strong style='color: red'>%s</strong>",_("Revoked")); + $experience=0; + $revoked=true; + break; + default: + $points += $awarded; + } + $sumexperience = $sumexperience + $experience; + } + + + function show_user_link ($name,$userid) + { + $name = trim($name); + if($name == "") + { + if ($userid == 0) + $name = _("System"); + else + $name = _("Deleted account"); + } + else + $name = "<a href='wot.php?id=9&userid=".intval($userid)."'>".sanitizeHTML($name)."</a>"; + return $name; + } + + function show_email_link ($email,$userid) + { + $email = trim($email); + if($email != "") + $email = "<a href='account.php?id=43&userid=".intval($userid)."'>".sanitizeHTML($email)."</a>"; + return $email; + } + + function get_assurer_ranking($userid,&$num_of_assurances,&$rank_of_assurer) + { + $num_of_assurances = get_number_of_assurances (intval($userid)); + $rank_of_assurer = get_top_assurer_position($num_of_assurances); + } + + function get_assuree_ranking($userid,&$num_of_assurees,&$rank_of_assuree) + { + $num_of_assurees = get_number_of_assurees (intval($userid)); + $rank_of_assuree = get_top_assuree_position($num_of_assurees); + } + + +// ************* html table definitions ****************** + + function output_ranking($userid) + { + get_assurer_ranking($userid,$num_of_assurances,$rank_of_assurer); + get_assuree_ranking($userid,$num_of_assurees,$rank_of_assuree); + +?> +<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td class="title"><?=_("Assurer Ranking")?></td> + </tr> + <tr> + <td class="DataTD"><?=sprintf(_("You have made %s assurances which ranks you as the #%s top assurer."), intval($num_of_assurances), intval($rank_of_assurer) )?></td> + </tr> + <tr> + <td class="DataTD"><?=sprintf(_("You have received %s assurances which ranks you as the #%s top assuree."), intval($num_of_assurees), intval($rank_of_assuree) )?></td> + </tr> +</table> +<br/> +<? + } + + function output_assurances_header($title,$support) + { +?> +<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> +<? + if ($support == "1") + { +?> + <td colspan="10" class="title"><?=$title?></td> +<? + } else { +?> + <td colspan="7" class="title"><?=$title?></td> +<? } +?> + </tr> + <tr> + <td class="DataTD"><strong><?=_("ID")?></strong></td> + <td class="DataTD"><strong><?=_("Date")?></strong></td> +<? + if ($support == "1") + { +?> + <td class="DataTD"><strong><?=_("When")?></strong></td> + <td class="DataTD"><strong><?=_("Email")?></strong></td> +<? } ?> + <td class="DataTD"><strong><?=_("Who")?></strong></td> + <td class="DataTD"><strong><?=_("Points")?></strong></td> + <td class="DataTD"><strong><?=_("Location")?></strong></td> + <td class="DataTD"><strong><?=_("Method")?></strong></td> + <td class="DataTD"><strong><?=_("Experience Points")?></strong></td> +<? + if ($support == "1") + { +?> + <td class="DataTD"><strong><?=_("Revoke")?></strong></td> +<? + } +?> + </tr> +<? + } + + function output_assurances_footer($points_txt,$points,$experience_txt,$sumexperience,$support) + { +?> + <tr> + <td class="DataTD" colspan="5"><strong><?=$points_txt?>:</strong></td> + <td class="DataTD"><?=$points?></td> + <td class="DataTD"> </td> + <td class="DataTD"><strong><?=$experience_txt?>:</strong></td> + <td class="DataTD"><?=$sumexperience?></td> +<? + if ($support == "1") + { +?> + <td class="DataTD"> </td> +<? + } +?> + + </tr> +</table> +<br/> +<? + } + + function output_assurances_row($assuranceid,$date,$when,$email,$name,$awarded,$points,$location,$method,$experience,$userid,$support,$revoked) + { + + $tdstyle=""; + $emopen=""; + $emclose=""; + + if ($awarded == $points) + { + if ($awarded == "0") + { + if ($when < "2006-09-01") + { + $tdstyle="style='background-color: #ffff80'"; + $emopen="<em>"; + $emclose="</em>"; + } + } + } +?> + <tr> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$assuranceid?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$date?><?=$emclose?></td> +<? + if ($support == "1") + { +?> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$when?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$email?><?=$emclose?></td> +<? } +?> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$name?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$awarded?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$location?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$method?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$experience?><?=$emclose?></td> +<? + if ($support == "1") + { + if ($revoked == true) + { +?> + <td class="DataTD" <?=$tdstyle?>> </td> +<? } else { +?> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><a href="account.php?id=43&userid=<?=intval($userid)?>&assurance=<?=intval($assuranceid)?>&csrf=<?=make_csrf('admdelassurance')?>" onclick="return confirm('<?=_("Are you sure you want to revoke this assurance?")?>');"><?=_("Revoke")?></a><?=$emclose?></td> +<? + } + } +?> + </tr> +<? + } + + function output_summary_header() + { +?> +<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td colspan="4" class="title"><?=_("Summary of your Points")?></td> + </tr> + <tr> + <td class="DataTD"><strong><?=_("Description")?></strong></td> + <td class="DataTD"><strong><?=_("Points")?></strong></td> + <td class="DataTD"><strong><?=_("Countable Points")?></strong></td> + <td class="DataTD"><strong><?=_("Remark")?></strong></td> + </tr> +<? + } + + function output_summary_footer() + { +?> +</table> +<br/> +<? + } + + function output_summary_row($title,$points,$points_countable,$remark) + { +?> + <tr> + <td class="DataTD"><strong><?=$title?></strong></td> + <td class="DataTD"><?=$points?></td> + <td class="DataTD"><?=$points_countable?></td> + <td class="DataTD"><?=$remark?></td> + </tr> +<? + } + + +// ************* output given assurances ****************** + + function output_given_assurances_content($userid,&$points,&$sum_experience,$support) + { + $points = 0; + $sumexperience = 0; + $res = get_given_assurances(intval($userid)); + while($row = mysql_fetch_assoc($res)) + { + $fromuser = get_user (intval($row['to'])); + $apoints = calc_experience ($row,$points,$experience,$sum_experience,$revoked); + $name = show_user_link ($fromuser['fname']." ".$fromuser['lname'],intval($row['to'])); + $email = show_email_link ($fromuser['email'],intval($row['to'])); + output_assurances_row (intval($row['id']),$row['date'],$row['when'],$email,$name,$apoints,intval($row['points']),$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience,$userid,$support,$revoked); + } + } + +// ************* output received assurances ****************** + + function output_received_assurances_content($userid,&$points,&$sum_experience,$support) + { + $points = 0; + $sumexperience = 0; + $res = get_received_assurances(intval($userid)); + while($row = mysql_fetch_assoc($res)) + { + $fromuser = get_user (intval($row['from'])); + calc_assurances ($row,$points,$experience,$sum_experience,$awarded,$revoked); + $name = show_user_link ($fromuser['fname']." ".$fromuser['lname'],intval($row['from'])); + $email = show_email_link ($fromuser['email'],intval($row['from'])); + output_assurances_row (intval($row['id']),$row['date'],$row['when'],$email,$name,$awarded,intval($row['points']),$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience,$userid,$support,$revoked); + } + } + +// ************* output summary table ****************** + + function check_date_limit ($userid,$age) + { + $dob = date("Y-m-d", mktime(0,0,0,date("m"),date("d"),date("Y")-$age)); + $res = query_init ("select id from `users` where `id`='".$userid."' and `dob` < '$dob'"); + return intval(query_get_number_of_rows($res)); + } + + function calc_points($row) + { + $awarded = intval($row['awarded']); + if ($awarded == "") + $awarded = 0; + if (intval($row['points']) < $awarded) + $points = $awarded; // if 'sum of added points' > 100, awarded shows correct value + else + $points = intval($row['points']); // on very old assurances, awarded is '0' instead of correct value + switch ($row['method']) + { + case 'Thawte Points Transfer': // revoke all Thawte-points (as per arbitration) + case 'CT Magazine - Germany': // revoke c't (only one test-entry) + case 'Temporary Increase': // revoke 'temporary increase' (Current usage breaks audit aspects, needs to be reimplemented) + $points = 0; + break; + case 'Administrative Increase': // ignore AI with 2 points or less (historical for experiance points, now other calculation) + if ($points <= 2) // maybe limit to 35/50 pts in the future? + $points = 0; + break; + case 'Unknown': // to be revoked in the future? limit to max 50 pts? + case 'Trusted Third Parties': // to be revoked in the future? limit to max 35 pts? + case '': // to be revoked in the future? limit to max 50 pts? + case 'Face to Face Meeting': // normal assurances, limit to 35/50 pts in the future? + break; + default: // should never happen ... ;-) + $points = 0; + } + if ($points < 0) // ignore negative points (bug needs to be fixed) + $points = 0; + return $points; + } + + function max_points($userid) + { + return output_summary_content ($userid,0); + } + + function output_summary_content($userid,$display_output) + { + $sum_points = 0; + $sum_experience = 0; + $sum_experience_other = 0; + $max_points = 100; + $max_experience = 50; + + $experience_limit_reached_txt = _("Limit reached"); + + if (check_date_limit($userid,18) != 1) + { + $max_experience = 10; + $experience_limit_reached_txt = _("Limit given by PoJAM reached"); + } + if (check_date_limit($userid,14) != 1) + { + $max_experience = 0; + $experience_limit_reached_txt = _("Limit given by PoJAM reached"); + } + + $res = get_received_assurances_summary($userid); + while($row = mysql_fetch_assoc($res)) + { + $points = calc_points ($row); + + if ($points > $max_points) // limit to 100 points, above is experience (needs to be fixed) + { + $sum_experience_other = $sum_experience_other+($points-$max_points)*intval($row['number']); + $points = $max_points; + } + $sum_points += $points*intval($row['number']); + } + + $res = get_given_assurances_summary($userid); + while($row = mysql_fetch_assoc($res)) + { + switch ($row['method']) + { + case 'Face to Face Meeting': // count Face to Face only + $sum_experience += 2*intval($row['number']); + break; + } + + } + + if ($sum_points > $max_points) + { + $sum_points_countable = $max_points; + $remark_points = _("Limit reached"); + } + else + { + $sum_points_countable = $sum_points; + $remark_points = " "; + } + if ($sum_experience > $max_experience) + { + $sum_experience_countable = $max_experience; + $remark_experience = $experience_limit_reached_txt; + } + else + { + $sum_experience_countable = $sum_experience; + $remark_experience = " "; + } + + if ($sum_experience_countable + $sum_experience_other > $max_experience) + { + $sum_experience_other_countable = $max_experience-$sum_experience_countable; + $remark_experience_other = $experience_limit_reached_txt; + } + else + { + $sum_experience_other_countable = $sum_experience_other; + $remark_experience_other = " "; + } + + if ($sum_points_countable < $max_points) + { + if ($sum_experience_countable != 0) + $remark_experience = _("Points on hold due to less assurance points"); + $sum_experience_countable = 0; + if ($sum_experience_other_countable != 0) + $remark_experience_other = _("Points on hold due to less assurance points"); + $sum_experience_other_countable = 0; + } + + $issue_points = 0; + $cats_test_passed = get_cats_state ($userid); + if ($cats_test_passed == 0) + { + $issue_points_txt = "<strong style='color: red'>"._("You have to pass the CAcert Assurer Challenge (CATS-Test) to be an Assurer")."</strong>"; + if ($sum_points_countable < $max_points) + { + $issue_points_txt = "<strong style='color: red'>"; + $issue_points_txt .= sprintf(_("You need %s assurance points and the passed CATS-Test to be an Assurer"), intval($max_points)); + $issue_points_txt .= "</strong>"; + } + } + else + { + $experience_total = $sum_experience_countable+$sum_experience_other_countable; + $issue_points_txt = ""; + if ($sum_points_countable == $max_points) + $issue_points = 10; + if ($experience_total >= 10) + $issue_points = 15; + if ($experience_total >= 20) + $issue_points = 20; + if ($experience_total >= 30) + $issue_points = 25; + if ($experience_total >= 40) + $issue_points = 30; + if ($experience_total >= 50) + $issue_points = 35; + if ($issue_points != 0) + $issue_points_txt = sprintf(_("You may issue up to %s points"),$issue_points); + } + if ($display_output) + { + output_summary_row (_("Assurance Points you received"),$sum_points,$sum_points_countable,$remark_points); + output_summary_row (_("Total Experience Points by Assurance"),$sum_experience,$sum_experience_countable,$remark_experience); + output_summary_row (_("Total Experience Points (other ways)"),$sum_experience_other,$sum_experience_other_countable,$remark_experience_other); + output_summary_row (_("Total Points")," ",$sum_points_countable + $sum_experience_countable + $sum_experience_other_countable,$issue_points_txt); + } + return $issue_points; + } + + function output_given_assurances($userid,$support) + { + output_assurances_header(_("Assurance Points You Issued"),$support); + output_given_assurances_content($userid,$points,$sum_experience,$support); + output_assurances_footer(_("Total Points Issued"),$points,_("Total Experience Points"),$sum_experience,$support); + } + + function output_received_assurances($userid,$support) + { + output_assurances_header(_("Your Assurance Points"),$support); + output_received_assurances_content($userid,$points,$sum_experience,$support); + output_assurances_footer(_("Total Assurance Points"),$points,_("Total Experience Points"),$sum_experience,$support); + } + + function output_summary($userid) + { + output_summary_header(); + output_summary_content($userid,1); + output_summary_footer(); + } + + function output_end_of_page() + { +?> + <p>[ <a href='javascript:history.go(-1)'><?=_("Go Back")?></a> ]</p> +<? + } +?> diff --git a/includes/tverify_stuff.php b/includes/tverify_stuff.php index 46f49f6..93f7c32 100644 --- a/includes/tverify_stuff.php +++ b/includes/tverify_stuff.php @@ -66,7 +66,7 @@ if(!function_exists("showfooter")) </div> </div> <div id="siteInfo"> - <a href="/index.php?id=12"><?=_("About Us")?></a> | <a href="/index.php?id=13"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> | + <a href="//wiki.cacert.org/FAQ/AboutUs"><?=_("About Us")?></a> | <a href="/index.php?id=13"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> | <a href="/index.php?id=10"><?=_("Privacy Policy")?></a> | <a href="/index.php?id=51"><?=_("Mission Statement")?></a> | <a href="/index.php?id=11"><?=_("Contact Us")?></a> | <a href="/index.php?id=19"><?=_("Further Information")?></a> | ©2002-<?=date("Y")?> <?=_("by CAcert")?></div> diff --git a/includes/wot.inc.php b/includes/wot.inc.php index 05ce449..edc442a 100644 --- a/includes/wot.inc.php +++ b/includes/wot.inc.php @@ -106,14 +106,17 @@ function calc_experience ($row,&$points,&$experience,&$sum_experience) { - $points += $row['awarded']; + $apoints = max($row['points'], $row['awarded']); + + $points += $apoints; + $experience = " "; if ($row['method'] == "Face to Face Meeting") { $sum_experience = $sum_experience +2; $experience = "2"; } - return $row['awarded']; + return $apoints; } function calc_assurances ($row,&$points,&$experience,&$sumexperience,&$awarded) @@ -147,7 +150,12 @@ { $name = trim($name); if($name == "") - $name = _("Deleted before Verification"); + { + if ($userid == 0) + $name = _("System"); + else + $name = _("Deleted account"); + } else $name = "<a href='wot.php?id=9&userid=".intval($userid)."'>$name</a>"; return $name; @@ -223,17 +231,35 @@ <? } - function output_assurances_row($assuranceid,$date,$name,$points,$location,$method,$experience) + function output_assurances_row($assuranceid,$date,$when,$name,$awarded,$points,$location,$method,$experience) + { + + $tdstyle=""; + $emopen=""; + $emclose=""; + + if ($awarded == $points) { + if ($awarded == "0") + { + if ($when < "2006-09-01") + { + $tdstyle="style='background-color: #ffff80'"; + $emopen="<em>"; + $emclose="</em>"; + } + } + } + ?> <tr> - <td class="DataTD"><?=$assuranceid?></td> - <td class="DataTD"><?=$date?></td> - <td class="DataTD"><?=$name?></td> - <td class="DataTD"><?=$points?></td> - <td class="DataTD"><?=$location?></td> - <td class="DataTD"><?=$method?></td> - <td class="DataTD"><?=$experience?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$assuranceid?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$date?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$name?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$awarded?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$location?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$method?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$experience?><?=$emclose?></td> </tr> <? } @@ -285,9 +311,9 @@ while($row = mysql_fetch_assoc($res)) { $fromuser = get_user (intval($row['to'])); - calc_experience ($row,$points,$experience,$sum_experience); + $apoints = calc_experience ($row,$points,$experience,$sum_experience); $name = show_user_link ($fromuser['fname']." ".$fromuser['lname'],intval($row['to'])); - output_assurances_row (intval($row['id']),$row['date'],$name,intval($row['awarded']),$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience); + output_assurances_row (intval($row['id']),$row['date'],$row['when'],$name,$apoints,intval($row['points']),$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience); } } @@ -303,7 +329,7 @@ $fromuser = get_user (intval($row['from'])); calc_assurances ($row,$points,$experience,$sum_experience,$awarded); $name = show_user_link ($fromuser['fname']." ".$fromuser['lname'],intval($row['from'])); - output_assurances_row (intval($row['id']),$row['date'],$name,$awarded,$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience); + output_assurances_row (intval($row['id']),$row['date'],$row['when'],$name,$awarded,intval($row['points']),$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience); } } @@ -318,8 +344,11 @@ function calc_points($row) { - if (intval($row['points']) < intval($row['awarded'])) - $points = intval($row['awarded']); // if 'sum of added points' > 100, awarded shows correct value + $awarded = intval($row['awarded']); + if ($awarded == "") + $awarded = 0; + if (intval($row['points']) < $awarded) + $points = $awarded; // if 'sum of added points' > 100, awarded shows correct value else $points = intval($row['points']); // on very old assurances, awarded is '0' instead of correct value switch ($row['method']) @@ -333,8 +362,8 @@ if ($points <= 2) // maybe limit to 35/50 pts in the future? $points = 0; break; - case 'unknown': // to be revoked in the future? limit to max 50 pts? - case 'Trusted 3rd Parties': // to be revoked in the future? limit to max 35 pts? + case 'Unknown': // to be revoked in the future? limit to max 50 pts? + case 'Trusted Third Parties': // to be revoked in the future? limit to max 35 pts? case '': // to be revoked in the future? limit to max 50 pts? case 'Face to Face Meeting': // normal assurances, limit to 35/50 pts in the future? break; @@ -507,4 +536,94 @@ <p>[ <a href='javascript:history.go(-1)'><?=_("Go Back")?></a> ]</p> <? } + +// functions for 6.php (assure somebody) + +function AssureHead($confirmation,$checkname) +{ +?> +<form method="post" action="wot.php"> + <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="600"> + <tr> + <td colspan="2" class="title"><?=$confirmation?></td> + </tr> + <tr> + <td class="DataTD" colspan="2" align="left"><?=$checkname?></td> + </tr> +<? + } + +function AssureTextLine($field1,$field2) +{ ?> + <tr> + <td class="DataTD"><?=$field1?>:</td> + <td class="DataTD"><?=$field2?></td> + </tr> +<? +} + +function AssureCCABoxLine($type,$text) +{ + return; + AssureBoxLine($type,$text); +} + +function AssureBoxLine($type,$text,$checked) +{ +?> + <tr> + <td class="DataTD"><input type="checkbox" name="<?=$type?>" value="1" <?=$checked?"checked":""?>></td> + <td class="DataTD"><?=$text?></td> + </tr> +<? +} + +function AssureMethodLine($text,$methods,$remark) +{ + if (count($methods) != 1) + { +?> + <tr> + <td class="DataTD"><?=$text?></td> + <td class="DataTD"> + <select name="method"> +<? + foreach($methods as $val) { ?> + <option value="<?=$val?>"> <?=$val?></option> + +<? } ?> + </select> + </br><?=$remark?> + </td> + </tr> +<? + } else { +?> + <input type="hidden" name="<?=$val?>" value="<?=$methods[0]?>"> +<? + } +} + +function AssureInboxLine($type,$field,$value,$description) +{ +?> + <tr> + <td class="DataTD"><?=$field?>:</td> + <td class="DataTD"><input type="text" name="<?=$type?>" value="<?=$value?>"><?=$description?></td> + </tr> +<? +} + +function AssureFoot($oldid,$confirm) +{?> + <tr> + <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=$confirm?>"> <input type="submit" name="cancel" value="<?=_("Cancel")?>"></td> + </tr> + </table> + <input type="hidden" name="pagehash" value="<?=$_SESSION['_config']['wothash']?>"> + <input type="hidden" name="oldid" value="<?=$oldid?>"> +</form> +<? +} + diff --git a/locale/.gitignore b/locale/.gitignore index 94fd7c6..ac93223 100644 --- a/locale/.gitignore +++ b/locale/.gitignore @@ -1,5 +1,6 @@ # Language files are imported from translingo # => Ignore them -# Use make.php if you need new ones +# Use make if you need new ones *.po +*.pot *.mo diff --git a/locale/Makefile b/locale/Makefile new file mode 100644 index 0000000..1517066 --- /dev/null +++ b/locale/Makefile @@ -0,0 +1,183 @@ +# +# This Makefile will download the translations from our translation server (if +# they don't exist yet) and compile them. Try target help for more information +# + +################################################################################ +### Download ### +################################################################################ + +DOWNLOAD_SERVER := translations.cacert.org +PO_URL_TEMPLATE := http://$(DOWNLOAD_SERVER)/export/cacert/%/messages.po + +# Only use languages that have 10% or more of translated strings +AUTO_LANGS := \ +en \ +de \ +nl \ +pt_BR \ +fr \ +sv \ +it \ +es \ +hu \ +fi \ +ja \ +bg \ +pt \ +da \ +pl \ +zh_CN \ +ru \ +lv \ +cs \ +zh_TW \ +el \ +tr \ +ar \ + +LANGS := \ +ar \ +bg \ +cs \ +da \ +de \ +el \ +en \ +es \ +fa \ +fi \ +fr \ +he \ +hr \ +hu \ +id \ +is \ +it \ +ja \ +ka \ +ko \ +lv \ +nb \ +nl \ +pl \ +pt \ +pt_BR \ +ro \ +ru \ +sl \ +sv \ +th \ +tr \ +uk \ +zh_CN \ +zh_TW \ + + +PO_FILE_TEMPLATE := %/messages.po +MO_FILE_TEMPLATE := %/LC_MESSAGES/messages.mo + + +# target: all - Build locales downloading po files +.PHONY: all +all: $(AUTO_LANGS) + + +# target: help - Display callable targets +.PHONY: help +help: + @egrep "^# target:" [Mm]akefile + + +# target: clean - remove the build directories +RM := rm -rf +.PHONY: clean +clean: + -$(RM) $(LANGS:%=%/) + + +# target: <lang> - build this particular language +.PHONY: $(LANGS) +$(LANGS): %: $(MO_FILE_TEMPLATE) + + +$(LANGS:%=$(MO_FILE_TEMPLATE)): $(MO_FILE_TEMPLATE): $(PO_FILE_TEMPLATE) + mkdir -p $(@D) +#filter obsolete translations + grep --invert-match '^#~ ' $< | \ + msgfmt --check --output-file $@ - + + +.PHONY: $(LANGS:%=$(PO_FILE_TEMPLATE)) +$(LANGS:%=$(PO_FILE_TEMPLATE)): + mkdir -p $(@D) + wget --output-document - '$(@:$(PO_FILE_TEMPLATE)=$(PO_URL_TEMPLATE))' | \ + php -f escape_special_chars.php \ + > $@ + + + + +################################################################################ +### Upload ### +################################################################################ + +UPLOAD_SERVER := $(DOWNLOAD_SERVER) +SSH_USER := critical +SSH_OPTIONS := +SCP_OPTIONS := $(SSH_OPTIONS) + +FILE_OWNER := www-data + +POT_UPLOAD_PATH := /var/www/Pootle/po/cacert/templates/messages.pot +MANAGE_PY := /var/www/Pootle/manage.py + +VERSION := Production +DESCRITPION := LibreSSL - CAcert web application (localisation files) +COPYRIGHT_YEAR := 2004-$(shell date +\%Y) +PACKAGE := LibreSSL + +GETTEXT_FILE_PATTERN := \ +../CommModule/client.pl \ +../includes/*.php \ +../includes/*/*.php \ +../pages/*/*.php \ +../scripts/*.php \ +../www/*.php \ +../www/*/*.php \ +# ../tverify/*.php \ +# ../tverify/*/*.php \ + +GETTEXT_FILES := $(wildcard $(GETTEXT_FILE_PATTERN)) + +# target: template - create the gettext template file, if you want to upload it +# target: onto the translation server you can directly use the +# target: target "upload" +.PHONY: template +template: messages.pot + +# target: template.clean - remove anything that was created during the build of +# target: the template file +.PHONY: template.clean +template.clean: + -$(RM) messages.pot + + +# target: upload - upload the template to the translation server +.PHONY: upload +upload: messages.pot + scp $(SCP_OPTIONS) messages.pot $(SSH_USER)@$(UPLOAD_SERVER):$(POT_UPLOAD_PATH) + ssh $(SSH_OPTIONS) $(SSH_USER)@$(UPLOAD_SERVER) "sudo -u $(FILE_OWNER) pootle-update cacert" + +# target: upload.clean - remove anything that was created during the upload +.PHONY: upload.clean +upload.clean: template.clean + +messages.pot: $(GETTEXT_FILES) + xgettext --output - --sort-by-file --copyright-holder "CAcert Inc." \ + --package-name "CAcert" --package-version "$(VERSION)" \ + --msgid-bugs-address "translations-admin@cacert.org" $^ | \ + # replace place holders in the lines before the first msgid\ + sed '1,/^msgid/ { s/SOME DESCRIPTIVE TITLE/$(DESCRITPION)/; s/YEAR/$(COPYRIGHT_YEAR)/; s/PACKAGE/$(PACKAGE)/ }' \ + > $@ + diff --git a/locale/escape_special_chars.php b/locale/escape_special_chars.php new file mode 100644 index 0000000..32de390 --- /dev/null +++ b/locale/escape_special_chars.php @@ -0,0 +1,71 @@ +#!/usr/bin/php -q +<?php +/* +LibreSSL - CAcert web application +Copyright (C) 2004-2012 CAcert Inc. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; version 2 of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +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 +*/ + +/* Convert special characters in UTF-8 encoded PO files to HTML entities */ + +define('MSGSTR', 'msgstr'); +define('MSGSTR_LEN', strlen(MSGSTR)); +define('MSGID', 'msgid'); +define('MSGID_LEN', strlen(MSGID)); + +function is_msgstr($line) { + if (strlen($line) < MSGSTR_LEN) { + return false; + } + + return substr_compare($line, MSGSTR, 0, MSGSTR_LEN) === 0; +} + +function is_msgid($line) { + if (strlen($line) < MSGID_LEN) { + return false; + } + + return substr_compare($line, MSGID, 0, MSGID_LEN) === 0; +} + +// Skip the metadata (first msgid/msgstr pair) +while (!feof(STDIN)) { + $line = fgets(STDIN); + + echo $line; + + if (is_msgstr($line)) { + break; + } +} + +// determines if the current line belongs to a msgid or a msgstr +$msgstr = false; + +while (!feof(STDIN)) { + $line = fgets(STDIN); + + if (is_msgstr($line)) { + $msgstr = true; + } elseif (is_msgid($line)) { + $msgstr = false; + } + + if ($msgstr) { + $line = htmlentities($line, ENT_NOQUOTES, "UTF-8"); + } + echo $line; +} diff --git a/locale/make.php b/locale/make.php deleted file mode 100755 index 859d75e..0000000 --- a/locale/make.php +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/php -q -<? - $lang = array( "bg" => "bg_BG", "da" => "da_DK", "de" => "de_DE", "es" => "es_ES", - "fr" => "fr_FR", "fi" => "fi_FI", "he" => "he_IL", "hr" => "hr_HR", - "hu" => "hu_HU", "it" => "it_IT", "ja" => "ja_JP", "nl" => "nl_NL", - "pt" => "pt_PT", "ro" => "ro_RO", "ru" => "ru_RU", "fa" => "fa_IR", - "sv" => "sv_SE", "tr" => "tr_TR", "zh" => "zh_CN", "ar" => "ar_SY", - "el" => "el_GR", "tl" => "tl_PH", "pl" => "pl_PL", "cs" => "cs_CZ", - "ka" => "ka_GE", "is" => "is_IS", "ko" => "ko_KR", "nb" => "nb_NO"); - - if($argc > 1) - { - foreach($argv as $key) - { - $val = $lang[$key]; - if($val != "") - { - $do = `wget -O $key.po "http://translingo.cacert.org/export2.php?pid=1&editlanguage=$val" 2>&1`; -echo $do; - echo `mkdir -p $key/LC_MESSAGES/`; - $do = `msgfmt -o $key/LC_MESSAGES/messages.mo $key.po 2>&1`; -echo $do; - } - } - } else { - foreach($lang as $key => $val) - { - $do = `wget -O $key.po "http://translingo.cacert.org/export2.php?pid=1&editlanguage=$val" 2>&1`; -echo $do; - echo `mkdir -p $key/LC_MESSAGES/`; - $do = `msgfmt -o $key/LC_MESSAGES/messages.mo $key.po 2>&1`; -echo $do; - } - } -?> diff --git a/pages/account/12.php b/pages/account/12.php index 40135be..44926ca 100644 --- a/pages/account/12.php +++ b/pages/account/12.php @@ -19,12 +19,13 @@ <form method="post" action="account.php"> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> <tr> - <td colspan="5" class="title"><?=_("Domain Certificates")?> - <a href="account.php?id=12&viewall=<?=!$viewall?>"><?=_("View all certificates")?></a></td> + <td colspan="6" class="title"><?=_("Domain Certificates")?> - <a href="account.php?id=12&viewall=<?=!$viewall?>"><?=_("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> </tr> @@ -33,7 +34,7 @@ UNIX_TIMESTAMP(`domaincerts`.`expire`) - UNIX_TIMESTAMP() as `timeleft`, UNIX_TIMESTAMP(`domaincerts`.`expire`) as `expired`, `domaincerts`.`expire` as `expires`, `revoked` as `revoke`, - UNIX_TIMESTAMP(`revoked`) as `revoked`, `CN`, `domaincerts`.`id` as `id` + UNIX_TIMESTAMP(`revoked`) as `revoked`, `CN`, `domaincerts`.`serial`, `domaincerts`.`id` as `id` from `domaincerts`,`domains` where `memid`='".intval($_SESSION['profile']['id'])."' and `deleted`=0 and `domaincerts`.`domid`=`domains`.`id` "; if($viewall != 1) @@ -48,7 +49,7 @@ { ?> <tr> - <td colspan="5" class="DataTD"><?=_("No domains are currently listed.")?></td> + <td colspan="6" class="DataTD"><?=_("No domains are currently listed.")?></td> </tr> <? } else { while($row = mysql_fetch_assoc($res)) @@ -74,12 +75,13 @@ <? } ?> <td class="DataTD"><?=$verified?></td> <td class="DataTD"><a href="account.php?id=15&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> </tr> <? } ?> <tr> - <td class="DataTD" colspan="5"><input type="submit" name="renew" value="<?=_("Renew")?>">     + <td class="DataTD" colspan="6"><input type="submit" name="renew" value="<?=_("Renew")?>">     <input type="submit" name="revoke" value="<?=_("Revoke/Delete")?>"></td> </tr> <? } ?> diff --git a/pages/account/16.php b/pages/account/16.php index 3e582e3..514ecfd 100644 --- a/pages/account/16.php +++ b/pages/account/16.php @@ -57,7 +57,7 @@ </tr> <? } ?> <tr> - <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Another Email")?>"> + <td class="DataTD" colspan="2"><input type="submit" name="add_email" value="<?=_("Another Email")?>"> <input type="submit" name="process" value="<?=_("Next")?>"></td> </tr> </table> diff --git a/pages/account/18.php b/pages/account/18.php index 5ee1a3b..13dcc30 100644 --- a/pages/account/18.php +++ b/pages/account/18.php @@ -19,36 +19,38 @@ <form method="post" action="account.php"> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> <tr> - <td colspan="5" class="title"><?=_("Client Certificates")?> - <a href="account.php?id=18&viewall=<?=!$viewall?>"><?=_("View all certificates")?></a></td> + <td colspan="6" class="title"><?=_("Client Certificates")?> - <a href="account.php?id=18&viewall=<?=!$viewall?>"><?=_("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> <? - $query = "select UNIX_TIMESTAMP(`created`) as `created`, - UNIX_TIMESTAMP(`expire`) - UNIX_TIMESTAMP() as `timeleft`, - UNIX_TIMESTAMP(`expire`) as `expired`, - `expire` as `expires`, `revoked` as `revoke`, - UNIX_TIMESTAMP(`revoked`) as `revoked`, `CN`, `id` - from `orgemailcerts`, `org` - where `memid`='".intval($_SESSION['profile']['id'])."' and - `org`.`orgid`=`orgemailcerts`.`orgid` "; + $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`, + UNIX_TIMESTAMP(`oemail`.`revoked`) as `revoked`, + `oemail`.`CN`, `oemail`.`serial`, `oemail`.`id` + from `orgemailcerts` as `oemail`, `org` + where `org`.`memid`='".intval($_SESSION['profile']['id'])."' and + `org`.`orgid`=`oemail`.`orgid` "; if($viewall != 1) { - $query .= "AND `revoked`=0 AND `renewed`=0 "; + $query .= "AND `oemail`.`revoked`=0 AND `oemail`.`renewed`=0 "; $query .= "HAVING `timeleft` > 0 AND `revoked`=0 "; } - $query .= "ORDER BY `modified` desc"; + $query .= "ORDER BY `oemail`.`modified` desc"; $res = mysql_query($query); if(mysql_num_rows($res) <= 0) { ?> <tr> - <td colspan="5" class="DataTD"><?=_("No client certificates are currently listed.")?></td> + <td colspan="6" class="DataTD"><?=_("No client certificates are currently listed.")?></td> </tr> <? } else { while($row = mysql_fetch_assoc($res)) @@ -78,12 +80,13 @@ <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> </tr> <? } ?> <tr> - <td class="DataTD" colspan="5"><input type="submit" name="renew" value="<?=_("Renew")?>">     + <td class="DataTD" colspan="6"><input type="submit" name="renew" value="<?=_("Renew")?>">     <input type="submit" name="revoke" value="<?=_("Revoke/Delete")?>"></td> </tr> <? } ?> diff --git a/pages/account/22.php b/pages/account/22.php index 565cb5f..9df8200 100644 --- a/pages/account/22.php +++ b/pages/account/22.php @@ -19,12 +19,13 @@ <form method="post" action="account.php"> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> <tr> - <td colspan="5" class="title"><?=_("Domain Certificates")?> - <a href="account.php?id=22&viewall=<?=!$viewall?>"><?=_("View all certificates")?></a></td> + <td colspan="6" class="title"><?=_("Domain Certificates")?> - <a href="account.php?id=22&viewall=<?=!$viewall?>"><?=_("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> @@ -33,7 +34,9 @@ UNIX_TIMESTAMP(`orgdomaincerts`.`expire`) - UNIX_TIMESTAMP() as `timeleft`, UNIX_TIMESTAMP(`orgdomaincerts`.`expire`) as `expired`, `orgdomaincerts`.`expire` as `expires`, `revoked` as `revoke`, - UNIX_TIMESTAMP(`revoked`) as `revoked`, `CN`, `orgdomaincerts`.`id` as `id` + UNIX_TIMESTAMP(`revoked`) as `revoked`, `CN`, + `orgdomaincerts`.`serial`, + `orgdomaincerts`.`id` as `id` from `orgdomaincerts`,`org` where `org`.`memid`='".intval($_SESSION['profile']['id'])."' and `orgdomaincerts`.`orgid`=`org`.`orgid` "; if($viewall != 1) @@ -48,7 +51,7 @@ { ?> <tr> - <td colspan="5" class="DataTD"><?=_("No domains are currently listed.")?></td> + <td colspan="6" class="DataTD"><?=_("No domains are currently listed.")?></td> </tr> <? } else { while($row = mysql_fetch_assoc($res)) @@ -74,12 +77,13 @@ <? } ?> <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> </tr> <? } ?> <tr> - <td class="DataTD" colspan="5"><input type="submit" name="renew" value="<?=_("Renew")?>">     + <td class="DataTD" colspan="6"><input type="submit" name="renew" value="<?=_("Renew")?>">     <input type="submit" name="revoke" value="<?=_("Revoke/Delete")?>"></td> </tr> <? } ?> diff --git a/pages/account/24.php b/pages/account/24.php index 19faa9f..7f56023 100644 --- a/pages/account/24.php +++ b/pages/account/24.php @@ -15,6 +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 */ ?> +<? + // 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'] = ""; + if (array_key_exists('ST',$_SESSION['_config'])) $_SESSION['_config']['ST'] = ""; + if (array_key_exists('C',$_SESSION['_config'])) $_SESSION['_config']['C'] = ""; + if (array_key_exists('comments',$_SESSION['_config'])) $_SESSION['_config']['comments'] = ""; + +?> <form method="post" action="account.php"> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> <tr> @@ -22,27 +32,27 @@ </tr> <tr> <td class="DataTD"><?=_("Organisation Name")?>:</td> - <td class="DataTD"><input type="text" name="O" value="<?=array_key_exists('O',$_SESSION['_config'])?$_SESSION['_config']['O']:""?>" maxlength="50"></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"><input type="text" name="contact" value="<?=array_key_exists('contact',$_SESSION['_config'])?$_SESSION['_config']['contact']:""?>"></td> + <td class="DataTD"><input type="text" name="contact" value="" size="90"></td> </tr> <tr> <td class="DataTD"><?=_("Town/Suburb")?>:</td> - <td class="DataTD"><input type="text" name="L" value="<?=array_key_exists('L',$_SESSION['_config'])?$_SESSION['_config']['L']:""?>"></td> + <td class="DataTD"><input type="text" name="L" value="" size="90"></td> </tr> <tr> <td class="DataTD"><?=_("State/Province")?>:</td> - <td class="DataTD"><input type="text" name="ST" value="<?=array_key_exists('ST',$_SESSION['_config'])?$_SESSION['_config']['ST']:""?>"></td> + <td class="DataTD"><input type="text" name="ST" value="" size="90"></td> </tr> <tr> <td class="DataTD"><?=_("Country")?>:</td> - <td class="DataTD"><input type="text" name="C" value="<?=array_key_exists('C',$_SESSION['_config'])?sanitizeHTML($_SESSION['_config']['C']):""?>" size="5">(2 letter <a href="http://www.iso.org/iso/english_country_names_and_code_elements">ISO code</a>)</td> + <td class="DataTD"><input type="text" name="C" value="" size="5">(2 letter <a href="http://www.iso.org/iso/english_country_names_and_code_elements">ISO code</a>)</td> </tr> <tr> <td class="DataTD"><?=_("Comments")?>:</td> - <td class="DataTD"><textarea name="comments" cols="35" rows="5"><?=array_key_exists('comments',$_SESSION['_config'])?$_SESSION['_config']['comments']:""?></textarea></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> diff --git a/pages/account/25.php b/pages/account/25.php index ab0e6b2..a70f608 100644 --- a/pages/account/25.php +++ b/pages/account/25.php @@ -19,6 +19,15 @@ <tr> <td colspan="5" class="title"><?=_("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&ord=1"><?=_("Country")?></a> - + <a href="account.php?id=25&ord=2"><?=_("Name")?></a> + </td> +</tr> + <tr> <td class="DataTD" width="350"><?=_("Organisation")?></td> <td class="DataTD"><?=_("Domains")?></td> @@ -27,7 +36,24 @@ <td class="DataTD"><?=_("Delete")?></td> </tr> <? - $query = "select * from `orginfo` ORDER BY `id`"; + $order = 0; + if (array_key_exists('ord',$_REQUEST)) { + $order = intval($_REQUEST['ord']); + } + + $order_by = "`id`"; + switch ($order) { + case 1: + $order_by = "`C`,`O`"; + break; + case 2: + $order_by = "`O`"; + break; + // the 0 and default case are handled by the preset + } + + // 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)) { diff --git a/pages/account/27.php b/pages/account/27.php index 2cd52a8..9524620 100644 --- a/pages/account/27.php +++ b/pages/account/27.php @@ -25,27 +25,27 @@ </tr> <tr> <td class="DataTD"><?=_("Organisation Name")?>:</td> - <td class="DataTD"><input type="text" name="O" value="<?=$row['O']?>"></td> + <td class="DataTD"><input type="text" name="O" value="<?=$row['O']?>" size="90"></td> </tr> <tr> <td class="DataTD"><?=_("Contact Email")?>:</td> - <td class="DataTD"><input type="text" name="contact" value="<?=($row['contact'])?>"></td> + <td class="DataTD"><input type="text" name="contact" value="<?=($row['contact'])?>" size="90"></td> </tr> <tr> <td class="DataTD"><?=_("Town/Suburb")?>:</td> - <td class="DataTD"><input type="text" name="L" value="<?=($row['L'])?>"></td> + <td class="DataTD"><input type="text" name="L" value="<?=($row['L'])?>" size="90"></td> </tr> <tr> <td class="DataTD"><?=_("State/Province")?>:</td> - <td class="DataTD"><input type="text" name="ST" value="<?=($row['ST'])?>"></td> + <td class="DataTD"><input type="text" name="ST" value="<?=($row['ST'])?>" size="90"></td> </tr> <tr> <td class="DataTD"><?=_("Country")?>:</td> - <td class="DataTD"><input type="text" name="C" value="<?=($row['C'])?>"></td> + <td class="DataTD"><input type="text" name="C" value="<?=($row['C'])?>" size="5"> (2 letter <a href="http://www.iso.org/iso/english_country_names_and_code_elements">ISO code</a>)</td> </tr> <tr> <td class="DataTD"><?=_("Comments")?>:</td> - <td class="DataTD"><textarea name="comments" cols=15 rows=5><?=($row['comments'])?></textarea></td> + <td class="DataTD"><textarea name="comments" cols=60 rows=10><?=($row['comments'])?></textarea></td> </tr> <tr> <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Update")?>"></td> diff --git a/pages/account/30.php b/pages/account/30.php index 0c7d337..04ad229 100644 --- a/pages/account/30.php +++ b/pages/account/30.php @@ -34,7 +34,7 @@ <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> </tr> <tr> - <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Cancel")?>"> + <td class="DataTD" colspan="2"><input type="submit" name="cancel" value="<?=_("Cancel")?>"> <input type="submit" name="process" value="<?=_("Delete")?>"></td> </tr> </table> diff --git a/pages/account/31.php b/pages/account/31.php index d91a77a..9f3d27e 100644 --- a/pages/account/31.php +++ b/pages/account/31.php @@ -29,7 +29,7 @@ <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> </tr> <tr> - <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Cancel")?>"> + <td class="DataTD" colspan="2"><input type="submit" name="cancel" value="<?=_("Cancel")?>"> <input type="submit" name="process" value="<?=_("Delete")?>"></td> </tr> </table> diff --git a/pages/account/32.php b/pages/account/32.php index 00dc1ea..a05c927 100644 --- a/pages/account/32.php +++ b/pages/account/32.php @@ -38,10 +38,10 @@ $user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".intval($row['memid'])."'")); ?> <tr> - <td class="DataTD"><a href='mailto:<?=$user['email']?>'><?=($user['fname'])?> <?=($user['lname'])?></a></td> + <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"><?=($row['OU'])?></a></td> - <td class="DataTD"><?=($row['comments'])?></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&orgid=<?=$row['orgid']?>&memid=<?=$row['memid']?>"><?=_("Delete")?></a></td> <? } else { ?> diff --git a/pages/account/33.php b/pages/account/33.php index 4da8bed..376a8b9 100644 --- a/pages/account/33.php +++ b/pages/account/33.php @@ -18,6 +18,13 @@ <? $query = "select * from `orginfo` where `id`='".intval($_REQUEST['orgid'])."'"; $row = mysql_fetch_assoc(mysql_query($query)); + + // Reset session variables regarding OrgAdmin's, present empty form + if (array_key_exists('email',$_SESSION['_config'])) $_SESSION['_config']['email']=""; + if (array_key_exists('OU',$_SESSION['_config'])) $_SESSION['_config']['OU'] = ""; + if (array_key_exists('masteracc',$_SESSION['_config'])) $_SESSION['_config']['masteracc'] = 0; + if (array_key_exists('comments',$_SESSION['_config'])) $_SESSION['_config']['comments'] = ""; + ?> <form method="post" action="account.php"> <input type="hidden" name="orgid" value="<?=intval($_REQUEST['orgid'])?>"> @@ -27,24 +34,24 @@ </tr> <tr> <td class="DataTD"><?=_("Email")?>:</td> - <td class="DataTD"><input type="text" name="email" value="<?=array_key_exists('email',$_SESSION['_config'])?sanitizeHTML($_SESSION['_config']['email']):""?>"></td> + <td class="DataTD"><input type="text" name="email" value=""></td> </tr> <tr> <td class="DataTD"><?=_("Department")?>:</td> - <td class="DataTD"><input type="text" name="OU" value="<?=array_key_exists('OU',$_SESSION['_config'])?$_SESSION['_config']['OU']:""?>"></td> + <td class="DataTD"><input type="text" name="OU" value=""></td> </tr> <? if($_SESSION['profile']['orgadmin'] == 1) { ?> <tr> <td class="DataTD"><?=_("Master Account")?>:</td> <td class="DataTD"><select name="masteracc"> - <option value="0">No</option> - <option value="1"<? if(array_key_exists('masteracc',$_SESSION['_config']) && $_SESSION['_config']['masteracc'] == 1) echo " selected='selected'"; ?>>Yes</option> + <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> <? } ?> <tr> <td class="DataTD"><?=_("Comments")?>:</td> - <td class="DataTD"><input type="text" name="comments" value="<?=array_key_exists('comments',$_SESSION['_config'])?$_SESSION['_config']['comments']:""?>"></td> + <td class="DataTD"><input type="text" name="comments" size=27 maxlength=20 value=""></td> </tr> <tr> <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Add")?>"></td> diff --git a/pages/account/34.php b/pages/account/34.php index 25ad1db..b11bc7d 100644 --- a/pages/account/34.php +++ b/pages/account/34.php @@ -35,7 +35,7 @@ <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> </tr> <tr> - <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Cancel")?>"> + <td class="DataTD" colspan="2"><input type="submit" name="cancel" value="<?=_("Cancel")?>"> <input type="submit" name="process" value="<?=_("Delete")?>"></td> </tr> </table> diff --git a/pages/account/37.php b/pages/account/37.php index 4b021e0..48c737a 100755..100644 --- a/pages/account/37.php +++ b/pages/account/37.php @@ -15,17 +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><?=_("About CAcert.org")?></H3> - -<p><?=_("CAcert.org is a community driven, Certificate Authority that issues certificates to the public at large for free.")?></p> - -<p><? printf(_("CAcert's goal is to promote awareness and education on computer security through the use of encryption, specifically with the X.509 family of standards. We have compiled a %sdocument base%s that has helpful hints and tips on setting up encryption with common software, and general information about Public Key Infrastructures (PKI)."), "<a href='http://wiki.cacert.org/'>", "</a>"); ?></p> - -<p><?=_("For the enthusiast looking to dip their toe in the water, we have an easy way of obtaining certificates you can use with your email program. You can use these not only to encrypt, but to prove to your friends and family that your email really does come from you.")?></p> - -<p><?=_("For administrators looking to protect the services they offer, we provide host and wild card certificates which you can issue almost immediately. Not only can you use these to protect websites, but also POP3, SMTP and IMAP connections, to list but a few. Unlike other certificate authorities, we don't limit the strength of the certificates, or the use of wild card certificates. Everyone should have the right to security and to protect their privacy, not just those looking to run ecommerce sites.")?></p> - -<p><?=_("If you're extremely serious about encryption, you can join CAcert's Assurance Programme and Web of Trust. This allows you to have your identity verified to obtain added benefits, including longer length certificates and the ability to include your name on email certificates."); ?></p> - -<p><?=_("CAcert Inc. is a non-profit association, incorporated in New South Wales Australia.")?></p> -<p><?=_("More information about CAcert Incorporated:")?><a href="http://wiki.cacert.org/wiki/CAcertIncorporated">http://wiki.cacert.org/wiki/CAcertIncorporated</a></p> +<p style="background-color: #FF8080; font-size: 150%"> +<? +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>'); +?> +</p> diff --git a/pages/account/38.php b/pages/account/38.php index 34cbea4..7caddb0 100755..100644 --- a/pages/account/38.php +++ b/pages/account/38.php @@ -14,27 +14,6 @@ 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 -*/ ?> -<H3><?=_("Donations")?></H3><br> +*/ -<h4><?=_("If I'd like to donate to CAcert Inc., how can I do it?")?></h4> - -<p><?=_("CAcert Inc. is a non-profit association which is legally able to accept donations. CAcert adheres to strict guidelines about how this money can to be used. If you'd like to make a donation, you can do so via")?> - -<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="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> - -<pre> -Account Name: CAcert Inc -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><?=_("Thank you very much for your support, your donations help CAcert to continue to operate.")?></p> +require_once(dirname(__FILE__)."/../index/13.php"); diff --git a/pages/account/40.php b/pages/account/40.php index 1b76f9c..fa0c52f 100755..100644 --- a/pages/account/40.php +++ b/pages/account/40.php @@ -19,11 +19,20 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s ?> <H3><?=_("Contact Us")?></H3> +<p><? printf(_("To contact us please log out and then use the contact form ". + "there or send us an email to %s. We are working to fix this ". + "situation so you may contact us while staying logged in again."), + + "<a href='mailto:support@cacert.org'>support@cacert.org</a>" + ) ?> +</p> + +<?/* <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="http://www.CAcert.org/help.php"><?=_("Go here for more details.")?></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> @@ -65,7 +74,12 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s </form> <p><b><?=_("Security Issues")?></b></p> -<p><?=_("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 <a href='https://bugs.cacert.org/'>bugs.cacert.org</a> and mark it as private.")?></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 %s. You can file a bugreport on %s and mark it as ". + "private."), + "<a href='mailto:support@cacert.org'>support@cacert.org</a>", + "<a href='https://bugs.cacert.org/'>bugs.cacert.org</a>")?></p> <p><b><?=_("Snail Mail")?></b></p> <p><?=_("Alternatively you can get in contact with us via the following methods:")?></p> @@ -84,3 +98,4 @@ Australia</p> document.form2.secrethash2.value = pagehash; --> </script> +*/ diff --git a/pages/account/41.php b/pages/account/41.php index e44eec9..d2cfc8c 100644 --- a/pages/account/41.php +++ b/pages/account/41.php @@ -14,7 +14,11 @@ 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 -*/ ?> +*/ + +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> @@ -24,11 +28,10 @@ <td class="DataTD"><?=_("My prefered language")?>:</td> <td class="DataTD"><select name="lang"> <? -echo $_SESSION['_config']['language']; - foreach($_SESSION['_config']['translations'] as $key => $val) + foreach(L10n::$translations as $key => $val) { echo "<option value='$key'"; - if($key == $_SESSION['_config']['language']) + if($key == L10n::get_translation()) echo " selected"; echo ">$val</option>\n"; } diff --git a/pages/account/43.php b/pages/account/43.php index a286ec6..7bf6d04 100644 --- a/pages/account/43.php +++ b/pages/account/43.php @@ -16,15 +16,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> <? +include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php"); + + if(array_key_exists('assurance',$_REQUEST) && $_REQUEST['assurance'] > 0) { $assurance = mysql_escape_string(intval($_REQUEST['assurance'])); $row = 0; $res = mysql_query("select `to` from `notary` where `id`='$assurance'"); - if ($res) { + if ($res) { $row = mysql_fetch_assoc($res); } - mysql_query("delete from `notary` where `id`='$assurance'"); + mysql_query("delete from `notary` where `id`='$assurance'"); if ($row) { fix_assurer_flag($row['to']); } @@ -38,14 +41,26 @@ //if(!strstr($email, "%")) // $emailsearch = "%$email%"; - if(intval($email) > 0) - $emailsearch = ""; - - $query = "select `users`.`id` as `id`, `email`.`email` as `email` from `users`,`email` - where `users`.`id`=`email`.`memid` and - (`email`.`email` like '$emailsearch' or `email`.`id`='$email' or `users`.`id`='$email') and - `email`.`hash`='' and `email`.`deleted`=0 and `users`.`deleted`=0 - group by `users`.`id` limit 100"; + // bug-975 ted+uli changes --- begin + if(preg_match("/^[0-9]+$/", $email)) { + // $email consists of digits only ==> search for IDs + // Be defensive here (outer join) if primary mail is not listed in email table + $query = "select `users`.`id` as `id`, `email`.`email` as `email` + from `users` left outer join `email` on (`users`.`id`=`email`.`memid`) + where (`email`.`id`='$email' or `users`.`id`='$email') + and `users`.`deleted`=0 + group by `users`.`id` limit 100"; + } else { + // $email contains non-digits ==> search for mail addresses + // Be defensive here (outer join) if primary mail is not listed in email table + $query = "select `users`.`id` as `id`, `email`.`email` as `email` + from `users` left outer join `email` on (`users`.`id`=`email`.`memid`) + where (`email`.`email` like '$emailsearch' + or `users`.`email` like '$emailsearch') + and `users`.`deleted`=0 + group by `users`.`id` limit 100"; + } + // bug-975 ted+uli changes --- end $res = mysql_query($query); if(mysql_num_rows($res) > 1) { ?> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> @@ -138,7 +153,7 @@ { echo "<option"; if($day == $i) - echo " selected='selected'"; + echo " selected='selected'"; echo ">$i</option>"; } ?> @@ -178,7 +193,7 @@ <td class="DataTD"><a href="account.php?id=43&codesign=<?=$row['id']?>&csrf=<?=make_csrf('admcodesign')?>"><?=$row['codesign']?></a></td> </tr> <tr> - <td class="DataTD"><?=_("Org Admin")?>:</td> + <td class="DataTD"><?=_("Org Assurer")?>:</td> <td class="DataTD"><a href="account.php?id=43&orgadmin=<?=$row['id']?>&csrf=<?=make_csrf('admorgadmin')?>"><?=$row['orgadmin']?></a></td> </tr> <tr> @@ -317,16 +332,476 @@ </table> <br> <? } ?> +<? // 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> + </tr> -<? - if(array_key_exists('assuredto',$_GET) && $_GET['assuredto'] == "yes") { +<? + // --- bug-975 begin --- + // potential db inconsistency like in a20110804.1 + // Admin console -> don't list user account + // User login -> impossible + // Assurer, assure someone -> user displayed + /* regular user account search with regular settings + + --- Admin Console find user query + $query = "select `users`.`id` as `id`, `email`.`email` as `email` from `users`,`email` + where `users`.`id`=`email`.`memid` and + (`email`.`email` like '$emailsearch' or `email`.`id`='$email' or `users`.`id`='$email') and + `email`.`hash`='' and `email`.`deleted`=0 and `users`.`deleted`=0 + group by `users`.`id` limit 100"; + => requirements + 1. email.hash = '' + 2. email.deleted = 0 + 3. users.deleted = 0 + 4. email.email = primary-email (???) or'd + not covered by admin console find user routine, but may block users login + 5. users.verified = 0|1 + further "special settings" + 6. users.locked (setting displayed in display form) + 7. users.assurer_blocked (setting displayed in display form) + + --- User login user query + select * from `users` where `email`='$email' and (`password`=old_password('$pword') or `password`=sha1('$pword') or + `password`=password('$pword')) and `verified`=1 and `deleted`=0 and `locked`=0 + => requirements + 1. users.verified = 1 + 2. users.deleted = 0 + 3. users.locked = 0 + 4. users.email = primary-email + + --- Assurer, assure someone find user query + select * from `users` where `email`='".mysql_escape_string(stripslashes($_POST['email']))."' + and `deleted`=0 + => requirements + 1. users.deleted = 0 + 2. users.email = primary-email + Admin User Assurer + bit Console Login assure someone + + 1. email.hash = '' Yes No No + 2. email.deleted = 0 Yes No No + 3. users.deleted = 0 Yes Yes Yes + 4. users.verified = 1 No Yes No + 5. users.locked = 0 No Yes No + 6. users.email = prim-email No Yes Yes + 7. email.email = prim-email Yes No No + + full usable account needs all 7 requirements fulfilled + so if one setting isn't set/cleared there is an inconsistency either way + if eg email.email is not avail, admin console cannot open user info + but user can login and assurer can display user info + if user verified is not set to 1, admin console displays user record + but user cannot login, but assurer can search for the user and the data displays + + consistency check: + 1. search primary-email in users.email + 2. search primary-email in email.email + 3. userid = email.memid + 4. check settings from table 1. - 5. + + */ + + $inconsistency = 0; + $inconsistencydisp = ""; + $inccause = ""; + // 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); + $uemail = $drow['uemail']; + $udeleted = $drow['udeleted']; + $uverified = $drow['verified']; + $ulocked = $drow['locked']; + + $query = "select `hash`, `email` as `eemail` from `email` + where `memid`='".intval($row['id'])."' and + `email` ='".$uemail."' and + `deleted` = 0"; + $dres = mysql_query($query); + if ($drow = mysql_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); + } + + if ($drow) { + $eemail = $drow['eemail']; + $edeleted = $drow['edeleted']; + $ehash = $drow['hash']; + if ($udeleted!=0) { + $inconsistency += 1; + $inccause .= (empty($inccause)?"":"<br>")._("Users record set to deleted"); + } + if ($uverified!=1) { + $inconsistency += 2; + $inccause .= (empty($inccause)?"":"<br>")._("Users record verified not set"); + } + if ($ulocked!=0) { + $inconsistency += 4; + $inccause .= (empty($inccause)?"":"<br>")._("Users record locked set"); + } + if ($edeleted!=0) { + $inconsistency += 8; + $inccause .= (empty($inccause)?"":"<br>")._("Email record set deleted"); + } + if ($ehash!='') { + $inconsistency += 16; + $inccause .= (empty($inccause)?"":"<br>")._("Email record hash not unset"); + } + } else { + $inconsistency = 32; + $inccause = _("Prim. email, Email record doesn't exist"); + } + if ($inconsistency>0) { + // $inconsistencydisp = _("Yes"); +?> + <tr> + <td class="DataTD"><?=_("Account inconsistency")?>:</td> + <td class="DataTD"><?=$inccause?><br>code: <?=$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.")?> + </td> + </tr> +<? } + + // --- bug-975 end --- +?> +</table> +<br> +<? + // End - Debug infos ?> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td colspan="6" class="title"><?=_("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> + </tr> + + <tr> + <td class="DataTD"><?=_("Server")?>:</td> + <? + $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); + $total = $drow['total']; + + $maxexpire = "0000-00-00 00:00:00"; + if ($drow['maxexpire']) { + $maxexpire = $drow['maxexpire']; + } + + if($total > 0) { + $query = "select COUNT(*) as `valid` + from `domains` inner join `domaincerts` + on `domains`.`id` = `domaincerts`.`domid` + where `domains`.`memid` = '".intval($row['id'])."' + and `revoked` = '0000-00-00 00:00:00' + and `expire` > NOW()"; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $valid = $drow['valid']; + + $query = "select COUNT(*) as `expired` + from `domains` inner join `domaincerts` + on `domains`.`id` = `domaincerts`.`domid` + where `domains`.`memid` = '".intval($row['id'])."' + and `expire` <= NOW()"; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $expired = $drow['expired']; + + $query = "select COUNT(*) as `revoked` + from `domains` inner join `domaincerts` + on `domains`.`id` = `domaincerts`.`domid` + where `domains`.`memid` = '".intval($row['id'])."' + and `revoked` != '0000-00-00 00:00:00'"; + $dres = mysql_query($query); + $drow = mysql_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 colspan="5" class="DataTD"><?=_("None")?></td> + <? + } ?> + </tr> + + <tr> + <td class="DataTD"><?=_("Client")?>:</td> + <? + $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); + $total = $drow['total']; + + $maxexpire = "0000-00-00 00:00:00"; + if ($drow['maxexpire']) { + $maxexpire = $drow['maxexpire']; + } + + if($total > 0) { + $query = "select COUNT(*) as `valid` + from `emailcerts` + where `memid` = '".intval($row['id'])."' + and `revoked` = '0000-00-00 00:00:00' + and `expire` > NOW()"; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $valid = $drow['valid']; + + $query = "select COUNT(*) as `expired` + from `emailcerts` + where `memid` = '".intval($row['id'])."' + and `expire` <= NOW()"; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $expired = $drow['expired']; + + $query = "select COUNT(*) as `revoked` + from `emailcerts` + where `memid` = '".intval($row['id'])."' + and `revoked` != '0000-00-00 00:00:00'"; + $dres = mysql_query($query); + $drow = mysql_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 colspan="5" class="DataTD"><?=_("None")?></td> + <? + } ?> + </tr> + + <tr> + <td class="DataTD"><?=_("GPG")?>:</td> + <? + $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); + $total = $drow['total']; + + $maxexpire = "0000-00-00 00:00:00"; + if ($drow['maxexpire']) { + $maxexpire = $drow['maxexpire']; + } + + if($total > 0) { + $query = "select COUNT(*) as `valid` + from `gpg` + where `memid` = '".intval($row['id'])."' + and `expire` > NOW()"; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $valid = $drow['valid']; + + $query = "select COUNT(*) as `expired` + from `emailcerts` + where `memid` = '".intval($row['id'])."' + and `expire` <= NOW()"; + $dres = mysql_query($query); + $drow = mysql_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"></td> + <td class="DataTD"><?=($maxexpire != "0000-00-00 00:00:00")? + substr($maxexpire, 0, 10) : _("Pending")?></td> + <? + } else { // $total > 0 + ?> + <td colspan="5" class="DataTD"><?=_("None")?></td> + <? + } ?> + </tr> + + <tr> + <td class="DataTD"><?=_("Org Server")?>:</td> + <? + $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); + $total = $drow['total']; + + $maxexpire = "0000-00-00 00:00:00"; + if ($drow['maxexpire']) { + $maxexpire = $drow['maxexpire']; + } + + if($total > 0) { + $query = "select COUNT(*) as `valid` + from `orgdomaincerts` as `orgcerts` inner join `org` + on `orgcerts`.`orgid` = `org`.`orgid` + where `org`.`memid` = '".intval($row['id'])."' + and `orgcerts`.`revoked` = '0000-00-00 00:00:00' + and `orgcerts`.`expire` > NOW()"; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $valid = $drow['valid']; + + $query = "select COUNT(*) as `expired` + from `orgdomaincerts` as `orgcerts` inner join `org` + on `orgcerts`.`orgid` = `org`.`orgid` + where `org`.`memid` = '".intval($row['id'])."' + and `orgcerts`.`expire` <= NOW()"; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $expired = $drow['expired']; + + $query = "select COUNT(*) as `revoked` + from `orgdomaincerts` as `orgcerts` inner join `org` + on `orgcerts`.`orgid` = `org`.`orgid` + where `org`.`memid` = '".intval($row['id'])."' + and `orgcerts`.`revoked` != '0000-00-00 00:00:00'"; + $dres = mysql_query($query); + $drow = mysql_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 colspan="5" class="DataTD"><?=_("None")?></td> + <? + } ?> + </tr> + + <tr> + <td class="DataTD"><?=_("Org Client")?>:</td> + <? + $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); + $total = $drow['total']; + + $maxexpire = "0000-00-00 00:00:00"; + if ($drow['maxexpire']) { + $maxexpire = $drow['maxexpire']; + } + + if($total > 0) { + $query = "select COUNT(*) as `valid` + from `orgemailcerts` as `orgcerts` inner join `org` + on `orgcerts`.`orgid` = `org`.`orgid` + where `org`.`memid` = '".intval($row['id'])."' + and `orgcerts`.`revoked` = '0000-00-00 00:00:00' + and `orgcerts`.`expire` > NOW()"; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $valid = $drow['valid']; + + $query = "select COUNT(*) as `expired` + from `orgemailcerts` as `orgcerts` inner join `org` + on `orgcerts`.`orgid` = `org`.`orgid` + where `org`.`memid` = '".intval($row['id'])."' + and `orgcerts`.`expire` <= NOW()"; + $dres = mysql_query($query); + $drow = mysql_fetch_assoc($dres); + $expired = $drow['expired']; + + $query = "select COUNT(*) as `revoked` + from `orgemailcerts` as `orgcerts` inner join `org` + on `orgcerts`.`orgid` = `org`.`orgid` + where `org`.`memid` = '".intval($row['id'])."' + and `orgcerts`.`revoked` != '0000-00-00 00:00:00'"; + $dres = mysql_query($query); + $drow = mysql_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 colspan="5" class="DataTD"><?=_("None")?></td> + <? + } ?> + </tr> +</table> +<br> + +<a href="account.php?id=43&userid=<?=$row['id']?>&shownotary=assuredto"><?=_("Show Assurances the user got")?></a> + (<a href="account.php?id=43&userid=<?=$row['id']?>&shownotary=assuredto15"><?=_("New calculation")?></a>) +<br /> +<a href="account.php?id=43&userid=<?=$row['id']?>&shownotary=assuredby"><?=_("Show Assurances the user gave")?></a> + (<a href="account.php?id=43&userid=<?=$row['id']?>&shownotary=assuredby15"><?=_("New calculation")?></a>) +<br /> + +<? +// if(array_key_exists('assuredto',$_GET) && $_GET['assuredto'] == "yes") { + +function showassuredto() +{ +?> +<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> <tr> - <td colspan="7" class="title"><?=_("Assurance Points")?></td> + <td colspan="8" class="title"><?=_("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> @@ -336,7 +811,7 @@ <td class="DataTD"><b><?=_("Revoke")?></b></td> </tr> <? - $query = "select * from `notary` where `to`='".intval($row['id'])."'"; + $query = "select * from `notary` where `to`='".intval($_GET['userid'])."'"; $dres = mysql_query($query); $points = 0; while($drow = mysql_fetch_assoc($dres)) @@ -345,9 +820,10 @@ $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&userid=<?=intval($drow['from'])?>"><?=sanitizeHTML($fromuser['fname'])." ".sanitizeHTML($fromuser['lname'])?></td> - <td class="DataTD"><a href="account.php?id=43&userid=<?=intval($drow['to'])?>"><?=sanitizeHTML($fromuser['email'])?></a></td> + <td class="DataTD"><a href="account.php?id=43&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> @@ -360,20 +836,18 @@ <td class="DataTD" colspan="3"> </td> </tr> </table> -<? } else { ?> - <tr> - <td class="DataTD" colspan="2"><a href="account.php?id=43&userid=<?=$row['id']?>&assuredto=yes"><?=_("Show Assurances the user got")?></a></td> - </tr> <? } ?> -<br> + <? - if(array_key_exists('assuredby',$_GET) && $_GET['assuredby'] == "yes") { +function showassuredby() +{ ?> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> <tr> - <td colspan="7" class="title"><?=_("Assurance Points The User Issued")?></td> + <td colspan="8" class="title"><?=_("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> @@ -383,7 +857,7 @@ <td class="DataTD"><b><?=_("Revoke")?></b></td> </tr> <? - $query = "select * from `notary` where `from`='".$row['id']."' and `to`!='".$row['id']."'"; + $query = "select * from `notary` where `from`='".intval($_GET['userid'])."'"; $dres = mysql_query($query); $points = 0; while($drow = mysql_fetch_assoc($dres)) @@ -392,6 +866,7 @@ $points += $drow['points']; ?> <tr> + <td class="DataTD"><?=$drow['id']?></td> <td class="DataTD"><?=$drow['date']?></td> <td class="DataTD"><a href="wot.php?id=9&userid=<?=$drow['to']?>"><?=$fromuser['fname']." ".$fromuser['lname']?></td> <td class="DataTD"><a href="account.php?id=43&userid=<?=intval($drow['to'])?>"><?=sanitizeHTML($fromuser['email'])?></a></td> @@ -407,11 +882,21 @@ <td class="DataTD" colspan="3"> </td> </tr> </table> -<? } else { ?> - <tr> - <td class="DataTD" colspan="2"><a href="account.php?id=43&userid=<?=$row['id']?>&assuredby=yes"><?=_("Show Assurances the user gave")?></a></td> - </tr> <? } ?> <br><br> -<? } } ?> +<? } } +switch ($_GET['shownotary']) + { + case 'assuredto': showassuredto(); + break; + case 'assuredby': showassuredby(); + break; + case 'assuredto15': output_received_assurances(intval($_GET['userid']),1); + break; + case 'assuredby15': output_given_assurances(intval($_GET['userid']),1); + break; + } + + +?> diff --git a/pages/account/5.php b/pages/account/5.php index ee500c0..5c131ba 100644 --- a/pages/account/5.php +++ b/pages/account/5.php @@ -19,12 +19,13 @@ <form method="post" action="account.php"> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> <tr> - <td colspan="6" class="title"><?=_("Client Certificates")?> - <a href="account.php?id=5&viewall=<?=!$viewall?>"><?=_("View all certificates")?></a></td> + <td colspan="7" class="title"><?=_("Client Certificates")?> - <a href="account.php?id=5&viewall=<?=!$viewall?>"><?=_("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> @@ -38,6 +39,7 @@ UNIX_TIMESTAMP(`emailcerts`.`revoked`) as `revoked`, `emailcerts`.`id`, `emailcerts`.`CN`, + `emailcerts`.`serial`, emailcerts.disablelogin as `disablelogin` from `emailcerts` where `emailcerts`.`memid`='".$_SESSION['profile']['id']."' @@ -54,7 +56,7 @@ { ?> <tr> - <td colspan="5" class="DataTD"><?=_("No client certificates are currently listed.")?></td> + <td colspan="7" class="DataTD"><?=_("No client certificates are currently listed.")?></td> </tr> <? } else { while($row = mysql_fetch_assoc($res)) @@ -84,6 +86,7 @@ <td class="DataTD"><?=$verified?></td> <td class="DataTD"><?=(trim($row['CN'])=="" ? _("empty") : $row['CN'])?></td> <? } ?> + <td class="DataTD"><?=$row['serial']?></td> <td class="DataTD"><?=$row['revoke']?></td> <td class="DataTD"><?=$row['expires']?></td> <td class="DataTD"> diff --git a/pages/help/0.php b/pages/help/0.php index 83f97bd..7aa9d3b 100644 --- a/pages/help/0.php +++ b/pages/help/0.php @@ -15,15 +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><?=_("Help!")?></h3> -<p><?=_("Following are several tips you may find useful.")?></p> - -<ul> -<li><a href='help.php?id=3'><?=_("Generating a new key pair and CSR for IIS 5.0")?></a></li> -<li><a href='help.php?id=4'><?=_("How do I generate a private key and CSR using OpenSSL?")?></a></li> -<li><a href='logos.php'><?=_("How do I get a secured by CAcert emblem on my site?")?></a></li> -<li><a href='help.php?id=6'><?=_("How do I get a server certificate from CAcert?")?></a></li> -<li><a href='help.php?id=7'><?=_("How does CAcert protect its root private key?")?></a></li> -<li><a href='help.php?id=9'><?=_("How can I do a single sign on similar to CAcert using client certificates?")?></a></li> -<li><a href='http://wiki.cacert.org/'><?=_("Unofficial FAQ/Wiki")?></a></li> -</ul> +<p style="background-color: #FF8080; font-size: 150%"> +<? +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>'); +?> +</p> diff --git a/pages/help/2.php b/pages/help/2.php index 5dd86c4..a03a773 100644 --- a/pages/help/2.php +++ b/pages/help/2.php @@ -15,65 +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 */ ?> -<ul> - <li><a href="#whatFor"><?=_("What is it for?")?></a></li> - <li><a href="#whyEmails"><?=_("Why digitally sign your own emails?! (weirdo..)")?></a></li> - <li><a href="#freedom"><?=_("How it prepares us to protect our freedom")?></a></li> - <li><a href="#whyAdopt"><?=_("Why isn't it being adopted by everyone?")?></a></li> - <li><a href="#whyAccept"><?=_("Why is the digital signature described as 'not valid/not trusted'?")?></a></li> - <li><a href="#proof"><?=_("But, er, is this really proof of your email identity?")?></a></li> - <li><a href="#gimme"><?=_("How do I create my own digital signature?!")?></a><br></li> - <li><a href="#encrypt"><?=_("I can't wait to start sending encrypted emails!")?></a></li> - <li><a href="#notes"><?=_("Notes for the strangely curious")?></a></li> - <li><a href="#refs"><?=_("References")?></a></li> -</ul> -<br> -<h3><a name="whatFor"></a><?=_("What is it for?")?></h3> -<p><?=_("The purpose of digital signing is to prove, electronically, one's identity")?>. <?=_("You see this all the time on the Internet - every time you go to a secure page on a web site, for example to enter personal details, or to make a purchase, every day you browse web sites that have been digitally signed by a Certificate Authority that is accepted as having the authority to sign it. This is all invisible to the user, except that you may be aware that you are entering a secure zone (e.g. SSL and HTTPS).")?></p> -<p><?=_("Your browser includes special digital (root) certificates from a number of these 'Certificate Authorities' by default, and all web sites use certificates that are validated by one of these companies, which you as a user implicitly trust every time you go to the secure part of a web site. (You might ask, who validates the security of the Certificate Authorities, and why should you trust them?!")?>.... <a href="#notes"><?=_("Good question")?></a>.)</p> -<p><?=_("Digital signing thus provides security on the Internet.")?></p> - -<h3><a name="whyEmails"></a><?=_("Why digitally sign your own emails?! (weirdo..)")?></h3> -<p><?=_("Emails are not secure. In fact emails are VERY not secure!")?></p> -<p><?=_("To get from computer Internet User A to Internet User B an email may pass through tens of anonymous computers on the Internet. These 'Internet infrastructure' computers are all free to inspect and change the contents of your email as they see fit. Governments systematically browse the contents of all emails going in/out/within their country, e.g. the")?> <a href="http://www.cnn.com/2000/TECH/computing/07/28/uk.surveillance.idg/"><?=_("UK Government has done this since the year 2000")?></a>. (<a href="#freedom"><?=_("How it prepares us to protect our freedom")?></a>). <?=_("Ever requested a password that you lost to be emailed to you? That password was wide open to inspection by potential crackers.")?></p> -<p><?=_("As anyone who has received an email containing a virus from a strange address knows, emails can be easily spoofed. The identity of the sender is very easy to forge via email. Thus a great advantage is that digital signing provides a means of ensuring that an email is really from the person you think it is. If everyone digitally signed their emails, it would be much easier to know whether an email is legitimate and unchanged and to the great relief of many, spamming would be much easier to control, and viruses that forge the sender's address would be obvious and therefore easier to control.")?></p> - -<h3><a name="freedom"></a><?=_("How it prepares us to protect our freedom")?></h3> -<p><?=_("But perhaps, fundamentally, the most important reason for digital signing is awareness and privacy. It creates awareness of the (lack of) security of the Internet, and the tools that we can arm ourselves with to ensure our personal security. And in sensitising people to digital signatures, we become aware of the possibility of privacy and encryption.")?></p> -<p><?=_("Most people would object if they found that all their postal letters are being opened, read and possibly recorded by the Government before being passed on to the intended recipient, resealed as if nothing had happened. And yet this is what happens every day with your emails (in the UK). There are some who have objected to this intrusion of privacy, but their voices are small and fall on deaf ears. However the most effective way to combat this intrusion is to seal the envelope shut in a miniature bank vault, i.e. encrypt your email. If all emails were encrypted, it would be very hard for Government, or other organisations/individual crackers, to monitor the general public. They would only realistically have enough resources to monitor those they had reason to suspect. Why? Because encryption can be broken, but it takes a lot of computing power and there wouldn't be enough to monitor the whole population of any given country.")?></p> -<p><?=_("The reason digital signatures prepare us for encryption is that if everyone were setup to be able to generate their own digital signatures, it would be technically very easy to make the next step from digital signatures to encryption. And that would be great for privacy, the fight against spamming, and a safer Internet.")?></p> - -<h3><a name="whyAdopt"></a><?=_("Why isn't it being adopted by everyone?")?></h3> -<p><?=_("Of the biggest reasons why most people haven't started doing this, apart from being slightly technical, the reason is financial. You need your own certificate to digitally sign your emails. And the Certificate Authorities charge money to provide you with your own certificate. Need I say more. Dosh = no thanks I'd rather walk home. But organisations are emerging to provide the common fool in the street with a free alternative. However, given the obvious lack of funding and the emphasis on money to get enrolled, these organisations do not yet have the money to get themselves established as trusted Certificate Authorities. Thus it is currently down to trust. The decision of the individual to trust an unknown Certificate Authority. However once you have put your trust in a Certificate Authority you can implicitly trust the digital signatures generated using their certificates. In other words, if you trust (and accept the certificate of) the Certificate Authority that I use, you can automatically trust my digital signature. Trust me!")?></p> - -<h3><a name="whyAccept"></a><?=_("Why is the digital signature described as 'not valid/not trusted'?")?></h3> -<p><?=_("To fully understand, read the section directly above. I am using a free Certificate Authority to provide me with the ability to digitally sign my emails. As a result, this Certificate Authority is not (yet) recognised by your email software as it is a new organisation that is not yet fully established, although it is probably being included in the Mozilla browser. If you choose to, you can go the their site at CAcert.org to install the root certificate. You may be told that the certificate is untrusted - that is normal and I suggest that you continue installation regardless. Be aware that this implies your acceptance that you trust their secure distribution and storing of digital signatures, such as mine. (You already do this all the time). The CAcert.org root certificate will then automatically provide the safe validation of my digital signature, which I have entrusted to them. Or you can simply decide that you've wasted your time reading this and do nothing (humbug!). Shame on you! :-)")?></p> - -<h3><a name="proof"></a><?=_("But, er, is this really proof of your email identity?")?></h3> -<p><?=_("Security is a serious matter. For a digital certificate with full rights to be issued to an individual by a Certificate Authority, stringent tests must be conducted, including meeting the physical person to verify their identity. At the current moment in time, my physical identity has not been verified by CAcert.org, but they have verified my email address. Installing their root certificate (see above) will thus automatically allow you to validate my digital signature. You can then be confident of the authenticity of my email address - only I have the ability to digitally sign my emails using my CAcert.org certificate, so if you get an email that I digitally signed and which is validated by your email software using the CAcert.org root certificate that you installed, you know it's from me. (Visually you get a simple indication that my email is signed and trusted). Technically, they haven't verified that I really am me! But you have the guarantee that emails from my address are sent by the person who physically administers that address, i.e. me! The only way that someone could forge my digital signature would be if they logged on to my home computer (using the password) and ran my email software (using the password) to send you a digitally signed email from my address. Although I have noticed the cats watching me logon...")?></p> - -<h3><a name="gimme"></a><?=_("Cool man! How do I create my own digital signature?!")?></h3> -<p><?=_("Easy. Ish. Go to CAcert.org, install their root certificate and then follow their joining instructions. Once you have joined, request a certificate from the menu. You will receive an email with a link to the certificate. Click on the link from your email software, and hopefully it will be seamlessly installed. Next find the security section of the settings in your email software and configure digital signatures using the certificate you just downloaded. Hmm. Call me if you want, I'll guide you through it.")?></p> - -<h3><a name="encrypt"></a><?=_("I can't wait to start sending encrypted emails!")?></h3> -<p><?=_("There's nothing to it. I mean literally, you can already start sending your emails encrypted. Assuming of course you have your own digital signature certificate (e.g. as per above), and the person you want to send an encrypted email to also has a digital signature certificate, and has recently sent you a digitally signed email with it. If all these conditions hold, you just have to change the settings in your email software to send the email encrypted and hey presto! Your email software (probably Outlook I guess) should suss out the rest.")?></p> - -<h3><a name="notes"></a><?=_("Notes for the strangely curious")?></h3> -<p><?=_("You are putting your trust in people you don't know!")?><br><?=_("One assumes that if a site has an SSL certificate (that's what enables secure communication, for exchanging personal details, credit card numbers, etc. and gives the 'lock' icon in the browser) that they have obtained that certificate from a reliable source (a Certificate Authority), which has the appropriate stringent credentials for issuing something so vital to the security of the Internet, and the security of your communications. You have probably never even asked yourself the question of who decided to trust these Certificate Authorities, because your browser comes with their (root) certificates pre-installed, so any web site that you come across that has an SSL certificate signed by one of them, is automatically accepted (by your browser) as trustworthy.")?></p> -<p><?=_("Thus, having now asked the question, you suppose that it's the people who make the browser software that have carefully decided who is a trustworthy Certificate Authority. Funnily enough, the mainstream browsers have not, historically, had public policies on how they decide whether a Certificate Authority gets added to their browser. All of the Certificate Authorities that have found themselves in the browser software, are big names, probably with big profits (so they must be doing a good job!).")?></p> -<p><?=_("That situation has changed, and Internet Explorer, being the most obvious example, now insists that any Certificate Authorities are 'audited' by an 'independent' organisation, the American Institute for Certified Public Accountant's (AICPA). So now, if you have the money needed (from US$75000 up to US$250000 and beyond) you can get these accountants, who clearly know a lot about money, to approve you as having the required technical infrastructure and business processes to be a Certificate Authority. And they get a nice wad of money for the pleasure. And the Certificate Authorities, having a kind of monopoly as a result, charge a lot for certificates and also get a nice wad of money. And everyone's happy.")?></p> -<p><?=_("But, with all this money, and all this responsibility, they must be taking a lot of care to ensure the Certificate Authorities do their jobs well, and keep doing their jobs well, right? Well right?!")?></p> -<p><?=_("And they are making mistakes")?></p> -<p><?=_("So if you don't pass the audit, you don't get to be a Certificate Authority. And to pass the audit, well, you've got to show that you can do a good job issuing certificates. That they're secure, you only give them to the right people, etc. So what happens when you make a mistake and you erroneously issue a certificate that risks the entire Internet browsing population, like Verisign did? Well, er, nothing actually. They already paid for their audit, and damn it, they're so big now, we couldn't possibly revoke their Certificate Authority status. (There's too much money at stake!)")?></p> - -<h3><?=_("So, dammit, what's the point of all this then?")?></h3> -<p><?=_("The point is, as the current situation holds, you should be wary of anyone making decisions for you (i.e. pre-installed certificates in your browser), and you should be weary of anyone else's certificates that you install. But at the end of the day, it all boils down to trust. If an independent Certificate Authority seems to be reputable to you, and you can find evidence to support this claim, there's no reason why you shouldn't trust it any less than you implicitly trust the people who have already made mistakes.")?></p> -<h3><a name="refs"></a><?=_("References")?></h3> -<p><a href="http://www.schneier.com/paper-pki.pdf"><?=_("Ten Risks of PKI: What You're not Being Told about Public Key Infrastructure")?></a> - http://www.counterpane.com/pki-risks.pdf</p> -<p><a href="http://www.webtrust.org/certauth.htm"><?=_("WebTrust for Certification Authorities")?></a> - http://www.webtrust.org/certauth.htm</p> -<p><a href="http://www.microsoft.com/technet/treeview/default.asp?url=/technet/security/bulletin/MS01-017.asp"><?=_("Erroneous Verisign Issued Digital Certificates Pose Spoofing Hazard")?></a> - http://www.microsoft.com/technet/treeview/default.asp?url=/technet/security/bulletin/MS01-017.asp</p> -<p><a href="http://www.microsoft.com/technet/treeview/default.asp?url=/technet/security/news/rootcert.asp"><?=_("Microsoft Root Certificate Program")?></a> - http://www.microsoft.com/technet/treeview/default.asp?url=/technet/security/news/rootcert.asp</p> -<p><a href="http://www.homeoffice.gov.uk/crimpol/crimreduc/regulation/index.html"><?=_("The Regulation of Investigational Powers Act (RIPA)</a> ('Snooping Bill' official gov site, UK)")?> - http://www.homeoffice.gov.uk/crimpol/crimreduc/regulation/index.html</p> -<p><a href="http://www.cnn.com/2000/TECH/computing/07/28/uk.surveillance.idg/"><?=_("U.K. e-mail snooping bill passed")?></a> (UK) - http://www.cnn.com/2000/TECH/computing/07/28/uk.surveillance.idg/</p> -<p><?=_("Disclaimer : These are the author's opinions, but they should not be considered 'truth' without personal verification. The author may have made mistakes and any mistakes will be willingly rectified by contacting the administrator of elucido.net, contact details available from the normal domain registration information services (e.g. whois.net). No recommendation to install a Certificate Authority's root certificate is either intended nor implied.")?></p> -<p><? printf(_("The page has been reproduced on %s with explicit permission from %sthe author%s with the information being copyrighted to the author (name with held by request)"), "<a href='http://www.CAcert.org'>CAcert.org</a>", "<a href='http://elucido.net/'>", "</a>")?></p> +<p style="background-color: #FF8080; font-size: 150%"> +<? +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>'); +?> +</p> diff --git a/pages/help/3.php b/pages/help/3.php index b56823e..8cdeb08 100644 --- a/pages/help/3.php +++ b/pages/help/3.php @@ -15,74 +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><?=_("Generating a Key Pair and Certificate Signing Request (CSR) for a Microsoft Internet Information Server (IIS) 5.0.")?></h3> -<p><?=_("To generate a public and private key pair and CSR for a Microsoft IIS 5 Server:")?></p> - <ol class="tutorial"> - <li><b><?=_("Key generation process")?></b><br /> - <?=_("Under 'Administrative Tools', open the 'Internet Services Manager'. Then open up the properties window for the website you wish to request the certificate for. Right-clicking on the particular website will open up its properties.")?><br /> - <img src="iistutorial/image001.jpg" height="453" width="642" alt="<?=_("Screenshot of IIS 5.0")?>" /><br /> - <img src="iistutorial/image002.jpg" height="453" width="463" alt="<?=_("Screenshot of IIS 5.0")?>" /></li> - <li><b><?=_("Open Directory Security folder")?></b><br /> - <?=_("In the 'Directory Security' folder click on the 'Server Certificate' button in the 'Secure communications' section. If you have not used this option before the 'Edit' button will not be active.")?><br /> - <img src="iistutorial/image003.gif" height="386" width="503" alt="<?=_("Screenshot of IIS 5.0")?>" /></li> - <li><b><?=_("Select 'Create a new certificate'")?></b><br /> - <?=_("Now 'Create a new certificate'.")?><br /> - <img src="iistutorial/image004.gif" height="386" width="503" alt="<?=_("Screenshot of IIS 5.0")?>" /></li> - <li><b><?=_("Prepare the request")?></b><br /> - <?=_("You'll prepare the request now, but you can only submit the request via the online request forms. We do not accept CSRs via email.")?><br /> - <img src="iistutorial/image005.gif" height="386" width="503" alt="<?=_("Screenshot of IIS 5.0")?>" /></li> - <li><b><?=_("Enter a certificate name and select Certificate strength")?></b><br /> - <?=_("Select 'Bit length'. We advise a key length of 1024 bits.")?><br /> - <img src="iistutorial/image006.gif" height="386" width="503" alt="<?=_("Screenshot of IIS 5.0")?>" /><br /> - <br /> - <?=_("You have now created a public/private key pair. The private key is stored locally on your machine. The public portion is sent to CAcert in the form of a CSR.")?><br /> - <br /> - <?=_("You will now create a CSR. This information will be displayed on your certificate, and identifies the owner of the key to users. The CSR is only used to request the certificate. The following characters must be excluded from your CSR fields, or your certificate may not work:")?> <p style="color: red;">! @ # $ % ^ * ( ) ~ ? > < & / \</p> - </li> - <li><b><?=_("Enter your Organisation Information")?></b><br /> - <?=_("Enter the Organisation name: this must be the full legal name of the Organisation that is applying for the certificate.")?><br /> - <br /> - <?=_("The Organisational Unit field is the 'free' field. It is often the department or Server name for reference.")?><br /> - <img src="iistutorial/image007.gif" height="386" width="503" alt="<?=_("Screenshot of IIS 5.0")?>" /></li> - <li><b><?=_("Enter your Common Name")?></b><br /> - <?=_("The Common Name is the fully qualified host and Domain Name or website address that you will be securing. Both 'www.CAcert.org' and 'secure.CAcert.com' are valid Common Names. IP addresses are usually not used.")?><br /> - <img src="iistutorial/image008.gif" height="386" width="503" alt="<?=_("Screenshot of IIS 5.0")?>" /></li> - <li><b><?=_("Enter the geographical details")?></b><br /> - <?=_("Your country, state and city.")?><br /> - <img src="iistutorial/image009.gif" height="386" width="503" alt="<?=_("Screenshot of IIS 5.0")?>" /></li> - <li><b><?=_("Choose a filename to save the request to")?></b><br /> - <?=_("Select an easy to locate folder. You'll have to open this file up with Notepad. The CSR must be copied and pasted into our online form. Once the CSR has been submitted, you won't need this CSR any more as IIS won't reuse old CSR to generate new certificates.")?><br /> - <img src="iistutorial/image010.gif" height="386" width="503" alt="<?=_("Screenshot of IIS 5.0")?>" /></li> - <li><b><?=_("Confirm your request details")?></b></li> - </ol> -<p><?=_("Finish up and exit IIS Certificate Wizard")?></p> - -<h3><?=_("Certificate Installation process for IIS 5.0")?></h3> -<p><?=_("After your certificate has been emailed to you, follow this process to install the certificate.")?></p> - <ol class="tutorial"> - <li><b><?=_("Saving the certificate")?></b><br /> - <?=_("Copy the contents of the email including the")?> - <code>-----BEGIN CERTIFICATE-----</code> <?=_("and")?> - <code>-----END CERTIFICATE-----</code> <?=_("lines. Do not copy any extra line feeds or carriage returns at the beginning or end of the certificate. Save the certificate into a text editor like Notepad. Save the certificate with an extension of .cer and a meaningful name like certificate.cer")?><br /><br /> - <img src="iistutorial/image011b.png" alt="<?=_("Screenshot of IIS 5.0")?>" /></li> - <li><b><?=_("Installation steps")?></b><br /> - <?=_("Return to the 'Internet Information Services' screen in 'Administrative Tools' under 'Control Panel'. Right click on 'Default Web Site' and select 'Properties'.")?><br /> - <img src="iistutorial/image001.jpg" height="453" width="642" alt="<?=_("Screenshot of IIS 5.0")?>" /></li> - <li><b><?=_("Select the Directory Security tab")?></b><br /> - <?=_("Select 'Server Certificate' at the bottom of the tab in the 'Secure communications' section.")?><br /> - <img src="iistutorial/image002.jpg" height="453" width="463" alt="<?=_("Screenshot of IIS 5.0")?>" /><br /></li> - <li><b><?=_("In the 'IIS Certificate Wizard' you should find a 'Pending Certificate Request'.")?></b><br /> - <?=_("Ensure 'Process the pending request and install the certificate' is selected and click on 'Next'.")?><br /> - <img src="iistutorial/image012.gif" height="388" width="506" alt="<?=_("Screenshot of IIS 5.0")?>" /></li> - <li><b><?=_("Browse to the location you saved the .cer file to in step 1")?></b><br /> - <?=_("Select the .cer file and click 'Next'.")?><br /> - <img src="iistutorial/image013.gif" height="388" width="505" alt="<?=_("Screenshot of IIS 5.0")?>" /></li> - <li><b><?=_("Ensure that you are processing the correct certificate")?></b><br /> - <?=_("...then click 'Next'.")?><br /> - <img src="iistutorial/image014.jpg" height="390" width="506" alt="<?=_("Screenshot of IIS 5.0")?>" /></li> - <li><b><?=_("You will see a confirmation screen.")?></b><br /> - <?=_("When you have read this information, click 'Finish'.")?><br /> - <img src="iistutorial/image015.gif" height="390" width="507" alt="<?=_("Screenshot of IIS 5.0")?>" /></li> - </ol> - <p><b><?=_("And you're done!")?></b></p> - <p><?=_("For more information, refer to your server documentation or visit")?> <a href="http://support.microsoft.com/support/"><?=_("Microsoft Support Online")?></a>.</p> +<p style="background-color: #FF8080; font-size: 150%"> +<? +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>'); +?> +</p> diff --git a/pages/help/4.php b/pages/help/4.php index 428c934..248564c 100644 --- a/pages/help/4.php +++ b/pages/help/4.php @@ -15,31 +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 */ ?> -<p><?=_("Firstly you will need to run the following command, preferably in secured directory no one else can access, however protecting your private keys is beyond the scope of this document.")?></p> -<p># openssl req -nodes -new -keyout private.key -out server.csr</p> -<p><?=_("Then the system will try to generate some very random numbers to get a secure key.")?></p> -<p><?=_("Generating a 1024 bit RSA private key")?><br> - ...++++++<br> - ....++++++<br> -<?=_("writing new private key to 'private.key'")?></p> -<p><?=_("You will then be asked to enter information about your company into the certificate. Below is a valid example:")?></p> -<p><?=_("Country Name (2 letter code) [AU]:")?>AU<br> - <?=_("State or Province Name (full name) [NSW]:")?>NSW<br> - <?=_("Locality Name (eg, city) [Sydney]:")?>Sydney<br> - <?=_("Organization Name (eg, company) [XYZ Corp]:")?>CAcert Inc.<br> - <?=_("Organizational Unit Name (eg, section) [Server Administration]:.")?><br> - <?=_("Common Name (eg, YOUR name) []:")?>www.cacert.org<br> - <?=_("Email Address")?> []:no-returns@cacert.org</p> -<p><?=_("Finally you will be asked information about 'extra' attribute, you simply hit enter to both these questions.")?></p> -<p><?=_("Next step is that you submit the contents of server.csr to the CAcert website, it should look *EXACTLY* like the following example otherwise the server may reject your request because it appears to be invalid.")?></p> -<p>-----BEGIN CERTIFICATE REQUEST-----<br> - MIIBezCB5QIBADA8MRcwFQYDVQQDEw53d3cuY2FjZXJ0Lm9yZzEhMB8GCSqGSIb3<br> - DQEJARYSc3VwcG9ydEBjYWNlcnQub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB<br> - iQKBgQDQd1+ut4TJLWZf5A9r3D17Kob+CNwz/jfCOYrH0P6q1uw4jfSyrWUeSaVc<br> - 59Xjpov8gRctlAuWM9KavkLSF6vcNdDEbvUYnL/+ixdmVE9tlXuSFEGz0GAF5faf<br> - QZe30wk+2hnC6P+rwclypOhkTXtWgvSHPZg9Cos8xqDyv589QwIDAQABoAAwDQYJ<br> - KoZIhvcNAQEEBQADgYEAJruzBZr4inqaeidn1m2q47lXZUWjgsrp3k3bFJ/HCb3S<br> - 2SgVqHFrOisItrr7H0Dw2EcPhIrRokRdjIAwwlxG9v21eFaksZUiaP5Yrmf89Njk<br> - HV+MZXxbC71NIKrnZsDhHibZslICh/XjdPP7zfKMlHuaaz1oVAmu9BlsS6ZXkVA=<br> ------END CERTIFICATE REQUEST----- </p> -<p><?=_("Once you've submitted it the system will process your request and send an email back to you containing your server certificate.")?></p> +<p style="background-color: #FF8080; font-size: 150%"> +<? +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>'); +?> +</p> diff --git a/pages/help/5.php b/pages/help/5.php index d59e3dc..604febc 100644 --- a/pages/help/5.php +++ b/pages/help/5.php @@ -15,4 +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 */ ?> -<?=_("To be completed")?> +<p style="background-color: #FF8080; font-size: 150%"> +<? +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>'); +?> +</p> diff --git a/pages/help/6.php b/pages/help/6.php index adbd656..5308e93 100644 --- a/pages/help/6.php +++ b/pages/help/6.php @@ -15,14 +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 */ ?> -<p><?=_("Firstly you need to join CAcert to do that go:")?> <a href='https://www.cacert.org/index.php?id=1'><?=("here")?></a></p> - -<p><?=_("Then you need to generate a Certificate Signing Request, for more details go:")?> <a href=http://www.cacert.org/help.php><?=_("here")?></a></p> - -<p><?=_("You then need to add the domain you have control of to your account, which you can do:")?> <a href='https://www.cacert.org/account.php?id=7'><?=_("here")?></a></p> - -<p><?=_("System will send you an email with a link in it, you just open the link in a webbrowser.")?></p> - -<p><?=_("Then you need to submit the contents from the CSR file to CAcert, you need to go:")?> <a href='https://www.cacert.org/account.php?id=10'><?=_("here")?></a></p> - -<p><?=_("CAcert then sends you an email with a signed copy of your certificate. Hopefully the rest should be pretty straight forward.")?></p> +<p style="background-color: #FF8080; font-size: 150%"> +<? +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>'); +?> +</p> diff --git a/pages/help/7.php b/pages/help/7.php index 842a4cf..73e18da 100644 --- a/pages/help/7.php +++ b/pages/help/7.php @@ -15,12 +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 */ ?> -<p><?=_("In light of a request on the bugzilla list for more information about how our root certificate is protected I've decided to do a write up here and see if there is anything more people suggest could be done, or a better way of handling things altogether.")?></p> -<p><?=_("Currently there is 2 main servers, one for webserver, one for root store, with the root store only connected to the webserver via serial cable, with a daemon running as non-root processes on each end of the serial listening/sending requests/info.")?></p> -<p><?=_("If the root store detects a bad request it assumes the webserver is compromised and shuts itself down.")?></p> -<p><?=_("If the root store doesn't receive a 'ping' reply over the serial link within a determined amount of time it assumes the webserver is compromised or the root store itself has been stolen and shuts itself down.")?></p> -<p><?=_("Apart from the boot stuff, all data resides on an encrypted partition on the root store server and only manual intervention in the boot up process by entering the password will start it again.")?></p> -<p><?=_("The requests sent to the root store, are stored in a file for another process triggered by cron to parse and sign them, then stored in a reply file to be sent back to the webserver. Causing things to be separated into different users, basic privilege separation stuff. So being actually able to hack the serial daemons will only at the VERY worst cause fraudulent certificates, not the root to be revealed.")?></p> -<p><?=_("Why use serial you ask? Well certificate requests are low bandwidth for starters, then of course simpler systems in security are less prone to exploits, and finally serial code is pretty mature and well tested and hopefully all exploits were found and fixed a long time ago.")?></p> -<p><?=_("With the proposed root certificate changes, there would be a new root, this would sign at least 1 sub-root, then the private key stored offline in a bank vault, with the sub-root doing all the signing, or alternatively 2 sub-roots, 1 for client certificates, one for server, the thinking behind this, if any of the sub-roots are compromised they can be revoked and reissued.")?></p> -<p><?=_("Alternatively as things progress we can add more layers of security with say 4 webservers talking to 2 intermediate servers, talking to the root store, and acting in a token ring fashion, anything happening out of sequence, and the server directly upstream shuts itself down, which if that were in place and there were multiple paths, any down time in this fashion would fall over to the servers not compromised, anyways just some food for thought.")?></p> +<p style="background-color: #FF8080; font-size: 150%"> +<? +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>'); +?> +</p> diff --git a/pages/help/8.php b/pages/help/8.php index 8ee4974..41c4959 100644 --- a/pages/help/8.php +++ b/pages/help/8.php @@ -15,6 +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 */ ?> -<p><i><?=_("Question: I'm a software developer for linux and I want to use CAcert/openssl to distribute my packages with detached signatures, is this possible and why would I do this over PGP/GPG detached signatures?")?></i></p> -<p><?=_("I'll anwser the why part first, as that's reasonably easy. The short answer is it takes most of the key handling responsibilty away from you and/or your group. If you need to revoke your key for any reason (such as a developer leaving the project) it won't effect your ability to revoke the existing key or keys, and issue new ones.")?></p> - +<p style="background-color: #FF8080; font-size: 150%"> +<? +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>'); +?> +</p> diff --git a/pages/help/9.php b/pages/help/9.php index 8a538fe..d6fdc39 100644 --- a/pages/help/9.php +++ b/pages/help/9.php @@ -15,53 +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 */ ?> +<p style="background-color: #FF8080; font-size: 150%"> <? - function dotab($num) - { - $string=""; - for($i = 0; $i < $num; $i++) - { - for($j = 0; $j < 8; $j++) - $string .= " "; - } - return($string); - } +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>'); ?> -<h3><?=_("How can I do a single sign on similar to CAcert using client certificates?")?></h3> - -<p><?=_("Firstly you need mod-ssl and apache setup (this is beyond the scope of this FAQ item and you will need to search on google etc for LAMP setup information). I recommend mod-ssl over apache-ssl because it means you need less resources to achieve the same result.")?></p> - -<p><?=_("Once you have everything setup and working you will need to add lines similar to below to your apache.conf")?></p> - -<p style="border:dotted 1px #900;padding:0.3em;background-color:#ffe;"><br> -<VirtualHost 127.0.0.1:443><br> -SSLEngine on<br> -SSLVerifyClient require<br> -SSLVerifyDepth 2<br> -SSLCACertificateFile /etc/ssl/cacert.crt<br> -SSLCertificateFile /etc/ssl/certs/cacert.crt<br> -SSLCertificateKeyFile /etc/ssl/private/cacert.pem<br> -SSLOptions +StdEnvVars<br> -<br> -ServerName secure.cacert.org<br> -DocumentRoot /www<br> -</VirtualHost><br><br> -</p> - -<p><?=_("Please note, you will need to alter the paths, hostname and IP of the above example, which is just that an example! The SSLCACertificateFile directive is supposed to point to a file with the root certificate you wish to verify your client certificates against, for the CAcert website we obviously only accept certificates issued by our own website and use our root certificate to initially verify this.")?></p> - -<p><?=_("Once you have everything working and you've tested sending a client certificate to your site and you're happy all is well you can start adding code to PHP (or any other language you like that can pull server environment information). At present I only have PHP code available and the example is in PHP")?></p> - -<p style="border:dotted 1px #900;padding:0.3em;background-color:#ffe;"><br> -<?=dotab(1)?>if($_SERVER['HTTP_HOST'] == "secure.cacert.org")<br> -<?=dotab(1)?>{<br> -<?=dotab(2)?>$query = "select * from `users` where `email`='$_SERVER[SSL_CLIENT_S_DN_Email]'";<br> -<?=dotab(2)?>$res = mysql_query($query);<br> -<?=dotab(2)?>if(mysql_num_rows($res) > 0)<br> -<?=dotab(2)?>{<br> -<?=dotab(3)?>$_SESSION['profile']['loggedin'] = 1;<br> -<?=dotab(3)?>header("location: https://secure.cacert.org/account.php");<br> -<?=dotab(3)?>exit;<br> -<?=dotab(2)?>}<br> -<?=dotab(1)?>}<br><br> </p> diff --git a/pages/index/1.php b/pages/index/1.php index f4343e7..a60a242 100644 --- a/pages/index/1.php +++ b/pages/index/1.php @@ -25,27 +25,33 @@ <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="2" class="title"><?=_("My Details")?></td> + <td colspan="3" class="title"><?=_("My Details")?></td> </tr> + <tr> <td class="DataTD" width="125"><?=_("First Name")?>: </td> <td class="DataTD" width="125"><input type="text" name="fname" 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> </tr> + <tr> <td class="DataTD" valign="top"><?=_("Middle Name(s)")?><br> (<?=_("optional")?>) </td> <td class="DataTD"><input type="text" name="mname" value="<?=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" value="<?=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" value="<?=array_key_exists('suffix',$_REQUEST)?sanitizeHTML($_REQUEST['suffix']):""?>" autocomplete="off"><br><?=sprintf(_("Please only write %sName Suffixes%s into this field."),'<a href="http://en.wikipedia.org/wiki/Suffix_%28name%29" target="_blank">','</a>')?></td> + <td class="DataTD"><input type="text" name="suffix" value="<?=array_key_exists('suffix',$_REQUEST)?sanitizeHTML($_REQUEST['suffix']):""?>" autocomplete="off"><br><?=sprintf(_("Please only write Name Suffixes into this field."))?></td> </tr> + <tr> <td class="DataTD"><?=_("Date of Birth")?><br> (<?=_("dd/mm/yyyy")?>)</td> @@ -73,49 +79,63 @@ </select> <input type="text" name="year" value="<?=array_key_exists('year',$_SESSION['signup']) ? sanitizeHTML($_SESSION['signup']['year']):""?>" size="4" autocomplete="off"></nobr> </td> + <td class="DataTD"> </td> </tr> + <tr> <td class="DataTD"><?=_("Email Address")?>: </td> - <td class="DataTD"><input type="text" name="email" value="<?=array_key_exists('email',$_REQUEST)?sanitizeHTML($_REQUEST['email']):""?>" autocomplete="off"><br/><?=_("I own or am authorised to control this email address")?> -</td> + <td class="DataTD"><input type="text" name="email" 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> </tr> + <tr> <td class="DataTD"><?=_("Pass Phrase")?><font color="red">*</font>: </td> <td class="DataTD"><input type="password" name="pword1" autocomplete="off"></td> + <td class="DataTD" rowspan="2"> </td> </tr> <tr> <td class="DataTD"><?=_("Pass Phrase Again")?><font color="red">*</font>: </td> <td class="DataTD"><input type="password" name="pword2" 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="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> </tr> + <tr> - <td class="DataTD" colspan="2"><?=_("Lost Pass Phrase Questions - Please enter five questions and your responses to be used for security verification.")?></td> + <td class="DataTD" colspan="3"><?=_("Lost Pass Phrase Questions - Please enter five questions and your responses to be used for security verification.")?></td> </tr> + <tr> <td class="DataTD">1) <input type="text" name="Q1" size="15" value="<?=array_key_exists('Q1',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q1']):""?>"></td> <td class="DataTD"><input type="text" name="A1" value="<?=array_key_exists('A1',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A1']):""?>" autocomplete="off"></td> + <td class="DataTD" rowspan="5"> </td> </tr> + <tr> <td class="DataTD">2) <input type="text" name="Q2" size="15" value="<?=array_key_exists('Q2',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q2']):""?>"></td> <td class="DataTD"><input type="text" name="A2" value="<?=array_key_exists('A2',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A2']):""?>" autocomplete="off"></td> </tr> + <tr> <td class="DataTD">3) <input type="text" name="Q3" size="15" value="<?=array_key_exists('Q3',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q3']):""?>"></td> <td class="DataTD"><input type="text" name="A3" value="<?=array_key_exists('A3',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A3']):""?>" autocomplete="off"></td> </tr> + <tr> <td class="DataTD">4) <input type="text" name="Q4" size="15" value="<?=array_key_exists('Q4',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q4']):""?>"></td> <td class="DataTD"><input type="text" name="A4" value="<?=array_key_exists('A4',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A4']):""?>" autcomplete="off"></td> </tr> + <tr> <td class="DataTD">5) <input type="text" name="Q5" size="15" value="<?=array_key_exists('Q5',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['Q5']):""?>"></td> <td class="DataTD"><input type="text" name="A5" value="<?=array_key_exists('A5',$_SESSION['signup'])?sanitizeHTML($_SESSION['signup']['A5']):""?>" autocomplete="off"></td> </tr> + <tr> - <td class="DataTD" colspan="2"><?=_("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"><?=_("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" align="left"> @@ -123,16 +143,18 @@ <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> + <td class="DataTD"> </td> </tr> + <tr> - <td class="DataTD" colspan="2"><?=_("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"><?=_("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="2"><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.php">http://www.cacert.org/policy/CAcertCommunityAgreement.php</a></td> + <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.php">http://www.cacert.org/policy/CAcertCommunityAgreement.php</a></td> </tr> <tr> - <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Next")?>"></td> + <td class="DataTD" colspan="3"><input type="submit" name="process" value="<?=_("Next")?>"></td> </tr> </table> diff --git a/pages/index/11.php b/pages/index/11.php index 1b76f9c..8391903 100644 --- a/pages/index/11.php +++ b/pages/index/11.php @@ -23,7 +23,7 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s <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="http://www.CAcert.org/help.php"><?=_("Go here for more details.")?></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> diff --git a/pages/index/12.php b/pages/index/12.php index 4b021e0..48c737a 100644 --- a/pages/index/12.php +++ b/pages/index/12.php @@ -15,17 +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><?=_("About CAcert.org")?></H3> - -<p><?=_("CAcert.org is a community driven, Certificate Authority that issues certificates to the public at large for free.")?></p> - -<p><? printf(_("CAcert's goal is to promote awareness and education on computer security through the use of encryption, specifically with the X.509 family of standards. We have compiled a %sdocument base%s that has helpful hints and tips on setting up encryption with common software, and general information about Public Key Infrastructures (PKI)."), "<a href='http://wiki.cacert.org/'>", "</a>"); ?></p> - -<p><?=_("For the enthusiast looking to dip their toe in the water, we have an easy way of obtaining certificates you can use with your email program. You can use these not only to encrypt, but to prove to your friends and family that your email really does come from you.")?></p> - -<p><?=_("For administrators looking to protect the services they offer, we provide host and wild card certificates which you can issue almost immediately. Not only can you use these to protect websites, but also POP3, SMTP and IMAP connections, to list but a few. Unlike other certificate authorities, we don't limit the strength of the certificates, or the use of wild card certificates. Everyone should have the right to security and to protect their privacy, not just those looking to run ecommerce sites.")?></p> - -<p><?=_("If you're extremely serious about encryption, you can join CAcert's Assurance Programme and Web of Trust. This allows you to have your identity verified to obtain added benefits, including longer length certificates and the ability to include your name on email certificates."); ?></p> - -<p><?=_("CAcert Inc. is a non-profit association, incorporated in New South Wales Australia.")?></p> -<p><?=_("More information about CAcert Incorporated:")?><a href="http://wiki.cacert.org/wiki/CAcertIncorporated">http://wiki.cacert.org/wiki/CAcertIncorporated</a></p> +<p style="background-color: #FF8080; font-size: 150%"> +<? +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>'); +?> +</p> diff --git a/pages/index/13.php b/pages/index/13.php index 34cbea4..f2ea173 100644 --- a/pages/index/13.php +++ b/pages/index/13.php @@ -19,7 +19,11 @@ <h4><?=_("If I'd like to donate to CAcert Inc., how can I do it?")?></h4> -<p><?=_("CAcert Inc. is a non-profit association which is legally able to accept donations. CAcert adheres to strict guidelines about how this money can to be used. If you'd like to make a donation, you can do so via")?> +<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"), + '<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"> @@ -38,3 +42,16 @@ Account No.: 180264 <p><?=_("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> + + +<h3><?=_("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 + 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."), + '<a href="//www.booking.com/index.html?aid=346253">booking.com</a>'); + ?></p> + diff --git a/pages/index/8.php b/pages/index/8.php index e45090d..4d515a6 100644 --- a/pages/index/8.php +++ b/pages/index/8.php @@ -15,16 +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 */ ?> -<p><b><? printf(_("The current %s board, and roles."), "CAcert Inc."); ?></b></p> -<p> -Lambert Hofstra - <?=_("President")?><br/> -Peter Yuill - <?=_("Vice President")?><br/> -Alexander Prinsier - <?=_("Treasurer")?><br/> -Mario Lipinski - <?=_("Secretary")?><br/> -Piers Lauder - <?=_("member")?><br/> -Ian Grigg - <?=_("member")?><br/> -Dirk Astrath - <?=_("member")?><br/> +<p style="background-color: #FF8080; font-size: 150%"> +<? +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>'); +?> </p> -Kevin Dawson - <?=_("Public Officer")?><br /> -<br /> -More detailed informations can be found in the CAcert wiki under <a href="//wiki.cacert.org/Board"><?=_("CAcert Board")?></a> diff --git a/pages/wot/14.php b/pages/wot/14.php index 21c5873..a827ee4 100644 --- a/pages/wot/14.php +++ b/pages/wot/14.php @@ -20,7 +20,11 @@ <p><?=sprintf(_("If you have a %sSignaturecard%s (also called 'Buergerkarte'), you can digitally sign your assurance request here, and get 50 CAcert points:"),"<a href='http://www.buergerkarte.at/'>","</a>")?><br /></p> -<p><?=sprintf(_("To get assured with your Signaturecard, you need the Software from <a href='http://www.buergerkarte.at/bku/'>http://www.buergerkarte.at/bku/</a>. To activate your E-Card, please go to <a href='https://www.sozialversicherung.at/signon2-Registrierung/'>https://www.sozialversicherung.at/signon2-Registrierung/</a>."))?></p> +<p><?=sprintf(_("To get assured with your Signaturecard, you need the ". + "Software from %s. To activate your E-Card, please go to %s."), + "<a href='http://www.buergerkarte.at/bku/'>http://www.buergerkarte.at/bku/</a>", + "<a href='https://www.sozialversicherung.at/signon2-Registrierung/'>https://www.sozialversicherung.at/signon2-Registrierung/</a>" + )?></p> <pre><?=sanitizeHTML($_REQUEST['XMLResponse'])?></pre> diff --git a/pages/wot/5.php b/pages/wot/5.php index 6c53d00..c1a6438 100644 --- a/pages/wot/5.php +++ b/pages/wot/5.php @@ -16,20 +16,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ include_once("../includes/shutdown.php"); + require_once("../includes/lib/l10n.php"); ?> <? if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "") { - if(array_key_exists('reminderset',$_SESSION['_config']) && $_SESSION['_config']['remindersent'] == 1) - { - ?><font color="orange" size="+1"><? - } - else - { - ?><font color="orange" size="+1"><?=_("ERROR")?>: <? - } - echo $_SESSION['_config']['error']."</font>"; - unset($_SESSION['_config']['error']); + ?><font color="orange" size="+1"> + <? echo _("ERROR").": ".$_SESSION['_config']['error'] ?> + </font> + <?unset($_SESSION['_config']['error']); } ?> <? if(array_key_exists('noemailfound',$_SESSION['_config']) && $_SESSION['_config']['noemailfound'] == 1) { ?> @@ -38,8 +33,8 @@ <select name="reminder-lang"> <? if($_SESSION['_config']['reminder-lang'] == "") - $_SESSION['_config']['reminder-lang'] = $_SESSION['profile']['language']; - foreach($_SESSION['_config']['translations'] as $key => $val) + $_SESSION['_config']['reminder-lang'] = L10n::get_translation(); + foreach(L10n::$translations as $key => $val) { echo "<option value='$key'"; if($key == $_SESSION['_config']['reminder-lang']) diff --git a/pages/wot/6.php b/pages/wot/6.php index bc37aa2..28c1875 100644 --- a/pages/wot/6.php +++ b/pages/wot/6.php @@ -16,6 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> <? + if(!array_key_exists('notarise',$_SESSION['_config'])) { echo "Error: No user data found."; @@ -24,147 +25,35 @@ $row = $_SESSION['_config']['notarise']; - if(!array_key_exists('pointsalready',$_SESSION['_config'])) $_SESSION['_config']['pointsalready']=0; - - - if($_SESSION['profile']['ttpadmin'] == 1 && $_SESSION['profile']['board'] == 1) - { - $methods = array("Face to Face Meeting", "Trusted 3rd Parties", "Thawte Points Transfer", "Administrative Increase", "CT Magazine - Germany"); - } else if($_SESSION['profile']['ttpadmin'] == 1) { + if($_SESSION['profile']['ttpadmin'] == 1) +// $methods = array("Face to Face Meeting", "Trusted 3rd Parties", "TopUP"); +// else $methods = array("Face to Face Meeting", "Trusted 3rd Parties"); - } - - $cap = "/cap.php?"; - $name = $row['fname']." ".$row['mname']." ".$row['lname']." ".$row['suffix']; - $_SESSION['_config']['wothash'] = md5($name."-".$row['dob']); - while(strstr($name, " ")) - $name = str_replace(" ", " ", $name); - $cap .= "name=".urlencode($name); - $cap .= "&dob=".urlencode($row['dob']); - $cap .= "&email=".urlencode($row['email']); - $name = $_SESSION['profile']['fname']." ".$_SESSION['profile']['mname']." ".$_SESSION['profile']['lname']." ".$_SESSION['profile']['suffix']; - while(strstr($name, " ")) - $name = str_replace(" ", " ", $name); - $cap .= "&assurer=".urlencode($name); - $cap .= "&date=now"; - $cap .= "&maxpoints=".maxpoints(); - - $maxpoints = maxpoints(); - if($maxpoints > 100) - $maxpoints = 100; - - if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "") { ?><font color="#ff0000" size="+1">ERROR: <?=$_SESSION['_config']['error']?></font><? unset($_SESSION['_config']['error']); } ?> -<form method="post" action="wot.php"> -<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="600"> - <tr> - <td colspan="2" class="title"><?=_("Assurance Confirmation")?></td> - </tr> -<? if(array_key_exists('alreadydone',$_SESSION['_config']) && $_SESSION['_config']['alreadydone'] == 1) { ?> - <tr> - <td class="DataTD" colspan="2" align="left" style="color: red;"><b><?=_("PLEASE NOTE: You have already assured this person before! If this is unintentional please DO NOT CONTINUE with this assurance.")?></b></td> - </tr> -<? - } if(100 - $_SESSION['_config']['pointsalready'] - $maxpoints < 0) { - ?> - <tr> - <td class="DataTD" colspan="2" align="left" style="color: red;"><b><? printf(_("This person already has %s assurance points. Any points you give this person may be rounded down, or they may not even get any points. If you have less then 150 points you will still receive 2 points for assuring them."), $_SESSION['_config']['pointsalready']); ?></b></td> - </tr> -<? } - - $query = "select `verified` from `users` where `id`='".$row['id']."'"; - $res = mysql_query($query); - $drow = mysql_fetch_assoc($res); - //if($_SESSION['_config']['verified'] <= 0) - if($drow['verified']<=0) - { ?> - <tr> - <td class="DataTD" colspan="2" align="left" style="color: red;"><b><?=_("You are about to assure a person that isn't currently verified. If you continue and they do not verify their account within 48 hours the account could automatically be removed by the system.")?></b></td> - </tr> -<? } ?> - <tr> - <td class="DataTD" colspan="2" align="left"><? printf(_("Please check the following details match against what you witnessed when you met %s in person. You MUST NOT proceed unless you are sure the details are correct. You may be held responsible by the CAcert Arbitrator for any issues with this Assurance."), $row['fname']); ?></td> - </tr> - <tr> - <td class="DataTD"><?=_("Name")?>:</td> - <td class="DataTD"><?=$row['fname']?> <?=$row['mname']?> <?=$row['lname']?> <?=$row['suffix']?></td> - </tr> - <tr> - <td class="DataTD"><?=_("Date of Birth")?>:</td> - <td class="DataTD"><?=$row['dob']?> (<?=_("YYYY-MM-DD")?>)</td> - </tr> -<? if($_SESSION['profile']['ttpadmin'] == 1) { ?> - <tr> - <td class="DataTD"><?=_("Method")?>:</td> - <td class="DataTD"><select name="method"> -<? foreach($methods as $val) { ?> - <option value="<?=$val?>"<? if(array_key_exists('method',$_POST) && $val == $_POST['method']) echo " selected"; ?>><?=$val?></option> -<? } ?> - </select> - </td> - </tr> - <tr> - <td class="DataTD" colspan="2"><?=_("Only tick the next box if the Assurance was face to face.")?></td> - </tr> -<? } ?> - <tr> - <td class="DataTD"><input type="checkbox" name="certify" value="1"<? if(array_key_exists('certify',$_POST) && $_POST['certify'] == 1) echo " checked"; ?>></td> - <td class="DataTD"><? printf(_("I certify that %s %s %s has appeared in person"), $row['fname'], $row['mname'], $row['lname']); ?></td> - </tr> - <tr> - <td class="DataTD"><?=_("Location")?>:</td> - <td class="DataTD"><input type="text" name="location" value="<?=array_key_exists('location',$_SESSION['_config'])?$_SESSION['_config']['location']:""?>"></td> - </tr> - <tr> - <td class="DataTD"><?=_("Date")?>:</td> - <td class="DataTD"><input type="text" name="date" value="<?=array_key_exists('date',$_SESSION['_config'])?$_SESSION['_config']['date']:""?>"><br><?=_("Only fill this in if you assured the person on a different day")?></td> - </tr> -<? if($_SESSION['profile']['board'] == 1 && $_SESSION['_config']['pointsalready'] <= 150) { ?> - <tr> - <td class="DataTD" colspan="2"><?=_("Issuing a temporary increase will automatically boost their points to 200 points for a nomindated amount of days, after which the person will be reduced to 150 points regardless of the amount of points they had previously. Regardless of method chosen above it will be recorded in the system as an Administrative Increase and there is a maximum amount of 45 days that points can be issued for.")?></td> - </tr> - <tr> - <td class="DataTD"><nobr><?=_("Temporary Increase")?>:</nobr><br><nobr><?=_("Number of days")?></nobr></td> - <td class="DataTD"><input type="text" name="expire" value="<?=intval(array_key_exists('expire',$_POST)?$_POST['expire']:0)?>"></td> - </tr> - <tr> - <td class="DataTD"><nobr><?=_("Sponsoring Member")?>:</td> - <td class="DataTD"><select name="sponsor"> -<? - $query = "select * from `users` where `board`='1' and `id`!='".intval($_SESSION['profile']['id'])."'"; - $res = mysql_query($query); - while($row = mysql_fetch_assoc($res)) - { + else + $methods = array("Face to Face Meeting"); + + $fname = $row['fname']; + $mname = $row['mname']; + $lname = $row['lname']; + $suffix = $row['suffix']; + $dob = $row['dob']; + $name = $fname." ".$mname." ".$lname." ".$suffix; + $_SESSION['_config']['wothash'] = md5($name."-".$dob); + + include_once($_SESSION['_config']['filepath']."/includes/wot.inc.php"); + + AssureHead(_("Assurance Confirmation"),sprintf(_("Please check the following details match against what you witnessed when you met %s in person. You MUST NOT proceed unless you are sure the details are correct. You may be held responsible by the CAcert Arbitrator for any issues with this Assurance."), $fname)); + AssureTextLine(_("Name"),$name); + AssureTextLine(_("Date of Birth"),$dob." ("._("YYYY-MM-DD").")"); + AssureBoxLine("certify",sprintf(_("I certify that %s %s %s has appeared in person"), $fname, $mname, $lname),array_key_exists('certify',$_POST) && $_POST['certify'] == 1); + AssureInboxLine("location",_("Location"),array_key_exists('location',$_SESSION['_config'])?$_SESSION['_config']['location']:"",""); + AssureInboxLine("date",_("Date"),array_key_exists('date',$_SESSION['_config'])?$_SESSION['_config']['date']:date("Y-m-d"),"<br/>"._("Please adjust the date if you assured the person on a different day")); + AssureMethodLine(_("Method"),$methods,_("Only tick the next box if the Assurance was face to face.")); + AssureBoxLine("assertion",_("I believe that the assertion of identity I am making is correct, complete and verifiable. I have seen original documentation attesting to this identity. I accept that the CAcert Arbitrator may call upon me to provide evidence in any dispute, and I may be held responsible."),array_key_exists('assertion',$_POST) && $_POST['assertion'] == 1); + AssureBoxLine("rules",_("I have read and understood the Assurance Policy and the Assurance Handbook and am making this Assurance subject to and in compliance with the policy and handbook."),array_key_exists('rules',$_POST) && $_POST['rules'] == 1); + AssureTextLine(_("Policy"),"<a href=\"/policy/AssurancePolicy.php\" target=\"_blank\">"._("Assurance Policy")."</a> - <a href=\"http://wiki.cacert.org/AssuranceHandbook2\" target=\"_blank\">"._("Assurance Handbook")."</a>"); + AssureInboxLine("points",_("Points"),"","<br />(Max. ".maxpoints().")"); + AssureCCABoxLine("CCAAgreed",sprintf(_("Check this box only if %s agreed to the <a href=\"/policy/CAcertCommunityAgreement.php\">CAcert Community Agreement</a>"),$fname)); + AssureCCABoxLine("CCAAgree",_("Check this box only if YOU agree to the <a href=\"/policy/CAcertCommunityAgreement.php\">CAcert Community Agreement</a>")); + AssureFoot($id,_("I confirm this Assurance")); ?> - <option value="<?=$row['id']?>"<? if(array_key_exists('sponsor',$_POST) && $row['id'] == $_POST['sponsor']) echo " selected='selected'"; ?>><?=$row['fname']." ".$row['lname']?></option> -<? } ?> - </select> - </td> - </tr> -<? } ?> - <tr> - <td class="DataTD"><input type="checkbox" name="assertion" value="1"<? if(array_key_exists('assertion',$_POST) && $_POST['assertion'] == 1) echo " checked='checked'"; ?>></td> - <td class="DataTD"><?=_("I believe that the assertion of identity I am making is correct, complete and verifiable. I have seen original documentation attesting to this identity. I accept that the CAcert Arbitrator may call upon me to provide evidence in any dispute, and I may be held responsible.")?></td> - </tr> - <tr> - <td class="DataTD"><input type="checkbox" name="rules" value="1"<? if(array_key_exists('rules',$_POST) && $_POST['rules'] == 1) echo " checked='checked'"; ?>></td> - <td class="DataTD"><?=_("I have read and understood the Assurance Policy and the Assurance Handbook and am making this Assurance subject to and in compliance with the policy and handbook.")?></td> - </tr> - <tr> - <td class="DataTD"><?=_("Policy")?>:</td> - <td class="DataTD"><a href="/policy/AssurancePolicy.php" target="_NEW"><?=_("Assurance Policy")?></a> - <a href="http://wiki.cacert.org/AssuranceHandbook2" target="_NEW"><?=_("Assurance Handbook")?></a></td> - </tr> - <tr> - <td class="DataTD"><?=_("Points")?>:<br><nobr>(Max <?=maxpoints()?>)</nobr></td> - <td class="DataTD"><input type="text" name="points" value=""></td> - </tr> - <tr> - <td class="DataTD"><?=_("WoT Form")?>:</td> - <td class="DataTD"><a href="<?=$cap?>" target="_NEW">A4 - <?=_("WoT Form")?></a> <a href="<?=$cap?>&format=letter" target="_NEW">US - <?=_("WoT Form")?></a></td> - </tr> - <tr> - <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("I confirm this Assurance")?>"> <input type="submit" name="cancel" value="<?=_("Cancel")?>"></td> - </tr> -</table> -<input type="hidden" name="pagehash" value="<?=$_SESSION['_config']['wothash']?>"> -<input type="hidden" name="oldid" value="<?=$id?>"> -</form> diff --git a/pages/wot/9.php b/pages/wot/9.php index b974c5d..bfa7a98 100644 --- a/pages/wot/9.php +++ b/pages/wot/9.php @@ -14,8 +14,11 @@ 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 -*/ ?> -<? +*/ + + 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) { @@ -47,7 +50,7 @@ <? if($userlang != "") { ?> <tr> <td class="DataTD"><?=_("Language")?>:</td> - <td class="DataTD" align="left"><? printf(_("%s prefers to be contacted in %s"), $user['fname'], $_SESSION['_config']['translations'][$userlang]) ?></td> + <td class="DataTD" align="left"><? printf(_("%s prefers to be contacted in %s"), $user['fname'], L10n::$translations[$userlang]) ?></td> </tr> <? } ?> <? diff --git a/password.dat.sample b/password.dat.sample deleted file mode 100644 index f9bbb55..0000000 --- a/password.dat.sample +++ /dev/null @@ -1,2 +0,0 @@ -$translingo_password = 'ThePassword'; -$translingo_account = 'TheAccount'; diff --git a/scripts/37de-blit2011-email.txt b/scripts/37de-blit2011-email.txt new file mode 100644 index 0000000..365bd5b --- /dev/null +++ b/scripts/37de-blit2011-email.txt @@ -0,0 +1,18 @@ +8. Brandenburger Linux-Infotag 2011 -- Helfer Gesucht +::::::::::::::::::::::::::::::::::::::::::::::::::::: + +Hallo CAcerties, + +am Samstag, dem 5. November 2011 moechte sich CAcert mit einem Stand auf dem 8. Brandenburger Linux-Infotag 2011 (Motto: "Freie Gedanken - Freie Systeme") praesentieren. Hierzu wurde nun im Wiki eine Organisationsseite eingerichtet, auf der Ihr Euch als Helfer eintragen koennt + http://wiki.cacert.org/events/BLIT2011 +Sofern Ihr aus Berlin, Potsdam sowie Umgebung oder von woanders kommt und Zeit wie auch Lust habt, dann tragt Euch bitte, gerne auch nur fuer einen +bestimmten Zeitraum, ein. Wer in den vergangenen Jahren dabei war, weiss vieviel Spass es allen gemacht hat! + +Auf der Veranstaltung sind Professoren, wissenschaftliche Mitarbeiter und in jedem Fall viele Studenten zu erwarten. Es waere daher super, wenn wir dort moeglichst viele von CAcert ueberzeugen koennen, um dort eine neue Keimzelle entstehen lassen zu koennen. Daher benoetigen wir mindestens drei Assurer, um 100 Punkte vergeben zu koennen. + +Wir freuen uns auf Eure Mithilfe. + + +Wiki Organisationsseite: [http://wiki.cacert.org/events/BLIT2011] + +Kontakt: events@cacert.org diff --git a/scripts/37de-blit2011-mail.php.txt b/scripts/37de-blit2011-mail.php.txt new file mode 100644 index 0000000..e0ecead --- /dev/null +++ b/scripts/37de-blit2011-mail.php.txt @@ -0,0 +1,106 @@ +#!/usr/bin/php -q +<? /* + LibreSSL - CAcert web application + Copyright (C) 2004-2009 CAcert Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + 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 +*/ + include_once("../includes/mysql.php"); + + $lines = ""; + $fp = fopen("37de-blit2011-email.txt", "r"); + while(!feof($fp)) + { + $line = trim(fgets($fp, 4096)); + $lines .= wordwrap($line, 75, "\n")."\n"; + } + fclose($fp); + + +// $locid = intval($_REQUEST['location']); +// $maxdist = intval($_REQUEST['maxdist']); +// maxdist in [Km] + $maxdist = 200; + + +// location location.ID +// verified: 29.4.09 u.schroeter +// $locid = 7902857; // Paris +// $locid = 238568; // Bielefeld +// $locid = 715191; // Hamburg +// $locid = 1102495; // London +// $locid = 520340; // Duesseldorf +// $locid = 1260319; // Muenchen +// $locid = 606058; // Frankfurt +// $locid = 1775784; // Stuttgart +// $locid = 228950; // Berlin +// $locid = 606058; // Frankfurt +// $locid = 599389; // Flensburg +// $locid = 61065; // Amsterdam, Eemnes +// $locid = 228950; // Berlin +// $locid = 2138880; // Baltimore (Baltimore (city)), Maryland, US +// $locid = 1486658; // Potsdam +// $locid = 664715; // Goteborg, Vastra Gotaland, Sweden +// $locid = 2094781; // Mission Hills (Los Angeles), California, US +// $locid = 423655; // Copenhagen, Kobenhavn*, Denmark +// $locid = 2257312; // Sydney, New South Wales, Australia +// $locid = 572764; // Essen, Nordrhein-Westfalen, Germany +// $locid = 78; // Aachen, Nordrhein-Westfalen, Germany +// $locid = 266635; // Bonn, Nordrhein-Westfalen, Germany +// $locid = 2102723; // Washington (District of Columbia, ..., US +// $locid = 2177566; // New York (Bronx), New York, United States + +// BLIT2011 + $locid = 1486658; // Potsdam + $eventname = "8. Brandenburger Linux-Infotag 2011 - Potsdam"; + $city = "5. Nov 2011"; + + + $query = "select * from `locations` where `id`='$locid'"; + $loc = mysql_fetch_assoc(mysql_query($query)); + + $query = "SELECT ROUND(6378.137 * ACOS(0.9999999*((SIN(PI() * $loc[lat] / 180) * SIN(PI() * `locations`.`lat` / 180)) + + (COS(PI() * $loc[lat] / 180 ) * COS(PI() * `locations`.`lat` / 180) * + COS(PI() * `locations`.`long` / 180 - PI() * $loc[long] / 180)))), -1) AS `distance`, sum(`points`) as pts, `users`.* + FROM `locations` + inner join `users` on `users`.`locid` = `locations`.`id` + inner join `alerts` on `users`.`id`=`alerts`.`memid` + inner join `notary` on `users`.`id`=`notary`.`to` + WHERE (`alerts`.`general`=1 OR `alerts`.`country`=1 OR `alerts`.`regional`=1 OR `alerts`.`radius`=1) + GROUP BY `users`.`id` + HAVING `distance` <= '$maxdist' + ORDER BY `distance` "; + echo $query; + + // comment next line when starting to send mail not only to me + // $query = "select * from `users` where `email` like 'cacerttest%'"; + + $res = mysql_query($query); + $xrows = mysql_num_rows($res); + + while($row = mysql_fetch_assoc($res)) + { + // uncomment next line to send mails ... + sendmail($row['email'], "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + } + // 1x cc to events.cacert.org + sendmail("events@cacert.org", "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + // 1x mailing report to events.cacert.org + sendmail("events@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + + // 1x mailing report to Arbitrator of case http://wiki.cacert.org/wiki/Arbitrations/a20090525.1 + sendmail("p.dunkel@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + echo "invitation sent to $xrows recipients.\n"; + +?> diff --git a/scripts/38us-fudcon2012-email.txt b/scripts/38us-fudcon2012-email.txt new file mode 100644 index 0000000..afb3387 --- /dev/null +++ b/scripts/38us-fudcon2012-email.txt @@ -0,0 +1,17 @@ +Hi, + +I'm a Fedora developer and sysadmin (and a CAcert Assurer), and am going to be attending the Fedora Users and Developers Conference which will be held at Virginia Tech from January 13 - 15, 2012. + +We have a GPG/PGP keysigning party planned, and I'm interested in getting some people together to offer CAcert assurances. This is especially important since CAcert will be removing all points formerly obtained by Thawte Point Transfer very soon. + +Would you be interested in helping with a CAcert assurance event at FUDCon? I'm not sure of the date yet, but it would be somewhere between the 13th and 15th. + +Please contact me at either nb@fedoraproject.org or nb@cacert.org if you might be interested in helping with this. + +Nick + +Further infos: + * [https://wiki.cacert.org/Events/FUDConBlacksburg] CAcert organizing wiki page + * [http://fedoraproject.org/wiki/FUDCon:Blacksburg_2012] has more information about FUDCon. + +Contact: events@cacert.org diff --git a/scripts/38us-fudcon2012-mail.php.txt b/scripts/38us-fudcon2012-mail.php.txt new file mode 100644 index 0000000..d90f5a2 --- /dev/null +++ b/scripts/38us-fudcon2012-mail.php.txt @@ -0,0 +1,107 @@ +#!/usr/bin/php -q +<? /* + LibreSSL - CAcert web application + Copyright (C) 2004-2009 CAcert Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + 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 +*/ + include_once("../includes/mysql.php"); + + $lines = ""; + $fp = fopen("38us-fudcon2012-email.txt", "r"); + while(!feof($fp)) + { + $line = trim(fgets($fp, 4096)); + $lines .= wordwrap($line, 75, "\n")."\n"; + } + fclose($fp); + + +// $locid = intval($_REQUEST['location']); +// $maxdist = intval($_REQUEST['maxdist']); +// maxdist in [Km] + $maxdist = 250; + + +// location location.ID +// verified: 29.4.09 u.schroeter +// $locid = 7902857; // Paris +// $locid = 238568; // Bielefeld +// $locid = 715191; // Hamburg +// $locid = 1102495; // London +// $locid = 520340; // Duesseldorf +// $locid = 1260319; // Muenchen +// $locid = 606058; // Frankfurt +// $locid = 1775784; // Stuttgart +// $locid = 228950; // Berlin +// $locid = 606058; // Frankfurt +// $locid = 599389; // Flensburg +// $locid = 61065; // Amsterdam, Eemnes +// $locid = 228950; // Berlin +// $locid = 2138880; // Baltimore (Baltimore (city)), Maryland, US +// $locid = 1486658; // Potsdam +// $locid = 664715; // Goteborg, Vastra Gotaland, Sweden +// $locid = 2094781; // Mission Hills (Los Angeles), California, US +// $locid = 423655; // Copenhagen, Kobenhavn*, Denmark +// $locid = 2257312; // Sydney, New South Wales, Australia +// $locid = 572764; // Essen, Nordrhein-Westfalen, Germany +// $locid = 78; // Aachen, Nordrhein-Westfalen, Germany +// $locid = 266635; // Bonn, Nordrhein-Westfalen, Germany +// $locid = 2102723; // Washington (District of Columbia, ..., US +// $locid = 2177566; // New York (Bronx), New York, United States +// $locid = 1486658; // Potsdam BLIT2011 + +// FUDcon 2012 + $locid = 2237836; // Blacksburg (Montgomery), Virginia, United States + $eventname = "FUDCon 2012"; + $city = "Blacksburg, VA"; + + + $query = "select * from `locations` where `id`='$locid'"; + $loc = mysql_fetch_assoc(mysql_query($query)); + + $query = "SELECT ROUND(6378.137 * ACOS(0.9999999*((SIN(PI() * $loc[lat] / 180) * SIN(PI() * `locations`.`lat` / 180)) + + (COS(PI() * $loc[lat] / 180 ) * COS(PI() * `locations`.`lat` / 180) * + COS(PI() * `locations`.`long` / 180 - PI() * $loc[long] / 180)))), -1) AS `distance`, sum(`points`) as pts, `users`.* + FROM `locations` + inner join `users` on `users`.`locid` = `locations`.`id` + inner join `alerts` on `users`.`id`=`alerts`.`memid` + inner join `notary` on `users`.`id`=`notary`.`to` + WHERE (`alerts`.`general`=1 OR `alerts`.`country`=1 OR `alerts`.`regional`=1 OR `alerts`.`radius`=1) + GROUP BY `users`.`id` + HAVING `distance` <= '$maxdist' + ORDER BY `distance` "; + echo $query; + + // comment next line when starting to send mail not only to me + // $query = "select * from `users` where `email` like 'cacerttest%'"; + + $res = mysql_query($query); + $xrows = mysql_num_rows($res); + + while($row = mysql_fetch_assoc($res)) + { + // uncomment next line to send mails ... + sendmail($row['email'], "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + } + // 1x cc to events.cacert.org + sendmail("events@cacert.org", "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + // 1x mailing report to events.cacert.org + sendmail("events@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + + // 1x mailing report to Arbitrator of case http://wiki.cacert.org/wiki/Arbitrations/a20090525.1 + sendmail("p.dunkel@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + echo "invitation sent to $xrows recipients.\n"; + +?> diff --git a/scripts/39uk-ate-manchester-email.txt b/scripts/39uk-ate-manchester-email.txt new file mode 100644 index 0000000..6c709bf --- /dev/null +++ b/scripts/39uk-ate-manchester-email.txt @@ -0,0 +1,40 @@ +CAcert Assurer Training Event -- Crewe/Manchester, UK +::::::::::::::::::::::::::::::::::::::::::::::::::::: + +Dear Member of the CAcert Community, + +Much has happened during recent years. The old way of orally-transmitted procedures has now gone, and our rules have been cast into formal policies. New procedures (e.g. the Assurer Challenge) and obligations (e.g. in the CAcert Community Agreement) have been approved. + +The Assurer Training Events bring all this to you, the Assurer, and the Community: + +- What is the difference in Thawte notary and CAcert Assurance? +- What do you have to add onto the CAP form if you assure minors? +- What are the 2 essential CCA points you have to present an Assuree? +- Who can access the Member's privacy information? + +Answers to these and many other questions typically faced by Assurers are given at the Assurer Training Events (ATEs). Bring your ID for assurances. Especially note that Tverify/Thawte people need to boost up their Assurance Points. + +ATE-Manchester takes place at: +* Saturday, January 14th, 2012 +* The Venue +* Belong Village +* Brookhouse Drive +* Crewe +* Cheshire CW2 6NA +* 11:30am - 3pm + +The venue is near to and easily accessible from the train station (Crewe is a major rail junction within 3-4 hours of most of the major cities!) + +For Registration please reply: 'I will attend ATE-Manchester' + +Don't forget your ID! + +We are looking forward to hearing from you. + + +- Best regards from the Event Team! + + +PS: Contact: events@cacert.org +Location, Transportation and other event details at +[https://wiki.cacert.org/Events/20120114ATE-Manchester] diff --git a/scripts/39uk-ate-manchester-mail.php.txt b/scripts/39uk-ate-manchester-mail.php.txt new file mode 100644 index 0000000..5c5d0d9 --- /dev/null +++ b/scripts/39uk-ate-manchester-mail.php.txt @@ -0,0 +1,108 @@ +#!/usr/bin/php -q +<? /* + LibreSSL - CAcert web application + Copyright (C) 2004-2009 CAcert Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + 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 +*/ + include_once("../includes/mysql.php"); + + $lines = ""; + $fp = fopen("39uk-ate-manchester-email.txt", "r"); + while(!feof($fp)) + { + $line = trim(fgets($fp, 4096)); + $lines .= wordwrap($line, 75, "\n")."\n"; + } + fclose($fp); + + +// $locid = intval($_REQUEST['location']); +// $maxdist = intval($_REQUEST['maxdist']); +// maxdist in [Km] - changed to 350 to include glasgow + london + $maxdist = 350; + + +// location location.ID +// verified: 29.4.09 u.schroeter +// $locid = 7902857; // Paris +// $locid = 238568; // Bielefeld +// $locid = 715191; // Hamburg +// $locid = 1102495; // London +// $locid = 520340; // Duesseldorf +// $locid = 1260319; // Muenchen +// $locid = 606058; // Frankfurt +// $locid = 1775784; // Stuttgart +// $locid = 228950; // Berlin +// $locid = 606058; // Frankfurt +// $locid = 599389; // Flensburg +// $locid = 61065; // Amsterdam, Eemnes +// $locid = 228950; // Berlin +// $locid = 2138880; // Baltimore (Baltimore (city)), Maryland, US +// $locid = 1486658; // Potsdam +// $locid = 664715; // Goteborg, Vastra Gotaland, Sweden +// $locid = 2094781; // Mission Hills (Los Angeles), California, US +// $locid = 423655; // Copenhagen, Kobenhavn*, Denmark +// $locid = 2257312; // Sydney, New South Wales, Australia +// $locid = 572764; // Essen, Nordrhein-Westfalen, Germany +// $locid = 78; // Aachen, Nordrhein-Westfalen, Germany +// $locid = 266635; // Bonn, Nordrhein-Westfalen, Germany +// $locid = 2102723; // Washington (District of Columbia, ..., US +// $locid = 2177566; // New York (Bronx), New York, United States +// $locid = 1486658; // Potsdam BLIT2011 +// $locid = 2237836; // Blacksburg (Montgomery), Virginia, United States + +// ATE Manchester 2012 + $locid = 1161640; // Manchester, Manchester, United Kingdom + $eventname = "ATE-Manchester"; + $city = "Manchester/Crewe UK"; + + + $query = "select * from `locations` where `id`='$locid'"; + $loc = mysql_fetch_assoc(mysql_query($query)); + + $query = "SELECT ROUND(6378.137 * ACOS(0.9999999*((SIN(PI() * $loc[lat] / 180) * SIN(PI() * `locations`.`lat` / 180)) + + (COS(PI() * $loc[lat] / 180 ) * COS(PI() * `locations`.`lat` / 180) * + COS(PI() * `locations`.`long` / 180 - PI() * $loc[long] / 180)))), -1) AS `distance`, sum(`points`) as pts, `users`.* + FROM `locations` + inner join `users` on `users`.`locid` = `locations`.`id` + inner join `alerts` on `users`.`id`=`alerts`.`memid` + inner join `notary` on `users`.`id`=`notary`.`to` + WHERE (`alerts`.`general`=1 OR `alerts`.`country`=1 OR `alerts`.`regional`=1 OR `alerts`.`radius`=1) + GROUP BY `users`.`id` + HAVING `distance` <= '$maxdist' + ORDER BY `distance` "; + echo $query; + + // comment next line when starting to send mail not only to me + // $query = "select * from `users` where `email` like 'cacerttest%'"; + + $res = mysql_query($query); + $xrows = mysql_num_rows($res); + + while($row = mysql_fetch_assoc($res)) + { + // uncomment next line to send mails ... + sendmail($row['email'], "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + } + // 1x cc to events.cacert.org + sendmail("events@cacert.org", "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + // 1x mailing report to events.cacert.org + sendmail("events@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + + // 1x mailing report to Arbitrator of case http://wiki.cacert.org/wiki/Arbitrations/a20090525.1 + sendmail("p.dunkel@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + echo "invitation sent to $xrows recipients.\n"; + +?> diff --git a/scripts/40de-ate-hamburg-email.txt b/scripts/40de-ate-hamburg-email.txt new file mode 100644 index 0000000..ddf7c0f --- /dev/null +++ b/scripts/40de-ate-hamburg-email.txt @@ -0,0 +1,66 @@ +CAcert Assurer Training Event Hamburg [Deutsch] +:::::::::::::::::::::::::::::::::::::::::::::::::: + +Es hat sich viel getan im letzten Jahr. Eine ganze Reihe von bisher eher "muendlich ueberlieferten" Regeln wurden in Policies gegossen. Neue Prozeduren (z.B. die Assurer Challenge) und Verpflichtungen (z.B. in dem CAcert Community Agreement) wurden beschlossen. Die Assurer Training Events wollen versuchen, die ganzen Informationen unter’s Volk zu bringen: + +- Was hast du auf dem CAP Formular hinzuzufuegen, wenn du Minderjaehrige ueberpruefst ? +- Was sind die 2 wesentlichen Punkte der CCA die du einem Assuree vermitteln koennen sollst ? +- Unter welchen Umstaenden koennen z.Bsp. niederlaendische Rufnamen akzeptiert werden? + +Antworten auf diese und weitere Fragen erhaelst du bei den Assurer Training Events (ATEs). + +Die kommende Veranstaltung in deiner Naehe findet statt am: + +Dienstag den 14. Februar 2012, 19:00 - 22:00 + +Attraktor e.V. +Mexikoring 21 +22297 Hamburg + +Das Veranstaltungs-Team freut sich schon auf Eure Teilnahme. + +Details zum Veranstaltungsort und Anfahrthinweise findet Ihr im +Wiki [https://wiki.cacert.org/events/20120214-ATE-Hamburg-3] +Blog [http://blog.cacert.org/2012/02/547.html] + + + +Unverbindliche Anmeldung und Registrierung: +Rueckantwort mit 'Ich moechte teilnehmen: ATE-Hamburg' + +Kontakt: events@cacert.org + + +CAcert Assurer Training Event Hamburg [English] +:::::::::::::::::::::::::::::::::::::::::::::::::: + +Much has happened during the past 3 years. The old way of +orally-transmitted procedures has now gone, and our rules have been cast +into formal policies. New procedures (e.g. the Assurer Challenge) and +obligations (e.g. in the CAcert Community Agreement) have been approved. +The Assurer Training Events bring all this to you, the Community: + +- What you have to add onto the CAP form if you assure U18 people ? +- What are the 2 essential topics regarding CCA you have to present an Assuree ? +- When you can accept i.e. a Dutch "roepnaam" ? + +Answers to these and many other questions are given at the Assurer +Training Events (ATEs). + +ATE-Hamburg takes place on: +Tuesday, Feb 14, 2012, 19:00 - 22:00 + +Attraktor e.V. +Mexikoring 21 +22297 Hamburg + +The Event-Team is looking forward to hearing from you. + +Details on Location and Transportation you will find under +Wiki [https://wiki.cacert.org/events/20120214-ATE-Hamburg-3] +Blog [http://blog.cacert.org/2012/02/547.html] + +Registration for ATE-Hamburg: please reply +'I will attend: ATE-Hamburg' + +Contact: events@cacert.org diff --git a/scripts/40de-ate-hamburg-mail.php.txt b/scripts/40de-ate-hamburg-mail.php.txt new file mode 100644 index 0000000..54ec1b8 --- /dev/null +++ b/scripts/40de-ate-hamburg-mail.php.txt @@ -0,0 +1,112 @@ +#!/usr/bin/php -q +<? /* + LibreSSL - CAcert web application + Copyright (C) 2004-2009 CAcert Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + 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 +*/ + include_once("../includes/mysql.php"); + + $lines = ""; + $fp = fopen("40de-ate-hamburg-email.txt", "r"); + while(!feof($fp)) + { + $line = trim(fgets($fp, 4096)); + $lines .= wordwrap($line, 75, "\n")."\n"; + } + fclose($fp); + + +// $locid = intval($_REQUEST['location']); +// $maxdist = intval($_REQUEST['maxdist']); +// maxdist in [Km] - changed to 350 to include glasgow + london + $maxdist = 200; + + +// location location.ID +// verified: 29.4.09 u.schroeter +// $locid = 7902857; // Paris +// $locid = 238568; // Bielefeld +// $locid = 715191; // Hamburg +// $locid = 1102495; // London +// $locid = 520340; // Duesseldorf +// $locid = 1260319; // Muenchen +// $locid = 606058; // Frankfurt +// $locid = 1775784; // Stuttgart +// $locid = 228950; // Berlin +// $locid = 606058; // Frankfurt +// $locid = 599389; // Flensburg +// $locid = 61065; // Amsterdam, Eemnes +// $locid = 228950; // Berlin +// $locid = 2138880; // Baltimore (Baltimore (city)), Maryland, US +// $locid = 1486658; // Potsdam +// $locid = 664715; // Goteborg, Vastra Gotaland, Sweden +// $locid = 2094781; // Mission Hills (Los Angeles), California, US +// $locid = 423655; // Copenhagen, Kobenhavn*, Denmark +// $locid = 2257312; // Sydney, New South Wales, Australia +// $locid = 572764; // Essen, Nordrhein-Westfalen, Germany +// $locid = 78; // Aachen, Nordrhein-Westfalen, Germany +// $locid = 266635; // Bonn, Nordrhein-Westfalen, Germany +// $locid = 2102723; // Washington (District of Columbia, ..., US +// $locid = 2177566; // New York (Bronx), New York, United States +// $locid = 1486658; // Potsdam BLIT2011 +// $locid = 2237836; // Blacksburg (Montgomery), Virginia, United States + +// ATE Manchester 2012 +// $locid = 1161640; // Manchester, Manchester, United Kingdom +// $eventname = "ATE-Manchester"; +// $city = "Manchester/Crewe UK"; + +// ATE Hamburg, DE, Feb 14 2012 + $locid = 715191; // Hamburg + $eventname = "ATE-Hamburg"; + $city = "Feb 14, 2012"; + + $query = "select * from `locations` where `id`='$locid'"; + $loc = mysql_fetch_assoc(mysql_query($query)); + + $query = "SELECT ROUND(6378.137 * ACOS(0.9999999*((SIN(PI() * $loc[lat] / 180) * SIN(PI() * `locations`.`lat` / 180)) + + (COS(PI() * $loc[lat] / 180 ) * COS(PI() * `locations`.`lat` / 180) * + COS(PI() * `locations`.`long` / 180 - PI() * $loc[long] / 180)))), -1) AS `distance`, sum(`points`) as pts, `users`.* + FROM `locations` + inner join `users` on `users`.`locid` = `locations`.`id` + inner join `alerts` on `users`.`id`=`alerts`.`memid` + inner join `notary` on `users`.`id`=`notary`.`to` + WHERE (`alerts`.`general`=1 OR `alerts`.`country`=1 OR `alerts`.`regional`=1 OR `alerts`.`radius`=1) + GROUP BY `users`.`id` + HAVING `distance` <= '$maxdist' + ORDER BY `distance` "; + echo $query; + + // comment next line when starting to send mail not only to me + // $query = "select * from `users` where `email` like 'cacerttest%'"; + + $res = mysql_query($query); + $xrows = mysql_num_rows($res); + + while($row = mysql_fetch_assoc($res)) + { + // uncomment next line to send mails ... + sendmail($row['email'], "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + } + // 1x cc to events.cacert.org + sendmail("events@cacert.org", "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + // 1x mailing report to events.cacert.org + sendmail("events@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + + // 1x mailing report to Arbitrator of case http://wiki.cacert.org/wiki/Arbitrations/a20090525.1 + sendmail("p.dunkel@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + echo "invitation sent to $xrows recipients.\n"; + +?> diff --git a/scripts/41de-ate-jena-email.txt b/scripts/41de-ate-jena-email.txt new file mode 100644 index 0000000..f70dc85 --- /dev/null +++ b/scripts/41de-ate-jena-email.txt @@ -0,0 +1,33 @@ +CAcert Assurer Training Event Jena [Deutsch] +:::::::::::::::::::::::::::::::::::::::::::: + +Es hat sich viel getan im letzten Jahr. Eine ganze Reihe von bisher eher "muendlich ueberlieferten" Regeln wurden in Policies gegossen. Neue Prozeduren (z.B. die Assurer Challenge) und Verpflichtungen (z.B. in dem CAcert Community Agreement) wurden beschlossen. Die Assurer Training Events wollen versuchen, die ganzen Informationen unter’s Volk zu bringen: + +- Was hast du auf dem CAP Formular hinzuzufuegen, wenn du Minderjaehrige ueberpruefst ? +- Warum solltest du dir R/L/O einpraegen ? +- Wie verhaelst du dich, wenn du ein fremdes Ausweis Dokument das erste mal pruefst ? + +Antworten auf diese und weitere Fragen erhaelst du bei den Assurer Training Events (ATEs). + +Die kommende Veranstaltung in deiner Naehe findet statt am: + +Donnerstag den 29. Maerz 2012, 19:00 - 22:00 + +Adresse: Am Johannisfriedhof 2, Jena +Gebaeude: Universitaetsrechenzentrum der Friedrich-Schiller-Universitaet Jena +OSM: [http://osm.org/go/0MAe9XhNp-] +Webseite: [http://www.uni-jena.de/URZ.html] + + +Das Veranstaltungs-Team freut sich schon auf Eure Teilnahme. + +Details zum Veranstaltungsort und Anfahrthinweise findet Ihr im +Wiki [https://wiki.cacert.org/Events/2012-03-29ATE-Jena] +Blog [http://blog.cacert.org/2012/03/550.html] + + + +Unverbindliche Anmeldung und Registrierung: +Rueckantwort mit 'Ich moechte teilnehmen: ATE-Jena' + +Kontakt: events@cacert.org diff --git a/scripts/41de-ate-jena-mail.php.txt b/scripts/41de-ate-jena-mail.php.txt new file mode 100644 index 0000000..5691f63 --- /dev/null +++ b/scripts/41de-ate-jena-mail.php.txt @@ -0,0 +1,109 @@ +#!/usr/bin/php -q +<? /* + LibreSSL - CAcert web application + Copyright (C) 2004-2009 CAcert Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + 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 +*/ + include_once("../includes/mysql.php"); + + $lines = ""; + $fp = fopen("41de-ate-jena-email.txt", "r"); + while(!feof($fp)) + { + $line = trim(fgets($fp, 4096)); + $lines .= wordwrap($line, 75, "\n")."\n"; + } + fclose($fp); + + +// $locid = intval($_REQUEST['location']); +// $maxdist = intval($_REQUEST['maxdist']); +// maxdist in [Km] - changed to 350 to include glasgow + london + $maxdist = 200; + + +// location location.ID +// verified: 29.4.09 u.schroeter +// $locid = 7902857; // Paris +// $locid = 238568; // Bielefeld +// $locid = 715191; // Hamburg +// $locid = 1102495; // London +// $locid = 520340; // Duesseldorf +// $locid = 1260319; // Muenchen +// $locid = 606058; // Frankfurt +// $locid = 1775784; // Stuttgart +// $locid = 228950; // Berlin +// $locid = 606058; // Frankfurt +// $locid = 599389; // Flensburg +// $locid = 61065; // Amsterdam, Eemnes +// $locid = 228950; // Berlin +// $locid = 2138880; // Baltimore (Baltimore (city)), Maryland, US +// $locid = 1486658; // Potsdam +// $locid = 664715; // Goteborg, Vastra Gotaland, Sweden +// $locid = 2094781; // Mission Hills (Los Angeles), California, US +// $locid = 423655; // Copenhagen, Kobenhavn*, Denmark +// $locid = 2257312; // Sydney, New South Wales, Australia +// $locid = 572764; // Essen, Nordrhein-Westfalen, Germany +// $locid = 78; // Aachen, Nordrhein-Westfalen, Germany +// $locid = 266635; // Bonn, Nordrhein-Westfalen, Germany +// $locid = 2102723; // Washington (District of Columbia, ..., US +// $locid = 2177566; // New York (Bronx), New York, United States +// $locid = 1486658; // Potsdam BLIT2011 +// $locid = 2237836; // Blacksburg (Montgomery), Virginia, United States +// $locid = 1161640; // Manchester, Manchester, United Kingdom + +// ATE Jena, DE, Mar 29 2012 + $locid = 803095; // Jena, Thueringen, Germany + $eventname = "ATE-Jena"; + $city = "Mar 29, 2012"; + + + $query = "select * from `locations` where `id`='$locid'"; + $loc = mysql_fetch_assoc(mysql_query($query)); + + $query = "SELECT ROUND(6378.137 * ACOS(0.9999999*((SIN(PI() * $loc[lat] / 180) * SIN(PI() * `locations`.`lat` / 180)) + + (COS(PI() * $loc[lat] / 180 ) * COS(PI() * `locations`.`lat` / 180) * + COS(PI() * `locations`.`long` / 180 - PI() * $loc[long] / 180)))), -1) AS `distance`, sum(`points`) as pts, `users`.* + FROM `locations` + inner join `users` on `users`.`locid` = `locations`.`id` + inner join `alerts` on `users`.`id`=`alerts`.`memid` + inner join `notary` on `users`.`id`=`notary`.`to` + WHERE (`alerts`.`general`=1 OR `alerts`.`country`=1 OR `alerts`.`regional`=1 OR `alerts`.`radius`=1) + GROUP BY `users`.`id` + HAVING `distance` <= '$maxdist' + ORDER BY `distance` "; + echo $query; + + // comment next line when starting to send mail not only to me + // $query = "select * from `users` where `email` like 'cacerttest%'"; + + $res = mysql_query($query); + $xrows = mysql_num_rows($res); + + while($row = mysql_fetch_assoc($res)) + { + // uncomment next line to send mails ... + sendmail($row['email'], "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + } + // 1x cc to events.cacert.org + sendmail("events@cacert.org", "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + // 1x mailing report to events.cacert.org + sendmail("events@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + + // 1x mailing report to Arbitrator of case http://wiki.cacert.org/wiki/Arbitrations/a20090525.1 + sendmail("p.dunkel@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + echo "invitation sent to $xrows recipients.\n"; + +?> diff --git a/scripts/42de-ate-leipzig-email.txt b/scripts/42de-ate-leipzig-email.txt new file mode 100644 index 0000000..ea08a75 --- /dev/null +++ b/scripts/42de-ate-leipzig-email.txt @@ -0,0 +1,39 @@ +CAcert Assurer Training Event Leipzig +:::::::::::::::::::::::::::::::::::::::::::::::::: + +Es hat sich viel getan im letzten Jahr. Eine ganze Reihe von bisher eher "muendlich ueberlieferten" Regeln wurden in Policies gegossen. Neue Prozeduren (z.B. die Assurer Challenge) und Verpflichtungen (z.B. in dem CAcert Community Agreement) wurden beschlossen. Die Assurer Training Events wollen versuchen, die ganzen Informationen unter’s Volk zu bringen: + +- Was hast du auf dem CAP Formular hinzuzufuegen, wenn du Minderjaehrige ueberpruefst ? +- Warum solltest du dir R/L/O einpraegen ? +- Wie verhaelst du dich, wenn du ein fremdes Ausweis Dokument das erste mal pruefst ? + +Antworten auf diese und weitere Fragen erhaelst du bei den Assurer Training Events (ATEs). + +Die kommende Veranstaltung in deiner Naehe findet statt am: + +Dienstag den 10. April 2012, 19:00 - 22:00 +(Dienstag nach Ostern) + +Adresse: + Universtität Leipzig / Institut fĂ¼r Informatik + Johannisgasse 26 / Raum 1-40 + 04103 Leipzig +Webseite: + [http://www.informatik.uni-leipzig.de/ifi/] +Lageplan: + [http://www.fmi.uni-leipzig.de/cms/service/lageplan.html] + + + +Das Veranstaltungs-Team freut sich schon auf Eure Teilnahme. + +Details zum Veranstaltungsort und Anfahrthinweise findet Ihr im +Wiki [https://wiki.cacert.org/Events/2012-04-10ATE-Leipzig] +Blog [http://blog.cacert.org/2012/03/555.html] + + + +Unverbindliche Anmeldung und Registrierung: +Rueckantwort mit 'Ich moechte teilnehmen: ATE-Leipzig' + +Kontakt: events@cacert.org diff --git a/scripts/42de-ate-leipzig-mail.php.txt b/scripts/42de-ate-leipzig-mail.php.txt new file mode 100644 index 0000000..d0c02b7 --- /dev/null +++ b/scripts/42de-ate-leipzig-mail.php.txt @@ -0,0 +1,114 @@ +#!/usr/bin/php -q +<? /* + LibreSSL - CAcert web application + Copyright (C) 2004-2009 CAcert Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + 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 +*/ + include_once("../includes/mysql.php"); + + $lines = ""; + $fp = fopen("42de-ate-leipzig-email.txt", "r"); + while(!feof($fp)) + { + $line = trim(fgets($fp, 4096)); + $lines .= wordwrap($line, 75, "\n")."\n"; + } + fclose($fp); + + +// $locid = intval($_REQUEST['location']); +// $maxdist = intval($_REQUEST['maxdist']); +// maxdist in [Km] - changed to 350 to include glasgow + london + $maxdist = 200; + + +// location location.ID +// verified: 29.4.09 u.schroeter +// $locid = 7902857; // Paris +// $locid = 238568; // Bielefeld +// $locid = 715191; // Hamburg +// $locid = 1102495; // London +// $locid = 520340; // Duesseldorf +// $locid = 1260319; // Muenchen +// $locid = 606058; // Frankfurt +// $locid = 1775784; // Stuttgart +// $locid = 228950; // Berlin +// $locid = 606058; // Frankfurt +// $locid = 599389; // Flensburg +// $locid = 61065; // Amsterdam, Eemnes +// $locid = 228950; // Berlin +// $locid = 2138880; // Baltimore (Baltimore (city)), Maryland, US +// $locid = 1486658; // Potsdam +// $locid = 664715; // Goteborg, Vastra Gotaland, Sweden +// $locid = 2094781; // Mission Hills (Los Angeles), California, US +// $locid = 423655; // Copenhagen, Kobenhavn*, Denmark +// $locid = 2257312; // Sydney, New South Wales, Australia +// $locid = 572764; // Essen, Nordrhein-Westfalen, Germany +// $locid = 78; // Aachen, Nordrhein-Westfalen, Germany +// $locid = 266635; // Bonn, Nordrhein-Westfalen, Germany +// $locid = 2102723; // Washington (District of Columbia, ..., US +// $locid = 2177566; // New York (Bronx), New York, United States +// $locid = 1486658; // Potsdam BLIT2011 +// $locid = 2237836; // Blacksburg (Montgomery), Virginia, United States +// $locid = 1161640; // Manchester, Manchester, United Kingdom + +// ATE Jena, DE, Mar 29 2012 +// $locid = 803095; // Jena, Thueringen, Germany +// $eventname = "ATE-Jena"; +// $city = "Mar 29, 2012"; + +// ATE Leipzig, DE, Apr 10 2012 + $locid = 1067965; // Leipzig, Sachsen, Germany + $eventname = "ATE-Leipzig"; + $city = "Apr 10, 2012"; + + + $query = "select * from `locations` where `id`='$locid'"; + $loc = mysql_fetch_assoc(mysql_query($query)); + + $query = "SELECT ROUND(6378.137 * ACOS(0.9999999*((SIN(PI() * $loc[lat] / 180) * SIN(PI() * `locations`.`lat` / 180)) + + (COS(PI() * $loc[lat] / 180 ) * COS(PI() * `locations`.`lat` / 180) * + COS(PI() * `locations`.`long` / 180 - PI() * $loc[long] / 180)))), -1) AS `distance`, sum(`points`) as pts, `users`.* + FROM `locations` + inner join `users` on `users`.`locid` = `locations`.`id` + inner join `alerts` on `users`.`id`=`alerts`.`memid` + inner join `notary` on `users`.`id`=`notary`.`to` + WHERE (`alerts`.`general`=1 OR `alerts`.`country`=1 OR `alerts`.`regional`=1 OR `alerts`.`radius`=1) + GROUP BY `users`.`id` + HAVING `distance` <= '$maxdist' + ORDER BY `distance` "; + echo $query; + + // comment next line when starting to send mail not only to me + // $query = "select * from `users` where `email` like 'cacerttest%'"; + + $res = mysql_query($query); + $xrows = mysql_num_rows($res); + + while($row = mysql_fetch_assoc($res)) + { + // uncomment next line to send mails ... + sendmail($row['email'], "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + } + // 1x cc to events.cacert.org + sendmail("events@cacert.org", "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + // 1x mailing report to events.cacert.org + sendmail("events@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + + // 1x mailing report to Arbitrator of case http://wiki.cacert.org/wiki/Arbitrations/a20090525.1 + sendmail("p.dunkel@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1); + echo "invitation sent to $xrows recipients.\n"; + +?> diff --git a/scripts/43de-ate-karlsruhe-email.txt b/scripts/43de-ate-karlsruhe-email.txt new file mode 100644 index 0000000..26af21c --- /dev/null +++ b/scripts/43de-ate-karlsruhe-email.txt @@ -0,0 +1,103 @@ +[Deutsch]
+
+Es hat sich viel getan im letzten Jahr. Eine ganze Reihe von bisher
+eher "muendlich ueberlieferten" Regeln wurden in Policies gegossen.
+Neue Prozeduren (z.B. die Assurer Challenge) und Verpflichtungen (z.B. in dem CAcert Community Agreement) wurden beschlossen. Die Assurer Training Events wollen versuchen, die ganzen Informationen unter’s Volk zu bringen:
+
+- Welcher Satz fehlt auf alten CAP Formularen?
+- Warum soll ich mir R/L/O einpraegen?
+- Wie verhaelst du dich, wenn du ein fremdes Ausweis Dokument das erste mal pruefst?
+
+Antworten auf diese und weitere Fragen erhaelst du bei den Assurer Training Events (ATEs).
+
+Darueberhinaus wird beim ATE der Vorgang der Identitaetsueberpruefung trainiert und auditiert, um die Qualitaet der Assurances in der taeglichen Praxis zu erfassen. Dabei gilt es moegliche Fehler und Fallstricke zu erkennen und aufzudecken. Die Assurer haben also die Moeglichkeit, sich mit den Fehlern auseinanderzusetzen und zu erfahren, wie diese vermieden werden koennen.
+
+As IanG said: The ATE or Assurer Training Event is exceptionally recommended for all Assurers, and include parts which contribute directly to our audit. Come and find out how you can also contribute.
+
+Die kommende Veranstaltung in deiner Naehe findet statt am:
+
+- Dienstag, den 15. Mai 2012
+- in der Zeit von: 19:00 - ca. 22:00 Uhr
+- Raum: New York
+- im FZI Forschungszentrum Informatik
+- Haid-und-Neu-Str. 10-14
+- 76131 Karlsruhe
+
+Details zum Veranstaltungsort und Anfahrthinweise findet Ihr im
+Wiki [http://wiki.cacert.org/Events/2012-05-15ATE-Karlsruhe]
+Blog [http://blog.cacert.org/2012/04/559.html]
+
+Teilnehmer Registrierung mit Rueckantwort:
+ 'Ich moechte am ATE-Karlsruhe teilnehmen'
+
+Das Veranstaltungs-Team freut sich schon auf Eure Teilnahme.
+
+Kontakt: events@cacert.org
+
+
+[French]
+
+Bon nombre de changements ont eu lieu au cours de la derniere annee au sein de CAcert. Beaucoup de regles "orales" ont ete transformees en reglements ("Policies"). De nouvelles procedures (par exemple le Challenge Assureur) et devoirs (par exemple le CAcert Community Agreement) ont ete activees. Les Assurer Training Events essaient de propager ces informations :
+
+- Que manque-t-il sur les "anciens" formulaires CAP ?
+- Pourquoi dois-je me souvenir de R/L/O ?
+- Que faire si une personne vous montre un document d'identite qui vous est inconnu ?
+
+Durant les Assurer Training Events (ATEs) vous recevrez les reponses a ces questions et a plein d'autres.
+
+De plus, les ATE vous permettent de vous entrainer a verifier les identites. Ceci sera audite afin de mesurer la qualite des assurances effectuees dans la routine quotidienne. On essaiera de vous induire en erreur. Vous aurez ainsi la possibilite de voir les problemes et d'apprendre a dejouer les pieges.
+
+Comme IanG l'a dit : il est fortement recommande aux assureurs de participer aux ATE. Le programmme contient des parties qui entrent directement en ligne de compte pour le succes de notre audit. Venez et decouvrez comment contribuer.
+
+Le prochain ATE qui aura lieu pres de chez vous sera :
+- Mardi le 15 mai 2012
+- de 19:00 a environ 22:00
+- Chambre: New York
+- dans le FZI Forschungszentrum Informatik
+- Haid-und-Neu-Str. 10-14
+- 76131 Karlsruhe
+
+NB : les exposes auront lieu en Allemand
+
+Plus de renseignements sur le lieu :
+Wiki [http://wiki.cacert.org/Events/2012-05-15ATE-Karlsruhe]
+Blog [http://blog.cacert.org/2012/04/559.html]
+
+Pour participer, repondez a ce courriel : 'Je viendrais au ATE-Karlsruhe'
+
+Le comite d'organisation se rejouit de votre venue.
+
+Contact: events@cacert.org
+
+[English]
+
+During the last year many changes took place inside CAcert. Many "oral" rules have been put into Policies. New procedures (e.g. Assurer Challenge) and obligations (e.g. CAcert Community Agreement) have been put into live. The Assurer Training Events (ATE) try to spread this information:
+
+- What is missing on the "old" CAP forms?
+- Why should I remember R/L/O?
+- What can you do if an Assuree shows an ID document unknown to you?
+
+These and more questions will be answered during the Assurer Training Events (ATEs)
+
+Furthermore, the ATE trains how to do assurances and audits assurances, to measure the quality of assurances in the daily routine. Here are some possible errors and pitfalls which need to be found. Assurers have the opportunity to see those errors and how to avoid them.
+
+As IanG said: The ATE or Assurer Training Event is exceptionally recommended for all Assurers and includes parts which contribute directly to our audit. Come and find out how you can also contribute.
+
+The next event held in your area will be:
+
+- Tuesday 15th Mai 2012
+- during 19:00 - ca. 22:00
+- Room: New York
+- in the FZI Forschungszentrum Informatik
+- Haid-und-Neu-Str. 10-14
+- 76131 Karlsruhe
+
+Details to the location can be found:
+Wiki [http://wiki.cacert.org/Events/2012-05-15ATE-Karlsruhe]
+Blog [http://blog.cacert.org/2012/04/559.html]
+
+User reply for registration: 'I will attend the ATE-Karlsruhe'
+
+The event team is looking forward for your attendance:
+
+Contact: events@cacert.org
diff --git a/scripts/43de-ate-karlsruhe-mail.php.txt b/scripts/43de-ate-karlsruhe-mail.php.txt new file mode 100644 index 0000000..afea2f2 --- /dev/null +++ b/scripts/43de-ate-karlsruhe-mail.php.txt @@ -0,0 +1,155 @@ +#!/usr/bin/php -q
+<? /*
+ LibreSSL - CAcert web application
+ Copyright (C) 2004-2009 CAcert Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ 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
+*/
+ include_once("../includes/mysql.php");
+
+ $lines = "";
+ $fp = fopen("43de-ate-karlsruhe-email.txt", "r");
+ while(!feof($fp))
+ {
+ $line = trim(fgets($fp, 4096));
+ $lines .= wordwrap($line, 75, "\n")."\n";
+ }
+ fclose($fp);
+
+
+// $locid = intval($_REQUEST['location']);
+// $maxdist = intval($_REQUEST['maxdist']);
+// maxdist in [Km]
+ $maxdist = 200;
+
+
+// location location.ID
+// verified: 29.4.09 u.schroeter
+// $locid = 7902857; // Paris
+// $locid = 238568; // Bielefeld
+// $locid = 715191; // Hamburg
+// $locid = 1102495; // London
+// $locid = 520340; // Duesseldorf
+// $locid = 1260319; // Muenchen
+// $locid = 606058; // Frankfurt
+// $locid = 1775784; // Stuttgart
+// $locid = 228950; // Berlin
+// $locid = 606058; // Frankfurt
+// $locid = 599389; // Flensburg
+// $locid = 61065; // Amsterdam, Eemnes
+// $locid = 228950; // Berlin
+
+// Software Freedom Day 19. Sept 2009
+// $locid = 715191; // Hamburg
+
+// LISA2009 Baltimore, 1.11.2009
+// $locid = 2138880; // Baltimore (Baltimore (city)), Maryland, United States
+// $city = "Baltimore, MD - Nov. 3rd 2009";
+
+// OpenSourceTreffen-Muenchen, 20.11.2009
+// $locid = 1260319; // Muenchen
+// $city = "Muenchen - 20. Nov 2009";
+
+// BLIT2009, Brandenburger Linux-Infotag, 21.11.2009
+// $locid = 1486658; // Potsdam
+// $eventname = "Brandenburger Linux-Infotag (BLIT2009)";
+// $city = "Potsdam - 21. Nov 2009";
+
+// ATE-Goteborg, 16.12.2009
+// $locid = 664715; // Goteborg, Vastra Gotaland, Sweden
+// $eventname = "ATE-Goteborg";
+// $city = "Goteborg - Dec 16th 2009";
+
+// Assurance Event Mission Hills CA, 15.01.2010
+// $locid = 2094781; // Mission Hills (Los Angeles), California, United States
+// $eventname = "Assurance Event";
+// $city = "Mission Hills CA - Jan 15th 2010";
+
+// Assurance Event OSD Copenhagen DK, 5.03.2010
+// $locid = 423655; // Copenhagen, Kobenhavn*, Denmark
+// $eventname = "Assurance Event OpenSource-Days 2010";
+// $city = "Copenhagen DK - March 5th/6th 2010";
+
+// SCALE 8x Los Angeles, CA, Feb 19-21 2010
+// $locid = 2093625; // Copenhagen, Kobenhavn*, Denmark
+// $eventname = "SCALE 8x 2010";
+// $city = "Los Angeles, CA - February 19-21 2010";
+
+// ATE Sydney, AU, Mar 24 2010
+// $locid = 2257312; // Sydney, New South Wales, Australia
+// $eventname = "ATE-Sydney";
+// $city = "March 24, 2010";
+
+// ATE Essen, DE, Sept 28 2010
+// $locid = 572764; // Essen, Nordrhein-Westfalen, Germany
+// $eventname = "ATE-Essen";
+// $city = "September 28, 2010";
+
+// ATE Aachen, DE, Oct 4th 2010
+// $locid = 78; // Aachen, Nordrhein-Westfalen, Germany
+// $eventname = "ATE-Aachen";
+// $city = "October 4th, 2010";
+
+// ATE Muenchen, DE, Apr 2nd 2011
+// $locid = 1260319; // Muenchen
+// $eventname = "ATE-Muenchen";
+// $city = "2. April, 2011";
+
+// ATE Bonn, DE, Jun 8th 2011
+// $locid = 266635; // Bonn, Nordrhein-Westfalen, Germany
+// $eventname = "ATE-Bonn";
+// $city = "8. Juni, 2011";
+
+// ATE Karlsruhe, DE, May 15th 2012
+ $locid = 873779; // Karlsruhe, Baden-Wuerttemberg, Germany
+ $eventname = "ATE-Karlsruhe";
+ $city = "15. May 2012";
+
+ $query = "select * from `locations` where `id`='$locid'";
+ $loc = mysql_fetch_assoc(mysql_query($query));
+
+ $query = "SELECT ROUND(6378.137 * ACOS(0.9999999*((SIN(PI() * $loc[lat] / 180) * SIN(PI() * `locations`.`lat` / 180)) +
+ (COS(PI() * $loc[lat] / 180 ) * COS(PI() * `locations`.`lat` / 180) *
+ COS(PI() * `locations`.`long` / 180 - PI() * $loc[long] / 180)))), -1) AS `distance`, sum(`points`) as pts, `users`.*
+ FROM `locations`
+ inner join `users` on `users`.`locid` = `locations`.`id`
+ inner join `alerts` on `users`.`id`=`alerts`.`memid`
+ inner join `notary` on `users`.`id`=`notary`.`to`
+ WHERE (`alerts`.`general`=1 OR `alerts`.`country`=1 OR `alerts`.`regional`=1 OR `alerts`.`radius`=1)
+ GROUP BY `users`.`id`
+ HAVING `distance` <= '$maxdist'
+ ORDER BY `distance` ";
+ echo $query;
+
+ // comment next line when starting to send mail not only to me
+ // $query = "select * from `users` where `email` like 'cacerttest%'";
+
+ $res = mysql_query($query);
+ $xrows = mysql_num_rows($res);
+
+ while($row = mysql_fetch_assoc($res))
+ {
+ // uncomment next line to send mails ...
+ sendmail($row['email'], "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+ }
+ // 1x cc to events.cacert.org
+ sendmail("events@cacert.org", "[CAcert.org] $eventname - $city", $lines, "events@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+ // 1x mailing report to events.cacert.org
+ sendmail("events@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+
+ // 1x mailing report to Arbitrator of case http://wiki.cacert.org/wiki/Arbitrations/a20090525.1
+ sendmail("p.dunkel@cacert.org", "[CAcert.org] $eventname - $city Report", "invitation sent to $xrows recipients.", "support@cacert.org", "", "", "CAcert Events Organisation", "returns@cacert.org", 1);
+ echo "invitation sent to $xrows recipients.\n";
+
+?>
diff --git a/scripts/cron/permissionreview.php b/scripts/cron/permissionreview.php new file mode 100755 index 0000000..572c1fd --- /dev/null +++ b/scripts/cron/permissionreview.php @@ -0,0 +1,102 @@ +#!/usr/bin/php -q +<?php +/* +LibreSSL - CAcert web application +Copyright (C) 2004-2012 CAcert Inc. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; version 2 of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +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 +*/ + +require_once(dirname(__FILE__).'/../../includes/mysql.php'); + +$BOARD_PRIVATE = 'cacert-board-private@lists.cacert.org'; + +$flags = array( + 'admin' => 'Support Engineer', + 'orgadmin' => 'Organisation Assurer', + 'board' => 'Board Member', + 'ttpadmin' => 'Trusted Third Party Admin', + 'tverify' => 'Tverify Admin', + 'locadmin' => 'Location Admin' + ); + +$adminlist = array(); + +foreach ($flags as $flag => $description) { + $query = "select `fname`, `lname`, `email` from `users` where `$flag` = 1"; + if(! $res = mysql_query($query) ) { + fwrite(STDERR, + "MySQL query for flag $flag failed:\n". + "\"$query\"\n". + mysql_error() + ); + + continue; + } + + $admins = array(); + $adminlist[$flag] = ""; + + while ($row = mysql_fetch_assoc($res)) { + $admins[] = $row; + $adminlist[$flag] .= "$row[fname] $row[lname] $row[email]\n"; + } + + foreach ($admins as $admin) { + $message = <<<EOF +Hello $admin[fname], + +you get this message, because you are listed as $description on +CAcert.org. Please review the following list of persons with the same privilege +and report to the responsible team leader or board +($BOARD_PRIVATE) if you spot any errors. + +$adminlist[$flag] + + +Best Regards, +CAcert Support +EOF; + sendmail($admin['email'], "Permissions Review", $message, 'support@cacert.org'); + } +} + + + +$message = <<<EOF +Dear Board Members, + +it's time for the permission review again. Here is the list of privileged users +in the CAcert web application. Please review them and also ask the persons +responsible for an up-to-date copy of access lists not directly recorded in the +web application (critical admins, software assessors etc.) + + +EOF; + +foreach ($flags as $flag => $description) { + $message .= <<<EOF +List of ${description}s: +$adminlist[$flag] + +EOF; +} + +$message .= <<<EOF + +Best Regards, +CAcert Support +EOF; + +sendmail($BOARD_PRIVATE, "Permissions Review", $message, 'support@cacert.org'); diff --git a/scripts/removedead.php b/scripts/cron/removedead.php index 7e47c7f..aadda81 100755 --- a/scripts/removedead.php +++ b/scripts/cron/removedead.php @@ -17,7 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - include_once("/home/cacert/www/includes/mysql.php"); + require_once(dirname(__FILE__).'/../../includes/mysql.php'); + require_once(dirname(__FILE__).'/../../includes/lib/l10n.php'); $query = "select * from `users` where `users`.`verified`=0 and (UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(`users`.`created`)) >= 172800"; @@ -67,9 +68,7 @@ if($data['language'] != "") { - $userlang = $data['language']; - putenv("LANG=".$userlang); - setlocale(LC_ALL, $userlang); + L10n::set_translation($data['language']); } $body = _("You are receiving this email because you had a temporary increase to 200 points. This has since expired and you have been reduced to 150 points.")."\n\n"; diff --git a/scripts/updatesort.php b/scripts/cron/updatesort.php index 4d36bfc..498eda2 100755 --- a/scripts/updatesort.php +++ b/scripts/cron/updatesort.php @@ -16,12 +16,27 @@ 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("../includes/mysql.php"); + require_once(dirname(__FILE__).'/../../includes/mysql.php'); - //mysql_query("update users set assurer=0"); - $query = "select notary.`to` as uid from notary group by notary.`to` having sum(points)>=100;"; + /* Set assurer flag for accounts who miss it + + See also includes/lib/account.php, function fix_assurer_flag($userID) + + We may have some performance problems here, there are 150k assurances and 220k users + in the production database. The exists-clause on cats_passed should be a good filter... */ + + /* Synchronisation of assurer flag currently deactivated, see https://bugs.cacert.org/view.php?id=1003 + and https://bugs.cacert.org/view.php?id=1024 */ +/* + $query = "select `n`.`to` as `uid` from `notary` as `n`, `users` as `u` ". + " where `n`.`to`=`u`.`id` and `u`.`assurer`<>'1' ". + " and (`n`.`expire` > now() OR `n`.`expire` IS NULL) ". + " and exists(select 1 from `cats_passed` as `cp`, `cats_variant` as `cv` ". + " where `cp`.`variant_id`=`cv`.`id` and `cv`.`type_id` = 1 and `cp`.`user_id`=`n`.`to`)". + " group by `n`.`to` having sum(`n`.`points`)>=100"; + $res = mysql_query($query); while($row = mysql_fetch_assoc($res)) { @@ -29,7 +44,28 @@ //echo $query."\n"; mysql_query($query); } - +*/ + /* Remove assurer flag from accounts not eligible. + + Also a bit performance critical, but assurer flag is only set at 5k accounts + + */ + /* Synchronisation of assurer flag currently deactivated, see https://bugs.cacert.org/view.php?id=1003 + and https://bugs.cacert.org/view.php?id=1024 */ +/* + $query = "select `u`.id as `uid` from `users` as `u` " . + " where `u`.`assurer` = '1' ". + " and (not exists(select 1 from `cats_passed` as `cp`, `cats_variant` as `cv` ". + " where `cp`.`variant_id`=`cv`.`id` and `cv`.`type_id` = 1 and `cp`.`user_id`=`u`.`id`) ". + " or (select sum(`n`.`points`) from `notary` as `n` where `n`.`to`=`u`.`id` and (`n`.`expire` > now() OR `n`.`expire` IS NULL)) < 100) "; + $res = mysql_query($query); + while($row = mysql_fetch_assoc($res)) + { + $query = "update users set `assurer`='0' where `id`='${row['uid']}'"; + //echo $query."\n"; + mysql_query($query); + } +*/ mysql_query("update `locations` set `acount`=0"); $query = "SELECT `users`.`locid` AS `locid`, count(*) AS `total` FROM `users` @@ -72,6 +108,4 @@ } - - ?> diff --git a/scripts/warning.php b/scripts/cron/warning.php index b578c09..18e89da 100755 --- a/scripts/warning.php +++ b/scripts/cron/warning.php @@ -17,7 +17,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - include_once("/home/cacert/www/includes/mysql.php"); + require_once(dirname(__FILE__).'/../../includes/mysql.php'); $days = array("1" => "3", "15" => "2", "30" => "1", "45" => "0"); diff --git a/scripts/db_migrations/version1.sh b/scripts/db_migrations/version1.sh new file mode 100755 index 0000000..48e24f9 --- /dev/null +++ b/scripts/db_migrations/version1.sh @@ -0,0 +1,164 @@ +#!/bin/sh +# LibreSSL - CAcert web application +# Copyright (C) 2004-2011 CAcert Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# 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 + + + +# script to do database migrations + +# This particular version migrates from the preversioned state to version 1 +# If you want to reuse it for further migrations you probably should pay special +# attention because you have to adjust it a bit + +set -e # script fails if any command fails + +STDIN=0 +STDOUT=1 +STDERR=2 + +if [ "$1" = "--help" ]; then + cat >&$STDERR <<- USAGE + Usage: $0 [MYSQL_OPTIONS] + You have to specify all options needed by "mysql" as if you had started + the MySQL command line client directly (including the name of the + database to operate on). The MySQL user used has to have enough + privileges to do all necessary operations (among others CREATE, ALTER, + DROP, UPDATE, INSERT, DELETE). + You might need to enter the mysql password multiple times if you + specify the -p option. + USAGE + exit 1 +fi + +mysql_opt=" --batch --skip-column-names $@" + +schema_version=$( mysql $mysql_opt <<- 'SQL' + CREATE TABLE IF NOT EXISTS `schema_version` ( + `id` int(11) PRIMARY KEY auto_increment, + `version` int(11) NOT NULL UNIQUE, + `when` datetime NOT NULL + ) DEFAULT CHARSET=latin1; + + SELECT MAX(`version`) FROM `schema_version`; +SQL +) + +if [ $schema_version != "NULL" ]; then + cat >&$STDERR <<- ERROR + Error: database schema is not in the right version to do the migration! + Expected version: 0 (i.e. the version before there was versioning) + ERROR + exit 2 +fi + + +mysql $mysql_opt <<- 'SQL' + -- CCA agreements and such + CREATE TABLE `user_agreements` ( + `id` int(11) PRIMARY KEY auto_increment, + + -- the user that agrees + `memid` int(11) NOT NULL, + + -- user that is involved in the agreement (e.g. Assurer) + `secmemid` int(11) DEFAULT NULL, + + -- what is being agreed to? e.g. CCA + `document` varchar(50) DEFAULT NULL, + + -- when did the agreement take place? + `date` datetime DEFAULT NULL, + + -- whether the user actively agreed or if the agreement took place via + -- an indirect process (e.g. Assurance) + `active` int(1) NOT NULL, + + -- in which process did the agreement take place (e.g. certificate + -- issuance, account creation, assurance) + `method` varchar(100) NOT NULL, + + -- user comment + `comment` varchar(100) DEFAULT NULL + ) DEFAULT CHARSET=latin1; + + + -- description for all certs to make identifying a cert easier + ALTER TABLE `domaincerts` ADD `description` varchar(100) NOT NULL + DEFAULT ''; + ALTER TABLE `emailcerts` ADD `description` varchar(100) NOT NULL + DEFAULT ''; + ALTER TABLE `gpg` ADD `description` varchar(100) NOT NULL + DEFAULT ''; + ALTER TABLE `orgdomaincerts` ADD `description` varchar(100) NOT NULL + DEFAULT ''; + ALTER TABLE `orgemailcerts` ADD `description` varchar(100) NOT NULL + DEFAULT ''; + + + -- Bugs #855, #863, #864, #888 + ALTER TABLE `notary` + -- allow for marking as deleted instead of really deleting + ADD `deleted` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + + -- add "TOPUP" as method for point transfers (for TTP) + MODIFY `method` + enum( + 'Face to Face Meeting', + 'Trusted Third Parties', + 'Thawte Points Transfer', + 'Administrative Increase', + 'CT Magazine - Germany', + 'Temporary Increase', + 'Unknown', + 'TOPUP' + ) NOT NULL DEFAULT 'Face to Face Meeting'; + + + + -- Organisation Assurance + ALTER TABLE `orginfo` + -- which Organisation Assurer entered the organisation? + ADD `creator_id` int(11) NOT NULL DEFAULT '0', + + -- when was the organisation entered? + ADD `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + + -- allow for marking as deleted instead of really deleting + ADD `deleted` datetime NOT NULL DEFAULT '0000-00-00 00:00:00'; + + ALTER TABLE `org` + -- which Organisation Assurer assigned the Organisation Admin? + ADD `creator_id` int(11) NOT NULL DEFAULT '0', + + -- when was the Organisation Admin assigned? + ADD `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + + -- allow for marking as deleted instead of really deleting + ADD `deleted` datetime NOT NULL DEFAULT '0000-00-00 00:00:00'; + + + + + -- Update schema version number + INSERT INTO `schema_version` + (`version`, `when`) VALUES + ('1' , NOW() ); +SQL + + +echo "Database successfully migrated to version 1" +exit 0 + diff --git a/scripts/send_thawte.php.txt b/scripts/send_thawte.php.txt new file mode 100644 index 0000000..d3a9e77 --- /dev/null +++ b/scripts/send_thawte.php.txt @@ -0,0 +1,167 @@ +#!/usr/bin/php -q +<? /* + LibreSSL - CAcert web application + Copyright (C) 2004-2009 CAcert Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + 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 +*/ + include_once("../includes/mysql.php"); + +// english (use the same for foreign language, too) + + $lines_EN = ""; + if (file_exists("thawte_EN.txt")) + { + $fp = fopen("thawte_EN.txt", "r"); + while(!feof($fp)) + { + $line = trim(fgets($fp, 4096)); + $line = wordwrap($line, 75, "\n")."\n"; + $line = mb_convert_encoding($line, "HTML-ENTITIES", "UTF-8"); + $lines_EN .= $line; + } + fclose($fp); + } + + $lines_DE = ""; + if (file_exists("thawte_DE.txt")) + { + $fp = fopen("thawte_DE.txt", "r"); + while(!feof($fp)) + { + $line = trim(fgets($fp, 4096)); + $line = wordwrap($line, 75, "\n")."\n"; + $line = mb_convert_encoding($line, "HTML-ENTITIES", "UTF-8"); + $lines_DE .= $line; + } + fclose($fp); + } + + $lines_NL = ""; + if (file_exists("thawte_NL.txt")) + { + $fp = fopen("thawte_NL.txt", "r"); + while(!feof($fp)) + { + $line = trim(fgets($fp, 4096)); + $line = wordwrap($line, 75, "\n")."\n"; + $line = mb_convert_encoding($line, "HTML-ENTITIES", "UTF-8"); + $lines_NL .= $line; + } + fclose($fp); + } + + $lines_FR = ""; + if (file_exists("thawte_FR.txt")) + { + $fp = fopen("thawte_FR.txt", "r"); + while(!feof($fp)) + { + $line = trim(fgets($fp, 4096)); + $line = wordwrap($line, 75, "\n")."\n"; + $line = mb_convert_encoding($line, "HTML-ENTITIES", "UTF-8"); + $lines_FR .= $line; + } + fclose($fp); + } + + $lines_ES = ""; + if (file_exists("thawte_ES.txt")) + { + $fp = fopen("thawte_ES.txt", "r"); + while(!feof($fp)) + { + $line = trim(fgets($fp, 4096)); + $line = wordwrap($line, 75, "\n")."\n"; + $line = mb_convert_encoding($line, "HTML-ENTITIES", "UTF-8"); + $lines_ES .= $line; + } + fclose($fp); + } + + $lines_RU = ""; + if (file_exists("thawte_RU.txt")) + { + $fp = fopen("thawte_RU.txt", "r"); + while(!feof($fp)) + { + $line = trim(fgets($fp, 4096)); + $line = wordwrap($line, 75, "\n")."\n"; + $line = mb_convert_encoding($line, "HTML-ENTITIES", "UTF-8"); + $lines_RU .= $line; + } + fclose($fp); + } + +// read last used id + $lastid = 0; + if (file_exists("send_thawte_lastid.txt")) + { + $fp = fopen("send_thawte_lastid.txt", "r"); + $lastid = trim(fgets($fp, 4096)); + fclose($fp); + } + + echo "ID now: $lastid\n"; + + + $count = 0; + + $query = "select `id`,`fname`,`lname`,`email`,`language` from `users` where `deleted` = 0 and `id` > '$lastid' order by `id`"; + + $res = mysql_query($query); + + while($row = mysql_fetch_assoc($res)) + { + $mailtxt = "Hello ${row["fname"]} ${row["lname"]},\n".$lines_EN."\n\n"; + switch ($row["language"]) + { + case "de_DE": + case "de": + $mailtxt .= $lines_DE; + break; + + case "nl_NL": + case "nl": + $mailtxt .= $lines_NL; + break; + + case "fr_FR": + case "fr": + $mailtxt .= $lines_FR; + break; + + case "es_ES": + case "es": + $mailtxt .= $lines_ES; + break; + + case "ru_RU": + case "ru": + $mailtxt .= $lines_RU; + break; + } + + sendmail($row['email'], "[CAcert.org] Changes at CAcert", $mailtxt, "mailing@cacert.org", "", "", "CAcert", "returns@cacert.org", ""); + + $fp = fopen("send_thawte_lastid.txt", "w"); + fputs($fp, $row["id"]."\n"); + fclose($fp); + + $count++; + echo "Sent ${count}th mail. User ID: ${row["id"]}\n"; + + sleep (1); + } +?> diff --git a/scripts/thawte_DE.txt b/scripts/thawte_DE.txt new file mode 100644 index 0000000..9f51516 --- /dev/null +++ b/scripts/thawte_DE.txt @@ -0,0 +1,35 @@ +Wir freuen uns, euch aktuelle Veränderungen bei CAcert zeigen zu können. + +Obwohl auch bisher schon viel getan wurde, geschah dies jedoch zumeist "unter der Haube". Heute jedoch möchten wir eine sichtbare Ă„nderung ankĂ¼ndigen: + + + 1. Ă„nderung der "Meine Punkte Seite" + +Die Punkte Liste im MenĂ¼ unter "Meine Details" -> "Meine Punkte" wird erweitert. Wesentlicher Punkt ist: Die erhaltenen und vergebenen Assurance-Punkte werden neu ermittelt. + +War fĂ¼r die Darstellung bisher ausschlaggebend, wie viele Punkte der Empfänger bereits hatte und wurde ggf. entsprechend bis auf 0 Punkte abgerundet, so werden zukĂ¼nftig genau die Punkte angezeigt, die auch vergeben wurden. Dabei kann ein Assuree auch in Zukunft nur maximal 100 Punkte durch Assurances angerechnet bekommen, indem er seine Identität Ă¼berprĂ¼fen lässt (Assurance Points). Als Assurer kann er bis zu 50 Erfahrungspunkte sammeln, indem er die Identität anderer Mitglieder Ă¼berprĂ¼ft (Experience Points). + +NatĂ¼rlich gehen durch diesen Schritt keine Punkte "verloren", sondern die Punkte werden nur verständlicher dargestellt. + +Durch die neue Darstellung wird der Berechnungsvorgang deutlich transparenter und nachvollziehbarer. Bitte schaut euch doch demnächst einmal die neue Punkteliste an. Diese findet ihr unter https://www.cacert.org/wot.php?id=15 + + + 2. Tverify Punkte Streichung + +Damit einher geht auch der kĂ¼nftige Wegfall der bei einigen Mitgliedern eventuell noch von frĂ¼her vorhandene Tverify-Punkten. Diese von der CA Thawte vergebenen Punkte können schon seit geraumer Zeit nicht mehr an CAcert-Mitglieder Ă¼bertragen werden. Die bereits vergebenen Punkte können allerdings nicht nach vergebender Person unterschieden werden und sind deshalb durch CAcert nicht Ă¼berprĂ¼fbar. Deshalb werden diese Punkte in naher Zukunft nicht mehr berĂ¼cksichtigt. Es lohnt sich also im Zweifelsfall durch weitere CAcert Assurances zusätzliche Assurance Punkte zu erhalten. + +Mit diesen MaĂŸnahmen wird ein weiterer Schritt umgesetzt, der fĂ¼r ein erfolgreiches Audit notwendig ist. Ein bestandenes Audit stellt einen wichtigen Baustein dar, um später als CA in die Browser aufgenommen zu werden. + + + 3. ĂœberprĂ¼fung der Newsletter Einstellungen + +Einen weiteren, wichtigen Punkt möchten wir hier darĂ¼ber hinaus an alle Empfänger dieses Newsletters richten: In Zukunft möchten wir gerne alle paar Monate einen Newsletter mit unseren wichtigsten Neuerungen versenden. Dieser Newsletter wurde an alle CAcert-Teilnehmer versendet. Bitte prĂ¼ft eure Einstellungen im MenĂ¼ von www.cacert.org unter "Meine Details" -> "Meine Benachrichtigungen" oder unter https://www.cacert.org/account.php?id=36 und klickt an, welche Newsletter ihr zukĂ¼nftig wirklich bekommen möchtet. In Zukunft werden wir uns auf diese Angaben verlassen und nur an diejenigen die Newsletter verschicken, die zum entsprechenden Punkt eine Information wĂ¼nschen. + + +Viele GrĂ¼ĂŸe, +Alexander Bahlo +Officer for public relations +CAcert.org + +Weitere Infos zur neuen Zählweise im CAcert Wiki: +https://wiki.cacert.org/FAQ/NewPointsCount diff --git a/scripts/thawte_EN.txt b/scripts/thawte_EN.txt new file mode 100644 index 0000000..37a5528 --- /dev/null +++ b/scripts/thawte_EN.txt @@ -0,0 +1,35 @@ + +we are proud to announce recent changes in the CAcert website. + +Although there have been quite a few changes in the past, mostly they have happened "behind the scenes". Today we can announce more visible changes: + + + 1. Change to My Points page + +The Point list in the menu under "My Details" -> "My Points" will be enhanced. Main Point is: The Assurance Points received and given will be allocated in a new way. The crucial point was the working total of Assurance Points allocated to the Assuree. Previously, only the beneficial points were displayed, and points allocated in Assurances were rounded down if in excess of 100. + +From now on, all allocated points are displayed. The Assuree can still only benefit up to a maximum of 100 Assurance Points. As an Assurer, the member may benefit up to a maximum of 50 Experience Points by assuring other members. The new list will display the calculation much more transparently. Please have a look at the new points listing at https://www.cacert.org/wot.php?id=15 + + + 2. Tverify points revoked + +Along with this change, all points allocated under the old Tverify program will be revoked in the near future. The Tverify program to transfer points allocated by Thawte Notaries across to CAcert members was stopped sometime ago. Tverify points cannot be verified by CAcert (for example, they cannot be distinguished between the different Notaries), and therefore, these points will be revoked soon. If you are unsure about your level of assurance, we recommend that you seek further assurance from CAcert Assurers. + +By performing these measures, we take another step towards a successful audit. Passing the audit is an important building block to be accepted as a CA in the internet browsers. + + + 3. Check your Alert Settings + +We would like to advise you of another important fact: In the future, we intend to send you further newsletters with our most important news, every few months. This present newsletter is being sent to all CAcert Community Member in a one-off mailing. For the future, please check your settings online at www.cacert.org under "My Details" -> "My Alert Settings" or at https://www.cacert.org/account.php?id=36 and choose which newsletters you want to receive. In the future, we intend to rely on your settings so as to send our newsletter only to those who wish to receive the specified information. + + +Best regards, +Alexander Bahlo +Officer for Public Relations +CAcert.org + +Further information on the New Points counting: +https://wiki.cacert.org/FAQ/NewPointsCount + + + diff --git a/scripts/thawte_ES.txt b/scripts/thawte_ES.txt new file mode 100644 index 0000000..4199a16 --- /dev/null +++ b/scripts/thawte_ES.txt @@ -0,0 +1,31 @@ +Anunciamos con orgullo los recientes cambios en el sitio web de Cacert + +Aunque ha habido algunos cambios en el pasado, muchos de ellos han tenido lugar “tras bambalinasâ€. Hoy, podemos anunciar cambios mĂ¡s visibles: + + +1. Cambios en la pĂ¡gina “Mis Puntos†+ +La lista de puntos en la opciĂ³n del menĂº “Mis Datos†→ “Mis puntos†ha sido mejorada. El cambio principal es que los Puntos de Seguridad recibidos y emitidos serĂ¡n mostrados bajo un nuevo esquema. Lo mĂ¡s destacado se encuentra en los Puntos de Seguridad asignados al Asegurado. Anteriormente, sĂ³lo los puntos obtenidos eran mostrados, y los puntos asignados en Certificaciones eran redondeadas a la baja si superaban los 100 puntos. + +A partir de ahora, se mostrarĂ¡n todos los puntos asignados. El Asegurado aĂºn puede beneficiarse solamente de un mĂ¡ximo de 100 Puntos de Seguridad. Como Asegurador, el miembro puede beneficiarse hasta un mĂ¡ximo de 50 puntos de experiencia al asegurar a otros miembros. El nuevo formato mostrarĂ¡ la disposiciĂ³n de una forma mucho mĂ¡s transparente. Por favor, dele un vistazo a la nueva lista de puntos en https://www.cacert.org/wot.php?id=15 + + +2. RevocaciĂ³n de los puntos Tverify + +En el conjunto de cambios, todos los puntos asignados mediante el viejo programa Tverify serĂ¡n revocados en un futuro cercano. El programa Tverify para transferir los puntos asignados por Notarios de Thawte a miembros de Cacert fue detenido hace algĂºn tiempo. Los puntos Tverify no pueden ser verificados por Cacert (por ejemplo, no se pueden distinguir los puntos emitidos por diferente notarios), y por lo tanto, dichos puntos serĂ¡n revocados en breve. Si no estĂ¡ seguro acerca de su nivel de seguridad, recomendamos que aumente su nivel de seguridad a travĂ©s de los Aseguradores de Cacert. + +Aplicando Ă©stas medidas, damos otro paso hacia una auditorĂa exitosa. Superar la auditorĂa es un elemento importante para ser aceptado como un CA (Autoridad de CertificaciĂ³n) en los navegadores de internet. + + +3. Actualice su configuraciĂ³n en la pĂ¡gina “Mi ConfiguraciĂ³n de Alertas†+ +Nos gustarĂa avisarle de otro hecho importante: En el futuro, tenemos la intenciĂ³n de enviar mĂ¡s boletines informativos con nuestras novedades y/o noticias mĂ¡s importantes cada pocos meses. Este boletĂn estĂ¡ siendo enviado en un Ăºnico correo a todos los miembros de la comunidad CAcert. Para futuros envĂos, le rogamos que revise su configuraciĂ³n en www.cacert.org en la opciĂ³n de menĂº "Mis Datos" → "Mi ConfiguraciĂ³n de Alertas" o en https://www.cacert.org/account.php?id=36 y seleccione la listas que desea recibir. Tenemos la intenciĂ³n de utilizar su configuraciĂ³n para enviar solo la informaciĂ³n que desee recibir. + + +Saludos, +Alexander Bahlo +Officer for Public Relations +CAcert.org + +Para mĂ¡s informaciĂ³n sobre la nueva cuenta de puntos +https://wiki.cacert.org/FAQ/NewPointsCount diff --git a/scripts/thawte_FR.txt b/scripts/thawte_FR.txt new file mode 100644 index 0000000..b16fa14 --- /dev/null +++ b/scripts/thawte_FR.txt @@ -0,0 +1,31 @@ +Nous sommes heureux d'annoncer les changements rĂ©cents dans le site Web de CAcert. + +Il y a eu quelques changements par le passĂ©, principalement des modifications non visibles pour l'utilisateur. Aujourd'hui, nous pouvons annoncer des changements plus importants : + + + 1. Changement sur la page "mes Points" + +La liste de points dans le menu « Mes DĂ©tails » -> « Mes Points » sera amĂ©liorĂ©e. Principalement, les accrĂ©ditations "Points reçus" et "donnĂ©s" seront allouĂ©es d'une nouvelle manière. Le point crucial a Ă©tĂ© le travail sur le total des points d'accrĂ©ditation allouĂ©s. Auparavant, seuls les points d'accrĂ©ditation Ă©taient affichĂ©s, maintenant ces points d'accrĂ©ditations ont Ă©tĂ© arrondis si le total est supĂ©rieur Ă 100. + +Le membre qui a reçu des points d'accrĂ©ditation ne peut bĂ©nĂ©ficier que d'un maximum de 100 Points. En tant qu'accrĂ©diteur, le membre peut bĂ©nĂ©ficier jusqu'Ă un maximum de 50 Points d'expĂ©rience en accrĂ©ditant d'autres membres. La nouvelle liste affichera ce calcul en dĂ©tail. Veuillez, s'il vous plait, regarder votre nouveau dĂ©compte de points Ă la page https://www.cacert.org/wot.php?id=15 + + + 2. Les points "Tverify" rĂ©voquĂ©es + +Avec ce changement, tous les points attribuĂ©s Ă la faveur de l'ancien programme "Tverify" seront rĂ©voquĂ©s prochainement. Le programme "Tverify" pour transfĂ©rer des points attribuĂ©s par des accrĂ©diteurs Thawte aux membres de CAcert a Ă©tĂ© arrĂªtĂ© il y a quelques mois. les points "Tverify" ne peuvent Ăªtre vĂ©rifiĂ©es valablement par CAcert (par exemple, on ne peut distinguer les diffĂ©rents accrĂ©diteurs les ayant attribuĂ©s), par consĂ©quent, ces points seront abrogĂ©es bientĂ´t. Si vous n'Ăªtes pas certain de votre niveau d'accrĂ©ditation, nous vous recommandons de vous renseigner auprès de la CommunautĂ© CAcert et de son support. + +En mettant en place ces mesures, nous franchisons une nouvelle Ă©tape vers la rĂ©alisation d'un audit de processus de l'Association. Cet audit est une Ă©tape importante pour Ăªtre acceptĂ© comme une AutoritĂ© de Certification dans les navigateurs Internet. + + + 3. VĂ©rifiez vos paramètres d'alerte + +Nous tenons Ă vous informer d'autres faits importants : Ă l'avenir, nous comptons vous envoyer d'autres bulletins d'informations importantes, pĂ©riodiquement, au fil des mois. Ce prĂ©sent bulletin est envoyĂ© ponctuellement Ă tous les membres de la communautĂ© CAcert. Veuillez vĂ©rifier en ligne vos paramètres de rĂ©ception d'information sur www.cacert.org dans "Mes Details" -> "Mes paramètres d'alerte" ou Ă https://www.cacert.org/account.php?id=36 et choisissez les bulletins vous voulez recevoir. Ă€ l'avenir, nous avons l'intention de nous appuyer sur vos paramètres afin d'envoyer nos bulletins d'information Ă ceux qui dĂ©sirent les recevoir. + + +Cordialement, +Alexander Bahlo +Responsable des Relations Publiques +CAcert.org + +Plus d'informations sur le nouveau dĂ©compte des Points : +https://wiki.cacert.org/FAQ/NewPointsCount diff --git a/scripts/thawte_NL.txt b/scripts/thawte_NL.txt new file mode 100644 index 0000000..55e0531 --- /dev/null +++ b/scripts/thawte_NL.txt @@ -0,0 +1,35 @@ +We zijn blij u te laten weten dat recent onze CAcert website een aantal veranderingen heeft ondergaan. + +Ook al zijn er al vele wijzigingen geweest in het verleden, de meeste hiervan waren alleen achter de schermen zichtbaar. Vandaag kunnen we een aantal meer zichtbare veranderingen aankondigen: + + + 1. Veranderingen aan de 'Mijn Punten' pagina. + +De punten lijst, te vinden onder "Mijn Details" -> "Mijn Punten" in het menu, zal verbeteren. +Belangrijkste wijziging: De Waarmerk punten die u ontvangt en geeft zullen op een nieuwe manier toegekend worden. De cruciale verandering is de aanpassing hoe het totaal aantal toegewezen Waarmerk Punten aan de gewaarmerkte wordt getoond. In het verleden werden alleen de punten getoond welke strict noodzakelijk waren, waarbij afgerond werd naar beneden als het totaal boven de 100 punten kwam. + +Vanaf nu zullen alle toegewezen punten worden getoond. De Gewaarmerkte kan nog steeds maar profiteren van maximaal 100 Waarmerk Punten. Als waarmerker kan een deelnemer maximaal profiteren van 50 Ervarings-Punten door andere deelnemers te waarmerken. De nieuwe lijst zal de berekening transparanter maken. Neem a.u.b. een kijkje op https://www.cacert.org/wot.php?id=15 om te zien hoe de nieuwe punten weergave er uit ziet. + + + 2. Tverify punten ingetrokken. + +Samen met deze verandering zullen ook alle punten die in het verleden zijn toegewezen onder het oude 'Tverify programma' over afzienbare tijd worden ingetrokken. Het Tverify programma (om punten toegekend door Thawte Waarmerkers over te zetten naar CAcert Deelnemers) is al enige tijd geleden stil gezet. Tverify punten vallen buiten de controle van CAcert (er kan bijvoorbeeld geen onderscheid worden gemaakt tussen verschillende waarmerkers), daarom worden deze punten binnen afzienbare tijd ingetrokken. +Als u niet zeker bent over uw waarmerk niveau, raden wij u aan meer waarmerkingen te zoeken bij CAcert Waarmerkers. + +Door deze stappen te nemen komt een succesvolle audit een stap dichterbij. De audit rond krijgen is belangrijk om geaccepteerd te worden als CA in de internetbrowsers. + + + 3. Controleer uw Waarschuwing instellingen. + +Wij willen u graag wijzen op een ander belangrijk feit: In de toekomst willen wij u graag, eens in de zoveel maanden, een nieuwsbrief sturen met belangrijk nieuws. +Deze eenmalige nieuwsbrief hebben we naar alle CAcert deelnemers toe gestuurd. Controleer s.v.p. uw instellingen, te vinden op www.cacert.org onder "Mijn Gegevens" -> "Mijn Waarschuwingen" of op https://www.cacert.org/account.php?id=36, en geef aan welke nieuwsbrieven u wilt ontvangen. In de toekomst zullen wij u alleen de door u aangegeven nieuwsbrieven toesturen. + + +Met vriendelijke groet, + +Alexander Bahlo +Officer for Public Relations +CAcert.org + +Meer informatie over het Nieuwe Punten tel systeem is te vinden op: +https://wiki.cacert.org/FAQ/NewPointsCount diff --git a/scripts/thawte_RU.txt b/scripts/thawte_RU.txt new file mode 100644 index 0000000..84548af --- /dev/null +++ b/scripts/thawte_RU.txt @@ -0,0 +1,31 @@ +MÑ‹ Ñ€Đ°Đ´Ñ‹ ÑĐ¾Đ¾Đ±Ñ‰Đ¸Ñ‚ÑŒ Đ¾Đ± Đ¸Đ·Đ¼ĐµĐ½ĐµĐ½Đ¸ÑÑ… Đ½Đ° Đ²ĐµĐ±-ÑĐ°Đ¹Ñ‚Đµ CAcert. + +Đ˜Đ·Đ¼ĐµĐ½ĐµĐ½Đ¸Ñ Đ±Ñ‹Đ»Đ¸ и Ñ€Đ°Đ½ÑŒÑˆĐµ, Đ½Đ¾ Đ¿Ñ€Đ¾Ñ…Đ¾Đ´Đ¸Đ»Đ¸ Đ¾Đ½Đ¸ Đ±Đ¾Đ»ÑŒÑˆĐµĐ¹ Ñ‡Đ°ÑÑ‚ÑŒÑ "Đ·Đ° ÑÑ†ĐµĐ½Đ¾Đ¹". Đ¡ĐµĐ³Đ¾Đ´Đ½Ñ Đ¼Ñ‹ Ñ…Đ¾Ñ‚Đ¸Đ¼ ÑĐ¾Đ¾Đ±Ñ‰Đ¸Ñ‚ÑŒ Đ¾ Đ½Đ°Đ¸Đ±Đ¾Đ»ĐµĐµ Đ²Đ°Đ¶Đ½Ñ‹Ñ… из Đ½Đ¸Ñ…: + + + 1. Đ˜Đ·Đ¼ĐµĐ½ĐµĐ½Đ¸Ñ Đ² ÑÑ‚Ñ€Đ°Đ½Đ¸Ñ†Đµ My Points (ĐœĐ¾Đ¸ Đ¿ÑƒĐ½ĐºÑ‚Ñ‹) + +Đ¡Đ¿Đ¸ÑĐ¾Đº Đ¿ÑƒĐ½ĐºÑ‚Đ¾Đ² Đ´Đ¾ÑÑ‚ÑƒĐ¿Đ½Ñ‹Đ¹ Đ² Đ¼ĐµĐ½Ñ "My Details" -> "My Points" Đ±ÑƒĐ´ĐµÑ‚ уÑĐ¾Đ²ĐµÑ€ÑˆĐµĐ½ÑÑ‚Đ²Đ¾Đ²Đ°Đ½. Đ“Đ»Đ°Đ²Đ½Đ¾Đµ Đ¸Đ·Đ¼ĐµĐ½ĐµĐ½Đ¸Đµ: Đ²Ñ‹Đ´Đ°Đ½Đ½Ñ‹Đµ и Đ¿Đ¾Đ»ÑƒÑ‡ĐµĐ½Đ½Ñ‹Đµ ĐŸÑƒĐ½ĐºÑ‚Ñ‹ ĐŸĐ¾Đ´Ñ‚Đ²ĐµÑ€Đ¶Đ´ĐµĐ½Đ¸Ñ (Assurance Points) Đ±ÑƒĐ´ÑƒÑ‚ Đ½Đ°Ñ‡Đ¸ÑĐ»ÑÑ‚ÑŒÑÑ Đ¿Đ¾-Đ½Đ¾Đ²Đ¾Đ¼Ñƒ, Đ° Đ¸Đ¼ĐµĐ½Đ½Đ¾ Đ² Ñ‚Đ¾Đ¼, Ñ‡Ñ‚Đ¾ ĐºĐ°ÑĐ°ĐµÑ‚ÑÑ ÑÑƒĐ¼Đ¼Đ°Ñ€Đ½Đ¾Đ³Đ¾ ĐºĐ¾Đ»Đ¸Ñ‡ĐµÑÑ‚Đ²Đ¾ Đ¿ÑƒĐ½ĐºÑ‚Đ¾Đ², Đ½Đ°Ñ‡Đ¸ÑĐ»ĐµĐ½Đ½Ñ‹Ñ… Đ¿Đ¾Đ´Ñ‚Đ²ĐµÑ€Đ¶Đ´Đ°ĐµĐ¼Đ¾Đ¼Ñƒ ÑƒÑ‡Đ°ÑÑ‚Đ½Đ¸ĐºÑƒ (Assuree). Đ Đ°Đ½ÑŒÑˆĐµ Đ¿Đ¾ĐºĐ°Đ·Ñ‹Đ²Đ°Đ»Đ¸ÑÑŒ Ñ‚Đ¾Đ»ÑŒĐºĐ¾ Đ´ĐµĐ¹ÑÑ‚Đ²ÑƒÑÑ‰Đ¸Đµ Đ¿ÑƒĐ½ĐºÑ‚Ñ‹, Đ° Ñ‚Đµ, Ñ‡Ñ‚Đ¾ Đ¿Ñ€ĐµĐ²Ñ‹ÑˆĐ°Đ»Đ¸ Đ³Ñ€Đ°Đ½Đ¸Ñ†Ñƒ Đ² 100 Đ¿ÑƒĐ½ĐºÑ‚Đ¾Đ², Đ¿Ñ€Đ¾ÑÑ‚Đ¾ Đ¾ĐºÑ€ÑƒĐ³Đ»ÑлиÑÑŒ Đ´Đ¾ Đ·Đ½Đ°Ñ‡ĐµĐ½Đ¸Ñ 100. + +Đ¢ĐµĐ¿ĐµÑ€ÑŒ Đ¿Đ¾ĐºĐ°Đ·Ñ‹Đ²Đ°ÑÑ‚ÑÑ Đ²Ñе Đ½Đ°Ñ‡Đ¸ÑĐ»ĐµĐ½Đ½Ñ‹Đµ Đ¿ÑƒĐ½ĐºÑ‚Ñ‹. ĐŸĐ¾Đ´Ñ‚Đ²ĐµÑ€Đ¶Đ´Đ°ĐµĐ¼Ñ‹Đ¹ (Assuree) Đ¿Đ¾-Đ¿Ñ€ĐµĐ¶Đ½ĐµĐ¼Ñƒ Đ¼Đ¾Đ¶ĐµÑ‚ Đ·Đ°Ñ€Đ°Đ±Đ¾Ñ‚Đ°Ñ‚ÑŒ Đ¼Đ°ĐºÑĐ¸Đ¼ÑƒĐ¼ 100 Đ¿ÑƒĐ½ĐºÑ‚Đ¾Đ². ĐŸĐ¾Đ´Ñ‚Đ²ĐµÑ€Đ¶Đ´Đ°ÑÑ‰Đ¸Đ¹ (Assurer) Đ¼Đ¾Đ¶ĐµÑ‚ Đ·Đ°Ñ€Đ°Đ±Đ¾Ñ‚Đ°Ñ‚ÑŒ ĐµÑ‰Ñ‘ Đ´Đ¾ 50 Đ¿ÑƒĐ½ĐºÑ‚Đ¾Đ² Đ¿Đ¾Đ´Ñ‚Đ²ĐµÑ€Đ¶Đ´Đ°Ñ Đ´Ñ€ÑƒĐ³Đ¸Ñ…. Đ’ Đ½Đ¾Đ²Đ¾Đ¼ ÑĐ¿Đ¸ÑĐºĐµ ÑÑ‚Đ¸ Đ²Ñ‹Ñ‡Đ¸ÑĐ»ĐµĐ½Đ¸Ñ Đ±ÑƒĐ´ÑƒÑ‚ Đ¿Đ¾ĐºĐ°Đ·Đ°Đ½Ñ‹ Đ±Đ¾Đ»ĐµĐµ Đ¿Ñ€Đ¾Đ·Ñ€Đ°Ñ‡Đ½Đ¾. ĐŸĐ¾Đ¶Đ°Đ»ÑƒĐ¹ÑÑ‚Đ°, Đ¿Đ¾ÑĐ¼Đ¾Ñ‚Ñ€Đ¸Ñ‚Đµ Đ½Đ° Đ½Đ¾Đ²Ñ‹Đ¹ ÑĐ¿Đ¸ÑĐ¾Đº здеÑÑŒ: https://www.cacert.org/wot.php?id=15 + + + 2. ĐÑ‚Đ¾Đ·Đ²Đ°Đ½Ñ‹ Đ¿ÑƒĐ½ĐºÑ‚Ñ‹ Tverify + +Đ’ ÑĐ²Ñзи Ñ ÑÑ‚Đ¸Đ¼, Đ²Ñе Đ¿ÑƒĐ½ĐºÑ‚Ñ‹, ĐºĐ¾Ñ‚Đ¾Ñ€Ñ‹Đµ Đ±Ñ‹Đ»Đ¸ Đ½Đ°Ñ‡Đ¸ÑĐ»ĐµĐ½Ñ‹ Đ¿Đ¾ ÑÑ‚Đ°Ñ€Đ¾Đ¹ Đ¿Ñ€Đ¾Đ³Ñ€Đ°Đ¼Đ¼Đµ Tverify, Đ±ÑƒĐ´ÑƒÑ‚ ÑƒĐ´Đ°Đ»ĐµĐ½Ñ‹ Đ² Đ±Đ»Đ¸Đ¶Đ°Đ¹ÑˆĐµĐ¼ Đ±ÑƒĐ´ÑƒÑ‰ĐµĐ¼. ĐŸÑ€Đ¾Đ³Ñ€Đ°Đ¼Đ¼Đ° Tverify Đ¿Đ¾ Đ¿ĐµÑ€ĐµĐ´Đ°Ñ‡Đµ Đ¿ÑƒĐ½ĐºÑ‚Đ¾Đ², Đ²Ñ‹Đ´Đ°Đ½Đ½Ñ‹Ñ… Đ½Đ¾Ñ‚Đ°Ñ€Đ¸ÑƒÑĐ°Đ¼Đ¸ Thawte ÑƒÑ‡Đ°ÑÑ‚Đ½Đ¸ĐºĐ°Đ¼ CAcert, Đ±Ñ‹Đ»Đ° Đ½ĐµĐºĐ¾Ñ‚Đ¾Ñ€Đ¾Đµ Đ²Ñ€ĐµĐ¼Ñ Đ½Đ°Đ·Đ°Đ´ Đ¿Ñ€Đ¸Đ¾ÑÑ‚Đ°Đ½Đ¾Đ²Đ»ĐµĐ½Đ°. ĐŸÑƒĐ½ĐºÑ‚Ñ‹ Thawte Đ½Đµ Đ¼Đ¾Đ³ÑƒÑ‚ Đ±Ñ‹Ñ‚ÑŒ Đ¿Ñ€Đ¾Đ²ĐµÑ€ĐµĐ½Ñ‹ CAcert (Đ½Đ°Đ¿Ñ€Đ¸Đ¼ĐµÑ€, Đ½ĐµĐ»ÑŒĐ·Ñ Ñ€Đ°Đ·Đ»Đ¸Ñ‡Đ¸Ñ‚ÑŒ Đ¿ÑƒĐ½ĐºÑ‚Ñ‹, Đ²Ñ‹Đ´Đ°Đ½Đ½Ñ‹Đµ Ñ€Đ°Đ·Đ½Ñ‹Đ¼Đ¸ Đ½Đ¾Ñ‚Đ°Ñ€Đ¸ÑƒÑĐ°Đ¼Đ¸), Đ² ÑĐ²Ñзи Ñ Ñ‡ĐµĐ¼ Ñ‚Đ°ĐºĐ¸Đµ Đ¿ÑƒĐ½ĐºÑ‚Ñ‹ Đ² Đ±Đ»Đ¸Đ¶Đ°Đ¹ÑˆĐµĐ¼ Đ²Ñ€ĐµĐ¼ĐµĐ½Đ¸ Đ±ÑƒĐ´ÑƒÑ‚ ÑƒĐ´Đ°Đ»ĐµĐ½Ñ‹. Đ•Ñли Đ²Ñ‹ ÑĐ¾Đ¼Đ½ĐµĐ²Đ°ĐµÑ‚ĐµÑÑŒ Đ² ÑĐ²Đ¾Ñ‘Đ¼ ÑƒÑ€Đ¾Đ²Đ½Đµ Đ¿Đ¾Đ´Ñ‚Đ²ĐµÑ€Đ¶Đ´ĐµĐ½Đ¸Ñ (level of assurance), ÑĐ¾Đ²ĐµÑ‚ÑƒĐµĐ¼ Đ²Đ°Đ¼ Đ¿Ñ€Đ¾Đ¹Ñ‚Đ¸ Đ´Đ¾Đ¿Đ¾Đ»Đ½Đ¸Ñ‚ĐµĐ»ÑŒĐ½Đ¾Đµ Đ¿Đ¾Đ´Ñ‚Đ²ĐµÑ€Đ¶Đ´ĐµĐ½Đ¸Đµ у ÑƒÑ‡Đ°ÑÑ‚Đ½Đ¸ĐºĐ¾Đ² CAcert, Đ¸Đ¼ĐµÑÑ‰Đ¸Ñ… Đ¿Ñ€Đ°Đ²Đ¾ Đ¿Đ¾Đ´Ñ‚Đ²ĐµÑ€Đ¶Đ´ĐµĐ½Đ¸Ñ (CAcert Assurers). + +ĐŸÑ€ĐµĐ´Đ¿Ñ€Đ¸Đ½Đ¸Đ¼Đ°Ñ ÑÑ‚Đ¸ Đ¼ĐµÑ€Ñ‹, Đ¼Ñ‹ Đ´ĐµĐ»Đ°ĐµĐ¼ ĐµÑ‰Ñ‘ Đ¾Đ´Đ¸Đ½ ÑˆĐ°Đ³ Đº уÑĐ¿ĐµÑˆĐ½Đ¾Đ¼Ñƒ Đ°ÑƒĐ´Đ¸Ñ‚Ñƒ. ĐŸÑ€Đ¾Đ¹Ñ‚Đ¸ Đ°ÑƒĐ´Đ¸Ñ‚ — ÑÑ‚Đ¾ Đ²Đ°Đ¶Đ½Ñ‹Đ¹ ÑĐ»ĐµĐ¼ĐµĐ½Ñ‚, Đ´Đ»Ñ Ñ‚Đ¾Đ³Đ¾ Ñ‡Ñ‚Đ¾Đ±Ñ‹ ÑÑ‚Đ°Ñ‚ÑŒ Đ¿Ñ€Đ¸Đ½ÑÑ‚Ñ‹Đ¼ CA Đ² Đ˜Đ½Ñ‚ĐµÑ€Đ½ĐµÑ‚-Đ±Ñ€Đ°ÑƒĐ·ĐµÑ€Đ°Ñ…. + + + 3. ĐŸÑ€Đ¾Đ²ĐµÑ€ÑŒÑ‚Đµ Đ²Đ°ÑˆĐ¸ Đ½Đ°ÑÑ‚Ñ€Đ¾Đ¹ĐºĐ¸ Đ¾Đ¿Đ¾Đ²ĐµÑ‰ĐµĐ½Đ¸Đ¹ (Alert Settings) + +ĐœÑ‹ Ñ…Đ¾Ñ‚ĐµĐ»Đ¸ Đ±Ñ‹ ÑĐ¾Đ¾Đ±Ñ‰Đ¸Ñ‚ÑŒ Đ²Đ°Đ¼ Đ¾Đ± ĐµÑ‰Ñ‘ Đ¾Đ´Đ½Đ¾Đ¼ Đ²Đ°Đ¶Đ½Đ¾Đ¼ Ñ„Đ°ĐºÑ‚Đµ: Đ² Đ±ÑƒĐ´ÑƒÑ‰ĐµĐ¼ Đ¼Ñ‹ Đ½Đ°Đ¼ĐµÑ€ĐµĐ½Ñ‹ ĐºĐ°Đ¶Đ´Ñ‹Đµ Đ½ĐµÑĐºĐ¾Đ»ÑŒĐºĐ¾ Đ¼ĐµÑÑÑ†ĐµĐ² Đ¾Ñ‚Đ¿Ñ€Đ°Đ²Đ»ÑÑ‚ÑŒ Đ²Đ°Đ¼ Đ¿Đ¾Ñ‡Ñ‚Đ¾Đ²Ñ‹Đµ ÑĐ¾Đ¾Đ±Ñ‰ĐµĐ½Đ¸Ñ Ñ Đ½Đ°Đ¸Đ±Đ¾Đ»ĐµĐµ Đ²Đ°Đ¶Đ½Ñ‹Đ¼Đ¸ Đ½Đ¾Đ²Đ¾ÑÑ‚ÑĐ¼Đ¸. Đ¡ĐµĐ¹Ñ‡Đ°Ñ Đ¼Ñ‹ Đ¾Ñ‚Đ¿Ñ€Đ°Đ²Đ»ÑĐµĐ¼ Đ¾Đ´Đ½Đ¾ ÑĐ¾Đ¾Đ±Ñ‰ĐµĐ½Đ¸Đµ ÑĐ¾ Đ²ÑĐµĐ¼Đ¸ Đ½Đ¾Đ²Đ¾ÑÑ‚ÑĐ¼Đ¸ Đ²Đ½ÑƒÑ‚Ñ€Đ¸. Đ’ Đ±ÑƒĐ´ÑƒÑ‰ĐµĐ¼ Đ¼Ñ‹ Ñ…Đ¾Ñ‚Đ¸Đ¼ Đ¾Ñ‚Đ¿Ñ€Đ°Đ²Đ»ÑÑ‚ÑŒ Đ²Đ°Đ¼ ÑĐ¾Đ¾Đ±Ñ‰ĐµĐ½Đ¸Ñ Đ¸ÑÑ…Đ¾Đ´Ñ Đ¸Đ· Ñ‚Đ¾Đ³Đ¾, ĐºĐ°ĐºĐ¸Đµ Ñ‚ĐµĐ¼Ñ‹ Đ²Ñ‹ ÑƒĐºĐ°Đ¶ĐµÑ‚Đµ Đ² ÑĐ²Đ¾Đ¸Ñ… Đ½Đ°ÑÑ‚Ñ€Đ¾Đ¹ĐºĐ°Ñ…. ĐŸÑ€Đ¾Đ²ĐµÑ€ÑŒÑ‚Đµ, Đ¿Đ¾Đ¶Đ°Đ»ÑƒĐ¹ÑÑ‚Đ°, ÑĐ²Đ¾Đ¸ Đ½Đ°ÑÑ‚Ñ€Đ¾Đ¹ĐºĐ¸ Đ² "My Details" -> "My Alert Settings" или Đ½Đ° https://www.cacert.org/account.php?id=36, и Đ²Ñ‹Đ±ĐµÑ€Đ¸Ñ‚Đµ, ĐºĐ°ĐºĐ¸Đµ ÑĐ¾Đ¾Đ±Ñ‰ĐµĐ½Đ¸Ñ Đ²Ñ‹ Ñ…Đ¾Ñ‚Đ¸Ñ‚Đµ Đ¿Đ¾Đ»ÑƒÑ‡Đ°Ñ‚ÑŒ. + + +Đ¡ Đ½Đ°Đ¸Đ»ÑƒÑ‡ÑˆĐ¸Đ¼Đ¸ Đ¿Đ¾Đ¶ĐµĐ»Đ°Đ½Đ¸ÑĐ¼Đ¸, +ĐĐ»ĐµĐºÑĐ°Đ½Đ´Ñ€ Đ‘Đ°Ñ…Đ»Đ¾ (Alexander Bahlo) +ĐÑ‚Đ²ĐµÑ‚ÑÑ‚Đ²ĐµĐ½Đ½Ñ‹Đ¹ Đ¿Đ¾ ÑĐ²ÑĐ·ÑĐ¼ Ñ Đ¾Đ±Ñ‰ĐµÑÑ‚Đ²ĐµĐ½Đ½Đ¾ÑÑ‚ÑŒÑ CAcert.org +(Officer for Public Relations CAcert.org) + +Đ”Đ¾Đ¿Đ¾Đ»Đ½Đ¸Ñ‚ĐµĐ»ÑŒĐ½Đ°Ñ Đ¸Đ½Ñ„Đ¾Ñ€Đ¼Đ°Ñ†Đ¸Ñ Đ¾ Đ¿Đ¾Đ´ÑÑ‡Ñ‘Ñ‚Đµ Đ¿ÑƒĐ½ĐºÑ‚Đ¾Đ²: +https://wiki.cacert.org/FAQ/NewPointsCount diff --git a/www/account.php b/www/account.php index 434053f..d1dd695 100644 --- a/www/account.php +++ b/www/account.php @@ -64,6 +64,10 @@ die("No such file."); } exit; + } else if ($id == 37) { + $protocol = $_SERVER['HTTPS'] ? 'https' : 'http'; + $newUrl = $protocol . '://wiki.cacert.org/FAQ/AboutUs'; + header('Location: '.$newUrl, true, 301); // 301 = Permanently Moved } else { showheader(_("My CAcert.org Account!")); includeit($id, "account"); diff --git a/www/advertising.php b/www/advertising.php index e987461..43e4f93 100644 --- a/www/advertising.php +++ b/www/advertising.php @@ -47,7 +47,7 @@ if($months < 1 || $months > 12) { $id = 1; - $errmsg .= _("You can only place an advertisement for up to 12 months.<br />"); + $errmsg .= _("You can only place an advertisement for up to 12 months.")."<br />"; $process=""; $oldid=0; } @@ -55,7 +55,7 @@ if(strlen($title) <= 5) { $id = 1; - $errmsg .= _("Link title was too short.<br />"); + $errmsg .= _("Link title was too short.")."<br />"; $process=""; $oldid=0; } @@ -63,7 +63,7 @@ if(strlen($link) <= 10) { $id = 1; - $errmsg .= _("Link URI was too short.<br />"); + $errmsg .= _("Link URI was too short.")."<br />"; $process=""; $oldid=0; } diff --git a/www/cap.php b/www/cap.php index 6b08d38..73380e1 100644 --- a/www/cap.php +++ b/www/cap.php @@ -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 */ - if($_SESSION['_config']['language'] != "ja_JP") + if($_SESSION['_config']['language'] != "ja") { define('FPDF_FONTPATH','/usr/share/fpdf/font/'); require_once('/usr/share/ufpdf/fpdf.php'); @@ -35,7 +35,7 @@ { $this->Image((array_key_exists('bw',$_REQUEST) && $_REQUEST['bw'])?'images/CAcert-logo-mono-1000.png':'images/CAcert-logo-colour-1000.png',8,8,100); $this->SetFont('Arial','B',14); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','',14); $this->Cell(100); $this->Cell(40,20,recode($_SESSION['_config']['recode'], _("CAcert Assurance Programme"))); @@ -46,12 +46,12 @@ $this->SetY(36); $this->SetFont('Arial','I',8); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','I',8); $this->Cell(0,0,'CAcert Inc. - P.O. Box 4107 - Denistone East NSW 2112 - Australia - http://www.CAcert.org',0,0,'C'); $this->Ln(3); $this->SetFont('Arial','',6); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','',6); $this->Cell(0,0, recode($_SESSION['_config']['recode'], _("CAcert's Root Certificate fingerprints")).": A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B "._("and")." 135C EC36 F49C B8E9 3B1A B270 CD80 8846 76CE 8F33",0,0,'C'); $this->SetLineWidth(0.05); @@ -71,7 +71,7 @@ // Show text blurb at top of page $this->SetY(45); $this->SetFont('Arial','',10); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','',10); $this->Write(4,sprintf(recode($_SESSION['_config']['recode'], _("To the Assurer: The CAcert Assurance Programme (CAP) aims to verify the identities of Internet users through face-to-face witnessing of government issued identity documents. The Applicant asks you to verify to CAcert.org that you have met them and verified their identity against one or more original, trusted, government photo identity documents. If you have ANY doubts or concerns about the Applicant's identity, DO NOT COMPLETE OR SIGN this form. For more information about the CAcert Assurance Programme, including detailed guides for CAcert Assurers, please visit: %s")), "http://www.CAcert.org")); $this->Ln(10); @@ -84,21 +84,21 @@ $this->Rect(11, $top, $this->w - 25, 60, "D"); //50 -> 60 $this->SetXY(11, $top + 5); $this->SetFont("Arial", "BUI", "20"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','BUI',20); $this->Write(0, recode($_SESSION['_config']['recode'], _("Applicant's Statement"))); $this->Rect(13, $top + 10, $this->w - 29, 6, "D"); $this->Line(80, $top + 10, 80, $top + 16); $this->SetXY(15, $top + 13); $this->SetFont("Arial", "B", "12"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','B',12); $this->Write(0, recode($_SESSION['_config']['recode'], _("Names")).":"); if($name) { $this->SetXY(82, $top + 13); $this->SetFont("Arial", '', "11"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','',11); $this->Write(0, $name); } @@ -106,18 +106,18 @@ $this->Line(80, $top + 16, 80, $top + 22); $this->SetXY(15, $top + 19); $this->SetFont("Arial", "B", "12"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','B',12); $this->Write(0, recode($_SESSION['_config']['recode'], _("Date of Birth")).": "); $this->SetFont("Arial", "", "8"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','',8); $this->Write(0, "(".recode($_SESSION['_config']['recode'], _("YYYY-MM-DD")).")"); if($dob) { $this->SetXY(82, $top + 19); $this->SetFont("Arial", "", "11"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','',11); $this->Write(0, $dob); } @@ -125,26 +125,26 @@ $this->Line(80, $top + 22, 80, $top + 28); $this->SetXY(15, $top + 25); $this->SetFont("Arial", "B", "12"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','B',12); $this->Write(0, recode($_SESSION['_config']['recode'], _("Email Address")).":"); if($email) { $this->SetXY(82, $top + 25); $this->SetFont("Arial", "", "11"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','',11); $this->Write(0, $email); } $this->SetXY(13, $top + 32); $this->SetFont("Arial", "", "9"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','',9); $this->MultiCell($this->w - 29, 3, recode($_SESSION['_config']['recode'], _("I hereby confirm that the information stated above is both true and correct, and request the CAcert Assurer (identified below) to verify me according to CAcert Assurance Policy."))); // new da start $this->SetXY(13, $top + 42); $this->SetFont("Arial", "", "9"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','',9); $this->MultiCell($this->w - 29, 3, recode($_SESSION['_config']['recode'], _("I agree to the CAcert Community Agreement.")." ( http://www.cacert.org/policy/CAcertCommunityAgreement.php )")); // new da end @@ -157,7 +157,7 @@ $this->Write(0, "20___-___-___"); } else { $this->SetFont("Arial", "U", "10"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','U',10); $this->Write(0, str_pad($date, 13, " ")); } @@ -167,18 +167,18 @@ $this->Rect(11, $top, $this->w - 25, 83, "D"); //63->93 $this->SetXY(11, $top + 5); $this->SetFont("Arial", "BUI", "20"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','BUI',20); $this->Write(0, recode($_SESSION['_config']['recode'], _("CAcert Assurer"))); $this->SetFont("Arial", "", "9"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','',9); $this->SetXY(13, $top + 15); if($assurer) { $this->Write(0, recode($_SESSION['_config']['recode'], _("Assurer's Name")).": "); $this->SetFont("Arial", "", "10"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','U',10); // $this->MultiCell($this->w - 70, 2, recode($_SESSION['_config']['recode'], $assurer)); $this->Write(0, str_pad($assurer, 50, " ")); @@ -187,7 +187,7 @@ $this->Write(0, recode($_SESSION['_config']['recode'], _("Assurer's Name")).": ________________________________________________________________"); } $this->SetFont("Arial", "", "9"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','',9); $this->SetXY(13, $top + 22); $this->MultiCell($this->w - 34, 3, recode($_SESSION['_config']['recode'], _("Photo ID Shown: (ID types, not numbers. eg Drivers license, Passport)"))); @@ -198,12 +198,12 @@ } else { $this->Write(0, "1. "); $this->SetFont("Arial", "U", "10"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','U',10); $this->Write(0, str_pad($document1, 90, " ")); } $this->SetFont("Arial", "", "9"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','',9); $this->SetXY(13, $top + 35); if($document2 == "") @@ -212,12 +212,12 @@ } else { $this->Write(0, "2. "); $this->SetFont("Arial", "U", "10"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','U',10); $this->Write(0, str_pad($document2, 90, " ")); } $this->SetFont("Arial", "", "9"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','',9); $this->SetXY(13, $top + 45); $this->Write(0, recode($_SESSION['_config']['recode'], _("Location of Face-to-face Meeting")).": "); @@ -226,12 +226,12 @@ $this->Write(0, "_____________________________________________"); } else { $this->SetFont("Arial", "U", "10"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','U',10); $this->Write(0, str_pad($location, 70, " ")); } $this->SetFont("Arial", "", "9"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','',9); $this->SetXY(13, $top + 50); if($maxpoints > 0) @@ -241,7 +241,7 @@ $this->Write(0, recode($_SESSION['_config']['recode'], _("Points Allocated")).": ______________"); } $this->SetFont("Arial", "", "9"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','',9); $this->SetXY(13, $top + 54); $this->MultiCell($this->w - 33, 3, recode($_SESSION['_config']['recode'], _("I, the Assurer, hereby confirm that I have verified the Member according to CAcert Assurance Policy."))); @@ -249,7 +249,7 @@ $this->MultiCell($this->w - 33, 3, recode($_SESSION['_config']['recode'], _("I am a CAcert Community Member, have passed the Assurance Challenge, and have been assured with at least 100 Assurance Points."))); $this->SetFont("Arial", "", "9"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','',9); $this->SetXY(13, $top + 74); //22->67 $this->Write(0, recode($_SESSION['_config']['recode'], _("Assurer's signature")).": __________________________________"); @@ -260,7 +260,7 @@ $this->Write(0, "20___-___-___"); } else { $this->SetFont("Arial", "U", "10"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','U',10); $this->Write(0, str_pad($date, 13, " ")); } @@ -277,7 +277,7 @@ $maxpoints = 0; $pdf = new PDF('P', 'mm', $format); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $pdf->AddSJISFont(); $pdf->Open(); $pdf->AddPage(); diff --git a/www/capnew.php b/www/capnew.php index 3136993..41a0894 100644 --- a/www/capnew.php +++ b/www/capnew.php @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -// $Id: capnew.php,v 1.3 2011-06-10 18:30:41 wytze Exp $ -define('REV', '$Revision: 1.3 $'); +// $Id: capnew.php,v 1.4 2012-01-24 14:26:05 root Exp $ +define('REV', '$Revision: 1.4 $'); /* ** Created from old cap.php 2003, which used the now obsoleted ftpdf package @@ -168,7 +168,7 @@ define('REV', '$Revision: 1.3 $'); ** $_GET['format'] paper format required A0-A6,Letter, Folio, B0-B6 (dflt A4) ** $_GET['watermark'] watermark on the page ** $_GET['orientation'] paper orientation default 'portrait' -** $_SESSION['_config']['language'] for 'ja_JP' japanese default != ja_JP +** $_SESSION['_config']['language'] for 'ja' japanese default != ja ** $_SESSION['_config']['recode'] = 'format' recode() uses it: needed ? ** recode() is aliased to php lib function recode_string() ** $_REQUEST['bw'] if exists use black/white, default use colour @@ -336,7 +336,7 @@ define('DFL_FORMAT', 'html..utf-8'); // Japanese is not supported? if( array_key_exists('_config', $_SESSION) ) { if( isset($_SESSION['_config']['language']) ) { - if($_SESSION['_config']['language'] == 'ja_JP') + if($_SESSION['_config']['language'] == 'ja') define('FONT','SJIS'); else define( 'FONT', 'freesans'); } @@ -387,7 +387,7 @@ function utf8_is_ascii_ctrl($str) { // extend TCPF with custom functions class CAPPDF extends TCPDF { - // do cap form version numbering automatically '$Revision: 1.3 $' + // do cap form version numbering automatically '$Revision: 1.4 $' /*public*/ function Version() { strtok(REV, ' '); return(strtok(' ')); diff --git a/www/cats/cats_import.php b/www/cats/cats_import.php index 56dd0cf..feb92d4 100644 --- a/www/cats/cats_import.php +++ b/www/cats/cats_import.php @@ -31,8 +31,8 @@ function sanitize_string($buffer) { } define ('UNDEFINED', 'nd'); -define ('ALLOWED_IP', '213.154.225.228'); -define ('ALLOWED_IP2', '193.238.157.112'); +define ('ALLOWED_IP', '213.154.225.243'); +define ('ALLOWED_IP2', '172.16.2.27'); define ('CONFIG_FILEPATH', '/www/'); $remote_addr = (isset($_SERVER['REMOTE_ADDR']))?$_SERVER['REMOTE_ADDR']:UNDEFINED; diff --git a/www/coapnew.php b/www/coapnew.php index c9e4e47..4f69247 100644 --- a/www/coapnew.php +++ b/www/coapnew.php @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -// $Id: coapnew.php,v 1.3 2011-06-10 18:30:42 wytze Exp $ -define('REV', '$Revision: 1.3 $'); +// $Id: coapnew.php,v 1.4 2012-01-24 14:26:05 root Exp $ +define('REV', '$Revision: 1.4 $'); /* ** Created from old cap.php 2003, which used the now obsoleted ftpdf package @@ -179,7 +179,7 @@ define('REV', '$Revision: 1.3 $'); ** $_GET['format'] paper format required A0-A6,Letter, Folio, B0-B6 (dflt A4) ** $_GET['watermark'] watermark on the page ** $_GET['orientation'] paper orientation default "landscape" default 2-up (new) -** $_SESSION['_config']['language'] for "ja_JP" japanese default != ja_JP +** $_SESSION['_config']['language'] for "ja" japanese default != ja ** $_SESSION['_config']['recode'] = "format" recode() uses it: needed ? ** recode() is aliased to php lib function recode_string() ** $_REQUEST[bw] if exists use black/white, default use colour @@ -371,7 +371,7 @@ define('DFL_FORMAT', 'html..utf-8'); // Japanese is not supported? if( array_key_exists('_config', $_SESSION) ) { if( isset($_SESSION['_config']['language']) ) { - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") define('FONT','SJIS'); else define( 'FONT', 'freesans'); } @@ -422,7 +422,7 @@ function utf8_is_ascii_ctrl($str) { // extend TCPF with custom functions class COAPPDF extends TCPDF { - // do cap form version numbering automatically "$Revision: 1.3 $" + // do cap form version numbering automatically "$Revision: 1.4 $" /*public*/ function Version() { strtok(REV, " "); return(strtok(" ")); diff --git a/www/index.php b/www/index.php index a4c50fc..41b6d7a 100644 --- a/www/index.php +++ b/www/index.php @@ -14,8 +14,9 @@ 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 -*/ ?> -<? +*/ + +require_once('../includes/lib/l10n.php'); $id = 0; if(array_key_exists("id",$_REQUEST)) $id=intval($_REQUEST['id']); $oldid = 0; if(array_key_exists("oldid",$_REQUEST)) $oldid=intval($_REQUEST['oldid']); @@ -310,18 +311,12 @@ if($_SESSION['profile']['language'] == "") { - $query = "update `users` set `language`='".$_SESSION['_config']['language']."' + $query = "update `users` set `language`='".L10n::get_translation()."' where `id`='".$_SESSION['profile']['id']."'"; mysql_query($query); } else { - $_SESSION['_config']['language'] = $_SESSION['profile']['language']; - - putenv("LANG=".$_SESSION['_config']['language']); - setlocale(LC_ALL, $_SESSION['_config']['language']); - - $domain = 'messages'; - bindtextdomain("$domain", $_SESSION['_config']['filepath']."/locale"); - textdomain("$domain"); + L10n::set_translation($_SESSION['profile']['language']); + L10n::init_gettext(); } $query = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['profile']['id']."' group by `to`"; $res = mysql_query($query); @@ -551,7 +546,7 @@ mysql_query($query); $body = _("Thanks for signing up with CAcert.org, below is the link you need to open to verify your account. Once your account is verified you will be able to start issuing certificates till your hearts' content!")."\n\n"; - $body .= "http://".$_SESSION['_config']['normalhostname']."/verify.php?type=email&emailid=$emailid&hash=$hash\n\n"; //."&"."lang=".$_SESSION['_config']['language']."\n\n"; + $body .= "http://".$_SESSION['_config']['normalhostname']."/verify.php?type=email&emailid=$emailid&hash=$hash\n\n"; $body .= _("Best regards")."\n"._("CAcert.org Support!"); sendmail($_SESSION['signup']['email'], "[CAcert.org] "._("Mail Probe"), $body, "support@cacert.org", "", "", "CAcert Support"); @@ -632,6 +627,13 @@ if(!array_key_exists('signup',$_SESSION) || $_SESSION['signup']['year'] < 1900) $_SESSION['signup']['year'] = "19XX"; + + if ($id == 12) + { + $protocol = $_SERVER['HTTPS'] ? 'https' : 'http'; + $newUrl = $protocol . '://wiki.cacert.org/FAQ/AboutUs'; + header('Location: '.$newUrl, true, 301); // 301 = Permanently Moved + } if ($id == 19) { @@ -640,6 +642,13 @@ header('Location: '.$newUrl, true, 301); // 301 = Permanently Moved } + if ($id == 8) + { + $protocol = $_SERVER['HTTPS'] ? 'https' : 'http'; + $newUrl = $protocol . '://wiki.cacert.org/Board'; + header('Location: '.$newUrl, true, 301); // 301 = Permanently Moved + } + showheader(_("Welcome to CAcert.org")); includeit($id); showfooter(); diff --git a/www/policy/CertificationPracticeStatement.php b/www/policy/CertificationPracticeStatement.php index e17056b..2a9bd11 100644 --- a/www/policy/CertificationPracticeStatement.php +++ b/www/policy/CertificationPracticeStatement.php @@ -3203,54 +3203,50 @@ The form of the PGP signatures depends on several factors, therefore no stipulat <h4><a name="p7.1.2" id="p7.1.2">7.1.2. Certificate extensions</a></h4> <p> -Client certificates include the following extensions:. + Client certificates include the following extensions: </p> -<ul><li> - basicConstraints=CA:FALSE (critical) - </li><li> - keyUsage=digitalSignature,keyEncipherment,cRLSign - </li><li> - </li><li> - extendedKeyUsage=emailProtection,clientAuth,serverAuth,msEFS,msSGC,nsSGC - </li><li> - authorityInfoAccess = OCSP;URI:http://ocsp.cacert.org - </li><li> - subjectAltName=(as per <a href="#p3.1.1">§3.1.1.</a>). -</li></ul> +<ul> + <li>basicConstraints=CA:FALSE (critical)</li> + <li>keyUsage=digitalSignature,keyEncipherment,keyAgreement (critical)</li> + <li>extendedKeyUsage=emailProtection,clientAuth,msEFS,msSGC,nsSGC</li> + <li>authorityInfoAccess = OCSP;URI:http://ocsp.cacert.org</li> + <li>crlDistributionPoints=URI:<crlUri> where <crlUri> is replaced + with the URI where the certificate revocation list relating to the + certificate is found</li> + <li>subjectAltName=(as per <a href="#p3.1.1">§3.1.1.</a>).</li> +</ul> <ul class="q"> <li> what about Client Certificates Adobe Signing extensions ?</li> <li> SubjectAltName should become critical if DN is removed http://tools.ietf.org/html/rfc5280#section-4.2.1.6</li> </ul> - <p> -Server certificates include the following extensions: + Server certificates include the following extensions: </p> -<ul><li> - basicConstraints=CA:FALSE (critical) - </li><li> - keyUsage=digitalSignature,keyEncipherment - </li><li> - extendedKeyUsage=clientAuth,serverAuth,nsSGC,msSGC - </li><li> - authorityInfoAccess = OCSP;URI:http://ocsp.cacert.org - </li><li> - subjectAltName=(as per <a href="#p3.1.1">§3.1.1.</a>). -</li></ul> +<ul> + <li>basicConstraints=CA:FALSE (critical)</li> + <li>keyUsage=digitalSignature,keyEncipherment,keyAgreement (critical)</li> + <li>extendedKeyUsage=clientAuth,serverAuth,nsSGC,msSGC</li> + <li>authorityInfoAccess = OCSP;URI:http://ocsp.cacert.org</li> + <li>crlDistributionPoints=URI:<crlUri> where <crlUri> is replaced + with the URI where the certificate revocation list relating to the + certificate is found</li> + <li>subjectAltName=(as per <a href="#p3.1.1">§3.1.1.</a>).</li> +</ul> <p> -Code-Signing certificates include the following extensions: + Code-Signing certificates include the following extensions: </p> - -<ul><li> - basicConstraints=CA:FALSE (critical) - </li><li> - keyUsage=digitalSignature,keyEncipherment - </li><li> - extendedKeyUsage=emailProtection,clientAuth,codeSigning,msCodeInd,msCodeCom,msEFS,msSGC,nsSGC - </li><li> - authorityInfoAccess = OCSP;URI:http://ocsp.cacert.org -</li></ul> +<ul> + <li>basicConstraints=CA:FALSE (critical)</li> + <li>keyUsage=digitalSignature,keyEncipherment,keyAgreement (critical)</li> + <li>extendedKeyUsage=emailProtection,clientAuth,codeSigning,msCodeInd,msCodeCom,msEFS,msSGC,nsSGC</li> + <li>authorityInfoAccess = OCSP;URI:http://ocsp.cacert.org</li> + <li>crlDistributionPoints=URI:<crlUri> where <crlUri> is replaced + with the URI where the certificate revocation list relating to the + certificate is found</li> + <li>subjectAltName=(as per <a href="#p3.1.1">§3.1.1.</a>).</li> +</ul> <ul class="q"> <li> what about subjectAltName for Code-signing</li> </ul> diff --git a/www/ttp.php b/www/ttp.php index 2240518..6385127 100644 --- a/www/ttp.php +++ b/www/ttp.php @@ -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 */ - if($_SESSION['_config']['language'] != "ja_JP") + if($_SESSION['_config']['language'] != "ja") { define('FPDF_FONTPATH','/usr/share/fpdf/font/'); require_once('/usr/share/ufpdf/fpdf.php'); @@ -40,7 +40,7 @@ { $this->Image($_REQUEST['bw']?'images/CAcert-logo-mono-1000.png':'images/CAcert-logo-colour-1000.png',8,8,100); $this->SetFont('Arial','B',14); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','B',14); $this->Cell(100); $this->Cell(40,20,recode($_SESSION['_config']['recode'], _("Trusted Third Party"))); @@ -54,12 +54,12 @@ { $this->SetY(-10); $this->SetFont('Arial','I',8); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','I',8); $this->Cell(0,0,'CAcert Inc. - P.O. Box 4107 - Denistone East NSW 2112 - Australia - http://www.CAcert.org',0,0,'C'); $this->SetY(-7); $this->SetFont('Arial','',6); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','',6); $this->Cell(0,0, recode($_SESSION['_config']['recode'], _("CAcert's Root Certificate fingerprints")).": A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B "._("and")." 135C EC36 F49C B8E9 3B1A B270 CD80 8846 76CE 8F33",0,0,'C'); } @@ -72,7 +72,7 @@ // Show text blurb at top of page $this->SetY(40); $this->SetFont('Arial','',10); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','',10); $this->Write(4, recode($_SESSION['_config']['recode'], _("The CAcert Trusted Third Party (TTP) Programme is designed to assure Internet user identities through personal verification of government issued identity documents."))); $this->Ln(7); @@ -100,18 +100,18 @@ $this->Line(120, $top + 6, 120, $top + 36); $this->SetXY(11, $top + 3); $this->SetFont("Arial", "BUI", "12"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','BUI',12); $this->Write(0, recode($_SESSION['_config']['recode'],_("Person Verifying Applicant's Identity"))); $this->SetXY(11, $top + 9); $this->SetFont("Arial", "B", "8"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','B',8); $this->Write(0, recode($_SESSION['_config']['recode'],_("Names").":")); $this->SetXY(120, $top + 9); $this->Write(0, recode($_SESSION['_config']['recode'],_("Office Street Address").":")); $this->SetFont("Arial", "B", "6"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','B',6); $this->SetXY(11, $top + 14); $this->Write(0, recode($_SESSION['_config']['recode'],_("Profession (Please circle one)")).":"); @@ -122,7 +122,7 @@ $this->SetXY(11, $top + 22); $this->Write(0, recode($_SESSION['_config']['recode'], "("._("as applicable")."):")); $this->SetFont("Arial", "B", "8"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','B',8); $this->SetXY(11, $top + 27); $this->Write(0, recode($_SESSION['_config']['recode'],_("Office Phone")).":"); @@ -147,12 +147,12 @@ $this->Line(120, $top + 6, 120, $top + 36); $this->SetXY(11, $top + 3); $this->SetFont("Arial", "BUI", "12"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','BUI',12); $this->Write(0, recode($_SESSION['_config']['recode'],_("Applicant Information"))); $this->SetXY(11, $top + 9); $this->SetFont("Arial", "B", "8"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','B',8); $this->Write(0, recode($_SESSION['_config']['recode'],_("Full Name (as shown on ID)").":")); if($name) @@ -170,11 +170,11 @@ $this->SetXY(11, $top + 21); $this->Write(0, recode($_SESSION['_config']['recode'],_("Date of Birth")).": "); $this->SetFont("Arial", "B", "6"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','B',6); $this->Write(0, "(".recode($_SESSION['_config']['recode'], _("YYYY-MM-DD")).")"); $this->SetFont("Arial", "B", "8"); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','B',8); if($dob) { @@ -199,7 +199,7 @@ $format = "A4"; $pdf = new PDF('P', 'mm', $format); - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == "ja") $pdf->AddSJISFont(); $pdf->Open(); $pdf->AddPage(); diff --git a/www/wot.php b/www/wot.php index 7fa572f..bf5d301 100644 --- a/www/wot.php +++ b/www/wot.php @@ -16,10 +16,106 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> <? - require_once("../includes/loggedin.php"); +require_once("../includes/loggedin.php"); +require_once("../includes/lib/l10n.php"); + + +function show_page($target,$message,$error) +{ + showheader(_("My CAcert.org Account!")); + if ($error != "") + $message=_("ERROR").": ".$error; + if ($message != "") + echo "<p><font color='orange' size='+1'>".$message."</font></p>"; + + switch ($target) + { + case '0': + case 'InfoPage': includeit(0, "wot"); + break; + case '1': + case 'ListByCity': includeit(1, "wot"); + break; + case '2': + case 'BecomeAssurer': includeit(2, "wot"); + break; + case '3': + case 'TrustRules': includeit(3, "wot"); + break; + case '4': + case 'ShowTTPInfo': includeit(4, "wot"); + break; + case '5'; + case 'EnterEmail': includeit(5, "wot"); + break; + case '6': + case 'VerifyData': includeit(6, "wot"); + break; +// case '7': +// case '???': includeit(7, "wot"); +// break; + case '8': + case 'EnterMyInfo': includeit(8, "wot"); + break; + case '9': + case 'ContactAssurer': includeit(9, "wot"); + break; + case '10': + case 'MyPointsOld': includeit(10, "wot"); + break; +// case '11': +// case 'OAInfo': includeit(11, "wot"); +// break; + case '12': + case 'SearchAssurer': includeit(12, "wot"); + break; + case '13': + case 'EnterMyCity': includeit(13, "wot"); + break; +// case '14': +// case 'EnterEmail': includeit(14, "wot"); +// break; + case '15': + case 'MyPointsNew': includeit(15, "wot"); + break; + } + + showfooter(); +} + +function send_reminder() +{ + $body = ""; + $my_translation = L10n::get_translation(); + + $_SESSION['_config']['reminder-lang'] = $_POST['reminder-lang']; + + $reminder_translations[] = $_POST['reminder-lang']; + if ( !in_array("en", $reminder_translations, $strict=true) ) { + $reminder_translations[] = "en"; + } + + foreach ($reminder_translations as $translation) { + L10n::set_translation($translation); + + $body .= L10n::$translations[$translation].":\n\n"; + $body .= sprintf(_("This is a short reminder that you filled out forms to become trusted with CAcert.org, and %s has attempted to issue you points. Please create your account at %s as soon as possible and then notify %s so that the points can be issued."), $_SESSION['profile']['fname']." (".$_SESSION['profile']['email'].")", "http://www.cacert.org", $_SESSION['profile']['fname'])."\n\n"; + $body .= _("Best regards")."\n"; + $body .= _("CAcert Support Team")."\n\n"; + } + + L10n::set_translation($reminder_translations[0]); // for the subject + sendmail($_POST['email'], "[CAcert.org] "._("Reminder Notice"), $body, $_SESSION['profile']['email'], "", "", $_SESSION['profile']['fname']); + + L10n::set_translation($my_translation); + + $_SESSION['_config']['remindersent'] = 1; + $_SESSION['_config']['error'] = _("A reminder notice has been sent."); +} + - loadem("account"); + loadem("account"); if(array_key_exists('date',$_POST) && $_POST['date'] != "") $_SESSION['_config']['date'] = $_POST['date']; @@ -29,244 +125,142 @@ $oldid=array_key_exists('oldid',$_REQUEST)?intval($_REQUEST['oldid']):0; if($oldid == 12) - { $id = $oldid; - } if(($id == 5 || $oldid == 5 || $id == 6 || $oldid == 6)) - { - if (!is_assurer($_SESSION['profile']['id'])) { - showheader(_("My CAcert.org Account!")); - echo "<p>".get_assurer_reason($_SESSION['profile']['id'])."</p>"; - showfooter(); - exit; - } - } + if (!is_assurer($_SESSION['profile']['id'])) + { + show_page ("Exit","",get_assurer_reason($_SESSION['profile']['id'])); + exit; + } if($oldid == 6 && intval($_SESSION['_config']['notarise']['id']) <= 0) { - $oldid=0; - $id = 5; + show_page ("EnterEmail","",_("Something went wrong. Please enter the email address again")); + exit; } - if($oldid == 5 && array_key_exists('reminder',$_POST) && $_POST['reminder'] != "") { - $body = ""; - if($_POST['reminder-lang'] != "" && $_POST['reminder-lang'] != "en_AU") - { - $userlang = $_POST['reminder-lang']; - $_SESSION['_config']['reminder-lang'] = $_POST['reminder-lang']; - putenv("LANG=".$userlang); - setlocale(LC_ALL, $userlang); - - $body .= $_SESSION['_config']['translations'][$userlang].":\n\n"; - $body .= sprintf(_("This is a short reminder that you filled out forms to become trusted with CAcert.org, and %s has attempted to issue you points. Please create your account at %s as soon as possible and then notify %s so that the points can be issued."), $_SESSION['profile']['fname']." (".$_SESSION['profile']['email'].")", "http://www.cacert.org", $_SESSION['profile']['fname'])."\n\n"; - $body .= _("Best regards")."\n"; - $body .= _("CAcert Support Team"); - - $body .= "\n\nEnglish:\n\n"; - } - - $body .= sprintf("This is a short reminder that you filled out forms to become trusted with CAcert.org, and %s has attempted to issue you points. Please create your account at %s as soon as possible and then notify %s so that the points can be issued.", $_SESSION['profile']['fname']." (".$_SESSION['profile']['email'].")", "http://www.cacert.org", $_SESSION['profile']['fname'])."\n\n"; - $body .= "Best regards"."\n"; - $body .= "CAcert Support Team"; - - sendmail($_POST['email'], "[CAcert.org] "._("Reminder Notice"), $body, $_SESSION['profile']['email'], "", "", $_SESSION['profile']['fname']); - - if($_POST['reminder-lang'] != "" && $_POST['reminder-lang'] != "en_AU") - { - $userlang = $_SESSION['profile']['language']; - putenv("LANG=".$userlang); - setlocale(LC_ALL, $userlang); - } - - $_SESSION['_config']['remindersent'] = 1; - $_SESSION['_config']['error'] = _("A reminder notice has been sent."); - - $id = $oldid; - $oldid=0; + send_reminder(); + show_page ("EnterEmail",_("A reminder notice has been sent."),""); + exit; } if($oldid == 5) { - $_SESSION['_config']['noemailfound'] = 0; $query = "select * from `users` where `email`='".mysql_escape_string(stripslashes($_POST['email']))."' and `deleted`=0"; $res = mysql_query($query); if(mysql_num_rows($res) != 1) { - $id = $oldid; - $oldid=0; - $_SESSION['_config']['error'] = _("I'm sorry, there was no email matching what you entered in the system. Please double check your information."); $_SESSION['_config']['noemailfound'] = 1; - } else { + show_page("EnterEmail","",_("I'm sorry, there was no email matching what you entered in the system. Please double check your information.")); + exit; + } else + { + $_SESSION['_config']['noemailfound'] = 0; $_SESSION['_config']['notarise'] = mysql_fetch_assoc($res); + if ($_SESSION['_config']['notarise']['verified'] == 0) + { + show_page("EnterEmail","",_("User is not yet verified. Please try again in 24 hours!")); + exit; + } } } if($oldid == 5 || $oldid == 6) { + $id=6; +// $oldid=0; if(array_key_exists('cancel',$_REQUEST) && $_REQUEST['cancel'] != "") { - header("location: wot.php"); + show_page("EnterEmail","",""); exit; } - if($_SESSION['_config']['notarise']['id'] == $_SESSION['profile']['id']) { - $id = 5; - $oldid=0; - $_SESSION['_config']['error'] = _("You are never allowed to Assure yourself!"); + show_page("EnterEmail","",_("You are never allowed to Assure yourself!")); + exit; } - } - if($oldid == 5 || $oldid == 6) - { $query = "select * from `notary` where `from`='".$_SESSION['profile']['id']."' and `to`='".$_SESSION['_config']['notarise']['id']."'"; - $_SESSION['_config']['alreadydone'] = 0; $res = mysql_query($query); - if(mysql_num_rows($res) > 0 && $_SESSION['profile']['points'] < 200) - { - $id = 5; - $oldid=0; - $_SESSION['_config']['error'] = _("You are only allowed to Assure someone once!"); - } elseif($oldid == 5) { - $id = 6; - } - if($id == 6 && mysql_num_rows($res) > 0) - { - $_SESSION['_config']['alreadydone'] = 1; - } - unset($_SESSION['_config']['pointsalready']); - if($id == 6 && $_SESSION['profile']['points'] >= 100) - { - $query = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['_config']['notarise']['id']."' group by `to`"; - $res = mysql_query($query); - $drow = mysql_fetch_assoc($res); - $_SESSION['_config']['pointsalready'] = $drow['total']; - } - unset($_SESSION['_config']['verified']); - if($id == 6 && $_SESSION['profile']['points'] >= 100) + if(mysql_num_rows($res) > 0) { - $query = "select `verified` from `users` where `id`='".$_SESSION['_config']['notarise']['id']."'"; - $res = mysql_query($query); - $drow = mysql_fetch_assoc($res); - $_SESSION['_config']['verified'] = $drow['verified']; + show_page("EnterEmail","",_("You are only allowed to Assure someone once!")); + exit; } } if($oldid == 6) { - if(!array_key_exists('assertion',$_POST) || $_POST['assertion'] != 1 || !array_key_exists('rules',$_POST) || $_POST['rules'] != 1) +$iecho= "c"; + if(!array_key_exists('assertion',$_POST) || $_POST['assertion'] != 1) + { + show_page("VerifyData","",_("You failed to check all boxes to validate your adherence to the rules and policies of CAcert")); + exit; + } + +/* if(!array_key_exists('rules',$_POST) || $_POST['rules'] != 1) { - $id = $oldid; - $oldid=6; - $_SESSION['_config']['error'] = _("You failed to check all boxes to validate your adherence to the rules and policies of CAcert"); + show_page("VerifyData","",_("You failed to check all boxes to validate your adherence to the rules and policies of CAcert")); + exit; } +*/ if((!array_key_exists('certify',$_POST) || $_POST['certify'] != 1 ) && $_SESSION['profile']['ttpadmin'] != 1) { - $id = $oldid; - $oldid=6; - $_SESSION['_config']['error'] = _("You failed to check all boxes to validate your adherence to the rules and policies of CAcert"); + show_page("VerifyData","",_("You failed to check all boxes to validate your adherence to the rules and policies of CAcert")); + exit; } - } - if($oldid == 6 && $_SESSION['profile']['ttpadmin'] != 1) - { - if($_POST['location'] == "") + if($_SESSION['profile']['ttpadmin'] != 1 && $_POST['location'] == "") { - $id = $oldid; - $oldid=0; - $_SESSION['_config']['error'] = _("You failed to enter a location of your meeting."); + show_page("VerifyData","",_("You failed to enter a location of your meeting.")); + exit; + } + + if($_REQUEST['points'] == "") + { + show_page("VerifyData","",_("You must enter the number of points you wish to allocate to this person.")); + exit; } - } - if($oldid == 6) - { $query = "select * from `users` where `id`='".$_SESSION['_config']['notarise']['id']."'"; $res = mysql_query($query); $row = mysql_fetch_assoc($res); $name = $row['fname']." ".$row['mname']." ".$row['lname']." ".$row['suffix']; if($_SESSION['_config']['wothash'] != md5($name."-".$row['dob']) || $_SESSION['_config']['wothash'] != $_REQUEST['pagehash']) { - $id = $oldid; - $oldid=0; - $_SESSION['_config']['error'] = _("Race condition discovered, user altered details during assurance procedure. PLEASE MAKE SURE THE NEW DETAILS BELOW MATCH THE ID DOCUMENTS."); + show_page("VerifyData","",_("Race condition discovered, user altered details during assurance procedure. PLEASE MAKE SURE THE NEW DETAILS BELOW MATCH THE ID DOCUMENTS.")); + exit; } } - if($oldid == 6 && $_REQUEST['points'] == "") - { - $id = $oldid; - $oldid=0; - $_SESSION['_config']['error'] = _("You must enter the number of points you wish to allocate to this person."); - } if($oldid == 6) { $max = maxpoints(); - - if (intval($_POST['points']) > $max) { - $awarded = $newpoints = $max; - } elseif (intval($_POST['points']) < 0) { - $awarded = $newpoints = 0; - } else { - $awarded = $newpoints = intval($_POST['points']); - } + + $awarded = $newpoints = intval($_POST['points']); + if($newpoints > $max) + $newpoints = $awarded = $max; + if($newpoints < 0) + $newpoints = $awarded = 0; $query = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['_config']['notarise']['id']."' group by `to`"; $res = mysql_query($query); $drow = mysql_fetch_assoc($res); - if($_SESSION['profile']['board'] == 1 && intval($_POST['expire']) > 0 && $drow['total'] > 150) - { - showheader(_("My CAcert.org Account!")); - echo "<p>"._("You tried to give a temporary points increase to someone that already has more then 150 points. Can't continue.")."</p>"; - showfooter(); - exit; - } - - if($_SESSION['profile']['board'] == 1 && intval($_POST['expire']) > 0 && intval($_POST['sponsor']) <= 0) - { - showheader(_("My CAcert.org Account!")); - echo "<p>"._("You didn't list a valid sponsor for this action.")."</p>"; - showfooter(); - exit; - } - - if($_SESSION['profile']['board'] == 1 && intval($_POST['expire']) > 0 && intval($_POST['sponsor']) > 0) - { - $resc = mysql_query("select * from `users` where `id`='".intval($_POST['sponsor'])."' and `board`='1'"); - $rc = mysql_num_rows($resc); - $sponsor = mysql_fetch_assoc($resc); - if($rc <= 0) - { - showheader(_("My CAcert.org Account!")); - echo "<p>"._("You listed an invalid sponsor for this action.")."</p>"; - showfooter(); - exit; - } - } - - if($_SESSION['profile']['board'] == 1 && intval($_POST['expire']) > 0) - { - $_POST['method'] = "Administrative Increase"; - $newpoints = 200 - $drow['total']; - if(intval($_POST['expire']) > 45) - $_POST['expire'] = 45; - if(intval($_POST['expire']) <= 7) - $_POST['expire'] = 7; - } else { - $_POST['expire'] = 0; - if(($drow['total'] + $newpoints) > 100 && $max < 100) - $newpoints = 100 - $drow['total']; - if(($drow['total'] + $newpoints) > $max && $max >= 100) - $newpoints = $max - $drow['total']; - if($newpoints < 0) - $newpoints = 0; - } + $_POST['expire'] = 0; + if(($drow['total'] + $newpoints) > 100 && $max < 100) + $newpoints = 100 - $drow['total']; + if(($drow['total'] + $newpoints) > $max && $max >= 100) + $newpoints = $max - $drow['total']; + if($newpoints < 0) + $newpoints = 0; + if(mysql_escape_string(stripslashes($_POST['date'])) == "") $_POST['date'] = date("Y-m-d H:i:s"); @@ -278,9 +272,8 @@ $res = mysql_query($query); if(mysql_num_rows($res) > 0) { - $id = $oldid; - $oldid=0; - $_SESSION['_config']['error'] = _("Identical Assurance attempted, will not continue."); + show_page("VerifyEmail","",_("Identical Assurance attempted, will not continue.")); + exit; } } @@ -299,7 +292,7 @@ $query .= ",\n`sponsor`='".intval($_POST['sponsor'])."'"; } else if($_SESSION['profile']['board'] == 1) { $query .= ",\n`method`='".mysql_escape_string(stripslashes($_POST['method']))."'"; - } else if($_SESSION['profile']['ttpadmin'] == 1 && ($_POST['method'] == 'Trusted 3rd Parties' || $_POST['method'] == 'Trusted third Parties')) { + } else if($_SESSION['profile']['ttpadmin'] == 1 && ($_POST['method'] == 'Trusted 3rd Parties' || $_POST['method'] == 'Trusted Third Parties')) { $query .= ",\n`method`='Trusted Third Parties'"; } mysql_query($query); @@ -324,13 +317,9 @@ $_SESSION['profile']['points'] += $addpoints; } - if($_SESSION['_config']['notarise']['language'] != "") - { - $userlang = $_SESSION['_config']['notarise']['language']; - putenv("LANG=".$userlang); - setlocale(LC_ALL, $userlang); - } - + $my_translation = L10n::get_translation(); + L10n::set_translation($_SESSION['_config']['notarise']['language']); + $body = sprintf(_("You are receiving this email because you have been assured by %s %s (%s)."), $_SESSION['profile']['fname'], $_SESSION['profile']['lname'], $_SESSION['profile']['email'])."\n\n"; if($_POST['points'] != $newpoints) $body .= sprintf(_("You were issued %s points however the system has rounded this down to %s and you now have %s points in total."), $_POST['points'], $newpoints, ($newpoints + $drow['total']))."\n\n"; @@ -361,8 +350,7 @@ sendmail($_SESSION['_config']['notarise']['email'], "[CAcert.org] "._("You've been Assured."), $body, "support@cacert.org", "", "", "CAcert Website"); - putenv("LANG=".$_SESSION['profile']['language']); - setlocale(LC_ALL, $_SESSION['profile']['language']); + L10n::set_translation($my_translation); $body = sprintf(_("You are receiving this email because you have assured %s %s (%s)."), $_SESSION['_config']['notarise']['fname'], $_SESSION['_config']['notarise']['lname'], $_SESSION['_config']['notarise']['email'])."\n\n"; if($_POST['points'] != $newpoints) @@ -443,7 +431,8 @@ { $oldid=0; $id = 9; - $error = _("It looks like you were trying to contact multiple people, this isn't allowed due to data security reasons."); + show_page("ContactAssurer","",_("It looks like you were trying to contact multiple people, this isn't allowed due to data security reasons.")); + exit; } else { $body = $_REQUEST['message']; $subject = $_REQUEST['subject']; @@ -455,25 +444,33 @@ { sendmail($user['email'], "[CAcert.org] ".$_REQUEST['subject'], $_REQUEST['message'], $_SESSION['profile']['email'], "", "", $_SESSION['profile']['fname']." ".$_SESSION['profile']['lname']); - showheader(_("My CAcert.org Account!")); - echo "<p>"._("Your email has been sent to")." ".$user['fname'].".</p>"; - echo "<p>[ <a href='javascript:history.go(-2)'>Go Back</a> ]</p>\n"; + + showheader(_("My CAcert.org Account!"));?> + <p> + <? printf(_("Your email has been sent to %s."), $user['fname']); ?> + </p> + <p>[ <a href='javascript:history.go(-2)'><?= _("Go Back") ?></a> ]</p> + <? showfooter(); exit; } else { - showheader(_("My CAcert.org Account!")); - echo _("Sorry, I was unable to locate that user."); - showfooter(); + show_page(0,"",_("Sorry, I was unable to locate that user.")); exit; } + } - } elseif($oldid == 9) { + } + if($oldid == 9) + { $oldid=0; - $error = _("There was an error and I couldn't proceed"); $id = 9; + show_page("ContactAssurer","",_("There was an error and I couldn't proceed")); + exit; } - showheader(_("My CAcert.org Account!")); - includeit($id, "wot"); - showfooter(); +// showheader(_("My CAcert.org Account!")); +// echo "ID now = ".$id."/".$oldid.">>".$iecho; +// includeit($id, "wot"); +// showfooter(); +show_page ($id,"",""); ?> |