From 617bb93955302ebbf1abfa086ea4037183c003dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Sat, 1 Nov 2008 21:48:52 +0000
Subject: [PATCH] Added version info on frontpage
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@967 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/Configuration.php | 2 +-
templates/default/frontpage.php | 4 +++-
www/index.php | 4 +---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/SimpleSAML/Configuration.php b/lib/SimpleSAML/Configuration.php
index ec7313e35..a0917127c 100644
--- a/lib/SimpleSAML/Configuration.php
+++ b/lib/SimpleSAML/Configuration.php
@@ -62,7 +62,7 @@ class SimpleSAML_Configuration {
$this->configuration = $config;
}
- public function getVersion() {
+ public function getVersion($verbose = FALSE) {
return 'trunk';
}
diff --git a/templates/default/frontpage.php b/templates/default/frontpage.php
index 1824ef428..dd0259dd6 100644
--- a/templates/default/frontpage.php
+++ b/templates/default/frontpage.php
@@ -33,7 +33,9 @@ $icon_disabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/d
<p><?php echo $this->t('intro'); ?></p>
<div>
- <code style="background: white; border: 1px solid #ccc; padding: 1em; color: #555" ><?php echo $this->data['directory']; ?></code>
+ <code style="background: white; border: 1px solid #ccc; padding: 1em; color: #555" ><?php
+ echo $this->data['directory'] . ' (' . $this->data['version'] . ')';
+ ?></code>
</div>
<h2><?php echo $this->t('useful_links_header'); ?></h2>
diff --git a/www/index.php b/www/index.php
index f8295edf3..93ff4078d 100644
--- a/www/index.php
+++ b/www/index.php
@@ -221,8 +221,6 @@ $funcmatrix[] = array(
'enabled' => $password_ok
);
-
-
$t = new SimpleSAML_XHTML_Template($config, 'frontpage.php', 'frontpage');
$t->data['header'] = 'simpleSAMLphp installation page';
$t->data['icon'] = 'compass_l.png';
@@ -232,7 +230,7 @@ $t->data['links_meta'] = $linksmeta;
$t->data['links_doc'] = $linksdoc;
$t->data['enablematrix'] = $enablematrix;
$t->data['funcmatrix'] = $funcmatrix;
-
+$t->data['version'] = $config->getVersion();
$t->data['directory'] = dirname(dirname(__FILE__));
$t->show();
--
GitLab