arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Quick correction on how lang is described in the user_get_fields function

Browse Source
This commit is contained in:
jacob 2010-11-17 15:52:02 +00:00
parent 0ff766175b
commit 2848ed177d
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
user.inc.php
View File

@ -375,7 +375,7 @@ function user_role_field_required($role, $fieldname){
// accepts either an array of roles (eg. {'judge', 'teacher', 'foo'}), a single one as a string (eg. 'judge'), or a null value (no roles at all) // accepts either an array of roles (eg. {'judge', 'teacher', 'foo'}), a single one as a string (eg. 'judge'), or a null value (no roles at all)
function user_get_fields($userRoles = null){ function user_get_fields($userRoles = null){
global $roles, $conference; global $roles, $conference, $config;
if($userRoles == null){ if($userRoles == null){
$userRoles = array(); $userRoles = array();
@ -445,11 +445,11 @@ function user_get_fields($userRoles = null){
switch($fieldName){ switch($fieldName){
case 'languages': case 'languages':
$fields[$fieldName]['type'] = 'multiselect'; $fields[$fieldName]['type'] = 'multiselect';
$fields[$fieldName]['options'] = array(); $fields[$fieldName]['options'] = $config['languages'];
$query = mysql_query("SELECT lang, langname FROM languages WHERE active = 'Y'"); break;
while($row = mysql_fetch_assoc($query)){ case 'lang':
$fields[$fieldName]['options'][$row['lang']] = $row['langname']; $fields[$fieldName]['type'] = 'singleselect';
} $fields[$fieldName]['options'] = $config['languages'];
break; break;
case 'cat_prefs': case 'cat_prefs':
$fields[$fieldName]['description'] = 'Preference levels for judging individual project categories'; $fields[$fieldName]['description'] = 'Preference levels for judging individual project categories';
@ -1317,7 +1317,6 @@ function updateSessionRoles($u=null) {
if(!$u) if(!$u)
$u=user_load($_SESSION['users_id']); $u=user_load($_SESSION['users_id']);
$_SESSION['roles']=array(); $_SESSION['roles']=array();
// echo "updateSessionRole for {$_SESSION['users_id']}:";print_r($u);
if($u && is_array($u['roles'])) { if($u && is_array($u['roles'])) {
foreach($u['roles'] AS $r=>$rd) { foreach($u['roles'] AS $r=>$rd) {
if($rd['active']=="yes" || $r=='admin' || $r=='config' || $r=='committee') if($rd['active']=="yes" || $r=='admin' || $r=='config' || $r=='committee')