webnotes-cvs Mailing List for phpWebNotes (Page 10)

Status: Beta

Brought to you by: prescience, vboctor

webnotes-cvs — CVS monitoring only

You can subscribe to this list here.

2002	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep (240)	_Oct (66)	_Nov	_Dec
2003	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug (9)	_Sep (7)	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 .. 8 9 10 11 12 13 > >> (Page 10 of 13)

[Webnotes-cvs] webnotes/core api.php,1.17,1.18 config_inc.php,1.13,1.14

From: <vb...@us...> - 2002-09-11 14:34:02

Update of /cvsroot/webnotes/webnotes/core
In directory usw-pr-cvs1:/tmp/cvs-serv8432

Modified Files:
	api.php config_inc.php 
Log Message:
Fixed 0000032: Setting paths/urls for phpWebNotes in custom_config_inc.php is too late.

Index: api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/api.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- api.php	11 Sep 2002 09:49:54 -0000	1.17
+++ api.php	11 Sep 2002 14:33:58 -0000	1.18
@@ -24,6 +24,26 @@
 	if ( file_exists( $t_custom_config ) ) {
 		require_once( $t_custom_config );
 	}
+	
+	# Filenames
+	$g_login = $g_web_directory . 'login' . $g_ext;
+	$g_login_page = $g_web_directory . 'login_page' . $g_ext;
+	$g_login_success_page = $g_web_directory . 'index' . $g_ext;
+	$g_logout = $g_web_directory . 'logout' . $g_ext;
+	$g_logout_redirect_page = $g_web_directory;
+
+	$g_admin_page = $g_web_directory . 'admin' . $g_ext;
+	$g_admin_index_files = $g_web_directory . 'admin_index_files' . $g_ext;
+	$g_admin_manage_notes = $g_web_directory . 'admin_manage_notes' . $g_ext;
+	$g_admin_view_queue = $g_web_directory . 'admin_view_queue' . $g_ext;
+	$g_admin_pending = $g_web_directory . 'admin_pending' . $g_ext;
+	$g_admin_change_password = $g_web_directory . 'admin_change_password' . $g_ext;
+
+	$g_css_inc_file = $g_absolute_directory . 'core' . DIRECTORY_SEPARATOR . 'css_inc' . $g_ext;
+
+	$g_note_add_page = $g_web_directory . 'note_add_page' . $g_ext;
+	$g_note_preview_page = $g_web_directory . 'note_preview_page' . $g_ext;
+	$g_note_add = $g_web_directory . 'note_add' . $g_ext;
 
 	$t_path_lang = $t_path_main . 'lang' . DIRECTORY_SEPARATOR;
 	require_once( $t_path_lang . 'strings_english' . $g_ext );

Index: config_inc.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/config_inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- config_inc.php	11 Sep 2002 09:49:54 -0000	1.13
+++ config_inc.php	11 Sep 2002 14:33:59 -0000	1.14
@@ -50,33 +50,10 @@
 	$g_ext = '.php';
 
 	### url directory
-	$g_web_directory = DIRECTORY_SEPARATOR . 'webnotes' . DIRECTORY_SEPARATOR;
+	$g_web_directory = '/webnotes/';
 
 	### absolute directory path
 	$g_absolute_directory = dirname( dirname( __FILE__ ) ) . DIRECTORY_SEPARATOR;
-
-
-	### Filenames
-	$g_login = $g_web_directory . 'login' . $g_ext;
-	$g_login_page = $g_web_directory . 'login_page' . $g_ext;
-	$g_login_success_page = $g_web_directory . 'index' . $g_ext;
-	$g_logout = $g_web_directory . 'logout' . $g_ext;
-	$g_logout_redirect_page = $g_web_directory;
-
-	$g_admin_page = $g_web_directory . 'admin' . $g_ext;
-	$g_admin_index_files = $g_web_directory . 'admin_index_files' . $g_ext;
-	$g_admin_manage_notes = $g_web_directory . 'admin_manage_notes' . $g_ext;
-	$g_admin_view_queue = $g_web_directory . 'admin_view_queue' . $g_ext;
-	$g_admin_pending = $g_web_directory . 'admin_pending' . $g_ext;
-	$g_admin_change_password = $g_web_directory . 'admin_change_password' . $g_ext;
-
-	$g_css_inc_file = $g_absolute_directory . 'core' . DIRECTORY_SEPARATOR . 'css_inc' . $g_ext;
-
-	$g_note_add_page = $g_web_directory . 'note_add_page' . $g_ext;
-
-	$g_note_preview_page = $g_web_directory . 'note_preview_page' . $g_ext;
-
-	$g_note_add = $g_web_directory . 'note_add' . $g_ext;
 
 	######################
 	# COOKIES' SETTINGS

[Webnotes-cvs] webnotes/core note_api.php,1.12,1.13

From: <vb...@us...> - 2002-09-11 10:00:41

Update of /cvsroot/webnotes/webnotes/core
In directory usw-pr-cvs1:/tmp/cvs-serv27294/core

Modified Files:
	note_api.php 
Log Message:
Fixed a problem with note_queue_count() where it used to count orphan 
notes.  Although this case should be fixed elsewhere, it should be handled 
correctly if it exists.

Index: note_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/note_api.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- note_api.php	11 Sep 2002 09:49:54 -0000	1.12
+++ note_api.php	11 Sep 2002 10:00:38 -0000	1.13
@@ -10,11 +10,13 @@
 
 	### --------------------
 	function note_queue_count() {
-		global $g_phpWN_note_table;
+		global $g_phpWN_note_table, $g_phpWN_page_table;
 
+		# the reason of including the page is to avoid counting orphan
+		# notes.
 		$query = "SELECT COUNT(*)
-				FROM $g_phpWN_note_table
-				WHERE visible='0'";
+				FROM $g_phpWN_note_table n, $g_phpWN_page_table p
+				WHERE visible='0' AND n.page_id = p.id";
 		$result = db_query( $query );
 		return db_result( $result, 0, 0 );
 	}
@@ -37,7 +39,7 @@
 	    		INTO $g_phpWN_note_table
 	    		( id, page_id, email, ip, date_submitted, note, visible )
 				VALUES
-				( null, '$c_page_id', '$c_email', '$c_remote_address', NOW(), '$c_note', $t_visible )";
+				( null, '$c_page_id', '$c_email', '$c_remote_address', NOW(), '$c_note', '$t_visible' )";
 	    return db_query( $query );
 	}
 	### --------------------
@@ -234,4 +236,4 @@
 		}
 	}
 	### --------------------
-?>
\ No newline at end of file
+?>

[Webnotes-cvs] webnotes/core access_api.php,1.1,1.2 api.php,1.16,1.17 config_api.php,1.1,1.2 config_inc.php,1.12,1.13 constants_inc.php,1.1,1.2 css_inc.php,1.1,1.2 database_api.php,1.2,1.3 lang_api.php,1.1,1.2 link_api.php,1.2,1.3 note_api.php,1.11,1.12 page_api.php,1.8,1.9 php_api.php,1.4,1.5 string_api.php,1.2,1.3 user_api.php,1.1,1.2 util_api.php,1.2,1.3