Update of /cvs/scoop/scoop/etc
In directory sodium.sabren.com:/tmp/cvs-serv5844/etc

Modified Files:
	httpd-location.conf httpd-vhost.conf startup.pl 
Log Message:

New flexible user preferences stuff.

-janra



Index: startup.pl
===================================================================
RCS file: /cvs/scoop/scoop/etc/startup.pl,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** startup.pl	30 Jul 2004 08:12:54 -0000	1.67
--- startup.pl	4 Aug 2004 21:49:47 -0000	1.68
***************
*** 127,130 ****
--- 127,134 ----
  use Scoop::Session;
  
+ use Scoop::Users;
+ use Scoop::Users::Prefs;
+ use Scoop::Users::NewUser;
+ 
  use Scoop::Stories;
  use Scoop::Stories::Views;
***************
*** 152,155 ****
--- 156,160 ----
  use Scoop::Admin::Hooks;
  use Scoop::Admin::Themes;
+ use Scoop::Admin::Prefs;
  use Scoop::Admin::Logging;
  
***************
*** 158,162 ****
  use Scoop::Comments::Mojo;
  use Scoop::Comments::Rate;
- use Scoop::Comments::Prefs;
  
  use Scoop::Polls::Forms;
--- 163,166 ----

Index: httpd-vhost.conf
===================================================================
RCS file: /cvs/scoop/scoop/etc/httpd-vhost.conf,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** httpd-vhost.conf	5 Oct 2003 19:17:33 -0000	1.29
--- httpd-vhost.conf	4 Aug 2004 21:49:47 -0000	1.30
***************
*** 168,183 ****
  	#PerlSetVar cache_stories 20 <-- not used yet
  	
- 
- 	# You can now add mirrors of your images, distributed 
- 	# geographically. Make sure that the "value" 
- 	# part of the following has quotes around it. Otherwise, 
- 	# it works like a hash. Make the key a descriptive word, 
- 	# and the value the *full URL* to the images/ directory.
- 	# Separate servers with a comma, and make sure to escape newlines
- 	# with a  backslash. Example:
- 	#PerlSetVar image_mirrors "Australia => http://images.au.mysite.org,\
- 	# 						 UK 	   => http://images.uk.mysite.org"
- 
- 	
  	# Linkpoint cc processing settings.
  	# See doc/Linkpoint.howto for instructions.
--- 168,171 ----

Index: httpd-location.conf
===================================================================
RCS file: /cvs/scoop/scoop/etc/httpd-location.conf,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** httpd-location.conf	5 Oct 2003 19:17:33 -0000	1.25
--- httpd-location.conf	4 Aug 2004 21:49:47 -0000	1.26
***************
*** 169,182 ****
  	PerlSetVar site_key __SITE_KEY__
  
-     # You can now add mirrors of your images, distributed 
-     # geographically. Make sure that the "value" 
-     # part of the following has quotes around it. Otherwise, 
-     # it works like a hash. Make the key a descriptive word, 
-     # and the value the *full URL* to the images/ directory.
-     # Separate servers with a comma, and make sure to escape newlines
-     # with a  backslash. Example:
-     #PerlSetVar image_mirrors "Australia => http://images.au.mysite.org,\
- 	#                          UK		 => http://images.uk.mysite.org"
- 
      # Linkpoint cc processing settings.
  	# See doc/Linkpoint.howto for instructions.
--- 169,172 ----