- small fix to smarty.inc.php. Really use our compile and templates directory

- Fix in menu.tpl to honor "show fetchmail tab"

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@768 a1433add-5e2c-0410-b055-b7f2511e0802

smarty.inc.php

@@ -5,9 +5,9 @@ $smarty = new Smarty;
 
 //$smarty->debugging = true;
 
-$smarty->template_dir	= $incpath.'/'.$smarty->template_dir;
-$smarty->compile_dir	= $incpath.'/'.$smarty->compile_dir;
-$smarty->config_dir		= $incpath.'/'.$smarty->config_dir;
+$smarty->template_dir	= $incpath.'/templates';
+$smarty->compile_dir	= $incpath.'/templates_c';
+$smarty->config_dir	= $incpath.'/'.$smarty->config_dir;
 
 $CONF['theme_css']	= $CONF['postfix_admin_url'].'/'.htmlentities($CONF['theme_css']);
 $CONF['theme_logo']	= $CONF['postfix_admin_url'].'/'.htmlentities($CONF['theme_logo']);
@@ -32,8 +32,7 @@ else
 }
 if (file_exists ($CONF ['postfix_admin_path'].'/templates/'.$motd_file))
 	$smarty->assign ('motd_file', $motd_file);
-?>
-<?php
+
 function select_options ($aValues, $aSelected)
 {
 	$ret_val = '';
@@ -53,4 +52,4 @@ function eval_size ($aSize)
 	else 				{$ret_val = $aSize;	}
 	return $ret_val;
 }
-php?>
+?>

templates/menu.tpl

@@ -46,6 +46,7 @@
 	</li>
 {/strip}
 {* fetchmail *}
+{if $CONF.fetchmail}
 {strip}
 	<li><a target="_top" href="{#url_fetchmail#}">{$PALANG.pMenu_fetchmail}</a>
 		<ul>
@@ -54,6 +55,7 @@
 		</ul>
 	</li>
 {/strip}
+{/if}
 {* sendmail *}
 {strip}
 	<li><a target="_top" href="{#url_sendmail#}">{$PALANG.pMenu_sendmail}</a>
@@ -105,4 +107,4 @@ if (window.attachEvent)
 	window.attachEvent("onload", sfHover);
 // ]]>
 </script>
-{/literal}
+{/literal}