FIX: Admin:$actions_xxx()を実行していたバグほか細々としたバグの修正

diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php
index 07091be..3426a5a 100644 (file)
--- a/nucleus/libs/ADMIN.php
+++ b/nucleus/libs/ADMIN.php
@@ -329,7 +329,7 @@ class Admin
                // skip to overview when allowed\r
                if ( $member->isLoggedIn() && $member->canLogin() )\r
                {\r
-                       self::$action_overview();\r
+                       self::action_overview();\r
                        exit;\r
                }\r
                \r
@@ -912,7 +912,7 @@ class Admin
                // delete actions are handled by itemdelete (which has confirmation)\r
                if ( $actiontype == 'delete' )\r
                {\r
-                       self::$action_itemdelete();\r
+                       self::action_itemdelete();\r
                        return;\r
                }\r
                \r
@@ -985,7 +985,7 @@ class Admin
                \r
                if ( $catid != intPostVar('catid') )\r
                {\r
-                       self::$action_categoryedit(\r
+                       self::action_categoryedit(\r
                                $catid,\r
                                $blog->getID(),\r
                                $CONF['AdminURL'] . 'index.php?action=itemlist&blogid=' . getBlogIDFromItemID($itemid)\r
@@ -997,7 +997,7 @@ class Admin
                        $item = Item::getItem($itemid, 0, 0);\r
                        $cnt  = quickQuery('SELECT COUNT(*) FROM ' . sql_table('item') . ' WHERE unix_timestamp(itime) <= ' . $item['timestamp']);\r
                        $_REQUEST['start'] = $cnt + 1;\r
-                       self::$action_itemlist(getBlogIDFromItemID($itemid));\r
+                       self::action_itemlist(getBlogIDFromItemID($itemid));\r
                }\r
                return;\r
        }\r
@@ -1050,7 +1050,7 @@ class Admin
                // delete item (note: some checks will be performed twice)\r
                self::deleteOneItem($itemid);\r
                \r
-               self::$action_itemlist($blogid);\r
+               self::action_itemlist($blogid);\r
                return;\r
        }\r
        \r
@@ -1177,11 +1177,11 @@ class Admin
                \r
                if ( $catid != intRequestVar('catid') )\r
                {\r
-                       self::$action_categoryedit($catid, $blog->getID());\r
+                       self::action_categoryedit($catid, $blog->getID());\r
                }\r
                else\r
                {\r
-                       self::$action_itemlist(getBlogIDFromCatID($catid));\r
+                       self::action_itemlist(getBlogIDFromCatID($catid));\r
                }\r
                return;\r
        }\r
@@ -1237,7 +1237,7 @@ class Admin
                if ( $result['status'] == 'newcategory' )\r
                {\r
                        $distURI = $manager->addTicketToUrl($CONF['AdminURL'] . 'index.php?action=itemList&blogid=' . intval($blogid));\r
-                       self::$action_categoryedit($result['catid'], $blogid, $distURI);\r
+                       self::action_categoryedit($result['catid'], $blogid, $distURI);\r
                }\r
                else\r
                {\r
@@ -1326,11 +1326,11 @@ class Admin
                \r
                if ( $member->canAlterItem($itemid) )\r
                {\r
-                       self::$action_itemcommentlist($itemid);\r
+                       self::action_itemcommentlist($itemid);\r
                }\r
                else\r
                {\r
-                       self::$action_browseowncomments();\r
+                       self::action_browseowncomments();\r
                }\r
                return;\r
        }\r
@@ -1383,11 +1383,11 @@ class Admin
                \r
                if ( $member->canAlterItem($itemid) )\r
                {\r
-                       self::$action_itemcommentlist($itemid);\r
+                       self::action_itemcommentlist($itemid);\r
                }\r
                else\r
                {\r
-                       self::$action_browseowncomments();\r
+                       self::action_browseowncomments();\r
                }\r
                return;\r
        }\r
@@ -1458,7 +1458,7 @@ class Admin
         */\r
        static private function action_memberedit()\r
        {\r
-               self::$action_editmembersettings(intRequestVar('memberid'));\r
+               self::action_editmembersettings(intRequestVar('memberid'));\r
                return;\r
        }\r
        \r
@@ -1645,7 +1645,7 @@ class Admin
                        {\r
                                $member->logout();\r
                        }\r
-                       self::$action_login(_MSG_ACTIVATION_SENT, 0);\r
+                       self::action_login(_MSG_ACTIVATION_SENT, 0);\r
                        return;\r
                }\r
                \r
@@ -1654,11 +1654,11 @@ class Admin
                {\r
                        $mem->newCookieKey();\r
                        $member->logout();\r
-                       self::$action_login(_MSG_LOGINAGAIN, 0);\r
+                       self::action_login(_MSG_LOGINAGAIN, 0);\r
                }\r
                else\r
                {\r
-                       self::$action_overview(_MSG_SETTINGSCHANGED);\r
+                       self::action_overview(_MSG_SETTINGSCHANGED);\r
                }\r
                return;\r
        }\r
@@ -1711,7 +1711,7 @@ class Admin
                );\r
                $manager->notify('PostRegister', $data);\r
                \r
-               self::$action_usermanagement();\r
+               self::action_usermanagement();\r
                return;\r
        }\r
        \r
@@ -1900,7 +1900,7 @@ class Admin
                        self::error(_ERROR_ALREADYONTEAM);\r
                }\r
                \r
-               self::$action_manageteam();\r
+               self::action_manageteam();\r
                return;\r
        }\r
        \r
@@ -1947,7 +1947,7 @@ class Admin
                {\r
                        self::error($error);\r
                }\r
-               self::$action_manageteam();\r
+               self::action_manageteam();\r
                return;\r
        }\r
        \r
@@ -2053,11 +2053,11 @@ class Admin
                // only show manageteam if member did not change its own admin privileges\r
                if ( $member->isBlogAdmin($blogid) )\r
                {\r
-                       self::$action_manageteam();\r
+                       self::action_manageteam();\r
                }\r
                else\r
                {\r
-                       self::$action_overview(_MSG_ADMINCHANGED);\r
+                       self::action_overview(_MSG_ADMINCHANGED);\r
                }\r
                return;\r
        }\r
@@ -2119,7 +2119,7 @@ class Admin
                $blog           =& $manager->getBlog($blogid);\r
                $newCatID       =  $blog->createNewCategory($cname, $cdesc);\r
                \r
-               self::$action_blogsettings();\r
+               self::action_blogsettings();\r
                return;\r
        }\r
        \r
@@ -2214,7 +2214,7 @@ class Admin
                }\r
                else\r
                {\r
-                       self::$action_blogsettings();\r
+                       self::action_blogsettings();\r
                }\r
                return;\r
        }\r
@@ -2284,7 +2284,7 @@ class Admin
                        self::error($error);\r
                }\r
                \r
-               self::$action_blogsettings();\r
+               self::action_blogsettings();\r
                return;\r
        }\r
        \r
@@ -2444,7 +2444,7 @@ class Admin
                );\r
                $manager->notify('PostPluginOptionsUpdate', $data);\r
                \r
-               self::$action_overview(_MSG_SETTINGSCHANGED);\r
+               self::action_overview(_MSG_SETTINGSCHANGED);\r
                return;\r
        }\r
        \r
@@ -2530,7 +2530,7 @@ class Admin
                $data = array('blogid' => $blogid);\r
                $manager->notify('PostDeleteBlog', $data);\r
                \r
-               self::$action_overview(_DELETED_BLOG);\r
+               self::action_overview(_DELETED_BLOG);\r
                return;\r
        }\r
        \r
@@ -2578,11 +2578,11 @@ class Admin
                \r
                if ( $member->isAdmin() )\r
                {\r
-                       self::$action_usermanagement();\r
+                       self::action_usermanagement();\r
                }\r
                else\r
                {\r
-                       self::$action_overview(_DELETED_MEMBER);\r
+                       self::action_overview(_DELETED_MEMBER);\r
                }\r
                return;\r
        }\r
@@ -2779,7 +2779,7 @@ class Admin
                $blog->setURL(trim($burl));\r
                $blog->writeSettings();\r
                \r
-               self::$action_overview(_MSG_NEWBLOG);\r
+               self::action_overview(_MSG_NEWBLOG);\r
                return;\r
        }\r
        \r
@@ -3128,7 +3128,7 @@ class Admin
                }\r
                \r
                // jump back to template edit\r
-               self::$action_templateedit(_TEMPLATE_UPDATED);\r
+               self::action_templateedit(_TEMPLATE_UPDATED);\r
                return;\r
        }\r
        \r
@@ -3206,7 +3206,7 @@ class Admin
                $data = array('templateid' => $templateid);\r
                $manager->notify('PostDeleteTemplate', $data);\r
                \r
-               self::$action_templateoverview();\r
+               self::action_templateoverview();\r
                return;\r
        }\r
        \r
@@ -3237,7 +3237,7 @@ class Admin
                \r
                $newTemplateId = Template::createNew($name, $desc);\r
                \r
-               self::$action_templateoverview();\r
+               self::action_templateoverview();\r
                return;\r
        }\r
        \r
@@ -3286,7 +3286,7 @@ class Admin
                        self::addToTemplate($newid, $o->tpartname, $o->tcontent);\r
                }\r
                \r
-               self::$action_templateoverview();\r
+               self::action_templateoverview();\r
                return;\r
        }\r
        \r
@@ -3482,7 +3482,7 @@ class Admin
                }\r
                \r
                // jump back to template edit\r
-               self::$action_admintemplateedit(_TEMPLATE_UPDATED);\r
+               self::action_admintemplateedit(_TEMPLATE_UPDATED);\r
                return;\r
        }\r
        \r
@@ -3555,7 +3555,7 @@ class Admin
                $data = array('templateid' => $templateid);\r
                $manager->notify('PostDeleteAdminTemplate', $data);\r
                \r
-               self::$action_admintemplateoverview();\r
+               self::action_admintemplateoverview();\r
                return;\r
        }\r
        \r
@@ -3582,7 +3582,7 @@ class Admin
                }\r
                \r
                $newTemplateId = Template::createNew($name, $desc);\r
-               self::$action_admintemplateoverview();\r
+               self::action_admintemplateoverview();\r
                return;\r
        }\r
        \r
@@ -3629,7 +3629,7 @@ class Admin
                        self::addToAdminTemplate($newid, $o->tpartname, $o->tcontent);\r
                }\r
                \r
-               self::$action_admintemplateoverview();\r
+               self::action_admintemplateoverview();\r
                return;\r
        }\r
 \r
@@ -3678,7 +3678,7 @@ class Admin
                \r
                $newId = SKIN::createNew($name, $desc);\r
                \r
-               self::$action_skinoverview();\r
+               self::action_skinoverview();\r
                return;\r
        }\r
        \r
@@ -3745,7 +3745,7 @@ class Admin
                // 2. Update description\r
                $skin->updateGeneralInfo($name, $desc, $type, $inc_mode, $inc_prefix);\r
                \r
-               self::$action_skinedit();\r
+               self::action_skinedit();\r
                return;\r
        }\r
        \r
@@ -3795,7 +3795,7 @@ class Admin
                $skin = new SKIN($skinid);\r
                $skin->update($type, $content);\r
                \r
-               self::$action_skinedittype(_SKIN_UPDATED);\r
+               self::action_skinedittype(_SKIN_UPDATED);\r
                return;\r
        }\r
        \r
@@ -3881,7 +3881,7 @@ class Admin
                $data = array('skinid' => $skinid);\r
                $manager->notify('PostDeleteSkin', $data);\r
                \r
-               self::$action_skinoverview();\r
+               self::action_skinoverview();\r
                return;\r
        }\r
        \r
@@ -3962,7 +3962,7 @@ class Admin
                );\r
                $manager->notify('PostDeleteSkinPart', $data);\r
                \r
-               self::$action_skinedit();\r
+               self::action_skinedit();\r
                return;\r
        }\r
 \r
@@ -4013,7 +4013,7 @@ class Admin
                        self::$skinclonetype($skin, $newid, $row['stype']);\r
                }\r
                \r
-               self::$action_skinoverview();\r
+               self::action_skinoverview();\r
                return;\r
        }\r
        \r
@@ -4080,7 +4080,7 @@ class Admin
                }\r
                /* TODO: $newId is not reused... */\r
                $newId = Skin::createNew($name, $desc);\r
-               self::$action_adminskinoverview();\r
+               self::action_adminskinoverview();\r
                return;\r
        }\r
        \r
@@ -4142,7 +4142,7 @@ class Admin
                }\r
                // 2. Update description\r
                $skin->updateGeneralInfo($name, $desc, $type, $inc_mode, $inc_prefix);\r
-               self::$action_adminskinedit();\r
+               self::action_adminskinedit();\r
                return;\r
        }\r
        \r
@@ -4194,7 +4194,7 @@ class Admin
                \r
                $skin = new Skin($skinid, 'Admin', 'AdminSkin');\r
                $skin->update($type, $content);\r
-               self::$action_adminskinedittype(_SKIN_UPDATED);\r
+               self::action_adminskinedittype(_SKIN_UPDATED);\r
                return;\r
        }\r
        \r
@@ -4261,7 +4261,7 @@ class Admin
                \r
                $data = array('skinid' => intval($skinid));\r
                $manager->notify('PostDeleteAdminSkin', $data);\r
-               self::$action_adminskinoverview();\r
+               self::action_adminskinoverview();\r
                return;\r
        }\r
        \r
@@ -4328,7 +4328,7 @@ class Admin
                );\r
                $manager->notify('PostDeleteAdminSkinPart', $data);\r
                \r
-               self::$action_adminskinedit();\r
+               self::action_adminskinedit();\r
                return;\r
        }\r
 \r
@@ -4378,7 +4378,7 @@ class Admin
                {\r
                        self::$skinclonetype($skin, $newid, $row['stype']);\r
                }\r
-               self::$action_adminskinoverview();\r
+               self::action_adminskinoverview();\r
                return;\r
        }\r
        \r
@@ -4577,7 +4577,8 @@ class Admin
                \r
                $info = postVar('info');\r
                \r
-               $exporter = new SkinEXPORT();\r
+               include_libs('skinie.php');\r
+               $exporter = new SkinExport();\r
                foreach ( $skinList as $skinId )\r
                {\r
                        $exporter->addSkin($skinId);\r
@@ -5164,7 +5165,7 @@ class Admin
         */\r
        static private function action_banlistnewfromitem()\r
        {\r
-               self::$action_banlistnew(getBlogIDFromItemID(intRequestVar('itemid')));\r
+               self::action_banlistnew(getBlogIDFromItemID(intRequestVar('itemid')));\r
                return;\r
        }\r
        \r
@@ -5245,7 +5246,7 @@ class Admin
                                self::error(_ERROR_ADDBAN);\r
                        }\r
                }\r
-               self::$action_banlist();\r
+               self::action_banlist();\r
                return;\r
        }\r
        \r
@@ -5263,7 +5264,7 @@ class Admin
                \r
                ActionLog::clear();\r
                \r
-               self::$action_manage(_MSG_ACTIONLOGCLEARED);\r
+               self::action_manage(_MSG_ACTIONLOGCLEARED);\r
                return;\r
        }\r
        \r
@@ -5492,7 +5493,7 @@ class Admin
                $manager->notify('PostAddPlugin', $data);\r
                \r
                // update all events\r
-               self::$action_pluginupdate();\r
+               self::action_pluginupdate();\r
                return;\r
        }\r
        \r
@@ -5703,7 +5704,7 @@ class Admin
                sql_query('UPDATE ' . sql_table('plugin') . ' SET porder=' . $oldOrder . ' WHERE porder=' . $newOrder);\r
                sql_query('UPDATE ' . sql_table('plugin') . ' SET porder=' . $newOrder . ' WHERE pid=' . $plugid);\r
                \r
-               //self::$action_pluginlist();\r
+               //self::action_pluginlist();\r
                // To avoid showing ticket in the URL, redirect to pluginlist, instead.\r
                redirect($CONF['AdminURL'] . '?action=pluginlist');\r
                return;\r
@@ -5743,7 +5744,7 @@ class Admin
                sql_query('UPDATE ' . sql_table('plugin') . ' SET porder=' . $oldOrder . ' WHERE porder=' . $newOrder);\r
                sql_query('UPDATE ' . sql_table('plugin') . ' SET porder=' . $newOrder . ' WHERE pid=' . $plugid);\r
                \r
-               //self::$action_pluginlist();\r
+               //self::action_pluginlist();\r
                // To avoid showing ticket in the URL, redirect to pluginlist, instead.\r
                redirect($CONF['AdminURL'] . '?action=pluginlist');\r
                return;\r
@@ -5815,7 +5816,7 @@ class Admin
                );\r
                $manager->notify('PostPluginOptionsUpdate', $data);\r
                \r
-               self::$action_pluginoptions(_PLUGS_OPTIONS_UPDATED);\r
+               self::action_pluginoptions(_PLUGS_OPTIONS_UPDATED);\r
                return;\r
        }\r
        \r

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index 847cfb6..41578ff 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -3711,6 +3711,7 @@ class AdminActions extends BaseActions
                
                $prevPid = -1;
                
+               include_libs('ACTIONS.php');
                $handler = new Actions($this->skintype);
                $parser = new PARSER($handler);
                        
@@ -4113,7 +4114,7 @@ class AdminActions extends BaseActions
                                if ( $this->skintype == 'itemmove' )
                                {
                                        $query  = "SELECT icat as result FROM %s WHERE inumber=%d;";
-                                       $query = spriintf($query, sql_table('item'), intRequestVar('itemid'));
+                                       $query = sprintf($query, sql_table('item'), intRequestVar('itemid'));
                                        $catid  = quickQuery(sprintf($query, intRequestVar('itemid')));
                                        Admin::selectBlogCategory('catid', $catid, 10, 1);
                                }
@@ -4455,7 +4456,7 @@ class AdminActions extends BaseActions
                        {
                                $template['body'] = $templates['PLUGIN_QUICKMENU_BODY'];
                        }
-                       if ( array_key_exists('PLUGIN_QUICKMENU_FOOT', $templates) || !empty($templates['PLUGIN_QUICKMENU_FOOT']) )
+                       if ( !array_key_exists('PLUGIN_QUICKMENU_FOOT', $templates) || empty($templates['PLUGIN_QUICKMENU_FOOT']) )
                        {
                                $template['foot'] = "</ul>\n";
                        }
@@ -5505,7 +5506,7 @@ class AdminActions extends BaseActions
                        $templates = Template::read($tplName);
                }
                
-               if ( !array_key_exists($templates['ADMIN_CUSTOMHELPLINK_ANCHOR']) || empty($templates['ADMIN_CUSTOMHELPLINK_ANCHOR']) )
+               if ( !array_key_exists('ADMIN_CUSTOMHELPLINK_ANCHOR', $templates) || empty($templates['ADMIN_CUSTOMHELPLINK_ANCHOR']) )
                {
                        $template = "<a href=\"<%helpurl%>#<%helptarget%>\" title=\"<%title%>\" <%onclick%>>\n";
                }

diff --git a/nucleus/libs/showlist.php b/nucleus/libs/showlist.php
index 1cc3a02..4a03679 100644 (file)
--- a/nucleus/libs/showlist.php
+++ b/nucleus/libs/showlist.php
@@ -1176,7 +1176,7 @@ function listplug_table_bloglist($vars, $type, $templateName = '')
                        break;\r
                case 'BODY':\r
                        $current = $vars['current'];\r
-                       if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY'. $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY']) )\r
+                       if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY']) )\r
                        {\r
                                $template = "<td title=\"blogid:<%blogid%> shortname:<%shortname%>\">\n"\r
                                          . "<a href=\"<%blogurl%>\"><img src=\"images/globe.gif\" width=\"13\" height=\"13\" alt=\"<%iconalt%>\" /></a><%blogname%></td>\n"\r
@@ -1208,7 +1208,7 @@ function listplug_table_bloglist($vars, $type, $templateName = '')
                                if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM']) )\r
                                {\r
                                        $template .= "<td><a href=\"index.php?action=blogsettings&amp;blogid=<%blogid%>\" title=\"<%ttsettingtext%>\"><%settingtext%></a></td>\n"\r
-                                                  . "<td><a href=\"index.php?action=banlist&amp;blogid=<%blogid%>\" title=\"<%ttbanstext%>\"><%banstext%></a></td>\n";\r
+                                                 . "<td><a href=\"index.php?action=banlist&amp;blogid=<%blogid%>\" title=\"<%ttbanstext%>\"><%banstext%></a></td>\n";\r
                                }\r
                                else\r
                                {\r
@@ -1224,7 +1224,7 @@ function listplug_table_bloglist($vars, $type, $templateName = '')
                        {\r
                                if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM']) )\r
                                {\r
-                                       $template .= "<td><a href=\"index.php?action=deleteblog&amp;blogid=<%blogid%>\" title=\"<%ttdeletetext%>\"></a><%deletetext%></td>\n";\r
+                                       $template .= "<td><a href=\"index.php?action=deleteblog&amp;blogid=<%blogid%>\" title=\"<%ttdeletetext%>\"><%deletetext%></a></td>\n";\r
                                }\r
                                else\r
                                {\r
@@ -1805,7 +1805,7 @@ function listplug_table_actionlist($vars, $type, $templateName = '')
        switch( $type )\r
        {\r
                case 'HEAD':\r
-                       if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_ACTNLIST_HEAD'. $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_ACTNLIST_HEAD']) )\r
+                       if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_ACTNLIST_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_ACTNLIST_HEAD']) )\r
                        {\r
                                $template = "<th><%coltime%></th>\n"\r
                                          . "<th><%colmesg%></th>\n";\r
@@ -1928,7 +1928,7 @@ function listplug_table_adminskinlist($vars, $type, $templateName = '')
        switch( $type )\r
        {\r
                case 'HEAD':\r
-                       if ( !array_key_exists($templates['SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD']) || empty($templates['SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD']) )\r
+                       if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD']) )\r
                        {\r
                                $template = "<th><%colname%></th>\n"\r
                                          . "<th><%coldesc%></th>\n"\r