FIX:グローバル設定に準じている管理エリア・ブックマークレットのスキン設定を-サイトの設定を使う -と表示するように修正

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

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index bf0fa4d..784f473 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -472,6 +472,8 @@ class AdminActions extends BaseActions
                                'editmember',
                                'localeselectoptions',
                                'pluginoptions',
+                               'defadminskinselect',
+                               'defbookmarkletselect',
                                );
                                break;
                        case 'forgotpassword':
@@ -575,6 +577,8 @@ class AdminActions extends BaseActions
                                'localeselectoptions',
                                'mediadirwarning',
                                'pluginextras',
+                               'defadminskinselect',
+                               'defbookmarkletselect',
                                );
                                break;
                        case 'showlogin':
@@ -1173,6 +1177,85 @@ class AdminActions extends BaseActions
                }
                return;
        }
+
+       /**
+        * AdminActions::parse_defadminskinselect()
+        * Parse skinvar defadminskinselect
+        *
+        * @param       string  $template_name  name of template to use
+        * @return      void
+        */
+       public function parse_defadminskinselect($template_name)
+       {
+               global $CONF, $action;
+
+               if ( $action == 'editmembersettings' )
+               {
+                       global $member;
+                       $default = $member->adminskin;
+               }
+               elseif ( $action == 'memberedit' )
+               {
+                       global $manager;
+                       $mem = $manager->getMember(intRequestVar('memberid'));
+                       $default = $mem->adminskin;
+               }
+               else
+               {
+                       $default = $CONF['AdminSkin'];
+               }
+
+               $query  = "SELECT sdname as text, sdnumber as value FROM %s WHERE sdname LIKE 'admin/%%'";
+               $query = sprintf($query, sql_table('skin_desc'));
+               $template = array(
+                               'name'          => 'adminskin',
+                               'tabindex'      => 10080,
+                               'selected'      => $default,
+                               'extra'         => Entity::hsc(_MEMBERS_USESITELANG)
+               );
+               $this->parser->parse(showlist($query, 'select', $template, $template_name));
+               return;
+       }
+       
+       /**
+        * AdminActions::parse_defbookmarkletselect()
+        * Parse skinvar defbookmarkletselect
+        *
+        * @param       string  $template_name  name of template to use
+        * @return      void
+        */
+       public function parse_defbookmarkletselect($template_name)
+       {
+               global $CONF, $action;
+               
+               if ( $action == 'editmembersettings' )
+               {
+                       global $member;
+                       $default = $member->bookmarklet;
+               }
+               elseif ( $action == 'memberedit' )
+               {
+                       global $manager;
+                       $mem = $manager->getMember(intRequestVar('memberid'));
+                       $default = $mem->bookmarklet;
+               }
+               else
+               {
+                       $default = $CONF['BookmarkletSkin'];
+               }
+               
+               $query  = "SELECT sdname as text, sdnumber as value FROM %s WHERE sdname LIKE 'admin/%%'";
+               $query = sprintf($query, sql_table('skin_desc'));
+       
+               $template = array(
+                               'name'          => 'bookmarklet',
+                               'tabindex'      => 10085,
+                               'selected'      => $default,
+                               'extra'         => Entity::hsc(_MEMBERS_USESITELANG)
+               );
+               $this->parser->parse(showlist($query, 'select', $template, $template_name));
+               return;
+       }
        
        /**
         * AdminActions::parse_batchdeletetype()