Lanmikeman/nativegallery-weryskok
1
0
Fork 0
mirror of https://github.com/WerySkok/nativegallery.git synced 2024-11-15 03:31:19 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix exif

Browse source
This commit is contained in:
themohooks 2024-07-05 13:59:22 +03:00
parent 8ee5f1c486
commit f7595364d8
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Models/Comment.php
View file

@ -1,7 +1,7 @@
<?php <?php
namespace App\Models; namespace App\Models;
use \App\Services\{DB, Date}; use \App\Services\{DB, Date};
use \App\Models\User; use \App\Models\{User, Photo};
class Comment { class Comment {
@ -17,8 +17,8 @@ class Comment {
<span class="message_date">'.Date::zmdate($this->c['posted_at']).'</span><br> <span class="message_date">'.Date::zmdate($this->c['posted_at']).'</span><br>
</div> </div>
<a name="2681468"></a><a name="last"></a> <a name="2681468"></a><a name="last"></a>
<div><b><a href="/author/'.$this->c['user_id'].'/" class="message_author">'.$user->i('username').'</a></b> &middot; </div> <div><img src="'.$user->i('photourl').'" width="32" style="border-radius: 3px; margin-right: 5px;"><b><a href="/author/'.$this->c['user_id'].'/" class="message_author">'.$user->i('username').'</a></b> &middot; </div>
<div class="rank">Фото: 1585</div> <div class="rank">Фото: '.Photo::fetchAll($this->c['user_id']).'</div>
<div class="message-text">'.$this->c['body'].'</div> <div class="message-text">'.$this->c['body'].'</div>
<div class="comment-votes-block"> <div class="comment-votes-block">
<div class="wvote" wid="'.$this->c['id'].'"> <div class="wvote" wid="'.$this->c['id'].'">

5
app/Models/Photo.php
View file

@ -11,6 +11,11 @@ class Photo {
public function i($table) { public function i($table) {
return DB::query("SELECT * FROM photos WHERE id=:id", array(':id'=>$this->photoid))[0][$table]; return DB::query("SELECT * FROM photos WHERE id=:id", array(':id'=>$this->photoid))[0][$table];
} }
public static function fetchAll($user_id = NULL) {
if ($user_id != NULL) {
return DB::query("SELECT COUNT(*) FROM photos WHERE user_id=:id", array(':id'=>$user_id))[0]['COUNT(*)'];
}
}
public function content($table) { public function content($table) {
$content = json_decode(self::i('content'), true); $content = json_decode(self::i('content'), true);
return $content[$table]; return $content[$table];

2
views/components/Navbar.php
View file

@ -59,7 +59,7 @@ $user = new \App\Models\User(Auth::userid());
<li class="mm-pad-right"><a href="/login" class="mm-item"><span class="mm-icon"><i class="fas fa-xs fa-address-card"></i></span><span class="mm-label">Войти</span></a></li> <li class="mm-pad-right"><a href="/login" class="mm-item"><span class="mm-icon"><i class="fas fa-xs fa-address-card"></i></span><span class="mm-label">Войти</span></a></li>
<li><a href="/register" class="mm-item"><span class="mm-icon"><i class="fas fa-xs fa-user"></i></span><span class="mm-label">Регистрация</span></a></li> <li><a href="/register" class="mm-item"><span class="mm-icon"><i class="fas fa-xs fa-user"></i></span><span class="mm-label">Регистрация</span></a></li>
<?php } else { ?> <?php } else { ?>
<li class="mm-pad-right mm-wide"><a href="/author/32944/" class="mm-item"><span class="mm-icon"><i class="fas fa-xs fa-user"></i></span><span class="mm-label"><?=$user->i('username')?></span></a> <li class="mm-pad-right mm-wide"><a href="/author/<?=Auth::userid()?>/" class="mm-item"><span class="mm-icon"><i class="fas fa-xs fa-user"></i></span><span class="mm-label"><?=$user->i('username')?></span></a>
<div> <div>
<ul class="mm-level-2"> <ul class="mm-level-2">
<li><a href="/lk/" class="mm-item"><span class="mm-icon"><i class="fas fa-sm fa-fw fa-info-circle"></i></span><span class="mm-label">Общая информация</span></a></li> <li><a href="/lk/" class="mm-item"><span class="mm-icon"><i class="fas fa-sm fa-fw fa-info-circle"></i></span><span class="mm-label">Общая информация</span></a></li>

3
views/pages/Photo.php
View file

@ -213,6 +213,9 @@ $photouser = new \App\Models\User($photo->i('user_id'));
if ($key === 'FILE.FileDateTime') { if ($key === 'FILE.FileDateTime') {
$value = Date::zmdate($value); $value = Date::zmdate($value);
} }
if (is_array($value)) {
$value = implode(', ', $value); // Convert array to a comma-separated string
}
echo ' echo '
<tr class="s11 h21"> <tr class="s11 h21">