forks/baikal
1
0
Fork 0
Code Releases Activity

Fix style with sabre/cs

Browse source
This commit is contained in:
Cyril 2019-10-15 10:03:57 +02:00
parent edbc8171c3
commit befb2b69ca
7 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/Frameworks/Baikal/Model/Config.php
View file

@ -42,7 +42,7 @@ abstract class Config extends \Flake\Core\Model\NoDb {
try {
$config = Yaml::parseFile($this->sConfigFilePath);
$aConfig = $config['parameters'];
} catch(\Exception $e) {
} catch (\Exception $e) {
$aConfig = static::getDefaultConfig();
}

14
Core/Frameworks/Baikal/Model/Config/Standard.php
View file

@ -115,7 +115,7 @@ class Standard extends \Baikal\Model\Config {
try {
$config = Yaml::parseFile(PROJECT_PATH_CONFIG . "system.yaml");
} catch(\Exception $e) {}
} catch (\Exception $e) {}
if (!isset($config['parameters']["BAIKAL_ADMIN_PASSWORDHASH"]) || trim($config['parameters']["BAIKAL_ADMIN_PASSWORDHASH"]) === "") {
@ -162,13 +162,13 @@ class Standard extends \Baikal\Model\Config {
protected static function getDefaultConfig() {
return [
"PROJECT_TIMEZONE" => "Europe/Paris",
"BAIKAL_CARD_ENABLED" => true,
"BAIKAL_CAL_ENABLED" => true,
"BAIKAL_INVITE_FROM" => "noreply@" . $_SERVER['SERVER_NAME'],
"BAIKAL_DAV_AUTH_TYPE" => "Digest",
"PROJECT_TIMEZONE" => "Europe/Paris",
"BAIKAL_CARD_ENABLED" => true,
"BAIKAL_CAL_ENABLED" => true,
"BAIKAL_INVITE_FROM" => "noreply@" . $_SERVER['SERVER_NAME'],
"BAIKAL_DAV_AUTH_TYPE" => "Digest",
"BAIKAL_ADMIN_PASSWORDHASH" => "",
"BAIKAL_AUTH_REALM" => "BaikalDAV",
"BAIKAL_AUTH_REALM" => "BaikalDAV",
];
}
}

10
Core/Frameworks/Baikal/Model/Config/System.php
View file

@ -125,13 +125,13 @@ class System extends \Baikal\Model\Config {
protected static function getDefaultConfig() {
return [
"PROJECT_SQLITE_FILE" => "db/db.sqlite",
"PROJECT_DB_MYSQL" => false,
"PROJECT_DB_MYSQL_HOST" => "",
"PROJECT_DB_MYSQL_DBNAME" => "",
"PROJECT_SQLITE_FILE" => "db/db.sqlite",
"PROJECT_DB_MYSQL" => false,
"PROJECT_DB_MYSQL_HOST" => "",
"PROJECT_DB_MYSQL_DBNAME" => "",
"PROJECT_DB_MYSQL_USERNAME" => "",
"PROJECT_DB_MYSQL_PASSWORD" => "",
"BAIKAL_ENCRYPTION_KEY" => "",
"BAIKAL_ENCRYPTION_KEY" => "",
"BAIKAL_CONFIGURED_VERSION" => BAIKAL_VERSION
];
}

2
Core/Frameworks/Baikal/Model/User.php
View file

@ -284,7 +284,7 @@ class User extends \Flake\Core\Model\Db {
try {
$config = Yaml::parseFile(PROJECT_PATH_CONFIG . "config.yaml");
} catch(\Exception $e) {}
} catch (\Exception $e) {}
return md5($this->get("username") . ':' . $config['parameters']['BAIKAL_AUTH_REALM'] . ':' . $sPassword);
}

14
Core/Frameworks/BaikalAdmin/Controller/Install/Database.php
View file

@ -40,13 +40,13 @@ class Database extends \Flake\Core\Controller {
if (file_exists(PROJECT_PATH_SPECIFIC . "config.system.php")) {
require_once(PROJECT_PATH_SPECIFIC . "config.system.php");
$this->oModel->set('PROJECT_SQLITE_FILE',PROJECT_SQLITE_FILE);
$this->oModel->set('PROJECT_DB_MYSQL',PROJECT_DB_MYSQL);
$this->oModel->set('PROJECT_DB_MYSQL_HOST',PROJECT_DB_MYSQL_HOST);
$this->oModel->set('PROJECT_DB_MYSQL_DBNAME',PROJECT_DB_MYSQL_DBNAME);
$this->oModel->set('PROJECT_DB_MYSQL_USERNAME',PROJECT_DB_MYSQL_USERNAME);
$this->oModel->set('PROJECT_DB_MYSQL_PASSWORD',PROJECT_DB_MYSQL_PASSWORD);
$this->oModel->set('BAIKAL_ENCRYPTION_KEY',BAIKAL_ENCRYPTION_KEY);
$this->oModel->set('PROJECT_SQLITE_FILE', PROJECT_SQLITE_FILE);
$this->oModel->set('PROJECT_DB_MYSQL', PROJECT_DB_MYSQL);
$this->oModel->set('PROJECT_DB_MYSQL_HOST', PROJECT_DB_MYSQL_HOST);
$this->oModel->set('PROJECT_DB_MYSQL_DBNAME', PROJECT_DB_MYSQL_DBNAME);
$this->oModel->set('PROJECT_DB_MYSQL_USERNAME', PROJECT_DB_MYSQL_USERNAME);
$this->oModel->set('PROJECT_DB_MYSQL_PASSWORD', PROJECT_DB_MYSQL_PASSWORD);
$this->oModel->set('BAIKAL_ENCRYPTION_KEY', BAIKAL_ENCRYPTION_KEY);
}
$this->oForm = $this->oModel->formForThisModelInstance([

2
Core/Frameworks/BaikalAdmin/Controller/Settings/System.php
View file

@ -70,7 +70,7 @@ class System extends \Flake\Core\Controller {
} else {
try {
$config = Yaml::parseFile(PROJECT_PATH_CONFIG . "system.yaml");
} catch(\Exception $e) {}
} catch (\Exception $e) {}
$bMySQL = $config['parameters']['PROJECT_DB_MYSQL'] ?? true;
}

2
Core/Frameworks/Flake/Framework.php
View file

@ -216,7 +216,7 @@ class Framework extends \Flake\Core\Framework {
try {
$config = Yaml::parseFile(PROJECT_PATH_CONFIG . "system.yaml");
} catch(\Exception $e) {
} catch (\Exception $e) {
return true;
}
# Dont init db on install, but in normal mode and when upgrading