Guillermo - Issue #12 -Backend

This commit is contained in:
AntonyAntonio 2017-06-20 15:52:16 -03:00
parent 21777a1708
commit 3b102b3903
4 changed files with 13 additions and 7 deletions

View File

@ -53,7 +53,7 @@ class GetSettingsController extends Controller {
'departments' => Department::getDepartmentNames(), 'departments' => Department::getDepartmentNames(),
'supportedLanguages' => Language::getSupportedLanguages(), 'supportedLanguages' => Language::getSupportedLanguages(),
'allowedLanguages' => Language::getAllowedLanguages(), 'allowedLanguages' => Language::getAllowedLanguages(),
'store-prefix' => Setting::getSetting('store-prefix') 'session-prefix' => Setting::getSetting('session-prefix')
]; ];
} else { } else {
$settingsList = [ $settingsList = [
@ -70,7 +70,7 @@ class GetSettingsController extends Controller {
'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,
'store-prefix' => Setting::getSetting('store-prefix') 'session-prefix' => Setting::getSetting('session-prefix')
]; ];
} }
} }

View File

@ -79,7 +79,7 @@ class InitSettingsController extends Controller {
'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,
'store-prefix' => 'opensupports-'.Hashing::generateRandomToken().'_' 'session-prefix' => 'opensupports-'.Hashing::generateRandomToken().'_'
]); ]);
} }

View File

@ -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) {

View File

@ -2,7 +2,8 @@
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;
}
} }