From 1ff27b7cd83f1e9f218918f5cdc3b617fd7735e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Tue, 23 Nov 2010 20:36:50 +0100 Subject: source code taken from cacert-20101031.tar.bz2 --- includes/general_stuff.php | 8 -- includes/tverify_stuff.php | 8 -- pages/wot/7-old.php | 183 ---------------------------------- scripts/25de-ate-hamburg-mail.php.txt | 143 ++++++++++++++++++++++++++ scripts/25de-ate-hamburg-mail.txt | 67 +++++++++++++ scripts/26us-lisa2010-email.txt | 26 +++++ scripts/26us-lisa2010-mail.php.txt | 151 ++++++++++++++++++++++++++++ scripts/addpoints.php | 2 +- www/wot.php | 2 +- 9 files changed, 389 insertions(+), 201 deletions(-) delete mode 100644 pages/wot/7-old.php create mode 100644 scripts/25de-ate-hamburg-mail.php.txt create mode 100644 scripts/25de-ate-hamburg-mail.txt create mode 100644 scripts/26us-lisa2010-email.txt create mode 100644 scripts/26us-lisa2010-mail.php.txt diff --git a/includes/general_stuff.php b/includes/general_stuff.php index 2cf4d3a..6747c84 100644 --- a/includes/general_stuff.php +++ b/includes/general_stuff.php @@ -131,14 +131,6 @@ if(!function_exists("showfooter"))
- - - - | | | | | | diff --git a/includes/tverify_stuff.php b/includes/tverify_stuff.php index 007f072..46f49f6 100644 --- a/includes/tverify_stuff.php +++ b/includes/tverify_stuff.php @@ -66,14 +66,6 @@ if(!function_exists("showfooter"))
- - - - | | | | | | diff --git a/pages/wot/7-old.php b/pages/wot/7-old.php deleted file mode 100644 index af167a0..0000000 --- a/pages/wot/7-old.php +++ /dev/null @@ -1,183 +0,0 @@ - -= 100")); - - $town = mysql_escape_string(stripslashes($_GET['town'])); - $start = intval($_GET['start']); - $limit = 25; - - echo "
    \n
  • "; - echo ""._("Home")." ("._("Listed").": $total1)\n"; - - $display = ""; - $ccid=intval($_GET['ccid']); - $locid=intval($_GET['locid']); - $regid=intval($_GET['regid']); - - if($locid > 0) - { - $total4 = mysql_num_rows(mysql_query("select * from `users`,`notary` where `listme`='1' and `locid`='".$locid."' and - `users`.`id`=`notary`.`to` group by `notary`.`to` HAVING SUM(`points`) >= 100")); - $loc = mysql_fetch_assoc(mysql_query("select * from `locations` where `id`='".$locid."'")); - $display = "
      \n
    • \n". - "$loc[name] ("._("Listed").": $total4)\n". - $display; - $regid = $loc['regid']; - } - - if($regid > 0) - { - $total3 = mysql_num_rows(mysql_query("select * from `users`,`notary` where `listme`='1' and `regid`='".$regid."' and - `users`.`id`=`notary`.`to` group by `notary`.`to` HAVING SUM(`points`) >= 100")); - $reg = mysql_fetch_assoc(mysql_query("select * from `regions` where `id`='".$regid."'")); - $display = "
        \n
      • \n". - "$reg[name] ("._("Listed").": $total3)\n". - $display; - $ccid = $reg['ccid']; - } - - if($ccid > 0) - { - $total2 = mysql_num_rows(mysql_query("select * from `users`,`notary` where `listme`='1' and - `ccid`='".$ccid."' and `users`.`id`=`notary`.`to` - group by `notary`.`to` HAVING SUM(`points`) >= 100")); - $cnt = mysql_fetch_assoc(mysql_query("select * from `countries` where `id`='".$ccid."'")); - $display = "
          \n
        • \n". - "$cnt[name] ("._("Listed").": $total2)\n". - $display; - } - - if($display) - echo $display; - - if($ccid <= 0) - { - echo "
            \n"; - $query = "select * from `countries` order by `name`"; - $res = mysql_query($query); - while($row = mysql_fetch_assoc($res)) - echo "
          • $row[name]
            • \n"; - - echo "
          \n
          • \n
\n
\n"; - } elseif($regid <= 0) { - echo "\n\n\n\n
\n
\n"; - } elseif($locid <= 0) { - echo "\n\n\n\n\n
\n"; - $rc = mysql_num_rows(mysql_query("select * from `locations` where `regid`='".$regid."'")); - if($start > 0) - { - $prev = $start - $limit; - if($prev < 0) - $prev = 0; - - $st = "[ << Start ] "; - $prev = "[ < Previous $limit ] "; - } - if($start < $rc - $limit) - { - $next = $start + $limit; - $last = $rc - $limit; - - $next = "[ Next $limit > ] "; - $end = "[ End >> ]"; - } - echo "
$st
$end
\n"; - echo "
$prev
$next
\n"; -?> -
-
- - - - - - - - - - - -
:
">
- - -
-
-\n\n\n\n\n\n\n
\n"; - echo "

"; - echo _("Make my location here"); - echo "

\n"; - echo "

"._("If you are happy with this location, click 'Make my location here' to update your location details.")."


\n"; - } -} else { - $total1 = mysql_num_rows(mysql_query("select * from `users`,`notary` where `listme`='1' and `users`.`id`=`notary`.`to` - group by `notary`.`to` HAVING SUM(`points`) >= 100")); - - if($locid > 0) - { - $total4 = mysql_num_rows(mysql_query("select * from `users`,`notary` where `listme`='1' and `locid`='".$locid."' and - `users`.`id`=`notary`.`to` group by `notary`.`to` HAVING SUM(`points`) >= 100")); - $loc = mysql_fetch_assoc(mysql_query("select * from `locations` where `id`='".$locid."'")); - $regid = $loc['regid']; - } - - if($regid) > 0) - { - $total3 = mysql_num_rows(mysql_query("select * from `users`,`notary` where `listme`='1' and `regid`='".$regid."' and - `users`.`id`=`notary`.`to` group by `notary`.`to` HAVING SUM(`points`) >= 100")); - $reg = mysql_fetch_assoc(mysql_query("select * from `regions` where `id`='".$regid."'")); - $ccid = $reg['ccid']; - } - - $total2 = mysql_num_rows(mysql_query("select * from `users`,`notary` where `listme`='1' and - `ccid`='".$ccid."' and `users`.`id`=`notary`.`to` - group by `notary`.`to` HAVING SUM(`points`) >= 100")); - - $_SESSION['profile']['ccid'] = $ccid; - $_SESSION['profile']['regid'] = $regid; - $_SESSION['profile']['locid'] = $locid; - - mysql_query("update `users` set `ccid`='".$ccid."',`regid`='".$regid."',`locid`='".$locid."' - where `id`='".$_SESSION['profile']['id']."'"); - - echo _("Your details have been updated."); -} -?> diff --git a/scripts/25de-ate-hamburg-mail.php.txt b/scripts/25de-ate-hamburg-mail.php.txt new file mode 100644 index 0000000..64c43b0 --- /dev/null +++ b/scripts/25de-ate-hamburg-mail.php.txt @@ -0,0 +1,143 @@ +#!/usr/bin/php -q + + diff --git a/scripts/25de-ate-hamburg-mail.txt b/scripts/25de-ate-hamburg-mail.txt new file mode 100644 index 0000000..41786d5 --- /dev/null +++ b/scripts/25de-ate-hamburg-mail.txt @@ -0,0 +1,67 @@ +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: + +Freitag den 05. November 2010, 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/2010-11-05-ATE-Hamburg] +Blog [https://blog.cacert.org/2010/10/491.html] + + + +Unverbindliche Anmeldung und Registrierung: +Rueckantwort mit 'Ich moechte teilnehmen: ATE-Hamburg' + +Kontakt: ate-hh@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: +Friday, Nov 05, 2010, 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/2010-11-05-ATE-Hamburg] +Blog [https://blog.cacert.org/2010/10/491.html] + +Registration for ATE-Hamburg: please reply +'I will attend: ATE-Hamburg' + +Contact: ate-hh@cacert.org + diff --git a/scripts/26us-lisa2010-email.txt b/scripts/26us-lisa2010-email.txt new file mode 100644 index 0000000..15cdc56 --- /dev/null +++ b/scripts/26us-lisa2010-email.txt @@ -0,0 +1,26 @@ +Dear CAcert Assurer, + +If you are attending the LISA'2010 conference in San Jose, CA, or if you live in the area, please consider attending the BoF (Birds of a Feather) sessions on Tuesday evening, 11/09/2010. I will be leading two seperate hour long BoF sessions. Both will be held in the Blossom Hill room of the San Jose Convention Center. The first is a GPG key signing event at 8:00pm. The second is a CAcert BoF, where we hope to educate and enroll some new assurers. + +I presented these same two BoF sessions at the LISA'09 conference in Baltimore. In order to bring any new assurers up to the 100 point level, we will need a few other assurers to help them earn their first trust points. I will also encourage them to them assurer each other on paper. They can then go on-line after the event and once they complete the Assurer Challenge, they start earning experience points. + +I can't pull off a successful CAcert event without a few other assurers. I am qualified to give out 35 points. I have one other assurer who has already contacted me and he is good for up to 15 points (and looking to earn more experience points himself). There were a few assurers who showed up to help last year, but I did not know in advance who was coming. If you can help, please reply to this e-mail letting me know you can attend and how many points you are qualified to assign. + +For more details on the events, please visit the following web pages or contact Ken. I don't really need help with the GPG key signing BoF, but you are certainly welcome to join us. + +[http://www.usenix.org/events/lisa10/bofs.html#gpg] +[http://www.usenix.org/events/lisa10/bofs.html#cacert] + +I have updated the Event entry on the CAcert Wiki. The listing is found at: +[https://wiki.cacert.org/events/LISA2010] +Feel free to add your own information if you can attend, or I can add your information if you like. + +Ken Schumacher +My own CAcert Assurance web page at [http://wiki.cacert.org/KenSchumacher] + +CAcert Bof Session, Tues Nov 9, 2010 9:00pm till 10:00pm +Blossom Hill Room at the San Jose Marriott Hotel +Free Admission to BoFs, no badge or ticket required + + +Contact: events@cacert.org diff --git a/scripts/26us-lisa2010-mail.php.txt b/scripts/26us-lisa2010-mail.php.txt new file mode 100644 index 0000000..95f07c7 --- /dev/null +++ b/scripts/26us-lisa2010-mail.php.txt @@ -0,0 +1,151 @@ +#!/usr/bin/php -q + diff --git a/scripts/addpoints.php b/scripts/addpoints.php index a518ceb..932cd83 100755 --- a/scripts/addpoints.php +++ b/scripts/addpoints.php @@ -47,7 +47,7 @@ `points`='$newpoints', `method`='Administrative Increase', `date`=NOW()"; mysql_query($query); $drow['points'] += $newpoints; - fix_assurer_flag($drow['id']) + fix_assurer_flag($drow['id']); } } } diff --git a/www/wot.php b/www/wot.php index 25eb213..2bd4622 100644 --- a/www/wot.php +++ b/www/wot.php @@ -245,7 +245,7 @@ if($_SESSION['profile']['board'] == 1 && intval($_POST['expire']) > 0) { - $_POST['method'] == "Administrative Increase"; + $_POST['method'] = "Administrative Increase"; $newpoints = 200 - $drow['total']; if(intval($_POST['expire']) > 45) $_POST['expire'] = 45; -- cgit v1.2.1