From b5d0cc96260a3d2b732b32fefe5feb7711ea99e0 Mon Sep 17 00:00:00 2001 From: Manfred Date: Thu, 25 May 2023 17:06:16 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Klasse=20"form-control"=20bei=20Typ=20Datep?= =?UTF-8?q?icker=20erg=C3=A4nzt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/filter.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/filter.class.php b/include/filter.class.php index 3578d7dcf..5e820aca7 100644 --- a/include/filter.class.php +++ b/include/filter.class.php @@ -210,7 +210,7 @@ class filter extends basis_db $html.="\n\t\t\t"; break; case 'datepicker': - $html .= ''; + $html .= ''; $html .= ''; From a5110893ea43d860cd00862e604a1b3fc0e4a00f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Tue, 30 May 2023 11:59:46 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Dateien=20die=20gr=C3=B6=C3=9Fer=20als=2030?= =?UTF-8?q?MB=20sind=20werden=20nicht=20automatisch=20gepr=C3=BCft=20ob=20?= =?UTF-8?q?diese=20eine=20Signatur=20enthalten=20da=20dies=20Dokumente=20s?= =?UTF-8?q?ind=20die=20manuell=20hochgeladen=20wurden=20um=20das=20UploadL?= =?UTF-8?q?imit=20der=20Arbeit=20zu=20umgehen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/libraries/SignatureLib.php | 12 +++++++++++- cis/private/lehre/abgabe_lektor_details.php | 4 ++++ locale/de-AT/abgabetool.php | 1 + locale/en-US/abgabetool.php | 1 + 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/application/libraries/SignatureLib.php b/application/libraries/SignatureLib.php index 132545219..c44ffc5f6 100644 --- a/application/libraries/SignatureLib.php +++ b/application/libraries/SignatureLib.php @@ -35,6 +35,17 @@ class SignatureLib { try { + // Dont send Document if it is bigger than 30 MB (Limit of Signature Server) + if (filesize($inputFileName) > 30000000) + { + $returnObject = new stdClass(); + $returnObject->code = 1; + $returnObject->error = 1; + $returnObject->retval = 'File to big'; + + return $returnObject; + } + // Get the content of the given file $inputFileContent = file_get_contents($inputFileName); if ($inputFileContent === false) // if failed @@ -72,4 +83,3 @@ class SignatureLib return null; } } - diff --git a/cis/private/lehre/abgabe_lektor_details.php b/cis/private/lehre/abgabe_lektor_details.php index 142af5527..a8705e7f9 100644 --- a/cis/private/lehre/abgabe_lektor_details.php +++ b/cis/private/lehre/abgabe_lektor_details.php @@ -710,6 +710,10 @@ while ($row=@$db->db_fetch_object($result)) $signaturVorhanden = true; // The document is signed } + elseif (isset($signList->code) && $signList->code == 1) + { + $uploadedDocumentSigned = $p->t('abgabetool/uploaddDocumentToBigForSignature'); + } elseif ($signList === null) { $uploadedDocumentSigned = 'WARNING: signature server error'; diff --git a/locale/de-AT/abgabetool.php b/locale/de-AT/abgabetool.php index f3b2cfac5..aae3ca2de 100644 --- a/locale/de-AT/abgabetool.php +++ b/locale/de-AT/abgabetool.php @@ -94,6 +94,7 @@ $this->phrasen['abgabetool/fehlerErmittelnEndabgabeProjektarbeit']='Fehler beim $this->phrasen['abgabetool/uploadedDocumentNotSignedStudent']='Es konnte keine gültige digitale Signatur erkannt werden. Bitte wenden Sie sich an Ihren Studiengang ob Ihre Endabgabe erfolgreich war und die Arbeit zur Benotung vorgelegt werden kann.'; $this->phrasen['abgabetool/uploadedDocumentNotSigned']='Signatur fehlt'; $this->phrasen['abgabetool/uploadedDocumentSigned']='Signatur vorhanden'; +$this->phrasen['abgabetool/uploaddDocumentToBigForSignature']='Datei zu groß für Signaturprüfung'; $this->phrasen['abgabetool/senatsMitglied']='Mitglied Prüfungssenat'; $this->phrasen['abgabetool/abgegeben']='Abgegeben, in Beurteilung'; ?> diff --git a/locale/en-US/abgabetool.php b/locale/en-US/abgabetool.php index b77e25d92..c13ebd90d 100644 --- a/locale/en-US/abgabetool.php +++ b/locale/en-US/abgabetool.php @@ -94,6 +94,7 @@ $this->phrasen['abgabetool/fehlerErmittelnEndabgabeProjektarbeit']='Error when g $this->phrasen['abgabetool/uploadedDocumentNotSignedStudent']='The document does not contain an electronic signature. Please inform your Dregree Programm to verify the upload'; $this->phrasen['abgabetool/uploadedDocumentNotSigned']='Signature not found'; $this->phrasen['abgabetool/uploadedDocumentSigned']='Signature found'; +$this->phrasen['abgabetool/uploaddDocumentToBigForSignature']='File to big for Signaturecheck'; $this->phrasen['abgabetool/senatsMitglied']='Examiner'; $this->phrasen['abgabetool/abgegeben']='handed in, in assessment'; ?>