Changeset 10834 for temp/branches

Timestamp:

2006/12/17 21:35:15 (19 years ago)

Author:

uehara

Message:

 

File:

• temp/branches/ec-cube-beta/html/admin/contents/campaign.php (modified) (6 diffs)

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

@@ -145 +145 @@
  * Ìá¤êÃÍ¡§¥¨¥é¡¼Ê¸»ú³ÊǼÇÛÎó
  */
-function lfErrorCheck($campaign_id = 0) {
+function lfErrorCheck($campaign_id = "") {
     
     global $objQuery;
@@ -160 +160 @@
     if(count($objErr->arrErr) <= 0) {
 
-        $directory_name = $objQuery->get("dtb_campaign", "directory_name", "campaign_id = ?", array($campaign_id));
-
+        // ÊÔ½¸»þÍѤ˸µ¤Î¥Ç¥£¥ì¥¯¥È¥ê̾¤ò¼èÆÀ¤¹¤ë¡£
+        if($campaign_id != "") {
+            $directory_name = $objQuery->get("dtb_campaign", "directory_name", "campaign_id = ?", array($campaign_id));
+        } else {
+            $directory_name = "";
+        }
         // Ʊ̾¤Î¥Õ¥©¥ë¥À¤¬Â¸ºß¤¹¤ë¾ì¹ç¤Ï¥¨¥é¡¼
         if(file_exists(CAMPAIGN_PATH.$arrList['directory_name'] && $directory_name != $arrList['directory_name'])) {
@@ -170 +174 @@
         if($ret != "" && $directory_name != $arrList['directory_name']) {
             $objErr->arrErr['directory_name'] = "¢¨ ¤¹¤Ç¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥È¥ê̾¤Ç¤¹¡£<br/>";
-        }       
+        }
     }
     
@@ -217 +221 @@
     if($campaign_id != "") {
         // update
-        $objQuery->update("dtb_campaign", $sqlval, "campaign_id = ?", array($campaign_id));     
+        $objQuery->update("dtb_campaign", $sqlval, "campaign_id = ?", array($campaign_id)); 
+
+        // ¸µ¤Î¥Ç¥£¥ì¥¯¥È¥ê̾¤ò¼èÆÀ̾       
+        $directory_name = $objQuery->get("dtb_campaign", "directory_name", "campaign_id = ?", array($campaign_id));
+        // ¥Õ¥¡¥¤¥ë̾¤òÊѹ¹
+        $ret = @rename(CAMPAIGN_PATH . $directory_name , CAMPAIGN_PATH . $arrList['directory_name']);
         
     } else {
@@ -225 +234 @@
         
         // ¥­¥ã¥ó¥Ú¡¼¥ó¥Ú¡¼¥¸¥Ç¥£¥ì¥¯¥È¥êºîÀ®
-        $ret = lfCreateDir(CAMPAIGN_PATH . $arrList['directory_name']);     
+        $ret = sfCreateFile(CAMPAIGN_PATH . $arrList['directory_name'], $dir_name, 0755);       
     }
 }
@@ -284 +293 @@
 }
 
-/* 
- * ´Ø¿ô̾¡§lsCreateDir()
- * °ú¿ô1 ¡§¥Ç¥£¥ì¥¯¥È¥ê̾
- * ÀâÌÀ¡¡¡§¥Ç¥£¥ì¥¯¥È¥êºîÀ®
- * Ìá¤êÃÍ¡§¥¨¥é¡¼¥Õ¥é¥°(¼ºÇԤʤé true À®¸ù¤Ê¤é¡¡false)
- */
-function lfCreateDir($dir_name) {
-    
-    $ret = sfCreateFile($dir_name, 0755);
-    
-    return $ret;
-}
-
 ?>