webapp/postfixadmin
1
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2025-08-07 17:42:53 +03:00
Code Activity

update generate_password() to allow length to be specified; update test

Browse Source
This commit is contained in:
David Goodwin
2018-05-02 21:10:06 +01:00
parent 7388a7ca62
commit 7282928e6d
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
functions.inc.php
View File

@@ -832,14 +832,13 @@ function encode_header($string, $default_charset = "utf-8") {
// /**
// generate_password * Generate a random password of $length characters.
// Action: Generates a random password * @param int $length (optional, default: 12)
// Call: generate_password () * @return string
// *
function generate_password() { */
// length of the generated password function generate_password($length = 12) {
$length = 12;
// define possible characters // define possible characters
$possible = "2345678923456789abcdefghijkmnpqrstuvwxyzABCDEFGHIJKLMNPQRSTUVWXYZ"; # skip 0 and 1 to avoid confusion with O and l $possible = "2345678923456789abcdefghijkmnpqrstuvwxyzABCDEFGHIJKLMNPQRSTUVWXYZ"; # skip 0 and 1 to avoid confusion with O and l

13
tests/GeneratePasswordTest.php
View File

@@ -11,5 +11,18 @@ class GeneratePasswordTest extends PHPUnit_Framework_TestCase {
$this->assertNotEquals($one, $two); $this->assertNotEquals($one, $two);
$this->assertNotEmpty($one); $this->assertNotEmpty($one);
$this->assertNotEmpty($two); $this->assertNotEmpty($two);
$this->assertEquals(12, strlen($one));
}
public function testLength() {
$one = generate_password(1);
$ten = generate_password(10);
$this->assertNotEquals($one, $ten);
$this->assertNotEmpty($one);
$this->assertNotEmpty($ten);
$this->assertEquals(10, strlen($ten));
$this->assertEquals(1, strlen($one));
} }
} }