FIX: Adminクラスの各メソッドが制御を戻すよう修正

エラーページ表示の際、処理が戻っていなかったために続きの処理が行われ、ページが重複して表示されていたバグの修正。今後の機能拡張に備える目的で、exitを使わずに処理を呼び出しファイルに戻すようにした。

diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php
index 79fba52..766b4ed 100644 (file)
--- a/nucleus/libs/ADMIN.php
+++ b/nucleus/libs/ADMIN.php
@@ -229,6 +229,7 @@ class Admin
                        if (!$manager->checkTicket())\r
                        {\r
                                self::error(_ERROR_BADTICKET);\r
+                               return;\r
                        }\r
                }\r
                \r
@@ -246,6 +247,7 @@ class Admin
                else if ( self::existsSkinContents('adminerrorpage') )\r
                {\r
                        self::error(_BADACTION . ENTITY::hsc($action));\r
+                       return;\r
                }\r
                elseif ( $id != $CONF['AdminSkin'] )\r
                {\r
@@ -253,13 +255,15 @@ class Admin
                        if ( self::$skin && self::existsSkinContents('adminerrorpage') )\r
                        {\r
                                self::error(_BADACTION . ENTITY::hsc($action));\r
+                               return;\r
                        }\r
                }\r
                else\r
                {\r
                        self::error(_BADACTION . ENTITY::hsc($action));\r
+                       return;\r
                }\r
-               exit;\r
+               return;\r
        }\r
        \r
        /**\r
@@ -335,7 +339,7 @@ class Admin
                if ( $member->isLoggedIn() && $member->canLogin() )\r
                {\r
                        self::action_overview();\r
-                       exit;\r
+                       return;\r
                }\r
                \r
                /* TODO: needless variable??? */\r
@@ -425,6 +429,7 @@ class Admin
                if ( !is_array($selected) || sizeof($selected) == 0 )\r
                {\r
                        self::error(_BATCH_NOSELECTION);\r
+                       return;\r
                }\r
                \r
                // On move: when no destination blog/category chosen, show choice now\r
@@ -463,6 +468,7 @@ class Admin
                if ( !is_array($selected) || sizeof($selected) == 0 )\r
                {\r
                        self::error(_BATCH_NOSELECTION);\r
+                       return;\r
                }\r
                \r
                // On delete: check if confirmation has been given\r
@@ -506,6 +512,7 @@ class Admin
                if ( !is_array($selected) || sizeof($selected) == 0 )\r
                {\r
                        self::error(_BATCH_NOSELECTION);\r
+                       return;\r
                }\r
                \r
                // On delete: check if confirmation has been given\r
@@ -538,6 +545,7 @@ class Admin
                if ( !is_array($selected) || sizeof($selected) == 0 )\r
                {\r
                        self::error(_BATCH_NOSELECTION);\r
+                       return;\r
                }\r
                \r
                // On delete: check if confirmation has been given\r
@@ -568,6 +576,7 @@ class Admin
                if ( !is_array($selected) || sizeof($selected) == 0 )\r
                {\r
                        self::error(_BATCH_NOSELECTION);\r
+                       return;\r
                }\r
                \r
                // On move: when no destination blog chosen, show choice now\r
@@ -997,6 +1006,7 @@ class Admin
                if ( !$manager->existsItem($itemid,1,1) )\r
                {\r
                        self::error(_ERROR_NOSUCHITEM);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('itemdelete');\r
@@ -1199,6 +1209,7 @@ class Admin
                if ( $result['status'] == 'error' )\r
                {\r
                        self::error($result['message']);\r
+                       return;\r
                }\r
                \r
                $item =& $manager->getItem($result['itemid'], 0, 0);\r
@@ -1261,17 +1272,20 @@ class Admin
                if (preg_match('#[a-zA-Z0-9|\.,;:!\?=\/\\\\]{90,90}#', $body) != FALSE)\r
                {\r
                        self::error(_ERROR_COMMENT_LONGWORD);\r
+                       return;\r
                }\r
                \r
                // check length\r
                if ( i18n::strlen($body) < 3 )\r
                {\r
                        self::error(_ERROR_COMMENT_NOCOMMENT);\r
+                       return;\r
                }\r
                \r
                if ( i18n::strlen($body) > 5000 )\r
                {\r
                        self::error(_ERROR_COMMENT_TOOLONG);\r
+                       return;\r
                }\r
                \r
                // prepare body\r
@@ -1495,21 +1509,25 @@ class Admin
                        if ( !isValidDisplayName($name) )\r
                        {\r
                                self::error(_ERROR_BADNAME);\r
+                               return;\r
                        }\r
                        \r
                        if ( ($name != $mem->getDisplayName()) && Member::exists($name) )\r
                        {\r
                                self::error(_ERROR_NICKNAMEINUSE);\r
+                               return;\r
                        }\r
                        \r
                        if ( $password != $repeatpassword )\r
                        {\r
                                self::error(_ERROR_PASSWORDMISMATCH);\r
+                               return;\r
                        }\r
                        \r
                        if ( $password && (i18n::strlen($password) < 6) )\r
                        {\r
                                self::error(_ERROR_PASSWORDTOOSHORT);\r
+                               return;\r
                        }\r
                                \r
                        if ( $password )\r
@@ -1527,6 +1545,7 @@ class Admin
                                if ( !$pwdvalid )\r
                                {\r
                                        self::error($pwderror);\r
+                                       return;\r
                                }\r
                        }\r
                }\r
@@ -1534,14 +1553,17 @@ class Admin
                if ( !NOTIFICATION::address_validation($email) )\r
                {\r
                        self::error(_ERROR_BADMAILADDRESS);\r
+                       return;\r
                }\r
                if ( !$realname )\r
                {\r
                        self::error(_ERROR_REALNAMEMISSING);\r
+                       return;\r
                }\r
                if ( ($locale != '') && (!in_array($locale, i18n::get_available_locale_list())) )\r
                {\r
                        self::error(_ERROR_NOSUCHTRANSLATION);\r
+                       return;\r
                }\r
                \r
                // check if there will remain at least one site member with both the logon and admin rights\r
@@ -1554,6 +1576,7 @@ class Admin
                        if ( $r->rowCount() < 2 )\r
                        {\r
                                self::error(_ERROR_ATLEASTONEADMIN);\r
+                               return;\r
                        }\r
                }\r
                \r
@@ -1645,11 +1668,13 @@ class Admin
                if ( postVar('password') != postVar('repeatpassword') )\r
                {\r
                        self::error(_ERROR_PASSWORDMISMATCH);\r
+                       return;\r
                }\r
                \r
                if ( i18n::strlen(postVar('password')) < 6 )\r
                {\r
                        self::error(_ERROR_PASSWORDTOOSHORT);\r
+                       return;\r
                }\r
                \r
                $res = Member::create(\r
@@ -1666,6 +1691,7 @@ class Admin
                if ( $res != 1 )\r
                {\r
                        self::error($res);\r
+                       return;\r
                }\r
                \r
                // fire PostRegister event\r
@@ -1725,6 +1751,7 @@ class Admin
                if ( !$info )\r
                {\r
                        self::error(_ERROR_ACTIVATE);\r
+                       return;\r
                }\r
                \r
                $mem =& $manager->getMember($info->vmember);\r
@@ -1732,6 +1759,7 @@ class Admin
                if ( !$mem )\r
                {\r
                        self::error(_ERROR_ACTIVATE);\r
+                       return;\r
                }\r
                \r
                /* TODO: we should consider to use the other way insterad of this */\r
@@ -1869,6 +1897,7 @@ class Admin
                if ( !$blog->addTeamMember($memberid, $admin) )\r
                {\r
                        self::error(_ERROR_ALREADYONTEAM);\r
+                       return;\r
                }\r
                \r
                self::action_manageteam();\r
@@ -1915,6 +1944,7 @@ class Admin
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                self::action_manageteam();\r
                return;\r
@@ -2003,6 +2033,7 @@ class Admin
                        if ( $r->rowCount() == 1 )\r
                        {\r
                                self::error(_ERROR_ATLEASTONEBLOGADMIN);\r
+                               return;\r
                        }\r
                }\r
                \r
@@ -2074,6 +2105,7 @@ class Admin
                if ( !isValidCategoryName($cname) )\r
                {\r
                        self::error(_ERROR_BADCATEGORYNAME);\r
+                       return;\r
                }\r
                \r
                $query = "SELECT * FROM %s WHERE cname=%s AND cblog=%d;";\r
@@ -2082,6 +2114,7 @@ class Admin
                if ( $res->rowCount() > 0 )\r
                {\r
                        self::error(_ERROR_DUPCATEGORYNAME);\r
+                       return;\r
                }\r
                \r
                $blog           =& $manager->getBlog($blogid);\r
@@ -2151,6 +2184,7 @@ class Admin
                if ( !isValidCategoryName($cname) )\r
                {\r
                        self::error(_ERROR_BADCATEGORYNAME);\r
+                       return;\r
                }\r
                \r
                $query  = "SELECT * FROM %s WHERE cname=%s AND cblog=%d AND not(catid=%d);";\r
@@ -2159,6 +2193,7 @@ class Admin
                if ( $res->rowCount() > 0 )\r
                {\r
                        self::error(_ERROR_DUPCATEGORYNAME);\r
+                       return;\r
                }\r
                \r
                $query =  "UPDATE %s SET cname=%s, cdesc=%s WHERE catid=%d;";\r
@@ -2177,12 +2212,11 @@ class Admin
                if ( $desturl )\r
                {\r
                        redirect($desturl);\r
-                       exit;\r
-               }\r
-               else\r
-               {\r
-                       self::action_blogsettings();\r
+                       return;\r
                }\r
+               \r
+               self::action_blogsettings();\r
+               \r
                return;\r
        }\r
        \r
@@ -2207,12 +2241,14 @@ class Admin
                if ( !$blog->isValidCategory($catid) )\r
                {\r
                        self::error(_ERROR_NOSUCHCATEGORY);\r
+                       return;\r
                }\r
                \r
                // don't allow deletion of default category\r
                if ( $blog->getDefaultCategory() == $catid )\r
                {\r
                        self::error(_ERROR_DELETEDEFCATEGORY);\r
+                       return;\r
                }\r
                \r
                // check if catid is the only category left for blogid\r
@@ -2222,6 +2258,7 @@ class Admin
                if ( $res->rowCount() == 1 )\r
                {\r
                        self::error(_ERROR_DELETELASTCATEGORY);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('categorydelete');\r
@@ -2247,6 +2284,7 @@ class Admin
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
                self::action_blogsettings();\r
@@ -2452,21 +2490,25 @@ class Admin
                if ( $notify_address && !NOTIFICATION::address_validation($notify_address) )\r
                {\r
                        self::error(_ERROR_BADNOTIFY);\r
+                       return;\r
                }\r
                \r
                if ( !isValidShortName($shortname) )\r
                {\r
                        self::error(_ERROR_BADSHORTBLOGNAME);\r
+                       return;\r
                }\r
                \r
                if ( ($blog->getShortName() != $shortname) && $manager->existsBlog($shortname) )\r
                {\r
                        self::error(_ERROR_DUPSHORTBLOGNAME);\r
+                       return;\r
                }\r
                // check if update file is writable\r
                if ( $updatefile && !is_writeable($updatefile) )\r
                {\r
                        self::error(_ERROR_UPDATEFILE);\r
+                       return;\r
                }\r
                \r
                $blog->setName(trim(postVar('name')));\r
@@ -2521,6 +2563,7 @@ class Admin
                if ( $CONF['DefaultBlog'] == $blogid )\r
                {\r
                        self::error(_ERROR_DELDEFBLOG);\r
+                       return;\r
                }\r
                \r
                $blog =& $manager->getBlog($blogid);\r
@@ -2551,6 +2594,7 @@ class Admin
                if ( $CONF['DefaultBlog'] == $blogid )\r
                {\r
                        self::error(_ERROR_DELDEFBLOG);\r
+                       return;\r
                }\r
                \r
                // delete all comments\r
@@ -2625,15 +2669,18 @@ class Admin
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
                if ( $member->isAdmin() )\r
                {\r
                        self::action_usermanagement();\r
+                       return;\r
                }\r
                else\r
                {\r
                        self::action_overview(_DELETED_MEMBER);\r
+                       return;\r
                }\r
                return;\r
        }\r
@@ -2726,11 +2773,13 @@ class Admin
                if ( !isValidShortName($bshortname) )\r
                {\r
                        self::error(_ERROR_BADSHORTBLOGNAME);\r
+                       return;\r
                }\r
                \r
                if ( $manager->existsBlog($bshortname) )\r
                {\r
                        self::error(_ERROR_DUPSHORTBLOGNAME);\r
+                       return;\r
                }\r
                \r
                $data = array(\r
@@ -2907,6 +2956,7 @@ class Admin
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('skinieimport');\r
@@ -2958,6 +3008,7 @@ class Admin
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
                $error = $importer->writeToDatabase($allowOverwrite);\r
@@ -2965,6 +3016,7 @@ class Admin
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
                /* TODO: we should consider to use the other way insterad of this */\r
@@ -3084,11 +3136,13 @@ class Admin
                if ( !isValidTemplateName($name) )\r
                {\r
                        self::error(_ERROR_BADTEMPLATENAME);\r
+                       return;\r
                }\r
                \r
                if ( (Template::getNameFromId($templateid) != $name) && Template::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPTEMPLATENAME);\r
+                       return;\r
                }\r
                \r
                // 1. Remove all template parts\r
@@ -3247,11 +3301,13 @@ class Admin
                if ( !isValidTemplateName($name) )\r
                {\r
                        self::error(_ERROR_BADTEMPLATENAME);\r
+                       return;\r
                }\r
                \r
                if ( Template::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPTEMPLATENAME);\r
+                       return;\r
                }\r
                \r
                $newTemplateId = Template::createNew($name, $desc);\r
@@ -3362,11 +3418,13 @@ class Admin
                if ( !isValidTemplateName($name) )\r
                {\r
                        self::error(_ERROR_BADTEMPLATENAME);\r
+                       return;\r
                }\r
                \r
                if ( (Template::getNameFromId($templateid) != $name) && Template::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPTEMPLATENAME);\r
+                       return;\r
                }\r
                \r
                // 1. Remove all template parts\r
@@ -3592,14 +3650,17 @@ class Admin
                if ( !isValidTemplateName($name) )\r
                {\r
                        self::error(_ERROR_BADTEMPLATENAME);\r
+                       return;\r
                }\r
                else if ( !preg_match('#^admin/#', $name) )\r
                {\r
                        self::error(_ERROR_BADADMINTEMPLATENAME);\r
+                       return;\r
                }\r
                else if ( Template::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPTEMPLATENAME);\r
+                       return;\r
                }\r
                \r
                $newTemplateId = Template::createNew($name, $desc);\r
@@ -3688,11 +3749,13 @@ class Admin
                if ( !isValidSkinName($name) )\r
                {\r
                        self::error(_ERROR_BADSKINNAME);\r
+                       return;\r
                }\r
                \r
                if ( SKIN::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPSKINNAME);\r
+                       return;\r
                }\r
                \r
                $newId = SKIN::createNew($name, $desc);\r
@@ -3743,11 +3806,13 @@ class Admin
                if ( !isValidSkinName($name) )\r
                {\r
                        self::error(_ERROR_BADSKINNAME);\r
+                       return;\r
                }\r
                \r
                if ( ($skin->getName() != $name) && SKIN::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPSKINNAME);\r
+                       return;\r
                }\r
                \r
                if ( !$type )\r
@@ -3785,6 +3850,7 @@ class Admin
                if ( !isValidShortName($type) )\r
                {\r
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('skinedittype');\r
@@ -3832,6 +3898,7 @@ class Admin
                if ( $skinid == $CONF['BaseSkin'] )\r
                {\r
                        self::error(_ERROR_DEFAULTSKIN);\r
+                       return;\r
                }\r
                \r
                // don't allow deletion of default skins for blogs\r
@@ -3842,6 +3909,7 @@ class Admin
                if ( $name )\r
                {\r
                        self::error(_ERROR_SKINDEFDELETE . Entity::hsc($name));\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('skindelete');\r
@@ -3866,6 +3934,7 @@ class Admin
                if ( $skinid == $CONF['BaseSkin'] )\r
                {\r
                        self::error(_ERROR_DEFAULTSKIN);\r
+                       return;\r
                }\r
                \r
                // don't allow deletion of default skins for blogs\r
@@ -3876,6 +3945,7 @@ class Admin
                if ( $name )\r
                                {\r
                        self::error(_ERROR_SKINDEFDELETE . Entity::hsc($name));\r
+                       return;\r
                }\r
                \r
                $data = array('skinid' => $skinid);\r
@@ -3916,6 +3986,7 @@ class Admin
                if ( !isValidShortName($skintype) )\r
                {\r
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
+                       return;\r
                }\r
                \r
                // don't allow default skinparts to be deleted\r
@@ -3923,6 +3994,7 @@ class Admin
                if ( in_array($skintype, array('index', 'item', 'archivelist', 'archive', 'search', 'error', 'member', 'imagepopup')) )\r
                {\r
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('skinremovetype');\r
@@ -3947,6 +4019,7 @@ class Admin
                if ( !isValidShortName($skintype) )\r
                {\r
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
+                       return;\r
                }\r
                \r
                // don't allow default skinparts to be deleted\r
@@ -3954,6 +4027,7 @@ class Admin
                if ( in_array($skintype, array('index', 'item', 'archivelist', 'archive', 'search', 'error', 'member', 'imagepopup')) )\r
                {\r
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
+                       return;\r
                }\r
                \r
                $data = array(\r
@@ -4083,14 +4157,17 @@ class Admin
                if ( !isValidSkinName($name) )\r
                {\r
                        self::error(_ERROR_BADSKINNAME);\r
+                       return;\r
                }\r
                else if ( !preg_match('#^admin/#', $name) )\r
                {\r
                        self::error(_ERROR_BADADMINSKINNAME);\r
+                       return;\r
                }\r
                else if ( Skin::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPSKINNAME);\r
+                       return;\r
                }\r
                /* TODO: $newId is not reused... */\r
                $newId = Skin::createNew($name, $desc);\r
@@ -4139,10 +4216,12 @@ class Admin
                if ( !isValidSkinName($name) )\r
                {\r
                        self::error(_ERROR_BADSKINNAME);\r
+                       return;\r
                }\r
                if ( ($skin->getName() != $name) && Skin::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPSKINNAME);\r
+                       return;\r
                }\r
                if ( !$type )\r
                {\r
@@ -4181,6 +4260,7 @@ class Admin
                if ( !isValidShortName($type) )\r
                {\r
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('adminskinedittype');\r
@@ -4243,7 +4323,7 @@ class Admin
                if ( $skinid == $CONF['AdminSkin'] )\r
                {\r
                        self::error(_ERROR_DEFAULTSKIN);\r
-                       exit;\r
+                       return;\r
                }\r
                \r
                /*\r
@@ -4259,9 +4339,9 @@ class Admin
                if ( count($members) )\r
                {\r
                        self::error(_ERROR_SKINDEFDELETE . implode(' ' . _AND . ' ', $members));\r
-                       exit;\r
+                       return;\r
                }\r
-\r
+               \r
                $manager->notify('PreDeleteAdminSkin', array('skinid' => (integer) $skinid));\r
                \r
                // 1. delete description\r
@@ -4298,6 +4378,7 @@ class Admin
                if ( !isValidShortName($skintype) )\r
                {\r
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('adminskinremovetype');\r
@@ -4322,6 +4403,7 @@ class Admin
                if ( !isValidShortName($skintype) )\r
                {\r
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
+                       return;\r
                }\r
                \r
                $data =array(\r
@@ -4478,6 +4560,7 @@ class Admin
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
                /* TODO: we should consider to use the other way instead of this */\r
@@ -4546,12 +4629,14 @@ class Admin
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
                $error = $importer->writeToDatabase($allowOverwrite);\r
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
                /* TODO: we should consider to use the other way instead of this */\r
@@ -4654,6 +4739,7 @@ class Admin
                if ( !NOTIFICATION::address_validation(postVar('AdminEmail')) )\r
                {\r
                        self::error(_ERROR_BADMAILADDRESS);\r
+                       return;\r
                }\r
                \r
                // save settings\r
@@ -4885,6 +4971,7 @@ class Admin
                if ( sizeof($deleted) == 0 )\r
                {\r
                        self::error(_ERROR_DELETEBAN);\r
+                       return;\r
                }\r
                \r
                /* TODO: we should use other ways */\r
@@ -4966,6 +5053,7 @@ class Admin
                        if ( !Ban::addBan($blogid, $iprange, $reason) )\r
                        {\r
                                self::error(_ERROR_ADDBAN);\r
+                               return;\r
                        }\r
                }\r
                else\r
@@ -4983,6 +5071,7 @@ class Admin
                        if ( $failed )\r
                        {\r
                                self::error(_ERROR_ADDBAN);\r
+                               return;\r
                        }\r
                }\r
                self::action_banlist();\r
@@ -5047,7 +5136,7 @@ class Admin
                @set_time_limit(1200);\r
                \r
                Backup::do_backup($useGzip);\r
-               exit;\r
+               return;\r
        }\r
        \r
        /**\r
@@ -5066,6 +5155,7 @@ class Admin
                if ( intPostVar('letsgo') != 1 )\r
                {\r
                        self::error(_ERROR_BACKUP_NOTSURE);\r
+                       return;\r
                }\r
                \r
                include($DIR_LIBS . 'backup.php');\r
@@ -5078,6 +5168,7 @@ class Admin
                if ( $message != '' )\r
                {\r
                        self::error($message);\r
+                       return;\r
                }\r
                self::$skin->parse('backuprestore');\r
                return;\r
@@ -5120,6 +5211,7 @@ class Admin
                if ( !$manager->pidInstalled($plugid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('pluginhelp');\r
@@ -5145,11 +5237,13 @@ class Admin
                if ( $manager->pluginInstalled($name) )\r
                {\r
                        self::error(_ERROR_DUPPLUGIN);\r
+                       return;\r
                }\r
                \r
                if ( !checkPlugin($name) )\r
                {\r
                        self::error(_ERROR_PLUGFILEERROR . ' (' . Entity::hsc($name) . ')');\r
+                       return;\r
                }\r
                \r
                // get number of currently installed plugins\r
@@ -5183,6 +5277,7 @@ class Admin
                        \r
                        $manager->clearCachedInfo('installedPlugins');\r
                        self::error(_ERROR_PLUGIN_LOAD);\r
+                       return;\r
                }\r
                \r
                // check if plugin needs a newer Nucleus version\r
@@ -5193,6 +5288,7 @@ class Admin
                        \r
                        // ...and show error\r
                        self::error(_ERROR_NUCLEUSVERSIONREQ . Entity::hsc($plugin->getMinNucleusVersion()));\r
+                       return;\r
                }\r
                \r
                // check if plugin needs a newer Nucleus version\r
@@ -5203,6 +5299,7 @@ class Admin
                        \r
                        // ...and show error\r
                        self::error(_ERROR_NUCLEUSVERSIONREQ . Entity::hsc( $plugin->getMinNucleusVersion() . ' patch ' . $plugin->getMinNucleusPatchLevel() ) );\r
+                       return;\r
                }\r
                \r
                $pluginList = $plugin->getPluginDep();\r
@@ -5214,6 +5311,7 @@ class Admin
                                // uninstall plugin again...\r
                                self::deleteOnePlugin($plugin->getID());\r
                                self::error(sprintf(_ERROR_INSREQPLUGIN, Entity::hsc($pluginName)));\r
+                               return;\r
                        }\r
                }\r
                \r
@@ -5284,6 +5382,7 @@ class Admin
                if ( !$manager->pidInstalled($pid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('plugindelete');\r
@@ -5309,6 +5408,7 @@ class Admin
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
                redirect($CONF['AdminURL'] . '?action=pluginlist');\r
@@ -5418,6 +5518,7 @@ class Admin
                if ( !$manager->pidInstalled($plugid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
                // 1. get old order number\r
@@ -5453,6 +5554,7 @@ class Admin
                if ( !$manager->pidInstalled($plugid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
                // 1. get old order number\r
@@ -5495,6 +5597,7 @@ class Admin
                if ( !$manager->pidInstalled($pid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
                if ( isset($message) )\r
@@ -5530,6 +5633,7 @@ class Admin
                if ( !$manager->pidInstalled($pid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
                $aOptions = requestArray('plugoption');\r
@@ -5692,11 +5796,13 @@ class Admin
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                $error = $importer->writeToDatabase($allowOverwrite);\r
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
                $_REQUEST['skininfo']   = $importer->getInfo();\r
@@ -5704,6 +5810,6 @@ class Admin
                $_REQUEST['tpltnames']  = $importer->getTemplateNames();\r
                \r
                header('Location: ' . $CONF['AdminURL']);\r
-               exit;\r
+               return;\r
        }\r
 }\r