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

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

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