WebSVN – VORC – Diff – /trunk/perl/RollerCon.pm

 $SIG{__WARN__} = sub { warn sprintf("[%s] ", scalar localtime), @_ };
 $SIG{__DIE__}  = sub { die  sprintf("[%s] ", scalar localtime), @_ };
 our @EXPORT = qw( $ORCUSER $SYSTEM_EMAIL getRCDBH getAccessLevels authDB max authenticate canView getShiftDepartment getClassID getDepartments convertDepartments convertTime getSchedule getRCid getSetting getUser getUserEmail getUserDerbyName getYears printRCHeader changeShift modShiftTime signUpCount signUpEligible findConflict changeLeadShift sendNewUserEMail logit validate_emt);
-checkQueue (); # without a number here, the queue functionality is disabled / bypassed
+checkQueue (100); # without a number here, the queue functionality is disabled / bypassed
 my $dbh = WebDB::connect ("vorc");
 		$RCDBIDHASH->{department} = convertDepartments ($RCDBIDHASH->{department});
 		$RCDBIDHASH->{'access'} = max ($RCDBIDHASH->{'access'}, values %{$RCDBIDHASH->{department}});
 		$result->{cookie_string} = "${id}&${encpass}&$RCDBIDHASH->{'access'}";
 		$result->{RCid} = $RCDBIDHASH->{'RCid'};
 		logit($RCDBIDHASH->{'RCid'}, "Logged In") if $src eq "form";
-#		$dbh->do ("update official set last_login = CONVERT_TZ(now(), 'America/Chicago', 'America/Los_Angeles') where RCid = ?", undef, $RCDBIDHASH->{'RCid'}) if $src eq "form";
 		$dbh->do ("update official set last_login = now() where RCid = ?", undef, $RCDBIDHASH->{'RCid'}) if $src eq "form";
 		$result->{authenticated} = 'true';
-#		my @depts = map { s/-\d// } split /:/, $RCDBIDHASH->{department};
-#		my @depts = split /:/, $RCDBIDHASH->{department};
 		$ORCUSER = $RCDBIDHASH;
 		$ORCUSER->{MVPid} = getUser($ORCUSER->{RCid})->{MVPid};
 		$ORCUSER->{emt_verified} = getUser($ORCUSER->{RCid})->{emt_verified};
 	$FORM{'PASS'} = WebDB::trim $query->param('pass') || '';
 	$FORM{'SUB'} = $query->param('login') || '';
 	$FORM{'activate'} = WebDB::trim $query->param('activate') // '';
 	if ($RCAUTH) {
-		#We have an authenication cookie.  Double-check it
+		# We have an authenication cookie.  Double-check it
 		my ($RCID, $RCPASS, $RCLVL) = split /&/, $RCAUTH;
 		$authenticated = authDB('cookie', $RCID, $RCPASS, $MINLEVEL, $FORM{'activate'});
 	} elsif ($FORM{'SUB'}) {
-		#a log in form was submited
+		# a log in form was submited
 		if ($FORM{'SUB'} eq "Submit") {
 			$authenticated = authDB('form', $FORM{'ID'}, $FORM{'PASS'}, $MINLEVEL, $FORM{'activate'});
 		} elsif ($FORM{'SUB'} eq "New User") {
 			# Print the new user form and exit
       $authenticated->{cookie_string} = "";
       $authenticated->{authenticated} = 'false';
       $ENV{REQUEST_URI} =~ s/LOGOUT//;
       logit ($ORCUSER->{RCid}, "Logged Out");
       $dbh->do ("update official set last_active = ? where RCid = ?", undef, undef, $ORCUSER->{RCid});
-#  		`/bin/rm $SESSIONS_ACTIVE/$sessionid`;
 			$qdbh->do ("delete from session where sessionid = ?", undef, $sessionid);
       $ORCUSER = "";
     } else {
   		$dbh->do ("update official set last_active = now() where RCid = ?", undef, $ORCUSER->{RCid});
-#			`/bin/touch $SESSIONS_ACTIVE/$sessionid`;
-      $qdbh->do ("replace into session (RCid, sessionid, timestamp) values (?, ?, now())", undef, $ORCUSER->{RCid}, $sessionid);
+      $qdbh->do ("replace into session (RCid, sessionid, timestamp, email) values (?, ?, now(), ?)", undef, $ORCUSER->{RCid}, $sessionid, $ORCUSER->{email});
-#			`/bin/rm $SESSIONS_QUEUE/$RCqueueID` if ($RCqueueID and -e $SESSIONS_QUEUE."/".$RCqueueID);
       $qdbh->do ("delete from queue where queueid = ?", undef, $RCqueueID) if $RCqueueID;
   		return $authenticated->{cookie_string};
+  	}
     $qdbh->disconnect;
+	}
   } else {
   	$authenticated->{ERRMSG} = "";
   	# Since there was no ERRMSG, no need to log anything.
+  }
-#	print header(-cookie=>$RCAUTH_cookie);
   if ($RCqueueID) {
    	my $RCQUEUE_cookie = CGI::Cookie->new(-name=>'RCQUEUEID',-value=>"",-expires=>"+0m");
  	  print header(-cookie=>[$RCAUTH_cookie,$RCQUEUE_cookie]);
   } else {
  	  print header(-cookie=>$RCAUTH_cookie);
+ 	}
 	printRCHeader("Please Sign In");
 	print<<authpage;
 	<form action="$ENV{REQUEST_URI}" method=POST name=Req id=Req>
 	<input type=hidden name=RCqueueID value=$RCqueueID>
 	exit;
+}
 sub checkQueue {
+  my $max_users = shift;
   my $max_users = shift;
   return unless $max_users =~ /^\d+$/;
 	return if $ENV{'QUERY_STRING'} eq "SKIPQUEUE";
 	my $RCAUTH = CGI::cookie('RCAUTH') // "";
-	my $qdbh = WebDB::connect ("session");
+	my $qdbh = WebDB::connect ("session");
-	if ($RCAUTH) {
-	  # If the user is already logged in, bypass the queue check.
-	  use Digest::MD5 qw/md5_hex/;
-   	my ($RCID, $RCPASS, $RCLVL) = split /&/, $RCAUTH;
-#    my $sessionid = md5_hex ($RCID);
 	if ($RCAUTH) {
-   	my ($active) = $qdbh->selectrow_array ("select count(*) from session where RCid = ? and last_active > (now() - interval 30 minute)", undef, $RCID);
+	  # If the user is already logged in, bypass the queue check.
-#    return if -e $SESSIONS_ACTIVE."/".$sessionid;
+   	my ($email, $RCPASS, $RCLVL) = split /&/, $RCAUTH;
-    return if $active;
+   	my ($active) = $qdbh->selectrow_array ("select count(*) from session where email = ? and timestamp > (now() - interval 30 minute)", undef, $email);
     return if $active;
+	}
 #  my $active_users = `/bin/ls -1 $SESSIONS_ACTIVE | /usr/bin/wc -l`; chomp $active_users;
+ 	my ($active_users) = $qdbh->selectrow_array ("select count(*) from session where timestamp > (now() - interval 30 minute)");
- 	my ($active_users) = $qdbh->selectrow_array ("select count(*) from session where timestamp > (now() - interval 30 minute)");
+	my ($current_wait) = $qdbh->selectrow_array ("select timestampdiff(minute, timestamp, now()) from queue where last_seen > now() - interval 7 minute limit 1");
-#  my @queued_users = `/bin/ls -1 $SESSIONS_QUEUE`; foreach (@queued_users) { chomp; }
+	my @queued_users;
-	my @queued_users;
+  push @queued_users, map { @{$_} } @{ $qdbh->selectall_arrayref ("select queueid from queue where last_seen > (now() - interval 7 minute) and (timestamp <> last_seen or timestampdiff(minute, last_seen, now()) <= 1) order by timestamp") };
   push @queued_users, map { @{$_} } @{ $qdbh->selectall_arrayref ("select queueid from queue where timestamp > (now() - interval 7 minute) order by timestamp") };
  	my $RCqueueID = CGI::cookie('RCQUEUEID') // WebDB::trim CGI::param('RCqueueID') // "";
- 	my $RCqueueID = CGI::cookie('RCQUEUEID') // WebDB::trim CGI::param('RCqueueID') // "";
+  $RCqueueID = "" unless inQueue ($RCqueueID, \@queued_users);
+  if ($active_users >= $max_users) {
+    # We are at max users. People have to wait.
-  if ($active_users >= $max_users) {
+    if (!$RCqueueID) {
-    # We are at max users. People have to wait.
-    if (!$RCqueueID) {
+   	  use Digest::MD5 qw/md5_hex/;
-   	  use Digest::MD5 qw/md5_hex/;
+   	  $RCqueueID = time () ."-". md5_hex (rand ());
-   	  $RCqueueID = time () ."-". md5_hex (rand ());
+   	  push @queued_users, $RCqueueID;
-   	  push @queued_users, $RCqueueID;
+   	  $qdbh->do ("replace into queue (queueid, timestamp, last_seen) values (?, now(), now())", undef, $RCqueueID);
-   	  $qdbh->do ("replace into queue (queueid, timestamp) values (?, now())", undef, $RCqueueID);
+    } else {
       $qdbh->do ("update queue set last_seen = now() where queueid = ?", undef, $RCqueueID);
 # 	  `/bin/touch $SESSIONS_QUEUE/$RCqueueID`;
-    printQueuePage ($RCqueueID, "(".inQueue ($RCqueueID, \@queued_users)." of ".scalar @queued_users." users)");
+    printQueuePage ($RCqueueID, "(".inQueue ($RCqueueID, \@queued_users)." of ".scalar @queued_users." users)", $current_wait);
     exit;
+  } elsif (scalar @queued_users) {
     # There are users in queue...
-  } elsif (scalar @queued_users) {
+    if (!$RCqueueID) {
-    # There are users in queue...
+      # If you're not already in queue, get in line.
-    if (!$RCqueueID) {
+   	  use Digest::MD5 qw/md5_hex/;
-      # If you're not already in queue, get in line.
+   	  $RCqueueID = time () ."-". md5_hex (rand ());
-   	  use Digest::MD5 qw/md5_hex/;
+   	  push @queued_users, $RCqueueID;
-   	  $RCqueueID = time () ."-". md5_hex (rand ());
+   	  $qdbh->do ("replace into queue (queueid, timestamp, last_seen) values (?, now(), now())", undef, $RCqueueID);
-   	  push @queued_users, $RCqueueID;
+    } else {
-   	  $qdbh->do ("replace into queue (queueid, timestamp) values (?, now())", undef, $RCqueueID);
+      $qdbh->do ("update queue set last_seen = now() where queueid = ?", undef, $RCqueueID);
+    }
    	my $queue_position = inQueue ($RCqueueID, \@queued_users);
     if ($queue_position > ($max_users - $active_users)) {
+      # If you're not at the head of the line, continue to wait.
-      # If you're not at the head of the line, continue to wait.
+      printQueuePage ($RCqueueID, "($queue_position of ".scalar @queued_users." users)", $current_wait);
-      printQueuePage ($RCqueueID, "($queue_position of ".scalar @queued_users." users)");
+      exit;
       exit;
+  }
   return;
+}
   return;
 sub printQueuePage {
   my $RCqueueID = shift;
-sub printQueuePage {
+  my $queue_position = shift;
-  my $RCqueueID = shift;
+  my $wait_time = shift;

Subversion Repositories VORC

(root)/trunk/perl/RollerCon.pm – Rev 154 → 162