Skip to content
Snippets Groups Projects
Commit 120178ac authored by Tomasz Wolniewicz's avatar Tomasz Wolniewicz
Browse files

Merge branch 'master' into 'master' 

Adding newest commits from the TW fork

See merge request !5
parents 1978886b 74765a37
No related branches found
No related tags found
1 merge request!5Adding newest commits from the TW fork
Hide whitespace changes
Inline Side-by-side
lib/eduGAIN_manage.php
+ 1
− 1
View file @ 120178ac
...@@ -182,7 +182,7 @@ class eduGAIN_manage extends eduGAIN { ...@@ -182,7 +182,7 @@ class eduGAIN_manage extends eduGAIN {
private function updateMdsData($superadmin) { private function updateMdsData($superadmin) {
if ($superadmin !== 1) { 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)) { in_array('metadata_url', $this->changedFields) || in_array('reg_auth', $this->changedFields)) {
Utils::debug(4, "updateMdsData - updates not allowed without superadmin rights\n"); Utils::debug(4, "updateMdsData - updates not allowed without superadmin rights\n");
return; return;
......
page-logic/manage.php
+ 4
− 1
View file @ 120178ac
...@@ -187,11 +187,14 @@ if ($mgm->role == 'OT') { ...@@ -187,11 +187,14 @@ if ($mgm->role == 'OT') {
$mgm->checkCriticalSave(); $mgm->checkCriticalSave();
$mgm->setPostVar(); $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"); require(eduGAIN_config . "database_policy.php");
else else
require(eduGAIN_config . "database_rw.php"); require(eduGAIN_config . "database_rw.php");
require("../lib/eduGAIN.php"); require("../lib/eduGAIN.php");
$page_title = "eduGAIN database management tool"; $page_title = "eduGAIN database management tool";
......
page-logic/status.php
+ 5
− 0
View file @ 120178ac
...@@ -163,4 +163,9 @@ $data = []; ...@@ -163,4 +163,9 @@ $data = [];
$data['participants'] = $participants; $data['participants'] = $participants;
$data['votingOnly'] = $votingOnly; $data['votingOnly'] = $votingOnly;
$data['candidates'] = $candidates; $data['candidates'] = $candidates;
if (isset($_GET['problems'])) {
$data['problem_switch'] = 1;
} else {
$data['problem_switch'] = 0;
}
echo $twig->render('status.html', $data); echo $twig->render('status.html', $data);
templates/common/master.html
+ 1
− 0
View file @ 120178ac
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1" /> <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" /> <link rel="icon" href="favicon.ico" type="image/x-icon" />
<title>{% block title %}eduGAIN Technical Site{% endblock title %}</title> <title>{% block title %}eduGAIN Technical Site{% endblock title %}</title>
......
templates/status.html
+ 4
− 0
View file @ 120178ac
...@@ -209,5 +209,9 @@ function deselectAll(){ ...@@ -209,5 +209,9 @@ function deselectAll(){
}); });
}); });
if ({{problem_switch}} == 1) {
$('.feed-ok').hide();
$('#problem_filter').prop('checked', true);
}
</script> </script>
{% endblock javascripts %} {% endblock javascripts %}
templates/status/status-members.html
+ 1
− 0
View file @ 120178ac
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
{% set alert_text = 'validUnitl under ' ~ constant('VALIDITY_ALERT_THRESHOLD')/3600 ~ ' hours' %} {% set alert_text = 'validUnitl under ' ~ constant('VALIDITY_ALERT_THRESHOLD')/3600 ~ ' hours' %}
{% elseif federation.fed.valid_sec < constant('VALIDITY_WARNING_THRESHOLD') %} {% elseif federation.fed.valid_sec < constant('VALIDITY_WARNING_THRESHOLD') %}
{% set alert_icon = 'blue_dot.png' %} {% 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' %} {% set alert_text = 'validUnitl between ' ~ constant('VALIDITY_ALERT_THRESHOLD')/3600 ~ ' and ' ~ constant('VALIDITY_WARNING_THRESHOLD')/3600 ~ ' hours' %}
{% endif %} {% endif %}
<div id="{{ federation.fed.code }}_option_div" class="member-div{{ problem_class }}" style="padding-left: 1em;{% <div id="{{ federation.fed.code }}_option_div" class="member-div{{ problem_class }}" style="padding-left: 1em;{%
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment