Changeset 20870

Timestamp:

2011/04/20 16:13:08 (13 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:20869

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/Smarty/templates/admin/system/plugin.tpl 18949@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcamp%2Fcamp-2_5-E%2Fdata%2FSmarty%2Ftemplates%2Fadmin%2Fsystem%2Fplugin.tpl
data/class/helper/SC_Helper_Plugin.php 18913@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcamp%2Fcamp-2_5-E%2Fdata%2Fclass%2Fhelper%2FSC_Helper_Plugin.php
data/class/pages/admin/LC_Page_Admin.php 15280@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2FLC_Page_Admin.php
data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php 18933@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcamp%2Fcamp-2_5-E%2Fdata%2Fclass%2Fpages%2Fadmin%2Fsystem%2FLC_Page_Admin_System_Plugin.php
html/install/sql/create_table_mysql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_mysql.sql
html/install/sql/create_table_pgsql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_pgsql.sql

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110420071045-smb0kz6k8uhe0i8f

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

ohkouchi@loop-az.jp-20110420071305-b734t36r0p852crv

bzr:revno:

3581

bzr:revprop:branch-nick:

branches/version-2_11-dev

bzr:root:

branches/version-2_11-dev

bzr:text-revisions:

data/Smarty/templates/admin/system/plugin.tpl ohkouchi@loop-az.jp-20110420071045-smb0kz6k8uhe0i8f
data/class/helper/SC_Helper_Plugin.php ohkouchi@loop-az.jp-20110420071045-smb0kz6k8uhe0i8f
data/class/pages/admin/LC_Page_Admin.php ohkouchi@loop-az.jp-20110420071045-smb0kz6k8uhe0i8f
data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php ohkouchi@loop-az.jp-20110420071045-smb0kz6k8uhe0i8f
html/install/sql/create_table_mysql.sql ohkouchi@loop-az.jp-20110420071045-smb0kz6k8uhe0i8f
html/install/sql/create_table_pgsql.sql ohkouchi@loop-az.jp-20110420071045-smb0kz6k8uhe0i8f

bzr:timestamp:

2011-04-20 16:13:05.654000044 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-04-20T07:13:05.654000Z

Message:

#494 (プラグイン機能)

• プラグインの存在チェック, デバックログ出力を追加
• プラグインのロード順位を指定できるよう修正

Location:

branches/version-2_11-dev

Files:

• data/Smarty/templates/admin/system/plugin.tpl (modified) (3 diffs)
• data/class/helper/SC_Helper_Plugin.php (modified) (3 diffs)
• data/class/pages/admin/LC_Page_Admin.php (modified) (2 diffs)
• data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php (modified) (2 diffs)
• html/install/sql/create_table_mysql.sql (modified) (1 diff)
• html/install/sql/create_table_pgsql.sql (modified) (1 diff)

branches/version-2_11-dev/data/Smarty/templates/admin/system/plugin.tpl

@@ -57 +57 @@
             <colgroup width="28%">
             <colgroup width="7%">
-            <colgroup width="10%">
+            <colgroup width="5%">
+            <colgroup width="5%">
             <colgroup width="5%">
             <tr>
-                <th >プラグイン名</th>
+                <th>プラグイン名</th>
                 <th>作者</th>
                 <th>サイトURL</th>
@@ -67 +68 @@
                 <th>操作</th>
                 <th>設定</th>
+                <th>移動</th>
             </tr>
             <!--{section name=data loop=$plugins}-->
@@ -100 +102 @@
                     <!--{/if}-->
                 </td>
-
+                <td align="center">
+                <!--{if $smarty.section.data.iteration != 1}-->
+                <a href="?" onclick="fnModeSubmit('up','plugin_id', '<!--{$plugins[data].plugin_id}-->'); return false;">上へ</a>
+                <!--{/if}-->
+                <!--{if $smarty.section.data.iteration != $smarty.section.data.last}-->
+                <a href="?" onclick="fnModeSubmit('down','plugin_id', '<!--{$plugins[data].plugin_id}-->'); return false;">下へ</a>
+                <!--{/if}-->
+                </td>
             </tr>
             <!--{/section}-->

branches/version-2_11-dev/data/class/helper/SC_Helper_Plugin.php

@@ -40 +40 @@
         $table = "dtb_plugin";
         $where = "enable = 1 AND del_flg = 0";
+        // XXX 2.11.0 互換のため
+        $arrCols = $objQuery->listTableFields($table);
+        if (in_array('rank', $arrCols)) {
+            $objQuery->setOrder('rank');
+        }
         $arrRet = $objQuery->select($col, $table, $where);
         $class_name = get_class($lcpage);
 
-        // 実行されたぺーじ
         // 現在のページで使用するプラグインが存在するかどうかを検証する
         foreach ($arrRet as $plugins){
             // プラグインを稼働させるクラス名のリストを取得する
             // プラグインのディレクトリ内の設定ファイルを参照する
-            $plugin_name = $plugins['name'];
+            $plugin_name = $plugins['plugin_name'];
             $plugin_class_name = $plugins['class_name'];
-            require_once DATA_REALDIR."plugin/{$plugin_name}/{$plugin_class_name}.php";
+            $plugin_path = DATA_REALDIR . "plugin/{$plugin_name}/{$plugin_class_name}.php";
 
-            $code_str = "\$is_enable = {$plugin_class_name}::isEnable(\$class_name);";
-            eval($code_str);
-            if ($is_enable) {
-                $arrPluginList[] = $plugin_class_name;
+            if (file_exists($plugin_path)) {
+                require_once $plugin_path;
+                if (class_exists($class_name)) {
+                    $code_str = "\$is_enable = {$plugin_class_name}::isEnable(\$class_name);";
+                    eval($code_str);
+                    if ($is_enable) {
+                        $arrPluginList[] = $plugin_class_name;
+                        GC_Utils_Ex::gfDebugLog($class_name . ' で、プラグイン ' . $plugin_name . ' をロードしました');
+                    } else {
+                        GC_Utils_Ex::gfDebugLog($class_name . ' で、プラグイン ' . $plugin_name . ' は無効になっています');
+                    }
+                } else {
+                    GC_Utils_Ex::gfDebugLog('プラグイン ' . $plugin_name . ' の ' . $class_name . ' が見つかりませんでした');
+                }
+            } else {
+                GC_Utils_Ex::gfDebugLog('プラグイン ' . $plugin_name . " が読み込めませんでした。\n"
+                                        . 'Failed opening required ' . $plugin_path);
             }
         }
@@ -96 +113 @@
         $table = 'dtb_plugin';
         $where = 'enable = 1 AND del_flg = 0';
+        // XXX 2.11.0 互換のため
+        $arrCols = $objQuery->listTableFields($table);
+        if (in_array('rank', $arrCols)) {
+            $objQuery->setOrder('rank DESC');
+        }
         $arrRet = $objQuery->select($col,$table,$where);
         return $arrRet;
@@ -108 +130 @@
         $table = 'dtb_plugin';
         $where = 'del_flg = 0';
+        // XXX 2.11.0 互換のため
+        $arrCols = $objQuery->listTableFields($table);
+        if (in_array('rank', $arrCols)) {
+            $objQuery->setOrder('rank DESC');
+        }
         $arrRet = $objQuery->select($col,$table,$where);
         return $arrRet;

branches/version-2_11-dev/data/class/pages/admin/LC_Page_Admin.php

@@ -66 +66 @@
 
         // プラグインクラス生成
-        // $this->objPlagin = new SC_Helper_Plugin_Ex();
-        // $this->objPlagin->preProcess($this);
+        $this->objPlagin = new SC_Helper_Plugin_Ex();
+        $this->objPlagin->preProcess($this);
 
         // トランザクショントークンの検証と生成
@@ -88 +88 @@
      */
     function sendResponse() {
+        if (isset($this->objPlagin)) { // FIXME モバイルエラー応急対応
+            // post-prosess処理(暫定的)
+            $this->objPlagin->process($this);
+        }
         $this->objDisplay->prepare($this, true);
         $this->objDisplay->response->write();

branches/version-2_11-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php

@@ -119 +119 @@
             }
             break;
+        case 'up':
+            $this->arrErr = $objFormParam->checkError();
+            if(count($this->arrErr) == 0) {
+                $plugin_id = $objFormParam->getValue('plugin_id');
+                SC_Helper_DB_Ex::sfRankUp("dtb_plugin", "plugin_id", $plugin_id);
+                SC_Response_Ex::reload();
+            }
+            break;
+        case 'down':
+            $this->arrErr = $objFormParam->checkError();
+            if(count($this->arrErr) == 0) {
+                $plugin_id = $objFormParam->getValue('plugin_id');
+                SC_Helper_DB_Ex::sfRankDown("dtb_plugin", "plugin_id", $plugin_id);
+                SC_Response_Ex::reload();
+            }
+            break;
+
         default:
             break;
@@ -269 +286 @@
         $sqlval['plugin_id'] = $objQuery->nextVal('dtb_plugin_plugin_id');
         $sqlval['plugin_code'] = $plugin_code;
+        $sqlval['rank'] = 1 + $objQuery->max('rank', 'dtb_plugin');
         $sqlval['status'] = PLUGIN_STATUS_UPLOADED;
         $sqlval['enable'] = PLUGIN_ENABLE_FALSE;

branches/version-2_11-dev/html/install/sql/create_table_mysql.sql

@@ -1143 +1143 @@
     plugin_setting_path varchar(255) NOT NULL DEFAULT '',
     class_name varchar(255) NOT NULL DEFAULT '',
+    rank int NOT NULL DEFAULT 0,
     status smallint NOT NULL DEFAULT 0,
     enable smallint NOT NULL DEFAULT 0,

branches/version-2_11-dev/html/install/sql/create_table_pgsql.sql

@@ -1143 +1143 @@
     plugin_setting_path text NOT NULL DEFAULT '',
     class_name text NOT NULL DEFAULT '',
+    rank int NOT NULL DEFAULT 0,
     status smallint NOT NULL DEFAULT 0,
     enable smallint NOT NULL DEFAULT 0,