Changeset 10893 for temp/branches

Timestamp:

2006/12/18 18:00:21 (20 years ago)

Author:

uehara

Message:

 

Location:

temp/branches/ec-cube-beta

Files:

• data/conf/conf.php (modified) (1 diff)
• html/admin/contents/campaign.php (modified) (5 diffs)
• html/admin/contents/campaign_design.php (modified) (1 diff)

temp/branches/ec-cube-beta/data/conf/conf.php

@@ -26 +26 @@
 
 // ¥­¥ã¥ó¥Ú¡¼¥ó¥Õ¥¡¥¤¥ëÊݸÀè
-define("CAMPAIGN_DIR", "include/campaign/");
-define("CAMPAIGN_PATH", USER_PATH . CAMPAIGN_DIR);
+define("CAMPAIGN_TEMPLATE_DIR", "include/campaign/");
+define("CAMPAIGN_TEMPLATE_DIR", USER_PATH . CAMPAIGN_TEMPLATE_DIR);
 define("CAMPAIGN_TEMPLATE_ACTIVE", "active/");
 define("CAMPAIGN_TEMPLATE_END", "end/");

temp/branches/ec-cube-beta/html/admin/contents/campaign.php

@@ -169 +169 @@
 
         // Ʊ̾¤Î¥Õ¥©¥ë¥À¤¬Â¸ºß¤¹¤ë¾ì¹ç¤Ï¥¨¥é¡¼
-        if(file_exists(CAMPAIGN_PATH.$arrList['directory_name']) && $directory_name != $arrList['directory_name']) {
+        if(file_exists(CAMPAIGN_TEMPLATE_DIR.$arrList['directory_name']) && $directory_name != $arrList['directory_name']) {
             $objErr->arrErr['directory_name'] = "¢¨ Ʊ̾¤Î¥Ç¥£¥ì¥¯¥È¥ê¤¬¤¹¤Ç¤Ë¸ºß¤·¤Þ¤¹¡£<br/>";
         }
@@ -226 +226 @@
         $directory_name = $objQuery->get("dtb_campaign", "directory_name", "campaign_id = ?", array($campaign_id));
         // ¥Õ¥¡¥¤¥ë̾¤òÊѹ¹
-        $ret = @rename(CAMPAIGN_PATH . $directory_name , CAMPAIGN_PATH . $arrList['directory_name']);
+        $ret = @rename(CAMPAIGN_TEMPLATE_DIR . $directory_name , CAMPAIGN_TEMPLATE_DIR . $arrList['directory_name']);
 
         // update
@@ -234 +234 @@
 
         // ¥­¥ã¥ó¥Ú¡¼¥ó¥Ú¡¼¥¸¥Ç¥£¥ì¥¯¥È¥êºîÀ®
-        lfCreateTemplate(CAMPAIGN_PATH . $arrList['directory_name']);
+        lfCreateTemplate(CAMPAIGN_TEMPLATE_DIR . $arrList['directory_name']);
 
         $sqlval['create_date'] = "now()";   
@@ -293 +293 @@
     $directory_name = $objQuery->get("dtb_campaign", "directory_name", "campaign_id = ?", array($campaign_id));
     // ¥Õ¥¡¥¤¥ë¤òºï½ü
-    sfDeleteDir(CAMPAIGN_PATH . $directory_name);
+    sfDeleteDir(CAMPAIGN_TEMPLATE_DIR . $directory_name);
         
     $sqlval['del_flg'] = 1; 
@@ -313 +313 @@
     $ret = sfCreateFile($create_dir, 0755); 
     $ret = sfCreateFile($create_active_dir, 0755);  
-    $ret = sfCreateFile($create_end_dir, 0755); 
+    $ret = sfCreateFile($create_end_dir, 0755);
+    // ¥­¥ã¥ó¥Ú¡¼¥ó¼Â¹ÔPHP¤ò¥³¥Ô¡¼
+    copy();
     // ¥Ç¥Õ¥©¥ë¥È¥Æ¥ó¥×¥ì¡¼¥ÈºîÀ®(¥­¥ã¥ó¥Ú¡¼¥óÃæ)
     sfWriteFile("", $create_active_dir."header.tpl", "w");

temp/branches/ec-cube-beta/html/admin/contents/campaign_design.php

@@ -58 +58 @@
 $directory_name = $objQuery->get("dtb_campaign", "directory_name", "campaign_id = ?", array($arrForm['campaign_id']));
 // ¥­¥ã¥ó¥Ú¡¼¥ó¥Æ¥ó¥×¥ì¡¼¥È³ÊǼ¥Ç¥£¥ì¥¯¥È¥ê
-$campaign_dir = CAMPAIGN_PATH . $directory_name . "/" .$status;
+$campaign_dir = CAMPAIGN_TEMPLATE_DIR . $directory_name . "/" .$status;
 
 switch($_POST['mode']) {