Commit Graph

58 Commits

Author SHA1 Message Date
paolo d58ba92b15 - phpC(dis)I fixes 2016-07-11 13:35:12 +02:00
paolo 8fbc64bbff - Try to fix problems with phpC(dis)I
- Changed permissions in dump.sql
2016-07-07 17:15:30 +02:00
paolo 61a559d380 Changed permission basis/phrase to system/phrase 2016-07-06 10:13:43 +02:00
paolo a3210781ea - Added permission system/vorlagestudiengang to dump.sql
- Added method getMessagesByToken to controller Message
- Library MessageLib now load the helper fhc_helper
- Added new method getMessagesByToken to library MessageLib
- Added field relationmessage_id to methods sendMessage and sendMessageVorlage
- Method sendMessageVorlage now checks if the text and the subject for
the template are not empty
- Method sendMessageVorlage now saves the token automatically generated
- Method sendMessageVorlage now return a more comprehensive error message
- Method getMessagesByPerson of Message_model now checks for the right permissions
- Added fields relationmessage_id and person_id in getMessagesByPerson query
- Added method getMessagesByToken to model Message_model
2016-06-29 15:41:40 +02:00
paolo 9a4f5480c4 - Added permission basis/phrase to dump.sql
- The function getAuthUID() present in the helper fhcauth_helper.php
now tries to work always with CI session to get the uid
- REST_controller doesn't need anymore to handle the uid
- FHC_Controller and FHC_Model load fhcauth_helper in their constructor,
so any class that extends them now could call the function getAuthUID()
anywhere in the code
- The controllers don't need anymore to pass the uid to the models or to the
libraries
- Library FHC_DB_ACL load fhcauth_helper in its constructor and uses getAuthID()
2016-06-24 13:22:27 +02:00
paolo 5a5472257a - Modified MessageLib constructor to allow to give the parameter UID from a Controller
- Controller Message now works with MessageLib
- Added getMessagesByPersonID method to controller Message
- Added permissions basis/message and fs/system to dump.sql
2016-06-21 15:07:51 +02:00
paolo 5a5a22e0d5 - Removed body tag from footer.php and header.php
- Added permission fs/dms to dump.sql and fhcomplete.php
- Added FilesystemLib to read and write from/in filesystem
- Added FS_Model to manage filesystem with the same permission system of DB_Model
- Added more models to handle the Dms
- Modified Dms controller to use the new models
2016-06-21 11:10:55 +02:00
Paminger 4c58b95728 Libs and Vorlagen 2016-06-17 00:12:46 +02:00
paolo 0dc605df3c - Modified FHC_Model, now it is saving uid in CI session
- Added codeception tests
- Added statistik to dump.sql
- Moved old libraries to CI
2016-06-06 16:36:23 +02:00
paolo dabcf8188b - Modified FHC_Model contructor to get UID from vilesci authentication
- Copied functionalities from old libraries to controllers
- Ported old libraries to CI
- Modified codeception
2016-06-03 16:19:06 +02:00
paolo 00211ee647 - Added codeception test cases
- Moved old libraries to CI
2016-05-25 18:36:18 +02:00
paolo 4f8826dc3f Merge origin/ci into ci
Conflicts:
	application/controllers/api/v1/crm/Prestudentstatus.php
2016-05-24 12:32:32 +02:00
paolo c6efbac308 - Added permission "basis/dms_version" for table campus.tbl_dms_version
- Added dms functionalities to relative controller and model
2016-05-23 15:34:59 +02:00
paolo a34f82fd3c - Added permission "basis/studienplan_semester" for table lehre.tbl_studienplan_semester
- Added method getStudienplaeneFromSem in controller Studienplan
- Added method getNextStudiensemester in controller Studiensemester
2016-05-23 10:32:21 +02:00
paolo cd10d96c91 - Added permissions and linked them to user admin in dump.sql
- Modified validate methods to public for classes benutzer, student and mitarbeiter
2016-05-20 12:09:18 +02:00
paolo e5554ad1ba Merge origin/ci into ci 2016-05-20 11:05:12 +02:00
paolo ffac4458ef Added permissions for user amdin in the DB 2016-05-20 11:04:51 +02:00
paolo 3c6638fac6 Added permissions for user amdin in the DB 2016-05-20 11:01:52 +02:00
Paminger d4994c95e9 New Build Folder 2016-05-20 10:38:28 +02:00
Paminger 42e911b4fe CodeSniffer 2016-05-20 07:44:08 +02:00
paolo 32acc8a414 Fixed controllers parameters names and number 2016-05-19 15:51:15 +02:00
paolo 674e832392 disContinuous disIntegration 2016-05-18 16:09:47 +02:00
paolo f76b83ef64 - Fixed include of ci_db_extra.php in ci_hack.php
- Added delete for table public.tbl_preinteressent in dump.sql
2016-05-12 16:55:21 +02:00
paolo 6d093dc4ed - DB_Model added new functionalities
- Codeception changed
 - Studiengang_model fixed message error
 - Removed File and File_model, they will be replaced by Dms and Dms_model
 - Added new permissions in fhcomplete config file
2016-05-09 18:19:58 +02:00
Paminger 2dada5200c Merge branch 'master' into ci
Conflicts:
	.gitignore
	composer.json
	include/prestudent.class.php
	include/securimage/securimage.php
	include/studienplan.class.php
	system/dbupdate_3.2.php
	tests/codesniffer/FHComplete/Sniffs/Commenting/DocBlockAlignmentSniff.php
	tests/codesniffer/FHComplete/Sniffs/Commenting/FunctionCommentSniff.php
	tests/codesniffer/FHComplete/Sniffs/Commenting/FunctionCommentTypeSniff.php
	tests/codesniffer/FHComplete/Sniffs/ControlStructures/ControlSignatureSniff.php
	tests/codesniffer/FHComplete/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
	tests/codesniffer/FHComplete/Sniffs/ControlStructures/WhileStructuresSniff.php
	tests/codesniffer/FHComplete/Sniffs/Formatting/OneClassPerUseSniff.php
	tests/codesniffer/FHComplete/Sniffs/Formatting/UseInAlphabeticalOrderSniff.php
	tests/codesniffer/FHComplete/Sniffs/Functions/ClosureDeclarationSniff.php
	tests/codesniffer/FHComplete/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/CamelCapsMethodNameSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidClassBracketsSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidFunctionNameSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidTraitNameSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidVariableNameSniff.php
	tests/codesniffer/FHComplete/Sniffs/PHP/DisallowShortOpenTagSniff.php
	tests/codesniffer/FHComplete/Sniffs/PHP/TypeCastingSniff.php
	tests/codesniffer/FHComplete/Sniffs/Strings/ConcatenationSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/CommaSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionCallSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/OperatorSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/ScopeIndentSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/TabAndSpaceSniff.php
	tests/codesniffer/FHComplete/ruleset.xml
	tests/codesniffer/FHComplete/tests/FHCompletePHPStandardTest.php
	tests/codesniffer/FHComplete/tests/TestHelper.php
	tests/codesniffer/FHComplete/tests/bootstrap.php
	tests/codesniffer/FHComplete/tests/files/FHComplete/throws_pass.php
	tests/codesniffer/FHComplete/tests/files/bad_trait_name.php
	tests/codesniffer/FHComplete/tests/files/class_brackets_fail1.php
	tests/codesniffer/FHComplete/tests/files/class_brackets_fail2.php
	tests/codesniffer/FHComplete/tests/files/class_brackets_fail3.php
	tests/codesniffer/FHComplete/tests/files/class_underscore_prefix_pass.php
	tests/codesniffer/FHComplete/tests/files/control_structure_brackets_pass.php
	tests/codesniffer/FHComplete/tests/files/control_structure_dowhile.php
	tests/codesniffer/FHComplete/tests/files/control_structure_elseif.php
	tests/codesniffer/FHComplete/tests/files/control_structure_indentation.php
	tests/codesniffer/FHComplete/tests/files/control_structure_nobrackets.php
	tests/codesniffer/FHComplete/tests/files/control_structure_nospace.php
	tests/codesniffer/FHComplete/tests/files/control_structure_while.php
	tests/codesniffer/FHComplete/tests/files/control_structures_no_newline.php
	tests/codesniffer/FHComplete/tests/files/docblock_align_fail.php
	tests/codesniffer/FHComplete/tests/files/docblock_align_flat_pass.php
	tests/codesniffer/FHComplete/tests/files/docblock_align_pass.php
	tests/codesniffer/FHComplete/tests/files/double_space.php
	tests/codesniffer/FHComplete/tests/files/for_function_comment_pass.php
	tests/codesniffer/FHComplete/tests/files/function_comment_opening_line_fail.php
	tests/codesniffer/FHComplete/tests/files/function_comment_opening_line_pass.php
	tests/codesniffer/FHComplete/tests/files/function_comment_type_fail.php
	tests/codesniffer/FHComplete/tests/files/function_comment_type_pass.php
	tests/codesniffer/FHComplete/tests/files/function_spacing.php
	tests/codesniffer/FHComplete/tests/files/mixing_indent.php
	tests/codesniffer/FHComplete/tests/files/multiple_use.php
	tests/codesniffer/FHComplete/tests/files/multiple_use_pass.php
	tests/codesniffer/FHComplete/tests/files/operator_spacing_pass.php
	tests/codesniffer/FHComplete/tests/files/short_open_tags_fail.php
	tests/codesniffer/FHComplete/tests/files/short_open_tags_pass.php
	tests/codesniffer/FHComplete/tests/files/space_tab.php
	tests/codesniffer/FHComplete/tests/files/tab_space.php
	tests/codesniffer/FHComplete/tests/files/traits_no_order.php
	tests/codesniffer/FHComplete/tests/files/traits_pass.php
	tests/codesniffer/FHComplete/tests/files/type_casting_fail.php
	tests/codesniffer/FHComplete/tests/files/type_casting_pass.php
	tests/codesniffer/FHComplete/tests/files/use_class_and_closure_pass.php
	tests/codesniffer/FHComplete/tests/files/use_closure_pass.php
	tests/codesniffer/FHComplete/tests/files/use_no_order.php
	tests/codesniffer/FHComplete/tests/files/use_ok_pass.php
	tests/codesniffer/FHComplete/tests/files/use_with_commas.php
	tests/codesniffer/FHComplete/tests/files/variable_name_pass.php
	tests/codesniffer/FHComplete/tests/files/whitespace_comma.php
	tests/codesniffer/FHComplete/tests/files/whitespace_comma_before.php
	tests/codesniffer/FHComplete/tests/files/whitespace_comma_pass.php
	tests/codesniffer/FHComplete/tests/ruleset.xml
2016-04-28 18:14:40 +02:00
Paminger 3b2ead0aaa BugFix 2016-04-28 06:47:17 +02:00
Paminger 5300ae6e21 BugFix 2016-04-28 05:51:10 +02:00
Paminger eb141cec67 Move CodeceptionTests for PHPCI-Compatibility 2016-04-27 21:03:59 +02:00
Paminger 8261e397da Placeholder 2016-04-27 18:39:17 +02:00
paolo 0be0280c28 Codeception v1 working 2016-04-27 16:32:28 +02:00
paolo a0c06aa2c3 Merge origin/ci into ci
Conflicts:
	application/config/config.php
	tests/codeception/_data/dump.sql
	tests/codeception/api/v1/PersonCept.php
2016-04-27 12:06:59 +02:00
paolo 546483bed7 Merging time 2016-04-27 12:04:42 +02:00
paolo 549b0133c2 Merge origin/ci into ci
Conflicts:
	application/config/config.php
	tests/codeception/_data/dump.sql
	tests/codeception/api/v1/PersonCept.php
2016-04-27 11:54:20 +02:00
paolo 51774021b4 Codeception 2016-04-27 11:46:29 +02:00
Paminger 39f65875c6 PersonCept 2016-04-26 15:23:21 +02:00
Paminger fe227ebdcb Cepts 2016-04-26 15:03:09 +02:00
Paminger 4799ec68de Autoload 2016-04-26 14:50:00 +02:00
paolo a3a9c42e99 - Renamed classes, methods and properties names in german
- All the controllers exends APIv1_Controller rather than REST_Controller
 - Codeceptions modified to be compliant to changes
2016-04-25 15:57:52 +02:00
Paminger ecff3747d0 Dontknow 2016-04-25 14:25:09 +02:00
paolo 18df562208 Check permissions 2016-04-22 16:31:46 +02:00
paolo f6f533a23b API Calls codeception
Fixed translations
2016-04-22 14:44:40 +02:00
paolo f12ce76194 Merging 2016-04-15 15:47:56 +02:00
paolo 9aef5dcc30 HTTP basic authentication
Set this as default authentication, providing codeception test case
2016-04-15 15:41:38 +02:00
paolo aec2e7b5ac HTTP digest authentication
The digest http authentication does not allow to use a password storing
systems, that do not successively allow to retrieve it, even if hashed
2016-04-14 15:24:53 +02:00
Paminger 1f236b4b5a CodeCeption 2016-04-11 07:08:46 +02:00
Paminger bf0a96f21a Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
Conflicts:
	application/models/person/Person_model.php
	ci_hack.php
2016-04-10 18:20:43 +02:00
Paminger 3b39752ab7 Acceptance Tests 2016-04-10 18:11:09 +02:00
paolo 1131bff3ec Changes:
application/controllers/api/v1/Person.php
	Fixed conflicts

application/models/person/Person_model.php
	Fixed conflicts

ci_hack.php
	Load the language class otherwise some VileSci functionalities would crash
	Ex: Personen -> Zusammenlegen

tests/codesniffer/FHComplete/ruleset.xml
	Turned off ParamCommentFullStop option
2016-04-08 16:53:52 +02:00
Gerald Raab 6283e92339 Codesniffer FHC-Standard 2016-04-08 16:37:00 +02:00
Paminger bcfae6b009 Shit 2016-04-07 15:17:26 +02:00