mirror of
https://github.com/opensupports/opensupports.git
synced 2025-07-31 01:35:15 +02:00
Merge pull request #33 from guillegiu/master
Guillermo - Issue #12 -Backend
This commit is contained in:
commit
fa83ada1c8
@ -52,7 +52,8 @@ class GetSettingsController extends Controller {
|
|||||||
'registration' => Setting::getSetting('registration')->getValue(),
|
'registration' => Setting::getSetting('registration')->getValue(),
|
||||||
'departments' => Department::getDepartmentNames(),
|
'departments' => Department::getDepartmentNames(),
|
||||||
'supportedLanguages' => Language::getSupportedLanguages(),
|
'supportedLanguages' => Language::getSupportedLanguages(),
|
||||||
'allowedLanguages' => Language::getAllowedLanguages()
|
'allowedLanguages' => Language::getAllowedLanguages(),
|
||||||
|
'session-prefix' => Setting::getSetting('session-prefix')
|
||||||
];
|
];
|
||||||
} else {
|
} else {
|
||||||
$settingsList = [
|
$settingsList = [
|
||||||
@ -68,7 +69,8 @@ class GetSettingsController extends Controller {
|
|||||||
'departments' => Department::getDepartmentNames(),
|
'departments' => Department::getDepartmentNames(),
|
||||||
'supportedLanguages' => Language::getSupportedLanguages(),
|
'supportedLanguages' => Language::getSupportedLanguages(),
|
||||||
'allowedLanguages' => Language::getAllowedLanguages(),
|
'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')
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -78,7 +78,8 @@ class InitSettingsController extends Controller {
|
|||||||
'ticket-gap' => Hashing::generateRandomPrime(1000000, 9999999),
|
'ticket-gap' => Hashing::generateRandomPrime(1000000, 9999999),
|
||||||
'file-gap' => Hashing::generateRandomPrime(1000000, 9999999),
|
'file-gap' => Hashing::generateRandomPrime(1000000, 9999999),
|
||||||
'file-first-number' => Hashing::generateRandomNumber(1000000, 9999999),
|
'file-first-number' => Hashing::generateRandomNumber(1000000, 9999999),
|
||||||
'file-quantity' => 0
|
'file-quantity' => 0,
|
||||||
|
'session-prefix' => 'opensupports-'.Hashing::generateRandomToken().'_'
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -14,6 +14,7 @@ abstract class Controller {
|
|||||||
public function getHandler() {
|
public function getHandler() {
|
||||||
return function () {
|
return function () {
|
||||||
try {
|
try {
|
||||||
|
Session::getInstance()->setSessionPrefix(Setting::getSetting('session-prefix')->getValue());
|
||||||
$this->validate();
|
$this->validate();
|
||||||
$this->handler();
|
$this->handler();
|
||||||
} catch (\Exception $exception) {
|
} catch (\Exception $exception) {
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
class Session {
|
class Session {
|
||||||
static $instance = null;
|
static $instance = null;
|
||||||
|
private $sessionPrefix = '';
|
||||||
|
|
||||||
private function __construct() {
|
private function __construct() {
|
||||||
$this->initSession();
|
$this->initSession();
|
||||||
@ -65,14 +66,14 @@ class Session {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function store($key, $value) {
|
public function store($key, $value) {
|
||||||
$_SESSION[$key] = $value;
|
$_SESSION[$this->sessionPrefix . $key] = $value;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function getStoredData($key) {
|
private function getStoredData($key) {
|
||||||
$storedValue = null;
|
$storedValue = null;
|
||||||
|
|
||||||
if (array_key_exists($key, $_SESSION)) {
|
if (array_key_exists($this->sessionPrefix . $key, $_SESSION)) {
|
||||||
$storedValue = $_SESSION[$key];
|
$storedValue = $_SESSION[$this->sessionPrefix . $key];
|
||||||
}
|
}
|
||||||
|
|
||||||
return $storedValue;
|
return $storedValue;
|
||||||
@ -81,4 +82,8 @@ class Session {
|
|||||||
public function isLoggedWithId($userId) {
|
public function isLoggedWithId($userId) {
|
||||||
return ($this->getStoredData('userId') === $userId);
|
return ($this->getStoredData('userId') === $userId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function setSessionPrefix($prefix) {
|
||||||
|
$this->sessionPrefix = $prefix;
|
||||||
|
}
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user