mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-01-17 21:49:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #30 from jbrooksuk/setup-inputs

Browse Source 
Group setting inputs, so we don't save the CSRF token in settings
This commit is contained in:
James Brooks 2014-11-25 12:29:15 +00:00
commit 3202f02513
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/SetupController.php
View File

@ -10,9 +10,9 @@
public function setupCachet() {
$postData = Input::get();
$v = Validator::make($postData, [
'app_name' => 'required',
'app_domain' => 'url|required',
'show_support' => 'boolean',
'settings.app_name' => 'required',
'settings.app_domain' => 'url|required',
'settings.show_support' => 'boolean',
'user.name'=> 'alpha_dash|required',
'user.email' => 'email|required',
'user.password' => 'required'
@ -32,7 +32,7 @@
Auth::login($user);
// Create the settings, boi.
foreach ($postData as $settingName => $settingValue) {
foreach (array_get($postData, 'settings') as $settingName => $settingValue) {
$setting = new Setting;
$setting->name = $settingName;
$setting->value = $settingValue;

21
app/views/setup.blade.php
View File

@ -11,27 +11,27 @@
<div class='panel panel-default'>
<div class='panel-heading'>Service Details</div>
<div class='panel-body'>
<form name='SetupForm' class='form-vertical' role='form' method="POST">
{{ Form::open(['name' => 'SetupForm', 'class' => 'form-vertical', 'role' => 'form']) }}
<h3>Status Page Details</h3>
<div class='form-group'>
<label class='sr-only'>Site Name</label>
<input type='text' name='app_name' class='form-control' placeholder='Site Name' value='{{ Input::old('app_name', '') }}' required />
@if($errors->has('app_name'))
<span class='text-danger'>{{ $errors->first('app_name') }}</span>
<input type='text' name='settings[app_name]' class='form-control' placeholder='Site Name' value='{{ Input::old('settings.app_name', '') }}' required />
@if($errors->has('settings.app_name'))
<span class='text-danger'>{{ $errors->first('settings.app_name') }}</span>
@endif
</div>
<div class='form-group'>
<label class='sr-only'>Site Domain</label>
<input type='text' name='app_domain' class='form-control' placeholder='Site Domain' value='{{ Input::old('app_domain', '') }}' required />
@if($errors->has('app_domain'))
<span class='text-danger'>{{ $errors->first('app_domain') }}</span>
<input type='text' name='settings[app_domain]' class='form-control' placeholder='Site Domain' value='{{ Input::old('settings.app_domain', '') }}' required />
@if($errors->has('settings.app_domain'))
<span class='text-danger'>{{ $errors->first('settings.app_domain') }}</span>
@endif
</div>
<div class='form-group'>
<label>
<input type='checkbox' name='show_support' value='1' checked />
<input type='checkbox' name='settings[show_support]' value='1' checked />
Show support for Cachet?
</label>
Show support for Cachet?
</div>
<h3>Administrator Account</h3>
@ -61,8 +61,7 @@
<div class='form-group'>
<button type='submit' class='btn btn-default'>Setup!</button>
</div>
{{ Form::token() }}
</form>
{{ Form::close() }}
</div>
</div>
</div>