• R/O
  • SSH
  • HTTPS

risoluto: Commit


Commit MetaInfo

Revision327 (tree)
Time2012-04-06 15:54:41
Authoryuta_hayakawa

Log Message

バグ修正

Change Summary

Incremental Difference

--- trunk/upgrade/simplepage/page01.php (revision 326)
+++ trunk/upgrade/simplepage/page01.php (revision 327)
@@ -100,6 +100,11 @@
100100 , 'pass' => false
101101 )
102102 , array(
103+ 'path' => RISOLUTO_USERLAND . $this->target
104+ , 'stat' => 'writable'
105+ , 'pass' => true
106+ )
107+ , array(
103108 'path' => RISOLUTO_DOCROOT . '/js/' . $this->target . '_ckeditor.js'
104109 , 'stat' => 'writable'
105110 , 'pass' => ( !file_exists( $tmp_base . '/file/simplepage_ckeditor.js' ) ? true : false )
--- trunk/upgrade/simplepage/page05.php (revision 326)
+++ trunk/upgrade/simplepage/page05.php (revision 327)
@@ -90,7 +90,7 @@
9090 // 配置対象をセットする
9191 // 他に配置する対象があれば、この配列に加えてください。
9292 // target: 対象ファイル名 / destination: 配置先のパス/パーミッション/オーナ名/グループ名) /
93- // operation: 操作の内容(copy/move/unlink/mkdir/rmdir)
93+ // operation: 操作の内容(copy/copy_with_replace/move/unlink/mkdir/rmdir)
9494 clearstatcache();
9595 $tmp_base = RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' );
9696 $this->filelist = array(
@@ -97,163 +97,163 @@
9797 array(
9898 'target' => $tmp_base . '/file/simplepage_ckeditor.js'
9999 , 'destination' => RISOLUTO_DOCROOT . '/js/' . $this->target . '_ckeditor.js'
100- , 'operation' => 'copy'
100+ , 'operation' => 'copy_with_replace'
101101 , 'pass' => ( !file_exists( $tmp_base . '/file/simplepage_ckeditor.js' ) ? true : false )
102102 )
103103 , array(
104104 'target' => $tmp_base . '/file/simplepage_version'
105105 , 'destination' => RISOLUTO_CONF . $this->target . '_version'
106- , 'operation' => 'copy'
106+ , 'operation' => 'copy_with_replace'
107107 , 'pass' => ( !file_exists( $tmp_base . '/file/simplepage_version' ) ? true : false )
108108 )
109109 , array(
110110 'target' => $tmp_base . '/file/simplepage.ini'
111111 , 'destination' => RISOLUTO_CONF . $this->target . '.ini'
112- , 'operation' => 'copy'
112+ , 'operation' => 'copy_with_replace'
113113 , 'pass' => ( !file_exists( $tmp_base . '/file/simplepage.ini' ) ? true : false )
114114 )
115115 , array(
116116 'target' => $tmp_base . '/file/00004_simplepage.tpl'
117117 , 'destination' => RISOLUTO_USERLAND . 'admin/menu/00004_' . $this->target . '.tpl'
118- , 'operation' => 'copy'
118+ , 'operation' => 'copy_with_replace'
119119 , 'pass' => ( !file_exists( $tmp_base . '/file/00004_simplepage.tpl' ) ? true : false )
120120 )
121121 , array(
122122 'target' => $tmp_base . '/file/AUTHORS'
123123 , 'destination' => RISOLUTO_USERLAND . $this->target . '/AUTHORS'
124- , 'operation' => 'copy'
124+ , 'operation' => 'copy_with_replace'
125125 , 'pass' => ( !file_exists( $tmp_base . '/file/AUTHORS' ) ? true : false )
126126 )
127127 , array(
128128 'target' => $tmp_base . '/file/LICENSE'
129129 , 'destination' => RISOLUTO_USERLAND . $this->target . '/LICENSE'
130- , 'operation' => 'copy'
130+ , 'operation' => 'copy_with_replace'
131131 , 'pass' => ( !file_exists( $tmp_base . '/file/LICENSE' ) ? true : false )
132132 )
133133 , array(
134134 'target' => $tmp_base . '/file/pageadd_complete.php'
135135 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageadd_complete.php'
136- , 'operation' => 'copy'
136+ , 'operation' => 'copy_with_replace'
137137 , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_complete.php' ) ? true : false )
138138 )
139139 , array(
140140 'target' => $tmp_base . '/file/pageadd_complete.tpl'
141141 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageadd_complete.tpl'
142- , 'operation' => 'copy'
142+ , 'operation' => 'copy_with_replace'
143143 , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_complete.tpl' ) ? true : false )
144144 )
145145 , array(
146146 'target' => $tmp_base . '/file/pageadd_confirm.php'
147147 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageadd_confirm.php'
148- , 'operation' => 'copy'
148+ , 'operation' => 'copy_with_replace'
149149 , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_confirm.php' ) ? true : false )
150150 )
151151 , array(
152152 'target' => $tmp_base . '/file/pageadd_confirm.tpl'
153153 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageadd_confirm.tpl'
154- , 'operation' => 'copy'
154+ , 'operation' => 'copy_with_replace'
155155 , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_confirm.tpl' ) ? true : false )
156156 )
157157 , array(
158158 'target' => $tmp_base . '/file/pageadd_entry.php'
159159 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageadd_entry.php'
160- , 'operation' => 'copy'
160+ , 'operation' => 'copy_with_replace'
161161 , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_entry.php' ) ? true : false )
162162 )
163163 , array(
164164 'target' => $tmp_base . '/file/pageadd_entry.tpl'
165165 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageadd_entry.tpl'
166- , 'operation' => 'copy'
166+ , 'operation' => 'copy_with_replace'
167167 , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_entry.tpl' ) ? true : false )
168168 )
169169 , array(
170170 'target' => $tmp_base . '/file/pagedel_complete.php'
171171 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagedel_complete.php'
172- , 'operation' => 'copy'
172+ , 'operation' => 'copy_with_replace'
173173 , 'pass' => ( !file_exists( $tmp_base . '/file/pagedel_complete.php' ) ? true : false )
174174 )
175175 , array(
176176 'target' => $tmp_base . '/file/pagedel_complete.tpl'
177177 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagedel_complete.tpl'
178- , 'operation' => 'copy'
178+ , 'operation' => 'copy_with_replace'
179179 , 'pass' => ( !file_exists( $tmp_base . '/file/pagedel_complete.tpl' ) ? true : false )
180180 )
181181 , array(
182182 'target' => $tmp_base . '/file/pagedel_confirm.php'
183183 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagedel_confirm.php'
184- , 'operation' => 'copy'
184+ , 'operation' => 'copy_with_replace'
185185 , 'pass' => ( !file_exists( $tmp_base . '/file/pagedel_confirm.php' ) ? true : false )
186186 )
187187 , array(
188188 'target' => $tmp_base . '/file/pagedel_confirm.tpl'
189189 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagedel_confirm.tpl'
190- , 'operation' => 'copy'
190+ , 'operation' => 'copy_with_replace'
191191 , 'pass' => ( !file_exists( $tmp_base . '/file/pagedel_confirm.tpl' ) ? true : false )
192192 )
193193 , array(
194194 'target' => $tmp_base . '/file/pagelist.php'
195195 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagelist.php'
196- , 'operation' => 'copy'
196+ , 'operation' => 'copy_with_replace'
197197 , 'pass' => ( !file_exists( $tmp_base . '/file/pagelist.php' ) ? true : false )
198198 )
199199 , array(
200200 'target' => $tmp_base . '/file/pagelist.tpl'
201201 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagelist.tpl'
202- , 'operation' => 'copy'
202+ , 'operation' => 'copy_with_replace'
203203 , 'pass' => ( !file_exists( $tmp_base . '/file/pagelist.tpl' ) ? true : false )
204204 )
205205 , array(
206206 'target' => $tmp_base . '/file/pagemod_complete.php'
207207 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagemod_complete.php'
208- , 'operation' => 'copy'
208+ , 'operation' => 'copy_with_replace'
209209 , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_complete.php' ) ? true : false )
210210 )
211211 , array(
212212 'target' => $tmp_base . '/file/pagemod_complete.tpl'
213213 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagemod_complete.tpl'
214- , 'operation' => 'copy'
214+ , 'operation' => 'copy_with_replace'
215215 , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_complete.tpl' ) ? true : false )
216216 )
217217 , array(
218218 'target' => $tmp_base . '/file/pagemod_confirm.php'
219219 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagemod_confirm.php'
220- , 'operation' => 'copy'
220+ , 'operation' => 'copy_with_replace'
221221 , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_confirm.php' ) ? true : false )
222222 )
223223 , array(
224224 'target' => $tmp_base . '/file/pagemod_confirm.tpl'
225225 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagemod_confirm.tpl'
226- , 'operation' => 'copy'
226+ , 'operation' => 'copy_with_replace'
227227 , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_confirm.tpl' ) ? true : false )
228228 )
229229 , array(
230230 'target' => $tmp_base . '/file/pagemod_entry.php'
231231 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagemod_entry.php'
232- , 'operation' => 'copy'
232+ , 'operation' => 'copy_with_replace'
233233 , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_entry.php' ) ? true : false )
234234 )
235235 , array(
236236 'target' => $tmp_base . '/file/pagemod_entry.tpl'
237237 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagemod_entry.tpl'
238- , 'operation' => 'copy'
238+ , 'operation' => 'copy_with_replace'
239239 , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_entry.tpl' ) ? true : false )
240240 )
241241 , array(
242242 'target' => $tmp_base . '/file/pageview.php'
243243 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageview.php'
244- , 'operation' => 'copy'
244+ , 'operation' => 'copy_with_replace'
245245 , 'pass' => ( !file_exists( $tmp_base . '/file/pageview.php' ) ? true : false )
246246 )
247247 , array(
248248 'target' => $tmp_base . '/file/pageview.tpl'
249249 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageview.tpl'
250- , 'operation' => 'copy'
250+ , 'operation' => 'copy_with_replace'
251251 , 'pass' => ( !file_exists( $tmp_base . '/file/pageview.tpl' ) ? true : false )
252252 )
253253 , array(
254254 'target' => $tmp_base . '/file/simplepage_base.inc'
255255 , 'destination' => RISOLUTO_USERLAND . $this->target . '/simplepage_base.inc'
256- , 'operation' => 'copy'
256+ , 'operation' => 'copy_with_replace'
257257 , 'pass' => ( !file_exists( $tmp_base . '/file/simplepage_base.inc' ) ? true : false )
258258 )
259259 );
@@ -267,7 +267,7 @@
267267 } // end of if
268268
269269 // 処理を呼び出す
270- $tmp_errflag = $this->obj_util->fileOperator( $dat[ 'operation' ], $dat[ 'target' ], $dat[ 'destination' ] );
270+ $tmp_errflag = $this->obj_util->fileOperator( $dat[ 'operation' ], $dat[ 'target' ], $dat[ 'destination' ], $this->target );
271271
272272 // 処理結果によって、状態を変える
273273 if ( $tmp_errflag )
--- tags/upgrade_simplepage-1_2_0_to_simplepage-1_3_0/page01.php (revision 326)
+++ tags/upgrade_simplepage-1_2_0_to_simplepage-1_3_0/page01.php (revision 327)
@@ -100,6 +100,11 @@
100100 , 'pass' => false
101101 )
102102 , array(
103+ 'path' => RISOLUTO_USERLAND . $this->target
104+ , 'stat' => 'writable'
105+ , 'pass' => true
106+ )
107+ , array(
103108 'path' => RISOLUTO_DOCROOT . '/js/' . $this->target . '_ckeditor.js'
104109 , 'stat' => 'writable'
105110 , 'pass' => ( !file_exists( $tmp_base . '/file/simplepage_ckeditor.js' ) ? true : false )
--- tags/upgrade_simplepage-1_2_0_to_simplepage-1_3_0/page05.php (revision 326)
+++ tags/upgrade_simplepage-1_2_0_to_simplepage-1_3_0/page05.php (revision 327)
@@ -90,7 +90,7 @@
9090 // 配置対象をセットする
9191 // 他に配置する対象があれば、この配列に加えてください。
9292 // target: 対象ファイル名 / destination: 配置先のパス/パーミッション/オーナ名/グループ名) /
93- // operation: 操作の内容(copy/move/unlink/mkdir/rmdir)
93+ // operation: 操作の内容(copy/copy_with_replace/move/unlink/mkdir/rmdir)
9494 clearstatcache();
9595 $tmp_base = RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' );
9696 $this->filelist = array(
@@ -97,163 +97,163 @@
9797 array(
9898 'target' => $tmp_base . '/file/simplepage_ckeditor.js'
9999 , 'destination' => RISOLUTO_DOCROOT . '/js/' . $this->target . '_ckeditor.js'
100- , 'operation' => 'copy'
100+ , 'operation' => 'copy_with_replace'
101101 , 'pass' => ( !file_exists( $tmp_base . '/file/simplepage_ckeditor.js' ) ? true : false )
102102 )
103103 , array(
104104 'target' => $tmp_base . '/file/simplepage_version'
105105 , 'destination' => RISOLUTO_CONF . $this->target . '_version'
106- , 'operation' => 'copy'
106+ , 'operation' => 'copy_with_replace'
107107 , 'pass' => ( !file_exists( $tmp_base . '/file/simplepage_version' ) ? true : false )
108108 )
109109 , array(
110110 'target' => $tmp_base . '/file/simplepage.ini'
111111 , 'destination' => RISOLUTO_CONF . $this->target . '.ini'
112- , 'operation' => 'copy'
112+ , 'operation' => 'copy_with_replace'
113113 , 'pass' => ( !file_exists( $tmp_base . '/file/simplepage.ini' ) ? true : false )
114114 )
115115 , array(
116116 'target' => $tmp_base . '/file/00004_simplepage.tpl'
117117 , 'destination' => RISOLUTO_USERLAND . 'admin/menu/00004_' . $this->target . '.tpl'
118- , 'operation' => 'copy'
118+ , 'operation' => 'copy_with_replace'
119119 , 'pass' => ( !file_exists( $tmp_base . '/file/00004_simplepage.tpl' ) ? true : false )
120120 )
121121 , array(
122122 'target' => $tmp_base . '/file/AUTHORS'
123123 , 'destination' => RISOLUTO_USERLAND . $this->target . '/AUTHORS'
124- , 'operation' => 'copy'
124+ , 'operation' => 'copy_with_replace'
125125 , 'pass' => ( !file_exists( $tmp_base . '/file/AUTHORS' ) ? true : false )
126126 )
127127 , array(
128128 'target' => $tmp_base . '/file/LICENSE'
129129 , 'destination' => RISOLUTO_USERLAND . $this->target . '/LICENSE'
130- , 'operation' => 'copy'
130+ , 'operation' => 'copy_with_replace'
131131 , 'pass' => ( !file_exists( $tmp_base . '/file/LICENSE' ) ? true : false )
132132 )
133133 , array(
134134 'target' => $tmp_base . '/file/pageadd_complete.php'
135135 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageadd_complete.php'
136- , 'operation' => 'copy'
136+ , 'operation' => 'copy_with_replace'
137137 , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_complete.php' ) ? true : false )
138138 )
139139 , array(
140140 'target' => $tmp_base . '/file/pageadd_complete.tpl'
141141 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageadd_complete.tpl'
142- , 'operation' => 'copy'
142+ , 'operation' => 'copy_with_replace'
143143 , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_complete.tpl' ) ? true : false )
144144 )
145145 , array(
146146 'target' => $tmp_base . '/file/pageadd_confirm.php'
147147 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageadd_confirm.php'
148- , 'operation' => 'copy'
148+ , 'operation' => 'copy_with_replace'
149149 , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_confirm.php' ) ? true : false )
150150 )
151151 , array(
152152 'target' => $tmp_base . '/file/pageadd_confirm.tpl'
153153 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageadd_confirm.tpl'
154- , 'operation' => 'copy'
154+ , 'operation' => 'copy_with_replace'
155155 , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_confirm.tpl' ) ? true : false )
156156 )
157157 , array(
158158 'target' => $tmp_base . '/file/pageadd_entry.php'
159159 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageadd_entry.php'
160- , 'operation' => 'copy'
160+ , 'operation' => 'copy_with_replace'
161161 , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_entry.php' ) ? true : false )
162162 )
163163 , array(
164164 'target' => $tmp_base . '/file/pageadd_entry.tpl'
165165 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageadd_entry.tpl'
166- , 'operation' => 'copy'
166+ , 'operation' => 'copy_with_replace'
167167 , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_entry.tpl' ) ? true : false )
168168 )
169169 , array(
170170 'target' => $tmp_base . '/file/pagedel_complete.php'
171171 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagedel_complete.php'
172- , 'operation' => 'copy'
172+ , 'operation' => 'copy_with_replace'
173173 , 'pass' => ( !file_exists( $tmp_base . '/file/pagedel_complete.php' ) ? true : false )
174174 )
175175 , array(
176176 'target' => $tmp_base . '/file/pagedel_complete.tpl'
177177 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagedel_complete.tpl'
178- , 'operation' => 'copy'
178+ , 'operation' => 'copy_with_replace'
179179 , 'pass' => ( !file_exists( $tmp_base . '/file/pagedel_complete.tpl' ) ? true : false )
180180 )
181181 , array(
182182 'target' => $tmp_base . '/file/pagedel_confirm.php'
183183 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagedel_confirm.php'
184- , 'operation' => 'copy'
184+ , 'operation' => 'copy_with_replace'
185185 , 'pass' => ( !file_exists( $tmp_base . '/file/pagedel_confirm.php' ) ? true : false )
186186 )
187187 , array(
188188 'target' => $tmp_base . '/file/pagedel_confirm.tpl'
189189 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagedel_confirm.tpl'
190- , 'operation' => 'copy'
190+ , 'operation' => 'copy_with_replace'
191191 , 'pass' => ( !file_exists( $tmp_base . '/file/pagedel_confirm.tpl' ) ? true : false )
192192 )
193193 , array(
194194 'target' => $tmp_base . '/file/pagelist.php'
195195 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagelist.php'
196- , 'operation' => 'copy'
196+ , 'operation' => 'copy_with_replace'
197197 , 'pass' => ( !file_exists( $tmp_base . '/file/pagelist.php' ) ? true : false )
198198 )
199199 , array(
200200 'target' => $tmp_base . '/file/pagelist.tpl'
201201 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagelist.tpl'
202- , 'operation' => 'copy'
202+ , 'operation' => 'copy_with_replace'
203203 , 'pass' => ( !file_exists( $tmp_base . '/file/pagelist.tpl' ) ? true : false )
204204 )
205205 , array(
206206 'target' => $tmp_base . '/file/pagemod_complete.php'
207207 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagemod_complete.php'
208- , 'operation' => 'copy'
208+ , 'operation' => 'copy_with_replace'
209209 , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_complete.php' ) ? true : false )
210210 )
211211 , array(
212212 'target' => $tmp_base . '/file/pagemod_complete.tpl'
213213 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagemod_complete.tpl'
214- , 'operation' => 'copy'
214+ , 'operation' => 'copy_with_replace'
215215 , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_complete.tpl' ) ? true : false )
216216 )
217217 , array(
218218 'target' => $tmp_base . '/file/pagemod_confirm.php'
219219 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagemod_confirm.php'
220- , 'operation' => 'copy'
220+ , 'operation' => 'copy_with_replace'
221221 , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_confirm.php' ) ? true : false )
222222 )
223223 , array(
224224 'target' => $tmp_base . '/file/pagemod_confirm.tpl'
225225 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagemod_confirm.tpl'
226- , 'operation' => 'copy'
226+ , 'operation' => 'copy_with_replace'
227227 , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_confirm.tpl' ) ? true : false )
228228 )
229229 , array(
230230 'target' => $tmp_base . '/file/pagemod_entry.php'
231231 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagemod_entry.php'
232- , 'operation' => 'copy'
232+ , 'operation' => 'copy_with_replace'
233233 , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_entry.php' ) ? true : false )
234234 )
235235 , array(
236236 'target' => $tmp_base . '/file/pagemod_entry.tpl'
237237 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagemod_entry.tpl'
238- , 'operation' => 'copy'
238+ , 'operation' => 'copy_with_replace'
239239 , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_entry.tpl' ) ? true : false )
240240 )
241241 , array(
242242 'target' => $tmp_base . '/file/pageview.php'
243243 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageview.php'
244- , 'operation' => 'copy'
244+ , 'operation' => 'copy_with_replace'
245245 , 'pass' => ( !file_exists( $tmp_base . '/file/pageview.php' ) ? true : false )
246246 )
247247 , array(
248248 'target' => $tmp_base . '/file/pageview.tpl'
249249 , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageview.tpl'
250- , 'operation' => 'copy'
250+ , 'operation' => 'copy_with_replace'
251251 , 'pass' => ( !file_exists( $tmp_base . '/file/pageview.tpl' ) ? true : false )
252252 )
253253 , array(
254254 'target' => $tmp_base . '/file/simplepage_base.inc'
255255 , 'destination' => RISOLUTO_USERLAND . $this->target . '/simplepage_base.inc'
256- , 'operation' => 'copy'
256+ , 'operation' => 'copy_with_replace'
257257 , 'pass' => ( !file_exists( $tmp_base . '/file/simplepage_base.inc' ) ? true : false )
258258 )
259259 );
@@ -267,7 +267,7 @@
267267 } // end of if
268268
269269 // 処理を呼び出す
270- $tmp_errflag = $this->obj_util->fileOperator( $dat[ 'operation' ], $dat[ 'target' ], $dat[ 'destination' ] );
270+ $tmp_errflag = $this->obj_util->fileOperator( $dat[ 'operation' ], $dat[ 'target' ], $dat[ 'destination' ], $this->target );
271271
272272 // 処理結果によって、状態を変える
273273 if ( $tmp_errflag )
Show on old repository browser