tyler.durden/opensupports
1
0
Fork 0
mirror of https://github.com/opensupports/opensupports.git synced 2025-07-30 01:05:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

[HOTFIX] - Fix check-requirements to check files folder correctly

Browse Source
This commit is contained in:
ivan 2018-01-11 18:51:07 -03:00
parent f227c9a9fa
commit 2d83116520
4 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/app/install/install-step-4-user-system.js
View File

@ -30,7 +30,6 @@ class InstallStep4UserSystem extends React.Component {
<FormField name="registration" label={i18n('ENABLE_USER_REGISTRATION')} decorator={ToggleButton} fieldProps={{disabled: this.isDisabled()}}/> <FormField name="registration" label={i18n('ENABLE_USER_REGISTRATION')} decorator={ToggleButton} fieldProps={{disabled: this.isDisabled()}}/>
<div className="install-step-4__buttons"> <div className="install-step-4__buttons">
<SubmitButton className="install-step-4__next" size="medium" type="secondary">{i18n('NEXT')}</SubmitButton> <SubmitButton className="install-step-4__next" size="medium" type="secondary">{i18n('NEXT')}</SubmitButton>
<Button className="install-step-4__previous" size="medium" onClick={this.onPreviousClick.bind(this)}>{i18n('PREVIOUS')}</Button>
</div> </div>
</Form> </Form>
</div> </div>
@ -46,17 +45,12 @@ class InstallStep4UserSystem extends React.Component {
}); });
} }
onPreviousClick(event) {
event.preventDefault();
history.push('/install/step-3');
}
onSubmit(form) { onSubmit(form) {
this.props.dispatch(ConfigActions.updateUserSystemSettings({ this.props.dispatch(ConfigActions.updateUserSystemSettings({
'user-system-enabled': form['user-system-enabled'] * 1, 'user-system-enabled': form['user-system-enabled'] * 1,
'registration': form['registration'] * 1 'registration': form['registration'] * 1
})); }));
history.push('/install/step-5'); history.push('/install/step-5');
} }
@ -69,4 +63,4 @@ export default connect((store) => {
return { return {
language: store.config.language language: store.config.language
}; };
})(InstallStep4UserSystem); })(InstallStep4UserSystem);

10
server/controllers/system/check-requirements.php
View File

@ -30,7 +30,9 @@ class CheckRequirementsController extends Controller {
} }
public function handler() { public function handler() {
$configWritable = !!fopen('config.php', 'w+'); if(InstallationDoneController::isInstallationDone()) {
throw new Exception(ERRORS::INIT_SETTINGS_DONE);
}
Response::respondSuccess([ Response::respondSuccess([
'phpVersion' => [ 'phpVersion' => [
@ -50,8 +52,8 @@ class CheckRequirementsController extends Controller {
], ],
'files' => [ 'files' => [
'name' => 'Folder: /api/files', 'name' => 'Folder: /api/files',
'value' => $configWritable ? 'Writable' : 'Not writable', 'value' => is_writable('files') ? 'Writable' : 'Not writable',
'ok' => $configWritable 'ok' => is_writable('files')
] ]
]); ]);
} }
@ -64,4 +66,4 @@ class CheckRequirementsController extends Controller {
else if($currentVersion[0] < $requiredVersion[0]) return false; else if($currentVersion[0] < $requiredVersion[0]) return false;
else return $currentVersion[1] >= $requiredVersion[1]; else return $currentVersion[1] >= $requiredVersion[1];
} }
} }

6
server/controllers/system/init-database.php
View File

@ -48,9 +48,7 @@ class InitDatabaseController extends Controller {
$dbUser = Controller::request('dbUser'); $dbUser = Controller::request('dbUser');
$dbPass = Controller::request('dbPassword'); $dbPass = Controller::request('dbPassword');
if(!defined('MYSQL_HOST')) { RedBean::setup('mysql:host=' . $dbHost, $dbUser, $dbPass);
RedBean::setup('mysql:host=' . $dbHost, $dbUser, $dbPass);
}
if($dbName) { if($dbName) {
RedBean::addDatabase($dbName, 'mysql:host='. $dbHost . ';dbname=' . $dbName, $dbUser, $dbPass); RedBean::addDatabase($dbName, 'mysql:host='. $dbHost . ';dbname=' . $dbName, $dbUser, $dbPass);
@ -81,4 +79,4 @@ class InitDatabaseController extends Controller {
fclose($configFile); fclose($configFile);
Response::respondSuccess(); Response::respondSuccess();
} }
} }

15
tests/system/init-settings.rb
View File

@ -1,4 +1,17 @@
describe '/system/init-settings' do describe '/system/init-settings' do
it 'should prevent initing database if already called' do
result = request('/system/init-database', {})
(result['status']).should.equal('fail')
(result['message']).should.equal('INIT_SETTINGS_DONE')
result = request('/system/check-requirements', {})
(result['status']).should.equal('success')
result = request('/system/init-database', {})
(result['status']).should.equal('fail')
(result['message']).should.equal('INIT_SETTINGS_DONE')
end
it 'should initialize correctly' do it 'should initialize correctly' do
result = request('/system/init-settings', { result = request('/system/init-settings', {
'user-system-enabled' => true, 'user-system-enabled' => true,
@ -25,4 +38,4 @@ describe '/system/init-settings' do
(result['status']).should.equal('success') (result['status']).should.equal('success')
end end
end end