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

- Added constant DOC_ROOT in system.config-default.inc.php

Browse Source 
- Using DOC_ROOT in dbupdate_3.2.php to be compatible with checksystem.php and DBTools.php
- Rolled back all classes in the include directory from CI to basis_db
This commit is contained in:
bison
2016-08-17 11:14:52 +02:00
parent dd6ef9fdb1
commit cf999b6d82
17 changed files with 308 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/system.config-default.inc.php
+3
View File
@@ -19,6 +19,9 @@
// Dokumentenmanagement
define('DMS_PATH','/var/fhcomplete/documents/dms/');
// Pfad zu Document Root
define('DOC_ROOT','/var/www/html/build/');
// Fuer Mails etc
define('DOMAIN','technikum-wien.at');
include/benutzer.class.php
-2
View File
@@ -23,8 +23,6 @@ require_once(dirname(__FILE__).'/person.class.php');
class benutzer extends person
{
use db_extra; //CI Hack
//Tabellenspalten
public $uid; // varchar(32)
public $bnaktiv=true; // boolean
include/berechtigung.class.php
+10 -20
View File
@@ -19,16 +19,10 @@
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
* Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
*/
require_once(dirname(__FILE__).'/datum.class.php');
require_once(dirname(__FILE__).'/basis_db.class.php');
// CI
require_once(dirname(__FILE__).'/../ci_hack.php');
require_once(dirname(__FILE__).'/../application/models/system/Berechtigung_model.php');
class berechtigung extends Berechtigung_model
class berechtigung extends basis_db
{
use db_extra; //CI Hack
public $result=array();
public $new;
@@ -50,21 +44,17 @@ class berechtigung extends Berechtigung_model
* @param $berechtigung_kurzbz
* @return true wenn ok, false im Fehlerfall
*/
public function load($berechtigung_kurzbz = null)
public function load($berechtigung_kurzbz)
{
if (empty($berechtigung_kurzbz))
{
$this->errormsg = "berechtigung not set!";
return false;
}
$result = parent::load($berechtigung_kurzbz);
$qry = "SELECT *
FROM system.tbl_berechtigung
WHERE berechtigung_kurzbz = " . $this->db_add_param($berechtigung_kurzbz);
if (is_object($result) && $result->error == EXIT_SUCCESS && is_array($result->retval))
if ($result = $this->db_query($qry))
{
if (count($result->retval) > 0)
if ($row = $this->db_fetch_object($result))
{
$this->berechtigung_kurzbz = $row->berechtigung_kurzbz;
$this->berechtigung_kurzbz=$row->berechtigung_kurzbz;
$this->beschreibung = $row->beschreibung;
return true;
}
@@ -323,4 +313,4 @@ class berechtigung extends Berechtigung_model
}
}
}
?>
?>
include/dms.class.php
+11 -17
View File
@@ -24,16 +24,8 @@
*/
require_once(dirname(__FILE__).'/basis_db.class.php');
require_once(dirname(__FILE__).'/datum.class.php');
// CI
require_once(dirname(__FILE__).'/../ci_hack.php');
require_once(dirname(__FILE__).'/../application/models/content/Dms_model.php');
class dms extends Dms_model
class dms extends basis_db
{
use db_extra; //CI Hack
public $new;
public $result=array();
@@ -71,18 +63,20 @@ class dms extends Dms_model
* @param dms_id
* @param version optional
*/
public function load($dms_id = null, $version=null)
public function load($dms_id, $version = null)
{
$qry = "SELECT tbl_dms.dms_id, * FROM campus.tbl_dms JOIN campus.tbl_dms_version USING(dms_id) WHERE dms_id=".$this->db_add_param($dms_id, FHC_INTEGER);
$qry = "SELECT tbl_dms.dms_id, *
FROM campus.tbl_dms JOIN campus.tbl_dms_version USING(dms_id)
WHERE dms_id = " . $this->db_add_param($dms_id, FHC_INTEGER);
if(!is_null($version))
$qry.=" AND version=".$this->db_add_param($version, FHC_INTEGER);
if (!is_null($version))
$qry .= " AND version=".$this->db_add_param($version, FHC_INTEGER);
$qry.=" ORDER BY version DESC LIMIT 1;";
$qry .= " ORDER BY version DESC LIMIT 1;";
if($result = $this->db_query($qry))
if ($result = $this->db_query($qry))
{
if($row = $this->db_fetch_object($result))
if ($row = $this->db_fetch_object($result))
{
$this->dms_id = $row->dms_id;
$this->version = $row->version;
@@ -1396,4 +1390,4 @@ class dms extends Dms_model
}
}
}
?>
?>
include/funktion.class.php
+11 -18
View File
@@ -23,16 +23,10 @@
* Klasse funktion (FAS-Online)
* @create 14-03-2006
*/
require_once(dirname(__FILE__).'/datum.class.php');
require_once(dirname(__FILE__).'/basis_db.class.php');
// CI
require_once(dirname(__FILE__).'/../ci_hack.php');
require_once(dirname(__FILE__).'/../application/models/ressource/Funktion_model.php');
class funktion extends Funktion_model
class funktion extends basis_db
{
use db_extra; //CI Hack
public $new; // boolean
public $result = array(); // fachbereich Objekt
@@ -109,27 +103,26 @@ class funktion extends Funktion_model
* @param $funktion_kurzbz ID der zu ladenden Funktion
* @return true wenn ok, false im Fehlerfall
*/
public function load($funktion_kurzbz = null)
public function load($funktion_kurzbz)
{
if (empty($funktion_kurzbz) || $funktion_kurzbz == '')
if ($funktion_kurzbz == '')
{
$this->errormsg = 'funktion_bz darf nicht leer sein';
return false;
}
$result = parent::load($funktion_kurzbz);
if (!is_object($result) || (is_object($result) && $result->error != EXIT_SUCCESS))
$qry = "SELECT *
FROM public.tbl_funktion
WHERE funktion_kurzbz = " . $this->db_add_param($funktion_kurzbz) . ";";
if (!$this->db_query($qry))
{
$this->errormsg = 'Fehler beim Laden des Datensatzes';
return false;
}
if (is_array($result->retval) && count($result->retval) == 1)
if ($row = $this->db_fetch_object())
{
$row = $result->retval[0];
$this->funktion_kurzbz = $row->funktion_kurzbz;
$this->beschreibung = $row->beschreibung;
$this->aktiv = $this->db_parse_bool($row->aktiv);
@@ -219,4 +212,4 @@ class funktion extends Funktion_model
}
}
}
?>
?>
include/kontakt.class.php
+8 -14
View File
@@ -23,16 +23,10 @@
* Klasse kontakt
* @create 20-12-2006
*/
require_once(dirname(__FILE__).'/datum.class.php');
require_once(dirname(__FILE__).'/basis_db.class.php');
// CI
require_once(dirname(__FILE__).'/../ci_hack.php');
require_once(dirname(__FILE__).'/../application/models/person/Kontakt_model.php');
class kontakt extends Kontakt_model
class kontakt extends basis_db
{
use db_extra; //CI Hack
public $new; // boolean
public $result = array(); // adresse Objekt
@@ -80,9 +74,9 @@ class kontakt extends Kontakt_model
* @param $kontakt_id ID des zu ladenden Kontaktes
* @return true wenn ok, false im Fehlerfall
*/
public function load($kontakt_id = null)
public function load($kontakt_id)
{
if(!is_numeric($kontakt_id))
if (!is_numeric($kontakt_id))
{
$this->errormsg = 'Kontakt_id ist ungueltig';
return false;
@@ -93,11 +87,11 @@ class kontakt extends Kontakt_model
public.tbl_kontakt
LEFT JOIN public.tbl_standort USING(standort_id)
LEFT JOIN public.tbl_firma USING(firma_id)
WHERE kontakt_id=".$this->db_add_param($kontakt_id, FHC_INTEGER).";";
WHERE kontakt_id = " . $this->db_add_param($kontakt_id, FHC_INTEGER) . ";";
if($this->db_query($qry))
if ($this->db_query($qry))
{
if($row = $this->db_fetch_object())
if ($row = $this->db_fetch_object())
{
$this->kontakt_id = $row->kontakt_id;
$this->person_id = $row->person_id;
@@ -516,4 +510,4 @@ class kontakt extends Kontakt_model
}
}
}
?>
?>
include/mitarbeiter.class.php
-3
View File
@@ -25,10 +25,7 @@ require_once(dirname(__FILE__).'/functions.inc.php');
class mitarbeiter extends benutzer
{
use db_extra; //CI Hack
public $new;
public $errormsg;
public $result=array();
//Tabellenspalten
include/nation.class.php
+19 -38
View File
@@ -24,19 +24,12 @@
* Klasse Nation (FAS-Online)
* @create 06-04-2006
*/
require_once(dirname(__FILE__).'/datum.class.php');
require_once(dirname(__FILE__).'/basis_db.class.php');
// CI
require_once(dirname(__FILE__).'/../ci_hack.php');
require_once(dirname(__FILE__).'/../application/models/codex/Nation_model.php');
class nation extends Nation_model
class nation extends basis_db
{
use db_extra; //CI Hack
public $new; // boolean
public $nation = array(); // nation Objekt
public $errormsg; // string
//Tabellenspalten
public $code;
@@ -67,22 +60,20 @@ class nation extends Nation_model
* @param $code code der zu ladenden Nation
* @return true wenn ok, false im Fehlerfall
*/
public function load($code = null)
public function load($code)
{
//Lesen der Daten aus der Datenbank
$result = parent::loadWhere(array('nation_code' => $code));
$qry = "SELECT * FROM bis.tbl_nation WHERE nation_code=".$this->db_add_param($code).';';
if (!is_object($result) || (is_object($result) && $result->error != EXIT_SUCCESS))
if(!$this->db_query($qry))
{
$this->errormsg = 'Fehler bei einer Datenbankabfrage';
return false;
}
if(is_array($result->retval) && count($result->retval) == 1)
if($row = $this->db_fetch_object())
{
$this->code = $code;
$row = $result->retval[0];
$this->sperre = $this->db_parse_bool($row->sperre);
$this->kontinent = $row->kontinent;
@@ -109,37 +100,26 @@ class nation extends Nation_model
public function getAll($ohnesperre = false, $orderEnglish = false)
{
//Lesen der Daten aus der Datenbank
if (!$orderEnglish)
{
$result = parent::addOrder('kurztext');
}
else
{
$result = parent::addOrder('engltext');
}
$qry = "SELECT * FROM bis.tbl_nation";
if ($result->error == EXIT_SUCCESS)
{
if ($ohnesperre)
{
$result = parent::loadWhere('sperre IS NULL');
}
else
{
$result = parent::load();
}
}
if ($ohnesperre)
$qry .= " WHERE sperre is null";
if ($orderEnglish == false)
$qry .= " ORDER BY kurztext";
else
$qry .= " ORDER BY engltext";
$qry .= ';';
if (!is_object($result) || (is_object($result) && ($result->error != EXIT_SUCCESS || !is_array($result->retval))))
if (!$this->db_query($qry))
{
$this->errormsg = 'Fehler bei einer Datenbankabfrage';
return false;
}
for ($i = 0; $i < count($result->retval); $i++)
while ($row = $this->db_fetch_object())
{
$row = $result->retval[$i];
$nation = new nation();
$nation->code = $row->nation_code;
@@ -154,6 +134,7 @@ class nation extends Nation_model
$this->nation[] = $nation;
}
return true;
}
include/organisationsform.class.php
+14 -21
View File
@@ -24,16 +24,8 @@
* Klasse Organisationsform
*/
require_once(dirname(__FILE__).'/datum.class.php');
// CI
require_once(dirname(__FILE__).'/../ci_hack.php');
require_once(dirname(__FILE__).'/../application/models/codex/Orgform_model.php');
class organisationsform extends Orgform_model
class organisationsform extends basis_db
{
use db_extra; //CI Hack
public $orgform_kurzbz;
public $code;
public $bezeichnung;
@@ -54,7 +46,7 @@ class organisationsform extends Orgform_model
* Laedt eine Organisationsform
* @param $orgform_kurzbz
*/
public function load($orgform_kurzbz = null)
public function load($orgform_kurzbz)
{
$qry = "SELECT * FROM bis.tbl_orgform WHERE orgform_kurzbz=".$this->db_add_param($orgform_kurzbz).';';
@@ -141,22 +133,23 @@ class organisationsform extends Orgform_model
*/
public function getOrgformLV()
{
$result = parent::getOrgformLV();
$qry = "SELECT *
FROM bis.tbl_orgform
WHERE orgform_kurzbz NOT IN ('VBB', 'ZGS')
ORDER BY orgform_kurzbz";
if (is_object($result) && $result->error == EXIT_SUCCESS && is_array($result->retval))
if ($result = $this->db_query($qry))
{
for ($i = 0; $i < count($result->retval); $i++)
while ($row = $this->db_fetch_object($result))
{
$row = $result->retval[$i];
$orgform = new organisationsform();
$orgform = new organisationsform();
$orgform->orgform_kurzbz = $row->orgform_kurzbz;
$orgform->code = $row->code;
$orgform->bezeichnung = $row->bezeichnung;
$orgform->rolle = $row->rolle;
$orgform->orgform_kurzbz = $row->orgform_kurzbz;
$orgform->code = $row->code;
$orgform->bezeichnung = $row->bezeichnung;
$orgform->rolle = $row->rolle;
$this->result[] = $orgform;
$this->result[] = $orgform;
}
return true;
}
include/ort.class.php
+20 -32
View File
@@ -23,19 +23,12 @@
* Klasse ort (FAS-Online)
* @create 04-12-2006
*/
require_once(dirname(__FILE__).'/datum.class.php');
require_once(dirname(__FILE__).'/basis_db.class.php');
// CI
require_once(dirname(__FILE__).'/../ci_hack.php');
require_once(dirname(__FILE__).'/../application/models/ressource/Ort_model.php');
class ort extends Ort_model
class ort extends basis_db
{
use db_extra; //CI Hack
public $new; // boolean
public $result = array(); // ort Objekt
public $errormsg; // string
//Tabellenspalten
public $ort_kurzbz; // string
@@ -82,31 +75,27 @@ class ort extends Ort_model
*/
public function getAll($raumtyp_kurzbz = null)
{
parent::addOrder('ort_kurzbz');
$qry = 'SELECT * FROM public.tbl_ort ORDER BY ort_kurzbz;';
if (!is_null($raumtyp_kurzbz) && $raumtyp_kurzbz != '')
{
$result = parent::addJoin('public.tbl_ortraumtyp', 'ort_kurzbz');
if ($result->error == EXIT_SUCCESS)
{
$result = parent::loadWhere(array('raumtyp_kurzbz' => $raumtyp_kurzbz));
}
$qry = '
SELECT
tbl_ort.*
FROM
public.tbl_ort
JOIN public.tbl_ortraumtyp USING(ort_kurzbz)
WHERE raumtyp_kurzbz = ' . $this->db_add_param($raumtyp_kurzbz) .
'ORDER BY ort_kurzbz;';
}
else
{
$result = parent::load();
}
if (!is_object($result) || (is_object($result) && ($result->error != EXIT_SUCCESS || !is_array($result->retval))))
if (!$this->db_query($qry))
{
$this->errormsg = 'Fehler beim Laden der Datensaetze';
return false;
}
for ($i = 0; $i < count($result->retval); $i++)
while ($row = $this->db_fetch_object())
{
$row = $result->retval[$i];
$ort_obj = new ort();
$ort_obj->ort_kurzbz = $row->ort_kurzbz;
@@ -138,7 +127,7 @@ class ort extends Ort_model
* @param $fachb_id ID des zu ladenden Ortes
* @return true wenn ok, false im Fehlerfall
*/
public function load($ort_kurzbz = null)
public function load($ort_kurzbz)
{
if ($ort_kurzbz == '')
{
@@ -146,20 +135,19 @@ class ort extends Ort_model
return false;
}
$result = parent::load(trim($ort_kurzbz));
if (!is_object($result) || (is_object($result) && $result->error != EXIT_SUCCESS))
$qry = "SELECT * FROM public.tbl_ort WHERE trim(ort_kurzbz) = " . $this->db_add_param(trim($ort_kurzbz)) . ";";
if (!$this->db_query($qry))
{
$this->errormsg = 'Fehler beim Laden des Datensatzes';
return false;
}
if(is_array($result->retval) && count($result->retval) > 0)
if ($row = $this->db_fetch_object())
{
$row = $result->retval[0];
$this->ort_kurzbz = $row->ort_kurzbz;
$this->bezeichnung = $row->bezeichnung;
$this->planbezeichnung = $row->planbezeichnung;
$this->planbezeichnung = $row->planbezeichnung;
$this->max_person = $row->max_person;
$this->aktiv = $this->db_parse_bool($row->aktiv);
$this->lehre = $this->db_parse_bool($row->lehre);
include/person.class.php
+14 -17
View File
@@ -22,17 +22,11 @@
/*
* Benoetigt functions.inc.php
*/
require_once(dirname(__FILE__).'/basis_db.class.php');
require_once(dirname(__FILE__).'/datum.class.php');
// CI
require_once(dirname(__FILE__).'/../ci_hack.php');
require_once(dirname(__FILE__).'/../application/models/person/Person_model.php');
class person extends Person_model
class person extends basis_db
{
use db_extra; //CI Hack
public $errormsg; // string
public $new; // boolean
public $personen = array(); // person Objekt
public $done = false; // boolean
@@ -87,23 +81,26 @@ class person extends Person_model
* @param int $personId ID der Person die geladen werden soll.
* @return bool
**/
public function load($personId = null)
public function load($personId)
{
//person_id auf gueltigkeit pruefen
if (is_numeric($personId) && $personId != '')
{
$result = parent::load($personId);
if (!is_object($result) || (is_object($result) && $result->error != EXIT_SUCCESS))
$qry = "SELECT person_id, sprache, anrede, titelpost, titelpre, nachname, vorname, vornamen,
gebdatum, gebort, gebzeit, foto, anmerkung, homepage, svnr, ersatzkennzeichen,
familienstand, anzahlkinder, aktiv, insertamum, insertvon, updateamum, updatevon, ext_id,
geschlecht, staatsbuergerschaft, geburtsnation, kurzbeschreibung, zugangscode, foto_sperre, matr_nr
FROM public.tbl_person
WHERE person_id = " . $this->db_add_param($personId, FHC_INTEGER);
if (!$this->db_query($qry))
{
$this->errormsg = "Fehler beim Lesen der Personendaten\n";
return false;
}
if(is_array($result->retval) && count($result->retval) == 1)
if ($row = $this->db_fetch_object())
{
$row = $result->retval[0];
$this->person_id = $row->person_id;
$this->sprache = $row->sprache;
$this->anrede = $row->anrede;
@@ -735,7 +732,7 @@ class person extends Person_model
public.tbl_preincoming
WHERE
person_id = (SELECT person_id FROM public.tbl_person
WHERE zugangscode=".$this->db_add_param($zugangscode).")
WHERE zugangscode = " . $this->db_add_param($zugangscode) . ")
ORDER BY insertamum DESC;";
if ($this->db_query($qry))
@@ -962,4 +959,4 @@ class person extends Person_model
return false;
}
}
}
}
include/preinteressent.class.php
+4 -9
View File
@@ -19,16 +19,11 @@
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
* Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
*/
require_once(dirname(__FILE__).'/basis_db.class.php');
require_once(dirname(__FILE__).'/datum.class.php');
// CI
require_once(dirname(__FILE__).'/../ci_hack.php');
require_once(dirname(__FILE__).'/../application/models/crm/Preinteressent_model.php');
class preinteressent extends Preinteressent_model
class preinteressent extends basis_db
{
use db_extra; //CI Hack
public $new; // boolean
public $result = array();
@@ -72,7 +67,7 @@ class preinteressent extends Preinteressent_model
* Laedt einen Datensatz
* @param preinteressent_id ID des zu ladenden Datensatzes
*/
public function load($preinteressent_id = null)
public function load($preinteressent_id)
{
//id auf Gueltigkeit pruefen
if(!is_numeric($preinteressent_id) || $preinteressent_id == '')
@@ -723,4 +718,4 @@ class preinteressent extends Preinteressent_model
}
}
}
?>
?>
include/statistik.class.php
+28 -37
View File
@@ -19,16 +19,10 @@
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>
* Karl Burkhart <burkhart@technikum-wien.at>.
*/
require_once(dirname(__FILE__).'/datum.class.php');
require_once(dirname(__FILE__).'/basis_db.class.php');
// CI
require_once(dirname(__FILE__).'/../ci_hack.php');
require_once(dirname(__FILE__).'/../application/models/organisation/Statistik_model.php');
class statistik extends Statistik_model
class statistik extends basis_db
{
use db_extra; //CI Hack
public $new;
public $statistik_obj=array();
public $result;
@@ -80,16 +74,19 @@ class statistik extends Statistik_model
* Laedt eine Statistik
* @param $statistik_kurzbz
*/
public function load($statistik_kurzbz = null)
public function load($statistik_kurzbz)
{
$result = parent::load($statistik_kurzbz);
$qry = "SELECT
*
FROM
public.tbl_statistik
WHERE
statistik_kurzbz = " . $this->db_add_param($statistik_kurzbz);
if (is_object($result) && $result->error == EXIT_SUCCESS && is_array($result->retval))
if($result = $this->db_query($qry))
{
if(count($result->retval) > 0)
if($row = $this->db_fetch_object($result))
{
$row = $result->retval[0];
$this->statistik_kurzbz = $row->statistik_kurzbz;
$this->content_id = $row->content_id;
$this->bezeichnung = $row->bezeichnung;
@@ -119,7 +116,7 @@ class statistik extends Statistik_model
{
$this->errormsg = 'Fehler beim Laden der Daten';
return false;
}
}
}
/**
@@ -128,19 +125,15 @@ class statistik extends Statistik_model
*/
public function getAll($order = FALSE)
{
if ($order)
{
parent::addOrder($order);
}
$qry = 'SELECT * FROM public.tbl_statistik';
if($order)
$qry .= ' ORDER BY ' . $order;
$result = parent::load();
if (is_object($result) && $result->error == EXIT_SUCCESS && is_array($result->retval))
if($result = $this->db_query($qry))
{
for ($i = 0; $i < count($result->retval); $i++)
while($row = $this->db_fetch_object($result))
{
$row = $result->retval[$i];
$obj = new statistik();
$obj->statistik_kurzbz = $row->statistik_kurzbz;
@@ -168,7 +161,7 @@ class statistik extends Statistik_model
{
$this->errormsg = 'Fehler beim Laden der Daten';
return false;
}
}
}
/**
* Laedt alle Statistiken einer Gruppe, Parameter publish zum Filtern.
@@ -335,19 +328,17 @@ class statistik extends Statistik_model
{
$arr = array();
parent::addOrder('gruppe');
parent::addOrder('bezeichnung');
parent::addOrder('statistik_kurzbz');
$result = parent::load();
$qry = "SELECT
*
FROM
public.tbl_statistik
ORDER BY gruppe, bezeichnung, statistik_kurzbz";
if (is_object($result) && $result->error == EXIT_SUCCESS && is_array($result->retval))
if($result = $this->db_query($qry))
{
$lastgruppe='';
for ($i = 0; $i < count($result->retval); $i++)
while($row = $this->db_fetch_object($result))
{
$row = $result->retval[$i];
if($row->gruppe!='' && $row->gruppe!=$lastgruppe)
{
$arr[$row->gruppe]=array('name'=>$row->gruppe);
@@ -367,7 +358,7 @@ class statistik extends Statistik_model
}
}
}
return $arr;
return $arr;
}
/**
@@ -643,4 +634,4 @@ class statistik extends Statistik_model
}
return array_unique($result);
}
}
}
include/studiengang.class.php
+20 -28
View File
@@ -20,26 +20,12 @@
* Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
* Gerald Raab <gerald.raab@technikum-wien.at>.
*/
//require_once(dirname(__FILE__).'/basis_db.class.php');
require_once(dirname(__FILE__).'/basis_db.class.php');
require_once(dirname(__FILE__).'/datum.class.php');
// CI
// look if get_instance() is declared
if (function_exists('get_instance'))
require_once(dirname(__FILE__).'/../ci_db_extra.php');
else
require_once(dirname(__FILE__).'/../ci_hack.php');
require_once(dirname(__FILE__).'/../application/models/organisation/Studiengang_model.php');
class studiengang extends Studiengang_model
class studiengang extends basis_db
{
use db_extra; //CI Hack
public $new; // boolean
public $result = array(); // studiengang Objekt
public $errormsg; // string
public $studiengang_kz; // integer
public $kurzbz; // varchar(5)
@@ -99,7 +85,7 @@ class studiengang extends Studiengang_model
$this->studiengang_typ_arr["e"] = "Erhalter"; */
}
/*public function __get($value)
public function __get($value)
{
switch($value)
{
@@ -110,14 +96,14 @@ class studiengang extends Studiengang_model
}
}
return $this->$value;
}*/
}
/**
* Laedt einen Studiengang
* @param studiengang_kz KZ des Studienganges der zu Laden ist
* @return true wenn ok, false im Fehlerfall
*/
public function load($studiengang_kz = null)
public function load($studiengang_kz)
{
if(!is_numeric($studiengang_kz))
{
@@ -253,19 +239,25 @@ class studiengang extends Studiengang_model
*/
public function getAllForBewerbung()
{
error_log("getAllForBewerbung called!!!");
$result = parent::getAllForBewerbung();
if(!is_object($result))
$qry = 'SELECT DISTINCT studiengang_kz, typ, organisationseinheittyp_kurzbz, studiengangbezeichnung, standort, studiengangbezeichnung_englisch, lgartcode, tbl_lgartcode.bezeichnung '
. 'FROM lehre.vw_studienplan '
. 'LEFT JOIN bis.tbl_lgartcode USING (lgartcode) '
. 'WHERE onlinebewerbung IS TRUE '
. 'AND aktiv IS TRUE '
. 'ORDER BY typ, studiengangbezeichnung, tbl_lgartcode.bezeichnung ASC';
if(!$result = $this->db_query($qry))
{
$this->errormsg = 'Datensatz konnte nicht geladen werden';
return FALSE;
return false;
}
$this->result = $result->result();
while($row = $this->db_fetch_object($result))
{
$this->result[] = $row;
}
return TRUE;
return true;
}
/**
@@ -350,7 +342,7 @@ class studiengang extends Studiengang_model
if(count($kennzahlen)==0)
return true;
$kennzahlen = $this->db_implode4SQL($kennzahlen);
$kennzahlen = $this->implode4SQL($kennzahlen);
$qry = 'SELECT * FROM public.tbl_studiengang WHERE studiengang_kz in('.$kennzahlen.')';
if ($aktiv)
include/studienplan.class.php
+5 -12
View File
@@ -25,19 +25,12 @@
* Andreas Moik <moik@technikum-wien.at>
*/
require_once(dirname(__FILE__).'/datum.class.php');
require_once(dirname(__FILE__).'/basis_db.class.php');
// CI
require_once(dirname(__FILE__).'/../ci_hack.php');
require_once(dirname(__FILE__).'/../application/models/organisation/Studienplan_model.php');
class studienplan extends Studienplan_model
class studienplan extends basis_db
{
use db_extra; //CI Hack
public $new = true; // boolean
public $result = array(); // Objekte
public $errormsg; // string
//Tabellenspalten
public $studienplan_id; // integer (PK)
@@ -82,12 +75,12 @@ class studienplan extends Studienplan_model
{
$this->$name=$value;
}
/*
public function __get($name)
{
return $this->$name;
}
*/
/**
* Laedt Studienplan mit der ID $studienplan_id
* @param $studienplan_id ID des zu ladenden Studienplanes
@@ -1199,4 +1192,4 @@ class studienplan extends Studienplan_model
}
}
}
?>
?>
include/studiensemester.class.php
+140 -183
View File
@@ -20,16 +20,10 @@
* Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
* Gerald Simane-Sequens <gerald.simane-sequens@technikum-wien.at>
*/
require_once(dirname(__FILE__).'/datum.class.php');
require_once('basis_db.class.php');
// CI
require_once(dirname(__FILE__).'/../ci_hack.php');
require_once(dirname(__FILE__).'/../application/models/organisation/Studiensemester_model.php');
class studiensemester extends Studiensemester_model
class studiensemester extends basis_db
{
use db_extra; //CI Hack
public $new; // boolean
public $studiensemester = array(); // studiensemester Objekt
@@ -60,43 +54,33 @@ class studiensemester extends Studiensemester_model
*
* @param $studiensemester_kurzbz Stsem das geladen werden soll
*/
public function load($studiensemester_kurzbz = null)
public function load($studiensemester_kurzbz)
{
if (empty($studiensemester_kurzbz))
{
$this->errormsg = "studiensemester not set!";
return false;
}
$qry = "SELECT * FROM public.tbl_studiensemester WHERE studiensemester_kurzbz = " . $this->db_add_param($studiensemester_kurzbz);
$result = parent::load($studiensemester_kurzbz);
if (is_object($result) && $result->error == EXIT_SUCCESS && is_array($result->retval))
{
if (count($result->retval) > 0)
{
$row = $result->retval[0];
$this->studiensemester_kurzbz = $row->studiensemester_kurzbz;
$this->start = $row->start;
$this->ende = $row->ende;
$this->bezeichnung = $row->bezeichnung;
$this->studienjahr_kurzbz = $row->studienjahr_kurzbz;
$this->beschreibung = $row->beschreibung;
$this->onlinebewerbung = $row->onlinebewerbung;
return true;
}
else
{
$this->errormsg = "Es ist kein Studiensemester mit dieser Kurzbezeichung vorhanden";
return false;
}
}
else
if(!$this->db_query($qry))
{
$this->errormsg = 'Fehler beim Lesen des Studiensemesters';
return false;
}
if($row = $this->db_fetch_object())
{
$this->studiensemester_kurzbz = $row->studiensemester_kurzbz;
$this->start = $row->start;
$this->ende = $row->ende;
$this->bezeichnung = $row->bezeichnung;
$this->studienjahr_kurzbz = $row->studienjahr_kurzbz;
$this->beschreibung = $row->beschreibung;
$this->onlinebewerbung = $row->onlinebewerbung;
}
else
{
$this->errormsg = "Es ist kein Studiensemester mit dieser Kurzbezeichung vorhanden";
return false;
}
return true;
}
/**
@@ -180,23 +164,22 @@ class studiensemester extends Studiensemester_model
*/
public function getakt()
{
$result = parent::loadWhere(array('start <=' => 'NOW()', 'ende >=' => 'NOW()'));
$qry = "SELECT studiensemester_kurzbz FROM public.tbl_studiensemester WHERE start <= NOW() AND ende >= NOW()";
if (is_object($result) && $result->error == EXIT_SUCCESS && is_array($result->retval))
if(!$this->db_query($qry))
{
if (count($result->retval) > 0)
{
return $result->retval[0]->studiensemester_kurzbz;
}
else
{
$this->errormsg = "Kein aktuelles Studiensemester vorhanden";
return false;
}
$this->errormsg = $this->db_last_error();
return false;
}
if($this->db_num_rows()>0)
{
$erg = $this->db_fetch_object();
return $erg->studiensemester_kurzbz;
}
else
{
$this->errormsg = $result->msg;
$this->errormsg = "Kein aktuelles Studiensemester vorhanden";
return false;
}
}
@@ -235,48 +218,36 @@ class studiensemester extends Studiensemester_model
*/
public function getaktorNext($semester = '')
{
if (($result = $this->getakt()) && !is_numeric($semester))
{
return $result;
}
if(($stsem=$this->getakt()) && $semester=='')
return $stsem;
else
{
parent::addOrder('ende');
parent::addLimit(1);
$whereArray = array('ende >=' => 'NOW()');
if (is_numeric($semester))
{
if ($semester %2 == 0)
{
$ss = 'SS';
}
else
{
$ss = 'WS';
}
$qry = "SELECT studiensemester_kurzbz FROM public.tbl_studiensemester WHERE true";
$whereArray['SUBSTRING(studiensemester_kurzbz FROM 1 FOR 2) ='] = $ss;
}
$result = parent::loadWhere($whereArray);
if (is_object($result) && $result->error == EXIT_SUCCESS && is_array($result->retval))
if($semester!='')
{
if (count($result->retval) > 0)
{
return $result->retval[0]->studiensemester_kurzbz;
}
if($semester%2==0)
$ss='SS';
else
{
$this->errormsg = "Kein aktuelles Studiensemester vorhanden";
return false;
}
$ss='WS';
$qry.= " AND substring(studiensemester_kurzbz from 1 for 2)='$ss' ";
}
$qry.= " AND ende >= now() ORDER BY ende LIMIT 1";
if(!$this->db_query($qry))
{
$this->errormsg = $this->db_last_error();
return false;
}
if($erg = $this->db_fetch_object())
{
return $erg->studiensemester_kurzbz;
}
else
{
$this->errormsg = $result->msg;
$this->errormsg = "Kein aktuelles Studiensemester vorhanden";
return false;
}
}
@@ -291,29 +262,34 @@ class studiensemester extends Studiensemester_model
*/
public function getNearest($semester = '')
{
$result = parent::getNearest($semester);
if (is_object($result) && $result->error == EXIT_SUCCESS && is_array($result->retval))
$qry = "SELECT studiensemester_kurzbz, start, ende FROM public.vw_studiensemester ";
if($semester!='')
{
if(count($result->retval) > 0)
{
$row = $result->retval[0];
$this->studiensemester_kurzbz = $row->studiensemester_kurzbz;
$this->start = $row->start;
$this->ende = $row->ende;
return $row->studiensemester_kurzbz;
}
if($semester%2==0)
$ss='SS';
else
{
$this->errormsg = "Kein aktuelles Studiensemester vorhanden";
return false;
}
$ss='WS';
$qry.= " WHERE substring(studiensemester_kurzbz from 1 for 2)='$ss' ";
}
$qry.=' ORDER BY delta LIMIT 1';
if(!$this->db_query($qry))
{
$this->errormsg = $this->db_last_error();
return false;
}
if($erg = $this->db_fetch_object())
{
$this->studiensemester_kurzbz=$erg->studiensemester_kurzbz;
$this->start=$erg->start;
$this->ende=$erg->ende;
return $erg->studiensemester_kurzbz;
}
else
{
$this->errormsg = $this->db_last_error();
$this->errormsg = "Kein aktuelles Studiensemester vorhanden";
return false;
}
}
@@ -325,25 +301,17 @@ class studiensemester extends Studiensemester_model
*/
public function getAll($order = null)
{
if (strcasecmp($order, 'DESC') == 0)
{
parent::addOrder('ende', 'DESC');
}
else
{
parent::addOrder('ende', 'ASC');
}
$result = parent::load();
$qry = "SELECT * FROM public.tbl_studiensemester ORDER BY ende";
if (is_object($result) && $result->error == EXIT_SUCCESS && is_array($result->retval))
if($order == "desc")
$qry .= " DESC";
if($this->db_query($qry))
{
for ($i = 0; $i < count($result->retval); $i++)
while($row = $this->db_fetch_object())
{
$row = $result->retval[$i];
$stsem_obj = new studiensemester();
$stsem_obj->studiensemester_kurzbz = $row->studiensemester_kurzbz;
$stsem_obj->start = $row->start;
$stsem_obj->ende = $row->ende;
@@ -372,45 +340,32 @@ class studiensemester extends Studiensemester_model
*/
public function getNextStudiensemester($art = '')
{
parent::addOrder('start');
parent::addLimit(1);
if (isset($art))
{
$result = parent::loadWhere(
array('start >' => 'NOW()',
'SUBSTRING(studiensemester_kurzbz FROM 1 FOR 2) = ' => $art
)
);
}
else
{
$result = parent::loadWhere(array('start >' => 'NOW()'));
}
$qry = "SELECT * FROM public.tbl_studiensemester WHERE start>now() ";
if (is_object($result) && $result->error == EXIT_SUCCESS && is_array($result->retval))
{
if (count($result->retval) > 0)
{
$row = $result->retval[0];
$this->studiensemester_kurzbz = $row->studiensemester_kurzbz;
$this->start = $row->start;
$this->ende = $row->ende;
return true;
}
else
{
$this->errormsg = "Es wurde kein entsprechendes Studiensemester gefunden";
return false;
}
}
else
if($art!='')
$qry.= " AND substring(studiensemester_kurzbz from 1 for 2)=".$this->db_add_param($art);
$qry.=" ORDER BY start LIMIT 1";
if(!$this->db_query($qry))
{
$this->errormsg = 'Fehler beim Lesen des Studiensemesters';
return false;
}
if($row = $this->db_fetch_object())
{
$this->studiensemester_kurzbz = $row->studiensemester_kurzbz;
$this->start = $row->start;
$this->ende = $row->ende;
}
else
{
$this->errormsg = "Es wurde kein entsprechendes Studiensemester gefunden";
return false;
}
return true;
}
/**
@@ -465,16 +420,13 @@ class studiensemester extends Studiensemester_model
*/
public function getPrevious()
{
parent::addOrder('ende', 'DESC');
parent::addLimit(1);
$result = parent::loadWhere(array('ende <' => 'NOW()'));
$qry = "SELECT studiensemester_kurzbz FROM public.tbl_studiensemester WHERE ende<now() ORDER BY ende DESC LIMIT 1";
if (is_object($result) && $result->error == EXIT_SUCCESS && is_array($result->retval))
if($this->db_query($qry))
{
if (count($result->retval) > 0)
if($row = $this->db_fetch_object())
{
return $result->retval[0]->studiensemester_kurzbz;
return $row->studiensemester_kurzbz;
}
else
{
@@ -565,18 +517,22 @@ class studiensemester extends Studiensemester_model
*/
public function getNextFrom($studiensemester_kurzbz)
{
$result = parent::getNextFrom($studiensemester_kurzbz);
$qry = "SELECT studiensemester_kurzbz, start, ende
FROM public.tbl_studiensemester
WHERE start > (
SELECT ende
FROM public.tbl_studiensemester
WHERE studiensemester_kurzbz = " . $this->db_add_param($studiensemester_kurzbz) .
")
ORDER BY start LIMIT 1";
if (is_object($result) && $result->error == EXIT_SUCCESS && is_array($result->retval))
if($this->db_query($qry))
{
if (count($result->retval) > 0)
if($row = $this->db_fetch_object())
{
$row = $result->retval[0];
$this->studiensemester_kurzbz = $row->studiensemester_kurzbz;
$this->start = $row->start;
$this->ende = $row->ende;
return $row->studiensemester_kurzbz;
}
else
@@ -690,26 +646,23 @@ class studiensemester extends Studiensemester_model
*/
public function getFinished($limit = null)
{
parent::addOrder('ende', 'DESC');
parent::addLimit($limit);
$qry = "SELECT * FROM public.tbl_studiensemester WHERE start <= NOW() ORDER BY ende DESC";
$result = parent::loadWhere(array('start <=' => 'NOW()'));
if(!is_null($limit) && is_numeric($limit))
$qry.=' LIMIT '.$limit;
if (is_object($result) && $result->error == EXIT_SUCCESS && is_array($result->retval))
if($this->db_query($qry))
{
for ($i = 0; $i < count($result->retval); $i++)
while($row = $this->db_fetch_object())
{
$stsem_obj = new studiensemester();
$row = $result->retval[$i];
$stsem_obj->studiensemester_kurzbz = $row->studiensemester_kurzbz;
$stsem_obj->start = $row->start;
$stsem_obj->ende = $row->ende;
$this->studiensemester[] = $stsem_obj;
}
return true;
}
else
@@ -728,13 +681,17 @@ class studiensemester extends Studiensemester_model
*/
public function getLastOrAktSemester($days = 60)
{
$result = parent::getLastOrAktSemester($days);
$qry = "SELECT studiensemester_kurzbz
FROM public.tbl_studiensemester
WHERE start < NOW()-'".$days." days'::interval
ORDER BY start DESC
LIMIT 1";
if (is_object($result) && $result->error == EXIT_SUCCESS && is_array($result->retval))
if($this->db_query($qry))
{
if (count($result->retval) > 0)
if($row = $this->db_fetch_object())
{
return $result->retval[0]->studiensemester_kurzbz;
return $row->studiensemester_kurzbz;
}
else
{
@@ -786,14 +743,14 @@ class studiensemester extends Studiensemester_model
*/
public function getTimestamp($studiensemester_kurzbz)
{
$result = parent::load($studiensemester_kurzbz);
$qry = "SELECT start, ende, studiensemester_kurzbz
FROM public.tbl_studiensemester
WHERE studiensemester_kurzbz = " . $this->db_add_param($studiensemester_kurzbz);
if (is_object($result) && $result->error == EXIT_SUCCESS && is_array($result->retval))
if($this->db_query($qry))
{
if (count($result->retval))
if($row = $this->db_fetch_object())
{
$row = $result->retval[0];
if (!isset($this->begin))
$this->begin = new stdclass();
@@ -1005,4 +962,4 @@ class studiensemester extends Studiensemester_model
}
}
}
?>
?>
system/dbupdate_3.2.php
+1 -1
View File
@@ -1313,7 +1313,7 @@ if($result = $db->db_query("SELECT * FROM public.tbl_vorlage WHERE vorlage_kurzb
$testQuery = "SELECT setval('seq_vorlagestudiengang_vorlagestudiengang_id', max(vorlagestudiengang_id)) FROM tbl_vorlagestudiengang;";
$testResult = $db->db_query($testQuery);
$text = file_get_contents('../system/xsl/Bewerberakt.xsl');
$text = file_get_contents(DOC_ROOT . '/system/xsl/Bewerberakt.xsl');
while($row = $db->db_fetch_object($result))
{