diff options
| -rw-r--r-- | src/fcontest.php | 7 | ||||
| -rw-r--r-- | src/fscore.php | 3 | ||||
| -rw-r--r-- | src/scoretable.php | 6 |
3 files changed, 12 insertions, 4 deletions
diff --git a/src/fcontest.php b/src/fcontest.php index 0bd14f0..e10c205 100644 --- a/src/fcontest.php +++ b/src/fcontest.php @@ -264,16 +264,19 @@ function DBUserInfo($contest, $site, $user, $c=null,$hashpass=true) { /* if(isset($inst[1])) */ /* $a['usershortname'] = trim($inst[1]); */ /* } */ + return cleanuserdesc($a); +} +function cleanuserdesc($a) { $inst = explode(']',$a['userdesc']); if(isset($inst[1])) { $inst2 = explode('[',$inst[0]); if(isset($inst2[1])) - $a['usershortinstitution'] = trim($inst2[0]); + $a['usershortinstitution'] = trim($inst2[1]); if(isset($inst[2])) { $a['userdesc']=trim($inst[2]); $inst = explode('[',$inst[1]); if(isset($inst[1])) { - $a['userinstitution'] = trim($inst[1]); + $a['userflag'] = trim($inst[1]); } } else { $a['userdesc']=trim($inst[1]); diff --git a/src/fscore.php b/src/fscore.php index df8375d..bd803b3 100644 --- a/src/fscore.php +++ b/src/fscore.php @@ -258,12 +258,13 @@ function DBScoreSite($contest, $site, $verifylastmile, $hor=-1, $data=null) { "usertype='team' and userlastlogin is not null and userenabled='t'", "DBScoreSite(get users)"); $n = DBnlines($r); for ($i=0;$i<$n;$i++) { - $a = DBRow($r,$i); + $a = cleanuserdesc(DBRow($r,$i)); $resp[$a["usernumber"]]["user"]=$a["usernumber"]; $resp[$a["usernumber"]]["site"]=$a["usersitenumber"]; $resp[$a["usernumber"]]["username"]=$a["username"]; $resp[$a["usernumber"]]["usertype"]=$a["usertype"]; $resp[$a["usernumber"]]["userfullname"]=$a["userfullname"]; + $resp[$a["usernumber"]]["userflag"]=$a["userflag"]; $resp[$a["usernumber"]]["totaltime"]=0; $resp[$a["usernumber"]]["totalcount"]=0; $resp[$a["usernumber"]]["problem"]=array(); diff --git a/src/scoretable.php b/src/scoretable.php index 89392e7..6ed81af 100644 --- a/src/scoretable.php +++ b/src/scoretable.php @@ -314,7 +314,11 @@ if($redo) { else { */ $_SESSION["scoreblink"][$score[$e]["username"]."-".$score[$e]["site"]]=0; - $strtmp .= " <td nowrap>" . $score[$e]["username"]."/".$score[$e]["site"] . " </td>"; + if( $score[$e]["userflag"] != '') + $strtmp .= " <td nowrap><img alt=\"" . $score[$e]["userflag"]. "\" width=\"18\" src=\"" . $loc. '/images/flags/' . + $score[$e]["userflag"] . ".png\"> " . $score[$e]["username"]."/".$score[$e]["site"] . " </td>"; + else + $strtmp .= " <td nowrap>" . $score[$e]["username"]."/".$score[$e]["site"] . " </td>"; $strtmp .= "<td>" . $score[$e]["userfullname"]; // } $_SESSION["scorepos"][$score[$e]["username"]."-".$score[$e]["site"]] = $cg2; |