cvs: php-gtk-web /include shared-manual.inc /manual add-note.php browse.php

cmv		Fri Aug 10 15:23:39 2001 EDT

  Modified files:              
    /php-gtk-web/include	shared-manual.inc 
    /php-gtk-web/manual	add-note.php browse.php 
  Log:
  grr
  
Index: php-gtk-web/include/shared-manual.inc
diff -u php-gtk-web/include/shared-manual.inc:1.18 php-gtk-web/include/shared-manual.inc:1.19
--- php-gtk-web/include/shared-manual.inc:1.18	Fri Aug 10 15:12:25 2001
+++ php-gtk-web/include/shared-manual.inc	Fri Aug 10 15:23:38 2001
@@ -164,14 +164,15 @@
 }
 
 
-function makeEntry($date,$name,$blurb,$rating=0,$id=0) {
+
+function makeEntry($row, $show_admin = true, $show_rating = true ) {
 	global $MAGIC_COOKIE;
 
 	echo '<tr valign="top">';
 	echo '<td bgcolor="#e0e0e0" colspan="2">';
 	echo '<table border="0" cellpadding="2" cellspacing="0" width="100%">';
 	echo '<tr valign="top"><td>';
-	$name = htmlspecialchars($name);
+	$name = htmlspecialchars($row['user']);
 	if ($name && $name != "[email protected]" && $name != "[email protected]") {
 		if (ereg("(.+)@(.+)\.(.+)",$name)) {
 			echo '<a href="mailto:'.$name.'">'.$name.'</a><br>';
@@ -179,32 +180,40 @@
 			echo '<b>'.$name.'</b><br>';
 		}
 	}
-	echo date("d-M-Y h:i", $date);
+	echo date("d-M-Y h:i", $row['xwhen']);
 	echo '<br></td>';
 	echo '<td align="right"><small>';
-	if (isset($MAGIC_COOKIE) && $id) {
+	if (isset($MAGIC_COOKIE) && $show_admin) {
 
-		print_link('/manual/admin-notes.php?action=edit+' . $id . '&brief=1',
+		print_link('/manual/admin-notes.php?action=edit+' . $row['id'] . '&brief=1',
 			make_image('notes-edit.gif', 'edit note')
 		);
 		echo '&nbsp';
-		print_link('/manual/admin-notes.php?action=reject+' . $id . '&brief=1&popup=1',
+		print_link('/manual/admin-notes.php?action=reject+' . $row['id'] . '&brief=1&popup=1',
 			make_image('notes-reject.gif', 'reject note'),
 			'admin'
 		);
 		echo '&nbsp';
-		print_link('/manual/admin-notes.php?action=delete+' . $id . '&brief=1&popup=1',
+		print_link('/manual/admin-notes.php?action=delete+' . $row['id'] . '&brief=1&popup=1',
 			make_image('notes-delete.gif', 'delete note'),
 			'admin'
 		);
 	}
 	echo '<br>';
 
-	printf('rating: <B>%.02f<B>', $rating );
+	if ($show_rating) {
+		echo 'rating: ';
+		if ( $row['votes'] > 3 ) {
+			printf('<b>%.02f<b> (%d votes)', $row['rate'], $row['votes'] );
+		} else {
+			echo '&lt; 3 votes';
+		}
+		echo '<br>';
+	}
 
-	echo '<br></small></td></tr>';
+	echo '</small></td></tr>';
 	echo '<tr bgcolor="#f0f0f0"><td colspan="2">';
-	echo clean_note($blurb). '<br>';
+	echo clean_note($row['note']). '<br>';
 	echo '</td></tr>';
 	echo '</table>';
 	echo '</td></tr>';
@@ -304,7 +313,7 @@
 	} else {
 
 		foreach($notes as $note) {
-			makeEntry($note['xwhen'], $note['user'], $note['note'], $note['rate'], $note['id'] );
+			makeEntry($note);
 		}
 
                 echo "<tr bgcolor=\"#d0d0d0\" valign=\"top\">\n";
Index: php-gtk-web/manual/add-note.php
diff -u php-gtk-web/manual/add-note.php:1.6 php-gtk-web/manual/add-note.php:1.7
--- php-gtk-web/manual/add-note.php:1.6	Thu Aug  9 17:03:55 2001
+++ php-gtk-web/manual/add-note.php	Fri Aug 10 15:23:39 2001
@@ -72,7 +72,12 @@
 
 		echo '<P>This is what your entry will look like, roughly:</P>';
                 echo '<table border="0" cellpadding="0" cellspacing="0" width="100%">';
-                makeEntry(time(),stripslashes($user),stripslashes($note));
+		$temp = array(
+			'user' => stripslashes($user),
+			'note' => stripslashes($note),
+			'xwhen' => time()
+		);
+                makeEntry($temp, false, false);
                 echo "</table>";
 
         } else {
Index: php-gtk-web/manual/browse.php
diff -u php-gtk-web/manual/browse.php:1.4 php-gtk-web/manual/browse.php:1.5
--- php-gtk-web/manual/browse.php:1.4	Fri Aug 10 15:12:26 2001
+++ php-gtk-web/manual/browse.php	Fri Aug 10 15:23:39 2001
@@ -51,7 +51,7 @@
 			makeTitle( $row['sect'] );
 			$last = $row['sect'];
 		}
-		makeEntry($row['xwhen'], $row['user'], $row['note'], $row['rate'], $row['id'] );
+		makeEntry($row);
 	}
 
 } else if (!$fl) {