• R/O
  • SSH
  • HTTPS

risoluto: Commit


Commit MetaInfo

Revision326 (tree)
Time2012-04-06 15:51:59
Authoryuta_hayakawa

Log Message

バグ修正

Change Summary

Incremental Difference

--- trunk/upgrade/simpleblog/page01.php (revision 325)
+++ trunk/upgrade/simpleblog/page01.php (revision 326)
@@ -100,11 +100,26 @@
100100 , 'pass' => false
101101 )
102102 , array(
103+ 'path' => RISOLUTO_USERLAND . $this->target
104+ , 'stat' => 'writable'
105+ , 'pass' => false
106+ )
107+ , array(
103108 'path' => RISOLUTO_DOCROOT . '/js/' . $this->target . '_ckeditor.js'
104109 , 'stat' => 'writable'
105110 , 'pass' => ( !file_exists( $tmp_base . '/file/simpleblog_ckeditor.js' ) ? true : false )
106111 )
107112 , array(
113+ 'path' => RISOLUTO_BATCH . $this->target . '_posttweet.php'
114+ , 'stat' => 'writable'
115+ , 'pass' => ( !file_exists( $tmp_base . '/file/simpleblog_posttweet.php' ) ? true : false )
116+ )
117+ , array(
118+ 'path' => RISOLUTO_BATCH . $this->target . '_posttweet.tpl'
119+ , 'stat' => 'writable'
120+ , 'pass' => ( !file_exists( $tmp_base . '/file/simpleblog_posttweet.tpl' ) ? true : false )
121+ )
122+ , array(
108123 'path' => RISOLUTO_CONF . $this->target . '_version'
109124 , 'stat' => 'writable'
110125 , 'pass' => ( !file_exists( $tmp_base . '/file/simpleblog_version' ) ? true : false )
@@ -129,12 +144,14 @@
129144 , 'stat' => 'writable'
130145 , 'pass' => ( !file_exists( $tmp_base . '/file/LICENSE' ) ? true : false )
131146 )
147+// ToDo: UNCOMMENT HERE for next release
148+// , array(
149+// 'path' => RISOLUTO_USERLAND . $this->target . '/blog_menubar.tpl'
150+// , 'stat' => 'writable'
151+// , 'pass' => ( !file_exists( $tmp_base . '/file/blog_menubar.tpl' ) ? true : false )
152+// )
153+// ToDo: UNCOMMENT HERE for next release
132154 , array(
133- 'path' => RISOLUTO_USERLAND . $this->target . '/blog_menubar.tpl'
134- , 'stat' => 'writable'
135- , 'pass' => ( !file_exists( $tmp_base . '/file/blog_menubar.tpl' ) ? true : false )
136- )
137- , array(
138155 'path' => RISOLUTO_USERLAND . $this->target . '/blogadd_complete.php'
139156 , 'stat' => 'writable'
140157 , 'pass' => ( !file_exists( $tmp_base . '/file/blogadd_complete.php' ) ? true : false )
@@ -244,97 +261,99 @@
244261 , 'stat' => 'writable'
245262 , 'pass' => ( !file_exists( $tmp_base . '/file/blogview.tpl' ) ? true : false )
246263 )
264+// ToDo: UNCOMMENT HERE for next release
265+// , array(
266+// 'path' => RISOLUTO_USERLAND . $this->target . '/categoryadd_complete.php'
267+// , 'stat' => 'writable'
268+// , 'pass' => ( !file_exists( $tmp_base . '/file/categoryadd_complete.php' ) ? true : false )
269+// )
270+// , array(
271+// 'path' => RISOLUTO_USERLAND . $this->target . '/categoryadd_complete.tpl'
272+// , 'stat' => 'writable'
273+// , 'pass' => ( !file_exists( $tmp_base . '/file/categoryadd_complete.tpl' ) ? true : false )
274+// )
275+// , array(
276+// 'path' => RISOLUTO_USERLAND . $this->target . '/categoryadd_confirm.php'
277+// , 'stat' => 'writable'
278+// , 'pass' => ( !file_exists( $tmp_base . '/file/categoryadd_confirm.php' ) ? true : false )
279+// )
280+// , array(
281+// 'path' => RISOLUTO_USERLAND . $this->target . '/categoryadd_confirm.tpl'
282+// , 'stat' => 'writable'
283+// , 'pass' => ( !file_exists( $tmp_base . '/file/categoryadd_confirm.tpl' ) ? true : false )
284+// )
285+// , array(
286+// 'path' => RISOLUTO_USERLAND . $this->target . '/categoryadd_entry.php'
287+// , 'stat' => 'writable'
288+// , 'pass' => ( !file_exists( $tmp_base . '/file/categoryadd_entry.php' ) ? true : false )
289+// )
290+// , array(
291+// 'path' => RISOLUTO_USERLAND . $this->target . '/categoryadd_entry.tpl'
292+// , 'stat' => 'writable'
293+// , 'pass' => ( !file_exists( $tmp_base . '/file/categoryadd_entry.tpl' ) ? true : false )
294+// )
295+// , array(
296+// 'path' => RISOLUTO_USERLAND . $this->target . '/categorydel_complete.php'
297+// , 'stat' => 'writable'
298+// , 'pass' => ( !file_exists( $tmp_base . '/file/categorydel_complete.php' ) ? true : false )
299+// )
300+// , array(
301+// 'path' => RISOLUTO_USERLAND . $this->target . '/categorydel_complete.tpl'
302+// , 'stat' => 'writable'
303+// , 'pass' => ( !file_exists( $tmp_base . '/file/categorydel_complete.tpl' ) ? true : false )
304+// )
305+// , array(
306+// 'path' => RISOLUTO_USERLAND . $this->target . '/categorydel_confirm.php'
307+// , 'stat' => 'writable'
308+// , 'pass' => ( !file_exists( $tmp_base . '/file/categorydel_confirm.php' ) ? true : false )
309+// )
310+// , array(
311+// 'path' => RISOLUTO_USERLAND . $this->target . '/categorydel_confirm.tpl'
312+// , 'stat' => 'writable'
313+// , 'pass' => ( !file_exists( $tmp_base . '/file/categorydel_confirm.tpl' ) ? true : false )
314+// )
315+// , array(
316+// 'path' => RISOLUTO_USERLAND . $this->target . '/categorylist.php'
317+// , 'stat' => 'writable'
318+// , 'pass' => ( !file_exists( $tmp_base . '/file/categorylist.php' ) ? true : false )
319+// )
320+// , array(
321+// 'path' => RISOLUTO_USERLAND . $this->target . '/categorylist.tpl'
322+// , 'stat' => 'writable'
323+// , 'pass' => ( !file_exists( $tmp_base . '/file/categorylist.tpl' ) ? true : false )
324+// )
325+// , array(
326+// 'path' => RISOLUTO_USERLAND . $this->target . '/categorymod_complete.php'
327+// , 'stat' => 'writable'
328+// , 'pass' => ( !file_exists( $tmp_base . '/file/categorymod_complete.php' ) ? true : false )
329+// )
330+// , array(
331+// 'path' => RISOLUTO_USERLAND . $this->target . '/categorymod_complete.tpl'
332+// , 'stat' => 'writable'
333+// , 'pass' => ( !file_exists( $tmp_base . '/file/categorymod_complete.tpl' ) ? true : false )
334+// )
335+// , array(
336+// 'path' => RISOLUTO_USERLAND . $this->target . '/categorymod_confirm.php'
337+// , 'stat' => 'writable'
338+// , 'pass' => ( !file_exists( $tmp_base . '/file/categorymod_confirm.php' ) ? true : false )
339+// )
340+// , array(
341+// 'path' => RISOLUTO_USERLAND . $this->target . '/categorymod_confirm.tpl'
342+// , 'stat' => 'writable'
343+// , 'pass' => ( !file_exists( $tmp_base . '/file/categorymod_confirm.tpl' ) ? true : false )
344+// )
345+// , array(
346+// 'path' => RISOLUTO_USERLAND . $this->target . '/categorymod_entry.php'
347+// , 'stat' => 'writable'
348+// , 'pass' => ( !file_exists( $tmp_base . '/file/categorymod_entry.php' ) ? true : false )
349+// )
350+// , array(
351+// 'path' => RISOLUTO_USERLAND . $this->target . '/categorymod_entry.tpl'
352+// , 'stat' => 'writable'
353+// , 'pass' => ( !file_exists( $tmp_base . '/file/categorymod_entry.tpl' ) ? true : false )
354+// )
355+// ToDo: UNCOMMENT HERE for next release
247356 , array(
248- 'path' => RISOLUTO_USERLAND . $this->target . '/categoryadd_complete.php'
249- , 'stat' => 'writable'
250- , 'pass' => ( !file_exists( $tmp_base . '/file/categoryadd_complete.php' ) ? true : false )
251- )
252- , array(
253- 'path' => RISOLUTO_USERLAND . $this->target . '/categoryadd_complete.tpl'
254- , 'stat' => 'writable'
255- , 'pass' => ( !file_exists( $tmp_base . '/file/categoryadd_complete.tpl' ) ? true : false )
256- )
257- , array(
258- 'path' => RISOLUTO_USERLAND . $this->target . '/categoryadd_confirm.php'
259- , 'stat' => 'writable'
260- , 'pass' => ( !file_exists( $tmp_base . '/file/categoryadd_confirm.php' ) ? true : false )
261- )
262- , array(
263- 'path' => RISOLUTO_USERLAND . $this->target . '/categoryadd_confirm.tpl'
264- , 'stat' => 'writable'
265- , 'pass' => ( !file_exists( $tmp_base . '/file/categoryadd_confirm.tpl' ) ? true : false )
266- )
267- , array(
268- 'path' => RISOLUTO_USERLAND . $this->target . '/categoryadd_entry.php'
269- , 'stat' => 'writable'
270- , 'pass' => ( !file_exists( $tmp_base . '/file/categoryadd_entry.php' ) ? true : false )
271- )
272- , array(
273- 'path' => RISOLUTO_USERLAND . $this->target . '/categoryadd_entry.tpl'
274- , 'stat' => 'writable'
275- , 'pass' => ( !file_exists( $tmp_base . '/file/categoryadd_entry.tpl' ) ? true : false )
276- )
277- , array(
278- 'path' => RISOLUTO_USERLAND . $this->target . '/categorydel_complete.php'
279- , 'stat' => 'writable'
280- , 'pass' => ( !file_exists( $tmp_base . '/file/categorydel_complete.php' ) ? true : false )
281- )
282- , array(
283- 'path' => RISOLUTO_USERLAND . $this->target . '/categorydel_complete.tpl'
284- , 'stat' => 'writable'
285- , 'pass' => ( !file_exists( $tmp_base . '/file/categorydel_complete.tpl' ) ? true : false )
286- )
287- , array(
288- 'path' => RISOLUTO_USERLAND . $this->target . '/categorydel_confirm.php'
289- , 'stat' => 'writable'
290- , 'pass' => ( !file_exists( $tmp_base . '/file/categorydel_confirm.php' ) ? true : false )
291- )
292- , array(
293- 'path' => RISOLUTO_USERLAND . $this->target . '/categorydel_confirm.tpl'
294- , 'stat' => 'writable'
295- , 'pass' => ( !file_exists( $tmp_base . '/file/categorydel_confirm.tpl' ) ? true : false )
296- )
297- , array(
298- 'path' => RISOLUTO_USERLAND . $this->target . '/categorylist.php'
299- , 'stat' => 'writable'
300- , 'pass' => ( !file_exists( $tmp_base . '/file/categorylist.php' ) ? true : false )
301- )
302- , array(
303- 'path' => RISOLUTO_USERLAND . $this->target . '/categorylist.tpl'
304- , 'stat' => 'writable'
305- , 'pass' => ( !file_exists( $tmp_base . '/file/categorylist.tpl' ) ? true : false )
306- )
307- , array(
308- 'path' => RISOLUTO_USERLAND . $this->target . '/categorymod_complete.php'
309- , 'stat' => 'writable'
310- , 'pass' => ( !file_exists( $tmp_base . '/file/categorymod_complete.php' ) ? true : false )
311- )
312- , array(
313- 'path' => RISOLUTO_USERLAND . $this->target . '/categorymod_complete.tpl'
314- , 'stat' => 'writable'
315- , 'pass' => ( !file_exists( $tmp_base . '/file/categorymod_complete.tpl' ) ? true : false )
316- )
317- , array(
318- 'path' => RISOLUTO_USERLAND . $this->target . '/categorymod_confirm.php'
319- , 'stat' => 'writable'
320- , 'pass' => ( !file_exists( $tmp_base . '/file/categorymod_confirm.php' ) ? true : false )
321- )
322- , array(
323- 'path' => RISOLUTO_USERLAND . $this->target . '/categorymod_confirm.tpl'
324- , 'stat' => 'writable'
325- , 'pass' => ( !file_exists( $tmp_base . '/file/categorymod_confirm.tpl' ) ? true : false )
326- )
327- , array(
328- 'path' => RISOLUTO_USERLAND . $this->target . '/categorymod_entry.php'
329- , 'stat' => 'writable'
330- , 'pass' => ( !file_exists( $tmp_base . '/file/categorymod_entry.php' ) ? true : false )
331- )
332- , array(
333- 'path' => RISOLUTO_USERLAND . $this->target . '/categorymod_entry.tpl'
334- , 'stat' => 'writable'
335- , 'pass' => ( !file_exists( $tmp_base . '/file/categorymod_entry.tpl' ) ? true : false )
336- )
337- , array(
338357 'path' => RISOLUTO_USERLAND . $this->target . '/comment_add.php'
339358 , 'stat' => 'writable'
340359 , 'pass' => ( !file_exists( $tmp_base . '/file/comment_add.php' ) ? true : false )
@@ -384,27 +403,19 @@
384403 , 'stat' => 'writable'
385404 , 'pass' => ( !file_exists( $tmp_base . '/file/rss_2.0.tpl' ) ? true : false )
386405 )
406+// ToDo: UNCOMMENT HERE for next release
407+// , array(
408+// 'path' => RISOLUTO_USERLAND . $this->target . '/rss_2.0_ya.tpl'
409+// , 'stat' => 'writable'
410+// , 'pass' => ( !file_exists( $tmp_base . '/file/rss_2.0_ya.tpl' ) ? true : false )
411+// )
412+// ToDo: UNCOMMENT HERE for next release
387413 , array(
388- 'path' => RISOLUTO_USERLAND . $this->target . '/rss_2.0_ya.tpl'
389- , 'stat' => 'writable'
390- , 'pass' => ( !file_exists( $tmp_base . '/file/rss_2.0_ya.tpl' ) ? true : false )
391- )
392- , array(
393414 'path' => RISOLUTO_USERLAND . $this->target . '/simpleblog_base.inc'
394415 , 'stat' => 'writable'
395416 , 'pass' => ( !file_exists( $tmp_base . '/file/simpleblog_base.inc' ) ? true : false )
396417 )
397418 , array(
398- 'path' => RISOLUTO_USERLAND . $this->target . '/simpleblog_posttweet.php'
399- , 'stat' => 'writable'
400- , 'pass' => ( !file_exists( $tmp_base . '/file/simpleblog_posttweet.php' ) ? true : false )
401- )
402- , array(
403- 'path' => RISOLUTO_USERLAND . $this->target . '/simpleblog_posttweet.tpl'
404- , 'stat' => 'writable'
405- , 'pass' => ( !file_exists( $tmp_base . '/file/simpleblog_posttweet.tpl' ) ? true : false )
406- )
407- , array(
408419 'path' => RISOLUTO_USERLAND . $this->target . '/tb.php'
409420 , 'stat' => 'writable'
410421 , 'pass' => ( !file_exists( $tmp_base . '/file/tb.php' ) ? true : false )
--- trunk/upgrade/simpleblog/page04.php (revision 325)
+++ trunk/upgrade/simpleblog/page04.php (revision 326)
@@ -152,7 +152,7 @@
152152 if ( $this->obj_db->dbConnect( $this->obj_conf->get( $dat[ 'section' ], $dat[ 'key' ] ) ) )
153153 {
154154
155- $tmp_errflag = $this->obj_db->fileSQLExec( $dat[ 'path' ] );
155+ $tmp_errflag = $this->obj_db->fileSQLExec( $dat[ 'path' ], $this->target );
156156
157157 // 接続に成功している場合は接続をクローズする
158158 $this->obj_db->dbDisConnect();
--- trunk/upgrade/simpleblog/page05.php (revision 325)
+++ trunk/upgrade/simpleblog/page05.php (revision 326)
@@ -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,421 +97,421 @@
9797 array(
9898 'target' => $tmp_base . '/file/simpleblog_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/simpleblog_ckeditor.js' ) ? true : false )
102102 )
103103 , array(
104+ 'target' => $tmp_base . '/file/simpleblog_posttweet.php'
105+ , 'destination' => RISOLUTO_BATCH . $this->target . '_posttweet.php'
106+ , 'operation' => 'copy_with_replace'
107+ , 'pass' => ( !file_exists( $tmp_base . '/file/simpleblog_posttweet.php' ) ? true : false )
108+ )
109+ , array(
110+ 'target' => $tmp_base . '/file/simpleblog_posttweet.tpl'
111+ , 'destination' => RISOLUTO_BATCH . $this->target . '_posttweet.tpl'
112+ , 'operation' => 'copy_with_replace'
113+ , 'pass' => ( !file_exists( $tmp_base . '/file/simpleblog_posttweet.tpl' ) ? true : false )
114+ )
115+ , array(
104116 'target' => $tmp_base . '/file/simpleblog_version'
105117 , 'destination' => RISOLUTO_CONF . $this->target . '_version'
106- , 'operation' => 'copy'
118+ , 'operation' => 'copy_with_replace'
107119 , 'pass' => ( !file_exists( $tmp_base . '/file/simpleblog_version' ) ? true : false )
108120 )
109121 , array(
110122 'target' => $tmp_base . '/file/simpleblog.ini'
111123 , 'destination' => RISOLUTO_CONF . $this->target . '.ini'
112- , 'operation' => 'copy'
124+ , 'operation' => 'copy_with_replace'
113125 , 'pass' => ( !file_exists( $tmp_base . '/file/simpleblog.ini' ) ? true : false )
114126 )
115127 , array(
116128 'target' => $tmp_base . '/file/00005_simpleblog.tpl'
117129 , 'destination' => RISOLUTO_USERLAND . 'admin/menu/00005_' . $this->target . '.tpl'
118- , 'operation' => 'copy'
130+ , 'operation' => 'copy_with_replace'
119131 , 'pass' => ( !file_exists( $tmp_base . '/file/00005_simpleblog.tpl' ) ? true : false )
120132 )
121133 , array(
122134 'target' => $tmp_base . '/file/AUTHORS'
123135 , 'destination' => RISOLUTO_USERLAND . $this->target . '/AUTHORS'
124- , 'operation' => 'copy'
136+ , 'operation' => 'copy_with_replace'
125137 , 'pass' => ( !file_exists( $tmp_base . '/file/AUTHORS' ) ? true : false )
126138 )
127139 , array(
128140 'target' => $tmp_base . '/file/LICENSE'
129141 , 'destination' => RISOLUTO_USERLAND . $this->target . '/LICENSE'
130- , 'operation' => 'copy'
142+ , 'operation' => 'copy_with_replace'
131143 , 'pass' => ( !file_exists( $tmp_base . '/file/LICENSE' ) ? true : false )
132144 )
133145 , array(
134146 'target' => $tmp_base . '/file/blog_menubar.tpl'
135147 , 'destination' => RISOLUTO_USERLAND . $this->target . '/blog_menubar.tpl'
136- , 'operation' => 'copy'
148+ , 'operation' => 'copy_with_replace'
137149 , 'pass' => ( !file_exists( $tmp_base . '/file/blog_menubar.tpl' ) ? true : false )
138150 )
139151 , array(
140152 'target' => $tmp_base . '/file/blogadd_complete.php'
141153 , 'destination' => RISOLUTO_USERLAND . $this->target . '/blogadd_complete.php'
142- , 'operation' => 'copy'
154+ , 'operation' => 'copy_with_replace'
143155 , 'pass' => ( !file_exists( $tmp_base . '/file/blogadd_complete.php' ) ? true : false )
144156 )
145157 , array(
146158 'target' => $tmp_base . '/file/blogadd_complete.tpl'
147159 , 'destination' => RISOLUTO_USERLAND . $this->target . '/blogadd_complete.tpl'
148- , 'operation' => 'copy'
160+ , 'operation' => 'copy_with_replace'
149161 , 'pass' => ( !file_exists( $tmp_base . '/file/blogadd_complete.tpl' ) ? true : false )
150162 )
151163 , array(
152164 'target' => $tmp_base . '/file/blogadd_confirm.php'
153165 , 'destination' => RISOLUTO_USERLAND . $this->target . '/blogadd_confirm.php'
154- , 'operation' => 'copy'
166+ , 'operation' => 'copy_with_replace'
155167 , 'pass' => ( !file_exists( $tmp_base . '/file/blogadd_confirm.php' ) ? true : false )
156168 )
157169 , array(
158170 'target' => $tmp_base . '/file/blogadd_confirm.tpl'
159171 , 'destination' => RISOLUTO_USERLAND . $this->target . '/blogadd_confirm.tpl'
160- , 'operation' => 'copy'
172+ , 'operation' => 'copy_with_replace'
161173 , 'pass' => ( !file_exists( $tmp_base . '/file/blogadd_confirm.tpl' ) ? true : false )
162174 )
163175 , array(
164176 'target' => $tmp_base . '/file/blogadd_entry.php'
165177 , 'destination' => RISOLUTO_USERLAND . $this->target . '/blogadd_entry.php'
166- , 'operation' => 'copy'
178+ , 'operation' => 'copy_with_replace'
167179 , 'pass' => ( !file_exists( $tmp_base . '/file/blogadd_entry.php' ) ? true : false )
168180 )
169181 , array(
170182 'target' => $tmp_base . '/file/blogadd_entry.tpl'
171183 , 'destination' => RISOLUTO_USERLAND . $this->target . '/blogadd_entry.tpl'
172- , 'operation' => 'copy'
184+ , 'operation' => 'copy_with_replace'
173185 , 'pass' => ( !file_exists( $tmp_base . '/file/blogadd_entry.tpl' ) ? true : false )
174186 )
175187 , array(
176188 'target' => $tmp_base . '/file/blogcomment.php'
177189 , 'destination' => RISOLUTO_USERLAND . $this->target . '/blogcomment.php'
178- , 'operation' => 'copy'
190+ , 'operation' => 'copy_with_replace'
179191 , 'pass' => ( !file_exists( $tmp_base . '/file/blogcomment.php' ) ? true : false )
180192 )
181193 , array(
182194 'target' => $tmp_base . '/file/blogcomment.tpl'
183195 , 'destination' => RISOLUTO_USERLAND . $this->target . '/blogcomment.tpl'
184- , 'operation' => 'copy'
196+ , 'operation' => 'copy_with_replace'
185197 , 'pass' => ( !file_exists( $tmp_base . '/file/blogcomment.tpl' ) ? true : false )
186198 )
187199 , array(
188200 'target' => $tmp_base . '/file/blogdel_complete.php'
189201 , 'destination' => RISOLUTO_USERLAND . $this->target . '/blogdel_complete.php'
190- , 'operation' => 'copy'
202+ , 'operation' => 'copy_with_replace'
191203 , 'pass' => ( !file_exists( $tmp_base . '/file/blogdel_complete.php' ) ? true : false )
192204 )
193205 , array(
194206 'target' => $tmp_base . '/file/blogdel_complete.tpl'
195207 , 'destination' => RISOLUTO_USERLAND . $this->target . '/blogdel_complete.tpl'
196- , 'operation' => 'copy'
208+ , 'operation' => 'copy_with_replace'
197209 , 'pass' => ( !file_exists( $tmp_base . '/file/blogdel_complete.tpl' ) ? true : false )
198210 )
199211 , array(
200212 'target' => $tmp_base . '/file/blogdel_confirm.php'
201213 , 'destination' => RISOLUTO_USERLAND . $this->target . '/blogdel_confirm.php'
202- , 'operation' => 'copy'
214+ , 'operation' => 'copy_with_replace'
203215 , 'pass' => ( !file_exists( $tmp_base . '/file/blogdel_confirm.php' ) ? true : false )
204216 )
205217 , array(
206218 'target' => $tmp_base . '/file/blogdel_confirm.tpl'
207219 , 'destination' => RISOLUTO_USERLAND . $this->target . '/blogdel_confirm.tpl'
208- , 'operation' => 'copy'
220+ , 'operation' => 'copy_with_replace'
209221 , 'pass' => ( !file_exists( $tmp_base . '/file/blogdel_confirm.tpl' ) ? true : false )
210222 )
211223 , array(
212224 'target' => $tmp_base . '/file/bloglist.php'
213225 , 'destination' => RISOLUTO_USERLAND . $this->target . '/bloglist.php'
214- , 'operation' => 'copy'
226+ , 'operation' => 'copy_with_replace'
215227 , 'pass' => ( !file_exists( $tmp_base . '/file/bloglist.php' ) ? true : false )
216228 )
217229 , array(
218230 'target' => $tmp_base . '/file/bloglist.tpl'
219231 , 'destination' => RISOLUTO_USERLAND . $this->target . '/bloglist.tpl'
220- , 'operation' => 'copy'
232+ , 'operation' => 'copy_with_replace'
221233 , 'pass' => ( !file_exists( $tmp_base . '/file/bloglist.tpl' ) ? true : false )
222234 )
223235 , array(
224236 'target' => $tmp_base . '/file/blogmod_complete.php'
225237 , 'destination' => RISOLUTO_USERLAND . $this->target . '/blogmod_complete.php'
226- , 'operation' => 'copy'
238+ , 'operation' => 'copy_with_replace'
227239 , 'pass' => ( !file_exists( $tmp_base . '/file/blogmod_complete.php' ) ? true : false )
228240 )
229241 , array(
230242 'target' => $tmp_base . '/file/blogmod_complete.tpl'
231243 , 'destination' => RISOLUTO_USERLAND . $this->target . '/blogmod_complete.tpl'
232- , 'operation' => 'copy'
244+ , 'operation' => 'copy_with_replace'
233245 , 'pass' => ( !file_exists( $tmp_base . '/file/blogmod_complete.tpl' ) ? true : false )
234246 )
235247 , array(
236248 'target' => $tmp_base . '/file/blogmod_confirm.php'
237249 , 'destination' => RISOLUTO_USERLAND . $this->target . '/blogmod_confirm.php'
238- , 'operation' => 'copy'
250+ , 'operation' => 'copy_with_replace'
239251 , 'pass' => ( !file_exists( $tmp_base . '/file/blogmod_confirm.php' ) ? true : false )
240252 )
241253 , array(
242254 'target' => $tmp_base . '/file/blogmod_confirm.tpl'
243255 , 'destination' => RISOLUTO_USERLAND . $this->target . '/blogmod_confirm.tpl'
244- , 'operation' => 'copy'
256+ , 'operation' => 'copy_with_replace'
245257 , 'pass' => ( !file_exists( $tmp_base . '/file/blogmod_confirm.tpl' ) ? true : false )
246258 )
247259 , array(
248260 'target' => $tmp_base . '/file/blogmod_entry.php'
249261 , 'destination' => RISOLUTO_USERLAND . $this->target . '/blogmod_entry.php'
250- , 'operation' => 'copy'
262+ , 'operation' => 'copy_with_replace'
251263 , 'pass' => ( !file_exists( $tmp_base . '/file/blogmod_entry.php' ) ? true : false )
252264 )
253265 , array(
254266 'target' => $tmp_base . '/file/blogmod_entry.tpl'
255267 , 'destination' => RISOLUTO_USERLAND . $this->target . '/blogmod_entry.tpl'
256- , 'operation' => 'copy'
268+ , 'operation' => 'copy_with_replace'
257269 , 'pass' => ( !file_exists( $tmp_base . '/file/blogmod_entry.tpl' ) ? true : false )
258270 )
259271 , array(
260272 'target' => $tmp_base . '/file/blogview.php'
261273 , 'destination' => RISOLUTO_USERLAND . $this->target . '/blogview.php'
262- , 'operation' => 'copy'
274+ , 'operation' => 'copy_with_replace'
263275 , 'pass' => ( !file_exists( $tmp_base . '/file/blogview.php' ) ? true : false )
264276 )
265277 , array(
266278 'target' => $tmp_base . '/file/blogview.tpl'
267279 , 'destination' => RISOLUTO_USERLAND . $this->target . '/blogview.tpl'
268- , 'operation' => 'copy'
280+ , 'operation' => 'copy_with_replace'
269281 , 'pass' => ( !file_exists( $tmp_base . '/file/blogview.tpl' ) ? true : false )
270282 )
271283 , array(
272284 'target' => $tmp_base . '/file/blogview.php'
273285 , 'destination' => RISOLUTO_USERLAND . $this->target . '/blogview.php'
274- , 'operation' => 'copy'
286+ , 'operation' => 'copy_with_replace'
275287 , 'pass' => ( !file_exists( $tmp_base . '/file/blogview.php' ) ? true : false )
276288 )
277289 , array(
278290 'target' => $tmp_base . '/file/categoryadd_complete.tpl'
279291 , 'destination' => RISOLUTO_USERLAND . $this->target . '/categoryadd_complete.tpl'
280- , 'operation' => 'copy'
292+ , 'operation' => 'copy_with_replace'
281293 , 'pass' => ( !file_exists( $tmp_base . '/file/categoryadd_complete.tpl' ) ? true : false )
282294 )
283295 , array(
284296 'target' => $tmp_base . '/file/categoryadd_complete.php'
285297 , 'destination' => RISOLUTO_USERLAND . $this->target . '/categoryadd_complete.php'
286- , 'operation' => 'copy'
298+ , 'operation' => 'copy_with_replace'
287299 , 'pass' => ( !file_exists( $tmp_base . '/file/categoryadd_complete.php' ) ? true : false )
288300 )
289301 , array(
290302 'target' => $tmp_base . '/file/categoryadd_confirm.tpl'
291303 , 'destination' => RISOLUTO_USERLAND . $this->target . '/categoryadd_confirm.tpl'
292- , 'operation' => 'copy'
304+ , 'operation' => 'copy_with_replace'
293305 , 'pass' => ( !file_exists( $tmp_base . '/file/categoryadd_confirm.tpl' ) ? true : false )
294306 )
295307 , array(
296308 'target' => $tmp_base . '/file/categoryadd_confirm.php'
297309 , 'destination' => RISOLUTO_USERLAND . $this->target . '/categoryadd_confirm.php'
298- , 'operation' => 'copy'
310+ , 'operation' => 'copy_with_replace'
299311 , 'pass' => ( !file_exists( $tmp_base . '/file/categoryadd_confirm.php' ) ? true : false )
300312 )
301313 , array(
302314 'target' => $tmp_base . '/file/categoryadd_entry.tpl'
303315 , 'destination' => RISOLUTO_USERLAND . $this->target . '/categoryadd_entry.tpl'
304- , 'operation' => 'copy'
316+ , 'operation' => 'copy_with_replace'
305317 , 'pass' => ( !file_exists( $tmp_base . '/file/categoryadd_entry.tpl' ) ? true : false )
306318 )
307319 , array(
308320 'target' => $tmp_base . '/file/categoryadd_entry.php'
309321 , 'destination' => RISOLUTO_USERLAND . $this->target . '/categoryadd_entry.php'
310- , 'operation' => 'copy'
322+ , 'operation' => 'copy_with_replace'
311323 , 'pass' => ( !file_exists( $tmp_base . '/file/categoryadd_entry.php' ) ? true : false )
312324 )
313325 , array(
314326 'target' => $tmp_base . '/file/categorydel_complete.tpl'
315327 , 'destination' => RISOLUTO_USERLAND . $this->target . '/categorydel_complete.tpl'
316- , 'operation' => 'copy'
328+ , 'operation' => 'copy_with_replace'
317329 , 'pass' => ( !file_exists( $tmp_base . '/file/categorydel_complete.tpl' ) ? true : false )
318330 )
319331 , array(
320332 'target' => $tmp_base . '/file/categorydel_complete.php'
321333 , 'destination' => RISOLUTO_USERLAND . $this->target . '/categorydel_complete.php'
322- , 'operation' => 'copy'
334+ , 'operation' => 'copy_with_replace'
323335 , 'pass' => ( !file_exists( $tmp_base . '/file/categorydel_complete.php' ) ? true : false )
324336 )
325337 , array(
326338 'target' => $tmp_base . '/file/categorydel_confirm.tpl'
327339 , 'destination' => RISOLUTO_USERLAND . $this->target . '/categorydel_confirm.tpl'
328- , 'operation' => 'copy'
340+ , 'operation' => 'copy_with_replace'
329341 , 'pass' => ( !file_exists( $tmp_base . '/file/categorydel_confirm.tpl' ) ? true : false )
330342 )
331343 , array(
332344 'target' => $tmp_base . '/file/categorydel_confirm.php'
333345 , 'destination' => RISOLUTO_USERLAND . $this->target . '/categorydel_confirm.php'
334- , 'operation' => 'copy'
346+ , 'operation' => 'copy_with_replace'
335347 , 'pass' => ( !file_exists( $tmp_base . '/file/categorydel_confirm.php' ) ? true : false )
336348 )
337349 , array(
338350 'target' => $tmp_base . '/file/categorylist.tpl'
339351 , 'destination' => RISOLUTO_USERLAND . $this->target . '/categorylist.tpl'
340- , 'operation' => 'copy'
352+ , 'operation' => 'copy_with_replace'
341353 , 'pass' => ( !file_exists( $tmp_base . '/file/categorylist.tpl' ) ? true : false )
342354 )
343355 , array(
344356 'target' => $tmp_base . '/file/categorylist.php'
345357 , 'destination' => RISOLUTO_USERLAND . $this->target . '/categorylist.php'
346- , 'operation' => 'copy'
358+ , 'operation' => 'copy_with_replace'
347359 , 'pass' => ( !file_exists( $tmp_base . '/file/categorylist.php' ) ? true : false )
348360 )
349361 , array(
350362 'target' => $tmp_base . '/file/categorymod_complete.tpl'
351363 , 'destination' => RISOLUTO_USERLAND . $this->target . '/categorymod_complete.tpl'
352- , 'operation' => 'copy'
364+ , 'operation' => 'copy_with_replace'
353365 , 'pass' => ( !file_exists( $tmp_base . '/file/categorymod_complete.tpl' ) ? true : false )
354366 )
355367 , array(
356368 'target' => $tmp_base . '/file/categorymod_complete.php'
357369 , 'destination' => RISOLUTO_USERLAND . $this->target . '/categorymod_complete.php'
358- , 'operation' => 'copy'
370+ , 'operation' => 'copy_with_replace'
359371 , 'pass' => ( !file_exists( $tmp_base . '/file/categorymod_complete.php' ) ? true : false )
360372 )
361373 , array(
362374 'target' => $tmp_base . '/file/categorymod_confirm.tpl'
363375 , 'destination' => RISOLUTO_USERLAND . $this->target . '/categorymod_confirm.tpl'
364- , 'operation' => 'copy'
376+ , 'operation' => 'copy_with_replace'
365377 , 'pass' => ( !file_exists( $tmp_base . '/file/categorymod_confirm.tpl' ) ? true : false )
366378 )
367379 , array(
368380 'target' => $tmp_base . '/file/categorymod_confirm.php'
369381 , 'destination' => RISOLUTO_USERLAND . $this->target . '/categorymod_confirm.php'
370- , 'operation' => 'copy'
382+ , 'operation' => 'copy_with_replace'
371383 , 'pass' => ( !file_exists( $tmp_base . '/file/categorymod_confirm.php' ) ? true : false )
372384 )
373385 , array(
374386 'target' => $tmp_base . '/file/categorymod_entry.tpl'
375387 , 'destination' => RISOLUTO_USERLAND . $this->target . '/categorymod_entry.tpl'
376- , 'operation' => 'copy'
388+ , 'operation' => 'copy_with_replace'
377389 , 'pass' => ( !file_exists( $tmp_base . '/file/categorymod_entry.tpl' ) ? true : false )
378390 )
379391 , array(
380392 'target' => $tmp_base . '/file/categorymod_entry.php'
381393 , 'destination' => RISOLUTO_USERLAND . $this->target . '/categorymod_entry.php'
382- , 'operation' => 'copy'
394+ , 'operation' => 'copy_with_replace'
383395 , 'pass' => ( !file_exists( $tmp_base . '/file/categorymod_entry.php' ) ? true : false )
384396 )
385397 , array(
386398 'target' => $tmp_base . '/file/blogview.tpl'
387399 , 'destination' => RISOLUTO_USERLAND . $this->target . '/blogview.tpl'
388- , 'operation' => 'copy'
400+ , 'operation' => 'copy_with_replace'
389401 , 'pass' => ( !file_exists( $tmp_base . '/file/blogview.tpl' ) ? true : false )
390402 )
391403 , array(
392404 'target' => $tmp_base . '/file/comment_add.php'
393405 , 'destination' => RISOLUTO_USERLAND . $this->target . '/comment_add.php'
394- , 'operation' => 'copy'
406+ , 'operation' => 'copy_with_replace'
395407 , 'pass' => ( !file_exists( $tmp_base . '/file/comment_add.php' ) ? true : false )
396408 )
397409 , array(
398410 'target' => $tmp_base . '/file/comment_del.php'
399411 , 'destination' => RISOLUTO_USERLAND . $this->target . '/comment_del.php'
400- , 'operation' => 'copy'
412+ , 'operation' => 'copy_with_replace'
401413 , 'pass' => ( !file_exists( $tmp_base . '/file/comment_del.php' ) ? true : false )
402414 )
403415 , array(
404416 'target' => $tmp_base . '/file/comment_ng.php'
405417 , 'destination' => RISOLUTO_USERLAND . $this->target . '/comment_ng.php'
406- , 'operation' => 'copy'
418+ , 'operation' => 'copy_with_replace'
407419 , 'pass' => ( !file_exists( $tmp_base . '/file/comment_ng.php' ) ? true : false )
408420 )
409421 , array(
410422 'target' => $tmp_base . '/file/comment_notification.tpl'
411423 , 'destination' => RISOLUTO_USERLAND . $this->target . '/comment_notification.tpl'
412- , 'operation' => 'copy'
424+ , 'operation' => 'copy_with_replace'
413425 , 'pass' => ( !file_exists( $tmp_base . '/file/comment_notification.tpl' ) ? true : false )
414426 )
415427 , array(
416428 'target' => $tmp_base . '/file/comment_ok.php'
417429 , 'destination' => RISOLUTO_USERLAND . $this->target . '/comment_ok.php'
418- , 'operation' => 'copy'
430+ , 'operation' => 'copy_with_replace'
419431 , 'pass' => ( !file_exists( $tmp_base . '/file/comment_ok.php' ) ? true : false )
420432 )
421433 , array(
422434 'target' => $tmp_base . '/file/commentlist.php'
423435 , 'destination' => RISOLUTO_USERLAND . $this->target . '/commentlist.php'
424- , 'operation' => 'copy'
436+ , 'operation' => 'copy_with_replace'
425437 , 'pass' => ( !file_exists( $tmp_base . '/file/commentlist.php' ) ? true : false )
426438 )
427439 , array(
428440 'target' => $tmp_base . '/file/commentlist.tpl'
429441 , 'destination' => RISOLUTO_USERLAND . $this->target . '/commentlist.tpl'
430- , 'operation' => 'copy'
442+ , 'operation' => 'copy_with_replace'
431443 , 'pass' => ( !file_exists( $tmp_base . '/file/commentlist.tpl' ) ? true : false )
432444 )
433445 , array(
434446 'target' => $tmp_base . '/file/rss.php'
435447 , 'destination' => RISOLUTO_USERLAND . $this->target . '/rss.php'
436- , 'operation' => 'copy'
448+ , 'operation' => 'copy_with_replace'
437449 , 'pass' => ( !file_exists( $tmp_base . '/file/rss.php' ) ? true : false )
438450 )
439451 , array(
440452 'target' => $tmp_base . '/file/rss_1.0.tpl'
441453 , 'destination' => RISOLUTO_USERLAND . $this->target . '/rss_1.0.tpl'
442- , 'operation' => 'copy'
454+ , 'operation' => 'copy_with_replace'
443455 , 'pass' => ( !file_exists( $tmp_base . '/file/rss_1.0.tpl' ) ? true : false )
444456 )
445457 , array(
446458 'target' => $tmp_base . '/file/rss_2.0.tpl'
447459 , 'destination' => RISOLUTO_USERLAND . $this->target . '/rss_2.0.tpl'
448- , 'operation' => 'copy'
460+ , 'operation' => 'copy_with_replace'
449461 , 'pass' => ( !file_exists( $tmp_base . '/file/rss_2.0.tpl' ) ? true : false )
450462 )
451463 , array(
452464 'target' => $tmp_base . '/file/rss_2.0_ya.tpl'
453465 , 'destination' => RISOLUTO_USERLAND . $this->target . '/rss_2.0_ya.tpl'
454- , 'operation' => 'copy'
466+ , 'operation' => 'copy_with_replace'
455467 , 'pass' => ( !file_exists( $tmp_base . '/file/rss_2.0_ya.tpl' ) ? true : false )
456468 )
457469 , array(
458470 'target' => $tmp_base . '/file/simpleblog_base.inc'
459471 , 'destination' => RISOLUTO_USERLAND . $this->target . '/simpleblog_base.inc'
460- , 'operation' => 'copy'
472+ , 'operation' => 'copy_with_replace'
461473 , 'pass' => ( !file_exists( $tmp_base . '/file/simpleblog_base.inc' ) ? true : false )
462474 )
463475 , array(
464- 'target' => $tmp_base . '/file/simpleblog_posttweet.php'
465- , 'destination' => RISOLUTO_USERLAND . $this->target . '/simpleblog_posttweet.php'
466- , 'operation' => 'copy'
467- , 'pass' => ( !file_exists( $tmp_base . '/file/simpleblog_posttweet.php' ) ? true : false )
468- )
469- , array(
470- 'target' => $tmp_base . '/file/simpleblog_posttweet.tpl'
471- , 'destination' => RISOLUTO_USERLAND . $this->target . '/simpleblog_posttweet.tpl'
472- , 'operation' => 'copy'
473- , 'pass' => ( !file_exists( $tmp_base . '/file/simpleblog_posttweet.tpl' ) ? true : false )
474- )
475- , array(
476476 'target' => $tmp_base . '/file/tb.php'
477477 , 'destination' => RISOLUTO_USERLAND . $this->target . '/tb.php'
478- , 'operation' => 'copy'
478+ , 'operation' => 'copy_with_replace'
479479 , 'pass' => ( !file_exists( $tmp_base . '/file/tb.php' ) ? true : false )
480480 )
481481 , array(
482482 'target' => $tmp_base . '/file/trackback_del.php'
483483 , 'destination' => RISOLUTO_USERLAND . $this->target . '/trackback_del.php'
484- , 'operation' => 'copy'
484+ , 'operation' => 'copy_with_replace'
485485 , 'pass' => ( !file_exists( $tmp_base . '/file/trackback_del.php' ) ? true : false )
486486 )
487487 , array(
488488 'target' => $tmp_base . '/file/trackback_ng.php'
489489 , 'destination' => RISOLUTO_USERLAND . $this->target . '/trackback_ng.php'
490- , 'operation' => 'copy'
490+ , 'operation' => 'copy_with_replace'
491491 , 'pass' => ( !file_exists( $tmp_base . '/file/trackback_ng.php' ) ? true : false )
492492 )
493493 , array(
494494 'target' => $tmp_base . '/file/trackback_notification.tpl'
495495 , 'destination' => RISOLUTO_USERLAND . $this->target . '/trackback_notification.tpl'
496- , 'operation' => 'copy'
496+ , 'operation' => 'copy_with_replace'
497497 , 'pass' => ( !file_exists( $tmp_base . '/file/trackback_notification.tpl' ) ? true : false )
498498 )
499499 , array(
500500 'target' => $tmp_base . '/file/trackback_ok.php'
501501 , 'destination' => RISOLUTO_USERLAND . $this->target . '/trackback_ok.php'
502- , 'operation' => 'copy'
502+ , 'operation' => 'copy_with_replace'
503503 , 'pass' => ( !file_exists( $tmp_base . '/file/trackback_ok.php' ) ? true : false )
504504 )
505505 , array(
506506 'target' => $tmp_base . '/file/trackbacklist.php'
507507 , 'destination' => RISOLUTO_USERLAND . $this->target . '/trackbacklist.php'
508- , 'operation' => 'copy'
508+ , 'operation' => 'copy_with_replace'
509509 , 'pass' => ( !file_exists( $tmp_base . '/file/trackbacklist.php' ) ? true : false )
510510 )
511511 , array(
512512 'target' => $tmp_base . '/file/trackbacklist.tpl'
513513 , 'destination' => RISOLUTO_USERLAND . $this->target . '/trackbacklist.tpl'
514- , 'operation' => 'copy'
514+ , 'operation' => 'copy_with_replace'
515515 , 'pass' => ( !file_exists( $tmp_base . '/file/trackbacklist.tpl' ) ? true : false )
516516 )
517517 );
@@ -525,7 +525,7 @@
525525 } // end of if
526526
527527 // 処理を呼び出す
528- $tmp_errflag = $this->obj_util->fileOperator( $dat[ 'operation' ], $dat[ 'target' ], $dat[ 'destination' ] );
528+ $tmp_errflag = $this->obj_util->fileOperator( $dat[ 'operation' ], $dat[ 'target' ], $dat[ 'destination' ], $this->target );
529529
530530 // 処理結果によって、状態を変える
531531 if ( $tmp_errflag )
Show on old repository browser