- Show search field only for "normal" users, not mail users.

Author: falkotimme

interface/lib/app.inc.php

@@ -245,6 +245,12 @@ public function tpl_defaults() {
 		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 */

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>

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>

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>

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>