From 7368ef80cbfafe74594af232421aa1d550605264 Mon Sep 17 00:00:00 2001 From: thejoelinux Date: Tue, 1 Aug 2017 18:17:33 +0200 Subject: [PATCH] correction session + 2 controllers --- webroot/classes/session_saas.php | 21 +++++++-------------- webroot/controllers/games.php | 14 +++++++------- webroot/controllers/members.php | 12 ++++++------ 3 files changed, 20 insertions(+), 27 deletions(-) diff --git a/webroot/classes/session_saas.php b/webroot/classes/session_saas.php index 004d67d..8043080 100644 --- a/webroot/classes/session_saas.php +++ b/webroot/classes/session_saas.php @@ -1,9 +1,9 @@ debug) { trigger_error('session_saas::__construct called', E_USER_NOTICE); } - session_set_save_handler( - array(&$this, 'open'), - array(&$this, 'close'), - array(&$this, 'read'), - array(&$this, 'write'), - array(&$this, 'destroy'), - array(&$this, 'gc') - ); + session_set_save_handler($this); // session_name("whatever"); $this->life_time = ini_get('session.gc_maxlifetime'); // -- Define a lifetime on session cookie @@ -39,7 +32,7 @@ class session_saas { return true; } - public function open() { + public function open($save_path, $session_name) { if($this->debug) { trigger_error('session_saas::open called', E_USER_NOTICE); } @@ -91,9 +84,9 @@ class session_saas { 'content' => $postdata ) ); - + $context = stream_context_create($opts); - if(file_get_contents($GLOBALS["saas_sessions_url"], false, $context)) { + if(!file_get_contents($GLOBALS["saas_sessions_url"], false, $context)) { return false; } return true; @@ -117,7 +110,7 @@ class session_saas { 'content' => $postdata ) ); - + $context = stream_context_create($opts); if(!file_get_contents($GLOBALS["saas_sessions_url"], false, $context)) { return false; diff --git a/webroot/controllers/games.php b/webroot/controllers/games.php index 9017d7b..a00fa02 100644 --- a/webroot/controllers/games.php +++ b/webroot/controllers/games.php @@ -58,7 +58,7 @@ class GamesController extends AppController { return "games/edit"; } - function _edit() { + function _edit($success = 'edit') { $game = Game::fetch($GLOBALS["data"]->db_escape_string($_REQUEST["i"])); if($this->format == "json") { echo json_encode($game); @@ -72,13 +72,13 @@ class GamesController extends AppController { try { Game::fetch_all($games); echo json_encode($games); - exit(); // no further rendering needed + exit(); // no further rendering needed } catch(data_exception $e) { return "data_exception"; } } - + function _delete() { try { $game = Game::fetch($GLOBALS["data"]->db_escape_string($_REQUEST["i"])); @@ -148,10 +148,10 @@ class GamesController extends AppController { $game->create_reservation(); $this->set_message("La réservation a été faite"); } else { - $this->set_message("Impossible de réserver : pas d'adresse email pour cet utilisateur", "danger"); + $this->set_message("Impossible de réserver : pas d'adresse email pour cet utilisateur", "danger"); } } else { - $this->set_message("Impossible de réserver : pas d'inscription valide pour cet utilisateur", "danger"); + $this->set_message("Impossible de réserver : pas d'inscription valide pour cet utilisateur", "danger"); } $this->set("game", $game); return "games/edit"; @@ -174,10 +174,10 @@ class GamesController extends AppController { return "games/not_found"; } catch (data_exception $e) { return "data_exception"; - } + } } - function _list() { + function _list($method = 'fetch_all') { if($this->format == "json") { parent::_list(); } diff --git a/webroot/controllers/members.php b/webroot/controllers/members.php index 2f2fa29..f9dab46 100644 --- a/webroot/controllers/members.php +++ b/webroot/controllers/members.php @@ -37,7 +37,7 @@ class MembersController extends AppController { // TODO : posted datas should be validated // who is responsible for that ? i think // this is the model - + // TODO once a member is created : an online access // could be granted when there is a valid subs. @@ -58,19 +58,19 @@ class MembersController extends AppController { header("Pragma: no-cache"); header("Expires: 0"); while(list($key, $val) = each($members)) { - echo + echo '"'.$val->subscription_end_date.'";"'.$val->subscription_status.'";"'. $val->firstname.'";"'.$val->lastname.'";"'. $val->address.'";"'.$val->po_town.'";"'.$val->email.'"'; echo "\n"; } - exit(); // no further rendering needed + exit(); // no further rendering needed } catch(data_exception $e) { return "data_exception"; } } - function _edit() { + function _edit($success = 'edit') { try { $member = Member::fetch($GLOBALS["data"]->db_escape_string($_REQUEST["i"])); if($member->id != 0) { @@ -119,7 +119,7 @@ class MembersController extends AppController { try { Member::fetch_all($members); echo json_encode($members); - exit(); // no further rendering needed + exit(); // no further rendering needed } catch(data_exception $e) { return "data_exception"; } @@ -286,7 +286,7 @@ class MembersController extends AppController { } } - function _list() { + function _list($method = 'fetch_all') { if($this->format == "json") { parent::_list(); } -- 2.21.0