From dc5f7824a00c088a23883199e45cb26b114b5803 Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Mon, 8 Jul 2024 11:50:28 -0600
Subject: [PATCH 1/2] define variables needed in the header template

---
 modules/expirychecker/public/about2expire.php        | 2 ++
 modules/expirychecker/public/expired.php             | 2 ++
 modules/material/themes/material/default/header.twig | 9 ++++-----
 modules/mfa/public/low-on-backup-codes.php           | 2 ++
 modules/mfa/public/must-set-up-mfa.php               | 6 ++++--
 modules/mfa/public/new-backup-codes.php              | 2 ++
 modules/mfa/public/out-of-backup-codes.php           | 2 ++
 modules/mfa/public/prompt-for-mfa.php                | 2 ++
 modules/mfa/public/send-manager-mfa.php              | 2 ++
 modules/profilereview/public/nag.php                 | 2 ++
 modules/profilereview/public/review.php              | 2 ++
 modules/silauth/public/loginuserpass.php             | 2 ++
 12 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/modules/expirychecker/public/about2expire.php b/modules/expirychecker/public/about2expire.php
index 7200a7b5..9f39439f 100644
--- a/modules/expirychecker/public/about2expire.php
+++ b/modules/expirychecker/public/about2expire.php
@@ -55,6 +55,8 @@
 $globalConfig = Configuration::getInstance();
 
 $t = new Template($globalConfig, 'expirychecker:about2expire');
+$t->data['theme_color_scheme'] = $globalConfig->getOptionalString('theme.color-scheme', '');
+$t->data['analytics_tracking_id'] = $globalConfig->getOptionalString('analytics.trackingId', '');
 $t->data['form_target'] = Module::getModuleURL('expirychecker/about2expire.php');
 $t->data['form_data'] = ['StateId' => $stateId];
 $t->data['days_left'] = $state['daysLeft'];
diff --git a/modules/expirychecker/public/expired.php b/modules/expirychecker/public/expired.php
index 95c42d4e..98bc15a5 100644
--- a/modules/expirychecker/public/expired.php
+++ b/modules/expirychecker/public/expired.php
@@ -48,6 +48,8 @@
 $globalConfig = Configuration::getInstance();
 
 $t = new Template($globalConfig, 'expirychecker:expired');
+$t->data['theme_color_scheme'] = $globalConfig->getOptionalString('theme.color-scheme', '');
+$t->data['analytics_tracking_id'] = $globalConfig->getOptionalString('analytics.trackingId', '');
 $t->data['form_target'] = Module::getModuleURL('expirychecker/expired.php');
 $t->data['form_data'] = ['StateId' => $stateId];
 $t->send();
diff --git a/modules/material/themes/material/default/header.twig b/modules/material/themes/material/default/header.twig
index 6c0fa471..257a4f34 100644
--- a/modules/material/themes/material/default/header.twig
+++ b/modules/material/themes/material/default/header.twig
@@ -5,9 +5,9 @@
 
 <base href="{{ baseurlpath }}/module.php/material/">
 
-{% if analyticsTrackingId is defined and analyticsTrackingId is not empty %}
+{% if analytics_tracking_id is not empty %}
   <!-- Google tag (gtag.js) -->
-  <script async src="https://www.googletagmanager.com/gtag/js?id={{ analyticsTrackingId }}"></script>
+  <script async src="https://www.googletagmanager.com/gtag/js?id={{ analytics_tracking_id }}"></script>
   <script>
     window.dataLayer = window.dataLayer || [];
 
@@ -17,12 +17,11 @@
 
     gtag('js', new Date());
 
-    gtag('config', '{{ analyticsTrackingId }}');
+    gtag('config', '{{ analytics_tracking_id }}');
   </script>
 {% endif %}
 
-{# FIXME: <link rel="stylesheet" href="material.{{ theme.color-scheme | e ?: 'indigo-purple' }}.1.2.1.min.css"> #}
-<link rel="stylesheet" href="material.indigo-purple.1.2.1.min.css">
+<link rel="stylesheet" href="material.{{ theme_color_scheme | e ?: 'indigo-purple' }}.1.2.1.min.css">
 <link rel="stylesheet" href="styles.2.3.6.css">
 
 <script async src="material.1.2.1.min.js"></script>
diff --git a/modules/mfa/public/low-on-backup-codes.php b/modules/mfa/public/low-on-backup-codes.php
index eb048962..91ae0e13 100644
--- a/modules/mfa/public/low-on-backup-codes.php
+++ b/modules/mfa/public/low-on-backup-codes.php
@@ -31,6 +31,8 @@
 $globalConfig = Configuration::getInstance();
 
 $t = new Template($globalConfig, 'mfa:low-on-backup-codes');
+$t->data['theme_color_scheme'] = $globalConfig->getOptionalString('theme.color-scheme', '');
+$t->data['analytics_tracking_id'] = $globalConfig->getOptionalString('analytics.trackingId', '');
 $t->data['num_backup_codes_remaining'] = $state['numBackupCodesRemaining'];
 $t->send();
 
diff --git a/modules/mfa/public/must-set-up-mfa.php b/modules/mfa/public/must-set-up-mfa.php
index d1067c62..4ecf1efb 100644
--- a/modules/mfa/public/must-set-up-mfa.php
+++ b/modules/mfa/public/must-set-up-mfa.php
@@ -1,11 +1,11 @@
 <?php
 
-use SimpleSAML\Module\mfa\LoggerFactory;
 use SimpleSAML\Auth\State;
 use SimpleSAML\Configuration;
 use SimpleSAML\Error\BadRequest;
-use SimpleSAML\XHTML\Template;
 use SimpleSAML\Module\mfa\Auth\Process\Mfa;
+use SimpleSAML\Module\mfa\LoggerFactory;
+use SimpleSAML\XHTML\Template;
 
 $stateId = filter_input(INPUT_GET, 'StateId') ?? null;
 if (empty($stateId)) {
@@ -24,6 +24,8 @@
 $globalConfig = Configuration::getInstance();
 
 $t = new Template($globalConfig, 'mfa:must-set-up-mfa');
+$t->data['theme_color_scheme'] = $globalConfig->getOptionalString('theme.color-scheme', '');
+$t->data['analytics_tracking_id'] = $globalConfig->getOptionalString('analytics.trackingId', '');
 $t->send();
 
 $logger->info(sprintf(
diff --git a/modules/mfa/public/new-backup-codes.php b/modules/mfa/public/new-backup-codes.php
index 67e61fef..035cc143 100644
--- a/modules/mfa/public/new-backup-codes.php
+++ b/modules/mfa/public/new-backup-codes.php
@@ -34,6 +34,8 @@
 $globalConfig = Configuration::getInstance();
 
 $t = new Template($globalConfig, 'mfa:new-backup-codes');
+$t->data['theme_color_scheme'] = $globalConfig->getOptionalString('theme.color-scheme', '');
+$t->data['analytics_tracking_id'] = $globalConfig->getOptionalString('analytics.trackingId', '');
 $t->data['mfa_setup_url'] = $state['mfaSetupUrl'];
 $t->data['new_backup_codes'] = $state['newBackupCodes'] ?? [];
 $t->data['idp_name'] = $globalConfig->getString('idp_display_name');
diff --git a/modules/mfa/public/out-of-backup-codes.php b/modules/mfa/public/out-of-backup-codes.php
index 70509f91..2fa5c84a 100644
--- a/modules/mfa/public/out-of-backup-codes.php
+++ b/modules/mfa/public/out-of-backup-codes.php
@@ -32,6 +32,8 @@
 $globalConfig = Configuration::getInstance();
 
 $t = new Template($globalConfig, 'mfa:out-of-backup-codes');
+$t->data['theme_color_scheme'] = $globalConfig->getOptionalString('theme.color-scheme', '');
+$t->data['analytics_tracking_id'] = $globalConfig->getOptionalString('analytics.trackingId', '');
 $t->data['has_other_mfa_options'] = $hasOtherMfaOptions;
 $t->send();
 
diff --git a/modules/mfa/public/prompt-for-mfa.php b/modules/mfa/public/prompt-for-mfa.php
index 445a402c..ad9fa4c2 100644
--- a/modules/mfa/public/prompt-for-mfa.php
+++ b/modules/mfa/public/prompt-for-mfa.php
@@ -120,6 +120,8 @@
 $mfaTemplateToUse = Mfa::getTemplateFor($mfaOption['type']);
 
 $t = new Template($globalConfig, $mfaTemplateToUse);
+$t->data['theme_color_scheme'] = $globalConfig->getOptionalString('theme.color-scheme', '');
+$t->data['analytics_tracking_id'] = $globalConfig->getOptionalString('analytics.trackingId', '');
 $t->data['error_message'] = $errorMessage ?? null;
 $t->data['mfa_option_data'] = json_encode($mfaOption['data']);
 $t->data['mfa_options'] = $mfaOptions;
diff --git a/modules/mfa/public/send-manager-mfa.php b/modules/mfa/public/send-manager-mfa.php
index a777cf73..717dc29f 100644
--- a/modules/mfa/public/send-manager-mfa.php
+++ b/modules/mfa/public/send-manager-mfa.php
@@ -36,6 +36,8 @@
 $globalConfig = Configuration::getInstance();
 
 $t = new Template($globalConfig, 'mfa:send-manager-mfa');
+$t->data['theme_color_scheme'] = $globalConfig->getOptionalString('theme.color-scheme', '');
+$t->data['analytics_tracking_id'] = $globalConfig->getOptionalString('analytics.trackingId', '');
 $t->data['manager_email'] = $state['managerEmail'];
 $t->data['error_message'] = $errorMessage ?? null;
 $t->send();
diff --git a/modules/profilereview/public/nag.php b/modules/profilereview/public/nag.php
index a020009b..d2aa37dc 100644
--- a/modules/profilereview/public/nag.php
+++ b/modules/profilereview/public/nag.php
@@ -31,6 +31,8 @@
 $globalConfig = Configuration::getInstance();
 
 $t = new Template($globalConfig, 'profilereview:' . $state['template']);
+$t->data['theme_color_scheme'] = $globalConfig->getOptionalString('theme.color-scheme', '');
+$t->data['analytics_tracking_id'] = $globalConfig->getOptionalString('analytics.trackingId', '');
 $t->data['profile_url'] = $state['profileUrl'];
 $t->data['method_options'] = $state['methodOptions'] ?? [];
 $t->data['mfa_options'] = $state['mfaOptions'] ?? [];
diff --git a/modules/profilereview/public/review.php b/modules/profilereview/public/review.php
index 158374a9..9e46346f 100644
--- a/modules/profilereview/public/review.php
+++ b/modules/profilereview/public/review.php
@@ -35,6 +35,8 @@
 $globalConfig = Configuration::getInstance();
 
 $t = new Template($globalConfig, 'profilereview:review');
+$t->data['theme_color_scheme'] = $globalConfig->getOptionalString('theme.color-scheme', '');
+$t->data['analytics_tracking_id'] = $globalConfig->getOptionalString('analytics.trackingId', '');
 $t->data['profile_url'] = $state['profileUrl'];
 $t->data['method_options'] = $state['methodOptions'];
 $t->data['mfa_options'] = $state['mfaOptions'];
diff --git a/modules/silauth/public/loginuserpass.php b/modules/silauth/public/loginuserpass.php
index 12fc066f..3d21979b 100644
--- a/modules/silauth/public/loginuserpass.php
+++ b/modules/silauth/public/loginuserpass.php
@@ -80,6 +80,8 @@
 }
 
 $t = new Template($globalConfig, 'silauth:loginuserpass');
+$t->data['theme_color_scheme'] = $globalConfig->getOptionalString('theme.color-scheme', '');
+$t->data['analytics_tracking_id'] = $globalConfig->getOptionalString('analytics.trackingId', '');
 $t->data['stateparams'] = array('AuthState' => $authStateId);
 $t->data['username'] = $username;
 $t->data['errorcode'] = $errorCode;

From 7c183657be5cdd779d17514d2da7d10a79df304d Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Mon, 8 Jul 2024 12:00:46 -0600
Subject: [PATCH 2/2] still need to check undefined analytics_tracking_id,
 theme_color_scheme

Any template instantiated by SSP code will not have defined our variables.
---
 modules/material/themes/material/default/header.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/material/themes/material/default/header.twig b/modules/material/themes/material/default/header.twig
index 257a4f34..36adee50 100644
--- a/modules/material/themes/material/default/header.twig
+++ b/modules/material/themes/material/default/header.twig
@@ -5,7 +5,7 @@
 
 <base href="{{ baseurlpath }}/module.php/material/">
 
-{% if analytics_tracking_id is not empty %}
+{% if analytics_tracking_id is defined and analytics_tracking_id is not empty %}
   <!-- Google tag (gtag.js) -->
   <script async src="https://www.googletagmanager.com/gtag/js?id={{ analytics_tracking_id }}"></script>
   <script>
@@ -21,7 +21,7 @@
   </script>
 {% endif %}
 
-<link rel="stylesheet" href="material.{{ theme_color_scheme | e ?: 'indigo-purple' }}.1.2.1.min.css">
+<link rel="stylesheet" href="material.{{ (theme_color_scheme ?? 'indigo-purple')|e }}.1.2.1.min.css">
 <link rel="stylesheet" href="styles.2.3.6.css">
 
 <script async src="material.1.2.1.min.js"></script>