fixed registration to use existing functions... yea I also broke it at the same time.. I know

1 files changed, 42 insertions, 29 deletions

diff --git a/config/ampache.cfg.php.dist b/config/ampache.cfg.php.dist
index cbd73113..f106e628 100644
--- a/config/ampache.cfg.php.dist
+++ b/config/ampache.cfg.php.dist
@@ -119,35 +119,6 @@ require_session = "true"
 # DEFAULT: false
 #allow_zip_download = "false"
 
-# This setting turns on/off public registration. It is
-# recommended you leave this off, as it will allow anyone to
-# sign up for an account on your server.
-# REMEMBER: don't forget to set the mail from address futher down in the config.
-# DEFAULT: false
-#allow_public_registration = "false"
-
-# This setting defines the mail domain your in.
-# It tries to deliver a test mail before the user can register and uses
-# the from address info@"domain.tld". No mail is send from this address it's
-# only used to test the existense of a mailbox before accepting user registration.
-# DEFAULT: domain.tld
-#mail_domain = "domain.tld"
-
-# This settting will be used as mail from address.
-# You need to change this when you activate public_registration.
-mail_from = "info@domain.tld"
-
-# This setting will allow all registrants to be auto-approved
-# as a user. By default, they will be added as a guest and
-# must be "promoted" by the admin.
-# DEFAULT: false
-#auto_user = "false"
-
-# This will display the user agreement when registering
-# For agreement text, edit templates/user_agreement.php
-# User will need to accept the agreement before they can register
-#user_agreement = "false"
-
 # This sets which ID3 tag takes precedence.
 # we've found for those of you who don't have
 # good v2 tags it's sometimes nice to keep the v1
@@ -262,6 +233,48 @@ max_upload_size = "10485760"
 # DEFAULT: iso-8859-1
 site_charset = iso-8859-1
 
+
+##########################################################
+# Public Registration settings, defaults to disabled 
+##########################################################
+
+# This setting turns on/off public registration. It is
+# recommended you leave this off, as it will allow anyone to
+# sign up for an account on your server.
+# REMEMBER: don't forget to set the mail from address futher down in the config.
+# DEFAULT: false
+#allow_public_registration = "false"
+
+# Require Captcha Text on Image confirmation
+# Turning this on requires the user to correctly
+# type in the letters in the image created by Captcha
+# Default is off because its very hard to detect if it failed
+# to draw, or they failed to enter it.
+# DEFAULT: false
+#captcha_public_reg = "false"
+
+# This setting defines the mail domain your in.
+# It tries to deliver a test mail before the user can register and uses
+# the from address info@"domain.tld". No mail is send from this address it's
+# only used to test the existense of a mailbox before accepting user registration.
+# DEFAULT: domain.tld
+#mail_domain = "domain.tld"
+
+# This settting will be used as mail from address.
+# You need to change this when you activate public_registration.
+#mail_from = "info@domain.tld"
+
+# This setting will allow all registrants to be auto-approved
+# as a user. By default, they will be added as a guest and
+# must be "promoted" by the admin.
+# DEFAULT: false
+#auto_user = "false"
+
+# This will display the user agreement when registering
+# For agreement text, edit templates/user_agreement.php
+# User will need to accept the agreement before they can register
+#user_agreement = "false"
+
 ##########################################################
 # These Option Control which playback methods are allowed
 ##########################################################