changed names of user account options from "user accounts" to "user_a…

…ccounts" to be more consistent

Build.PL

@@ -81,7 +81,7 @@ my $build = GBrowseInstall->new(
 print STDERR <<END;
 **** WARNING *****************************************************************************************
 If you are upgrading from an earlier version of GBrowse and wish to use named user accounts, please 
-set "user accounts" to 1 in /etc/gbrowse2/GBrowse.conf and run bin/gbrowse_metadb_config.pl to 
+set "user_accounts" to 1 in /etc/gbrowse2/GBrowse.conf and run bin/gbrowse_metadb_config.pl to 
 create/update your user account database.
 
 See /etc/gbrowse2/GBrowse.conf.new for suggested settings.

INSTALL.SKIP

@@ -38,3 +38,13 @@
 ^blib/conf\/yeast_simple\.conf$
 ^blib/etc\/default\/gbrowse\-slave$
 ^blib/etc\/init\.d\/gbrowse\-slave$
+^blib/conf\/GBrowse\.conf$
+^blib/conf\/pop_demo\.conf$
+^blib/conf\/slave_preload\.conf$
+^blib/conf\/synteny\/rice_synteny\.conf$
+^blib/conf\/synteny\/wild_rice_synteny\.conf$
+^blib/conf\/yeast_chr1\+2\.conf$
+^blib/conf\/yeast_renderfarm\.conf$
+^blib/conf\/yeast_simple\.conf$
+^blib/etc\/default\/gbrowse\-slave$
+^blib/etc\/init\.d\/gbrowse\-slave$

conf/GBrowse.conf

@@ -152,9 +152,9 @@ max keyword results    = 1000
 ####### User Account Registration Database ######
 # If "user accounts" is true, then we will try to use
 # a user registration database
-user accounts               = $CAN_USER_ACCOUNTS
-user accounts registration  = $CAN_USER_ACCOUNTS_REG
-user accounts openid        = $CAN_USER_ACCOUNTS_OPENID
+user_accounts               = $CAN_USER_ACCOUNTS
+user_accounts_registration  = $CAN_USER_ACCOUNTS_REG
+user_accounts_openid        = $CAN_USER_ACCOUNTS_OPENID
 
 
 # Path to the database -- you will need to create this database and grant all

lib/Bio/Graphics/Browser2.pm

@@ -241,16 +241,19 @@ sub application_name_long  { shift->setting(general=>'application_name_long') ||
 sub email_address          { shift->setting(general=>'email_address')         || 'noreply@gbrowse.com'        }
 sub smtp                   { shift->setting(general=>'smtp_gateway')          || 'smtp.res.oicr.on.ca'        }
 sub user_account_db        { shift->setting(general=>'user_account_db')                                       } # Used by uploads & user databases, they set their own defaults.
-sub user_accounts	   { shift->setting(general=>'user accounts')	      || 0                            }
+sub user_accounts	   { my $self = shift;
+			     return $self->setting(general=>'user_accounts') ||
+				    $self->setting(general=>'user_accounts')  || 
+				    0; }
 sub user_accounts_allow_registration
                            { 
-			       my $val = shift->setting(general=>'user accounts registration');
+			       my $val = shift->setting(general=>'user_accounts_registration');
 			       return 1 unless defined $val;
 			       return $val;
 			   }
 sub user_accounts_allow_openid
                            { 
-			       my $val = shift->setting(general=>'user accounts openid');
+			       my $val = shift->setting(general=>'user_accounts_openid');
 			       return 1 unless defined $val;
 			       return $val;
 			   }

lib/Bio/Graphics/Browser2/Render/HTML.pm

@@ -340,7 +340,7 @@ sub render_html_head {
       foreach qw(controls.js autocomplete.js);
   }
 
-  if ($self->setting('user accounts')) {
+  if ($self->globals->user_accounts)) {
     push @scripts,{src=>"$js/$_"}
       foreach qw(login.js);
   }
@@ -696,7 +696,7 @@ sub render_actionmenu {
     my $chrom_sizes_link = a({-href=>'?action=chrom_sizes'},$self->translate('CHROM_SIZES'));
     my $reset_link       = a({-href=>'?reset=1',-class=>'reset_button'},    $self->translate('RESET'));
 
-    my $login = $self->setting('user accounts') ? $self->render_login : '';
+    my $login = $self->globals->user_accounts ? $self->render_login : '';
 
     my $file_menu = ul({-id    => 'actionmenu',
 			-class => 'dropdown downdown-horizontal'},