From 471f600ba1703e67a2fbd84707749997501c6830 Mon Sep 17 00:00:00 2001
From: Jason Pierce <pierce.jason@gmail.com>
Date: Mon, 18 Feb 2008 02:54:39 -0600
Subject: [PATCH] newpage: fix multi-file updates via changing several
 getchdir() to getcwd() remove debug output better indention of output

---
 newpage/newpage.php | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/newpage/newpage.php b/newpage/newpage.php
index f2fcb6d..dceefbc 100755
--- a/newpage/newpage.php
+++ b/newpage/newpage.php
@@ -2,7 +2,7 @@
 <?php
 ###
 ## newpage.sh implementation in php
-## v0.2.1
+## v0.2.2
 ## ++) fopen(STDIN)
 ## +/) Basic substitution support ([MODDATE],[SEL])
 ## 4) Multi-site support (pub,dev need different headers, footers, output directory, etc.
@@ -50,7 +50,7 @@ function process_files($files)
 		{
 			// continue should be named discontinue??  Odd nameing...
 			// this skips the rest of this itteration, and starts on next $file
-			echo "\t[ !]Updated file $file: Not templating, wrong dir. \n";
+			echo "\t[ !]Updated file $file: Wrong dir, ignore. \n";
 			continue;
 		}
 
@@ -59,14 +59,14 @@ function process_files($files)
 		// editors will syntax as html, we can easily see it is for templating
 		if ($file_info['extension'] == 'htm')
 		{
-			echo "\t[ +]Updated content file $file: doing something cool now. \n";
+			echo "\n\t[ +]Updated file $file: Templating contents... \n";
 			apply_templates($file_info['dirname'], $file_info['filename']);
 			backup_hpage($file_info['dirname'], $file_info['filename']);
 			place_hpage($file_info['dirname'], $file_info['filename']);
 			popdir();
 		} else
 		{
-			echo "\t[ !]Updated non-content file $file: nothing cool to do here. \n";
+			echo "\n\t[ !]Updated file $file: Wrong extension, ignore. \n";
 		}
 	}
 }
@@ -89,7 +89,7 @@ function apply_templates($dir, $file)
 
 	$full_content = shell_exec($git_get_command);
 	$CWD = getchdir('../');
-	echo "\n\tMoving up in apply_templates() .. $CWD\n";
+#	echo "\ndbg\tMoving up in apply_templates() .. $CWD\n";
 	if (touch($tmp_file) != TRUE)
 	{
 		die("[!!]While creating $tmp_file: Unable to write in directory $CWD\n");
@@ -109,20 +109,20 @@ function backup_hpage($dir, $file)
 	##	Create blank file content.html
 	###	
 	$dir = realpath('./public_html/' . $dir) . '/';
-	$CWD = getchdir();
-	echo "\n\tGoing nowhere in backup_hpage() .. $CWD\n";
+	$CWD = getcwd();
+#	echo "\ndbg\tGoing nowhere in backup_hpage() .. $CWD\n";
 	$hpage = $dir . $file . '.html';
-	var_dump($hpage);
+
 	if (file_exists($hpage))
 	{
 		$hpage_bup = $hpage . '.bup';
 		if (file_exists($hpage_bup))
 		{
 			unlink($hpage_bup);
-			echo "\t[ +]Deleted previous backup of $hpage. \n";
+			echo "\t\t[ +]Deleted previous backup of $hpage. \n";
 		}
 		rename($hpage, $hpage_bup);
-		echo "\t[ +]Backing up current $hpage to $hpage_bup. \n";
+		echo "\t\t[ +]Backing up current $hpage to $hpage_bup. \n";
 	}
 	// public_html/content.html should not exist now. only public_html/hpage.html.bup
 	if (touch($hpage) != TRUE)
@@ -137,13 +137,13 @@ function place_hpage($dir, $file)
 	##	We already verified that we can write to new hpage location.
 	##	So just move the tmp hpage to that location, and call it a day!
 	###
-	$CWD = getchdir();
-	echo "\n\tStill here in place_hpage() .. $CWD\n";
+	$CWD = getcwd();
+#	echo "\ndbg:\tStill here in place_hpage() .. $CWD\n";
 	$dir = realpath('./public_html/' . $dir) . '/';
 	$tmp_file = 'tmp.' . $file . '.html';
 	$hpage = $dir . $file . '.html';
 	rename($tmp_file, $hpage);
-	echo "[++]Write successful: $hpage. \n";
+	echo "\t[++]Write successful: $hpage. \n";
 }
 
 function diff_files($old, $new)
@@ -174,16 +174,8 @@ function popdir()
 	##	Take us back into git dir. 
 	###
 	global $g_CWD;
-	$CWD = getcwd();
-	var_dump($CWD);
-	var_dump($g_CWD);
 	$dir = array_pop($g_CWD);
-	var_dump($g_CWD);
-	var_dump($dir);
 	chdir($dir);
-
-
-	return $CWD;
 }
 // include_once('sub_engine.php');
 ?>
\ No newline at end of file
-- 
2.11.4.GIT