Commit 4cfff787 authored by Falko Timme's avatar Falko Timme
Browse files

No commit message

No commit message
parent 6d0a4e43
......@@ -144,7 +144,7 @@ class app {
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 @@ class app {
$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', '&nbsp;');
}
}
......
......@@ -29,9 +29,9 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
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["programs"]["wput"] = $conf["rootpath"]."\\tools\\w
$conf["theme"] = 'default';
$conf["html_content_encoding"] = 'text/html; charset=iso-8859-1';
$conf["logo"] = 'themes/default/images/mydns_config_logo.png';
/*
Default Language
......
......@@ -56,6 +56,11 @@ class page_action extends tform_actions {
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 {
......
......@@ -18,7 +18,7 @@ if (window.top != window.self)
<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">&nbsp;</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>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment