From fc5323835ba0d8760f2ddedd41f5604de36d6c69 Mon Sep 17 00:00:00 2001 From: genuineparts Date: Sun, 22 Jun 2025 17:45:42 +0200 Subject: [PATCH] bugfixes --- admin/index.php | 5 ++--- core/init_core.inc.php | 2 +- inc/lang.class.php | 19 +++++++++++-------- inc/sessions.class.php | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/admin/index.php b/admin/index.php index aadbc92..cd7064c 100644 --- a/admin/index.php +++ b/admin/index.php @@ -1,4 +1,4 @@ -page_begin("Admincenter", True); define("in_BL_ADMIN",TRUE); @@ -41,7 +41,6 @@ function size_format($num, $prec = 2) return $num . ' bytes'; } } - if(isset($session->userdata['uid']) && $session->userdata['uid']!=0 && ($session->userdata["admin_cp"] && $session->userdata["is_admin"])){ require_once dirname(dirname(__FILE__)).'/inc/admin.class.php'; require_once dirname(dirname(__FILE__)).'/inc/panel.class.php'; diff --git a/core/init_core.inc.php b/core/init_core.inc.php index 1ddb6c0..d0e56cf 100644 --- a/core/init_core.inc.php +++ b/core/init_core.inc.php @@ -155,7 +155,6 @@ $root = $_SERVER['DOCUMENT_ROOT'] . $config['path']; */ require dirname(__FILE__, 2) .'/inc/lang.class.php'; $lang=new lang(); -$lang->setlang($config['lang']); /** * Check if we have a Theme variable and the Theme exists @@ -206,6 +205,7 @@ $core=new core($db, $log, $tpl); if(defined('INSTALLED')){ if(is_dir(dirname(__FILE__, 2) .'/install')){ + $session->page_begin("Maintenance", FALSE); $core->message($lang->_('DELINSTALLDIR'), $lang->_('DELINSTALLDIRTEXT'),FALSE); return; } diff --git a/inc/lang.class.php b/inc/lang.class.php index feade45..ed285b8 100644 --- a/inc/lang.class.php +++ b/inc/lang.class.php @@ -31,16 +31,17 @@ class lang{ var $langname=array('de'=>'Deutsch','en'=>'English'); var $language; var $languagedir; - var $lf; + var array $langdata; function __construct($languagedir='/languages/'){ $this->languagedir = dirname(dirname(__FILE__)).'/languages/'; } - function setlang($language){ - global $config, $error, $db, $log, $core, $plugin, $lang; + function setlang($language): void + { + global $config; unset($this->language); - unset($this->lf); + unset($this->langdata); if(!$language || $language==''){ $language=$config['lang']; if(!$language){ @@ -51,8 +52,10 @@ class lang{ }else{ $this->language=$language; } - include_once $this->languagedir.$this->language.'.lang.php'; - $this->lf=$lf; + require_once $this->languagedir.$this->language.'.lang.php'; + if (isset($lf)) { + $this->langdata = $lf; + } } function getlanguages(){ @@ -71,8 +74,8 @@ class lang{ } function _($string){ - if(isset($this->lf[$string])){ - return($this->lf[$string]); + if(isset($this->langdata[$string])){ + return($this->langdata[$string]); }else{ return($string); } diff --git a/inc/sessions.class.php b/inc/sessions.class.php index 45aebd8..5007e58 100644 --- a/inc/sessions.class.php +++ b/inc/sessions.class.php @@ -24,7 +24,7 @@ $module["session"]["ver"]="0.9.1"; * @author Bernhard Jaud * @package astat core * @license http://opensource.org/licenses/gpl-license.php GNU Public License - * @version $Id: sessions.class.php 129 2010-02-21 22:04:51Z genuineparts $ + * @version $Id$ */ class session {