mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-08-05 05:37:45 +02:00
Code Issues Releases Wiki Activity

Fixed download controller and errors with publicfielddefinitions

Browse Source
This commit is contained in:
trendschau
2021-11-20 14:23:29 +01:00
parent 6e1e2d1e34
commit 63c8b204d7
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
content/00-welcome/01-manage-access.md
View File

@@ -2,9 +2,6 @@
Typemill has a build-in system to restrict access to pages or to the whole websites. You can activate both features in the system settings under the section "access rights". If you activate one of the features, then Typemill will use session cookies on all frontend pages. Learn all the details in the following video tutorial:
```pagebreak
```
![youtube-video](media/live/youtube-uw-m-4g1kaa.jpeg "click to load video"){#UW_m-4g1kAA .youtube}
## Restrict Access for the Website

2
system/Controllers/ControllerDownload.php
View File

@@ -137,7 +137,7 @@ class ControllerDownload extends ControllerShared
header_remove("Last-Modified");
header('Cache-Control: max-age=0, no-cache, no-store, must-revalidate');
header('Cache-Control: private', false); # required for some browsers
header('Content-Type: application/zip');
header('Content-Type: ' . $mimetype);
header('Content-Disposition: attachment; filename="'.basename($file).'";'); # Make the browser display the Save As dialog
header('Content-Transfer-Encoding: binary');
header('Content-Length: '.filesize($file));

4
system/Models/Fields.php
View File

@@ -91,6 +91,10 @@ class Fields
# Now prepopulate the field object with the value */
if($field->getType() == "textarea")
{
if($fieldName == "publicformdefinitions" && $userValue == '')
{
$userValue = $objectSettings['settings'][$fieldName];
}
if($userValue)
{
$field->setContent($userValue);

7
system/Plugin.php
View File

@@ -257,11 +257,16 @@ abstract class Plugin implements EventSubscriberInterface
# get settings and start validation
$originalSettings = \Typemill\Settings::getObjectSettings('plugins', $pluginName);
if(isset($settings['plugins'][$pluginName]['publicformdefinitions']))
if(isset($settings['plugins'][$pluginName]['publicformdefinitions']) && $settings['plugins'][$pluginName]['publicformdefinitions'] != '')
{
$arrayFromYaml = \Symfony\Component\Yaml\Yaml::parse($settings['plugins'][$pluginName]['publicformdefinitions']);
$originalSettings['public']['fields'] = $arrayFromYaml;
}
elseif(isset($originalSettings['settings']['publicformdefinitions']))
{
$arrayFromYaml = \Symfony\Component\Yaml\Yaml::parse($originalSettings['settings']['publicformdefinitions']);
$originalSettings['public']['fields'] = $arrayFromYaml;
}
$validate = new Validation();

6
system/author/partials/fields.twig
View File

@@ -54,7 +54,7 @@
{% elseif field.type == 'checkbox' %}
<label class="control-group">{{ __( field.getCheckboxLabel() ) }}
<label class="control-group">{{ markdown( field.getCheckboxLabel() ) }}
<input type="checkbox" id="{{ itemName}}[{{ field.name }}]" name="{{ itemName}}[{{ field.name }}]"{{ field.getAttributeValues() }}{{ field.getAttributes() }}>
<span class="checkmark"></span>
</label>
@@ -65,7 +65,7 @@
{% for value,label in options %}
<label class="control-group">{{ __( label ) }}
<label class="control-group">{{ markdown( label ) }}
<input type="checkbox" id="{{ itemName }}[{{ field.name }}][{{value}}]" name="{{ itemName }}[{{ field.name }}][{{value}}]" {{ settings[object][itemName][field.name][value] ? ' checked' : '' }}>
<span class="checkmark"></span>
</label>
@@ -88,7 +88,7 @@
{% for value,label in options %}
<label class="control-group">{{ __(label) }}
<label class="control-group">{{ markdown(label) }}
<input type="radio" id="{{ itemName }}[{{ field.name }}]" name="{{ itemName }}[{{ field.name }}]" value="{{ value }}" {{ (value == settings[object][itemName][field.name]) ? ' checked' : '' }}>
<span class="radiomark"></span>
</label>