diff --git a/lib/eduGAIN_manage.php b/lib/eduGAIN_manage.php index 4ae0cb346c899dfa80e5f2de6602a1920d101a5f..d8e10506aeb461b1ec50ef053fe5e104710ce207 100644 --- a/lib/eduGAIN_manage.php +++ b/lib/eduGAIN_manage.php @@ -182,7 +182,7 @@ class eduGAIN_manage extends eduGAIN { private function updateMdsData($superadmin) { if ($superadmin !== 1) { - if ($this->args['status'] > 4 || in_array('code', $this->changedFields) || + if ($this->args['status'] > 4 || $this->args['fed_status'] > 4 || in_array('code', $this->changedFields) || in_array('metadata_url', $this->changedFields) || in_array('reg_auth', $this->changedFields)) { Utils::debug(4, "updateMdsData - updates not allowed without superadmin rights\n"); return; diff --git a/page-logic/manage.php b/page-logic/manage.php index 1526c2cb5797016b8f0021d25c3a00c63ad81006..65eaabb1734e7bca594077cf62eeedb39712f9e6 100644 --- a/page-logic/manage.php +++ b/page-logic/manage.php @@ -187,11 +187,14 @@ if ($mgm->role == 'OT') { $mgm->checkCriticalSave(); $mgm->setPostVar(); -if ($mgm->superadmin) +Utils::debug(5, "This run OTP status: ". $mgm->otp_succeeded."\n"); + +if ($mgm->otp_succeeded == 1) require(eduGAIN_config . "database_policy.php"); else require(eduGAIN_config . "database_rw.php"); + require("../lib/eduGAIN.php"); $page_title = "eduGAIN database management tool"; diff --git a/page-logic/status.php b/page-logic/status.php index 1958160281fa1e0b5c8572a68e2603d2c4cc1ca6..cc187f6550a7f7f3109bcb69c0456f8ced81adc1 100644 --- a/page-logic/status.php +++ b/page-logic/status.php @@ -163,4 +163,9 @@ $data = []; $data['participants'] = $participants; $data['votingOnly'] = $votingOnly; $data['candidates'] = $candidates; +if (isset($_GET['problems'])) { + $data['problem_switch'] = 1; +} else { + $data['problem_switch'] = 0; +} echo $twig->render('status.html', $data); diff --git a/templates/common/master.html b/templates/common/master.html index 5a3019bff58a1e109df288fb15cfa7101efc26ab..cb724861b6b20df64295ee78356788662e57b5e2 100644 --- a/templates/common/master.html +++ b/templates/common/master.html @@ -3,6 +3,7 @@ <head> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1" /> + <meta name="format-detection" content="telephone=no" /> <link rel="icon" href="favicon.ico" type="image/x-icon" /> <title>{% block title %}eduGAIN Technical Site{% endblock title %}</title> diff --git a/templates/status.html b/templates/status.html index bcba572e95838f9e1a855d259887aef93a58ab9e..973b24db60bd84083f3cb1a890fca7ba8a8e70f5 100644 --- a/templates/status.html +++ b/templates/status.html @@ -209,5 +209,9 @@ function deselectAll(){ }); }); +if ({{problem_switch}} == 1) { + $('.feed-ok').hide(); + $('#problem_filter').prop('checked', true); +} </script> {% endblock javascripts %} diff --git a/templates/status/status-members.html b/templates/status/status-members.html index 70c027b807755e2279e50cbd734181fdd8188a5b..5cf3271b3b27ffc8d0b6ace4261ad978f1efd98d 100644 --- a/templates/status/status-members.html +++ b/templates/status/status-members.html @@ -25,6 +25,7 @@ {% set alert_text = 'validUnitl under ' ~ constant('VALIDITY_ALERT_THRESHOLD')/3600 ~ ' hours' %} {% elseif federation.fed.valid_sec < constant('VALIDITY_WARNING_THRESHOLD') %} {% set alert_icon = 'blue_dot.png' %} + {% set problem_class = ' feed-problem' %} {% set alert_text = 'validUnitl between ' ~ constant('VALIDITY_ALERT_THRESHOLD')/3600 ~ ' and ' ~ constant('VALIDITY_WARNING_THRESHOLD')/3600 ~ ' hours' %} {% endif %} <div id="{{ federation.fed.code }}_option_div" class="member-div{{ problem_class }}" style="padding-left: 1em;{%