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

fix installation for mariadb-10.5; fix warnings for not used feature; thx to Akecheta for the hints and testing

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-03-07 18:40:31 +01:00
parent 0d45e03f19
commit a2f8d02b16
2 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -550,16 +550,23 @@ class FroxlorInstall
$this->_updateSetting($upd_stmt, 'error', 'system', 'errorlog_level'); $this->_updateSetting($upd_stmt, 'error', 'system', 'errorlog_level');
} }
/*
* not yet used in configfiles
* -> 0.11.x
*
$distros = glob(\Froxlor\FileDir::makeCorrectDir(\Froxlor\Froxlor::getInstallDir() . '/lib/configfiles/') . '*.xml'); $distros = glob(\Froxlor\FileDir::makeCorrectDir(\Froxlor\Froxlor::getInstallDir() . '/lib/configfiles/') . '*.xml');
foreach ($distros as $_distribution) { foreach ($distros as $_distribution) {
if ($this->_data['distribution'] == str_replace(".xml", "", strtolower(basename($_distribution)))) { if ($this->_data['distribution'] == str_replace(".xml", "", strtolower(basename($_distribution)))) {
$dist = new \Froxlor\Config\ConfigParser($_distribution); $dist = new \Froxlor\Config\ConfigParser($_distribution);
$defaults = $dist->getDefaults(); $defaults = $dist->getDefaults();
foreach ($defaults->property as $property) { if (!empty($defaults)) {
$this->_updateSetting($upd_stmt, $property->value, $property->settinggroup, $property->varname); foreach ($defaults as $property) {
$this->_updateSetting($upd_stmt, $property->attributes()->value, $property->attributes()->settinggroup, $property->attributes()->varname);
}
} }
} }
} }
*/
$this->_updateSetting($upd_stmt, $this->_data['activate_newsfeed'], 'admin', 'show_news_feed'); $this->_updateSetting($upd_stmt, $this->_data['activate_newsfeed'], 'admin', 'show_news_feed');
$this->_updateSetting($upd_stmt, dirname(dirname(dirname(__FILE__))), 'system', 'letsencryptchallengepath'); $this->_updateSetting($upd_stmt, dirname(dirname(dirname(__FILE__))), 'system', 'letsencryptchallengepath');
@@ -734,8 +741,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

6
lib/Froxlor/Config/ConfigParser.php
View File

@@ -182,7 +182,7 @@ class ConfigParser
} }
/** /**
* Parse the XML and populate $this->services * Parse the XML and populate $this->defaults
* *
* @return bool * @return bool
*/ */
@@ -194,9 +194,9 @@ class ConfigParser
} }
// Get all defaults // Get all defaults
$defaults = $this->xml->xpath('//defaults'); $defaults = $this->xml->xpath('//defaults/default');
foreach ($defaults as $default) { foreach ($defaults as $default) {
$this->defaults = $default; $this->defaults[] = $default;
} }
// Switch flag to indicate we parsed our data // Switch flag to indicate we parsed our data