Merge remote-tracking branch 'origin/master'

extension/Source/core/AbstractBuildForm.php

@@ -697,7 +697,8 @@ abstract class AbstractBuildForm {
                     $storeUse = str_replace(STORE_TABLE_DEFAULT, '', $storeUse); // Remove STORE_DEFAULT
                 }
                 // Retrieve value via FSRVD
-                $value = $this->store->getVar($name, $storeUse, $formElement[FE_CHECK_TYPE], $foundInStore);
+                $sanitizeClass=($mode == FORM_UPDATE) ? SANITIZE_ALLOW_ALL : $formElement[FE_CHECK_TYPE];
+                $value = $this->store->getVar($name, $storeUse, $sanitizeClass, $foundInStore);
             }
 
             if ($formElement[FE_ENCODE] === FE_ENCODE_SPECIALCHAR) {

extension/Source/core/Constants.php

@@ -105,7 +105,7 @@ const SANITIZE_TYPE_MESSAGE_VIOLATE_CLASS = 'c';
 const PATTERN_ALNUMX = '^[@\-_\.,;: \/\(\)a-zA-Z0-9ÀÈÌÒÙàèìòùÁÉÍÓÚÝáéíóúýÂÊÎÔÛâêîôûÃÑÕãñõÄËÏÖÜŸäëïöüÿç]*$';
 const PATTERN_DIGIT = '^[\d]*$';
 const PATTERN_NUMERICAL = '^[\d.+-]*$';
-const PATTERN_EMAIL = '^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$';
+const PATTERN_EMAIL = '^([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})?$';
 const PATTERN_ALLBUT = '^[^\[\]{}%\\\\#]*$';
 const PATTERN_ALL = '.*';
 

extension/Source/core/report/Excel.php

@@ -173,24 +173,16 @@ class Excel {
     }
 
     /**
-     * Increment the alpha string. If 'Z' is reached on the last position, it appends 'A'.
+     * Increment the alpha string. i.e. count using A-Z as base.
      * 'A' > 'B'
-     * 'Z' > 'ZA'
-     * 'ZA' > 'ZB'
+     * 'Z' > 'AA'
+     * 'AA' > 'AB'
+     * 'AGTC' > 'AGTD'
      *
      * @param $column
      * @return string - incremented column.
      */
     private function nextColumn($column) {
-        $len = strlen($column);
-        $c = $column[$len - 1];
-        if ($c == 'Z') {
-            $column .= 'A';
-        } else {
-            $c = ++$c;
-            $column[$len - 1] = $c;
-        }
-
-        return $column;
+        return ++$column;
     }
 }

extension/Tests/unit/core/BuildFormPlainTest.php

@@ -152,8 +152,8 @@ class BuildFormPlainTest extends AbstractDatabaseTest {
         $formElement[FE_CHECK_TYPE] = SANITIZE_ALLOW_EMAIL;
         $formElement[FE_CHECK_PATTERN] = '';
         $result = $build->buildInput($formElement, 'name:1', '', $json);
-        $label['123'][API_ELEMENT_ATTRIBUTE]['pattern'] = '^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$';
-        $this->assertEquals('<input id="123" name="name:1" class="form-control" maxlength="255" type="input" value="" pattern="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" data-pattern-error="' . SANITIZE_ALLOW_EMAIL_MESSAGE . '" data-error="Error" data-hidden="no" data-required="no" ><div class="help-block with-errors hidden"></div>', $result);
+        $label['123'][API_ELEMENT_ATTRIBUTE]['pattern'] = '^([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})?$';
+        $this->assertEquals('<input id="123" name="name:1" class="form-control" maxlength="255" type="input" value="" pattern="^([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})?$" data-pattern-error="' . SANITIZE_ALLOW_EMAIL_MESSAGE . '" data-error="Error" data-hidden="no" data-required="no" ><div class="help-block with-errors hidden"></div>', $result);
         $this->assertEquals(['disabled' => false, FE_MODE_REQUIRED => '', 'form-element' => 'name:1', 'value' => '', API_ELEMENT_UPDATE => $label], $json);
 
         $formElement[FE_CHECK_TYPE] = SANITIZE_ALLOW_ALL;

extension/Tests/unit/core/helper/SanitizeTest.php

@@ -28,7 +28,7 @@ class SanitizeTest extends TestCase {
         # Check ''
         $this->assertEquals('', Sanitize::sanitize('', SANITIZE_ALLOW_ALNUMX), "SANITIZE_ALNUMX fails");
         $this->assertEquals('', Sanitize::sanitize('', SANITIZE_ALLOW_DIGIT), "SANITIZE_DIGIT fails");
-        $this->assertEquals('!!email!!', Sanitize::sanitize('', SANITIZE_ALLOW_EMAIL), "SANITIZE_EMAIL fails");
+        $this->assertEquals('', Sanitize::sanitize('', SANITIZE_ALLOW_EMAIL), "SANITIZE_EMAIL fails");
         $this->assertEquals('', Sanitize::sanitize('', SANITIZE_ALLOW_PATTERN, '.*'), "SANITIZE_PATTERN fails");
         $this->assertEquals('', Sanitize::sanitize('', SANITIZE_ALLOW_ALL), "SANITIZE_ALL fails");
         $this->assertEquals('', Sanitize::sanitize('', SANITIZE_ALLOW_ALLBUT), "SANITIZE_ALLBUT fails");