tbrehm
2009-05-04 723dd04bc0b3d36b704ee62643dae1818b09a613
interface/lib/app.inc.php
@@ -44,6 +44,11 @@
   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']);
@@ -114,21 +119,25 @@
      //$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=utf-8">
<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/css/central.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>
<div class="uniForm">
  <div id="errorMsg">
    <h3>Error</h3>
      <ol>
        <li>'.$msg;
         if($next_link != '') $msg .= '<a href="'.$next_link.'">Next</a>';
         $msg .= '</li>
      </ol>
  </div>
</div>
</body>
</html>';
         die($msg);
@@ -145,8 +154,12 @@
         //* 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;
         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);
         }
         if(isset($wb)) $this->_wb = $wb;
         $this->_language_inc = 1;
      }      
      if(!empty($this->_wb[$text])) {