X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=0ef376f0409fa4809897392149d2cadecbc36dc1;hb=4c0591c17b89dbb049ba119d3f3ea15c5b56128c;hp=0af77f04df235d0da9e136dc5e7df3eb4f8856fa;hpb=ab568d677a2d2243eabee315b3e609c4ea4f73a0;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 0af77f04..0ef376f0 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -18,7 +18,7 @@ use Carp;
 use strict;
 use vars qw(%u $dbm $filename %valid);
 
-%u = undef;
+%u = ();
 $dbm = undef;
 $filename = undef;
 
@@ -36,7 +36,7 @@ $filename = undef;
   lastin => '0,Last Time in,cldatetime',
   passwd => '9,Password',
   addr => '0,Full Address',
-  sort => '0,Type of User',                # A - ak1a, U - User, S - spider cluster, B - BBS
+  'sort' => '0,Type of User',                # A - ak1a, U - User, S - spider cluster, B - BBS
   xpert => '0,Expert Status,yesno',
   bbs => '0,Home BBS',
   node => '0,Last Node',
@@ -47,6 +47,8 @@ $filename = undef;
   reg => '0,Registered?,yesno',            # is this user registered?
   lang => '0,Language',
   hmsgno => '0,Highest Msgno',
+  group => '0,Access Group,parray',               # used to create a group of users/nodes for some purpose or other
+  isolate => '9,Isolate network,yesno',
 );
 
 no strict;
@@ -104,7 +106,7 @@ sub new
 
   my $self = {};
   $self->{call} = $call;
-  $self->{sort} = 'U';
+  $self->{'sort'} = 'U';
   $self->{dxok} = 1;
   $self->{annok} = 1;
   $self->{lang} = $main::lang;
@@ -195,6 +197,67 @@ sub fields
   return keys(%valid);
 }
 
+#
+# group handling
+#
+
+# add one or more groups
+sub add_group
+{
+	my $self = shift;
+	my $ref = $self->{group} || [ 'local' ];
+	$self->{group} = $ref if !$self->{group};
+	push @$ref, @_ if @_;
+}
+
+# remove one or more groups
+sub del_group
+{
+	my $self = shift;
+	my $ref = $self->{group} || [ 'local' ];
+	my @in = @_;
+	
+	$self->{group} = $ref if !$self->{group};
+	
+	@$ref = map { my $a = $_; return (grep { $_ eq $a } @in) ? () : $a } @$ref;
+}
+
+# does this thing contain all the groups listed?
+sub union
+{
+	my $self = shift;
+	my $ref = $self->{group};
+	my $n;
+	
+	return 0 if !$ref || @_ == 0;
+	return 1 if @$ref == 0 && @_ == 0;
+	for ($n = 0; $n < @_; ) {
+		for (@$ref) {
+			my $a = $_;
+			$n++ if grep $_ eq $a, @_; 
+		}
+	}
+	return $n >= @_;
+}
+
+# simplified group test just for one group
+sub in_group
+{
+	my $self = shift;
+	my $s = shift;
+	my $ref = $self->{group};
+	
+	return 0 if !$ref;
+	return grep $_ eq $s, $ref;
+}
+
+# set up a default group (only happens for them's that connect direct)
+sub new_group
+{
+	my $self = shift;
+	$self->{group} = [ 'local' ];
+}
+
 #
 # return a prompt for a field
 #
@@ -205,45 +268,11 @@ sub field_prompt
   return $valid{$ele};
 }
 
-#
-# enter an element from input, returns 1 for success
-#
-
-sub enter
-{
-  my ($self, $ele, $value) = @_;
-  return 0 if (!defined $valid{$ele});
-  chomp $value;
-  return 0 if $value eq "";
-  if ($ele eq 'long') {
-    my ($longd, $longm, $longl) = $value =~ /(\d+) (\d+) ([EWew])/;
-	return 0 if (!$longl || $longd < 0 || $longd > 180 || $longm < 0 || $longm > 59);
-	$longd += ($longm/60);
-	$longd = 0-$longd if (uc $longl) eq 'W'; 
-	$self->{'long'} = $longd;
-	return 1;
-  } elsif ($ele eq 'lat') {
-    my ($latd, $latm, $latl) = $value =~ /(\d+) (\d+) ([NSns])/;
-	return 0 if (!$latl || $latd < 0 || $latd > 90 || $latm < 0 || $latm > 59);
-	$latd += ($latm/60);
-	$latd = 0-$latd if (uc $latl) eq 'S';
-	$self->{'lat'} = $latd;
-	return 1;
-  } elsif ($ele eq 'qra') {
-    $self->{'qra'} = UC $value;
-	return 1;
-  } else {
-    $self->{$ele} = $value;               # default action
-	return 1;
-  }
-  return 0;
-}
-
 # some variable accessors
 sub sort
 {
   my $self = shift;
-  @_ ? $self->{sort} = shift : $self->{sort} ;
+  @_ ? $self->{'sort'} = shift : $self->{'sort'} ;
 }
 1;
 __END__