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

Improvements and typos

Browse source
This commit is contained in:
genuineparts 2025-06-23 20:13:52 +02:00
parent 3bdbc74b0e
commit 5b27274fa7
13 changed files with 78 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/adduser.apnl.php
View file

@ -1,4 +1,4 @@
<?php
<?php global $session;
/**
* Project: BeCast WebEngine - simple site engine
* File: /admin/addusers.apnl.php

2
admin/config.apnl.php
View file

@ -49,7 +49,7 @@ class config_panel extends admin_module{
$config[$row["name"]] = $row["value"];
}
}
$result = $db->query("SELECT * FROM `" . $config["prefix"] . "config` v LEFT JOIN `" . $config["prefix"] . "config_categorys` c ON v.`category`=c.`cid`");
$result = $db->query("SELECT * FROM `" . $config["prefix"] . "config` v LEFT JOIN `" . $config["prefix"] . "config_categories` c ON v.`category`=c.`cid`");
while ($row = $db->fetch_array($result)){
$data[$row["categoryname"]][]=$row;
}

30
admin/editusers.apnl.php
View file

@ -1,4 +1,4 @@
<?php
<?php global $session;
/**
* Project: BeCast WebEngine - simple site engine
* File: /admin/editusers.apnl.php
@ -111,12 +111,12 @@ class editusers_panel extends admin_module{
$panel->content.="<table id=\"users\" width=\"90%\" cellspacing=\"2\">
<thead>
<tr>
<th align=\"center\">".$lang->_('ID')."</th>
<th align=\"center\">".$lang->_('USERNAME')."</th>
<th align=\"center\">".$lang->_('REALNAME')."</th>
<th align=\"center\">".$lang->_('ROLE')."</th>
<th align=\"center\">".$lang->_('STATUS')."</th>
<th align=\"center\">".$lang->_('ACTION')."</th>
<th style=\"text-align='center';\">".$lang->_('ID')."</th>
<th style=\"text-align='center';\">".$lang->_('USERNAME')."</th>
<th style=\"text-align='center';\">".$lang->_('REALNAME')."</th>
<th style=\"text-align='center';\">".$lang->_('ROLE')."</th>
<th style=\"text-align='center';\">".$lang->_('STATUS')."</th>
<th style=\"text-align='center';\">".$lang->_('ACTION')."</th>
</tr></thead><tbody>";
if(!empty($user)){
foreach($user as $u){
@ -131,22 +131,22 @@ class editusers_panel extends admin_module{
$u['activestyle']='style="font-style:italic;"';
}
$panel->content.="<tr ".$u['activestyle'].">
<td align=\"center\">".$u["uid"]."</td>
<td align=\"center\">".$u["username"]."</td>
<td align=\"center\">".$u["realname"]."</td>
<td align=\"center\">".$u["role_name"]."</td>
<td align=\"center\">".$u['activetext']."</td>";
<td style=\"text-align='center';\">".$u["uid"]."</td>
<td style=\"text-align='center';\">".$u["username"]."</td>
<td style=\"text-align='center';\">".$u["realname"]."</td>
<td style=\"text-align='center';\">".$u["role_name"]."</td>
<td style=\"text-align='center';\">".$u['activetext']."</td>";
if($u["uid"]==$session->userdata["uid"]){
$panel->content.="<td align=\"center\"><a onclick=\"return confirmLink(this,'".$lang->_('BADIDEA')."')\" href=\"".$config["path"]."/admin/index.php?panel=editusers&amp;action=delete&amp;user=".$u["uid"]."\"><img src=\"".$config["path"]."/admin/images/icons/delete.png\" /></a> <a href=\"".$config["path"]."/admin/index.php?panel=editusers&amp;edituser=".$u["uid"]."\"><img src=\"".$config["path"]."/admin/images/icons/wrench.png\" /></a></td>
$panel->content.="<td style=\"text-align='center';\"><a onclick=\"return confirmLink(this,'".$lang->_('BADIDEA')."')\" href=\"".$config["path"]."/admin/index.php?panel=editusers&amp;action=delete&amp;user=".$u["uid"]."\"><img src=\"".$config["path"]."/admin/images/icons/delete.png\" /></a> <a href=\"".$config["path"]."/admin/index.php?panel=editusers&amp;edituser=".$u["uid"]."\"><img src=\"".$config["path"]."/admin/images/icons/wrench.png\" /></a></td>
</tr>";
}else{
$panel->content.="<td align=\"center\"><a onclick=\"return confirmLink(this, '".sprintf($lang->_('DELETEUSER'),$u["username"])."')\" href=\"".$config["path"]."/admin/index.php?panel=editusers&amp;action=delete&amp;user=".$u["uid"]."\"><img src=\"".$config["path"]."/admin/images/icons/delete.png\" /></a> <a href=\"".$config["path"]."/admin/index.php?panel=editusers&amp;edituser=".$u["uid"]."\"><img src=\"".$config["path"]."/admin/images/icons/wrench.png\" /></a></td>
$panel->content.="<td style=\"text-align='center';\"><a onclick=\"return confirmLink(this, '".sprintf($lang->_('DELETEUSER'),$u["username"])."')\" href=\"".$config["path"]."/admin/index.php?panel=editusers&amp;action=delete&amp;user=".$u["uid"]."\"><img src=\"".$config["path"]."/admin/images/icons/delete.png\" /></a> <a href=\"".$config["path"]."/admin/index.php?panel=editusers&amp;edituser=".$u["uid"]."\"><img src=\"".$config["path"]."/admin/images/icons/wrench.png\" /></a></td>
</tr>";
}
}
}else{
$panel->content.="<tr>
<td align=\"center\" colspan=\"5\">".$lang->_('NOUSERS')."</td>
<td style=\"text-align='center';\" colspan=\"5\">".$lang->_('NOUSERS')."</td>
</tr>";
}
$panel->content.="</tbody></table><br />";

17
core/init_core.inc.php
View file

@ -68,11 +68,6 @@ require dirname(__FILE__, 2) .'/inc/logger.class.php';
*/
require dirname(__FILE__, 2) .'/inc/datacache.class.php';
/**
* Cache
*/
require dirname(__FILE__, 2) .'/inc/cache.class.php';
/**
* Errors
*/
@ -119,10 +114,16 @@ if($config['LCLANG']){
$cache=new datacache();
/**
* Start Datacache
*
* Start Cache
* I think this is vestigial and can be deleted. Hesitant to remove it because some instance in the wild may use this?
*/
$ccache=new cache();
if(isset($config['MEMCACHE_SERVER'])) {
/**
* Cache
*/
require dirname(__FILE__, 2) .'/inc/cache.class.php';
$ccache = new cache();
}
/**
* Look if we have a path Variable and try to autoset if not.

53
inc/panel.class.php
View file

@ -26,23 +26,23 @@
*/
$module["panel"]["name"]="Panel Class";
$module["panel"]["ver"]="0.3.5";
$module["panel"]["ver"]="0.3.6";
class panel {
var $sidebar="";
var $page="";
var $bodyext="";
var $title="";
var $content="";
var $meta="";
var $form="";
var $foot="";
var $head="";
var $menu_items ="";
var string $sidebar="";
var string $page="";
var string $bodyext="";
var string $title="";
var string $content="";
var string $meta="";
var string $form="";
var string $foot="";
var string $head="";
var string $menu_items ="";
function page($additional_title="",$meta=""){
global $config,$db,$core;
return '<!DOCTYPE html>
<html>
<html lang="de">
<head>
<title>'.$config['sitetitle'].'</title>
<link rel="stylesheet" type="text/css" href="admin.css" />
@ -77,24 +77,26 @@ class panel {
exit();
}
function menu_item($panel,$text, $img=""){
function menu_item($panel,$text, $img=""): void
{
global $config, $userdata, $userinfo, $session, $meta;
if($panel=="group_only"){
$this->menu_items.="<li><strong>".$text."</strong></li>";
}elseif($panel=="admin_home"){
$this->menu_items.="<li><a href=\"".$config["path"]."/admin/index.php\"><img src=\"".$config["path"]."/admin/images/icons/".$img.".png\" /> ".$text."</a></li>";
$this->menu_items.="<li><a href=\"".$config["path"]."/admin/index.php\"><img src=\"".$config["path"]."/admin/images/icons/".$img.".png\" alt='".$img."'> ".$text."</a></li>";
}elseif($panel=="page_home"){
$this->menu_items.="<li><a href=\"".$config["path"]."/index.php\"><img src=\"".$config["path"]."/admin/images/icons/".$img.".png\" /> ".$text."</a></li>";
$this->menu_items.="<li><a href=\"".$config["path"]."/index.php\"><img src=\"".$config["path"]."/admin/images/icons/".$img.".png\" alt='".$img."'> ".$text."</a></li>";
}else{
if($img!=""){
$this->menu_items.="<li><a href=\"".$config["path"]."/admin/index.php?panel=".$panel."\"><img src=\"".$config["path"]."/admin/images/icons/".$img.".png\" /> ".$text."</a></li>";
$this->menu_items.="<li><a href=\"".$config["path"]."/admin/index.php?panel=".$panel."\"><img src=\"".$config["path"]."/admin/images/icons/".$img.".png\" alt='".$img."'> ".$text."</a></li>";
}else{
$this->menu_items.="<li><a href=\"".$config["path"]."/admin/index.php?panel=".$panel."\">".$text."</a></li>";
}
}
}
function admin_message($title,$message,$redirect=FALSE,$panel="",$time="4"){
function admin_message($title,$message,$redirect=FALSE,$panel="",$time="4"): void
{
global $config,$session,$lang;
$session->page_begin("Admin Message", True);
if($panel!="" && $redirect){
@ -111,7 +113,8 @@ class panel {
}
function menu(){
function menu(): string
{
return '<div id="menu">
<ul>'.$this->menu_items.'</ul></div>';
@ -120,8 +123,8 @@ class panel {
function form ($args = array(),$return=FALSE,$extra=""){
$method = $args["method"] ? $args["method"] : 'post';
$action = $args["action"] ? $args["action"] : $_SERVER['PHP_SELF'];
$method = $args["method"] ?? 'POST';
$action = $args["action"] ?? $_SERVER['PHP_SELF'];
$form = '<form action="' .$action. '" method="' .$method. '"' .$extra. '>';
if(!$return){
$this->content .= $form;
@ -129,7 +132,7 @@ class panel {
return $form;
}
}
function formClose ()
function formClose ($return=FALSE)
{
$form = '</form>';
@ -214,10 +217,10 @@ class panel {
*/
function textarea ($args = array(),$extra="",$return=FALSE)
{
$name = $args["name"] ? $args["name"] : 'field';
$rows = $args["rows"] ? $args["rows"] : '3';
$cols = $args["cols"] ? $args["cols"] : '30';
$text = $args["value"] ? $args["value"] : '';
$name = $args["name"] ?? 'field';
$rows = $args["rows"] ?? '3';
$cols = $args["cols"] ?? '30';
$text = $args["value"] ?? '';
$fld = '<textarea name="' .$name. '" rows="' .$rows. '" cols="' .$cols. '"' .$extra. '>' .$text. '</textarea>';
if(!$return){

6
install/sql/dump.sql
View file

@ -73,8 +73,8 @@ INSERT INTO `as_config` (`name`, `value`, `title`, `description`, `option`, `cat
-- Tabellenstruktur für Tabelle `as_config_categorys`
--
DROP TABLE IF EXISTS `as_config_categorys`;
CREATE TABLE IF NOT EXISTS `as_config_categorys` (
DROP TABLE IF EXISTS `as_config_categories`;
CREATE TABLE IF NOT EXISTS `as_config_categories` (
`cid` int(11) NOT NULL auto_increment,
`categoryname` varchar(200) NOT NULL,
PRIMARY KEY (`cid`)
@ -84,7 +84,7 @@ CREATE TABLE IF NOT EXISTS `as_config_categorys` (
-- Daten für Tabelle `as_config_categorys`
--
INSERT INTO `as_config_categorys` (`cid`, `categoryname`) VALUES
INSERT INTO `as_config_categories` (`cid`, `categoryname`) VALUES
(1, 'Allgemein'),
(2, 'Wartungsmodus'),
(3, 'Registrierung'),

7
modules/contact/contact.module.php
View file

@ -3,22 +3,21 @@
class module_contact extends admin_module{
function admin_panels(){
panels=array();
return $panels;
return array();
}
function get_info(){
$info["name"]="Kontaktformular";
$info["file"]="contact";
$info["author"]="BeCast";
$info["version"]="1.0.0";
$info["version"]="1.0.1";
$info["url"]="http://www.becast.at";
return $info;
}
function install(){
global $config, $db;
$db->query("INSERT INTO `" . $config["prefix"] . "config_categorys` (
$db->query("INSERT INTO `" . $config["prefix"] . "config_categories` (
`cid` ,
`categoryname`
)

6
modules/news/news.module.php
View file

@ -10,9 +10,9 @@ class module_news extends admin_module{
function get_info(){
$info["name"]="Newsmodul";
$info["file"]="news";
$info["author"]="astat";
$info["version"]="1.0.0";
$info["url"]="http://www.astat.org";
$info["author"]="BeCast";
$info["version"]="1.0.1";
$info["url"]="http://www.becast.at";
return $info;
}

2
modules/text/admin/add.apnl.php
View file

@ -81,7 +81,7 @@ class add_text_panel extends admin_module{
$panel->content.="<h3>Kategorien:</h3>
<table width=\"100%\">
<tr>";
$resultk=$db->query("SELECT `id`,`categoryname` FROM `" . $config["prefix"] . "article_categorys` WHERE `active`='true'") or die($db->error());
$resultk=$db->query("SELECT `id`,`categoryname` FROM `" . $config["prefix"] . "article_categories` WHERE `active`='true'") or die($db->error());
while($row=$db->fetch_array($resultk)){
$navs[]=$row;
}

2
modules/text/admin/addcategory.apnl.php
View file

@ -52,7 +52,7 @@ class addcategory_text_panel extends admin_module{
}
$categoryname=$db->escape($_POST['categoryname']);
$active=$db->escape($_POST['active']);
$db->query("INSERT INTO `" . $config["prefix"]. "article_categorys` (`categoryname`,`picture`,`active`) VALUES ('".$categoryname."','".$userfile_name."','".$active."')") or die ($db->error());
$db->query("INSERT INTO `" . $config["prefix"]. "article_categories` (`categoryname`,`picture`,`active`) VALUES ('".$categoryname."','".$userfile_name."','".$active."')") or die ($db->error());
$panel->admin_message("Danke", "Die Kategorie wurde erfolgreich eingetragen!.",TRUE,"addcategory_text");
}else{
$fail="<span style=\"text-align: center; color: red;\">Der Kategoriename muss angegeben werden!</span>";

6
modules/text/admin/edit.apnl.php
View file

@ -1,4 +1,4 @@
<?php
<?php global $session;
/**
* Project: astat - simple site engine
* File: /modules/text/edit.apnl.php
@ -91,7 +91,7 @@ class edit_text_panel extends admin_module{
while($rowa=$db->fetch_array($resultn)){
$cat[$rowa["c_id"]]=TRUE;
}
$resultk=$db->query("SELECT `id`,`categoryname` FROM `" . $config["prefix"] . "article_categorys` WHERE `active`='true'");
$resultk=$db->query("SELECT `id`,`categoryname` FROM `" . $config["prefix"] . "article_categories` WHERE `active`='true'");
while($row=$db->fetch_array($resultk)){
if($cat[$row["id"]]==TRUE){
$row["checked"]="checked=\"checked\"";
@ -132,7 +132,7 @@ class edit_text_panel extends admin_module{
}else{
$result = $db->query("SELECT a.title,a.id,a.active,a.date,a.url,u.username FROM `" . $config["prefix"] . "article` a LEFT JOIN `" . $config["prefix"] . "users` u on a.`author`=u.`uid`");
while($row=$db->fetch_array($result, $db->ASSOC)){
$cresult=$db->query("SELECT a.`categoryname` FROM `" . $config["prefix"] . "article_categorys` a LEFT JOIN `" . $config["prefix"] . "article_category` c on a.`id`=c.`c_id` WHERE c.`a_id`='".$row["id"]."'");
$cresult=$db->query("SELECT a.`categoryname` FROM `" . $config["prefix"] . "article_categories` a LEFT JOIN `" . $config["prefix"] . "article_category` c on a.`id`=c.`c_id` WHERE c.`a_id`='".$row["id"]."'");
while($crow=$db->fetch_array($cresult, $db->ASSOC)){
if(!$row["categoryname"]){
$row["categoryname"]=$crow["categoryname"];

14
modules/text/admin/editcategory.apnl.php
View file

@ -1,4 +1,4 @@
<?php
<?php global $session;
/**
* Project: BeCast WebEngine - simple site engine
* File: /modules/text/editcategory.apnl.php
@ -50,12 +50,12 @@ class editcategory_text_panel extends admin_module{
if($ret!==TRUE){
$panel->admin_message("Fehler", "Das Bild konnte nicht hochgeladen wrden <br /> Der Fehler war: ". $ret,TRUE,"editcategory_text");
}
$result=$db->query("SELECT `picture` FROM `" . $config["prefix"]. "article_categorys` WHERE `id`='".intval($_POST["id"])."' LIMIT 1");
$result=$db->query("SELECT `picture` FROM `" . $config["prefix"]. "article_categories` WHERE `id`='".intval($_POST["id"])."' LIMIT 1");
$file=$db->fetch_array($result);
@unlink($filedir.$file['picture']);
$db->query("UPDATE `" . $config["prefix"]. "article_categorys` SET `picture`='".$userfile_name."' WHERE `id`='".intval($_POST["id"])."'");
}elseif($_POST["delimg"]==1){
$result=$db->query("SELECT `picture` FROM `" . $config["prefix"]. "article_categorys` WHERE `id`='".intval($_POST["id"])."' LIMIT 1");
$result=$db->query("SELECT `picture` FROM `" . $config["prefix"]. "article_categories` WHERE `id`='".intval($_POST["id"])."' LIMIT 1");
$file=$db->fetch_array($result);
@unlink($filedir.$file['picture']);
$db->query("UPDATE `" . $config["prefix"]. "article_categorys` SET `picture`='' WHERE `id`='".intval($_POST["id"])."'") or die($db->error());
@ -71,7 +71,7 @@ class editcategory_text_panel extends admin_module{
}elseif(isset($_GET['id'])&& $_GET['id']!=""){
if($_GET['action']=="edit"){
$result = $db->query("SELECT * FROM `" . $config["prefix"] . "article_categorys` WHERE `id`='".intval($_GET['id'])."'");
$result = $db->query("SELECT * FROM `" . $config["prefix"] . "article_categories` WHERE `id`='".intval($_GET['id'])."'");
$_POST=$db->fetch_array($result);
/*$resultna=$db->query("SELECT id,name FROM " . $config["prefix"] . "menue");
while($rowa=$db->fetch_array($resultna)){
@ -112,15 +112,15 @@ class editcategory_text_panel extends admin_module{
$panel->parse_page();
}elseif($_GET["action"]=="delete" && $_GET["id"]){
$result=$db->query("SELECT `picture` FROM `" . $config["prefix"] . "article_categorys` where `id`='".intval($_GET["id"])."'");
$result=$db->query("SELECT `picture` FROM `" . $config["prefix"] . "article_categories` where `id`='".intval($_GET["id"])."'");
$row = $db->fetch_array($result);
@unlink($root.'/catimages/'.$row["picture"]);
$db->query("DELETE FROM `" . $config["prefix"] . "article_categorys` WHERE `id`='".intval($_GET["id"])."'");
$db->query("DELETE FROM `" . $config["prefix"] . "article_categories` WHERE `id`='".intval($_GET["id"])."'");
$panel->admin_message("Kategorie gel&ouml;scht!","Die Kategorie wurde erfolgreich gel&ouml;scht.",True,"editcategory_text",3);
}
}else{
$result = $db->query("SELECT * FROM `" . $config["prefix"] . "article_categorys`");
$result = $db->query("SELECT * FROM `" . $config["prefix"] . "article_categories`");
while($row=$db->fetch_array($result, $db->ASSOC)){
$articles[]=$row;
}

4
modules/text/text.module.php
View file

@ -36,7 +36,7 @@ class module_text extends admin_module{
KEY `eid` (`eid`)
) ENGINE=MyISAM");
$db->query("CREATE TABLE IF NOT EXISTS `" . $config["prefix"] . "article_categorys` (
$db->query("CREATE TABLE IF NOT EXISTS `" . $config["prefix"] . "article_categories` (
`id` int(11) NOT NULL auto_increment,
`categoryname` varchar(80) NOT NULL default '',
`picture` varchar(80) NOT NULL default '',
@ -68,7 +68,7 @@ class module_text extends admin_module{
function uninstall(){
global $config, $db;
$db->query("DROP TABLE `" . $config["prefix"] . "article`");
$db->query("DROP TABLE `" . $config["prefix"] . "article_categorys`");
$db->query("DROP TABLE `" . $config["prefix"] . "article_categories`");
$db->query("DROP TABLE `" . $config["prefix"] . "article_category`");
$db->query("DROP TABLE `" . $config["prefix"] . "article_menue`");
@$this->recursive($_SERVER["DOCUMENT_ROOT"]."/catimages");