From e1b50e3294c3d422b0579c372700c522ecee34ca Mon Sep 17 00:00:00 2001 From: kevin_fourie Date: Fri, 1 Aug 2008 10:12:52 +0000 Subject: [PATCH] Merged in from DEV trunk... --- lib/templating/smartytemplate.inc.php | 20 +++++++++++--------- templates/ktcore/search2/search_portlet.smarty | 2 ++ templates/ktcore/search2/search_results.smarty | 6 +++--- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/lib/templating/smartytemplate.inc.php b/lib/templating/smartytemplate.inc.php index d675b3a..1cc3a85 100644 --- a/lib/templating/smartytemplate.inc.php +++ b/lib/templating/smartytemplate.inc.php @@ -8,31 +8,31 @@ * Document Management Made Simple * Copyright (C) 2008 KnowledgeTree Inc. * Portions copyright The Jam Warehouse Software (Pty) Limited - * + * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the * Free Software Foundation. - * + * * This program is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * - * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, + * + * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, * California 94120-7775, or email info@knowledgetree.com. - * + * * The interactive user interfaces in modified source and object code versions * of this program must display Appropriate Legal Notices, as required under * Section 5 of the GNU General Public License version 3. - * + * * In accordance with Section 7(b) of the GNU General Public License version 3, * these Appropriate Legal Notices must retain the display of the "Powered by - * KnowledgeTree" logo and retain the original copyright notice. If the display of the + * KnowledgeTree" logo and retain the original copyright notice. If the display of the * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices - * must display the words "Powered by KnowledgeTree" and retain the original + * must display the words "Powered by KnowledgeTree" and retain the original * copyright notice. * Contributor( s): ______________________________________ */ @@ -104,6 +104,8 @@ class KTSmartyTemplate extends KTTemplate { $_SESSION['search2_quickQuery'] = ''; } + $smarty->assign('search2_anonymous', !array_key_exists('userID', $_SESSION) || ($_SESSION['userID'] == -2)); + $smarty->assign('search2_user', $_SESSION['userId']); $smarty->assign('search2_quick', $search2_quick); $smarty->assign('search2_general', $search2_general); $smarty->assign('search2_quickQuery', $search2_quickQuery); diff --git a/templates/ktcore/search2/search_portlet.smarty b/templates/ktcore/search2/search_portlet.smarty index 0e0297e..95f567b 100644 --- a/templates/ktcore/search2/search_portlet.smarty +++ b/templates/ktcore/search2/search_portlet.smarty @@ -4,7 +4,9 @@ {if (count($savedSearches) > 0)} diff --git a/templates/ktcore/search2/search_results.smarty b/templates/ktcore/search2/search_results.smarty index 84d65a7..9215996 100755 --- a/templates/ktcore/search2/search_results.smarty +++ b/templates/ktcore/search2/search_results.smarty @@ -13,7 +13,7 @@ {/capture} {i18n arg_options=$options}Use the #options# to extend your search criteria.{/i18n} {/if} -{if !empty($iSavedID)} +{if !$search2_anonymous && !empty($iSavedID)} {capture assign=options} Query Editor {/capture} @@ -22,7 +22,7 @@
-{if !empty($iSavedID)} +{if !$search2_anonymous && !empty($iSavedID)}
{i18n}Saved Search{/i18n} {i18n}This is the saved search criteria:{/i18n} {$txtSavedName}.
@@ -98,7 +98,7 @@ function onShowAll(showall) {/literal} -{if empty($iSavedID)} +{if !$search2_anonymous && empty($iSavedID)}
{i18n}You can save this search:{/i18n} -- libgit2 0.21.4