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

 use DBI;
 use WebDB;
 $SIG{__WARN__} = sub { warn sprintf("[%s] ", scalar localtime), @_ };
-$SIG{__DIE__}  = sub { die  sprintf("[%s] ", scalar localtime), @_ };
-my $SESSIONS = $ENV{SERVER_NAME} eq "volunteers.rollercon.com" ? "/home3/rollerco/vorc_sessions" : "/tmp/sessions";
-my $SESSIONS_ACTIVE = $SESSIONS . "/active";
-my $SESSIONS_QUEUE  = $SESSIONS . "/queue";
-`/bin/mkdir $SESSIONS` unless -e $SESSIONS;
-`/bin/mkdir $SESSIONS_ACTIVE` unless -e $SESSIONS_ACTIVE;
-`/bin/mkdir $SESSIONS_QUEUE`  unless -e $SESSIONS_QUEUE;
-`/usr/bin/find $SESSIONS_ACTIVE -mmin +30 -type f -delete`;
-`/usr/bin/find $SESSIONS_QUEUE -mmin +7 -type f -delete`;
+$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
-my $dbh = WebDB->connect ();
+my $dbh = WebDB::connect ("vorc");
 sub getRCDBH {
     if ($session_length > getSetting ("MAX_SESSION_MINUTES")) {
       $ENV{'QUERY_STRING'} = "LOGOUT";
       $authenticated->{ERRMSG} = "Maximum session time exceeded.<br>";
+    }
     my $qdbh = WebDB::connect ("session");
 	  if ($ENV{'QUERY_STRING'} eq "LOGOUT") {
       # warn "logging $ORCUSER->{derby_name} out...";
       $authenticated->{ERRMSG} .= "Logged Out.<br>";
       $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`;
-  		`/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`;
-			`/bin/touch $SESSIONS_ACTIVE/$sessionid`;
+      $qdbh->do ("replace into session (RCid, sessionid, timestamp) values (?, ?, now())", undef, $ORCUSER->{RCid}, $sessionid);
+#			`/bin/rm $SESSIONS_QUEUE/$RCqueueID` if ($RCqueueID and -e $SESSIONS_QUEUE."/".$RCqueueID);
-			`/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;
+	}
 	return if $ENV{'QUERY_STRING'} eq "SKIPQUEUE";
+	my $RCAUTH = CGI::cookie('RCAUTH') // "";
-	my $RCAUTH = CGI::cookie('RCAUTH') // "";
+	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;
-	  use Digest::MD5 qw/md5_hex/;
+#    my $sessionid = md5_hex ($RCID);
-   	my ($RCID, $RCPASS, $RCLVL) = split /&/, $RCAUTH;
+   	my ($active) = $qdbh->selectrow_array ("select count(*) from session where RCid = ? and last_active > (now() - interval 30 minute)", undef, $RCID);
-    my $sessionid = md5_hex ($RCID);
+#    return if -e $SESSIONS_ACTIVE."/".$sessionid;
+    return if $active;
+	}
+#  my $active_users = `/bin/ls -1 $SESSIONS_ACTIVE | /usr/bin/wc -l`; chomp $active_users;
-    return if -e $SESSIONS_ACTIVE."/".$sessionid;
+ 	my ($active_users) = $qdbh->selectrow_array ("select count(*) from session where timestamp > (now() - interval 30 minute)");
 #  my @queued_users = `/bin/ls -1 $SESSIONS_QUEUE`; foreach (@queued_users) { chomp; }
 	my @queued_users;
-  my $active_users = `/bin/ls -1 $SESSIONS_ACTIVE | /usr/bin/wc -l`; chomp $active_users;
+  push @queued_users, map { @{$_} } @{ $qdbh->selectall_arrayref ("select queueid from queue where timestamp > (now() - interval 7 minute) order by timestamp") };
   my @queued_users = `/bin/ls -1 $SESSIONS_QUEUE`; foreach (@queued_users) { chomp; }
  	my $RCqueueID = CGI::cookie('RCQUEUEID') // WebDB::trim CGI::param('RCqueueID') // "";
   if ($active_users >= $max_users) {
     # We are at max users. People have to wait.
-    if (!$RCqueueID) {
+    if (!$RCqueueID) {
    	  use Digest::MD5 qw/md5_hex/;
    	  $RCqueueID = time () ."-". md5_hex (rand ());
    	  push @queued_users, $RCqueueID;
+    }
       # If you're not already in queue, get in line.
    	  use Digest::MD5 qw/md5_hex/;
    	  $RCqueueID = time () ."-". md5_hex (rand ());
    	  push @queued_users, $RCqueueID;
+    }
- 	  `/bin/touch $SESSIONS_QUEUE/$RCqueueID`;
+ 		$qdbh->do ("replace into queue (queueid, timestamp) values (?, now())", 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.
   printRCHeader("is Busy");
   print<<busy;
     <P><b><font size=+2>Sorry, we are full right now.</font></P>
     <P>You are in queue $queue_position.</P>
     <div><ul>
-    <li>This page will refresh every 15 seconds.</li>
+    <li>This page will refresh every 30 seconds.</li>
     <li>When it's your turn to log in, you'll see the username/password boxes.</li>
     <li>If you don't log in within five [5] minutes, or if you leave this page, you will likely lose your place in line.</li>
     </ul></div>
     </BODY>
     <SCRIPT language="JavaScript">
    	<!--
-    // Refresh the page after a delay of 5 seconds
+    // Refresh the page after a delay
       setTimeout(function(){
         location.replace(location.href);
-      }, 15000); // 15000 milliseconds = 15 seconds
+      }, 30000); // 30000 milliseconds = 30 seconds
     //-->
     </SCRIPT>
     </HTML>
 busy
   return;
   my $filter = shift // "";
   my $year = 1900 + (localtime)[5];
   my @whereclause;
   if ($filter eq "all") {
-  	push @whereclause, "date >= '$year-01-01'";
+  	push @whereclause, "year(date) >= year(now())";
   } else {
   	push @whereclause, "date >= date(now())";
+  }
 #  if ($RCid ne $ORCUSER->{RCid}) {
   my $daily_count;
   if ($department eq "CLA") {
     # MVP Class Sign-up
     $MAXSHIFTS = getSetting ("MAX_CLASS_SIGNUP");
-	  ($daily_count) = $dbh->selectrow_array ("select count(*) from v_class_signup where RCid = ?", undef, $user_id);
+	  ($daily_count) = $dbh->selectrow_array ("select count(*) from v_class_signup where RCid = ? and year(date) = year(now())", undef, $user_id);
 #	  ($daily_count) = $dbh->selectrow_array ("select count(*) from v_shift where RCid = ? and dept = 'CLA'", undef, $user_id);
    	if ($change eq "add" and $daily_count >= $MAXSHIFTS and !$leadership_change) {
 	    return "<br>Denied! You may only sign up for $MAXSHIFTS Classes!<br>\n";
+	  }

Subversion Repositories VORC

(root)/trunk/perl/RollerCon.pm – Rev 152 → 153