Changeset 16648 for branches

Timestamp:

2007/11/01 13:53:18 (15 years ago)

Author:

naka

Message:

コンビーズ連携モジュールのマージ

Location:

branches/beta

Files:

• data/Smarty/templates/admin/mail/index.tpl (modified) (1 diff)
• html/admin/mail/index.php (modified) (3 diffs)

branches/beta/data/Smarty/templates/admin/mail/index.tpl

@@ -370 +370 @@
                 </td>
                 <td><img src="<!--{$smarty.const.URL_DIR}-->img/common/_.gif" width="8" height="1" alt=""></td>
-                <td><input type="submit" name="subm" value="ÇÛ¿®ÆâÍƤòÀßÄꤹ¤ë" onclick="document.form1['mode'].value='input';"/></td>
+                <td><input type="submit" name="subm" value="ÇÛ¿®ÆâÍƤòÀßÄꤹ¤ë" onclick="document.form1['mode'].value='input';"/>
+                <!--{* ¥³¥ó¥Ó¡¼¥º¥â¥¸¥å¡¼¥ëÏ¢·ÈÍÑ *}-->
+                <!--{assign var=path value=`$smarty.const.MODULE_PATH`mdl_combz/combz_mail.tpl}-->
+                <!--{if file_exists($path)}-->
+                    <!--{include file=$path}-->
+                <!--{/if}-->
+                </td>
             </tr>
         </table>

branches/beta/html/admin/mail/index.php

@@ -7 +7 @@
 require_once("../require.php");
 require_once("./inc_mailmagazine.php");
+
+if(file_exists(MODULE_PATH . 'mdl_combz/mdl_combz.inc')) {
+    require_once(MODULE_PATH . 'mdl_combz/mdl_combz.inc');
+}
 
 class LC_Page {
@@ -128 +132 @@
 case 'search':
 case 'back':
+// ¥³¥ó¥Ó¡¼¥ºÏ¢·ÈÍÑ
+case 'combz':
     //-- ÆþÎÏÃÍ¥³¥ó¥Ð¡¼¥È
     $objPage->list_data = lfConvertParam($_POST, $arrSearchColumn);
@@ -170 +176 @@
         //¸½ºß»þ¹ï¤Î¼èÆÀ
         $objPage->arrNowDate = lfGetNowDate();
+    }
+    
+    if($_POST['mode'] == 'combz' && function_exists('sfCombzPost')) {
+        $objPage->combz_return = sfCombzPost($_POST['combz_type'], $where, $arrval);
     }
     break;