X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fsvc_www.cgi;h=adc31c88aad021181e50518949ac1b44e234d4e5;hb=8dba5cb96454bf8ec81333ebac381180731396f1;hp=de1f5dd78ee8d0995513b2df20429c73161862ab;hpb=2eb5fc5cdbe002fd17a4d3ee5bde71b4f5422f8b;p=freeside.git

diff --git a/httemplate/search/svc_www.cgi b/httemplate/search/svc_www.cgi
index de1f5dd78..adc31c88a 100755
--- a/httemplate/search/svc_www.cgi
+++ b/httemplate/search/svc_www.cgi
@@ -1,28 +1,104 @@
-<%
+<% include( 'elements/search.html',
+                 'title'       => 'Virtual Host Search Results',
+                 'name'        => 'virtual hosts',
+                 'query'       => $sql_query,
+                 'count_query' => $count_query,
+                 'redirect'    => $link,
+                 'header'      => [ '#',
+                                    'Service',
+                                    'Zone',
+                                    'User',
+                                    FS::UI::Web::cust_header(),
+                                  ],
+                 'fields'      => [ 'svcnum',
+                                    'svc',
+                                    sub { $_[0]->domain_record->zone },
+                                    sub {
+                                          my $svc_www = shift;
+                                          my $svc_acct = $svc_www->svc_acct;
+                                          $svc_acct
+                                            ? $svc_acct->email
+                                            : '';
+                                        },
+                                    \&FS::UI::Web::cust_fields,
+                                  ],
+                 'links'       => [ $link,
+                                    $link,
+                                    '',
+                                    $ulink,
+                                    ( map { $_ ne 'Cust. Status' ? $link_cust : '' }
+                                          FS::UI::Web::cust_header()
+                                    ),
+                                  ],
+                 'align' => 'rlll'. FS::UI::Web::cust_aligns(),
+                 'color' => [ 
+                              '',
+                              '',
+                              '',
+                              '',
+                              FS::UI::Web::cust_colors(),
+                            ],
+                 'style' => [ 
+                              '',
+                              '',
+                              '',
+                              '',
+                              FS::UI::Web::cust_styles(),
+                            ],
+             )
+%>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('List services');
 
 #my $conf = new FS::Conf;
 
-my($query)=$cgi->keywords;
-$query ||= ''; #to avoid use of unitialized value errors
-my $orderby;
-if ( $query eq 'svcnum' ) {
-  $orderby = 'ORDER BY svcnum';
-} else {
-  eidiot('unimplemented');
+my $orderby = 'ORDER BY svcnum';
+my @extra_sql = ();
+if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
+
+  push @extra_sql, 'pkgnum IS NULL'
+    if $cgi->param('magic') eq 'unlinked';
+
+  if ( $cgi->param('sortby') =~ /^(\w+)$/ ) {
+    my $sortby = $1;
+    $orderby = "ORDER BY $sortby";
+  }
+
+} elsif ( $cgi->param('svcpart') =~ /^(\d+)$/ ) {
+  push @extra_sql, "svcpart = $1";
 }
 
-my $count_query = 'SELECT COUNT(*) FROM svc_www';
+my $addl_from = ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
+                ' LEFT JOIN part_svc  USING ( svcpart ) '.
+                ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
+                ' LEFT JOIN cust_main USING ( custnum ) ';
+
+#here is the agent virtualization
+push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql(
+                   'null_right' => 'View/link unlinked services'
+                 );
+
+my $extra_sql = 
+  scalar(@extra_sql)
+    ? ' WHERE '. join(' AND ', @extra_sql )
+    : '';
+
+
+my $count_query = "SELECT COUNT(*) FROM svc_www $addl_from $extra_sql";
 my $sql_query = {
   'table'     => 'svc_www',
   'hashref'   => {},
   'select'    => join(', ',
                    'svc_www.*',
-                   map "cust_main.$_", qw(custnum last first company)
+                   'part_svc.svc',
+                   'cust_main.custnum',
+                   FS::UI::Web::cust_sql_fields(),
                  ),
-  'extra_sql' => $orderby,
-  'addl_from' => 'LEFT JOIN cust_svc  USING ( svcnum  )'.
-                 'LEFT JOIN cust_pkg  USING ( pkgnum  )'.
-                 'LEFT JOIN cust_main USING ( custnum )',
+  'extra_sql' => $extra_sql,
+  'order_by'  => $orderby,
+  'addl_from' => $addl_from,
 };
 
 my $link  = [ "${p}view/svc_www.cgi?", 'svcnum', ];
@@ -35,26 +111,4 @@ my $link_cust = sub {
   $svc_x->custnum ? [ "${p}view/cust_main.cgi?", 'custnum' ] : '';
 };
 
-%><%= include( 'elements/search.html',
-                 'title'       => 'Virtual Host Search Results',
-                 'name'        => 'virtual hosts',
-                 'query'       => $sql_query,
-                 'count_query' => $count_query,
-                 'redirect'    => $link,
-                 'header'      => [ '#',
-                                    'Zone',
-                                    'User',
-                                    'Customer',
-                                  ],
-                 'fields'      => [ 'svcnum',
-                                    sub { $_[0]->domain_record->zone },
-                                    sub { $_[0]->svc_acct->email },
-                                    \&FS::svc_Common::cust_name,
-                                  ],
-                 'links'       => [ $link,
-                                    '',
-                                    $ulink,
-                                    $link_cust,
-                                  ],
-             )
-%>
+</%init>