@@ -1,2 +1,7 @@

-order deny,allow

-allow from all

\ No newline at end of file

+<IfModule !mod_authz_core.c>

+  Order allow,deny

+  Allow from all

+</IfModule>

+<IfModule mod_authz_core.c>

+  Require all granted

+</IfModule>

\ No newline at end of file

@@ -38,7 +38,7 @@ input[type="number"],input[type="search"],input[type="tel"],input[type="time"],i

 	font-size: 123%;

 	line-height: 2;

 	font-weight: normal;

-	border: none;

+	border-bottom: inherit 3px solid;

 	margin-bottom: 1em;

 }

@@ -143,7 +143,6 @@ input[type="number"],input[type="search"],input[type="tel"],input[type="time"],i

 	min-height: 2.1em;

 }

-.widget.w5  { float: left; width: 3%; }

 .widget.w10 { float: left; width: 8%; }

 .widget.w15 { float: left; width: 13%; }

 .widget.w20 { float: left; width: 18%; }

@@ -171,7 +170,6 @@ input[type="number"],input[type="search"],input[type="tel"],input[type="time"],i

 }

 @media screen and (max-width: 43em) {

-	.widget.w5,

 	.widget.w10,

 	.widget.w15,

 	.widget.w20,

@@ -193,8 +191,6 @@ input[type="number"],input[type="search"],input[type="tel"],input[type="time"],i

 	.widget.w100 { float: none; width: 98%; }

 }

-.widget.w5:before,

-.widget.w5:after,

 .widget.w10:before,

 .widget.w10:after,

 .widget.w15:before,

@@ -239,7 +235,6 @@ form:after {

 	display: table; /* 2 */

 }

-.widget.w5:after,

 .widget.w10:after,

 .widget.w15:after,

 .widget.w20:after,

@@ -1 +1 @@

-input[type="text"],input[type="password"],input[type="date"],input[type="datetime"],input[type="email"],input[type="number"],input[type="search"],input[type="tel"],input[type="time"],input[type="url"],textarea,select{width:100%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.widget input.captcha{max-width:4em}.formbody>fieldset{clear:left}.formbody>fieldset legend{color:inherit;font-size:123%;line-height:2;font-weight:normal;border:0;margin-bottom:1em}.widget .radio_container legend,.widget .checkbox_container legend{color:inherit;font-size:100%;font-weight:normal;border-bottom:0;display:block;margin-bottom:.4em;line-height:1.5em}.widget .checkbox_container label,.widget .radio_container label{font-weight:normal;display:inline;margin-bottom:0}.widget .checkbox_container>span,.widget .radio_container>span{display:block}.widget.headline{margin-top:1em;font-size:108%;font-weight:bold;min-height:1.5em}.widget{padding:0 1%;margin-bottom:.5em;min-height:4em;float:left;width:98%}.widget.cbx{min-height:1.5em;height:1.5em;padding:4px 1%}.widget label{display:block;margin-bottom:.4em;line-height:1.5em}.widget.error input,.widget.error select,.widget.error textarea{border-color:#e23e15}.widget p.error{font-size:85%;margin-top:-0.4em;margin-bottom:.4em}.widget.error .errortip{background-color:#e23e15;border-bottom-left-radius:50%;border-bottom-right-radius:50%;border-top-left-radius:50%;border-top-right-radius:50%;color:#fff;cursor:help;display:block;float:right;font-family:'Open Sans',Arial,Helvetica,sans-serif;font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;height:15px;line-height:13px;margin-top:3.25px;text-align:center;vertical-align:top;width:15px}.submit_container{min-height:2.1em}.widget.w5{float:left;width:3%}.widget.w10{float:left;width:8%}.widget.w15{float:left;width:13%}.widget.w20{float:left;width:18%}.widget.w25{float:left;width:23%}.widget.w30{float:left;width:28%}.widget.w35{float:left;width:33%}.widget.w40{float:left;width:38%}.widget.w45{float:left;width:43%}.widget.w50{float:left;width:48%}.widget.w55{float:left;width:53%}.widget.w60{float:left;width:58%}.widget.w65{float:left;width:63%}.widget.w70{float:left;width:68%}.widget.w75{float:left;width:73%}.widget.w80{float:left;width:78%}.widget.w85{float:left;width:83%}.widget.w90{float:left;width:88%}.widget.w95{float:left;width:93%}.widget.w100{float:left;width:98%}.widget.clr,.formbody>fieldset{clear:left}@media screen and (max-width:43em){.widget.w5,.widget.w10,.widget.w15,.widget.w20,.widget.w25,.widget.w30,.widget.w35,.widget.w40,.widget.w45,.widget.w50,.widget.w55,.widget.w60,.widget.w65,.widget.w70,.widget.w75,.widget.w80,.widget.w85,.widget.w90,.widget.w95,.widget.w100{float:none;width:98%}}.widget.w5:before,.widget.w5:after,.widget.w10:before,.widget.w10:after,.widget.w15:before,.widget.w15:after,.widget.w20:before,.widget.w20:after,.widget.w25:before,.widget.w25:after,.widget.w30:before,.widget.w30:after,.widget.w35:before,.widget.w35:after,.widget.w40:before,.widget.w40:after,.widget.w45:before,.widget.w45:after,.widget.w50:before,.widget.w50:after,.widget.w55:before,.widget.w55:after,.widget.w60:before,.widget.w60:after,.widget.w65:before,.widget.w65:after,.widget.w70:before,.widget.w70:after,.widget.w75:before,.widget.w75:after,.widget.w80:before,.widget.w80:after,.widget.w85:before,.widget.w85:after,.widget.w90:before,.widget.w90:after,.widget.w95:before,.widget.w95:after,.widget.w100:before,.widget.w100:after,form:before,form:after{content:" ";display:table}.widget.w5:after,.widget.w10:after,.widget.w15:after,.widget.w20:after,.widget.w25:after,.widget.w30:after,.widget.w35:after,.widget.w40:after,.widget.w45:after,.widget.w50:after,.widget.w55:after,.widget.w60:after,.widget.w65:after,.widget.w70:after,.widget.w75:after,.widget.w80:after,.widget.w85:after,.widget.w90:after,.widget.w95:after,.widget.w100:after,form:after{clear:both}.widget.widget-split input[type="text"],.widget.widget-split input[type="password"],.widget.widget-split input[type="date"],.widget.widget-split input[type="datetime"],.widget.widget-split input[type="email"],.widget.widget-split input[type="number"],.widget.widget-split input[type="search"],.widget.widget-split input[type="tel"],.widget.widget-split input[type="time"],.widget.widget-split input[type="url"],.widget.widget-split textarea,.widget.widget-split select{max-width:50%!important;min-width:10%!important;float:left;margin-right:10px;display:inline}.widget.widget-split.widget-split-3 input{max-width:30%!important}.widget.widget-split.widget-split-3 input[type="submit"]{max-width:70%!important}.widget.widget-split.widget-split-4 input{max-width:40%!important}.widget.widget-split.widget-split-4 input[type="submit"]{max-width:60%!important}.widget.widget-split.widget-split-5 input{max-width:50%!important}.widget.widget-split.widget-split-5 input[type="submit"]{max-width:50%!important}.widget.widget-split.widget-split-6 input{max-width:60%!important}.widget.widget-split.widget-split-6 input[type="submit"]{max-width:40%!important}.widget.widget-split.widget-split-7 input{max-width:70%!important}.widget.widget-split.widget-split-7 input[type="submit"]{max-width:30%!important}.widget.fl_right input[type="submit"],.submit_container.fl_right .submit{float:right}.widget.lblp{padding-top:1.9em;min-height:2.1em}.widget.autoh{min-height:0}.widget,form{*zoom:1}

\ No newline at end of file

+input[type="text"],input[type="password"],input[type="date"],input[type="datetime"],input[type="email"],input[type="number"],input[type="search"],input[type="tel"],input[type="time"],input[type="url"],textarea,select{width:100%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.widget input.captcha{max-width:4em}.formbody>fieldset{clear:left}.formbody>fieldset legend{color:inherit;font-size:123%;line-height:2;font-weight:normal;border-bottom:inherit 3px solid;margin-bottom:1em}.widget .radio_container legend,.widget .checkbox_container legend{color:inherit;font-size:100%;font-weight:normal;border-bottom:0;display:block;margin-bottom:.4em;line-height:1.5em}.widget .checkbox_container label,.widget .radio_container label{font-weight:normal;display:inline;margin-bottom:0}.widget .checkbox_container>span,.widget .radio_container>span{display:block}.widget.headline{margin-top:1em;font-size:108%;font-weight:bold;min-height:1.5em}.widget{padding:0 1%;margin-bottom:.5em;min-height:4em;float:left;width:98%}.widget.cbx{min-height:1.5em;height:1.5em;padding:4px 1%}.widget label{display:block;margin-bottom:.4em;line-height:1.5em}.widget.error input,.widget.error select,.widget.error textarea{border-color:#e23e15}.widget p.error{font-size:85%;margin-top:-0.4em;margin-bottom:.4em}.widget.error .errortip{background-color:#e23e15;border-bottom-left-radius:50%;border-bottom-right-radius:50%;border-top-left-radius:50%;border-top-right-radius:50%;color:#fff;cursor:help;display:block;float:right;font-family:'Open Sans',Arial,Helvetica,sans-serif;font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;height:15px;line-height:13px;margin-top:3.25px;text-align:center;vertical-align:top;width:15px}.submit_container{min-height:2.1em}.widget.w10{float:left;width:8%}.widget.w15{float:left;width:13%}.widget.w20{float:left;width:18%}.widget.w25{float:left;width:23%}.widget.w30{float:left;width:28%}.widget.w35{float:left;width:33%}.widget.w40{float:left;width:38%}.widget.w45{float:left;width:43%}.widget.w50{float:left;width:48%}.widget.w55{float:left;width:53%}.widget.w60{float:left;width:58%}.widget.w65{float:left;width:63%}.widget.w70{float:left;width:68%}.widget.w75{float:left;width:73%}.widget.w80{float:left;width:78%}.widget.w85{float:left;width:83%}.widget.w90{float:left;width:88%}.widget.w95{float:left;width:93%}.widget.w100{float:left;width:98%}.widget.clr,.formbody>fieldset{clear:left}@media screen and (max-width:43em){.widget.w10,.widget.w15,.widget.w20,.widget.w25,.widget.w30,.widget.w35,.widget.w40,.widget.w45,.widget.w50,.widget.w55,.widget.w60,.widget.w65,.widget.w70,.widget.w75,.widget.w80,.widget.w85,.widget.w90,.widget.w95,.widget.w100{float:none;width:98%}}.widget.w10:before,.widget.w10:after,.widget.w15:before,.widget.w15:after,.widget.w20:before,.widget.w20:after,.widget.w25:before,.widget.w25:after,.widget.w30:before,.widget.w30:after,.widget.w35:before,.widget.w35:after,.widget.w40:before,.widget.w40:after,.widget.w45:before,.widget.w45:after,.widget.w50:before,.widget.w50:after,.widget.w55:before,.widget.w55:after,.widget.w60:before,.widget.w60:after,.widget.w65:before,.widget.w65:after,.widget.w70:before,.widget.w70:after,.widget.w75:before,.widget.w75:after,.widget.w80:before,.widget.w80:after,.widget.w85:before,.widget.w85:after,.widget.w90:before,.widget.w90:after,.widget.w95:before,.widget.w95:after,.widget.w100:before,.widget.w100:after,form:before,form:after{content:" ";display:table}.widget.w10:after,.widget.w15:after,.widget.w20:after,.widget.w25:after,.widget.w30:after,.widget.w35:after,.widget.w40:after,.widget.w45:after,.widget.w50:after,.widget.w55:after,.widget.w60:after,.widget.w65:after,.widget.w70:after,.widget.w75:after,.widget.w80:after,.widget.w85:after,.widget.w90:after,.widget.w95:after,.widget.w100:after,form:after{clear:both}.widget.widget-split input[type="text"],.widget.widget-split input[type="password"],.widget.widget-split input[type="date"],.widget.widget-split input[type="datetime"],.widget.widget-split input[type="email"],.widget.widget-split input[type="number"],.widget.widget-split input[type="search"],.widget.widget-split input[type="tel"],.widget.widget-split input[type="time"],.widget.widget-split input[type="url"],.widget.widget-split textarea,.widget.widget-split select{max-width:50%!important;min-width:10%!important;float:left;margin-right:10px;display:inline}.widget.widget-split.widget-split-3 input{max-width:30%!important}.widget.widget-split.widget-split-3 input[type="submit"]{max-width:70%!important}.widget.widget-split.widget-split-4 input{max-width:40%!important}.widget.widget-split.widget-split-4 input[type="submit"]{max-width:60%!important}.widget.widget-split.widget-split-5 input{max-width:50%!important}.widget.widget-split.widget-split-5 input[type="submit"]{max-width:50%!important}.widget.widget-split.widget-split-6 input{max-width:60%!important}.widget.widget-split.widget-split-6 input[type="submit"]{max-width:40%!important}.widget.widget-split.widget-split-7 input{max-width:70%!important}.widget.widget-split.widget-split-7 input[type="submit"]{max-width:30%!important}.widget.fl_right input[type="submit"],.submit_container.fl_right .submit{float:right}.widget.lblp{padding-top:1.9em;min-height:2.1em}.widget.autoh{min-height:0}.widget,form{*zoom:1}

\ No newline at end of file

@@ -32,7 +32,7 @@ $GLOBALS['TL_DCA']['tl_form_field']['fields']['eSM_fl_width'] = array

 	'exclude'                 => true,

 	'inputType'               => 'select',

 	'default'                 => 100,

-	'options'                 => array(5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100),

+	'options'                 => array(10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100),

 	'reference'               => &$GLOBALS['TL_LANG']['tl_form_field']['ref_width'],

 	'eval'                    => array('tl_class'=>'w50'),

 	'sql'                     => "varchar(3) NOT NULL default '100'"

@@ -32,7 +32,6 @@ $GLOBALS['TL_LANG']['tl_form_field']['formilicious_legend']  = 'Formilicious Fra

  */

 $GLOBALS['TL_LANG']['tl_form_field']['ref_width']     = array

 (

-	5   => '5 %',

 	10  => '10 %',

 	15  => '15 %',

 	20  => '20 %',

@@ -31,320 +31,357 @@ class ModulePersonalData extends \Contao\ModulePersonalData

 {

 	/**

-	 * Generate the module

-	 */

-	protected function compile()

-	{

-		global $objPage;

-		$this->import('FrontendUser', 'User');

-

-		$GLOBALS['TL_LANGUAGE'] = $objPage->language;

-

-		\System::loadLanguageFile('tl_member');

-		$this->loadDataContainer('tl_member');

-

-		// Call onload_callback (e.g. to check permissions)

-		if (is_array($GLOBALS['TL_DCA']['tl_member']['config']['onload_callback']))

-		{

-			foreach ($GLOBALS['TL_DCA']['tl_member']['config']['onload_callback'] as $callback)

-			{

-				if (is_array($callback))

-				{

-					$this->import($callback[0]);

-					$this->$callback[0]->$callback[1]();

-				}

-				elseif (is_callable($callback))

-				{

-					$callback();

-				}

-			}

-		}

-

-		// Set the template

-		if ($this->memberTpl != '')

-		{

-			$this->Template = new \FrontendTemplate($this->memberTpl);

-			$this->Template->setData($this->arrData);

-		}

-

-		$this->Template->fields = '';

-		$this->Template->tableless = $this->tableless;

-

-		$arrFields = array();

-		$doNotSubmit = false;

-		$hasUpload = false;

-		$row = 0;

-

-		$blnModified = false;

-		$objMember = \MemberModel::findByPk($this->User->id);

-

-		// Build the form

-		foreach ($this->editable as $fielddata)

-		{

-			// Split formilicious editable data in single vars

-			list($field,$fieldWidth,$fieldClr,$fieldMandatory) = array_values($fielddata);

-			$arrData = &$GLOBALS['TL_DCA']['tl_member']['fields'][$field];

-

-			// Map checkboxWizards to regular checkbox widgets

-			if ($arrData['inputType'] == 'checkboxWizard')

-			{

-				$arrData['inputType'] = 'checkbox';

-			}

-

-			$strClass = $GLOBALS['TL_FFL'][$arrData['inputType']];

-

-			// Continue if the class does not exist

-			if (!$arrData['eval']['feEditable'] || !class_exists($strClass))

-			{

-				continue;

-			}

-

-			$strGroup = $arrData['eval']['feGroup'];

-

-			$arrData['eval']['required'] = false;

-			$arrData['eval']['tableless'] = $this->tableless;

-

-			// Use strlen() here (see #3277)

-			if ($arrData['eval']['mandatory'])

-			{

-				if (is_array($this->User->$field))

-				{

-					if (empty($this->User->$field))

-					{

-						$arrData['eval']['required'] = true;

-					}

-				}

-				else

-				{

-					if (!strlen($this->User->$field))

-					{

-						$arrData['eval']['required'] = true;

-					}

-				}

-			}

-

-			$varValue = $this->User->$field;

-

-			// Call the load_callback

-			if (isset($arrData['load_callback']) && is_array($arrData['load_callback']))

-			{

-				foreach ($arrData['load_callback'] as $callback)

-				{

-					if (is_array($callback))

-					{

-						$this->import($callback[0]);

-						$varValue = $this->$callback[0]->$callback[1]($varValue, $this->User, $this);

-					}

-					elseif (is_callable($callback))

-					{

-						$varValue = $callback($varValue, $this->User, $this);

-					}

-				}

-			}

-

-			$objWidget = new $strClass($strClass::getAttributesFromDca($arrData, $field, $varValue, '', '', $this));

-

-			$objWidget->storeValues = true;

-			$objWidget->rowClass = 'row_'.$row . (($row == 0) ? ' row_first' : '') . ((($row % 2) == 0) ? ' even' : ' odd');

-

-			// Extend with formilicious data

-			$objWidget->eSM_fl_width = $fieldWidth;

-			$objWidget->eSM_fl_clear = $fieldClr;

-			if ($fieldMandatory)

-			{

-				$objWidget->required = $fieldMandatory;

-				$objWidget->mandatory = $fieldMandatory;

-			} else {

-				$objWidget->required = false;

-				$objWidget->mandatory = false;

-			}

-			if (in_array($arrData['eval']['rgxp'], array('date','time','datim')))

-			{

-				$strDateFormatFunc = 'getNumeric'.ucfirst($arrData['eval']['rgxp']).'Format';

-				$objWidget->placeholder = \Date::getInputFormat(\Date::$strDateFormatFunc());

-				$objWidget->maxlength = strlen($objWidget->placeholder);

-			}

-

-			// Increase the row count if it is a password field

-			if ($objWidget instanceof \FormPassword)

-			{

-				++$row;

-				$objWidget->rowClassConfirm = 'row_'.$row . ((($row % 2) == 0) ? ' even' : ' odd');

-			}

-

-			// Validate the form data

-			if (\Input::post('FORM_SUBMIT') == 'tl_member_' . $this->id)

-			{

-				$objWidget->validate();

-				$varValue = $objWidget->value;

-

-				$rgxp = $arrData['eval']['rgxp'];

-

-				// Convert date formats into timestamps (check the eval setting first -> #3063)

-				if (($rgxp == 'date' || $rgxp == 'time' || $rgxp == 'datim') && $varValue != '')

-				{

-					try

-					{

-						$objDate = new \Date($varValue);

-						$varValue = $objDate->tstamp;

-					}

-					catch (\OutOfBoundsException $e)

-					{

-						$objWidget->addError(sprintf($GLOBALS['TL_LANG']['ERR']['invalidDate'], $varValue));

-					}

-				}

-

-				// Make sure that unique fields are unique (check the eval setting first -> #3063)

-				if ($arrData['eval']['unique'] && $varValue != '' && !$this->Database->isUniqueValue('tl_member', $field, $varValue, $this->User->id))

-				{

-					$objWidget->addError(sprintf($GLOBALS['TL_LANG']['ERR']['unique'], $arrData['label'][0] ?: $field));

-				}

-

-				// Trigger the save_callback (see #5247)

-				if ($objWidget->submitInput() && !$objWidget->hasErrors() && is_array($arrData['save_callback']))

-				{

-					foreach ($arrData['save_callback'] as $callback)

-					{

-						try

-						{

-							if (is_array($callback))

-							{

-								$this->import($callback[0]);

-								$varValue = $this->$callback[0]->$callback[1]($varValue, $this->User, $this);

-							}

-							elseif (is_callable($callback))

-							{

-								$varValue = $callback($varValue, $this->User, $this);

-							}

-						}

-						catch (\Exception $e)

-						{

-							$objWidget->class = 'error';

-							$objWidget->addError($e->getMessage());

-						}

-					}

-				}

-

-				// Do not submit the field if there are errors

-				if ($objWidget->hasErrors())

-				{

-					$doNotSubmit = true;

-				}

-				elseif ($objWidget->submitInput())

-				{

-					// Store the form data

-					$_SESSION['FORM_DATA'][$field] = $varValue;

-

-					// Set the correct empty value (see #6284, #6373)

-					if ($varValue === '')

-					{

-						$varValue = $objWidget->getEmptyValue();

-					}

-

-					// Set the new value

-					$this->User->$field = $varValue;

-

-					// Set the new field in the member model

-					$blnModified = true;

-					$objMember->$field = $varValue;

-				}

-			}

-

-			if ($objWidget instanceof \uploadable)

-			{

-				$hasUpload = true;

-			}

-

-			$temp = $objWidget->parse();

-

-			$this->Template->fields .= $temp;

-			$arrFields[$strGroup][$field] .= $temp;

-			++$row;

-		}

-

-		// Save the model

-		if ($blnModified)

-		{

-			$objMember->save();

-		}

-

-		$this->Template->hasError = $doNotSubmit;

-

-		// Redirect or reload if there was no error

-		if (\Input::post('FORM_SUBMIT') == 'tl_member_' . $this->id && !$doNotSubmit)

-		{

-			// HOOK: updated personal data

-			if (isset($GLOBALS['TL_HOOKS']['updatePersonalData']) && is_array($GLOBALS['TL_HOOKS']['updatePersonalData']))

-			{

-				foreach ($GLOBALS['TL_HOOKS']['updatePersonalData'] as $callback)

-				{

-					$this->import($callback[0]);

-					$this->$callback[0]->$callback[1]($this->User, $_SESSION['FORM_DATA'], $this);

-				}

-			}

-

-			// Call the onsubmit_callback

-			if (is_array($GLOBALS['TL_DCA']['tl_member']['config']['onsubmit_callback']))

-			{

-				foreach ($GLOBALS['TL_DCA']['tl_member']['config']['onsubmit_callback'] as $callback)

-				{

-					if (is_array($callback))

-					{

-						$this->import($callback[0]);

-						$this->$callback[0]->$callback[1]($this->User, $this);

-					}

-					elseif (is_callable($callback))

-					{

-						$callback($this->User, $this);

-					}

-				}

-			}

-

-			// Check whether there is a jumpTo page

-			if (($objJumpTo = $this->objModel->getRelated('jumpTo')) !== null)

-			{

-				$this->jumpToOrReload($objJumpTo->row());

-			}

-

-			$this->reload();

-		}

-

-		$this->Template->loginDetails = $GLOBALS['TL_LANG']['tl_member']['loginDetails'];

-		$this->Template->addressDetails = $GLOBALS['TL_LANG']['tl_member']['addressDetails'];

-		$this->Template->contactDetails = $GLOBALS['TL_LANG']['tl_member']['contactDetails'];

-		$this->Template->personalData = $GLOBALS['TL_LANG']['tl_member']['personalData'];

-

-		// Add groups

-		foreach ($arrFields as $k=>$v)

-		{

-			$this->Template->$k = $v;

-		}

-

-		$this->Template->formId = 'tl_member_' . $this->id;

-		$this->Template->slabel = specialchars($GLOBALS['TL_LANG']['MSC']['saveData']);

-		$this->Template->action = \Environment::get('indexFreeRequest');

-		$this->Template->enctype = $hasUpload ? 'multipart/form-data' : 'application/x-www-form-urlencoded';

-		$this->Template->rowLast = 'row_' . $row . ((($row % 2) == 0) ? ' even' : ' odd');

-

-		// HOOK: add memberlist fields

-		if (in_array('memberlist', \ModuleLoader::getActive()))

-		{

-			$this->Template->profile = $arrFields['profile'];

-			$this->Template->profileDetails = $GLOBALS['TL_LANG']['tl_member']['profileDetails'];

-		}

-

-		// HOOK: add newsletter fields

-		if (in_array('newsletter', \ModuleLoader::getActive()))

-		{

-			$this->Template->newsletter = $arrFields['newsletter'];

-			$this->Template->newsletterDetails = $GLOBALS['TL_LANG']['tl_member']['newsletterDetails'];

-		}

-

-		// HOOK: add helpdesk fields

-		if (in_array('helpdesk', \ModuleLoader::getActive()))

-		{

-			$this->Template->helpdesk = $arrFields['helpdesk'];

-			$this->Template->helpdeskDetails = $GLOBALS['TL_LANG']['tl_member']['helpdeskDetails'];

-		}

-	}

+   * Generate the module

+   */

+  protected function compile()

+  {

+    /** @var \PageModel $objPage */

+    global $objPage;

+

+    $this->import('FrontendUser', 'User');

+

+    $GLOBALS['TL_LANGUAGE'] = $objPage->language;

+

+    \System::loadLanguageFile('tl_member');

+    $this->loadDataContainer('tl_member');

+

+    // Call onload_callback (e.g. to check permissions)

+    if (is_array($GLOBALS['TL_DCA']['tl_member']['config']['onload_callback']))

+    {

+      foreach ($GLOBALS['TL_DCA']['tl_member']['config']['onload_callback'] as $callback)

+      {

+        if (is_array($callback))

+        {

+          $this->import($callback[0]);

+          $this->{$callback[0]}->{$callback[1]}();

+        }

+        elseif (is_callable($callback))

+        {

+          $callback();

+        }

+      }

+    }

+

+    // Set the template

+    if ($this->memberTpl != '')

+    {

+      /** @var \FrontendTemplate|object $objTemplate */

+      $objTemplate = new \FrontendTemplate($this->memberTpl);

+

+      $this->Template = $objTemplate;

+      $this->Template->setData($this->arrData);

+    }

+

+    $this->Template->fields = '';

+    $this->Template->tableless = $this->tableless;

+

+    $arrFields = array();

+    $doNotSubmit = false;

+    $hasUpload = false;

+    $row = 0;

+

+    // Predefine the group order (other groups will be appended automatically)

+    $arrGroups = array

+    (

+      'personal' => array(),

+      'address'  => array(),

+      'contact'  => array(),

+      'login'    => array(),

+      'profile'  => array()

+    );

+

+    $blnModified = false;

+    $objMember = \MemberModel::findByPk($this->User->id);

+    $strTable = $objMember->getTable();

+

+    // Initialize the versioning (see #7415)

+    $objVersions = new \Versions($strTable, $objMember->id);

+    $objVersions->setUsername($objMember->username);

+    $objVersions->setUserId(0);

+    $objVersions->setEditUrl('contao/main.php?do=member&act=edit&id=%s&rt=1');

+    $objVersions->initialize();

+

+    // Build the form

+    foreach ($this->editable as $fielddata)

+    {

+      // Split formilicious editable data in single vars

+      list($field,$fieldWidth,$fieldClr,$fieldMandatory) = array_values($fielddata);

+

+      $arrData = &$GLOBALS['TL_DCA']['tl_member']['fields'][$field];

+

+      // Map checkboxWizards to regular checkbox widgets

+      if ($arrData['inputType'] == 'checkboxWizard')

+      {

+        $arrData['inputType'] = 'checkbox';

+      }

+

+      // Map fileTrees to upload widgets (see #8091)

+      if ($arrData['inputType'] == 'fileTree')

+      {

+        $arrData['inputType'] = 'upload';

+      }

+

+      /** @var \Widget $strClass */

+      $strClass = $GLOBALS['TL_FFL'][$arrData['inputType']];

+

+      // Continue if the class does not exist

+      if (!$arrData['eval']['feEditable'] || !class_exists($strClass))

+      {

+        continue;

+      }

+

+      $strGroup = $arrData['eval']['feGroup'];

+

+      $arrData['eval']['required'] = false;

+      $arrData['eval']['tableless'] = $this->tableless;

+

+      // Use strlen() here (see #3277)

+      if ($arrData['eval']['mandatory'])

+      {

+        if (is_array($this->User->$field))

+        {

+          if (empty($this->User->$field))

+          {

+            $arrData['eval']['required'] = true;

+          }

+        }

+        else

+        {

+          if (!strlen($this->User->$field))

+          {

+            $arrData['eval']['required'] = true;

+          }

+        }

+      }

+

+      $varValue = $this->User->$field;

+

+      // Call the load_callback

+      if (isset($arrData['load_callback']) && is_array($arrData['load_callback']))

+      {

+        foreach ($arrData['load_callback'] as $callback)

+        {

+          if (is_array($callback))

+          {

+            $this->import($callback[0]);

+            $varValue = $this->{$callback[0]}->{$callback[1]}($varValue, $this->User, $this);

+          }

+          elseif (is_callable($callback))

+          {

+            $varValue = $callback($varValue, $this->User, $this);

+          }

+        }

+      }

+

+      /** @var \Widget $objWidget */

+      $objWidget = new $strClass($strClass::getAttributesFromDca($arrData, $field, $varValue, $field, $strTable, $this));

+

+      $objWidget->storeValues = true;

+      $objWidget->rowClass = 'row_' . $row . (($row == 0) ? ' row_first' : '') . ((($row % 2) == 0) ? ' even' : ' odd');

+

+      // Extend with formilicious data

+      $objWidget->eSM_fl_width = $fieldWidth;

+      $objWidget->eSM_fl_clear = $fieldClr;

+      if ($fieldMandatory)

+      {

+        $objWidget->required = $fieldMandatory;

+        $objWidget->mandatory = $fieldMandatory;

+      } else {

+        $objWidget->required = false;

+        $objWidget->mandatory = false;

+      }

+      if (in_array($arrData['eval']['rgxp'], array('date','time','datim')))

+      {

+        $strDateFormatFunc = 'getNumeric'.ucfirst($arrData['eval']['rgxp']).'Format';

+        $objWidget->placeholder = \Date::getInputFormat(\Date::$strDateFormatFunc());

+        $objWidget->maxlength = strlen($objWidget->placeholder);

+      }

+

+      // Increase the row count if it is a password field

+      if ($objWidget instanceof \FormPassword)

+      {

+        if ($objMember->password != '')

+        {

+          $objWidget->mandatory = false;

+        }

+

+        $objWidget->rowClassConfirm = 'row_' . ++$row . ((($row % 2) == 0) ? ' even' : ' odd');

+      }

+

+      // Validate the form data

+      if (\Input::post('FORM_SUBMIT') == 'tl_member_' . $this->id)

+      {

+        $objWidget->validate();

+        $varValue = $objWidget->value;

+

+        $rgxp = $arrData['eval']['rgxp'];

+

+        // Convert date formats into timestamps (check the eval setting first -> #3063)

+        if ($varValue != '' && in_array($rgxp, array('date', 'time', 'datim')))

+        {

+          try

+          {

+            $objDate = new \Date($varValue, \Date::getFormatFromRgxp($rgxp));

+            $varValue = $objDate->tstamp;

+          }

+          catch (\OutOfBoundsException $e)

+          {

+            $objWidget->addError(sprintf($GLOBALS['TL_LANG']['ERR']['invalidDate'], $varValue));

+          }

+        }

+

+        // Make sure that unique fields are unique (check the eval setting first -> #3063)

+        if ($arrData['eval']['unique'] && $varValue != '' && !$this->Database->isUniqueValue('tl_member', $field, $varValue, $this->User->id))

+        {

+          $objWidget->addError(sprintf($GLOBALS['TL_LANG']['ERR']['unique'], $arrData['label'][0] ?: $field));

+        }

+

+        // Trigger the save_callback (see #5247)

+        if ($objWidget->submitInput() && !$objWidget->hasErrors() && is_array($arrData['save_callback']))

+        {

+          foreach ($arrData['save_callback'] as $callback)

+          {

+            try

+            {

+              if (is_array($callback))

+              {

+                $this->import($callback[0]);

+                $varValue = $this->{$callback[0]}->{$callback[1]}($varValue, $this->User, $this);

+              }

+              elseif (is_callable($callback))

+              {

+                $varValue = $callback($varValue, $this->User, $this);

+              }

+            }

+            catch (\Exception $e)

+            {

+              $objWidget->class = 'error';

+              $objWidget->addError($e->getMessage());

+            }

+          }

+        }

+

+        // Do not submit the field if there are errors

+        if ($objWidget->hasErrors())

+        {

+          $doNotSubmit = true;

+        }

+        elseif ($objWidget->submitInput())

+        {

+          // Store the form data

+          $_SESSION['FORM_DATA'][$field] = $varValue;

+

+          // Set the correct empty value (see #6284, #6373)

+          if ($varValue === '')

+          {

+            $varValue = $objWidget->getEmptyValue();

+          }

+

+          // Encrypt the value (see #7815)

+          if ($arrData['eval']['encrypt'])

+          {

+            $varValue = \Encryption::encrypt($varValue);

+          }

+

+          // Set the new value

+          if ($varValue !== $this->User->$field)

+          {

+            $this->User->$field = $varValue;

+

+            // Set the new field in the member model

+            $blnModified = true;

+            $objMember->$field = $varValue;

+          }

+        }

+      }

+

+      if ($objWidget instanceof \uploadable)

+      {

+        $hasUpload = true;

+      }

+

+      $temp = $objWidget->parse();

+

+      $this->Template->fields .= $temp;

+      $arrFields[$strGroup][$field] .= $temp;

+      ++$row;

+    }

+

+    // Save the model

+    if ($blnModified)

+    {

+      $objMember->tstamp = time();

+      $objMember->save();

+

+      // Create a new version

+      if ($GLOBALS['TL_DCA'][$strTable]['config']['enableVersioning'])

+      {

+        $objVersions->create();

+      }

+    }

+

+    $this->Template->hasError = $doNotSubmit;

+

+    // Redirect or reload if there was no error

+    if (\Input::post('FORM_SUBMIT') == 'tl_member_' . $this->id && !$doNotSubmit)

+    {

+      // HOOK: updated personal data

+      if (isset($GLOBALS['TL_HOOKS']['updatePersonalData']) && is_array($GLOBALS['TL_HOOKS']['updatePersonalData']))

+      {

+        foreach ($GLOBALS['TL_HOOKS']['updatePersonalData'] as $callback)

+        {

+          $this->import($callback[0]);

+          $this->{$callback[0]}->{$callback[1]}($this->User, $_SESSION['FORM_DATA'], $this);

+        }

+      }

+

+      // Call the onsubmit_callback

+      if (is_array($GLOBALS['TL_DCA']['tl_member']['config']['onsubmit_callback']))

+      {

+        foreach ($GLOBALS['TL_DCA']['tl_member']['config']['onsubmit_callback'] as $callback)

+        {

+          if (is_array($callback))

+          {

+            $this->import($callback[0]);

+            $this->{$callback[0]}->{$callback[1]}($this->User, $this);

+          }

+          elseif (is_callable($callback))

+          {

+            $callback($this->User, $this);

+          }

+        }

+      }

+

+      // Check whether there is a jumpTo page

+      if (($objJumpTo = $this->objModel->getRelated('jumpTo')) !== null)

+      {

+        $this->jumpToOrReload($objJumpTo->row());

+      }

+

+      \Message::addConfirmation($GLOBALS['TL_LANG']['MSC']['savedData']);

+      $this->reload();

+    }

+

+    $this->Template->loginDetails = $GLOBALS['TL_LANG']['tl_member']['loginDetails'];

+    $this->Template->addressDetails = $GLOBALS['TL_LANG']['tl_member']['addressDetails'];

+    $this->Template->contactDetails = $GLOBALS['TL_LANG']['tl_member']['contactDetails'];

+    $this->Template->personalData = $GLOBALS['TL_LANG']['tl_member']['personalData'];

+

+    // Add the groups

+    foreach ($arrFields as $k=>$v)

+    {

+      $this->Template->$k = $v; // backwards compatibility

+

+      $key = $k . (($k == 'personal') ? 'Data' : 'Details');

+      $arrGroups[$GLOBALS['TL_LANG']['tl_member'][$key]] = $v;

+    }

+

+    $this->Template->categories = $arrGroups;

+    $this->Template->formId = 'tl_member_' . $this->id;

+    $this->Template->slabel = specialchars($GLOBALS['TL_LANG']['MSC']['saveData']);

+    $this->Template->action = \Environment::get('indexFreeRequest');

+    $this->Template->enctype = $hasUpload ? 'multipart/form-data' : 'application/x-www-form-urlencoded';

+    $this->Template->rowLast = 'row_' . $row . ((($row % 2) == 0) ? ' even' : ' odd');

+    $this->Template->message = \Message::generate(false, true);

+  }

 }

@@ -30,291 +30,305 @@ namespace eSM_formilicious;

 class ModuleRegistration extends \Contao\ModuleRegistration

 {

-	/**

-	 * Generate the module

-	 */

-	protected function compile()

-	{

-		global $objPage;

-

-		$GLOBALS['TL_LANGUAGE'] = $objPage->language;

-

-		\System::loadLanguageFile('tl_member');

-		$this->loadDataContainer('tl_member');

-

-		// Call onload_callback (e.g. to check permissions)

-		if (is_array($GLOBALS['TL_DCA']['tl_member']['config']['onload_callback']))

-		{

-			foreach ($GLOBALS['TL_DCA']['tl_member']['config']['onload_callback'] as $callback)

-			{

-				if (is_array($callback))

-				{

-					$this->import($callback[0]);

-					$this->$callback[0]->$callback[1]();

-				}

-				elseif (is_callable($callback))

-				{

-					$callback();

-				}

-			}

-		}

-

-		// Activate account

-		if (\Input::get('token') != '')

-		{

-			$this->activateAcount();

-			return;

-		}

-

-		if ($this->memberTpl != '')

-		{

-			$this->Template = new \FrontendTemplate($this->memberTpl);

-			$this->Template->setData($this->arrData);

-		}

-

-		$this->Template->fields = '';

-		$this->Template->tableless = $this->tableless;

-		$objCaptcha = null;

-		$doNotSubmit = false;

-

-		// Captcha

-		if (!$this->disableCaptcha)

-		{

-			$arrCaptcha = array

-			(

-				'id' => 'registration',

-				'label' => $GLOBALS['TL_LANG']['MSC']['securityQuestion'],

-				'type' => 'captcha',

-				'mandatory' => true,

-				'required' => true,

-				'tableless' => $this->tableless

-			);

-

-			$strClass = $GLOBALS['TL_FFL']['captcha'];

-

-			// Fallback to default if the class is not defined

-			if (!class_exists($strClass))

-			{

-				$strClass = 'FormCaptcha';

-			}

-

-			$objCaptcha = new $strClass($arrCaptcha);

-

-			if (\Input::post('FORM_SUBMIT') == 'tl_registration')

-			{

-				$objCaptcha->validate();

-

-				if ($objCaptcha->hasErrors())

-				{

-					$doNotSubmit = true;

-				}

-			}

-		}

-

-		$arrUser = array();

-		$arrFields = array();

-		$hasUpload = false;

-		$i = 0;

-

-		// Build form

-		foreach ($this->editable as $fielddata)

-		{

-			// Split formilicious editable data in single vars

-			list($field,$fieldWidth,$fieldClr,$fieldMandatory) = array_values($fielddata);

-

-			$arrData = $GLOBALS['TL_DCA']['tl_member']['fields'][$field];

-

-			// Map checkboxWizard to regular checkbox widget

-			if ($arrData['inputType'] == 'checkboxWizard')

-			{

-				$arrData['inputType'] = 'checkbox';

-			}

-

-			$strClass = $GLOBALS['TL_FFL'][$arrData['inputType']];

-

-			// Continue if the class is not defined

-			if (!class_exists($strClass))

-			{

-				continue;

-			}

-

-			$arrData['eval']['tableless'] = $this->tableless;

-			$arrData['eval']['required'] = $arrData['eval']['mandatory'];

-

-			$objWidget = new $strClass($strClass::getAttributesFromDca($arrData, $field, $arrData['default'], '', '', $this));

-

-			$objWidget->storeValues = true;

-			$objWidget->rowClass = 'row_' . $i . (($i == 0) ? ' row_first' : '') . ((($i % 2) == 0) ? ' even' : ' odd');

-

-			// Extend with formilicious data

-			$objWidget->eSM_fl_width = $fieldWidth;

-			$objWidget->eSM_fl_clear = $fieldClr;

-			if ($fieldMandatory)