Merge pull request #34 from mattbk/settings-filetype

File extension for images is now defined in settings.json
This commit is contained in:
mattbk
2015-11-03 14:44:12 -06:00
2 changed files with 4 additions and 3 deletions

View File

@ -81,8 +81,8 @@ switch ($mode) {
break; break;
case 'phase': case 'phase':
$template = 'change.html.twig'; $template = 'change.html.twig';
$variables['imageWithElement'] = 'img/'.$phase.'-with.jpg'; $variables['imageWithElement'] = 'img/'.$phase.'-with.'.$settings->filetype;
$variables['imageWithoutElement'] = 'img/'.$phase.'-without.jpg'; $variables['imageWithoutElement'] = 'img/'.$phase.'-without.'.$settings->filetype;
$variables['step_count'] = $index; $variables['step_count'] = $index;
$variables['step_total'] = count($settings->phases); $variables['step_total'] = count($settings->phases);
// Store the participant ID with some simple validation to prevent SQL injection // Store the participant ID with some simple validation to prevent SQL injection

View File

@ -13,5 +13,6 @@
], ],
"baseURL": "/", "baseURL": "/",
"debug": false, "debug": false,
"timezone": "America/Chicago" "timezone": "America/Chicago",
"filetype": "jpg"
} }