CHANGE: ノーマルスキンタイプに関する修正

標準のスキンタイプをノーマルと定義し、クラスメンバー・メソッドをnormalという名前に統一した。

diff --git a/nucleus/libs/ACTIONS.php b/nucleus/libs/ACTIONS.php
index 8e86f6f..6ec2122 100644 (file)
--- a/nucleus/libs/ACTIONS.php
+++ b/nucleus/libs/ACTIONS.php
@@ -72,7 +72,7 @@ class Actions extends BaseActions
         * Actions::$skin_type_friendly_names\r
         * friendly name for wrapped page types\r
         */\r
-       static public $default_skin_types = array(\r
+       static public $normal_skin_types = array(\r
                'index'                 => _SKIN_PART_MAIN,\r
                'item'                  => _SKIN_PART_ITEM,\r
                'archivelist'   => _SKIN_PART_ALIST,\r
@@ -84,15 +84,15 @@ class Actions extends BaseActions
        );\r
        \r
        /**\r
-        * Actions::getAvailableSkinTypes()\r
+        * Actions::getNormalSkinTypes()\r
         * \r
         * @static\r
         * @param       void\r
         * @return      array   list of friendly names for page actions\r
         */\r
-       static public function getAvailableSkinTypes()\r
+       static public function getNormalSkinTypes()\r
        {\r
-               return self::$default_skin_types;\r
+               return self::$normal_skin_types;\r
        }\r
        \r
        /**\r

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index 4fd043e..14fcf97 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -50,7 +50,7 @@ class AdminActions extends BaseActions
         * AdminActions::$skin_type_friendly_names
         * 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,
@@ -134,27 +134,15 @@ class AdminActions extends BaseActions
        );
        
        /**
-        * 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;
        }
        
        /**
@@ -1973,7 +1961,7 @@ class AdminActions extends BaseActions
                        /* TODO: removeaction? */
                }
                
-               $temporary = $skin->getDefaultTypes();
+               $temporary = $skin->getNormalTypes();
                $normal_skintype = array();
                foreach ( $temporary as $type => $label )
                {
@@ -2503,7 +2491,7 @@ class AdminActions extends BaseActions
                                $skin =& $manager->getSkin($skinid, 'AdminActions');
                        }
                        
-                       $types = $skin->getDefaultTypes();
+                       $types = $skin->getNormalTypes();
                }
                
                $type = strtolower(trim(requestVar('type')));
@@ -4238,27 +4226,17 @@ class AdminActions extends BaseActions
                $pageAction  = strtolower(trim(requestVar('action')));
                if ( in_array($pageAction, Admin::$adminskin_actions) )
                {
-                       $regularType = self::$default_skin_types;
-                       unset($regularType['memberedit']);
-                       unset($regularType['login']);
-                       $regularType = array_keys($regularType);
+                       $normal_types = self::$normal_skin_types;
+                       unset($normal_types['memberedit']);
+                       unset($normal_types['login']);
+                       $normal_types = array_keys($normal_types);
                }
                else
                {
-                       /* TODO: use Skin class */
-                       $regularType = array(
-                               'index',
-                               'item',
-                               'archivelist',
-                               'archive',
-                               'search',
-                               'error',
-                               'member',
-                               'imagepopup'
-                       );
+                       $normal_types = array_keys(Actions::$normal_skin_types);
                }
                
-               if ( in_array($nowSkinType, $regularType) )
+               if ( in_array($nowSkinType, $normal_types) )
                {
                        help('skinpart' . $nowSkinType);
                }
@@ -4296,7 +4274,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();

diff --git a/nucleus/libs/SKIN.php b/nucleus/libs/SKIN.php
index ae598d9..3e087d1 100644 (file)
--- a/nucleus/libs/SKIN.php
+++ b/nucleus/libs/SKIN.php
@@ -609,14 +609,14 @@ class Skin
        }\r
        \r
        /**\r
-        * Skin::getDefaultTypes()\r
+        * Skin::getNormalTypes()\r
         * \r
         * @param       string  void\r
         * @return      array   default skin types\r
         */\r
-       public function getDefaultTypes()\r
+       public function getNormalTypes()\r
        {\r
-               return call_user_func(array($this->action_class, 'getAvailableSkinTypes'));\r
+               return call_user_func(array($this->action_class, 'getNormalSkinTypes'));\r
        }\r
        \r
        /**\r
@@ -627,7 +627,7 @@ class Skin
         */\r
        public function getAvailableTypes()\r
        {\r
-               $default_skintypes = $this->getDefaultTypes();\r
+               $default_skintypes = $this->getNormalTypes();\r
                $query = "SELECT stype FROM %s WHERE sdesc=%d;";\r
                $query = sprintf($query, sql_table('skin'), (integer) $this->id);\r
                \r

diff --git a/nucleus/plugins/medium/MediumActions.php b/nucleus/plugins/medium/MediumActions.php
index a192c4b..9422f18 100644 (file)
--- a/nucleus/plugins/medium/MediumActions.php
+++ b/nucleus/plugins/medium/MediumActions.php
@@ -15,16 +15,16 @@ class MediumActions extends BaseActions
                'script'
                );
        
-       static public $default_skin_types = array(
+       static public $normal_skin_types = array(
                'login'         => 'NP_Medium',
                'choose'        => _UPLOAD_TITLE,
                'select'        => _SKIN_PART_ALIST,
                'error'         => _ERROR
        );
        
-       static public function getAvailableSkinTypes()
+       static public function getNormalSkinTypes()
        {
-               return self::$default_skin_types;
+               return self::$normal_skin_types;
        }
        
        public function getAvailableActions()