From 4cfff787c076d963ff56103ef416a1ea661a375d Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Thu, 15 Dec 2005 11:41:04 -0500
Subject: [PATCH]
---
interface/web/dns/soa_edit.php | 5 +++++
interface/lib/config.inc.php | 7 ++++---
interface/web/themes/default/templates/main.tpl.htm | 2 +-
interface/lib/app.inc.php | 7 ++++++-
interface/web/themes/default/images/mydns_config_logo.png | 0
5 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index 9bf8af7..2c304a5 100644
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -144,7 +144,7 @@
if($this->_language_inc != 1) {
// loading global and module Wordbook
@include_once($conf["rootpath"]."/lib/lang/".$_SESSION["s"]["language"].".lng");
- @include_once($conf["rootpath"]."/web/".$_SESSION["s"]["module"]["name"]."/lib/lang/".$_SESSION["s"]["language"].".lng");
+ @include_once($conf["rootpath"]."/web/".$_SESSION["s"]["module"]["name"]."/lib/lang/".$_SESSION["s"]["language"].".lng");
$this->_wb = $wb;
$this->_language_inc = 1;
}
@@ -162,6 +162,11 @@
$this->tpl->setVar('theme',$_SESSION["s"]["theme"]);
$this->tpl->setVar('phpsessid',session_id());
$this->tpl->setVar('html_content_encoding',$conf["html_content_encoding"]);
+ if($conf["logo"] != '' && @is_file($conf["logo"])){
+ $this->tpl->setVar('logo', '<img src="'.$conf["logo"].'" border="0" alt="">');
+ } else {
+ $this->tpl->setVar('logo', ' ');
+ }
}
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index 8f63a89..2be920c 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -29,9 +29,9 @@
ini_set('register_globals',0);
-$conf["rootpath"] = "F:\\server\\www\\ispconfig3\\interface";
-//$conf["rootpath"] = "D:\\www\\ispconfig3\\interface";
-//$conf["rootpath"] = "/home/www/ispconfig3/web/cms";
+$conf["rootpath"] = "F:\\server\\www\\ispconfig3\\interface";
+//$conf["rootpath"] = "D:\\www\\ispconfig3\\interface";
+//$conf["rootpath"] = "/home/www/ispconfig3/web/cms";
$conf["fs_div"] = "\\"; // File system divider, \\ on windows and / on linux and unix
$conf["classpath"] = $conf["rootpath"].$conf["fs_div"]."lib".$conf["fs_div"]."classes";
@@ -64,6 +64,7 @@
$conf["theme"] = 'default';
$conf["html_content_encoding"] = 'text/html; charset=iso-8859-1';
+$conf["logo"] = 'themes/default/images/mydns_config_logo.png';
/*
Default Language
diff --git a/interface/web/dns/soa_edit.php b/interface/web/dns/soa_edit.php
index e75f969..e38109f 100644
--- a/interface/web/dns/soa_edit.php
+++ b/interface/web/dns/soa_edit.php
@@ -56,6 +56,11 @@
function onSubmit() {
global $app, $conf;
+ if($app->tform->getCurrentTab() == 'rr'){
+ parent::onSubmit();
+ return true;
+ }
+
if($this->dataRecord['id'] > 0){
if(!$app->tform->checkPerm($this->dataRecord['id'],'u')) $app->error($app->tform->wordbook['error_no_permission']);
} else {
diff --git a/interface/web/themes/default/images/mydns_config_logo.png b/interface/web/themes/default/images/mydns_config_logo.png
new file mode 100644
index 0000000..2bbecdf
--- /dev/null
+++ b/interface/web/themes/default/images/mydns_config_logo.png
Binary files differ
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index b57e866..3cb8da4 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -18,7 +18,7 @@
<body bgcolor="#FFFFFF" leftmargin=0 topmargin=0 marginwidth=0 marginheight=0 onload="breakout()">
<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
<tr bgcolor="#496FA8">
- <td height="30" colspan="2" align="center" valign="top" background="themes/{tmpl_var name="theme"}/images/bg_nav_1.jpg"> </td>
+ <td height="30" colspan="2" align="right" valign="top" background="themes/{tmpl_var name="theme"}/images/bg_nav_1.jpg"><tmpl_var name="logo"></td>
</tr>
<tr bgcolor="#FFFFFF">
<td height="1" colspan="2" align="center" valign="bottom"><img src="themes/{tmpl_var name="theme"}/images/x.gif" width="1" height="1"></td>
--
Gitblit v1.9.1