X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fsites%2Fsite.php;h=d80dc5fa028f179d6cbe27ecebde9ee256f0fa51;hb=65550c4ae1b04acc58b767bfcc0cb5e3588f7e90;hp=d9c5cdb463dd80132359b025b65751b6b5788e07;hpb=75c2018247f063737bd1fa309438ce600b9499e1;p=plewww.git diff --git a/planetlab/sites/site.php b/planetlab/sites/site.php index d9c5cdb..d80dc5f 100644 --- a/planetlab/sites/site.php +++ b/planetlab/sites/site.php @@ -48,6 +48,7 @@ $max_slivers= $site['max_slivers']; $max_slices= $site['max_slices']; $enabled = $site['enabled']; +$ext_consortium_id = $site ['ext_consortium_id']; // get peer $peer_id= $site['peer_id']; @@ -150,10 +151,22 @@ plekit_linetabs($tabs); // show gray background on foreign objects : start a
with proper class $peers->block_start ($peer_id); -if ( $local_peer && ( ! $enabled ) ) - plc_warning ("This site is not enabled - Please visit " . - href (l_sites_pending(),"this page") . - " to review pending applications."); +// sanity checks +if ( $local_peer ) { + // pending site + global $PENDING_CONSORTIUM_ID; + if ( $ext_consortium_id === $PENDING_CONSORTIUM_ID) { + if ( ! $enabled ) + plc_warning ("This site is under pending registration - Please visit " . + href (l_sites_pending(),"this page") . + " to review pending applications."); + else + plc_warning ("This site is pending but is also enabled - something is wrong. You should fix the issue with plcsh"); + } else { + if ( ! $enabled) + plc_warning ("This site is disabled."); + } +} $can_update=(plc_is_admin () && $local_peer) || ( plc_in_site($site_id) && plc_is_pi());