Changeset 406

Show
Ignore:
Timestamp:
03/20/07 00:11:40 (2 years ago)
Author:
mikey
Message:

bugfix: hostname was not validated correctly
removed tabs

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/php/net/stubbles/util/validators/stubMailValidator.php

    r336 r406  
    2929         
    3030        $url = parse_url('mailto://' . $value); 
    31         if (isset($url['host']) == false || preg_match('/([a-z0-9-]*)\.([a-z]{2,4})$/', $url['host']) == false) { 
     31        if (isset($url['host']) == false || preg_match('/^([a-z0-9-]*)\.([a-z]{2,4})$/', $url['host']) == false) { 
    3232            return false; 
    3333        } 

  • trunk/src/test/php/net/stubbles/util/validators/stubMailValidatorTestCase.php

    r336 r406  
    3434     * assure that validation works correct 
    3535     */ 
    36     public function testValidation() 
    37     { 
    38         $this->assertFalse($this->mailValidator->validate(null)); 
    39         $this->assertFalse($this->mailValidator->validate('')); 
    40         $this->assertFalse($this->mailValidator->validate('xcdsfad')); 
    41         $this->assertFalse($this->mailValidator->validate('foobar@thishost.willnever.exist')); 
    42         $this->assertTrue($this->mailValidator->validate('example@example.org')); 
    43         $this->assertTrue($this->mailValidator->validate('example.foo.bar@example.org')); 
    44         $this->assertFalse($this->mailValidator->validate('.foo.bar@example.org')); 
    45         $this->assertFalse($this->mailValidator->validate('example@example.org\n')); 
    46         $this->assertFalse($this->mailValidator->validate('example@example.org\nBcc: example@example.com')); 
    47     } 
     36    public function testValidation() 
     37    { 
     38        $this->assertFalse($this->mailValidator->validate(null)); 
     39        $this->assertFalse($this->mailValidator->validate('')); 
     40        $this->assertFalse($this->mailValidator->validate('xcdsfad')); 
     41        $this->assertFalse($this->mailValidator->validate('foobar@thishost.willnever.exist')); 
     42        $this->assertTrue($this->mailValidator->validate('example@example.org')); 
     43        $this->assertTrue($this->mailValidator->validate('example.foo.bar@example.org')); 
     44        $this->assertFalse($this->mailValidator->validate('.foo.bar@example.org')); 
     45        $this->assertFalse($this->mailValidator->validate('example@example.org\n')); 
     46        $this->assertFalse($this->mailValidator->validate('example@exa"mple.org')); 
     47        $this->assertFalse($this->mailValidator->validate('example@example.org\nBcc: example@example.com')); 
     48    } 
    4849 
    49    /** 
     50    /** 
    5051     * assure that returning the criterias works correct 
    5152     */ 
    52    public function testGetCriteria() 
    53    { 
    54        $this->assertEqual($this->mailValidator->getCriteria(), array()); 
    55    } 
     53    public function testGetCriteria() 
     54    { 
     55        $this->assertEqual($this->mailValidator->getCriteria(), array()); 
     56    } 
    5657} 
    5758?>