MERGE: リビジョン1734のマージ。Actionsクラスから不要行を削除。

Revision 1734: remove extra lines added in revision 1723.
My commit includes unneeded lines from my working repository.
Revision 1723: Code cleanup for Actions class
This inclludes adding access modifiers and comments for each methods.
http://nucleuscms.svn.sourceforge.net/viewvc/nucleuscms?view=revision&revision=1723

diff --git a/nucleus/libs/ACTIONS.php b/nucleus/libs/ACTIONS.php
index eaef5a5..e75f5c0 100644 (file)
--- a/nucleus/libs/ACTIONS.php
+++ b/nucleus/libs/ACTIONS.php
@@ -146,15 +146,9 @@ class Actions extends BaseActions
                        case 'onteam':\r
                                $condition = $member->isLoggedIn() && $this->ifOnTeam($name);\r
                                break;\r
-                       case 'admin':\r
-                               $condition = $member->isLoggedIn() && $this->ifAdmin($name);\r
-                               break;\r
-                       case 'superadmin':\r
-                               $condition = $member->isLoggedIn() && $member->isAdmin();\r
-                               break;\r
-                       case 'allowloginedit':\r
-                               $condition = $member->isLoggedIn() && ($CONF['AllowLoginEdit'] || $member->isAdmin());\r
-                               break;\r
+                       case 'admin':
+                               $condition = $member->isLoggedIn() && $this->ifAdmin($name);
+                               break;
                        case 'nextitem':\r
                                $condition = ($itemidnext != '');\r
                                break;\r
@@ -173,27 +167,6 @@ class Actions extends BaseActions
                        case 'hasplugin':\r
                                $condition = $this->ifHasPlugin($name, $value);\r
                                break;\r
-                       case 'adminaction':\r
-                               $condition = ($this->objAdmin->action == $name);\r
-                               break;\r
-                       case 'adminoldaction':\r
-                               $condition = ($this->objAdmin->action == $name);\r
-                               break;\r
-                       case 'addresschange':\r
-                               $condition = ($this->_ifAddresscange());\r
-                               break;\r
-                       case 'bechangepass':\r
-                               $condition = ($this->_beChangePassword());\r
-                               break;\r
-                       case 'skincandidates':\r
-                               $condition = ($this->_ifSkincandidates());\r
-                               break;\r
-                       case 'nameclashes':\r
-                               $condition = requestVar('nameclashes');\r
-                               break;\r
-                       case 'existsnewplugin':\r
-                               $condition = ($this->_existsNewPlugin());\r
-                               break;\r
                        default:\r
                                $condition = $manager->pluginInstalled("NP_{$field}") && $this->ifPlugin($field, $name, $value);\r
                                break;\r