• R/O
  • SSH
  • HTTPS

jinrousiki: Commit


Commit MetaInfo

Revision2676 (tree)
Time2020-06-27 23:37:36
Authorumethyl

Log Message

Loader::LoadRequest() -> RQ::LoadRequest()

Change Summary

Incremental Difference

--- trunk/admin/generate_html_log.php (revision 2675)
+++ trunk/admin/generate_html_log.php (revision 2676)
@@ -5,8 +5,7 @@
55 $disable = true; //使用時には false に変更する
66 if ($disable) HTML::OutputUnusableError();
77
8-Loader::LoadRequest('RequestOldLog'); //引数を取得
9-
8+RQ::LoadRequest('RequestOldLog'); //引数を取得
109 RQ::Set('prefix', ''); //各ページの先頭につける文字列 (テスト / 上書き回避用)
1110 RQ::Set('index_no', 8); //インデックスページの開始番号
1211 RQ::Set('min_room_no', 351); //インデックス化する村の開始番号
--- trunk/async.php (revision 2675)
+++ trunk/async.php (revision 2676)
@@ -1,10 +1,11 @@
11 <?php
22 require_once('init.php');
3-Loader::LoadFile('game_play_class');
4-Loader::LoadRequest('game_play');
53
64 if (true !== GameConfig::ASYNC) {
75 $title = Message::SESSION_ERROR;
86 HTML::OutputResult($title, $title . Message::TOP);
97 }
8+
9+Loader::LoadFile('game_play_class');
10+RQ::LoadRequest('game_play');
1011 GamePlayController::ExecuteAsync();
--- trunk/include/controller/admin_class.php (revision 2675)
+++ trunk/include/controller/admin_class.php (revision 2676)
@@ -7,7 +7,7 @@
77 HTML::OutputUnusableError();
88 }
99
10- Loader::LoadRequest();
10+ RQ::LoadRequest();
1111 RQ::Get()->ParseGetRoomNo();
1212
1313 DB::Connect();
@@ -28,7 +28,7 @@
2828 HTML::OutputUnusableError();
2929 }
3030
31- Loader::LoadRequest();
31+ RQ::LoadRequest();
3232 RQ::Get()->ParseGetInt(RequestDataIcon::ID);
3333 $icon_no = RQ::Get()->icon_no;
3434 $title = AdminMessage::DELETE_ICON . ' ' . Message::ERROR_TITLE;
--- trunk/include/controller/game_frame_class.php (revision 2675)
+++ trunk/include/controller/game_frame_class.php (revision 2676)
@@ -3,7 +3,7 @@
33 //-- GameFrame コントローラー --//
44 final class GameFrameController extends JinrouController {
55 protected static function Load() {
6- Loader::LoadRequest('game_frame');
6+ RQ::LoadRequest('game_frame');
77 }
88
99 protected static function Output() {
--- trunk/include/controller/game_log_class.php (revision 2675)
+++ trunk/include/controller/game_log_class.php (revision 2676)
@@ -3,7 +3,7 @@
33 //-- GameLog コントローラー --//
44 final class GameLogController extends JinrouController {
55 protected static function Load() {
6- Loader::LoadRequest('game_log');
6+ RQ::LoadRequest('game_log');
77 DB::Connect();
88 Session::Login();
99
--- trunk/include/controller/game_play_class.php (revision 2675)
+++ trunk/include/controller/game_play_class.php (revision 2676)
@@ -5,7 +5,7 @@
55 private static $view;
66
77 protected static function Load() {
8- Loader::LoadRequest('game_play');
8+ RQ::LoadRequest('game_play');
99 DB::Connect();
1010 Session::LoginGamePlay();
1111
--- trunk/include/controller/game_up_class.php (revision 2675)
+++ trunk/include/controller/game_up_class.php (revision 2676)
@@ -3,7 +3,7 @@
33 //-- GameUp コントローラー --//
44 final class GameUpController extends JinrouController {
55 protected static function Load() {
6- Loader::LoadRequest('game_up');
6+ RQ::LoadRequest('game_up');
77 }
88
99 protected static function Output() {
--- trunk/include/controller/game_view_class.php (revision 2675)
+++ trunk/include/controller/game_view_class.php (revision 2676)
@@ -3,7 +3,7 @@
33 //-- 観戦画面コントローラー --//
44 final class GameViewController extends JinrouController {
55 protected static function Load() {
6- Loader::LoadRequest('game_view');
6+ RQ::LoadRequest('game_view');
77 DB::Connect(RQ::Get()->db_no);
88
99 //村情報ロード
--- trunk/include/controller/game_vote_class.php (revision 2675)
+++ trunk/include/controller/game_vote_class.php (revision 2676)
@@ -3,7 +3,7 @@
33 //-- GameVote コントローラー --//
44 final class GameVoteController extends JinrouController {
55 protected static function Load() {
6- Loader::LoadRequest('game_vote');
6+ RQ::LoadRequest('game_vote');
77 DB::Connect();
88 Session::Login();
99 if (false === DB::Transaction()) { //トランザクション開始
--- trunk/include/controller/icon_edit_class.php (revision 2675)
+++ trunk/include/controller/icon_edit_class.php (revision 2676)
@@ -10,7 +10,7 @@
1010 }
1111
1212 protected static function Load() {
13- Loader::LoadRequest('icon_edit');
13+ RQ::LoadRequest('icon_edit');
1414 }
1515
1616 protected static function EnableCommand() {
--- trunk/include/controller/icon_upload_class.php (revision 2675)
+++ trunk/include/controller/icon_upload_class.php (revision 2676)
@@ -10,7 +10,7 @@
1010 }
1111
1212 protected static function Load() {
13- Loader::LoadRequest('icon_upload');
13+ RQ::LoadRequest('icon_upload');
1414 }
1515
1616 protected static function EnableCommand() {
--- trunk/include/controller/icon_view_class.php (revision 2675)
+++ trunk/include/controller/icon_view_class.php (revision 2676)
@@ -2,7 +2,7 @@
22 //-- アイコン一覧表示コントローラー --//
33 final class IconViewController extends JinrouController {
44 protected static function Load() {
5- Loader::LoadRequest('icon_view');
5+ RQ::LoadRequest('icon_view');
66 DB::Connect();
77 Session::Start();
88 }
--- trunk/include/controller/index_class.php (revision 2675)
+++ trunk/include/controller/index_class.php (revision 2676)
@@ -3,7 +3,7 @@
33 //-- TOPページコントローラー --//
44 final class JinrouIndexController extends JinrouController {
55 protected static function Load() {
6- Loader::LoadRequest('request_index');
6+ RQ::LoadRequest('request_index');
77 }
88
99 protected static function Output() {
--- trunk/include/controller/info/search_role_info_class.php (revision 2675)
+++ trunk/include/controller/info/search_role_info_class.php (revision 2676)
@@ -2,7 +2,7 @@
22 //-- 検索情報コントローラー (新役職情報) --//
33 final class SearchRoleInfoController extends JinrouController {
44 protected static function Load(){
5- Loader::LoadRequest();
5+ RQ::LoadRequest();
66 RQ::Get()->ParsePostOn('execute');
77 RQ::Get()->ParsePostData('role');
88 }
--- trunk/include/controller/info/shared_room_info_class.php (revision 2675)
+++ trunk/include/controller/info/shared_room_info_class.php (revision 2676)
@@ -3,7 +3,7 @@
33 //-- 関連サーバ村情報コントローラー --//
44 final class SharedRoomInfoController extends JinrouController {
55 protected static function Load() {
6- Loader::LoadRequest('shared_room');
6+ RQ::LoadRequest('shared_room');
77 }
88
99 protected static function Output() {
--- trunk/include/controller/login_class.php (revision 2675)
+++ trunk/include/controller/login_class.php (revision 2676)
@@ -3,7 +3,7 @@
33 //-- ログイン処理コントローラー --//
44 final class LoginController extends JinrouController {
55 protected static function Load() {
6- Loader::LoadRequest('login');
6+ RQ::LoadRequest('login');
77 DB::Connect();
88 }
99
--- trunk/include/controller/old_log_class.php (revision 2675)
+++ trunk/include/controller/old_log_class.php (revision 2676)
@@ -3,7 +3,7 @@
33 //-- 過去ログ表示クラス --//
44 final class OldLogController extends JinrouController {
55 protected static function Load() {
6- Loader::LoadRequest('old_log');
6+ RQ::LoadRequest('old_log');
77 DB::Connect(RQ::Get()->db_no);
88 }
99
--- trunk/include/controller/room_manager_class.php (revision 2675)
+++ trunk/include/controller/room_manager_class.php (revision 2676)
@@ -9,7 +9,7 @@
99 if (Loader::IsLoadedFile('index_class')) {
1010 self::Maintenance();
1111 }
12- Loader::LoadRequest('room_manager');
12+ RQ::LoadRequest('room_manager');
1313 }
1414
1515 protected static function EnableCommand() {
--- trunk/include/controller/test/cast_test_class.php (revision 2675)
+++ trunk/include/controller/test/cast_test_class.php (revision 2676)
@@ -2,7 +2,7 @@
22 //-- 村配役テストコントローラー --//
33 final class CastTestController extends JinrouController {
44 protected static function Load() {
5- Loader::LoadRequest('game_view');
5+ RQ::LoadRequest('game_view');
66
77 //仮想村
88 DevRoom::Initialize(['name' => GameMessage::ROOM_TITLE_FOOTER]);
--- trunk/include/controller/test/step_vote_test_class.php (revision 2675)
+++ trunk/include/controller/test/step_vote_test_class.php (revision 2676)
@@ -2,7 +2,7 @@
22 //足音投票テストコントローラー
33 final class StepVoteTestController extends JinrouController {
44 protected static function Load() {
5- Loader::LoadRequest('game_view');
5+ RQ::LoadRequest('game_view');
66
77 //仮想村
88 $stack = ['name' => GameMessage::ROOM_TITLE_FOOTER, 'status' => RoomStatus::PLAYING];
--- trunk/include/controller/test/user_entry_test_class.php (revision 2675)
+++ trunk/include/controller/test/user_entry_test_class.php (revision 2676)
@@ -4,7 +4,7 @@
44 protected static function Load() {
55 DB::Connect();
66 Session::Start();
7- Loader::LoadRequest('game_view');
7+ RQ::LoadRequest('game_view');
88
99 //仮想村
1010 DevRoom::Initialize(['name' => GameMessage::ROOM_TITLE_FOOTER]);
--- trunk/include/controller/test/vote_test_class.php (revision 2675)
+++ trunk/include/controller/test/vote_test_class.php (revision 2676)
@@ -2,7 +2,7 @@
22 //投票テストコントローラー
33 final class VoteTestController extends JinrouController {
44 protected static function Load() {
5- Loader::LoadRequest('game_view');
5+ RQ::LoadRequest('game_view');
66 include('data/vote_header.php');
77
88 //特殊モード
--- trunk/include/controller/user_manager_class.php (revision 2675)
+++ trunk/include/controller/user_manager_class.php (revision 2676)
@@ -2,7 +2,7 @@
22 //-- ユーザ登録コントローラー --//
33 final class UserManagerController extends JinrouController {
44 protected static function Load() {
5- Loader::LoadRequest('user_manager');
5+ RQ::LoadRequest('user_manager');
66 DB::Connect();
77 Session::Start();
88 }
@@ -105,7 +105,7 @@
105105 DB::$ROOM->ParseOption(true);
106106
107107 //DB から現在のユーザ情報を取得 (ロック付き)
108- RQ::LoadRequest('Request');
108+ //ここで起動している Request クラスは Load 時の Requset_user_manager
109109 RQ::Set(RequestDataGame::ID, $room_no);
110110 RQ::Get('retrieve_type', 'entry_user');
111111 DB::LoadUser();
--- trunk/include/html/controller/test/test_html_class.php (revision 2675)
+++ trunk/include/html/controller/test/test_html_class.php (revision 2676)
@@ -3,7 +3,7 @@
33 class DevHTML {
44 //共通リクエストロード
55 public static function LoadRequest() {
6- Loader::LoadRequest();
6+ RQ::LoadRequest();
77 RQ::Get()->ParsePostOn('execute');
88 }
99
--- trunk/include/loader_class.php (revision 2675)
+++ trunk/include/loader_class.php (revision 2676)
@@ -170,11 +170,6 @@
170170 }
171171 }
172172
173- //リクエストクラスロード
174- public static function LoadRequest($class = 'Request') {
175- return RQ::LoadRequest($class);
176- }
177-
178173 //ファイル取得
179174 protected static function GetFile($name) {
180175 return isset(LoaderData::$file[$name]) ? LoaderData::$file[$name] : null;
--- trunk/include/request/request_class.php (revision 2675)
+++ trunk/include/request/request_class.php (revision 2676)
@@ -12,8 +12,8 @@
1212 }
1313
1414 //Request クラスのロード
15- public static function LoadRequest($name = 'Request', $force = false) {
16- if ($force || is_null(self::$instance)) {
15+ public static function LoadRequest($name = 'Request') {
16+ if (true === is_null(self::$instance)) {
1717 if ($name != 'Request' && self::LoadFile($name)) {
1818 $class = self::CLASS_PREFIX . $name;
1919 } else {
Show on old repository browser