show pendingemail in school list if email isnt set (and let them know its unconfirmed)

show "no name set" in school list if the name (firstname." ".lastname) is blank
This commit is contained in:
james 2011-03-07 22:34:28 +00:00
parent 5270935d3b
commit 43283059ae

View File

@ -571,12 +571,21 @@ $(document).ready(function() {
if($r->sciencehead_uid > 0) { if($r->sciencehead_uid > 0) {
$sh = user_load($r->sciencehead_uid); $sh = user_load($r->sciencehead_uid);
$sciencehead = $sh['name']; $sciencehead = $sh['name'];
if(!$sciencehead) $sciencehead="<i>no name set</i>";
// print_r($sh); // print_r($sh);
$sha=account_load($sh['accounts_id']); $sha=account_load($sh['accounts_id']);
if($sha['email']) {
$scienceheademail=$sha['email']; $scienceheademail=$sha['email'];
$pending="";
}
else {
$scienceheademail=$sha['pendingemail'];
$pending="(unconfirmed)";
}
} }
echo " <td>$sciencehead</td>\n"; echo " <td>$sciencehead</td>\n";
echo " <td><a href=\"mailto:$scienceheademail\">$scienceheademail</a></td>\n"; echo " <td><a href=\"mailto:$scienceheademail\">$scienceheademail</a> $pending</td>\n";
if($config['participant_registration_type']=="schoolpassword") if($config['participant_registration_type']=="schoolpassword")
echo " <td>$r->registration_password</td>\n"; echo " <td>$r->registration_password</td>\n";
echo " <td>$r->accesscode</td>\n"; echo " <td>$r->accesscode</td>\n";