From 114e22bbaba29c7d95b9744b436422d468793692 Mon Sep 17 00:00:00 2001 From: genuineparts Date: Fri, 20 Jun 2025 20:13:51 +0200 Subject: [PATCH] Updates --- admin/adduser.apnl.php | 61 ++++++++++++++++++++---------- admin/editusers.apnl.php | 61 +++++++++++------------------- admin/index.php | 6 +-- inc/admin.class.php | 14 +++---- inc/config.default.inc.php | 2 +- inc/core.class.php | 20 +++++----- inc/panel.class.php | 12 +++--- languages/de.lang.php | 17 ++++++--- languages/en.lang.php | 15 ++++++-- modules/contact/contact.module.php | 6 +-- 10 files changed, 115 insertions(+), 99 deletions(-) diff --git a/admin/adduser.apnl.php b/admin/adduser.apnl.php index 08085ef..aaba2d9 100644 --- a/admin/adduser.apnl.php +++ b/admin/adduser.apnl.php @@ -1,4 +1,29 @@ + * @package BcWe core + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id$ + */ If (!defined("in_BL_ADMIN")) { die("Dieses Script kann nicht ausserhalb des Frameworks laufen!"); } @@ -11,17 +36,18 @@ class adduser_panel extends admin_module{ global $plugin,$session,$config,$db,$panel,$admin,$module,$root,$firephp,$log,$lang; if(isset($_POST["send"])){ if($_POST['role']==2 && $session->userdata['role']!=2){ - $panel->admin_message("Error","You cannot assign a role higher then yours!",True,"editusers",3); + $panel->admin_message($lang->_('ERROR'),$lang->_('CANTASSIGNHIGHERRIGHT'),True,"editusers",3); } if(!empty($_POST["name"]) && !empty($_POST["password"])){ $key=$session->generate_key(50); + $salt = $session->generate_Key(6); $plugin->run_hook('admin_user_before_create',array('data'=>$_POST,'key'=>$key,'user_fid'=>$session->userdata['fuid'])); - $db->query("INSERT INTO `" . $config["prefix"] . "users` (`username`,`realname`,`password`,`loginkey`,`role`,`email`,`active`) VALUES ('".$db->escape($_POST["name"])."','".$db->escape($_POST["realname"])."','".hash("sha256",$db->escape($_POST["password"]))."','".$key."','".$db->escape($_POST["role"])."','".$db->escape($_POST["email"])."','".$_POST["active"]."')"); + $db->query("INSERT INTO `" . $config["prefix"] . "users` (`username`,`realname`,`password`,`salt`,`loginkey`,`role`,`email`,`active`) VALUES ('".$db->escape($_POST["name"])."','".$db->escape($_POST["realname"])."','".hash("sha256",$salt.$db->escape($_POST["password"]))."','".$salt."','".$key."','".$db->escape($_POST["role"])."','".$db->escape($_POST["email"])."','".$_POST["active"]."')"); $_POST['uid']=$db->last_id(); $plugin->run_hook('admin_user_after_create',array('data'=>$_POST)); - $panel->admin_message("Daten übernommen!","Die Daten wurden erfolgreich übernommen.",True,"adduser",3); + $panel->admin_message($lang->_('DATASAVED'),$lang->_('DATASAVEDSUCCESS'),True,"adduser",3); }else{ - $panel->admin_message("Fehler!","Der Name und das Passwort müssen ausgefült werden.",True,"adduser",3); + $panel->admin_message($lang->_('ERROR'),$lang->_('NEEDSUSERNAMEPASS'),True,"adduser",3); } }else{ @@ -40,27 +66,20 @@ class adduser_panel extends admin_module{ $panel->content.="

".$lang->_('LOCATION').":

"; $panel->field(array("name"=>"from","value"=>$data["from"],"typ"=>"text")); $panel->content.="

".$lang->_('GENDER').":

"; - $panel->select(array("N/A"=>"u", "weiblich"=>"f","männlich"=>"m"),$data["gender"],"gender"); - - $panel->content.="

".$lang->_('BANREASON').":

"; - $panel->textarea(array("name"=>"bio","value"=>$data["bio"],"typ"=>"text")); + $panel->select(array($lang->_('DIV')=>"u", $lang->_('FEMALE')=>"f",$lang->_('MALE')=>"m"),$data["gender"],"gender"); $panel->content.="

".$lang->_('HOMEPAGE').":

"; $panel->field(array("name"=>"homepage","value"=>$data["homepage"],"typ"=>"text")); - $panel->content.="

ICQ:

"; - $panel->field(array("name"=>"icq","value"=>$data["icq"],"typ"=>"text")); - $panel->content.="

AIM:

"; - $panel->field(array("name"=>"aim","value"=>$data["aim"],"typ"=>"text")); - $panel->content.="

Skype:

"; - $panel->field(array("name"=>"skype","value"=>$data["skype"],"typ"=>"text")); - + $panel->content.="

".$lang->_('BANREASON').":

"; + $panel->textarea(array("name"=>"bio","value"=>$data["bio"],"typ"=>"text")); $panel->content.="

".$lang->_('ROLE').":

"; $result=$db->query("SELECT `id`,`role_name` FROM `" . $config["prefix"] . "role`"); - while($data = $db->fetch_array($result)){ - $dd[$data["role_name"]]=$data["id"]; - } - $panel->select($dd,"1","role"); - $panel->content.="

".$lang->_('ACTIVE').":

"; - $panel->select(array($lang->_('YES')=>1,$lang->_('NO')=>0),"0","active"); + while($rdata = $db->fetch_array($result)){ + $dd[$rdata["role_name"]]=$rdata["id"]; + } + $panel->select($dd,$data["role"],"role"); + $panel->content.="
"; + $panel->content.="

".$lang->_('STATUS').":

"; + $panel->select(array($lang->_('ACTIVE')=>1,$lang->_('INACTIVE')=>0,$lang->_('BANNED')=>2),$data["active"],"active"); $panel->field(array("name"=>"send","typ"=>"hidden","value"=>"1")); $panel->content.="
"; $panel->content.="
"; diff --git a/admin/editusers.apnl.php b/admin/editusers.apnl.php index 17f4128..4307178 100644 --- a/admin/editusers.apnl.php +++ b/admin/editusers.apnl.php @@ -1,7 +1,7 @@ - * @package astat core + * @package BcWe core * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ */ @@ -39,14 +39,15 @@ class editusers_panel extends admin_module{ if(isset($_POST["send"]) && !empty($_POST["name"]) && !empty($_POST["uid"])){ $pwd=""; if($_POST['role']==2 && $session->userdata['role']!=2){ - $panel->admin_message("Error","You cannot assign a role higher then yours!",True,"editusers",3); + $panel->admin_message($lang->_('ERROR'),$lang->_('CANTASSIGNHIGHERRIGHT'),True,"editusers",3); } $_POST['key']=$session->generate_key(50); + $salt = $session->generate_Key(6); if($_POST["password"]!=""){ - $pwd=", `password`='".hash("sha256",$db->escape($_POST["password"]))."', `loginkey`='".$_POST['key']."'"; + $pwd=", `password`='".hash("sha256",$salt.$db->escape($_POST["password"]))."', `loginkey`='".$_POST['key']."',`salt` = '".$salt."'"; } $plugin->run_hook('admin_user_before_update',array('data'=>$_POST,'key'=>$key,'user_fid'=>$session->userdata['fuid'])); - $db->query("UPDATE `" . $config["prefix"] . "users` SET `username`='".$db->escape($_POST["name"])."',`realname`='".$db->escape($_POST["realname"])."',`email`='".$db->escape($_POST["email"])."',`from`='".$db->escape($_POST["from"])."',`gender`='".$db->escape($_POST["gender"])."',`bio`='".$db->escape($_POST["bio"])."',`homepage`='".$db->escape($_POST["homepage"])."',`icq`='".$db->escape($_POST["icq"])."',`aim`='".$db->escape($_POST["aim"])."',`skype`='".$db->escape($_POST["skype"])."',`role`='".$db->escape($_POST["role"])."',`active`='".$db->escape($_POST["active"])."',`char_suspended`='".$db->escape($_POST["char_suspended"])."'".$pwd." WHERE `uid`='".intval($_POST["uid"])."'"); + $db->query("UPDATE `" . $config["prefix"] . "users` SET `username`='".$db->escape($_POST["name"])."',`realname`='".$db->escape($_POST["realname"])."',`email`='".$db->escape($_POST["email"])."',`from`='".$db->escape($_POST["from"])."',`gender`='".$db->escape($_POST["gender"])."',`bio`='".$db->escape($_POST["bio"])."',`homepage`='".$db->escape($_POST["homepage"])."',`role`='".$db->escape($_POST["role"])."',`active`='".$db->escape($_POST["active"])."',".$pwd." WHERE `uid`='".intval($_POST["uid"])."'"); $_POST['user_fid']=$session->userdata['fuid']; $plugin->run_hook('admin_user_after_update',array('data'=>$_POST)); $panel->admin_message($lang->_('SUCCESS'),$lang->_('DATASAVED'),True,"editusers",3); @@ -66,15 +67,9 @@ class editusers_panel extends admin_module{ $panel->content.="

".$lang->_('LOCATION').":

"; $panel->field(array("name"=>"from","value"=>$data["from"],"typ"=>"text")); $panel->content.="

".$lang->_('GENDER').":

"; - $panel->select(array($lang->_('N/A')=>"u", $lang->_('FEMALE')=>"f",$lang->_('MALE')=>"m"),$data["gender"],"gender"); + $panel->select(array($lang->_('DIV')=>"u", $lang->_('FEMALE')=>"f",$lang->_('MALE')=>"m"),$data["gender"],"gender"); $panel->content.="

".$lang->_('HOMEPAGE').":

"; $panel->field(array("name"=>"homepage","value"=>$data["homepage"],"typ"=>"text")); - $panel->content.="

".$lang->_('ICQ').":

"; - $panel->field(array("name"=>"icq","value"=>$data["icq"],"typ"=>"text")); - $panel->content.="

".$lang->_('AIM').":

"; - $panel->field(array("name"=>"aim","value"=>$data["aim"],"typ"=>"text")); - $panel->content.="

".$lang->_('SKYPE').":

"; - $panel->field(array("name"=>"skype","value"=>$data["skype"],"typ"=>"text")); $panel->content.="

".$lang->_('BANREASON').":

"; $panel->textarea(array("name"=>"bio","value"=>$data["bio"],"typ"=>"text")); $panel->content.="
"; @@ -87,9 +82,7 @@ class editusers_panel extends admin_module{ $panel->content.="
"; $panel->content.="

".$lang->_('STATUS').":

"; $panel->select(array($lang->_('ACTIVE')=>1,$lang->_('INACTIVE')=>0,$lang->_('BANNED')=>2),$data["active"],"active"); - $panel->content.="
"; - $panel->content.="

Char Creation supended?

"; - $panel->select(array($lang->_('YES')=>1,$lang->_('NO')=>0),$data["char_suspended"],"char_suspended"); + $panel->content.="
"; $panel->field(array("name"=>"send","typ"=>"hidden","value"=>"1")); $panel->field(array("name"=>"uid","typ"=>"hidden","value"=>$data["uid"])); $panel->content.="
"; @@ -103,7 +96,7 @@ class editusers_panel extends admin_module{ $plugin->run_hook('admin_user_before_delete',array('data'=>$data)); $db->query("DELETE FROM `" . $config["prefix"] . "users` WHERE `uid`='".intval($_GET["user"])."'"); $plugin->run_hook('admin_user_after_delete',array('data'=>$data)); - $panel->admin_message("User gelöscht!","Der User wurde erfolgreich gelöscht.",True,"editusers",3); + $panel->admin_message($lang->_('USERDELETED'),$lang->_('USERDELETEDSUCCESS'),True,"editusers",3); }else{ $left=""; @@ -118,9 +111,9 @@ class editusers_panel extends admin_module{ $panel->content.=" - - - + + + @@ -129,28 +122,31 @@ class editusers_panel extends admin_module{ foreach($user as $u){ if($u['active']==1){ $u['activetext']=$lang->_('ACTIVE'); + $u['activestyle']=''; }elseif($u['active']==2){ $u['activetext']=$lang->_('BANNED'); + $u['activestyle']='style="text-decoration:line-through;"'; }else{ $u['activetext']=$lang->_('INACTIVE'); + $u['activestyle']='style="font-style:italic;"'; } - $panel->content.=" + $panel->content.=""; if($u["uid"]==$session->userdata["uid"]){ - $panel->content.=" + $panel->content.=""; }else{ - $panel->content.=" + $panel->content.=""; } } }else{ $panel->content.=" - + "; } $panel->content.="
".$lang->_('ID')."".$lang->_('USERNAME')."".$lang->_('REALNAME')."".$lang->_('ID')."".$lang->_('USERNAME')."".$lang->_('REALNAME')." ".$lang->_('ROLE')." ".$lang->_('STATUS')." ".$lang->_('ACTION')."
".$u["uid"]." ".$u["username"]." ".$u["realname"]." ".$u["role_name"]." ".$u['activetext']." _('BADIDEA')."')\" href=\"".$config["path"]."/admin/index.php?panel=editusers&action=delete&user=".$u["uid"]."\">
_('DELETEUSER'),$u["username"])."')\" href=\"".$config["path"]."/admin/index.php?panel=editusers&action=delete&user=".$u["uid"]."\">
Keine User verfügbar.".$lang->_('NOUSERS')."

"; @@ -164,19 +160,6 @@ class editusers_panel extends admin_module{ -