Merge branch 'master' into 'master'

Adding newest commits from the TW fork See merge request !5

Merge branch 'master' into 'master'
120178ac · Tomasz Wolniewicz · 1978886b · 74765a37 · 120178ac · 120178ac
Commit 120178ac authored 1 year ago by Tomasz Wolniewicz
--- 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;

--- 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";

--- 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);
--- 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>


--- 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 %}
--- 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;{%