Commit a53a344e authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge branch 'develop' into f10782-UploadImageInTinyMCE

parents b63866f4 ccbda057
Pipeline #6953 passed with stage
in 1 minute and 57 seconds
......@@ -58,3 +58,4 @@ Software distributed together with QFQ
* bootstrap-validator.js - https://github.com/1000hz/bootstrap-validator
* Event Emitter - https://git.io/ee
* FullCalendar - https://fullcalendar.io/
* Datetimepicker - https://getdatepicker.com/
......@@ -858,8 +858,12 @@ abstract class AbstractBuildForm {
}
}
// Typehead might deliver an array, which is unwanted: fix this
if (is_array($value) && isset($value[0][API_TYPEAHEAD_VALUE])) {
$value = $value[0][API_TYPEAHEAD_VALUE];
}
if ($formElement[FE_ENCODE] === FE_ENCODE_SPECIALCHAR) {
// $value = htmlspecialchars_decode($value, ENT_QUOTES);
$value = Support::htmlEntityEncodeDecode(MODE_DECODE, $value);
} elseif ($formElement[FE_ENCODE] === FE_ENCODE_SINGLE_TICK) {
$value = OnString::escapeSingleTickInHtml($value);
......@@ -3139,7 +3143,7 @@ abstract class AbstractBuildForm {
}
// if FE type datetime and showSeconds is set, corrected format is needed
if($formElement[FE_TYPE] === FE_TYPE_DATETIME && $formElement[FE_SHOW_SECONDS] == 1 && $defaultDateFormat === 'DD.MM.YYYY HH:mm') {
if ($formElement[FE_TYPE] === FE_TYPE_DATETIME && $formElement[FE_SHOW_SECONDS] == 1 && $defaultDateFormat === 'DD.MM.YYYY HH:mm') {
$defaultDateFormat .= ':ss';
}
......@@ -3148,10 +3152,10 @@ abstract class AbstractBuildForm {
if ($formElement[FE_DATE_FORMAT] === 'hh:mm' || $formElement[FE_DATE_FORMAT] === 'hh:mm:ss' || $formElement[FE_SHOW_SECONDS] == 1) {
if ($formElement[FE_DATE_FORMAT] === 'HH:mm:ss' || $formElement[FE_SHOW_SECONDS] == 1) {
$defaultDateFormat = 'HH:mm:ss';
}else {
} else {
$defaultDateFormat = 'hh:mm';
}
}else{
} else {
$defaultDateFormat = 'HH:mm';
}
}
......
......@@ -235,7 +235,7 @@ class BuildFormBootstrap extends AbstractBuildForm {
/**
* Creates a link to open current form loaded in FormEditor
*
* @return string - the rendered Checkbox
* @return string
* @throws \CodeException
* @throws \DbException
* @throws \UserFormException
......
......@@ -193,8 +193,8 @@ class Checkbox {
/**
* Build as many Checkboxes as items.
*
* Layout: The Bootstrap Layout needs very special setup, the checkboxes are wrapped differently with <div
* class=checkbox> depending of if they aligned horizontal or vertical.
* Layout: The Bootstrap Layout needs very special setup, the checkboxes are wrapped differently with
* <div class=checkbox> depending of if they aligned horizontal or vertical.
* @param array $formElement
* @param string $htmlFormElementName
* @param string $attributeBase
......
......@@ -600,14 +600,10 @@ class Config {
$config[SYSTEM_BASE_URL] = (empty($finalBaseUrl)) ? $arr[0] : $finalBaseUrl;
}
//echo "CLIENT_REQUEST_SCHEME: " . ($_SERVER[CLIENT_REQUEST_SCHEME] ?? '') . PHP_EOL . "<br>SYSTEM_BASE_URL: " . $config[SYSTEM_BASE_URL] . PHP_EOL . '<br>';
// In case there is a) a CLIENT_REQUEST_SCHEME and b) no scheme: use the scheme of the current called url.
// In case there is no scheme: use the scheme of the current called url. If there is no $_SERVER[CLIENT_REQUEST_SCHEME], use 'http'.
if (substr($config[SYSTEM_BASE_URL], 0, 4) != 'http') {
//TODO: Die folgende Zeile ist auskommentiert damit die SELENIUM Tests durchlaufen.
// Muss schnell gefixt werden damit wir dynamisches Scheme detection haben.
$config[SYSTEM_BASE_URL] = ($_SERVER[CLIENT_REQUEST_SCHEME] ?? 'http') . '://' . $config[SYSTEM_BASE_URL];
}
// echo "SYSTEM_BASE_URL: " . $config[SYSTEM_BASE_URL] . PHP_EOL . '<br>';
}
return $config;
}
......
......@@ -7,7 +7,7 @@ render = single
# cat=config/config; type=string; label=Max file size for file uploads:If empty, take minimum of 'post_max_size' and 'upload_max_filesize' (PHP.INI).
maxFileSize =
# cat=config/config; type=string; label=Base URL of the current Typo3 installation: Example: https://your.base.url/including/sub/dir. Separate multiple URLs with comma - final one will dynmaically detected. Will be used to convert local pages to PDF. Use {{baseUrl:Y}} whenever the own URL should be displayed.
# cat=config/config; type=string; label=Base URL of the current Typo3 installation: Example: https://your.base.url/including/sub/dir. Separate multiple URLs with comma. Final one will dynamically detected. Will be used to convert local pages to PDF. Use {{baseUrl:Y}} whenever the own URL should be displayed. Skip the scheme if the website needs to be accessible with http and https.
baseUrl =
# cat=config/config; type=string; label=HTTP Origin of the current Typo3 installation: Example: "https://webwork16.math.uzh.ch". Will be used for picture upload check. Use {{httpOrigin:Y}} whenever the own HTTP Origin should be displayed.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment