// --- decoration
$title="Sites";
$tabs=array();
-$tabs []= tab_mysite();
+$tabs []= tab_sites();
$tabs []= tab_sites_local();
+$tabs []= tab_mysite();
// --------------------
$site_filter=array();
// check that site is enabled
if ( ! $site['enabled'])
$messages [] = "Not enabled";
+ global $PENDING_CONSORTIUM_ID;
+ if ( $site['ext_consortium_id'] === $PENDING_CONSORTIUM_ID )
+ $messages [] = "Pending registration";
// check that site has at least a PI and a tech
global $api;
$site_columns = array("site_id", "name", "abbreviated_name", "login_base" , "peer_id" );
$site_filter = array_merge ($site_filter, array ("enabled" => TRUE));
} else {
- $site_columns = array("site_id", "name", "abbreviated_name", "login_base" , "peer_id" , "is_public",
- "enabled", "person_ids", "max_slices", "slice_ids", "node_ids");
+ $site_columns = array("site_id", "name", "abbreviated_name", "login_base" , "peer_id" ,
+ "is_public", "enabled", "ext_consortium_id",
+ "person_ids", "max_slices", "slice_ids", "node_ids");
}
if (plc_is_admin())
$nifty=new PlekitNifty ('','objects-list','big');
$nifty->start();
+
+$headers=array();
if (plc_is_admin()) {
$headers['I']='int';
}
$headers['?']="string";
}
-$table=new PlekitTable("sites",$headers,2);
+if (plc_is_admin()) {
+ $table=new PlekitTable("sites",$headers,3);
+} else {
+ $table=new PlekitTable("sites",$headers,2);
+}
$table->start();
if ($sites) foreach ($sites as $site) {
$table->cell(l_site_t($site_id,$site_id));
}
$peers->cell($table,$peer_id);
- $table->cell (l_site_t($site_id,htmlentities($site['name'])));
+ // Thomas Dreibholz suggested that utf8_decode could be non-needed
+ // and maybe even harmful on modern systems like f23
+ $table->cell (l_site_t($site_id,htmlentities(utf8_decode($site['name']))));
+ // $table->cell (l_site_t($site_id,htmlentities($site['name'])));
$table->cell (l_site_t($site_id,$login_base));
$table->cell (htmlentities($site['abbreviated_name']));
if (plc_is_admin()) {
}
$notes=array();
if (plc_is_admin()) {
- $notes []= "N = number of sites";
+ $notes []= "N = number of nodes";
$notes []= "U = number of users";
$notes []= "S = number of slices";
$notes []= "I = site_id";