FIX: AdminActions::$normal_skin_typesの変更

[nucleus-jp/nucleus-next.git] / nucleus / libs / AdminActions.php

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index 4fd043e..5efc9a7 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -47,10 +47,10 @@ class AdminActions extends BaseActions
        );
        
        /**
-        * AdminActions::$skin_type_friendly_names
+        * AdminActions::$normal_skin_types
         * friendly name for wrapped page types
         */
-       static private $default_skin_types = array(
+       static private $normal_skin_types = array(
                'actionlog'                             => _ADM_SKPRT_ACTIONLOG,
                'activate'                              => _ADM_SKPRT_ACTIVATE,
                'activatesetpwd'                => _ADM_SKPRT_ACTIVATESETPWD,
@@ -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,31 +128,19 @@ class AdminActions extends BaseActions
                'templatedelete'                => _ADM_SKPRT_TEMPLATEDELETE,
                'templateedit'                  => _ADM_SKPRT_TEMPLATEEDIT,
                'templateoverview'              => _ADM_SKPRT_TEMPLATEOVERVIEW,
-               'usermanagement'                => _ADM_SKPRT_USERMANAGEMENT,
+               'usermanagement'                => _ADM_SKPRT_USERMANAGEMENT
        );
        
        /**
-        * AdminActions::getAvailableSkinTypes()
+        * AdminActions::getNormalSkinTypes()
         *
         * @static
         * @param       void
         * @return      array   list of friendly names for page actions
         */
-       static public function getAvailableSkinTypes()
+       static public function getNormalSkinTypes()
        {
-               return self::$default_skin_types;
-       }
-       
-       /**
-        * AdminActions::getDefaultTypes()
-        *
-        * @static
-        * @param       void
-        * @return      array   list of friendly names for page actions
-        */
-       static public function getDefaultTypes()
-       {
-               return self::$default_skin_types;
+               return self::$normal_skin_types;
        }
        
        /**
@@ -1197,7 +1183,7 @@ class AdminActions extends BaseActions
         */
        public function parse_defadminskinselect($template_name)
        {
-               global $CONF, $action;
+               global $CONF, $action, $manager;
                
                if ( $action == 'editmembersettings' )
                {
@@ -1206,7 +1192,6 @@ class AdminActions extends BaseActions
                }
                elseif ( $action == 'memberedit' )
                {
-                       global $manager;
                        $mem = $manager->getMember(intRequestVar('memberid'));
                        $default = $mem->adminskin;
                }
@@ -1241,7 +1226,7 @@ class AdminActions extends BaseActions
         */
        public function parse_defbookmarkletselect($template_name)
        {
-               global $CONF, $action;
+               global $CONF, $action, $manager;
                
                if ( $action == 'editmembersettings' )
                {
@@ -1250,7 +1235,6 @@ class AdminActions extends BaseActions
                }
                elseif ( $action == 'memberedit' )
                {
-                       global $manager;
                        $mem = $manager->getMember(intRequestVar('memberid'));
                        $default = $mem->bookmarklet;
                }
@@ -1973,7 +1957,7 @@ class AdminActions extends BaseActions
                        /* TODO: removeaction? */
                }
                
-               $temporary = $skin->getDefaultTypes();
+               $temporary = $skin->getNormalTypes();
                $normal_skintype = array();
                foreach ( $temporary as $type => $label )
                {
@@ -2503,7 +2487,7 @@ class AdminActions extends BaseActions
                                $skin =& $manager->getSkin($skinid, 'AdminActions');
                        }
                        
-                       $types = $skin->getDefaultTypes();
+                       $types = $skin->getNormalTypes();
                }
                
                $type = strtolower(trim(requestVar('type')));
@@ -4234,33 +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) )
                {
-                       $regularType = self::$default_skin_types;
-                       unset($regularType['memberedit']);
-                       unset($regularType['login']);
-                       $regularType = array_keys($regularType);
+                       $normal_types = array_keys(self::$normal_skin_types);
                }
                else
                {
-                       /* TODO: use Skin class */
-                       $regularType = array(
-                               'index',
-                               'item',
-                               'archivelist',
-                               'archive',
-                               'search',
-                               'error',
-                               'member',
-                               'imagepopup'
-                       );
+                       $normal_types = array_keys(Actions::getNormalSkinTypes());
                }
                
-               if ( in_array($nowSkinType, $regularType) )
+               if ( in_array($surrent_skin_type, $normal_types) )
                {
-                       help('skinpart' . $nowSkinType);
+                       help('skinpart' . $surrent_skin_type);
                }
                else
                {
@@ -4296,7 +4267,7 @@ class AdminActions extends BaseActions
                        $template['editaction'] = 'adminskinedittype';
                        $template['removeaction'] = 'adminskinremovetype';
                }
-               $normal_types = $skin->getDefaultTypes();
+               $normal_types = $skin->getNormalTypes();
                $available_types = $skin->getAvailableTypes();
                
                $special_skintypes = array();