Skip to content

give to admins full power of regex #701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 22, 2017
Merged

give to admins full power of regex #701

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d266059
give to admins full power of regex
btry Aug 21, 2017
03d59c6
revert upgrade
btry Aug 22, 2017
fc22f75
code style
btry Aug 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions inc/question.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,21 +401,15 @@ function warning_handler($errno, $errstr, $errfile, $errline, array $errcontext)
}

// Add leading and trailing regex marker automaticaly
if (isset($input['regex'])
&& !empty($input['regex'])) {
if (substr($input['regex'], 0, 1) != '/') {
if (substr($input['regex'], 0, 1) != '^') {
$input['regex'] = '/^' . $input['regex'];
} else {
$input['regex'] = '/' . $input['regex'];
}
}
if (substr($input['regex'], -1, 1) != '/') {
if (substr($input['regex'], -1, 1) != '$') {
$input['regex'] = $input['regex'] . '$/';
} else {
$input['regex'] = $input['regex'] . '/';
}
if (isset($input['regex']) && !empty($input['regex'])) {
// Avoid php notice when validating the regular expression
set_error_handler(function($errno, $errstr, $errfile, $errline, $errcontext) {});
$isValid = !(preg_match($input['regex'], null) === false);
restore_error_handler();

if (!$isValid) {
Session::addMessageAfterRedirect(__('The regular expression is invalid', 'formcreator'), false, ERROR);
return [];
}
}

Expand Down Expand Up @@ -492,6 +486,10 @@ public function prepareInputForUpdate($input) {
$input = $this->checkBeforeSave($input);
}

if (!is_array($input) || count($input) == 0) {
return false;
}

// generate a uniq id
if (!isset($input['uuid'])
|| empty($input['uuid'])) {
Expand Down