Merge pull request #1306 from TheSerapher/issue-1300

Issue 1300
This commit is contained in:
Sebastian Grewe 2014-01-09 08:41:30 -08:00
commit b12a45ed2a
4 changed files with 4 additions and 27 deletions

View File

@ -5,7 +5,7 @@ if (!defined('SECURITY')) die('Hacking attempt');
if ($setting->getValue('disable_contactform')) {
$_SESSION['POPUP'][] = array('CONTENT' => 'Contactform is currently disabled. Please try again later.', 'TYPE' => 'errormsg');
$smarty->assign("CONTENT", "disabled.tpl");
$smarty->assign("CONTENT", "empty");
} else if ($setting->getValue('disable_contactform_guest') && !$user->isAuthenticated(false)) {
$_SESSION['POPUP'][] = array('CONTENT' => 'Contactform is disabled for guests.', 'TYPE' => 'errormsg');
$smarty->assign("CONTENT", "disabled.tpl");

View File

@ -1,9 +0,0 @@
<?php
// Make sure we are called from index.php
if (!defined('SECURITY'))
die('Hacking attempt');
// Tempalte specifics
$smarty->assign("CONTENT", "default.tpl");
?>

View File

@ -74,18 +74,14 @@
<ul class="toggle">
{if $smarty.session.AUTHENTICATED|default:"0" == 1}
{if $GLOBAL.config.disable_contactform|default:"0" != 1}
<li class="icon-mail"><a href="{$smarty.server.PHP_SELF}?page=contactform">Support</a></li>
{else}
<li class="icon-mail"><a href="{$smarty.server.PHP_SELF}?page=support">Support</a></li>
<li class="icon-mail"><a href="{$smarty.server.PHP_SELF}?page=contactform">Contact</a></li>
{/if}
<li class="icon-off"><a href="{$smarty.server.PHP_SELF}?page=logout">Logout</a></li>
{else}
<li class="icon-login"><a href="{$smarty.server.PHP_SELF}?page=login">Login</a></li>
<li class="icon-pencil"><a href="{$smarty.server.PHP_SELF}?page=register">Sign Up</a></li>
{if $GLOBAL.config.disable_contactform_guest|default:"0" == 1 || $GLOBAL.config.disable_contactform|default:"0" == 1}
<li class="icon-mail"><a href="{$smarty.server.PHP_SELF}?page=support">Support</a></li>
{else}
<li class="icon-mail"><a href="{$smarty.server.PHP_SELF}?page=contactform">Support</a></li>
{if $GLOBAL.config.disable_contactform|default:"0" != 1}
<li class="icon-mail"><a href="{$smarty.server.PHP_SELF}?page=contactform">Contact</a></li>
{/if}
<li class="icon-doc"><a href="{$smarty.server.PHP_SELF}?page=tac">Terms and Conditions</a></li>
{/if}

View File

@ -1,10 +0,0 @@
<article class="module width_full">
<header><h3>Contact &amp; Support</h3></header>
<div class="module_content">
<center>
<table width="100%">
<p>This product comes 'as-is' without any warranty. Please check the Apache License, Version 2.0, for details.</p>
</table>
</center>
</div>
</article>