Fixed bug from previous commit

Marius Cramer

2014-01-22 ad955792a8ade5c0015aa3d68f86b1035c1acc31

 interface/lib/app.inc.php

old mode 100644
new mode 100755
@@ -28,12 +28,20 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

//* Enable gzip compression for the interface
ob_start('ob_gzhandler');

//* Set timezone
if(isset($conf['timezone']) && $conf['timezone'] != '') date_default_timezone_set($conf['timezone']);

//* Set error reporting level when we are not on a developer system
if(DEVSYSTEM == 0) {
   @ini_set('error_reporting', E_ALL & ~E_NOTICE & ~E_DEPRECATED);
}

/*
    Application Class
*/

ob_start('ob_gzhandler');

class app {

   private $_language_inc = 0;
@@ -56,15 +64,54 @@

      //* Start the session
      if($this->_conf['start_session'] == true) {
         session_start();

         $this->uses('session');
         $tmp = $this->db->queryOneRecord("SELECT `value` FROM sys_config WHERE `config_id` = 2 AND `group` = 'interface' AND `name` = 'session_timeout'");
         if($tmp && $tmp['value'] > 0) {
            /* check if user wants to stay logged in */
            if(isset($_POST['s_mod']) && isset($_POST['s_pg']) && $_POST['s_mod'] == 'login' && $_POST['s_pg'] == 'index' && isset($_POST['stay']) && $_POST['stay'] == '1') {
               /* check if staying logged in is allowed */
               $this->uses('ini_parser');
               $tmp = $this->db->queryOneRecord('SELECT config FROM sys_ini WHERE sysini_id = 1');
               $tmp = $this->ini_parser->parse_ini_string(stripslashes($tmp['config']));
               if(!isset($tmp['misc']['session_allow_endless']) || $tmp['misc']['session_allow_endless'] != 'y') {
                  $this->session->set_timeout($tmp['value']);
                  session_set_cookie_params(($tmp['value'] * 60) + 300); // make the cookie live 5 minutes longer
               } else {
                  // we are doing login here, so we need to set the session data
                  $this->session->set_permanent(true);
                  $this->session->set_timeout(365 * 24 * 3600); // one year
                  session_set_cookie_params(365 * 24 * 3600); // make the cookie live 5 minutes longer
               }
            } else {
               $this->session->set_timeout($tmp['value']);
               session_set_cookie_params(($tmp['value'] * 60) + 300); // make the cookie live 5 minutes longer
            }
         } else {
            session_set_cookie_params(0); // until browser is closed
         }
			
         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('functions'); // we need this before all others!
      $this->uses('auth,plugin');
   }

   public function __destruct() {
      session_write_close();
   }

   public function uses($classes) {
@@ -74,7 +121,7 @@
            $classname = trim($classname);
            //* Class is not loaded so load it
            if(!array_key_exists($classname, $this->_loaded_classes)) {
               include_once(ISPC_CLASS_PATH."/$classname.inc.php");
               include_once ISPC_CLASS_PATH."/$classname.inc.php";
               $this->$classname = new $classname();
               $this->_loaded_classes[$classname] = true;
            }
@@ -87,18 +134,20 @@
      if(is_array($fl)) {
         foreach($fl as $file) {
            $file = trim($file);
            include_once(ISPC_CLASS_PATH."/$file.inc.php");
            include_once ISPC_CLASS_PATH."/$file.inc.php";
         }
      }
   }

   /** 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);
         $priority = $this->functions->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')");
@@ -148,13 +197,15 @@

   /** Translates strings in current language */
   public function lng($text) {
      global $conf;
      if($this->_language_inc != 1) {
         $language = (isset($_SESSION['s']['language']))?$_SESSION['s']['language']:$conf['language'];
         //* loading global Wordbook
         $this->load_language_file('/lib/lang/'.$_SESSION['s']['language'].'.lng');
         $this->load_language_file('lib/lang/'.$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';
         if(isset($_SESSION['s']['module']['name'])) {
            $lng_file = 'web/'.$_SESSION['s']['module']['name'].'/lib/lang/'.$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;
@@ -172,12 +223,12 @@
   //** 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(substr($filename, -4) != '.lng') $this->error('Language file has wrong extension.');
      if(file_exists($filename)) {
         @include_once($filename);
         @include $filename;
         if(is_array($wb)) {
            if(is_array($this->_wb)) {
               $this->_wb = array_merge($this->_wb,$wb);
               $this->_wb = array_merge($this->_wb, $wb);
            } else {
               $this->_wb = $wb;
            }
@@ -189,15 +240,24 @@
      $this->tpl->setVar('app_title', $this->_conf['app_title']);
      if(isset($_SESSION['s']['user'])) {
         $this->tpl->setVar('app_version', $this->_conf['app_version']);
         // get pending datalog changes
         $datalog = $this->db->datalogStatus();
         $this->tpl->setVar('datalog_changes_txt', $this->lng('datalog_changes_txt'));
         $this->tpl->setVar('datalog_changes_end_txt', $this->lng('datalog_changes_end_txt'));
         $this->tpl->setVar('datalog_changes_count', $datalog['count']);
         $this->tpl->setLoop('datalog_changes', $datalog['entries']);
      } 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', '&nbsp;');
      }
      */
      $this->tpl->setVar('app_logo', $this->_conf['logo']);

      $this->tpl->setVar('phpsessid', session_id());

@@ -218,7 +278,21 @@
      /* Show username */
      if(isset($_SESSION['s']['user'])) {
         $this->tpl->setVar('cpuser', $_SESSION['s']['user']['username']);
         $this->tpl->setVar('logout_txt', $this->lng('logout_txt'));
         /* Show search field only for normal users, not mail users */
         if(stristr($_SESSION['s']['user']['username'], '@')){
            $this->tpl->setVar('usertype', 'mailuser');
         } else {
            $this->tpl->setVar('usertype', 'normaluser');
         }
      }

      /* Global Search */
      $this->tpl->setVar('globalsearch_resultslimit_of_txt', $this->lng('globalsearch_resultslimit_of_txt'));
      $this->tpl->setVar('globalsearch_resultslimit_results_txt', $this->lng('globalsearch_resultslimit_results_txt'));
      $this->tpl->setVar('globalsearch_noresults_text_txt', $this->lng('globalsearch_noresults_text_txt'));
      $this->tpl->setVar('globalsearch_noresults_limit_txt', $this->lng('globalsearch_noresults_limit_txt'));
      $this->tpl->setVar('globalsearch_searchfield_watermark_txt', $this->lng('globalsearch_searchfield_watermark_txt'));
   }

} // end class
@@ -227,4 +301,4 @@
//* possible future =  new app($conf);
$app = new app();

?>
?>