Fixed: FS#431 - jailkit users cannot login

tbrehm

2009-01-27 cbda30058c0f61ae2afbd9085afcf841f32751a5

 interface/lib/app.inc.php

@@ -1,6 +1,7 @@
<?php

/*
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,
@@ -27,101 +28,106 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

/*
    Application Class
*/

ob_start('ob_gzhandler');

class app {

   private  $_language_inc = 0;
   private $_language_inc = 0;
   private $_wb;
   private $_loaded_classes = array();
   private $_conf;

   public function __construct() {
   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;
      }
      
      if($conf['start_db'] == true) {
            $this->load('db_'.$conf['db_type']);
            $this->db = new db;
      }

      if($conf['start_session'] == true) {
      //* Start the session
      if($this->_conf['start_session'] == true) {
         session_start();
            //* Initialise vars if session is not set
            if( !isset($_SESSION['s']['id']) ){
                $_SESSION['s'] = array('id' => session_id(), 'theme' => $conf['theme'], 'language' => $conf['language']);
            }
			
         //* 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');
   }

   public function uses($classes) {
      global $conf;
		
      $cl = explode(',',$classes);
   public function uses($classes)
    {	
        $cl = explode(',', $classes);
      if(is_array($cl)) {
         foreach($cl as $classname){
            $classname = trim($classname);
                //* Class is not loaded so load it
            if(!array_key_exists($classname, $this->_loaded_classes)){
               include_once($conf['classpath'] . '/'.$classname.'.inc.php');
               $this->$classname = new $classname;
               include_once(ISPC_CLASS_PATH."/$classname.inc.php");
               $this->$classname = new $classname();
               $this->_loaded_classes[$classname] = true;
            }
         }
      }
   }

   public function load($files) {
      global $conf;
		
      $fl = explode(',',$files);
   public function load($files)
    {	
      $fl = explode(',', $files);
      if(is_array($fl)) {
         foreach($fl as $file) {
            include_once($conf['classpath'] . '/'.$file.'.inc.php');
         foreach($fl as $file){
            $file = trim($file);
            include_once(ISPC_CLASS_PATH."/$file.inc.php");
         }
      }
   }

   /*
      0 = DEBUG
      1 = WARNING
      2 = ERROR
   */
   public function log($msg, $priority = 0) {
      global $conf;
		
      if($priority >= $conf['log_priority']) {
         if (is_writable($conf['log_file'])) {
            if (!$fp = fopen ($conf['log_file'], 'a')) {
               $this->error('Logfile konnte nicht ge�ffnet werden.');
   /** Priority values are: 0 = DEBUG, 1 = WARNING,  2 = ERROR */
   public function log($msg, $priority = 0)
    {	
      if($priority >= $this->_conf['log_priority']) {
         if (is_writable($this->_conf['log_file'])) {
            if (!$fp = fopen ($this->_conf['log_file'], 'a')) {
               $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.');
         }
      } 
   } 

   /*
      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>
         $msg = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<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">
<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;
      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>
@@ -134,48 +140,60 @@
      }
   }

    public function lng($text){
      global $conf;
		
    /** Loads language */
    public function lng($text)
    {
      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');
            // TODO: this need to be made clearer somehow - pedro
         @include_once(ISPC_ROOT_PATH.'/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;
      }
		
      }		
      if(!empty($this->_wb[$text])) {
         $text = $this->_wb[$text];
      }
		
      return $text;
   }

    public function tpl_defaults() {
      global $conf;
	
      $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="">');
    public function tpl_defaults()
    {	
      $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('logo', '&nbsp;');
         $this->tpl->setVar('app_logo', '&nbsp;');
      }
      $this->tpl->setVar('app_title',$conf["app_title"]);
      $this->tpl->setVar('delete_confirmation',$this->lng('delete_confirmation'));
      $this->tpl->setVar('app_module',$_SESSION['s']['module']['name']);

      $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'])) {
         $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);
         $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

/*
 Initialize application (app) object
*/
$app = new app(); // new app($conf);
//** Initialize application (app) object
//* possible future =  new app($conf);
$app = new app();

?>