added style switch for user functions

docs/changelog/6.x.x.txt

@@ -71,6 +71,8 @@
  - fix [ 1003509 ] Admin mode breaks page layout with users not in Admin Group
  - Removed the page stats tracking function as it was killing people's sites.
    We recommend AWStats instead (www.awstats.org)
+ - Added the ability to switch the style for user functions like profiles,
+   authentication, etc.
 
 
 

docs/upgrades/upgrade_6.2.11-6.3.0.pl

@@ -755,9 +755,10 @@ $conf->write;
 
 
 
-print "\tMiscellaneous other changes.\n" unless ($quiet);
-WebGUI::SQL->write("delete from settings where name='snippetPreviewLength'");
-WebGUI::SQL->write("delete from incrementer where incrementerId in ('collateralFolderId','themeId','themeComponentId')");
+print "\tSetting user function style\n" unless ($quiet);
+my ($defaultPageId) = WebGUI::SQL->quickArray("select value from settings where name='defaultPage'");
+my ($styleId) = WebGUI::SQL->quickArray("select styleTemplateId from wobject where assetId=".quote($defaultPageId));
+WebGUI::SQL->write("insert into settings (name,value) values ('userFunctionStyleId',".quote($styleId).")");
 
 
 

docs/upgrades/upgrade_6.2.11-6.3.0.sql

@@ -244,4 +244,8 @@ alter table IndexedSearch_docInfo change wobject_groupIdView groupIdView varchar
 update USS set sortBy='lineage' where sortBy='sequenceNumber';
 delete from settings where name='trackPageStatistics';
 drop table pageStatistics;
+delete from settings where name='snippetPreviewLength';
+delete from incrementer where incrementerId in ('collateralFolderId','themeId','themeComponentId');
+
+
 

lib/WebGUI/Operation/Auth.pm

@@ -16,12 +16,14 @@ package WebGUI::Operation::Auth;
 use strict qw(vars subs);
 use URI;
 use WebGUI::ErrorHandler;
+use WebGUI::Operation::Shared;
 use WebGUI::Session;
 use WebGUI::SQL;
 use WebGUI::URL;
 use WebGUI::User;
 use WebGUI::Utility;
 
+
 #-------------------------------------------------------------------
 
 =head2 getInstance ( )
@@ -56,7 +58,7 @@ sub www_auth {
       WebGUI::ErrorHandler::security("access uncallable auth method on page '".$session{page}{title}."' [".$session{page}{pageId}."].");
 	  return WebGUI::International::get(1077);
    }
-   return $authMethod->$methodCall;   
+   return WebGUI::Operation::Shared::userStyle($authMethod->$methodCall);   
 }
 
 #-------------------------------------------------------------------

lib/WebGUI/Operation/MessageLog.pm

@@ -64,7 +64,7 @@ sub www_viewMessageLog {
    $vars->{'message.multiplePages'} = ($p->getNumberOfPages > 1);
    $vars->{'message.accountOptions'} = WebGUI::Operation::Shared::accountOptions();
 
-   return WebGUI::Asset::Template->new("PBtmpl0000000000000050")->process($vars);
+   return WebGUI::Operation::Shared::userStyle(WebGUI::Asset::Template->new("PBtmpl0000000000000050")->process($vars));
 }
 
 #-------------------------------------------------------------------
@@ -91,7 +91,7 @@ sub www_viewMessageLogMessage {
    
    $vars->{'message.text'} = $data->{message};
    $vars->{'message.accountOptions'} = WebGUI::Operation::Shared::accountOptions();
-   return WebGUI::Asset::Template->new("PBtmpl0000000000000049")->process($vars);
+   return WebGUI::Operation::Shared::userStyle(WebGUI::Asset::Template->new("PBtmpl0000000000000049")->process($vars));
 }
 
 1;

lib/WebGUI/Operation/Profile.pm

@@ -198,7 +198,7 @@ sub www_editProfile {
 	$vars->{'profile.form.elements'} = \@array;
     $vars->{'profile.form.submit'} = WebGUI::Form::submit({});
     $vars->{'profile.accountOptions'} = WebGUI::Operation::Shared::accountOptions();
-	return WebGUI::Asset::Template->new("PBtmpl0000000000000051")->process($vars);
+	return WebGUI::Operation::Shared::userStyle(WebGUI::Asset::Template->new("PBtmpl0000000000000051")->process($vars));
 }
 
 #-------------------------------------------------------------------
@@ -261,7 +261,7 @@ sub www_viewProfile {
 	if ($session{user}{userId} eq $session{form}{uid}) {
        $vars->{'profile.accountOptions'} = WebGUI::Operation::Shared::accountOptions();
 	}
-    return WebGUI::Asset::Template->new("PBtmpl0000000000000052")->process($vars);
+    return WebGUI::Operation::Shared::userStyle(WebGUI::Asset::Template->new("PBtmpl0000000000000052")->process($vars));
 }
 
 1;

lib/WebGUI/Operation/Settings.pm

@@ -215,6 +215,11 @@ sub www_editSettings {
                 -value=>$session{setting}{passiveProfilingEnabled},
                 -extras=>' onChange="alert(\''.$i18n->get("Illegal Warning","Asset").'\')" '
         );
+	$tabform->getTab("user")->yesNo(
+		-name=>"userFunctionStyleId",
+		-label=>"User Function Style",
+		-value=>$session{setting}{userFunctionStyleId}
+		);
 # auth settings 
 	WebGUI::Style::setScript($session{config}{extrasURL}."/swapLayers.js",{language=>"Javascript"});
    	$tabform->getTab("auth")->raw('<script language="JavaScript" > var active="'.$session{setting}{authMethod}.'"; </script>');

lib/WebGUI/Operation/Shared.pm

@@ -17,6 +17,7 @@ use WebGUI::Grouping;
 use WebGUI::International;
 use WebGUI::Session;
 use WebGUI::SQL;
+use WebGUI::Style;
 
 our @ISA = qw(Exporter);
 our @EXPORT = qw(&menuWrapper);
@@ -84,4 +85,16 @@ sub menuWrapper {
         return $output;
 }
 
+#-------------------------------------------------------------------
+sub userStyle {
+	my $output = shift;
+	if ($output) {
+		return WebGUI::Style::process($output,$session{setting}{userFunctionStyleId});
+	} else {
+		return undef;
+	}
+}
+
+
+
 1;

lib/WebGUI/Operation/Subscription.pm

@@ -426,7 +426,7 @@ sub www_redeemSubscriptionCode {
 	$f->submit;
 	$var{codeForm} = $f->print;
 
-	return WebGUI::Asset::Template->new("PBtmpl0000000000000053")->process(\%var);
+	return WebGUI::Operation::Shared::userStyle(WebGUI::Asset::Template->new("PBtmpl0000000000000053")->process(\%var));
 }
 
 1;