maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

more function moving

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-20 08:33:32 +01:00
parent 8c896d60d6
commit bed069f269
41 changed files with 336 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/Emails/EmailsTest.php
View File

@@ -377,7 +377,7 @@ class MailsTest extends TestCase
$data = [
'emailaddr' => 'info@test2.local',
'email_password' => \Froxlor\System::generatePassword(),
'email_password' => \Froxlor\System\Crypt::generatePassword(),
'alternative_email' => 'noone@example.com',
'email_quota' => 1337,
'sendinfomail' => TRAVIS_CI == 1 ? 0 : 1
@@ -399,7 +399,7 @@ class MailsTest extends TestCase
$data = [
'emailaddr' => 'info@test2.local',
'email_password' => \Froxlor\System::generatePassword(),
'email_password' => \Froxlor\System\Crypt::generatePassword(),
'alternative_email' => 'noone@example.com',
'email_quota' => 1338
];
@@ -459,7 +459,7 @@ class MailsTest extends TestCase
// add account
$data = [
'emailaddr' => 'info@test2.local',
'email_password' => \Froxlor\System::generatePassword(),
'email_password' => \Froxlor\System\Crypt::generatePassword(),
'alternative_email' => 'noone@example.com',
'sendinfomail' => TRAVIS_CI == 1 ? 0 : 1
];

8
tests/Extras/DirProtectionsTest.php
View File

@@ -27,7 +27,7 @@ class DirProtectionsTest extends TestCase
$data = [
'path' => '/test',
'username' => 'testing',
'directory_password' => \Froxlor\System::generatePassword(),
'directory_password' => \Froxlor\System\Crypt::generatePassword(),
'directory_authname' => 'test1'
];
$json_result = DirProtections::getLocal($customer_userdata, $data)->add();
@@ -49,7 +49,7 @@ class DirProtectionsTest extends TestCase
$data = [
'path' => '/test',
'username' => 'testing',
'directory_password' => \Froxlor\System::generatePassword(),
'directory_password' => \Froxlor\System\Crypt::generatePassword(),
'directory_authname' => 'test2'
];
$this->expectExceptionMessage("Combination of username and path already exists");
@@ -65,7 +65,7 @@ class DirProtectionsTest extends TestCase
'loginname' => 'test1'
))->get();
$customer_userdata = json_decode($json_result, true)['data'];
$up = \Froxlor\System::generatePassword();
$up = \Froxlor\System\Crypt::generatePassword();
$data = [
'path' => '/test',
'username' => $up,
@@ -146,7 +146,7 @@ class DirProtectionsTest extends TestCase
$data = [
'id' => 1,
'directory_password' => \Froxlor\System::generatePassword(),
'directory_password' => \Froxlor\System\Crypt::generatePassword(),
'directory_authname' => 'test1337'
];
$json_result = DirProtections::getLocal($customer_userdata, $data)->update();

4
tests/Mysqls/MysqlsTest.php
View File

@@ -27,7 +27,7 @@ class MysqlsTest extends TestCase
$customer_userdata = json_decode($json_result, true)['data'];
$data = [
'mysql_password' => \Froxlor\System::generatePassword(),
'mysql_password' => \Froxlor\System\Crypt::generatePassword(),
'description' => 'testdb',
'sendinfomail' => TRAVIS_CI == 1 ? 0 : 1
];
@@ -103,7 +103,7 @@ class MysqlsTest extends TestCase
$data = [
'dbname' => 'test1sql1',
'mysql_password' => \Froxlor\System::generatePassword(),
'mysql_password' => \Froxlor\System\Crypt::generatePassword(),
'description' => 'testdb-upd',
'loginname' => 'test1'
];

2
tests/bootstrap.php
View File

@@ -69,7 +69,7 @@ Database::query("ALTER TABLE `" . TABLE_PANEL_FPMDAEMONS . "` AUTO_INCREMENT=2;"
// add superadmin
Database::query("INSERT INTO `" . TABLE_PANEL_ADMINS . "` SET
`loginname` = 'admin',
`password` = '" . makeCryptPassword('admin') . "',
`password` = '" . \Froxlor\System\Crypt::makeCryptPassword('admin') . "',
`name` = 'Froxlor-Administrator',
`email` = 'admin@dev.froxlor.org',
`def_language` = 'English',