genuineparts/BeCastWebEngine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bugfixes

Browse source
This commit is contained in:
genuineparts 2025-06-22 17:45:42 +02:00
parent 976ab4a5b0
commit fc5323835b
4 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
admin/index.php
View file

@ -1,4 +1,4 @@
<?php <?php global $lang, $session, $db, $error;
/** /**
* Project: BeCast WebEngine - simple site engine * Project: BeCast WebEngine - simple site engine
* File: /admin/index.php * File: /admin/index.php
@ -27,7 +27,7 @@
ERROR_REPORTING(E_ALL ^E_NOTICE); ERROR_REPORTING(E_ALL ^E_NOTICE);
$basepath=""; $basepath="";
$nav_include="../"; $nav_include="../";
require_once dirname(dirname(__FILE__)).'/core/init_core.inc.php'; require_once dirname(__FILE__, 2) .'/core/init_core.inc.php';
$session->page_begin("Admincenter", True); $session->page_begin("Admincenter", True);
define("in_BL_ADMIN",TRUE); define("in_BL_ADMIN",TRUE);
@ -41,7 +41,6 @@ function size_format($num, $prec = 2)
return $num . ' bytes'; return $num . ' bytes';
} }
} }
if(isset($session->userdata['uid']) && $session->userdata['uid']!=0 && ($session->userdata["admin_cp"] && $session->userdata["is_admin"])){ 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/admin.class.php';
require_once dirname(dirname(__FILE__)).'/inc/panel.class.php'; require_once dirname(dirname(__FILE__)).'/inc/panel.class.php';

2
core/init_core.inc.php
View file

@ -155,7 +155,6 @@ $root = $_SERVER['DOCUMENT_ROOT'] . $config['path'];
*/ */
require dirname(__FILE__, 2) .'/inc/lang.class.php'; require dirname(__FILE__, 2) .'/inc/lang.class.php';
$lang=new lang(); $lang=new lang();
$lang->setlang($config['lang']);
/** /**
* Check if we have a Theme variable and the Theme exists * 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(defined('INSTALLED')){
if(is_dir(dirname(__FILE__, 2) .'/install')){ if(is_dir(dirname(__FILE__, 2) .'/install')){
$session->page_begin("Maintenance", FALSE);
$core->message($lang->_('DELINSTALLDIR'), $lang->_('DELINSTALLDIRTEXT'),FALSE); $core->message($lang->_('DELINSTALLDIR'), $lang->_('DELINSTALLDIRTEXT'),FALSE);
return; return;
} }

19
inc/lang.class.php
View file

@ -31,16 +31,17 @@ class lang{
var $langname=array('de'=>'Deutsch','en'=>'English'); var $langname=array('de'=>'Deutsch','en'=>'English');
var $language; var $language;
var $languagedir; var $languagedir;
var $lf; var array $langdata;
function __construct($languagedir='/languages/'){ function __construct($languagedir='/languages/'){
$this->languagedir = dirname(dirname(__FILE__)).'/languages/'; $this->languagedir = dirname(dirname(__FILE__)).'/languages/';
} }
function setlang($language){ function setlang($language): void
global $config, $error, $db, $log, $core, $plugin, $lang; {
global $config;
unset($this->language); unset($this->language);
unset($this->lf); unset($this->langdata);
if(!$language || $language==''){ if(!$language || $language==''){
$language=$config['lang']; $language=$config['lang'];
if(!$language){ if(!$language){
@ -51,8 +52,10 @@ class lang{
}else{ }else{
$this->language=$language; $this->language=$language;
} }
include_once $this->languagedir.$this->language.'.lang.php'; require_once $this->languagedir.$this->language.'.lang.php';
$this->lf=$lf; if (isset($lf)) {
$this->langdata = $lf;
}
} }
function getlanguages(){ function getlanguages(){
@ -71,8 +74,8 @@ class lang{
} }
function _($string){ function _($string){
if(isset($this->lf[$string])){ if(isset($this->langdata[$string])){
return($this->lf[$string]); return($this->langdata[$string]);
}else{ }else{
return($string); return($string);
} }

2
inc/sessions.class.php
View file

@ -24,7 +24,7 @@ $module["session"]["ver"]="0.9.1";
* @author Bernhard Jaud <bernhard at becast dot at> * @author Bernhard Jaud <bernhard at becast dot at>
* @package astat core * @package astat core
* @license http://opensource.org/licenses/gpl-license.php GNU Public License * @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 { class session {