• R/O
  • SSH
  • HTTPS

jinrousiki: Commit


Commit MetaInfo

Revision2305 (tree)
Time2018-12-24 23:52:05
Authorumethyl

Log Message

Text::ConvertLine()

Change Summary

Incremental Difference

--- trunk/include/controller/game_play_class.php (revision 2304)
+++ trunk/include/controller/game_play_class.php (revision 2305)
@@ -481,7 +481,7 @@
481481 $str = UserDB::GetLastWords(DB::$SELF->id);
482482 if ($str == '') return false;
483483
484- $str = Text::Line($str); //改行コードを変換
484+ $str = Text::ConvertLine($str);
485485 if ($str == '') return false;
486486 GamePlayHTML::OutputSelfLastWords($str);
487487 }
--- trunk/include/html/game_html_class.php (revision 2304)
+++ trunk/include/html/game_html_class.php (revision 2305)
@@ -147,7 +147,7 @@
147147 foreach (Lottery::GetList($stack_list) as $stack) { //表示順はランダム
148148 extract($stack);
149149 $str .= Text::Format(self::GetLastWords(),
150- $handle_name, GameMessage::LAST_WORDS_FOOTER, Text::Line($message)
150+ $handle_name, GameMessage::LAST_WORDS_FOOTER, Text::ConvertLine($message)
151151 );
152152 }
153153
--- trunk/include/html/option/option_form_html_class.php (revision 2304)
+++ trunk/include/html/option/option_form_html_class.php (revision 2305)
@@ -47,7 +47,7 @@
4747 //時刻入力フォーム生成 (リアルタイム制用)
4848 public static function GenerateRealtime(Option_real_time $filter, $day, $night) {
4949 return sprintf(self::GetRealTime(),
50- Text::Line($filter->GetExplain()), Message::SPACER,
50+ Text::ConvertLine($filter->GetExplain()), Message::SPACER,
5151 OptionMessage::REALTIME_DAY, Message::COLON,
5252 $filter->name, $day, Message::MINUTE,
5353 OptionMessage::REALTIME_NIGHT, Message::COLON,
@@ -58,7 +58,7 @@
5858 //発言数フォーム生成 (発言数制限制用)
5959 public static function GenerateLimitTalk(Option_limit_talk $filter, $count) {
6060 return sprintf(self::GetLimitTalk(),
61- Text::Line($filter->GetExplain()), Message::SPACER, $filter->name, $count
61+ Text::ConvertLine($filter->GetExplain()), Message::SPACER, $filter->name, $count
6262 );
6363 }
6464
@@ -66,7 +66,7 @@
6666 public static function GenerateSelector(OptionSelector $filter, $str) {
6767 return sprintf(self::GetSelector(),
6868 $filter->name, $filter->form_name, $filter->on_change, $filter->label,
69- $str, Text::Line($filter->GetExplain())
69+ $str, Text::ConvertLine($filter->GetExplain())
7070 );
7171 }
7272
--- trunk/include/option/option_form_class.php (revision 2304)
+++ trunk/include/option/option_form_class.php (revision 2305)
@@ -110,7 +110,7 @@
110110 //チェックボックス生成
111111 private static function GenerateCheckbox(OptionCheckbox $filter) {
112112 $footer = isset($filter->footer) ? $filter->footer : Text::Quote($filter->GetExplain());
113- return OptionFormHTML::GenerateCheckbox($filter, $filter->type, Text::Line($footer));
113+ return OptionFormHTML::GenerateCheckbox($filter, $filter->type, Text::ConvertLine($footer));
114114 }
115115
116116 //チェックボックス生成 (リアルタイム制専用)
--- trunk/include/room_class.php (revision 2304)
+++ trunk/include/room_class.php (revision 2305)
@@ -293,7 +293,7 @@
293293 extract($talk->GetStruct());
294294 if ($this->IsTest()) {
295295 $str = sprintf('★Talk: %s: %s: %s: %s: %s', $uname, $scene, $location, $action, $font_type);
296- Text::p(Text::Line($sentence), $str);
296+ Text::p(Text::ConvertLine($sentence), $str);
297297 return true;
298298 }
299299
@@ -335,7 +335,7 @@
335335 extract($talk->GetStruct());
336336 if ($this->IsTest()) {
337337 $str = sprintf('★Talk: %s: %s: %s: %s', $uname, $handle_name, $color, $font_type);
338- Text::p(Text::Line($sentence), $str);
338+ Text::p(Text::ConvertLine($sentence), $str);
339339 return true;
340340 }
341341
--- trunk/include/talk/talk_class.php (revision 2304)
+++ trunk/include/talk/talk_class.php (revision 2305)
@@ -404,7 +404,7 @@
404404 }
405405 $stack[$key] = $$key;
406406 }
407- $sentence = Text::Line($sentence);
407+ $sentence = Text::ConvertLine($sentence);
408408 $sentence = $this->QuoteTalk($sentence);
409409
410410 foreach (TalkElement::$list as $key) {
@@ -779,7 +779,7 @@
779779
780780 //発言登録 (システムユーザ)
781781 private function RegisterSystem($str, $talk_id, $css = TalkCSS::SYSTEM) {
782- $this->cache .= TalkHTML::GenerateSystem(Text::Line($str), $talk_id, $css);
782+ $this->cache .= TalkHTML::GenerateSystem(Text::ConvertLine($str), $talk_id, $css);
783783 return true;
784784 }
785785
Show on old repository browser