mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-21 17:02:19 +00:00
Merge branch 'master' into ci
Conflicts: composer.json composer.lock phpci.yml system/checksystem.php system/dbupdate_3.2.php tests/codeception/_data/dump.sql tests/codeception/tests/acceptance/CISLoginPage.php
This commit is contained in:
oesi
+10
-5
@@ -37,12 +37,17 @@ echo '<html>
|
||||
</head>
|
||||
<body>';
|
||||
|
||||
$uid = get_uid();
|
||||
$rechte = new benutzerberechtigung();
|
||||
$rechte->getBerechtigungen($uid);
|
||||
if (php_sapi_name() != 'cli')
|
||||
{
|
||||
$uid = get_uid();
|
||||
$rechte = new benutzerberechtigung();
|
||||
$rechte->getBerechtigungen($uid);
|
||||
|
||||
if(! $rechte->isBerechtigt('admin'))
|
||||
exit('Sie ('.$uid.') haben keine Berechtigung');
|
||||
if(!$rechte->isBerechtigt('admin'))
|
||||
{
|
||||
exit('Sie haben keine Berechtigung');
|
||||
}
|
||||
}
|
||||
|
||||
echo '<H1>Systemcheck!</H1>';
|
||||
echo '<H2>DB-Updates!</H2>';
|
||||
|
||||
+42
-1
@@ -1670,6 +1670,47 @@ if(!$result = @$db->db_query("SELECT aufnahmegruppe FROM public.tbl_gruppe"))
|
||||
echo 'Boolean aufnahmegruppe zu Gruppen hinzugefuegt. aufnahmegruppe_kurzbz zu tbl_prestudent und tbl_reihungstest hinzugefuegt<br>';
|
||||
}
|
||||
|
||||
// Removing column "r" from tbl_statistik
|
||||
if ($result = @$db->db_query("SELECT r FROM public.tbl_statistik LIMIT 1;"))
|
||||
{
|
||||
$qry = "ALTER TABLE public.tbl_statistik DROP COLUMN r;";
|
||||
|
||||
if (!$db->db_query($qry))
|
||||
echo '<strong>public.tbl_statistik: ' . $db->db_last_error() . '</strong><br>';
|
||||
else
|
||||
echo ' public.tbl_statistik: Spalte r entfernt.<br>';
|
||||
}
|
||||
|
||||
|
||||
// Removing column "php" from tbl_statistik
|
||||
if ($result = @$db->db_query("SELECT php FROM public.tbl_statistik LIMIT 1;"))
|
||||
{
|
||||
$qry = "ALTER TABLE public.tbl_statistik DROP COLUMN php;";
|
||||
|
||||
if (!$db->db_query($qry))
|
||||
echo '<strong>public.tbl_statistik: ' . $db->db_last_error() . '</strong><br>';
|
||||
else
|
||||
echo ' public.tbl_statistik: Spalte php entfernt.<br>';
|
||||
}
|
||||
|
||||
// vorlage_kurzbz von 16 auf 32 Zeichen
|
||||
if($result = $db->db_query("SELECT character_maximum_length FROM information_schema.columns WHERE column_name='vorlage_kurzbz' AND table_name='tbl_vorlage' AND table_schema='public';"))
|
||||
{
|
||||
if($row = $db->db_fetch_object($result))
|
||||
{
|
||||
if($row->character_maximum_length==16)
|
||||
{
|
||||
$qry = "ALTER TABLE public.tbl_vorlage ALTER COLUMN vorlage_kurzbz TYPE varchar(32);
|
||||
ALTER TABLE public.tbl_vorlagestudiengang ALTER COLUMN vorlage_kurzbz TYPE varchar(32);
|
||||
";
|
||||
if(!$db->db_query($qry))
|
||||
echo '<strong>public.tbl_vorlage: '.$db->db_last_error().'</strong><br>';
|
||||
else
|
||||
echo 'public.tbl_vorlage: Spalte vorlage_kurzbz auf 32 Zeichen verlaengert<br>';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
|
||||
echo '<H2>Pruefe Tabellen und Attribute!</H2>';
|
||||
|
||||
@@ -1882,7 +1923,7 @@ $tabellen=array(
|
||||
"public.tbl_service" => array("service_id", "bezeichnung","beschreibung","ext_id","oe_kurzbz","content_id"),
|
||||
"public.tbl_sprache" => array("sprache","locale","flagge","index","content","bezeichnung"),
|
||||
"public.tbl_standort" => array("standort_id","adresse_id","kurzbz","bezeichnung","insertvon","insertamum","updatevon","updateamum","ext_id", "firma_id","code"),
|
||||
"public.tbl_statistik" => array("statistik_kurzbz","bezeichnung","url","r","gruppe","sql","php","content_id","insertamum","insertvon","updateamum","updatevon","berechtigung_kurzbz","publish","preferences"),
|
||||
"public.tbl_statistik" => array("statistik_kurzbz","bezeichnung","url","gruppe","sql","content_id","insertamum","insertvon","updateamum","updatevon","berechtigung_kurzbz","publish","preferences"),
|
||||
"public.tbl_student" => array("student_uid","matrikelnr","prestudent_id","studiengang_kz","semester","verband","gruppe","updateamum","updatevon","insertamum","insertvon","ext_id"),
|
||||
"public.tbl_studentlehrverband" => array("student_uid","studiensemester_kurzbz","studiengang_kz","semester","verband","gruppe","updateamum","updatevon","insertamum","insertvon","ext_id"),
|
||||
"public.tbl_studiengang" => array("studiengang_kz","kurzbz","kurzbzlang","typ","bezeichnung","english","farbe","email","telefon","max_semester","max_verband","max_gruppe","erhalter_kz","bescheid","bescheidbgbl1","bescheidbgbl2","bescheidgz","bescheidvom","orgform_kurzbz","titelbescheidvom","aktiv","ext_id","zusatzinfo_html","moodle","sprache","testtool_sprachwahl","studienplaetze","oe_kurzbz","lgartcode","mischform","projektarbeit_note_anzeige", "onlinebewerbung"),
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
<?php
|
||||
/* Copyright (C) 2016 fhcomplete.org
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as
|
||||
* published by the Free Software Foundation; either version 2 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
|
||||
*
|
||||
* Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>
|
||||
*/
|
||||
/*
|
||||
* Dieses Script generiert fuer Testzwecke fuer jedes DMS-File einen symbolischen Link auf
|
||||
* eine Testdatei um im Testsystem korrekte Dateilinks zu haben.
|
||||
*/
|
||||
require_once('../config/vilesci.config.inc.php');
|
||||
require_once('../include/functions.inc.php');
|
||||
require_once('../include/benutzerberechtigung.class.php');
|
||||
|
||||
$uid = get_uid();
|
||||
$db = new basis_db();
|
||||
$rechte = new benutzerberechtigung();
|
||||
$rechte->getBerechtigungen($uid);
|
||||
if(!$rechte->isBerechtigt('system/developer',null,'suid'))
|
||||
die($rechte->errormsg);
|
||||
|
||||
$anzahl_neu=0;
|
||||
$anzahl_vorhanden=0;
|
||||
$qry = "SELECT filename FROM campus.tbl_dms_version";
|
||||
$path = '/var/fhcomplete/dms/';
|
||||
chdir($path);
|
||||
if($result = $db->db_query($qry))
|
||||
{
|
||||
while($row = $db->db_fetch_object($result))
|
||||
{
|
||||
$extension = strtolower(mb_substr($row->filename, mb_strrpos($row->filename,'.')+1));
|
||||
if(in_array($extension, array('jpg','pdf','zip','doc','docx','gif','png','jpeg','odt','ods','xls')))
|
||||
$testfile = 'testfile.'.strtolower($extension);
|
||||
else
|
||||
$testfile = 'testfile.txt';
|
||||
if(!file_exists($row->filename))
|
||||
{
|
||||
$cmd = 'ln -s '.$testfile.' '.$row->filename;
|
||||
exec($cmd);
|
||||
echo "<br>\ncreate $row->filename";
|
||||
$anzahl_neu++;
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<br>\nexists $row->filename";
|
||||
$anzahl_vorhanden++;
|
||||
}
|
||||
}
|
||||
}
|
||||
echo '<hr>';
|
||||
echo 'Done';
|
||||
echo '<br>Neu:'.$anzahl_neu;
|
||||
echo '<br>Vorhanden:'.$anzahl_vorhanden;
|
||||
?>
|
||||
+565
-543
File diff suppressed because it is too large
Load Diff
@@ -359,7 +359,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
|
||||
</table:table-row>
|
||||
<table:table-row table:style-name="Tabelle1.1">
|
||||
<table:table-cell table:style-name="Tabelle1.A2" table:number-columns-spanned="2" office:value-type="string">
|
||||
<text:p text:style-name="P4">Topic and Assessment of Master's thesis</text:p>
|
||||
<text:p text:style-name="P4">Topic and Assessment of Master's Thesis</text:p>
|
||||
</table:table-cell>
|
||||
<table:covered-table-cell/>
|
||||
<table:table-cell table:style-name="Tabelle1.B5" table:number-columns-spanned="6" office:value-type="string">
|
||||
@@ -381,7 +381,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
|
||||
</table:table-cell>
|
||||
<table:covered-table-cell/>
|
||||
<table:table-cell table:style-name="Tabelle1.A1" table:number-columns-spanned="7" office:value-type="string">
|
||||
<text:p text:style-name="P4">Examination interview on the Master’s thesis and its links to subjects of the curriculum as well as examination interview on a curricular theme</text:p>
|
||||
<text:p text:style-name="P4">Examination interview on the Master’s Thesis and its links to subjects of the curriculum as well as examination interview on a curricular theme</text:p>
|
||||
</table:table-cell>
|
||||
<table:covered-table-cell/>
|
||||
<table:covered-table-cell/>
|
||||
@@ -396,8 +396,8 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
|
||||
</table:table-cell>
|
||||
<table:covered-table-cell/>
|
||||
<table:table-cell table:style-name="Tabelle1.D2" table:number-columns-spanned="7" office:value-type="string">
|
||||
<text:p text:style-name="P14"><draw:custom-shape text:anchor-type="char" draw:z-index="6" draw:name="Rechteck 1" draw:style-name="gr1" draw:text-style-name="P21" svg:width="0.336cm" svg:height="0.359cm" svg:x="10.964cm" svg:y="0.153cm"><text:p/><draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/></draw:custom-shape>Presentation of the Master's thesis</text:p>
|
||||
<text:p text:style-name="P14">Examination interview on the Master's thesis <text:span text:style-name="T1">and its links</text:span></text:p>
|
||||
<text:p text:style-name="P14"><draw:custom-shape text:anchor-type="char" draw:z-index="6" draw:name="Rechteck 1" draw:style-name="gr1" draw:text-style-name="P21" svg:width="0.336cm" svg:height="0.359cm" svg:x="10.964cm" svg:y="0.153cm"><text:p/><draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/></draw:custom-shape>Presentation of the Master's Thesis</text:p>
|
||||
<text:p text:style-name="P14">Examination interview on the Master's Thesis <text:span text:style-name="T1">and its links</text:span></text:p>
|
||||
<text:p text:style-name="P4"><draw:custom-shape text:anchor-type="char" draw:z-index="4" draw:name="Rechteck 1" draw:style-name="gr1" draw:text-style-name="P21" svg:width="0.336cm" svg:height="0.359cm" svg:x="10.982cm" svg:y="-0.046cm"><text:p/><draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/></draw:custom-shape>to subjects of the curriculum</text:p>
|
||||
<text:p text:style-name="P14"><draw:custom-shape text:anchor-type="char" draw:z-index="5" draw:name="Rechteck 1" draw:style-name="gr1" draw:text-style-name="P21" svg:width="0.336cm" svg:height="0.359cm" svg:x="10.986cm" svg:y="-0.019cm"><text:p/><draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/></draw:custom-shape>Examination interview on other subjects relevant to the curriculum</text:p>
|
||||
</table:table-cell>
|
||||
@@ -410,7 +410,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
|
||||
</table:table-row>
|
||||
<table:table-row table:style-name="Tabelle1.1">
|
||||
<table:table-cell table:style-name="Tabelle1.A1" table:number-columns-spanned="9" office:value-type="string">
|
||||
<text:p text:style-name="P4">Notes on the presentation of the Master's thesis</text:p>
|
||||
<text:p text:style-name="P4">Notes on the presentation of the Master's Thesis</text:p>
|
||||
</table:table-cell>
|
||||
<table:covered-table-cell/>
|
||||
<table:covered-table-cell/>
|
||||
@@ -538,10 +538,10 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
|
||||
<table:covered-table-cell/>
|
||||
<table:table-cell table:style-name="Tabelle1.D2" table:number-columns-spanned="5" office:value-type="string">
|
||||
<text:p text:style-name="P4">
|
||||
(+++) Passed with highest distinction
|
||||
(+++) Passed with distinction
|
||||
</text:p>
|
||||
<text:p text:style-name="P4">
|
||||
(++) Passt with distinction
|
||||
(++) Passed with merit
|
||||
</text:p>
|
||||
<text:p text:style-name="P4">
|
||||
(+) Passed
|
||||
|
||||
@@ -381,7 +381,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
|
||||
</table:table-cell>
|
||||
<table:covered-table-cell/>
|
||||
<table:table-cell table:style-name="Tabelle1.A1" table:number-columns-spanned="7" office:value-type="string">
|
||||
<text:p text:style-name="P4">Prüfungsgespräch über Masterarbeit und Querverbindungen zu Fächern des Studienplans sowie Prüfungsgespräch über Stoffgebiet</text:p>
|
||||
<text:p text:style-name="P4">Prüfungsgespräch über die Masterarbeit und deren Querverbindungen zu Fächern des Studienplans sowie Prüfungsgespräch über das Stoffgebiet</text:p>
|
||||
</table:table-cell>
|
||||
<table:covered-table-cell/>
|
||||
<table:covered-table-cell/>
|
||||
|
||||
@@ -381,7 +381,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
|
||||
</table:table-cell>
|
||||
<table:covered-table-cell/>
|
||||
<table:table-cell table:style-name="Tabelle1.A1" table:number-columns-spanned="7" office:value-type="string">
|
||||
<text:p text:style-name="P4">Prüfungsgespräch über Masterarbeit und Querverbindungen zu Fächern des Studienplans sowie Prüfungsgespräch über Stoffgebiet</text:p>
|
||||
<text:p text:style-name="P4">Prüfungsgespräch über die Masterarbeit und deren Querverbindungen zu Fächern des Studienplans sowie Prüfungsgespräch über das Stoffgebiet</text:p>
|
||||
</table:table-cell>
|
||||
<table:covered-table-cell/>
|
||||
<table:covered-table-cell/>
|
||||
|
||||
@@ -369,7 +369,7 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
|
||||
<text:p text:style-name="P9"/>
|
||||
<text:p text:style-name="P9"/>
|
||||
<text:p text:style-name="P10"/>
|
||||
<text:p text:style-name="P10">Final assessment: Passed with highest distinction, Passed with distinction, Passed</text:p>
|
||||
<text:p text:style-name="P10">Final assessment: Passed with distinction, Passed with merit, Passed</text:p>
|
||||
<text:p text:style-name="P10">Pursuant to section 6 subsection 1 of the University of Applied Sciences Studies Act (FHStG), BGBI. Nr. <xsl:value-of select="bescheidbgbl1" /> idgF</text:p>
|
||||
<text:p text:style-name="P18"/>
|
||||
<text:p text:style-name="P18"/>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -2784,7 +2784,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
|
||||
</table:table-row>
|
||||
</table:table>
|
||||
<text:p text:style-name="P15"/>
|
||||
<text:p text:style-name="P23">Grading Scheme: Passed with highest distinction, Passed with distinction, Passed</text:p>
|
||||
<text:p text:style-name="P23">Grading Scheme: Passed with distinction, Passed with merit, Passed</text:p>
|
||||
<text:p text:style-name="P22"/>
|
||||
<text:p text:style-name="P22">
|
||||
<draw:frame xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" draw:style-name="fr4" draw:name="graphics5" text:anchor-type="char" svg:x="4.50cm" svg:y="0.1cm" svg:width="3.5cm" svg:height="3.5cm" draw:z-index="16" >
|
||||
|
||||
@@ -2814,7 +2814,7 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
|
||||
</table:table-row>
|
||||
</table:table>
|
||||
<text:p text:style-name="P15"/>
|
||||
<text:p text:style-name="P23">Grading Scheme: Passed with highest distinction, Passed with distinction, Passed</text:p>
|
||||
<text:p text:style-name="P23">Grading Scheme: Passed with distinction, Passed with merit, Passed</text:p>
|
||||
<text:p text:style-name="P22"/>
|
||||
</xsl:if>
|
||||
<text:p text:style-name="P22">
|
||||
|
||||
@@ -352,7 +352,7 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
|
||||
</table:table-cell>
|
||||
<table:table-cell table:style-name="Tabelle1.B1" office:value-type="string">
|
||||
<text:p text:style-name="P20">
|
||||
<text:span text:style-name="T2"><xsl:value-of select="abschlussbeurteilung_kurzbz" /></text:span>
|
||||
<text:span text:style-name="T2"><xsl:value-of select="abschlussbeurteilung_kurzbzEng" /></text:span>
|
||||
</text:p>
|
||||
</table:table-cell>
|
||||
</table:table-row>
|
||||
@@ -393,7 +393,7 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
|
||||
<text:p text:style-name="P9"/>
|
||||
<text:p text:style-name="P9"/>
|
||||
<text:p text:style-name="P10"/>
|
||||
<text:p text:style-name="P10">Final assessment: Passed with highest distinction, Passed with distinction, Passed</text:p>
|
||||
<text:p text:style-name="P10">Final assessment: Passed with distinction, Passed with merit, Passed</text:p>
|
||||
<text:p text:style-name="P10">Pursuant to section 6 subsection 1 of the University of Applied Sciences Studies Act (FHStG), BGBI. Nr. <xsl:value-of select="bescheidbgbl1" /> idgF</text:p>
|
||||
<text:p text:style-name="P18"/>
|
||||
<text:p text:style-name="P18"/>
|
||||
|
||||
Reference in New Issue
Block a user