CHANGE: globalfunctions.phpのdoError()から制御を戻すよう修正

doError()はexitせず制御を呼び出し元に戻すように関連する箇所を含めて修正。

diff --git a/nucleus/libs/ACTION.php b/nucleus/libs/ACTION.php
index 42f6114..d1746b6 100644 (file)
--- a/nucleus/libs/ACTION.php
+++ b/nucleus/libs/ACTION.php
@@ -259,6 +259,7 @@ class Action
                if ( array_key_exists('AllowMemberCreate', $CONF) && !$CONF['AllowMemberCreate'] )\r
                {\r
                        doError(_ERROR_MEMBERCREATEDISABLED);\r
+                       return;\r
                }\r
                \r
                // evaluate content from FormExtra\r
@@ -320,6 +321,7 @@ class Action
                if ( !Member::exists($membername) )\r
                {\r
                        doError(_ERROR_NOSUCHMEMBER);\r
+                       return;\r
                }\r
                \r
                $mem = Member::createFromName($membername);\r
@@ -329,6 +331,7 @@ class Action
                if ( $mem->getEmail() != $email )\r
                {\r
                        doError(_ERROR_INCORRECTEMAIL);\r
+                       return;\r
                }\r
                \r
                // send activation link\r
@@ -366,6 +369,7 @@ class Action
                if ( !$manager->existsItem($itemid, 0, 0) )\r
                {\r
                        doError(_ERROR_NOSUCHITEM);\r
+                       return;\r
                }\r
                \r
                $item =& $manager->getItem($itemid, 0, 0);\r
@@ -377,6 +381,7 @@ class Action
                if ( !$karma->isVoteAllowed(serverVar('REMOTE_ADDR') ) )\r
                {\r
                        doError(_ERROR_VOTEDBEFORE);\r
+                       return;\r
                }\r
                \r
                // check if item does allow voting\r
@@ -385,6 +390,7 @@ class Action
                if ( $item['closed'] )\r
                {\r
                        doError(_ERROR_ITEMCLOSED);\r
+                       return;\r
                }\r
                \r
                switch ( $type )\r
@@ -465,6 +471,7 @@ class Action
                if ( !$manager->pluginInstalled($pluginName) )\r
                {\r
                        doError(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
                // 2: call plugin\r
@@ -486,6 +493,7 @@ class Action
                if ( $error )\r
                {\r
                        doError($error);\r
+                       return;\r
                }\r
                \r
                return;\r
@@ -506,6 +514,7 @@ class Action
                if ( $ban != 0 )\r
                {\r
                        doError(_ERROR_BANNED1 . $ban->iprange . _ERROR_BANNED2 . $ban->message . _ERROR_BANNED3);\r
+                       return;\r
                }\r
                \r
                return;\r

diff --git a/nucleus/libs/PLUGINADMIN.php b/nucleus/libs/PLUGINADMIN.php
index 815e224..b402784 100644 (file)
--- a/nucleus/libs/PLUGINADMIN.php
+++ b/nucleus/libs/PLUGINADMIN.php
@@ -43,6 +43,7 @@ class PluginAdmin
                if ( !$manager->pluginInstalled($this->strFullName) )\r
                {\r
                        doError(_ERROR_INVALID_PLUGIN);\r
+                       return;\r
                }\r
                \r
                $this->plugin = &$manager->getPlugin($this->strFullName);\r
@@ -51,6 +52,7 @@ class PluginAdmin
                if ( !$this->bValid )\r
                {\r
                        doError(_ERROR_INVALID_PLUGIN);\r
+                       return;\r
                }\r
                \r
                Admin::initialize();\r

diff --git a/nucleus/libs/globalfunctions.php b/nucleus/libs/globalfunctions.php
index d471c23..0186fb9 100644 (file)
--- a/nucleus/libs/globalfunctions.php
+++ b/nucleus/libs/globalfunctions.php
@@ -979,6 +979,7 @@ function selector()
                if ( !$manager->existsItem($itemid,intval($CONF['allowFuture']),intval($CONF['allowDrafts'])) )\r
                {\r
                        doError(_ERROR_NOSUCHITEM);\r
+                       return;\r
                }\r
                \r
                // 1. get timestamp, blogid and catid for item\r
@@ -992,6 +993,7 @@ function selector()
                if ( $blogid && (intval($blogid) != $row['iblog']) )\r
                {\r
                        doError(_ERROR_NOSUCHITEM);\r
+                       return;\r
                }\r
                \r
                // if a category has been selected which doesn't match the item, ignore the\r
@@ -1098,7 +1100,7 @@ function selector()
                        {\r
                                $archiveprevexists = false;\r
                        }\r
-\r
+                       \r
                        // timestamp for the next year\r
                        $t = mktime(0, 0, 0, 1, 1, $y + 1);\r
                        $archivenext = i18n::formatted_datetime('%Y', $t);\r
@@ -1155,6 +1157,7 @@ function selector()
                if ( !$blogid )\r
                {\r
                        doError(_ERROR_NOSUCHBLOG);\r
+                       return;\r
                }\r
        }\r
        elseif ( $query )\r
@@ -1175,6 +1178,7 @@ function selector()
                if ( !$blogid )\r
                {\r
                        doError(_ERROR_NOSUCHBLOG);\r
+                       return;\r
                }\r
        }\r
        elseif ( $memberid )\r
@@ -1184,6 +1188,7 @@ function selector()
                if ( !Member::existsID($memberid) )\r
                {\r
                        doError(_ERROR_NOSUCHMEMBER);\r
+                       return;\r
                }\r
                $memberinfo = $manager->getMember($memberid);\r
        }\r
@@ -1220,6 +1225,7 @@ function selector()
        if ( !$blog->isValid )\r
        {\r
                doError(_ERROR_NOSUCHBLOG);\r
+               return;\r
        }\r
        \r
        // set catid if necessary\r
@@ -1229,6 +1235,7 @@ function selector()
                if ( !$blog->isValidCategory($catid) )\r
                {\r
                        doError(_ERROR_NOSUCHCATEGORY);\r
+                       return;\r
                }\r
                else\r
                {\r
@@ -1251,6 +1258,7 @@ function selector()
        if ( !$skin->isValid() )\r
        {\r
                doError(_ERROR_NOSUCHSKIN);\r
+               return;\r
        }\r
        \r
        // set global skinpart variable so can determine quickly what is being parsed from any plugin or phpinclude\r