diff --git a/typo3/sysext/form/Classes/Controller/Form.php b/typo3/sysext/form/Classes/Controller/Form.php
index 831123bfb92821408a940c0485c98169996c009c..55ee49f859bf5182e92469f302c68bfe6e4321a4 100644
--- a/typo3/sysext/form/Classes/Controller/Form.php
+++ b/typo3/sysext/form/Classes/Controller/Form.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -69,7 +67,6 @@ class tx_form_controller_form {
*
* @param array $typoscript TS configuration for this cObject
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function initialize($typoscript) {
t3lib_div::makeInstance(
@@ -101,7 +98,6 @@ class tx_form_controller_form {
* @param string $typoscriptKey A string label used for the internal debugging tracking.
* @param tslib_cObj $contentObject reference
* @return string HTML output
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function cObjGetSingleExt(
$typoscriptObjectName,
@@ -137,7 +133,6 @@ class tx_form_controller_form {
* Build the models and views and renders the output from the views
*
* @return string HTML Output
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function execute() {
$content = '';
@@ -167,9 +162,8 @@ class tx_form_controller_form {
* or when the user returns from the confirmation screen.
*
* @return boolean TRUE when form needs to be shown
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function showForm() {
+ protected function showForm() {
$show = FALSE;
$submittedByPrefix = $this->requestHandler->getByMethod();
@@ -201,9 +195,8 @@ class tx_form_controller_form {
* Render the form
*
* @return string The form HTML
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function renderForm() {
+ protected function renderForm() {
$this->requestHandler->destroySession();
$form = $this->typoscriptFactory->buildModelFromTyposcript($this->typoscript);
@@ -223,9 +216,8 @@ class tx_form_controller_form {
* and the confirmation screen has not been submitted
*
* @return boolean TRUE when confirmation screen needs to be shown
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function showConfirmation() {
+ protected function showConfirmation() {
$show = FALSE;
if (
@@ -245,9 +237,8 @@ class tx_form_controller_form {
* Stores the submitted data in a session
*
* @return string The confirmation screen HTML
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function renderConfirmation() {
+ protected function renderConfirmation() {
$form = $this->typoscriptFactory->buildModelFromTyposcript($this->typoscript);
$this->requestHandler->storeSession();
@@ -273,9 +264,8 @@ class tx_form_controller_form {
* Destroys the session because it is not needed anymore
*
* @return string The post processing HTML
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function doPostProcessing() {
+ protected function doPostProcessing() {
$form = $this->typoscriptFactory->buildModelFromTyposcript($this->typoscript);
$postProcessorTypoScript = array();
diff --git a/typo3/sysext/form/Classes/Controller/Wizard.php b/typo3/sysext/form/Classes/Controller/Wizard.php
index 4f28d56a2bfdeff3d2babeb5355f9a621b23c7e0..a30bd8d270e88de0e81641c5006897622e8ef77e 100644
--- a/typo3/sysext/form/Classes/Controller/Wizard.php
+++ b/typo3/sysext/form/Classes/Controller/Wizard.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,21 +37,12 @@ require($BACK_PATH . 'template.php');
* @version $Id$
*/
class tx_form_controller_wizard {
- /**
- * Constructs this controller
- *
- * @author Patrick Broens <patrick@patrickbroens.nl>
- */
- public function __construct() {
- }
-
/**
* Dispatch on action
*
* Calls the requested action
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function dispatch() {
switch(t3lib_div::_GP('action')) {
@@ -74,9 +63,8 @@ class tx_form_controller_wizard {
* The action which should be taken when the wizard is loaded
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function indexAction() {
+ protected function indexAction() {
/** @var $repository tx_form_domain_repository_content */
$repository = t3lib_div::makeInstance('tx_form_domain_repository_content');
@@ -92,9 +80,8 @@ class tx_form_controller_wizard {
* The action which should be taken when the form in the wizard is saved
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function saveAction() {
+ protected function saveAction() {
/** @var $repository tx_form_domain_repository_content */
$repository = t3lib_div::makeInstance('tx_form_domain_repository_content');
@@ -110,9 +97,8 @@ class tx_form_controller_wizard {
* The action which should be taken when the form in the wizard is loaded
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function loadAction() {
+ protected function loadAction() {
/** @var $repository tx_form_domain_repository_content */
$repository = t3lib_div::makeInstance('tx_form_domain_repository_content');
diff --git a/typo3/sysext/form/Classes/Domain/Factory/JsonToTyposcript.php b/typo3/sysext/form/Classes/Domain/Factory/JsonToTyposcript.php
index 018ee453b5e03ece1eadcfbec469574702937bd9..e73bea047d8caad675e02e93f70d0ff963106b18 100644
--- a/typo3/sysext/form/Classes/Domain/Factory/JsonToTyposcript.php
+++ b/typo3/sysext/form/Classes/Domain/Factory/JsonToTyposcript.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,7 @@ class tx_form_domain_factory_jsontotyposcript {
*
* @var integer
*/
- private $elementId = 0;
+ protected $elementId = 0;
/**
* Storage for the validation rules
@@ -47,20 +45,19 @@ class tx_form_domain_factory_jsontotyposcript {
*
* @var array
*/
- private $validationRules = array();
+ protected $validationRules = array();
/**
* Internal counter for the validation rules
*
* @var integer
*/
- private $validationRulesCounter = 1;
+ protected $validationRulesCounter = 1;
/**
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
}
@@ -73,7 +70,6 @@ class tx_form_domain_factory_jsontotyposcript {
*
* @param string $json Json containing all configuration for the form
* @return string The typoscript for the form
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function convert($json) {
$elements = json_decode((string) $json, TRUE);
@@ -101,9 +97,8 @@ class tx_form_domain_factory_jsontotyposcript {
* @param array $parent The parent element
* @param boolean $childrenWithParentName Indicates if the children use the parent name
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function convertToTyposcriptArray($elements, &$parent, $childrenWithParentName = FALSE) {
+ protected function convertToTyposcriptArray($elements, &$parent, $childrenWithParentName = FALSE) {
if (is_array($elements)) {
$elementCounter = 10;
foreach($elements as $element) {
@@ -156,9 +151,8 @@ class tx_form_domain_factory_jsontotyposcript {
* @param boolean $childrenWithParentName Indicates if the children use the parent name
* @param integer $elementCounter The element counter
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function getContainer($element, &$parent, $elementCounter, $childrenWithParentName = FALSE) {
+ protected function getContainer($element, &$parent, $elementCounter, $childrenWithParentName = FALSE) {
if ($element['elementContainer'] && $element['elementContainer']['items']) {
$this->convertToTyposcriptArray(
$element['elementContainer']['items'],
@@ -179,9 +173,8 @@ class tx_form_domain_factory_jsontotyposcript {
* @param array $parent The parent element
* @param integer $elementCounter The element counter
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function getForm($element, &$parent, $elementCounter) {
+ protected function getForm($element, &$parent, $elementCounter) {
// TODO: Put at the top of the form
if (!empty($this->validationRules)) {
$parent[$elementCounter . '.']['rules'] = $this->validationRules;
@@ -199,9 +192,8 @@ class tx_form_domain_factory_jsontotyposcript {
* @param integer $elementCounter The element counter
* @param boolean $childrenWithParentName Indicates if the children use the parent name
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function getDefaultElementSetup($element, &$parent, $elementCounter, $childrenWithParentName = FALSE) {
+ protected function getDefaultElementSetup($element, &$parent, $elementCounter, $childrenWithParentName = FALSE) {
$parent[$elementCounter] = $this->getContentObjectType($element);
$parent[$elementCounter . '.'] = array();
if ($element['configuration']) {
@@ -214,9 +206,8 @@ class tx_form_domain_factory_jsontotyposcript {
*
* @param array $element The JSON array for this element
* @return string The Content Object Type
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function getContentObjectType($element) {
+ protected function getContentObjectType($element) {
$shortXType = str_replace('typo3-form-wizard-elements-', '', $element['xtype']);
list($category, $type) = explode('-', $shortXType);
@@ -255,9 +246,8 @@ class tx_form_domain_factory_jsontotyposcript {
* @param integer $elementCounter The element counter
* @param boolean $childrenWithParentName Indicates if the children use the parent name
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setConfiguration($element, &$parent, $elementCounter, $childrenWithParentName = FALSE) {
+ protected function setConfiguration($element, &$parent, $elementCounter, $childrenWithParentName = FALSE) {
foreach ($element['configuration'] as $key => $value) {
switch ($key) {
case 'attributes':
@@ -306,9 +296,8 @@ class tx_form_domain_factory_jsontotyposcript {
* @param integer $elementCounter The element counter
* @param boolean $childrenWithParentName Indicates if the children use the parent name
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setAttributes($attributes, &$parent, $elementCounter, $childrenWithParentName = FALSE) {
+ protected function setAttributes($attributes, &$parent, $elementCounter, $childrenWithParentName = FALSE) {
foreach ($attributes as $key => $value) {
if ($key === 'name' && $value === '' && !$childrenWithParentName) {
$value = $this->elementId;
@@ -328,9 +317,8 @@ class tx_form_domain_factory_jsontotyposcript {
* @param array $parent The parent element
* @param integer $elementCounter The element counter
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setConfirmation($confirmation, &$parent, $elementCounter) {
+ protected function setConfirmation($confirmation, &$parent, $elementCounter) {
$parent[$elementCounter . '.']['confirmation'] = $confirmation;
}
@@ -341,9 +329,8 @@ class tx_form_domain_factory_jsontotyposcript {
* @param array $parent The parent element
* @param integer $elementCounter The element counter
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setFilters($filters, &$parent, $elementCounter) {
+ protected function setFilters($filters, &$parent, $elementCounter) {
if (is_array($filters) && !empty($filters)) {
$parent[$elementCounter . '.']['filters'] = array();
$filterCounter = 1;
@@ -362,9 +349,8 @@ class tx_form_domain_factory_jsontotyposcript {
* @param array $parent The parent element
* @param integer $elementCounter The element counter
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setLabel($label, &$parent, $elementCounter) {
+ protected function setLabel($label, &$parent, $elementCounter) {
if ($label['value'] != '') {
$parent[$elementCounter . '.']['label.']['value'] = $label['value'];
}
@@ -382,9 +368,8 @@ class tx_form_domain_factory_jsontotyposcript {
* @param array $parent The parent element
* @param integer $elementCounter The element counter
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setLayout($element, $value, &$parent, $elementCounter) {
+ protected function setLayout($element, $value, &$parent, $elementCounter) {
switch($element['xtype']) {
case 'typo3-form-wizard-elements-basic-button':
case 'typo3-form-wizard-elements-basic-fileupload':
@@ -424,9 +409,8 @@ class tx_form_domain_factory_jsontotyposcript {
* @param array $parent The parent element
* @param integer $elementCounter The element counter
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setLegend($legend, &$parent, $elementCounter) {
+ protected function setLegend($legend, &$parent, $elementCounter) {
if ($legend['value'] != '') {
$parent[$elementCounter . '.']['legend.']['value'] = $legend['value'];
}
@@ -444,9 +428,8 @@ class tx_form_domain_factory_jsontotyposcript {
* @param array $parent The parent element
* @param integer $elementCounter The element counter
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setOptions($element, $options, &$parent, $elementCounter) {
+ protected function setOptions($element, $options, &$parent, $elementCounter) {
if (is_array($options) && $element['xtype'] === 'typo3-form-wizard-elements-basic-select') {
$optionCounter = 10;
foreach ($options as $option) {
@@ -467,9 +450,8 @@ class tx_form_domain_factory_jsontotyposcript {
* @param array $parent The parent element
* @param integer $elementCounter The element counter
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setPostProcessor($postProcessors, &$parent, $elementCounter) {
+ protected function setPostProcessor($postProcessors, &$parent, $elementCounter) {
if (is_array($postProcessors) && !empty($postProcessors)) {
$parent[$elementCounter . '.']['postProcessor'] = array();
$postProcessorCounter = 1;
@@ -490,9 +472,8 @@ class tx_form_domain_factory_jsontotyposcript {
* @param array $parent The parent element
* @param integer $elementCounter The element counter
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setPrefix($prefix, &$parent, $elementCounter) {
+ protected function setPrefix($prefix, &$parent, $elementCounter) {
$parent[$elementCounter . '.']['prefix'] = $prefix;
}
@@ -505,9 +486,8 @@ class tx_form_domain_factory_jsontotyposcript {
* @param array $element The JSON array for this element
* @param array $validationRules The temporary storage array for the rules
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setValidationRules($element, $validationRules) {
+ protected function setValidationRules($element, $validationRules) {
if (is_array($validationRules)) {
foreach ($validationRules as $name => $ruleConfiguration) {
if (
@@ -539,9 +519,8 @@ class tx_form_domain_factory_jsontotyposcript {
* @param array $parent The parent element
* @param integer $elementCounter The element counter
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setVarious($element, $various, &$parent, $elementCounter) {
+ protected function setVarious($element, $various, &$parent, $elementCounter) {
foreach ($various as $key => $value) {
switch ($key) {
case 'headingSize':
@@ -571,9 +550,8 @@ class tx_form_domain_factory_jsontotyposcript {
* @param string $addKey Key which has underlying configuration
* @param integer $tabCount The amount of tabs for indentation
* @return string The formatted TypoScript string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function typoscriptArrayToString($typoscriptArray, $addKey = '', $tabCount = -1) {
+ protected function typoscriptArrayToString($typoscriptArray, $addKey = '', $tabCount = -1) {
$typoscript = '';
if ($addKey != '') {
diff --git a/typo3/sysext/form/Classes/Domain/Factory/Typoscript.php b/typo3/sysext/form/Classes/Domain/Factory/Typoscript.php
index b848e24d0a548c96bccc2a340b02a4f325e98588..385b04045bc0bda7dda6b235ee43dc2eaddab4f0 100644
--- a/typo3/sysext/form/Classes/Domain/Factory/Typoscript.php
+++ b/typo3/sysext/form/Classes/Domain/Factory/Typoscript.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -43,7 +41,6 @@ class tx_form_domain_factory_typoscript implements t3lib_Singleton {
*
* @param array $arguments Typoscript configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
}
@@ -53,7 +50,6 @@ class tx_form_domain_factory_typoscript implements t3lib_Singleton {
*
* @param array $typoscript Typoscript containing all configuration
* @return object The form object containing the child elements
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function buildModelFromTyposcript(array $typoscript) {
$this->setLayoutHandler($typoscript);
@@ -70,7 +66,6 @@ class tx_form_domain_factory_typoscript implements t3lib_Singleton {
* @param array $arguments Configuration array
* @throws Exception
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getChildElementsByIntegerKey(&$parentElement, $typoscript) {
if (is_array($typoscript)) {
@@ -100,7 +95,6 @@ class tx_form_domain_factory_typoscript implements t3lib_Singleton {
* @param string $class Classname for the element
* @param array $arguments Configuration array
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setElementType(&$parentElement, $class, array $arguments) {
if (substr($class, 0, 1) == '<') {
@@ -135,7 +129,6 @@ class tx_form_domain_factory_typoscript implements t3lib_Singleton {
* @param string $class Type of element
* @param array $arguments Configuration array
* @return object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function addElement(&$parentElement, $class, array $arguments = array()) {
$element = $this->createElement($class, $arguments);
@@ -149,7 +142,6 @@ class tx_form_domain_factory_typoscript implements t3lib_Singleton {
* @param string $class Type of element
* @param array $arguments Configuration array
* @return object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function createElement($class, array $arguments = array()) {
$class = strtolower((string) $class);
@@ -189,7 +181,6 @@ class tx_form_domain_factory_typoscript implements t3lib_Singleton {
* Set the attributes
*
* @param array $configuration Configuration
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAttributes(&$element, $arguments) {
if($element->hasAllowedAttributes()) {
@@ -224,7 +215,6 @@ class tx_form_domain_factory_typoscript implements t3lib_Singleton {
* Set the additionals from Element Typoscript configuration
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAdditionals(&$element, $arguments) {
if(!empty($arguments)) {
@@ -265,7 +255,6 @@ class tx_form_domain_factory_typoscript implements t3lib_Singleton {
*
* @param array $arguments TypoScript
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
protected function setFilters(&$element, $arguments) {
if (is_array($arguments)) {
@@ -286,7 +275,6 @@ class tx_form_domain_factory_typoscript implements t3lib_Singleton {
*
* @param array $typoscript TypoScript
* @return tx_form_system_layout The layout handler
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setLayoutHandler($typoscript) {
$layoutHandler = t3lib_div::makeInstance('tx_form_system_layout'); // singleton
@@ -300,7 +288,6 @@ class tx_form_domain_factory_typoscript implements t3lib_Singleton {
*
* @param array $typoscript TypoScript
* @return tx_form_system_request The request handler
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setRequestHandler($typoscript) {
$prefix = isset($typoscript['prefix']) ? $typoscript['prefix'] : '';
@@ -322,7 +309,6 @@ class tx_form_domain_factory_typoscript implements t3lib_Singleton {
*
* @param array $typoscript TypoScript
* @return tx_form_system_validate The validation object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setRules($typoscript) {
$rulesTyposcript = isset($typoscript['rules.']) ? $typoscript['rules.'] : NULL;
diff --git a/typo3/sysext/form/Classes/Domain/Factory/TyposcriptToJson.php b/typo3/sysext/form/Classes/Domain/Factory/TyposcriptToJson.php
index ab14c0811380c5bed4205451934c7837f2be4bee..930a92955f2b13a7c3ea0f73d16c5ae85dabb801 100644
--- a/typo3/sysext/form/Classes/Domain/Factory/TyposcriptToJson.php
+++ b/typo3/sysext/form/Classes/Domain/Factory/TyposcriptToJson.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,6 @@ class tx_form_domain_factory_typoscripttojson {
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
}
@@ -48,7 +45,6 @@ class tx_form_domain_factory_typoscripttojson {
*
* @param string $typoscript TypoScript string containing all configuration for the form
* @return string The JSON for the form
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function convert($typoscript) {
$this->setValidationRules($typoscript);
@@ -64,7 +60,6 @@ class tx_form_domain_factory_typoscripttojson {
* @param string $class Type of element
* @param array $arguments Configuration array
* @return object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function createElement($class, array $arguments = array()) {
$class = strtolower((string) $class);
@@ -88,9 +83,8 @@ class tx_form_domain_factory_typoscripttojson {
*
* @param array $arguments Configuration array
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function getChildElementsByIntegerKey(&$parentElement, $typoscript) {
+ protected function getChildElementsByIntegerKey(&$parentElement, $typoscript) {
if (is_array($typoscript)) {
$keys = t3lib_TStemplate::sortedKeyList($typoscript);
foreach ($keys as $key) {
@@ -117,7 +111,6 @@ class tx_form_domain_factory_typoscripttojson {
* @param string $class A predefined class
* @param array $arguments Configuration array
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
private function setElementType(&$parentElement, $class, array $arguments) {
if (in_array($class, tx_form_Common::getInstance()->getFormObjects())) {
@@ -138,7 +131,6 @@ class tx_form_domain_factory_typoscripttojson {
* @param string $class Type of element
* @param array $arguments Configuration array
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function addElement(&$parentElement, $class, array $arguments) {
$element = $this->createElement($class, $arguments);
@@ -150,9 +142,8 @@ class tx_form_domain_factory_typoscripttojson {
*
* @param array $typoscript Configuration array
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setValidationRules($typoscript) {
+ protected function setValidationRules($typoscript) {
if (isset($typoscript['rules.']) && is_array($typoscript['rules.'])) {
$this->validationRules = $typoscript['rules.'];
}
@@ -167,9 +158,8 @@ class tx_form_domain_factory_typoscripttojson {
*
* @param array $arguments The element arguments
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function addValidationRules(&$arguments) {
+ protected function addValidationRules(&$arguments) {
$validationRulesAvailable = FALSE;
if (!empty($this->validationRules) && isset($arguments['name'])) {
diff --git a/typo3/sysext/form/Classes/Domain/Model/Additional/Abstract.php b/typo3/sysext/form/Classes/Domain/Model/Additional/Abstract.php
index 7b465d9df42bf7a2f307b58c2c509a4d3b2f79eb..971bfbaa2deee2226ff3ef054dc23808572bd499 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Additional/Abstract.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Additional/Abstract.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -67,7 +65,6 @@ abstract class tx_form_domain_model_additional_abstract {
* @param string $type Type of the object
* @param mixed $value Value of the object
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($type, $value) {
$this->localCobj = t3lib_div::makeInstance('tslib_cObj');
@@ -79,7 +76,6 @@ abstract class tx_form_domain_model_additional_abstract {
* Get the layout string
*
* @return string XML string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getLayout() {
return $this->layout;
@@ -90,7 +86,6 @@ abstract class tx_form_domain_model_additional_abstract {
*
* @param string $layout XML string
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setLayout($layout) {
$this->layout = (string) $layout;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Additional/Additional.php b/typo3/sysext/form/Classes/Domain/Model/Additional/Additional.php
index 71aaf1d9459b69013b2a5884ff358dc73b4003e1..127dfb0772891f8dc9dcaf57752d5780cdd977ac 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Additional/Additional.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Additional/Additional.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,13 +36,12 @@ class tx_form_domain_model_additional_additional {
*
* @var array
*/
- private $additional = array();
+ protected $additional = array();
/**
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
}
@@ -56,7 +53,6 @@ class tx_form_domain_model_additional_additional {
* @param mixed $value Typoscript configuration to construct value
* @param string $type Typoscript content object
* @return tx_form_domain_model_additional
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function addAdditional($class, $type, $value) {
$class = strtolower((string) $class);
@@ -71,7 +67,6 @@ class tx_form_domain_model_additional_additional {
* Get the additional array of the object
*
* @return array Additionals of the object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getAdditional() {
return $this->additional;
@@ -82,7 +77,6 @@ class tx_form_domain_model_additional_additional {
*
* @param string $key Key of the additional
* @return string The additional object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getAdditionalObjectByKey($key) {
return $this->additional[$key];
@@ -94,7 +88,6 @@ class tx_form_domain_model_additional_additional {
*
* @param string $key Name of the additional
* @return boolean
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function additionalIsSet($key) {
if (isset($this->additional[$key])) {
@@ -110,7 +103,6 @@ class tx_form_domain_model_additional_additional {
* @param string $key Key for the additional
* @param string $layout XML string
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setLayout($key, $layout) {
$this->additional[$key]->setLayout($layout);
@@ -121,7 +113,6 @@ class tx_form_domain_model_additional_additional {
*
* @param string $key Key of the additional
* @return string The value of the additional
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue($key) {
return $this->additional[$key]->getValue();
diff --git a/typo3/sysext/form/Classes/Domain/Model/Additional/Error.php b/typo3/sysext/form/Classes/Domain/Model/Additional/Error.php
index c290e4dd96ae2722c9dd8abe2a8271d06eb3032c..e4b0c640a99f885fc9c4ce149cd7f654b13518cd 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Additional/Error.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Additional/Error.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_additional_error extends tx_form_domain_model_additio
* @param string $type Type of the object
* @param mixed $value Value of the object
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($type, $value) {
parent::__construct($type, $value);
@@ -49,7 +46,6 @@ class tx_form_domain_model_additional_error extends tx_form_domain_model_additio
* Return the value of the object
*
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$errors = array();
diff --git a/typo3/sysext/form/Classes/Domain/Model/Additional/Interface.php b/typo3/sysext/form/Classes/Domain/Model/Additional/Interface.php
index af0c4e99055b31f67c07e94c4616e07784dafca1..4eb9a723e21a8adbff10e24087752908a11cc9ad 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Additional/Interface.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Additional/Interface.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -37,7 +35,6 @@ interface tx_form_domain_model_additional_interface {
* Return the value of the object
*
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue();
}
diff --git a/typo3/sysext/form/Classes/Domain/Model/Additional/Label.php b/typo3/sysext/form/Classes/Domain/Model/Additional/Label.php
index 141ebe4983cc752c9c49c2f0876ccaeacd372963..e39fc3041251c1b28b424ea13b1276b54f88c4d6 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Additional/Label.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Additional/Label.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,6 @@ class tx_form_domain_model_additional_label extends tx_form_domain_model_additio
*
* @param string $value Attribute value
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($type, $value) {
parent::__construct($type, $value);
@@ -48,7 +45,6 @@ class tx_form_domain_model_additional_label extends tx_form_domain_model_additio
* Return the value of the object
*
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$value = $this->localCobj->cObjGetSingle($this->type, $this->value);
diff --git a/typo3/sysext/form/Classes/Domain/Model/Additional/Legend.php b/typo3/sysext/form/Classes/Domain/Model/Additional/Legend.php
index 18a6259941532ba114487c3fc112f8c67802bebe..df7083450342487ed59ede179b4b105f6410ac87 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Additional/Legend.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Additional/Legend.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_additional_legend extends tx_form_domain_model_additi
* @param string $type Type of the object
* @param mixed $value Value of the object
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($type, $value) {
parent::__construct($type, $value);
@@ -49,7 +46,6 @@ class tx_form_domain_model_additional_legend extends tx_form_domain_model_additi
* Return the value of the object
*
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$additional = $this->localCobj->cObjGetSingle($this->type, $this->value);
diff --git a/typo3/sysext/form/Classes/Domain/Model/Additional/Mandatory.php b/typo3/sysext/form/Classes/Domain/Model/Additional/Mandatory.php
index e64029e323a7689317b8081a74b65f477c58510a..1fdea5f9d5721ef6d44ca46d310500cadd06667b 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Additional/Mandatory.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Additional/Mandatory.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_additional_mandatory extends tx_form_domain_model_add
* @param string $type Type of the object
* @param mixed $value Value of the object
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($type, $value) {
parent::__construct($type, $value);
@@ -49,7 +46,6 @@ class tx_form_domain_model_additional_mandatory extends tx_form_domain_model_add
* Return the value of the object
*
* @return array
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$messages = array();
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Abstract.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Abstract.php
index c1a65a53376c1f016e516aa7393b9963d786ef52..c6aa0ae135cc6bac430cb8c2c29e993eb35098ac 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Abstract.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Abstract.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -59,7 +57,6 @@ abstract class tx_form_domain_model_attributes_abstract {
*
* @param string $value Attribute value
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
$this->localCobj = t3lib_div::makeInstance('tslib_cObj');
@@ -72,7 +69,6 @@ abstract class tx_form_domain_model_attributes_abstract {
*
* @param $value string The value to set
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setValue($value) {
$this->value = (string) $value;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Accept.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Accept.php
index ce2ee23d828f1fce3adc7f4974200055cd866403..c9b49767a729aa9490931281f4e0cc4b92e0e14f 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Accept.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Accept.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_accept extends tx_form_domain_model_attrib
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -59,7 +56,6 @@ class tx_form_domain_model_attributes_accept extends tx_form_domain_model_attrib
* TODO: Perhaps we once can add a list of all content-types to TYPO3
*
* @return string Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$attribute = (string) $this->value;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Acceptcharset.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Acceptcharset.php
index 50f122661bfaad51d890d40bbc76c2124c01182d..0b37d4b8d913bbbb69bb11c8e2d1fdf3dbe3403d 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Acceptcharset.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Acceptcharset.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_acceptcharset extends tx_form_domain_model
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -65,7 +62,6 @@ class tx_form_domain_model_attributes_acceptcharset extends tx_form_domain_model
* TODO: Perhaps we once can add a list of all character-sets to TYPO3
*
* @return string Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$attribute = (string) $this->value;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Accesskey.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Accesskey.php
index c2826cfe548b29257559b0e294b756d1e5a871af..10ffb9124c61092c64dc7f40d8c02cda056132e8 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Accesskey.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Accesskey.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_accesskey extends tx_form_domain_model_att
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -63,7 +60,6 @@ class tx_form_domain_model_attributes_accesskey extends tx_form_domain_model_att
* When the user activates a text field, it allows input, etc.
*
* @return string Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$attribute = (string) $this->value;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Action.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Action.php
index d3c50fb0771d41ad1de5aa5255a9cd39fc38d6fc..4fa5c52a5bcd592d5f7a92fae04dadc83c2ce0d2 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Action.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Action.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_action extends tx_form_domain_model_attrib
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -54,7 +51,6 @@ class tx_form_domain_model_attributes_action extends tx_form_domain_model_attrib
* User agent behavior for a value other than an HTTP URI is undefined.
*
* @return string Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$value = $this->value;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Alt.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Alt.php
index 0124ed2986a0ede6dc1b17dc374ee6117bbfa290..8ff6dfb99007b7c46c10af86d9e4f48f15ac9c7d 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Alt.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Alt.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_alt extends tx_form_domain_model_attribute
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -55,7 +52,6 @@ class tx_form_domain_model_attributes_alt extends tx_form_domain_model_attribute
* text is specified by the lang attribute.
*
* @return string Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$attribute = (string) $this->value;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Attributes.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Attributes.php
index 3d98089c4c5435acec6855ffb33fa77e9d914d32..c0efc37b4bc2f0cc065e2cf69338c2dcfb98a9b2 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Attributes.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Attributes.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,7 @@ class tx_form_domain_model_attributes_attributes {
*
* @var array
*/
- private $attributes = array();
+ protected $attributes = array();
/**
* Internal Id of the element
@@ -59,7 +57,6 @@ class tx_form_domain_model_attributes_attributes {
*
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($elementId) {
$this->elementId = (integer) $elementId;
@@ -74,7 +71,6 @@ class tx_form_domain_model_attributes_attributes {
* @param string $class Name of the attribute
* @param mixed $value Typoscript configuration to construct value
* @return tx_form_domain_model_attributes
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function addAttribute($class, $value) {
$class = strtolower((string) $class);
@@ -90,7 +86,6 @@ class tx_form_domain_model_attributes_attributes {
*
* @param string $class Name of the attribute
* @return tx_form_domain_model_attributes
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function removeAttribute($class) {
unset($this->attributes[$class]);
@@ -102,7 +97,6 @@ class tx_form_domain_model_attributes_attributes {
* Get the attributes of the object
*
* @return array Attributes objects
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getAttributes() {
return $this->attributes;
@@ -113,7 +107,6 @@ class tx_form_domain_model_attributes_attributes {
*
* @param string $key Key of the attribute
* @return string The attribute object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getAttributeObjectByKey($key) {
return $this->attributes[$key];
@@ -125,7 +118,6 @@ class tx_form_domain_model_attributes_attributes {
* @param string $key The name of the attribute
* @param object $attributeObject The attribute object
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAttribute($key, $attributeObject) {
$this->attributes[$key] = (object) $attributeObject;
@@ -136,7 +128,6 @@ class tx_form_domain_model_attributes_attributes {
*
* @param string $key The name of the attribute
* @return boolean
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function hasAttribute($key) {
if(isset($this->attributes[$key])) {
@@ -151,7 +142,6 @@ class tx_form_domain_model_attributes_attributes {
* @param $key string Name of the object
* @param $value string The value
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setValue($key, $value) {
$this->attributes[$key]->setValue($value);
@@ -162,7 +152,6 @@ class tx_form_domain_model_attributes_attributes {
*
* @param string $key Key of the attribute
* @return string The content of the attribute
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue($key) {
if($this->attributes[$key]) {
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Checked.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Checked.php
index 80f7b29b42c82bfc960c4516339329eef9492006..9fe80b71dbc5356f35b4f26d9f475086e17bf57c 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Checked.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Checked.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_checked extends tx_form_domain_model_attri
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -56,7 +53,6 @@ class tx_form_domain_model_attributes_checked extends tx_form_domain_model_attri
* User agents must ignore this attribute for other control types.
*
* @return string Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
if((integer) $this->value === 1
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Class.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Class.php
index 23976e562b26cce17db43922bfd0711f3a73fbdf..a91e72238f694c31530b2bd1360ea526c466c19d 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Class.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Class.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_class extends tx_form_domain_model_attribu
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -55,7 +52,6 @@ class tx_form_domain_model_attributes_class extends tx_form_domain_model_attribu
* Multiple class names must be separated by white space characters.
*
* @return string Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$attribute = (string) $this->value;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Cols.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Cols.php
index 9422f5b70026df3c81e5642afc7fdd18fefa58a5..c06902deddd3f9aa0ededd98bd07898dd2b2ecff 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Cols.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Cols.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_cols extends tx_form_domain_model_attribut
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -58,7 +55,6 @@ class tx_form_domain_model_attributes_cols extends tx_form_domain_model_attribut
* without the need for scrolling.
*
* @return integer Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$value = (integer) $this->value;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Dir.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Dir.php
index b0d4182f334ed9882250378eb318d028a996fa8c..b380327a0188a5551f152df4a3f69a171375c729 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Dir.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Dir.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_dir extends tx_form_domain_model_attribute
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -64,7 +61,6 @@ class tx_form_domain_model_attributes_dir extends tx_form_domain_model_attribute
* of table structure, etc. This is done with the dir attribute.
*
* @return string Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$value = strtolower((string) $this->value);
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Disabled.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Disabled.php
index 421164e0bafbdfd75c69f11a316d9f4316c5efee..cabca6401e4b4d305f8f4b5a013db3ee8b88024b 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Disabled.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Disabled.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_disabled extends tx_form_domain_model_attr
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -65,7 +62,6 @@ class tx_form_domain_model_attributes_disabled extends tx_form_domain_model_attr
* button labels, etc.
*
* @return string Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
if((integer) $this->value === 1
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Enctype.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Enctype.php
index fe93a863066dd64bdea37da77d41df3c0fb746a0..09cae895f7bd78f2806bce228e3d18f298af7da3 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Enctype.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Enctype.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_enctype extends tx_form_domain_model_attri
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -57,7 +54,6 @@ class tx_form_domain_model_attributes_enctype extends tx_form_domain_model_attri
* INPUT element, type="file".
*
* @return string Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$value = strtolower((string) $this->value);
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Id.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Id.php
index 601e1cc489d52c3313975e3f4a934134c14fc566..809bc763dc4bbc11dce4b0687cd34658a160a4a7 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Id.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Id.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_id extends tx_form_domain_model_attributes
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -54,7 +51,6 @@ class tx_form_domain_model_attributes_id extends tx_form_domain_model_attributes
* This id must be unique in a document.
*
* @return string Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$value = (string) $this->value;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Interface.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Interface.php
index ed5fa4e747bdcabd7bf700ebbcba852e6068930c..bd43d99ce58845e5d920b0b8eeb59d37f665027a 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Interface.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Interface.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -37,7 +35,6 @@ interface tx_form_domain_model_attributes_interface {
* Return attribute value, probably run through filter
*
* @return mixed
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue();
}
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Label.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Label.php
index dff0448512525e4f34303d7e33aca8dd1fae6092..e252d5642782aa0c3afdafe73685ae1d584bf715 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Label.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Label.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_label extends tx_form_domain_model_attribu
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -56,7 +53,6 @@ class tx_form_domain_model_attributes_label extends tx_form_domain_model_attribu
* rather than the content of the OPTION element as the option label.
*
* @return string Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$attribute = (string) $this->value;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Lang.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Lang.php
index 79f630cd59c38dcdf7e5d438519ae96062700d94..c0734ff88096607629b758c8c27efac725ef2df2 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Lang.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Lang.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_lang extends tx_form_domain_model_attribut
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -66,7 +63,6 @@ class tx_form_domain_model_attributes_lang extends tx_form_domain_model_attribut
* "x-klingon": The primary tag "x" indicates an experimental language tag
*
* @return string Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$attribute = (string) $this->value;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Maxlength.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Maxlength.php
index 0cad52a6f57d8f10d9a04b2a4f9c7771de7c70a0..6e5e06b83630ad35c6212784488797870b881067 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Maxlength.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Maxlength.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_maxlength extends tx_form_domain_model_att
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -57,7 +54,6 @@ class tx_form_domain_model_attributes_maxlength extends tx_form_domain_model_att
* The default value for this attribute is an unlimited number.
*
* @return integer Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$value = (integer) $this->value;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Method.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Method.php
index 227438b8bf0b643b60e7c341ac9cdf47cbe4e997..e50cdb9e23cd1118a3d6e10724c5b8d8593bcc8d 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Method.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Method.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_method extends tx_form_domain_model_attrib
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -55,7 +52,6 @@ class tx_form_domain_model_attributes_method extends tx_form_domain_model_attrib
* Possible (case-insensitive) values are "get" (the default) and "post".
*
* @return string Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$value = strtolower((string) $this->value);
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Multiple.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Multiple.php
index 189a30eb85061a5c80a6f2085016246cbca0b959..04b84ea010056c448b465621f000a1f0d98f997c 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Multiple.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Multiple.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_multiple extends tx_form_domain_model_attr
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -54,7 +51,6 @@ class tx_form_domain_model_attributes_multiple extends tx_form_domain_model_attr
* If not set, the SELECT element only permits single selections.
*
* @return string Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
if((integer) $this->value === 1
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Name.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Name.php
index 9b329f5c160fdc2d1b78aee89f76acc11f07c972..6922d9f6cf55fa0c94617e6d2c670573e30d216f 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Name.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Name.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -45,7 +43,7 @@ class tx_form_domain_model_attributes_name extends tx_form_domain_model_attribut
*
* @var boolean
*/
- private $returnValueWithoutPrefix = FALSE;
+ protected $returnValueWithoutPrefix = FALSE;
/**
* Constructor
@@ -53,7 +51,6 @@ class tx_form_domain_model_attributes_name extends tx_form_domain_model_attribut
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -63,7 +60,6 @@ class tx_form_domain_model_attributes_name extends tx_form_domain_model_attribut
* Return the name attribute without the prefix
*
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValueWithoutPrefix() {
$value = (string) $this->value;
@@ -94,7 +90,6 @@ class tx_form_domain_model_attributes_name extends tx_form_domain_model_attribut
* This does not apply for form objects, only the form tag
*
* @return string Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$value = $this->getValueWithoutPrefix();
@@ -115,7 +110,6 @@ class tx_form_domain_model_attributes_name extends tx_form_domain_model_attribut
*
* @param string $addition The additional string
* @return tx_form_domain_model_attributes_name
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAddition($addition) {
$this->addition = (string) $addition;
@@ -129,7 +123,6 @@ class tx_form_domain_model_attributes_name extends tx_form_domain_model_attribut
*
* @param boolean $parameter
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setReturnValueWithoutPrefix($parameter) {
$this->returnValueWithoutPrefix = (boolean) $parameter;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Readonly.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Readonly.php
index 86478f1b64af310cf6d74ae0573deb646ef71379..729654b4c7f243868dc2763e8d8da3b6cbb05667 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Readonly.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Readonly.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_readonly extends tx_form_domain_model_attr
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -63,7 +60,6 @@ class tx_form_domain_model_attributes_readonly extends tx_form_domain_model_attr
* How read-only elements are rendered depends on the user agent.
*
* @return string Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
if((integer) $this->value === 1
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Rows.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Rows.php
index 2135eea25857cb888085e178208be650e9024e9f..47bccdff9417fbf235f6a2a21d76be077d70288d 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Rows.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Rows.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_rows extends tx_form_domain_model_attribut
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -57,7 +54,6 @@ class tx_form_domain_model_attributes_rows extends tx_form_domain_model_attribut
* beyond the visible area.
*
* @return integer Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$value = (integer) $this->value;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Selected.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Selected.php
index 61951bbd3857fbaa96d5b8dbffe0bfe159c96cdc..4ea167e7fef6d840e7e4c2ab36b132252c862381 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Selected.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Selected.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_selected extends tx_form_domain_model_attr
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -51,7 +48,6 @@ class tx_form_domain_model_attributes_selected extends tx_form_domain_model_attr
* Case insensitive
*
* @return string Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
if((integer) $this->value === 1
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Size.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Size.php
index f655b0982774b20c6faf9ea1771fd215e20eac6c..ceefb02baa9986546ca56d3b99d4a69c4b470aa1 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Size.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Size.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_size extends tx_form_domain_model_attribut
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -56,7 +53,6 @@ class tx_form_domain_model_attributes_size extends tx_form_domain_model_attribut
* In that case, its value refers to the (integer) number of characters.
*
* @return integer Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$value = (integer) $this->value;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Src.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Src.php
index 2d8838bec3ab647e69910bcdb1e88b54e3926a26..2da96b6aaf255bb71e10c69992ba4862a5c86c95 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Src.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Src.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_src extends tx_form_domain_model_attribute
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -56,7 +53,6 @@ class tx_form_domain_model_attributes_src extends tx_form_domain_model_attribute
*
* @return string Attribute value
* @see tslib_cObj::getImgResource()
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$attribute = $this->localCobj->IMG_RESOURCE($this->value);
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Style.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Style.php
index 7b866733ba9343420a4902c987f506df91bdb86f..71b87e22b8a5871fb2db3d2174d67d176248f28f 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Style.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Style.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_style extends tx_form_domain_model_attribu
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -53,7 +50,6 @@ class tx_form_domain_model_attributes_style extends tx_form_domain_model_attribu
* This attribute specifies style information for the current element.
*
* @return string Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$attribute = (string) $this->value;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Tabindex.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Tabindex.php
index 0c5dbb7011c037829e19090f5b5284b22620e6a6..82c1ba43707d1b2a34e3d700f05aec56355fd21c 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Tabindex.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Tabindex.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_tabindex extends tx_form_domain_model_attr
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -81,7 +78,6 @@ class tx_form_domain_model_attributes_tabindex extends tx_form_domain_model_attr
* user agents may circle back to the beginning (or end).
*
* @return integer Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$attribute = (integer) $this->value;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Title.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Title.php
index c6a86252ce3e8f048989917a5a1e49815a338b79..26435b84298bd0a062bd887e3936e0f6276e928f 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Title.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Title.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_title extends tx_form_domain_model_attribu
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -63,7 +60,6 @@ class tx_form_domain_model_attributes_title extends tx_form_domain_model_attribu
* similar context.
*
* @return string Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$attribute = (string) $this->value;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Type.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Type.php
index 38d6f89c6b6929aef7be1f77fb6fc7eda3b5a6ef..a3674fb1058d681d3f5052267633bbeb46abe929 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Type.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Type.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -33,7 +31,7 @@ declare(encoding = 'utf-8');
*/
class tx_form_domain_model_attributes_type extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
- private $allowedValues = array(
+ protected $allowedValues = array(
'text',
'password',
'checkbox',
@@ -52,7 +50,6 @@ class tx_form_domain_model_attributes_type extends tx_form_domain_model_attribut
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -66,7 +63,6 @@ class tx_form_domain_model_attributes_type extends tx_form_domain_model_attribut
* Defines the type of form input control to create.
*
* @return string Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$attribute = strtolower((string) $this->value);
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attributes/Value.php b/typo3/sysext/form/Classes/Domain/Model/Attributes/Value.php
index 6d5a0587463c57077fd60dd50377533c9a3c4703..91e2b7e26a431a6eb4804a1285f81bb3e81ebde7 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attributes/Value.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attributes/Value.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_attributes_value extends tx_form_domain_model_attribu
* @param string $value Attribute value
* @param integer $elementId The ID of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($value, $elementId) {
parent::__construct($value, $elementId);
@@ -61,7 +58,6 @@ class tx_form_domain_model_attributes_value extends tx_form_domain_model_attribu
* of the OPTION element.
*
* @return string Attribute value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
$attribute = (string) $this->value;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Content.php b/typo3/sysext/form/Classes/Domain/Model/Content.php
index c406c0212f65180914572b57867bc6f401838eb4..4bcc58365d1dc418c79341e6f3af8a34a38592a7 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Content.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Content.php
@@ -39,27 +39,26 @@ class tx_form_domain_model_content {
*
* @var integer
*/
- private $uid = 0;
+ protected $uid = 0;
/**
* The page id
*
* @var integer
*/
- private $pageId = 0;
+ protected $pageId = 0;
/**
* The configuration Typoscript
*
* @var array
*/
- private $typoscript = array();
+ protected $typoscript = array();
/**
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
}
@@ -69,7 +68,6 @@ class tx_form_domain_model_content {
*
* @param integer $uid The uid
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setUid($uid) {
$this->uid = (integer) $uid;
@@ -79,7 +77,6 @@ class tx_form_domain_model_content {
* Returns the uid
*
* @return integer The uid
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getUid() {
return $this->uid;
@@ -90,7 +87,6 @@ class tx_form_domain_model_content {
*
* @param integer $pageId The page id
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setPageId($pageId) {
$this->pageId = (integer) $pageId;
@@ -100,7 +96,6 @@ class tx_form_domain_model_content {
* Returns the page id
*
* @return integer The page id
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getPageId() {
return $this->pageId;
@@ -111,7 +106,6 @@ class tx_form_domain_model_content {
*
* @param array $typoscript The Typoscript configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setTyposcript(array $typoscript) {
$this->typoscript = (array) $typoscript;
@@ -121,7 +115,6 @@ class tx_form_domain_model_content {
* Returns the Typoscript configuration
*
* @return array The Typoscript configuration
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getTyposcript() {
return $this->typoscript;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/Abstract.php b/typo3/sysext/form/Classes/Domain/Model/Element/Abstract.php
index 036da29ba29c98cbb5d7d9350e0894c8165de7e6..28c4eaf24e0376c5067dfe0ffde97a70301362b3 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/Abstract.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/Abstract.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -121,7 +119,6 @@ abstract class tx_form_domain_model_element_abstract {
* @param integer $elementId Internal Id of the element
* @param array $arguments Configuration array
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
$this->localCobj = t3lib_div::makeInstance('tslib_cObj');
@@ -139,7 +136,6 @@ abstract class tx_form_domain_model_element_abstract {
*
* @param integer $elementId Internal Id of the element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setElementId() {
$this->elementId = $this->elementCounter->getElementId();
@@ -150,7 +146,6 @@ abstract class tx_form_domain_model_element_abstract {
* of the outer tag of an element like <li>
*
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getElementId() {
return $this->elementId;
@@ -161,7 +156,6 @@ abstract class tx_form_domain_model_element_abstract {
*
* @param string $name The name
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setName($name = '') {
if ($name != '') {
@@ -175,7 +169,6 @@ abstract class tx_form_domain_model_element_abstract {
* Get the name of the element
*
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getName() {
return $this->name;
@@ -185,7 +178,6 @@ abstract class tx_form_domain_model_element_abstract {
* Check to see if this element accepts the parent name instead of its own
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function acceptsParentName() {
return $this->acceptsParentName;
@@ -197,7 +189,6 @@ abstract class tx_form_domain_model_element_abstract {
* @param string $attribute Name of the attribute
* @param mixed $value Value of the attribute
* @return object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAttribute($attribute, $value) {
if(array_key_exists($attribute, $this->allowedAttributes)) {
@@ -211,7 +202,6 @@ abstract class tx_form_domain_model_element_abstract {
* Get the allowed attributes for an element
*
* @return array The allowed attributes
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getAllowedAttributes() {
return $this->allowedAttributes;
@@ -221,7 +211,6 @@ abstract class tx_form_domain_model_element_abstract {
* Get the mandatory attributes for an element
*
* @return array The mandatory attributes
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getMandatoryAttributes() {
return $this->mandatoryAttributes;
@@ -231,7 +220,6 @@ abstract class tx_form_domain_model_element_abstract {
* Check if element has attributes which are allowed
*
* @return boolean TRUE if there is a list of allowed attributes
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function hasAllowedAttributes() {
if(isset($this->allowedAttributes)) {
@@ -244,7 +232,6 @@ abstract class tx_form_domain_model_element_abstract {
* Check if element has additionals which are allowed
*
* @return boolean TRUE if there is a list of allowed additionals
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function hasAllowedAdditionals() {
if(isset($this->allowedAdditional)) {
@@ -257,7 +244,6 @@ abstract class tx_form_domain_model_element_abstract {
* Get the allowed additionals for an element
*
* @return array The allowed additionals
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getAllowedAdditionals() {
return $this->allowedAdditional;
@@ -267,7 +253,6 @@ abstract class tx_form_domain_model_element_abstract {
* Get the array with all attribute objects for the element
*
* @return array
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getAttributes() {
return $this->attributes->getAttributes();
@@ -278,7 +263,6 @@ abstract class tx_form_domain_model_element_abstract {
*
* @param string $key The name of the attribute
* @return boolean
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function hasAttribute($key) {
return $this->attributes->hasAttribute($key);
@@ -289,7 +273,6 @@ abstract class tx_form_domain_model_element_abstract {
*
* @param string $key Name of the attribute
* @return mixed
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getAttributeValue($key) {
return $this->attributes->getValue($key);
@@ -299,7 +282,6 @@ abstract class tx_form_domain_model_element_abstract {
* Get the array with all additional objects for the element
*
* @return array
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getAdditional() {
return $this->additional->getAdditional();
@@ -310,7 +292,6 @@ abstract class tx_form_domain_model_element_abstract {
*
* @param string $key Key of the additional
* @return string The additional object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getAdditionalObjectByKey($key) {
return $this->additional->getAdditionalObjectByKey($key);
@@ -321,7 +302,6 @@ abstract class tx_form_domain_model_element_abstract {
*
* @param string $key Name of the additional
* @return mixed
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getAdditionalValue($key) {
return $this->additional->getValue($key);
@@ -331,7 +311,6 @@ abstract class tx_form_domain_model_element_abstract {
* Load the attributes object
*
* @return tx_form_domain_model_attributes
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
protected function createAttributes() {
$className = 'tx_form_domain_model_attributes_attributes';
@@ -344,7 +323,6 @@ abstract class tx_form_domain_model_element_abstract {
*
* @param string $layout The layout
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setLayout($layout = '') {
$this->layout = (string) $layout;
@@ -354,7 +332,6 @@ abstract class tx_form_domain_model_element_abstract {
* Get the layout for an element
*
* @return string XML for layout
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getLayout() {
return $this->layout;
@@ -365,7 +342,6 @@ abstract class tx_form_domain_model_element_abstract {
*
* @param string $value The value
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setValue($value = '') {
$this->value = (string) $value;
@@ -375,7 +351,6 @@ abstract class tx_form_domain_model_element_abstract {
* Get the value for the element
*
* @return mixed
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getValue() {
return $this->value;
@@ -386,7 +361,6 @@ abstract class tx_form_domain_model_element_abstract {
*
* @param string $data The content
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setData($data = '') {
$this->data = (string) $data;
@@ -396,7 +370,6 @@ abstract class tx_form_domain_model_element_abstract {
* Set the additionals from validation rules
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setMessagesFromValidation() {
if($this->validateClass->hasMessage($this->getName())) {
@@ -414,7 +387,6 @@ abstract class tx_form_domain_model_element_abstract {
* Set the additional error from validation rules
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setErrorsFromValidation() {
if($this->validateClass->hasErrors($this->getName())) {
@@ -434,7 +406,6 @@ abstract class tx_form_domain_model_element_abstract {
* @param string $additional Name of the additional
* @param mixed $value Value of the additional
* @return object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAdditional($additional, $type, $value) {
$this->additional->addAdditional($additional, $type, $value);
@@ -447,7 +418,6 @@ abstract class tx_form_domain_model_element_abstract {
*
* @param string $key Name of the additional
* @return boolean
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function additionalIsSet($key) {
return $this->additional->additionalIsSet($key);
@@ -457,7 +427,6 @@ abstract class tx_form_domain_model_element_abstract {
* Load the additional object
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
protected function createAdditional() {
$className = 'tx_form_domain_model_additional_additional';
@@ -471,7 +440,6 @@ abstract class tx_form_domain_model_element_abstract {
* @param string $key Name of the additional
* @param string $layout XML for layout
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAdditionalLayout($key, $layout) {
$this->additional->setLayout($key, $layout);
@@ -481,7 +449,6 @@ abstract class tx_form_domain_model_element_abstract {
* Load the filter object
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
protected function createFilter() {
$this->filter = t3lib_div::makeInstance('tx_form_system_filter');
@@ -494,7 +461,6 @@ abstract class tx_form_domain_model_element_abstract {
* @param string $class Name of the filter
* @param array $arguments Arguments for the filter
* @return object Filter object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function makeFilter($class, $arguments = array()) {
$filter = $this->filter->makeFilter($class, $arguments);
@@ -508,7 +474,6 @@ abstract class tx_form_domain_model_element_abstract {
*
* @param object $filter Filter object
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function addFilter($filter) {
$this->filter->addFilter($filter);
@@ -519,7 +484,6 @@ abstract class tx_form_domain_model_element_abstract {
* and set submitted data right for elements
*
* @return object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function checkFilterAndSetIncomingDataFromRequest() {
return $this;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/Button.php b/typo3/sysext/form/Classes/Domain/Model/Element/Button.php
index 00176bbfb971246db9ae18760b02982132a7c93e..312abe66bbf5352ce78f4feabb5d60024b7a0518 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/Button.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/Button.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -69,7 +67,6 @@ class tx_form_domain_model_element_button extends tx_form_domain_model_element_a
* Sets the configuration, calls parent constructor and fills the attributes
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
@@ -84,7 +81,6 @@ class tx_form_domain_model_element_button extends tx_form_domain_model_element_a
* @param string $value Value to display on button
* @return void
* @see typo3/sysext/form/model/element/tx_form_domain_model_element#setValue()
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setValue($value = '') {
$localizationHandler = t3lib_div::makeInstance('tx_form_system_localization');
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/Checkbox.php b/typo3/sysext/form/Classes/Domain/Model/Element/Checkbox.php
index b586ad7b0a6b5e9984975b449c153b5ff5a8e06e..4bb67abb037c8060360375447367566bee54f5fd 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/Checkbox.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/Checkbox.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -78,7 +76,6 @@ class tx_form_domain_model_element_checkbox extends tx_form_domain_model_element
* Sets the configuration, calls parent constructor and fills the attributes
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
@@ -121,7 +118,6 @@ class tx_form_domain_model_element_checkbox extends tx_form_domain_model_element
* @param string $attribute Name of the attribute
* @param mixed $value Value of the attribute
* @return object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAttribute($attribute, $value) {
if(array_key_exists($attribute, $this->allowedAttributes)) {
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/Checkboxgroup.php b/typo3/sysext/form/Classes/Domain/Model/Element/Checkboxgroup.php
index 0ecf8db826819c5e29c476a83ac096b7f74eb997..579e37294f9512e7f854914e171e973caeb5aa97 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/Checkboxgroup.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/Checkboxgroup.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_element_checkboxgroup extends tx_form_domain_model_el
* and adds all child objects
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
@@ -50,7 +47,6 @@ class tx_form_domain_model_element_checkboxgroup extends tx_form_domain_model_el
*
* @param object $element The child object
* @return object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function addElement($element) {
if ($element->acceptsParentName()) {
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/Container.php b/typo3/sysext/form/Classes/Domain/Model/Element/Container.php
index c8f5283812220723475021a0a5687e0381480b36..70ec40ef8f9af7c51d5ab2d1d6a6cac24a857df7 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/Container.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/Container.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -44,7 +42,6 @@ class tx_form_domain_model_element_container extends tx_form_domain_model_elemen
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
@@ -55,7 +52,6 @@ class tx_form_domain_model_element_container extends tx_form_domain_model_elemen
*
* @param object $element The child object
* @return object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function addElement($element) {
$this->elements[] = $element;
@@ -66,7 +62,6 @@ class tx_form_domain_model_element_container extends tx_form_domain_model_elemen
* Get the child elements
*
* @return array Child objects
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getElements() {
return $this->elements;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/Content.php b/typo3/sysext/form/Classes/Domain/Model/Element/Content.php
index 2a7bb04fac24b075aeabc3a05e8c8ef105ac269a..0c8d69461d039e11640fdbbe814a780b074f469b 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/Content.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/Content.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -51,7 +49,6 @@ class tx_form_domain_model_element_content extends tx_form_domain_model_element_
* Sets the configuration, calls parent constructor and fills the attributes
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
@@ -63,7 +60,6 @@ class tx_form_domain_model_element_content extends tx_form_domain_model_element_
* @param string $cObj The name of the object
* @param array $cObjDot The configuration of the object
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setData($cObj, $cObjDot) {
$this->cObj = $cObj;
@@ -76,7 +72,6 @@ class tx_form_domain_model_element_content extends tx_form_domain_model_element_
* configuration into html string
*
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getData() {
$data = $this->localCobj->cObjGetSingle($this->cObj, $this->cObjDot);
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/Fieldset.php b/typo3/sysext/form/Classes/Domain/Model/Element/Fieldset.php
index 2877404f7ccc695daa233a60952ae403e4cb56e2..09322f97a50327f74cf262deb627612fea0e1569 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/Fieldset.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/Fieldset.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -52,7 +50,6 @@ class tx_form_domain_model_element_fieldset extends tx_form_domain_model_element
* and adds all child objects
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/Fileupload.php b/typo3/sysext/form/Classes/Domain/Model/Element/Fileupload.php
index 43ce713bd3150678ee854992b181c4e0f864a861..1f7932af5550752e6b3e75422397f8d90dc00976 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/Fileupload.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/Fileupload.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -66,7 +64,6 @@ class tx_form_domain_model_element_fileupload extends tx_form_domain_model_eleme
/**
* @return string
- * @author Peter Beernink <p.beernink@drecomm.nl>
*/
public function getData() {
$uploadData = $this->requestHandler->get($this->name);
@@ -78,7 +75,6 @@ class tx_form_domain_model_element_fileupload extends tx_form_domain_model_eleme
* Sets the configuration, calls parent constructor and fills the attributes
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/Hidden.php b/typo3/sysext/form/Classes/Domain/Model/Element/Hidden.php
index c83b5f17c887e991936499122497527d54cb98f8..ca7c28e6c52d21ea7b7085d63020e369f7b78468 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/Hidden.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/Hidden.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -62,7 +60,6 @@ class tx_form_domain_model_element_hidden extends tx_form_domain_model_element_a
* Sets the configuration, calls parent constructor and fills the attributes
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/Imagebutton.php b/typo3/sysext/form/Classes/Domain/Model/Element/Imagebutton.php
index 7af66391cac7924224d08436a2536fb91b5cf86a..0051406ada4a8e4949dcc9a2d2fe349abb5c6bc1 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/Imagebutton.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/Imagebutton.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -70,7 +68,6 @@ class tx_form_domain_model_element_imagebutton extends tx_form_domain_model_elem
* Sets the configuration, calls parent constructor and fills the attributes
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/Optgroup.php b/typo3/sysext/form/Classes/Domain/Model/Element/Optgroup.php
index 70edf91494be349665f3971138d048468e761524..7615419741d2261ee11ee472d108692f7b761685 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/Optgroup.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/Optgroup.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -68,7 +66,6 @@ class tx_form_domain_model_element_optgroup extends tx_form_domain_model_element
* Sets the configuration, calls parent constructor and fills the attributes
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
@@ -94,7 +91,6 @@ class tx_form_domain_model_element_optgroup extends tx_form_domain_model_element
*
* @param object $element The child object
* @return object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function addElement($element) {
$this->elements[] = $element;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/Option.php b/typo3/sysext/form/Classes/Domain/Model/Element/Option.php
index d41f4f61de1c7c2fdccfa3e0af1298f785a390a3..cc141b78c28e29f8d8d7d5653498e85733f116eb 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/Option.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/Option.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -70,7 +68,6 @@ class tx_form_domain_model_element_option extends tx_form_domain_model_element_a
* Sets the configuration, calls parent constructor and fills the attributes
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
@@ -81,7 +78,6 @@ class tx_form_domain_model_element_option extends tx_form_domain_model_element_a
* <option>content</option>
*
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getData() {
return $this->data;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/Password.php b/typo3/sysext/form/Classes/Domain/Model/Element/Password.php
index 1a1cbc29ea9bd654bf1e0091b3762518ed465919..5ca7019cced95864807ce99d6e28244345a131d7 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/Password.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/Password.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -72,7 +70,6 @@ class tx_form_domain_model_element_password extends tx_form_domain_model_element
* Sets the configuration, calls parent constructor and fills the attributes
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/Radio.php b/typo3/sysext/form/Classes/Domain/Model/Element/Radio.php
index 118a2ef6916b46b1942e3c7e0212cf55eafc07b3..26d856deaf5624cb70bbd75fc71ed5ede1f8a487 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/Radio.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/Radio.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -78,7 +76,6 @@ class tx_form_domain_model_element_radio extends tx_form_domain_model_element_ab
* Sets the configuration, calls parent constructor and fills the attributes
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/Radiogroup.php b/typo3/sysext/form/Classes/Domain/Model/Element/Radiogroup.php
index b1b21c5d3751455c90b1c51561935e075bd9540d..a2b9c942d054846aa2610ff53ede24d122679476 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/Radiogroup.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/Radiogroup.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_domain_model_element_radiogroup extends tx_form_domain_model_eleme
* and adds all child objects
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
@@ -50,7 +47,6 @@ class tx_form_domain_model_element_radiogroup extends tx_form_domain_model_eleme
*
* @param object $element The child object
* @return object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function addElement($element) {
if ($element->acceptsParentName()) {
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/Reset.php b/typo3/sysext/form/Classes/Domain/Model/Element/Reset.php
index ecdc1c971f0ab1fd9cc61d4a52eaf3457b580427..0478c84f0f9e3d2e4c7ee96c883117d3b9c04f75 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/Reset.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/Reset.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -69,7 +67,6 @@ class tx_form_domain_model_element_reset extends tx_form_domain_model_element_ab
* Sets the configuration, calls parent constructor and fills the attributes
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
@@ -84,7 +81,6 @@ class tx_form_domain_model_element_reset extends tx_form_domain_model_element_ab
* @param string $value Value to display on button
* @return void
* @see typo3/sysext/form/model/element/tx_form_domain_model_element#setValue()
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setValue($value = '') {
$localizationHandler = t3lib_div::makeInstance('tx_form_system_localization');
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/Select.php b/typo3/sysext/form/Classes/Domain/Model/Element/Select.php
index 88266d2f2faeb8647ad4fd504f626a5c45112074..ed06e40df43058e2c2e7985b3915de82a40f0818 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/Select.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/Select.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -66,7 +64,6 @@ class tx_form_domain_model_element_select extends tx_form_domain_model_element_c
* Sets the configuration, calls parent constructor and fills the attributes
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
@@ -77,7 +74,6 @@ class tx_form_domain_model_element_select extends tx_form_domain_model_element_c
*
* @param object $element The child object
* @return object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function addElement($element) {
$element->setParentName($this->getName());
@@ -91,7 +87,6 @@ class tx_form_domain_model_element_select extends tx_form_domain_model_element_c
* @param string $attribute Name of the attribute
* @param mixed $value Value of the attribute
* @return object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAttribute($attribute, $value) {
if(array_key_exists($attribute, $this->allowedAttributes)) {
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/Submit.php b/typo3/sysext/form/Classes/Domain/Model/Element/Submit.php
index 0091e7f6dd43a75f5f4adcafaa4185bad7ebace1..b46e6cd32ba93caad6c5f8c79f5ebe8a46cc2ea9 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/Submit.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/Submit.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -69,7 +67,6 @@ class tx_form_domain_model_element_submit extends tx_form_domain_model_element_a
* Sets the configuration, calls parent constructor and fills the attributes
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
@@ -84,7 +81,6 @@ class tx_form_domain_model_element_submit extends tx_form_domain_model_element_a
* @param string $value Value to display on button
* @return void
* @see typo3/sysext/form/model/element/tx_form_domain_model_element#setValue()
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setValue($value = '') {
$localizationHandler = t3lib_div::makeInstance('tx_form_system_localization');
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/Textarea.php b/typo3/sysext/form/Classes/Domain/Model/Element/Textarea.php
index f93e92fff5e7c771206c746d5cacdc769c89aaa3..ee95a380488505b7a51b8e4f1c9ef6f227e1b869 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/Textarea.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/Textarea.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -69,7 +67,6 @@ class tx_form_domain_model_element_textarea extends tx_form_domain_model_element
* Sets the configuration, calls parent constructor and fills the attributes
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
@@ -80,7 +77,6 @@ class tx_form_domain_model_element_textarea extends tx_form_domain_model_element
* <textarea>content</textarea>
*
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getData() {
return $this->data;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/Textline.php b/typo3/sysext/form/Classes/Domain/Model/Element/Textline.php
index 07083d4460d9636beb9ebce7475cb6cdb539a7b3..805bf0d93505c51e0786fe018edb3095c2d6ca2d 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/Textline.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/Textline.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -72,7 +70,6 @@ class tx_form_domain_model_element_textline extends tx_form_domain_model_element
* Sets the configuration, calls parent constructor and fills the attributes
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
diff --git a/typo3/sysext/form/Classes/Domain/Model/Form.php b/typo3/sysext/form/Classes/Domain/Model/Form.php
index e977986fd529fb213eccbe7b0cd34460a60e8c08..c89aadc444e6ed2d050bcf4ebc8698cf4a3a2aac 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Form.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Form.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -72,7 +70,6 @@ class tx_form_domain_model_form extends tx_form_domain_model_element_container {
* and adds all form element objects
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
@@ -84,7 +81,6 @@ class tx_form_domain_model_form extends tx_form_domain_model_element_container {
* @param string $attribute Name of the attribute
* @param mixed $value Value of the attribute
* @return object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAttribute($attribute, $value) {
if(array_key_exists($attribute, $this->allowedAttributes)) {
@@ -103,9 +99,8 @@ class tx_form_domain_model_form extends tx_form_domain_model_element_container {
* when both have been filled.
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function equalizeNameAndIdAttribute() {
+ protected function equalizeNameAndIdAttribute() {
$nameAttribute = $this->attributes->getAttributeObjectByKey('name');
$idAttribute = $this->attributes->getAttributeObjectByKey('id');
if(is_object($nameAttribute) && is_object($idAttribute)) {
diff --git a/typo3/sysext/form/Classes/Domain/Model/JSON/Button.php b/typo3/sysext/form/Classes/Domain/Model/JSON/Button.php
index b56bac20ff70efddc00625cd412e2bdf2e96e6ce..72db019515cbe42b7db652d1a2e4318db8927ea8 100644
--- a/typo3/sysext/form/Classes/Domain/Model/JSON/Button.php
+++ b/typo3/sysext/form/Classes/Domain/Model/JSON/Button.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -81,7 +79,6 @@ class tx_form_domain_model_json_button extends tx_form_domain_model_json_element
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
diff --git a/typo3/sysext/form/Classes/Domain/Model/JSON/Checkbox.php b/typo3/sysext/form/Classes/Domain/Model/JSON/Checkbox.php
index 71890b0cbbac326f146a3288ff41da1e14b50daa..c20e1e0e30c4de1496d017b35bca9f348292927a 100644
--- a/typo3/sysext/form/Classes/Domain/Model/JSON/Checkbox.php
+++ b/typo3/sysext/form/Classes/Domain/Model/JSON/Checkbox.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -81,7 +79,6 @@ class tx_form_domain_model_json_checkbox extends tx_form_domain_model_json_eleme
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
diff --git a/typo3/sysext/form/Classes/Domain/Model/JSON/Checkboxgroup.php b/typo3/sysext/form/Classes/Domain/Model/JSON/Checkboxgroup.php
index 944723101b2809780110f1fd177852ac7c283ed7..b7e6da8a82da7efc1ef31c617ff5c2de3a44ed8e 100644
--- a/typo3/sysext/form/Classes/Domain/Model/JSON/Checkboxgroup.php
+++ b/typo3/sysext/form/Classes/Domain/Model/JSON/Checkboxgroup.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -73,7 +71,6 @@ class tx_form_domain_model_json_checkboxgroup extends tx_form_domain_model_json_
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
@@ -98,9 +95,8 @@ class tx_form_domain_model_json_checkboxgroup extends tx_form_domain_model_json_
*
* @param array $parameters Configuration array
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setOptions($parameters) {
+ protected function setOptions($parameters) {
if (is_array($parameters)) {
$keys = t3lib_TStemplate::sortedKeyList($parameters);
foreach ($keys as $key) {
@@ -128,9 +124,8 @@ class tx_form_domain_model_json_checkboxgroup extends tx_form_domain_model_json_
*
* @param array $parameters Configuration array
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setVarious($parameters) {
+ protected function setVarious($parameters) {
if (isset($parameters['name'])) {
$this->configuration['various']['name'] = $parameters['name'];
}
diff --git a/typo3/sysext/form/Classes/Domain/Model/JSON/Container.php b/typo3/sysext/form/Classes/Domain/Model/JSON/Container.php
index a807c2c175b997a084f5eee0256209023fb18581..f6b84191167996ab063c9df89ffeeb3b25e7359e 100644
--- a/typo3/sysext/form/Classes/Domain/Model/JSON/Container.php
+++ b/typo3/sysext/form/Classes/Domain/Model/JSON/Container.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -46,7 +44,6 @@ class tx_form_domain_model_json_container extends tx_form_domain_model_json_elem
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
@@ -57,7 +54,6 @@ class tx_form_domain_model_json_container extends tx_form_domain_model_json_elem
*
* @param object $element The element to add
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function addElement($element) {
$this->elementContainer['items'][] = $element;
diff --git a/typo3/sysext/form/Classes/Domain/Model/JSON/Element.php b/typo3/sysext/form/Classes/Domain/Model/JSON/Element.php
index a3bad8875ffdedc3e9e2a00bc1ffddac72966c4e..95b897dd3a228c8a6c541070bb6cab89fb96cf15 100644
--- a/typo3/sysext/form/Classes/Domain/Model/JSON/Element.php
+++ b/typo3/sysext/form/Classes/Domain/Model/JSON/Element.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -66,7 +64,6 @@ class tx_form_domain_model_json_element {
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
}
@@ -76,7 +73,6 @@ class tx_form_domain_model_json_element {
*
* @param array $parameters Configuration array
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setParameters($parameters) {
foreach ($this->configuration as $key => $value) {
@@ -104,7 +100,6 @@ class tx_form_domain_model_json_element {
* Check if child elements are allowed within this element
*
* @return boolean TRUE if allowed
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function childElementsAllowed() {
return $this->childElementsAllowed;
@@ -115,9 +110,8 @@ class tx_form_domain_model_json_element {
*
* @param array $parameters Configuration array
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setAttributes($parameters) {
+ protected function setAttributes($parameters) {
foreach ($this->allowedAttributes as $allowedAttribute) {
if (isset($parameters[$allowedAttribute])) {
$this->configuration['attributes'][$allowedAttribute] = $parameters[$allowedAttribute];
@@ -132,9 +126,8 @@ class tx_form_domain_model_json_element {
*
* @param array $parameters Configuration array
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setFilters($parameters) {
+ protected function setFilters($parameters) {
if (isset($parameters['filters.']) && is_array($parameters['filters.'])) {
$filters = $parameters['filters.'];
@@ -157,9 +150,8 @@ class tx_form_domain_model_json_element {
*
* @param array $parameters Configuration array
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setLabel($parameters) {
+ protected function setLabel($parameters) {
if (isset($parameters['label']) && !isset($parameters['label.'])) {
$this->configuration['label']['value'] = $parameters['label'];
} elseif (!isset($parameters['label']) && isset($parameters['label.'])) {
@@ -172,9 +164,8 @@ class tx_form_domain_model_json_element {
*
* @param array $parameters Configuration array
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setLayout($parameters) {
+ protected function setLayout($parameters) {
if (isset($parameters['layout'])) {
if ($this->configuration['layout'] === 'front') {
$this->configuration['layout'] = 'back';
@@ -189,9 +180,8 @@ class tx_form_domain_model_json_element {
*
* @param array $parameters Configuration array
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setValidation($parameters) {
+ protected function setValidation($parameters) {
if (isset($parameters['validation']) && is_array($parameters['validation'])) {
$this->configuration['validation'] = $parameters['validation'];
} else {
diff --git a/typo3/sysext/form/Classes/Domain/Model/JSON/Fieldset.php b/typo3/sysext/form/Classes/Domain/Model/JSON/Fieldset.php
index 60b43cf48e8669ca2906afd54c56693878116f15..ef0ebbd5a5e64609b8ef5280cc989c9b2dbbc702 100644
--- a/typo3/sysext/form/Classes/Domain/Model/JSON/Fieldset.php
+++ b/typo3/sysext/form/Classes/Domain/Model/JSON/Fieldset.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -68,7 +66,6 @@ class tx_form_domain_model_json_fieldset extends tx_form_domain_model_json_conta
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
@@ -92,9 +89,8 @@ class tx_form_domain_model_json_fieldset extends tx_form_domain_model_json_conta
*
* @param array $parameters Configuration array
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setLegend($parameters) {
+ protected function setLegend($parameters) {
if (isset($parameters['legend']) && !isset($parameters['legend.'])) {
$this->configuration['legend']['value'] = $parameters['legend'];
} elseif (!isset($parameters['legend']) && isset($parameters['legend.'])) {
diff --git a/typo3/sysext/form/Classes/Domain/Model/JSON/Fileupload.php b/typo3/sysext/form/Classes/Domain/Model/JSON/Fileupload.php
index 7c0cbfd12c8f8c6dc0a5e253b6490e94c031a2c9..798e8eca956433987664b74bb46c0d242d9a22e4 100644
--- a/typo3/sysext/form/Classes/Domain/Model/JSON/Fileupload.php
+++ b/typo3/sysext/form/Classes/Domain/Model/JSON/Fileupload.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
diff --git a/typo3/sysext/form/Classes/Domain/Model/JSON/Form.php b/typo3/sysext/form/Classes/Domain/Model/JSON/Form.php
index 71ed0a20ff1d45cfb29d76e1e1d488e810182dee..625e5041ddfda228477ae609a3349207f5cd102f 100644
--- a/typo3/sysext/form/Classes/Domain/Model/JSON/Form.php
+++ b/typo3/sysext/form/Classes/Domain/Model/JSON/Form.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -74,7 +72,6 @@ class tx_form_domain_model_json_form extends tx_form_domain_model_json_container
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
@@ -100,9 +97,8 @@ class tx_form_domain_model_json_form extends tx_form_domain_model_json_container
*
* @param array $parameters Configuration array
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setConfirmation($parameters) {
+ protected function setConfirmation($parameters) {
if (isset($parameters['confirmation'])) {
$this->configuration['confirmation'] = $parameters['confirmation'];
}
@@ -113,9 +109,8 @@ class tx_form_domain_model_json_form extends tx_form_domain_model_json_container
*
* @param array $parameters Configuration array
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setPostProcessors($parameters) {
+ protected function setPostProcessors($parameters) {
if (isset($parameters['postProcessor.']) && is_array($parameters['postProcessor.'])) {
$postProcessors = $parameters['postProcessor.'];
@@ -143,9 +138,8 @@ class tx_form_domain_model_json_form extends tx_form_domain_model_json_container
*
* @param array $parameters Configuration array
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setPrefix($parameters) {
+ protected function setPrefix($parameters) {
if (isset($parameters['prefix'])) {
$this->configuration['prefix'] = $parameters['prefix'];
}
diff --git a/typo3/sysext/form/Classes/Domain/Model/JSON/Header.php b/typo3/sysext/form/Classes/Domain/Model/JSON/Header.php
index 838e5919fdaaebf44934a8503246a577b8f88cfe..fa416558ce607ebfd1cd64bd219a6426c133d738 100644
--- a/typo3/sysext/form/Classes/Domain/Model/JSON/Header.php
+++ b/typo3/sysext/form/Classes/Domain/Model/JSON/Header.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -70,7 +68,6 @@ class tx_form_domain_model_json_header extends tx_form_domain_model_json_element
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
@@ -96,9 +93,8 @@ class tx_form_domain_model_json_header extends tx_form_domain_model_json_element
*
* @param array $parameters Configuration array
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setVarious($parameters) {
+ protected function setVarious($parameters) {
if (isset($parameters['wrap'])) {
preg_match('/<(h[1-5]{1}).*?>/', $parameters['wrap'], $matches);
if (!empty($matches)) {
diff --git a/typo3/sysext/form/Classes/Domain/Model/JSON/Hidden.php b/typo3/sysext/form/Classes/Domain/Model/JSON/Hidden.php
index 88ab63bae1fc5408110bf9f3d8360d864b63b436..1456c23848a865951f2a662d4385eec55260859d 100644
--- a/typo3/sysext/form/Classes/Domain/Model/JSON/Hidden.php
+++ b/typo3/sysext/form/Classes/Domain/Model/JSON/Hidden.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -76,7 +74,6 @@ class tx_form_domain_model_json_hidden extends tx_form_domain_model_json_element
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
diff --git a/typo3/sysext/form/Classes/Domain/Model/JSON/Name.php b/typo3/sysext/form/Classes/Domain/Model/JSON/Name.php
index 11650d75b4ccce4ff0bb4eaf2ce7c97dcbd2959e..bd3060acf61cde9f5b054d3f55767f18aa32d29c 100644
--- a/typo3/sysext/form/Classes/Domain/Model/JSON/Name.php
+++ b/typo3/sysext/form/Classes/Domain/Model/JSON/Name.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -73,7 +71,6 @@ class tx_form_domain_model_json_name extends tx_form_domain_model_json_fieldset
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
@@ -100,9 +97,8 @@ class tx_form_domain_model_json_name extends tx_form_domain_model_json_fieldset
*
* @param array $parameters Configuration array
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setVarious($parameters) {
+ protected function setVarious($parameters) {
if (is_array($parameters)) {
$keys = t3lib_TStemplate::sortedKeyList($parameters);
foreach ($keys as $key) {
diff --git a/typo3/sysext/form/Classes/Domain/Model/JSON/Password.php b/typo3/sysext/form/Classes/Domain/Model/JSON/Password.php
index 995a991e24e7d24594b25bacd0b99e352d2e811c..1d19d81b6e4977a5a5b34bf97a20e8965c69b83c 100644
--- a/typo3/sysext/form/Classes/Domain/Model/JSON/Password.php
+++ b/typo3/sysext/form/Classes/Domain/Model/JSON/Password.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -84,7 +82,6 @@ class tx_form_domain_model_json_password extends tx_form_domain_model_json_eleme
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
diff --git a/typo3/sysext/form/Classes/Domain/Model/JSON/Radio.php b/typo3/sysext/form/Classes/Domain/Model/JSON/Radio.php
index 3cd1568f8d5ed8dd78de9911c7860d57eb7f9043..aa7c25c587ab30fdd2b8162560553c178db33d64 100644
--- a/typo3/sysext/form/Classes/Domain/Model/JSON/Radio.php
+++ b/typo3/sysext/form/Classes/Domain/Model/JSON/Radio.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -81,7 +79,6 @@ class tx_form_domain_model_json_radio extends tx_form_domain_model_json_element
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
diff --git a/typo3/sysext/form/Classes/Domain/Model/JSON/Radiogroup.php b/typo3/sysext/form/Classes/Domain/Model/JSON/Radiogroup.php
index 01c39bf63ba6cfcf2d0ce135dd11d7452b753888..6f1abd631ce5ad6c988e7fa12c2ba0048cf8978c 100644
--- a/typo3/sysext/form/Classes/Domain/Model/JSON/Radiogroup.php
+++ b/typo3/sysext/form/Classes/Domain/Model/JSON/Radiogroup.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -73,7 +71,6 @@ class tx_form_domain_model_json_radiogroup extends tx_form_domain_model_json_fie
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
@@ -98,9 +95,8 @@ class tx_form_domain_model_json_radiogroup extends tx_form_domain_model_json_fie
*
* @param array $parameters Configuration array
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setOptions($parameters) {
+ protected function setOptions($parameters) {
if (is_array($parameters)) {
$keys = t3lib_TStemplate::sortedKeyList($parameters);
foreach ($keys as $key) {
@@ -128,9 +124,8 @@ class tx_form_domain_model_json_radiogroup extends tx_form_domain_model_json_fie
*
* @param array $parameters Configuration array
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setVarious($parameters) {
+ protected function setVarious($parameters) {
if (isset($parameters['name'])) {
$this->configuration['various']['name'] = $parameters['name'];
}
diff --git a/typo3/sysext/form/Classes/Domain/Model/JSON/Reset.php b/typo3/sysext/form/Classes/Domain/Model/JSON/Reset.php
index 70f96b3c89dd4908934e3bf90b20226fdb9dea66..abc623a77a3b88148cdecd6c839c64430c46dca4 100644
--- a/typo3/sysext/form/Classes/Domain/Model/JSON/Reset.php
+++ b/typo3/sysext/form/Classes/Domain/Model/JSON/Reset.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -81,7 +79,6 @@ class tx_form_domain_model_json_reset extends tx_form_domain_model_json_element
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
diff --git a/typo3/sysext/form/Classes/Domain/Model/JSON/Select.php b/typo3/sysext/form/Classes/Domain/Model/JSON/Select.php
index 6358b4e18920f1db71455a66fc0b513a3baa829e..7e20e8f27154deaf4f15cce268a30dd31e088ebe 100644
--- a/typo3/sysext/form/Classes/Domain/Model/JSON/Select.php
+++ b/typo3/sysext/form/Classes/Domain/Model/JSON/Select.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -79,7 +77,6 @@ class tx_form_domain_model_json_select extends tx_form_domain_model_json_element
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
@@ -103,9 +100,8 @@ class tx_form_domain_model_json_select extends tx_form_domain_model_json_element
*
* @param array $parameters Configuration array
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setOptions($parameters) {
+ protected function setOptions($parameters) {
if (is_array($parameters)) {
$keys = t3lib_TStemplate::sortedKeyList($parameters);
foreach ($keys as $key) {
diff --git a/typo3/sysext/form/Classes/Domain/Model/JSON/Submit.php b/typo3/sysext/form/Classes/Domain/Model/JSON/Submit.php
index 7e08261b3fc891bde958a86faabcee98aa1dacb5..39245bf72ce242ac9318ae7320eeac344bec9b22 100644
--- a/typo3/sysext/form/Classes/Domain/Model/JSON/Submit.php
+++ b/typo3/sysext/form/Classes/Domain/Model/JSON/Submit.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -81,7 +79,6 @@ class tx_form_domain_model_json_submit extends tx_form_domain_model_json_element
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
diff --git a/typo3/sysext/form/Classes/Domain/Model/JSON/Textarea.php b/typo3/sysext/form/Classes/Domain/Model/JSON/Textarea.php
index 59e1aa72fb248988ca5456526b6bfd8fb4d1690f..8a34a1de2837db348349159b96283ecf925e0c06 100644
--- a/typo3/sysext/form/Classes/Domain/Model/JSON/Textarea.php
+++ b/typo3/sysext/form/Classes/Domain/Model/JSON/Textarea.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -82,7 +80,6 @@ class tx_form_domain_model_json_textarea extends tx_form_domain_model_json_eleme
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
diff --git a/typo3/sysext/form/Classes/Domain/Model/JSON/Textline.php b/typo3/sysext/form/Classes/Domain/Model/JSON/Textline.php
index 713728d7b001f1ef02722e01332ecbd80c5ae3ec..deaa4778d60b423832bd8b2116cde3a9913d3ff1 100644
--- a/typo3/sysext/form/Classes/Domain/Model/JSON/Textline.php
+++ b/typo3/sysext/form/Classes/Domain/Model/JSON/Textline.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -84,7 +82,6 @@ class tx_form_domain_model_json_textline extends tx_form_domain_model_json_eleme
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
parent::__construct();
diff --git a/typo3/sysext/form/Classes/Domain/Repository/Content.php b/typo3/sysext/form/Classes/Domain/Repository/Content.php
index 71688cef4d26d10cb31e934d4adf09541de5fd53..095103d46bd08169cb803623240b76d42c8391c8 100644
--- a/typo3/sysext/form/Classes/Domain/Repository/Content.php
+++ b/typo3/sysext/form/Classes/Domain/Repository/Content.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -42,7 +40,6 @@ class tx_form_domain_repository_content {
* Using the GET or POST variable 'P'
*
* @return mixed|tx_form_domain_model_content if found, FALSE if not
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getRecord() {
$record = FALSE;
@@ -71,7 +68,6 @@ class tx_form_domain_repository_content {
* Check if the referenced record exists
*
* @return TRUE if record exists, FALSE if not
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function hasRecord() {
$hasRecord = FALSE;
@@ -89,7 +85,6 @@ class tx_form_domain_repository_content {
* Convert and save the incoming data of the FORM wizard
*
* @return TRUE if succeeded, FALSE if not
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function save() {
$json = t3lib_div::_GP('configuration');
@@ -124,7 +119,6 @@ class tx_form_domain_repository_content {
* Read and convert the content record to JSON
*
* @return The JSON object if record exists, FALSE if not
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getRecordAsJson() {
$json = FALSE;
diff --git a/typo3/sysext/form/Classes/Exception/class.tx_form_exception_general.php b/typo3/sysext/form/Classes/Exception/General.php
similarity index 100%
rename from typo3/sysext/form/Classes/Exception/class.tx_form_exception_general.php
rename to typo3/sysext/form/Classes/Exception/General.php
diff --git a/typo3/sysext/form/Classes/Exception/class.tx_form_exception_loader.php b/typo3/sysext/form/Classes/Exception/Loader.php
similarity index 100%
rename from typo3/sysext/form/Classes/Exception/class.tx_form_exception_loader.php
rename to typo3/sysext/form/Classes/Exception/Loader.php
diff --git a/typo3/sysext/form/Classes/System/Elementcounter/Elementcounter.php b/typo3/sysext/form/Classes/System/Elementcounter/Elementcounter.php
index db88bec62489604996c9412caf7c3f6a8398abfc..1cdae38209f625bdb859f728b4d4be3abaaf1b8c 100644
--- a/typo3/sysext/form/Classes/System/Elementcounter/Elementcounter.php
+++ b/typo3/sysext/form/Classes/System/Elementcounter/Elementcounter.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -44,7 +42,6 @@ class tx_form_system_elementcounter implements t3lib_Singleton {
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
}
@@ -53,7 +50,6 @@ class tx_form_system_elementcounter implements t3lib_Singleton {
* Raise the element counter by one
*
* @return integer
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getElementId() {
$elementId = $this->elementCounter;
diff --git a/typo3/sysext/form/Classes/System/Filter/Alphabetic.php b/typo3/sysext/form/Classes/System/Filter/Alphabetic.php
index ef13c8db3c8addee6cc53d980b6b151f8e44841f..abbe4d291724ebab632aa8616ddbf65abbd66b40 100644
--- a/typo3/sysext/form/Classes/System/Filter/Alphabetic.php
+++ b/typo3/sysext/form/Classes/System/Filter/Alphabetic.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -45,7 +43,6 @@ class tx_form_system_filter_alphabetic implements tx_form_system_filter_interfac
*
* @param array $arguments Filter configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments = array()) {
$this->setAllowWhiteSpace($arguments['allowWhiteSpace']);
@@ -56,7 +53,6 @@ class tx_form_system_filter_alphabetic implements tx_form_system_filter_interfac
*
* @param boolean $allowWhiteSpace True if allowed
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAllowWhiteSpace($allowWhiteSpace = TRUE) {
$this->allowWhiteSpace = (boolean) $allowWhiteSpace;
@@ -69,7 +65,6 @@ class tx_form_system_filter_alphabetic implements tx_form_system_filter_interfac
*
* @param string $value
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function filter($value) {
$whiteSpace = $this->allowWhiteSpace ? '\s' : '';
diff --git a/typo3/sysext/form/Classes/System/Filter/Alphanumeric.php b/typo3/sysext/form/Classes/System/Filter/Alphanumeric.php
index dab1e53c45a85265376dbbd00c6008278d2c0bdd..75255907c35b2f19cbfe1059260382bb6a6d2e33 100644
--- a/typo3/sysext/form/Classes/System/Filter/Alphanumeric.php
+++ b/typo3/sysext/form/Classes/System/Filter/Alphanumeric.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -45,7 +43,6 @@ class tx_form_system_filter_alphanumeric implements tx_form_system_filter_interf
*
* @param array $arguments Filter configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments = array()) {
$this->setAllowWhiteSpace($arguments['allowWhiteSpace']);
@@ -56,7 +53,6 @@ class tx_form_system_filter_alphanumeric implements tx_form_system_filter_interf
*
* @param boolean $allowWhiteSpace True if allowed
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAllowWhiteSpace($allowWhiteSpace = TRUE) {
$this->allowWhiteSpace = (boolean) $allowWhiteSpace;
@@ -69,7 +65,6 @@ class tx_form_system_filter_alphanumeric implements tx_form_system_filter_interf
*
* @param string $value
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function filter($value) {
$whiteSpace = $this->allowWhiteSpace ? '\s' : '';
diff --git a/typo3/sysext/form/Classes/System/Filter/Currency.php b/typo3/sysext/form/Classes/System/Filter/Currency.php
index c9b9c17a1300cc5c703ed18212540ed925d0878e..1559bf01e53d1d0ceaa48d14b1de75fbade7b161 100644
--- a/typo3/sysext/form/Classes/System/Filter/Currency.php
+++ b/typo3/sysext/form/Classes/System/Filter/Currency.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,7 @@ class tx_form_system_filter_currency implements tx_form_system_filter_interface
*
* @var string
*/
- private $decimalsPoint;
+ protected $decimalsPoint;
/**
* Separator between group of thousands
@@ -47,14 +45,13 @@ class tx_form_system_filter_currency implements tx_form_system_filter_interface
*
* @var string
*/
- private $thousandSeparator;
+ protected $thousandSeparator;
/**
* Constructor
*
* @param array $arguments Filter configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments = array()) {
$this->setDecimalsPoint($arguments['decimalPoint'])
@@ -66,7 +63,6 @@ class tx_form_system_filter_currency implements tx_form_system_filter_interface
*
* @param string $decimalsPoint Character used for decimal point
* @return tx_form_filter_currency
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setDecimalsPoint($decimalsPoint = '.') {
if(empty($decimalsPoint)) {
@@ -83,7 +79,6 @@ class tx_form_system_filter_currency implements tx_form_system_filter_interface
*
* @param string $thousandSeparator Character used for thousand separator
* @return tx_form_filter_currency
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setThousandSeparator($thousandSeparator = ',') {
if(empty($thousandSeparator)) {
@@ -105,7 +100,6 @@ class tx_form_system_filter_currency implements tx_form_system_filter_interface
*
* @param string $value
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function filter($value) {
$value = (float) ((string) $value);
diff --git a/typo3/sysext/form/Classes/System/Filter/Digit.php b/typo3/sysext/form/Classes/System/Filter/Digit.php
index 8ec6e24bd639268d338ed19458978c2f434e6b98..7fbf2dcd61b904bf4a524b70c87be757a255ec37 100644
--- a/typo3/sysext/form/Classes/System/Filter/Digit.php
+++ b/typo3/sysext/form/Classes/System/Filter/Digit.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -37,7 +35,6 @@ class tx_form_system_filter_digit implements tx_form_system_filter_interface {
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
}
@@ -48,7 +45,6 @@ class tx_form_system_filter_digit implements tx_form_system_filter_interface {
*
* @param string $value
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function filter($value) {
$pattern = '/[^0-9]/';
diff --git a/typo3/sysext/form/Classes/System/Filter/Filter.php b/typo3/sysext/form/Classes/System/Filter/Filter.php
index 7bfa92cf85eec2fc9af28ea156f4bea7c718a895..a258ac1f0bc72c2fe49872ea5bb357dacd6ecc4b 100644
--- a/typo3/sysext/form/Classes/System/Filter/Filter.php
+++ b/typo3/sysext/form/Classes/System/Filter/Filter.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -48,7 +46,6 @@ class tx_form_system_filter implements tx_form_system_filter_interface {
*
* @param array $arguments Filter configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments = array()) {
$removeXssFilter = $this->makeFilter('removexss');
@@ -61,7 +58,6 @@ class tx_form_system_filter implements tx_form_system_filter_interface {
* @param string $class Name of the filter
* @param mixed $value Typoscript configuration
* @return tx_form_filter
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function addFilter($filter) {
$this->filters[] = (object) $filter;
@@ -76,7 +72,6 @@ class tx_form_system_filter implements tx_form_system_filter_interface {
* @param string $class Name of the filter
* @param array $arguments Configuration of the filter
* @return object The filter object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function makeFilter($class, $arguments = array()) {
$class = strtolower((string) $class);
@@ -92,7 +87,6 @@ class tx_form_system_filter implements tx_form_system_filter_interface {
*
* @param mixed $value
* @return mixed
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function filter($value) {
if(!empty($this->filters)) {
diff --git a/typo3/sysext/form/Classes/System/Filter/Integer.php b/typo3/sysext/form/Classes/System/Filter/Integer.php
index eee0b7d9d1b8e5f8c401b1f0b7cb0c649a85c57b..bea39b45e97a962cb3a72aac2db4b437454d331b 100644
--- a/typo3/sysext/form/Classes/System/Filter/Integer.php
+++ b/typo3/sysext/form/Classes/System/Filter/Integer.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -37,7 +35,6 @@ class tx_form_system_filter_integer implements tx_form_system_filter_interface {
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
}
@@ -47,7 +44,6 @@ class tx_form_system_filter_integer implements tx_form_system_filter_interface {
*
* @param string $value
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function filter($value) {
return (integer) ((string) $value);
diff --git a/typo3/sysext/form/Classes/System/Filter/Interface.php b/typo3/sysext/form/Classes/System/Filter/Interface.php
index 5bf937d09f5cfc1e8eefd2ebeca87355be2f24b9..0265d804a9b123e415dee3dac2bb8e2ea48d3e3f 100644
--- a/typo3/sysext/form/Classes/System/Filter/Interface.php
+++ b/typo3/sysext/form/Classes/System/Filter/Interface.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,6 @@ interface tx_form_system_filter_interface {
*
* @param mixed $value
* @return mixed
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function filter($value);
}
diff --git a/typo3/sysext/form/Classes/System/Filter/Lowercase.php b/typo3/sysext/form/Classes/System/Filter/Lowercase.php
index 69873410488f904963b6461a7651e01fdb0e5c22..96a5ddda5bb5f95ee4d3c0cfc5f8cf24b864fca6 100644
--- a/typo3/sysext/form/Classes/System/Filter/Lowercase.php
+++ b/typo3/sysext/form/Classes/System/Filter/Lowercase.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -37,7 +35,6 @@ class tx_form_system_filter_lowercase implements tx_form_system_filter_interface
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
}
@@ -47,7 +44,6 @@ class tx_form_system_filter_lowercase implements tx_form_system_filter_interface
*
* @param string $value
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function filter($value) {
return $GLOBALS['TSFE']->csConvObj->conv_case($GLOBALS['TSFE']->renderCharset, $value, 'toLower');
diff --git a/typo3/sysext/form/Classes/System/Filter/Regexp.php b/typo3/sysext/form/Classes/System/Filter/Regexp.php
index befec94fa166aa4f2c6df5d6e9a631e3a4b48acb..7ceecf755b7fd4348d7621d550bf44549a8dbb11 100644
--- a/typo3/sysext/form/Classes/System/Filter/Regexp.php
+++ b/typo3/sysext/form/Classes/System/Filter/Regexp.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -45,7 +43,6 @@ class tx_form_system_filter_regexp implements tx_form_system_filter_interface {
*
* @param array $arguments Filter configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments = array()) {
$this->setRegularExpression($arguments['expression']);
@@ -56,7 +53,6 @@ class tx_form_system_filter_regexp implements tx_form_system_filter_interface {
*
* @param string $expression The regular expression
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setRegularExpression($expression) {
$this->regularExpression = (string) $expression;
@@ -68,7 +64,6 @@ class tx_form_system_filter_regexp implements tx_form_system_filter_interface {
*
* @param string $value
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function filter($value) {
return preg_replace($this->regularExpression, '', (string) $value);
diff --git a/typo3/sysext/form/Classes/System/Filter/Removexss.php b/typo3/sysext/form/Classes/System/Filter/Removexss.php
index b1c405af9e9e5d8cf5bdf342f9a4b00bcbd5fd28..cbe4a8ee543a812f4d740e45f81e23127cab63fd 100644
--- a/typo3/sysext/form/Classes/System/Filter/Removexss.php
+++ b/typo3/sysext/form/Classes/System/Filter/Removexss.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,6 @@ class tx_form_system_filter_removexss implements tx_form_system_filter_interface
*
* @param array $arguments Filter configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments = array()) {
}
@@ -51,7 +48,6 @@ class tx_form_system_filter_removexss implements tx_form_system_filter_interface
*
* @param string $value Unfiltered value
* @return string The filtered value
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function filter($value) {
$value = stripslashes($value);
diff --git a/typo3/sysext/form/Classes/System/Filter/Stripnewlines.php b/typo3/sysext/form/Classes/System/Filter/Stripnewlines.php
index cab1508a0cbd520c3ffdd2d0f03b189fb550d70a..63839c10b5b5c40b7bf2dc2705d45778f362da95 100644
--- a/typo3/sysext/form/Classes/System/Filter/Stripnewlines.php
+++ b/typo3/sysext/form/Classes/System/Filter/Stripnewlines.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -37,7 +35,6 @@ class tx_form_system_filter_stripnewlines implements tx_form_system_filter_inter
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
}
@@ -47,7 +44,6 @@ class tx_form_system_filter_stripnewlines implements tx_form_system_filter_inter
*
* @param string $value
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function filter($value) {
return str_replace(array("\n", "\r"), ' ', (string) $value);
diff --git a/typo3/sysext/form/Classes/System/Filter/Titlecase.php b/typo3/sysext/form/Classes/System/Filter/Titlecase.php
index 88fb0cf4d46e1201c1427d76d47f4377117ea78d..bd08e7dc3997f5a5f6b767766b1cafaba7c554a2 100644
--- a/typo3/sysext/form/Classes/System/Filter/Titlecase.php
+++ b/typo3/sysext/form/Classes/System/Filter/Titlecase.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -37,7 +35,6 @@ class tx_form_system_filter_titlecase implements tx_form_system_filter_interface
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
}
@@ -47,7 +44,6 @@ class tx_form_system_filter_titlecase implements tx_form_system_filter_interface
*
* @param string $value
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function filter($value) {
return ucwords(strtolower((string) $value));
diff --git a/typo3/sysext/form/Classes/System/Filter/Trim.php b/typo3/sysext/form/Classes/System/Filter/Trim.php
index f79617f0fd38af96d3a275d805a7b616971db75f..c70cac1c66633af567b6af6b24ea4d1e9e4db4c4 100644
--- a/typo3/sysext/form/Classes/System/Filter/Trim.php
+++ b/typo3/sysext/form/Classes/System/Filter/Trim.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -45,7 +43,6 @@ class tx_form_system_filter_trim implements tx_form_system_filter_interface {
*
* @param array $arguments Filter configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments = array()) {
$this->setCharacterList($arguments['characterList']);
@@ -58,7 +55,6 @@ class tx_form_system_filter_trim implements tx_form_system_filter_interface {
*
* @param string $characterList
* @return tx_form_filter_trim
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setCharacterList($characterList) {
$this->characterList = $characterList;
@@ -71,7 +67,6 @@ class tx_form_system_filter_trim implements tx_form_system_filter_interface {
*
* @param string $value
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function filter($value) {
if ($this->characterList === NULL) {
diff --git a/typo3/sysext/form/Classes/System/Filter/Uppercase.php b/typo3/sysext/form/Classes/System/Filter/Uppercase.php
index ea51dbaaec1bbabd8ca6b22409f4f3199c3c7b83..dfa37418e22249bca07316ee8ed768b79454ffae 100644
--- a/typo3/sysext/form/Classes/System/Filter/Uppercase.php
+++ b/typo3/sysext/form/Classes/System/Filter/Uppercase.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -37,7 +35,6 @@ class tx_form_system_filter_uppercase implements tx_form_system_filter_interface
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
}
@@ -47,7 +44,6 @@ class tx_form_system_filter_uppercase implements tx_form_system_filter_interface
*
* @param string $value
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function filter($value) {
return $GLOBALS['TSFE']->csConvObj->conv_case($GLOBALS['TSFE']->renderCharset, $value, 'toUpper');
diff --git a/typo3/sysext/form/Classes/System/Layout/Layout.php b/typo3/sysext/form/Classes/System/Layout/Layout.php
index f531f0efa07179770d17abeb205120f99c2abbfa..eb4cca761305fa3f6e86e870974957985378b1be 100644
--- a/typo3/sysext/form/Classes/System/Layout/Layout.php
+++ b/typo3/sysext/form/Classes/System/Layout/Layout.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -45,7 +43,6 @@ class tx_form_system_layout implements t3lib_Singleton {
*
* @param $layout array Layout array from form configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($layout = array()) {
$this->setLayout($layout);
@@ -61,7 +58,6 @@ class tx_form_system_layout implements t3lib_Singleton {
* @param $layoutDefault string The default layout of the object
* @param $layoutOverride string Assigned layout to this object
* @return string The new layout if changed
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getLayoutByObject($elementName, $layoutDefault, $layoutOverride = '') {
if(!empty($layoutOverride)) {
@@ -80,7 +76,6 @@ class tx_form_system_layout implements t3lib_Singleton {
*
* @param array $layout The layout array
* @return tx_form_system_layout
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setLayout($layout = array()) {
if(!empty($layout)) {
@@ -97,7 +92,6 @@ class tx_form_system_layout implements t3lib_Singleton {
* @param string $elementName Type of object
* @param string $layout XML containing layout for element
* @return tx_form_system_layout
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setLayoutByElement($elementName, $layout) {
$this->layout[$elementName] = (string) $layout;
diff --git a/typo3/sysext/form/Classes/System/Loader/Loader.php b/typo3/sysext/form/Classes/System/Loader/Loader.php
index d95ac117e01663625999063e76f98835b461dd0a..96061b87f7cd9dab76438046aabb2d9431e3a5e3 100644
--- a/typo3/sysext/form/Classes/System/Loader/Loader.php
+++ b/typo3/sysext/form/Classes/System/Loader/Loader.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
diff --git a/typo3/sysext/form/Classes/System/Localization/Localization.php b/typo3/sysext/form/Classes/System/Localization/Localization.php
index 6f23d2236b6144b30501edb01713b309406625a8..e2b44fbfe0387832c6b63ea9cf1a4ab8c8d11e42 100644
--- a/typo3/sysext/form/Classes/System/Localization/Localization.php
+++ b/typo3/sysext/form/Classes/System/Localization/Localization.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -45,7 +43,6 @@ class tx_form_system_localization implements t3lib_Singleton {
*
* @param $localLanguageFile string File reference to the local language file
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($localLanguageFile) {
$this->localLanguageFile = (string) $localLanguageFile;
diff --git a/typo3/sysext/form/Classes/System/Postprocessor/Mail.php b/typo3/sysext/form/Classes/System/Postprocessor/Mail.php
index c37cb82cfb2309b0363aebd4e5d5d9fb48fdcbbf..c55204a3448fdb95bf84ebcc27f26c48a9bdb2c4 100644
--- a/typo3/sysext/form/Classes/System/Postprocessor/Mail.php
+++ b/typo3/sysext/form/Classes/System/Postprocessor/Mail.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_system_postprocessor_mail {
* @param $form tx_form_domain_model_form Form domain model
* @param $typoscript array Post processor TypoScript settings
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_form $form, array $typoScript) {
$this->form = $form;
@@ -54,7 +51,6 @@ class tx_form_system_postprocessor_mail {
* Configures the mail message
*
* @return string HTML message from this processor
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function process() {
$this->setReturnPath();
@@ -76,9 +72,8 @@ class tx_form_system_postprocessor_mail {
* Set the return-path (the bounce address) of the mail message
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setReturnPath() {
+ protected function setReturnPath() {
if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['forceReturnPath']) {
$returnPath = $GLOBALS['TYPO3_CONF_VARS']['SYS']['forceReturnPath'];
$this->mailMessage->setReturnPath($returnPath);
@@ -91,9 +86,8 @@ class tx_form_system_postprocessor_mail {
* If not configured, it will use a default setting
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setSubject() {
+ protected function setSubject() {
if (isset($this->typoScript['subject'])) {
$subject = $this->typoScript['subject'];
} else {
@@ -109,9 +103,8 @@ class tx_form_system_postprocessor_mail {
* Mostly the sender is a combination of the name and the email address
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setFrom() {
+ protected function setFrom() {
$fromEmail = '';
if ($this->typoScript['senderEmail']) {
$fromEmail = $this->typoScript['senderEmail'];
@@ -148,9 +141,8 @@ class tx_form_system_postprocessor_mail {
* Checks the address if it is a valid email address
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setTo() {
+ protected function setTo() {
if (
$this->typoScript['recipientEmail'] &&
t3lib_div::validEmail($this->typoScript['recipientEmail'])
@@ -165,9 +157,8 @@ class tx_form_system_postprocessor_mail {
* Checks the address if it is a valid email address
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setCc() {
+ protected function setCc() {
if (
$this->typoScript['ccEmail'] &&
t3lib_div::validEmail($this->typoScript['ccEmail'])
@@ -183,9 +174,8 @@ class tx_form_system_postprocessor_mail {
* but too big, it will be set to 5, which means very low.
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setPriority() {
+ protected function setPriority() {
$priority = 3;
if ($this->typoScript['priority']) {
$priority = t3lib_div::intInRange($valueList['priority'], 1, 5);
@@ -199,9 +189,8 @@ class tx_form_system_postprocessor_mail {
* Sanitizes the header string when necessary
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setOrganization() {
+ protected function setOrganization() {
if ($this->typoScript['organization']) {
$organization = $this->typoScript['organization'];
$organization = $this->sanitizeHeaderString($organization);
@@ -216,9 +205,8 @@ class tx_form_system_postprocessor_mail {
* if different from renderCharset
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setCharacterSet() {
+ protected function setCharacterSet() {
$characterSet = NULL;
if ($GLOBALS['TSFE']->config['config']['formMailCharset']) {
$characterSet = $GLOBALS['TSFE']->csConvObj->parse_charset($GLOBALS['TSFE']->config['config']['formMailCharset']);
@@ -236,9 +224,8 @@ class tx_form_system_postprocessor_mail {
* Add a MimePart of the type text/html to the message.
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setHtmlContent() {
+ protected function setHtmlContent() {
$view = t3lib_div::makeInstance(
'tx_form_view_mail_html',
$this->form,
@@ -254,9 +241,8 @@ class tx_form_system_postprocessor_mail {
* Add a MimePart of the type text/plain to the message.
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setPlainContent() {
+ protected function setPlainContent() {
$view = t3lib_div::makeInstance(
'tx_form_view_mail_plain',
$this->form
@@ -271,9 +257,8 @@ class tx_form_system_postprocessor_mail {
* Sending the mail requires the recipient and message to be set.
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function send() {
+ protected function send() {
if (
$this->mailMessage->getTo() &&
$this->mailMessage->getBody()
@@ -286,9 +271,8 @@ class tx_form_system_postprocessor_mail {
* Render the message after trying to send the mail
*
* @return string HTML message from the mail view
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function render() {
+ protected function render() {
$view = t3lib_div::makeInstance(
'tx_form_view_mail',
$this->mailMessage,
@@ -303,7 +287,6 @@ class tx_form_system_postprocessor_mail {
*
* @param string String to check
* @return string Valid or empty string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
protected function sanitizeHeaderString($string) {
$pattern = '/[\r\n\f\e]/';
@@ -318,9 +301,8 @@ class tx_form_system_postprocessor_mail {
* Add attachments when uploaded
*
* @return void
- * @author Peter Beernink <p.beernink@drecomm.nl>
*/
- private function addAttachments() {
+ protected function addAttachments() {
$formElements = $this->form->getElements();
$values = $this->requestHandler->getByMethod();
diff --git a/typo3/sysext/form/Classes/System/Postprocessor/Postprocessor.php b/typo3/sysext/form/Classes/System/Postprocessor/Postprocessor.php
index 7eb9743c31d131fa4de3bc10623fcccfd99e1f35..d8758f1ab57aab994b49832c957e1cddfbd194a5 100644
--- a/typo3/sysext/form/Classes/System/Postprocessor/Postprocessor.php
+++ b/typo3/sysext/form/Classes/System/Postprocessor/Postprocessor.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,6 @@ class tx_form_system_postprocessor {
* @param $form tx_form_domain_model_form Form domain model
* @param $typoscript array Post processor TypoScript settings
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_form $form, array $typoScript) {
$this->form = $form;
@@ -53,7 +50,6 @@ class tx_form_system_postprocessor {
* own settings
*
* @return string HTML messages from the called processors
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function process() {
$html = '';
diff --git a/typo3/sysext/form/Classes/System/Request/Request.php b/typo3/sysext/form/Classes/System/Request/Request.php
index 0151fe111d4201df238dad8479827e712830d6f6..ee072fdec3d0f7a44cd44d790cd52a09f1cb280d 100644
--- a/typo3/sysext/form/Classes/System/Request/Request.php
+++ b/typo3/sysext/form/Classes/System/Request/Request.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -39,7 +37,7 @@ class tx_form_system_request implements t3lib_Singleton {
*
* @var string
*/
- private $prefix = 'tx_form';
+ protected $prefix = 'tx_form';
/**
* Method used for submitting data
@@ -47,7 +45,7 @@ class tx_form_system_request implements t3lib_Singleton {
*
* @var string
*/
- private $method = 'post';
+ protected $method = 'post';
/**
* Session data
@@ -56,7 +54,7 @@ class tx_form_system_request implements t3lib_Singleton {
*
* @var array
*/
- private $sessionData = array();
+ protected $sessionData = array();
/**
* Constructor
@@ -64,7 +62,6 @@ class tx_form_system_request implements t3lib_Singleton {
* @param string $prefix Proposal for prefix
* @param string $method The used method
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
}
@@ -76,7 +73,6 @@ class tx_form_system_request implements t3lib_Singleton {
*
* @param string $prefix Value containing characters a-z, A-Z, 0-9, _ and -
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setPrefix($prefix = 'tx_form') {
if(empty($prefix)) {
@@ -91,7 +87,6 @@ class tx_form_system_request implements t3lib_Singleton {
* Get the prefix
*
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getPrefix() {
return $this->prefix;
@@ -103,7 +98,6 @@ class tx_form_system_request implements t3lib_Singleton {
*
* @param string $method The method
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setMethod($method = 'get') {
$allowedMethods = array(
@@ -135,7 +129,6 @@ class tx_form_system_request implements t3lib_Singleton {
* Returns the method of this request handler
*
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getMethod() {
return $this->method;
@@ -148,7 +141,6 @@ class tx_form_system_request implements t3lib_Singleton {
*
* @param string $key Parameter to look for
* @return mixed
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function get($key) {
switch (TRUE) {
@@ -168,7 +160,6 @@ class tx_form_system_request implements t3lib_Singleton {
*
* @param string $key Parameter to look for
* @return boolean
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function has($key) {
switch (TRUE) {
@@ -187,7 +178,6 @@ class tx_form_system_request implements t3lib_Singleton {
* Check to see if there is a request
*
* @return boolean
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function hasRequest() {
switch (TRUE) {
@@ -210,7 +200,6 @@ class tx_form_system_request implements t3lib_Singleton {
* @param string $key Parameter to search for
* @param mixed $default Default value to use if key not found
* @return mixed Returns NULL if key does not exist
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getQuery($key = NULL, $default = NULL) {
if($key === NULL) {
@@ -227,7 +216,6 @@ class tx_form_system_request implements t3lib_Singleton {
* @param string $key Parameter to search for
* @param mixed $default Default value to use if key not found
* @return mixed Returns NULL if key does not exist
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getPost($key = NULL, $default = NULL) {
if($key === NULL) {
@@ -244,7 +232,6 @@ class tx_form_system_request implements t3lib_Singleton {
* @param string $key Parameter to search for
* @param mixed $default Default value to use if key not found
* @return mixed Returns NULL if key does not exist
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getSession($key = NULL, $default = NULL) {
if($key === NULL) {
@@ -279,7 +266,6 @@ class tx_form_system_request implements t3lib_Singleton {
* Store the form input in a session
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function storeSession() {
if ($GLOBALS['TSFE']->loginUser){
@@ -301,7 +287,6 @@ class tx_form_system_request implements t3lib_Singleton {
* Destroy the session data for the form
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function destroySession() {
$this->removeFiles();
@@ -325,7 +310,6 @@ class tx_form_system_request implements t3lib_Singleton {
* files
*
* @return void
- * @author Peter Beernink <p.beernink@drecomm.nl>
*/
public function storeFiles() {
$formData = $this->getByMethod();
@@ -369,9 +353,8 @@ class tx_form_system_request implements t3lib_Singleton {
* Remove uploaded files from the typo3temp
*
* @return void
- * @author Peter Beernink <p.beernink@drecomm.nl>
*/
- private function removeFiles() {
+ protected function removeFiles() {
$values = $this->getByMethod();
if (is_array($values)) {
diff --git a/typo3/sysext/form/Classes/System/Validate/Abstract.php b/typo3/sysext/form/Classes/System/Validate/Abstract.php
index e9b6e4cfc9e6f73967c1c004759db53ce4d41705..fcdfc445c99ce9d35ed17695095f84aa40dcaf0c 100644
--- a/typo3/sysext/form/Classes/System/Validate/Abstract.php
+++ b/typo3/sysext/form/Classes/System/Validate/Abstract.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -93,7 +91,6 @@ abstract class tx_form_system_validate_abstract implements tx_form_system_valida
*
* @param array $arguments Typoscript configuration for the validation rule
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments) {
$this->localCobj = t3lib_div::makeInstance('tslib_cObj');
@@ -110,7 +107,6 @@ abstract class tx_form_system_validate_abstract implements tx_form_system_valida
*
* @param string $fieldName The field name
* @return object The rule object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setFieldName($fieldName) {
$this->fieldName = (string) $fieldName;
@@ -122,7 +118,6 @@ abstract class tx_form_system_validate_abstract implements tx_form_system_valida
* Returns the field name
*
* @return string The field name
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getFieldName() {
return $this->fieldName;
@@ -132,7 +127,6 @@ abstract class tx_form_system_validate_abstract implements tx_form_system_valida
* Returns the message
*
* @return array Typoscript for cObj
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getMessage() {
return $this->message;
@@ -142,7 +136,6 @@ abstract class tx_form_system_validate_abstract implements tx_form_system_valida
* Returns the error
*
* @return array Typoscript for cObj
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getError() {
return $this->error;
@@ -161,7 +154,6 @@ abstract class tx_form_system_validate_abstract implements tx_form_system_valida
* @param mixed $message Message as string or TS
* @param string $type Name of the cObj
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setMessage($message = '', $type = 'TEXT') {
if(empty($message)) {
@@ -195,7 +187,6 @@ abstract class tx_form_system_validate_abstract implements tx_form_system_valida
* @param mixed $message Message as string or TS
* @param string $type Name of the cObj
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setError($error = '', $type = 'TEXT') {
if(empty($error)) {
@@ -222,7 +213,6 @@ abstract class tx_form_system_validate_abstract implements tx_form_system_valida
*
* @param boolean $show TRUE is display
* @return object The rule object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setShowMessage($show) {
if($show === NULL) {
@@ -238,7 +228,6 @@ abstract class tx_form_system_validate_abstract implements tx_form_system_valida
* Returns TRUE when message needs to be displayed
*
* @return boolean
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function messageMustBeDisplayed() {
return $this->showMessage;
@@ -250,7 +239,6 @@ abstract class tx_form_system_validate_abstract implements tx_form_system_valida
*
* @param string $message Message text with markers
* @return string Message text with substituted markers
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
protected function substituteValues($message) {
return $message;
@@ -261,7 +249,6 @@ abstract class tx_form_system_validate_abstract implements tx_form_system_valida
* In some cases this method will be override by rule class
*
* @return string The local language message label
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
protected function getLocalLanguageLabel($type) {
$label = get_class($this) . '.' . $type;
diff --git a/typo3/sysext/form/Classes/System/Validate/Alphabetic.php b/typo3/sysext/form/Classes/System/Validate/Alphabetic.php
index bf0181f604769e9dc9bf65d0aa2208b2aa6c7456..3fa7c5f1f0f49ae5902e3327cd214651e1a07ede 100644
--- a/typo3/sysext/form/Classes/System/Validate/Alphabetic.php
+++ b/typo3/sysext/form/Classes/System/Validate/Alphabetic.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -52,7 +50,6 @@ class tx_form_system_validate_alphabetic extends tx_form_system_validate_abstrac
*
* @param array $arguments Typoscript configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments = array()) {
$this->setAllowWhiteSpace($arguments['allowWhiteSpace']);
@@ -89,7 +86,6 @@ class tx_form_system_validate_alphabetic extends tx_form_system_validate_abstrac
*
* @param boolean $allowWhiteSpace TRUE if white space allowed
* @return object Rule object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAllowWhiteSpace($allowWhiteSpace) {
if($allowWhiteSpace === NULL) {
diff --git a/typo3/sysext/form/Classes/System/Validate/Alphanumeric.php b/typo3/sysext/form/Classes/System/Validate/Alphanumeric.php
index b013fba7543900da5342c1a2c3a5264ae652bbcf..5a4e34476eb27e6f99937b915d221450cb6d4100 100644
--- a/typo3/sysext/form/Classes/System/Validate/Alphanumeric.php
+++ b/typo3/sysext/form/Classes/System/Validate/Alphanumeric.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -45,7 +43,6 @@ class tx_form_system_validate_alphanumeric extends tx_form_system_validate_abstr
*
* @param array $arguments Typoscript configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments) {
$this->setAllowWhiteSpace($arguments['allowWhiteSpace']);
@@ -82,7 +79,6 @@ class tx_form_system_validate_alphanumeric extends tx_form_system_validate_abstr
*
* @param boolean $allowWhiteSpace TRUE if white space allowed
* @return object Rule object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAllowWhiteSpace($allowWhiteSpace) {
if($allowWhiteSpace === NULL) {
diff --git a/typo3/sysext/form/Classes/System/Validate/Between.php b/typo3/sysext/form/Classes/System/Validate/Between.php
index 58d681495ace0fba35beb99b634d631163a688bc..8c5ef1c91cacf0104f35ecebf48f2ca3baacad97 100644
--- a/typo3/sysext/form/Classes/System/Validate/Between.php
+++ b/typo3/sysext/form/Classes/System/Validate/Between.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -60,7 +58,6 @@ class tx_form_system_validate_between extends tx_form_system_validate_abstract i
*
* @param array $arguments Typoscript configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments) {
$this->setMinimum($arguments['minimum'])
@@ -98,7 +95,6 @@ class tx_form_system_validate_between extends tx_form_system_validate_abstract i
*
* @param mixed $minimum Minimum value
* @return object Rule object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setMinimum($minimum) {
$this->minimum = $minimum;
@@ -111,7 +107,6 @@ class tx_form_system_validate_between extends tx_form_system_validate_abstract i
*
* @param mixed $maximum Maximum value
* @return object Rule object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setMaximum($maximum) {
$this->maximum = $maximum;
@@ -124,7 +119,6 @@ class tx_form_system_validate_between extends tx_form_system_validate_abstract i
*
* @param boolean $inclusive True is inclusive
* @return object Rule object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setInclusive($inclusive) {
if($inclusive === NULL) {
@@ -162,7 +156,6 @@ class tx_form_system_validate_between extends tx_form_system_validate_abstract i
*
* @param string $message Message text with markers
* @return string Message text with substituted markers
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
protected function substituteValues($message) {
$message = str_replace('%minimum', $this->minimum, $message);
diff --git a/typo3/sysext/form/Classes/System/Validate/Date.php b/typo3/sysext/form/Classes/System/Validate/Date.php
index bb8434f7835735119d300769e37917ec5c32bfee..c12bc8e06b6d657b975d12718922cfc39dd1f8df 100644
--- a/typo3/sysext/form/Classes/System/Validate/Date.php
+++ b/typo3/sysext/form/Classes/System/Validate/Date.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -45,7 +43,6 @@ class tx_form_system_validate_date extends tx_form_system_validate_abstract {
*
* @param array $arguments Typoscript configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments) {
$this->setFormat($arguments['format']);
@@ -80,7 +77,6 @@ class tx_form_system_validate_date extends tx_form_system_validate_abstract {
*
* @param string $format strftime format
* @return Rule object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setFormat($format) {
if($format === NULL) {
@@ -98,7 +94,6 @@ class tx_form_system_validate_date extends tx_form_system_validate_abstract {
*
* @param string $message Message text with markers
* @return string Message text with substituted markers
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
protected function substituteValues($message) {
$humanReadableDateFormat = $this->humanReadableDateFormat($this->format);
@@ -115,7 +110,6 @@ class tx_form_system_validate_date extends tx_form_system_validate_abstract {
*
* @param string $format strftime format
* @return string Human readable format
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
protected function humanReadableDateFormat($format) {
$label = get_class($this) . '.strftime.';
diff --git a/typo3/sysext/form/Classes/System/Validate/Digit.php b/typo3/sysext/form/Classes/System/Validate/Digit.php
index 87d4b7b3bc411601b2631888d9dc27532e681676..9e6b04bb2bf3605e1925dbbbd9b2ffcaab923012 100644
--- a/typo3/sysext/form/Classes/System/Validate/Digit.php
+++ b/typo3/sysext/form/Classes/System/Validate/Digit.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,6 @@ class tx_form_system_validate_digit extends tx_form_system_validate_abstract {
*
* @param array $arguments Typoscript configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments) {
parent::__construct($arguments);
diff --git a/typo3/sysext/form/Classes/System/Validate/Email.php b/typo3/sysext/form/Classes/System/Validate/Email.php
index c28d0e18aeebfe2c3b89e7d29b4f8b358598161a..77fa2ccc8cedc408e591b4d52e46768b19298849 100644
--- a/typo3/sysext/form/Classes/System/Validate/Email.php
+++ b/typo3/sysext/form/Classes/System/Validate/Email.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,6 @@ class tx_form_system_validate_email extends tx_form_system_validate_abstract {
*
* @param array $arguments Typoscript configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments) {
parent::__construct($arguments);
diff --git a/typo3/sysext/form/Classes/System/Validate/Equals.php b/typo3/sysext/form/Classes/System/Validate/Equals.php
index 4aeded0e4de35aa7aea64ff9aa80c73a00b8ce6c..3429c32a3e38cd9499288259a802db681ecc6705 100644
--- a/typo3/sysext/form/Classes/System/Validate/Equals.php
+++ b/typo3/sysext/form/Classes/System/Validate/Equals.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -45,7 +43,6 @@ class tx_form_system_validate_equals extends tx_form_system_validate_abstract {
*
* @param array $arguments Typoscript configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments) {
$this->setField($arguments['field']);
@@ -81,7 +78,6 @@ class tx_form_system_validate_equals extends tx_form_system_validate_abstract {
*
* @param string $field Field to compare
* @return Rule object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setField($field) {
$this->field = (string) $field;
@@ -95,7 +91,6 @@ class tx_form_system_validate_equals extends tx_form_system_validate_abstract {
*
* @param string $message Message text with markers
* @return string Message text with substituted markers
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
protected function substituteValues($message) {
$message = str_replace('%field', $this->field, $message);
diff --git a/typo3/sysext/form/Classes/System/Validate/Fileallowedtypes.php b/typo3/sysext/form/Classes/System/Validate/Fileallowedtypes.php
index 8d7fa8b28432a8227b8b6abfe98fe149b5aa6845..52007e49763b1d2c16725af143ceed3a7cc526f8 100644
--- a/typo3/sysext/form/Classes/System/Validate/Fileallowedtypes.php
+++ b/typo3/sysext/form/Classes/System/Validate/Fileallowedtypes.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -46,7 +44,6 @@ class tx_form_system_validate_fileallowedtypes extends tx_form_system_validate_a
*
* @param array $arguments Typoscript configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments) {
$this->setAllowedTypes($arguments['types']);
@@ -78,7 +75,6 @@ class tx_form_system_validate_fileallowedtypes extends tx_form_system_validate_a
*
* @param string $allowedTypes Allowed Types
* @return object Rule object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAllowedTypes($allowedTypes) {
$allowedTypes = strtolower($allowedTypes);
@@ -93,7 +89,6 @@ class tx_form_system_validate_fileallowedtypes extends tx_form_system_validate_a
*
* @param string $message Message text with markers
* @return string Message text with substituted markers
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
protected function substituteValues($message) {
$message = str_replace(
diff --git a/typo3/sysext/form/Classes/System/Validate/Filemaximumsize.php b/typo3/sysext/form/Classes/System/Validate/Filemaximumsize.php
index bd928a42324bab42e065d7c330d9b486373dbb65..62af4fc8a02314642d62f601f4e8569d1b90f54e 100644
--- a/typo3/sysext/form/Classes/System/Validate/Filemaximumsize.php
+++ b/typo3/sysext/form/Classes/System/Validate/Filemaximumsize.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -46,7 +44,6 @@ class tx_form_system_validate_filemaximumsize extends tx_form_system_validate_ab
*
* @param array $arguments Typoscript configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments) {
$this->setMaximum($arguments['maximum']);
@@ -78,7 +75,6 @@ class tx_form_system_validate_filemaximumsize extends tx_form_system_validate_ab
*
* @param integer $maximum Maximum value
* @return object Rule object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setMaximum($maximum) {
$this->maximum = (integer) $maximum;
@@ -92,7 +88,6 @@ class tx_form_system_validate_filemaximumsize extends tx_form_system_validate_ab
*
* @param string $message Message text with markers
* @return string Message text with substituted markers
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
protected function substituteValues($message) {
$message = str_replace(
diff --git a/typo3/sysext/form/Classes/System/Validate/Fileminimumsize.php b/typo3/sysext/form/Classes/System/Validate/Fileminimumsize.php
index a16e5d7da85f857379c5a5a52bd13dc83679e01f..7e8761dfcf95df9d374251dd79e00225f9125394 100644
--- a/typo3/sysext/form/Classes/System/Validate/Fileminimumsize.php
+++ b/typo3/sysext/form/Classes/System/Validate/Fileminimumsize.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -46,7 +44,6 @@ class tx_form_system_validate_fileminimumsize extends tx_form_system_validate_ab
*
* @param array $arguments Typoscript configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments) {
$this->setMinimum($arguments['minimum']);
@@ -78,7 +75,6 @@ class tx_form_system_validate_fileminimumsize extends tx_form_system_validate_ab
*
* @param integer $minimum Minimum value
* @return object Rule object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setMinimum($minimum) {
$this->minimum = (integer) $minimum;
@@ -92,7 +88,6 @@ class tx_form_system_validate_fileminimumsize extends tx_form_system_validate_ab
*
* @param string $message Message text with markers
* @return string Message text with substituted markers
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
protected function substituteValues($message) {
$message = str_replace(
diff --git a/typo3/sysext/form/Classes/System/Validate/Float.php b/typo3/sysext/form/Classes/System/Validate/Float.php
index 991f3b7bb14196d88ee4781f0e304ca13e4f4fe6..a1b85f8bfd286ac2e8b8da71db593ba37d8c328f 100644
--- a/typo3/sysext/form/Classes/System/Validate/Float.php
+++ b/typo3/sysext/form/Classes/System/Validate/Float.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,6 @@ class tx_form_system_validate_float extends tx_form_system_validate_abstract {
*
* @param array $arguments Typoscript configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments) {
parent::__construct($arguments);
diff --git a/typo3/sysext/form/Classes/System/Validate/Greaterthan.php b/typo3/sysext/form/Classes/System/Validate/Greaterthan.php
index d1a3134d5f179710c0331800d439593a52506255..21462151c6822bee740f03d6aaf176585bd455ca 100644
--- a/typo3/sysext/form/Classes/System/Validate/Greaterthan.php
+++ b/typo3/sysext/form/Classes/System/Validate/Greaterthan.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -45,7 +43,6 @@ class tx_form_system_validate_greaterthan extends tx_form_system_validate_abstra
*
* @param array $arguments Typoscript configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments) {
$this->setMinimum($arguments['minimum']);
@@ -75,7 +72,6 @@ class tx_form_system_validate_greaterthan extends tx_form_system_validate_abstra
*
* @param mixed $minimum Minimum value
* @return object Rule object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setMinimum($minimum) {
$this->minimum = (integer) $minimum;
@@ -89,7 +85,6 @@ class tx_form_system_validate_greaterthan extends tx_form_system_validate_abstra
*
* @param string $message Message text with markers
* @return string Message text with substituted markers
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
protected function substituteValues($message) {
$message = str_replace('%minimum', $this->minimum, $message);
diff --git a/typo3/sysext/form/Classes/System/Validate/Inarray.php b/typo3/sysext/form/Classes/System/Validate/Inarray.php
index 3dd6fd542b68541dd03583035ba7f0754cbc7e7f..77b9d568abf4a7c37bd01105bffaae014ba1eab9 100644
--- a/typo3/sysext/form/Classes/System/Validate/Inarray.php
+++ b/typo3/sysext/form/Classes/System/Validate/Inarray.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -52,7 +50,6 @@ class tx_form_system_validate_inarray extends tx_form_system_validate_abstract {
*
* @param array $arguments Typoscript configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments) {
$this->setArray($arguments['array.'])
@@ -84,7 +81,6 @@ class tx_form_system_validate_inarray extends tx_form_system_validate_abstract {
*
* @param array $array The haystack
* @return object Rule object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setArray($array) {
$this->array = (array) $array;
@@ -97,7 +93,6 @@ class tx_form_system_validate_inarray extends tx_form_system_validate_abstract {
*
* @param boolean $strict True if strict
* @return object Rule object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setStrict($strict) {
$this->strict = (boolean) $strict;
diff --git a/typo3/sysext/form/Classes/System/Validate/Integer.php b/typo3/sysext/form/Classes/System/Validate/Integer.php
index 2cb26f02c381aa67c26e1aa9f3360684dd2a874c..8f9cf84c22c9fe9a8de5d14379123da4ab26e5b2 100644
--- a/typo3/sysext/form/Classes/System/Validate/Integer.php
+++ b/typo3/sysext/form/Classes/System/Validate/Integer.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,6 @@ class tx_form_system_validate_integer extends tx_form_system_validate_abstract {
*
* @param array $arguments Typoscript configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments) {
parent::__construct($arguments);
diff --git a/typo3/sysext/form/Classes/System/Validate/Interface.php b/typo3/sysext/form/Classes/System/Validate/Interface.php
index 0f5743f334fc8253065743f7ce4f880452c3d191..9243bacdf553c607f5c04f1134cde19abaad5e11 100644
--- a/typo3/sysext/form/Classes/System/Validate/Interface.php
+++ b/typo3/sysext/form/Classes/System/Validate/Interface.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
diff --git a/typo3/sysext/form/Classes/System/Validate/Ip.php b/typo3/sysext/form/Classes/System/Validate/Ip.php
index 3247478cd8f13307956cee04b95f9adea9bdc137..536dc2ae6c74dc166730face007afc58bf3fa778 100644
--- a/typo3/sysext/form/Classes/System/Validate/Ip.php
+++ b/typo3/sysext/form/Classes/System/Validate/Ip.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,6 @@ class tx_form_system_validate_ip extends tx_form_system_validate_abstract {
*
* @param array $arguments Typoscript configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments) {
parent::__construct($arguments);
diff --git a/typo3/sysext/form/Classes/System/Validate/Length.php b/typo3/sysext/form/Classes/System/Validate/Length.php
index ab3e0d14ac37a260237ad29016bfe7bd1e0acef3..3a595a1ec35e24a341f681105e6e1e2ed71ba60e 100644
--- a/typo3/sysext/form/Classes/System/Validate/Length.php
+++ b/typo3/sysext/form/Classes/System/Validate/Length.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -52,7 +50,6 @@ class tx_form_system_validate_length extends tx_form_system_validate_abstract {
*
* @param array $arguments Typoscript configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments) {
$this->setMinimum($arguments['minimum'])
@@ -90,7 +87,6 @@ class tx_form_system_validate_length extends tx_form_system_validate_abstract {
*
* @param integer $minimum Minimum value
* @return object Rule object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setMinimum($minimum) {
$this->minimum = (integer) $minimum;
@@ -103,7 +99,6 @@ class tx_form_system_validate_length extends tx_form_system_validate_abstract {
*
* @param integer $maximum Maximum value
* @return object Rule object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setMaximum($maximum) {
if(empty($maximum)) {
@@ -141,7 +136,6 @@ class tx_form_system_validate_length extends tx_form_system_validate_abstract {
*
* @param string $message Message text with markers
* @return string Message text with substituted markers
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
protected function substituteValues($message) {
$message = str_replace('%minimum', $this->minimum, $message);
diff --git a/typo3/sysext/form/Classes/System/Validate/Lessthan.php b/typo3/sysext/form/Classes/System/Validate/Lessthan.php
index 277297f39c82c0d02184749cd3010445bb6736a5..dcafd82d517a8f03f519abcc2241f68f6f9d9097 100644
--- a/typo3/sysext/form/Classes/System/Validate/Lessthan.php
+++ b/typo3/sysext/form/Classes/System/Validate/Lessthan.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -45,7 +43,6 @@ class tx_form_system_validate_lessthan extends tx_form_system_validate_abstract
*
* @param array $arguments Typoscript configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments) {
$this->setMaximum($arguments['maximum']);
@@ -76,7 +73,6 @@ class tx_form_system_validate_lessthan extends tx_form_system_validate_abstract
*
* @param mixed $maximum Maximum value
* @return object Rule object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setMaximum($maximum) {
$this->maximum = $maximum;
@@ -90,7 +86,6 @@ class tx_form_system_validate_lessthan extends tx_form_system_validate_abstract
*
* @param string $message Message text with markers
* @return string Message text with substituted markers
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
protected function substituteValues($message) {
$message = str_replace('%maximum', $this->maximum, $message);
diff --git a/typo3/sysext/form/Classes/System/Validate/Regexp.php b/typo3/sysext/form/Classes/System/Validate/Regexp.php
index 55d6a6203192da2d06ed83e8c52ff2a2f30948d4..a982762c79a969b173130ecc25c68e5bac77d057 100644
--- a/typo3/sysext/form/Classes/System/Validate/Regexp.php
+++ b/typo3/sysext/form/Classes/System/Validate/Regexp.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -45,7 +43,6 @@ class tx_form_system_validate_regexp extends tx_form_system_validate_abstract {
*
* @param array $arguments Typoscript configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments) {
$this->setRegularExpression($arguments['expression']);
@@ -76,7 +73,6 @@ class tx_form_system_validate_regexp extends tx_form_system_validate_abstract {
*
* @param string $expression The regular expression
* @return object Rule object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setRegularExpression($expression) {
$this->regularExpression = (string) $expression;
diff --git a/typo3/sysext/form/Classes/System/Validate/Required.php b/typo3/sysext/form/Classes/System/Validate/Required.php
index 5a30cac4781c3430258862d204cb0e105e6b0d40..4da30b49744860c7c713ba2335ee24afb9e0dc5e 100644
--- a/typo3/sysext/form/Classes/System/Validate/Required.php
+++ b/typo3/sysext/form/Classes/System/Validate/Required.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,6 @@ class tx_form_system_validate_required extends tx_form_system_validate_abstract
*
* @param array $arguments Typoscript configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments) {
parent::__construct($arguments);
diff --git a/typo3/sysext/form/Classes/System/Validate/Uri.php b/typo3/sysext/form/Classes/System/Validate/Uri.php
index 9b19c4fe2e7b55e18a5f033a3fa695cb2065ffae..be0f6acf065148927dda854779f9c2946c2a7f62 100644
--- a/typo3/sysext/form/Classes/System/Validate/Uri.php
+++ b/typo3/sysext/form/Classes/System/Validate/Uri.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,6 @@ class tx_form_system_validate_uri extends tx_form_system_validate_abstract {
*
* @param array $arguments Typoscript configuration
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($arguments) {
parent::__construct($arguments);
diff --git a/typo3/sysext/form/Classes/System/Validate/Validate.php b/typo3/sysext/form/Classes/System/Validate/Validate.php
index eb5bcfe6dd1c72e704ed8029ff449668700154be..52562e67d89461039e46b8581603e466adb50093 100644
--- a/typo3/sysext/form/Classes/System/Validate/Validate.php
+++ b/typo3/sysext/form/Classes/System/Validate/Validate.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -58,7 +56,6 @@ class tx_form_system_validate implements t3lib_Singleton {
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct() {
}
@@ -70,7 +67,6 @@ class tx_form_system_validate implements t3lib_Singleton {
* @param string $class Name of the validation rule
* @param array $arguments Configuration of the rule
* @return object The rule object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function createRule($class, $arguments = array()) {
$class = strtolower((string) $class);
@@ -89,7 +85,6 @@ class tx_form_system_validate implements t3lib_Singleton {
* @param string $fieldName Field name the rule belongs to
* @param boolean $breakOnError Break the rule chain when TRUE
* @return tx_form_validate
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function addRule($rule, $fieldName, $breakOnError = FALSE) {
$this->rules[] = array(
@@ -118,7 +113,6 @@ class tx_form_system_validate implements t3lib_Singleton {
* the check for the remaining rules will stop and method returns FALSE
*
* @return boolean True if all rules validate
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function isValid() {
$this->errors = array();
@@ -149,7 +143,6 @@ class tx_form_system_validate implements t3lib_Singleton {
* Returns all messages from all rules
*
* @return array
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getMessages() {
return $this->messages;
@@ -160,7 +153,6 @@ class tx_form_system_validate implements t3lib_Singleton {
*
* @param string $name Name of the form object
* @return array
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getMessagesByName($name) {
return $this->messages[$name];
@@ -171,7 +163,6 @@ class tx_form_system_validate implements t3lib_Singleton {
*
* @param string $name Name of the form object
* @return boolean
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function hasMessage($name) {
if(isset($this->messages[$name])) {
@@ -184,7 +175,6 @@ class tx_form_system_validate implements t3lib_Singleton {
* Returns all error messages from all rules
*
* @return array
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getErrors() {
return $this->errors;
@@ -195,7 +185,6 @@ class tx_form_system_validate implements t3lib_Singleton {
*
* @param string $name Name of the form object
* @return array
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getErrorsByName($name) {
return $this->errors[$name];
@@ -206,7 +195,6 @@ class tx_form_system_validate implements t3lib_Singleton {
*
* @param string $name Name of the form object
* @return boolean
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function hasErrors($name) {
if(isset($this->errors[$name])) {
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Additional/Additional.php b/typo3/sysext/form/Classes/View/Confirmation/Additional/Additional.php
index 1f8f6de74952e5993d10a0190249d8f765325259..4acd02b7d53ffe461af07e74fa2f493139ae240b 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Additional/Additional.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Additional/Additional.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -45,7 +43,6 @@ class tx_form_view_confirmation_additional extends tx_form_view_confirmation_ele
*
* @param object $model The parent model
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($model) {
$this->model = $model;
@@ -55,7 +52,6 @@ class tx_form_view_confirmation_additional extends tx_form_view_confirmation_ele
* Get the additional value
*
* @return string The value of the additional
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getAdditionalValue() {
$type = preg_replace('/.*_([^_]*)$/', "$1", get_class($this), 1);
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Additional/Label.php b/typo3/sysext/form/Classes/View/Confirmation/Additional/Label.php
index a8351b9374b17fee256314cbd518d2f3424d2ec0..6879e33f2442689ca6eba1693c37c68ca40b9de3 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Additional/Label.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Additional/Label.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -49,7 +47,6 @@ class tx_form_view_confirmation_additional_label extends tx_form_view_confirmati
*
* @param object $model The parent model
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Additional/Legend.php b/typo3/sysext/form/Classes/View/Confirmation/Additional/Legend.php
index 224f11a3b979ac9927bc75660e84ceaab99167b0..1d2abda499bfd237dc3989a1defa439c4965243a 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Additional/Legend.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Additional/Legend.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -49,7 +47,6 @@ class tx_form_view_confirmation_additional_legend extends tx_form_view_confirmat
*
* @param object $model The parent model
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Confirmation.php b/typo3/sysext/form/Classes/View/Confirmation/Confirmation.php
index 7c0a7fa6c59aff5db8cc22befce29f1e6ce51ee2..c25c6c238a11bb0f6cd208ce11c7c5cfe2551786 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Confirmation.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Confirmation.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -66,7 +64,6 @@ class tx_form_view_confirmation extends tx_form_view_confirmation_element_contai
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_form $model, array $typoscript) {
$this->localCobj = t3lib_div::makeInstance('tslib_cObj');
@@ -82,7 +79,6 @@ class tx_form_view_confirmation extends tx_form_view_confirmation_element_contai
*
* @param tx_form_domain_model_form $formModel The model of the form
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setData(tx_form_domain_model_form $model) {
$this->model = (object) $model;
@@ -94,7 +90,6 @@ class tx_form_view_confirmation extends tx_form_view_confirmation_element_contai
* (when using formatOutput :-)
*
* @return string XHTML string containing the whole form
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function get() {
$message = $this->getMessage();
@@ -126,9 +121,8 @@ class tx_form_view_confirmation extends tx_form_view_confirmation_element_contai
* confirmation.message.wrap = <p>|</p>
*
* @return string XHTML string containing the message
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function getMessage() {
+ protected function getMessage() {
if(isset($this->typoscript['message']) && isset($this->typoscript['message.'])) {
$value = $this->typoscript['message.'];
$type = $this->typoscript['message'];
@@ -144,7 +138,7 @@ class tx_form_view_confirmation extends tx_form_view_confirmation_element_contai
return $this->localCobj->cObjGetSingle($type, $value);
}
- private function getConfirmationButtons() {
+ protected function getConfirmationButtons() {
$requestHandler = t3lib_div::makeInstance('tx_form_system_request');
$prefix = $requestHandler->getPrefix();
$action = $this->localCobj->getTypoLink_URL($GLOBALS['TSFE']->id);
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/Abstract.php b/typo3/sysext/form/Classes/View/Confirmation/Element/Abstract.php
index 90849dd3d099ddc4be68a252cc18dce7e732e750..a378bb9dcc719817f3a82fc4ee46c287da0a7abb 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/Abstract.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/Abstract.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -64,7 +62,6 @@ abstract class tx_form_view_confirmation_element_abstract {
*
* @param object $model Current elements model
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($model) {
$this->model = $model;
@@ -79,7 +76,6 @@ abstract class tx_form_view_confirmation_element_abstract {
* @param DOMDocument $dom
* @param DOMDocument $reference Current XML structure
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
protected function parseXML(DOMDocument &$dom, &$reference, &$emptyElement) {
$node = &$reference->firstChild;
@@ -185,7 +181,6 @@ abstract class tx_form_view_confirmation_element_abstract {
* @param string $type Type of element for layout
* @param boolean $returnFirstChild If TRUE, the first child will be returned instead of the DOMDocument
* @return mixed DOMDocument/DOMNode XML part of the view object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function render($type = 'element', $returnFirstChild = TRUE) {
$useLayout = $this->getLayout((string) $type);
@@ -214,7 +209,6 @@ abstract class tx_form_view_confirmation_element_abstract {
*
* @param string $type Layout type
* @return string HTML string of the layout to use for this element
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getLayout($type) {
$layoutHandler = t3lib_div::makeInstance('tx_form_system_layout');
@@ -250,7 +244,6 @@ abstract class tx_form_view_confirmation_element_abstract {
* @param $node Current Node
* @param $value Value to import
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function replaceNodeWithFragment(DOMDocument &$dom, &$node, $value) {
$replaceNode = $dom->createDocumentFragment();
@@ -265,7 +258,6 @@ abstract class tx_form_view_confirmation_element_abstract {
*
* @param DOMElement $domElement DOM element of the specific HTML tag
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAttributes(DOMElement &$domElement) {
$attributes = $this->model->getAttributes();
@@ -285,7 +277,6 @@ abstract class tx_form_view_confirmation_element_abstract {
* @param DOMElement $domElement DOM element of the specific HTML tag
* @param string $key Attribute key
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAttribute(DOMElement &$domElement, $key) {
$attribute = $this->model->getAttributeValue((string) $key);
@@ -303,7 +294,6 @@ abstract class tx_form_view_confirmation_element_abstract {
* @param string $key Key of the attribute which needs to be changed
* @param string $other Key of the attribute to take the value from
* @return unknown_type
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAttributeWithValueofOtherAttribute(DOMElement &$domElement, $key, $other) {
$attribute = $this->model->getAttributeValue((string) $other);
@@ -318,7 +308,6 @@ abstract class tx_form_view_confirmation_element_abstract {
*
* @param string $class Type of additional
* @return object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
protected function createAdditional($class) {
$class = strtolower((string) $class);
@@ -332,7 +321,6 @@ abstract class tx_form_view_confirmation_element_abstract {
*
* @param string $key Type of additional
* @return DOMNode
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getAdditional($key) {
$additional = $this->createAdditional($key);
@@ -356,7 +344,6 @@ abstract class tx_form_view_confirmation_element_abstract {
* like <li id="csc-form-"> ... </li>
*
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getElementWrapId() {
$elementId = (integer) $this->model->getElementId();
@@ -371,7 +358,6 @@ abstract class tx_form_view_confirmation_element_abstract {
* like <li>element</li>
*
* @return boolean
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function noWrap() {
return $this->noWrap;
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/Checkbox.php b/typo3/sysext/form/Classes/View/Confirmation/Element/Checkbox.php
index 40568bc1ef02ea932cc6c8a214f9242f8e679235..9d31b7b451ef9d11853fe5de9fa59f4b222f76fc 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/Checkbox.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/Checkbox.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -48,7 +46,6 @@ class tx_form_view_confirmation_element_checkbox extends tx_form_view_confirmati
*
* @param tx_form_domain_model_element_checkbox $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_checkbox $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/Checkboxgroup.php b/typo3/sysext/form/Classes/View/Confirmation/Element/Checkboxgroup.php
index f2c0e2b719eba824e76f3eff1f1a928eeececc02..92409c580e65f832eace81493d9854fe5ae5fd67 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/Checkboxgroup.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/Checkboxgroup.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -50,7 +48,6 @@ class tx_form_view_confirmation_element_checkboxgroup extends tx_form_view_confi
*
* @param tx_form_domain_model_element_checkboxgroup $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_checkboxgroup $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/Container.php b/typo3/sysext/form/Classes/View/Confirmation/Element/Container.php
index 181198980fc13ca55c647d9f0e2ac5ccdcdf9866..6bf650ee936edd12bd6f57f743f12a353047d6e1 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/Container.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/Container.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -49,7 +47,6 @@ class tx_form_view_confirmation_element_container extends tx_form_view_confirmat
*
* @param object $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($model) {
parent::__construct($model);
@@ -61,7 +58,6 @@ class tx_form_view_confirmation_element_container extends tx_form_view_confirmat
*
* @param DOMDocument $dom DOMDocument
* @return DOMDocumentFragment
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getChildElements(DOMDocument &$dom) {
$modelChildren = $this->model->getElements();
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/Fieldset.php b/typo3/sysext/form/Classes/View/Confirmation/Element/Fieldset.php
index e533583903543e048c77ae0d96dcdeaf029b84de..ac945101d8920f6dedb4c504a0c898e475c4c75f 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/Fieldset.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/Fieldset.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -50,7 +48,6 @@ class tx_form_view_confirmation_element_fieldset extends tx_form_view_confirmati
*
* @param tx_form_domain_model_element_fieldset $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_fieldset $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/Fileupload.php b/typo3/sysext/form/Classes/View/Confirmation/Element/Fileupload.php
index ef51db6faed2a2de353fc7bce211ac66df81b1d7..666eefbe7dd47fafe3feb3f927a33e2d208820d0 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/Fileupload.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/Fileupload.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -48,7 +46,6 @@ class tx_form_view_confirmation_element_fileupload extends tx_form_view_confirma
*
* @param tx_form_domain_model_element_fileupload $model Model for this element
* @return void
- * @author Rens Admiraal <r.admiraal@drecomm.nl>
*/
public function __construct(tx_form_domain_model_element_fileupload $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/Optgroup.php b/typo3/sysext/form/Classes/View/Confirmation/Element/Optgroup.php
index 25180b6195fad631e83afec9c194379cb4c31d37..3975f0b351d01625fe6ba19f47edc1d5c187361e 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/Optgroup.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/Optgroup.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -55,7 +53,6 @@ class tx_form_view_confirmation_element_optgroup extends tx_form_view_confirmati
*
* @param tx_form_domain_model_element_optgroup $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_optgroup $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/Option.php b/typo3/sysext/form/Classes/View/Confirmation/Element/Option.php
index 8b2544d323fdf71c94448422b7ad64c8f426351d..eeec3b3680cde389ad04778708772e9d8ddf71e3 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/Option.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/Option.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -47,7 +45,6 @@ class tx_form_view_confirmation_element_option extends tx_form_view_confirmation
*
* @param tx_form_domain_model_element_option $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_option $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/Radio.php b/typo3/sysext/form/Classes/View/Confirmation/Element/Radio.php
index 2613f03a7cbc7de3472b61aac471bfd5db4394c1..9d40546f5bc769894219fdd394dadbe1956c967f 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/Radio.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/Radio.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -48,7 +46,6 @@ class tx_form_view_confirmation_element_radio extends tx_form_view_confirmation_
*
* @param tx_form_domain_model_element_radio $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_radio $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/Radiogroup.php b/typo3/sysext/form/Classes/View/Confirmation/Element/Radiogroup.php
index 43f72b2e207d186431a03b877cf74218a2280a5c..69072a9c3dda49ed3a5015bdab920a88d32164d3 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/Radiogroup.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/Radiogroup.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -50,7 +48,6 @@ class tx_form_view_confirmation_element_radiogroup extends tx_form_view_confirma
*
* @param tx_form_domain_model_element_radiogroup $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_radiogroup $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/Select.php b/typo3/sysext/form/Classes/View/Confirmation/Element/Select.php
index ec35b2e27100fbf6c5e4712e3f476ca7c63331ee..e666dd045612a96f9df38a5a9def34b32eb13aed 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/Select.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/Select.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -50,7 +48,6 @@ class tx_form_view_confirmation_element_select extends tx_form_view_confirmation
*
* @param tx_form_domain_model_element_select $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_select $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/Textarea.php b/typo3/sysext/form/Classes/View/Confirmation/Element/Textarea.php
index 586b3e5015736320edc5929e4b85f067e6bbe5d8..541e9874e624bad206ed01cf96168ecfeddbe9c5 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/Textarea.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/Textarea.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -48,7 +46,6 @@ class tx_form_view_confirmation_element_textarea extends tx_form_view_confirmati
*
* @param tx_form_domain_model_element_textarea $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_textarea $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/Textline.php b/typo3/sysext/form/Classes/View/Confirmation/Element/Textline.php
index 4b3b2ed53bb54ca6d850154ea3ed8568374741bc..cd0ea02df00feae43f3ddffd67e5e526eb92a937 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/Textline.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/Textline.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -48,7 +46,6 @@ class tx_form_view_confirmation_element_textline extends tx_form_view_confirmati
*
* @param tx_form_domain_model_element_textline $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_textline $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Form/Additional/Additional.php b/typo3/sysext/form/Classes/View/Form/Additional/Additional.php
index 282d9c0f3e7866537263d937b5628809ed2d627f..52b841c5c511603dc498080811353d8c9a3f616c 100644
--- a/typo3/sysext/form/Classes/View/Form/Additional/Additional.php
+++ b/typo3/sysext/form/Classes/View/Form/Additional/Additional.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -45,7 +43,6 @@ class tx_form_view_form_additional extends tx_form_view_form_element_abstract {
*
* @param object $model The parent model
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($model) {
$this->model = $model;
@@ -55,7 +52,6 @@ class tx_form_view_form_additional extends tx_form_view_form_element_abstract {
* Get the additional value
*
* @return string The value of the additional
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getAdditionalValue() {
$type = preg_replace('/.*_([^_]*)$/', "$1", get_class($this), 1);
diff --git a/typo3/sysext/form/Classes/View/Form/Additional/Error.php b/typo3/sysext/form/Classes/View/Form/Additional/Error.php
index 171ea03525434a0dedd4cb49e2cbad744c8456bd..aa0d9479148a70fd444ade94b54de2bc745ac3da 100644
--- a/typo3/sysext/form/Classes/View/Form/Additional/Error.php
+++ b/typo3/sysext/form/Classes/View/Form/Additional/Error.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -49,7 +47,6 @@ class tx_form_view_form_additional_error extends tx_form_view_form_additional {
*
* @param object $model The parent model
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Form/Additional/Label.php b/typo3/sysext/form/Classes/View/Form/Additional/Label.php
index 8cfbca56ad6dd63355f82ffab4393a452396f66c..48647214f7d474065fe7b63c2b496a20b72dd014 100644
--- a/typo3/sysext/form/Classes/View/Form/Additional/Label.php
+++ b/typo3/sysext/form/Classes/View/Form/Additional/Label.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -51,7 +49,6 @@ class tx_form_view_form_additional_label extends tx_form_view_form_additional {
*
* @param object $model The parent model
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Form/Additional/Legend.php b/typo3/sysext/form/Classes/View/Form/Additional/Legend.php
index 7b8b4ae35050c12494db7b5c50e095d302dfadae..2572354e0d726f6f85813d3f000c365259445e22 100644
--- a/typo3/sysext/form/Classes/View/Form/Additional/Legend.php
+++ b/typo3/sysext/form/Classes/View/Form/Additional/Legend.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -51,7 +49,6 @@ class tx_form_view_form_additional_legend extends tx_form_view_form_additional {
*
* @param object $model The parent model
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Form/Additional/Mandatory.php b/typo3/sysext/form/Classes/View/Form/Additional/Mandatory.php
index 83bf146d0b96c25c438725f643e7ec2a34ab4e36..8f54b84486c54d2bc1b2a1166db1ff90fa47e449 100644
--- a/typo3/sysext/form/Classes/View/Form/Additional/Mandatory.php
+++ b/typo3/sysext/form/Classes/View/Form/Additional/Mandatory.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -49,7 +47,6 @@ class tx_form_view_form_additional_mandatory extends tx_form_view_form_additiona
*
* @param object $model The parent model
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Form/Element/Abstract.php b/typo3/sysext/form/Classes/View/Form/Element/Abstract.php
index 92c7f20a03454c04cddae3d643379b72836c0499..3e3b2f29af65719f4e4f7b19969f15ddb8c87251 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/Abstract.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/Abstract.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -64,7 +62,6 @@ abstract class tx_form_view_form_element_abstract {
*
* @param object $model Current elements model
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($model) {
$this->model = $model;
@@ -79,7 +76,6 @@ abstract class tx_form_view_form_element_abstract {
* @param DOMDocument $dom
* @param DOMDocument $reference Current XML structure
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
protected function parseXML(DOMDocument &$dom, &$reference) {
$node = &$reference->firstChild;
@@ -185,7 +181,6 @@ abstract class tx_form_view_form_element_abstract {
* @param string $type Type of element for layout
* @param boolean $returnFirstChild If TRUE, the first child will be returned instead of the DOMDocument
* @return mixed DOMDocument/DOMNode XML part of the view object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function render($type = 'element', $returnFirstChild = TRUE) {
$useLayout = $this->getLayout((string) $type);
@@ -209,7 +204,6 @@ abstract class tx_form_view_form_element_abstract {
*
* @param string $type Layout type
* @return string HTML string of the layout to use for this element
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getLayout($type) {
$layoutHandler = t3lib_div::makeInstance('tx_form_system_layout');
@@ -252,7 +246,6 @@ abstract class tx_form_view_form_element_abstract {
* @param $node Current Node
* @param $value Value to import
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function replaceNodeWithFragment(DOMDocument &$dom, &$node, $value) {
$replaceNode = $dom->createDocumentFragment();
@@ -267,7 +260,6 @@ abstract class tx_form_view_form_element_abstract {
*
* @param DOMElement $domElement DOM element of the specific HTML tag
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAttributes(DOMElement &$domElement) {
$attributes = $this->model->getAttributes();
@@ -287,7 +279,6 @@ abstract class tx_form_view_form_element_abstract {
* @param DOMElement $domElement DOM element of the specific HTML tag
* @param string $key Attribute key
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAttribute(DOMElement &$domElement, $key) {
$value = htmlspecialchars($this->model->getAttributeValue((string) $key), ENT_QUOTES);
@@ -305,7 +296,6 @@ abstract class tx_form_view_form_element_abstract {
* @param string $key Key of the attribute which needs to be changed
* @param string $other Key of the attribute to take the value from
* @return unknown_type
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAttributeWithValueofOtherAttribute(DOMElement &$domElement, $key, $other) {
$value = htmlspecialchars($this->model->getAttributeValue((string) $other), ENT_QUOTES);
@@ -320,7 +310,6 @@ abstract class tx_form_view_form_element_abstract {
*
* @param string $class Type of additional
* @return object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
protected function createAdditional($class) {
$class = strtolower((string) $class);
@@ -334,7 +323,6 @@ abstract class tx_form_view_form_element_abstract {
*
* @param string $key Type of additional
* @return DOMNode
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getAdditional($key) {
$additional = $this->createAdditional($key);
@@ -347,7 +335,6 @@ abstract class tx_form_view_form_element_abstract {
* or <textarea>content</textarea>
*
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getElementData() {
return htmlspecialchars($this->model->getData(), ENT_QUOTES);
@@ -358,7 +345,6 @@ abstract class tx_form_view_form_element_abstract {
* like <li id="csc-form-"> ... </li>
*
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getElementWrapId() {
$elementId = (integer) $this->model->getElementId();
@@ -373,7 +359,6 @@ abstract class tx_form_view_form_element_abstract {
* like <li>element</li>
*
* @return boolean
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function noWrap() {
return $this->noWrap;
diff --git a/typo3/sysext/form/Classes/View/Form/Element/Button.php b/typo3/sysext/form/Classes/View/Form/Element/Button.php
index 78c9368e17d3b5bf94f665e696535b54e0835554..ed37b814d573d61fbec4952258cc7bf089dea6d4 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/Button.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/Button.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -48,7 +46,6 @@ class tx_form_view_form_element_button extends tx_form_view_form_element_abstrac
*
* @param tx_form_domain_model_element_button $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_button $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Form/Element/Checkbox.php b/typo3/sysext/form/Classes/View/Form/Element/Checkbox.php
index d3e7d1997ba7f6c689fb8270fee690124d6b0b46..b4dbfe39508a6298dc7d1bd9c3f766eba51f361b 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/Checkbox.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/Checkbox.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -48,7 +46,6 @@ class tx_form_view_form_element_checkbox extends tx_form_view_form_element_abstr
*
* @param tx_form_domain_model_element_checkbox $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_checkbox $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Form/Element/Checkboxgroup.php b/typo3/sysext/form/Classes/View/Form/Element/Checkboxgroup.php
index 96ed16e7b5753da9131760ec966db877932003b8..16b4a52f0bc6f6dfe229bbf4d8efc0bb0b6de8fb 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/Checkboxgroup.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/Checkboxgroup.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -50,7 +48,6 @@ class tx_form_view_form_element_checkboxgroup extends tx_form_view_form_element_
*
* @param tx_form_domain_model_element_checkboxgroup $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_checkboxgroup $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Form/Element/Container.php b/typo3/sysext/form/Classes/View/Form/Element/Container.php
index 3ed9a052c3dbf35eb9901ad6d3a964b821cd4575..8bac747d43debfeb15c359e8049e998c3b311305 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/Container.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/Container.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -49,7 +47,6 @@ class tx_form_view_form_element_container extends tx_form_view_form_element_abst
*
* @param object $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($model) {
parent::__construct($model);
@@ -61,7 +58,6 @@ class tx_form_view_form_element_container extends tx_form_view_form_element_abst
*
* @param DOMDocument $dom DOMDocument
* @return DOMDocumentFragment
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getChildElements(DOMDocument &$dom) {
$modelChildren = $this->model->getElements();
diff --git a/typo3/sysext/form/Classes/View/Form/Element/Content.php b/typo3/sysext/form/Classes/View/Form/Element/Content.php
index 510cfef80f3a61f890221d4fcbd87ec797084db0..7d5bebfdc7832616df88153efed856b91a66b217 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/Content.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/Content.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -47,7 +45,6 @@ class tx_form_view_form_element_content extends tx_form_view_form_element_abstra
*
* @param tx_form_domain_model_element_content $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_content $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Form/Element/Fieldset.php b/typo3/sysext/form/Classes/View/Form/Element/Fieldset.php
index 84337e8f8e63010699935c5d62bd333ecc5e46cb..d628eafc85e04f94853c291b9defbebd9eddc6de 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/Fieldset.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/Fieldset.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -50,7 +48,6 @@ class tx_form_view_form_element_fieldset extends tx_form_view_form_element_conta
*
* @param tx_form_domain_model_element_fieldset $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_fieldset $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Form/Element/Fileupload.php b/typo3/sysext/form/Classes/View/Form/Element/Fileupload.php
index 422d22b2f116982bc473deddf9316d99eb67f2d6..299b0c10184bd1212935dd2d3ac860274eb79e64 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/Fileupload.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/Fileupload.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -48,7 +46,6 @@ class tx_form_view_form_element_fileupload extends tx_form_view_form_element_abs
*
* @param tx_form_domain_model_element_fileupload $model Model for this element
* @return void
- * @author Rens Admiraal <r.admiraal@drecomm.nl>
*/
public function __construct(tx_form_domain_model_element_fileupload $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Form/Element/Hidden.php b/typo3/sysext/form/Classes/View/Form/Element/Hidden.php
index cc6b0878fe796fe14921accc6349225d412902d7..516d8000b1e9363ba3748f6e60413148bc0ca5a4 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/Hidden.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/Hidden.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -47,7 +45,6 @@ class tx_form_view_form_element_hidden extends tx_form_view_form_element_abstrac
*
* @param tx_form_domain_model_element_hidden $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_hidden $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Form/Element/Imagebutton.php b/typo3/sysext/form/Classes/View/Form/Element/Imagebutton.php
index b7ef4dc4debd6fc4f48be310e63a84bdfd76cd98..c61417c0d95ea4ac1c18bb145a3de6b31d2eafb7 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/Imagebutton.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/Imagebutton.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -48,7 +46,6 @@ class tx_form_view_form_element_imagebutton extends tx_form_view_form_element_ab
*
* @param tx_form_domain_model_element_imagebutton $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_imagebutton $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Form/Element/Optgroup.php b/typo3/sysext/form/Classes/View/Form/Element/Optgroup.php
index 69f81856ae63f8709046674930bd8cc1c37dd608..3cdfc6801ed1de903ef0ebb768a9b86e66d404af 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/Optgroup.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/Optgroup.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -57,7 +55,6 @@ class tx_form_view_form_element_optgroup extends tx_form_view_form_element_conta
*
* @param tx_form_domain_model_element_optgroup $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_optgroup $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Form/Element/Option.php b/typo3/sysext/form/Classes/View/Form/Element/Option.php
index f4f8b5ae4463cae78453b89a1b713ff5b23739ed..3487f5cd9c348e6a1d32e40ef63b4bb042cb1313 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/Option.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/Option.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -55,7 +53,6 @@ class tx_form_view_form_element_option extends tx_form_view_form_element_abstrac
*
* @param tx_form_domain_model_element_option $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_option $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Form/Element/Password.php b/typo3/sysext/form/Classes/View/Form/Element/Password.php
index afcc7cecfc7cbf6202a7e949f236d023408d09fd..c13a98bb8c0b0e4cf458a49213252aa2d8a68901 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/Password.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/Password.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -48,7 +46,6 @@ class tx_form_view_form_element_password extends tx_form_view_form_element_abstr
*
* @param tx_form_domain_model_element_password $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_password $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Form/Element/Radio.php b/typo3/sysext/form/Classes/View/Form/Element/Radio.php
index 05a7dd4a243d4a06344c1d9776bc2e62c95eb33a..27bccfff85a582cd88b8db3f7681ee2c297398cd 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/Radio.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/Radio.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -48,7 +46,6 @@ class tx_form_view_form_element_radio extends tx_form_view_form_element_abstract
*
* @param tx_form_domain_model_element_radio $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_radio $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Form/Element/Radiogroup.php b/typo3/sysext/form/Classes/View/Form/Element/Radiogroup.php
index 8a1c4bb167e49c00dbd2b2836c84d0f94a3e0273..d9cfea8f61f41e76658913aae29859b9ad498bb2 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/Radiogroup.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/Radiogroup.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -50,7 +48,6 @@ class tx_form_view_form_element_radiogroup extends tx_form_view_form_element_fie
*
* @param tx_form_domain_model_element_radiogroup $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_radiogroup $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Form/Element/Reset.php b/typo3/sysext/form/Classes/View/Form/Element/Reset.php
index 40d8d4a6955ee34aa73d9ef751d42eeb6b40be26..c0515f1986ca26474714acb73a244425ff2496ac 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/Reset.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/Reset.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -48,7 +46,6 @@ class tx_form_view_form_element_reset extends tx_form_view_form_element_abstract
*
* @param tx_form_domain_model_element_reset $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_reset $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Form/Element/Select.php b/typo3/sysext/form/Classes/View/Form/Element/Select.php
index 0990cff6a1e6053f48bcd295a5a6adc8f956c881..2e6764542b92d914482f07cb84cd4e87c15941e8 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/Select.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/Select.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -50,7 +48,6 @@ class tx_form_view_form_element_select extends tx_form_view_form_element_contain
*
* @param tx_form_domain_model_element_select $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_select $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Form/Element/Submit.php b/typo3/sysext/form/Classes/View/Form/Element/Submit.php
index a237e842fd9bb6bd20f459d5f923f7364bbcdf72..61e28eb9f100e26ef2d321555f72a827de3f842c 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/Submit.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/Submit.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -48,7 +46,6 @@ class tx_form_view_form_element_submit extends tx_form_view_form_element_abstrac
*
* @param tx_form_domain_model_element_submit $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_submit $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Form/Element/Textarea.php b/typo3/sysext/form/Classes/View/Form/Element/Textarea.php
index 7836464e3b008000cd3eddb94e8671ec5b3cf74a..6ca56bb1046c265397f0fd0e4ef5d3d2053666f1 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/Textarea.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/Textarea.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -48,7 +46,6 @@ class tx_form_view_form_element_textarea extends tx_form_view_form_element_abstr
*
* @param tx_form_domain_model_element_textarea $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_textarea $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Form/Element/Textline.php b/typo3/sysext/form/Classes/View/Form/Element/Textline.php
index 8eaed5c8a2be292cc012b275edde9aadb38605cf..ba1f1bad8229915f2fcf4bb4d35c4eab4e01b601 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/Textline.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/Textline.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -48,7 +46,6 @@ class tx_form_view_form_element_textline extends tx_form_view_form_element_abstr
*
* @param tx_form_domain_model_element_textline $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_textline $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Form/Form.php b/typo3/sysext/form/Classes/View/Form/Form.php
index 883aa2f3c0d3e3f375a093cf2eac0b9135056b1d..76281e36e5ce86ce9e462757d716a97649f8552d 100644
--- a/typo3/sysext/form/Classes/View/Form/Form.php
+++ b/typo3/sysext/form/Classes/View/Form/Form.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -47,7 +45,6 @@ class tx_form_view_form extends tx_form_view_form_element_container {
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_form $model) {
parent::__construct($model);
@@ -58,7 +55,6 @@ class tx_form_view_form extends tx_form_view_form_element_container {
*
* @param tx_form_domain_model_form $formModel The model of the form
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setData(tx_form_domain_model_form $model) {
$this->model = (object) $model;
@@ -70,7 +66,6 @@ class tx_form_view_form extends tx_form_view_form_element_container {
* (when using formatOutput :-)
*
* @return string XHTML string containing the whole form
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function get() {
$this->setCss();
@@ -84,9 +79,8 @@ class tx_form_view_form extends tx_form_view_form_element_container {
* Add the form CSS file as additional header data
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function setCss() {
+ protected function setCss() {
$GLOBALS['TSFE']->additionalHeaderData['tx_form_css'] =
'<link rel="stylesheet" type="text/css" href="' .
t3lib_extMgm::siteRelPath('form') .
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Additional/Additional.php b/typo3/sysext/form/Classes/View/Mail/Html/Additional/Additional.php
index b20d8d6ee3dbf16209c49e1e131451d1ec69d291..9b071350733e3e83f15670012b0f55a4417dac56 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Additional/Additional.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Additional/Additional.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -45,7 +43,6 @@ class tx_form_view_mail_html_additional extends tx_form_view_mail_html_element_a
*
* @param object $model The parent model
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($model) {
$this->model = $model;
@@ -55,7 +52,6 @@ class tx_form_view_mail_html_additional extends tx_form_view_mail_html_element_a
* Get the additional value
*
* @return string The value of the additional
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getAdditionalValue() {
$type = preg_replace('/.*_([^_]*)$/', "$1", get_class($this), 1);
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Additional/Label.php b/typo3/sysext/form/Classes/View/Mail/Html/Additional/Label.php
index 941404ca1b602bf2322db61a5cebab3cdebb37e7..c64e88fd60169b1203976e85b212a5cc7817699c 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Additional/Label.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Additional/Label.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -49,7 +47,6 @@ class tx_form_view_mail_html_additional_label extends tx_form_view_mail_html_add
*
* @param object $model The parent model
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Additional/Legend.php b/typo3/sysext/form/Classes/View/Mail/Html/Additional/Legend.php
index 7065f8a51f8e2d9b0515f1836186333d45673976..77833471bca6a7cff5e9671b0979bd410547d21e 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Additional/Legend.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Additional/Legend.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -53,7 +51,6 @@ class tx_form_view_mail_html_additional_legend extends tx_form_view_mail_html_ad
*
* @param object $model The parent model
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/Abstract.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/Abstract.php
index e76043d2e13b4eef3cedf94e47d69851f66af07e..1f2f1051806f8f80204dcb88e5f0ea9abc8749fd 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/Abstract.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/Abstract.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -64,7 +62,6 @@ abstract class tx_form_view_mail_html_element_abstract {
*
* @param object $model Current elements model
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($model) {
$this->model = $model;
@@ -79,7 +76,6 @@ abstract class tx_form_view_mail_html_element_abstract {
* @param DOMDocument $dom
* @param DOMDocument $reference Current XML structure
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
protected function parseXML(DOMDocument &$dom, &$reference, &$emptyElement) {
$node = &$reference->firstChild;
@@ -182,7 +178,6 @@ abstract class tx_form_view_mail_html_element_abstract {
* @param string $type Type of element for layout
* @param boolean $returnFirstChild If TRUE, the first child will be returned instead of the DOMDocument
* @return mixed DOMDocument/DOMNode XML part of the view object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function render($type = 'element', $returnFirstChild = TRUE) {
$useLayout = $this->getLayout((string) $type);
@@ -211,7 +206,6 @@ abstract class tx_form_view_mail_html_element_abstract {
*
* @param string $type Layout type
* @return string HTML string of the layout to use for this element
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getLayout($type) {
$layoutHandler = t3lib_div::makeInstance('tx_form_system_layout');
@@ -247,7 +241,6 @@ abstract class tx_form_view_mail_html_element_abstract {
* @param $node Current Node
* @param $value Value to import
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function replaceNodeWithFragment(DOMDocument &$dom, &$node, $value) {
$replaceNode = $dom->createDocumentFragment();
@@ -262,7 +255,6 @@ abstract class tx_form_view_mail_html_element_abstract {
*
* @param DOMElement $domElement DOM element of the specific HTML tag
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAttributes(DOMElement &$domElement) {
$attributes = $this->model->getAttributes();
@@ -282,7 +274,6 @@ abstract class tx_form_view_mail_html_element_abstract {
* @param DOMElement $domElement DOM element of the specific HTML tag
* @param string $key Attribute key
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAttribute(DOMElement &$domElement, $key) {
$value = htmlspecialchars($this->model->getAttributeValue((string) $key), ENT_QUOTES);
@@ -300,7 +291,6 @@ abstract class tx_form_view_mail_html_element_abstract {
* @param string $key Key of the attribute which needs to be changed
* @param string $other Key of the attribute to take the value from
* @return unknown_type
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setAttributeWithValueofOtherAttribute(DOMElement &$domElement, $key, $other) {
$value = htmlspecialchars($this->model->getAttributeValue((string) $other), ENT_QUOTES);
@@ -315,7 +305,6 @@ abstract class tx_form_view_mail_html_element_abstract {
*
* @param string $class Type of additional
* @return object
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
protected function createAdditional($class) {
$class = strtolower((string) $class);
@@ -329,7 +318,6 @@ abstract class tx_form_view_mail_html_element_abstract {
*
* @param string $key Type of additional
* @return DOMNode
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getAdditional($key) {
$additional = $this->createAdditional($key);
@@ -353,7 +341,6 @@ abstract class tx_form_view_mail_html_element_abstract {
* like <li id="csc-form-"> ... </li>
*
* @return string
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getElementWrapId() {
$elementId = (integer) $this->model->getElementId();
@@ -368,7 +355,6 @@ abstract class tx_form_view_mail_html_element_abstract {
* like <li>element</li>
*
* @return boolean
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function noWrap() {
return $this->noWrap;
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/Checkbox.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/Checkbox.php
index fc3c799ba77f3b0721682b45f0a305358364d3b7..fbae2d33dbc2406041195fce5a23c722bd2fe542 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/Checkbox.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/Checkbox.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -52,7 +50,6 @@ class tx_form_view_mail_html_element_checkbox extends tx_form_view_mail_html_ele
*
* @param tx_form_domain_model_element_checkbox $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_checkbox $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/Checkboxgroup.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/Checkboxgroup.php
index f3c31d8b3b8862ea4d719a87bce7f25613114910..e2e711cb0b3cc42bb48edf9047f19d2030a7f0bf 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/Checkboxgroup.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/Checkboxgroup.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -52,7 +50,6 @@ class tx_form_view_mail_html_element_checkboxgroup extends tx_form_view_mail_htm
*
* @param tx_form_domain_model_element_checkboxgroup $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_checkboxgroup $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/Container.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/Container.php
index 165b38d0b22e24cf35a0b8d3a7153d5c156fa440..7ce2e06ed874cc9e8fce5c4dca99d5ffc03c3469 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/Container.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/Container.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -49,7 +47,6 @@ class tx_form_view_mail_html_element_container extends tx_form_view_mail_html_el
*
* @param object $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($model) {
parent::__construct($model);
@@ -61,7 +58,6 @@ class tx_form_view_mail_html_element_container extends tx_form_view_mail_html_el
*
* @param DOMDocument $dom DOMDocument
* @return DOMDocumentFragment
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function getChildElements(DOMDocument &$dom) {
$modelChildren = $this->model->getElements();
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/Fieldset.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/Fieldset.php
index c7606149b3ef85fcc5c7f36df2581a6e80d0f601..ee5c085ee61a5dc3d03148ed25a98879de47dba0 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/Fieldset.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/Fieldset.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -60,7 +58,6 @@ class tx_form_view_mail_html_element_fieldset extends tx_form_view_mail_html_ele
*
* @param tx_form_domain_model_element_fieldset $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_fieldset $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/Fileupload.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/Fileupload.php
index f48128138d5355fe8d9135ed204f96814a13799a..a7507f9673c84a14306a4d8c04388c25cb91da93 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/Fileupload.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/Fileupload.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -52,7 +50,6 @@ class tx_form_view_mail_html_element_fileupload extends tx_form_view_mail_html_e
*
* @param tx_form_domain_model_element_fileupload $model Model for this element
* @return void
- * @author Rens Admiraal <r.admiraal@drecomm.nl>
*/
public function __construct(tx_form_domain_model_element_fileupload $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/Hidden.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/Hidden.php
index 361adc75319d9ccca703d44f0d7c1faf696eb82b..1459a8a1329559bf9f957892b80404ed4821b60a 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/Hidden.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/Hidden.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -54,7 +52,6 @@ class tx_form_view_mail_html_element_hidden extends tx_form_view_mail_html_eleme
*
* @param tx_form_domain_model_element_hidden $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_hidden $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/Optgroup.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/Optgroup.php
index 8cf303c86963d4a7362d56f645b50a08a66db31a..11c3174b0df543cdc0873c7159c38b964d407b93 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/Optgroup.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/Optgroup.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -55,7 +53,6 @@ class tx_form_view_mail_html_element_optgroup extends tx_form_view_mail_html_ele
*
* @param tx_form_domain_model_element_optgroup $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_optgroup $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/Option.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/Option.php
index cc7dd9bcea71a8511b4ac695130dd1921bdde686..5b74afafea4c9039c15889436ac5631ac84b1589 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/Option.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/Option.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -57,7 +55,6 @@ class tx_form_view_mail_html_element_option extends tx_form_view_mail_html_eleme
*
* @param tx_form_domain_model_element_option $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_option $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/Radio.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/Radio.php
index 97dba3b3ff2e1581ee9bc9862e0c8e62caa86534..5469b2e19896cfe4a67bfcdeb1f138dd3cd74fe6 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/Radio.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/Radio.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -52,7 +50,6 @@ class tx_form_view_mail_html_element_radio extends tx_form_view_mail_html_elemen
*
* @param tx_form_domain_model_element_radio $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_radio $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/Radiogroup.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/Radiogroup.php
index c44b472d14f0bda666d712d858e4e53eb3329647..621d8e4d156d269bae80f7f31f1043288ce9ba33 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/Radiogroup.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/Radiogroup.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -52,7 +50,6 @@ class tx_form_view_mail_html_element_radiogroup extends tx_form_view_mail_html_e
*
* @param tx_form_domain_model_element_radiogroup $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_radiogroup $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/Select.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/Select.php
index 2a95fddadd80b37e70c9b1208e5f3c56fab27f59..8c23fe987fb9bb8b90e53eea07c0b3b0af4d1675 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/Select.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/Select.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -52,7 +50,6 @@ class tx_form_view_mail_html_element_select extends tx_form_view_mail_html_eleme
*
* @param tx_form_domain_model_element_select $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_select $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/Textarea.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/Textarea.php
index f71681f092ceb49f7a99511e32bfd14b3fc381e1..590ee8d204cbb99a2bd1d863efa491155595ad72 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/Textarea.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/Textarea.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -52,7 +50,6 @@ class tx_form_view_mail_html_element_textarea extends tx_form_view_mail_html_ele
*
* @param tx_form_domain_model_element_textarea $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_textarea $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/Textline.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/Textline.php
index 4cc38d2d74389f698326fccb77b9ee28db4aac68..bfd418ebc3e18711d49ca5edbcccc33f07433c32 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/Textline.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/Textline.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -52,7 +50,6 @@ class tx_form_view_mail_html_element_textline extends tx_form_view_mail_html_ele
*
* @param tx_form_domain_model_element_textline $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_textline $model) {
parent::__construct($model);
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Html.php b/typo3/sysext/form/Classes/View/Mail/Html/Html.php
index 3e8dd09588380f35d344b2d5a7bd8cf0a6936492..9331fe89bca1b4aa38ab3acd490395ef7faf9082 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Html.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Html.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -76,7 +74,6 @@ class tx_form_view_mail_html extends tx_form_view_mail_html_element_container {
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_form $model, array $typoscript) {
$this->localCobj = t3lib_div::makeInstance('tslib_cObj');
@@ -92,7 +89,6 @@ class tx_form_view_mail_html extends tx_form_view_mail_html_element_container {
*
* @param tx_form_domain_model_form $formModel The model of the form
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function setData(tx_form_domain_model_form $model) {
$this->model = (object) $model;
@@ -104,7 +100,6 @@ class tx_form_view_mail_html extends tx_form_view_mail_html_element_container {
* (when using formatOutput :-)
*
* @return string XHTML string containing the whole form
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function get() {
$node = $this->render('element', FALSE);
diff --git a/typo3/sysext/form/Classes/View/Mail/Mail.php b/typo3/sysext/form/Classes/View/Mail/Mail.php
index bbdfc7d160aa08a197a8773e15d9f2d7c77e13f5..7c85d200a6466fff7f0fc484a14d533aacd82c28 100644
--- a/typo3/sysext/form/Classes/View/Mail/Mail.php
+++ b/typo3/sysext/form/Classes/View/Mail/Mail.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -65,7 +63,6 @@ class tx_form_view_mail {
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(t3lib_mail_Message $mailMessage, array $typoScript) {
$this->localCobj = t3lib_div::makeInstance('tslib_cObj');
@@ -86,15 +83,15 @@ class tx_form_view_mail {
return $output;
}
- private function success() {
+ protected function success() {
return $this->makeContentObject('success');
}
- private function error() {
+ protected function error() {
return $this->makeContentObject('error');
}
- private function makeContentObject($isSent) {
+ protected function makeContentObject($isSent) {
$message = NULL;
$type = NULL;
@@ -130,9 +127,8 @@ class tx_form_view_mail {
* In some cases this method will be override by rule class
*
* @return string The local language message label
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
- private function getLocalLanguageLabel($type) {
+ protected function getLocalLanguageLabel($type) {
$label = get_class($this) . '.' . $type;
$message = $this->localizationHandler->getLocalLanguageLabel($label);
return $message;
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Checkbox.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Checkbox.php
index dbf30bf3410162a62eadb317f341ef14d53c4dbb..1b030e9e9058c85550b558a975d9d29db0e18b31 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Checkbox.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Checkbox.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,6 @@ class tx_form_view_mail_plain_element_checkbox extends tx_form_view_mail_plain_e
*
* @param tx_form_domain_model_element_checkbox $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_checkbox $model, $spaces) {
parent::__construct($model, $spaces);
@@ -52,7 +49,7 @@ class tx_form_view_mail_plain_element_checkbox extends tx_form_view_mail_plain_e
}
}
- private function getValue() {
+ protected function getValue() {
$value = NULL;
if (
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Checkboxgroup.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Checkboxgroup.php
index dfde2b8da19c6afd4e396b8665a3a0c6880405c3..139ad4a7fa199ef092b2ace246d5512f990e8943 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Checkboxgroup.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Checkboxgroup.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,6 @@ class tx_form_view_mail_plain_element_checkboxgroup extends tx_form_view_mail_pl
*
* @param tx_form_domain_model_element_radiogroup $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_checkboxgroup $model, $spaces) {
parent::__construct($model, $spaces);
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Container.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Container.php
index cbdbd3bffda2e8538ab20ba30086ddf683b8b0e9..d82ce3c38f81eeaa58f412d02809943c1d0e4ea1 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Container.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Container.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -37,7 +35,6 @@ class tx_form_view_mail_plain_element_container extends tx_form_view_mail_plain_
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($model, $spaces) {
parent::__construct($model, $spaces);
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Element.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Element.php
index 29f5fae3955043c6cb543f3dee0f66a4b9621393..5b4a0725be5cc4e23ec444e79bfe9b8698b5ef0d 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Element.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Element.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -37,7 +35,6 @@ class tx_form_view_mail_plain_element {
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct($model, $spaces) {
$this->model = (object) $model;
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Fieldset.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Fieldset.php
index 61a1d5b42610f2ead0c595e19a17e7629b4a273a..985203c4d51ef14965988b97e5d8ff0dbd93bf73 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Fieldset.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Fieldset.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,6 @@ class tx_form_view_mail_plain_element_fieldset extends tx_form_view_mail_plain_e
*
* @param tx_form_domain_model_element_fieldset $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_fieldset $model, $spaces) {
parent::__construct($model, $spaces);
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Fileupload.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Fileupload.php
index d121aa9a6dff11dac2c321c8c2d6e8a348a4d760..28ed49e4d6456c5cd5a76721d06c7955d0057cf5 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Fileupload.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Fileupload.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,6 @@ class tx_form_view_mail_plain_element_fileupload extends tx_form_view_mail_plain
*
* @param tx_form_domain_model_element_fileupload $model Model for this element
* @return void
- * @author Rens Admiraal <r.admiraal@drecomm.nl>
*/
public function __construct(tx_form_domain_model_element_fileupload $model, $spaces) {
parent::__construct($model, $spaces);
@@ -50,7 +47,7 @@ class tx_form_view_mail_plain_element_fileupload extends tx_form_view_mail_plain
return str_repeat(chr(32), $this->spaces) . $content;
}
- private function getLabel() {
+ protected function getLabel() {
if ($this->model->additionalIsSet('label')) {
$label = $this->model->getAdditionalValue('label');
} else {
@@ -60,7 +57,7 @@ class tx_form_view_mail_plain_element_fileupload extends tx_form_view_mail_plain
return $label;
}
- private function getValue() {
+ protected function getValue() {
$value = $this->model->getAttributeValue('value');
return $value;
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Hidden.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Hidden.php
index 81133888d77deaf1b1b86f3f63f1d1b224b1f1fb..881baee31172f9a9fd20b6e064c92bb72ad66862 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Hidden.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Hidden.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,6 @@ class tx_form_view_mail_plain_element_hidden extends tx_form_view_mail_plain_ele
*
* @param tx_form_domain_model_element_hidden $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_hidden $model, $spaces) {
parent::__construct($model, $spaces);
@@ -50,13 +47,13 @@ class tx_form_view_mail_plain_element_hidden extends tx_form_view_mail_plain_ele
return str_repeat(chr(32), $this->spaces) . $content;
}
- private function getLabel() {
+ protected function getLabel() {
$label = $this->model->getName();
return $label;
}
- private function getValue() {
+ protected function getValue() {
$value = $this->model->getAttributeValue('value');
return $value;
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Optgroup.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Optgroup.php
index d2b2d54e5d818ba8ac7d9d5e66485a0076f8ff5f..cc02c66bd1c307ec452eb0adf58dad06a8c189ab 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Optgroup.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Optgroup.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,6 @@ class tx_form_view_mail_plain_element_optgroup extends tx_form_view_mail_plain_c
*
* @param tx_form_domain_model_element_optgroup $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_optgroup $model, $spaces) {
parent::__construct($model, $spaces);
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Option.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Option.php
index eeb2f540cd533df77e3954541f7a5b652d0a6bb1..7a507d3bc771f479bbdfd900a1ca45dd5f9e2ba0 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Option.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Option.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,6 @@ class tx_form_view_mail_plain_element_option extends tx_form_view_mail_plain_ele
*
* @param tx_form_domain_model_element_textarea $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_option $model, $spaces) {
parent::__construct($model, $spaces);
@@ -52,7 +49,7 @@ class tx_form_view_mail_plain_element_option extends tx_form_view_mail_plain_ele
}
}
- private function getData() {
+ protected function getData() {
$value = '';
if (
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Radio.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Radio.php
index bbb527bcf68041a6ecd11faa6256bd14bee3cb8d..f3386b0de6aaabc31b1a242fcbccce2f42b2dcf9 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Radio.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Radio.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,6 @@ class tx_form_view_mail_plain_element_radio extends tx_form_view_mail_plain_elem
*
* @param tx_form_domain_model_element_radio $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_radio $model, $spaces) {
parent::__construct($model, $spaces);
@@ -52,7 +49,7 @@ class tx_form_view_mail_plain_element_radio extends tx_form_view_mail_plain_elem
}
}
- private function getValue() {
+ protected function getValue() {
$value = NULL;
if (
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Radiogroup.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Radiogroup.php
index 6c4d331a14441679d0544ba37162bb8fff42b714..57b796992a0c1b6e4ee7410847982a79ba1c6d50 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Radiogroup.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Radiogroup.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,6 @@ class tx_form_view_mail_plain_element_radiogroup extends tx_form_view_mail_plain
*
* @param tx_form_domain_model_element_radiogroup $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_radiogroup $model, $spaces) {
parent::__construct($model, $spaces);
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Select.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Select.php
index 2a8400bfc9d86def0213d9994519d3dfae06300d..881a1d3b44e70537d7515762f60fc25ffee2735a 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Select.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Select.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,6 @@ class tx_form_view_mail_plain_element_select extends tx_form_view_mail_plain_ele
*
* @param tx_form_domain_model_element_select $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_select $model, $spaces) {
parent::__construct($model, $spaces);
@@ -52,7 +49,7 @@ class tx_form_view_mail_plain_element_select extends tx_form_view_mail_plain_ele
return str_repeat(chr(32), $this->spaces) . $content;
}
- private function getLabel() {
+ protected function getLabel() {
$label = '';
if ($this->model->additionalIsSet('label')) {
@@ -64,7 +61,7 @@ class tx_form_view_mail_plain_element_select extends tx_form_view_mail_plain_ele
return $label;
}
- private function getValues() {
+ protected function getValues() {
$values = $this->renderChildren(
$this->model->getElements(),
$this->spaces + 4
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Textarea.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Textarea.php
index abe6ebf616226ad4711e56e3c77fa41194ec8d9e..e941730c17365eb323715547a51ed4f6d85ae290 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Textarea.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Textarea.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,6 @@ class tx_form_view_mail_plain_element_textarea extends tx_form_view_mail_plain_e
*
* @param tx_form_domain_model_element_textarea $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_textarea $model, $spaces) {
parent::__construct($model, $spaces);
@@ -53,7 +50,7 @@ class tx_form_view_mail_plain_element_textarea extends tx_form_view_mail_plain_e
return str_repeat(chr(32), $this->spaces) . $content;
}
- private function getLabel() {
+ protected function getLabel() {
$label = '';
if ($this->model->additionalIsSet('label')) {
@@ -65,7 +62,7 @@ class tx_form_view_mail_plain_element_textarea extends tx_form_view_mail_plain_e
return $label;
}
- private function getData() {
+ protected function getData() {
$value = str_replace(
chr(10),
chr(10) . str_repeat(chr(32), $this->spaces + 4),
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Textline.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Textline.php
index 530d5e32133adeb87c40264081d9feca9e0f523b..954e72bd6d8cbba4bc9c9c3c03dc899b2f4647a1 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/Textline.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/Textline.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -38,7 +36,6 @@ class tx_form_view_mail_plain_element_textline extends tx_form_view_mail_plain_e
*
* @param tx_form_domain_model_element_textline $model Model for this element
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_element_textline $model, $spaces) {
parent::__construct($model, $spaces);
@@ -50,7 +47,7 @@ class tx_form_view_mail_plain_element_textline extends tx_form_view_mail_plain_e
return str_repeat(chr(32), $this->spaces) . $content;
}
- private function getLabel() {
+ protected function getLabel() {
$label = '';
if ($this->model->additionalIsSet('label')) {
@@ -62,7 +59,7 @@ class tx_form_view_mail_plain_element_textline extends tx_form_view_mail_plain_e
return $label;
}
- private function getValue() {
+ protected function getValue() {
$value = $this->model->getAttributeValue('value');
return $value;
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Plain.php b/typo3/sysext/form/Classes/View/Mail/Plain/Plain.php
index 38f6b61da936fd73e36bff9e19f65457c9090155..d49b90232f2d4102e6a6d15d2f6a576e6b5e241e 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Plain.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Plain.php
@@ -1,6 +1,4 @@
<?php
-declare(encoding = 'utf-8');
-
/***************************************************************
* Copyright notice
*
@@ -37,7 +35,6 @@ class tx_form_view_mail_plain extends tx_form_view_mail_plain_element_container
* Constructor
*
* @return void
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function __construct(tx_form_domain_model_form $model, $spaces = 0) {
parent::__construct($model, $spaces);
@@ -47,7 +44,6 @@ class tx_form_view_mail_plain extends tx_form_view_mail_plain_element_container
*
*
* @return string Plain content containing the submitted values
- * @author Patrick Broens <patrick@patrickbroens.nl>
*/
public function render() {
$content = $this->renderChildren($this->model->getElements());
diff --git a/typo3/sysext/form/Classes/View/Wizard/Load.php b/typo3/sysext/form/Classes/View/Wizard/Load.php
index f36384e9c81e586ebf57b3f24983ae0edfc559fe..b2cb06deb8f78445ce65d02b3405b04302edbc87 100644
--- a/typo3/sysext/form/Classes/View/Wizard/Load.php
+++ b/typo3/sysext/form/Classes/View/Wizard/Load.php
@@ -1,5 +1,4 @@
<?php
-declare(encoding = 'utf-8');
/***************************************************************
* Copyright notice
*
@@ -39,7 +38,7 @@ class tx_form_view_wizard_load {
*
* @var boolean TRUE if available, FALSE if not
*/
- private $recordIsAvailable = FALSE;
+ protected $recordIsAvailable = FALSE;
/**
* Constructs this view
@@ -68,7 +67,7 @@ class tx_form_view_wizard_load {
* @param mixed $configuration JSON string, FALSE if not succeeded
* @return void
*/
- private function headerOutput($jsonObject) {
+ protected function headerOutput($jsonObject) {
if (!$jsonObject) {
header('HTTP/1.1 500 Internal Server Error');
$jsonArray = array('message' => 'Failed to save the form');
diff --git a/typo3/sysext/form/Classes/View/Wizard/Save.php b/typo3/sysext/form/Classes/View/Wizard/Save.php
index 486b873ec58c4f71242111ff73efe70db30d9492..48471f4ca80eb1bf507adfe8ac645793d6d02123 100644
--- a/typo3/sysext/form/Classes/View/Wizard/Save.php
+++ b/typo3/sysext/form/Classes/View/Wizard/Save.php
@@ -1,5 +1,4 @@
<?php
-declare(encoding = 'utf-8');
/***************************************************************
* Copyright notice
*
@@ -39,7 +38,7 @@ class tx_form_view_wizard_save {
*
* @var boolean TRUE if available, FALSE if not
*/
- private $recordIsAvailable = FALSE;
+ protected $recordIsAvailable = FALSE;
/**
* Constructs this view
@@ -75,7 +74,7 @@ class tx_form_view_wizard_save {
* @param string $json JSON string
* @return void
*/
- private function headerOutput($success) {
+ protected function headerOutput($success) {
if (!$success) {
header('HTTP/1.1 500 Internal Server Error');
$jsonArray = array('message' => 'Failed to save the form');
diff --git a/typo3/sysext/form/Classes/View/Wizard/Wizard.php b/typo3/sysext/form/Classes/View/Wizard/Wizard.php
index 57a876016d6faaa755375f71a1582374afba0d5e..99432842c6c5b7ccaa23135334faa78858a9321a 100644
--- a/typo3/sysext/form/Classes/View/Wizard/Wizard.php
+++ b/typo3/sysext/form/Classes/View/Wizard/Wizard.php
@@ -1,5 +1,4 @@
<?php
-declare(encoding = 'utf-8');
/***************************************************************
* Copyright notice
*
@@ -49,7 +48,7 @@ class tx_form_view_wizard_wizard {
*
* @var boolean TRUE if available, FALSE if not
*/
- private $recordIsAvailable = FALSE;
+ protected $recordIsAvailable = FALSE;
/**
* Constructs this view
@@ -136,7 +135,7 @@ class tx_form_view_wizard_wizard {
*
* @return void
*/
- private function loadJavascript() {
+ protected function loadJavascript() {
$compress = TRUE;
$baseUrl = t3lib_div::resolveBackPath(
'../../../../../' .
@@ -262,7 +261,7 @@ class tx_form_view_wizard_wizard {
*
* @return void
*/
- private function loadCss() {
+ protected function loadCss() {
// TODO Set to TRUE when finished
$compress = FALSE;
$baseUrl = t3lib_div::resolveBackPath(
@@ -296,7 +295,7 @@ class tx_form_view_wizard_wizard {
*
* @return void
*/
- private function loadSettings() {
+ protected function loadSettings() {
$record = $this->repository->getRecord();
$pageId = $record->getPageId();
$modTSconfig = t3lib_BEfunc::getModTSconfig(
@@ -317,7 +316,7 @@ class tx_form_view_wizard_wizard {
*
* @param $file
*/
- private function loadLocalization() {
+ protected function loadLocalization() {
$wizardLabels = $GLOBALS['LANG']->includeLLFile(
'EXT:form/Resources/Private/Language/locallang_wizard.xml',
FALSE,
@@ -342,7 +341,7 @@ class tx_form_view_wizard_wizard {
*
* @param array $array The array with the trailing dots
*/
- private function removeTrailingDotsFromTyposcript(&$array) {
+ protected function removeTrailingDotsFromTyposcript(&$array) {
if (is_array($array)) {
foreach ($array as $key => $value) {
if (is_array($value)) {
@@ -363,7 +362,7 @@ class tx_form_view_wizard_wizard {
*
* @return array all available buttons as an assoc. array
*/
- private function getButtons() {
+ protected function getButtons() {
$buttons = array(
'csh' => '',
'csh_buttons' => '',
@@ -420,7 +419,7 @@ class tx_form_view_wizard_wizard {
*
* @return string The body content
*/
- private function getBodyContent() {
+ protected function getBodyContent() {
if ($this->recordIsAvailable) {
$bodyContent = '';
} else {
diff --git a/typo3/sysext/form/ext_autoload.php b/typo3/sysext/form/ext_autoload.php
index e549e5d0e2660f6b837167cc0d9c7c38aabe91b4..92cf778087116a2347c5ef09abbcbbf6954599de 100644
--- a/typo3/sysext/form/ext_autoload.php
+++ b/typo3/sysext/form/ext_autoload.php
@@ -1,6 +1,6 @@
<?php
// DO NOT CHANGE THIS FILE! It is automatically generated by extdeveval::buildAutoloadRegistry.
-// This file was generated on 2011-08-01 21:36
+// This file was generated on 2011-08-02 13:40
$extensionPath = t3lib_extMgm::extPath('form');
$extensionClassesPath = t3lib_extMgm::extPath('form') . 'Classes/';
@@ -91,8 +91,8 @@ return array(
'tx_form_domain_model_json_textarea' => $extensionClassesPath . 'Domain/Model/JSON/Textarea.php',
'tx_form_domain_model_json_textline' => $extensionClassesPath . 'Domain/Model/JSON/Textline.php',
'tx_form_domain_repository_content' => $extensionClassesPath . 'Domain/Repository/Content.php',
- 'tx_form_exception_general' => $extensionClassesPath . 'Exception/class.tx_form_exception_general.php',
- 'tx_form_exception_loader' => $extensionClassesPath . 'Exception/class.tx_form_exception_loader.php',
+ 'tx_form_exception_general' => $extensionClassesPath . 'Exception/General.php',
+ 'tx_form_exception_loader' => $extensionClassesPath . 'Exception/Loader.php',
'tx_form_system_elementcounter' => $extensionClassesPath . 'System/Elementcounter/Elementcounter.php',
'tx_form_system_filter_alphabetic' => $extensionClassesPath . 'System/Filter/Alphabetic.php',
'tx_form_system_filter_alphanumeric' => $extensionClassesPath . 'System/Filter/Alphanumeric.php',