X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdisconnect.pl;h=9acf0ce336fa5f37d5621b80139803097187c67b;hb=a6e52cc1680c2c30ef874e2e6c16d00c956624ee;hp=32cb543f43469bfa4692d1e8270681225194c441;hpb=57b5e464bc44ae8eee23ab94c1f499f527595dc9;p=spider.git

diff --git a/cmd/disconnect.pl b/cmd/disconnect.pl
index 32cb543f..9acf0ce3 100644
--- a/cmd/disconnect.pl
+++ b/cmd/disconnect.pl
@@ -6,24 +6,35 @@ my @calls = split /\s+/, $line;
 my $call;
 my @out;
 
-if ($self->priv < 9) {
-  return (1, "not allowed");
+if ($self->priv < 5) {
+	return (1, $self->msg('e5'));
 }
 
 foreach $call (@calls) {
-  $call = uc $call;
-  next if $call eq $main::mycall;
-  my $dxchan = DXChannel->get($call);
-  if ($dxchan) {
-    if ($dxchan->is_ak1a) {
-      $dxchan->send_now("D", DXProt::pc39($dxchan->call, 'Disconnected'));
-    } else {
-      $dxchan->disconnect;
-	} 
-	push @out, "disconnected $call";
-  } else {
-    push @out, "$call not connected locally";
-  }
+	$call = uc $call;
+	next if $call eq $main::mycall;
+	my $dxchan = DXChannel->get($call);
+	if ($dxchan) {
+		if ($dxchan->is_node) {
+#			$dxchan->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', $self->call)));
+		} else {
+			return (1, $self->msg('e5')) if $self->priv < 8;
+			$dxchan->send_now('D', $self->msg('disc1', $self->call));
+		} 
+		$dxchan->disconnect;
+		push @out, $self->msg('disc2', $call);
+	} elsif (my $conn = Msg->conns($call)) {
+		$conn->disconnect;
+		push @out, $self->msg('disc3', $call);
+	} elsif (my $ref = DXCluster->get_exact($call)) {
+		my $dxchancall = $ref->dxchancall;
+		if ($dxchancall eq $main::mycall || !DXChannel->get($dxchancall)) {
+			$ref->del;
+			push @out, $self->msg('disc4', $call);
+		}
+	} else {
+		push @out, $self->msg('e10', $call);
+	}
 }
 
 return (1, @out);