From 43be0bed37766c7ee30173095c44086fa58a60a8 Mon Sep 17 00:00:00 2001
From: Hanne Moa <hanne.moa@uninett.no>
Date: Mon, 29 Feb 2016 11:57:31 +0100
Subject: [PATCH] s/-tpl.php/.tpl.php/
WTF...
---
modules/cron/templates/{croninfo-tpl.php => croninfo.tpl.php} | 0
modules/cron/www/croninfo.php | 2 +-
modules/discopower/lib/PowerIdPDisco.php | 2 +-
modules/discopower/templates/{disco-tpl.php => disco.tpl.php} | 0
modules/portal/lib/Portal.php | 4 ++--
.../sanitycheck/templates/{check-tpl.php => check.tpl.php} | 0
modules/sanitycheck/www/index.php | 2 +-
modules/statistics/lib/StatDataset.php | 2 +-
.../templates/{statistics-tpl.php => statistics.tpl.php} | 0
.../templates/{statmeta-tpl.php => statmeta.tpl.php} | 0
modules/statistics/www/showstats.php | 2 +-
modules/statistics/www/statmeta.php | 2 +-
12 files changed, 8 insertions(+), 8 deletions(-)
rename modules/cron/templates/{croninfo-tpl.php => croninfo.tpl.php} (100%)
rename modules/discopower/templates/{disco-tpl.php => disco.tpl.php} (100%)
rename modules/sanitycheck/templates/{check-tpl.php => check.tpl.php} (100%)
rename modules/statistics/templates/{statistics-tpl.php => statistics.tpl.php} (100%)
rename modules/statistics/templates/{statmeta-tpl.php => statmeta.tpl.php} (100%)
diff --git a/modules/cron/templates/croninfo-tpl.php b/modules/cron/templates/croninfo.tpl.php
similarity index 100%
rename from modules/cron/templates/croninfo-tpl.php
rename to modules/cron/templates/croninfo.tpl.php
diff --git a/modules/cron/www/croninfo.php b/modules/cron/www/croninfo.php
index 79ad1d0f6..b8e3246a5 100644
--- a/modules/cron/www/croninfo.php
+++ b/modules/cron/www/croninfo.php
@@ -36,6 +36,6 @@ foreach ($tags AS $tag) {
-$t = new SimpleSAML_XHTML_Template($config, 'cron:croninfo-tpl.php', 'cron:cron');
+$t = new SimpleSAML_XHTML_Template($config, 'cron:croninfo.tpl.php', 'cron:cron');
$t->data['urls'] = $urls;
$t->show();
diff --git a/modules/discopower/lib/PowerIdPDisco.php b/modules/discopower/lib/PowerIdPDisco.php
index 15f6a9f91..88cc30ff8 100644
--- a/modules/discopower/lib/PowerIdPDisco.php
+++ b/modules/discopower/lib/PowerIdPDisco.php
@@ -247,7 +247,7 @@ class sspmod_discopower_PowerIdPDisco extends SimpleSAML_XHTML_IdPDisco
$idpList = $this->idplistStructured($this->filterList($idpList));
$preferredIdP = $this->getRecommendedIdP();
- $t = new SimpleSAML_XHTML_Template($this->config, 'discopower:disco-tpl.php', 'disco');
+ $t = new SimpleSAML_XHTML_Template($this->config, 'discopower:disco.tpl.php', 'disco');
$t->data['idplist'] = $idpList;
$t->data['preferredidp'] = $preferredIdP;
$t->data['return'] = $this->returnURL;
diff --git a/modules/discopower/templates/disco-tpl.php b/modules/discopower/templates/disco.tpl.php
similarity index 100%
rename from modules/discopower/templates/disco-tpl.php
rename to modules/discopower/templates/disco.tpl.php
diff --git a/modules/portal/lib/Portal.php b/modules/portal/lib/Portal.php
index 7478e0fde..df0df4792 100644
--- a/modules/portal/lib/Portal.php
+++ b/modules/portal/lib/Portal.php
@@ -38,7 +38,7 @@ class sspmod_portal_Portal {
function getMenu($thispage) {
$config = SimpleSAML_Configuration::getInstance();
- $t = new SimpleSAML_XHTML_Template($config, 'sanitycheck:check-tpl.php');
+ $t = new SimpleSAML_XHTML_Template($config, 'sanitycheck:check.tpl.php');
$tabset = $this->getTabset($thispage);
$logininfo = $this->getLoginInfo($t, $thispage);
$text = '';
@@ -68,4 +68,4 @@ class sspmod_portal_Portal {
}
-}
\ No newline at end of file
+}
diff --git a/modules/sanitycheck/templates/check-tpl.php b/modules/sanitycheck/templates/check.tpl.php
similarity index 100%
rename from modules/sanitycheck/templates/check-tpl.php
rename to modules/sanitycheck/templates/check.tpl.php
diff --git a/modules/sanitycheck/www/index.php b/modules/sanitycheck/www/index.php
index d8b608838..ec631beb0 100644
--- a/modules/sanitycheck/www/index.php
+++ b/modules/sanitycheck/www/index.php
@@ -22,7 +22,7 @@ if (isset($_REQUEST['output']) && $_REQUEST['output'] == 'text') {
exit;
}
-$t = new SimpleSAML_XHTML_Template($config, 'sanitycheck:check-tpl.php');
+$t = new SimpleSAML_XHTML_Template($config, 'sanitycheck:check.tpl.php');
$t->data['pageid'] = 'sanitycheck';
$t->data['errors'] = $errors;
$t->data['info'] = $info;
diff --git a/modules/statistics/lib/StatDataset.php b/modules/statistics/lib/StatDataset.php
index e6285102a..aeb69d074 100644
--- a/modules/statistics/lib/StatDataset.php
+++ b/modules/statistics/lib/StatDataset.php
@@ -251,7 +251,7 @@ class sspmod_statistics_StatDataset
public function getDelimiterPresentation()
{
$config = SimpleSAML_Configuration::getInstance();
- $t = new SimpleSAML_XHTML_Template($config, 'statistics:statistics-tpl.php');
+ $t = new SimpleSAML_XHTML_Template($config, 'statistics:statistics.tpl.php');
$availdelimiters = $this->availDelimiters();
diff --git a/modules/statistics/templates/statistics-tpl.php b/modules/statistics/templates/statistics.tpl.php
similarity index 100%
rename from modules/statistics/templates/statistics-tpl.php
rename to modules/statistics/templates/statistics.tpl.php
diff --git a/modules/statistics/templates/statmeta-tpl.php b/modules/statistics/templates/statmeta.tpl.php
similarity index 100%
rename from modules/statistics/templates/statmeta-tpl.php
rename to modules/statistics/templates/statmeta.tpl.php
diff --git a/modules/statistics/www/showstats.php b/modules/statistics/www/showstats.php
index ed4c443fc..d15edc7cd 100644
--- a/modules/statistics/www/showstats.php
+++ b/modules/statistics/www/showstats.php
@@ -96,7 +96,7 @@ if (array_key_exists('output', $_REQUEST) && $_REQUEST['output'] === 'csv') {
-$t = new SimpleSAML_XHTML_Template($config, 'statistics:statistics-tpl.php');
+$t = new SimpleSAML_XHTML_Template($config, 'statistics:statistics.tpl.php');
$t->data['pageid'] = 'statistics';
$t->data['header'] = 'stat';
$t->data['imgurl'] = $grapher->show($axis['axis'], $axis['axispos'], $datasets, $maxes);
diff --git a/modules/statistics/www/statmeta.php b/modules/statistics/www/statmeta.php
index 46c5ddb01..4b8a9d04b 100644
--- a/modules/statistics/www/statmeta.php
+++ b/modules/statistics/www/statmeta.php
@@ -10,7 +10,7 @@ $aggr->loadMetadata();
$metadata = $aggr->getMetadata();
-$t = new SimpleSAML_XHTML_Template($config, 'statistics:statmeta-tpl.php');
+$t = new SimpleSAML_XHTML_Template($config, 'statistics:statmeta.tpl.php');
$t->data['metadata'] = $metadata;
$t->show();
--
GitLab