Skip to content

Commit

Permalink
zorg Code v4.11.1
Browse files Browse the repository at this point in the history 
Merge pull request #78 from zorgch/develop
  • Loading branch information
@oliveratgithub
oliveratgithub committed Feb 24, 2024
2 parents d84cd79 + 4a5af6a commit 37f6c84
Show file tree
Hide file tree
Showing 8 changed files with 88 additions and 83 deletions.
2 changes: 1 addition & 1 deletion Docker/.env.docker
View file
Expand Up @@ -7,7 +7,7 @@ DOMAINNAME="zorg.local"
APACHE_USER="www-data"
APACHE_GROUP="www-data"
APACHE_WEBROOT="/var/www"
PHP_Version=7.4
PHP_VERSION=7.4
PHP_INI_DIR="/usr/local/etc/php"
XDEBUG_PORT=9003
XDEBUG_MODES="develop,debug,profile"
Expand Down
83 changes: 42 additions & 41 deletions www/includes/apod.inc.php
View file
Expand Up @@ -4,8 +4,9 @@
*
* Holt und speichert die Astronomy Pictures of the Day (APOD)
*
* @author [z]biko
* @date 01.01.2004
* @version 1.0
* @since 1.0 `01.01.2004` `[z]biko` File added
*
* @package zorg\APOD
*/
/**
Expand All @@ -16,7 +17,7 @@
* @include gallery.inc.php Gallery and Pic functions
* @include util.inc.php Various Helper Functions
*/
require_once dirname(__FILE__).'/config.inc.php';
require_once __DIR__.'/config.inc.php';
require_once INCLUDES_DIR.'mysql.inc.php';
require_once INCLUDES_DIR.'forum.inc.php';
require_once INCLUDES_DIR.'gallery.inc.php';
Expand All @@ -36,28 +37,26 @@
* hd | bool | False | Retrieve the URL for the high resolution image
* api_key | string | DEMO_KEY | api.nasa.gov key for expanded usage
*
* @author [z]biko
* @author IneX
* @version 4.1
* @since 1.0 `01.01.2004` function added
* @since 2.0 `06.08.2018` function refactored to use NASA APOD API
* @since 3.0 `09.08.2018` enhanced function so an APOD date can be passed
* @since 4.0 `14.09.2018` added processing of videos & website links passed from the APOD API
* @since 4.1 `26.06.2023` fixes code quality issue "Unreachable code ('cleanup:')"
* @version 4.2
* @since 1.0 `01.01.2004` `[z]biko` function added
* @since 2.0 `06.08.2018` `IneX` function refactored to use NASA APOD API
* @since 3.0 `09.08.2018` `IneX` enhanced function so an APOD date can be passed
* @since 4.0 `14.09.2018` `IneX` added processing of videos & website links passed from the APOD API
* @since 4.1 `26.06.2023` `IneX` fixes code quality issue "Unreachable code ('cleanup:')"
* @since 4.2 `24.02.2024` `IneX` replaces deprecated $MAX_PIC_SIZE, fixes SQL INSERT with empty 'extension'
*
* @uses APOD_API, APOD_TEMP_IMGPATH, APOD_GALLERY_ID, $MAX_PIC_SIZE
* @uses APOD_API, APOD_TEMP_IMGPATH, APOD_GALLERY_ID, MAX_PIC_SIZE
* @uses cURLfetchJSON(), createPic(), getYoutubeVideoThumbnail(), getVimeoVideoThumbnail(), Comment::post()
* @param string $apod_date (Optional) A valid date after June 16 1995, formatted as: yyyy-mm-dd (2018-08-06)
* @global object $db Globales Class-Object mit allen MySQL-Methoden
* @global array $MAX_PIC_SIZE Globales Array im Scope von gallery.inc.php mit den Image-Width & -Height Grössen für Pics und Thumbnails
* @global object $db Globales Class-Object mit allen MySQL-Methoden
* @return boolean Returns true or false, depening on if the function was processed successfully or not
*/
function get_apod($apod_date_input=NULL)
{
global $db, $MAX_PIC_SIZE;
global $db;

/** Validate $apod_date if passed */
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> $apod_date_input: %s', __FUNCTION__, __LINE__, $apod_date_input));
zorgDebugger::log()->debug('$apod_date_input: %s', [$apod_date_input]);
if (empty($apod_date_input) || strtotime($apod_date_input) === false) $apod_date_input = NULL;

/** Retrieve the APOD data from the APOD_API */
Expand All @@ -82,10 +81,10 @@ function get_apod($apod_date_input=NULL)
* [url] => https://apod.nasa.gov/apod/http://nusoft.fnal.gov/nova/public/img/FD-evt-echo.gif
* )
*/
if ( DEVELOPMENT && $apod_date_input != NULL ) error_log(sprintf('[DEBUG] <%s:%d> date("ymd",$apod_date_input): %s', __FUNCTION__, __LINE__, date('ymd',strtotime($apod_date_input))));
if ( DEVELOPMENT && $apod_date_input == NULL ) error_log(sprintf('[DEBUG] <%s:%d> date("ymd",strtotime($apod_data[date])): %s', __FUNCTION__, __LINE__, date('ymd',strtotime($apod_data['date']))));
zorgDebugger::log()->debug('date("ymd",$apod_date_input): %s', [date('ymd',strtotime($apod_date_input))]);
zorgDebugger::log()->debug('date("ymd",strtotime($apod_data[date])): %s', [date('ymd',strtotime($apod_data['date']))]);
$new_apod_date = ( $apod_date_input != NULL ? date('ymd',strtotime($apod_date_input)) : date('ymd',strtotime($apod_data['date'])) );
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> $new_apod_date: %s', __FUNCTION__, __LINE__, $new_apod_date));
zorgDebugger::log()->debug('$new_apod_date: %s', [$new_apod_date]);
$new_apod_title = $apod_data['title'];
$new_apod_explanation = $apod_data['explanation'];
$new_apod_copyright = $apod_data['copyright'];
Expand All @@ -94,7 +93,7 @@ function get_apod($apod_date_input=NULL)
$new_apod_img_large = str_replace('https://apod.nasa.gov/apod/http', 'http', $apod_data['hdurl']); // with fix for malformed url (APOD API issue)
$new_apod_archive_url = APOD_SOURCE . 'ap'.$new_apod_date.'.html'; // E.g.: https://apod.nasa.gov/apod/ap180714.html
$new_apod_urlparts = pathinfo($new_apod_img_small);
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> pathinfo(): %s', __FUNCTION__, __LINE__, print_r($new_apod_urlparts,true)));
zorgDebugger::log()->debug('pathinfo(): %s', [print_r($new_apod_urlparts,true)]);
$new_apod_fileext = $new_apod_urlparts['extension'];
$new_apod_filename = $apod_data['date'] . '.' . $new_apod_fileext;
$new_apod_temp_filepath = APOD_TEMP_IMGPATH . $new_apod_filename;
Expand All @@ -109,13 +108,14 @@ function get_apod($apod_date_input=NULL)
if (!empty($new_apod_title))
{
if ($new_apod_mediatype === 'image') $new_apod_fileext = '.'.$new_apod_fileext;
$new_apod_picid = $db->insert('gallery_pics', [
'album'=>APOD_GALLERY_ID
,'extension'=>$new_apod_fileext
,'pic_added'=>$new_apod_date
,'name'=>$new_apod_title.($new_apod_mediatype == 'video' ? ' [video]' : '')
], __FILE__, __LINE__, __FUNCTION__);
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> $new_apod_picid: %s', __FUNCTION__, __LINE__, $new_apod_picid));
$new_apod_basedata = [
'album'=>APOD_GALLERY_ID
,'pic_added'=>$new_apod_date
,'name'=>$new_apod_title.($new_apod_mediatype == 'video' ? ' [video]' : '')
];
if (!empty($new_apod_fileext) && is_string($new_apod_fileext)) $new_apod_basedata['extension'] = $new_apod_fileext;
$new_apod_picid = $db->insert('gallery_pics', $new_apod_basedata, __FILE__, __LINE__, __FUNCTION__);
zorgDebugger::log()->debug('$new_apod_picid: %s', [$new_apod_picid]);

/** If $new_apod_title is empty, abort */
} else {
Expand All @@ -142,8 +142,8 @@ function get_apod($apod_date_input=NULL)
$new_apod_filepath_pic_tn = tnPath(APOD_GALLERY_ID, $new_apod_picid, $new_apod_fileext); // Fix eventual double-slashes in path

/** Create APOD gallery pic */
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> createPic(): %s', __FUNCTION__, __LINE__, $new_apod_filepath_pic));
if (!createPic($new_apod_temp_filepath, $new_apod_filepath_pic, $MAX_PIC_SIZE['picWidth'], $MAX_PIC_SIZE['picHeight']))
zorgDebugger::log()->debug('image createPic(): %s', [$new_apod_filepath_pic]);
if (!createPic($new_apod_temp_filepath, $new_apod_filepath_pic, MAX_PIC_SIZE['width'], MAX_PIC_SIZE['height']))
{
error_log(sprintf('[ERROR] <%s:%d> %s createPic() ERROR: %s', __FILE__, __LINE__, __FUNCTION__, $new_apod_filepath_pic));
/** Goto: cleanup */
Expand All @@ -152,8 +152,8 @@ function get_apod($apod_date_input=NULL)
}

/** Create APOD gallery pic-thumbnail */
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> createPic() thumbnail: %s', __FUNCTION__, __LINE__, $new_apod_filepath_pic_tn));
if (!createPic($new_apod_temp_filepath, $new_apod_filepath_pic_tn, $MAX_PIC_SIZE['tnWidth'], $MAX_PIC_SIZE['tnHeight']))
zorgDebugger::log()->debug('image createPic() thumbnail: %s', [$new_apod_filepath_pic_tn]);
if (!createPic($new_apod_temp_filepath, $new_apod_filepath_pic_tn, MAX_THUMBNAIL_SIZE['width'], MAX_THUMBNAIL_SIZE['height']))
{
error_log(sprintf('[ERROR] <%s:%d> %s createPic() thumbnail ERROR: %s', __FILE__, __LINE__, __FUNCTION__, $new_apod_filepath_pic_tn));
/** Goto: cleanup */
Expand All @@ -171,6 +171,7 @@ function get_apod($apod_date_input=NULL)
*/
case 'video':
/* Find out what 'video'-type exactly we're dealing with... */
$media_type = null;
$video_services = [
[
'service' => 'youtube'
Expand All @@ -186,14 +187,14 @@ function get_apod($apod_date_input=NULL)
if (strpos($service['identifier'], $new_apod_urlparts['dirname']) !== false)
{
$media_type = $service['service'];
zorgDebugger::log()->debug('$service[identifier] found: %s', [$media_type]);
/** Video type found, let's exit the foreach{}-loop */
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> $service[identifier] found: %s', __FUNCTION__, __LINE__, $media_type));
break;
}
}

/** No matching $media_type found, let's Goto: cleanup */
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> $media_type: %s', __FUNCTION__, __LINE__, print_r($media_type,true)));
zorgDebugger::log()->debug('$media_type: NOT FOUND --> %s', [print_r($media_type,true)]);
if (empty($media_type) || is_array($media_type))
{
/** Goto: cleanup */
Expand All @@ -204,7 +205,7 @@ function get_apod($apod_date_input=NULL)
/** Get Video-Thumbnail image */
$new_apod_img_thumbnail = getVideoThumbnail($media_type, $new_apod_urlparts['filename']);
$new_apod_temp_filepath = $new_apod_temp_filepath.pathinfo($new_apod_img_thumbnail, PATHINFO_EXTENSION);
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> cURLfetchUrl(): %s', __FUNCTION__, __LINE__, $new_apod_temp_filepath));
zorgDebugger::log()->debug('video cURLfetchUrl(): %s', [$new_apod_temp_filepath]);
if (!cURLfetchUrl($new_apod_img_thumbnail, $new_apod_temp_filepath))
{
remove_apod_id_from_db($new_apod_picid);
Expand All @@ -213,8 +214,8 @@ function get_apod($apod_date_input=NULL)

/** Create APOD gallery pic-thumbnail for 'video' */
$new_apod_filepath_pic_tn = tnPath(APOD_GALLERY_ID, $new_apod_picid, '.'.pathinfo($new_apod_img_thumbnail, PATHINFO_EXTENSION));
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> createPic() thumbnail: %s', __FUNCTION__, __LINE__, $new_apod_filepath_pic_tn));
if (!createPic($new_apod_temp_filepath, $new_apod_filepath_pic_tn, $MAX_PIC_SIZE['tnWidth'], $MAX_PIC_SIZE['tnHeight']))
zorgDebugger::log()->debug('video createPic() thumbnail: %s', [$new_apod_filepath_pic_tn]);
if (!createPic($new_apod_temp_filepath, $new_apod_filepath_pic_tn, MAX_PIC_SIZE['width'], MAX_PIC_SIZE['height']))
{
error_log(sprintf('[ERROR] <%s:%d> %s createPic() thumbnail ERROR: %s', __FILE__, __LINE__, __FUNCTION__, $new_apod_filepath_pic_tn));
remove_apod_id_from_db($new_apod_picid);
Expand All @@ -223,7 +224,7 @@ function get_apod($apod_date_input=NULL)

/** Update APOD 'video' entry in gallery_pics table */
$result = $db->update('gallery_pics', ['id', $new_apod_picid], ['extension' => $media_type, 'picsize' => $new_apod_img_small], __FILE__, __LINE__, __FUNCTION__);
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> $db->update(gallery_pics): (%s) %s', __FUNCTION__, __LINE__, $result, ($result>0 ? 'true' : 'false')));
zorgDebugger::log()->debug('$db->update(gallery_pics): (%s) %s', [$result, ($result>0 ? 'true' : 'false')]);
if ($result === 0) {
remove_apod_id_from_db($new_apod_picid);
return false;
Expand All @@ -238,10 +239,10 @@ function get_apod($apod_date_input=NULL)
case 'website':
/** Create APOD gallery pic-thumbnail for 'video' or 'website' */
$new_apod_temp_filepath = PHP_IMAGES_DIR . 'apod/tn_website.png';
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> $new_apod_temp_filepath: %s', __FUNCTION__, __LINE__, $new_apod_temp_filepath));
zorgDebugger::log()->debug('$new_apod_temp_filepath: %s', [$new_apod_temp_filepath]);
$new_apod_filepath_pic_tn = tnPath(APOD_GALLERY_ID, $new_apod_picid, '.'.pathinfo($new_apod_temp_filepath, PATHINFO_EXTENSION));
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> createPic() thumbnail: %s', __FUNCTION__, __LINE__, $new_apod_filepath_pic_tn));
if (!createPic($new_apod_temp_filepath, $new_apod_filepath_pic_tn, $MAX_PIC_SIZE['tnWidth'], $MAX_PIC_SIZE['tnHeight']))
zorgDebugger::log()->debug('website createPic() thumbnail: %s', [$new_apod_filepath_pic_tn]);
if (!createPic($new_apod_temp_filepath, $new_apod_filepath_pic_tn, MAX_PIC_SIZE['width'], MAX_PIC_SIZE['height']))
{
error_log(sprintf('[ERROR] <%s:%d> %s createPic() thumbnail ERROR: %s', __FILE__, __LINE__, __FUNCTION__, $new_apod_filepath_pic_tn));
remove_apod_id_from_db($new_apod_picid);
Expand All @@ -250,7 +251,7 @@ function get_apod($apod_date_input=NULL)

/** Update APOD 'website' entry in gallery_pics table */
$result = $db->update('gallery_pics', ['id', $new_apod_picid], ['extension' => $new_apod_mediatype, 'picsize' => $new_apod_img_small], __FILE__, __LINE__, __FUNCTION__);
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> $db->update(gallery_pics): (%s) %s', __FUNCTION__, __LINE__, $result, ($result>0 ? 'true' : 'false')));
zorgDebugger::log()->debug('$db->update(gallery_pics): (%s) %s', [($result>0 ? 'true' : 'false')]);
if ($result === 0) {
remove_apod_id_from_db($new_apod_picid);
return false;
Expand Down
35 changes: 17 additions & 18 deletions www/includes/gallery.inc.php
View file
Expand Up @@ -1497,14 +1497,14 @@ function createPic($srcFile, $dstFile, $maxWidth, $maxHeight, $bgcolor=0)

$ret = array('width'=>$maxWidth, 'height'=>$maxHeight);
} else {
$dst = ImageCreateTrueColor ($picWidth, $picHeight); // GD 2.0.1
//$dst = ImageCreate($picWidth, $picHeight); // GD 1.6
$dst = ImageCreateTrueColor($picWidth, $picHeight); // GD 2.0.1
//$dst = ImageCreate($picWidth, $picHeight); // GD 1.6
if (!$dst) return array('error'=>"Bild konnte nicht erzeugt werden");

if (ImageCopyResampled($dst, $src, 0,0,0,0, $picWidth, $picHeight, $width, $height)) {
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> ImageCopyResampled OK', __FUNCTION__, __LINE__));
zorgDebugger::log()->debug('ImageCopyResampled OK');
} else {
error_log(sprintf('[ERROR] <%s:%d> ImageCopyResampled: %s => %s', __FUNCTION__, __LINE__, $src, $dst));
error_log(sprintf('[ERROR] <%s:%d> ImageCopyResampled: %s', __FUNCTION__, __LINE__, $src));
return false;
}

Expand All @@ -1513,42 +1513,41 @@ function createPic($srcFile, $dstFile, $maxWidth, $maxHeight, $bgcolor=0)

switch ($ext) {
case '.jpg':
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> ImageJPEG(%s, %s)', __FUNCTION__, __LINE__, $dst, $dstFile));
zorgDebugger::log()->debug('ImageJPEG($dst, %s)', [$dstFile]);
if (!ImageJPEG($dst, $dstFile)) {
error_log(sprintf('[ERROR] <%s:%d> ImageJPEG: %s => %s', __FUNCTION__, __LINE__, $dst, $dstFile));
zorgDebugger::log()->debug('ImageJPEG: $dst => %s', [$dstFile]);
return false;
}
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> ImageJPEG() OK', __FUNCTION__, __LINE__));
zorgDebugger::log()->debug('ImageJPEG() OK');
break;

case '.gif':
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> ImageGIF(%s, %s)', __FUNCTION__, __LINE__, $dst, $dstFile));
zorgDebugger::log()->debug('ImageGIF($dst, %s)', [$dstFile]);
if (!ImageGIF($dst, $dstFile)) {
error_log(sprintf('[ERROR] <%s:%d> ImageGIF: %s => %s', __FUNCTION__, __LINE__, $dst, $dstFile));
zorgDebugger::log()->debug('ImageGIF: $dst => %s', [$dstFile]);
return false;
}
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> ImageGIF() OK', __FUNCTION__, __LINE__));
zorgDebugger::log()->debug('ImageGIF() OK');
break;

case '.png':
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> ImagePNG(%s, %s)', __FUNCTION__, __LINE__, $dst, $dstFile));
zorgDebugger::log()->debug('ImagePNG($dst, %s)', [$dstFile]);
if (!ImagePNG($dst, $dstFile)) {
error_log(sprintf('[ERROR] <%s:%d> ImagePNG: %s => %s', __FUNCTION__, __LINE__, $dst, $dstFile));
zorgDebugger::log()->debug('ImagePNG: $dst => %s', [$dstFile]);
return false;
}
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> ImagePNG() OK', __FUNCTION__, __LINE__));
zorgDebugger::log()->debug('ImagePNG() OK');
break;

default:
error_log(sprintf('[ERROR] <%s:%d> Wrong File Type', __FUNCTION__, __LINE__));
error_log(sprintf('[ERROR] <%s:%d> Wrong File Type: %s', __FUNCTION__, __LINE__, strval($ext)));
return false;
break;
}
chmod($dstFile, 0664);

ImageDestroy($src);
ImageDestroy($dst);
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> ImageDestroy() OK', __FUNCTION__, __LINE__));
zorgDebugger::log()->debug('ImageDestroy() OK');

return $ret;
}
Expand Down Expand Up @@ -2012,7 +2011,7 @@ function pic2album($id)
function getVideoThumbnail($service, $video_id, $image_size='small', $output_to='display')
{
/** Validate & format passed parameters */
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> getVideoThumbnail(): %s, %s, %s, %s', __FUNCTION__, __LINE__, $service, $video_id, $image_size, $output_to));
zorgDebugger::log()->debug('getVideoThumbnail(): %s, %s, %s, %s', [$service, $video_id, $image_size, $output_to]);
if (is_array($service) || is_array($video_id) || is_array($image_size) || is_array($output_to)) return false;
if (is_numeric($service) || is_numeric($image_size) || is_numeric($output_to)) return false;
if (strpos($video_id, '?') > 0) $video_id = strtok($video_id, '?');
Expand All @@ -2037,7 +2036,7 @@ function getVideoThumbnail($service, $video_id, $image_size='small', $output_to=
]
];
$thumbnailUrl = sprintf($service_data[$service]['url'], $video_id, $service_data[$service]['size'][$image_size]);
if (DEVELOPMENT) error_log(sprintf('[DEBUG] <%s:%d> $thumbnailUrl: %s', __FUNCTION__, __LINE__, $thumbnailUrl));
zorgDebugger::log()->debug('$thumbnailUrl: %s', [$thumbnailUrl]);

/** Download Video-Thumbnail from URL to path as specified in $output_to */
if ($output_to != 'display')
Expand Down
6 changes: 5 additions & 1 deletion www/includes/mysql.inc.php
View file
Expand Up @@ -110,9 +110,13 @@ function query($sql, $file='', $line=0, $funktion='', $params=[]) {
/** Check if $params is provided, if not, execute the query directly */
if (empty($params)) {
$result = mysqli_query($this->conn, $sql);
/* Log SQL-Queries not upgraded to Prepared Statements */
/** Log SQL-Queries not upgraded to Prepared Statements */
zorgDebugger::log()->debug('<%s:%d> may required update to SQL prepared statement, in %s', [$funktion, $line, $file]);
} else {
/** Ensure $params is an Array */
if (is_object($params)) throw '$params cannot be of type object!';
if (!is_array($params)) $params = [ $params ];

$stmt = mysqli_prepare($this->conn, $sql);
if ($stmt === false) throw new mysqli_sql_exception(mysqli_error($this->conn));

Expand Down
6 changes: 3 additions & 3 deletions www/includes/usersystem.inc.php
View file
Expand Up @@ -187,7 +187,7 @@ function __construct()

/** Grundsätzlich mal jeden zuerst als "Gast" anschauen */
$this->typ = USER_ALLE;
session_name(ZORG_SESSION_ID);
session_name(ZORG_SESSION_ID); // FIXME Cannot change session name when session is active

/** DEACTIVATED: Generelle Session Settings & Session (re-)Starten (wenn noch nicht aktiv) */
// if (session_status() === PHP_SESSION_NONE)
Expand Down Expand Up @@ -1831,10 +1831,10 @@ function get_and_create_user_files_dir($user_id)
* @since 1.0 `04.01.2024` `IneX` Method added
*
* @param integer $user_id
* @param string $game_name Name of Game: «addle» or chess. Default: addle
* @param string $game_name Name of Game: «addle» or «chess». Default: addle
* @return boolean
*/
function userPlays($game_name='addle', $user_id)
function userPlays($user_id, $game_name='addle')
{
global $db;

Expand Down
2 changes: 1 addition & 1 deletion www/profil.php
View file
Expand Up @@ -177,7 +177,7 @@
$htmlOutput .= '<img src="'.$user->userImage($user_id, 1).'">';//style="width: 100%;max-width: 100%;"

/** User Addle (nur wenn Viewer selber eingeloggt ist) */
if ($user->is_loggedin() && $user_id !== $user->id && $user->userPlays('addle', $user_id))
if ($user->is_loggedin() && $user_id !== $user->id && $user->userPlays($user_id, 'addle'))
{
$sidebarHtml .= '<h3>Addle</h3>
<form action="/addle.php?show=overview&do=new" method="post">
Expand Down

0 comments on commit 37f6c84

Please sign in to comment.