• R/O
  • SSH
  • HTTPS

risoluto: Commit


Commit MetaInfo

Revision322 (tree)
Time2012-04-05 15:57:50
Authoryuta_hayakawa

Log Message

upgrade_simplepage-1_2_0_to_simplepage-1_3_0用コードに変更

Change Summary

Incremental Difference

--- trunk/upgrade/simplepage/LICENSE (revision 321)
+++ trunk/upgrade/simplepage/LICENSE (revision 322)
@@ -1,6 +1,6 @@
11 The BSD License
22
3-Copyright (c) 2008-2011, Risoluto Developers
3+Copyright (c) 2008-2012, Risoluto Developers
44 All rights reserved.
55
66 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
--- trunk/upgrade/simplepage/AUTHORS (revision 321)
+++ trunk/upgrade/simplepage/AUTHORS (revision 322)
@@ -1,10 +1,10 @@
11 [Core Members]
22
3-* Yuta Hayakawa <yuta_hayakawa@users.sourceforge.jp>
3+* Yuta Hayakawa <haya@risoluto.org>
44 - Project Manager
55 - Developer
66
7-* Shohei Wanibuchi<wanibuchi@users.sourceforge.jp>
7+* Shohei Wanibuchi<wanibuchi@risoluto.org>
88 - Developer
99 - Designer
1010
--- trunk/upgrade/simplepage/sql/upgrade_modify.sql (revision 321)
+++ trunk/upgrade/simplepage/sql/upgrade_modify.sql (revision 322)
@@ -0,0 +1,3 @@
1+ALTER TABLE [[[_PREFIX]]]_t_pages DROP `page_title`;
2+
3+ALTER TABLE [[[_PREFIX]]]_t_pages ADD `page_slug` VARCHAR( 255 ) AFTER `page_body`;
--- trunk/upgrade/simplepage/page01.php (revision 321)
+++ trunk/upgrade/simplepage/page01.php (revision 322)
@@ -7,7 +7,7 @@
77 * @package risoluto
88 * @author Risoluto Developers
99 * @license http://opensource.org/licenses/bsd-license.php new BSD license
10- * @copyright (C) 2008-2011 Risoluto Developers / All Rights Reserved.
10+ * @copyright (C) 2008-2012 Risoluto Developers / All Rights Reserved.
1111 */
1212
1313 /**
@@ -91,146 +91,148 @@
9191 // 他にチェック対象があれば、この配列に加えてください。
9292 // path: チェック対象となるパス / stat: あるべき状態(writable: 書込可 / readable: 読込可)
9393 // readableを指定したとき、その対象が書込可の場合はNGとなります
94+ clearstatcache();
95+ $tmp_base = RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' );
9496 $this->checklist = array(
9597 array(
96- 'path' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' )
98+ 'path' => $tmp_base
9799 , 'stat' => 'writable'
98- , 'pass' => true
100+ , 'pass' => false
99101 )
100102 , array(
101- 'path' => RISOLUTO_DOCROOT . '/js/simplepage_ckeditor_config.js'
103+ 'path' => RISOLUTO_DOCROOT . '/js/' . $this->target . '_ckeditor.js'
102104 , 'stat' => 'writable'
103- , 'pass' => true
105+ , 'pass' => ( !file_exists( $tmp_base . '/file/simplepage_ckeditor.js' ) ? true : false )
104106 )
105107 , array(
106- 'path' => RISOLUTO_CONF . 'simplepage_version'
108+ 'path' => RISOLUTO_CONF . $this->target . '_version'
107109 , 'stat' => 'writable'
108- , 'pass' => false
110+ , 'pass' => ( !file_exists( $tmp_base . '/file/simplepage_version' ) ? true : false )
109111 )
110112 , array(
111- 'path' => RISOLUTO_CONF . 'simplepage.ini'
113+ 'path' => RISOLUTO_CONF . $this->target . '.ini'
112114 , 'stat' => 'writable'
113- , 'pass' => true
115+ , 'pass' => ( !file_exists( $tmp_base . '/file/simplepage.ini' ) ? true : false )
114116 )
115117 , array(
116- 'path' => RISOLUTO_USERLAND . 'admin/menu/00004_simplepage.tpl'
118+ 'path' => RISOLUTO_USERLAND . 'admin/menu/00004_' . $this->target . '.tpl'
117119 , 'stat' => 'writable'
118- , 'pass' => true
120+ , 'pass' => ( !file_exists( $tmp_base . '/file/0004_simplepage.tpl' ) ? true : false )
119121 )
120122 , array(
121- 'path' => RISOLUTO_USERLAND . 'simplepage/AUTHORS'
123+ 'path' => RISOLUTO_USERLAND . $this->target . '/AUTHORS'
122124 , 'stat' => 'writable'
123- , 'pass' => true
125+ , 'pass' => ( !file_exists( $tmp_base . '/file/AUTHORS' ) ? true : false )
124126 )
125127 , array(
126- 'path' => RISOLUTO_USERLAND . 'simplepage/LICENSE'
128+ 'path' => RISOLUTO_USERLAND . $this->target . '/LICENSE'
127129 , 'stat' => 'writable'
128- , 'pass' => true
130+ , 'pass' => ( !file_exists( $tmp_base . '/file/LICENSE' ) ? true : false )
129131 )
130132 , array(
131- 'path' => RISOLUTO_USERLAND . 'simplepage/pageadd_complete.php'
133+ 'path' => RISOLUTO_USERLAND . $this->target . '/pageadd_complete.php'
132134 , 'stat' => 'writable'
133- , 'pass' => false
135+ , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_complete.php' ) ? true : false )
134136 )
135137 , array(
136- 'path' => RISOLUTO_USERLAND . 'simplepage/pageadd_complete.tpl'
138+ 'path' => RISOLUTO_USERLAND . $this->target . '/pageadd_complete.tpl'
137139 , 'stat' => 'writable'
138- , 'pass' => true
140+ , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_complete.tpl' ) ? true : false )
139141 )
140142 , array(
141- 'path' => RISOLUTO_USERLAND . 'simplepage/pageadd_confirm.php'
143+ 'path' => RISOLUTO_USERLAND . $this->target . '/pageadd_confirm.php'
142144 , 'stat' => 'writable'
143- , 'pass' => true
145+ , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_confirm.php' ) ? true : false )
144146 )
145147 , array(
146- 'path' => RISOLUTO_USERLAND . 'simplepage/pageadd_confirm.tpl'
148+ 'path' => RISOLUTO_USERLAND . $this->target . '/pageadd_confirm.tpl'
147149 , 'stat' => 'writable'
148- , 'pass' => true
150+ , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_confirm.tpl' ) ? true : false )
149151 )
150152 , array(
151- 'path' => RISOLUTO_USERLAND . 'simplepage/pageadd_entry.php'
153+ 'path' => RISOLUTO_USERLAND . $this->target . '/pageadd_entry.php'
152154 , 'stat' => 'writable'
153- , 'pass' => true
155+ , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_entry.php' ) ? true : false )
154156 )
155157 , array(
156- 'path' => RISOLUTO_USERLAND . 'simplepage/pageadd_entry.tpl'
158+ 'path' => RISOLUTO_USERLAND . $this->target . '/pageadd_entry.tpl'
157159 , 'stat' => 'writable'
158- , 'pass' => true
160+ , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_entry.tpl' ) ? true : false )
159161 )
160162 , array(
161- 'path' => RISOLUTO_USERLAND . 'simplepage/pagedel_complete.php'
163+ 'path' => RISOLUTO_USERLAND . $this->target . '/pagedel_complete.php'
162164 , 'stat' => 'writable'
163- , 'pass' => false
165+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagedel_complete.php' ) ? true : false )
164166 )
165167 , array(
166- 'path' => RISOLUTO_USERLAND . 'simplepage/pagedel_complete.tpl'
168+ 'path' => RISOLUTO_USERLAND . $this->target . '/pagedel_complete.tpl'
167169 , 'stat' => 'writable'
168- , 'pass' => true
170+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagedel_complete.tpl' ) ? true : false )
169171 )
170172 , array(
171- 'path' => RISOLUTO_USERLAND . 'simplepage/pagedel_confirm.php'
173+ 'path' => RISOLUTO_USERLAND . $this->target . '/pagedel_confirm.php'
172174 , 'stat' => 'writable'
173- , 'pass' => false
175+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagedel_confirm.php' ) ? true : false )
174176 )
175177 , array(
176- 'path' => RISOLUTO_USERLAND . 'simplepage/pagedel_confirm.tpl'
178+ 'path' => RISOLUTO_USERLAND . $this->target . '/pagedel_confirm.tpl'
177179 , 'stat' => 'writable'
178- , 'pass' => true
180+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagedel_confirm.tpl' ) ? true : false )
179181 )
180182 , array(
181- 'path' => RISOLUTO_USERLAND . 'simplepage/pagelist.php'
183+ 'path' => RISOLUTO_USERLAND . $this->target . '/pagelist.php'
182184 , 'stat' => 'writable'
183- , 'pass' => false
185+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagelist.php' ) ? true : false )
184186 )
185187 , array(
186- 'path' => RISOLUTO_USERLAND . 'simplepage/pagelist.tpl'
188+ 'path' => RISOLUTO_USERLAND . $this->target . '/pagelist.tpl'
187189 , 'stat' => 'writable'
188- , 'pass' => true
190+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagelist.tpl' ) ? true : false )
189191 )
190192 , array(
191- 'path' => RISOLUTO_USERLAND . 'simplepage/pagemod_complete.php'
193+ 'path' => RISOLUTO_USERLAND . $this->target . '/pagemod_complete.php'
192194 , 'stat' => 'writable'
193- , 'pass' => false
195+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_complete.php' ) ? true : false )
194196 )
195197 , array(
196- 'path' => RISOLUTO_USERLAND . 'simplepage/pagemod_complete.tpl'
198+ 'path' => RISOLUTO_USERLAND . $this->target . '/pagemod_complete.tpl'
197199 , 'stat' => 'writable'
198- , 'pass' => true
200+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_complete.tpl' ) ? true : false )
199201 )
200202 , array(
201- 'path' => RISOLUTO_USERLAND . 'simplepage/pagemod_confirm.php'
203+ 'path' => RISOLUTO_USERLAND . $this->target . '/pagemod_confirm.php'
202204 , 'stat' => 'writable'
203- , 'pass' => true
205+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_confirm.php' ) ? true : false )
204206 )
205207 , array(
206- 'path' => RISOLUTO_USERLAND . 'simplepage/pagemod_confirm.tpl'
208+ 'path' => RISOLUTO_USERLAND . $this->target . '/pagemod_confirm.tpl'
207209 , 'stat' => 'writable'
208- , 'pass' => true
210+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_confirm.tpl' ) ? true : false )
209211 )
210212 , array(
211- 'path' => RISOLUTO_USERLAND . 'simplepage/pagemod_entry.php'
213+ 'path' => RISOLUTO_USERLAND . $this->target . '/pagemod_entry.php'
212214 , 'stat' => 'writable'
213- , 'pass' => false
215+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_entry.php' ) ? true : false )
214216 )
215217 , array(
216- 'path' => RISOLUTO_USERLAND . 'simplepage/pagemod_entry.tpl'
218+ 'path' => RISOLUTO_USERLAND . $this->target . '/pagemod_entry.tpl'
217219 , 'stat' => 'writable'
218- , 'pass' => true
220+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_entry.tpl' ) ? true : false )
219221 )
220222 , array(
221- 'path' => RISOLUTO_USERLAND . 'simplepage/pageview.php'
223+ 'path' => RISOLUTO_USERLAND . $this->target . '/pageview.php'
222224 , 'stat' => 'writable'
223- , 'pass' => false
225+ , 'pass' => ( !file_exists( $tmp_base . '/file/pageview.php' ) ? true : false )
224226 )
225227 , array(
226- 'path' => RISOLUTO_USERLAND . 'simplepage/pageview.tpl'
228+ 'path' => RISOLUTO_USERLAND . $this->target . '/pageview.tpl'
227229 , 'stat' => 'writable'
228- , 'pass' => true
230+ , 'pass' => ( !file_exists( $tmp_base . '/file/pageview.tpl' ) ? true : false )
229231 )
230232 , array(
231- 'path' => RISOLUTO_USERLAND . 'simplepage/simplepage_base.inc'
233+ 'path' => RISOLUTO_USERLAND . $this->target . '/simplepage_base.inc'
232234 , 'stat' => 'writable'
233- , 'pass' => true
235+ , 'pass' => ( !file_exists( $tmp_base . '/file/simplepage_base.inc' ) ? true : false )
234236 )
235237 );
236238
--- trunk/upgrade/simplepage/target.txt (nonexistent)
+++ trunk/upgrade/simplepage/target.txt (revision 322)
@@ -0,0 +1 @@
1+simplepage
\ No newline at end of file
--- trunk/upgrade/simplepage/page02.php (revision 321)
+++ trunk/upgrade/simplepage/page02.php (revision 322)
@@ -7,7 +7,7 @@
77 * @package risoluto
88 * @author Risoluto Developers
99 * @license http://opensource.org/licenses/bsd-license.php new BSD license
10- * @copyright (C) 2008-2011 Risoluto Developers / All Rights Reserved.
10+ * @copyright (C) 2008-2012 Risoluto Developers / All Rights Reserved.
1111 */
1212
1313 /**
--- trunk/upgrade/simplepage/page03.php (revision 321)
+++ trunk/upgrade/simplepage/page03.php (revision 322)
@@ -7,7 +7,7 @@
77 * @package risoluto
88 * @author Risoluto Developers
99 * @license http://opensource.org/licenses/bsd-license.php new BSD license
10- * @copyright (C) 2008-2011 Risoluto Developers / All Rights Reserved.
10+ * @copyright (C) 2008-2012 Risoluto Developers / All Rights Reserved.
1111 */
1212
1313 /**
--- trunk/upgrade/simplepage/finish.php (revision 321)
+++ trunk/upgrade/simplepage/finish.php (revision 322)
@@ -7,7 +7,7 @@
77 * @package risoluto
88 * @author Risoluto Developers
99 * @license http://opensource.org/licenses/bsd-license.php new BSD license
10- * @copyright (C) 2008-2011 Risoluto Developers / All Rights Reserved.
10+ * @copyright (C) 2008-2012 Risoluto Developers / All Rights Reserved.
1111 */
1212
1313 /**
--- trunk/upgrade/simplepage/page04.php (revision 321)
+++ trunk/upgrade/simplepage/page04.php (revision 322)
@@ -7,7 +7,7 @@
77 * @package risoluto
88 * @author Risoluto Developers
99 * @license http://opensource.org/licenses/bsd-license.php new BSD license
10- * @copyright (C) 2008-2011 Risoluto Developers / All Rights Reserved.
10+ * @copyright (C) 2008-2012 Risoluto Developers / All Rights Reserved.
1111 */
1212
1313 /**
@@ -101,34 +101,36 @@
101101 // チェック対象となるDSNをセットする
102102 // 他にチェック対象があれば、この配列に加えてください。
103103 // section: セクション名 / key: キー名
104+ clearstatcache();
105+ $tmp_base = RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' );
104106 $this->checklist = array(
105107 array(
106108 'section' => 'DBS'
107109 , 'key' => 'DEFAULT_DSN'
108110 , 'description' => '既存テーブルの削除'
109- , 'path' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/sql/upgrade_drop.sql'
110- , 'pass' => true
111+ , 'path' => $tmp_base . '/sql/upgrade_drop.sql'
112+ , 'pass' => ( !file_exists( $tmp_base . '/sql/upgrade_drop.sql' ) or !filesize( $tmp_base . '/sql/upgrade_drop.sql' ) ? true : false )
111113 )
112114 , array(
113115 'section' => 'DBS'
114116 , 'key' => 'DEFAULT_DSN'
115117 , 'description' => 'テーブルの新規追加'
116- , 'path' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/sql/upgrade_create.sql'
117- , 'pass' => true
118+ , 'path' => $tmp_base . '/sql/upgrade_create.sql'
119+ , 'pass' => ( !file_exists( $tmp_base . '/sql/upgrade_create.sql' ) or !filesize( $tmp_base . '/sql/upgrade_create.sql' ) ? true : false )
118120 )
119121 , array(
120122 'section' => 'DBS'
121123 , 'key' => 'DEFAULT_DSN'
122124 , 'description' => '既存テーブルの変更'
123- , 'path' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/sql/upgrade_modify.sql'
124- , 'pass' => true
125+ , 'path' => $tmp_base . '/sql/upgrade_modify.sql'
126+ , 'pass' => ( !file_exists( $tmp_base . '/sql/upgrade_modify.sql' ) or !filesize( $tmp_base . '/sql/upgrade_modify.sql' ) ? true : false )
125127 )
126128 , array(
127129 'section' => 'DBS'
128130 , 'key' => 'DEFAULT_DSN'
129131 , 'description' => 'データの操作'
130- , 'path' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/sql/upgrade_data.sql'
131- , 'pass' => true
132+ , 'path' => $tmp_base . '/sql/upgrade_data.sql'
133+ , 'pass' => ( !file_exists( $tmp_base . '/sql/upgrade_data.sql' ) or !filesize( $tmp_base . '/sql/upgrade_data.sql' ) ? true : false )
132134 )
133135 );
134136
@@ -150,7 +152,7 @@
150152 if ( $this->obj_db->dbConnect( $this->obj_conf->get( $dat[ 'section' ], $dat[ 'key' ] ) ) )
151153 {
152154
153- $tmp_errflag = $this->obj_db->fileSQLExec( $dat[ 'path' ] );
155+ $tmp_errflag = $this->obj_db->fileSQLExec( $dat[ 'path' ], $this->target );
154156
155157 // 接続に成功している場合は接続をクローズする
156158 $this->obj_db->dbDisConnect();
--- trunk/upgrade/simplepage/page05.php (revision 321)
+++ trunk/upgrade/simplepage/page05.php (revision 322)
@@ -7,7 +7,7 @@
77 * @package risoluto
88 * @author Risoluto Developers
99 * @license http://opensource.org/licenses/bsd-license.php new BSD license
10- * @copyright (C) 2008-2011 Risoluto Developers / All Rights Reserved.
10+ * @copyright (C) 2008-2012 Risoluto Developers / All Rights Reserved.
1111 */
1212
1313 /**
@@ -91,168 +91,170 @@
9191 // 他に配置する対象があれば、この配列に加えてください。
9292 // target: 対象ファイル名 / destination: 配置先のパス/パーミッション/オーナ名/グループ名) /
9393 // operation: 操作の内容(copy/move/unlink/mkdir/rmdir)
94+ clearstatcache();
95+ $tmp_base = RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' );
9496 $this->filelist = array(
9597 array(
96- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/simplepage_ckeditor.js'
97- , 'destination' => RISOLUTO_DOCROOT . '/js/simplepage_ckeditor.js'
98+ 'target' => $tmp_base . '/file/simplepage_ckeditor.js'
99+ , 'destination' => RISOLUTO_DOCROOT . '/js/' . $this->target . '_ckeditor.js'
98100 , 'operation' => 'copy'
99- , 'pass' => true
101+ , 'pass' => ( !file_exists( $tmp_base . '/file/simplepage_ckeditor.js' ) ? true : false )
100102 )
101103 , array(
102- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/simplepage_version'
103- , 'destination' => RISOLUTO_CONF . 'simplepage_version'
104+ 'target' => $tmp_base . '/file/simplepage_version'
105+ , 'destination' => RISOLUTO_CONF . $this->target . '_version'
104106 , 'operation' => 'copy'
105- , 'pass' => false
107+ , 'pass' => ( !file_exists( $tmp_base . '/file/simplepage_version' ) ? true : false )
106108 )
107109 , array(
108- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/simplepage.ini'
109- , 'destination' => RISOLUTO_CONF . 'simplepage.ini'
110+ 'target' => $tmp_base . '/file/simplepage.ini'
111+ , 'destination' => RISOLUTO_CONF . $this->target . '.ini'
110112 , 'operation' => 'copy'
111- , 'pass' => true
113+ , 'pass' => ( !file_exists( $tmp_base . '/file/simplepage.ini' ) ? true : false )
112114 )
113115 , array(
114- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/00004_simplepage.tpl'
115- , 'destination' => RISOLUTO_USERLAND . 'admin/menu/00004_simplepage.tpl'
116+ 'target' => $tmp_base . '/file/00004_simplepage.tpl'
117+ , 'destination' => RISOLUTO_USERLAND . 'admin/menu/00004_' . $this->target . '.tpl'
116118 , 'operation' => 'copy'
117- , 'pass' => true
119+ , 'pass' => ( !file_exists( $tmp_base . '/file/0004_simplepage.tpl' ) ? true : false )
118120 )
119121 , array(
120- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/AUTHORS'
121- , 'destination' => RISOLUTO_USERLAND . 'simplepage/AUTHORS'
122+ 'target' => $tmp_base . '/file/AUTHORS'
123+ , 'destination' => RISOLUTO_USERLAND . $this->target . '/AUTHORS'
122124 , 'operation' => 'copy'
123- , 'pass' => true
125+ , 'pass' => ( !file_exists( $tmp_base . '/file/AUTHORS' ) ? true : false )
124126 )
125127 , array(
126- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/LICENSE'
127- , 'destination' => RISOLUTO_USERLAND . 'simplepage/LICENSE'
128+ 'target' => $tmp_base . '/file/LICENSE'
129+ , 'destination' => RISOLUTO_USERLAND . $this->target . '/LICENSE'
128130 , 'operation' => 'copy'
129- , 'pass' => true
131+ , 'pass' => ( !file_exists( $tmp_base . '/file/LICENSE' ) ? true : false )
130132 )
131133 , array(
132- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/pageadd_complete.php'
133- , 'destination' => RISOLUTO_USERLAND . 'simplepage/pageadd_complete.php'
134+ 'target' => $tmp_base . '/file/pageadd_complete.php'
135+ , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageadd_complete.php'
134136 , 'operation' => 'copy'
135- , 'pass' => false
137+ , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_complete.php' ) ? true : false )
136138 )
137139 , array(
138- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/pageadd_complete.tpl'
139- , 'destination' => RISOLUTO_USERLAND . 'simplepage/pageadd_complete.tpl'
140+ 'target' => $tmp_base . '/file/pageadd_complete.tpl'
141+ , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageadd_complete.tpl'
140142 , 'operation' => 'copy'
141- , 'pass' => true
143+ , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_complete.tpl' ) ? true : false )
142144 )
143145 , array(
144- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/pageadd_confirm.php'
145- , 'destination' => RISOLUTO_USERLAND . 'simplepage/pageadd_confirm.php'
146+ 'target' => $tmp_base . '/file/pageadd_confirm.php'
147+ , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageadd_confirm.php'
146148 , 'operation' => 'copy'
147- , 'pass' => true
149+ , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_confirm.php' ) ? true : false )
148150 )
149151 , array(
150- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/pageadd_confirm.tpl'
151- , 'destination' => RISOLUTO_USERLAND . 'simplepage/pageadd_confirm.tpl'
152+ 'target' => $tmp_base . '/file/pageadd_confirm.tpl'
153+ , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageadd_confirm.tpl'
152154 , 'operation' => 'copy'
153- , 'pass' => true
155+ , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_confirm.tpl' ) ? true : false )
154156 )
155157 , array(
156- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/pageadd_entry.php'
157- , 'destination' => RISOLUTO_USERLAND . 'simplepage/pageadd_entry.php'
158+ 'target' => $tmp_base . '/file/pageadd_entry.php'
159+ , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageadd_entry.php'
158160 , 'operation' => 'copy'
159- , 'pass' => true
161+ , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_entry.php' ) ? true : false )
160162 )
161163 , array(
162- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/pageadd_entry.tpl'
163- , 'destination' => RISOLUTO_USERLAND . 'simplepage/pageadd_entry.tpl'
164+ 'target' => $tmp_base . '/file/pageadd_entry.tpl'
165+ , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageadd_entry.tpl'
164166 , 'operation' => 'copy'
165- , 'pass' => true
167+ , 'pass' => ( !file_exists( $tmp_base . '/file/pageadd_entry.tpl' ) ? true : false )
166168 )
167169 , array(
168- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/pagedel_complete.php'
169- , 'destination' => RISOLUTO_USERLAND . 'simplepage/pagedel_complete.php'
170+ 'target' => $tmp_base . '/file/pagedel_complete.php'
171+ , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagedel_complete.php'
170172 , 'operation' => 'copy'
171- , 'pass' => false
173+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagedel_complete.php' ) ? true : false )
172174 )
173175 , array(
174- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/pagedel_complete.tpl'
175- , 'destination' => RISOLUTO_USERLAND . 'simplepage/pagedel_complete.tpl'
176+ 'target' => $tmp_base . '/file/pagedel_complete.tpl'
177+ , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagedel_complete.tpl'
176178 , 'operation' => 'copy'
177- , 'pass' => true
179+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagedel_complete.tpl' ) ? true : false )
178180 )
179181 , array(
180- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/pagedel_confirm.php'
181- , 'destination' => RISOLUTO_USERLAND . 'simplepage/pagedel_confirm.php'
182+ 'target' => $tmp_base . '/file/pagedel_confirm.php'
183+ , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagedel_confirm.php'
182184 , 'operation' => 'copy'
183- , 'pass' => false
185+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagedel_confirm.php' ) ? true : false )
184186 )
185187 , array(
186- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/pagedel_confirm.tpl'
187- , 'destination' => RISOLUTO_USERLAND . 'simplepage/pagedel_confirm.tpl'
188+ 'target' => $tmp_base . '/file/pagedel_confirm.tpl'
189+ , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagedel_confirm.tpl'
188190 , 'operation' => 'copy'
189- , 'pass' => true
191+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagedel_confirm.tpl' ) ? true : false )
190192 )
191193 , array(
192- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/pagelist.php'
193- , 'destination' => RISOLUTO_USERLAND . 'simplepage/pagelist.php'
194+ 'target' => $tmp_base . '/file/pagelist.php'
195+ , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagelist.php'
194196 , 'operation' => 'copy'
195- , 'pass' => false
197+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagelist.php' ) ? true : false )
196198 )
197199 , array(
198- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/pagelist.tpl'
199- , 'destination' => RISOLUTO_USERLAND . 'simplepage/pagelist.tpl'
200+ 'target' => $tmp_base . '/file/pagelist.tpl'
201+ , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagelist.tpl'
200202 , 'operation' => 'copy'
201- , 'pass' => true
203+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagelist.tpl' ) ? true : false )
202204 )
203205 , array(
204- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/pagemod_complete.php'
205- , 'destination' => RISOLUTO_USERLAND . 'simplepage/pagemod_complete.php'
206+ 'target' => $tmp_base . '/file/pagemod_complete.php'
207+ , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagemod_complete.php'
206208 , 'operation' => 'copy'
207- , 'pass' => false
209+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_complete.php' ) ? true : false )
208210 )
209211 , array(
210- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/pagemod_complete.tpl'
211- , 'destination' => RISOLUTO_USERLAND . 'simplepage/pagemod_complete.tpl'
212+ 'target' => $tmp_base . '/file/pagemod_complete.tpl'
213+ , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagemod_complete.tpl'
212214 , 'operation' => 'copy'
213- , 'pass' => true
215+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_complete.tpl' ) ? true : false )
214216 )
215217 , array(
216- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/pagemod_confirm.php'
217- , 'destination' => RISOLUTO_USERLAND . 'simplepage/pagemod_confirm.php'
218+ 'target' => $tmp_base . '/file/pagemod_confirm.php'
219+ , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagemod_confirm.php'
218220 , 'operation' => 'copy'
219- , 'pass' => true
221+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_confirm.php' ) ? true : false )
220222 )
221223 , array(
222- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/pagemod_confirm.tpl'
223- , 'destination' => RISOLUTO_USERLAND . 'simplepage/pagemod_confirm.tpl'
224+ 'target' => $tmp_base . '/file/pagemod_confirm.tpl'
225+ , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagemod_confirm.tpl'
224226 , 'operation' => 'copy'
225- , 'pass' => true
227+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_confirm.tpl' ) ? true : false )
226228 )
227229 , array(
228- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/pagemod_entry.php'
229- , 'destination' => RISOLUTO_USERLAND . 'simplepage/pagemod_entry.php'
230+ 'target' => $tmp_base . '/file/pagemod_entry.php'
231+ , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagemod_entry.php'
230232 , 'operation' => 'copy'
231- , 'pass' => false
233+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_entry.php' ) ? true : false )
232234 )
233235 , array(
234- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/pagemod_entry.tpl'
235- , 'destination' => RISOLUTO_USERLAND . 'simplepage/pagemod_entry.tpl'
236+ 'target' => $tmp_base . '/file/pagemod_entry.tpl'
237+ , 'destination' => RISOLUTO_USERLAND . $this->target . '/pagemod_entry.tpl'
236238 , 'operation' => 'copy'
237- , 'pass' => true
239+ , 'pass' => ( !file_exists( $tmp_base . '/file/pagemod_entry.tpl' ) ? true : false )
238240 )
239241 , array(
240- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/pageview.php'
241- , 'destination' => RISOLUTO_USERLAND . 'simplepage/pageview.php'
242+ 'target' => $tmp_base . '/file/pageview.php'
243+ , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageview.php'
242244 , 'operation' => 'copy'
243- , 'pass' => false
245+ , 'pass' => ( !file_exists( $tmp_base . '/file/pageview.php' ) ? true : false )
244246 )
245247 , array(
246- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/pageview.tpl'
247- , 'destination' => RISOLUTO_USERLAND . 'simplepage/pageview.tpl'
248+ 'target' => $tmp_base . '/file/pageview.tpl'
249+ , 'destination' => RISOLUTO_USERLAND . $this->target . '/pageview.tpl'
248250 , 'operation' => 'copy'
249- , 'pass' => true
251+ , 'pass' => ( !file_exists( $tmp_base . '/file/pageview.tpl' ) ? true : false )
250252 )
251253 , array(
252- 'target' => RISOLUTO_USERLAND . $this->obj_sess->sessLoad( 'currentcage' ) . '/file/simplepage_base.inc'
253- , 'destination' => RISOLUTO_USERLAND . 'simplepage/simplepage_base.inc'
254+ 'target' => $tmp_base . '/file/simplepage_base.inc'
255+ , 'destination' => RISOLUTO_USERLAND . $this->target . '/simplepage_base.inc'
254256 , 'operation' => 'copy'
255- , 'pass' => true
257+ , 'pass' => ( !file_exists( $tmp_base . '/file/simplepage_base.inc' ) ? true : false )
256258 )
257259 );
258260
--- trunk/upgrade/simplepage/page06.php (revision 321)
+++ trunk/upgrade/simplepage/page06.php (revision 322)
@@ -7,7 +7,7 @@
77 * @package risoluto
88 * @author Risoluto Developers
99 * @license http://opensource.org/licenses/bsd-license.php new BSD license
10- * @copyright (C) 2008-2011 Risoluto Developers / All Rights Reserved.
10+ * @copyright (C) 2008-2012 Risoluto Developers / All Rights Reserved.
1111 */
1212
1313 /**
--- trunk/upgrade/simplepage/upgrade.php (revision 321)
+++ trunk/upgrade/simplepage/upgrade.php (revision 322)
@@ -7,7 +7,7 @@
77 * @package risoluto
88 * @author Risoluto Developers
99 * @license http://opensource.org/licenses/bsd-license.php new BSD license
10- * @copyright (C) 2008-2011 Risoluto Developers / All Rights Reserved.
10+ * @copyright (C) 2008-2012 Risoluto Developers / All Rights Reserved.
1111 */
1212
1313 /**
@@ -65,7 +65,7 @@
6565 public function model()
6666 {
6767 // ディレクトリ名からバージョン情報を取得する
68- $this->versioninfo = explode( '_to_', str_replace( 'upgrade/', '', $this->obj_sess->sessLoad( 'currentcage' ) ) );
68+ $this->versioninfo = explode( '_to_', str_replace( 'upgrade' . DIRECTORY_SEPARATOR, '', $this->obj_sess->sessLoad( 'currentcage' ) ) );
6969 return true;
7070 } // end of function:model()
7171
@@ -91,6 +91,8 @@
9191 $this->smarty->assign ( 'fromVer', $this->versioninfo[0] );
9292 $this->smarty->assign ( 'toVer', $this->versioninfo[1] );
9393
94+ $this->smarty->assign ( 'target', $this->target );
95+
9496 // 表示
9597 $this->smarty->display( 'upgrade.tpl' );
9698
Show on old repository browser