CHANGE: Managerクラスのテンプレートキャッシュ機構を利用するように変更

Manager::getTemplate()はテンプレートのキャッシュを行うため、SQL文による問い合わせ回数を削減する効果がある。AdminActionsクラスとshowlist.phpではこれを使わずにTemplate::read()によりテンプレートを取得していたため毎回SQL文による問い合わせを発行しており、応答速度低下につながっていた。この修正によりサーバー側のスループットを改善する。

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index dd51103..f89ff75 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -824,7 +824,7 @@ class AdminActions extends BaseActions
                
                if ( !empty($templateName))
                {
-                       $template = Template::read($templateName);
+                       $template =& $manager->getTemplate($templateName);
                }
                
                $key = postVar('ackey');
@@ -987,7 +987,7 @@ class AdminActions extends BaseActions
                
                if ( !empty($templateName) )
                {
-                       $templates = Template::read($templateName);
+                       $templates =& $manager->getTemplate($templateName);
                }
                
                if ( !array_key_exists('ADMIN_BATCHLIST', $templates) || empty($templates['ADMIN_BATCHLIST']) )
@@ -1121,7 +1121,7 @@ class AdminActions extends BaseActions
                
                if ( !empty($templateName) )
                {
-                       $templates = Template::read($templateName);
+                       $templates =& $manager->getTemplate($templateName);
                }
                
                if ( !array_key_exists('ADMIN_BLOGLINK', $templates) || empty($templates['ADMIN_BLOGLINK']) )
@@ -1214,10 +1214,12 @@ class AdminActions extends BaseActions
         */
        public function parse_adminskinielist($type, $templateName = '')
        {
+               global $manager;
+               
                $templates = array();
                if ( $templateName )
                {
-                       $templates = Template::read($templateName);
+                       $templates =& $manager->getTemplate($templateName);
                }
                
                if ( !array_key_exists('SKINIE_EXPORT_LIST', $templates) || empty($templates['SKINIE_EXPORT_LIST']) )
@@ -1319,10 +1321,12 @@ class AdminActions extends BaseActions
         */
        public function parse_adminspecialskinlist($templateName = '')
        {
+               global $manager;
+               
                $templates = array();
                if ( $templateName )
                {
-                       $templates = Template::read($templateName);
+                       $templates =& $manager->getTemplate($templateName);
                }
                
                $nType  = $this->parser->skin->getAvailableTypes();
@@ -1489,7 +1493,7 @@ class AdminActions extends BaseActions
                $templates = array();
                if ( $templateName )
                {
-                       $templates = Template::read($templateName);
+                       $templates =& $manager->getTemplate($templateName);
                }
                
                if ( !array_key_exists('BANLIST_DELETED_LIST', $templates) || empty($templates['BANLIST_DELETED_LIST']) )
@@ -2227,11 +2231,13 @@ class AdminActions extends BaseActions
         */
        public function parse_defaultadminskintypes($tabindex, $templateName = '')
        {
+               global $manager;
+               
                $templates = array();
                
                if ( $templateName )
                {
-                       $templates = Template::read($templateName);
+                       $templates =& $manager->getTemplate($templateName);
                }
                
                $types = $this->parser->skin->getAvailableTypes();
@@ -2917,7 +2923,7 @@ class AdminActions extends BaseActions
                $t_id           =  intRequestVar('templateid');
                $t_name         =  Template::getNameFromId($t_id);
                $t_desc         =  Template::getDesc($t_id);
-               $template       = &Template::read($t_name);
+               $template       =& $manager->getTemplate($t_name);
                
                switch ( $type )
                {
@@ -2938,7 +2944,7 @@ class AdminActions extends BaseActions
                                $tmplt = array();
                                if ( $desc )
                                {
-                                       $tmplt = Template::read($desc);
+                                       $tmplt =& $manager->getTemplate($desc);
                                }
                                if ( !array_key_exists('TEMPLATE_EDIT_EXPLUGNAME', $tmplt) || empty($tmplt['TEMPLATE_EDIT_EXPLUGNAME']) )
                                {
@@ -2991,7 +2997,7 @@ class AdminActions extends BaseActions
                $t_id           =  intRequestVar('templateid');
                $t_name         =  Template::getNameFromId($t_id);
                $t_desc         =  Template::getDesc($t_id);
-               $template       = &Template::read($t_name);
+               $template       =& $manager->getTemplate($t_name);
                
                switch ( $type )
                {
@@ -3012,7 +3018,7 @@ class AdminActions extends BaseActions
                                $tmplt = array();
                                if ( $desc )
                                {
-                                       $tmplt = Template::read($desc);
+                                       $tmplt =& $manager->getTemplate($desc);
                                }
                                if ( !array_key_exists('TEMPLATE_EDIT_EXPLUGNAME', $tmplt) || empty($tmplt['TEMPLATE_EDIT_EXPLUGNAME']) )
                                {
@@ -4191,7 +4197,7 @@ class AdminActions extends BaseActions
                $template = array();
                if ( $templateName )
                {
-                       $templates = Template::read($templateName);
+                       $templates =& $manager->getTemplate($templateName);
                        if ( !array_key_exists('INSERT_PLUGOPTION_TITLE', $templates) || empty($templates['INSERT_PLUGOPTION_TITLE']) )
                        {
                                $template['title'] = "<tr>"
@@ -4294,7 +4300,7 @@ class AdminActions extends BaseActions
                $template  = array();
                if ( !empty($templateName) )
                {
-                       $templates = Template::read($templateName);
+                       $templates = & $manager->getTemplate($templateName);
                }
                $pluginExtras = array();
                $manager->notify(
@@ -4477,10 +4483,12 @@ class AdminActions extends BaseActions
         */
        public function parse_skinielist($type, $templateName = '')
        {
+               global $manager;
+               
                $templates = array();
                if ( $templateName )
                {
-                       $templates = Template::read($templateName);
+                       $templates =& $manager->getTemplate($templateName);
                }
                if ( array_key_exists('SKINIE_EXPORT_LIST', $templates) && !empty($templates['SKINIE_EXPORT_LIST']) )
                {
@@ -4591,10 +4599,12 @@ class AdminActions extends BaseActions
         */
        public function parse_specialskinlist($templateName = '')
        {
+               global $manager;
+               
                $templates = array();
                if ( $templateName )
                {
-                       $templates = Template::read($templateName);
+                       $templates =& $manager->getTemplate($templateName);
                }
                
                /* TODO: use Skin class */
@@ -4715,7 +4725,7 @@ class AdminActions extends BaseActions
         */
        public function parse_systemsettings($type = 'phpinfo', $templateName = '')
        {
-               global $member, $CONF, $nucleus;
+               global $manager, $member, $CONF, $nucleus;
                
                $member->isAdmin() or Admin::disallow();
                
@@ -4746,7 +4756,7 @@ class AdminActions extends BaseActions
                                $templates = array();
                                if ( $templateName )
                                {
-                                       $templates = Template::read($templateName);
+                                       $templates =& $manager->getTemplate($templateName);
                                }
                                if ( !array_key_exists('SYSTEMINFO_GDSETTINGS', $templates) || empty($templates['SYSTEMINFO_GDSETTINGS']) )
                                {
@@ -5297,6 +5307,8 @@ class AdminActions extends BaseActions
         */
        private function templateEditRow(&$template, $desc, $name, $help = '', $tabindex = 0, $big = 0, $tplt = '')
        {
+               global $manager;
+               
                static $count = 1;
                
                if ( !array_key_exists($name, $template) )
@@ -5309,7 +5321,7 @@ class AdminActions extends BaseActions
                
                if ( $tplt )
                {
-                       $tmplt = skinableTEMPLATE::read($tplt);
+                       $tmplt =& $manager->getTemplate($tplt);
                }
                
                $data = array(
@@ -5386,13 +5398,13 @@ class AdminActions extends BaseActions
         */
        static function customHelplink($id, $tplName = '', $url = '', $title = '', $onclick = '')
        {
-               global $CONF;
+               global $CONF, $manager;
                
                $templates = array();
                
                if ( $tplName )
                {
-                       $templates = Template::read($tplName);
+                       $templates =& $manager->getTemplate($tplName);
                }
                
                if ( !array_key_exists('ADMIN_CUSTOMHELPLINK_ANCHOR', $templates) || empty($templates['ADMIN_CUSTOMHELPLINK_ANCHOR']) )
@@ -5445,13 +5457,13 @@ class AdminActions extends BaseActions
         */
        private function customHelpHtml($id, $tplName = '', $url = '', $iconURL = '', $alt = '', $title = '', $onclick = '')
        {
-               global $CONF;
+               global $CONF, $manager;
                
                $templates = array();
                
                if ( $tplName )
                {
-                       $templates = Template::read($tplName);
+                       $templates =& $manager->getTemplate($tplName);
                }
                if ( !array_key_exists('ADMIN_CUSTOMHELPLINK_ICON', $templates) || !empty($templates['ADMIN_CUSTOMHELPLINK_ICON']) )
                {
@@ -5513,10 +5525,12 @@ class AdminActions extends BaseActions
                                                                $templateName = '',
                                                                $showlist        = false)
        {
+               global $manager;
+               
                $templates = array();
                if ( $templateName )
                {
-                       $templates = Template::read($templateName);
+                       $templates =& $manager->getTemplate($templateName);
                }
                
                if ( $name == 'admin' )

diff --git a/nucleus/libs/showlist.php b/nucleus/libs/showlist.php
index af4a806..30e6793 100644 (file)
--- a/nucleus/libs/showlist.php
+++ b/nucleus/libs/showlist.php
@@ -68,12 +68,12 @@ function showlist($query, $type, $vars, $templateName = '')
 \r
 function listplug_select($vars, $type, $templateName = '')\r
 {\r
-       global $DIR_LIBS;\r
+       global $DIR_LIBS, $manager;\r
        \r
        $templates = array();\r
        if ( !empty($templateName) )\r
        {\r
-               $templates = Template::read($templateName);\r
+               $templates =& $manager->getTemplate($templateName);\r
        }\r
        \r
        switch( $type )\r
@@ -148,10 +148,12 @@ function listplug_select($vars, $type, $templateName = '')
 \r
 function listplug_table($vars, $type, $templateName = '')\r
 {\r
+       global $manager;\r
+       \r
        $templates = array();\r
        if ( !empty($templateName) )\r
        {\r
-               $templates = Template::read($templateName);\r
+               $templates =& $manager->getTemplate($templateName);\r
        }\r
        \r
        switch( $type )\r
@@ -227,10 +229,12 @@ function listplug_table($vars, $type, $templateName = '')
 \r
 function listplug_table_memberlist($vars, $type, $templateName = '')\r
 {\r
+       global $manager;\r
+       \r
        $templates = array();\r
        if ( !empty($templateName) )\r
        {\r
-               $templates = Template::read($templateName);\r
+               $templates =& $manager->getTemplate($templateName);\r
        }\r
        \r
        switch( $type )\r
@@ -314,7 +318,7 @@ function listplug_table_teamlist($vars, $type, $templateName = '')
        $templates = array();\r
        if ( !empty($templateName) )\r
        {\r
-               $templates = Template::read($templateName);\r
+               $templates =& $manager->getTemplate($templateName);\r
        }\r
        \r
        switch( $type )\r
@@ -393,7 +397,7 @@ function listplug_table_pluginlist($vars, $type, $templateName = '')
        $templates = array();\r
        if ( !empty($templateName) )\r
        {\r
-               $templates = Template::read($templateName);\r
+               $templates =& $manager->getTemplate($templateName);\r
        }\r
        \r
        switch( $type )\r
@@ -706,7 +710,7 @@ function listplug_table_plugoptionlist($vars, $type, $templateName = '')
        $templates = array();\r
        if ( !empty($templateName) )\r
        {\r
-               $templates = Template::read($templateName);\r
+               $templates =& $manager->getTemplate($templateName);\r
        }\r
        \r
        switch( $type )\r
@@ -757,10 +761,12 @@ function listplug_table_plugoptionlist($vars, $type, $templateName = '')
 \r
 function listplug_plugOptionRow($current, $templateName = '')\r
 {\r
+       global $manager;\r
+       \r
        $templates = array();\r
        if ( !empty($templateName) )\r
        {\r
-               $templates = Template::read($templateName);\r
+               $templates =& $manager->getTemplate($templateName);\r
        }\r
        \r
        $varname = "plugoption[{$current['oid']}][{$current['contextid']}]";\r
@@ -949,12 +955,14 @@ function listplug_plugOptionRow($current, $templateName = '')
 \r
 function listplug_table_itemlist($vars, $type, $templateName = '')\r
 {\r
+       global $manager;\r
+       \r
        $cssclass  = '';\r
        \r
        $templates = array();\r
        if ( !empty($templateName) )\r
        {\r
-               $templates = Template::read($templateName);\r
+               $templates =& $manager->getTemplate($templateName);\r
        }\r
        \r
        switch( $type )\r
@@ -1072,11 +1080,12 @@ function listplug_nextBatchId()
 \r
 function listplug_table_commentlist($vars, $type, $templateName = '')\r
 {\r
+       global $manager;\r
        \r
        $templates = array();\r
        if ( !empty($templateName) )\r
        {\r
-               $templates = Template::read($templateName);\r
+               $templates =& $manager->getTemplate($templateName);\r
        }\r
        \r
        switch( $type )\r
@@ -1183,10 +1192,12 @@ function listplug_table_commentlist($vars, $type, $templateName = '')
 \r
 function listplug_table_bloglist($vars, $type, $templateName = '')\r
 {\r
+       global $manager;\r
+       \r
        $templates = array();\r
        if ( !empty($templateName) )\r
        {\r
-               $templates = Template::read($templateName);\r
+               $templates =& $manager->getTemplate($templateName);\r
        }\r
        \r
        switch( $type )\r
@@ -1284,10 +1295,12 @@ function listplug_table_bloglist($vars, $type, $templateName = '')
 \r
 function listplug_table_shortblognames($vars, $type, $templateName = '')\r
 {\r
+       global $manager;\r
+       \r
        $templates = array();\r
        if ( !empty($templateName) )\r
        {\r
-               $templates = Template::read($templateName);\r
+               $templates =& $manager->getTemplate($templateName);\r
        }\r
        \r
        switch( $type )\r
@@ -1341,11 +1354,12 @@ function listplug_table_shortblognames($vars, $type, $templateName = '')
 \r
 function listplug_table_shortnames($vars, $type, $templateName = '')\r
 {\r
+       global $manager;\r
        \r
        $templates = array();\r
        if ( !empty($templateName) )\r
        {\r
-               $templates = Template::read($templateName);\r
+               $templates =& $manager->getTemplate($templateName);\r
        }\r
        \r
        switch( $type )\r
@@ -1399,10 +1413,12 @@ function listplug_table_shortnames($vars, $type, $templateName = '')
 \r
 function listplug_table_categorylist($vars, $type, $templateName = '')\r
 {\r
+       global $manager;\r
+       \r
        $templates = array();\r
        if ( !empty($templateName) )\r
        {\r
-               $templates = Template::read($templateName);\r
+               $templates =& $manager->getTemplate($templateName);\r
        }\r
        \r
        switch( $type )\r
@@ -1474,7 +1490,7 @@ function listplug_table_templatelist($vars, $type, $templateName = '')
        $templates = array();\r
        if ( !empty($templateName) )\r
        {\r
-               $templates = Template::read($templateName);\r
+               $templates =& $manager->getTemplate($templateName);\r
        }\r
        \r
        switch( $type )\r
@@ -1557,7 +1573,7 @@ function listplug_table_skinlist($vars, $type, $templateName = '')
        $templates = array();\r
        if ( !empty($templateName) )\r
        {\r
-               $templates = Template::read($templateName);\r
+               $templates =& $manager->getTemplate($templateName);\r
        }\r
        \r
        switch( $type )\r
@@ -1705,10 +1721,12 @@ function listplug_table_skinlist($vars, $type, $templateName = '')
 \r
 function listplug_table_draftlist($vars, $type, $templateName = '')\r
 {\r
+       global $manager;\r
+       \r
        $templates = array();\r
        if ( !empty($templateName) )\r
        {\r
-               $templates = Template::read($templateName);\r
+               $templates =& $manager->getTemplate($templateName);\r
        }\r
        switch( $type )\r
        {\r
@@ -1767,10 +1785,12 @@ function listplug_table_draftlist($vars, $type, $templateName = '')
 \r
 function listplug_table_otherdraftlist($vars, $type, $templateName = '')\r
 {\r
+       global $manager;\r
+       \r
        $templates = array();\r
        if ( !empty($templateName) )\r
        {\r
-               $templates = Template::read($templateName);\r
+               $templates =& $manager->getTemplate($templateName);\r
        }\r
        \r
        switch( $type )\r
@@ -1834,10 +1854,12 @@ function listplug_table_otherdraftlist($vars, $type, $templateName = '')
 \r
 function listplug_table_actionlist($vars, $type, $templateName = '')\r
 {\r
+       global $manager;\r
+       \r
        $templates = array();\r
        if ( !empty($templateName) )\r
        {\r
-               $templates = Template::read($templateName);\r
+               $templates =& $manager->getTemplate($templateName);\r
        }\r
        \r
        switch( $type )\r
@@ -1891,10 +1913,12 @@ function listplug_table_actionlist($vars, $type, $templateName = '')
 \r
 function listplug_table_banlist($vars, $type, $templateName = '')\r
 {\r
+       global $manager;\r
+       \r
        $templates = array();\r
        if ( !empty($templateName) )\r
        {\r
-               $templates = Template::read($templateName);\r
+               $templates =& $manager->getTemplate($templateName);\r
        }\r
        \r
        switch( $type )\r
@@ -1961,7 +1985,7 @@ function listplug_table_adminskinlist($vars, $type, $templateName = '')
        $templates = array();\r
        if ( !empty($templateName) )\r
        {\r
-               $templates = Template::read($templateName);\r
+               $templates =& $manager->getTemplate($templateName);\r
        }\r
        switch( $type )\r
        {\r
@@ -2113,7 +2137,7 @@ function listplug_table_admintemplatelist($vars, $type, $templateName = '')
        $templates = array();\r
        if ( !empty($templateName) )\r
        {\r
-               $templates = Template::read($templateName);\r
+               $templates =& $manager->getTemplate($templateName);\r
        }\r
        \r
        switch( $type )\r