This commit was generated by cvs2svn to compensate for changes in r10640,

[freeside.git] / rt / lib / RT / URI / freeside / Internal.pm

diff --git a/rt/lib/RT/URI/freeside/Internal.pm b/rt/lib/RT/URI/freeside/Internal.pm
index 4f5a73e..b5af134 100644 (file)
--- a/rt/lib/RT/URI/freeside/Internal.pm
+++ b/rt/lib/RT/URI/freeside/Internal.pm
@@ -28,11 +28,12 @@
 use strict;
 no warnings qw(redefine);
 
-use vars qw($conf);
+#use vars qw($conf);
 
 use FS;
 use FS::UID qw(dbh);
-use FS::CGI qw(popurl small_custview);
+use FS::CGI qw(popurl);
+use FS::UI::Web::small_custview qw(small_custview);
 use FS::Conf;
 use FS::Record qw(qsearchs qsearch dbdef);
 use FS::cust_main;
@@ -94,7 +95,8 @@ sub FreesideVersion {
 
 sub FreesideGetConfig {
 
-  $conf = new FS::Conf unless ref($conf);
+  #$conf = new FS::Conf unless ref($conf);
+  my $conf = new FS::Conf;
 
   return scalar($conf->config(@_));
 
@@ -102,13 +104,19 @@ sub FreesideGetConfig {
 
 sub smart_search { #Subroutine
 
-  return map { { $_->hash } } &FS::cust_main::smart_search(@_);
+  return map { { $_->hash } } &FS::cust_main::Search::smart_search(@_);
+
+}
+
+sub email_search { #Subroutine
+
+  return map { { $_->hash } } &FS::cust_main::Search::email_search(@_);
 
 }
 
 sub small_custview {
 
-  return &FS::CGI::small_custview(@_);
+  return &FS::UI::Web::small_custview::small_custview(@_);
 
 }