Index: openacs-4/packages/oct-election/tcl/oct-election-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/tcl/oct-election-procs.tcl,v
diff -u -r1.1.1.1.4.9 -r1.1.1.1.4.10
--- openacs-4/packages/oct-election/tcl/oct-election-procs.tcl	21 Oct 2008 09:22:27 -0000	1.1.1.1.4.9
+++ openacs-4/packages/oct-election/tcl/oct-election-procs.tcl	9 Sep 2013 14:48:53 -0000	1.1.1.1.4.10
@@ -26,7 +26,7 @@
 	return [list $status $text]
     }
      
-    set num_days 90
+    set num_days 180
 
     set valid_voter_p 0
     db_1row get_election {
@@ -54,6 +54,7 @@
     
     if {$num_posts < 2} {
 	set status 0
+	ns_log warning "not valid voter b/c forums $user_id"
 	set text "You are not a valid voter for this election because you have not posted at least twice in the OpenACS forums since $pretty_vote_forum_cutoff.  See <a href=\"http://openacs.org/governance/\">OpenACS Governance</a>"
     } else {
 	set valid_voter_p 1
Index: openacs-4/packages/oct-election/www/election.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/election.tcl,v
diff -u -r1.3.2.3 -r1.3.2.4
--- openacs-4/packages/oct-election/www/election.tcl	17 Nov 2006 15:10:29 -0000	1.3.2.3
+++ openacs-4/packages/oct-election/www/election.tcl	9 Sep 2013 14:48:53 -0000	1.3.2.4
@@ -10,7 +10,7 @@
 set valid_voter_p [lindex $valid_voter 0]
 set valid_voter_text [lindex $valid_voter 1]
 
-db_1row get_election {
+if {![db_0or1row get_election {
     select start_time,
            end_time,
            vote_forum_cutoff,
@@ -20,7 +20,9 @@
            (case when now() > start_time then 1 else 0 end) as past_start_p,
            (case when now() > end_time then 1 else 0 end) as past_end_p
       from oct_election
-     where election_id = :election_id
+     where election_id = :election_id and election_id <> 2
+}]} {
+    ad_returnredirect "election2"
 }
 
 set pretty_start_time [lc_time_fmt $start_time %c]
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/oct-election/www/election2.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/oct-election/www/find-match-cvs-users-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/find-match-cvs-users-2.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/oct-election/www/find-match-cvs-users-2.adp	17 Nov 2006 15:10:29 -0000	1.1.2.1
+++ openacs-4/packages/oct-election/www/find-match-cvs-users-2.adp	9 Sep 2013 14:48:53 -0000	1.1.2.2
@@ -4,7 +4,7 @@
   
 <multiple name="users">
 
-  <if @users.username@ ne "">
+  <if @users.assigned_p eq "0">
      <li>@users.last_name@, @users.first_names@ (@users.email@) - <b>CVS user: @users.username@</b></li>
   </if>
   <else>
Index: openacs-4/packages/oct-election/www/find-match-cvs-users-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/find-match-cvs-users-2.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/oct-election/www/find-match-cvs-users-2.tcl	17 Nov 2006 15:10:29 -0000	1.1.2.1
+++ openacs-4/packages/oct-election/www/find-match-cvs-users-2.tcl	9 Sep 2013 14:48:53 -0000	1.1.2.2
@@ -24,7 +24,7 @@
 set title "Searching user"
 set context [list $title]
 
-db_multirow users select_users {
+db_multirow -extend {assigned_p} users select_users {
     select pe.person_id,
     pe.first_names,
     pe.last_name,
@@ -37,6 +37,10 @@
     or lower(first_names) like lower('%' || :search_text || '%')
     or lower(email) like lower('%' || :search_text || '%'))
 } {
+    set assigned_p 1
+    if {$username eq "" || [util_email_valid_p $username]} {
+	set assigned_p 0
+    }
 }
 
 ad_return_template
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/oct-election/www/user-list.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/oct-election/www/user-list.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?