Fixed: FS#1124 - Traffic quota on some systems not working

tbrehm

2010-03-21 b0ebbdedaa0805599b97a9d3bbc96c0a5cf2bbac

 interface/lib/app.inc.php

@@ -65,7 +65,7 @@
         if(empty($_SESSION['s']['language'])) $_SESSION['s']['language'] = $conf['language'];
      }
      
      $this->uses('auth');
      $this->uses('auth,plugin');
   }

   public function uses($classes)
@@ -98,7 +98,15 @@
   /** Priority values are: 0 = DEBUG, 1 = WARNING,  2 = ERROR */
   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('Unable to open logfile.');
@@ -110,6 +118,7 @@
         } else {
            $this->error('Unable to write to logfile.');
         }
         */
      } 
   } 

@@ -151,21 +160,22 @@
    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');
         //* 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($lng_file)) $lng_file = '/web/'.$_SESSION['s']['module']['name'].'/lib/lang/en.lng';
            //@include_once($lng_file);
            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);
         }
         //if(isset($wb)) $this->_wb = $wb;
         $this->_language_inc = 1;
      }      
      if(!empty($this->_wb[$text])) {
         $text = $this->_wb[$text];
      } else {
         if($this->_conf['debug_language']) {
            $text = '#'.$text.'#';
         }
      }
      return $text;
   }
@@ -178,7 +188,7 @@
         @include_once($filename);
         if(is_array($wb)) {
            if(is_array($this->_wb)) {
               $this->_wb = array_merge($wb,$this->_wb);
               $this->_wb = array_merge($this->_wb,$wb);
            } else {
               $this->_wb = $wb;
            }
@@ -189,7 +199,11 @@
    public function tpl_defaults()
    {   
      $this->tpl->setVar('app_title', $this->_conf['app_title']);
      $this->tpl->setVar('app_version', $this->_conf['app_version']);
      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'].'">');