Skip to content
Snippets Groups Projects
Commit 209bf099 authored by Anton Bagliy's avatar Anton Bagliy
Browse files

Merge branch 'hotfix/openid'

parents c4914058 00f34055
Branches
Tags
No related merge requests found
...@@ -127,6 +127,7 @@ class Controller_Handler_Sign extends Controller_Handler ...@@ -127,6 +127,7 @@ class Controller_Handler_Sign extends Controller_Handler
$isStudent = $_GET["openid_sreg_student"]; $isStudent = $_GET["openid_sreg_student"];
$isStaff = $_GET["openid_sreg_staff"]; $isStaff = $_GET["openid_sreg_staff"];
$globalKey = $_GET["openid_sreg_r61globalkey"]; $globalKey = $_GET["openid_sreg_r61globalkey"];
$studentId = $_GET["openid_sreg_r61studentid"];
$email = $_GET["openid_sreg_email"]; $email = $_GET["openid_sreg_email"];
// user_role для http://gitlab.mmcs.sfedu.ru/it-lab/grade/issues/248 // user_role для http://gitlab.mmcs.sfedu.ru/it-lab/grade/issues/248
// $chosen_role = $_GET["user_role"]; // $chosen_role = $_GET["user_role"];
...@@ -177,7 +178,7 @@ class Controller_Handler_Sign extends Controller_Handler ...@@ -177,7 +178,7 @@ class Controller_Handler_Sign extends Controller_Handler
} catch (Exception $e) { } catch (Exception $e) {
$error = $e->getMessage(); $error = $e->getMessage();
} finally { } finally {
Model_Logs::logSigninDetailed($id, $isStaff, $isStudent, $globalKey, $error); Model_Logs::logSigninDetailed($id, $isStaff, $isStudent, $globalKey, $studentId, $error);
} }
if ($id <= 0) { if ($id <= 0) {
......
...@@ -28,15 +28,16 @@ class Model_Logs extends Model ...@@ -28,15 +28,16 @@ class Model_Logs extends Model
return $result; return $result;
} }
public static function logSigninDetailed($accountID, $isStaff, $isStudent, $globalKey, $errorMessage) { public static function logSigninDetailed($accountID, $isStaff, $isStudent, $globalKey, $studentId, $errorMessage) {
$query = 'SELECT * FROM log_sigindetailed(:account, :isstaff, :isstudent, :globalkey, :errormessage)'; $query = 'SELECT * FROM log_sigindetailed(:account, :isstaff, :isstudent, :globalkey, :errormessage)';
$message = 'studentID='.$studentId.'. Message: '.$errorMessage;
$result = DB::query(Database::UPDATE, $query) $result = DB::query(Database::UPDATE, $query)
->param(':account', $accountID) ->param(':account', $accountID)
->param(':isstaff', $isStaff) ->param(':isstaff', $isStaff)
->param(':isstudent', $isStudent) ->param(':isstudent', $isStudent)
->param(':globalkey', $globalKey) ->param(':globalkey', $globalKey)
->param(':errormessage', $errorMessage) ->param(':errormessage', $message)
->execute(); ->execute();
return $result; return $result;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment