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

fix installation for mariadb-10.5; minor fixes for global search later

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-03-07 18:43:06 +01:00
parent 3c20fe4202
commit f758d0d943
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
install/lib/class.FroxlorInstall.php
View File

@@ -812,8 +812,26 @@ class FroxlorInstall
private function _grantDbPrivilegesTo(&$db_root, $database, $username, $password, $access_host) private function _grantDbPrivilegesTo(&$db_root, $database, $username, $password, $access_host)
{ {
// mariadb
if (version_compare($db_root->getAttribute(\PDO::ATTR_SERVER_VERSION), '10.0.0', '>=')) {
// create user
$stmt = $db_root->prepare("
CREATE USER '" . $username . "'@'" . $access_host . "' IDENTIFIED BY :password
");
$stmt->execute(array(
"password" => $password
));
// grant privileges
$stmt = $db_root->prepare("
GRANT ALL ON `" . $database . "`.* TO :username@:host
");
$stmt->execute(array(
"username" => $username,
"host" => $access_host
));
}
// mysql8 compatibility // mysql8 compatibility
if (version_compare($db_root->getAttribute(\PDO::ATTR_SERVER_VERSION), '8.0.11', '>=')) { elseif (version_compare($db_root->getAttribute(\PDO::ATTR_SERVER_VERSION), '8.0.11', '>=')) {
// create user // create user
$stmt = $db_root->prepare(" $stmt = $db_root->prepare("
CREATE USER '" . $username . "'@'" . $access_host . "' IDENTIFIED WITH mysql_native_password BY :password CREATE USER '" . $username . "'@'" . $access_host . "' IDENTIFIED WITH mysql_native_password BY :password

1
lib/Froxlor/UI/Callbacks/Text.php
View File

@@ -3,7 +3,6 @@
namespace Froxlor\UI\Callbacks; namespace Froxlor\UI\Callbacks;
use Froxlor\PhpHelper; use Froxlor\PhpHelper;
use Froxlor\Settings;
use Froxlor\UI\Panel\UI; use Froxlor\UI\Panel\UI;
use Froxlor\User; use Froxlor\User;

2
lib/Froxlor/UI/Collection.php
View File

@@ -25,7 +25,7 @@ class Collection
private array $has = []; private array $has = [];
private array $params; private array $params;
private array $userinfo; private array $userinfo;
private ?Pagination $pagination; private ?Pagination $pagination = null;
public function __construct(string $class, array $userInfo, array $params = []) public function __construct(string $class, array $userInfo, array $params = [])
{ {