From 2b86b5a9107f3b95cd282961fcfe1fc30fbfb0b9 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Fri, 4 Mar 2011 04:54:11 -0600 Subject: [PATCH] modified: config.php modified: lib/lang/en_US.php modified: lib/lang/ja_JP.php modified: lib/lang/zh_TW.php modified: lib/lib_common.php modified: yotsubanome.php --- config.php | 4 ++-- lib/lang/en_US.php | 4 ++-- lib/lang/ja_JP.php | 4 ++-- lib/lang/zh_TW.php | 4 ++-- lib/lib_common.php | 28 ++++++++++-------------- yotsubanome.php | 54 +++++++++++++++++++++++----------------------- 6 files changed, 46 insertions(+), 52 deletions(-) diff --git a/config.php b/config.php index b9dccec..c27dea2 100755 --- a/config.php +++ b/config.php @@ -171,7 +171,7 @@ define("CLEAR_SAGE", 0); // 使用不推文模式時清除E-mail中的「sage」 define("USE_QUOTESYSTEM", 1); // 是否打開引用瀏覽系統 [自動轉換>>No.xxxx文字成連結並導引] (是：1 否：0) //++++---- //define("KB", 1); // Kilobytes or Bytes on the image file size display (Kilobytes:1 Bytes:0) -$config['KB'] = 0; // Kilobytes or Bytes on the image file size display (Kilobytes:1 Bytes:0) +$config['KB'] = false; // Kilobytes or Bytes on the image file size display (Kilobytes:true Bytes:false) //++++---- define("SHOW_IMGWH", 1); // 是否顯示附加圖檔之原檔長寬尺寸 (是：1 否：0) define("SHOW_FILENAME", 1); // 是否顯示附加圖檔之原檔文件名 (是：1 否：0) @@ -263,7 +263,7 @@ define("RE_PAGE_DEF", 40); // 回應模式一頁顯示幾筆回應內容 (分頁 define("MAX_RES", 1000); // 強制sageレス数 // 回應筆數超過多少則不自動推文 (關閉：0) define("MAX_AGE_TIME", 0); // 強制sageまでの時間 0で強制sageなし // 討論串可接受推文的時間範圍 (單位：小時，討論串存在超過此時間則回應皆不再自動推文 關閉：0) define("COMM_MAX", 18000); // 內文接受Bytes數 (注意：中文字為2Bytes) -define("MAX_LINES", 16); // The number of lines in the comment feild that are displayed in the index (unlimited:0) +$config['LINE_NUMBER'] = 24; // 1レスに表示する行数 (しない：0) // The number of lines in the comment feild that are displayed in the index (unlimited:0) define("NO_TEXTONLY", 0); // no text only? behavior with the no image switch (Ost [Eastern]:2 Futaba:1 Yotsubanome [OLD]:0) define("BR_CHECK", 0); // 改行を抑制する行数 しない:0 // 文字換行行數上限 (不限：0) define("STATIC_HTML_UNTIL", -1); // 更新文章時自動生成的靜態網頁至第幾頁止 (全部生成：-1 僅入口頁：0) diff --git a/lib/lang/en_US.php b/lib/lang/en_US.php index 2e2854c..2605513 100755 --- a/lib/lang/en_US.php +++ b/lib/lang/en_US.php @@ -149,8 +149,8 @@ $language['info_basic_showid_after'] = '(force show:2 selective show:1 do not sh $language['info_basic_cr_limit'] = 'Comment row limit (<br> check)'; $language['info_basic_cr_after'] = ' Row(s) (unlimited:0)'; //----$language['info_basic_timezone'] = 'Time zone'; -$language['info_basic_max_lines_limit'] = 'Comment line limit'; -$language['info_basic_max_lines_after'] = ' Line(s) (unlimited:0)'; +$language['info_basic_line_number_limit'] = 'Comment line limit'; +$language['info_basic_line_number_after'] = ' Line(s) (unlimited:0)'; $language['info_basic_threadcount'] = 'Total threads count'; $language['info_basic_theme'] = 'Theme'; $language['info_dsusage_top'] = 'Data source usage'; diff --git a/lib/lang/ja_JP.php b/lib/lang/ja_JP.php index 75243a9..81c11cd 100755 --- a/lib/lang/ja_JP.php +++ b/lib/lang/ja_JP.php @@ -149,8 +149,8 @@ $language['info_basic_showid_after'] = '(強制:2 する:1 しない:0)'; $language['info_basic_cr_limit'] = '改行を抑制する行数 (<br> check)'; $language['info_basic_cr_after'] = ' 行 (しない：0)'; //----$language['info_basic_timezone'] = '時間帯設定'; -$language['info_basic_max_lines_limit'] = '改行を抑制する行数'; -$language['info_basic_max_lines_after'] = ' 線 (しない：0)'; +$language['info_basic_line_number_limit'] = '1レスに表示する行数'; +$language['info_basic_line_number_after'] = ' 行 (しない：0)'; $language['info_basic_threadcount'] = '現在のスレ数'; $language['info_basic_theme'] = 'テーマ'; $language['info_dsusage_top'] = 'データソース使用量'; diff --git a/lib/lang/zh_TW.php b/lib/lang/zh_TW.php index 9bb1eef..7976f4c 100755 --- a/lib/lang/zh_TW.php +++ b/lib/lang/zh_TW.php @@ -149,8 +149,8 @@ $language['info_basic_showid_after'] = '(強制顯示：2 選擇性顯示：1 $language['info_basic_cr_limit'] = '文字換行行數上限 (<br> check)'; $language['info_basic_cr_after'] = ' 行 (不限：0)'; //----$language['info_basic_timezone'] = '時區設定'; -$language['info_basic_max_lines_limit'] = '文字換行行數上限'; -$language['info_basic_max_lines_after'] = ' 線 (不限：0)'; +$language['info_basic_line_number_limit'] = '文字換行行數上限'/'/++++----'; +$language['info_basic_line_number_after'] = ' 行 (不限：0)'; $language['info_basic_threadcount'] = '目前總討論串篇數'; $language['info_basic_theme'] = '主題風格'; $language['info_dsusage_top'] = '記錄檔使用量'; diff --git a/lib/lib_common.php b/lib/lib_common.php index 483556b..9bacbc9 100755 --- a/lib/lib_common.php +++ b/lib/lib_common.php @@ -106,14 +106,13 @@ function form(&$dat, $resno, $iscollapse=true, $retURL=PHP_SELF, $name='', $mail '{$FORM_NOATTECHMENT_FIELD}' => ''); } } - if(OPTION || USE_UPSERIES){ //++++ more options will be added on later + if(OPTION){ //++++ more options will be added on later $pte_vals['{$FORM_OPTION1_TEXT}'] = _T('form_option1'); - } - if(USE_UPSERIES){ // 啟動連貼機能 - $pte_vals['{$FORM_CONTPOST_FIELD}'] = ''; - $pte_vals['{$FORM_CONTPOST_TEXT}'] = _T('form_contpost'); - } - if(OPTION){ //options hook + if(USE_UPSERIES){ // 啟動連貼機能 + $pte_vals['{$FORM_CONTPOST_FIELD}'] = ''; + $pte_vals['{$FORM_CONTPOST_TEXT}'] = _T('form_contpost'); + } + // options hook $pte_vals['{$FORM_OPTION_HOOK}'] = ''; } if(USE_CATEGORY){ @@ -219,7 +218,7 @@ function str_cut($str, $maxlen=20){ $return_str = $return_str.'…'; break; } - } + } return $return_str; } @@ -372,26 +371,21 @@ function sp($string, $value, $shownull = false){ if($plu_word) return($plu_word); else return($string); } + //++++---- //++++---- /* comment too long function */ -// truncate $str to $max_lines lines and return $str and $abbr +// truncate $str to $config['LINE_NUMBER'] lines and return $str and $abbr // where $abbr = whether or not $str was actually truncated function abbreviate($str, $max_lines){ - if(!defined('MAX_LINES')){ - if(defined('BR_CHECK')) define('MAX_LINES', BR_CHECK); - else define('MAX_LINES', 24); - - $max_lines = MAX_LINES; - } $lines = explode("
", $str); if(count($lines) > $max_lines){ $abbr = 1; $lines = array_slice($lines, 0, $max_lines); $str = implode("
", $lines); }else $abbr = 0; - //close spans after abbreviating - //XXX will not work with more html - use abbreviate_html from shiichan + // close spans after abbreviating + // XXX will not work with more html - use abbreviate_html from shiichan $str .= str_repeat("", substr_count($str, "'._T('long_here').''._T('long_see').''; + if(!$resno && $config['LINE_NUMBER']) list($com, $abbreviated) = abbreviate($com, $config['LINE_NUMBER']); + if(isset($abbreviated) && $abbreviated && $config['LINE_NUMBER']) $com .= '
'._T('long_comment').''._T('long_here').''._T('long_see').''; if(USE_QUOTESYSTEM && $i){ // 啟用引用瀏覽系統 if(preg_match_all('/((?:>|＞)+)(?:No\.)?(\d+)/i', $com, $matches, PREG_SET_ORDER)){ // 找尋>>No.xxx @@ -1199,9 +1199,9 @@ function manage_css(){ if(file_exists(DATA_DIR.CSV_SS)){ $style_data = DATA_DIR.CSV_SS; $style_mode = _t('admin_editing'); - //---- }else{ - //---- $style_data = CSS_DIR.CSVSS; - //---- $style_mode = _t('admin_imported'); +//---- }else{ +//---- $style_data = CSS_DIR.CSVSS; +//---- $style_mode = _t('admin_imported'); } echo '