Skip to content

Commit

Permalink
zorg Code v4.11.0
Browse files Browse the repository at this point in the history 
Merge pull request #77 from zorgch/develop
  • Loading branch information
@oliveratgithub
oliveratgithub authored Jan 21, 2024
2 parents d9fb5e9 + 9b3342a commit d84cd79
Show file tree
Hide file tree
Showing 8 changed files with 282 additions and 231 deletions.
27 changes: 15 additions & 12 deletions www/actions/anficker.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,29 @@
* @package zorg\Games\Anficker
*/
// Includes --------------------------------------------------------------------
require_once dirname(__FILE__).'/../includes/main.inc.php';
require_once __DIR__.'/../includes/config.inc.php';
require_once INCLUDES_DIR.'anficker.inc.php';

/** Input validation */
$doAction = filter_input(INPUT_POST, 'do', FILTER_DEFAULT, FILTER_REQUIRE_SCALAR) ?? null; // $_POST['do']
$trainSpresim = filter_input(INPUT_POST, 'spresim-trainieren', FILTER_VALIDATE_BOOLEAN) ?? false; // $_POST['spresim-trainieren']
$anfickId = filter_input(INPUT_POST, 'anfick_id', FILTER_VALIDATE_INT) ?? 0; // $_POST['anfick_id']
$anfickScore = filter_input(INPUT_POST, 'note', FILTER_VALIDATE_INT) ?? 0; // $_POST['note']
$anfick = htmlentities(filter_input(INPUT_POST, 'text', FILTER_SANITIZE_FULL_SPECIAL_CHARS)) ?? null; // $_POST['text']
$returnUrl = '/tpl/175';

// Anficken -------------------------------------------------------------------
if(isset($_POST['do']) && $_POST['do'] == 'anficken')
{
if($user->is_loggedin() && $doAction === 'anficken')
{
/**
* Benoten NUR wenn spresim-trainieren gewählt wird
* und eine Note vorhanden ist
*/
if (isset($_POST['spresim-trainieren']) && (isset($_POST['note']) && is_numeric($_POST['note']) && $_POST['note'] > 0))
{
Anficker::vote($_POST['anfick_id'], $_POST['note']);
}
if ($trainSpresim && $anfickId > 0 && $anfickScore > 0) Anficker::vote($anfickId, $anfickScore);

$textEscaped = htmlentities(addslashes($_POST['text']));
if (!empty($anfick)) Anficker::addAnfick(max(0, $user->id), $anfick, $trainSpresim);

Anficker::addAnfick(max(0, $user->id), $textEscaped, $_POST['spresim-trainieren']);

header("Location: /tpl/175?del=no&spresimtrainieren=".$_POST['spresim-trainieren']."#anficker");
exit;
$returnUrl .= '?del=no&spresimtrainieren='.$trainSpresim.'#anficker';
}
header('Location: '.$returnUrl);
exit;
6 changes: 3 additions & 3 deletions www/actions/error_action.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
$tplId = filter_input(INPUT_GET, 'tpl', FILTER_VALIDATE_INT) ?? null; // $_GET['tpl']
$doDelete = filter_input(INPUT_POST, 'del', FILTER_DEFAULT, FILTER_REQUIRE_SCALAR) ?? null; // $_POST['del']
$showQuery = filter_input(INPUT_POST, 'query', FILTER_SANITIZE_FULL_SPECIAL_CHARS) ?? 0; // $_POST['query']
$del_ids = filter_input(INPUT_POST, 'to_del', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY) ?? []; // $_POST['to_del']
$del_ids = (isset($_POST['to_del']) ? call_user_func_array('array_merge', array($_POST['to_del'])) : null); // $_POST['to_del']
$showNum = filter_input(INPUT_POST, 'num', FILTER_VALIDATE_INT) ?? 0; // $_POST['num']
$urlParams = '';

Expand All @@ -28,7 +28,7 @@
}

/** Delete multiple SQL-Errors */
if(count($del_ids) > 0 && $user->type >= USER_MEMBER)
if(count($del_ids) > 0 && $user->typ >= USER_MEMBER)
{
$placeholders = implode(',', array_fill(0, count($del_ids), '?'));
$sql = 'DELETE FROM sql_error WHERE id IN (' . $placeholders . ')';
Expand All @@ -39,7 +39,7 @@
/** Change displayed number of SQL-Error */
if($showNum > 0)
{
$_SESSION['error_num'] = $_POST['num'];
$_SESSION['error_num'] = intval($_POST['num']);
$urlParams = '?error_num='.$showNum;
}

Expand Down
5 changes: 3 additions & 2 deletions www/actions/tpleditor.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,9 @@
zorgDebugger::log()->debug('Notify Template-Owner: owner %d <-- edit by %d', [$notifyOtherTplOwner, $user->id]);
if ($notifyOtherTplOwner !== $user->id)
{
$notification_text = t('change-notification-owner', 'tpl', [ $user->id2user($user->id), $frm['id'], $frm['title'] ]);
$notification_status = $notification->send($notifyOtherTplOwner, 'messagesystem', ['from_user_id'=>$user->id, 'subject'=>t('change-notification-owner-subject', 'tpl'), 'text'=>$notification_text, 'message'=>$notification_text]);
$username = $user->id2user($user->id);
$notification_text = t('change-notification-owner', 'tpl', [ $username, $frm['id'], $frm['title'] ]);
$notification_status = $notification->send($notifyOtherTplOwner, 'messagesystem', ['from_user_id'=>$user->id, 'subject'=>t('change-notification-owner-subject', 'tpl', [$username]), 'text'=>$notification_text, 'message'=>$notification_text]);
zorgDebugger::log()->debug('$_TPLROOT[owner] Notification: %s', [$notification_status ? 'true' : 'false']);
}

Expand Down
188 changes: 119 additions & 69 deletions www/includes/anficker.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,100 +38,146 @@ class Anficker
/**
* Anfick des User hinzufügen
*
* @author ?
* @author IneX
* @version 2.1
* @version 2.5
* @since 1.0 function added
* @since 2.0 `IneX` code enhancements
* @since 2.1 `16.04.2020` `IneX` migrated mysql-functions to mysqli
* @since 2.5 `21.01.2024` `IneX` Bug #667 : Anficks werden x-mal gespeichert
*
* @see Anficker::logAnfick(), Anficker::getId()
* @see self::logAnfick(), self::getId()
* @param integer $user_id ID des Users, welcher gerade mit Spresim batteld
* @param string $text Anfick des Users
* @param boolean $spresim_trainieren Gibt an, ob Anfick des Users gespeichert werden soll oder nicht
* @global object $db Globales Class-Object mit allen MySQL-Methoden
* @global object $user Globales Class-Object mit den User-Methoden & Variablen
* @return bool
*
* @todo Unterschied, ob Spresim trainieren oder nur battlen sollte möglich sein (Bug #487) (Mättä, 25.10.04) | IDEE: Eine möglich Lösung wäre, ein zusätzliches Flag in der Tabelle "battle_only" oder so...
* @todo Müsste es nicht "REPLACE INTO..." sein?? Jetzt werden x-Einträge mit gleichem Text gemacht! (IneX, 8.6.09)
* // TODO Bug #487 : Unterschied, ob Spresim trainieren oder nur battlen sollte möglich sein (Mättä, 25.10.04) | IDEE: Eine möglich Lösung wäre, ein zusätzliches Flag in der Tabelle "battle_only" oder so...
*/
static function addAnfick($user_id, $text, $spresim_trainieren=FALSE) {
global $db, $user;

// nur Anfick speichern, wenn Spresim trainiert werden soll:
//if ($spresim_trainieren == TRUE)
//{
if($text != '' && !empty($user_id))//$user->id2user($user_id)))
{
$sql = 'INSERT IGNORE INTO anficker_anficks ( text, user_id, datum) VALUES (?, ?, ?)';
$insert_id = $db->query($sql, __FILE__, __LINE__, __METHOD__, [$text, $user_id, timestamp(true)]);
}
//else
//{


// Hier sollte was kommen, WENN SPRESIM NICHT TRAINIERT WERDEN SOLL... leider zur Zeit nicht realisierbar, IneX 8.6.09
// IDEE: Eine möglich Lösung wäre, ein zusätzliches Flag in der Tabelle "battle_only" oder so... (IneX, 8.6.09)

static function addAnfick($user_id, $text, $spresim_trainieren=FALSE)
{
global $db;

if($user_id > 0 && !empty($text))
{
// nur Anfick speichern, wenn Spresim trainiert werden soll:
//if ($spresim_trainieren == TRUE)
//{
/** Check if Anfick already exists */
$existing_anfick_id = 0;
$default_initial_score = 4.0;
$sql_check = 'SELECT id, note, votes, user_id FROM anficker_anficks WHERE text=? LIMIT 1';
$exists = $db->query($sql_check, __FILE__, __LINE__, __METHOD__, [$text]);
if ($db->num($exists) > 0) {
$af = $db->fetch($exists);
$existing_anfick_id = intval($af['id']);
$existing_anfick_score = floatval($af['note']);
$existing_anfick_votes = intval($af['votes']);
$existing_anfick_creator = intval($af['user_id']);
}

/** Update existing Anfick */
if ($existing_anfick_id > 0)
{
$new_votes = $existing_anfick_votes+1;
$new_score = number_format(($default_initial_score+$existing_anfick_score)*$existing_anfick_votes/$new_votes, 8, '.', '');
$update = [
'note' => $new_score
,'votes' => $new_votes
,'user_id' => (empty($existing_anfick_creator) ? $user_id : $existing_anfick_creator)
];
$db->update('anficker_anficks', $existing_anfick_id, $update, __FILE__, __LINE__, __METHOD__);
}
/** Add new Anfick */
else {
$insert = [
'text' => $text
,'user_id' => $user_id
,'datum' => timestamp(true)
];
$insert_id = $db->insert('anficker_anficks', $insert, __FILE__, __LINE__, __METHOD__);
}

//else
//{

// Hier sollte was kommen, WENN SPRESIM NICHT TRAINIERT WERDEN SOLL... leider zur Zeit nicht realisierbar, IneX 8.6.09
// IDEE: Eine möglich Lösung wäre, ein zusätzliches Flag in der Tabelle "battle_only" oder so... (IneX, 8.6.09)

//}
//}
//}

// DEBUGGING
//error_log('[DEBUG] ' . __FILE__ . ':' . __LINE__ . ' mysql_insert_id() = ' . mysql_insert_id());
//error_log('[DEBUG] ' . __FILE__ . ':' . __LINE__ . ' Anficker::getId($text) = `' . $text . '`');

$anfick_id = ($insert_id > 0 ? $insert_id : Anficker::getId($text));

Anficker::logAnfick($anfick_id, $user_id, $user_id);
$anfick_id = ($existing_anfick_id > 0 ? $existing_anfick_id : $insert_id);
$log = self::logAnfick($anfick_id, $user_id, $user_id);
return (!$log ? false : true);
}
return false;
}


/**
* Anfick im Anfick-Log ergänzen
*
* @author ?
* @author IneX
* @see self::addAnfick()
*
* @version 2.0
* @since 1.0
* @see Anficker::addAnfick()
* @since 1.0 Method added
* @since 2.0 `IneX` SQL- and code optimziations
*
* @param integer $anfick_id ID des Anficks wo das Log ergänzt werden soll
* @param integer $user_id ID des Users, welcher angefickt wurde
* @param integer $anficker_id ID des Users, welcher den Anfick gemacht hat
* @global object $db Globales Class-Object mit allen MySQL-Methoden
* @return int|bool Returns INSERT id - or false
*/
static function logAnfick($anfick_id, $user_id, $anficker_id) {
global $db;
$sql = 'INSERT INTO anficker_log (datum, user_id, anficker_id, anfick_id) VALUES (?, ?, ?, ?)';
//return $db->query($sql, __FILE__, __LINE__);
$db->query($sql, __FILE__, __LINE__, __METHOD__, [timestamp(true), $user_id, $anficker_id, $anfick_id]);

$result = false;
if ($anfick_id > 0 && $user_id > 0 && $anficker_id > 0) {
$insert = [
'datum' => timestamp(true)
,'user_id' => intval($user_id)
,'anficker_id' => intval($anficker_id)
,'anfick_id' => intval($anfick_id)
];
$result = $db->insert('anficker_log', $insert, __FILE__, __LINE__, __METHOD__);
}
return $result;
}


static function deleteLog($user_id) {
global $db;
$sql = 'DELETE FROM anficker_log WHERE user_id=?';
return $db->query($sql, __FILE__, __LINE__, __METHOD__, [$user_id]);

$result = false;
if ($user_id > 0) {
$sql = 'DELETE FROM anficker_log WHERE user_id=?';
$result = $db->query($sql, __FILE__, __LINE__, __METHOD__, [$user_id]);
}
return $result;
}


static function getId($text) {
global $db;
$sql = 'SELECT id FROM anficker_anficks WHERE text=?';
$rs = $db->fetch($db->query($sql, __FILE__, __LINE__, __METHOD__, [$text]));
return $rs['id'];

$result = null;
if (!empty($text)) {
$sql = 'SELECT id FROM anficker_anficks WHERE text=?';
$rs = $db->fetch($db->query($sql, __FILE__, __LINE__, __METHOD__, [$text]));
$result = intval($rs['id']);
}
return $result;
}


/**
* Anfick-Log ausgeben
*
* @author ?
* @author IneX
* @see self::logAnfick(), self::anfickenMit()
*
* @version 2.0
* @since 1.0
* @see Anficker::logAnfick(), Anficker::anfickenMit()
* @since 1.0 method added
* @since 2.0 `IneX` SQL- and code optimizations
*
* @param integer $user_id ID des Users, welcher gerade mit Spresim batteld
* @global object $db Globales Class-Object mit allen MySQL-Methoden
Expand All @@ -140,8 +186,8 @@ static function getId($text) {
static function getLog($user_id) {
global $db;

//Anficker::addRandomAnfick2Log($user_id, ANFICKER_USER_ID);
Anficker::logAnfick(Anficker::anfickenMit(), $user_id, ANFICKER_USER_ID);
//self::addRandomAnfick2Log($user_id, ANFICKER_USER_ID);
self::logAnfick(self::anfickenMit(), $user_id, ANFICKER_USER_ID);

$sql = 'SELECT anficker_anficks.note, anficker_anficks.id, anficker_log.datum, anficker_anficks.text, anficker_log.anficker_id FROM anficker_log
LEFT JOIN anficker_anficks ON (anficker_anficks.id = anficker_log.anfick_id) WHERE anficker_log.user_id=? ORDER BY anficker_log.id ASC';
Expand Down Expand Up @@ -182,11 +228,11 @@ static function getNumAnficks($user_id=null)
*
* @deprecated
*
* @author ?
* @author IneX
* @see self::anfickenMit()
*
* @version 2.0
* @since 1.0
* @see Anficker::anfickenMit()
* @since 1.0 method added
* @since 2.0 `IneX` method deprecation mode activated
*
* @param integer $user_id ID des Users, welcher gerade mit Spresim batteld
* @return array Gibt ganzes Log der Anfickerei für Ausgabe zurück
Expand All @@ -205,7 +251,7 @@ static function addRandomAnfick2Log($user_id) {
$rs = $db->fetch($result);*/

//return Anficker::logAnfick($rs['id'], $user_id, ANFICKER_USER_ID);
Anficker::logAnfick(Anficker::anfickenMit(), $user_id, ANFICKER_USER_ID);
self::logAnfick(self::anfickenMit(), $user_id, ANFICKER_USER_ID);
}


Expand All @@ -217,7 +263,7 @@ static function addRandomAnfick2Log($user_id) {
* @since 1.0 `08.06.2009` `IneX` function added
* @since 1.1 `16.04.2020` `IneX` code optimizations, migrated mysql-functions to mysqli
*
* @see Anficker::getNumAnficks()
* @see self::getNumAnficks()
* @global object $db Globales Class-Object mit allen MySQL-Methoden
* @return integer ID des Anfick von Spresim
*/
Expand All @@ -226,10 +272,10 @@ static function anfickenMit()
global $db;

$sql = 'SELECT * FROM anficker_anficks ORDER BY note ASC';
$result = $db->query($sql, __FILE__, __LINE__, __FUNCTION__);
$result = $db->query($sql, __FILE__, __LINE__, __METHOD__);

/** zufällige id holen */
$rs = Anficker::getNumAnficks();
$rs = self::getNumAnficks();
$id = rand(0, $rs['num']-1); // Zufalls #
$id = rand($id, $rs['num']-1); // die besten bevorzugen.
mysqli_data_seek($result, $id);
Expand All @@ -243,21 +289,25 @@ static function anfickenMit()
/**
* Anfick-Spruch benoten
*
* @author ?
* @author IneX
* @version 1.1
* @since 1.0
* @since 1.0 method added
* @since 1.1 `IneX` SQL- and code optimizations
*
* @param integer $anfick_id ID des benoteten Anficks
* @param integer $note Bewertung des Anficks
* @global object $db Globales Class-Object mit allen MySQL-Methoden
* @return integer
*/
static function vote($anfick_id, $note) {
static function vote($anfick_id, $note)
{
global $db;
$sql = 'UPDATE anficker_anficks SET note=((?+note*votes)/(votes+1)), votes=(votes+1) WHERE id=?'
;
//return $db->query($sql, __FILE__, __LINE__);
$db->query($sql, __FILE__, __LINE__, __METHOD__, [$note, $anfick_id]);
}

$result = 0;
if ($anfick_id > 0 && $note > 0)
{
$sql = 'UPDATE anficker_anficks SET note=((?+note)*votes/(votes+1)), votes=(votes+1) WHERE id=?';
$result = $db->query($sql, __FILE__, __LINE__, __METHOD__, [intval($note), intval($anfick_id)]);
}
return $result;
}
}
Loading

0 comments on commit d84cd79

Please sign in to comment.