diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100755 index 9b0c38d..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,12 +0,0 @@ -# These are supported funding model platforms - -github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] -patreon: # orange_management -open_collective: # Replace with a single Open Collective username -ko_fi: # Replace with a single Ko-fi username -tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel -community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry -liberapay: # Replace with a single Liberapay username -issuehunt: # Replace with a single IssueHunt username -otechie: # Replace with a single Otechie username -custom: ['https://paypal.me/orangemgmt'] diff --git a/cssOMS/alerts/alerts.md b/cssOMS/alerts/alerts.md index 80f99f5..d7f3bdc 100644 --- a/cssOMS/alerts/alerts.md +++ b/cssOMS/alerts/alerts.md @@ -9,7 +9,7 @@ Alerts are boxes styled in such a way that they attract the attention of the use ![Alert ok](Developer-Guide/frontend/elements/alerts/ok.png) ```html -
This is ok
+
This is ok
``` #### Advanced @@ -17,7 +17,7 @@ Alerts are boxes styled in such a way that they attract the attention of the use ![Alert ok advanced](Developer-Guide/frontend/elements/alerts/ok_advanced.png) ```html -
+

This is a Title

This is a message
@@ -28,7 +28,7 @@ Alerts are boxes styled in such a way that they attract the attention of the use ![Alert info](Developer-Guide/frontend/elements/alerts/info.png) ```html -
This is a info
+
This is a info
``` ### Warning @@ -36,7 +36,7 @@ Alerts are boxes styled in such a way that they attract the attention of the use ![Alert warning](Developer-Guide/frontend/elements/alerts/warning.png) ```html -
This is a warning
+
This is a warning
``` ### Error @@ -44,7 +44,7 @@ Alerts are boxes styled in such a way that they attract the attention of the use ![Alert error](Developer-Guide/frontend/elements/alerts/error.png) ```html -
This is an error
+
This is an error
``` diff --git a/general/setup.md b/general/setup.md index d9655f2..3612129 100755 --- a/general/setup.md +++ b/general/setup.md @@ -74,7 +74,7 @@ Additional tools and settings coming with the VM: 5. `sitespeed.io ./Build/Helper/Scripts/sitespeedDemoUrls.txt -b chrome --outputFolder /var/www/html/sitespeed` 6. Slow sql query threashold is defined as 0.5s. -

+

diff --git a/general/structure.md b/general/structure.md index 8c342fb..f6154b4 100755 --- a/general/structure.md +++ b/general/structure.md @@ -4,7 +4,7 @@ The user request gets passed through the entire application to all modules. The The routes usually reference endpoints in the module `controllers` which collects the model data through the model `mapper` and creates a partial response `view` with an assigned `template` and the collected model data. -

+

Application Flow

@@ -35,6 +35,6 @@ Furthermore the Application also performs a `CSRF` check, defines the `CSP`, aut A short extract of the database structure can be seen below. Please note that this only contains the very basic tables from a fresh install with very few modules and even then we only included the key tables for simplicity reasons. -

+

Application UML

\ No newline at end of file diff --git a/phpOMS/application.md b/phpOMS/application.md index 104c310..99c5f7b 100644 --- a/phpOMS/application.md +++ b/phpOMS/application.md @@ -21,10 +21,10 @@ The .htaccess file can be used to enable URL rewriting, file compression for css ## index.php -In the index file the application gets initialized and executed. +In the index file the application gets initialized and executed. ```php -run(); // outputs the application response \ob_end_flush(); ``` -We use output buffering `\ob_start()` and `\ob_end_flush()` which allows the application to internally modify the response before it gets returned to the user. +We use output buffering `\ob_start()` and `\ob_end_flush()` which allows the application to internally modify the response before it gets returned to the user. ## Application.php The application file is responsible for initializing the application resources, handling the request and response population (see Router and Dispatcher) as well as rendering the main view. Another task which is often performed in this file is the user authentication. ```php - +

diff --git a/security/security_guidelines.md b/security/security_guidelines.md index 397bdcb..2e43d49 100755 --- a/security/security_guidelines.md +++ b/security/security_guidelines.md @@ -72,8 +72,8 @@ Javascript can now be included like this: $head = $response->data['Content']->head; $nonce = $this->app->appSettings->getOption('script-nonce'); -$head->addAsset(AssetType::JSLATE, 'Resources/chartjs/Chartjs/chart.js', ['nonce' => $nonce]); -$head->addAsset(AssetType::JSLATE, 'Modules/ItemManagement/Controller.js', ['nonce' => $nonce, 'type' => 'module']); +$head->addAsset(AssetType::JSLATE, 'Resources/chartjs/Chartjs/chart.js?v=' . $this->app->version, ['nonce' => $nonce]); +$head->addAsset(AssetType::JSLATE, 'Modules/ItemManagement/Controller.js?v=' . self::VERSION, ['nonce' => $nonce, 'type' => 'module']); ``` ### X-XSS-Protection diff --git a/standards/documentation.md b/standards/documentation.md index ce6286e..bc20f8c 100755 --- a/standards/documentation.md +++ b/standards/documentation.md @@ -188,11 +188,19 @@ In code todos can be created like this ```php /** * @todo Multi line todo - * This way developers can see todos directly in the code without going to an external source. - * Todos must not have empty lines in their descriptions. - * If the external ressources have empty lines they must be removed in the todo comment. - * 1. list item 1 - * 2. list item 2 + * This way developers can see todos directly in the code without going to an external source. + * Todos must not have empty lines in their descriptions. + * If the external resources have empty lines they must be removed in the todo comment. + * 1. list item 1 + * 2. list item 2 */ ``` +We support and recognize the following todo tags: + +* @security For todos which have a strong security impact +* @bug For bugs +* @feature For features that should be implemented +* @performance For ideas/concerns regarding performance +* @todo General todos +* @question Ideas and concerns that need further investigation