@@ -30,11 +30,16 @@

 namespace legalAgeCheck;

+use Contao\Environment;

+use Contao\Input;

 use Contao\InsertTags;

 use Contao\PageModel;

 use Contao\LayoutModel;

 use Contao\PageRegular;

-use Contao\System;

+use Contao\FrontendTemplate;

+use Contao\Frontend;

+use Haste\Http\Response\JsonResponse;

+use Haste\Http\Response\Response;

 /**

  * Class LegalAgeCheck 

@@ -43,7 +48,7 @@ use Contao\System;

  * @author     Benjamin Roth <www.esales-media.de> 

  * @package    Controller

  */

-class LegalAgeCheck extends \Frontend

+class LegalAgeCheck extends Frontend

 {

 	/**

@@ -58,6 +63,16 @@ class LegalAgeCheck extends \Frontend

 	 */

 	public function performAgeCheck(PageModel $objPage, LayoutModel $objLayout, PageRegular $objPageRegular)

 	{

+	  // Trigger ajax cookie authentication

+    if (Environment::get('isAjaxRequest') && Input::get('do') == 'legalage_authentication') {

+      if (!is_null(Input::get('legalage_commit')))

+      {

+        static::sendResponse(array('status'=>(static::ajaxUnlockPage() ? 'OK' : 'FAILED')));

+      } else {

+        static::preconditionFailed();

+      }

+    }

+

 		// Skip age check if passed before

 		//if ($this->Session->get('legalAgeCheck_passed'))

 		if ($this->Input->cookie('legalAgeCheck_passed') || $objPage->es_ext_agecheck_ignorePage)

@@ -67,19 +82,19 @@ class LegalAgeCheck extends \Frontend

 		}

 		// Get root page

-		$objRootPage = \PageModel::findByPk($objPage->rootId);

+		$objRootPage = PageModel::findByPk($objPage->rootId);

 		// Cancel verification if age check is disabled					

 		if (is_null($objRootPage) || !$objRootPage->es_ext_agecheck || $objRootPage->es_ext_agecheck_exitPage == $objPage->id)

 			return;

 		// Get exit page

-		$objExitPage = \PageModel::findWithDetails($objRootPage->es_ext_agecheck_exitPage);

+		$objExitPage = PageModel::findWithDetails($objRootPage->es_ext_agecheck_exitPage);

 		if (is_null($objExitPage) || !$objExitPage->published)

 			return;

 		// Load dialog template

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

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

 		// Load modal box template

 		//$objModalBoxTemplate = new FrontendTemplate('agecheck_dialog_template');

@@ -89,8 +104,10 @@ class LegalAgeCheck extends \Frontend

 		$objTemplate->text = str_replace(array("\r", "\n"),array("\\r","\\n"),$objRootPage->es_ext_agecheck_text);

 		$objTemplate->btn_over_18 = $GLOBALS['TL_LANG']['MSC']['es_legalagecheck']['over_18'];

 		$objTemplate->btn_under_18 = $GLOBALS['TL_LANG']['MSC']['es_legalagecheck']['under_18'];

-		$objTemplate->exitPageURL = $this->generateFrontendUrl($objExitPage->row(), null, null, true);

-		$objTemplate->commitURL = 'system/modules/legalAgeCheck/ajax/Ajax.php?do=legalage_authentication&legalage_commit='.$this->createToken();

+//		$objTemplate->exitPageURL = $this->generateFrontendUrl($objExitPage->row(), null, null, true);

+		$objTemplate->exitPageURL = $objExitPage->getAbsoluteUrl();

+//		$objTemplate->commitURL = 'system/modules/legalAgeCheck/ajax/Ajax.php?do=legalage_authentication&legalage_commit='.$this->createToken();

+		$objTemplate->commitURL = Frontend::addToUrl('do=legalage_authentication&legalage_commit='.$this->createToken());

 		//$objTemplate->modalBoxTemplate = addcslashes($objModalBoxTemplate->parse(), "\\'\"&\n\r");

 		// Add dialog code to page

@@ -138,4 +155,16 @@ class LegalAgeCheck extends \Frontend

 		}

 		return $_SESSION['legalAgeCheck_token'];

 	}

+

+  private static function sendResponse($content)

+  {

+    $objResponse = new JsonResponse($content);

+    $objResponse->send();

+  }

+

+  private static function preconditionFailed()

+  {

+    $objResponse = new Response('Precondition failed',412);

+    $objResponse->send();

+  }

 }

\ No newline at end of file

@@ -12,8 +12,10 @@

   ],

   "require":{

     "php": "^5.6 || ^7.0",

+    "ext-json": "*",

     "contao/core-bundle": "^3.5 || ^4.4",

-    "contao-community-alliance/composer-plugin": "~2.4 || ~3.0"

+    "contao-community-alliance/composer-plugin": "~2.4 || ~3.0",

+    "codefog/contao-haste": "4.*"

   },

   "extra":{

     "contao": {

@@ -70,7 +70,11 @@ $GLOBALS['TL_DCA']['tl_page']['fields']['es_ext_agecheck_title'] = array

   'label'                   => &$GLOBALS['TL_LANG']['tl_page']['es_ext_agecheck_title'],

   'exclude'                 => true,

   'inputType'               => 'text',

-  'eval'                    => array('mandatory'=>true, 'rgxp'=>'extnd'),

+  'load_callback'            => array

+  (

+    array('tl_page_legalAgeCheck', 'setDefaultLegalAgeTitle')

+  ),

+  'eval'                    => array('mandatory'=>true, 'rgxp'=>'extnd','alwaysSave'=>true),

   'sql'                     => "varchar(255) NOT NULL default ''"

 );

@@ -109,4 +113,21 @@ class tl_page_legalAgeCheck extends \Backend

     return $varValue;

   }

+

+  /**

+   * Return default title if value is empty

+   *

+   * @param $varValue

+   * @param \DataContainer $dc

+   * @return String

+   */

+  public function setDefaultLegalAgeTitle($varValue, \DataContainer $dc)

+  {

+    if (!$varValue)

+    {

+      return $GLOBALS['TL_LANG']['MSC']['es_legalagecheck']['title'];

+    }

+

+    return $varValue;

+  }

 }

\ No newline at end of file

@@ -5,12 +5,12 @@ $GLOBALS['TL_CSS'][] = 'system/modules/legalAgeCheck/assets/css/vex-theme-defaul

 <script src="system/modules/legalAgeCheck/assets/js/vex.combined.min.js"></script>

 <script>

-	var comPromo = vex.dialog.open({

+	var legalAgeCheck = vex.dialog.open({

 		unsafeMessage: '<h1 class="vex-header"><?php echo $this->title; ?></h1>' +

 		'<?php echo $this->text; ?>',

 		overlayClosesOnClick: false,

 		escapeButtonCloses: false,

-		buttons: [{text: '<?php echo $this->btn_over_18; ?>',type: 'button',className: 'vex-dialog-button-primary',click: function(vexContent, event) {

+		buttons: [{text: '<?php echo $this->btn_over_18; ?>',type: 'button',className: 'vex-dialog-button-primary',click: function(event) {

 			$.ajax({

 				url: '<?php echo $this->commitURL; ?>',

 				type: 'GET',

@@ -18,11 +18,11 @@ $GLOBALS['TL_CSS'][] = 'system/modules/legalAgeCheck/assets/css/vex-theme-defaul

 				success: function (data) {

 					if (data.status == 'OK')

 					{

-						return vex.close(vexContent.data().vex.id);

+            return vex.close(legalAgeCheck);

 					}

 				}

 			});

-		}}, {text: '<?php echo $this->btn_under_18; ?>',type: 'button',className: 'vex-dialog-button-secondary',click: function(vexContent, event) { window.location = '<?php echo $this->exitPageURL; ?>'}}]

+		}}, {text: '<?php echo $this->btn_under_18; ?>',type: 'button',className: 'vex-dialog-button-secondary',click: function(event) { window.location = '<?php echo $this->exitPageURL; ?>'}}]

 	});