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

Browse Source
This commit is contained in:
Christian Paminger
2007-07-31 09:02:29 +00:00
parent a892fb31d2
commit e4fec1d3d6
13 changed files with 61 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/menu.html
+1 -2
View File
@@ -1,5 +1,4 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<!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=iso-8859-1">
cis/private/.htaccess
-9
View File
@@ -1,9 +0,0 @@
AuthName "Technikum-Wien"
AuthType Basic
AuthLDAPURL ldap://ldap.technikum-wien.at/ou=People,dc=technikum-wien,dc=at?uid?one?objectclass=posixAccount
AuthLDAPGroupAttributeIsDN Off
AuthLDAPGroupAttribute memberuid
require group cn=fhadmin,ou=Group,dc=technikum-wien,dc=at
require group cn=hadesadm,ou=Group,dc=technikum-wien,dc=at
require user tw01e061
require user masik
content/fasold.xul.php
+1 -5
View File
@@ -5,10 +5,6 @@ include('../vilesci/config.inc.php');
include('../include/functions.inc.php');
include('../include/fas/benutzer.class.php');
// Testumgebung
//if (!isset($REMOTE_USER))
// $REMOTE_USER='pam';
//$uid=$REMOTE_USER;
$user = get_uid();
$error_msg='';
@@ -60,7 +56,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/fasold/fasoldoverlay.xul.php"?>';
observes = "menu-file-close:command"
modifiers = "accel" />
</keyset>
<toolbox id="main-toolbox">
<menubar id="menu">
content/lvplanung/timetable-week.xul.php
+1 -1
View File
@@ -73,7 +73,7 @@ else
$stg_kz=null;
if (isset($_GET['sem']))
$sem=$_GET['sem'];
else
else
$sem=null;
if (isset($_GET['ver']))
content/tempus.xul.php
+2 -6
View File
@@ -5,17 +5,13 @@ include('../vilesci/config.inc.php');
include('../include/functions.inc.php');
include('../include/fas/benutzer.class.php');
// Testumgebung
if (!isset($REMOTE_USER))
$REMOTE_USER='pam';
$uid=$REMOTE_USER;
$uid=get_uid();
$error_msg='';
//Variablen laden
if (!$conn = @pg_pconnect(CONN_STRING))
$error_msg='Es konnte keine Verbindung zum Server aufgebaut werden!';
$error_msg.=loadVariables($conn,$REMOTE_USER);
$error_msg.=loadVariables($conn,$uid);
$benutzer = new benutzer($conn);
if(!$benutzer->loadVariables($uid))
content/tempusoverlay.js.php
+43 -10
View File
@@ -23,16 +23,18 @@ function onVerbandSelect()
var tree=document.getElementById('tree-verband');
if(tree.currentIndex==-1)
return;
var col = tree.columns ? tree.columns["stg_kz"] : "stg_kz";
var stg_kz=tree.view.getCellText(tree.currentIndex, col);
var col = tree.columns ? tree.columns["sem"] : "sem";
var col=tree.columns ? tree.columns["stg_kz"] : "stg_kz";
var stg_kz=tree.view.getCellText(tree.currentIndex,col);
col=tree.columns ? tree.columns["sem"] : "sem";
var sem=tree.view.getCellText(tree.currentIndex,col);
var col = tree.columns ? tree.columns["ver"] : "ver";
col=tree.columns ? tree.columns["ver"] : "ver";
var ver=tree.view.getCellText(tree.currentIndex,col);
var col = tree.columns ? tree.columns["grp"] : "grp";
col=tree.columns ? tree.columns["grp"] : "grp";
var grp=tree.view.getCellText(tree.currentIndex,col);
var col = tree.columns ? tree.columns["gruppe"] : "gruppe";
col=tree.columns ? tree.columns["gruppe"] : "gruppe";
var gruppe=tree.view.getCellText(tree.currentIndex,col);
var daten=window.TimeTableWeek.document.getElementById('TimeTableWeekData');
var datum=parseInt(daten.getAttribute("datum"));
var attributes="&stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&gruppe="+gruppe;
@@ -81,7 +83,7 @@ function onVerbandSelect()
//var treeStudenten=document.getElementById('treeStudenten');
//attribute="<?php echo APP_ROOT; ?>rdf/student.rdf.php?"+"stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&gruppe="+gruppe;
//treeStudenten.setAttribute('datasources',attribute);
// Studenten
try
{
@@ -137,9 +139,10 @@ function onVerbandSelect()
function onOrtSelect()
{
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
var contentFrame=document.getElementById('iframeTimeTableWeek');
var treeOrt=document.getElementById('tree-ort');
var col = treeOrt.columns ? treeOrt.columns["ort_kurzbz"] : "ort_kurzbz";
var col=treeOrt.columns ? treeOrt.columns["ort_kurzbz"] : "ort_kurzbz";
var ort=treeOrt.view.getCellText(treeOrt.currentIndex,col);
var daten=window.TimeTableWeek.document.getElementById('TimeTableWeekData');
var datum=parseInt(daten.getAttribute("datum"));
@@ -153,10 +156,10 @@ function onOrtSelect()
function onLektorSelect()
{
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
var contentFrame=document.getElementById('iframeTimeTableWeek');
var treeLektor=document.getElementById('tree-lektor');
var col = treeLektor.columns ? treeLektor.columns["uid"] : "uid";
var col=treeLektor.columns ? treeLektor.columns["uid"] : "uid";
var uid=treeLektor.view.getCellText(treeLektor.currentIndex,col);
if(uid=='')
return;
@@ -173,6 +176,36 @@ function onLektorSelect()
// LVAs
var vboxLehrveranstalungPlanung=document.getElementById('vboxLehrveranstalungPlanung');
vboxLehrveranstalungPlanung.setAttribute('datasources','../rdf/lehreinheit-lvplan.rdf.php?'+"type=lektor&lektor="+uid);
// Lehrveranstaltung
try
{
//var stg_idx = treeLektor.view.getParentIndex(tree.currentIndex);
//var col = tree.columns ? tree.columns["studiengang_kz"] : "studiengang_kz";
//var stg_kz=tree.view.getCellText(stg_idx,col);
url = '<?php echo APP_ROOT; ?>rdf/lehrveranstaltung_einheiten.rdf.php?stg_kz=0&uid='+uid+'&'+gettimestamp();
var treeLV=document.getElementById('lehrveranstaltung-tree');
//Alte DS entfernen
var oldDatasources = treeLV.database.GetDataSources();
while(oldDatasources.hasMoreElements())
{
treeLV.database.RemoveDataSource(oldDatasources.getNext());
}
var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
LvTreeDatasource = rdfService.GetDataSource(url);
LvTreeDatasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
LvTreeDatasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
treeLV.database.AddDataSource(LvTreeDatasource);
LvTreeDatasource.addXMLSinkObserver(LvTreeSinkObserver);
treeLV.builder.addListener(LvTreeListener);
}
catch(e)
{
debug(e);
}
}
function loadURL(event)
include/Excel/Workbook.php
+1 -1
View File
@@ -370,7 +370,7 @@ class Spreadsheet_Excel_Writer_Workbook extends Spreadsheet_Excel_Writer_BIFFwri
*/
function &addValidator()
{
include_once 'Spreadsheet/Excel/Writer/Validator.php';
require_once 'Validator.php';
/* FIXME: check for successful inclusion*/
$valid = new Spreadsheet_Excel_Writer_Validator($this->_parser);
return $valid;
include/Excel/Worksheet.php
+5 -2
View File
@@ -1228,9 +1228,12 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
*/
function _XF(&$format)
{
if ($format != 0) {
if ($format != 0)
{
return($format->getXfIndex());
} else {
}
else
{
return(0x0F);
}
}
include/functions.inc.php
+2 -2
View File
@@ -31,9 +31,9 @@ function db_query($conn, $sql_query)
// Auth: Benutzer des Webportals
function get_uid()
{
return strtolower(trim($_SERVER['REMOTE_USER']));
//return strtolower(trim($_SERVER['REMOTE_USER']));
// fuer Testzwecke
//return 'weisss';
return 'pam';
}
function crlf()
include/lvgesamtnote.class.php
+3 -4
View File
@@ -200,8 +200,7 @@ class lvgesamtnote
$this->addslashes($this->student_uid).', '.
$this->addslashes($this->studiensemester_kurzbz).', '.
$this->addslashes($this->mitarbeiter_uid).', '.
$this->addslashes($this->note).', '.
$this->addslashes($this->freigabedatum).', '.
$this->addslashes($this->note).', now(), '.
$this->addslashes($this->benotungsdatum).', '.
$this->addslashes($this->bemerkung).', '.
$this->addslashes($this->updateamum).', '.
@@ -213,7 +212,7 @@ class lvgesamtnote
{
$qry='UPDATE campus.tbl_lvgesamtnote SET '.
'note='.$this->addslashes($this->note).', '.
'freigabedatum='.$this->addslashes($this->freigabedatum).', '.
'freigabedatum=now(), '.
'benotungsdatum='.$this->addslashes($this->benotungsdatum).', '.
'bemerkung='.$this->addslashes($this->bemerkung).', '.
'mitarbeiter_uid='.$this->addslashes($this->mitarbeiter_uid).', '.
@@ -317,4 +316,4 @@ class lvgesamtnote
}
}
}
?>
?>
rdf/lvgesamtnote.rdf.php
+1 -1
View File
@@ -88,4 +88,4 @@ foreach ($obj->result as $row)
}
?>
</RDF:Seq>
</RDF:RDF>
</RDF:RDF>
rdf/student-verband.rdf.php
+1 -1
View File
@@ -53,7 +53,7 @@ for ($i=0;$i<$num_rows_stg;$i++)
$sql_query="SELECT DISTINCT semester FROM tbl_student WHERE studiengang_kz=$row_stg->studiengang_kz ORDER BY semester";
if(!($result_sem=pg_query($conn, $sql_query)))
die(pg_errormessage($conn));
$num_rows_sem=pg_numrows($result_sem);
$num_rows_sem=pg_numrows($result_sem);
for ($j=0; $j<$num_rows_sem; $j++)
{
vilesci/.htaccess
-39
View File
@@ -1,39 +0,0 @@
AuthName "Technikum-Wien"
AuthType Basic
AuthLDAPURL ldap://ldap.technikum-wien.at/ou=People,dc=technikum-wien,dc=at?uid?one?objectclass=posixAccount
AuthLDAPGroupAttributeIsDN Off
AuthLDAPGroupAttribute memberuid
require group cn=fhadmin,ou=Group,dc=technikum-wien,dc=at
require user trob
require user wahl
require user drabek
require user elgner
require user schaaf
require user kofler
require user esberger
require user kollmitz
require user schmoe
require user trattner
require user naglr
require user patai
require user tw01e061
require user docsek
require user teschl
require user oesi
require user adams
require user weisss
require user moserp
require user moehring
require user skritek
require user kroesl
require user ffe
require user kindlm
require user schmuderm
require user sagmeister
require user masik
require user kubicka
require user lehner
require user schwarzl
require user horauer
require user me
require user ruhan