Delete reaction type icon on delete action

diff --git a/wcfsetup/install/files/lib/data/reaction/type/ReactionTypeAction.class.php b/wcfsetup/install/files/lib/data/reaction/type/ReactionTypeAction.class.php
index ee73d23b61fa7473984211c98db577439050adc9..6ed3dbde4db131c29b78f71a8361c1fefb924540 100644 (file)
--- a/wcfsetup/install/files/lib/data/reaction/type/ReactionTypeAction.class.php
+++ b/wcfsetup/install/files/lib/data/reaction/type/ReactionTypeAction.class.php
@@ -24,22 +24,22 @@ use wcf\system\WCF;
  */
 class ReactionTypeAction extends AbstractDatabaseObjectAction implements ISortableAction, IToggleAction {
        use TDatabaseObjectToggle;
-       
+
        /**
         * @inheritDoc
         */
        protected $permissionsDelete = ['admin.content.reaction.canManageReactionType'];
-       
+
        /**
         * @inheritDoc
         */
        protected $permissionsUpdate = ['admin.content.reaction.canManageReactionType'];
-       
+
        /**
         * @inheritDoc
         */
        protected $requireACP = ['delete', 'update', 'updatePosition'];
-       
+
        /**
         * @inheritDoc
         */
@@ -53,17 +53,17 @@ class ReactionTypeAction extends AbstractDatabaseObjectAction implements ISortab
                                $this->parameters['data']['showOrder']
                        ]);
                }
-               
+
                // The title cannot be empty by design, but cannot be filled proper if the
                // multilingualism is enabled, therefore, we must fill the tilte with a dummy value.
                if (!isset($this->parameters['data']['title']) && isset($this->parameters['title_i18n'])) {
                        $this->parameters['data']['title'] = 'wcf.reactionType.title';
                }
-               
+
                /** @var ReactionType $reactionType */
                $reactionType = parent::create();
                $reactionTypeEditor = new ReactionTypeEditor($reactionType);
-               
+
                // i18n
                $updateData = [];
                if (isset($this->parameters['title_i18n'])) {
@@ -73,44 +73,44 @@ class ReactionTypeAction extends AbstractDatabaseObjectAction implements ISortab
                                'wcf.reactionType',
                                1
                        );
-                       
+
                        $updateData['title'] = 'wcf.reactionType.title' . $reactionType->reactionTypeID;
                }
-               
+
                // image
                if (isset($this->parameters['iconFile']) && is_array($this->parameters['iconFile'])) {
                        $iconFile = reset($this->parameters['iconFile']);
                        if (!($iconFile instanceof UploadFile)) {
                                throw new \InvalidArgumentException("The parameter 'image' is no instance of '". UploadFile::class ."', instance of '". get_class($iconFile) ."' given.");
                        }
-                       
+
                        // save new image
                        if (!$iconFile->isProcessed()) {
                                $fileName = $reactionType->reactionTypeID . '-' . $iconFile->getFilename();
-                               
+
                                rename($iconFile->getLocation(), WCF_DIR . '/images/reaction/' . $fileName);
                                $iconFile->setProcessed(WCF_DIR . '/images/reaction/' . $fileName);
-                               
+
                                $updateData['iconFile'] = $fileName;
                        }
                }
-               
+
                if (!empty($updateData)) {
                        $reactionTypeEditor->update($updateData);
                }
-               
+
                return $reactionType;
        }
-       
+
        /**
         * @inheritDoc
         */
        public function update() {
                parent::update();
-               
+
                foreach ($this->getObjects() as $object) {
                        $updateData = [];
-                       
+
                        // i18n
                        if (isset($this->parameters['title_i18n'])) {
                                I18nHandler::getInstance()->save(
@@ -119,10 +119,10 @@ class ReactionTypeAction extends AbstractDatabaseObjectAction implements ISortab
                                        'wcf.reactionType',
                                        1
                                );
-                               
+
                                $updateData['title'] = 'wcf.reactionType.title' . $object->reactionTypeID;
                        }
-                       
+
                        // delete orphaned images
                        if (isset($this->parameters['iconFile_removedFiles']) && is_array($this->parameters['iconFile_removedFiles'])) {
                                /** @var UploadFile $file */
@@ -130,25 +130,25 @@ class ReactionTypeAction extends AbstractDatabaseObjectAction implements ISortab
                                        @unlink($file->getLocation());
                                }
                        }
-                       
+
                        // image
                        if (isset($this->parameters['iconFile']) && is_array($this->parameters['iconFile'])) {
                                $iconFile = reset($this->parameters['iconFile']);
                                if (!($iconFile instanceof UploadFile)) {
                                        throw new \InvalidArgumentException("The parameter 'image' is no instance of '". UploadFile::class ."', instance of '". get_class($iconFile) ."' given.");
                                }
-                               
+
                                // save new image
                                if (!$iconFile->isProcessed()) {
                                        $fileName = $object->reactionTypeID . '-' . $iconFile->getFilename();
-                                       
+
                                        rename($iconFile->getLocation(), WCF_DIR . '/images/reaction/' . $fileName);
                                        $iconFile->setProcessed(WCF_DIR . '/images/reaction/' . $fileName);
-                                       
+
                                        $updateData['iconFile'] = $fileName;
                                }
                        }
-                       
+
                        // update show order
                        if (isset($this->parameters['data']['showOrder']) && $this->parameters['data']['showOrder'] !== null) {
                                $sql = "UPDATE  wcf" . WCF_N . "_reaction_type
@@ -160,7 +160,7 @@ class ReactionTypeAction extends AbstractDatabaseObjectAction implements ISortab
                                        $this->parameters['data']['showOrder'],
                                        $object->reactionTypeID
                                ]);
-                               
+
                                $sql = "UPDATE  wcf" . WCF_N . "_reaction_type
                                        SET     showOrder = showOrder - 1
                                        WHERE   showOrder > ?";
@@ -169,13 +169,13 @@ class ReactionTypeAction extends AbstractDatabaseObjectAction implements ISortab
                                        $object->showOrder
                                ]);
                        }
-                       
+
                        if (!empty($updateData)) {
                                $object->update($updateData);
-                       } 
+                       }
                }
        }
-       
+
        /**
         * @inheritDoc
         */
@@ -187,39 +187,39 @@ class ReactionTypeAction extends AbstractDatabaseObjectAction implements ISortab
                else {
                        throw new PermissionDeniedException();
                }
-               
+
                if (!isset($this->parameters['data']['structure'])) {
                        throw new UserInputException('structure');
                }
-               
+
                $this->readInteger('offset', true, 'data');
        }
-       
+
        /**
         * @inheritDoc
         */
        public function updatePosition() {
                $reactionTypeList = new ReactionTypeList();
                $reactionTypeList->readObjects();
-               
+
                $i = $this->parameters['data']['offset'];
                WCF::getDB()->beginTransaction();
                foreach ($this->parameters['data']['structure'][0] as $reactionTypeID) {
                        $reactionType = $reactionTypeList->search($reactionTypeID);
                        if ($reactionType === null) continue;
-                       
+
                        $editor = new ReactionTypeEditor($reactionType);
                        $editor->update(['showOrder' => $i++]);
                }
                WCF::getDB()->commitTransaction();
        }
-       
+
        /**
         * @inheritDoc
         */
        public function delete() {
                $returnValues = parent::delete();
-               
+
                $sql = "UPDATE  wcf" . WCF_N . "_reaction_type
                                SET     showOrder = showOrder - 1
                                WHERE   showOrder > ?";
@@ -228,11 +228,16 @@ class ReactionTypeAction extends AbstractDatabaseObjectAction implements ISortab
                        $statement->execute([
                                $object->showOrder
                        ]);
+
+                       // Delete outdated reaction type icon.
+                       if (isset($object->iconFile) && \file_exists(WCF_DIR . '/images/reaction/' . $object->iconFile)) {
+                               @unlink(WCF_DIR . '/images/reaction/' . $object->iconFile);
+                       }
                }
-               
+
                return $returnValues;
        }
-       
+
        /**
         * @inheritDoc
         */