blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-21 08:52:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Andreas Österreicher
2013-08-09 16:14:30 +00:00
parent a3d9c303c4
commit 17a4ee099e
4 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/auth_mixed.class.php
+1
View File
@@ -91,6 +91,7 @@ class authentication extends auth
/* Authentifizierung des User */
if (($link_id = @ldap_bind($connect, $user_dn, $passwort)) == false)
{
$this->errormsg='LDAP Bind fehlgeschlagen: '.ldap_error($connect);
return false;
}
include/cronjob.class.php
+49 -49
View File
@@ -80,7 +80,7 @@ class cronjob extends basis_db
return false;
}
$qry = "SELECT * FROM system.tbl_cronjob WHERE cronjob_id='".addslashes($cronjob_id)."'";
$qry = "SELECT * FROM system.tbl_cronjob WHERE cronjob_id=".$this->db_add_param($cronjob_id, FHC_INTEGER);
if($this->db_query($qry))
{
@@ -92,15 +92,15 @@ class cronjob extends basis_db
$this->beschreibung = $row->beschreibung;
$this->file = $row->file;
$this->last_execute = $row->last_execute;
$this->aktiv = ($row->aktiv=='t'?true:false);
$this->running = ($row->running=='t'?true:false);
$this->aktiv = $this->db_parse_bool($row->aktiv);
$this->running = $this->db_parse_bool($row->running);
$this->jahr = $row->jahr;
$this->monat = $row->monat;
$this->tag = $row->tag;
$this->wochentag = $row->wochentag;
$this->stunde = $row->stunde;
$this->minute = $row->minute;
$this->standalone = ($row->standalone=='t'?true:false);
$this->standalone = $this->db_parse_bool($row->standalone);
$this->reihenfolge = $row->reihenfolge;
$this->updateamum = $row->updateamum;
$this->updatevon = $row->updatevon;
@@ -186,26 +186,26 @@ class cronjob extends basis_db
$qry = 'BEGIN;INSERT INTO system.tbl_cronjob (server_kurzbz, titel, beschreibung, file, last_execute, aktiv,
running, jahr, monat, tag, wochentag, stunde, minute, standalone, reihenfolge, updateamum, updatevon,
insertamum, insertvon, variablen) VALUES('.
$this->addslashes($this->server_kurzbz).', '.
$this->addslashes($this->titel).', '.
$this->addslashes($this->beschreibung).', '.
$this->addslashes($this->file).', '.
$this->addslashes($this->last_execute).', '.
($this->aktiv?'true':'false').', '.
($this->running?'true':'false').', '.
$this->addslashes($this->jahr).', '.
$this->addslashes($this->monat).', '.
$this->addslashes($this->tag).', '.
$this->addslashes($this->wochentag).', '.
$this->addslashes($this->stunde).', '.
$this->addslashes($this->minute).', '.
($this->standalone?'true':'false').', '.
$this->addslashes($this->reihenfolge).', '.
$this->addslashes($this->updateamum).', '.
$this->addslashes($this->updatevon).', '.
$this->addslashes($this->insertamum).', '.
$this->addslashes($this->insertvon).','.
$this->addslashes($this->variablen).');';
$this->db_add_param($this->server_kurzbz).', '.
$this->db_add_param($this->titel).', '.
$this->db_add_param($this->beschreibung).', '.
$this->db_add_param($this->file).', '.
$this->db_add_param($this->last_execute).', '.
$this->db_add_param($this->aktiv, FHC_BOOLEAN).', '.
$this->db_add_param($this->running, FHC_BOOLEAN).', '.
$this->db_add_param($this->jahr).', '.
$this->db_add_param($this->monat).', '.
$this->db_add_param($this->tag).', '.
$this->db_add_param($this->wochentag).', '.
$this->db_add_param($this->stunde).', '.
$this->db_add_param($this->minute).', '.
$this->db_add_param($this->standalone, FHC_BOOLEAN).', '.
$this->db_add_param($this->reihenfolge).', '.
$this->db_add_param($this->updateamum).', '.
$this->db_add_param($this->updatevon).', '.
$this->db_add_param($this->insertamum).', '.
$this->db_add_param($this->insertvon).','.
$this->db_add_param($this->variablen).');';
}
else
{
@@ -219,25 +219,25 @@ class cronjob extends basis_db
}
$qry='UPDATE system.tbl_cronjob SET '.
'server_kurzbz='.$this->addslashes($this->server_kurzbz).', '.
'titel='.$this->addslashes($this->titel).', '.
'beschreibung='.$this->addslashes($this->beschreibung).', '.
'file='.$this->addslashes($this->file).', '.
'last_execute='.$this->addslashes($this->last_execute).', '.
'aktiv='.($this->aktiv?'true':'false').', '.
'running='.($this->running?'true':'false').', '.
'jahr='.$this->addslashes($this->jahr).', '.
'monat='.$this->addslashes($this->monat).', '.
'tag='.$this->addslashes($this->tag).', '.
'wochentag='.$this->addslashes($this->wochentag).', '.
'stunde='.$this->addslashes($this->stunde).', '.
'minute='.$this->addslashes($this->minute).', '.
'standalone='.($this->standalone?'true':'false').', '.
'reihenfolge='.$this->addslashes($this->reihenfolge).', '.
'variablen='.$this->addslashes($this->variablen).','.
'updateamum='.$this->addslashes($this->updateamum).','.
'updatevon='.$this->addslashes($this->updatevon).' '.
'WHERE cronjob_id='.$this->addslashes($this->cronjob_id).';';
'server_kurzbz='.$this->db_add_param($this->server_kurzbz).', '.
'titel='.$this->db_add_param($this->titel).', '.
'beschreibung='.$this->db_add_param($this->beschreibung).', '.
'file='.$this->db_add_param($this->file).', '.
'last_execute='.$this->db_add_param($this->last_execute).', '.
'aktiv='.$this->db_add_param($this->aktiv, FHC_BOOLEAN).', '.
'running='.$this->db_add_param($this->running, FHC_BOOLEAN).', '.
'jahr='.$this->db_add_param($this->jahr).', '.
'monat='.$this->db_add_param($this->monat).', '.
'tag='.$this->db_add_param($this->tag).', '.
'wochentag='.$this->db_add_param($this->wochentag).', '.
'stunde='.$this->db_add_param($this->stunde).', '.
'minute='.$this->db_add_param($this->minute).', '.
'standalone='.$this->db_add_param($this->standalone, FHC_BOOLEAN).', '.
'reihenfolge='.$this->db_add_param($this->reihenfolge).', '.
'variablen='.$this->db_add_param($this->variablen).','.
'updateamum='.$this->db_add_param($this->updateamum).','.
'updatevon='.$this->db_add_param($this->updatevon).' '.
'WHERE cronjob_id='.$this->db_add_param($this->cronjob_id, FHC_INTEGER).';';
}
if($this->db_query($qry))
@@ -290,7 +290,7 @@ class cronjob extends basis_db
return false;
}
$qry = "DELETE FROM system.tbl_cronjob WHERE cronjob_id='".addslashes($cronjob_id)."'";
$qry = "DELETE FROM system.tbl_cronjob WHERE cronjob_id=".$this->db_add_param($cronjob_id, FHC_INTEGER);
if($this->db_query($qry))
return true;
@@ -312,7 +312,7 @@ class cronjob extends basis_db
{
$qry = "SELECT * FROM system.tbl_cronjob WHERE 1=1";
if($server!=null)
$qry.=" AND server_kurzbz='".addslashes($server)."'";
$qry.=" AND server_kurzbz=".$this->db_add_param($server);
if ($aktiv)
$qry.=' AND aktiv=true';
@@ -335,15 +335,15 @@ class cronjob extends basis_db
$obj->beschreibung = $row->beschreibung;
$obj->file = $row->file;
$obj->last_execute = $row->last_execute;
$obj->aktiv = ($row->aktiv=='t'?true:false);
$obj->running = ($row->running=='t'?true:false);
$obj->aktiv = $this->db_parse_bool($row->aktiv);
$obj->running = $this->db_parse_bool($row->running);
$obj->jahr = $row->jahr;
$obj->monat = $row->monat;
$obj->tag = $row->tag;
$obj->wochentag = $row->wochentag;
$obj->stunde = $row->stunde;
$obj->minute = $row->minute;
$obj->standalone = ($row->standalone=='t'?true:false);
$obj->standalone = $this->db_parse_bool($row->standalone);
$obj->reihenfolge = $row->reihenfolge;
$obj->updateamum = $row->updateamum;
$obj->updatevon = $row->updatevon;
@@ -664,4 +664,4 @@ class cronjob extends basis_db
return false;
}
}
?>
?>
system/checksystem.php
+1 -2
View File
@@ -4163,6 +4163,7 @@ $tabellen=array(
"lehre.tbl_lehrfach" => array("lehrfach_id","studiengang_kz","fachbereich_kurzbz","kurzbz","bezeichnung","farbe","aktiv","semester","sprache","updateamum","updatevon","insertamum","insertvon","ext_id"),
"lehre.tbl_lehrform" => array("lehrform_kurzbz","bezeichnung","verplanen"),
"lehre.tbl_lehrfunktion" => array("lehrfunktion_kurzbz","beschreibung","standardfaktor","sort"),
"lehre.tbl_lehrmittel" => array("lehrmittel_kurzbz","beschreibung","ort_kurzbz"),
"lehre.tbl_lehrveranstaltung" => array("lehrveranstaltung_id","kurzbz","bezeichnung","lehrform_kurzbz","studiengang_kz","semester","sprache","ects","semesterstunden","anmerkung","lehre","lehreverzeichnis","aktiv","planfaktor","planlektoren","planpersonalkosten","plankostenprolektor","koordinator","sort","zeugnis","projektarbeit","updateamum","updatevon","insertamum","insertvon","ext_id","bezeichnung_english","orgform_kurzbz","incoming"),
"lehre.tbl_moodle" => array("lehrveranstaltung_id","lehreinheit_id","moodle_id","mdl_course_id","studiensemester_kurzbz","gruppen","insertamum","insertvon","moodle_version"),
"lehre.tbl_moodle_version" => array("moodle_version","bezeichnung","pfad"),
@@ -4188,7 +4189,6 @@ $tabellen=array(
"public.tbl_benutzer" => array("uid","person_id","aktiv","alias","insertamum","insertvon","updateamum","updatevon","ext_id","updateaktivvon","updateaktivam"),
"public.tbl_benutzerfunktion" => array("benutzerfunktion_id","fachbereich_kurzbz","uid","oe_kurzbz","funktion_kurzbz","semester", "datum_von","datum_bis", "updateamum","updatevon","insertamum","insertvon","ext_id","bezeichnung"),
"public.tbl_benutzergruppe" => array("uid","gruppe_kurzbz","studiensemester_kurzbz","updateamum","updatevon","insertamum","insertvon","ext_id"),
"public.tbl_berechtigung" => array("berechtigung_kurzbz","beschreibung"),
"public.tbl_buchungstyp" => array("buchungstyp_kurzbz","beschreibung","standardbetrag","standardtext","aktiv"),
"public.tbl_dokument" => array("dokument_kurzbz","bezeichnung","ext_id"),
"public.tbl_dokumentprestudent" => array("dokument_kurzbz","prestudent_id","mitarbeiter_uid","datum","updateamum","updatevon","insertamum","insertvon","ext_id"),
@@ -4247,7 +4247,6 @@ $tabellen=array(
"public.tbl_variable" => array("name","uid","wert"),
"public.tbl_vorlage" => array("vorlage_kurzbz","bezeichnung","anmerkung","mimetype"),
"public.tbl_vorlagestudiengang" => array("vorlagestudiengang_id","vorlage_kurzbz","studiengang_kz","version","text","oe_kurzbz"),
"sync.tbl_zutrittskarte" => array("key","name","firstname","groupe","logaswnumber","physaswnumber","validstart","validend","text1","text2","text3","text4","text5","text6","pin"),
"testtool.tbl_ablauf" => array("ablauf_id","gebiet_id","studiengang_kz","reihung","gewicht","semester", "insertamum","insertvon","updateamum", "updatevon"),
"testtool.tbl_antwort" => array("antwort_id","pruefling_id","vorschlag_id"),
"testtool.tbl_frage" => array("frage_id","kategorie_kurzbz","gebiet_id","level","nummer","demo","insertamum","insertvon","updateamum","updatevon"),
vilesci/cronjobs/cronjob.php
+4 -4
View File
@@ -34,7 +34,7 @@ $datum = new datum();
$cj = new cronjob();
if(!$cj->getAll(SERVER_NAME,'reihenfolge',true))
die('Fehler beim Laden der Cronjobs');
foreach ($cj->result as $cronjob)
{
$timestamp = $cronjob->getNextExecutionTime();
@@ -43,13 +43,13 @@ foreach ($cj->result as $cronjob)
//Starten des Jobs
if($cronjob->execute())
{
echo date('d.m.Y H:i:s').' '.$cronjob->titel.'('.$cronjob->cronjob_id.') executed<br>';
echo date('d.m.Y H:i:s').' '.$cronjob->titel.'('.$cronjob->cronjob_id.') executed<br>'."\n";
}
else
{
echo date('d.m.Y H:i:s').' '.$cronjob->titel.'('.$cronjob->cronjob_id.') <b>failed</b><br>';
echo date('d.m.Y H:i:s').' '.$cronjob->titel.'('.$cronjob->cronjob_id.') <b>failed</b><br>'."\n";
}
}
}
?>
?>