modified: config.php

[test.git] / yotsubanome.php

diff --git a/yotsubanome.php b/yotsubanome.php
index 297eab5edbf25072fcf6eebb2e57dbace770ebc1..28fa27a8499ac54008efedaa5b92e8e6341b9c0e 100755 (executable)
--- a/yotsubanome.php
+++ b/yotsubanome.php
@@ -357,8 +357,8 @@ function arrangeThread($PTE, $tree, $tree_cut, $posts, $hiddenReply, $resno=0, $
                if(AUTO_LINK) $com = auto_link($com);
                $com = quoteLight($com);
                $com = quoteLight2($com);
-               if(!$resno && MAX_LINES) list($com, $abbreviated) = abbreviate($com, MAX_LINES);
-               if(isset($abbreviated) && $abbreviated && MAX_LINES) $com .= '<br /><span class="abbrev">'._T('long_comment').'<a href="'.PHP_SELF.'?res='.$tree[0].'#r'.$no.'">'._T('long_here').'</a>'._T('long_see').'</span>';
+               if(!$resno && $config['LINE_NUMBER']) list($com, $abbreviated) = abbreviate($com, $config['LINE_NUMBER']);
+               if(isset($abbreviated) && $abbreviated && $config['LINE_NUMBER']) $com .= '<br /><span class="abbrev">'._T('long_comment').'<a href="'.PHP_SELF.'?res='.$tree[0].'#r'.$no.'">'._T('long_here').'</a>'._T('long_see').'</span>';
 
                if(USE_QUOTESYSTEM && $i){ // 啟用引用瀏覽系統
                        if(preg_match_all('/((?:&gt;|＞)+)(?: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 '<div class="banner"><table width="100%"><tr><th class="bar_managecss">
 '.str_replace('[file]', $style_data, $style_mode).'
@@ -1239,26 +1239,26 @@ function manage_css(){
        }
 
        // Read data from R3 DAT
-       //---- else if(file_exists(CSS_DIR.CSVSS)){
-               //---- $style_data = CSS_DIR.CSVSS;
-               //---- $lines = explode("\n", file_get_contents($style_data));
-               //---- $j = 0;
-               //---- foreach($lines as $null => $line){ // Line has data, or line is not commented out
-                       //---- if(substr($line, 0, 2) != '//' && $line != ''){
-                               //---- $bits = explode('[*]', $line);
-                               //---- $j++;
-                               //---- $style_name = $bits[0];
-                               //---- $style_path = CSS_DIR.$bits[2];
-                               //---- if(file_exists($style_path)){
-                                       //---- $style_short = $bits[1];
-                                       //---- if($bits[3]) $style_rel = ' checked="checked"';
-                                       //---- else $style_rel = false;
-                                       //---- $class = ($j % 2) ? 'row1' : 'row2'; // BG colour
-                                       //---- echo '<tr class="'.$class.'"><td align="left" colspan="2"><label><input name="default" type="radio"'.$style_rel.' value="'.$style_name.'" /> '.$style_path.'</label><input type="hidden" name="path['.$style_name.']" value="'.$bits[2].'" /></td><td align="left"><input name="names['.$style_name.']" value="'.$style_name.'" size="25" /></td><td align="left"><input name="short['.$style_name.']" value="'.$style_short.'" size="5" /></td><td align="left"><input name="order['.$style_name.']" size="2" value="'.$j.'" /></td></tr>';
-                               //---- }
-                       //---- }
-               //---- }
-       //---- }
+//---- else if(file_exists(CSS_DIR.CSVSS)){
+//----         $style_data = CSS_DIR.CSVSS;
+//----         $lines = explode("\n", file_get_contents($style_data));
+//----         $j = 0;
+//----         foreach($lines as $null => $line){ // Line has data, or line is not commented out
+//----                 if(substr($line, 0, 2) != '//' && $line != ''){
+//----                         $bits = explode('[*]', $line);
+//----                         $j++;
+//----                         $style_name = $bits[0];
+//----                         $style_path = CSS_DIR.$bits[2];
+//----                         if(file_exists($style_path)){
+//----                                 $style_short = $bits[1];
+//----                                 if($bits[3]) $style_rel = ' checked="checked"';
+//----                                 else $style_rel = false;
+//----                                 $class = ($j % 2) ? 'row1' : 'row2'; // BG colour
+//----                                 echo '<tr class="'.$class.'"><td align="left" colspan="2"><label><input name="default" type="radio"'.$style_rel.' value="'.$style_name.'" /> '.$style_path.'</label><input type="hidden" name="path['.$style_name.']" value="'.$bits[2].'" /></td><td align="left"><input name="names['.$style_name.']" value="'.$style_name.'" size="25" /></td><td align="left"><input name="short['.$style_name.']" value="'.$style_short.'" size="5" /></td><td align="left"><input name="order['.$style_name.']" size="2" value="'.$j.'" /></td></tr>';
+//----                         }
+//----                 }
+//----         }
+//---- }
 
        $j++; $class = ($j % 2) ? 'row1' : 'row2';
 
@@ -1305,7 +1305,7 @@ function total_size($isupdate=false){
                $all = $sp[0];
                unset($sp);
        }
-        //---- return (int)($all / 1024);
+//----        return (int)($all / 1024);
        if(!$config['KB']) return (int)($all);
        else return (int)($all / 1024);
 }
@@ -1515,7 +1515,7 @@ function showstatus(){
 <tr><td>'._T('info_basic_showid').'</td><td colspan="3"> '.DISP_ID.' '._T('info_basic_showid_after').'</td></tr>
 <tr><td>'._T('info_basic_cr_limit').'</td><td colspan="3"> '.BR_CHECK._T('info_basic_cr_after').'</td></tr>
 <!--<tr><td>'._T('info_basic_timezone').'</td><td colspan="3"> GMT </td></tr>-->
-<tr><td>'._T('info_basic_max_lines_limit').'</td><td colspan="3"> '.MAX_LINES._T('info_basic_max_lines_after').'</td></tr>
+<tr><td>'._T('info_basic_line_number_limit').'</td><td colspan="3"> '.$config['LINE_NUMBER']._T('info_basic_line_number_after').'</td></tr>
 <tr><td>'._T('info_basic_theme').'</td><td colspan="3"> '.$PTE->BlockValue('THEMENAME').' '.$PTE->BlockValue('THEMEVER').'<br/>by '.$PTE->BlockValue('THEMEAUTHOR').'</td></tr>
 <tr><td align="center" colspan="4">'._T('info_dsusage_top').'</td></tr>
 <tr align="center"><td>'._T('info_basic_threadcount').'</td><td colspan="'.(isset($piosensorInfo)?'2':'3').'"> '.$counttree.' '._T('info_basic_threads').'</td>'.(isset($piosensorInfo)?'<td rowspan="2">'.$piosensorInfo.'</td>':'').'</tr>