Commit b221dfc3 authored by bbaer's avatar bbaer

Merge remote-tracking branch 'origin/master'

parents 40c362ef 6ffa1f1b
......@@ -36,6 +36,75 @@ Features
Bug Fixes
^^^^^^^^^
Version 18.4.4
--------------
Date: 28.04.18
Bug Fixes
^^^^^^^^^
* Fix broken ext_emconf.php
Version 18.4.3
--------------
Date: 28.04.18
Bug Fixes
^^^^^^^^^
* Version Number ...04... not supported by TE. Changing naming scheme to omit leading zero.
Version 18.04.1
---------------
Date: 28.04.2018
Bug Fixes
^^^^^^^^^
* config: broken dbIndexQfq, dbIndexData
Version 18.04.0
---------------
Date: 26.04.2018
Notes
^^^^^
* QFQ marked as 'stable'
* New version numbering: Year.Month.Index
* Manual.rst:
* AutoCron documentation enhanced.
* Replace '{{form:S}}' against '{{form:SE}}'.
* Check list for 'new installations'.
* Description for config variables enhanced.
* Details 'how record locking' is done.
* Details: extraButtonInfo
* Replace config.qfq.ini on most places with 'configuration'
* Path of 'sql.log' / 'mail.log' are now relative to <site path> (not <ext path> as before).
Features
^^^^^^^^
* formEditor.sql: update table cron.
* AutoCron.php: allow https connections with invalid certificate (e.g. 'localhost' is not listed as a valid hostname).
* ext_conf_template.txt: Extension manager configuration setup.
Bug Fixes
^^^^^^^^^
* AutoCron:
* Update form 'cron' to load/save records in DB_INDEX_QFQ
* Fix problem with array in checkForOldJobs().
* Implement check that re-trigger asynchronous cron jobs are handled correctly.
Version 0.25.15
---------------
......@@ -334,8 +403,8 @@ Bug Fixes
* #4865 / Pill Dynamic Updates Show / Hide
* #5031 / Missing details in DbException: New definition of SYSTEM_SHOW_DEBUG_INFO: even after config.qfq.ini is parsed
and SIP Infos has been read - if there is no BE User logged in, the value stays on 'auto' (earlier it has been replaced
to 'no'). Staying on 'auto' keeps the information that replacing is still open and not replaced means 'no'-BE User logged in.
and SIP Infos has been read - if there is no BE User logged in, the value stays on 'auto' (earlier it has been replaced
to 'no'). Staying on 'auto' keeps the information that replacing is still open and not replaced means 'no'-BE User logged in.
* #5016 / Loose checkbox value on save - Dirty workaround - better solution necessary.
* #5017 / STORE_RECORD used in FormElement and via '#!report' - save & restore STORE_RECORD.
* #5004 / FormElement with state 'ReadOnly' will be saved with empty value - existing values will be overwritten - fixed.
......@@ -951,7 +1020,7 @@ Features
* New security option `escapeTypeDefault`: will be defined 1) sytem wide in config.qfq.ini, or 2) more specific per
Form or 3) individually per variable. The later has priority.
* #3544 / Form: view current form - It's now possible to direct view a form, which is currently loaded/edited in the
FormEditor: Button 'eye' near left of button 'save'.
FormEditor: Button 'eye' near left of button 'save'.
* #3552 / typeAheadLdapSearchPerToken - webpass kann nicht gleichzeitig nach Vornamen und Nachnamen suchen. Added option
typeAheadLdapSearchPerToken to split search value in token and OR-combine every search with the individual tokens.
* Download latest QFQ builds and releases: https://w3.math.uzh.ch/qfq/.
......@@ -1043,7 +1112,7 @@ Bug Fixes
* TypeAhead.js: Handle <ENTER> key properly.
* #3462 / FormElement.parameter: requiredList not ok for non numeric content. STORE_FORM had been called without 'sanatize class'.
Therefore, all non numeric values has been sanatized by default. New: SANATIZE_ALLOW_ALL.
Therefore, all non numeric values has been sanatized by default. New: SANATIZE_ALLOW_ALL.
* Corrected error message to use 'itemList' instead of 'itemValues'. Renamed constant too.
* #2542 / FormElement-Typ 'note' funktioniert nicht mit dynamic update. 'Label' and 'note' are fixed - 'value' is still not updated, open.
......@@ -1084,8 +1153,8 @@ Bug Fixes
* #3419 / typeAheadSql: Array with only one column or non standard columnnames are not handeld properbly.
Detection of missing LIMIT implemented.
* #3425 / Form.parameter, FormElement.parameter: comment handling, trailing & leading spaces
Manual.rst: commented handling of 'comment character' and 'escaping of leading/trailing spaces'
Support.php: new funtion handleEscapeSpaceComment().
Manual.rst: commented handling of 'comment character' and 'escaping of leading/trailing spaces'
Support.php: new funtion handleEscapeSpaceComment().
* Evaluate.php: parse all F|FE.parameter via handleEscapeSpaceComment(). A leading '#' or ' ' might be escaped by '\'.
* Saving 'extra' FE in STORE_SIP has been done with inappropiate FE_NAME. Correct is the pure FE_NAME, without any
extension like recordId. Unessary and broken decoding removed.
......
......@@ -11,7 +11,7 @@ RELEASE_DATE = $(shell date '+%Y%m%d%H%M')
GIT_REVISION_SHORT = $(shell git rev-parse --short HEAD || true)
GIT_REVISION_LONG = $(shell git rev-parse HEAD || true)
EXTENSION_CONTENT = Classes Configuration Documentation qfq Resources ext_emconf.php ext_localconf.php ext_tables.php ext_icon.png config.qfq.example.ini RELEASE.txt
EXTENSION_CONTENT = Classes Configuration Documentation qfq Resources ext_emconf.php ext_localconf.php ext_tables.php ext_icon.png ext_conf_template.txt config.qfq.example.ini RELEASE.txt
DISTDIR=dist
......
......@@ -47,8 +47,8 @@ Neue Versionsnummer
6) **New Tag**:
git tag v0.25.15a
git push -u origin v0.25.15a
git tag v18.4.4
git push -u origin v18.4.4
7) PhpStorm: **Sync** all files to VM qfq.
......@@ -58,10 +58,8 @@ Update Doku auf docs.typo3.org
https://docs.typo3.org/typo3cms/drafts/github/T3DocumentationStarter/Public-Info-053/
1) Copy - Im `qfq` Projektverzeichnis: make update-qfq-doc
2) Commit - In `qfq-doc` Projektverzeichnis wechseln und auf github einchecken:
1) Copy 'qfq' doc to github project 'qfq-doc'. Commit changes. Push changes to github::
make update-qfq-doc
git commit -a
git push # User: math-uzh, PW: <kpit>
**one line**: make update-qfq-doc; pushd ../qfq-doc; git commit -a; git push; popd
\ No newline at end of file
......@@ -36,10 +36,10 @@ QFQ Extension
2017
:Author:
Carsten Rose, Rafael Ostertag
Carsten Rose, Benjamin Baer
:Email:
carsten.rose@math.uzh.ch, rafael.ostertag@math.uzh.ch
carsten.rose@math.uzh.ch, benjamin.baer@math.uzh.ch
:License:
This document is published under the Open Publication License
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -36,6 +36,75 @@ Features
Bug Fixes
^^^^^^^^^
Version 18.4.4
--------------
Date: 28.04.18
Bug Fixes
^^^^^^^^^
* Fix broken ext_emconf.php
Version 18.4.3
--------------
Date: 28.04.18
Bug Fixes
^^^^^^^^^
* Version Number ...04... not supported by TE. Changing naming scheme to omit leading zero.
Version 18.04.1
---------------
Date: 28.04.2018
Bug Fixes
^^^^^^^^^
* config: broken dbIndexQfq, dbIndexData
Version 18.04.0
---------------
Date: 26.04.2018
Notes
^^^^^
* QFQ marked as 'stable'
* New version numbering: Year.Month.Index
* Manual.rst:
* AutoCron documentation enhanced.
* Replace '{{form:S}}' against '{{form:SE}}'.
* Check list for 'new installations'.
* Description for config variables enhanced.
* Details 'how record locking' is done.
* Details: extraButtonInfo
* Replace config.qfq.ini on most places with 'configuration'
* Path of 'sql.log' / 'mail.log' are now relative to <site path> (not <ext path> as before).
Features
^^^^^^^^
* formEditor.sql: update table cron.
* AutoCron.php: allow https connections with invalid certificate (e.g. 'localhost' is not listed as a valid hostname).
* ext_conf_template.txt: Extension manager configuration setup.
Bug Fixes
^^^^^^^^^
* AutoCron:
* Update form 'cron' to load/save records in DB_INDEX_QFQ
* Fix problem with array in checkForOldJobs().
* Implement check that re-trigger asynchronous cron jobs are handled correctly.
Version 0.25.15
---------------
......@@ -334,8 +403,8 @@ Bug Fixes
* #4865 / Pill Dynamic Updates Show / Hide
* #5031 / Missing details in DbException: New definition of SYSTEM_SHOW_DEBUG_INFO: even after config.qfq.ini is parsed
and SIP Infos has been read - if there is no BE User logged in, the value stays on 'auto' (earlier it has been replaced
to 'no'). Staying on 'auto' keeps the information that replacing is still open and not replaced means 'no'-BE User logged in.
and SIP Infos has been read - if there is no BE User logged in, the value stays on 'auto' (earlier it has been replaced
to 'no'). Staying on 'auto' keeps the information that replacing is still open and not replaced means 'no'-BE User logged in.
* #5016 / Loose checkbox value on save - Dirty workaround - better solution necessary.
* #5017 / STORE_RECORD used in FormElement and via '#!report' - save & restore STORE_RECORD.
* #5004 / FormElement with state 'ReadOnly' will be saved with empty value - existing values will be overwritten - fixed.
......@@ -951,7 +1020,7 @@ Features
* New security option `escapeTypeDefault`: will be defined 1) sytem wide in config.qfq.ini, or 2) more specific per
Form or 3) individually per variable. The later has priority.
* #3544 / Form: view current form - It's now possible to direct view a form, which is currently loaded/edited in the
FormEditor: Button 'eye' near left of button 'save'.
FormEditor: Button 'eye' near left of button 'save'.
* #3552 / typeAheadLdapSearchPerToken - webpass kann nicht gleichzeitig nach Vornamen und Nachnamen suchen. Added option
typeAheadLdapSearchPerToken to split search value in token and OR-combine every search with the individual tokens.
* Download latest QFQ builds and releases: https://w3.math.uzh.ch/qfq/.
......@@ -1043,7 +1112,7 @@ Bug Fixes
* TypeAhead.js: Handle <ENTER> key properly.
* #3462 / FormElement.parameter: requiredList not ok for non numeric content. STORE_FORM had been called without 'sanatize class'.
Therefore, all non numeric values has been sanatized by default. New: SANATIZE_ALLOW_ALL.
Therefore, all non numeric values has been sanatized by default. New: SANATIZE_ALLOW_ALL.
* Corrected error message to use 'itemList' instead of 'itemValues'. Renamed constant too.
* #2542 / FormElement-Typ 'note' funktioniert nicht mit dynamic update. 'Label' and 'note' are fixed - 'value' is still not updated, open.
......@@ -1084,8 +1153,8 @@ Bug Fixes
* #3419 / typeAheadSql: Array with only one column or non standard columnnames are not handeld properbly.
Detection of missing LIMIT implemented.
* #3425 / Form.parameter, FormElement.parameter: comment handling, trailing & leading spaces
Manual.rst: commented handling of 'comment character' and 'escaping of leading/trailing spaces'
Support.php: new funtion handleEscapeSpaceComment().
Manual.rst: commented handling of 'comment character' and 'escaping of leading/trailing spaces'
Support.php: new funtion handleEscapeSpaceComment().
* Evaluate.php: parse all F|FE.parameter via handleEscapeSpaceComment(). A leading '#' or ' ' might be escaped by '\'.
* Saving 'extra' FE in STORE_SIP has been done with inappropiate FE_NAME. Correct is the pure FE_NAME, without any
extension like recordId. Unessary and broken decoding removed.
......
......@@ -2,8 +2,8 @@
[general]
project = QFQ - Quick Form Query
version = 0.25
release = 0.25.15a
version = 18.4
release = 18.4.4
t3author = Carsten Rose
copyright = since 2017 by the author
......
......@@ -57,9 +57,9 @@ copyright = u'2017, Carsten Rose'
# built documents.lease
#
# The short X.Y version.
version = '0.25'
version = '18.4'
# The full version, including alpha/beta/rc tags.
release = '0.25.15a'
release = '18.4.4'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
......@@ -36,6 +36,75 @@ Features
Bug Fixes
^^^^^^^^^
Version 18.4.4
--------------
Date: 28.04.18
Bug Fixes
^^^^^^^^^
* Fix broken ext_emconf.php
Version 18.4.3
--------------
Date: 28.04.18
Bug Fixes
^^^^^^^^^
* Version Number ...04... not supported by TE. Changing naming scheme to omit leading zero.
Version 18.04.1
---------------
Date: 28.04.2018
Bug Fixes
^^^^^^^^^
* config: broken dbIndexQfq, dbIndexData
Version 18.04.0
---------------
Date: 26.04.2018
Notes
^^^^^
* QFQ marked as 'stable'
* New version numbering: Year.Month.Index
* Manual.rst:
* AutoCron documentation enhanced.
* Replace '{{form:S}}' against '{{form:SE}}'.
* Check list for 'new installations'.
* Description for config variables enhanced.
* Details 'how record locking' is done.
* Details: extraButtonInfo
* Replace config.qfq.ini on most places with 'configuration'
* Path of 'sql.log' / 'mail.log' are now relative to <site path> (not <ext path> as before).
Features
^^^^^^^^
* formEditor.sql: update table cron.
* AutoCron.php: allow https connections with invalid certificate (e.g. 'localhost' is not listed as a valid hostname).
* ext_conf_template.txt: Extension manager configuration setup.
Bug Fixes
^^^^^^^^^
* AutoCron:
* Update form 'cron' to load/save records in DB_INDEX_QFQ
* Fix problem with array in checkForOldJobs().
* Implement check that re-trigger asynchronous cron jobs are handled correctly.
Version 0.25.15
---------------
......@@ -334,8 +403,8 @@ Bug Fixes
* #4865 / Pill Dynamic Updates Show / Hide
* #5031 / Missing details in DbException: New definition of SYSTEM_SHOW_DEBUG_INFO: even after config.qfq.ini is parsed
and SIP Infos has been read - if there is no BE User logged in, the value stays on 'auto' (earlier it has been replaced
to 'no'). Staying on 'auto' keeps the information that replacing is still open and not replaced means 'no'-BE User logged in.
and SIP Infos has been read - if there is no BE User logged in, the value stays on 'auto' (earlier it has been replaced
to 'no'). Staying on 'auto' keeps the information that replacing is still open and not replaced means 'no'-BE User logged in.
* #5016 / Loose checkbox value on save - Dirty workaround - better solution necessary.
* #5017 / STORE_RECORD used in FormElement and via '#!report' - save & restore STORE_RECORD.
* #5004 / FormElement with state 'ReadOnly' will be saved with empty value - existing values will be overwritten - fixed.
......@@ -951,7 +1020,7 @@ Features
* New security option `escapeTypeDefault`: will be defined 1) sytem wide in config.qfq.ini, or 2) more specific per
Form or 3) individually per variable. The later has priority.
* #3544 / Form: view current form - It's now possible to direct view a form, which is currently loaded/edited in the
FormEditor: Button 'eye' near left of button 'save'.
FormEditor: Button 'eye' near left of button 'save'.
* #3552 / typeAheadLdapSearchPerToken - webpass kann nicht gleichzeitig nach Vornamen und Nachnamen suchen. Added option
typeAheadLdapSearchPerToken to split search value in token and OR-combine every search with the individual tokens.
* Download latest QFQ builds and releases: https://w3.math.uzh.ch/qfq/.
......@@ -1043,7 +1112,7 @@ Bug Fixes
* TypeAhead.js: Handle <ENTER> key properly.
* #3462 / FormElement.parameter: requiredList not ok for non numeric content. STORE_FORM had been called without 'sanatize class'.
Therefore, all non numeric values has been sanatized by default. New: SANATIZE_ALLOW_ALL.
Therefore, all non numeric values has been sanatized by default. New: SANATIZE_ALLOW_ALL.
* Corrected error message to use 'itemList' instead of 'itemValues'. Renamed constant too.
* #2542 / FormElement-Typ 'note' funktioniert nicht mit dynamic update. 'Label' and 'note' are fixed - 'value' is still not updated, open.
......@@ -1084,8 +1153,8 @@ Bug Fixes
* #3419 / typeAheadSql: Array with only one column or non standard columnnames are not handeld properbly.
Detection of missing LIMIT implemented.
* #3425 / Form.parameter, FormElement.parameter: comment handling, trailing & leading spaces
Manual.rst: commented handling of 'comment character' and 'escaping of leading/trailing spaces'
Support.php: new funtion handleEscapeSpaceComment().
Manual.rst: commented handling of 'comment character' and 'escaping of leading/trailing spaces'
Support.php: new funtion handleEscapeSpaceComment().
* Evaluate.php: parse all F|FE.parameter via handleEscapeSpaceComment(). A leading '#' or ' ' might be escaped by '\'.
* Saving 'extra' FE in STORE_SIP has been done with inappropiate FE_NAME. Correct is the pure FE_NAME, without any
extension like recordId. Unessary and broken decoding removed.
......
; QFQ configuration
;
; Save this file as: <Documentroot>/typo3conf/config.qfq.ini
; Configure own URL, where `wkhtmltopdf` fetches pages and produces PDFs
BASE_URL_PRINT = http://url.my/
; WKHTMLTOPDF = /opt/wkhtmltox/bin/wkhtmltopdf
; DB_INIT = set names utf8
; auto | always | never
; DB_UPDATE = auto
; DB_INDEX_DATA = 1
; DB_INDEX_QFQ = 1
; Save this file as: <site path>/typo3conf/config.qfq.ini
DB_1_USER = <DBUSER>
DB_1_SERVER = <DBSERVER>
......@@ -24,113 +12,6 @@ DB_1_NAME = <DB>
; DB_2_PASSWORD = <DBPW>
; DB_2_NAME = <DB>
; '../../sql.log' = <T3 Install directory>/typo3conf/sql.log
; SQL_LOG = ../../sql.log
; all|modify|error|none
; SQL_LOG_MODE = modify
; MAIL_LOG = ../../mail.log
; SEND_E_MAIL_OPTIONS = "-o ... " - check http://caspian.dotconf.net/menu/Software/SendEmail
; [auto|yes|no][,download]. 'auto': if BE User is logged in the value will be replaced by 'yes', else 'no'. Additional choose 'download'.
; SHOW_DEBUG_INFO = auto
; REDIRECT_ALL_MAIL_TO = john.doe@example.com
; QFQ with own Bootstrap: 'container'. QFQ already nested in Bootstrap of mainpage: <empty>
; CSS_CLASS_QFQ_CONTAINER =
; Default background color, specified via CSS class
; CSS_CLASS_QFQ_FORM =
; CSS_CLASS_QFQ_FORM_PILL = qfq-color-grey-1
; CSS_CLASS_QFQ_FORM_BODY = qfq-color-grey-2
; yyyy-mm-dd, dd.mm.yyyy
; DATE_FORMAT = yyyy-mm-dd
; Access via {{TECHNICAL_CONTACT:Y}}
; TECHNICAL_CONTACT = john@doe.com
; validator.js: data-pattern-error="", data-required-error="", data-match-error="", data-error=""
; FORM_DATA_PATTERN_ERROR =
; FORM_DATA_REQUIRED_ERROR =
; FORM_DATA_MATCH_ERROR =
; FORM_DATA_ERROR =
; Default width of whole form
; FORM_BS_COLUMNS = 12
; Default size for Bootstrap Form Elements
; FORM_BS_LABEL_COLUMNS = 3
; FORM_BS_INPUT_COLUMNS = 6
; FORM_BS_NOTE_COLUMNS = 3
; EDIT_FORM_PAGE = form
; LDAP_1_RDN =
; LDAP_1_PASSWORD =
; ESCAPE_TYPE_DEFAULT=m
; SECURITY_VARS_HONEYPOT=email,username,password
; SECURITY_ATTACK_DELAY=5
; SECURITY_SHOW_MESSAGE=true
; SECURITY_GET_MAX_LENGTH=50
; GFX_EXTRA_BUTTON_INFO_INLINE = <img src="file.png">
; GFX_EXTRA_BUTTON_INFO_BELOW = <img src="file.png">
; EXTRA_BUTTON_INFO_POSITION = auto | below
; EXTRA_BUTTON_INFO_POSITION_CLASS = pull-right
; SAVE_BUTTON_TEXT =
; SAVE_BUTTON_TOOLTIP = save
; SAVE_BUTTON_CLASS = btn btn-default navbar-btn
; SAVE_BUTTON_GLYPH_ICON = glyphicon-ok
; CLOSE_BUTTON_TEXT =
; CLOSE_BUTTON_TOOLTIP = close
; CLOSE_BUTTON_CLASS = btn btn-default navbar-btn
; CLOSE_BUTTON_GLYPH_ICON = glyphicon-remove
; DELETE_BUTTON_TEXT =
; DELETE_BUTTON_TOOLTIP = delete
; DELETE_BUTTON_CLASS = btn btn-default navbar-btn
; DELETE_BUTTON_GLYPH_ICON = glyphicon-trash
; NEW_BUTTON_TEXT =
; NEW_BUTTON_TOOLTIP = new
; NEW_BUTTON_CLASS = btn btn-default navbar-btn
; NEW_BUTTON_GLYPH_ICON = glyphicon-plus
; RECORD_LOCK_TIMEOUT_SECONDS = 900
; Local Documentation (doc fits to installed version): typo3conf/ext/qfq/Documentation/html/Manual.html
; DOCUMENTATION_QFQ = https://docs.typo3.org/typo3cms/drafts/github/T3DocumentationStarter/Public-Info-053/Manual.html
; FILL_STORE_SYSTEM_BY_SQL_1 = "SELECT id AS _periodId FROM Period WHERE start<=NOW() ORDER BY start DESC LIMIT 1"
; Important: only define an error message, if QFQ should stop running in case of an SQL error or not exact 1 record.
; FILL_STORE_SYSTEM_BY_SQL_ERROR_MSG_1 = No current period found
; FORM_LANGUAGE_A_ID = E.g. FORM_LANGUAGE_A_ID = 1
; FORM_LANGUAGE_A_LABEL = E.g. FORM_LANGUAGE_A_ID = English
; FORM_LANGUAGE_B_ID = E.g. FORM_LANGUAGE_B_ID = 2
; FORM_LANGUAGE_B_LABEL = E.g. FORM_LANGUAGE_B_ID = French
; FORM_LANGUAGE_C_ID = E.g. FORM_LANGUAGE_C_ID = 3
; FORM_LANGUAGE_C_LABEL = E.g. FORM_LANGUAGE_C_ID = Spain
; FORM_LANGUAGE_D_ID = E.g. FORM_LANGUAGE_D_ID = 4
; FORM_LANGUAGE_D_LABEL = E.g. FORM_LANGUAGE_D_ID = Chinese
; Pressing the 'enter' key is equal to save and close
; enterAsSubmit = 1
; Attention: be sure that 'fileadmin/protected' is really locked down by a webserver directive.
; See https://docs.typo3.org/typo3cms/drafts/github/T3DocumentationStarter/Public-Info-053/Manual.html#secure-direct-fileaccess
;
; thumbnailDirSecure = fileadmin/protected/qfqThumbnail
; thumbnailDirPublic = typo3temp/qfqThumbnail
; cmdInkscape = inkscape
; cmdConvert = convert
This diff is collapsed.
<?php
/**
* @author Rafael Ostertag <rafael.ostertag@math.uzh.ch>
* @author Carsten Rose <carsten.rose@math.uzh.ch>
*/
$EM_CONF[$_EXTKEY] = array(
'title' => 'QFQ Extension',
'description' => 'Quick Form Query Extension',
'category' => 'Frontend',
'author' => 'Carsten Rose, Rafael Ostertag',
'title' => 'Quick Form Query',
'description' => 'Create HTML output by using (native/extended) SQL (as page content records in T3 backend) and design HTML forms (in T3 frontend) with the QFQ FormEditor. Supports multiple databases and record locking.',
'category' => 'fe',
'author' => 'Carsten Rose, Benjamin Baer',
'author_email' => 'carsten.rose@math.uzh.ch',
'dependencies' => 'fluid,extbase',
'clearcacheonload' => true,
'state' => 'alpha',
'version' => '0.25.15'
'state' => 'stable',
'version' => '18.4.4',
'constraints' => [
'depends' => [
'typo3' => '6.0.0-9.2.99',
],
'conflicts' => [],
'suggests' => [],
],
);
<?php
/**
* @author Rafael Ostertag <rafael.ostertag@math.uzh.ch>
* @author Carsten Rose <carsten.rose@math.uzh.ch>
*/
if (!defined('TYPO3_MODE')) {
......@@ -11,7 +11,7 @@ if (!defined('TYPO3_MODE')) {
'IMATHUZH.' . $_EXTKEY,
'Qfq',
'QFQ Element',
'../typo3conf/ext/qfq/ext_icon.png'
'typo3conf/ext/qfq/ext_icon.png'
);
/*
......
......@@ -34,8 +34,8 @@ require_once(__DIR__ . '/../qfq/File.php');
$answer = array();
$answer[API_MESSAGE] = '';
$answer[API_STATUS] = API_ANSWER_STATUS_ERROR;
$answer[API_MESSAGE] = '';
try {
......@@ -51,8 +51,6 @@ try {
$answer[API_MESSAGE] = $e->formatMessage();
} catch (qfq\CodeException $e) {
$answer[API_MESSAGE] = $e->formatMessage();
} catch (qfq\DbException $e) {
$answer[API_MESSAGE] = $e->formatMessage();
} catch (\Exception $e) {
$answer[API_MESSAGE] = "Generic Exception: " . $e->getMessage();
}
......
......@@ -18,6 +18,10 @@ require_once(__DIR__ . '/../qfq/Evaluate.php');
require_once(__DIR__ . '/../qfq/report/SendMail.php');
require_once(__DIR__ . '/../qfq/helper/Support.php');
/**
* Class AutoCron
* @package qfq
*/
class AutoCron {
/**
......@@ -45,6 +49,13 @@ class AutoCron {
private $verbose = '';
/**
* AutoCron constructor.
* @param bool $verbose
* @param bool $phpUnit
* @throws CodeException
* @throws UserFormException
*/
public function __construct($verbose = false, $phpUnit = false) {
$this->verbose = $verbose;
......@@ -129,6 +140,8 @@ class AutoCron {
* @param array $job
*
* @return array $job, updated with AUTOCRON_LAST_STATUS
* @throws CodeException
* @throws UserFormException
*/
private function doJobWebsite(array $job) {
......@@ -140,12 +153,18 @@ class AutoCron {
// If the URL does not start with 'http...': prefix with the site config.
if (substr($job[AUTOCRON_CONTENT], 0, 4) != 'http') {
// We need to prefix
$baseUrl = $this->store->getVar(SYSTEM_BASE_URL_PRINT, STORE_SYSTEM);
$baseUrl = $this->store->getVar(SYSTEM_BASE_URL, STORE_SYSTEM);
$job[AUTOCRON_CONTENT] = $baseUrl . $job[AUTOCRON_CONTENT];
}
// Download page
$page = file_get_contents($job[AUTOCRON_CONTENT]);
$ctx = array(
"ssl" => array(
"verify_peer" => false,
"verify_peer_name" => false,
),
);
$page = file_get_contents($job[AUTOCRON_CONTENT], false, stream_context_create($ctx));
if ($page === false) {
$job[AUTOCRON_LAST_STATUS] = htmlspecialchars(AUTOCRON_STATUS_ERROR . 'failed to fetch "' . $job[AUTOCRON_CONTENT] . '"');
......@@ -206,6 +225,10 @@ class AutoCron {
* @param array $job
*
* @return array $job, updated with AUTOCRON_LAST_STATUS
* @throws CodeException
* @throws DbException
* @throws UserFormException
* @throws UserReportException
*/
private function doJobMail(array $job) {
......@@ -254,6 +277,8 @@ class AutoCron {
*
* @throws CodeException
* @throws DbException
* @throws ShellException
* @throws UserFormException
*/
public function process() {
......
This diff is collapsed.
......@@ -13,6 +13,10 @@ const NESTING_TOKEN_CLOSE = '#&nesting-close&#';
const NESTING_TOKEN_LENGTH = 17;
/**
* Class BodytextParser
* @package qfq
*/
class BodytextParser {
/**
......@@ -50,6 +54,8 @@ class BodytextParser {
*
* @param $bodytext
*
* @param $nestingOpen
* @param $nestingClose
* @return string
*/
......@@ -213,6 +219,8 @@ class BodytextParser {
*
* @param $bodytext