Skip to content

Commit

Permalink
Bug #8, changed User::UNDEF_INSTRUMENT to tpt, was 'fr' [iet:1033…
Browse files Browse the repository at this point in the history
…4595]

* As per Chris E.'s request: https://iet.eu.teamwork.com/desk/#/tickets/248782
* Also added `brasil` to `User::INSTRUMENT_REGEX`
  • Loading branch information
nfreear committed Jun 5, 2018
1 parent 49d951e commit 523c33e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions db/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ class User extends base
const CSV_BATCH = 8; // Bug #5.

const PREFIX = 'ouop_';
const UNDEF_INSTRUMENT = 'fr'; // Was: 'kd', 'tpt';
const INSTRUMENT_REGEX = '/^(kd|tpt|fa|vr|fr)/';
const UNDEF_INSTRUMENT = 'tpt'; // Pilot 3-B tpt; (Was: 'fr', 'kd', 'tpt')
const INSTRUMENT_REGEX = '/^(kd|tpt|fa|vr|fr|brasil)/'; // Added: 'brasil'.

const OUCU_REGEX = '@^[a-z]{2,4}\d{1,7}$@';
const OPENID_URL_REGEX = '@^https?:\/\/openid\.open\.ac\.uk\/oucu\/(?P<oucu>\w+)$@';
Expand Down
2 changes: 2 additions & 0 deletions user/ajax.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@
'survey_urls'=> $prof->survey_urls,
'user_roles' => OuUser::getRoles(),
'redirect_url' => USER_LOGGED_IN ? $prof->redirect_url : null,
'undef_instrument' => OuUser::UNDEF_INSTRUMENT,
'instrument_regex' => OuUser::INSTRUMENT_REGEX,
'strings' => OuUser::getStringsAjax(LONG_TXT), // USER_LOGGED_IN ? OuUser::getStringsAjax(LONG_TXT) : [],
'config' => USER_LOGGED_IN && $config ? $config : [ 'ga' => $config[ 'ga' ] ],
], DEBUG ? JSON_PRETTY_PRINT : null);
Expand Down

0 comments on commit 523c33e

Please sign in to comment.