From ed30c60150ffda0301eb1f8d30c93cac94de41df Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 25 Jul 2011 10:38:22 -0400
Subject: [PATCH] Fixed some warnings in the installer.
---
interface/lib/app.inc.php | 204 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 128 insertions(+), 76 deletions(-)
diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index fc63f02..4de9904 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 - 2009, 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,36 +39,50 @@
private $_language_inc = 0;
private $_wb;
private $_loaded_classes = array();
- private $_conf;
+ private $_conf;
- public function __construct()
- {
+ public function __construct() {
global $conf;
+
+ if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS']) || isset($_REQUEST['s']) || isset($_REQUEST['s_old']) || isset($_REQUEST['conf'])) {
+ die('Internal Error: var override attempt detected');
+ }
+
$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) {
- session_start();
+ if($this->_conf['start_session'] == true) {
+ $this->uses('session');
+ session_set_save_handler( array($this->session, 'open'),
+ array($this->session, 'close'),
+ array($this->session, 'read'),
+ array($this->session, 'write'),
+ array($this->session, 'destroy'),
+ array($this->session, 'gc'));
+
+ session_start();
+
//* Initialize session variables
if(!isset($_SESSION['s']['id']) ) $_SESSION['s']['id'] = session_id();
if(empty($_SESSION['s']['theme'])) $_SESSION['s']['theme'] = $conf['theme'];
if(empty($_SESSION['s']['language'])) $_SESSION['s']['language'] = $conf['language'];
}
+
+ $this->uses('auth,plugin,functions');
}
- public function uses($classes)
- {
- $cl = explode(',', $classes);
+ public function uses($classes) {
+ $cl = explode(',', $classes);
if(is_array($cl)) {
- foreach($cl as $classname){
+ foreach($cl as $classname) {
$classname = trim($classname);
- //* Class is not loaded so load it
- if(!array_key_exists($classname, $this->_loaded_classes)){
+ //* Class is not loaded so load it
+ if(!array_key_exists($classname, $this->_loaded_classes)) {
include_once(ISPC_CLASS_PATH."/$classname.inc.php");
$this->$classname = new $classname();
$this->_loaded_classes[$classname] = true;
@@ -81,11 +91,10 @@
}
}
- public function load($files)
- {
+ public function load($files) {
$fl = explode(',', $files);
if(is_array($fl)) {
- foreach($fl as $file){
+ foreach($fl as $file) {
$file = trim($file);
include_once(ISPC_CLASS_PATH."/$file.inc.php");
}
@@ -93,91 +102,134 @@
}
/** Priority values are: 0 = DEBUG, 1 = WARNING, 2 = ERROR */
- public function log($msg, $priority = 0)
- {
+ public function log($msg, $priority = 0) {
+ global $conf;
if($priority >= $this->_conf['log_priority']) {
+ // $server_id = $conf["server_id"];
+ $server_id = 0;
+ $priority = intval($priority);
+ $tstamp = time();
+ $msg = $this->db->quote('[INTERFACE]: '.$msg);
+ $this->db->query("INSERT INTO sys_log (server_id,datalog_id,loglevel,tstamp,message) VALUES ($server_id,0,$priority,$tstamp,'$msg')");
+ /*
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.');
}
- }
- }
+ */
+ }
+ }
- /** Priority values are: 0 = DEBUG, 1 = WARNING, 2 = ERROR */
- public function error($msg, $next_link = '', $stop = true, $priority = 1)
- {
+ /** Priority values are: 0 = DEBUG, 1 = WARNING, 2 = ERROR */
+ public function error($msg, $next_link = '', $stop = true, $priority = 1) {
//$this->uses("error");
//$this->error->message($msg, $priority);
- if($stop == true){
- $msg = '<html>
-<head>
-<title>Error</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="../themes/default/style.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-<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>';
- $msg .= '</td>
-</tr>
-</table>
-</body>
-</html>';
- die($msg);
+ if($stop == true) {
+ /*
+ * We always have a error. So it is better not to use any more objects like
+ * the template or so, because we don't know why the error occours (it could be, that
+ * the error occours in one of these objects..)
+ */
+ /*
+ * Use the template inside the user-template - Path. If it is not found, fallback to the
+ * default-template (the "normal" behaviour of all template - files)
+ */
+ if (file_exists(dirname(__FILE__) . '/../web/themes/' . $_SESSION['s']['theme'] . '/templates/error.tpl.htm')) {
+ $content = file_get_contents(dirname(__FILE__) . '/../web/themes/' . $_SESSION['s']['theme'] . '/templates/error.tpl.htm');
+ } else {
+ $content = file_get_contents(dirname(__FILE__) . '/../web/themes/default/templates/error.tpl.htm');
+ }
+ if($next_link != '') $msg .= '<a href="'.$next_link.'">Next</a>';
+ $content = str_replace('###ERRORMSG###', $msg, $content);
+ die($content);
} else {
echo $msg;
if($next_link != '') echo "<a href='$next_link'>Next</a>";
}
}
- /** Loads language */
- public function lng($text)
- {
+ /** Translates strings in current language */
+ public function lng($text) {
if($this->_language_inc != 1) {
- //* 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');
- $this->_wb = $wb;
+ //* loading global Wordbook
+ $this->load_language_file('/lib/lang/'.$_SESSION['s']['language'].'.lng');
+ //* Load module wordbook, if it exists
+ if(isset($_SESSION['s']['module']['name']) && isset($_SESSION['s']['language'])) {
+ $lng_file = '/web/'.$_SESSION['s']['module']['name'].'/lib/lang/'.$_SESSION['s']['language'].'.lng';
+ if(!file_exists(ISPC_ROOT_PATH.'/'.$lng_file)) $lng_file = '/web/'.$_SESSION['s']['module']['name'].'/lib/lang/en.lng';
+ $this->load_language_file($lng_file);
+ }
$this->_language_inc = 1;
- }
+ }
if(!empty($this->_wb[$text])) {
$text = $this->_wb[$text];
+ } else {
+ if($this->_conf['debug_language']) {
+ $text = '#'.$text.'#';
+ }
}
return $text;
}
- 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', ' ');
+ //** Helper function to load the language files.
+ public function load_language_file($filename) {
+ $filename = ISPC_ROOT_PATH.'/'.$filename;
+ if(substr($filename,-4) != '.lng') $this->error('Language file has wrong extension.');
+ if(file_exists($filename)) {
+ @include($filename);
+ if(is_array($wb)) {
+ if(is_array($this->_wb)) {
+ $this->_wb = array_merge($this->_wb,$wb);
+ } else {
+ $this->_wb = $wb;
+ }
+ }
}
+ }
+
+ public function tpl_defaults() {
$this->tpl->setVar('app_title', $this->_conf['app_title']);
+ if(isset($_SESSION['s']['user'])) {
+ $this->tpl->setVar('app_version', $this->_conf['app_version']);
+ } else {
+ $this->tpl->setVar('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);
+ //print_r($_SESSION);
if(isset($_SESSION['s']['module']['name'])) {
$this->tpl->setVar('app_module', $_SESSION['s']['module']['name']);
}
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);
+ }
+ /* Show username */
+ if(isset($_SESSION['s']['user'])) {
+ $this->tpl->setVar('cpuser', $_SESSION['s']['user']['username']);
+ }
+ }
+
} // end class
//** Initialize application (app) object
--
Gitblit v1.9.1