From 69d83e26cb3f0bd1bd313cec2ce051b4c2426e39 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 25 Oct 2005 21:53:16 +0000 Subject: [PATCH] updated the timeline ditto final list add some mysql_error()... 2005-10-25 Vincent Untz * foundation.gnome.org/referenda/2005-10/rules.wml: updated the timeline * foundation.gnome.org/referenda/2005-10/timeline.ics: ditto * foundation.gnome.org/referenda/2005-10/voters.wml: final list * foundation.gnome.org/vote/include/step4-commit.php: add some mysql_error()... --- ChangeLog | 9 +++++++++ .../referenda/2005-10/rules.wml | 10 +++++----- .../referenda/2005-10/timeline.ics | 18 +++++++++--------- .../referenda/2005-10/voters.wml | 15 ++++++++++++--- .../vote/include/step4-commit.php | 10 +++++----- 5 files changed, 40 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index df97c80..b23098b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-10-25 Vincent Untz + + * foundation.gnome.org/referenda/2005-10/rules.wml: updated the + timeline + * foundation.gnome.org/referenda/2005-10/timeline.ics: ditto + * foundation.gnome.org/referenda/2005-10/voters.wml: final list + * foundation.gnome.org/vote/include/step4-commit.php: add some + mysql_error()... + 2005-10-25 Vincent Untz * foundation.gnome.org/vote/include/election-sql.php: updated for SQL diff --git a/foundation.gnome.org/referenda/2005-10/rules.wml b/foundation.gnome.org/referenda/2005-10/rules.wml index eb53db7..4f5ad2b 100644 --- a/foundation.gnome.org/referenda/2005-10/rules.wml +++ b/foundation.gnome.org/referenda/2005-10/rules.wml @@ -31,7 +31,7 @@
  • Instructions explaining how to vote will be sent via e-mail to all eligible voters on October 24, 2005, and votes must be returned by - November 4, 2005, 23:59 UTC (18:59 EST). + November 6, 2005, 23:59 UTC (18:59 EST).
  • Votes will be held confidential during the referendum, but an @@ -55,7 +55,7 @@ Any eligible voter may challenge the preliminary results by e-mailing elections@gnome.org - prior to November 11, 2005. The decision of the Elections Committee as + prior to November 13, 2005. The decision of the Elections Committee as to any challenge shall be final. Once any challenges have been resolved, the Elections Committee shall announce the final results.
    • @@ -79,13 +79,13 @@ October 24 (Monday): Instructions mailed to eligible voters, voting begins.
  • - November 4 (Friday): Voting closes. + November 6 (Sunday): Voting closes.
  • - November 5 (Saturday): Preliminary results are announced. + November 7 (Monday): Preliminary results are announced.
  • - November 11 (Friday): Last day to challenge preliminary results. + November 13 (Sunday): Last day to challenge preliminary results.
    • diff --git a/foundation.gnome.org/referenda/2005-10/timeline.ics b/foundation.gnome.org/referenda/2005-10/timeline.ics index b713d86..d3e683b 100644 --- a/foundation.gnome.org/referenda/2005-10/timeline.ics +++ b/foundation.gnome.org/referenda/2005-10/timeline.ics @@ -5,11 +5,11 @@ VERSION:2.0 BEGIN:VEVENT UID:20051020T082209Z-2839-500-1-6@localhost.localdomain DTSTAMP:20051020T082209Z -DTSTART;VALUE=DATE:20051105 -DTEND;VALUE=DATE:20051106 +DTSTART;VALUE=DATE:20051107 +DTEND;VALUE=DATE:20051108 SUMMARY:Preliminery Results Announced CREATED:20051020T090739 -LAST-MODIFIED:20051020T090739 +LAST-MODIFIED:20051025T203039 DESCRIPTION:Preliminary results are announced. CLASS:PUBLIC TRANSP:OPAQUE @@ -18,11 +18,11 @@ END:VEVENT BEGIN:VEVENT UID:20051020T082150Z-2839-500-1-5@localhost.localdomain DTSTAMP:20051020T082150Z -DTSTART;VALUE=DATE:20051104 -DTEND;VALUE=DATE:20051105 +DTSTART;VALUE=DATE:20051106 +DTEND;VALUE=DATE:20051107 SUMMARY:Ballots Must Be Returned CREATED:20051020T090739 -LAST-MODIFIED:20051020T090739 +LAST-MODIFIED:20051025T203039 DESCRIPTION:Voting closes. CLASS:PUBLIC TRANSP:OPAQUE @@ -31,11 +31,11 @@ END:VEVENT BEGIN:VEVENT UID:20051020T082242Z-2839-500-1-7@localhost.localdomain DTSTAMP:20051020T082242Z -DTSTART;VALUE=DATE:20051111 -DTEND;VALUE=DATE:20051112 +DTSTART;VALUE=DATE:20051113 +DTEND;VALUE=DATE:20051114 SUMMARY:Challenges to the Result Close CREATED:20051020T090739 -LAST-MODIFIED:20051020T090739 +LAST-MODIFIED:20051025T203039 DESCRIPTION:Last day to challenge preliminary results. CLASS:PUBLIC TRANSP:OPAQUE diff --git a/foundation.gnome.org/referenda/2005-10/voters.wml b/foundation.gnome.org/referenda/2005-10/voters.wml index 99c508e..a6f5653 100644 --- a/foundation.gnome.org/referenda/2005-10/voters.wml +++ b/foundation.gnome.org/referenda/2005-10/voters.wml @@ -16,8 +16,6 @@ elections@gnome.org.

    -

    This list is not complete and might change.

    -
    • Aaron Bockover
    • Aaron Weber
      • @@ -31,6 +29,8 @@
    • Alan Horkan
    • Alastair McKinstry
    • Alejandro Sánchez Acosta
      • +
    • Alessio Dessi
      • +
    • Alessio Frusciante
    • Alexander Kirillov
    • Alexander Larsson
    • Alexander Shopov
      • @@ -57,6 +57,7 @@
    • Archit Baweja
    • Ariel Rios
    • Arvind Samptur
      • +
    • Baptiste Mille-Mathias
    • Baris Cicek
    • Bastien Nocera
    • Behdad Esfahbod
      • @@ -82,6 +83,7 @@
    • Chris Ridpath
    • Christian Fredrik Kalager Schaller
    • Christian Kellner
      • +
    • Christian Meyer
    • Christian Neumair
    • Christian Persch
    • Christian Rose
      • @@ -123,6 +125,7 @@
    • Erik Walthinsen
    • Erwann Chénedé
    • Eugene O'Connor
      • +
    • Everson Santos Araujo
    • Farzaneh Sarafraz
    • Federico Mena Quintero
    • Fernando Herrera
      • @@ -134,6 +137,7 @@
    • Frank Rehberger
    • Frédéric Crozat
    • Frederico Souza da Camara
      • +
    • Fredrik Hedberg
    • Gaël Chamoulaud
    • Gareth Owen
    • Gary Ekker
      • @@ -197,12 +201,14 @@
    • Jon Trowbridge
    • Jordi Mallach
    • Jordi Mas i Hernànde
      • +
    • Jorge Bernal
    • Jörgen Scheibengruber
    • Jorn Baayen
    • José Carlos Marcos
    • JP Rosevear
    • Jukka-Pekka Iivonen
    • Julio M. Merino Vidal
      • +
    • Kalle Vahlman
    • Kalpesh Shah
    • Kaushal Kumar
    • Keith Packard
      • @@ -333,17 +339,20 @@
    • Steve Fox
    • Steve Hall
    • Sven Herzberg
      • +
    • Sven Neumann
    • Ted Gould
    • Telsa Gwynne
    • Theppitak Karoonboonyanan
    • Thomas Friehoff
    • Thomas Vander Stichele
    • Thomas Wood
      • +
    • Tiago Cardoso Menezes
    • Timothy Ney
    • Timur Bakeyev
    • Todd Kulesza
    • Tomas Frydrych
    • Tomas Ögren
      • +
    • Tomislav Markovski
    • Tommi Vainikainen
    • Toni Willberg
    • Trinh Minh Thanh
      • @@ -365,7 +374,7 @@

    - 343 voters + 354 voters

    diff --git a/foundation.gnome.org/vote/include/step4-commit.php b/foundation.gnome.org/vote/include/step4-commit.php index e7f12fa..4467756 100644 --- a/foundation.gnome.org/vote/include/step4-commit.php +++ b/foundation.gnome.org/vote/include/step4-commit.php @@ -59,8 +59,8 @@ function step4_do () { } while ($anon_token_id === FALSE && $i < 10); if ($anon_token_id === FALSE) { + $error .= "Can not create an anonymous token: ".mysql_error ($handle)."
    \n"; elec_sql_rollback ($handle); - $error .= "Can not create an anonymous token.
    \n"; return $result; } @@ -69,8 +69,8 @@ function step4_do () { $res = elec_insert_new_vote ($handle, $anon_token_id, $vote); if (!$res) { + $error .= "Can not insert a vote: ".mysql_error ($handle)."
    \n"; elec_sql_rollback ($handle); - $error .= "Can not insert a vote.
    \n"; return $result; } @@ -80,8 +80,8 @@ function step4_do () { $res = elec_insert_new_vote ($handle, $anon_token_id, $vote); if (!$res) { + $error .= "Can not insert a vote: ".mysql_error ($handle)."
    \n"; elec_sql_rollback ($handle); - $error .= "Can not insert a vote.
    \n"; return $result; } } @@ -91,14 +91,14 @@ function step4_do () { $res = elec_sql_remove_tmp_token ($handle, $election_id, $email, $tmp_token); if (!$res) { + $error .= "Can not remove temporary token: ".mysql_error ($handle)."
    \n"; elec_sql_rollback ($handle); - $error .= "Can not remove temporary token.
    \n"; return $result; } $res = elec_sql_commit ($handle); if (!$res) { - $error .= "Can not commit the vote.
    \n"; + $error .= "Can not commit the vote: ".mysql_error ($handle)."
    \n"; return $result; }