Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Maurice Meyer 2016-05-12 17:20:41 +02:00
commit b644d5ed66
3 changed files with 2 additions and 4 deletions

View file

@ -67,7 +67,7 @@ limitations under the License.
</div>
<div class="form-group">
<label for="zone-mail" class="control-label">Email</label>
<input type="text" class="form-control" id="zone-mail" placeholder="Email" autocomplete="off" data-regex="^.+\@.+\.[^.]+$" tabindex="3">
<input type="text" class="form-control" id="zone-mail" placeholder="Email" autocomplete="off" data-regex="^.+@[^.]+(\.[^.]+)*$" tabindex="3">
</div>
<button id="zone-button-add" class="btn btn-primary" tabindex="8">Add</button>
</div>

View file

@ -23,8 +23,6 @@ require_once '../lib/soa-mail.php';
$input = json_decode(file_get_contents('php://input'));
error_log($input->type);
if(!isset($input->csrfToken) || $input->csrfToken !== $_SESSION['csrfToken']) {
echo "Permission denied!";
exit();

View file

@ -70,7 +70,7 @@ limitations under the License.
</div>
<div class="form-group">
<label for="soa-mail" class="control-label">Email</label>
<input type="text" class="form-control" id="soa-mail" placeholder="Email" autocomplete="off" data-regex="^.+\@.+\.[^.]+$" tabindex="2">
<input type="text" class="form-control" id="soa-mail" placeholder="Email" autocomplete="off" data-regex="^.+@[^.]+(\.[^.]+)*$" tabindex="2">
</div>
<button disabled type="submit" class="btn btn-primary" tabindex="7">Save</button>
</div>