tyler.durden
/
opensupports
mirror of https://github.com/opensupports/opensupports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33 from guillegiu/master 

Guillermo -   Issue #12 -Backend
This commit is contained in:
Ivan Diaz 2017-06-20 21:47:17 +02:00 committed by GitHub
parent 83c6330f73 3b102b3903
commit fa83ada1c8
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/controllers/system/get-settings.php
View File

@ -52,7 +52,8 @@ class GetSettingsController extends Controller {
'registration' => Setting::getSetting('registration')->getValue(),
'departments' => Department::getDepartmentNames(),
'supportedLanguages' => Language::getSupportedLanguages(),
'allowedLanguages' => Language::getAllowedLanguages()
'allowedLanguages' => Language::getAllowedLanguages(),
'session-prefix' => Setting::getSetting('session-prefix')
];
} else {
$settingsList = [
@ -68,7 +69,8 @@ class GetSettingsController extends Controller {
'departments' => Department::getDepartmentNames(),
'supportedLanguages' => Language::getSupportedLanguages(),
'allowedLanguages' => Language::getAllowedLanguages(),
'user-system-enabled' => Setting::getSetting('user-system-enabled')->getValue() * 1
'user-system-enabled' => Setting::getSetting('user-system-enabled')->getValue() * 1,
'session-prefix' => Setting::getSetting('session-prefix')
];
}
}

3
server/controllers/system/init-settings.php
View File

@ -78,7 +78,8 @@ class InitSettingsController extends Controller {
'ticket-gap' => Hashing::generateRandomPrime(1000000, 9999999),
'file-gap' => Hashing::generateRandomPrime(1000000, 9999999),
'file-first-number' => Hashing::generateRandomNumber(1000000, 9999999),
'file-quantity' => 0
'file-quantity' => 0,
'session-prefix' => 'opensupports-'.Hashing::generateRandomToken().'_'
]);
}

1
server/libs/Controller.php
View File

@ -14,6 +14,7 @@ abstract class Controller {
public function getHandler() {
return function () {
try {
Session::getInstance()->setSessionPrefix(Setting::getSetting('session-prefix')->getValue());
$this->validate();
$this->handler();
} catch (\Exception $exception) {

13
server/models/Session.php
View File

@ -2,7 +2,8 @@
class Session {
static $instance = null;
private $sessionPrefix = '';
private function __construct() {
$this->initSession();
}
@ -65,14 +66,14 @@ class Session {
}
public function store($key, $value) {
$_SESSION[$key] = $value;
$_SESSION[$this->sessionPrefix . $key] = $value;
}
private function getStoredData($key) {
$storedValue = null;
if (array_key_exists($key, $_SESSION)) {
$storedValue = $_SESSION[$key];
if (array_key_exists($this->sessionPrefix . $key, $_SESSION)) {
$storedValue = $_SESSION[$this->sessionPrefix . $key];
}
return $storedValue;
@ -81,4 +82,8 @@ class Session {
public function isLoggedWithId($userId) {
return ($this->getStoredData('userId') === $userId);
}
public function setSessionPrefix($prefix) {
$this->sessionPrefix = $prefix;
}
}