From f653aea37230a2ef8e23ba742dcf3fdaa29c8fa1 Mon Sep 17 00:00:00 2001
From: ovclas <ovclas@gmail.com>
Date: Mon, 16 Jul 2012 02:16:52 +0000
Subject: [PATCH] issue 1522 when copy layout, change resource file path in
 layout.html, layout.css file

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10898 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/layout/layout.admin.controller.php    | 21 ++++++++++++++-----
 .../layout/tpl/layout_all_instance_list.html  |  2 ++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/modules/layout/layout.admin.controller.php b/modules/layout/layout.admin.controller.php
index f2f8ceb53..bd8c0bee8 100644
--- a/modules/layout/layout.admin.controller.php
+++ b/modules/layout/layout.admin.controller.php
@@ -698,7 +698,7 @@
 
 			$sourceImagePath = $oLayoutModel->getUserLayoutImagePath($sourceLayoutSrl);
 			$targetImagePath = $oLayoutModel->getUserLayoutImagePath($targetLayoutSrl);
-			FileHandler::makeDir($targetimagePath);
+			FileHandler::makeDir($targetImagePath);
 
 			$sourceFileList = $oLayoutModel->getUserLayoutFileList($sourceLayoutSrl);
 			foreach($sourceFileList as $key => $file)
@@ -706,13 +706,24 @@
 				if(is_readable($sourceLayoutPath.$file))
 				{
 					FileHandler::copyFile($sourceLayoutPath.$file, $targetLayoutPath.$file);
+					if($file == 'layout.html' || $file == 'layout.css')
+					{
+						$this->_changeFilepathInSource($targetLayoutPath.$file, $sourceImagePath, $targetImagePath);
+					}
 				}
 			}
+		}
 
-			/*$sourceImageFiles = FileHandler::readDir($sourceImagePath);
-			if(is_array($sourceImageFiles))
-			{
-			}*/
+		/**
+		 * Change resource file path in Layout file
+		 * @param string $file
+		 * @return void
+		 */
+		function _changeFilepathInSource($file, $source, $target)
+		{
+			$content = FileHandler::readFile($file);
+			$content = str_replace($source, $target, $content);
+			FileHandler::writeFile($file, $content);
 		}
 
         /**
diff --git a/modules/layout/tpl/layout_all_instance_list.html b/modules/layout/tpl/layout_all_instance_list.html
index 0646fc43c..b7a3d2ab1 100644
--- a/modules/layout/tpl/layout_all_instance_list.html
+++ b/modules/layout/tpl/layout_all_instance_list.html
@@ -17,6 +17,7 @@
 				<th scope="col" class="nowr">{$lang->regdate}</th>
 				<th scope="col" class="nowr">{$lang->cmd_layout_management}</th>
 				<th scope="col" class="nowr">{$lang->cmd_layout_edit}</th>
+				<th scope="col" class="nowr">{$lang->cmd_copy}</th>
 				<th scope="col" class="nowr">{$lang->cmd_delete}</th>
 			</tr>
 		</thead>
@@ -32,6 +33,7 @@
 				<td class="nowr">{zdate($item->regdate, "Y-m-d")}</td>
 				<td class="nowr"><a href="{getUrl('act', 'dispLayoutAdminModify', 'layout_srl', $item->layout_srl)}">{$lang->cmd_layout_management}</a></td>
 				<td class="nowr"><a href="{getUrl('act', 'dispLayoutAdminEdit', 'layout_srl', $item->layout_srl)}">{$lang->cmd_layout_edit}</a></td>
+				<td class="nowr"><a href="{getUrl('', 'module', 'layout', 'act', 'dispLayoutAdminCopyLayout', 'layout_srl', $item->layout_srl)}" onclick="popopen(this.href);return false;" title="{$lang->cmd_copy}">{$lang->cmd_copy}</a></td>
 				<td class="nowr">
 					<form class="layout_delete_form" ruleset="deleteLayout" action="./" method="post">
 						<input type="hidden" name="module" value="layout" />