X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fautohandler;h=248f14a24211bd65cb765ce7abe8c341532aa6e9;hp=ad0ab8ba6892a25bd1346111729c071cc1594de1;hb=ff27c3f36240aee48ed50153dd5d8fe3ac3f2443;hpb=2c757d7db4cb6a7b9655de13206fcc84fb7ce61f

diff --git a/httemplate/autohandler b/httemplate/autohandler
index ad0ab8ba6..248f14a24 100644
--- a/httemplate/autohandler
+++ b/httemplate/autohandler
@@ -1,29 +1,50 @@
 % $m->call_next;
 <%init>
+
+  $FS::Maketext::lh = '';
+
   dbh->{'private_profile'} = {} if UNIVERSAL::can(dbh, 'sprintProfile');
+
 </%init>
 <%filter>
 
-my $profile = '';
 if ( UNIVERSAL::can(dbh, 'sprintProfile') ) {
 
-  if ( lc($r->content_type) eq 'text/html' ) {
+  my $profile = '';
+
+  if ( lc($r->content_type) =~ /^text\/html/
+       && $FS::CurrentUser::CurrentUser->option('show_db_profile')
+     )
+  {
 
-    # barely worth it, just in case someone tries to use profiling on a
-    # non-RT install
-    eval "use Text::Wrapper;";
-    die $@ if $@;
+    ## barely worth it, just in case someone tries to use profiling on a
+    ## non-RT install
+    #eval "use Text::Wrapper;";
+    #die $@ if $@;
 
-    my $wrapper = new Text::Wrapper( columns => 80 );
+    my $text = dbh->sprintProfile();
+    #$text =~ s/^/                                                          /mg;
 
-    $profile = '<PRE>'.
-               encode_entities( $wrapper->wrap( dbh->sprintProfile() ) ).
-               #"\n\n". &sprintAutoProfile(). '</PRE>';
-               "\n\n".                        '</PRE>';
-  } 
+    $profile = '<PRE>'.  encode_entities( $text ). "\n\n". '</PRE>';
+
+  }
+
+  #well, could do this without sprintProfile, but definiately don't want it on
+  #unless DBIx::Profile is loaded
+  if ( $FS::CurrentUser::CurrentUser->option('save_db_profile') ) {
+    #my $file = %%%FREESIDE_LOG%%%; #substitute here?  maybe get from FS.pm?
+    my $file = '/usr/local/etc/freeside/'; #bah
+    $file .= "dbix_profile.$$.". time;
+    dbh->setLogFile($file);
+    dbh->printProfile();
+  }
 
   dbh->{'private_profile'} = {};
+
+  s/(<\/BODY>[\s\n]*<\/HTML>[\s\n]*)/$profile$1/i;
 }
 
-s/(<\/BODY>[\s\n]*<\/HTML>[\s\n]*)$/$profile$1/i;
 </%filter>
+<%cleanup>
+   dbh->commit() if dbh;
+</%cleanup>