From 6e9980647935e513b117d1443a8e2ba84253ab71 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Thu, 9 Jan 2014 09:09:14 +0100
Subject: [PATCH] [REMOVE] Uneeded, useless support page

* Removed support page templates
* Changed navigation to contact
* Modified contact form behaviour on enable/disable events

This fixes #1300. It wasn't clear which templates needed to be edited
for the contact form to work.
---
 public/include/pages/contactform.inc.php    |  2 +-
 public/templates/mpos/global/navigation.tpl | 10 +++-------
 public/templates/mpos/support/default.tpl   | 10 ----------
 3 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 public/templates/mpos/support/default.tpl

diff --git a/public/include/pages/contactform.inc.php b/public/include/pages/contactform.inc.php
index 75dc427f..ad4a54c7 100644
--- a/public/include/pages/contactform.inc.php
+++ b/public/include/pages/contactform.inc.php
@@ -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");
diff --git a/public/templates/mpos/global/navigation.tpl b/public/templates/mpos/global/navigation.tpl
index fd2da85a..b18a1a83 100644
--- a/public/templates/mpos/global/navigation.tpl
+++ b/public/templates/mpos/global/navigation.tpl
@@ -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}
diff --git a/public/templates/mpos/support/default.tpl b/public/templates/mpos/support/default.tpl
deleted file mode 100644
index d56872ce..00000000
--- a/public/templates/mpos/support/default.tpl
+++ /dev/null
@@ -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>