Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-10 18:37:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [FIX] Fixed config issue when managing MySQL BIT fields

Browse Source 
* [MOD] Added some options on config migration
This commit is contained in:
nuxsmin
2017-01-24 11:17:14 +01:00
parent 4ebe0f723b
commit bf74b99b54
3 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
inc/SP/Core/Installer.class.php
View File

@@ -471,9 +471,7 @@ class Installer
$UserData->setUserLogin($this->InstallData->getAdminLogin());
$UserData->setUserPass($this->InstallData->getAdminPass());
$UserData->setUserName('Admin');
$UserData->setUserIsAdminApp(true);
$UserData->setUserIsAdminAcc(false);
$UserData->setUserIsDisabled(false);
$UserData->setUserIsAdminApp(1);
try {
User::getItem($UserData)->add();

11
inc/SP/Core/Upgrade.class.php
View File

@@ -296,7 +296,9 @@ class Upgrade
{
return [
'setAccountCount' => 'account_count',
'setAccountLink' => 'account_link',
'setCheckUpdates' => 'checkupdates',
'setCheckNotices' => 'checknotices',
'setDbHost' => 'dbhost',
'setDbName' => 'dbname',
'setDbPass' => 'dbpass',
@@ -310,7 +312,6 @@ class Upgrade
'setSessionTimeout' => 'session_timeout',
'setSiteLang' => 'sitelang',
'setConfigVersion' => 'version',
'setCheckNotices' => 'checknotices',
'setConfigHash' => 'config_hash',
'setProxyEnabled' => 'proxy_enabled',
'setProxyPass' => 'proxy_pass',
@@ -320,8 +321,8 @@ class Upgrade
'setResultsAsCards' => 'resultsascards',
'setSiteTheme' => 'sitetheme',
'setAccountPassToImage' => 'account_passtoimage',
'setFilesAllowedExts' => 'allowed_exts',
'setFilesAllowedSize' => 'allowed_size',
'setFilesAllowedExts' => ['allowed_exts', 'files_allowed_exts'],
'setFilesAllowedSize' => ['allowed_size', 'files_allowed_size'],
'setFilesEnabled' => ['filesenabled', 'files_enabled'],
'setLdapBase' => ['ldapbase', 'ldap_base'],
'setLdapBindPass' => ['ldapbindpass', 'ldap_bindpass'],
@@ -329,12 +330,16 @@ class Upgrade
'setLdapEnabled' => ['ldapenabled', 'ldap_enabled'],
'setLdapGroup' => ['ldapgroup', 'ldap_group'],
'setLdapServer' => ['ldapserver', 'ldap_server'],
'setLdapAds' => 'ldap_ads',
'setLdapDefaultGroup' => 'ldap_defaultgroup',
'setLdapDefaultProfile' => 'ldap_defaultprofile',
'setLogEnabled' => ['logenabled', 'log_enabled'],
'setMailEnabled' => ['mailenabled', 'mail_enabled'],
'setMailFrom' => ['mailfrom', 'mail_from'],
'setMailPass' => ['mailpass', 'mail_pass'],
'setMailPort' => ['mailport', 'mail_port'],
'setMailRequestsEnabled' => ['mailrequestsenabled', 'mail_requestsenabled'],
'setMailAuthenabled' => 'mail_authenabled',
'setMailSecurity' => ['mailsecurity', 'mail_security'],
'setMailServer' => ['mailserver', 'mail_server'],
'setMailUser' => ['mailuser', 'mail_user'],

54
inc/SP/DataModel/UserData.class.php
View File

@@ -60,23 +60,23 @@ class UserData extends UserPassData implements DataModelInterface
/**
* @var bool
*/
public $user_isAdminApp = false;
public $user_isAdminApp = 0;
/**
* @var bool
*/
public $user_isAdminAcc = false;
public $user_isAdminAcc = 0;
/**
* @var bool
*/
public $user_isDisabled = false;
public $user_isDisabled = 0;
/**
* @var bool
*/
public $user_isChangePass = false;
public $user_isChangePass = 0;
/**
* @var bool
*/
public $user_isLdap = false;
public $user_isLdap = 0;
/**
* @var int
*/
@@ -92,7 +92,7 @@ class UserData extends UserPassData implements DataModelInterface
/**
* @var bool
*/
public $user_isMigrate = false;
public $user_isMigrate = 0;
/**
* @var
*/
@@ -107,7 +107,7 @@ class UserData extends UserPassData implements DataModelInterface
*/
public function getUserCount()
{
return $this->user_count;
return (int)$this->user_count;
}
/**
@@ -115,7 +115,7 @@ class UserData extends UserPassData implements DataModelInterface
*/
public function setUserCount($user_count)
{
$this->user_count = $user_count;
$this->user_count = (int)$user_count;
}
/**
@@ -123,7 +123,7 @@ class UserData extends UserPassData implements DataModelInterface
*/
public function getUserLastLogin()
{
return $this->user_lastLogin;
return (int)$this->user_lastLogin;
}
/**
@@ -131,7 +131,7 @@ class UserData extends UserPassData implements DataModelInterface
*/
public function setUserLastLogin($user_lastLogin)
{
$this->user_lastLogin = $user_lastLogin;
$this->user_lastLogin = (int)$user_lastLogin;
}
/**
@@ -139,7 +139,7 @@ class UserData extends UserPassData implements DataModelInterface
*/
public function getUserLastUpdate()
{
return $this->user_lastUpdate;
return (int)$this->user_lastUpdate;
}
/**
@@ -147,7 +147,7 @@ class UserData extends UserPassData implements DataModelInterface
*/
public function setUserLastUpdate($user_lastUpdate)
{
$this->user_lastUpdate = $user_lastUpdate;
$this->user_lastUpdate = (int)$user_lastUpdate;
}
/**
@@ -155,7 +155,7 @@ class UserData extends UserPassData implements DataModelInterface
*/
public function isUserIsMigrate()
{
return $this->user_isMigrate;
return (bool)$this->user_isMigrate;
}
/**
@@ -163,7 +163,7 @@ class UserData extends UserPassData implements DataModelInterface
*/
public function setUserIsMigrate($user_isMigrate)
{
$this->user_isMigrate = $user_isMigrate;
$this->user_isMigrate = (int)$user_isMigrate;
}
/**
@@ -235,7 +235,7 @@ class UserData extends UserPassData implements DataModelInterface
*/
public function getUserProfileId()
{
return $this->user_profileId;
return (int)$this->user_profileId;
}
/**
@@ -243,7 +243,7 @@ class UserData extends UserPassData implements DataModelInterface
*/
public function setUserProfileId($user_profileId)
{
$this->user_profileId = $user_profileId;
$this->user_profileId = (int)$user_profileId;
}
/**
@@ -251,7 +251,7 @@ class UserData extends UserPassData implements DataModelInterface
*/
public function isUserIsAdminApp()
{
return $this->user_isAdminApp;
return (bool)$this->user_isAdminApp;
}
/**
@@ -259,7 +259,7 @@ class UserData extends UserPassData implements DataModelInterface
*/
public function setUserIsAdminApp($user_isAdminApp)
{
$this->user_isAdminApp = $user_isAdminApp;
$this->user_isAdminApp = (int)$user_isAdminApp;
}
/**
@@ -267,7 +267,7 @@ class UserData extends UserPassData implements DataModelInterface
*/
public function isUserIsAdminAcc()
{
return $this->user_isAdminAcc;
return (bool)$this->user_isAdminAcc;
}
/**
@@ -275,7 +275,7 @@ class UserData extends UserPassData implements DataModelInterface
*/
public function setUserIsAdminAcc($user_isAdminAcc)
{
$this->user_isAdminAcc = $user_isAdminAcc;
$this->user_isAdminAcc = (int)$user_isAdminAcc;
}
/**
@@ -283,7 +283,7 @@ class UserData extends UserPassData implements DataModelInterface
*/
public function isUserIsDisabled()
{
return $this->user_isDisabled;
return (bool)$this->user_isDisabled;
}
/**
@@ -291,7 +291,7 @@ class UserData extends UserPassData implements DataModelInterface
*/
public function setUserIsDisabled($user_isDisabled)
{
$this->user_isDisabled = $user_isDisabled;
$this->user_isDisabled = (int)$user_isDisabled;
}
/**
@@ -299,7 +299,7 @@ class UserData extends UserPassData implements DataModelInterface
*/
public function isUserIsChangePass()
{
return $this->user_isChangePass;
return (bool)$this->user_isChangePass;
}
/**
@@ -307,7 +307,7 @@ class UserData extends UserPassData implements DataModelInterface
*/
public function setUserIsChangePass($user_isChangePass)
{
$this->user_isChangePass = $user_isChangePass;
$this->user_isChangePass = (int)$user_isChangePass;
}
/**
@@ -315,7 +315,7 @@ class UserData extends UserPassData implements DataModelInterface
*/
public function isUserIsLdap()
{
return $this->user_isLdap;
return (bool)$this->user_isLdap;
}
/**
@@ -323,7 +323,7 @@ class UserData extends UserPassData implements DataModelInterface
*/
public function setUserIsLdap($user_isLdap)
{
$this->user_isLdap = $user_isLdap;
$this->user_isLdap = (int)$user_isLdap;
}
/**
@@ -379,7 +379,7 @@ class UserData extends UserPassData implements DataModelInterface
*/
public function getId()
{
return $this->user_id;
return (int)$this->user_id;
}
/**