From e6a2917b9de293e735df5dbf0b10dce967185f45 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 17 Apr 2013 10:35:00 -0400
Subject: [PATCH] Fix in ispconfig url detection function when nginx returns '_' as $_SERVER['SERVER_NAME']
---
interface/lib/classes/searchform_actions.inc.php | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/interface/lib/classes/searchform_actions.inc.php b/interface/lib/classes/searchform_actions.inc.php
index 97b5ab0..a451f4a 100644
--- a/interface/lib/classes/searchform_actions.inc.php
+++ b/interface/lib/classes/searchform_actions.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-Copyright (c) 2005, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -26,13 +26,6 @@
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/**
-* Action framework for the searchform library.
-*
-* @author Till Brehm <t.brehm@scrigo.org>
-* @copyright Copyright © 2005, Till Brehm
*/
class searchform_actions {
@@ -109,6 +102,11 @@
foreach($app->searchform->listDef["item"] as $field) {
$key = $field["field"];
if($field['formtype'] == "SELECT") {
+ if($rec[$key] == 'y' or $rec[$key] == 'n') {
+ // Set a additional image variable for bolean fields
+ $rec['_'.$key.'_'] = ($rec[$key] == 'y')?'list_icon_true.png':'list_icon_false.png';
+ }
+ // substitute value for select field
$rec[$key] = $field['value'][$rec[$key]];
}
}
@@ -153,7 +151,11 @@
global $app;
// Language File setzen
+ $lng_file = ISPC_WEB_PATH.'/lang/lib/lang/'.$_SESSION['s']['language'].'_list.lng';
+ if(!file_exists($lng_file)) $lng_file = ISPC_WEB_PATH.'/lang/lib/lang/en_'.'_list.lng';
+ include($lng_file);
$lng_file = "lib/lang/".$_SESSION["s"]["language"]."_".$app->searchform->listDef['name']."_search.lng";
+ if(!file_exists($lng_file)) $lng_file = 'lib/lang/en_'.$app->searchform->listDef['name']."_search.lng";
include($lng_file);
$app->tpl->setVar($wb);
$app->tpl->setVar("form_action",$app->searchform->listDef["file"]);
--
Gitblit v1.9.1