Fixed incorrect handling of microtime

This commit is contained in:
Andreas Oesterreicher
2017-07-03 18:31:48 +02:00
parent a06f54ca8a
commit 4dd46fc55f
14 changed files with 398 additions and 410 deletions
+68 -68
View File
@@ -26,7 +26,7 @@ require_once('../include/webservicerecht.class.php');
require_once('../include/studiensemester.class.php');
ini_set("soap.wsdl_cache_enabled", "0");
$SOAPServer = new SoapServer(APP_ROOT."/soap/student.wsdl.php?".microtime());
$SOAPServer = new SoapServer(APP_ROOT."/soap/student.wsdl.php?".microtime(true));
$SOAPServer->addFunction("getStudentFromUid");
$SOAPServer->addFunction("getStudentFromMatrikelnummer");
$SOAPServer->addFunction("getStudentFromStudiengang");
@@ -39,43 +39,43 @@ $SOAPServer->handle();
*/
function getStudentFromUid($student_uid, $authentifizierung)
{
$recht = new webservicerecht();
$recht = new webservicerecht();
$user = $authentifizierung->username;
$passwort = $authentifizierung->passwort;
$passwort = $authentifizierung->passwort;
// User authentifizieren
if(!check_user($user, $passwort))
return new SoapFault("Server", "Invalid Credentials");
return new SoapFault("Server", "Invalid Credentials");
// darf User überhaupt Methode verwenden
$recht = new webservicerecht();
$recht = new webservicerecht();
if(!$recht->isUserAuthorized($user, 'getStudentFromUid'))
return new SoapFault("Server", "No permission");
$studentObj = new student(); // Studentendaten
$student = new foo(); // Rückgabeobjekt
$preStudent = new prestudent(); // StudentenStatus
if(!$studentObj->load($student_uid))
return new SoapFault("Server", "Kein Student mit übergebener Uid gefunden");
return new SoapFault("Server", "Kein Student mit übergebener Uid gefunden");
$preStudent->getLastStatus($studentObj->prestudent_id);
$student->studiengang_kz = $studentObj->studiengang_kz;
$student->person_id = $studentObj->person_id;
$student->semester = $studentObj->semester;
$student->verband = $studentObj->verband;
$student->gruppe = $studentObj->gruppe;
$student->vorname = $studentObj->vorname;
$student->nachname = $studentObj->nachname;
$student->uid = $studentObj->uid;
$student->person_id = $studentObj->person_id;
$student->semester = $studentObj->semester;
$student->verband = $studentObj->verband;
$student->gruppe = $studentObj->gruppe;
$student->vorname = $studentObj->vorname;
$student->nachname = $studentObj->nachname;
$student->uid = $studentObj->uid;
$student->status = $preStudent->status_kurzbz;
$student->personenkennzeichen = $studentObj->matrikelnr;
$student->email = $student->uid.'@'.DOMAIN;
$student = $recht->clearResponse($user, 'getStudentFromUid', $student);
return $student;
return $student;
}
/**
@@ -85,48 +85,48 @@ function getStudentFromUid($student_uid, $authentifizierung)
*/
function getStudentFromMatrikelnummer($matrikelnummer, $authentifizierung)
{
$recht = new webservicerecht();
$recht = new webservicerecht();
$user = $authentifizierung->username;
$passwort = $authentifizierung->passwort;
$passwort = $authentifizierung->passwort;
// User authentifizieren
if(!check_user($user, $passwort))
return new SoapFault("Server", "Invalid Credentials");
return new SoapFault("Server", "Invalid Credentials");
// darf User überhaupt Methode verwenden
$recht = new webservicerecht();
$recht = new webservicerecht();
if(!$recht->isUserAuthorized($user, 'getStudentFromMatrikelnummer'))
return new SoapFault("Server", "No permission");
$studentObj = new student(); // Studentendaten
$student = new foo(); // Rückgabeobjekt
$preStudent = new prestudent(); // StudentenStatus
$student_uid = $studentObj->getUidFromMatrikelnummer($matrikelnummer);
if(!$studentObj->load($student_uid))
return new SoapFault("Server", "Kein Student mit übergebener Matrikelnummer gefunden");
return new SoapFault("Server", "Kein Student mit übergebener Matrikelnummer gefunden");
$preStudent->getLastStatus($studentObj->prestudent_id);
$student->studiengang_kz = $studentObj->studiengang_kz;
$student->person_id = $studentObj->person_id;
$student->semester = $studentObj->semester;
$student->verband = $studentObj->verband;
$student->gruppe = $studentObj->gruppe;
$student->vorname = $studentObj->vorname;
$student->nachname = $studentObj->nachname;
$student->uid = $studentObj->uid;
$student->person_id = $studentObj->person_id;
$student->semester = $studentObj->semester;
$student->verband = $studentObj->verband;
$student->gruppe = $studentObj->gruppe;
$student->vorname = $studentObj->vorname;
$student->nachname = $studentObj->nachname;
$student->uid = $studentObj->uid;
$student->status = $preStudent->status_kurzbz;
$student->personenkennzeichen = $studentObj->matrikelnr;
$student->email = $student->uid.'@'.DOMAIN;
$student = $recht->clearResponse($user, 'getStudentFromMatrikelnummer', $student);
return $student;
return $student;
}
/**
* Lädt alle Studenten eines gewissen Kriteriums
* Lädt alle Studenten eines gewissen Kriteriums
* @param $studiengang
* @param $semester
* @param $verband
@@ -134,51 +134,51 @@ function getStudentFromMatrikelnummer($matrikelnummer, $authentifizierung)
* @param $authentifizierung
*/
function getStudentFromStudiengang($studiengang, $semester = null, $verband = null, $gruppe = null, $authentifizierung)
{
$recht = new webservicerecht();
{
$recht = new webservicerecht();
$user = $authentifizierung->username;
$passwort = $authentifizierung->passwort;
$passwort = $authentifizierung->passwort;
// User authentifizieren
if(!check_user($user, $passwort))
return new SoapFault("Server", "Invalid Credentials");
return new SoapFault("Server", "Invalid Credentials");
// darf User überhaupt Methode verwenden
$recht = new webservicerecht();
$recht = new webservicerecht();
if(!$recht->isUserAuthorized($user, 'getStudentFromStudiengang'))
return new SoapFault("Server", "No permission");
$studentObj = new student(); // Studentendaten
$preStudent = new prestudent(); // StudentenStatus
$studiensemester = new studiensemester(); // aktuelles Studiensemester
$studSemester = $studiensemester->getakt();
$studentObj->result = $studentObj->getStudents($studiengang, $semester, $verband, $gruppe, null, $studSemester);
$studentArray = array();
$studentArray = array();
foreach($studentObj->result as $stud)
{
{
$student = new foo(); // Rückgabeobjekt
$preStudent->getLastStatus($stud->prestudent_id);
$student->studiengang_kz = $stud->studiengang_kz;
$student->person_id = $stud->person_id;
$student->semester = $stud->semester;
$student->verband = $stud->verband;
$student->gruppe = $stud->gruppe;
$student->vorname = $stud->vorname;
$student->nachname = $stud->nachname;
$student->uid = $stud->uid;
$student->status = $preStudent->status_kurzbz;
$student->person_id = $stud->person_id;
$student->semester = $stud->semester;
$student->verband = $stud->verband;
$student->gruppe = $stud->gruppe;
$student->vorname = $stud->vorname;
$student->nachname = $stud->nachname;
$student->uid = $stud->uid;
$student->status = $preStudent->status_kurzbz;
$student->personenkennzeichen = $stud->matrikelnr;
$student->email = $stud->uid.'@'.DOMAIN;
$student = $recht->clearResponse($user, 'getStudentFromStudiengang', $student);
$studentArray[] = $student;
$studentArray[] = $student;
}
return $studentArray;
return $studentArray;
}
class foo{}
class foo{}