FIX: AdminActions::$normal_skin_typesの変更

liginとmembereditを除外
ほか、normalに関する前回変更の修正

diff --git a/nucleus/libs/ACTIONS.php b/nucleus/libs/ACTIONS.php
index 6ec2122..198d30a 100644 (file)
--- a/nucleus/libs/ACTIONS.php
+++ b/nucleus/libs/ACTIONS.php
@@ -69,7 +69,7 @@ class Actions extends BaseActions
        );\r
        \r
        /**\r
-        * Actions::$skin_type_friendly_names\r
+        * Actions::$normal_skin_types\r
         * friendly name for wrapped page types\r
         */\r
        static public $normal_skin_types = array(\r

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index 14fcf97..5efc9a7 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -47,7 +47,7 @@ class AdminActions extends BaseActions
        );
        
        /**
-        * AdminActions::$skin_type_friendly_names
+        * AdminActions::$normal_skin_types
         * friendly name for wrapped page types
         */
        static private $normal_skin_types = array(
@@ -103,11 +103,9 @@ class AdminActions extends BaseActions
                'itemedit'                              => _ADM_SKPRT_ITEMEDIT,
                'itemlist'                              => _ADM_SKPRT_ITEMLIST,
                'itemmove'                              => _ADM_SKPRT_ITEMMOVE,
-               'login'                                 => FALSE,       //missing
                'manage'                                => _ADM_SKPRT_MANAGE,
                'manageteam'                    => _ADM_SKPRT_MANAGETEAM,
                'memberdelete'                  => _ADM_SKPRT_MEMBERDELETE,
-               'memberedit'                    => FALSE,       //missing
                'overview'                              => _ADM_SKPRT_OVERVIEW,
                'pagefoot'                              => _ADM_SKPRT_PAGEFOOT,
                'pagehead'                              => _ADM_SKPRT_PAGEHEAD,
@@ -130,7 +128,7 @@ class AdminActions extends BaseActions
                'templatedelete'                => _ADM_SKPRT_TEMPLATEDELETE,
                'templateedit'                  => _ADM_SKPRT_TEMPLATEEDIT,
                'templateoverview'              => _ADM_SKPRT_TEMPLATEOVERVIEW,
-               'usermanagement'                => _ADM_SKPRT_USERMANAGEMENT,
+               'usermanagement'                => _ADM_SKPRT_USERMANAGEMENT
        );
        
        /**
@@ -1185,7 +1183,7 @@ class AdminActions extends BaseActions
         */
        public function parse_defadminskinselect($template_name)
        {
-               global $CONF, $action;
+               global $CONF, $action, $manager;
                
                if ( $action == 'editmembersettings' )
                {
@@ -1194,7 +1192,6 @@ class AdminActions extends BaseActions
                }
                elseif ( $action == 'memberedit' )
                {
-                       global $manager;
                        $mem = $manager->getMember(intRequestVar('memberid'));
                        $default = $mem->adminskin;
                }
@@ -1229,7 +1226,7 @@ class AdminActions extends BaseActions
         */
        public function parse_defbookmarkletselect($template_name)
        {
-               global $CONF, $action;
+               global $CONF, $action, $manager;
                
                if ( $action == 'editmembersettings' )
                {
@@ -1238,7 +1235,6 @@ class AdminActions extends BaseActions
                }
                elseif ( $action == 'memberedit' )
                {
-                       global $manager;
                        $mem = $manager->getMember(intRequestVar('memberid'));
                        $default = $mem->bookmarklet;
                }
@@ -4222,23 +4218,20 @@ class AdminActions extends BaseActions
         */
        public function parse_skintypehelp()
        {
-               $nowSkinType = strtolower(trim(requestVar('type')));
-               $pageAction  = strtolower(trim(requestVar('action')));
-               if ( in_array($pageAction, Admin::$adminskin_actions) )
+               $surrent_skin_type = strtolower(trim(requestVar('type')));
+               $page_action  = strtolower(trim(requestVar('action')));
+               if ( in_array($page_action, Admin::$adminskin_actions) )
                {
-                       $normal_types = self::$normal_skin_types;
-                       unset($normal_types['memberedit']);
-                       unset($normal_types['login']);
-                       $normal_types = array_keys($normal_types);
+                       $normal_types = array_keys(self::$normal_skin_types);
                }
                else
                {
-                       $normal_types = array_keys(Actions::$normal_skin_types);
+                       $normal_types = array_keys(Actions::getNormalSkinTypes());
                }
                
-               if ( in_array($nowSkinType, $normal_types) )
+               if ( in_array($surrent_skin_type, $normal_types) )
                {
-                       help('skinpart' . $nowSkinType);
+                       help('skinpart' . $surrent_skin_type);
                }
                else
                {