From 2c4579ffbb4b3af0dfc78281884c8ce60998a3fb Mon Sep 17 00:00:00 2001
From: fantu <fantu@ispconfig3>
Date: Thu, 11 Dec 2008 08:17:20 -0500
Subject: [PATCH] All language are now full merge
---
interface/lib/app.inc.php | 58 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index fc63f02..d4e69cc 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,19 +39,19 @@
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
- if($conf["start_session"] == true) {
+ if($this->_conf['start_session'] == true) {
session_start();
//* Initialize session variables
@@ -63,6 +59,8 @@
if(empty($_SESSION['s']['theme'])) $_SESSION['s']['theme'] = $conf['theme'];
if(empty($_SESSION['s']['language'])) $_SESSION['s']['language'] = $conf['language'];
}
+
+ $this->uses('auth');
}
public function uses($classes)
@@ -98,14 +96,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.');
}
}
}
@@ -119,11 +117,11 @@
$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>
-<br><br><br>
+<br /><br /><br />
<table width="100%" border="0" cellspacing="0" cellpadding="2">
<tr>
<td class="error"><b>Error:</b><br>'.$msg;
@@ -159,15 +157,20 @@
public function tpl_defaults()
{
- $this->tpl->setVar('theme', $_SESSION['s']['theme']);
- $this->tpl->setVar('phpsessid', session_id());
- $this->tpl->setVar('html_content_encoding', $this->_conf['html_content_encoding']);
- if($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('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']);
+
$this->tpl->setVar('delete_confirmation', $this->lng('delete_confirmation'));
//print_r($_SESSION);
if(isset($_SESSION['s']['module']['name'])) {
@@ -176,6 +179,9 @@
if(isset($_SESSION['s']['user']) && $_SESSION['s']['user']['typ'] == 'admin') {
$this->tpl->setVar('is_admin', 1);
}
+ if(isset($_SESSION['s']['user']) && $this->auth->has_clients($_SESSION['s']['user']['userid'])) {
+ $this->tpl->setVar('is_reseller', 1);
+ }
}
} // end class
--
Gitblit v1.9.1