From 5c42001eb9352d83e191c1c53bf0546c8755d13b Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Fri, 18 May 2012 10:08:18 -0400
Subject: [PATCH] - Show search field only for "normal" users, not mail users.
---
interface/web/themes/default_no_navimg/templates/main.tpl.htm | 2 +-
interface/web/themes/default/templates/main.tpl.htm | 2 +-
interface/web/themes/default_combobox/templates/main.tpl.htm | 2 +-
interface/web/themes/default_64_navimg/templates/main.tpl.htm | 2 +-
interface/lib/app.inc.php | 6 ++++++
5 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index ff344d0..7f73f74 100755
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -245,6 +245,12 @@
if(isset($_SESSION['s']['user'])) {
$this->tpl->setVar('cpuser', $_SESSION['s']['user']['username']);
$this->tpl->setVar('logout_txt', $this->lng('logout_txt'));
+ /* Show search field only for normal users, not mail users */
+ if(stristr($_SESSION['s']['user']['username'],'@')){
+ $this->tpl->setVar('usertype', 'mailuser');
+ } else {
+ $this->tpl->setVar('usertype', 'normaluser');
+ }
}
/* Global Search */
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 2129325..f888757 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -118,7 +118,7 @@
<!-- end: skip link navigation -->
<tmpl_if name="cpuser">
<span><a href="#logout" onclick="loadContent('login/logout.php');"><tmpl_var name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
- <input type="text" id="globalsearch" size="25" value="" />
+ <tmpl_if name='usertype' op='==' value='normaluser'><input type="text" id="globalsearch" size="25" value="" /></tmpl_if>
</tmpl_if>
</div>
<h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
diff --git a/interface/web/themes/default_64_navimg/templates/main.tpl.htm b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
index f5bad43..69578f5 100644
--- a/interface/web/themes/default_64_navimg/templates/main.tpl.htm
+++ b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
@@ -118,7 +118,7 @@
<!-- end: skip link navigation -->
<tmpl_if name="cpuser">
<span><a href="#logout" onclick="loadContent('login/logout.php');">LOGOUT <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
- <input type="text" id="globalsearch" size="25" value="" />
+ <tmpl_if name='usertype' op='==' value='normaluser'><input type="text" id="globalsearch" size="25" value="" /></tmpl_if>
</tmpl_if>
</div>
<h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
diff --git a/interface/web/themes/default_combobox/templates/main.tpl.htm b/interface/web/themes/default_combobox/templates/main.tpl.htm
index 902cce8..c49442d 100644
--- a/interface/web/themes/default_combobox/templates/main.tpl.htm
+++ b/interface/web/themes/default_combobox/templates/main.tpl.htm
@@ -273,7 +273,7 @@
<!-- end: skip link navigation -->
<tmpl_if name="cpuser">
<span><a href="#logout" onclick="loadContent('login/logout.php');">LOGOUT <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
- <input type="text" id="globalsearch" size="25" value="" />
+ <tmpl_if name='usertype' op='==' value='normaluser'><input type="text" id="globalsearch" size="25" value="" /></tmpl_if>
</tmpl_if>
</div>
<h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
diff --git a/interface/web/themes/default_no_navimg/templates/main.tpl.htm b/interface/web/themes/default_no_navimg/templates/main.tpl.htm
index 1230998..f03cc00 100644
--- a/interface/web/themes/default_no_navimg/templates/main.tpl.htm
+++ b/interface/web/themes/default_no_navimg/templates/main.tpl.htm
@@ -119,7 +119,7 @@
<!-- end: skip link navigation -->
<tmpl_if name="cpuser">
<span><a href="#logout" onclick="loadContent('login/logout.php');">LOGOUT <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
- <input type="text" id="globalsearch" size="25" value="" />
+ <tmpl_if name='usertype' op='==' value='normaluser'><input type="text" id="globalsearch" size="25" value="" /></tmpl_if>
</tmpl_if>
</div>
<h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
--
Gitblit v1.9.1