From 9e0cbf03c0d0130f706ad30785d209f308eebf91 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 28 Oct 2009 15:03:02 -0400
Subject: [PATCH] Fixed: FS#795 - Do not show the version number if the user is not logged in.
---
interface/web/themes/default/templates/main.tpl.htm | 246 ++++++++++++++++++++--------------------
interface/web/help/lib/module.conf.php | 20 +++
interface/web/help/version.php | 50 ++++++++
interface/web/js/scrigo.js.php | 3
4 files changed, 195 insertions(+), 124 deletions(-)
diff --git a/interface/web/help/lib/module.conf.php b/interface/web/help/lib/module.conf.php
index 36696ff..4af598d 100644
--- a/interface/web/help/lib/module.conf.php
+++ b/interface/web/help/lib/module.conf.php
@@ -37,4 +37,24 @@
'open' => 1,
'items' => $items);
+
+if($_SESSION['s']['user']['typ'] == 'admin') {
+//* make sure that the items array is empty
+$items = array();
+
+//* Add a menu item with the label 'View messages'
+$items[] = array( 'title' => 'Version',
+ 'target' => 'content',
+ 'link' => 'help/version.php');
+
+
+//* Add the menu items defined above to a menu section labeled 'Support'
+$module['nav'][] = array( 'title' => 'About ISPConfig',
+ 'open' => 1,
+ 'items' => $items);
+
+}
+
+
+
?>
\ No newline at end of file
diff --git a/interface/web/help/version.php b/interface/web/help/version.php
new file mode 100644
index 0000000..e53143c
--- /dev/null
+++ b/interface/web/help/version.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+Copyright (c) 2008, Till Brehm, projektfarm Gmbh
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of ISPConfig nor the names of its contributors
+ may be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+/******************************************
+* Begin Form configuration
+******************************************/
+
+$tform_def_file = "form/user_settings.tform.php";
+
+/******************************************
+* End Form configuration
+******************************************/
+
+require_once('../../lib/config.inc.php');
+require_once('../../lib/app.inc.php');
+
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
+
+echo '<p> </p><p> </p><p class="frmTextHead" style="text-align:center;">'.$app->lng('ISPConfig Version:').' '.ISPC_APP_VERSION.'</p>';
+
+?>
\ No newline at end of file
diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php
index 92eb747..3232f50 100644
--- a/interface/web/js/scrigo.js.php
+++ b/interface/web/js/scrigo.js.php
@@ -84,8 +84,9 @@
loadContent(redirect);
redirect = '';
}
+ document.getElementById('footer').innerHTML = 'Powered by <a href="http://www.ispconfig.org" target="_blank">ISPConfig</a>';
*/
- document.getElementById('footer').innerHTML = 'Powered by <a href="http://www.ispconfig.org" target="_blank">ISPConfig <?php echo ISPC_APP_VERSION ?></a>';
+
}
function submitForm(formname,target) {
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 49a89d1..d7aad2f 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -1,123 +1,123 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <title><tmpl_var name="app_title"> <tmpl_var name="app_version"></title>
- <meta http-equiv="Content-Type" content="text/html; charset=<tmpl_var name="html_content_encoding">"/>
- <link href="themes/default/css/central.css" rel="stylesheet" type="text/css"/>
- <!--[if lte IE 7]>
- <link href="themes/default/css/patches/central.css" rel="stylesheet" type="text/css" />
- <![endif]-->
- <!--[if lte ie 6]>
- <style type="text/css" media="screen">
- /*
- Move these to your IE specific stylesheet if possible
- */
- .uniForm,
- .uniForm fieldset,
- .uniForm .ctrlHolder,
- .uniForm .formHint,
- .uniForm .buttonHolder,
- .uniForm .ctrlHolder .multiField,
- .uniForm .inlineLabel{ zoom:1; }
-
- .uniForm .inlineLabels label, .uniForm .inlineLabels .label,
- .uniForm .blockLabels label, .uniForm .blockLabels .label,
- .uniForm .inlineLabel span{ padding-bottom: .2em; }
-
- .uniForm .inlineLabel input,
- .uniForm .inlineLabels .inlineLabel input,
- .uniForm .blockLabels .inlineLabel input{ margin-top: -.3em; }
- </style>
- <![endif]-->
- <!--[if gt ie 6]>
- <style type="text/css" media="screen">
- /*
- Move these to your IE specific stylesheet if possible
- */
- .uniForm,
- .uniForm fieldset,
- .uniForm .ctrlHolder,
- .uniForm .formHint,
- .uniForm .buttonHolder,
- .uniForm .ctrlHolder .multiField,
- .uniForm .inlineLabel{ zoom:1; }
-
- .uniForm .inlineLabels label, .uniForm .inlineLabels .label,
- .uniForm .blockLabels label, .uniForm .blockLabels .label,
- .uniForm .inlineLabel span{ padding-bottom: .2em; }
-
- .uniForm .inlineLabel input,
- .uniForm .inlineLabels .inlineLabel input,
- .uniForm .blockLabels .inlineLabel input{ margin-top: -.3em; }
- </style>
- <![endif]-->
- <link rel="shortcut icon" href="/themes/default/images/favicon.ico" />
- <script type="text/javascript" src="js/yui/yahoo/yahoo-min.js"></script>
- <script type="text/javascript" src="js/yui/connection/connection-min.js"></script>
- <script type="text/javascript" src="js/scrigo.js.php"></script>
- <script type="text/javascript" src="js/uni-form/jquery.js"></script>
- <script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
- <script language="JavaScript" type="text/javascript">
- var is_chrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
- if(!is_chrome) {
- var style = document.createElement('style');
- style.innerHTML = '#page_margins { min-width: 980px; max-width: 80%; background: #fff; display: table;}';
- document.getElementsByTagName("head")[0].appendChild(style);
- }
- </script>
-</head>
-<body onload="loadInitContent()">
- <div id="page_margins">
- <div id="page">
- <div id="header">
- <div id="topsubnav">
- <!-- start: skip link navigation -->
- <a class="skip" href="#navigation" title="skip link">Skip to the navigation</a><span class="hideme">.</span>
- <a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
- <!-- end: skip link navigation -->
- <span><a href="#logout" onclick="loadContent('login/logout.php');">LOGOUT</a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
- </div>
- <h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
- <span>hosting control panel</span>
- </div>
- <!-- begin: main navigation #nav -->
- <div id="nav">
- <a id="navigation" name="navigation"></a>
- <!-- skiplink anchor: navigation -->
- <div id="nav_main">
- <div id="topNav"> </div>
- </div>
- </div>
- <!-- end: main navigation -->
- <!-- begin: main content area #main -->
- <div id="main">
- <!-- begin: #col1 - first float column -->
- <div id="col1">
- <div id="col1_content" class="clearfix">
- <div id="sideNav"> </div>
- </div>
- </div>
- <!-- end: #col1 -->
- <!-- begin: #col3 static column -->
- <div id="col3">
- <div id="col3_content" class="clearfix">
- <a id="content" name="content"></a>
- <!-- skiplink anchor: Content -->
- <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
- <div id="pageContent"><!-- AJAX CONTENT --></div>
- </form>
- </div>
- <div id="ie_clearing"> </div>
- <!-- End: IE Column Clearing -->
- </div>
- <!-- end: #col3 -->
- </div>
- <!-- end: #main -->
- <!-- begin: #footer -->
- <div id="footer">
- Powered by <a href="<tmpl_var name="app_link">" target="_blank"><tmpl_var name="app_title"> <tmpl_var name="app_version"></a>
- </div><!-- end: #footer -->
- </div>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <title><tmpl_var name="app_title"> <tmpl_var name="app_version"></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=<tmpl_var name="html_content_encoding">"/>
+ <link href="themes/default/css/central.css" rel="stylesheet" type="text/css"/>
+ <!--[if lte IE 7]>
+ <link href="themes/default/css/patches/central.css" rel="stylesheet" type="text/css" />
+ <![endif]-->
+ <!--[if lte ie 6]>
+ <style type="text/css" media="screen">
+ /*
+ Move these to your IE specific stylesheet if possible
+ */
+ .uniForm,
+ .uniForm fieldset,
+ .uniForm .ctrlHolder,
+ .uniForm .formHint,
+ .uniForm .buttonHolder,
+ .uniForm .ctrlHolder .multiField,
+ .uniForm .inlineLabel{ zoom:1; }
+
+ .uniForm .inlineLabels label, .uniForm .inlineLabels .label,
+ .uniForm .blockLabels label, .uniForm .blockLabels .label,
+ .uniForm .inlineLabel span{ padding-bottom: .2em; }
+
+ .uniForm .inlineLabel input,
+ .uniForm .inlineLabels .inlineLabel input,
+ .uniForm .blockLabels .inlineLabel input{ margin-top: -.3em; }
+ </style>
+ <![endif]-->
+ <!--[if gt ie 6]>
+ <style type="text/css" media="screen">
+ /*
+ Move these to your IE specific stylesheet if possible
+ */
+ .uniForm,
+ .uniForm fieldset,
+ .uniForm .ctrlHolder,
+ .uniForm .formHint,
+ .uniForm .buttonHolder,
+ .uniForm .ctrlHolder .multiField,
+ .uniForm .inlineLabel{ zoom:1; }
+
+ .uniForm .inlineLabels label, .uniForm .inlineLabels .label,
+ .uniForm .blockLabels label, .uniForm .blockLabels .label,
+ .uniForm .inlineLabel span{ padding-bottom: .2em; }
+
+ .uniForm .inlineLabel input,
+ .uniForm .inlineLabels .inlineLabel input,
+ .uniForm .blockLabels .inlineLabel input{ margin-top: -.3em; }
+ </style>
+ <![endif]-->
+ <link rel="shortcut icon" href="/themes/default/images/favicon.ico" />
+ <script type="text/javascript" src="js/yui/yahoo/yahoo-min.js"></script>
+ <script type="text/javascript" src="js/yui/connection/connection-min.js"></script>
+ <script type="text/javascript" src="js/scrigo.js.php"></script>
+ <script type="text/javascript" src="js/uni-form/jquery.js"></script>
+ <script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
+ <script language="JavaScript" type="text/javascript">
+ var is_chrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
+ if(!is_chrome) {
+ var style = document.createElement('style');
+ style.innerHTML = '#page_margins { min-width: 980px; max-width: 80%; background: #fff; display: table;}';
+ document.getElementsByTagName("head")[0].appendChild(style);
+ }
+ </script>
+</head>
+<body onload="loadInitContent()">
+ <div id="page_margins">
+ <div id="page">
+ <div id="header">
+ <div id="topsubnav">
+ <!-- start: skip link navigation -->
+ <a class="skip" href="#navigation" title="skip link">Skip to the navigation</a><span class="hideme">.</span>
+ <a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
+ <!-- end: skip link navigation -->
+ <span><a href="#logout" onclick="loadContent('login/logout.php');">LOGOUT</a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
+ </div>
+ <h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
+ <span>hosting control panel</span>
+ </div>
+ <!-- begin: main navigation #nav -->
+ <div id="nav">
+ <a id="navigation" name="navigation"></a>
+ <!-- skiplink anchor: navigation -->
+ <div id="nav_main">
+ <div id="topNav"> </div>
+ </div>
+ </div>
+ <!-- end: main navigation -->
+ <!-- begin: main content area #main -->
+ <div id="main">
+ <!-- begin: #col1 - first float column -->
+ <div id="col1">
+ <div id="col1_content" class="clearfix">
+ <div id="sideNav"> </div>
+ </div>
+ </div>
+ <!-- end: #col1 -->
+ <!-- begin: #col3 static column -->
+ <div id="col3">
+ <div id="col3_content" class="clearfix">
+ <a id="content" name="content"></a>
+ <!-- skiplink anchor: Content -->
+ <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
+ <div id="pageContent"><!-- AJAX CONTENT --></div>
+ </form>
+ </div>
+ <div id="ie_clearing"> </div>
+ <!-- End: IE Column Clearing -->
+ </div>
+ <!-- end: #col3 -->
+ </div>
+ <!-- end: #main -->
+ <!-- begin: #footer -->
+ <div id="footer">
+ Powered by <a href="<tmpl_var name="app_link">" target="_blank"><tmpl_var name="app_title"></a>
+ </div><!-- end: #footer -->
+ </div>
+</body>
+</html>
--
Gitblit v1.9.1