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

Merge branch 'master' into feature-15390/Zeitwuensche_pro_Semester

Browse Source 
# Conflicts:
#	system/dbupdate_3.3.php
This commit is contained in:
Cris
2022-03-28 09:36:26 +02:00
parent 56d3d33cd6 25a3bbbb85
commit a8008d6233
6 changed files with 84 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/coodle/stammdaten.php
+17
View File
@@ -25,6 +25,7 @@ require_once('../../../include/functions.inc.php');
require_once('../../../include/phrasen.class.php');
require_once('../../../include/coodle.class.php');
require_once('../../../include/datum.class.php');
require_once('../../../include/benutzerberechtigung.class.php');
$user = get_uid();
$sprache = getSprache();
@@ -36,6 +37,22 @@ $message='';
if(!check_lektor($user))
die($p->t('global/keineBerechtigung'));
// Administratoren duerfen die UID als Parameter uebergeben um die Umfragen von anderen Personen anzuzeigen
if(isset($_GET['uid']))
{
$rechte = new benutzerberechtigung();
$rechte->getBerechtigungen($user);
if($rechte->isBerechtigt('admin'))
{
$user = $_GET['uid'];
$getParam = '&uid='.$user;
}
else
$getParam = '';
}
else
$getParam = '';
echo '
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
cis/private/coodle/uebersicht.php
+18 -1
View File
@@ -27,6 +27,7 @@ require_once('../../../include/functions.inc.php');
require_once('../../../include/phrasen.class.php');
require_once('../../../include/datum.class.php');
require_once('../../../include/benutzer.class.php');
require_once('../../../include/benutzerberechtigung.class.php');
$lang = getSprache();
@@ -35,6 +36,22 @@ $p = new phrasen($lang);
$uid = get_uid();
$message = '';
// Administratoren duerfen die UID als Parameter uebergeben um die Umfragen von anderen Personen anzuzeigen
if(isset($_GET['uid']))
{
$rechte = new benutzerberechtigung();
$rechte->getBerechtigungen($uid);
if($rechte->isBerechtigt('admin'))
{
$uid = $_GET['uid'];
$getParam = '&uid='.$uid;
}
else
$getParam = '';
}
else
$getParam = '';
echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
<html>
@@ -170,7 +187,7 @@ foreach($coodle->result as $c)
else
$title=$p->t('coodle/bearbeiten');
$row.= '&nbsp;<a href="stammdaten.php?coodle_id='.$c->coodle_id.'">
$row.= '&nbsp;<a href="stammdaten.php?coodle_id='.$c->coodle_id.'&'.$getParam.'">
<img src="../../../skin/images/edit.png" title="'.$title.'">
</a>';
}
cis/private/profile/freebusy.php
+18 -6
View File
@@ -28,17 +28,29 @@ require_once('../../../include/basis_db.class.php');
require_once('../../../include/functions.inc.php');
require_once('../../../include/freebusy.class.php');
require_once('../../../include/phrasen.class.php');
require_once('../../../include/benutzerberechtigung.class.php');
if (!$db = new basis_db())
die('Fehler beim Oeffnen der Datenbankverbindung');
$user=get_uid();
$user = get_uid();
$sprache = getSprache();
$p = new phrasen($sprache);
$action = (isset($_REQUEST['action'])?$_REQUEST['action']:'');
$id = (isset($_REQUEST['id'])?$_REQUEST['id']:'');
// Administratoren duerfen die UID als Parameter uebergeben um die Umfragen von anderen Personen anzuzeigen
if(isset($_GET['uid']))
{
$rechte = new benutzerberechtigung();
$rechte->getBerechtigungen($user);
if($rechte->isBerechtigt('admin'))
{
$user = $_GET['uid'];
}
}
echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
<html>
@@ -49,11 +61,11 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
<link rel="stylesheet" href="../../../skin/style.css.php" type="text/css">
<title>'.$p->t('freebusy/titel').'</title>
<link rel="stylesheet" type="text/css" href="../../../skin/jquery-ui-1.9.2.custom.min.css">
<script type="text/javascript" src="../../../vendor/jquery/jqueryV1/jquery-1.12.4.min.js"></script>
<script type="text/javascript" src="../../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
<script type="text/javascript" src="../../../vendor/components/jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script>
<link rel="stylesheet" type="text/css" href="../../../skin/jquery-ui-1.9.2.custom.min.css">
<script type="text/javascript" src="../../../vendor/jquery/jqueryV1/jquery-1.12.4.min.js"></script>
<script type="text/javascript" src="../../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
<script type="text/javascript" src="../../../vendor/components/jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script>
<script type="text/javascript" src="../../../vendor/jquery/sizzle/sizzle.js"></script>
<script type="text/javascript">
$(document).ready(function()
cis/private/tools/suche.php
+15
View File
@@ -39,6 +39,7 @@ require_once('../../../include/person.class.php');
require_once('../../../include/mitarbeiter.class.php');
require_once('../../../include/kontakt.class.php');
require_once('../../../include/bisverwendung.class.php');
require_once('../../../include/webservicelog.class.php');
$uid = get_uid();
$db = new basis_db();
@@ -90,6 +91,20 @@ while ($array_key = array_search("", $searchItems))
if(implode(',', $searchItems) == '')
exit;
// Legt einen Logeintrag für die Suchstatistik an
if (defined('LOG_CONTENT') && LOG_CONTENT==true)
{
$log = new webservicelog();
$log->webservicetyp_kurzbz = 'content';
$log->request_id = '';
$log->beschreibung = 'suche';
$log->request_data = implode(';',$searchItems);
$log->execute_user = $uid;
$log->save(true);
}
//Easter Egg
$easteregg = array ('antwort','leben','universum','rest','answer','universe','life','everything');
$easteregg_intersect = array_intersect(array_map('strtolower',$searchItems), $easteregg);
include/vorlage.class.php
+1
View File
@@ -566,6 +566,7 @@ class vorlage extends basis_db
$this->insertvon = $row->insertvon;
$this->updateamum = $row->updateamum;
$this->updatevon = $row->updatevon;
$this->vorlagestudiengang_id = $row->vorlagestudiengang_id;
return true;
}
system/dbupdate_3.3.php
+15 -1
View File
@@ -5968,7 +5968,7 @@ if(!$result = @$db->db_query("SELECT behebung_parameter FROM system.tbl_issue LI
// Add table campus.tbl_zeitwunsch_gueltigkeit and migrate initial data
if($result = $db->db_query("SELECT EXISTS (SELECT FROM information_schema.tables WHERE table_schema LIKE 'campus' AND table_name = 'tbl_zeitwunsch_gueltigkeit');"))
{
if ($result == false)
if ($db->db_fetch_object($result) == false)
{
$qry = "
CREATE TABLE campus.tbl_zeitwunsch_gueltigkeit
@@ -6085,6 +6085,20 @@ if ($result = $db->db_query("SELECT 1 FROM information_schema.columns WHERE tabl
}
}
// Add index beschreibung to system.tbl_webservicelog
if ($result = $db->db_query("SELECT * FROM pg_class WHERE relname='idx_webservicelog_beschreibung'"))
{
if ($db->db_num_rows($result) == 0)
{
$qry = "CREATE INDEX idx_webservicelog_beschreibung ON system.tbl_webservicelog USING btree (beschreibung)";
if (! $db->db_query($qry))
echo '<strong>Indizes: ' . $db->db_last_error() . '</strong><br>';
else
echo 'Index fuer system.tbl_webservicelog hinzugefuegt';
}
}
// *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
echo '<H2>Pruefe Tabellen und Attribute!</H2>';