From 00dfbafa919e12b7fb4fb869b273ec724e0ade07 Mon Sep 17 00:00:00 2001
From: redray <redray@ispconfig3>
Date: Sun, 30 Nov 2008 15:11:25 -0500
Subject: [PATCH] charset corrections
---
interface/lib/app.inc.php | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index 9d635ae..ae5d9f4 100644
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -100,14 +100,14 @@
if($priority >= $this->_conf['log_priority']) {
if (is_writable($this->_conf['log_file'])) {
if (!$fp = fopen ($this->_conf['log_file'], 'a')) {
- $this->error('Logfile konnte nicht ge�ffnet werden.');
+ $this->error('Unable to open logfile.');
}
if (!fwrite($fp, date('d.m.Y-H:i').' - '. $msg."\r\n")) {
- $this->error('Schreiben in Logfile nicht m�glich.');
+ $this->error('Unable to write to logfile.');
}
fclose($fp);
} else {
- $this->error('Logfile ist nicht beschreibbar.');
+ $this->error('Unable to write to logfile.');
}
}
}
@@ -121,7 +121,7 @@
$msg = '<html>
<head>
<title>Error</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link href="../themes/default/style.css" rel="stylesheet" type="text/css">
</head>
<body>
@@ -161,15 +161,20 @@
public function tpl_defaults()
{
- $this->tpl->setVar('theme', $_SESSION['s']['theme']);
+ $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']);
+
$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('app_title', $this->_conf['app_title']);
+
$this->tpl->setVar('delete_confirmation', $this->lng('delete_confirmation'));
//print_r($_SESSION);
if(isset($_SESSION['s']['module']['name'])) {
@@ -181,7 +186,6 @@
if(isset($_SESSION['s']['user']) && $this->auth->has_clients($_SESSION['s']['user']['userid'])) {
$this->tpl->setVar('is_reseller', 1);
}
- $this->tpl->setVar('ISPC_APP_VERSION', ISPC_APP_VERSION);
}
} // end class
--
Gitblit v1.9.1