DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 06:17:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix https detection

Browse source
This commit is contained in:
snipe 2016-05-14 15:04:59 -07:00
parent beed74c0d0
commit 4dd3a95b6d
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Controllers/SettingsController.php
View file

@ -50,7 +50,8 @@ class SettingsController extends Controller
$start_settings['db_error'] = $e->getMessage();
}
$protocol = stripos($_SERVER['SERVER_PROTOCOL'], 'https') === true ? 'https://' : 'http://';
$protocol = $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://';
$pageURL = $protocol;
if ($_SERVER["SERVER_PORT"] != "80") {
@ -164,6 +165,8 @@ class SettingsController extends Controller
$user->last_name = e(Input::get('last_name'));
$user->email = $data['email'] = e(Input::get('email'));
$user->activated = 1;
$permissions = array('superuser' => 1);
$user->permissions = json_encode($permissions);
$user->username = $data['username'] = e(Input::get('username'));
$user->password = bcrypt(Input::get('password'));
$data['password'] = Input::get('password');