blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-11 17:19:29 +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:
hainberg
2019-06-06 08:50:24 +02:00
parent fab7c72dda 0aec9ee694
commit 033bb35f88
6 changed files with 58 additions and 1211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/lehre/pruefung/pruefung.js.php
+4 -4
View File
@@ -590,11 +590,11 @@ function saveAnmeldung(lehrveranstaltung_id, termin_id)
success: function(data){
if(data.error === 'false')
{
messageBox("message", data.result, "green", "highlight", 1000);
messageBox("message", data.result, "green", "highlight", 10000);
}
else
{
messageBox("message", data.errormsg, "red", "highlight", 1000);
messageBox("message", data.errormsg, "red", "highlight", 10000);
}
resetForm();
@@ -635,11 +635,11 @@ function stornoAnmeldung(pruefungsanmeldung_id)
success: function(data){
if(data.error === 'false')
{
messageBox("message", data.result, "green", "highlight", 1000);
messageBox("message", data.result, "green", "highlight", 10000);
}
else
{
messageBox("message", data.errormsg, "red", "highlight", 1000);
messageBox("message", data.errormsg, "red", "highlight", 10000);
}
refresh();
cis/private/profile/index.php
+1 -1
View File
@@ -327,7 +327,7 @@ if ($type == 'student' && (!defined('CIS_PROFIL_STUDIENINFORMATION_ANZEIGEN') ||
".$p->t('global/gruppe').": $user->gruppe ".($user->gruppe!=' '?"<a href='#' onClick='javascript:window.open(\"../stud_in_grp.php?kz=$user->studiengang_kz&sem=$user->semester&verband=$user->verband&grp=$user->gruppe\",\"_blank\",\"width=600,height=500,location=no,menubar=no,status=no,toolbar=no,scrollbars=yes, resizable=1\");return false;'>".$p->t('benotungstool/liste')."</a>":"")."<br>";
if ($user->studiengang_kz<10000)
echo $p->t('profil/martrikelnummer').": $user->matrikelnr<br />";
echo $p->t('global/personenkennzeichen').": $user->matrikelnr<br />";
}
if ($type == 'mitarbeiter')
phpci.yml
+6 -3
View File
@@ -14,7 +14,6 @@ setup: # First!
- "DROP DATABASE IF EXISTS fhcomplete;"
- "CREATE DATABASE fhcomplete;"
composer: # Run composer to install all the required 3rd party software
action: "install"
shell:
# Install addons
- "git clone --quiet https://github.com/FH-Complete/FHC-AddOn-Abrechnung.git %BUILD_PATH%/addons/abrechnung"
@@ -85,14 +84,18 @@ setup: # First!
- "ln -s %BUILD_PATH% ../fhcomplete"
test: # Run tests
php_parallel_lint: # Lint
allow_failures: true
php_parallel_lint: # Lint cannot fail!
php_mess_detector: # Mess detector
rules:
- "unusedcode"
- "codesize"
- "design"
allow_failures: true
php_cpd: # Copy/paste detector
allow_failures: true
php_code_sniffer: # Code sniffer
standard: "tests/codesniffer/FHComplete"
allowed_warnings: -1 # Warnings are ignored for a successful build
allow_failures: true
#codeception: # Codeception
# config: "tests/codeception/"
tests/codeception/_data/.placeholder
View File
tests/codeception/_data/dump.sql
-1146
View File
File diff suppressed because it is too large Load Diff
tests/codesniffer/FHComplete/ruleset.xml
+47 -57
View File
@@ -1,75 +1,65 @@
<?xml version="1.0"?>
<ruleset name="FHComplete">
<description>FHComplete's coding standard</description>
<description>FHComplete's coding standard</description>
<exclude-pattern>\.git</exclude-pattern>
<exclude-pattern>*/Config/*.ini.php</exclude-pattern>
<exclude-pattern>/*/tmp/</exclude-pattern>
<!-- Ignored directories if phpcs is running from command line, already ignored by phpci -->
<exclude-pattern>\.git</exclude-pattern>
<exclude-pattern>vendor</exclude-pattern>
<exclude-pattern>tests</exclude-pattern>
<rule ref="PSR2">
<exclude name="PSR1.Classes.ClassDeclaration" />
<exclude name="PSR1.Methods.CamelCapsMethodName" />
<exclude name="PSR1.Files.SideEffects" />
<exclude name="Generic.WhiteSpace.DisallowTabIndent" />
<exclude name="Squiz.ControlStructures.ControlSignature" />
<exclude name="Squiz.Classes.ValidClassName" />
<exclude name="Generic.ControlStructures.InlineControlStructure" />
<exclude name="Squiz.PHP.DisallowSizeFunctionsInLoops" />
</rule>
<rule ref="PSR2">
<exclude name="PSR1.Classes.ClassDeclaration" />
<exclude name="PSR1.Methods.CamelCapsMethodName" />
<exclude name="PSR1.Files.SideEffects" />
<exclude name="Generic.WhiteSpace.DisallowTabIndent" />
<exclude name="Squiz.ControlStructures.ControlSignature" />
<exclude name="Squiz.Classes.ValidClassName" />
<exclude name="Generic.ControlStructures.InlineControlStructure" />
<exclude name="Squiz.PHP.DisallowSizeFunctionsInLoops" />
</rule>
<rule ref="Generic.Files.LineLength">
<properties>
<property name="lineLimit" value="120"/>
<property name="absoluteLineLimit" value="150"/>
</properties>
</rule>
<rule ref="Squiz.Arrays.ArrayBracketSpacing"/>
<rule ref="Generic.Files.LineLength">
<properties>
<property name="lineLimit" value="120"/>
<property name="absoluteLineLimit" value="150"/>
</properties>
</rule>
<rule ref="Squiz.Classes.LowercaseClassKeywords"/>
<rule ref="Squiz.Arrays.ArrayBracketSpacing"/>
<rule ref="Generic.CodeAnalysis.JumbledIncrementer"/>
<rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop"/>
<rule ref="Generic.CodeAnalysis.UnnecessaryFinalModifier"/>
<rule ref="Generic.CodeAnalysis.UnconditionalIfStatement"/>
<rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall"/>
<rule ref="Squiz.Classes.LowercaseClassKeywords"/>
<rule ref="Generic.Commenting.Todo"/>
<rule ref="Squiz.Commenting.DocCommentAlignment"/>
<rule ref="Generic.CodeAnalysis.JumbledIncrementer"/>
<rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop"/>
<rule ref="Generic.CodeAnalysis.UnnecessaryFinalModifier"/>
<rule ref="Generic.CodeAnalysis.UnconditionalIfStatement"/>
<rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall"/>
<!--
We allow EOL after closing braces
-->
<rule ref="FHComplete.ControlStructures.ControlSignature"/>
<rule ref="Generic.Commenting.Todo"/>
<rule ref="Squiz.Commenting.DocCommentAlignment"/>
<rule ref="Generic.Files.LineEndings"/>
<!-- We allow EOL after closing braces -->
<rule ref="FHComplete.ControlStructures.ControlSignature"/>
<rule ref="Generic.Formatting.NoSpaceAfterCast"/>
<rule ref="Generic.Files.LineEndings"/>
<rule ref="Squiz.Operators.ValidLogicalOperators"/>
<rule ref="Generic.Formatting.NoSpaceAfterCast"/>
<rule ref="Squiz.PHP.Eval"/>
<rule ref="Squiz.PHP.NonExecutableCode"/>
<rule ref="Generic.PHP.NoSilencedErrors"/>
<rule ref="Generic.PHP.ForbiddenFunctions"/>
<rule ref="Generic.PHP.DeprecatedFunctions"/>
<rule ref="Squiz.Operators.ValidLogicalOperators"/>
<rule ref="Squiz.Scope.MemberVarScope"/>
<rule ref="Squiz.Scope.StaticThisUsage"/>
<rule ref="Squiz.PHP.Eval"/>
<rule ref="Squiz.PHP.NonExecutableCode"/>
<rule ref="Generic.PHP.NoSilencedErrors"/>
<rule ref="Generic.PHP.ForbiddenFunctions"/>
<rule ref="Generic.PHP.DeprecatedFunctions"/>
<rule ref="Squiz.WhiteSpace.CastSpacing"/>
<rule ref="Squiz.WhiteSpace.SemicolonSpacing"/>
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/>
<rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
<rule ref="Squiz.Scope.MemberVarScope"/>
<rule ref="Squiz.Scope.StaticThisUsage"/>
<!-- Relax some src/* and tests/* rules -->
<rule ref="Squiz.Classes.ValidClassName">
<exclude-pattern>*/tests/*</exclude-pattern>
</rule>
<rule ref="FHComplete.Commenting.FunctionComment">
<exclude-pattern>*/tests/*</exclude-pattern>
</rule>
<rule ref="Squiz.WhiteSpace.CastSpacing"/>
<rule ref="Squiz.WhiteSpace.SemicolonSpacing"/>
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/>
<rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
<!-- All rules in ./Sniffs are included automatically -->
<!-- All rules in ./Sniffs are included automatically -->
</ruleset>