Merge branch 'issue490_doubleauth_openid' into develop

db/postgresql/issue487_inactive_disciplines.sql

@@ -158,6 +158,7 @@ begin
 END ;
 $function$;
 
+DROP FUNCTION IF EXISTS public.getdisciplinesforteacher(pteacherid integer, psemesterid integer);
 CREATE OR REPLACE FUNCTION public.getdisciplinesforteacher(pteacherid integer, psemesterid integer)
     RETURNS TABLE("ID" integer, "Type" exam_credit_grading_credit, "SubType" scientific_disciplinary_coursework, "GradeID" integer, "GradeNum" integer, "Degree" bachelor_master_specialist, "GroupID" integer, "GroupNum" integer, "GroupName" character varying, "SubjectID" integer, "SubjectName" character varying, "AuthorID" integer, "IsLocked" integer, "IsMapCreated" boolean)
     LANGUAGE sql
@@ -192,6 +193,7 @@ ORDER BY    view_disciplines.GradeID ASC,
             view_groups.GroupNum ASC;
 $function$;
 
+DROP FUNCTION IF EXISTS public.student_getdisciplines(precordbookid integer, psemesterid integer);
 CREATE OR REPLACE FUNCTION public.student_getdisciplines(precordbookid integer, psemesterid integer)
     RETURNS TABLE("ID" integer, "SubjectID" integer, "SubjectName" character varying, "Type" exam_credit_grading_credit, "Subtype" scientific_disciplinary_coursework, "LastName" character varying, "FirstName" character varying, "SecondName" character varying, "Rate" bigint, "MaxCurrentRate" bigint)
     LANGUAGE plpgsql
@@ -260,6 +262,7 @@ begin
 end
 $function$;
 
+DROP FUNCTION IF EXISTS public.getdisciplinesforgroup(pgroupid integer, psemesterid integer);
 CREATE OR REPLACE FUNCTION public.getdisciplinesforgroup(pgroupid integer, psemesterid integer)
     RETURNS TABLE("ID" integer, "SubjectName" character varying, "Subtype" scientific_disciplinary_coursework, "Type" exam_credit_grading_credit, "CompoundDiscID" integer, "CompoundDiscName" character varying, "CurRate" integer, "MaxRate" integer)
     LANGUAGE plpgsql

~dev_rating/application/classes/Controller/Handler/Sign.php

@@ -138,7 +138,9 @@ class Controller_Handler_Sign extends Controller_Handler
                 // http://gitlab.mmcs.sfedu.ru/it-lab/grade/issues/248
                 if ($chosen_role === 'student') {
                 // find student with same ext id
-                $inila = strtoupper(str_replace('st-ss-', '', $globalKey));
+                $openidPrefixes = ["st-","ss-"];
+                $emptySpaces = ['',''];
+                $inila = strtoupper(str_replace($openidPrefixes, $emptySpaces, $globalKey));
                 $extId = Model_Account::getAccountExtIdByInila($inila);
                 if ($extId === null || $extId === "") {
                     $id = User::instance()->signInByOpenID($globalKey);