[Webnotes-cvs] webnotes/core config_defaults_inc.php,NONE,1.1 api.php,1.23,1.24 config_inc.php,1.18,NONE

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

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

Modified Files:
	api.php 
Added Files:
	config_defaults_inc.php 
Removed Files:
	config_inc.php 
Log Message:
- 0000048: Rename config_inc.php to config_defaults_inc.php 

--- NEW FILE: config_defaults_inc.php ---
<?php
	# phpWebNotes - a php based note addition system
	# Copyright (C) 2000-2002 Webnotes Team - web...@so...
	# This program is distributed under the terms and conditions of the GPL
	# See the files README and LICENSE for details

	# --------------------------------------------------------
	# $Id: config_defaults_inc.php,v 1.1 2002/09/17 22:18:24 vboctor Exp $
	# --------------------------------------------------------

	#####################
	# VERSION SETTINGS
	#####################

	$g_phpWebNotes_version = '2.0.0-CVS';

	### Display phpWebNotes version on pages
	$g_show_version = ON;

	######################
	# DATABASE SETTINGS
	######################

	$g_hostname = 'localhost';
	$g_db_username = 'root';
	$g_db_password = '';
	$g_database_name = 'phpWebNotes';

	### Database Table Names
	$g_phpWN_note_table = 'phpWN_note_table';
	$g_phpWN_page_table = 'phpWN_page_table';
	$g_phpWN_user_table = 'phpWN_user_table';

	####################
	# SERVER SETTINGS
	####################

	# Using Microsoft Internet Information Server (IIS)
	$g_use_iis = OFF;

	### File extension to use.  Default is .php.
	### Switch to .php3 if you ran convertToPHP3
	$g_ext = '.php';

	### url directory
	$g_web_directory = '/webnotes/';

	### absolute directory path
	$g_absolute_directory = dirname( dirname( __FILE__ ) ) . DIRECTORY_SEPARATOR;

	######################
	# COOKIES' SETTINGS
	######################

	### Cookies
	$g_string_cookie = 'PHPWEBNOTES_COOKIE_STRING';

	##################
	# TIME SETTINGS
	##################

	### Time to wait between redirects (except index.html)
	$g_time_wait = 2;

	### This is how long the "save login" cookies live.
	$g_cookie_time_length = 30000000;  # 1 year

	#####################
	# DISPLAY SETTINGS
	#####################

	$g_window_title = 'phpWebNotes';
	$g_page_title = 'phpWebNotes';

	### default ordering of the notes.
	### ASC = newest on bottom
	$g_note_order = 'ASC';

	### optional page includes (for appearance customization)
	$g_top_page_inc = '';
	$g_bottom_page_inc = '';

	$g_date_format = 'm-d-y H:i';

	### change to language you want... choices are:
	### english
	$g_language = 'english';

	### Theme to be used
	$g_theme = 'phpnet';

	### Customize this file for the add message page
	$g_note_add_include = 'note_add_msg_inc.php';

	### Colors
	$g_table_border_color = '#aaaaaa';
	$g_table_title_color = '#cccccc';  # temporary color, should be changed
	$g_primary_dark_color = '#d8d8d8';
	$g_primary_light_color = '#e8e8e8';
	$g_white_color = '#ffffff';
	$g_header_color = '#bbddff';

	####################################
	# CACHING / OPTIMISATION SETTINGS 
	####################################

	# minutes to wait before document is stale (in minutes)
	$g_content_expire = 0;

	###################
	# ADMIN SETTINGS
	###################

	$g_auto_index_pages = ON;

	########################
	# MODERATION SETTINGS
	########################

	$g_auto_accept_notes = OFF;
	
	################################
	# SECURITY AND AUTHENTICATION 
	################################

	# AUTH_MD5, AUTH_CRYPT, AUTH_PLAIN
	$g_auth_type = AUTH_PLAIN;
	
	# allow users to signup for their own accounts
	$g_allow_signup = ON;

	###################
	# EMAIL SETTINGS
	###################

	# This option allows you to use a remote SMTP host.  Must use the phpMailer script
	# Name of smtp host, needed for phpMailer, taken from php.ini
	$g_smtp_host     = 'localhost';

	$g_webmaster_email = 'webmaster@nowhere';
	$g_administrator_email = 'admin@nowhere';

	# the "From: " field in emails
	$g_from_email           = 'noreply@nowhere';

	# the return address for bounced mail
	$g_return_path_email    = 'admin@nowhere';

	# if ON users will be sent their password when reset.
	# if OFF the password will be set to blank.
	$g_send_reset_password       = ON;

	# allow email notification
	$g_enable_email_notification = ON;

	# @@@@ what is the benefit of this option?
	# Set to OFF to remove X-Priority header
	$g_use_x_priority            = ON;

	# some Mail transfer agents (MTAs) don't like bare linefeeds...
	# or they take good input and create barelinefeeds
	# If problems occur when sending mail through your server try turning this OFF
	# more here: http://pobox.com/~djb/docs/smtplf.html
	$g_mail_send_crlf            = OFF;
?>
Index: api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/api.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- api.php	17 Sep 2002 00:55:35 -0000	1.23
+++ api.php	17 Sep 2002 22:18:24 -0000	1.24
@@ -18,7 +18,7 @@
 	# The $g_ext can not be used before the custom config is included.
 	require_once( $t_path_core . 'php_api.php' );
 	require_once( $t_path_core . 'constants_inc.php' );
-	require_once( $t_path_core . 'config_inc.php' );
+	require_once( $t_path_core . 'config_defaults_inc.php' );
 
 	$t_custom_config = $t_path_core . 'custom_config_inc.php';
 	if ( file_exists( $t_custom_config ) ) {

--- config_inc.php DELETED ---