From 51dae8cd15232a55639b171f54a9bced16a90ca5 Mon Sep 17 00:00:00 2001
From: henoheno <henoheno>
Date: Wed, 30 Jun 2004 23:20:29 +0900
Subject: [PATCH] Simplify. Left your will, before you $die

---
 init.php | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/init.php b/init.php
index 4c521e3..d8c5791 100644
--- a/init.php
+++ b/init.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: init.php,v 1.79 2004/06/30 13:36:45 henoheno Exp $
+// $Id: init.php,v 1.80 2004/06/30 14:20:29 henoheno Exp $
 //
 
 /////////////////////////////////////////////////
@@ -62,16 +62,15 @@ define('MUTIME',getmicrotime());
 
 /////////////////////////////////////////////////
 // ¥Õ¥¡¥¤¥ëÆɤ߹þ¤ß
-$die = FALSE; $message = '';
+$die = '';
 foreach(array('LANG_FILE', 'INI_FILE') as $file){
 	if (!file_exists(constant($file)) || !is_readable(constant($file))) {
-		$die = TRUE;
-		$message = "${message}File is not found. ($file)\n";
+		$die = "${die}File is not found. ($file)\n";
 	} else {
 		require(constant($file));
 	}
 }
-if ($die) { die_message(nl2br("\n\n" . $message . "\n")); }
+if ($die) { die_message(nl2br("\n\n" . $die)); }
 
 /////////////////////////////////////////////////
 // INI_FILE: $script: ½é´üÀßÄê
@@ -100,15 +99,13 @@ require(UA_INI_FILE);
 
 /////////////////////////////////////////////////
 // ¥Ç¥£¥ì¥¯¥È¥ê¤Î¥Á¥§¥Ã¥¯
-$die = FALSE; $message = $temp = '';
 
+$die = '';
 foreach(array('DATA_DIR', 'DIFF_DIR', 'BACKUP_DIR', 'CACHE_DIR') as $dir){
 	if(!is_writable(constant($dir))) {
-		$die = TRUE;
-		$temp = "${temp}Directory is not found or not writable ($dir)\n";
+		$die = "${die}Directory is not found or not writable ($dir)\n";
 	}
 }
-if ($temp) { $message = "$temp\n"; }
 
 // ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÊÑ¿ô¥Á¥§¥Ã¥¯
 $temp = '';
@@ -117,8 +114,8 @@ foreach(array('rss_max', 'page_title', 'note_hr', 'related_link', 'show_passage'
 	if (!isset(${$var})) { $temp .= "\$$var\n"; }
 }
 if ($temp) {
-	$die = TRUE;
-	$message = "${message}Variable(s) not found: (Maybe the old *.ini.php?)\n" . $temp . "\n";
+	if ($die) { $die .= "\n"; }	// A breath
+	$die = "${die}Variable(s) not found: (Maybe the old *.ini.php?)\n" . $temp;
 }
 
 $temp = '';
@@ -126,16 +123,17 @@ foreach(array('LANG', 'PLUGIN_DIR') as $def){
 	if (!defined($def)) $temp .= "$def\n";
 }
 if ($temp) {
-	$die = TRUE;
-	$message = "${message}Define(s) not found: (Maybe the old *.ini.php?)\n" . $temp . "\n";
+	if ($die) { $die .= "\n"; }	// A breath
+	$die = "${die}Define(s) not found: (Maybe the old *.ini.php?)\n" . $temp;
 }
 
-if($die){ die_message(nl2br("\n\n" . $message)); }
+if($die){ die_message(nl2br("\n\n" . $die)); }
+unset($die, $temp);
 
 /////////////////////////////////////////////////
 // ɬ¿Ü¤Î¥Ú¡¼¥¸¤¬Â¸ºß¤·¤Ê¤±¤ì¤Ð¡¢¶õ¤Î¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ë
-$pages = array($defaultpage, $whatsnew, $interwiki);
-foreach($pages as $page){
+
+foreach(array($defaultpage, $whatsnew, $interwiki) as $page){
 	if (!is_page($page)) { touch(get_filename($page)); }
 }
 
-- 
2.11.0