Исправил вывод имени вместо логина на форуме

visavi · May 27, 2018 · c6260c2 · c6260c2
1 parent facf6b9
commit c6260c2
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 19 deletions.
diff --git a/app/helpers.php b/app/helpers.php
@@ -1525,11 +1525,12 @@ function counterString($file)
 /**
  * Возвращает ссылку на профиль пользователя
  *
- * @param  User   $user  объект пользователя
- * @param  string $color цвет логина
+ * @param  User    $user  объект пользователя
+ * @param  string  $color цвет логина
+ * @param  boolean $link  выводить как ссылку
  * @return string        путь к профилю
  */
-function profile(User $user, $color = null)
+function profile(User $user, $color = null, $link = true)
 {
     if ($user->id) {
         $name = empty($user->name) ? $user->login : $user->name;
@@ -1538,7 +1539,11 @@ function profile(User $user, $color = null)
             $name = '<span style="color:' . $color . '">' . $name . '</span>';
         }
 
-        return '<a class="author" href="/users/' . $user->login . '" data-login="' . $user->login . '">' . $name . '</a>';
+        if ($link) {
+            return '<a class="author" href="/users/' . $user->login . '" data-login="' . $user->login . '">' . $name . '</a>';
+        }
+
+        return '<span class="author" data-login="' . $user->login . '">' . $name . '</span>';
     }
 
     return '<span class="author" data-login="' . setting('guestsuser') . '">' . setting('guestsuser') . '</span>';

diff --git a/resources/views/admin/forums/forum.blade.php b/resources/views/admin/forums/forum.blade.php
@@ -43,7 +43,7 @@
                 <div>
                     @if ($topic->lastPost)
                         {!! $topic->pagination('/admin/topics') !!}
-                        Сообщение: {{ $topic->lastPost->user->login }} ({{ dateFixed($topic->lastPost->created_at) }})
+                        Сообщение: {!! profile($topic->lastPost->user, null, false) !!} ({{ dateFixed($topic->lastPost->created_at) }})
                     @endif
                 </div>
             @endforeach

diff --git a/resources/views/admin/forums/index.blade.php b/resources/views/admin/forums/index.blade.php
@@ -53,7 +53,7 @@
                 @if ($forum->lastTopic->lastPost->id)
                     Тема: <a href="/admin/topics/end/{{ $forum->lastTopic->id }}">{{ $forum->lastTopic->title }}</a>
                     <br/>
-                    Сообщение: {{ $forum->lastTopic->lastPost->user->login }} ({{ dateFixed($forum->lastTopic->lastPost->created_at) }})
+                    Сообщение: {!! profile($forum->lastTopic->lastPost->user, null, false) !!} ({{ dateFixed($forum->lastTopic->lastPost->created_at) }})
                 @else
                     Темы еще не созданы!
                 @endif

diff --git a/resources/views/blogs/tags_search.blade.php b/resources/views/blogs/tags_search.blade.php
@@ -19,7 +19,7 @@
     <h3>Поиск запроса &quot;{{ $tag }}&quot; в метках</h3>
     Найдено совпадений: <b>{{ $page->total }}</b><br>
 
-    <?php foreach($blogs as $data): ?>
+    @foreach($blogs as $data)
 
         <div class="b">
             <i class="fa fa-pencil-alt"></i>
@@ -30,9 +30,9 @@
             Категория: <a href="/blogs/{{ $data->category_id }}">{{ $data->name }}</a><br>
             Просмотров: {{ $data->visits }}<br>
             Метки: {{ $data->tags }}<br>
-            Автор: <?= profile($data->user) ?>  (<?=dateFixed($data->created_at)?>)
+            Автор: {!! profile($data->user) !!}  ({{ dateFixed($data->created_at) }})
         </div>
-    <?php endforeach; ?>
+    @endforeach
 
     {!! pagination($page) !!}
 @stop
diff --git a/resources/views/forums/active_topics.blade.php b/resources/views/forums/active_topics.blade.php
@@ -25,7 +25,7 @@
         <div>
             {!! $data->pagination() !!}
             Форум: <a href="/forums/{{ $data->forum->id }}">{{ $data->forum->title }}</a><br>
-            Автор: {{ $data->user->login }} / Посл.: {{ $data->lastPost->user->login }} ({{ dateFixed($data->lastPost->created_at) }})
+            Автор: {!! profile($data->user, null, false) !!} / Посл.: {!! profile($data->lastPost->user, null, false) !!} ({{ dateFixed($data->lastPost->created_at) }})
         </div>
     @endforeach
 

diff --git a/resources/views/forums/bookmark.blade.php b/resources/views/forums/bookmark.blade.php
@@ -29,8 +29,8 @@
 
                 <div>
                     {!! $topic->topic->pagination() !!}
-                    Автор: {{ $topic->topic->user->login }} /
-                    Посл.: {{ $topic->topic->lastPost->user->login }}
+                    Автор: {!! profile($topic->topic->user, null, false) !!} /
+                    Посл.: {!! profile($topic->topic->lastPost->user, null, false) !!}
                     ({{ dateFixed($topic->topic->lastPost->created_at) }})
                 </div>
             @endforeach

diff --git a/resources/views/forums/forum.blade.php b/resources/views/forums/forum.blade.php
@@ -43,7 +43,7 @@
                 <div>
                     Тема: <a href="/topics/end/{{ $child->lastTopic->id }}">{{ $child->lastTopic->title }}</a><br>
                     @if ($child->lastTopic->lastPost->id)
-                        Сообщение: {{ $child->lastTopic->lastPost->user->login }} ({{ dateFixed($child->lastTopic->lastPost->created_at) }})
+                        Сообщение: {!! profile($child->lastTopic->lastPost->user, null, false) !!} ({{ dateFixed($child->lastTopic->lastPost->created_at) }})
                     @endif
                 </div>
             @else
@@ -64,7 +64,7 @@
             <div>
                 @if ($topic->lastPost)
                     {!! $topic->pagination() !!}
-                    Сообщение: {{ $topic->lastPost->user->login }} ({{ dateFixed($topic->lastPost->created_at) }})
+                    Сообщение: {!! profile($topic->lastPost->user, null, false) !!} ({{ dateFixed($topic->lastPost->created_at) }})
                 @endif
             </div>
         @endforeach

diff --git a/resources/views/forums/index.blade.php b/resources/views/forums/index.blade.php
@@ -47,7 +47,7 @@
                 @if ($forum->lastTopic->lastPost->id)
                     Тема: <a href="/topics/end/{{ $forum->lastTopic->id }}">{{ $forum->lastTopic->title }}</a>
                     <br/>
-                    Сообщение: {{ $forum->lastTopic->lastPost->user->login }} ({{ dateFixed($forum->lastTopic->lastPost->created_at) }})
+                    Сообщение: {!! profile($forum->lastTopic->lastPost->user, null, false) !!} ({{ dateFixed($forum->lastTopic->lastPost->created_at) }})
                 @else
                     Темы еще не созданы!
                 @endif

diff --git a/resources/views/forums/new_topics.blade.php b/resources/views/forums/new_topics.blade.php
@@ -24,7 +24,7 @@
         <div>
             {!! $data->pagination() !!}
             Форум: <a href="/forums/{{  $data->forum->id }}">{{  $data->forum->title }}</a><br>
-            Автор: {{ $data->user->login }} / Посл.: {{ $data->lastPost->user->login }} ({{ dateFixed($data->created_at) }})
+            Автор: {!! profile($data->user, null, false) !!} / Посл.: {!! profile($data->lastPost->user, null, false) !!} ({{ dateFixed($data->created_at) }})
         </div>
 
     @endforeach

diff --git a/resources/views/forums/search_topics.blade.php b/resources/views/forums/search_topics.blade.php
@@ -27,7 +27,7 @@
         <div>
             {!! $topic->pagination() !!}
             Раздел: <a href="/topics/{{ $topic->forum->id }}">{{ $topic->forum->title }}</a><br>
-            Сообщение: {{ $topic->lastPost->user->login }} ({{ dateFixed($topic->lastPost->created_at) }})
+            Сообщение: {!! profile($topic->lastPost->user, null, false) !!} ({{ dateFixed($topic->lastPost->created_at) }})
         </div>
     @endforeach
 

diff --git a/resources/views/forums/top.blade.php b/resources/views/forums/top.blade.php
@@ -24,8 +24,8 @@
             </div>
             <div>
                 {!! $data->pagination() !!}
-                Автор: {{ $data->user->login }}<br>
-                Сообщение: {{ $data->lastPost->user->login }} ({{ dateFixed($data->lastPost->created_at) }})
+                Автор: {!! profile($data->user, null, false) !!}<br>
+                Сообщение: {!! profile($data->lastPost->user, null, false) !!} ({{ dateFixed($data->lastPost->created_at) }})
             </div>
         @endforeach