From ec09b18c9c44f85ceb6d9e7588a03a221cd1193f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 12 Dec 2008 05:47:05 -0500
Subject: [PATCH] Disallow server changes for existing records in mail_domain_edit.php
---
interface/lib/app.inc.php | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index ae5d9f4..c003ef4 100644
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -1,15 +1,7 @@
<?php
-/**
- * Application Class
- *
- * @author Till Brehm
- * @copyright 2005, Till Brehm, projektfarm Gmbh
- * @version 0.1
- * @package ISPConfig
- */
/*
-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,
@@ -36,6 +28,10 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ Application Class
+*/
+
ob_start('ob_gzhandler');
class app {
@@ -43,15 +39,15 @@
private $_language_inc = 0;
private $_wb;
private $_loaded_classes = array();
- private $_conf;
+ private $_conf;
public function __construct()
{
global $conf;
$this->_conf = $conf;
if($this->_conf['start_db'] == true) {
- $this->load('db_'.$this->_conf['db_type']);
- $this->db = new db;
+ $this->load('db_'.$this->_conf['db_type']);
+ $this->db = new db;
}
//* Start the session
@@ -125,11 +121,11 @@
<link href="../themes/default/style.css" rel="stylesheet" type="text/css">
</head>
<body>
-<br><br><br>
+<br /><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="2">
<tr>
-<td class="error"><b>Error:</b><br>'.$msg;
- if($next_link != '') $msg .= '<a href="'.$next_link.'">Next</a><br>';
+<td class="error"><b>Error:</b><br />'.$msg;
+ if($next_link != '') $msg .= '<a href="'.$next_link.'">Next</a><br />';
$msg .= '</td>
</tr>
</table>
@@ -149,7 +145,11 @@
//* loading global and module Wordbook
// TODO: this need to be made clearer somehow - pedro
@include_once(ISPC_ROOT_PATH.'/lib/lang/'.$_SESSION['s']['language'].'.lng');
- @include_once(ISPC_ROOT_PATH.'/web/'.$_SESSION['s']['module']['name'].'/lib/lang/'.$_SESSION['s']['language'].'.lng');
+ if(isset($_SESSION['s']['module']['name']) && isset($_SESSION['s']['language'])) {
+ $lng_file = ISPC_ROOT_PATH.'/web/'.$_SESSION['s']['module']['name'].'/lib/lang/'.$_SESSION['s']['language'].'.lng';
+ if(!file_exists($lng_file)) $lng_file = ISPC_ROOT_PATH.'/web/'.$_SESSION['s']['module']['name'].'/lib/lang/en.lng';
+ @include_once($lng_file);
+ }
$this->_wb = $wb;
$this->_language_inc = 1;
}
@@ -164,16 +164,16 @@
$this->tpl->setVar('app_title', $this->_conf['app_title']);
$this->tpl->setVar('app_version', $this->_conf['app_version']);
$this->tpl->setVar('app_link', $this->_conf['app_link']);
+ if(isset($this->_conf['app_logo']) && $this->_conf['app_logo'] != '' && @is_file($this->_conf['app_logo'])){
+ $this->tpl->setVar('app_logo', '<img src="'.$this->_conf['app_logo'].'">');
+ } else {
+ $this->tpl->setVar('app_logo', ' ');
+ }
$this->tpl->setVar('phpsessid', session_id());
$this->tpl->setVar('theme', $_SESSION['s']['theme']);
$this->tpl->setVar('html_content_encoding', $this->_conf['html_content_encoding']);
- if(isset($this->_conf['logo']) && $this->_conf['logo'] != '' && @is_file($this->_conf['logo'])){
- $this->tpl->setVar('logo', '<img src="'.$this->_conf['logo'].'" border="0" alt="">');
- } else {
- $this->tpl->setVar('logo', ' ');
- }
$this->tpl->setVar('delete_confirmation', $this->lng('delete_confirmation'));
//print_r($_SESSION);
--
Gitblit v1.9.1