「イベントヘッドライン表示」ウィジェット更新。

diff --git a/include/global.php b/include/global.php
index 4a2b62e..72c9937 100644 (file)
--- a/include/global.php
+++ b/include/global.php
@@ -289,6 +289,7 @@ define('M3_REQUEST_PARAM_OPERATION_ANCHOR',                 'anchor');                      // 画面指定用ア
 define('M3_REQUEST_PARAM_OPERATION_ACT',                       'act');                         // クライアントからの実行処理
 define('M3_REQUEST_PARAM_OPERATION_LANG',                      'lang');                        // 言語指定表示
 define('M3_REQUEST_PARAM_SERIAL_NO',                           'serial');                      // シリアル番号
+define('M3_REQUEST_PARAM_CONFIG_ID',                           'config');                      // 定義ID
 define('M3_REQUEST_PARAM_PAGE_NO',                             'page');                        // ページ番号
 define('M3_REQUEST_PARAM_LIST_NO',                             'list');                        // 一覧番号
 define('M3_REQUEST_PARAM_ITEM_NO',                             'no');                          // 項目番号

diff --git a/widgets/event_headline/include/container/event_headlineWidgetContainer.php b/widgets/event_headline/include/container/event_headlineWidgetContainer.php
index 28ad87b..3edd5ea 100644 (file)
--- a/widgets/event_headline/include/container/event_headlineWidgetContainer.php
+++ b/widgets/event_headline/include/container/event_headlineWidgetContainer.php
@@ -115,7 +115,7 @@ class event_headlineWidgetContainer extends BaseWidgetContainer
                        $iconTitle = self::DEFAULT_TITLE;
                        $iconUrl = $this->gEnv->getRootUrl() . self::RSS_ICON_FILE;
                        $rssLink = '<img src="' . $this->getUrl($iconUrl) . '" alt="' . $iconTitle . '" title="' . $iconTitle . '" style="border:none;" />';
-                       $linkUrl = $this->gPage->createRssCmdUrl($this->gEnv->getCurrentWidgetId());
+                       $linkUrl = $this->gPage->createRssCmdUrl($this->gEnv->getCurrentWidgetId(), M3_REQUEST_PARAM_CONFIG_ID . '=' . $configId);
                        $rssLink = '<a href="' . convertUrlToHtmlEntity($this->getUrl($linkUrl)) . '">' . $rssLink . '</a>';
                        $rssLink = '<div align="right">' . $rssLink . '</div>';         // 右寄せ
                        $this->tmpl->addVar("_widget", "rss_link", $rssLink);

diff --git a/widgets/event_headline/include/container/rss_event_headlineWidgetContainer.php b/widgets/event_headline/include/container/rss_event_headlineWidgetContainer.php
index 0eeccea..c469ed5 100644 (file)
--- a/widgets/event_headline/include/container/rss_event_headlineWidgetContainer.php
+++ b/widgets/event_headline/include/container/rss_event_headlineWidgetContainer.php
@@ -24,6 +24,7 @@ class rss_event_headlineWidgetContainer extends BaseRssContainer
        private $rssChannel;                            // RSSチャンネル部出力データ
        private $rssSeqUrl = array();                                   // 項目の並び
        private $defaultUrl;    // システムのデフォルトURL
+       const DEFAULT_CONFIG_ID = 0;
        const DEFAULT_TITLE = 'ブログ最新記事';                  // デフォルトのウィジェットタイトル
        const DEFAULT_DESC = '最新のブログ記事が取得できます。';
        
@@ -64,7 +65,8 @@ class rss_event_headlineWidgetContainer extends BaseRssContainer
        function _assign($request, &$param)
        {
                // 定義ID取得
-               $configId = $this->gEnv->getCurrentWidgetConfigId();
+               //$configId = $this->gEnv->getCurrentWidgetConfigId();
+               $configId = $request->trimValueOf(M3_REQUEST_PARAM_CONFIG_ID);
                if (empty($configId)) $configId = self::DEFAULT_CONFIG_ID;
                
                // 初期値設定
@@ -100,7 +102,7 @@ class rss_event_headlineWidgetContainer extends BaseRssContainer
                        // システム強制終了
                        $this->gPage->exitSystem();
                }
-                                       
+
                // イベント記事取得
                $this->defaultUrl = $this->gEnv->getDefaultUrl();
                $this->db->getEntryItems($itemCount, $this->_langId, $sortOrder, $useBaseDay, $dayCount, array($this, 'itemLoop'));
@@ -145,7 +147,7 @@ class rss_event_headlineWidgetContainer extends BaseRssContainer
                $linkUrl = $this->getUrl($url, true/*リンク用*/);
                $escapedLinkUrl = $this->convertUrlToHtmlEntity($linkUrl);
                
-               if (!empty($name)){
+               if (!empty($title)){
                        $row = array(
                                'total' => $totalViewCount,             // 閲覧数
                                'link_url' => $this->convertUrlToHtmlEntity($linkUrl),          // リンク

diff --git a/widgets/event_headline/include/db/event_headlineDb.php b/widgets/event_headline/include/db/event_headlineDb.php
index ad1fc87..b0652e4 100644 (file)
--- a/widgets/event_headline/include/db/event_headlineDb.php
+++ b/widgets/event_headline/include/db/event_headlineDb.php
@@ -33,7 +33,7 @@ class event_headlineDb extends BaseDb
                $now = date("Y/m/d H:i:s");     // 現在日時
                $initDt = $this->gEnv->getInitValueOfTimestamp();
                $params = array();
-               
+
                // イベント記事を取得
                $queryStr = 'SELECT * FROM event_entry ';
                $queryStr .=  'WHERE ee_deleted = false ';              // 削除されていない