Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
typo3
qfq
Commits
6d10c0ee
Commit
6d10c0ee
authored
Mar 22, 2022
by
Carsten Rose
Browse files
Merge branch 'develop' into F9052_Report_CodeMirror
parents
5dc4165f
7c78abf2
Pipeline
#6982
passed with stage
in 2 minutes and 14 seconds
Changes
61
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
extension/Classes/Api/dataReport.php
View file @
6d10c0ee
...
...
@@ -10,7 +10,6 @@ namespace IMATHUZH\Qfq\Api;
require_once
(
__DIR__
.
'/../../vendor/autoload.php'
);
use
IMATHUZH\Qfq\Core\Helper\Path
;
use
IMATHUZH\Qfq\Core\QuickFormQuery
;
use
IMATHUZH\Qfq\Core\Store\Store
;
...
...
extension/Classes/Api/delete.php
View file @
6d10c0ee
...
...
@@ -10,7 +10,6 @@ namespace IMATHUZH\Qfq\Api;
require_once
(
__DIR__
.
'/../../vendor/autoload.php'
);
use
IMATHUZH\Qfq\Core\Helper\Path
;
use
IMATHUZH\Qfq\Core\QuickFormQuery
;
use
IMATHUZH\Qfq\Core\Store\Store
;
...
...
extension/Classes/Api/dirty.php
View file @
6d10c0ee
...
...
@@ -11,7 +11,6 @@ namespace IMATHUZH\Qfq\Api;
require_once
(
__DIR__
.
'/../../vendor/autoload.php'
);
use
IMATHUZH\Qfq\Core\Form\Dirty
;
use
IMATHUZH\Qfq\Core\Helper\Path
;
/**
* Return JSON encoded answer
...
...
extension/Classes/Api/download.php
View file @
6d10c0ee
...
...
@@ -12,7 +12,6 @@ namespace IMATHUZH\Qfq\Api;
require_once
(
__DIR__
.
'/../../vendor/autoload.php'
);
use
IMATHUZH\Qfq\Core\Helper\Path
;
use
IMATHUZH\Qfq\Core\Report\Download
;
...
...
extension/Classes/Api/dragAndDrop.php
View file @
6d10c0ee
...
...
@@ -10,7 +10,6 @@ namespace IMATHUZH\Qfq\Api;
require_once
(
__DIR__
.
'/../../vendor/autoload.php'
);
use
IMATHUZH\Qfq\Core\Helper\Path
;
use
IMATHUZH\Qfq\Core\QuickFormQuery
;
...
...
extension/Classes/Api/file.php
View file @
6d10c0ee
...
...
@@ -11,7 +11,6 @@ namespace IMATHUZH\Qfq\Api;
require_once
(
__DIR__
.
'/../../vendor/autoload.php'
);
use
IMATHUZH\Qfq\Core\File
;
use
IMATHUZH\Qfq\Core\Helper\Path
;
/**
* Process File Upload - immediately when the the user selects a file.
...
...
extension/Classes/Api/load.php
View file @
6d10c0ee
...
...
@@ -10,9 +10,8 @@ namespace IMATHUZH\Qfq\Api;
require_once
(
__DIR__
.
'/../../vendor/autoload.php'
);
use
IMATHUZH\Qfq\Core\Helper\Path
;
use
IMATHUZH\Qfq\Core\Store\Store
;
use
IMATHUZH\Qfq\Core\QuickFormQuery
;
use
IMATHUZH\Qfq\Core\Store\Store
;
/**
...
...
extension/Classes/Api/print.php
View file @
6d10c0ee
...
...
@@ -11,7 +11,6 @@ namespace IMATHUZH\Qfq\Api;
require_once
(
__DIR__
.
'/../../vendor/autoload.php'
);
use
IMATHUZH\Qfq\Core\Helper\Path
;
use
IMATHUZH\Qfq\Core\Report\Html2Pdf
;
use
IMATHUZH\Qfq\Core\Store\Config
;
...
...
extension/Classes/Api/rest.php
View file @
6d10c0ee
...
...
@@ -10,9 +10,8 @@ namespace IMATHUZH\Qfq\Api;
require_once
(
__DIR__
.
'/../../vendor/autoload.php'
);
use
IMATHUZH\Qfq\Core\Helper\Path
;
use
IMATHUZH\Qfq\Core\QuickFormQuery
;
use
IMATHUZH\Qfq\Core\Helper\OnString
;
use
IMATHUZH\Qfq\Core\QuickFormQuery
;
$restId
=
array
();
$restForm
=
array
();
...
...
extension/Classes/Api/save.php
View file @
6d10c0ee
...
...
@@ -10,10 +10,9 @@ namespace IMATHUZH\Qfq\Api;
require_once
(
__DIR__
.
'/../../vendor/autoload.php'
);
use
IMATHUZH\Qfq\Core\Helper\
Path
;
use
IMATHUZH\Qfq\Core\Helper\
Support
;
use
IMATHUZH\Qfq\Core\QuickFormQuery
;
use
IMATHUZH\Qfq\Core\Store\Store
;
use
IMATHUZH\Qfq\Core\Helper\Support
;
/**
* Return JSON encoded answer
...
...
extension/Classes/Api/setting.php
View file @
6d10c0ee
...
...
@@ -10,7 +10,6 @@ namespace IMATHUZH\Qfq\Api;
require_once
(
__DIR__
.
'/../../vendor/autoload.php'
);
use
IMATHUZH\Qfq\Core\Helper\Path
;
use
IMATHUZH\Qfq\Core\QuickFormQuery
;
/**
...
...
extension/Classes/Api/typeahead.php
View file @
6d10c0ee
...
...
@@ -12,7 +12,6 @@ namespace IMATHUZH\Qfq\Api;
require_once
(
__DIR__
.
'/../../vendor/autoload.php'
);
use
IMATHUZH\Qfq\Core\Form\TypeAhead
;
use
IMATHUZH\Qfq\Core\Helper\Path
;
/**
* Return JSON encoded answer
...
...
extension/Classes/Controller/QfqController.php
View file @
6d10c0ee
...
...
@@ -7,7 +7,6 @@ namespace IMATHUZH\Qfq\Controller;
require_once
(
__DIR__
.
'/../../vendor/autoload.php'
);
use
IMATHUZH\Qfq\Core\Helper\Path
;
use
IMATHUZH\Qfq\Core\QuickFormQuery
;
...
...
extension/Classes/Core/AbstractBuildForm.php
View file @
6d10c0ee
...
...
@@ -1489,7 +1489,7 @@ abstract class AbstractBuildForm {
}
}
// If type password is selected then type text with own class will be taken to fake password over CSS
if
(
$formElement
[
FE_TYPE
]
===
'password'
){
if
(
$formElement
[
FE_TYPE
]
===
'password'
)
{
$formElement
[
FE_TYPE
]
=
'text'
;
$class
.
=
' qfq-password'
;
}
...
...
@@ -1499,9 +1499,9 @@ abstract class AbstractBuildForm {
}
// Set for password to give choice of generated password for user and not autofill password field. Deprecated, we dont use type password anymore.
// if($formElement[FE_TYPE] === 'password') {
// $attribute .= Support::doAttribute('autocomplete', 'new-password');
// }
// if($formElement[FE_TYPE] === 'password') {
// $attribute .= Support::doAttribute('autocomplete', 'new-password');
// }
$attribute
.
=
HelperFormElement
::
getAttributeList
(
$formElement
,
[
FE_INPUT_AUTOCOMPLETE
,
'autofocus'
,
'placeholder'
]);
...
...
extension/Classes/Core/BodytextParser.php
View file @
6d10c0ee
...
...
@@ -8,7 +8,7 @@
namespace
IMATHUZH\Qfq\Core
;
use
IMATHUZH\Qfq\Core\Helper\Support
;
const
NESTING_TOKEN_OPEN
=
'#&nesting-open-&#'
;
...
...
@@ -121,7 +121,7 @@ class BodytextParser {
if
(
$firstLine
[
0
]
===
'#'
)
{
$token
=
substr
(
$firstLine
,
-
1
);
switch
(
$token
)
{
switch
(
$token
)
{
case
'<'
:
$nestingOpen
=
'<'
;
$nestingClose
=
'>'
;
...
...
extension/Classes/Core/BuildFormBootstrap.php
View file @
6d10c0ee
...
...
@@ -22,6 +22,7 @@ use IMATHUZH\Qfq\Core\Helper\Support;
class
BuildFormBootstrap
extends
AbstractBuildForm
{
private
$isFirstPill
;
/**
* @param array $formSpec
* @param array $feSpecAction
...
...
@@ -155,7 +156,7 @@ class BuildFormBootstrap extends AbstractBuildForm {
$class
[]
=
'qfq-form-no-title'
;
}
}
$html
.
=
"<div "
.
Support
::
doAttribute
(
'class'
,
$class
)
.
">"
;
$html
.
=
"<div "
.
Support
::
doAttribute
(
'class'
,
$class
)
.
">"
;
return
$html
;
}
...
...
@@ -267,7 +268,7 @@ class BuildFormBootstrap extends AbstractBuildForm {
$toolTip
=
"Form not 'form' or 'formElement'"
;
$status
=
'disabled'
;
}
else
{
if
(
$requiredNew
===
''
){
if
(
$requiredNew
===
''
)
{
$requiredNew
=
$this
->
store
->
getVar
(
F_REQUIRED_PARAMETER_NEW
,
STORE_RECORD
.
STORE_EMPTY
);
}
if
(
trim
(
$requiredNew
)
!==
''
)
{
...
...
@@ -648,8 +649,8 @@ class BuildFormBootstrap extends AbstractBuildForm {
$submitTo
=
Path
::
urlApi
(
API_SAVE_PHP
);
$refreshUrl
=
Path
::
urlApi
(
API_LOAD_PHP
);
$fileUploadTo
=
Path
::
urlApi
(
API_FILE_PHP
)
.
'?'
.
$actionUpload
;
$fileDeleteUrl
=
Path
::
urlApi
(
API_FILE_PHP
)
.
'?'
.
$actionDelete
;
$fileUploadTo
=
Path
::
urlApi
(
API_FILE_PHP
)
.
'?'
.
$actionUpload
;
$fileDeleteUrl
=
Path
::
urlApi
(
API_FILE_PHP
)
.
'?'
.
$actionDelete
;
$html
.
=
'</form>'
;
// <form class="form-horizontal" ...
$html
.
=
<<<EOF
...
...
@@ -703,10 +704,6 @@ EOF;
}
$html
.
=
'</div>'
;
// <div class="container-fluid"> === main <div class=...> around everything
return
$html
;
...
...
extension/Classes/Core/BuildFormPlain.php
View file @
6d10c0ee
...
...
@@ -9,8 +9,6 @@
namespace
IMATHUZH\Qfq\Core
;
/**
* Class BuildFormPlain
* @package qfq
...
...
extension/Classes/Core/BuildFormTable.php
View file @
6d10c0ee
...
...
@@ -8,7 +8,7 @@
namespace
IMATHUZH\Qfq\Core
;
use
IMATHUZH\Qfq\Core\Helper\OnArray
;
use
IMATHUZH\Qfq\Core\Helper\Support
;
...
...
extension/Classes/Core/Constants.php
View file @
6d10c0ee
...
...
@@ -79,7 +79,6 @@ const NAME_TG_COPIES = '_tgCopies'; // Number of templatesGroup copies to creat
const
FE_TG_INDEX
=
'_tgIndex'
;
// Index of the current copy of a templateGroup FE.
// Index wrap setup table
const
WRAP_SETUP_TITLE
=
'title'
;
const
WRAP_SETUP_ELEMENT
=
'element'
;
...
...
@@ -494,7 +493,7 @@ const TYPO3_PAGE_TITLE = 'pageTitle';
const
TYPO3_PAGE_TYPE
=
'pageType'
;
const
TYPO3_PAGE_ABSTRACT
=
'pageAbstract'
;
const
TYPO3_PAGE_DESCRIPTION
=
'pageDescription'
;
const
TYPO3_PAGE_KEYWORDS
=
'pageKeywords'
;
const
TYPO3_PAGE_KEYWORDS
=
'pageKeywords'
;
const
TYPO3_PAGE_NAV_TITLE
=
'pageNavTitle'
;
const
TYPO3_PAGE_LANGUAGE
=
'pageLanguage'
;
...
...
extension/Classes/Core/Database/Database.php
View file @
6d10c0ee
...
...
@@ -456,10 +456,10 @@ class Database {
case
'CALL'
:
$result
=
$this
->
mysqli_stmt
->
get_result
();
$queryType
=
QUERY_TYPE_SELECT
;
If
(
$result
===
false
){
if
(
$result
===
false
)
{
$stat
[
DB_NUM_ROWS
]
=
0
;
$msg
=
'Read rows: '
.
$stat
[
DB_NUM_ROWS
]
.
'(No SELECT statement)'
;
}
else
{
}
else
{
$this
->
mysqli_result
=
$result
;
$stat
[
DB_NUM_ROWS
]
=
$this
->
mysqli_result
->
num_rows
;
$msg
=
'Read rows: '
.
$stat
[
DB_NUM_ROWS
];
...
...
Prev
1
2
3
4
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment