From fdb51429328460e973a6c7fe8f89c3fb38cba47d Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 22 Feb 2010 11:47:13 -0500
Subject: [PATCH] - Added dovecot Support for opensuse - added installation instructions for opensuse 11.2 with bind and dovecot - fixed a bug in bind plugin. - improved opensuse installer.
---
interface/lib/classes/tform.inc.php | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index 4d7c148..4e047da 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -131,6 +131,9 @@
$wb = array();
include_once(ISPC_ROOT_PATH.'/lib/lang/'.$_SESSION['s']['language'].'.lng');
+
+ if(is_array($wb)) $wb_global = $wb;
+
if($module == '') {
$lng_file = "lib/lang/".$_SESSION["s"]["language"]."_".$this->formDef["name"].".lng";
if(!file_exists($lng_file)) $lng_file = "lib/lang/en_".$this->formDef["name"].".lng";
@@ -140,6 +143,12 @@
if(!file_exists($lng_file)) $lng_file = "../$module/lib/lang/en_".$this->formDef["name"].".lng";
include($lng_file);
}
+
+ if(is_array($wb_global)) {
+ $wb = array_merge($wb_global,$wb);
+ }
+ if(isset($wb_global)) unset($wb_global);
+
$this->wordbook = $wb;
return true;
@@ -965,6 +974,9 @@
foreach( $this->formDef["tabs"] as $key => $tab) {
$tab['name'] = $key;
+ // Translate the title of the tab
+ $tab['title'] = $this->lng($tab['title']);
+
if($tab['name'] == $active_tab) {
// If module is set, then set the template path relative to the module..
@@ -972,8 +984,7 @@
// Generate the template if it does not exist yet.
- // Translate the title of the tab
- $tab['title'] = $this->lng($tab['title']);
+
if(!is_file($tab["template"])) {
$app->uses('tform_tpl_generator');
@@ -1188,7 +1199,7 @@
// translation function for forms, tries the form wordbook first and if this fails, it tries the global wordbook
function lng($msg) {
- global $app;
+ global $app,$conf;
if(isset($this->wordbook[$msg])) {
return $this->wordbook[$msg];
--
Gitblit v1.9.1