Merge branch 'master' into ci

Conflicts:
	cis/testtool/admin/add_gebiet.php
	cis/testtool/admin/edit_gebiet.php
	cis/testtool/admin/index.php
	config/global.config-default.inc.php
	content/student/studentDBDML.php
	content/student/studentdetailoverlay.xul.php
	include/ablauf.class.php
	include/frage.class.php
	include/organisationseinheit.class.php
	include/studiengang.class.php
	include/vorschlag.class.php
	phpci.yml
	rdf/student.rdf.php
	system/dbupdate_3.2.php
	tests/codeception/_support/AcceptanceTester.php
	tests/codeception/_support/BasisKlasseTest.php
	tests/codeception/_support/FunctionalTester.php
	tests/codeception/_support/UnitTester.php
	tests/codeception/_support/_generated/AcceptanceTesterActions.php
	tests/codeception/acceptance/AcceptanceTester.php
	tests/codeception/acceptance/CISLoginPageCept.php
	tests/codeception/acceptance/_bootstrap.php
	tests/codeception/codeception.dist.yml
	tests/codeception/functional/FunctionalTester.php
	tests/codeception/functional/_bootstrap.php
	tests/codeception/tests/acceptance.suite.dist.yml
	tests/codeception/tests/acceptance/CISLoginPage.php
	tests/codeception/tests/acceptance/CISLoginPageCept.php
	tests/codeception/tests/api/_bootstrap.php
	tests/codeception/tests/functional/FunctionalTester.php
	tests/codeception/tests/functional/_bootstrap.php
	tests/codeception/tests/unit/BasisKlasseTest.php
	tests/codeception/tests/unit/UnitTester.php
	tests/codeception/unit/BasisKlasseTest.php
	tests/codeception/unit/UnitTester.php
This commit is contained in:
oesi
2016-11-22 13:58:29 +01:00
134 changed files with 16215 additions and 7654 deletions
+15 -10
View File
@@ -34,7 +34,7 @@
die($db->db_last_error());
$num_rows=$db->db_num_rows($result_stg);
$ss=new studiensemester();
$ss_nearest=$ss->getNearest();
$ss_nearest=$ss->getaktorNearest();
$ss_nearest_to_akt=$ss->getNearestFrom($ss_nearest);
?>
@@ -90,17 +90,22 @@
// File Operations
$name=$mg_kurzbz.'.txt';
$name=mb_strtolower($name);
$fp=fopen('../../../mlists/'.$name,"w");
//$fp=fopen('../../../../mlists/'.$name,"w");
$nr_person=$db->db_num_rows($result_person);
for ($p=0; $p<$nr_person; $p++)
if($fp=fopen('../../../mlists/'.$name,"w"))
{
$row = $db->db_fetch_object($result_person, $p);
fwrite($fp, '#'.$row->nachname.' '.$row->vorname.$crlf.$row->uid.$crlf);
$nr_person=$db->db_num_rows($result_person);
for ($p=0; $p<$nr_person; $p++)
{
$row = $db->db_fetch_object($result_person, $p);
fwrite($fp, '#'.$row->nachname.' '.$row->vorname.$crlf.$row->uid.$crlf);
}
fclose($fp);
echo $name.' created<br>';
}
else
{
echo "Failed to Create $name";
}
fclose($fp);
echo $name.' created<br>';
flush();
}
}