[Webnotes-cvs] webnotes/themes/phpnet theme_api.php,1.2,1.3

[<vb...@us...>]

Update of /cvsroot/webnotes/webnotes/themes/phpnet
In directory usw-pr-cvs1:/tmp/cvs-serv31397/themes/phpnet

Modified Files:
	theme_api.php 
Log Message:
- Fixed 0000026: Submitting notes does not go back to the document
- Partially Fixed 0000019: Support auto-accepting of notes
- Fixed a problem in add_file() in page_api where it was rejecting new pages rather than duplicate pages.

Index: theme_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/themes/phpnet/theme_api.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- theme_api.php	9 Sep 2002 11:24:31 -0000	1.2
+++ theme_api.php	9 Sep 2002 22:30:22 -0000	1.3
@@ -31,7 +31,7 @@
 	}
 
 	# This function is called before printing any notes to the page.
-	function theme_notes_start( $p_page ) {
+	function theme_notes_start( $p_page, $p_url ) {
 		global $g_note_add_page, $s_add_note_link, $s_manage, $s_admin, $g_web_directory, $g_theme;
 
 		if ( isset( $p_page ) ) {
@@ -40,7 +40,7 @@
 			$t_page = "Test Page";
 		}
 
-		$c_url = urlencode( $p_page );
+		$c_url = urlencode( $p_url );
 		$t_page_id = get_page_id( $p_page );
 
 		#$path = dirname ( __FILE__ ) . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR;
@@ -64,7 +64,7 @@
 	# are all included in the associative array that is passed to the
 	# function.  The theme should check that a field is defined in 
 	# the array before using it.
-	function theme_notes_echo( $p_page, $p_note_info_array ) {
+	function theme_notes_echo( $p_page, $p_url, $p_note_info_array ) {
 
 		if ( isset( $p_note_info_array['id'] ) ) {
 			$t_id = (integer)$p_note_info_array['id'];
@@ -110,7 +110,7 @@
 	}
 
 	# This function is called after all notes are echo'ed.
-	function theme_notes_end( $p_page ) {
+	function theme_notes_end( $p_page, $p_url ) {
 		global $g_note_add_page, $g_web_directory, $g_theme;
 
 		if ( isset( $p_page ) ) {
@@ -119,7 +119,7 @@
 			$t_page = "Test Page";
 		}
 
-		$c_url = urlencode( $p_page );
+		$c_url = urlencode( $p_url );
 		$t_page_id = get_page_id( $p_page );
 
 		$url = $g_web_directory . '/themes/' . $g_theme . '/images/';
@@ -138,9 +138,9 @@
 	# This function is called if the current page has no notes associated
 	# with it.  In this case theme_notes_start() and theme_notes_end() 
 	# APIs are not called.
-	function theme_notes_none( $p_page ) {
-		theme_notes_start( $p_page );
-		theme_notes_end( $p_page );
+	function theme_notes_none( $p_page, $p_url ) {
+		theme_notes_start( $p_page, $p_url );
+		theme_notes_end( $p_page, $p_url );
 	}
 
 	# This function is called if the current page was not indexed