* 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
);\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
* 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,
);
/**
- * 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;
}
/**
/* TODO: removeaction? */
}
- $temporary = $skin->getDefaultTypes();
+ $temporary = $skin->getNormalTypes();
$normal_skintype = array();
foreach ( $temporary as $type => $label )
{
$skin =& $manager->getSkin($skinid, 'AdminActions');
}
- $types = $skin->getDefaultTypes();
+ $types = $skin->getNormalTypes();
}
$type = strtolower(trim(requestVar('type')));
$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);
}
$template['editaction'] = 'adminskinedittype';
$template['removeaction'] = 'adminskinremovetype';
}
- $normal_types = $skin->getDefaultTypes();
+ $normal_types = $skin->getNormalTypes();
$available_types = $skin->getAvailableTypes();
$special_skintypes = array();
}\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
*/\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