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

Merge branch 'master' of https://github.com/FH-Complete/FHC-Core

Browse Source
This commit is contained in:
alex
2017-12-20 14:55:27 +01:00
parent c0f9b31409 92999ae93e
commit ada1108095
23 changed files with 171 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/lehre/benotungstool/copy_uebung.php
+4 -19
View File
@@ -455,21 +455,6 @@ if(isset($_GET['kopieren']))
return ($var!=''?"'".addslashes($var)."'":'null');
}
// ***********************************************************************************************
// String auf Laenge abschneiden
// ***********************************************************************************************
function CutString($strVal, $limit)
{
if(strlen($strVal) > $limit+3)
{
return substr($strVal, 0, $limit) . "...";
}
else
{
return $strVal;
}
}
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
@@ -587,7 +572,7 @@ if(isset($_GET['kopieren']))
{
if (empty($lehrveranstaltung_id))
$lehrveranstaltung_id=$row->lehrveranstaltung_id;
$content.='<option value="'.$row->lehrveranstaltung_id.'" '.(("$lehrveranstaltung_id"=="$row->lehrveranstaltung_id")?' selected="selected" ':'').'>&nbsp;'.CutString($row->bezeichnung, 30).' '.$row->lehrform_kurzbz.'&nbsp;('.$row->lehrveranstaltung_id.')</option>';
$content.='<option value="'.$row->lehrveranstaltung_id.'" '.(("$lehrveranstaltung_id"=="$row->lehrveranstaltung_id")?' selected="selected" ':'').'>&nbsp;'.CutString($row->bezeichnung, 30, '...').' '.$row->lehrform_kurzbz.'&nbsp;('.$row->lehrveranstaltung_id.')</option>';
}
}
else
@@ -634,7 +619,7 @@ if(isset($_GET['kopieren']))
{
$lektoren.= ($lektoren?',':'').'&nbsp;'.$ma->mitarbeiter_uid;
}
$lektoren=CutString($lektoren, 30);
$lektoren=CutString($lektoren, 30, '...');
$content.='<option value="'.$row->lehreinheit_id.'" '.($lehreinheit_id==$row->lehreinheit_id?' selected="selected" ':'').'>&nbsp;'.$row->lehrform_kurzbz.' '.$gruppen.'&nbsp;'.$lektoren.'&nbsp;('.$row->lehreinheit_id.')</option>';
}
}
@@ -786,7 +771,7 @@ if(isset($_GET['kopieren']))
{
if (empty($lehrveranstaltung_id_target))
$lehrveranstaltung_id_target=$row->lehrveranstaltung_id;
$content.='<option value="'.$row->lehrveranstaltung_id.'" '.(("$lehrveranstaltung_id_target"=="$row->lehrveranstaltung_id")?' selected="selected" ':'').'>&nbsp;'.CutString($row->bezeichnung, 30).' '.$row->lehrform_kurzbz.'&nbsp;('.$row->lehrveranstaltung_id.')</option>';
$content.='<option value="'.$row->lehrveranstaltung_id.'" '.(("$lehrveranstaltung_id_target"=="$row->lehrveranstaltung_id")?' selected="selected" ':'').'>&nbsp;'.CutString($row->bezeichnung, 30, '...').' '.$row->lehrform_kurzbz.'&nbsp;('.$row->lehrveranstaltung_id.')</option>';
}
}
else
@@ -835,7 +820,7 @@ if(isset($_GET['kopieren']))
{
$lektoren.= ($lektoren?',':'').'&nbsp;'.$ma->mitarbeiter_uid;
}
$lektoren=CutString($lektoren, 30);
$lektoren=CutString($lektoren, 30, '...');
$content.='<option value="'.$row->lehreinheit_id.'" '.($lehreinheit_id_target==$row->lehreinheit_id?' selected="selected" ':'').'>&nbsp;'.$row->lehrform_kurzbz.' '.$gruppen.'&nbsp;'.$lektoren.'&nbsp;('.$row->lehreinheit_id.')</option>';
}
}
cis/private/menu.php
-138
View File
@@ -1,138 +0,0 @@
<?php
/* Copyright (C) 2006 Technikum-Wien
*
* 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: Christian Paminger <[email protected]>,
* Andreas Oesterreicher <[email protected]> and
* Rudolf Hangl < [email protected] >
* Gerald Simane-Sequens < [email protected] >
*
*/
require_once('../../config/cis.config.inc.php');
require_once('../../include/globals.inc.php');
require_once('../../include/functions.inc.php');
require_once('../../include/benutzerberechtigung.class.php');
require_once('../../include/funktion.class.php');
require_once('../../include/studiensemester.class.php');
require_once('../../include/studiengang.class.php');
require_once('../../include/lehrveranstaltung.class.php');
require_once('../../include/mitarbeiter.class.php');
require_once('../../include/student.class.php');
require_once('../../include/datum.class.php');
if (!$db = new basis_db())
die('Es konnte keine Verbindung zum Server aufgebaut werden.');
if (!$user=get_uid())
die('Sie sind nicht angemeldet. Es wurde keine Benutzer UID gefunden ! <a href="javascript:history.back()">Zur&uuml;ck</a>');
$cutlength=10;
$rechte=new benutzerberechtigung();
$rechte->getBerechtigungen($user);
$fkt=new funktion();
$fkt->getAll($user);
$stg_obj = new studiengang();
if($stg_obj->getAll('kurzbzlang', false))
{
$stg = array();
foreach($stg_obj->result as $row)
$stg[$row->studiengang_kz] = $row->kurzbzlang;
}
else
die('Fehler beim Auslesen der Studiengaenge');
if(check_lektor($user))
$is_lector=true;
else
$is_lector=false;
if(check_student($user))
$is_student=true;
else
$is_student=false;
function CutString($strVal, $limit)
{
if(strlen($strVal) > $limit+3)
{
return substr($strVal, 0, $limit) . "...";
}
else
{
return $strVal;
}
}
$aktiv=false;
$qry = "SELECT aktiv FROM campus.vw_benutzer WHERE uid='$user'";
if($result = $db->db_query($qry))
{
if($row = $db->db_fetch_object($result))
{
$aktiv = ($row->aktiv=='t'?true:false);
}
}
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link href="../../skin/style.css.php" rel="stylesheet" type="text/css">
<script language="JavaScript" type="text/javascript">
<!--
__js_page_array = new Array();
function js_toggle_container(conid)
{
if (document.getElementById)
{
var block = "table-row";
if (navigator.appName.indexOf('Microsoft') > -1)
block = 'block';
var status = __js_page_array[conid];
if (status == null)
status=document.getElementById(conid).style.display; //status = "none";
if (status == "none")
{
document.getElementById(conid).style.display = block;
__js_page_array[conid] = "visible";
}
else
{
document.getElementById(conid).style.display = 'none';
__js_page_array[conid] = "none";
}
return false;
}
else
return true;
}
//-->
</script>
</head>
<body>
<?php
include('../../include/'.EXT_FKT_PATH.'/cis_menu_meincis.inc.php');
?>
</body>
</html>
cis/private/tools/suche.php
+24 -20
View File
@@ -261,26 +261,30 @@ function searchOE($searchItems)
$kontakt->loadFirmaKontakttyp($mitarbeiter->standort_id,'telefon');
$bisverwendung = new bisverwendung();
$bisverwendung->getLastAktVerwendung($bf->uid);
echo '<tr>';
echo '<td>'.$person->vorname.'</td>';
echo '<td><a href="../profile/index.php?uid=',$person->uid,'" title="',$person->titelpre,' ',$person->vorname,' ',$person->nachname,' ',$person->titelpost,'">',$person->nachname,'</a></td>';
echo '<td>'.$bf->bezeichnung;
if($bisverwendung->beschausmasscode=='5')
echo '<span style="color: orange"> (karenziert)</span>';
echo '</td>';
echo '<td>',($mitarbeiter->telefonklappe!=''?$kontakt->kontakt.'-'.$mitarbeiter->telefonklappe:'-'),'</td>';
echo '<td>',($mitarbeiter->ort_kurzbz!=''?$mitarbeiter->ort_kurzbz:'-'),'</td>';
//if($row->alias!='' && !in_array($row->studiengang_kz, $noalias)) ??? Was macht $noalias?
if($person->alias!='')
$mail = $person->alias.'@'.DOMAIN;
else
$mail = $person->uid.'@'.DOMAIN;
echo '<td><a href="mailto:',$mail,'">',$mail,'</a></td>';
//if(!defined('CIS_SUCHE_LVPLAN_ANZEIGEN') || CIS_SUCHE_LVPLAN_ANZEIGEN)
//echo '<td><a href="../../../cis/private/lvplan/stpl_week.php?pers_uid='.$person->uid.($person->mitarbeiter_uid==NULL?'&type=student':'&type=lektor').'">'.$p->t('lvplan/lvPlan').'</a></td>';
echo '</tr>';
echo "\n";
$benutzer = new benutzer($bf->uid);
if ($benutzer->bnaktiv)
{
echo '<tr>';
echo '<td>'.$person->vorname.'</td>';
echo '<td><a href="../profile/index.php?uid=',$person->uid,'" title="',$person->titelpre,' ',$person->vorname,' ',$person->nachname,' ',$person->titelpost,'">',$person->nachname,'</a></td>';
echo '<td>'.$bf->bezeichnung;
if($bisverwendung->beschausmasscode=='5')
echo '<span style="color: orange"> (karenziert)</span>';
echo '</td>';
echo '<td>',($mitarbeiter->telefonklappe!=''?$kontakt->kontakt.'-'.$mitarbeiter->telefonklappe:'-'),'</td>';
echo '<td>',($mitarbeiter->ort_kurzbz!=''?$mitarbeiter->ort_kurzbz:'-'),'</td>';
//if($row->alias!='' && !in_array($row->studiengang_kz, $noalias)) ??? Was macht $noalias?
if($person->alias!='')
$mail = $person->alias.'@'.DOMAIN;
else
$mail = $person->uid.'@'.DOMAIN;
echo '<td><a href="mailto:',$mail,'">',$mail,'</a></td>';
//if(!defined('CIS_SUCHE_LVPLAN_ANZEIGEN') || CIS_SUCHE_LVPLAN_ANZEIGEN)
//echo '<td><a href="../../../cis/private/lvplan/stpl_week.php?pers_uid='.$person->uid.($person->mitarbeiter_uid==NULL?'&type=student':'&type=lektor').'">'.$p->t('lvplan/lvPlan').'</a></td>';
echo '</tr>';
echo "\n";
}
}
echo "\n";
echo '</tbody></table><br>';
cis/public/incoming/incoming.php
+8 -8
View File
@@ -1535,17 +1535,17 @@ echo' <td>'.$p->t('incoming/masterstudiengang').'</td>
<td colspan="2"><b>Department Coordinator</b></td>
<td colspan="2"><b>International Coordinator</b></td></tr>
<tr>
<td width="25%">'.$p->t('global/vorname').' </td>
<td width="25%">'.$p->t('incoming/vorname').' </td>
<td width="25%"><input type="text" name="vorname_coordinator" size="20" maxlength="256" value="'.$depCoordinator->vorname.'">
<input type="hidden" name = "dep_coordinator_id" id="dep_coordinator_id" value="'.$preincoming->person_id_coordinator_dep.'"></td>
<td width="25%">'.$p->t('global/vorname').' </td>
<td width="25%">'.$p->t('incoming/vorname').' </td>
<td width="25%"><input type="text" name="vorname_intcoordinator" size="20" maxlength="256" value="'.$intCoordinator->vorname.'">
<input type="hidden" name = "int_coordinator_id" id="int_coordinator_id" value="'.$preincoming->person_id_coordinator_int.'"></td>
</tr>
<tr>
<td width="25%">'.$p->t('global/nachname').' </td>
<td width="25%">'.$p->t('incoming/nachname').' </td>
<td width="25%"><input type="text" name="nachname_coordinator" size="20" value="'.$depCoordinator->nachname.'"></td>
<td width="25%">'.$p->t('global/nachname').' </td>
<td width="25%">'.$p->t('incoming/nachname').' </td>
<td width="25%"><input type="text" name="nachname_intcoordinator" size="20" value="'.$intCoordinator->nachname.'"></td>
</tr>
<tr>
@@ -1868,13 +1868,13 @@ else if ($method == "profil")
<td><input type="text" name="zgv_master" value="'.$preincoming->zgvmaster.'" size=40></td>
</tr>
<tr>
<td>'.$p->t('global/vorname').'</td>
<td>'.$p->t('incoming/vorname').'</td>
<td><input type="text" size="20" maxlength="32" name="vorname" value="'.$person->vorname.'"></td>
<td>'.$p->t('incoming/abgelegtin').'</td>
<td><input type="text" name="zgv_master_name" size=40 value="'.$preincoming->zgvmaster_name.'"></td>
</tr>
<tr>
<td>'.$p->t('global/nachname').'</td>
<td>'.$p->t('incoming/nachname').'</td>
<td><input type="text" size="20" maxlength="64" name="nachname" value="'.$person->nachname.'" required></td>
<td>'.$p->t('incoming/abgelegtinort').'</td>
<td><input type="text" name="zgv_master_ort" size=40 value="'.$preincoming->zgvmaster_ort.'"></td>
@@ -1923,14 +1923,14 @@ echo' </SELECT></td>
<input type="radio" name="geschlecht" value="w" checked>'.$p->t('global/frau').'
</td>';
echo '<td>'.$p->t('global/vorname').'</td>
echo '<td>'.$p->t('incoming/vorname').'</td>
<td><input type="text" size="40" name="emergency_vorname" value="'.$personEmergency->vorname.'">
<input type="hidden" name="emergency_name_id" id="emergency_name_id" value="'.$preincoming->person_id_emergency.'"></td>
</tr>
<tr>
<td></td>
<td></td>
<td>'.$p->t('global/nachname').'</td>
<td>'.$p->t('incoming/nachname').'</td>
<td><input type="text" size="40" name="emergency_nachname" value="'.$personEmergency->nachname.'"></td>
</tr>
<tr>
cis/public/incoming/registration.php
+2 -2
View File
@@ -83,11 +83,11 @@ echo ' <form action="registration.php" method="POST" name="RegistrationForm">
<td><input type="text" size="20" maxlength="64" name="titel_pre"></td>
</tr>
<tr>
<td>'.$p->t('global/vorname').'*</td>
<td>'.$p->t('incoming/vorname').'*</td>
<td><input type="text" size="40" maxlength="32" name="vorname"></td>
</tr>
<tr>
<td>'.$p->t('global/nachname').'*</td>
<td>'.$p->t('incoming/nachname').'*</td>
<td><input type="text" size="40" maxlength="64" name="nachname"></td>
</tr>
<tr>