Merge branch 'master' into udf

This commit is contained in:
Paolo
2017-07-21 15:08:50 +02:00
82 changed files with 1558 additions and 1271 deletions
View File
-2
View File
@@ -1,2 +0,0 @@
<?php
// touched by Christian Paminger
+1
View File
@@ -155,6 +155,7 @@ $berechtigungen = array(
array('soap/studienordnung','Recht für Studienordnung Webservice'),
array('soap/benutzer','Berechtigung für Bentutzerabfrage Addon Kontoimport'),
array('soap/buchungen','Berechtigung für Buchungsabfrage Addon Kontoimport'),
array('student/alias','Berechtigung zum Aendern von Alias falls deaktiviert '),
array('student/bankdaten','Bankdaten des Studenten'),
array('student/anrechnung','Anrechnungen des Studenten'),
array('student/anwesenheit','Anwesenheiten im FAS'),
+179
View File
@@ -0,0 +1,179 @@
<?php
/* Copyright (C) 2017 fhcomplete.org
*
* 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: Andreas Oesterreicher <oesi@technikum-wien.at>
*/
/**
* Script to Test the System Environment
* Tests if all PHP-Modules, Configfiles, CommandlineTools, etc are installed
*/
require_once('../config/vilesci.config.inc.php');
require_once('../include/functions.inc.php');
require_once('../include/benutzerberechtigung.class.php');
$user = get_uid();
$rechte = new benutzerberechtigung();
$rechte->getBerechtigungen($user);
if(!$rechte->isBerechtigt('admin'))
die($rechte->errormsg);
echo '<!doctype html>
<html>
<head>
<meta charset="utf-8" />
<title>FH-Complete - Environment</title>';
include('../include/meta/jquery.php');
include('../include/meta/jquery-tablesorter.php');
echo '
<style>
.fail{
color:red;
}
.ok {
color:green;
}
</style>
<script language="Javascript">
$(document).ready(function()
{
$("#t1").tablesorter(
{
sortList: [[0,0]],
widgets: ["zebra"],
headers: {1:{sorter: false}}
});
});
</script>
</head>
<body>
<h1>FH-Complete Environment</h1>
<table id="t1" class="tablesorter">
<thead>
<tr>
<th>Module</th>
<th>Version/Status</th>
</tr>
</thead>
<tbody>
';
// Apache
printVersion("Apache", apache_get_version());
// PHP version
printVersion("php", phpversion());
// PHP module
printVersion("php-xsl", phpversion('xsl'));
printVersion("php-gd", phpversion('gd'));
printVersion("php-pgsql", phpversion('pgsql'));
printVersion("php-ldap", phpversion('ldap'));
printVersion("php-mcrypt", phpversion('mcrypt'));
printVersion("php-mbstring", phpversion('mbstring'));
printVersion("php-soap", phpversion('soap'));
printVersion("php-curl", phpversion('curl'));
// Unoconv version
$returnArray = array();
exec('unoconv --version',$returnArray);
if(isset($returnArray[0]))
$unoconvVersion = explode(' ',$returnArray[0])[1];
else
$unoconvVersion = null;
printVersion("Unoconv", $unoconvVersion, "0.7");
// Codeigniter Environment Variable CI_ENV
$CI_ENV = getenv('CI_ENV');
printVersion("CI_ENV", $CI_ENV);
// ZIP
printVersion("zip", checkInstalled('zip'));
// Composer
printVersion("composer", checkInstalled('composer'));
// Composer / Vendor
$vendorFileExists = file_exists('../vendor/codeigniter/framework/index.php');
printVersion("Composer Status", ($vendorFileExists?'ok':'out of date'));
// Config Files
$ConfigExists = file_exists('../config/cis.config.inc.php');
if(!$ConfigExists)
$ConfigExists = file_exists('../config/vilesci.config.inc.php');
printVersion("ConfigFile CIS/Vilesci", ($ConfigExists?'ok':'missing'));
$ConfigExists = file_exists('../config/global.config.inc.php');
printVersion("ConfigFile Global", ($ConfigExists?'ok':'missing'));
if($CI_ENV == '')
$CI_ENV = 'production';
$ConfigExists = file_exists('../application/config/'.$CI_ENV.'/config.php');
printVersion("ConfigFile Codeigniter", ($ConfigExists?'ok':'missing'));
// Htaccess Files
$htaccessExists = file_exists('../cis/private/.htaccess');
printVersion("htaccess File CIS", ($htaccessExists?'ok':'missing'));
$htaccessExists = file_exists('../content/.htaccess');
printVersion("htaccess File Content", ($htaccessExists?'ok':'missing'));
$htaccessExists = file_exists('../vilesci/.htaccess');
printVersion("htaccess File Vilesci", ($htaccessExists?'ok':'missing'));
$htaccessExists = file_exists('../system/.htaccess');
printVersion("htaccess File System", ($htaccessExists?'ok':'missing'));
$htaccessExists = file_exists('../rdf/.htaccess');
printVersion("htaccess File RDF", ($htaccessExists?'ok':'missing'));
echo '
</tbody>
</table>
</body>
</html>';
function printVersion($module, $currentVersion, $expectedVersion = '')
{
$failed = false;
if ($currentVersion == null)
$failed = true;
if ($currentVersion == '')
$currentVersion = 'missing';
if ($expectedVersion != '' && $currentVersion != $expectedVersion)
$failed = true;
echo '
<tr>
<td>'.$module.'</td>
<td><span class="'.($failed?'fail':'ok').'">'.$currentVersion.'</span>';
if($failed && $expectedVersion != '')
echo ' (should be '.$expectedVersion.')';
echo '</td>';
echo '</tr>';
}
function checkInstalled($tool)
{
$returnArray = array();
$returnValue = null;
exec('which '.$tool, $returnArray, $returnValue);
if($returnValue==0)
return 'ok';
else
return 'missing';
}
Binary file not shown.
+3 -3
View File
@@ -1287,7 +1287,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
</text:sequence-decls>
<text:p text:style-name="P60">
<draw:frame xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" draw:style-name="fr5" draw:name="Bild2" text:anchor-type="paragraph" svg:y="8.82cm" svg:width="11.45cm" svg:height="12.61cm" draw:z-index="20">
<draw:image xlink:href="Pictures/bundesadler.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
<draw:image xlink:href="Pictures/bundesadler.jpg" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
</draw:frame>
</text:p>
<text:p text:style-name="P2"/>
@@ -2836,12 +2836,12 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
<text:p text:style-name="P22"/>
<text:p text:style-name="P78">
<draw:frame xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" draw:style-name="fr6" draw:name="Bild1" text:anchor-type="paragraph" svg:y="8.82cm" svg:width="11.45cm" svg:height="12.61cm" draw:z-index="20">
<draw:image xlink:href="Pictures/bundesadler.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
<draw:image xlink:href="Pictures/bundesadler.jpg" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
</draw:frame>
</text:p>
<text:p text:style-name="P78">
<draw:frame xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" draw:style-name="fr7" draw:name="Bild5" text:anchor-type="paragraph" svg:y="8.82cm" svg:width="11.45cm" svg:height="12.61cm" draw:z-index="21">
<draw:image xlink:href="Pictures/bundesadler.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
<draw:image xlink:href="Pictures/bundesadler.jpg" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
</draw:frame>
</text:p>
+3 -3
View File
@@ -1291,7 +1291,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
</text:sequence-decls>
<text:p text:style-name="P60">
<draw:frame xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" draw:style-name="fr5" draw:name="Bild2" text:anchor-type="paragraph" svg:y="8.82cm" svg:width="11.45cm" svg:height="12.61cm" draw:z-index="20">
<draw:image xlink:href="Pictures/bundesadler.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
<draw:image xlink:href="Pictures/bundesadler.jpg" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
</draw:frame>
</text:p>
<text:p text:style-name="P2"/>
@@ -2839,12 +2839,12 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
<text:p text:style-name="P22"/>
<text:p text:style-name="P78">
<draw:frame xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" draw:style-name="fr6" draw:name="Bild1" text:anchor-type="paragraph" svg:y="8.82cm" svg:width="11.45cm" svg:height="12.61cm" draw:z-index="20">
<draw:image xlink:href="Pictures/bundesadler.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
<draw:image xlink:href="Pictures/bundesadler.jpg" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
</draw:frame>
</text:p>
<text:p text:style-name="P78">
<draw:frame xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" draw:style-name="fr7" draw:name="Bild5" text:anchor-type="paragraph" svg:y="8.82cm" svg:width="11.45cm" svg:height="12.61cm" draw:z-index="21">
<draw:image xlink:href="Pictures/bundesadler.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
<draw:image xlink:href="Pictures/bundesadler.jpg" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
</draw:frame>
</text:p>