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

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

Browse Source
This commit is contained in:
oesi
2016-12-01 10:10:08 +01:00
parent e280c87933 0b6fc563e3
commit 8ef26d396a
3 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
phpci.yml
+6 -10
View File
@@ -30,16 +30,12 @@ setup:
- "sed -i.bak 's/CREATE PROCEDURAL LANGUAGE plpgsql;//g' %BUILD_PATH%/system/fhcomplete3.0.sql"
# Install Database
- "psql -q -P pager=off -h localhost -U fhcomplete -p 5432 -d fhctest -f %BUILD_PATH%/system/fhcomplete3.0.sql >/dev/null"
# TODO: This part is not working because of the tbl_benutzerrolle.anmerkung field
# - "cp /home/phpci/config/version_3.0.php %BUILD_PATH%/version.php"
# - "wget -qO - 'http://admin:1q2w3@test.fhcomplete.org/build/system/checksystem.php'"
# - "cp /home/phpci/config/version_3.1.php %BUILD_PATH%/version.php"
# - "wget -qO - 'http://admin:1q2w3@test.fhcomplete.org/build/system/checksystem.php'"
# - "cp /home/phpci/config/version_3.2.php %BUILD_PATH%/version.php"
# - "wget -qO - 'http://admin:1q2w3@test.fhcomplete.org/build/system/checksystem.php'"
- "cd %BUILD_PATH%/system/ && php dbupdate_3.0.php"
- "cd %BUILD_PATH%/system/ && php dbupdate_3.1.php"
- "cd %BUILD_PATH%/system/ && php dbupdate_3.2.php"
- "cp /home/phpci/config/version_3.0.php %BUILD_PATH%/version.php"
- "cd %BUILD_PATH%/system/ && php checksystem.php"
- "cp /home/phpci/config/version_3.1.php %BUILD_PATH%/version.php"
- "cd %BUILD_PATH%/system/ && php checksystem.php"
- "cp /home/phpci/config/version_3.2.php %BUILD_PATH%/version.php"
- "cd %BUILD_PATH%/system/ && php checksystem.php"
test:
# lint:
system/checksystem.php
+9 -6
View File
@@ -37,13 +37,16 @@ echo '<html>
</head>
<body>';
$uid = get_uid();
$rechte = new benutzerberechtigung();
$rechte->getBerechtigungen($uid);
if(!$rechte->isBerechtigt('admin'))
if (php_sapi_name() != 'cli')
{
exit('Sie haben keine Berechtigung');
$uid = get_uid();
$rechte = new benutzerberechtigung();
$rechte->getBerechtigungen($uid);
if(!$rechte->isBerechtigt('admin'))
{
exit('Sie haben keine Berechtigung');
}
}
echo '<H1>Systemcheck!</H1>';
tests/codeception/_data/dump.sql
-3
View File
@@ -4,9 +4,6 @@ GRANT SELECT ON TABLE campus.tbl_pruefungsstatus TO vilesci;
GRANT SELECT ON TABLE fue.tbl_scrumsprint TO vilesci;
GRANT SELECT ON TABLE fue.tbl_scrumteam TO vilesci;
-- INSERT INTO ci_apikey
INSERT INTO public.ci_apikey (key, level, ignore_limits, date_created) VALUES ('testapikey@fhcomplete.org', NULL, NULL, NOW());
-- DELETE FROM system.tbl_rolleberechtigung
DELETE FROM system.tbl_rolleberechtigung WHERE berechtigung_kurzbz IN (
'basis/archiv',