From fbe0b42e25e9a7eda86c1d1c331763d214216292 Mon Sep 17 00:00:00 2001
From: real_nowhereman <real_nowhereman@aa359531-4221-0410-9edc-b0b45c38dadb>
Date: Tue, 1 Jan 2008 19:58:10 +0000
Subject: [PATCH] fixed write checks and error reporting

---
 setup/lib/step1.lib.php  |  8 +++++--
 setup/tpls/step1.tpl.php | 48 ++--------------------------------------
 2 files changed, 8 insertions(+), 48 deletions(-)

diff --git a/setup/lib/step1.lib.php b/setup/lib/step1.lib.php
index ace9d51..b96d4ac 100644
--- a/setup/lib/step1.lib.php
+++ b/setup/lib/step1.lib.php
@@ -1,7 +1,9 @@
 <?php
 	
 	function check_step() {
-	
+
+		global $err;
+
 		if(check_write(SETUPTEMP_FILE, 2)) {
 		
 			$r =	fs_mkdir(CACHE_DIR);
@@ -19,8 +21,10 @@
 			return true;
 		
 		}
+
+		$err[] = 'Write error';
 		
 		return false;
 	}
 	
-?>
\ No newline at end of file
+?>
diff --git a/setup/tpls/step1.tpl.php b/setup/tpls/step1.tpl.php
index 8d2c6b5..7b28958 100644
--- a/setup/tpls/step1.tpl.php
+++ b/setup/tpls/step1.tpl.php
@@ -13,58 +13,14 @@
 <?php 
 	echo wpautop(sprintf($l['descr'], FP_CONTENT));
 	
-	/*
-	if ($languages){
-	echo '<p><label> ' . $l['descrl1'] .' <select name="language">';
-		foreach($languages as $lg) {
-			$match = array();
-			
-			if (preg_match('|lang\.(.*)\.php|', $lg, $match)) {
-				$lid = $match[1];
-				$fc  = io_load_file("./setup/lang/$lg");
-				
-				$lv = $lid;
-				if (preg_match('|LangId:(.*)|i', $fc, $match))
-					$lv = $match[1];
-				
-				echo "<option value=\"$lid\"" . 
-					((isset($_POST['language']) && $_POST['language'] == $lg)?
-						' selected="selected"' : '')
-					 . ">$lv</option>";
-			}
-		}
-	echo '</select> </label></p>';
-	
-	echo '<p>' .$l['descrl2'] . '</p>';
-	
-	}
-	
-	
-	echo '<div id="more-lang-info" class="info-notice">';
-	echo wpautop(sprintf($l['descrlang'], FP_CONTENT));
-	echo '</div>';
-	
-	*/
-	
+
 	if ($err)
 		 echo wpautop(sprintf($l['descrw'], FP_CONTENT));
 		 
 ?>
-<!-- script type="text/javascript">
-function toggleinfo() {
-	var disp = document.getElementById('more-lang-info').style;
-	if (disp.display.indexOf('block') != -1)
-		disp.display = 'none';
-	else
-		disp.display = 'block';
-}
-
-document.getElementById('more-lang-info').style.display = 'none';
-
-</script -->
 <div id="buttonbar">
 	<input type="submit" name="start" id="start" 
 	value="<?php echo $lang['buttonbar']['next']; ?>" />
 </div>
 
-</div>
\ No newline at end of file
+</div>