Various small fixes

- Fix some warnings - Remove dead function getShoutboxById() - Remove empty action attributes - Update version numbers
IlchCMS · Apr 22, 2018 · e780aea · e780aea
1 parent e1c3ef7
commit e780aea
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 30 deletions.
diff --git a/application/modules/forum/config/config.php b/application/modules/forum/config/config.php
@@ -21,7 +21,7 @@ class Config extends \Ilch\Config\Install
 
     public $config = [
         'key' => 'forum',
-        'version' => '1.6',
+        'version' => '1.7',
         'icon_small' => 'fa-list',
         'author' => 'Stantin Thomas',
         'link' => 'http://ilch.de',

diff --git a/application/modules/forum/mappers/Post.php b/application/modules/forum/mappers/Post.php
@@ -143,10 +143,11 @@ public function getPostByTopicId($topicId, $pagination = null)
     public function deleteById($id)
     {
         $this->trigger(ForumConfig::EVENT_DELETEPOST_BEFORE, ['id' => $id]);
-        return $this->db()->delete('forum_posts')
+        $returnValue = $this->db()->delete('forum_posts')
             ->where(['id' => $id])
             ->execute();
         $this->trigger(ForumConfig::EVENT_DELETEPOST_AFTER, ['id' => $id]);
+        return $returnValue;
     }
 
     public function saveVisits(PostModel $model)

diff --git a/application/modules/forum/mappers/Rank.php b/application/modules/forum/mappers/Rank.php
@@ -40,7 +40,7 @@ public function getRanks()
      * Get rank by id.
      *
      * @param integer $id
-     * @return ArticleModel
+     * @return RankModel
      */
     public function getRankById($id)
     {
@@ -63,7 +63,7 @@ public function getRankById($id)
      * Get rank by posts.
      *
      * @param integer $posts
-     * @return ArticleModel
+     * @return RankModel
      */
     public function getRankByPosts($posts)
     {

diff --git a/application/modules/forum/models/ForumStatistics.php b/application/modules/forum/models/ForumStatistics.php
@@ -37,7 +37,7 @@ class ForumStatistics extends \Ilch\Model
     /**
      * Sets the id.
      *
-     * @param integer $id
+     * @param integer $countPosts
      */
     public function setCountPosts($countPosts)
     {
@@ -57,7 +57,7 @@ public function getCountPosts()
     /**
      * Sets the id.
      *
-     * @param integer $id
+     * @param integer $countTopics
      */
     public function setCountTopics($countTopics)
     {
@@ -76,7 +76,7 @@ public function getCountTopics()
     /**
      * Sets the id.
      *
-     * @param integer $id
+     * @param integer $countUsers
      */
     public function setCountUsers($countUsers)
     {

diff --git a/application/modules/forum/translations/de.php b/application/modules/forum/translations/de.php
@@ -74,7 +74,6 @@
     'noThreads' => 'Keine Themen vorhanden',
     'noNewThreads' => 'Keine neuen Themen vorhanden',
     'ranks' => 'Ränge',
-    'posts' => 'Beiträge',
     'menuRanks' => 'Ränge',
     'noRanks' => 'Keine Ränge vorhanden',
 ];
diff --git a/application/modules/forum/translations/en.php b/application/modules/forum/translations/en.php
@@ -74,7 +74,6 @@
     'noThreads' => 'No Threads available',
     'noNewThreads' => 'No new Threads available',
     'ranks' => 'Ranks',
-    'posts' => 'Posts',
     'menuRanks' => 'Ranks',
     'noRanks' => 'No ranks available',
 ];
diff --git a/application/modules/shoutbox/boxes/views/shoutbox.php b/application/modules/shoutbox/boxes/views/shoutbox.php
@@ -76,7 +76,7 @@
 
     <?php if (is_in_array($this->get('writeAccess'), explode(',', $config->get('shoutbox_writeaccess')))): ?>
         <div id="shoutbox-form-container" style="display: none;">
-            <form class="form-horizontal" action="" method="post">
+            <form class="form-horizontal" method="post">
                <?=$this->getTokenField() ?>
                 <div class="form-group hidden">
                     <label class="col-lg-2 control-label">

diff --git a/application/modules/shoutbox/config/config.php b/application/modules/shoutbox/config/config.php
@@ -10,7 +10,7 @@ class Config extends \Ilch\Config\Install
 {
     public $config = [
         'key' => 'shoutbox',
-        'version' => '1.0',
+        'version' => '1.1',
         'icon_small' => 'fa-bullhorn',
         'author' => 'Veldscholten, Kevin',
         'link' => 'http://ilch.de',

diff --git a/application/modules/shoutbox/mappers/Shoutbox.php b/application/modules/shoutbox/mappers/Shoutbox.php
@@ -44,6 +44,7 @@ public function getShoutbox()
     /**
      * Gets the Shoutbox.
      *
+     * @param null|int $limit
      * @return ShoutboxModel[]|array
      */
     public function getShoutboxLimit($limit = null)
@@ -73,19 +74,6 @@ public function getShoutboxLimit($limit = null)
         return $shoutbox;
     }
 
-    /**
-     * Gets shoutbox.
-     *
-     * @param integer $id
-     * @return ShoutboxModel|null
-     */
-    public function getShoutboxById($id)
-    {
-        $shoutbox = $this->getShoutbox(['id' => $id]);
-
-        return reset($shoutbox);
-    }
-
     /**
      * Insert shoutbox model.
      *

diff --git a/application/modules/shoutbox/models/Shoutbox.php b/application/modules/shoutbox/models/Shoutbox.php
@@ -57,7 +57,7 @@ public function getId()
      * Sets the id of the shoutbox.
      *
      * @param int $id
-     * @return this
+     * @return $this
      */
     public function setId($id)
     {
@@ -80,7 +80,7 @@ public function getUid()
      * Sets the uid of the shoutbox.
      *
      * @param string $uid
-     * @return this
+     * @return $this
      */
     public function setUid($uid)
     {
@@ -103,7 +103,7 @@ public function getName()
      * Sets the name of the shoutbox.
      *
      * @param string $name
-     * @return this
+     * @return $this
      */
     public function setName($name)
     {
@@ -126,7 +126,7 @@ public function getTextarea()
      * Sets the textarea of the shoutbox.
      *
      * @param string $textarea
-     * @return this
+     * @return $this
      */
     public function setTextarea($textarea)
     {
@@ -149,7 +149,7 @@ public function getTime()
      * Sets the time of the shoutbox.
      *
      * @param string $time
-     * @return this
+     * @return $this
      */
     public function setTime($time)
     {

diff --git a/application/modules/shoutbox/views/admin/index/index.php b/application/modules/shoutbox/views/admin/index/index.php
@@ -2,7 +2,7 @@
 
 <h1><?=$this->getTrans('manage') ?></h1>
 <?php if ($this->get('shoutbox') != ''): ?>
-    <form class="form-horizontal" method="POST" action="">
+    <form class="form-horizontal" method="POST">
         <?=$this->getTokenField() ?>
         <div class="table-responsive">
             <table class="table table-hover table-striped">