Changeset 2143

Show
Ignore:
Timestamp:
11/29/04 11:06:34 (4 years ago)
Author:
eridius
Message:

Make GUI banning work properly if _address doesn't have the user@ part

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/JVChatRoomMember.m

    r1914 r2143  
    434434                // Address is in the form of user@hostmask, lets get rid of the user bit 
    435435                NSArray *parts = [_address componentsSeparatedByString:@"@"]; 
     436                NSString *hostmask; 
    436437                if( [parts count] == 2 ) { 
    437                         NSString *hostmask = [parts objectAtIndex:1]; 
    438                         [[_parent connection] banMember:[NSString stringWithFormat:@"*!*@%@", hostmask] inRoom:[_parent target]]; 
     438                        hostmask = [parts objectAtIndex:1]; 
     439                } else { 
     440                        hostmask = [parts objectAtIndex:0]; 
    439441                } 
     442                [[_parent connection] banMember:[NSString stringWithFormat:@"*!*@%@", hostmask] inRoom:[_parent target]]; 
    440443        } 
    441444} 
    …… 
    481484        [firstTitle setStringValue:NSLocalizedString( @"With hostmask:", "ban hostmask label")]; 
    482485 
    483         if( _address) [firstField setStringValue:[NSString stringWithFormat:@"%@!%@", [self nickname], _address]]; 
    484         else [firstField setStringValue:@""]; 
     486        if( _address) { 
     487                NSArray *parts = [_address componentsSeparatedByString:@"@"]; 
     488                NSString *hostmask; 
     489                if( [parts count] == 2 ) { 
     490                        hostmask = [parts objectAtIndex:1]; 
     491                } else { 
     492                        hostmask = [parts objectAtIndex:0]; 
     493                } 
     494                [firstField setStringValue:[NSString stringWithFormat:@"%@!*@%@", [self nickname], hostmask]]; 
     495        } else 
     496                [firstField setStringValue:@""]; 
    485497 
    486498        [banWindow makeFirstResponder:firstField]; 
    …… 
    524536        [secondTitle setStringValue:NSLocalizedString( @"And reason:", "kick reason (secondary)" )]; 
    525537 
    526         if( _address ) [firstField setStringValue:[NSString stringWithFormat:@"%@!%@", [self nickname], _address]]; 
    527         else [firstField setStringValue:@""]; 
     538        if( _address ) { 
     539                NSArray *parts = [_address componentsSeparatedByString:@"@"]; 
     540                NSString *hostmask; 
     541                if( [parts count] == 2 ) { 
     542                        hostmask = [parts objectAtIndex:1]; 
     543                } else { 
     544                        hostmask = [parts objectAtIndex:0]; 
     545                } 
     546                [firstField setStringValue:[NSString stringWithFormat:@"%@!*@%@", [self nickname], hostmask]]; 
     547        } else 
     548                [firstField setStringValue:@""]; 
    528549        [secondField setStringValue:@""]; 
    529550