From 5e244045b46555605d0422884c89ee6404820bca Mon Sep 17 00:00:00 2001
From: sparky4 <sparky4@4ch.irc.su>
Date: Wed, 16 Feb 2011 19:45:35 -0600
Subject: [PATCH] 	modified:   config.php 	modified:   x.php 
 modified:   yotsubanome.php

	deleted:    x.phps
---
 config.php      | 10 ++++---
 x.php           | 70 +++++++++++++++++++++++++++----------------------
 yotsubanome.php |  4 +--
 3 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/config.php b/config.php
index fa47930..de3bf23 100755
--- a/config.php
+++ b/config.php
@@ -42,18 +42,22 @@ TODO:
 
 ChangeLog:
 ----------------------
+2011/2/16
+-[x.php] applied
+
 2011/2/12
 -[x.php] Created
 
 2011/2/11
 -[futaba2pio.php] Added more functionality
 -[yotsubanome.php] Fixed comment too long click "here" bug
-
-
 */
 //error_reporting(E_ALL);  //Show the cursed errors
+
+
 include_once('../../conk/.pass.php'); // The password file sparky4 uses this line until the stable release is released
 
+
 /*---- Part 1：程式基本設定 ----*/
 // 伺服器常態設定
 if(!defined("PHP_SELF"))define("PHP_SELF", 'yotsubanome.php'); // このスクリプト名 // 主程式名 (若是修改了主程式名，請配合修改)
@@ -88,7 +92,7 @@ define("SIZE_CACHE", 'sizecache.daty');
 define("CSVSS", '_css.csv_daty');
 define("CSV_SS", 'stylesheets.csv_daty');
 
-/*---- Part 2：板面各項細部功能設定 ----*/ 
+/*---- Part 2：板面各項細部功能設定 ----*/
 define("IMG_DIR", 'src/'); // 画像保存ディレクトリ。futaba.phpから見て // 圖片存放目錄
 define("THUMB_DIR", 'thumb/'); //サムネイル保存ディレクトリ // 預覽圖存放目錄
 define("PHP_SELF2", 'index.htm'); // 入り口ファイル名 // 入口檔名
diff --git a/x.php b/x.php
index ff67f93..b79419d 100644
--- a/x.php
+++ b/x.php
@@ -1,67 +1,75 @@
 <?php
 /*yotsubanome multiBBS reader
 from 2ch PHP script 18c
-X v0.0.0.0
+X v0.0.0.4
 */
 
-error_reporting(E_ALL); // show all errors for debugging
+//error_reporting(E_ALL); // show all errors for debugging
 
-/* Enviorment Settings */
-// Do not change unless you renamed the directories
-define("PHP_DIRECTORY", '../core/'); // yotsubanome "C:\windows\system\"
-define("DATA_DIR", PHP_DIRECTORY.'data/'); // data directory
-define("CSS_DIR", DATA_DIR.'css/'); // CSS directory
-define("ICON_DIR", DATA_DIR.'icon/'); // icon directory [Graphics of the software go here]
-define("TEMP_DIR", PHP_DIRECTORY.'temp/'); // upload content temperary directory
-define("TPLT_DIR", DATA_DIR.'tplt/'); // template directory
-
-//include_once(PHP_DIRECTORY.'config.php'); // 引入設定檔
-
-if(!defined("PHP_SELF"))define("PHP_SELF", 'yotsubanome.php'); // このスクリプト名 // 主程式名 (若是修改了主程式名，請配合修改)
+/* DIR config */
 if(!defined("BBSMENU")) define("BBSMENU", 0); // BBSmenu for the frame at BBS home page
 if(!defined("INDEXBBS")) define("INDEXBBS", 0); // home page BBS list
-if(!defined("BBSMENU") and !defined("INDEXBBS")) define("LISTBBS", 1); // misc. BBS list
+if(!BBSMENU && !INDEXBBS){
+	define("LISTBBS", 1); // misc. BBS list
+	$qazw = '../';
+	}else{
+	$qazw = './';
+	define("LISTBBS", 0); // misc. BBS list
+}
+
+/* Config */
+if(!defined("PHP_SELF"))define("PHP_SELF", 'yotsubanome.php'); // このスクリプト名 // 主程式名 (若是修改了主程式名，請配合修改)
+$config['TITLE'] = '画像掲示板';
 
+/* BBS SEARCH */
 $board = array();
-$handle = opendir('../');
+$handle = opendir($qazw);
 while(false !== ($file = readdir($handle))){
-	if($file != 'core' and $file != 'script' and $file != '.' and $file != '..'){ // do not include system core directory or distribution directory
-		if(is_dir('../'.$file) and is_file('../'.$file.'/config.php') || is_file('../'.$file.'/'.PHP_SELF)) array_push($board, $file);
+	if($file != 'my' and $file != 'lite' and $file != 'pg' and $file != 'script' and $file != '.' and $file != '..'){ // do not include system core directory or distribution directory
+		if(is_dir($qazw.$file) and is_file($qazw.$file.'/config.php') || is_file($qazw.$file.'/'.PHP_SELF)) array_push($board, $file);
 	}
 }
 closedir($handle);
 
-// display the list
+/* BBS list display */
 $bbsi = 0;
 $bbsdat = '';
-if(BBSMENU && !INDEXBBS && !LISTBBS){
+if(BBSMENU && !INDEXBBS){
 	foreach($board as $dir){
-		include('../'.$dir.'/config.php');
-		$bbsdat .= '<a href="../'.$dir.'/" target="cont">'.$config['TITLE'].'</a><br>';
+		if($dir != 'test') include($qazw.$dir.'/config.php');
+		$config['TITLE'] = preg_replace('/＠四葉の芽(.*?)/', '', $config['TITLE']);
+		$bbsdat .= '<a href="'.$qazw.$dir.'/" target="cont">'.$config['TITLE'].'</a><br>';
 //++++	<font color="#ff0099">new</font>
 //++++	<font color="#6f0069">old</font>
 		$bbsi++;
 	}
-}else if(!BBSMENU && INDEXBBS && !LISTBBS){
+}
+/*if(!BBSMENU && INDEXBBS){
 	foreach($board as $dir){
 		include('../'.$dir.'/config.php');
-		$bbsdat .= '<a href="../'.$dir.'/">'.$config['TITLE'].'</a><br>';
+		$config['TITLE'] = preg_replace('/＠四葉の芽(.*?)/', '', $config['TITLE']);
+		$bbsdat .= '<a href="'.$qazw.$dir.'/">'.$config['TITLE'].'</a><br>';
 //++++	<font color="#ff0099">new</font>
 //++++	<font color="#6f0069">old</font>
 		$bbsi++;
 	}
-}else if(!BBSMENU && !INDEXBBS && LISTBBS){
+}*/
+if(!BBSMENU/* && !INDEXBBS && LISTBBS*/){
 	foreach($board as $dir){
-		include('../'.$dir.'/config.php');
-		echo $config['TITLE'].'<br>';
-		$bbsdat .= '<a href="../'.$dir.'/">'.$config['TITLE'].'</a><br>';
+		if($dir != 'test') include($qazw.$dir.'/config.php');
+		$config['TITLE'] = preg_replace('/＠四葉の芽(.*?)/', '', $config['TITLE']);
+		$bbsdat .= '<a href="'.$qazw.$dir.'/">'.$config['TITLE'].'</a><br>';
 //++++	<font color="#ff0099">new</font>
 //++++	<font color="#6f0069">old</font>
 		$bbsi++;
-//		define("$config['TITLE']", '');
 	}
 }
-// print
+
+/* Print BBS list */
 print_r($bbsdat);
-if(LISTBBS) print_r($board);
+//echo $bbsdat;
+//if(LISTBBS) print_r($board);
+//echo LISTBBS,'<br>';
+//echo BBSMENU.'<br>';
+//echo INDEXBBS.'<br>';
 ?>
diff --git a/yotsubanome.php b/yotsubanome.php
index 4b3fb48..fd16534 100755
--- a/yotsubanome.php
+++ b/yotsubanome.php
@@ -9,7 +9,7 @@ yotsubanome.php*/$ver = "v0.7.8.1.0001 β lot.100404";/*
 配布条件はレッツPHP!に準じます。改造、再配布は自由にどうぞ。
 このスクリプトに関する質問はレッツPHP!にしないようにお願いします。
 最新版は<http://4ch.irc.su/+4/script/>で配布しています。
-ご質問は準備板＠四葉の芽<http://4ch.irc.su/+4/core/>までどうぞ。
+ご質問は準備板＠四葉の芽<http://4ch.irc.su/+4/test/>までどうぞ。
 
 --【スパーキー（④ ^ヮ^）】◆FCr.DTJy2k◆◆/ODv/gdbGrBJVTTiLB/IBFugUUM=◆四葉の芽◇ちゃんねる ## 管理者 ##
 ＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊
@@ -56,7 +56,7 @@ error_reporting(E_ALL); // show all errors for debugging
 
 /* Enviorment Settings */
 // Do not change unless you renamed the directories
-define("PHP_DIRECTORY", '../core/'); // yotsubanome "C:\windows\system\"
+define("PHP_DIRECTORY", '../test/'); // yotsubanome "C:\windows\system\"
 define("DATA_DIR", PHP_DIRECTORY.'data/'); // data directory
 define("CSS_DIR", DATA_DIR.'css/'); // CSS directory
 define("ICON_DIR", DATA_DIR.'icon/'); // icon directory [Graphics of the software go here]
-- 
2.39.5