From ab9da60f7279cec312dcedad0fe403f0aeda8a94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Tue, 30 Nov 2010 17:05:13 +0100 Subject: source code taken from cacert-20101129.tar.bz2 --- scripts/27au-ate-melbourne-email.txt | 31 ++++++ scripts/27au-ate-melbourne-mail.php.txt | 156 ++++++++++++++++++++++++++++++ www/cats/.#cats_import.php.1.2 | 165 -------------------------------- www/images/CAcert-logo-mono-1000.png | Bin 0 -> 19406 bytes www/policy/NRPDisclaimerAndLicence.php | 105 ++------------------ www/policy/index.php | 2 +- 6 files changed, 198 insertions(+), 261 deletions(-) create mode 100644 scripts/27au-ate-melbourne-email.txt create mode 100644 scripts/27au-ate-melbourne-mail.php.txt delete mode 100644 www/cats/.#cats_import.php.1.2 create mode 100644 www/images/CAcert-logo-mono-1000.png diff --git a/scripts/27au-ate-melbourne-email.txt b/scripts/27au-ate-melbourne-email.txt new file mode 100644 index 0000000..4b3e525 --- /dev/null +++ b/scripts/27au-ate-melbourne-email.txt @@ -0,0 +1,31 @@ +CAcert Assurer Training Event -- Melbourne +:::::::::::::::::::::::::::::::::::::::::::::::::: + +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 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-Melbourne takes place at: +* Thursday, 16th Dec, 2010 +* Readify P/L; Level 4, Life.Lab Building, 198 Harbour Esplanade, Docklands +* 6:00pm + +For Registration please reply: 'I will attend ATE-Melbourne' 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/20101216Melbourne diff --git a/scripts/27au-ate-melbourne-mail.php.txt b/scripts/27au-ate-melbourne-mail.php.txt new file mode 100644 index 0000000..55870bf --- /dev/null +++ b/scripts/27au-ate-melbourne-mail.php.txt @@ -0,0 +1,156 @@ +#!/usr/bin/php -q + diff --git a/www/cats/.#cats_import.php.1.2 b/www/cats/.#cats_import.php.1.2 deleted file mode 100644 index ec73b1b..0000000 --- a/www/cats/.#cats_import.php.1.2 +++ /dev/null @@ -1,165 +0,0 @@ - 0 -) $access = TRUE; - -if ($access !== TRUE) { - echo 'UNAUTHORIZED ACCESS
'."\r\n"; - echo 'IP: '.sanitize_string($remote_addr).'
'."\r\n"; - echo 'Server: '.sanitize_string($server_name).'
'."\r\n"; - echo 'HTTPS: '.sanitize_string($https).'
'."\r\n"; - echo 'Client cert: '.sanitize_string($ssl_client_s_dn).'
'."\r\n"; - trigger_error('Unauthorized access: ip('.$remote_addr.') server('.$server_name.') https('.$https.') cert('.$ssl_client_s_dn.')', E_USER_ERROR); - exit(); -} - -// Comment (to be romeved): do you we session autostart in php.ini?? -// Ted: Sessions are quite meaningless for me since the upload protocol is stateless. Should session_start be called nevertheless? -session_start(); - -require_once(CONFIG_FILEPATH.'includes/mysql.php'); - -// Comment (to be romeved): dunno the difference between stripslashes and stripcslashes -// manual is iunclear too, please make sure there are no decoding issues -// Ted: I just used it here because I saw it elsewhere and it seems to work. Would you prefer stripslashes? -if (get_magic_quotes_gpc()) { - $serial = stripcslashes($_POST['serial']); - $root = stripcslashes($_POST['root']); - $type = stripcslashes($_POST['type']); - $variant = stripcslashes($_POST['variant']); - $date = stripcslashes($_POST['date']); -} else { - $serial = $_POST['serial']; - $root = $_POST['root']; - $type = $_POST['type']; - $variant = $_POST['variant']; - $date = $_POST['date']; -} - -// Explicitly select all those IDs so I can insert new rows if needed. -$query = mysql_query('SELECT `id` FROM `cats_type` WHERE `type_text` = \''.mysql_real_escape_string($type).'\';'); -if (!$query) { - echo 'Invalid query'."\r\n"; - trigger_error('Invalid query', E_USER_ERROR); - exit(); -} - -if (mysql_num_rows($query) > 0) { - $result = mysql_fetch_array($query); - $typeID = $result['0']; -} else { - $query = mysql_query('INSERT INTO `cats_type` (`type_text`) VALUES (\''.mysql_real_escape_string($type).'\');'); - if (!$query) { - echo 'Invalid query'."\r\n"; - trigger_error('Invalid query', E_USER_ERROR); - exit(); - } - - $typeID = mysql_insert_id(); -} - -$query = mysql_query('SELECT `id` FROM `cats_variant` WHERE `type_id` = \''.(int)intval($typeID).'\' AND `test_text` = \''.mysql_real_escape_string($variant).'\';'); -if (!$query) { - echo 'Invalid query'."\r\n"; - trigger_error('Invalid query', E_USER_ERROR); - exit(); -} - -if (mysql_num_rows($query) > 0) { - $result = mysql_fetch_array($query); - $variantID = $result['0']; -} else { - $query = mysql_query('INSERT INTO `cats_variant` (`type_id`, `test_text`) VALUES (\''.(int)intval($typeID).'\', \''.mysql_real_escape_string($variant).'\');'); - if (!$query) { - echo 'Invalid query'."\r\n"; - trigger_error('Invalid query', E_USER_ERROR); - exit(); - } - - $variantID = mysql_insert_id(); -} - -// Now find the userid from cert serial -$query = mysql_query('SELECT `ec`.`memid` FROM `emailcerts` AS `ec`, `root_certs` AS `rc` WHERE `ec`.`rootcert` = `rc`.`id` AND `ec`.`serial` = \''.mysql_real_escape_string($serial).'\' AND `rc`.`cert_text` = \''.mysql_real_escape_string($root).'\';'); -if (!$query) { - echo 'Invalid query'."\r\n"; - trigger_error('Invalid query', E_USER_ERROR); - exit(); -} - -if (mysql_num_rows($query) > 0) { - $result = mysql_fetch_array($query); - $userID = $result['0']; -} else { - echo 'Cannot find cert '.sanitize_string($serial).' / '.sanitize_string($root)."\r\n"; - // Let's treat this as an error, since it should not happen. - trigger_error('Cannot find cert '.$serial.' / '.$root.'!'.mysql_error(), E_USER_ERROR); - exit(); -} - -// The unique constraint on cats_passed assures that records are not stored multiply -$query = mysql_query('INSERT INTO `cats_passed` (`user_id`, `variant_id`, `pass_date`) VALUES (\''.(int)intval($userID).'\', \''.(int)intval($variantID).'\', \''.mysql_real_escape_string($date).'\');'); -if (!$query) { - if (mysql_errno() != 1062) { // Duplicate Entry is considered success - echo 'Invalid query'."\r\n"; - trigger_error('Invalid query', E_USER_ERROR); - exit(); - } -} - -// 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 `u`.`id` = \''.(int)intval($userID).'\' AND EXISTS(SELECT 1 FROM `cats_passed` AS `tp` WHERE `tp`.`user_id` = `u`.`id`) AND (SELECT SUM(`points`) FROM `notary` AS `n` WHERE `n`.`to` = `u`.`id` AND `expire` < now()) >= 100;'); // Challenge has been passed and non-expired points >= 100 -if (!$query) { - echo 'Invalid query'."\r\n"; - trigger_error('Invalid query', E_USER_ERROR); - exit(); -} - -echo 'OK'."\r\n"; - -?> diff --git a/www/images/CAcert-logo-mono-1000.png b/www/images/CAcert-logo-mono-1000.png new file mode 100644 index 0000000..1beeb43 Binary files /dev/null and b/www/images/CAcert-logo-mono-1000.png differ diff --git a/www/policy/NRPDisclaimerAndLicence.php b/www/policy/NRPDisclaimerAndLicence.php index 6dbc647..bee8f26 100644 --- a/www/policy/NRPDisclaimerAndLicence.php +++ b/www/policy/NRPDisclaimerAndLicence.php @@ -1,99 +1,14 @@ - + + +NRP-DAL was replaced by the Root Distribution License +
-

-

- - -

- -

- CAcert Inc , -the 'issuer', -to you, the 'user', -being a general user of the Internet.")?> -

- -

Disclaimer

- -

- -

- -

-ISSUER DISCLAIMS ALL LIABILITY TO YOU -on behalf of itself and its related parties.")?> -

- -

- -

- -

- -
  • - -
  • - -
  • - -
  • - -
- -
- -

- -

- -

- - - -

- -

- +The document "Non Related Persons - Disclaimer And Licence" was replaced by the Root Distribution Licence, which can be found here. + + + + + diff --git a/www/policy/index.php b/www/policy/index.php index 8506489..d3bfb06 100644 --- a/www/policy/index.php +++ b/www/policy/index.php @@ -25,7 +25,7 @@ showheader(_("CAcert - Policies")); foreach (glob("*.php") as $filename) { - if($filename != "index.php") + if($filename != "index.php" && $filename != "NRPDisclaimerAndLicence.php") { echo "
  • $filename
    • \n"; } -- cgit v1.2.1