', + ' '. encode_entities($return{'subject'}), + '

'. $section->{'posttotal'}. ''. @@ -233,8 +224,8 @@ $OUT .= &{$section->{total_line_generator}}($line); } else { $OUT .= qq( ). - qq('. + qq(' : '>' ). $line->{'total_item'}. ''. qq(). $line->{'total_amount'}. ''; diff --git a/conf/invoice_latex b/conf/invoice_latex index 29a901df1..d37eeba3a 100644 --- a/conf/invoice_latex +++ b/conf/invoice_latex @@ -24,14 +24,14 @@ \addtolength{\voffset}{-0.0cm} % top margin to top of header \addtolength{\hoffset}{-0.6cm} % left margin on page -\addtolength{\topmargin}{[@-- defined($topmargin) ? $topmargin : '-1.25cm' --@]} +\addtolength{\topmargin}{-1.25cm} % top margin to top of header \setlength{\headheight}{2.0cm} % height of header -\setlength{\headsep}{[@-- defined($headsep) ? $headsep : '1.0cm' --@]} +\setlength{\headsep}{1.0cm} % between header and text \setlength{\footskip}{1.0cm} % bottom of footer from bottom of text %\addtolength{\textwidth}{2.1in} % width of text \setlength{\textwidth}{19.5cm} -\setlength{\textheight}{[@-- defined($textheight) ? $textheight : '19.5cm' --@]} +\setlength{\textheight}{19.5cm} \setlength{\oddsidemargin}{-0.9cm} % odd page left margin \setlength{\evensidemargin}{-0.9cm} % even page left margin @@ -51,7 +51,7 @@ } } -\newcommand{\extracouponspace}{[@-- defined($extracouponspace) ? $extracouponspace : '3.6cm' --@]} +\newcommand{\extracouponspace}{3.6cm} % Adjust the inset of the mailing address \newcommand{\addressinset}[1][]{\hspace{1.0cm}} @@ -80,7 +80,6 @@ $OUT .= '\vspace{-\extracouponspace}'; $OUT .= '\rule[0.5em]{\textwidth}{\footrulewidth}\\\\'; $OUT .= $coupon; - $OUT .= '\vspace{'. $couponfootsep. '}' if defined($couponfootsep); } ''; --@] [@-- $smallerfooter ? '\scriptsize{' : '\small{' --@] @@ -109,10 +108,10 @@ \returninset \makebox{ \begin{tabular}{ll} - \includegraphics{[@-- $logo_file --@]} & [@-- $verticalreturnaddress ? '\\\\' : '' --@] + \includegraphics{[@-- $logo_file --@]} & \begin{minipage}[b]{5.5cm} [@-- $returnaddress --@] - \end{minipage}\\ + \end{minipage} \end{tabular} } } @@ -202,7 +201,7 @@ \addressinset \rule{0.5cm}{0cm} \makebox{ \begin{minipage}[t]{7.0cm} -\vspace{[@-- defined($addresssep) ? $addresssep : '0.25cm' --@]} +\vspace{0.25cm} \textbf{[@-- $payname --@]}\\ \addressline{[@-- $company --@]} \addressline{[@-- $address1 --@]} diff --git a/conf/invoice_latexcoupon b/conf/invoice_latexcoupon index a4ccddda7..327c1213b 100644 --- a/conf/invoice_latexcoupon +++ b/conf/invoice_latexcoupon @@ -3,13 +3,13 @@ Detach and return this remittance form with your your payment.\\ \begin{tabular}{ll} \returninset \begin{tabular}{ll} - \makebox{ \includegraphics{[@-- $logo_file --@]}} & [@-- $verticalreturnaddress ? '\\\\' : '' --@] + \makebox{ \includegraphics{[@-- $logo_file --@]}} & \begin{minipage}[b]{5.5cm} [@-- $returnaddress --@] - \end{minipage}\\ + \end{minipage} \end{tabular}& \begin{tabular}{r@{: }lr} -Invoice date & \textbf{[@-- $date --@]} & \multirow{4}*{[@-- $verticalreturnaddress ? '\\rule{1.5cm}{0cm}' : '' --@] +Invoice date & \textbf{[@-- $date --@]} & \multirow{4}*{ \makebox{ \begin{minipage}[t]{7.0cm} \textbf{[@-- $payname --@]}\\ @@ -21,15 +21,15 @@ Invoice date & \textbf{[@-- $date --@]} & \multirow{4}*{[@-- $verticalreturnaddr \end{minipage}}}\\ Customer\#& \textbf{[@-- $custnum --@]} & \\ Total Due & \textbf{[@-- $balance --@]} & \\ -\rule{0pt}{[@-- defined($amountenclosedsep) ? $amountenclosedsep : '2.25em' --@]}Amount Enclosed & \rule{2cm}{1pt}& \\ +\rule{0pt}{2.25em}Amount Enclosed & \rule{2cm}{1pt}& \\ \end{tabular}\\ -\rule{0pt}{[@-- defined($coupontoaddresssep) ? $coupontoaddresssep : '1cm' --@]} &\\ +\rule{0pt}{1cm} &\\ \end{tabular}\\ \begin{tabular}{ll} \addressinset \rule{0.5cm}{0cm} & \makebox{ \begin{minipage}[t]{7.0cm} -[@-- $addcompanytoaddress ? $company_name. '\\\\' : '' --@][@-- $returnaddress --@] +[@-- $returnaddress --@] \end{minipage}} \hfill \end{tabular}\\ diff --git a/fs_selfservice/perl/xmlrpc_local-phonenum_balance.pl b/fs_selfservice/perl/xmlrpc_local-phonenum_balance.pl deleted file mode 100755 index 8cbb5b0f0..000000000 --- a/fs_selfservice/perl/xmlrpc_local-phonenum_balance.pl +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/perl - -use strict; -use Frontier::Client; -use Data::Dumper; - -my $phonenum = shift @ARGV; - -my $server = new Frontier::Client ( - url => 'http://localhost:8080/selfservice/xmlrpc.cgi', -); - -my $result = $server->call('FS.ClientAPI_XMLRPC.phonenum_balance', - 'phonenum' => $server->string($phonenum), # '3615588197', -); - -#print Dumper($result); -die $result->{'error'} if $result->{'error'}; - -warn Dumper($result); - -1; diff --git a/htetc/freeside-rt.conf b/htetc/freeside-rt.conf index 2753bc6cc..9b5ccf807 100644 --- a/htetc/freeside-rt.conf +++ b/htetc/freeside-rt.conf @@ -25,11 +25,6 @@ SetHandler perl-script PerlHandler HTML::Mason - -SetHandler perl-script -PerlHandler HTML::Mason - - SetHandler perl-script PerlHandler HTML::Mason diff --git a/httemplate/browse/cgp_rule.html b/httemplate/browse/cgp_rule.html index 8a427b828..6f7b3e087 100644 --- a/httemplate/browse/cgp_rule.html +++ b/httemplate/browse/cgp_rule.html @@ -26,45 +26,25 @@ my $svcnum = $1; #agent virt so you can't do cross-agent communigate rules my $cust_svc = qsearchs('cust_svc', { 'svcnum' => $svcnum }) or die 'unknown svcnum'; -my $part_svc = $cust_svc->part_svc; my $count_query = "SELECT COUNT(*) FROM cgp_rule WHERE svcnum = $svcnum"; my($svc_label, $svc_value, $svcdb) = $cust_svc->label; + my $view = FS::UI::Web::svc_url( 'm' => $m, 'action' => 'view', - 'part_svc' => $part_svc, + 'part_svc' => $cust_svc->part_svc, 'svc' => $cust_svc, ); my $html_init = qq(View this $svc_label

). - qq!Add new rule
!; - -if ( $part_svc->svcdb eq 'svc_domain' ) { - - #areyousure for adding these? - - foreach my $line ( FS::Conf->new->config('cgp_rule-domain_templates') ) { - $line =~ /^\s*(\d+)\s+(.+)\s*$/ or next; - my($t_svcnum, $t_name) = ( $1, $2 ); - $html_init .= - qq!! - ."Add $t_name rule
"; - } - -} - -$html_init .= - '
'. + qq!Add new rule

!. qq! @@ -75,7 +55,7 @@ my $condition_sub = sub { [ map { [ - { data => $_->conditionname, + { data => $_->condition, #align => }, { data => $_->op, @@ -107,7 +87,7 @@ my $action_sub = sub { my $edit_sub = [ $p.'edit/cgp_rule.html?', 'rulenum' ]; my $del_sub = sub { my $rulenum = shift->rulenum; - [ "javascript:areyousure_delete('${p}misc/delete-cgp_rule.html?$rulenum')", '' ]; + [ "javascript:areyousure('${p}misc/delete-cgp_rule.html?$rulenum')", '' ]; }; diff --git a/httemplate/browse/msg_template.html b/httemplate/browse/msg_template.html deleted file mode 100644 index 0cd33c797..000000000 --- a/httemplate/browse/msg_template.html +++ /dev/null @@ -1,28 +0,0 @@ -<% include( 'elements/browse.html', - 'title' => 'Message templates', - 'name_singular' => 'template', - 'menubar' => [ 'Add a new template' => - $p.'edit/msg_template.html', - ], - 'query' => { 'table' => 'msg_template', }, - 'count_query' => 'SELECT COUNT(*) FROM msg_template', - 'disableable' => 1, - 'disabled_statuspos' => 2, - 'agent_virt' => 1, - 'agent_null_right' => 'Edit global templates', - 'agent_pos' => 3, - 'header' => [ 'Name' ], - 'fields' => [ 'msgname' ], - 'links' => [ $link ], - ) -%> -<%init> - -die "access denied" - unless $FS::CurrentUser::CurrentUser->access_right('Edit templates') - || $FS::CurrentUser::CurrentUser->access_right('Edit global templates') - || $FS::CurrentUser::CurrentUser->access_right('Configuration'); - -my $link = [ "${p}edit/msg_template.html?", 'msgnum' ]; - - diff --git a/httemplate/browse/part_event.html b/httemplate/browse/part_event.html index 3d7c245ac..674004bc7 100644 --- a/httemplate/browse/part_event.html +++ b/httemplate/browse/part_event.html @@ -158,8 +158,7 @@ $html_init .= ''. my $count_query = 'SELECT COUNT(*) FROM part_event WHERE '. $FS::CurrentUser::CurrentUser->agentnums_sql( - 'null_right' => 'Edit global billing events', - 'viewall_right' => 'None', + 'null_right' => 'Edit global billing events', ); my $join_conditions = FS::part_event_condition->join_conditions_sql; diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi index 42eb5dfcb..e226ce13e 100755 --- a/httemplate/browse/part_pkg.cgi +++ b/httemplate/browse/part_pkg.cgi @@ -84,11 +84,11 @@ my $extra_sql = scalar(@where) join( 'AND ', @where) : ''; -my $agentnums_sql = $curuser->agentnums_sql( 'table'=>'cust_main' ); +my $agentnums = join(',', $curuser->agentnums); my $count_cust_pkg = " SELECT COUNT(*) FROM cust_pkg LEFT JOIN cust_main USING ( custnum ) WHERE cust_pkg.pkgpart = part_pkg.pkgpart - AND $agentnums_sql + AND cust_main.agentnum IN ($agentnums) "; $select = " diff --git a/httemplate/browse/part_tag.html b/httemplate/browse/part_tag.html deleted file mode 100644 index d0ef72ec3..000000000 --- a/httemplate/browse/part_tag.html +++ /dev/null @@ -1,26 +0,0 @@ -<% include( 'elements/browse.html', - 'title' => 'Tags', - 'name_singular' => 'tag', - 'menubar' => [ 'Add a new tag' => - $p.'edit/part_tag.html', - ], - 'query' => { 'table' => 'part_tag', }, - 'count_query' => 'SELECT COUNT(*) FROM part_tag', - 'header' => [ 'Tag', 'Message', ], - 'fields' => [ 'tagname', 'tagdesc', ], - 'links' => [ $link, '', ], - 'cell_style' => [ '', $tagdesc_style ], - 'disableable' => 1, - 'disabled_statuspos' => 1, - ) -%> -<%init> - -die "access denied" - unless $FS::CurrentUser::CurrentUser->access_right('Configuration'); - -my $tagdesc_style = sub { 'background-color:#'.shift->tagcolor }; - -my $link = [ "${p}edit/part_tag.html?", 'tagnum' ]; - - diff --git a/httemplate/browse/rate.cgi b/httemplate/browse/rate.cgi index 428158a6d..02d670fbd 100644 --- a/httemplate/browse/rate.cgi +++ b/httemplate/browse/rate.cgi @@ -2,8 +2,6 @@ 'title' => 'Rate plans', 'menubar' => [ 'Regions and Prefixes' => $p.'browse/rate_region.html', - 'Time Periods' => - $p.'browse/rate_time.html', ], 'html_init' => $html_init, 'name' => 'rate plans', diff --git a/httemplate/browse/rate_detail.html b/httemplate/browse/rate_detail.html index aef550513..3371926b4 100644 --- a/httemplate/browse/rate_detail.html +++ b/httemplate/browse/rate_detail.html @@ -1,21 +1,72 @@ -<% include('/elements/init_overlib.html') %> -<% include('/elements/header.html',$title) %> -<% include('/elements/menubar.html',@menubar) %> -<% include('/edit/elements/rate_detail.html', - 'ratenum' => $ratenum, - 'countrycode' => $countrycode, -) %> -<% include('/elements/footer.html') %> - +<% include( 'elements/browse.html', + 'title' => $title, + 'name_singular' => 'rate', + 'html_init' => $html_init, + 'menubar' => [ 'Rate plans' => $p.'browse/rate.cgi' ], + 'query' => { + 'table' => 'rate_detail', + 'addl_from' => $join, + 'hashref' => { 'ratenum' => $ratenum }, + 'extra_sql' => $where, + }, + 'count_query' => "SELECT COUNT(*) FROM rate_detail $join". + " WHERE ratenum = $ratenum $where", + 'header' => [ + 'Region', + 'Prefix(es)', + 'Included
minutes', + 'Connection
charge', + 'Charge per
minute', + 'Granularity', + 'Usage class', + ], + 'fields' => [ + 'regionname', + sub { shift->dest_region->prefixes_short }, + sub { shift->min_included. $edit_hint }, + $conn_charge_sub, + sub { $money_char. shift->min_charge. $edit_hint }, + sub { $granularity{ shift->sec_granularity } }, + 'classname', + ], + 'links' => [ '', '', $edit_link, $edit_link, '', '' ], + 'link_onclicks' => [ '', '', $edit_onclick, $edit_onclick, '', '' ], + 'align' => 'llrrcc', + ) +%> <%once> +tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities(); +tie my %conn_secs, 'Tie::IxHash', FS::rate_detail::conn_secs(); + my $conf = new FS::Conf; my $money_char = $conf->config('money_char') || '$'; -my @menubar = ( 'Rate plans' => $p.'browse/rate.cgi', - 'Regions and Prefixes' => $p.'browse/rate_region.html', - 'Time Periods' => $p.'browse/rate_time.html', - ); +my $join = + ' JOIN rate_region ON ( rate_detail.dest_regionnum = rate_region.regionnum )'; + +my $edit_link = [ 'javascript:void(0);', sub { ''; } ]; + +my $edit_onclick = sub { + my $rate_detail = shift; + my $ratedetailnum = $rate_detail->ratedetailnum; + include( '/elements/popup_link_onclick.html', + 'action' => "${p}edit/rate_detail.html?$ratedetailnum", + 'actionlabel' => 'Edit rate', + 'height' => 420, + #default# 'width' => 540, + #default# 'color' => '#333399', + ); +}; +my $edit_hint = ' (edit)'; + +my $conn_charge_sub = sub { + my $rate_detail = shift; + #return '' unless $rate_detail->conn_charge > 0 || $rate_detail->conn_sec; + $money_char. $rate_detail->conn_charge. + ($rate_detail->conn_sec ? ' for '.$conn_secs{$rate_detail->conn_sec} : ''). + $edit_hint; +}; <%init> @@ -23,6 +74,8 @@ my @menubar = ( 'Rate plans' => $p.'browse/rate.cgi', die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Configuration'); +my $html_init = include('/elements/init_overlib.html'); + $cgi->param('ratenum') =~ /^(\d+)$/ or die "unparsable ratenum"; my $ratenum = $1; my $rate = qsearchs('rate', { 'ratenum' => $ratenum } ) @@ -30,11 +83,18 @@ my $rate = qsearchs('rate', { 'ratenum' => $ratenum } ) my $ratename = $rate->ratename; my $title = "$ratename rates"; -my $where; -my $countrycode = ''; +my @where = (); + if ( $cgi->param('countrycode') =~ /^(\d+)$/ ) { - $countrycode = $1; + my $countrycode = $1; + push @where, "0 < ( SELECT COUNT(*) FROM rate_prefix + WHERE rate_prefix.regionnum = rate_region.regionnum + AND countrycode = '$countrycode' + ) + "; $title .= " for +$countrycode"; } +my $where = scalar(@where) ? ' AND '.join(' AND ', @where ) : ''; + diff --git a/httemplate/browse/rate_time.html b/httemplate/browse/rate_time.html deleted file mode 100644 index 416ded41f..000000000 --- a/httemplate/browse/rate_time.html +++ /dev/null @@ -1,48 +0,0 @@ -<% include( 'elements/browse.html', - 'title' => 'Rating Time Periods', - 'name_singular' => 'period', - 'menubar' => [ 'Rate plans' => $p.'browse/rate.cgi' ], - 'html_init' => $html_init, - 'query' => { - 'table' => 'rate_time', - 'order_by' => 'ratetimenum', # lacking anything else - 'hashref' => {}, - }, - 'count_query' => 'SELECT COUNT(*) FROM rate_time', - 'header' => \@header, - 'fields' => \@fields, - 'links' => \@links, - 'align' => \@align, - ) -%> -<%init> - -die "access denied" - unless $FS::CurrentUser::CurrentUser->access_right('Configuration'); - -my $edit_url = $p.'edit/rate_time.cgi'; - -my $link = [ "$edit_url?", 'ratetimenum' ]; - -my $html_init = - 'Time periods for VoIP and call billing.

'. - qq(Add a new period

); - -sub interval { - my $i = shift; - '' - .join('', map { '' } - shift->intervals - ) . '

'.($_->description)[$i].'

'; -} - -# inefficient but readable -my $stime_sub = sub { interval(0,shift) }; -my $etime_sub = sub { interval(1,shift) }; - -my @header = ( '#', 'Period', 'Start', 'End' ); -my @fields = ( 'ratetimenum', 'ratetimename', $stime_sub, $etime_sub ); -my @links = ( ($link) x 2 ); -my @align = ( 'right', 'left', 'left' ); - - diff --git a/httemplate/config/config-delete.cgi b/httemplate/config/config-delete.cgi index 488886824..a05cb1e14 100644 --- a/httemplate/config/config-delete.cgi +++ b/httemplate/config/config-delete.cgi @@ -1,17 +1,6 @@ <%init> - -my $curuser = $FS::CurrentUser::CurrentUser; -die "access denied\n" unless $curuser->access_right('Configuration'); - -my $fsconf = new FS::Conf; -if ( $fsconf->exists('disable_settings_changes') ) { - my @changers = split(/\s*,\s*/, $fsconf->config('disable_settings_changes')); - my %changers = map { $_=>1 } @changers; - unless ( $changers{$curuser->username} ) { - errorpage("Disabled in web demo"); - die "shouldn't be reached"; - } -} +die "access denied\n" + unless $FS::CurrentUser::CurrentUser->access_right('Configuration'); $cgi->param('confnum') =~ /^(\d+)$/ or die "illegal or missing confnum"; my $confnum = $1; diff --git a/httemplate/config/config-process.cgi b/httemplate/config/config-process.cgi index 4e1c85a03..788d9016e 100644 --- a/httemplate/config/config-process.cgi +++ b/httemplate/config/config-process.cgi @@ -1,30 +1,3 @@ -%if ( scalar(@error) ) { -% -% my $url = popurl(1)."config.cgi"; -% if ( length($cgi->query_string) > 1920 ) { #stupid IE 2083 URL limit -% -% my $session = int(rand(4294967296)); #XXX -% my $pref = new FS::access_user_pref({ -% 'usernum' => $FS::CurrentUser::CurrentUser->usernum, -% 'prefname' => "redirect$session", -% 'prefvalue' => $cgi->query_string, -% 'expiration' => time + 3600, #1h? 1m? -% }); -% my $pref_error = $pref->insert; -% if ( $pref_error ) { -% die "FATAL: couldn't even set redirect cookie: $pref_error". -% " attempting to set redirect$session to ". $cgi->query_string."\n"; -% } -% -<% $cgi->redirect("$url?redirect=$session") %> -% -% } else { -% -<% $cgi->redirect("$url?". $cgi->query_string ) %> -% -% } -% -%} else { <% header('Configuration set') %> -%} <%once> #false laziness w/config-view.cgi my %namecol = ( @@ -98,21 +70,10 @@ my %namecol = ( ); <%init> - -my $curuser = $FS::CurrentUser::CurrentUser; -die "access denied\n" unless $curuser->access_right('Configuration'); +die "access denied\n" + unless $FS::CurrentUser::CurrentUser->access_right('Configuration'); my $conf = new FS::Conf; - -if ( $conf->exists('disable_settings_changes') ) { - my @changers = split(/\s*,\s*/, $conf->config('disable_settings_changes')); - my %changers = map { $_=>1 } @changers; - unless ( $changers{$curuser->username} ) { - errorpage_popup("Disabled in web demo"); - die "shouldn't be reached"; - } -} - $FS::Conf::DEBUG = 1; my @config_items = grep { $_->key != ~/^invoice_(html|latex|template)/ } $conf->config_items; @@ -122,7 +83,6 @@ my $agentnum = $cgi->param('agentnum'); my $key = $cgi->param('key'); my $i = $confitems{$key}; -my @error = (); my @touch = (); my @delete = (); my $n = 0; @@ -132,8 +92,6 @@ foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) { if ( $cgi->param($i->key.$n) ne '' ) { my $value = $cgi->param($i->key.$n); $value =~ s/\r\n/\n/g; #browsers? - my $error = &{$i->validate}($value, $n) if $i->validate; - push @error, $error if $error; $conf->set($i->key, $value, $agentnum); } else { $conf->delete($i->key, $agentnum); @@ -141,8 +99,6 @@ foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) { } elsif ( $type eq 'binary' || $type eq 'image' ) { if ( defined($cgi->param($i->key.$n)) && $cgi->param($i->key.$n) ) { my $fh = $cgi->upload($i->key.$n); - my $error = &{$i->validate}($fh, $n) if $i->validate; - push @error, $error if $error; if (defined($fh)) { local $/; $conf->set_binary($i->key, <$fh>, $agentnum); @@ -162,16 +118,12 @@ foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) { || $i->multiple ) ) { if ( scalar(@{[ $cgi->param($i->key.$n) ]}) ) { - my $error = &{$i->validate}([ $cgi->param($i->key.$n) ], $n) if $i->validate; - push @error, $error if $error; $conf->set($i->key, join("\n", @{[ $cgi->param($i->key.$n) ]} ), $agentnum); } else { $conf->delete($i->key, $agentnum); } } elsif ( $type =~ /^(text|select(-(sub|part_svc|part_pkg|pkg_class))?)$/ ) { if ( $cgi->param($i->key.$n) ne '' ) { - my $error = &{$i->validate}($cgi->param($i->key.$n), $n) if $i->validate; - push @error, $error if $error; $conf->set($i->key, $cgi->param($i->key.$n), $agentnum); } else { $conf->delete($i->key, $agentnum); @@ -183,8 +135,4 @@ foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) { $conf->touch($_, $agentnum) foreach @touch; $conf->delete($_, $agentnum) foreach @delete; -if (scalar(@error)) { - $cgi->param('error', join(' ', @error)); -} - diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi index 11e75707c..08f6c1020 100644 --- a/httemplate/config/config-view.cgi +++ b/httemplate/config/config-view.cgi @@ -349,7 +349,7 @@ my @config_items = grep { $page_agent ? $_->per_agent : 1 } my @deleteable = qw( invoice_latexreturnaddress invoice_htmlreturnaddress ); my %deleteable = map { $_ => 1 } @deleteable; -my @sections = qw(required billing invoicing notification UI self-service username password session shell BIND ); +my @sections = qw(required billing invoicing UI self-service username password session shell BIND ); push @sections, '', 'deprecated'; my %section_items = (); diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi index cde48382a..ce96bc162 100644 --- a/httemplate/config/config.cgi +++ b/httemplate/config/config.cgi @@ -131,11 +131,7 @@ Setting <% $key %> % } elsif ( $type eq 'select-sub' ) { - ">

Period name

<% $_ %>
-% my @o = @{ $select[$col] }; -% if( @o ) { - -% } -% else { - - MAXLENGTH = <% $maxl[$col] %> - STYLE = "text-align:<% $align[$col] %>" - VALUE = "<% $data[$row][$col] %>" -% if( $opt{'autoadd'} ) { - onchange = "possiblyAddRow(this);" -% } - > -	- " - ALT = "X" - onclick = "deleteRow(this);" - > -

diff --git a/httemplate/elements/freeside.css b/httemplate/elements/freeside.css index dfb56e959..3816f9878 100644 --- a/httemplate/elements/freeside.css +++ b/httemplate/elements/freeside.css @@ -109,8 +109,6 @@ a.fstab { font-weight:bold; text-decoration:none; overflow:visible; - margin-left:6px; - margin-right:6px; } a.fstab:hover { text-decoration:none; @@ -121,12 +119,13 @@ a.fstab:hover { a:visited:hover.fsblackbutton */ a.fstabselected { - background-color:#ffffff; + background-color:#f8f8f8; color: #000000; - border-top:1px solid #7e0079; - border-left:1px solid #7e0079; - border-right:1px solid #7e0079; - border-bottom:1px solid #ffffff; + border:1px solid; + border-top-color:#7e0079; + border-left-color:#7e0079; + border-right-color:#7e0079; + border-bottom-color:#ffffff; -moz-border-radius-topleft:8px; -moz-border-radius-topright:8px; -webkit-border-radius-topleft:8px; @@ -142,37 +141,12 @@ a.fstabselected { font-weight:bold; text-decoration:none; overflow:visible; - margin-left:6px; - margin-right:6px; } a.fstabselected:hover { text-decoration:none; color: #000000; } -div.fstabs { - padding-left:8px; - border-bottom:1px solid #7e0079; -} - -div.fstabcontainer { - background-color:#ffffff; - padding:8px; - border-left:1px solid #7e0079; - border-right:1px solid #7e0079; - border-bottom:1px solid #7e0079; - -moz-border-radius-bottomleft:8px; - -moz-border-radius-bottomright:8px; - -webkit-border-radius-bottomleft:8px; - -webkit-border-radius-bottomright:8px; - border-radius-bottomleft:8px; - border-radius-bottomright:8px; - -moz-box-shadow: #666666 1px 1px 2px; - -webkit-box-shadow: #666666 1px 1px 2px; - box-shadow: #666666 1px 1px 2px; - filter: progid:DXImageTransform.Microsoft.Shadow(color='#666666', Direction=135, Strength=2); -} - .background { background-color:#f8f8f8; } diff --git a/httemplate/elements/header-popup.html b/httemplate/elements/header-popup.html index 2bd4a96e8..cd8da5657 100644 --- a/httemplate/elements/header-popup.html +++ b/httemplate/elements/header-popup.html @@ -1,21 +1,3 @@ -<%doc> - -Example: - - include( '/elements/header-popup.html', - { - 'title' => 'Title', - 'menubar' => \@menubar, - 'etc' => '', #included in tag, for things like onLoad= - 'head' => '', #included before closing tag - 'nobr' => 0, #1 for no

after the title - } - ); - - #old-style - include( '/elements/header.html', 'Title', $menubar, $etc, $head); - - diff --git a/httemplate/elements/htmlarea.html b/httemplate/elements/htmlarea.html index f00c77360..dca4328ab 100644 --- a/httemplate/elements/htmlarea.html +++ b/httemplate/elements/htmlarea.html @@ -22,9 +22,6 @@ Example: oFCKeditor.BasePath = '<% $p %>elements/fckeditor/'; oFCKeditor.Config['SkinPath'] = '<% $p %>elements/fckeditor/editor/skins/silver/'; -% if ( $opt{'width'} ) { - oFCKeditor.Width = '<% $opt{'width'} %>'; -% } oFCKeditor.Height = '<% $opt{'height'} || 420 %>'; oFCKeditor.Config['StartupFocus'] = true; oFCKeditor.Config['EnterMode'] = 'br'; diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html index a5bcdeb19..2d28e49d4 100644 --- a/httemplate/elements/menu.html +++ b/httemplate/elements/menu.html @@ -215,7 +215,7 @@ $report_packages{'Advanced package reports'} = [ $fsurl.'search/report_cust_pkg tie my %report_inventory, 'Tie::IxHash', 'Inventory by agent' => [ $fsurl.'search/report_agent_inventory.html', '' ], - 'Inventory activity' => [ $fsurl.'search/report_h_inventory_item.html', '' ], + #'Inventory activity' => [ $fsurl.'search/report_h_inventory_item.html', '' ], ; tie my %report_rating, 'Tie::IxHash', @@ -357,8 +357,6 @@ $tools_menu{'Quick payment entry'} = [ $fsurl.'misc/batch-cust_pay.html', 'Ente $tools_menu{'Process payment batches'} = [ $fsurl.'search/pay_batch.cgi?magic=_date;open=1;intransit=1', 'Process credit card and electronic check batches' ] if ( $conf->exists('batch-enable') || $conf->config('batch-enable_payby') ) && $curuser->access_right('Process batches'); -$tools_menu{'Process invoice batches'} = [ $fsurl.'search/bill_batch.cgi' ] - if ( $conf->exists('invoice_print_pdf') ); $tools_menu{'Job Queue'} = [ $fsurl.'search/queue.html', 'View pending job queue' ] if $curuser->access_right('Job queue'); $tools_menu{'Ticketing'} = [ \%tools_ticketing, 'Ticketing tools' ] @@ -421,7 +419,6 @@ tie my %config_billing_rates, 'Tie::IxHash', 'Rate plans' => [ $fsurl.'browse/rate.cgi', 'Manage rate plans' ], 'Regions and prefixes' => [ $fsurl.'browse/rate_region.html', 'Manage regions and prefixes' ], 'Usage classes' => [ $fsurl.'browse/usage_class.html', 'Usage classes define groups of usage for taxation.' ], - 'Time periods' => [ $fsurl.'browse/rate_time.html', 'Time periods define days and hours for rate plans' ], 'Edit rates with Excel' => [ $fsurl.'misc/rate_edit_excel.html', 'Download and edit rates with Excel, then upload changes.' ], #"Edit with Excel" ? ; @@ -473,18 +470,12 @@ tie my %config_phone, 'Tie::IxHash', ; tie my %config_misc, 'Tie::IxHash'; -$config_misc{'Message templates'} = [ $fsurl.'browse/msg_template.html', 'Templates for customer notices' ] - if $curuser->access_right('Edit templates') - || $curuser->access_right('Edit global templates') - || $curuser->access_right('Configuration'); -$config_misc{'Tags'} = [ $fsurl.'browse/part_tag.html', '' ] - if $curuser->access_right('Configuration'); $config_misc{'Advertising sources'} = [ $fsurl.'browse/part_referral.html', 'Where a customer heard about your service.' ] if $curuser->access_right('Edit advertising sources') || $curuser->access_right('Edit global advertising sources'); if ( $curuser->access_right('Configuration') ) { $config_misc{'Virtual fields'} = [ $fsurl.'browse/part_virtual_field.cgi', 'Locally defined fields', ]; - $config_misc{'Error catalog'} = [ $fsurl.'browse/msgcat.cgi', 'Change error messages and other customizable labels' ]; + $config_misc{'Message catalog'} = [ $fsurl.'browse/msgcat.cgi', 'Change error messages and other customizable labels' ]; } $config_misc{'Inventory classes and inventory'} = [ $fsurl.'browse/inventory_class.html', 'Setup inventory classes and stock inventory' ] if $curuser->access_right('Edit inventory') @@ -522,8 +513,7 @@ $config_menu{'Broadband'} = [ \%config_broadband, '' ] $config_menu{'Phone'} = [ \%config_phone, '' ] if ( $curuser->access_right('Configuration') ); $config_menu{'Miscellaneous'} = [ \%config_misc, '' ] - if $curuser->access_right('Configuration' ) - || $curuser->access_right('Edit advertising sources') + if $curuser->access_right('Edit advertising sources') || $curuser->access_right('Edit global advertising sources'); diff --git a/httemplate/elements/menubar.html b/httemplate/elements/menubar.html index c14904337..fe49f7b2e 100644 --- a/httemplate/elements/menubar.html +++ b/httemplate/elements/menubar.html @@ -19,10 +19,10 @@ Example: %if ( $opt->{'newstyle'} ) { +% my $s = ''; -

- <% join('', @html ) %> -

+ <% join("$s ", ( '', @html, '' ) ) %> +
%} else { diff --git a/httemplate/elements/pickcolor.html b/httemplate/elements/pickcolor.html deleted file mode 100644 index d410ebfc7..000000000 --- a/httemplate/elements/pickcolor.html +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - -

change

- -% for (1..$rows) { - -% for (1..$cols) { -% last unless @colors; -% my $color = shift(@colors); - -% } - -% } - - -<%init> - -my %opt = @_; - -my $value = length($opt{curr_value}) ? $opt{curr_value} : $opt{value}; - -my $unum = int(rand(100000)); - -my $id = $opt{'id'} || $opt{'field'}.$unum; - -my @colors = ( - '', #none/white - 'FF6666', #red - 'FF9966', #orange - 'FFFF66', #yellow - '66FF66', #green - '66FFFF', #cyan? - '6666FF', #blue - 'CC66FF', #purple? FF66FF looks more like pink. -); - -my $rows = 2; - -my $cols = int(.5+scalar(@colors)/$rows); - - diff --git a/httemplate/elements/progress-init.html b/httemplate/elements/progress-init.html index 8b8da66c8..194fc7480 100644 --- a/httemplate/elements/progress-init.html +++ b/httemplate/elements/progress-init.html @@ -1,45 +1,3 @@ -<%doc> -Example: -In misc/something.html: - - - - -% } -<%init> - -die "access denied" - unless $FS::CurrentUser::CurrentUser->access_right('Configuration'); - -my ($query) = $cgi->keywords; -$query =~ /^(\d+)$/ or die "Illegal ratedetailnum"; -my $rate_detail = FS::rate_detail->by_key($1); -my $error = $rate_detail->delete; - - diff --git a/httemplate/misc/inventory_item-import.html b/httemplate/misc/inventory_item-import.html index d264bafc5..990c14ffc 100644 --- a/httemplate/misc/inventory_item-import.html +++ b/httemplate/misc/inventory_item-import.html @@ -24,10 +24,7 @@ Import a file containing <% PL($inventory_class->classname) %>, one per line. %# - <% include('/elements/tr-select-agent.html', - 'viewall_right' => 'None', - ) - %> + <% include('/elements/tr-select-agent.html') %> <% include( '/elements/file-upload.html', 'field' => 'file', diff --git a/httemplate/misc/maestro-customer_status-test.html b/httemplate/misc/maestro-customer_status-test.html deleted file mode 100644 index 006492919..000000000 --- a/httemplate/misc/maestro-customer_status-test.html +++ /dev/null @@ -1,34 +0,0 @@ -<% include('/elements/header.html', { - 'title' => "Customer $custnum status", - }) %> - -<% include('/elements/small_custview.html', $custnum, '', 1) %> -
- - -% foreach my $key (keys %$return) { -% my $value = $return->{$key}; -% $value = join(', ', @$value) if ref($value) eq 'ARRAY'; - - - - -% } -

<% $key %>:

<% $value %>

- -<% include('/elements/footer.html') %> -<%init> - -my $return; - -my($custnum, $svcnum) = $cgi->keywords; -if ( $custnum =~ /^(\d+)$/ ) { - - use FS::Maestro; - $return = FS::Maestro::customer_status($1, $svcnum); - -} else { - $return = { 'error' => 'No custnum' }; -} - - diff --git a/httemplate/misc/maestro-customer_status.cgi b/httemplate/misc/maestro-customer_status.cgi deleted file mode 100644 index ffeb53c91..000000000 --- a/httemplate/misc/maestro-customer_status.cgi +++ /dev/null @@ -1,16 +0,0 @@ -<% $uri->query %> -<%init> - -my $uri = new URI; - -my($custnum, $svcnum) = $cgi->keywords; -if ( $custnum =~ /^(\d+)$/ ) { - - use FS::Maestro; - $uri->query_form( FS::Maestro::customer_status($1) ); - -} else { - $uri->query_form( { 'error' => 'No custnum' } ); -} - - diff --git a/httemplate/misc/maestro-customer_status.html b/httemplate/misc/maestro-customer_status.html deleted file mode 100644 index 8acae2b2a..000000000 --- a/httemplate/misc/maestro-customer_status.html +++ /dev/null @@ -1,16 +0,0 @@ -<% objToJson( $return ) %> -<%init> - -my $return; - -my($custnum, $svcnum) = $cgi->keywords; -if ( $custnum =~ /^(\d+)$/ ) { - - use FS::Maestro; - $return = FS::Maestro::customer_status($1, $svcnum); - -} else { - $return = { 'error' => 'No custnum' }; -} - - diff --git a/httemplate/misc/process/bill_batch-print.html b/httemplate/misc/process/bill_batch-print.html deleted file mode 100644 index 54d639eeb..000000000 --- a/httemplate/misc/process/bill_batch-print.html +++ /dev/null @@ -1,5 +0,0 @@ -% die "access denied" -% unless $FS::CurrentUser::CurrentUser->access_right('View invoices'); -% my $server = FS::UI::Web::JSRPC->new('FS::bill_batch::process_print_pdf', $cgi); -<% $server->process %> -<%init> diff --git a/httemplate/misc/process/payment.cgi b/httemplate/misc/process/payment.cgi index 665001ea9..906c99663 100644 --- a/httemplate/misc/process/payment.cgi +++ b/httemplate/misc/process/payment.cgi @@ -96,10 +96,8 @@ if ( $payby eq 'CHEK' ) { $payinfo = $1; validate($payinfo) or errorpage(gettext('invalid_card')); # . ": ". $self->payinfo; - errorpage(gettext('unknown_card_type')) - if $payinfo !~ /^99\d{14}$/ #token - && cardtype($payinfo) eq "Unknown"; + if $payinfo !~ /^99\d{14}$/ && cardtype($payinfo) eq "Unknown"; if ( defined $cust_main->dbdef_table->column('paycvv') ) { if ( length($cgi->param('paycvv') ) ) { diff --git a/httemplate/misc/process/recharge_svc.html b/httemplate/misc/process/recharge_svc.html index b56f8a282..5f68bf151 100755 --- a/httemplate/misc/process/recharge_svc.html +++ b/httemplate/misc/process/recharge_svc.html @@ -62,7 +62,6 @@ unless ($error) { $error = $cust_main->charge($amount, "Recharge " . $svc_acct->label, $description, $part_pkg->taxclass); - $error ||= "invalid $_" foreach grep { $rhash{$_} !~ /^\d*$/ } keys %rhash; if ($part_pkg->option('recharge_reset', 1)) { $error ||= $svc_acct->set_usage(\%rhash, 'null' => 1); }else{ diff --git a/httemplate/misc/upload-batch.cgi b/httemplate/misc/upload-batch.cgi index be80b1ff7..d1a84fd02 100644 --- a/httemplate/misc/upload-batch.cgi +++ b/httemplate/misc/upload-batch.cgi @@ -1,10 +1,36 @@ -<% $server->process %> +% if ( $error ) { +% errorpage($error); +% } else { + <% include('/elements/header.html','Batch results upload successful') %> + <% include('/elements/footer.html') %> +% } <%init> die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Process batches'); -my $server = - new FS::UI::Web::JSRPC 'FS::pay_batch::process_import_results', $cgi; +my $error; + +my $fh = $cgi->upload('batch_results'); +$error = 'No file uploaded' unless defined($fh); + +unless ( $error ) { + + $cgi->param('batchnum') =~ /^(\d+)$/; + my $batchnum = $1; + + my $pay_batch = qsearchs( 'pay_batch', { 'batchnum' => $batchnum } ); + if ( ! $pay_batch ) { + $error = "batchnum $batchnum not found"; + } elsif ( $pay_batch->status ne 'I' ) { + $error = "batch $batchnum is not in transit"; + } else { + $error = $pay_batch->import_results( + 'filehandle' => $fh, + 'format' => $cgi->param('format'), + ); + } + +} diff --git a/httemplate/misc/xmlrpc.cgi b/httemplate/misc/xmlrpc.cgi index 14bf9ef92..1d0383f2a 100644 --- a/httemplate/misc/xmlrpc.cgi +++ b/httemplate/misc/xmlrpc.cgi @@ -1,16 +1,18 @@ -<% $response_xml %>\ -<%init> +% +% +% my $request_xml = $cgi->param('POSTDATA'); +% +% #$r->log_error($request_xml); +% +% my $fsxmlrpc = new FS::XMLRPC; +% my ($error, $response_xml) = $fsxmlrpc->serve($request_xml); +% +% #$r->log_error($error) if $error; +% +% http_header('Content-Type' => 'text/xml', +% 'Content-Length' => length($response_xml)); +% +% print $response_xml; +% +% -my $request_xml = $cgi->param('POSTDATA'); - -#warn $request_xml; - -my $fsxmlrpc = new FS::XMLRPC; -my ($error, $response_xml) = $fsxmlrpc->serve($request_xml); - -#warn $error; - -http_header('Content-Type' => 'text/xml', - 'Content-Length' => length($response_xml)); - - diff --git a/httemplate/pref/pref-process.html b/httemplate/pref/pref-process.html index a340b7fc9..47f80afd0 100644 --- a/httemplate/pref/pref-process.html +++ b/httemplate/pref/pref-process.html @@ -7,11 +7,6 @@ % } <%init> -if ( FS::Conf->new->exists('disable_acl_changes') ) { - errorpage("Preference changes disabled in public demo"); - die "shouldn't be reached"; -} - my $error = ''; my $access_user = ''; diff --git a/httemplate/search/477.html b/httemplate/search/477.html index 63eab7ac8..bd7fb2d8b 100755 --- a/httemplate/search/477.html +++ b/httemplate/search/477.html @@ -43,7 +43,7 @@ % if ( $part eq 'IA' ) { % for ( my $tech = 0; $tech < scalar(@technology_option); $tech++ ) { % next unless $technology_option[$tech]; -% my $url = &{$url_mangler}($part); +% my $url = &{$url_mangler}($cgi->self_url, $part); % if ( $type eq 'xml' ) { <<% 'Part_IA_'. chr(65 + $tech) %>> % } @@ -57,7 +57,7 @@ % if ( $type eq 'xml' ) { <<% 'Part_'. uc($part) %>> % } -% my $url = &{$url_mangler}($part); +% my $url = &{$url_mangler}($cgi->self_url, $part); <% include( "477part${part}.html", 'url' => $url ) %> % if ( $type eq 'xml' ) { > @@ -83,8 +83,7 @@ my $type = $cgi->param('_type') || 'html'; my $xlsname = '477report'; my @technology_option = &FS::Report::FCC_477::parse_technology_option($cgi); my $url_mangler = sub { - my $part = shift; - my $url = $cgi->url('-path_info' => 1, '-full' => 1); + my ($url, $part) = (shift, shift); $url =~ s/477\./477part$part./; $url; }; diff --git a/httemplate/search/477partV.html b/httemplate/search/477partV.html index 885294d28..c6ceac4db 100755 --- a/httemplate/search/477partV.html +++ b/httemplate/search/477partV.html @@ -9,7 +9,7 @@ 'xml_elements' => [ 'zip codes' ], 'no_field_elements' => 1, 'fields' => [ 'zip' ], - 'url' => $opt{url} || '', + 'url' => $opt{url} || $cgi->self_url, ) %> diff --git a/httemplate/search/477partVI.html b/httemplate/search/477partVI.html index db572bcde..dbd17032c 100755 --- a/httemplate/search/477partVI.html +++ b/httemplate/search/477partVI.html @@ -47,7 +47,7 @@ [ $link, $link_suffix ], [ $link, $link_suffix ], ], - 'url' => $opt{url} || '', + 'url' => $opt{url} || $cgi->self_url, 'xml_row_element' => 'Datarow', ) %> diff --git a/httemplate/search/bill_batch.cgi b/httemplate/search/bill_batch.cgi deleted file mode 100755 index e5abc8955..000000000 --- a/httemplate/search/bill_batch.cgi +++ /dev/null @@ -1,65 +0,0 @@ -<% include( 'elements/search.html', - 'title' => 'Invoice Batches', - 'name_singular' => 'batch', - 'query' => { 'table' => 'bill_batch', - 'hashref' => $hashref, - 'extra_sql' => $extra_sql. - 'ORDER BY batchnum DESC', - }, - 'count_query' => "$count_query $extra_sql", - 'header' => [ 'Batch', - 'Item Count', - 'Status', - '', - ], - 'align' => 'rrcc', - 'fields' => [ 'batchnum', - sub { - my $st = "SELECT COUNT(*) from cust_bill_batch WHERE batchnum=" . shift->batchnum; - my $sth = dbh->prepare($st) - or die dbh->errstr. "doing $st"; - $sth->execute - or die "Error executing \"$st\": ". $sth->errstr; - $sth->fetchrow_arrayref->[0]; - }, - sub { - $statusmap{shift->status}; - }, - sub { shift->status eq 'O' ? - 'Download and close' : 'Download' - }, - ], - 'links' => [ - $link, - $link, - $link, - $dlink, - ], - 'style' => [ - '', - '', - '', - sub { shift->status eq 'O' ? "b" : '' }, - ], - 'really_disable_download' => 1, - ) - -%> -<%init> - -die "access denied" - unless $FS::CurrentUser::CurrentUser->access_right('View invoices'); - -my %statusmap = ('O'=>'Open', 'R'=>'Closed'); -my $hashref = {}; -my $count_query = 'SELECT COUNT(*) FROM bill_batch'; - -my $extra_sql = ''; # may add something here later -my $link = [ "${p}view/bill_batch.cgi?batchnum=", 'batchnum' ]; -my $dlink = sub { - [ "${p}view/bill_batch.cgi?magic=print;". - (shift->status eq 'O' ? 'close=1;' : ''). - 'batchnum=', - 'batchnum'] -}; - diff --git a/httemplate/search/cdr.html b/httemplate/search/cdr.html index a5575967c..6b38d3ba7 100644 --- a/httemplate/search/cdr.html +++ b/httemplate/search/cdr.html @@ -126,7 +126,7 @@ foreach my $param ( grep /^termpart\d+status$/, $cgi->param ) { $search = "NOT EXISTS ( SELECT 1 FROM cdr_termination WHERE $where_term )"; - } elsif ( $status =~ /^([\w ]+)$/ ) { + } elsif ( $cgi->param('freesidestatus') =~ /^([\w ]+)$/ ) { #false lazienss w/cdr_termination.pm (i should be a part_termination method) my $where_term = diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi index 98a1da9d9..77901de87 100644 --- a/httemplate/search/cust_bill_pkg.cgi +++ b/httemplate/search/cust_bill_pkg.cgi @@ -139,6 +139,9 @@ my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi); push @where, "_date >= $beginning", "_date <= $ending"; +push @where , " payby != 'COMP' " + unless $cgi->param('include_comp_cust'); + if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) { push @where, "cust_main.agentnum = $1"; } diff --git a/httemplate/search/cust_credit_bill_pkg.html b/httemplate/search/cust_credit_bill_pkg.html index 0f7834446..52e0ac6fe 100644 --- a/httemplate/search/cust_credit_bill_pkg.html +++ b/httemplate/search/cust_credit_bill_pkg.html @@ -92,6 +92,9 @@ my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi); push @where, "cust_bill._date >= $beginning", "cust_bill._date <= $ending"; +push @where , " payby != 'COMP' " + unless $cgi->param('include_comp_cust'); + if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) { push @where, "cust_main.agentnum = $1"; } diff --git a/httemplate/search/cust_pay_batch.cgi b/httemplate/search/cust_pay_batch.cgi index 825d21c8a..7376e9dcb 100755 --- a/httemplate/search/cust_pay_batch.cgi +++ b/httemplate/search/cust_pay_batch.cgi @@ -124,7 +124,7 @@ $sql_query = "SELECT paybatchnum,invnum,custnum,cpb.last,cpb.first," . 'LEFT JOIN pay_batch USING ( batchnum ) ' . "$search ORDER BY $orderby"; -my $html_init = ''; +my $html_init = ''; if ( $pay_batch ) { my $fixed = $conf->config('batch-fixed_format-'. $pay_batch->payby); if ( @@ -136,12 +136,11 @@ if ( $pay_batch ) { && $FS::CurrentUser::CurrentUser->access_right('Redownload resolved batches') ) ) { - $html_init .= qq!!; + $html_init .= qq!!; if ( $fixed ) { $html_init .= qq!!; } else { - $html_init .= qq!Download batch in format !. - qq!!. qq!!. qq!!. qq!!. @@ -152,7 +151,7 @@ if ( $pay_batch ) { qq!!. qq!!; } - $html_init .= qq!

!; + $html_init .= qq!
!; } if ( @@ -161,28 +160,13 @@ if ( $pay_batch ) { && $FS::CurrentUser::CurrentUser->access_right('Reprocess batches') ) ) { - $html_init .= ''. - include('/elements/form-file_upload.html', - 'name' => 'FileUpload', - 'action' => "$p/misc/upload-batch.cgi", - 'num_files' => 1, - 'fields' => [ 'batchnum', 'format' ], - 'message' => 'Batch results uploaded.', - ) . - 'Upload results
'. - include('/elements/file-upload.html', - 'field' => 'file', - 'label' => 'Filename', - 'no_table'=> 1 - ). - '
' - ; + $html_init .= qq!!. + qq!Upload results
!. + qq!Filename
!; if ( $fixed ) { $html_init .= qq!!; } else { - # should pull this from %import_info - $html_init .= qq!Format !. - qq!!. qq!!. qq!!. qq!!. @@ -191,12 +175,12 @@ if ( $pay_batch ) { qq!!. qq!!. qq!!. - qq!
!; + qq!
!; } $html_init .= qq!!; - $html_init .= '
'; + $html_init .= '
'; } - $html_init .= '

' + } if ($pay_batch) { diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi index 74a3a6d1e..adbec7a74 100755 --- a/httemplate/search/cust_pkg.cgi +++ b/httemplate/search/cust_pkg.cgi @@ -80,18 +80,6 @@ # ''; # }, sub { - my $cust_pkg = shift; - my $type = $cgi->param('_type') || ''; - if ($type =~ /xls|csv/) { - my $cust_svc = $cust_pkg->primary_cust_svc; - if($cust_svc) { - return join ": ",($cust_svc->label)[0,1]; - } - else { - return ''; - } - } - else { [ map { [ { 'data' => $_->[0]. ':', @@ -103,10 +91,9 @@ $_->[2]. '.cgi?'. $_->[3], }, ]; - } $cust_pkg->labels + } shift->labels ]; - } - } + }, ], 'color' => [ '', diff --git a/httemplate/search/elements/cust_main_dayranges.html b/httemplate/search/elements/cust_main_dayranges.html index 9b8b08f47..c53e68016 100644 --- a/httemplate/search/elements/cust_main_dayranges.html +++ b/httemplate/search/elements/cust_main_dayranges.html @@ -11,7 +11,6 @@ Example: my( $start, $end ) = @_; "SQL EXPRESSION BASED ON $start AND $end"; - # where $start and $end are unix timestamps }; @@ -146,7 +145,7 @@ unless ( $cgi->param('all_customers') ) { } push @where, - call_range_sub($range_sub, $days, 0, 'offset' => $offset, 'no_as'=>1). ' > 0'; # != 0'; + call_range_sub($range_sub, $days + $offset, 0, 'no_as'=>1). ' > 0'; # != 0'; } if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) { @@ -249,25 +248,11 @@ my $money_char = $conf->config('money_char') || '$'; # ) sub call_range_sub { - my($range_sub, $startdays, $enddays, %opt) = @_; + my($range_sub, $start, $end, %opt) = @_; - my $as = $opt{'no_as'} ? '' : " AS rangecol_${startdays}_$enddays"; + my $as = $opt{'no_as'} ? '' : " AS rangecol_${start}_$end"; - my $offset = $opt{'offset'} || 0; - # Always use $offset - 1day + 1sec = the last second of that day - my $cutoff = DateTime->now->set(hour => 23, minute => 59, second => 59); - $cutoff->subtract(days => $offset); - - my $start = $cutoff->clone; - $start->subtract(days => $startdays); - - my $end = $cutoff->clone; - $end->subtract(days => $enddays); - - #warn "offset $offset (".$cutoff->epoch."), range $startdays-$enddays (".$start->epoch . '-' . ($enddays ? $end->epoch : '').")\n"; - my $sql = &{$range_sub}( $start->epoch, - $enddays ? $end->epoch : '', - $cutoff->epoch ); #%opt? + my $sql = &{$range_sub}( $start, $end, $opt{'offset'} ); #%opt? $sql = "SUM($sql)" if $opt{'sum'}; diff --git a/httemplate/search/elements/search-html.html b/httemplate/search/elements/search-html.html index 98f9c4476..e5e6ca954 100644 --- a/httemplate/search/elements/search-html.html +++ b/httemplate/search/elements/search-html.html @@ -1,3 +1,4 @@ +% % if ( exists($opt{'redirect'}) && $opt{'redirect'} % && scalar(@$rows) == 1 && $total == 1 % && $type ne 'html-print' @@ -102,7 +103,7 @@ % $cgi->delete('maxrecords'); % $cgi->param('_dummy', 1); - ( show % foreach my $max ( map { $_ * $confmax } qw( 1 5 10 25 ) ) { @@ -143,18 +144,18 @@ Download full results
% $cgi->param('_type', "$xlsname.xls" ); - as query_string %>">Excel spreadsheet
+ as Excel spreadsheet
% $cgi->param('_type', 'csv'); - as query_string %>">CSV file
+ as CSV file
% if ( defined($opt{xml_elements}) ) { % $cgi->param('_type', 'xml'); - as query_string %>">XML file
+ as XML file
% } % $cgi->param('_type', 'html-print'); - as query_string %>">printable copy + as printable copy % $cgi->param('_type', "html" ); @@ -464,7 +465,7 @@ my $confmax = $args{'confmax'}; my $maxrecords = $args{'maxrecords'}; my $offset = $args{'offset'}; my %opt = %{ $args{'opt'} }; -my $self_url = $opt{'url'} || $cgi->url('-path_info' => 1, '-full' =>1); +my $self_url = $opt{'url'} || $cgi->self_url; my $count_sth = dbh->prepare($opt{'count_query'}) or die "Error preparing $opt{'count_query'}: ". dbh->errstr; diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html index 218816938..a258f1721 100644 --- a/httemplate/search/elements/search.html +++ b/httemplate/search/elements/search.html @@ -335,7 +335,7 @@ if ( $opt{'disableable'} ) { my $limit = ''; my($confmax, $maxrecords, $offset ); -unless ( $type =~ /^(csv|\w*.xls)$/) { +if ( !$type =~ /^(csv|\w*.xls)$/) { # html mode unless (exists($opt{count_query}) && length($opt{count_query})) { ( $opt{count_query} = $opt{query} ) =~ diff --git a/httemplate/search/h_inventory_item.html b/httemplate/search/h_inventory_item.html deleted file mode 100644 index b0f9b8aa8..000000000 --- a/httemplate/search/h_inventory_item.html +++ /dev/null @@ -1,135 +0,0 @@ -<% include('/elements/header.html', "$classname Inventory Activity Report") %> -<% include('/elements/table-grid.html') %> - -% my $TH = 'TH CLASS="grid" BGCOLOR="#cccccc" ROWSPAN=1'; - <<%$TH%> WIDTH="10%" ALIGN="left">Day (<% time2str("%B %Y", $sdate) %>) -% foreach my $day (0..$numdays-1) { - <<%$TH%> WIDTH="2%" ALIGN="right"><% $day+1 %> -% } - -% for (my $r=0; $r < scalar(@rows); $r++) { - -% my $TD = 'TD CLASS="grid" BGCOLOR="'.($r % 2 ? '#ffffff' : '#eeeeee').'"'; - <<%$TD%>><% $labels[$r] %> -% for my $day (0..$numdays-1) { - <<%$TD%> ALIGN="right"><% $rows[$r][$day] %> -% } - -% } - - -<%init> -use Date::Parse 'str2time'; -use Date::Format 'time2str'; -use Data::Dumper 'Dumper'; - -my ($agentnum, $classnum, $month, $year, $sdate, $edate); -$classnum = $cgi->param('classnum'); # may be empty -$agentnum = $cgi->param('agentnum'); # may also be empty -my $classname = ''; -if($classnum) { - my $class = qsearchs('inventory_class', { classnum => $classnum }); - die "classnum $classnum not found!" if !$class; - $classname = $class->classname . ' '; -} - -$month = $cgi->param('_month') || time2str('%m', time); -$year = $cgi->param('_year') || time2str('%Y', time); - -$sdate = str2time("$year-$month-01"); -$edate = str2time($year + ($month == 12 ? 1 : 0) . - '-' . - (($month + 1) % 12 || 12) . - '-01'); -my $numdays = sprintf("%.0f",($edate-$sdate)/86400); -my @days = (0..$numdays - 1); -# Initialize each row with zeroes. -my @labels = ( - 'Opening Balance', - 'Quantity Received', - 'Quantity Sold', - 'Quantity Returned', -); - -if($agentnum) { - push @labels, 'Transfer In', 'Transfer Out'; -} -push @labels, 'Closing Balance'; - -my %agent = ('agentnum' => $agentnum) if $agentnum; -my %class = ('classnum' => $classnum) if $classnum; - -my @rows = ( map {[ (0) x $numdays ]} @labels); -my $opening_balance = scalar( - qsearch('h_inventory_item', - { 'svcnum' => '', - %agent, - %class }, - FS::h_inventory_item->sql_h_search($sdate) ) - ) || 0; - -foreach my $day (0..$numdays-1) { - $rows[0][$day] = ($day == 0) ? - $opening_balance : - $rows[-1][$day-1]; - - my %history; - foreach my $action (qw(insert replace_new replace_old)) { - $history{$action} = [ - qsearch({ - 'table' => 'h_inventory_item', - 'hashref' => { 'history_action' => $action, - %class }, - 'order_by' => 'ORDER BY itemnum, history_date', - 'extra_sql' => - ' AND history_date >= '.($sdate + 86400*$day). - ' AND history_date < ' .($sdate + 86400*($day+1)), - } ) - ]; - } - # Incoming items: simple, just count the inserts - $rows[1][$day] = scalar(grep {!$agentnum or $_->agentnum == $agentnum} - @{ $history{'insert'} }); - - # Other item changes: trickier. - # Notice the order_by parameter above. - # Both lists are sorted by itemnum, then by date, so unless some villain has - # been rapidly replacing the same record several times per second, the - # replace_old and replace_new from the same operation will be in the same - # position. - while(my $h_new = shift @{ $history{'replace_new'} }) { - my $h_old = shift @{ $history{'replace_old'} }; - die "history error" if !defined($h_old) - or $h_old->itemnum != $h_new->itemnum; - if(!$agentnum or $h_new->agentnum == $agentnum) { - if(!$h_old->svcnum and $h_new->svcnum) { - # item was put into service. - $rows[2][$day]++; - } - elsif($h_old->svcnum and !$h_new->svcnum) { - # item was taken out of service. - $rows[3][$day]++; - } - } - if($agentnum and $h_old->agentnum != $agentnum and $h_new->agentnum == $agentnum) { - # item was transferred from another agent - $rows[4][$day]++; - } - elsif($agentnum and $h_old->agentnum == $agentnum and $h_new->agentnum != $agentnum) { - # item was transferred to another agent - $rows[5][$day]++; - } - # Add other cases here. - } - # Closing balance - $rows[-1][$day] = $rows[0][$day] - + $rows[1][$day] - - $rows[2][$day] - + $rows[3][$day]; - if($agentnum) { - $rows[-1][$day] += $rows[4][$day] - $rows[5][$day]; - } -} - - - diff --git a/httemplate/search/report_h_inventory_item.html b/httemplate/search/report_h_inventory_item.html deleted file mode 100644 index d0b3667c8..000000000 --- a/httemplate/search/report_h_inventory_item.html +++ /dev/null @@ -1,26 +0,0 @@ -<% include('/elements/header.html', 'Inventory Activity Report') %> - - - -<%init> - diff --git a/httemplate/search/report_newtax.html b/httemplate/search/report_newtax.html index 739652675..2588b48d3 100755 --- a/httemplate/search/report_newtax.html +++ b/httemplate/search/report_newtax.html @@ -1,6 +1,6 @@ <% include('/elements/header.html', 'Tax Report' ) %> - -<% include( '/elements/progress-init.html', - 'newtax', - [ qw( agentnum beginning ending ) ], - 'report_queued_newtax.cgi', - ) -%> - <% include('/elements/footer.html') %> <%init> diff --git a/httemplate/search/report_prepaid_income.cgi b/httemplate/search/report_prepaid_income.cgi index 2fe5b6f10..bfb699b54 100644 --- a/httemplate/search/report_prepaid_income.cgi +++ b/httemplate/search/report_prepaid_income.cgi @@ -108,6 +108,10 @@ my @where = (); #here is the agent virtualization push @where, $curuser->agentnums_sql( 'table'=>'cust_main' ); +#well, because cust_bill_pkg.cgi has it and without it the numbers don't match.. +push @where , " payby != 'COMP' " + unless $cgi->param('include_comp_cust'); + my %total = (); my %total_legacy = (); foreach my $agentnum (@agentnums) { diff --git a/httemplate/search/report_queued_newtax.cgi b/httemplate/search/report_queued_newtax.cgi index a375fce62..1d5813ece 100755 --- a/httemplate/search/report_queued_newtax.cgi +++ b/httemplate/search/report_queued_newtax.cgi @@ -1,10 +1,16 @@ -<% $server->process %> +<% include("/elements/header.html", "Queue Tax Report") %> +<% include("/elements/error.html") %> +% unless ($error) { + + Report queued. Check the job queue for status. + +% } +<% include("/elements/footer.html") %> <%init> die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Financial reports'); -my $server = - new FS::UI::Web::JSRPC 'FS::tax_rate::queue_liability_report', $cgi; +my $error = FS::tax_rate::queue_liability_report($cgi); diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi index 57228a501..3696ed40d 100755 --- a/httemplate/search/report_receivables.cgi +++ b/httemplate/search/report_receivables.cgi @@ -29,12 +29,24 @@ die "access denied" # ) sub balance { - my($start, $end, $cutoff) = @_; #, %opt ? + my($start, $end, $offset) = @_; #, %opt ? + #handle start and end ranges (86400 = 24h * 60m * 60s) + my $str2time = str2time_sql; + my $closing = str2time_sql_closing; + + # $end == 0 means "+infinity", while $start == 0 really means 0 + # so we should always include a start condition + $start = "( $str2time now() $closing - ". ($start + $offset) * 86400 . ' )'; + # but only include an end condition if $end != 0 + $end = $end ? + "( $str2time now() $closing - ". ($end + $offset) * 86400 . ' )' + : ''; + + #$opt{'unapplied_date'} = 1; + + FS::cust_main->balance_date_sql( $start, $end, 'unapplied_date'=>1, + 'cutoff' => "( $str2time now() $closing - ".$offset * 86400 . ')' ); - FS::cust_main->balance_date_sql( $start, $end, - 'cutoff' => $cutoff, - 'unapplied_date'=>1, - ); } diff --git a/httemplate/search/report_rt_transaction.html b/httemplate/search/report_rt_transaction.html index 61445bd1e..9b7b7cbbb 100644 --- a/httemplate/search/report_rt_transaction.html +++ b/httemplate/search/report_rt_transaction.html @@ -8,24 +8,6 @@ <% include ( '/elements/tr-select-otaker.html' ) %> - <% include ( '/elements/tr-input-text.html', - 'label' => 'Ticket #', - 'field' => 'ticketid', - ) - %> - - - Account - - - - -
@@ -39,18 +21,4 @@ die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('List rating data'); -my $conf = new FS::Conf; - -my @pkgparts = $conf->config('support_packages'); - -my @svc_acct = (); -if ( @pkgparts ) { - @svc_acct = qsearch({ - 'table' => 'svc_acct', - 'addl_from' => ' LEFT JOIN cust_svc USING ( svcnum ) '. - ' LEFT JOIN cust_pkg USING ( pkgnum ) ', - 'extra_sql' => 'WHERE pkgpart IN ('. join(',', @pkgparts). ')', - }); -} - diff --git a/httemplate/search/rt_transaction.html b/httemplate/search/rt_transaction.html index 8dda4baea..651f2896d 100644 --- a/httemplate/search/rt_transaction.html +++ b/httemplate/search/rt_transaction.html @@ -3,12 +3,11 @@ 'name_singular' => 'transaction', 'query' => $query, 'count_query' => $count_query, - 'count_addl' => [ $format_seconds_sub, $format_seconds_sub, ], + 'count_addl' => [ $format_seconds_sub, ], 'header' => [ 'Ticket #', 'Ticket', 'Date', 'Time', - 'Applied', ], 'fields' => [ 'ticketid', sub { encode_entities(shift->get('subject')) }, @@ -16,16 +15,12 @@ sub { my $seconds = shift->get('transaction_time'); &{ $format_seconds_sub }( $seconds ); }, - sub { my $seconds = shift->get('support'); - &{ $format_seconds_sub }( $seconds ); - }, ], 'links' => [ $link, $link, '', '', - '', ], ) %> @@ -33,9 +28,7 @@ my $format_seconds_sub = sub { my $seconds = shift; - #(($seconds < 0) ? '-' : '') . concise(duration($seconds)); - (($seconds < 0) ? '-' : '' ). int(abs($seconds)/3600)."h".sprintf("%02d",(abs( -$seconds)%3600)/60)."m"; + (($seconds < 0) ? '-' : '') . concise(duration($seconds)); }; @@ -54,9 +47,8 @@ my $transactiontime = " "; my $join = 'JOIN Tickets ON Transactions.ObjectId = Tickets.Id '. - 'JOIN Users ON Transactions.Creator = Users.Id '. - 'LEFT JOIN acct_rt_transaction '. - ' ON Transactions.Id = acct_rt_transaction.transaction_id'; + 'JOIN Users ON Transactions.Creator = Users.Id '; + my $where = " WHERE objecttype='RT::Ticket' AND ( ( Transactions.Type = 'Set' @@ -85,26 +77,20 @@ if ( $cgi->param('otaker') && $cgi->param('otaker') =~ /^([\w\.\-]+)$/ ) { $where .= " AND Users.name = '$1' "; } -if ( $cgi->param('ticketid') =~ /^\s*(\d+)\s*$/ ) { - $where .= " AND Tickets.ID = $1"; -} - -if ( $cgi->param('svcnum') =~ /^\s*(\d+)\s*$/ ) { - $where .= " AND acct_rt_transaction.svcnum = $1"; -} - my $query = { - 'select' => "Transactions.*, Tickets.Id AS ticketid, Tickets.Subject, Users.name as otaker, $transactiontime AS transaction_time, acct_rt_transaction.support", + 'select' => "Transactions.*, Tickets.Id AS ticketid, Tickets.Subject, Users.name as otaker, $transactiontime AS transaction_time", #'table' => 'Transactions', 'table' => 'transactions', - 'addl_from' => $join, + 'addl_from' => $join. + 'LEFT JOIN acct_rt_transaction '. + ' ON Transactions.Id = acct_rt_transaction.transaction_id', 'extra_sql' => $where, 'order by' => 'ORDER BY Created', }; my $count_query = - "SELECT COUNT(*), SUM($transactiontime), SUM(acct_rt_transaction.support) FROM Transactions $join $where"; + "SELECT COUNT(*), SUM($transactiontime) FROM Transactions $join $where"; -my $link = [ "${p}rt/Ticket/Display.html?id=", sub { shift->get('ticketid'); } ]; +my $link = [ "${p}rt/Ticket/Display.html?id=", sub { shift->get('id'); } ]; diff --git a/httemplate/search/sql.html b/httemplate/search/sql.html index bf5446975..df9b8cddb 100644 --- a/httemplate/search/sql.html +++ b/httemplate/search/sql.html @@ -1,15 +1,13 @@ <% include( 'elements/search.html', 'title' => 'Query Results', 'name' => 'rows', - 'query' => "SELECT $sql", - ) + 'query' => 'SELECT '. ( $cgi->param('sql') + || errorpage('Empty query') ), + ) %> <%init> die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Raw SQL'); -my $sql = $cgi->param('sql') or errorpage('Empty query'); -$sql =~ s/;+\s*$//; #remove trailing ; - diff --git a/httemplate/search/unapplied_cust_pay.html b/httemplate/search/unapplied_cust_pay.html index e232291fe..73361c00b 100755 --- a/httemplate/search/unapplied_cust_pay.html +++ b/httemplate/search/unapplied_cust_pay.html @@ -13,11 +13,18 @@ die "access denied" <%once> sub unapplied_payments { - my($start, $end, $cutoff) = @_; + my($start, $end, $offset) = @_; + + #handle start and end ranges (86400 = 24h * 60m * 60s) + my $str2time = str2time_sql; + my $closing = str2time_sql_closing; + $start = "( $str2time now() $closing - ".($start + $offset) * 86400 . ' )'; + $end = $end ? + "( $str2time now() $closing - ".($end + $offset) * 86400 . ' )' + : ''; + + FS::cust_main->unapplied_payments_date_sql( $start, $end ); - FS::cust_main->unapplied_payments_date_sql( $start, $end, - 'cutoff' => $cutoff, - ); } diff --git a/httemplate/view/bill_batch.cgi b/httemplate/view/bill_batch.cgi deleted file mode 100644 index 3fca6ebbe..000000000 --- a/httemplate/view/bill_batch.cgi +++ /dev/null @@ -1,99 +0,0 @@ -% if($magic eq 'print') { -<% include('/elements/header.html', "Download Batch") %> - - -<% include('/elements/footer.html') %> -% } -% -% elsif($magic eq 'download') { -% $m->clear_buffer; -% $r->content_type('application/pdf'); -% $r->headers_out->add('Content-Disposition' => 'attachment;filename="invoice_batch_'.$batchnum.'.pdf"'); -<% $batch->pdf %> -% $batch->pdf(''); -% my $error = $batch->replace; -% warn "error deleting cached PDF: '$error'\n" if $error; -% } -% else { -<% include('/search/elements/search.html', - 'title' => $close ? - "Batch $batchnum closed." : - "Invoice Batch $batchnum", - 'name' => 'invoices', - 'query' => { 'table' => 'cust_bill_batch', - 'select' => join(', ', - 'cust_bill.*', - FS::UI::Web::cust_sql_fields(), - 'cust_main.custnum AS cust_main_custnum', - ), - 'hashref' => { }, - 'addl_from' => - 'LEFT JOIN cust_bill USING ( invnum ) '. - 'LEFT JOIN cust_main USING ( custnum )', - 'extra_sql' => '', - " WHERE batchnum = $batchnum", - }, - 'count_query' => "SELECT COUNT(*) FROM cust_bill_batch WHERE batchnum = $batchnum", - 'html_init' => $html_init, - 'header' => [ 'Invoice #', - 'Amount', - 'Date', - 'Customer', - ], - 'fields' => [ sub { shift->cust_bill->display_invnum }, - sub { sprintf($money_char.'%.2f', - shift->cust_bill->charged ) }, - sub { time2str('%b %d %Y', - shift->cust_bill->_date ) }, - sub { shift->cust_bill->cust_main->name }, - ], - 'align' => 'rrll', - 'links' => [ ($link) x 3, $clink, - ], - 'really_disable_download' => 1, -) %> -% } -<%init> - -die "access denied" - unless $FS::CurrentUser::CurrentUser->access_right('View invoices'); - -my $conf = new FS::Conf; -my $batch; -my $batchnum = $cgi->param('batchnum'); - -$batch = FS::bill_batch->by_key($batchnum); -die "Batch '$batchnum' not found!\n" if !$batch; - -my $magic = $cgi->param('magic'); -my $html_init = ''; - -my $close = $cgi->param('close'); -$batch->close if $close; - -if(!$magic) { - $cgi->param('magic' => 'print'); - $cgi->delete('close'); - $html_init = 'Download this batch
'; - if($batch->status eq 'O') { - $cgi->param('close' => 1); - $cgi->delete('magic'); - $html_init .= 'Close this batch
'; - } - $html_init .= '
'; -} - -my $link = [ "$p/view/cust_bill.cgi?", 'invnum' ]; -my $clink = [ "$p/view/cust_main.cgi?", 'custnum' ]; -my $money_char = $conf->config('money_char') || '$'; - - diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi index f6bef43ba..ca8bf5442 100755 --- a/httemplate/view/cust_main.cgi +++ b/httemplate/view/cust_main.cgi @@ -4,22 +4,6 @@ }) %>
-% my @part_tag = $cust_main->part_tag; -% if ( $conf->config('cust_tag-location') eq 'top' && @part_tag ) { - -% foreach my $part_tag ( @part_tag ) { - - - -% } -

- tagcolor) - ? 'STYLE="background-color:#'.$part_tag->tagcolor.'"' - : '' - %>><% $part_tag->tagname.': '. $part_tag->tagdesc |h %> -

-% } <% include('/elements/menubar.html', { 'newstyle' => 1, @@ -29,7 +13,7 @@ %views, ) %> -

+
<% include('/elements/init_overlib.html') %> @@ -90,9 +74,6 @@ function areyousure(href, message) { This customer's signup URL: <% $signupurl %>?ref=<% $custnum %>

% } -%if ( $conf->exists('maestro-status_test') ) { - Test maestro status

-% } @@ -233,7 +214,6 @@ Comments <% include('cust_main/change_history.html', $cust_main ) %> % } - <% include('/elements/footer.html') %> <%init> diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html index 54c180bdd..c8d0c47cd 100644 --- a/httemplate/view/cust_main/billing.html +++ b/httemplate/view/cust_main/billing.html @@ -5,12 +5,7 @@ Billing information %if ( $FS::CurrentUser::CurrentUser->access_right('Bill customer now') % && ! $cust_main->is_encrypted($cust_main->payinfo) % ) { -%# (Bill now) - (<% include('/elements/bill.html', - custnum => $cust_main->custnum, - label => 'Bill now', - url => $p.'view/cust_main.cgi?'.$cust_main->custnum, - ) %>) + (Bill now) % } <% ntable("#cccccc") %> -% my @part_tag = $cust_main->part_tag; -% if ( $conf->config('cust_tag-location') =~ /^(cust_misc|)$/ && @part_tag ) { - - - - -% } - -%unless ( scalar(@agentnums) == 1 -% && !$curuser->access_right('View customers of all agents') ) { -% my $agent = qsearchs('agent',{ 'agentnum' => $cust_main->agentnum } ); +%my $agent; +%if ( $num_agents == 1 ) { +% my @agents = qsearchs( 'agent', {} ); +% $agent = $agents[0]; +%} else { +% $agent = qsearchs('agent',{ 'agentnum' => $cust_main->agentnum } ); @@ -132,8 +119,8 @@ my( $cust_main ) = @_; my $conf = new FS::Conf; my $date_format = ($conf->config('date_format') || "%m/%d/%Y"); -my $curuser = $FS::CurrentUser::CurrentUser; - -my @agentnums = $curuser->agentnums; +my $sth = dbh->prepare('SELECT COUNT(*) FROM agent') or die dbh->errstr; +$sth->execute or die $sth->errstr; +my $num_agents = $sth->fetchrow_arrayref->[0]; diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html index 811ac3c98..3ac4861c3 100755 --- a/httemplate/view/cust_main/packages.html +++ b/httemplate/view/cust_main/packages.html @@ -159,8 +159,7 @@ my %conf_opt = ( #for services.html 'svc_external-skip_manual' => $conf->exists('svc_external-skip_manual'), 'legacy_link' => $conf->exists('legacy_link'), - 'svc_broadband-manage_link' => scalar($conf->config('svc_broadband-manage_link')), - 'maestro-status_test' => $conf->exists('maestro-status_test'), + 'svc_broadband-manage_link' => $conf->config('svc_broadband-manage_link'), ); #subroutines diff --git a/httemplate/view/cust_main/packages/services.html b/httemplate/view/cust_main/packages/services.html index 6e30922c5..0fe7931d8 100644 --- a/httemplate/view/cust_main/packages/services.html +++ b/httemplate/view/cust_main/packages/services.html @@ -58,11 +58,6 @@ % if ( $curuser->access_right('Unprovision customer service') ) { ( <%svc_unprovision_link($cust_svc)%> ) % } - -% if ( $part_svc->svcdb eq 'svc_pbx' && $opt{'maestro-status_test'} ){ - ( Test maestro status ) -% } - % } diff --git a/httemplate/view/cust_main/tickets.html b/httemplate/view/cust_main/tickets.html index e90ae5276..e1f9a131e 100644 --- a/httemplate/view/cust_main/tickets.html +++ b/httemplate/view/cust_main/tickets.html @@ -1,31 +1,17 @@ - - -Create new ticket - in queue + + +in queue + -% } -% else { - - +% foreach my $param ( grep { $_ ne 'Queue' } keys %new_param ) { + % }
@@ -93,7 +79,6 @@ function updateTicketLink() { <%init> -my( $conf ) = new FS::Conf; my( $cust_main ) = @_; my( @tickets ) = $cust_main->tickets; diff --git a/httemplate/view/prospect_main.html b/httemplate/view/prospect_main.html index 9517e3920..9883e6766 100644 --- a/httemplate/view/prospect_main.html +++ b/httemplate/view/prospect_main.html @@ -14,8 +14,7 @@ -%unless ( scalar(@agentnums) == 1 -% && !$curuser->access_right('View customers of all agents') ) { +%unless ( scalar(@agentnums) == 1 ) { % my $agent = qsearchs('agent',{ 'agentnum' => $prospect_main->agentnum } ); diff --git a/httemplate/view/svc_acct/communigate.html b/httemplate/view/svc_acct/communigate.html index 0f090fdb9..9d6680750 100644 --- a/httemplate/view/svc_acct/communigate.html +++ b/httemplate/view/svc_acct/communigate.html @@ -53,45 +53,7 @@ <% include('/view/elements/tr.html', label=>'Send read receipts', value=>$svc_acct->cgp_sendmdnmode ) %> -%# vacation message -%#XXX finish me... do we need to search for specific rules -%# (and hide them?) need to see what CGP gives back after we've added a rule - <% include('/elements/init_overlib.html') %> - - - - - - -%# redirect all mail -%#XXX finish me... - - - - - +%#XXX vacation message, redirect all mail %# mail rules diff --git a/httemplate/view/svc_domain/acct_defaults.html b/httemplate/view/svc_domain/acct_defaults.html index 3a4e187be..b6d03e2df 100644 --- a/httemplate/view/svc_domain/acct_defaults.html +++ b/httemplate/view/svc_domain/acct_defaults.html @@ -36,7 +36,7 @@ %> <% include('/view/elements/tr.html', - label=>'Files limit', + label=>'Files limt', value=>$svc_domain->acct_def_file_maxnum, ) %> diff --git a/httemplate/view/svc_domain/dns.html b/httemplate/view/svc_domain/dns.html index 88a9bda95..f6f8c71c7 100644 --- a/httemplate/view/svc_domain/dns.html +++ b/httemplate/view/svc_domain/dns.html @@ -71,11 +71,10 @@ DNS records - Or % if ( @records ) { - delete all records and + Delete all records and % } - slave from nameserver IP + Or slave from nameserver IP diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi index 15b5ae56f..43d8a4e8b 100755 --- a/httemplate/view/svc_forward.cgi +++ b/httemplate/view/svc_forward.cgi @@ -50,9 +50,6 @@

<% ntable("#cccccc",2) %> diff --git a/httemplate/view/cust_main/misc.html b/httemplate/view/cust_main/misc.html index 6e90a0b4c..2cfe0263f 100644 --- a/httemplate/view/cust_main/misc.html +++ b/httemplate/view/cust_main/misc.html @@ -10,25 +10,12 @@	<% ucfirst($cust_main->status) %>
Tags	-% foreach my $part_tag ( @part_tag ) { - tagcolor) - ? 'STYLE="background-color:#'.$part_tag->tagcolor.'"' - : '' %> - ><% $part_tag->tagname.': '. $part_tag->tagdesc \|h %> - -% } -
Agent	<% $agent->agentnum %>: <% $agent->agent %>
<% $prospectnum %>
Agent
Vacation message	- <% include('/elements/popup_link.html', - 'action' => $p.'edit/cgp_rule-vacation.html?'. - 'svcnum='. $svc_acct->svcnum, - 'label' => '(add)', #XXX (edit) - 'actionlabel' => 'Vacation message', - 'width' => 600, - 'height' => 300, - #'color' - ) - %> -
Redirect all mail	- <% include('/elements/popup_link.html', - 'action' => $p.'edit/cgp_rule-redirect_all.html?'. - 'svcnum='. $svc_acct->svcnum, - 'label' => '(add)', #XXX (edit) - 'actionlabel' => 'Redirect all mail', - 'width' => 763, - #'height' - #'color' - ) - %> -

- -<% include('elements/svc_export_settings.html', $svc_forward) %> - <% joblisting({'svcnum'=>$svcnum}, 1) %> <% include('/elements/footer.html') %> diff --git a/init.d/freeside-init b/init.d/freeside-init index 1acefdc41..b4609d48a 100644 --- a/init.d/freeside-init +++ b/init.d/freeside-init @@ -48,10 +48,6 @@ case "$1" in echo "done." done - echo -n "Starting freeside-selfservice-xmlrpcd: " - freeside-selfservice-xmlrpcd $SELFSERVICE_USER - echo "done." - #ip=`/sbin/ifconfig $IF | grep 'inet addr:' | cut -d: -f2- | cut -d' ' -f1` #cp /opt/rt3/etc/RT_SiteConfig.pm.ORIG /opt/rt3/etc/RT_SiteConfig.pm #perl -pi -e "s/localhost/$ip/" /opt/rt3/etc/RT_SiteConfig.pm @@ -108,12 +104,6 @@ case "$1" in fi done - if [ -e /var/run/freeside/selfservice-xmlrpcd.pid ]; then - echo -n "Stopping freeside-selfservice-xmlrpcd: " - kill `cat /var/run/freeside/selfservice-xmlrpcd.pid` - echo "done." - fi - ;; restart) diff --git a/rpm/build/BOOTSTRAP b/rpm/build/BOOTSTRAP deleted file mode 100644 index 6ddf5b54d..000000000 --- a/rpm/build/BOOTSTRAP +++ /dev/null @@ -1,146 +0,0 @@ -# its more notes than a script, so no #!/bin/sh yet - -# s/ivan/username/ in buildsysrc and below - - -### -# host dirs -### - - -cd -mkdir public_html -mkdir mock -mkdir redhat -mkdir redhat/SRPMS -mkdir buildsys -mkdir buildsys/ref -mkdir buildsys/ref/SRPMS - -cd buildsys -for a in build-freeside buildsysrc cvs-check-and-build enrpm expect-addsign expect-signrepo ovid2flute refresh-repo; do -ln -s ~/freeside/rpm/build/$a . -done - - -### -# vserver setup -### - - -#ftp://ftp.pld-linux.org/people/hawk/vserver-templates/Centos -#sudo vserver centos5 build -m template --context 5 --hostname centos5.freeside.biz --interface dummy0:10.5.4.5/24 -- -d centos5 -t centos5-i686.tar.bz2 -sudo vserver centos5 build -m template --context 5 --hostname centos5.freeside.biz --interface dummy0:10.5.4.5/24 -- -d centos5 -t centos5-x86_64.tar.bz2 - -#something like this as /etc/init.d/vserver-nat: -!/bin/sh -iptables -t nat -F -iptables -t nat -A POSTROUTING -s 10.5.4.0/24 -d ! 10.5.4.0/24 -j SNAT --to-source 192.168.1.143 - -vserver centos5 start -vserver centos5 enter -#edit /etc/resolv.conf (easier from outside, no vi inside yet) - -yum update -yum install openssh-server vim-minimal zsh screen sudo perl patch cvs diffutils rpm-build rsync - -adduser ivan #username -cd ~ivan #username -mkdir .ssh -vi .ssh/authorized_keys - -mkdir redhat -mkdir redhat/BUILD -mkdir redhat/RPMS -mkdir redhat/SOURCES -mkdir redhat/SPECS -mkdir redhat/SRPMS -chown -R ivan:ivan redhat - -vi ~/.rpmmacros -%_gpg_path /home/ivan/.gnupg -%_gpg_name Freeside Internet Services, Inc. RPM Signing Key - -vi /etc/ssh/sshd_config #ListenAddress -#also need to edit on the host so the vserver can claim its address - -vi /etc/pam.d/sshd -#comment out: -#session required pam_loginuid.so - -/etc/init.d/sshd restart - -vi /etc/sudoers - -exit #and test ssh'ing in - -### -# more... -### - -#copy the stuff from rpm/build/native into /home/ivan (#username) in the vserver -cd rpm/build/native -for a in build-from-cvs freeside-cvs makesrpm ovid2flute ovid-0.12-1.x86_64.rpm Ovid.diff; do - cp $a /var/lib/vservers/centos5/home/ivan/ -done - -for a in build-from-cvs freeside-cvs makesrpm ovid2flute; do - chmod a+rx /var/lib/vservers/centos5/home/ivan/$a -done - -vserver centos5 enter #or ssh 10.5.4.5 and sudo - -rpm -i ovid-0.12-1.x86_64.rpm -cd /usr/lib/perl5/site_perl/5.*/Ovid -patch < ~ivan/Ovid.diff - -#also checkout the necessary freeside versions... -export CVSROOT=":pserver:anonymous:anonymous@cvs.freeside.biz:/home/cvs/cvsroot" - -cvs checkout -rFREESIDE_1_7_BRANCH -d freeside-1.7 freeside -#cvs checkout -rFREESIDE_1_9_BRANCH -d freeside-1.9 freeside - -### -# yet more -### - -cp -i /var/lib/vservers/centos5/etc/yum.repos.d/CentOS-Base.repo /etc/yum/repos.d/ -#and s/$releasever/5/g; - -cp expect-* /usr/local/bin/ -#edit them and set your real passphrase for the gpg key you're using -#(as per that dir above) - -### -# and the repository -### - -cd -mkdir -p public_html/repo/centos/5/freeside-1.7/testing/x86_64/ -mkdir public_html/repo/centos/5/freeside-1.7/testing/i686 - -### -# and for enrpm! -### - -vserver centos5 enter -yum install perl-libwww-perl make -cpan -install RPM::Specfile -#if it fails, might need to go to /root/.cpan/build/RPM-Specfile-* and do it manually -install YAML - -#for user cpan-ability -mkdir .cpan -mkdir .cpan/CPAN -cp /usr/lib/perl5/5.8.8/CPAN/Config.pm .cpan/CPAN/MyConfig.pm -vi .cpan/CPAN/MyConfig.pm #and just leave and change the /root ones -chmod a+rx .cpan/CPAN/MyConfig.pm - -#edit ovid2flue and set user - -### -# references -### - -http://www.freeside.biz/mediawiki/index.php/Freeside:Documentation:CreatingRPMRepo diff --git a/rpm/build/build-freeside b/rpm/build/build-freeside deleted file mode 100755 index afef96ab6..000000000 --- a/rpm/build/build-freeside +++ /dev/null @@ -1,192 +0,0 @@ -#!/bin/sh -# -# Copyright 2008, Elirion, Inc. All rights reserved. -# This software is licensed under the same terms as Freeside itself. -# -# This script rebuilds SRPMs of Freeside builds or the required Perl modules on all the target -# distributions and versions using mock. After a successful build, it signs the resulting RPMs -# and scp's them to the server where the yum repositories are hosted. -# (Of course, koji is supposed to do all this, including updating the repo.) - -VERSIONS='1.7 1.9' -#VERSIONS='1.7 1.9 2.1' -REPO=testing -BRANCH= -DISTROS='centos sles' -CENTOSVERS='5' -SLESVERS=10 -WHICHVERS= -ARCHS='i386 x86_64' - -BUILDSYSDIR=`dirname $0` - -MOCKWORK="$BUILDSYSDIR/mockwork" - -#MOCKARGS='--autocache' -MOCKARGS="--configdir=$BUILDSYSDIR/mock --resultdir=$MOCKWORK" - -if [ -f $BUILDSYSDIR/buildsysrc ]; then - #chmod a+x $BUILDSYSDIR/buildsysrc - #echo $BUILDSYSDIR/buildsysrc - . $BUILDSYSDIR/buildsysrc -fi -if [ -f $HOME/buildsysrc ]; then - #chmod a+x $HOME/buildsysrc - #echo $HOME/buildsysrc - . $HOME/buildsysrc -fi - -EXPECT_ADDSIGN=$BUILDSYSDIR/expect-addsign -if [ -f /usr/local/bin/expect-addsign ]; then - EXPECT_ADDSIGN=/usr/local/bin/expect-addsign -fi - -usage() { - echo "build-freeside: build RPMs for all target distros and architectures using mock" - echo "where:" - echo " -a : change architectures (currently: $ARCHS)" - echo " -b : change branch (currently: $BRANCH)" - echo " -d : change distributions (currently: $DISTROS)" - echo " -m : change arguments passed to 'mock' (currently: $MOCKARGS)" - echo " -r : change repositories (currently: $REPO)" - echo " -s : build these SRPMs instead of new ones in staging area" - echo " -v : change versions (currently: $VERSIONS)" - echo " -w : change distro version (currently: $WHICHVERS)" - exit 0 -} - -while getopts "a:b:d:hm:r:s:v:w:" flag -do - case $flag in - a) - echo "Changing architectures from $ARCHS to $OPTARG" - ARCHS=$OPTARG;; - b) - echo "Changing branch from $BRANCH to $OPTARG" - BRANCH=$OPTARG;; - d) - echo "Changing distros from $DISTROS to $OPTARG" - DISTROS=$OPTARG;; - m) - echo "Changing mock arguments from $MOCKARGS to $OPTARG" - MOCKARGS=$OPTARG;; - r) - echo "Changing repository from $REPO to $OPTARG" - REPO=$OPTARG;; - s) - echo "Changing SRPMS from $SRPMS to $OPTARG" - SRPMS=$OPTARG;; - v) - echo "Changing versions from $VERSIONS to $OPTARG" - VERSIONS=$OPTARG;; - w) - echo "Changing which distro versions from $WHICHVERS to $OPTARG" - WHICHVERS=$OPTARG;; - *) - usage;; - esac -done - -if [ "${SRCFOLDER}x" = "x" ]; then - PWD=`pwd` - echo "No source folder defined! (BUILDSYSDIR=$BUILDSYSDIR pwd=$PWD)" - exit -fi - -if [ "${REFFOLDER}x" = "x" ]; then - echo "No reference folder defined!" - exit -fi - -if [ "${SRPMS}x" = "x" ]; then - # Work out the new SRPMs on grosbeak - SRPMS=`/usr/bin/rsync -Cavz --dry-run $SRCFOLDER/ $REFFOLDER | grep .src.rpm | grep -v safecat | tr '\n' ' '` - - # Go and get the SRPMs - /usr/bin/rsync -Cavz $SRCFOLDER/ $REFFOLDER -fi - -# Make sure the SRPMs are there -for srpm in ${SRPMS} -do - if [ ! -f $REFFOLDER/${srpm} ] - then - echo "No such file: $REFFOLDER/${srpm}" - exit - fi -done - -# Build all the SRPMs -for srpm in ${SRPMS} -do - for distro in $DISTROS - do - if [ "${WHICHVERS}x" = "x" ]; then - if [ "$distro" = "centos" ]; then - DISTVERS=$CENTOSVERS - fi - if [ "$distro" = "sles" ]; then - DISTVERS=$SLESVERS - fi - else - DISTVERS=$WHICHVERS - fi - for distver in $DISTVERS - do - os=${distro}-${distver} - for arch in $ARCHS - do - echo "$os - $arch: $srpm" - echo mock $MOCKARGS -r ${os}-${arch} $REFFOLDER/${srpm} - time mock $MOCKARGS -r ${os}-${arch} $REFFOLDER/${srpm} - if true #[ -f $MOCKWORK/${os}-${arch}/state/status ] && grep done $MOCKWORK/${os}-${arch}/state/status - then - for VERSION in $VERSIONS - do - DEST=$VERSION - if [ "${BRANCH}x" != "x" ] - then - DEST=$BRANCH - fi - # Copy freeside RPMs for this version only - #FILES=`ls -1 $MOCKWORK/${os}-${arch}/result/freeside*-${VERSION}-*.rpm | grep -v .src.rpm | tr '\n' ' '` - FILES=`ls -1 $MOCKWORK/freeside*-${VERSION}-*.rpm | grep -v .src.rpm | tr '\n' ' '` - echo $FILES - if [ "${FILES}x" != "x" ] - then - for FILE in $FILES - do - $EXPECT_ADDSIGN $FILE - done - if [ "${REPOMACHINE}x" != "x" ] - then - scp -p $FILES $REPOUSER@$REPOMACHINE:$REPOFOLDER/repo/${distro}/${distver}/freeside-${DEST}/${REPO}/${arch} - else - cp -p $FILES $REPOFOLDER/repo/${distro}/${distver}/freeside-${DEST}/${REPO}/${arch} - fi - fi - # Copy non-freeside RPMs to all versions - #FILES=`ls -1 $MOCKWORK/${os}-${arch}/result/*.rpm | grep -v freeside | grep -v .src.rpm | tr '\n' ' '` - FILES=`ls -1 $MOCKWORK/*.rpm | grep -v freeside | grep -v .src.rpm | tr '\n' ' '` - echo $FILES - if [ "${FILES}x" != "x" ] - then - for FILE in $FILES - do - $EXPECT_ADDSIGN $FILE - done - if [ "${REPOMACHINE}x" != "x" ] - then - scp -p $FILES $REPOUSER@$REPOMACHINE:$REPOFOLDER/repo/${distro}/${distver}/freeside-${DEST}/${REPO}/${arch} - else - cp -p $FILES $REPOFOLDER/repo/${distro}/${distver}/freeside-${DEST}/${REPO}/${arch} - fi - fi - done - fi - done - done - done -done - -echo "build-freeside done" diff --git a/rpm/build/buildsysrc b/rpm/build/buildsysrc deleted file mode 100755 index c8d0beeb0..000000000 --- a/rpm/build/buildsysrc +++ /dev/null @@ -1,14 +0,0 @@ -# Define shell variables for the Freeside RPM build system -# - -SRCFOLDER=ivan@10.5.4.5:/home/ivan/redhat/SRPMS -REFFOLDER=$HOME/buildsys/ref/SRPMS -#ARCHS='i386 x86_64' -REPOFOLDER=/home/ivan/public_html -REPOBASEFOLDER=/home/ivan/public_html -KEYID=rpm - -VERSIONS='1.7' -DISTROS='centos' -CENTOSVERS='5' -#ARCHS='x86_64' diff --git a/rpm/build/cvs-check-and-build b/rpm/build/cvs-check-and-build deleted file mode 100755 index e8cd52104..000000000 --- a/rpm/build/cvs-check-and-build +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# -# Copyright 2009, Elirion, Inc. All rights reserved. -# This software is licensed under the same terms as Freeside itself. -# -# This script wraps other scripts in the build system. It does a CVS comparison on the vserver -# to determine if the CVS contents have changed. If so, an SRPM is built. The script then invokes -# the local build script which pulls down this SRPM and uses mock to build binary RPMs for the -# default targets. Finally, the repository is updated. -# -# There's currently no testing for failure. - -FORCE_FLAG= -QUIET_FLAG= - -usage() { - echo "cvs-check-and-build: check Freeside CVS and build RPMs if changed" - echo "where:" - echo " -f: force SRPM rebuild even if CVS contents have not changed" - echo " -h: print this help message" - echo " -q: run yum-arch and createrepo in quiet mode" - exit 0 -} - -while getopts "fhq" flag -do - case $flag in - f) - echo "Force mode" - FORCE_FLAG=-f;; - q) - echo "Quiet mode" - QUIET_FLAG=-q;; - *) - usage;; - esac -done - -#ssh 10.5.4.5 /home/rsiddall/build-from-cvs $FORCE_FLAG -#cd /home/rsiddall/buildsys; ./build-freeside; ./refresh-repo $QUIET_FLAG - -ssh 10.5.4.5 ./build-from-cvs $FORCE_FLAG - -cd ~/buildsys; ./build-freeside; ./refresh-repo $QUIET_FLAG - diff --git a/rpm/build/enrpm b/rpm/build/enrpm deleted file mode 100755 index 3e674bc3a..000000000 --- a/rpm/build/enrpm +++ /dev/null @@ -1,178 +0,0 @@ -#!/usr/bin/perl -w -# -# Attempt to build RPMs for Freeside from a tarball or module -# -# Contains portions of "cpanspec" http://cpanspec.sourceforge.net/ - -=head1 NAME - -enrpm - Attempt to build RPMs for Freeside from a tarball or a module - -=head1 SYNOPSIS - -enrpm [options] [tarball|module-name [...]] - - Options: - --help -h Help message - -=head1 DESCRIPTION - -B will generate a spec file to build a rpm from a CPAN-style -Perl module distribution, then try to build RPMs from that spec file -under mock, and update the repositories if successful. - -B uses the file extension of the tarball or module-name specified -on the command line to determine if the argument is a tarball or a module name. - -Modules are downloaded from the CPAN. You must have initialized CPAN on the machine -for B to be able to do this. - -For tarballs B attempts to build a usable .spec file using cpanflute2, and then builds -an SRPM from the .spec file and the tarball. - -Once an SRPM has been built, B uses an external script to build binary RPMs under "mock". -It then uses a second script to update the repositories. - -=head1 OPTIONS - -=over 4 - -=item B<--help> - -Print a brief help message and exit. - -=item B<--packager> - -Specify the name and e-mail address of the packager. This winds up in auto-generated .spec files. - -=item B<--server> - -Specify the host name or IP address of the server on which the SRPM will be built. This server must be -set up for SRPM building, which means it must have both B and B installed on it. - -=item B<--dry-run> - -Just print out commands, don't actually run them. - -=back - -=head1 BUGS - -Currently has little in the way of error detection and diagnostics. - -The back-end should be replaced with an existing build system such as koji. - -=head1 AUTHOR - -Richard Siddall - -=head1 SEE ALSO - -L, L, L - -=cut - -use strict; -use Getopt::Long; -use Cwd qw/getcwd abs_path/; -use File::Basename; -use Sys::Hostname; # False laziness to get around a real config file... - -my %opts; - -GetOptions(\%opts, 'packager=s', 'release=s', 'server=s', 'dryrun'); - -$ENV{PATH} = "/bin:/usr/bin"; - -sub usage { - print STDERR "usage: enrpm --packager > [--release=] --server [--dryrun] tarball|module-name\n"; - print STDERR "where:\n\t--packager is the name and e-mail address of the packager for the .spec file\n\t--release is the rpm release number for the .spec file\n\t--server is the server to build the SRPM on\n\t--dryrun means do not actually run the commands\n\n"; - print STDERR "\ttarball is the name of a tarball containing the Perl module to be packaged\n"; - print STDERR "\tmodule-name is the name of a CPAN Perl module to be packaged\n"; - exit; -} - -# Feeble excuse for not having a real configuration file -my $user = 'ivan'; -my $buildsys = "/home/$user/buildsys"; -#my $rembuild = '/home/rsiddall/buildsys/ref'; -my $remdeps = '/home/ivan'; -my $rpmtopdir = "/home/$user/redhat"; -my $packager = 'Ivan Kohler '; -my $server = '10.5.4.5'; - -$server = $opts{server} if defined($opts{server}); -$user = $1 if $server =~ /(\w+)\@[\w\d\.]+/; - -$packager = $opts{packager} if defined($opts{packager}); - -# Go ahead and build an SRPM... - -my $ovidignore = '--ignore ' . join ('--ignore ', qw/libwww/); - - -for my $file (@ARGV) { - my ($name,$version,$type); - - if ($file =~ /^(?:.*\/)?(.*)-(?:v\.?)?([^-]+)\.(tar)\.(?:gz|bz2)$/) { - $name = $1; - $version = $2; - $type = $3; - } elsif ($file =~ /^(?:.*\/)?(.*)-(?:v\.?)?([^-]+)\.tgz$/) { - $name = $1; - $version = $2; - $type = 'tar'; - } elsif ($file =~ /^(?:.*\/)?(.*)-(?:v\.?)?([^-]+)\.(zip)$/) { - $name = $1; - $version = $2; - $type = $3; - } else { - # keep things happy if we get "Foo-Bar" instead of "Foo::Bar" - $file =~ s/-/::/g; - $name = $file; - $version = undef; - $type = 'module'; - } - - if ($type eq 'module') { - my $fluteopts = ''; - $fluteopts .= "--packager='$packager' " if defined($packager); - $fluteopts .= "--release='$opts{release}' " if defined($opts{release}); - do_cmd("ssh $user\@$server \"ovid --deps $ovidignore $name | tail -1 | $remdeps/ovid2flute $fluteopts | /bin/sh\""); - } else { - my $absfile = abs_path($file); - my $fname = basename($file); - die "Packager name and e-mail required" if !defined($packager); - die "RPM release string required" if !defined($opts{release}); - do_cmd("scp $absfile $user\@$server:/home/$user/$fname"); -# do_cmd("ssh $user\@$server 'cpanflute2 --just-spec --noperlreqs --email=\\\"$packager\\\" --release=$opts{release} /home/$user/$fname > /home/$user/work/redhat/SPECS/$name.spec;'"); -# do_cmd("ssh $user\@$server 'perl -pi -e \\\"s/perl$perl$/perl/g\\\" /home/$user/work/redhat/SPECS/$name.spec;'"); -# do_cmd("ssh $user\@$server 'rpmbuild -bs --nodeps --define \\\"_sourcedir /home/$user/\\\" --define \\\"_srcrpmdir /home/$user/work/redhat/SRPMS\\\" /home/$user/work/redhat/SPECS/$name.spec'"); - open SCRIPT, ">/home/$user/makesrpm" or die "Can't create SRPM construction script: ", $!; - print SCRIPT "#!/bin/sh\n\n"; - print SCRIPT "cpanflute2 --just-spec --noperlreqs --email='$packager' --release=$opts{release} /home/$user/$fname > $rpmtopdir/SPECS/$name.spec;\n"; - print SCRIPT "perl -pi -e 's/perl(perl)/perl/g' $rpmtopdir/SPECS/$name.spec\n"; - print SCRIPT "rpmbuild -bs --nodeps --define '_sourcedir /home/$user/' --define '_srcrpmdir $rpmtopdir/SRPMS' $rpmtopdir/SPECS/$name.spec\n"; - close SCRIPT or die "Can't close SRPM construction script: ", $!; - chmod(0711, "/home/$user/makesrpm"); - do_cmd("scp /home/$user/makesrpm $user\@$server:/home/$user/makesrpm"); - do_cmd("ssh $user\@$server /home/$user/makesrpm"); - } - my $olddir = getcwd(); - do_cmd("$buildsys/build-freeside"); -# if (-x "$buildsys/refresh-repo") { - do_cmd("$buildsys/refresh-repo"); -# } else { -# do_cmd("ssh $user\@$server $rembuild/refresh-repo"); -# } -} - -sub do_cmd { - my $cmd = shift; - - print "$cmd\n"; - `$cmd` if !exists($opts{dryrun}); -} - -1; - diff --git a/rpm/build/expect-addsign b/rpm/build/expect-addsign deleted file mode 100755 index 5634ed47b..000000000 --- a/rpm/build/expect-addsign +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/expect -set p "not our actual passphrase" -set f [lindex $argv 0] -#spawn /bin/rpm --resign $f -spawn /usr/bin/rpm --resign $f -expect "Enter pass phrase:" -send -- "$p\r" -expect eof diff --git a/rpm/build/expect-signrepo b/rpm/build/expect-signrepo deleted file mode 100755 index 81035f9f2..000000000 --- a/rpm/build/expect-signrepo +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/expect -set password "not our actual passphrase" -set key [lindex $argv 0] -set output [lindex $argv 1] -set input [lindex $argv 2] -spawn gpg -sab --yes -u "$key" -o $output $input -expect "Enter passphrase:" -send -- "$password\r" -expect eof diff --git a/rpm/build/mock/centos-5-i386.cfg b/rpm/build/mock/centos-5-i386.cfg deleted file mode 100644 index 203d4fd13..000000000 --- a/rpm/build/mock/centos-5-i386.cfg +++ /dev/null @@ -1,87 +0,0 @@ -#!/usr/bin/python -tt -import os -config_opts['root'] = 'centos-5-i386' -config_opts['target_arch'] = 'i386' - -config_opts['cleanup_on_failure'] = 0 - -config_opts['chroot_setup_cmd'] = 'install buildsys-build' - -# caching related options -#these are probably obsolete? -config_opts['rebuild_cache'] = False -#config_opts['use_cache'] = False -config_opts['use_cache'] = True -config_opts['pack_cmd'] = "/usr/sbin/mock-helper pack" -config_opts['unpack_cmd'] = "/usr/sbin/mock-helper unpack" -config_opts['cache_ext'] = ".tar.gz" -config_opts['cache_topdir'] = "/var/cache/mock" -#config_opts['max_cache_age_days'] = 15 -config_opts['max_cache_age_days'] = 150 - -# config_opts['plugin_conf']['ccache_enable'] = True -config_opts['plugin_conf']['ccache_enable'] = False -# config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '4G' -# config_opts['plugin_conf']['ccache_opts']['dir'] = "%(cache_topdir)s/%(root)s/ccache/" -config_opts['plugin_conf']['yum_cache_enable'] = True -config_opts['plugin_conf']['yum_cache_opts']['max_age_days'] = 30 -config_opts['plugin_conf']['yum_cache_opts']['dir'] = "%(cache_topdir)s/%(root)s/yum_cache/" -config_opts['plugin_conf']['root_cache_enable'] = True -config_opts['plugin_conf']['root_cache_opts']['max_age_days'] = 15 -config_opts['plugin_conf']['root_cache_opts']['dir'] = "%(cache_topdir)s/%(root)s/root_cache/" -config_opts['plugin_conf']['root_cache_opts']['compress_program'] = "gzip" -config_opts['plugin_conf']['root_cache_opts']['extension'] = ".gz" - - -config_opts['yum.conf'] = """ - -[main] -cachedir=/var/cache/yum -debuglevel=1 -reposdir=/dev/null -logfile=/var/log/yum.log -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 - -# repos - -[os] -name=os -mirrorlist=http://mirrorlist.centos.org/?release=5&arch=i386&repo=os -baseurl=http://mirror.centos.org/centos/5/os/i386/ -#baseurl=file:///home/rsiddall/mock/repos/centos/5/os/i386/ - -[updates] -name=updates -mirrorlist=http://mirrorlist.centos.org/?release=5&arch=i386&repo=updates -baseurl=http://mirror.centos.org/centos/5/updates/i386/ -#baseurl=file:///home/rsiddall/mock/repos/centos/5/updates/i386/ - -[groups] -name=groups -baseurl=http://dev.centos.org/centos/buildsys/5/ - -""" - -#something here is causing a problem, don't know what, see if we need anything -#config_opts['macros'] = """ -#%_topdir /builddir/build -#%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm -# -## Change the next two lines to reflect yourself. -# -#%packager Freeside Internet Services, Inc. -##%vendor -##%distribution -# -## please change this to reflect the Distro Tree and Repo hosting packages! -##%dist . -#%centos_ver 5 -# -##%_smp_mflags -j1 -# -#""" - - diff --git a/rpm/build/mock/centos-5-x86_64.cfg b/rpm/build/mock/centos-5-x86_64.cfg deleted file mode 100644 index 174136909..000000000 --- a/rpm/build/mock/centos-5-x86_64.cfg +++ /dev/null @@ -1,88 +0,0 @@ -#!/usr/bin/python -tt -import os - -config_opts['root'] = 'centos-5-x86_64' -config_opts['target_arch'] = 'x86_64' - -config_opts['cleanup_on_failure'] = 0 - -config_opts['chroot_setup_cmd'] = 'install buildsys-build' - -# caching related options -#these are probably obsolete? -config_opts['rebuild_cache'] = False -#config_opts['use_cache'] = False -config_opts['use_cache'] = True -config_opts['pack_cmd'] = "/usr/sbin/mock-helper pack" -config_opts['unpack_cmd'] = "/usr/sbin/mock-helper unpack" -config_opts['cache_ext'] = ".tar.gz" -config_opts['cache_topdir'] = "/var/cache/mock" -#config_opts['max_cache_age_days'] = 15 -config_opts['max_cache_age_days'] = 150 - -# config_opts['plugin_conf']['ccache_enable'] = True -config_opts['plugin_conf']['ccache_enable'] = False -# config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '4G' -# config_opts['plugin_conf']['ccache_opts']['dir'] = "%(cache_topdir)s/%(root)s/ccache/" -config_opts['plugin_conf']['yum_cache_enable'] = True -config_opts['plugin_conf']['yum_cache_opts']['max_age_days'] = 30 -config_opts['plugin_conf']['yum_cache_opts']['dir'] = "%(cache_topdir)s/%(root)s/yum_cache/" -config_opts['plugin_conf']['root_cache_enable'] = True -config_opts['plugin_conf']['root_cache_opts']['max_age_days'] = 15 -config_opts['plugin_conf']['root_cache_opts']['dir'] = "%(cache_topdir)s/%(root)s/root_cache/" -config_opts['plugin_conf']['root_cache_opts']['compress_program'] = "gzip" -config_opts['plugin_conf']['root_cache_opts']['extension'] = ".gz" - - -config_opts['yum.conf'] = """ - -[main] -cachedir=/var/cache/yum -debuglevel=1 -reposdir=/dev/null -logfile=/var/log/yum.log -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 -exclude=[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefhijklmnopqrstuvwxyz]*.i*86 g[abcdefghijkmnopqrstuvwxyz]*.i?86 glib2.i?86 glib.i?86 *-devel.i?86 -# repos - -[os] -name=os -mirrorlist=http://mirrorlist.centos.org/?release=5&arch=x86_64&repo=os -baseurl=http://mirror.centos.org/centos/5/os/x86_64/ -#baseurl=file:///home/rsiddall/mock/repos/centos/5/os/x86_64/ - -[updates] -name=updates -mirrorlist=http://mirrorlist.centos.org/?release=5&arch=x86_64&repo=updates -baseurl=http://mirror.centos.org/centos/5/updates/x86_64/ -#baseurl=file:///home/rsiddall/mock/repos/centos/5/updates/x86_64/ - -[groups] -name=groups -baseurl=http://dev.centos.org/centos/buildsys/5/ -""" - -#something here is causing a problem, don't know what, see if we need anything -#re-enabled -#config_opts['macros'] = """ -#%_topdir /builddir/build -#%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm -# -## Change the next two lines to reflect yourself. -# -#%packager Freeside Internet Services, Inc. -##%vendor -##%distribution -# -## please change this to reflect the Distro Tree and Repo hosting packages! -##%dist . -#%centos_ver 5 -# -##%_smp_mflags -j1 -# -#""" - - diff --git a/rpm/build/mock/defaults.cfg b/rpm/build/mock/defaults.cfg deleted file mode 100644 index 3f9fcf6c2..000000000 --- a/rpm/build/mock/defaults.cfg +++ /dev/null @@ -1,39 +0,0 @@ -# mock defaults -# -# Define default values here. -# These values are overwritten in the /etc/mock/CHROOT.cfg files. -# -# Example: -# -# config_opts['foo'] = bar -config_opts['basedir'] = '/var/lib/mock/' -config_opts['chroot'] = '/usr/sbin/mock-helper chroot' -config_opts['mount'] = '/usr/sbin/mock-helper mount' -config_opts['umount'] = '/usr/sbin/mock-helper umount' -config_opts['rm'] = '/usr/sbin/mock-helper rm' -config_opts['mknod'] = '/usr/sbin/mock-helper mknod' -config_opts['yum'] = '/usr/sbin/mock-helper yum' -config_opts['runuser'] = '/sbin/runuser' -config_opts['chrootuser'] = 'mockbuild' -config_opts['chrootgroup'] = 'mockbuild' -config_opts['chrootuid'] = os.geteuid() -config_opts['chrootgid'] = os.getegid() -config_opts['chroothome'] = '/builddir' -config_opts['clean'] = True - -# caching related options -config_opts['rebuild_cache'] = False -config_opts['use_cache'] = False -config_opts['pack_cmd'] = "/usr/sbin/mock-helper pack" -config_opts['unpack_cmd'] = "/usr/sbin/mock-helper unpack" -config_opts['cache_ext'] = ".tar.gz" -config_opts['cache_topdir'] = "root-cache" -config_opts['max_cache_age_days'] = 15 - -# allow some network tests to run under the chroot -config_opts['files']['/etc/resolv.conf'] = open("/etc/resolv.conf","r").read() -config_opts['files']['/etc/hosts'] = open("/etc/hosts","r").read() - -config_opts['chroot_setup_cmd'] = 'install buildsys-build' -#config_opts['chroot_setup_cmd'] = 'groupinstall build' - diff --git a/rpm/build/mock/logging.ini b/rpm/build/mock/logging.ini deleted file mode 100644 index fadc6a85b..000000000 --- a/rpm/build/mock/logging.ini +++ /dev/null @@ -1,84 +0,0 @@ -[formatters] -keys: detailed,simple,unadorned,state - -[handlers] -keys: simple_console,detailed_console,unadorned_console,simple_console_warnings_only - -[loggers] -keys: root,build,state,mock - -[formatter_state] -format: %(asctime)s - %(message)s - -[formatter_unadorned] -format: %(message)s - -[formatter_simple] -format: %(levelname)s: %(message)s - -;useful for debugging: -[formatter_detailed] -format: %(levelname)s %(filename)s:%(lineno)d: %(message)s - -[handler_unadorned_console] -class: StreamHandler -args: [] -formatter: unadorned -level: INFO - -[handler_simple_console] -class: StreamHandler -args: [] -formatter: simple -level: INFO - -[handler_simple_console_warnings_only] -class: StreamHandler -args: [] -formatter: simple -level: WARNING - -[handler_detailed_console] -class: StreamHandler -args: [] -formatter: detailed -level: WARNING - -; usually dont want to set a level for loggers -; this way all handlers get all messages, and messages can be filtered -; at the handler level -; -; all these loggers default to a console output handler -; -[logger_root] -level: NOTSET -handlers: simple_console - -; mock logger normally has no output -; catches stuff like mock.trace_decorator and mock.util -; dont normally want to propagate to root logger, either -[logger_mock] -level: NOTSET -handlers: -qualname: mock -propagate: 1 - -[logger_state] -level: NOTSET -; unadorned_console only outputs INFO or above -handlers: unadorned_console -qualname: mock.Root.state -propagate: 0 - -[logger_build] -level: NOTSET -handlers: simple_console_warnings_only -qualname: mock.Root.build -propagate: 0 - -; the following is a list mock logger qualnames used within the code: -; -; qualname: mock.util -; qualname: mock.uid -; qualname: mock.trace_decorator - diff --git a/rpm/build/mock/site-defaults.cfg b/rpm/build/mock/site-defaults.cfg deleted file mode 100644 index 0ee2082eb..000000000 --- a/rpm/build/mock/site-defaults.cfg +++ /dev/null @@ -1,98 +0,0 @@ -# mock defaults -# vim:tw=0:ts=4:sw=4:et: -# -# This config file is for site-specific default values that apply across all -# configurations. Options specified in this config file can be overridden in -# the individual mock config files. -# -# The defaults.cfg delivered by default has NO options set. Only set options -# here if you want to override the defaults. -# -# Entries in this file follow the same format as other mock config files. -# config_opts['foo'] = bar - -############################################################################# -# -# Things that we recommend you set in defaults.cfg: -# -# config_opts['basedir'] = '/var/lib/mock/' -# config_opts['cache_topdir'] = '/var/cache/mock' -# Note: the path pointed to by basedir and cache_topdir must be owned -# by group 'mock' and must have mode: g+rws -# config_opts['rpmbuild_timeout'] = 0 -# config_opts['use_host_resolv'] = True - -# You can configure log format to pull from logging.ini formats of these names: -# config_opts['build_log_fmt_name'] = "unadorned" -# config_opts['root_log_fmt_name'] = "detailed" -# config_opts['state_log_fmt_name'] = "state" -# -# mock will normally set up a minimal chroot /dev. -# If you want to use a pre-configured /dev, disable this and use the bind-mount -# plugin to mount your special /dev -# config_opts['internal_dev_setup'] = True -# -# internal_setarch defaults to 'True' if the python 'ctypes' package is -# available. It is in the python std lib on >= python 2.5. On older versions, -# it is available as an addon. On systems w/o ctypes, it will default to -# 'False' -# config_opts['internal_setarch'] = False -# -# the cleanup_on_* options allow you to automatically clean and remove the -# mock build directory, but only take effect if --resultdir is used. -# config_opts provides fine-grained control. cmdline only has big hammer -# -# config_opts['cleanup_on_success'] = 1 -# config_opts['cleanup_on_failure'] = 1 - -############################################################################# -# -# plugin related. Below are the defaults. Change to suit your site -# policy. defaults.cfg is a good place to do this. -# -# NOTE: Some of the caching options can theoretically affect build -# reproducability. Change with care. -# -# config_opts['plugin_conf']['ccache_enable'] = True -# config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '4G' -# config_opts['plugin_conf']['ccache_opts']['dir'] = "%(cache_topdir)s/%(root)s/ccache/" -# config_opts['plugin_conf']['yum_cache_enable'] = True -# config_opts['plugin_conf']['yum_cache_opts']['max_age_days'] = 30 -# config_opts['plugin_conf']['yum_cache_opts']['dir'] = "%(cache_topdir)s/%(root)s/yum_cache/" -# config_opts['plugin_conf']['root_cache_enable'] = True -# config_opts['plugin_conf']['root_cache_opts']['max_age_days'] = 15 -# config_opts['plugin_conf']['root_cache_opts']['dir'] = "%(cache_topdir)s/%(root)s/root_cache/" -# config_opts['plugin_conf']['root_cache_opts']['compress_program'] = "gzip" -# config_opts['plugin_conf']['root_cache_opts']['extension'] = ".gz" -# -# bind mount plugin is enabled by default but has no configured directories to mount -# config_opts['plugin_conf']['bind_mount_enable'] = True -# config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/host/path', '/bind/mount/path/in/chroot/' )) -# -# config_opts['plugin_conf']['tmpfs_enable'] = False -# config_opts['plugin_conf']['tmpfs_opts'] = {'required_ram_mb': 1024} - -############################################################################# -# -# Things that you can change, but we dont recommend it: -# config_opts['chroothome'] = '/builddir' -# config_opts['clean'] = True - -############################################################################# -# -# Things that are best suited for individual chroot config files: -# -# MUST SET (in individual chroot cfg file): -# config_opts['root'] = 'name-of-yum-build-dir' -# config_opts['target_arch'] = 'i386' -# config_opts['yum.conf'] = '' -# -# CAN SET, defaults usually work ok: -# config_opts['chroot_setup_cmd'] = 'install buildsys-build' -# config_opts['log_config_file'] = 'logging.ini' -# config_opts['more_buildreqs']['srpm_name-version-release'] = 'dependencies' -# config_opts['macros']['Add_your_macro_name_here'] = "add macro value here" -# config_opts['files']['path/name/no/leading/slash'] = "put file contents here." -# config_opts['chrootuid'] = os.getuid() -# config_opts['chrootgid'] = grp.getgrnam("mock")[2] -# config_opts['useradd'] = '/usr/sbin/useradd -m -u %(uid)s -g %(gid)s -d %(home)s -n %(user)s' # Fedora/RedHat diff --git a/rpm/build/mock/sles-10-i386.cfg b/rpm/build/mock/sles-10-i386.cfg deleted file mode 100644 index ad1a62b40..000000000 --- a/rpm/build/mock/sles-10-i386.cfg +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/python -tt - -import os - -config_opts['root'] = 'sles-10-i386' -config_opts['basedir'] = '/var/lib/mock/' -config_opts['chroot'] = '/usr/sbin/mock-helper chroot' -config_opts['mount'] = '/usr/sbin/mock-helper mount' -config_opts['umount'] = '/usr/sbin/mock-helper umount' -config_opts['rm'] = '/usr/sbin/mock-helper rm' -config_opts['mknod'] = '/usr/sbin/mock-helper mknod' -config_opts['yum'] = '/usr/sbin/mock-helper yum' -config_opts['runuser'] = '/bin/su' -config_opts['chroot_setup_cmd'] = 'groupinstall build build-minimal build-base' -config_opts['chrootuser'] = 'mockbuild' -config_opts['chrootgroup'] = 'users' -config_opts['chrootuid'] = os.geteuid() -config_opts['chrootgid'] = os.getegid() -config_opts['chroothome'] = '/builddir' -config_opts['clean'] = True -config_opts['target_arch'] = 'i386' -config_opts['use_cache'] = 1 - - -config_opts['yum.conf'] = """ -[main] -cachedir=/var/cache/yum -debuglevel=1 -logfile=/var/log/yum.log -reposdir=/dev/null -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 - -# repos - -[base] -name=base -#baseurl=http://hb.linuxdev.us.dell.com/pub/yum/sles10/base/i386/ -#baseurl=http://redshank.elirion.net/sles -baseurl=file:///home/rsiddall/mock/repos/sles10/i386 - -[build] -name=build -#baseurl=http://hb.linuxdev.us.dell.com/pub/yum/sles10/base/i386/ -#baseurl=http://grosbeak.elirion.net/repo/sles/10/build/i386/ -baseurl=file:///home/rsiddall/public_html/repo/sles/10/build/i386 - -[groups] -name=groups -#baseurl=http://hb.linuxdev.us.dell.com/pub/yum/mock/buildgroups/sles10/i386/ -#baseurl=http://redshank.elirion.net/slesgroup/sles10/i386/ -baseurl=file:///home/rsiddall/mock/buildgroups/sles10/i386 - -""" - - - diff --git a/rpm/build/mock/sles-10-x86_64.cfg b/rpm/build/mock/sles-10-x86_64.cfg deleted file mode 100644 index d55b40ad6..000000000 --- a/rpm/build/mock/sles-10-x86_64.cfg +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/python -tt - -import os - -config_opts['root'] = 'sles-10-x86_64' -config_opts['basedir'] = '/var/lib/mock/' -config_opts['chroot'] = '/usr/sbin/mock-helper chroot' -config_opts['mount'] = '/usr/sbin/mock-helper mount' -config_opts['umount'] = '/usr/sbin/mock-helper umount' -config_opts['rm'] = '/usr/sbin/mock-helper rm' -config_opts['mknod'] = '/usr/sbin/mock-helper mknod' -config_opts['yum'] = '/usr/sbin/mock-helper yum' -config_opts['runuser'] = '/bin/su' -config_opts['chroot_setup_cmd'] = 'groupinstall build build-minimal build-base' -config_opts['chrootuser'] = 'mockbuild' -config_opts['chrootgroup'] = 'users' -config_opts['chrootuid'] = os.geteuid() -config_opts['chrootgid'] = os.getegid() -config_opts['chroothome'] = '/builddir' -config_opts['clean'] = True -config_opts['target_arch'] = 'x86_64' -config_opts['use_cache'] = 1 - - -config_opts['yum.conf'] = """ -[main] -cachedir=/var/cache/yum -debuglevel=1 -logfile=/var/log/yum.log -reposdir=/dev/null -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 - -# repos - -[base] -name=base -#baseurl=http://hb.linuxdev.us.dell.com/pub/yum/sles10/base/x86_64/ -#baseurl=http://redshank.elirion.net/sles -baseurl=file:///home/rsiddall/mock/repos/sles10/x86_64 - -[build] -name=build -#baseurl=http://hb.linuxdev.us.dell.com/pub/yum/sles10/base/x86_64/ -#baseurl=http://grosbeak.elirion.net/repo/sles/10/build/x86_64/ -baseurl=file:///home/rsiddall/public_html/repo/sles/10/build/x86_64 - -[groups] -name=groups -#baseurl=http://hb.linuxdev.us.dell.com/pub/yum/mock/buildgroups/sles10/x86_64/ -#baseurl=http://redshank.elirion.net/slesgroup/sles10/x86_64/ -baseurl=file:///home/rsiddall/mock/buildgroups/sles10/x86_64 - -""" - - - diff --git a/rpm/build/native/Ovid.diff b/rpm/build/native/Ovid.diff deleted file mode 100644 index 81db7c5a8..000000000 --- a/rpm/build/native/Ovid.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- Package.pm.orig 2007-05-25 09:54:14.000000000 -0400 -+++ Package.pm 2007-07-07 15:35:20.000000000 -0400 -@@ -165,6 +165,7 @@ - push @out, $self->provreq($n); - } - -+ return join("\n", map { "Provides: $_"; } @out) if scalar(@out) > 5; - return join('', 'Provides: ', join ' ', @out); - } - -@@ -376,10 +377,15 @@ - - %install - --make PREFIX=%{_prefix} \ -- DESTDIR=%{buildroot} \ -- INSTALLDIRS=@installdirs@ \ -- install -+if [ -f Build.PL -a -f Build ] ; then -+ ./Build destdir=%{buildroot} \ -+ install -+else -+ make PREFIX=%{_prefix} \ -+ DESTDIR=%{buildroot} \ -+ INSTALLDIRS=@installdirs@ \ -+ install -+fi - - [ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress - diff --git a/rpm/build/native/build-from-cvs b/rpm/build/native/build-from-cvs deleted file mode 100755 index aa1319b96..000000000 --- a/rpm/build/native/build-from-cvs +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh -# -# Copyright 2008, Elirion, Inc. All rights reserved. -# This software is licensed under the same terms as Freeside itself. -# -# This script builds SRPMs if the Freeside CVS contents have changed. -# It must have reference copies of the Freeside versions it builds. -# Each SRPM's "release" is set to the date & time the script is run. -# The version number is forced to the CVS version. The version and release -# hard-coded in the last .spec file committed to CVS are NOT used. -# -source $HOME/freeside-cvs -RELEASE=`date +%Y%m%d%H%M%S` -QUIET_FLAG= -#FORCE_FLAG=0 -FORCE_FLAG=1 -#VERSIONS='1.7 1.9' -VERSIONS='1.7' - -while getopts "fhqv:" flag -do - case $flag in - f) - echo "Force mode" - FORCE_FLAG=1;; - q) - echo "Quiet mode" - QUIET_FLAG=-q;; - v) - echo "Changing versions from $VERSIONS to $OPTARG" - VERSIONS=$OPTARG;; - *) - usage;; - esac -done - -usage() { - echo "build-from-cvs: build SRPMs if the Freeside CVS contents have changed" - echo "where:" - echo " -f: force building SRPMs even if CVS is unchanged" - echo " -h: print this usage information" - echo " -q: run quietly" - echo " -v : change versions (currently: $VERSIONS)" - exit 0 -} - -for VERSION in $VERSIONS; do - echo ${VERSION} - /bin/rm -rf ref-${VERSION} - cp -pr freeside-${VERSION} ref-${VERSION} - cd freeside-${VERSION} - cvs update -d -P - cd .. - diff -qr --exclude=CVS freeside-${VERSION} ref-${VERSION} - RETVAL=$? - if [ $FORCE_FLAG = 1 -o $RETVAL -gt 0 ]; then - # Build the tarball with the modified .spec file in it, hard-coding the release into the .spec file - cd freeside-${VERSION} - for SPECFILE in install/rpm/freeside.spec rpm/freeside.spec; do - if [ -f $SPECFILE ]; then - cp -pf $SPECFILE .. - perl -p -i -e "s/\d+[^\}]+/${VERSION}/ if /%define\s+version\s+(\d+[^\}]+)\}/;" ${SPECFILE} - perl -pi -e "s/\$1/${RELEASE}/ if /%define\s+release\s+(\d+)/;" $SPECFILE - tar zcvf $HOME/redhat/SOURCES/freeside-${VERSION}.tar.gz --exclude CVS ../freeside-${VERSION} - mv -f ../`basename $SPECFILE` `dirname $SPECFILE` - fi - done - cd .. - rpmbuild -ts $HOME/redhat/SOURCES/freeside-${VERSION}.tar.gz - # Could do a koji-build here - # Or move the SRPM to a staging directory for the build machine to check - # Should make the Bundles and check the dependencies for changes - fi - /bin/rm -rf ref-${VERSION} -done diff --git a/rpm/build/native/freeside-cvs b/rpm/build/native/freeside-cvs deleted file mode 100755 index 88d12b4dc..000000000 --- a/rpm/build/native/freeside-cvs +++ /dev/null @@ -1,2 +0,0 @@ -export CVSROOT=":pserver:anonymous:anonymous@cvs.freeside.biz:/home/cvs/cvsroot" -export CVS_RSH="ssh" diff --git a/rpm/build/native/makesrpm b/rpm/build/native/makesrpm deleted file mode 100755 index fc9703ebc..000000000 --- a/rpm/build/native/makesrpm +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -cpanflute2 --just-spec --noperlreqs --email='Ivan Kohler ' --release=1 /home/rsiddall/Business-OnlinePayment-Jety-0.06.tar.gz > /home/rsiddall/redhat/SPECS/Business-OnlinePayment-Jety.spec; -perl -pi -e 's/perl(perl)/perl/g' /home/rsiddall/redhat/SPECS/Business-OnlinePayment-Jety.spec -rpmbuild -bs --nodeps --define '_sourcedir /home/rsiddall/' --define '_srcrpmdir /home/rsiddall/redhat/SRPMS' /home/rsiddall/redhat/SPECS/Business-OnlinePayment-Jety.spec diff --git a/rpm/build/native/ovid-0.12-1.x86_64.rpm b/rpm/build/native/ovid-0.12-1.x86_64.rpm deleted file mode 100644 index 363e08922..000000000 Binary files a/rpm/build/native/ovid-0.12-1.x86_64.rpm and /dev/null differ diff --git a/rpm/build/native/ovid2flute b/rpm/build/native/ovid2flute deleted file mode 100755 index 5bb836116..000000000 --- a/rpm/build/native/ovid2flute +++ /dev/null @@ -1,141 +0,0 @@ -#!/usr/bin/perl -w -# -# Convert the output from ovid --deps into a list of modules to run through cpanflute2 to get -# better .spec files, and generate SRPMs from these. - -use strict; -use Getopt::Long; - -# Need to fix up modules where Ovid parses the name incorrectly -my %badparse=( - 'Crypt-PasswdMD-5' => 'Crypt-PasswdMD5', - 'IPC-Run-3' => 'IPC-Run3', - 'Digest-SHA-1' => 'Digest-SHA1', - 'Digest-MD-4' => 'Digest-MD4', -); - -my %extra_buildreqs=( - 'File-Rsync' => [ qw/rsync/ ], - 'MIMETools' => [ qw/perl(Mail::Header) perl(Mail::Internet) perl(Mail::Field) perl(IO::Stringy) perl(File::Temp)/ ], - 'HTML::Scrubber' => [ qw/perl(HTML::Parser) perl(HTML::Tagset)/ ], -# 'Time::Duration' => [ qw/perl(Test::Pod) perl(Test::Pod::Coverage)/ ], -); - -my %extra_reqs=( - 'File-Rsync' => [ qw/rsync/ ], -); - -my %opts; - -GetOptions(\%opts, 'packager=s', 'release=s'); - -$opts{packager} = 'Richard Siddall ' if !defined($opts{packager}); - -# Need to process modules that cause Ovid to crash -#my @extramods= qw/Text::CSV_XS Pod::Simple Crypt::SSLeay/; -#my @extramods= qw/Crypt::SSLeay/; -my @extramods= qw/IPC::ShareLite/; - -my $specfiledir="/home/ivan/work/redhat/SPECS"; -$specfiledir = "/home/ivan/redhat/SPECS" if ! -d $specfiledir; -my $srpmdir="/home/ivan/work/redhat/SRPMS"; -$srpmdir = "/home/ivan/redhat/SRPMS" if ! -d $srpmdir; - -foreach (reverse ) { - next if !defined($_); - #print $_; - last if $_ !~ /^([-\w:]+) perl-([-\w\.]+)(-\d+[\w\.]+?)$/; - #print "$1 = $2\n" - my ($name, $rpm, $ver) = ($1, $2, $3); - print "# $name ($rpm - $ver)\n"; - foreach my $cand (keys %badparse) { - if ($rpm =~ /^$cand/) { - $rpm =~ s/^$cand/$badparse{$cand}/; - print "# Fixed up $rpm\n"; - last; - } - } - printcmds($name, "$rpm$ver"); - #print "cpanspec -v --packager 'Unknown ' $name\n"; - #print "echo $rpm\n"; - #print "repoquery perl-$rpm\n"; - #touchsrpms($name, "$rpm$ver"); -} - -exit; - -foreach my $name (@extramods) { - my $rpm = $name; - $rpm =~ s/::/-/g; - my $tarball = `find ~/.cpan/sources -name '$rpm-*' -print | tail -1`; - #print "$name (Extra!)\n" - if ($tarball =~ /\/($rpm-.*?)(\.tar\.gz|\.tgz)\s*$/) { - $rpm = $1; - printcmds($name, $rpm); - } else { - die "Can't find full rpm name for $name in \"$tarball\"\n"; - } -} - -sub touchsrpms { - my ($name, $rpm) = @_; - my $repofolder ="/var/www/html/repo/sles/10/freeside-1.9/stable/x86_64"; - my $srpmfolder ="/home/ivan/work/redhat/SRPMS"; - my @files = glob "$repofolder/perl-$rpm-*.rpm"; - if (! scalar(@files)) { - print "Can't find $rpm in $repofolder\n"; - @files = glob "$srpmfolder/perl-$rpm-*.src.rpm\n"; - if (scalar(@files)) { - my $file = pop @files; - print "touch $file\n"; - } else { - print STDERR "No corresponding SRPM: $srpmfolder/perl-$rpm-*.src.rpm\n"; - printcmds($name, $rpm); - } - } -} - -sub printcmds { - my ($name, $rpm) = @_; - - my $tarball = `find ~/.cpan -name '$rpm.tar.gz' -print`; - $tarball = `find ~/.cpan -name '$rpm.tgz' -print` if ! $tarball; - chomp($tarball); -# my $specfile = "$specfiledir/$name.spec"; - my $rpmname = $rpm; - $rpmname = $1 if $rpm =~ /^(?:.*\/)?(.*)-(?:v\.?)?([^-]+)$/; - my $specfile = "$specfiledir/perl-$rpmname.spec"; - $specfile =~ s/::/-/g; - # Work out which version of the SRPM we're going to generate. - my $rel; - if (!defined($opts{release})) { - for ($rel = 1; ; $rel++) { - my $srpm = "$srpmdir/perl-$rpm-$rel.src.rpm"; - last if ! -e $srpm; - print "# File exists: $srpm\n"; - } - } else { - $rel = $opts{release}; - } - my $fluteopts = ""; - foreach my $cand (keys %extra_buildreqs) { - if ($rpm =~ /^$cand/) { - $fluteopts .= join "", map { "--buildrequires $_ " } @{$extra_buildreqs{$cand}}; - last; - } - } - foreach my $cand (keys %extra_reqs) { - if ($rpm =~ /^$cand/) { - $fluteopts .= join "", map { "--requires $_ " } @{$extra_reqs{$cand}}; - last; - } - } - print "cpanflute2 --just-spec --noperlreqs --email='$opts{packager}' --release=$rel $fluteopts $tarball > $specfile;\n"; - # Should fix up the .spec file - print "perl -pi -e 's/perl\$perl\$/perl/g' $specfile;\n"; - my $tarballdir = `dirname $tarball` or die "Can't find tarball for $name: $tarball\n"; - chomp($tarballdir); - print "rpmbuild -bs --nodeps --define '_sourcedir $tarballdir' --define '_srcrpmdir $srpmdir' $specfile\n"; - print "# Generates: $srpmdir/perl-$rpm-$rel.src.rpm\n"; -} - diff --git a/rpm/build/ovid2flute b/rpm/build/ovid2flute deleted file mode 100755 index 403b1d93f..000000000 --- a/rpm/build/ovid2flute +++ /dev/null @@ -1,139 +0,0 @@ -#!/usr/bin/perl -w -# -# Convert the output from ovid --deps into a list of modules to run through cpanflute2 to get -# better .spec files, and generate SRPMs from these. - -use strict; -use Getopt::Long; - -# Need to fix up modules where Ovid parses the name incorrectly -my %badparse=( - 'Crypt-PasswdMD-5' => 'Crypt-PasswdMD5', - 'IPC-Run-3' => 'IPC-Run3', - 'Digest-SHA-1' => 'Digest-SHA1', - 'Digest-MD-4' => 'Digest-MD4', -); - -my %extra_buildreqs=( - 'File-Rsync' => [ qw/rsync/ ], - 'MIMETools' => [ qw/perl(Mail::Header) perl(Mail::Internet) perl(Mail::Field) perl(IO::Stringy) perl(File::Temp)/ ], - 'HTML::Scrubber' => [ qw/perl(HTML::Parser) perl(HTML::Tagset)/ ], -# 'Time::Duration' => [ qw/perl(Test::Pod) perl(Test::Pod::Coverage)/ ], -); - -my %extra_reqs=( - 'File-Rsync' => [ qw/rsync/ ], -); - -my %opts; - -GetOptions(\%opts, 'packager=s', 'release=s'); - -$opts{packager} = 'Richard Siddall ' if !defined($opts{packager}); - -# Need to process modules that cause Ovid to crash -#my @extramods= qw/Text::CSV_XS Pod::Simple Crypt::SSLeay/; -#my @extramods= qw/Crypt::SSLeay/; -my @extramods= qw/IPC::ShareLite/; - -my $specfiledir="/home/rsiddall/work/redhat/SPECS"; -my $srpmdir="/home/rsiddall/work/redhat/SRPMS"; - -foreach (reverse ) { - next if !defined($_); - #print $_; - last if $_ !~ /^([-\w:]+) perl-([-\w\.]+)(-\d+[\w\.]+?)$/; - #print "$1 = $2\n" - my ($name, $rpm, $ver) = ($1, $2, $3); - print "# $name ($rpm - $ver)\n"; - foreach my $cand (keys %badparse) { - if ($rpm =~ /^$cand/) { - $rpm =~ s/^$cand/$badparse{$cand}/; - print "# Fixed up $rpm\n"; - last; - } - } - printcmds($name, "$rpm$ver"); - #print "cpanspec -v --packager 'Unknown ' $name\n"; - #print "echo $rpm\n"; - #print "repoquery perl-$rpm\n"; - #touchsrpms($name, "$rpm$ver"); -} - -exit; - -foreach my $name (@extramods) { - my $rpm = $name; - $rpm =~ s/::/-/g; - my $tarball = `find ~/.cpan/sources -name '$rpm-*' -print | tail -1`; - #print "$name (Extra!)\n" - if ($tarball =~ /\/($rpm-.*?)(\.tar\.gz|\.tgz)\s*$/) { - $rpm = $1; - printcmds($name, $rpm); - } else { - die "Can't find full rpm name for $name in \"$tarball\"\n"; - } -} - -sub touchsrpms { - my ($name, $rpm) = @_; - my $repofolder ="/var/www/html/repo/sles/10/freeside-1.9/stable/x86_64"; - my $srpmfolder ="/home/rsiddall/work/redhat/SRPMS"; - my @files = glob "$repofolder/perl-$rpm-*.rpm"; - if (! scalar(@files)) { - print "Can't find $rpm in $repofolder\n"; - @files = glob "$srpmfolder/perl-$rpm-*.src.rpm\n"; - if (scalar(@files)) { - my $file = pop @files; - print "touch $file\n"; - } else { - print STDERR "No corresponding SRPM: $srpmfolder/perl-$rpm-*.src.rpm\n"; - printcmds($name, $rpm); - } - } -} - -sub printcmds { - my ($name, $rpm) = @_; - - my $tarball = `find ~/.cpan -name '$rpm.tar.gz' -print`; - $tarball = `find ~/.cpan -name '$rpm.tgz' -print` if ! $tarball; - chomp($tarball); -# my $specfile = "$specfiledir/$name.spec"; - my $rpmname = $rpm; - $rpmname = $1 if $rpm =~ /^(?:.*\/)?(.*)-(?:v\.?)?([^-]+)$/; - my $specfile = "$specfiledir/perl-$rpmname.spec"; - $specfile =~ s/::/-/g; - # Work out which version of the SRPM we're going to generate. - my $rel; - if (!defined($opts{release})) { - for ($rel = 1; ; $rel++) { - my $srpm = "$srpmdir/perl-$rpm-$rel.src.rpm"; - last if ! -e $srpm; - print "# File exists: $srpm\n"; - } - } else { - $rel = $opts{release}; - } - my $fluteopts = ""; - foreach my $cand (keys %extra_buildreqs) { - if ($rpm =~ /^$cand/) { - $fluteopts .= join "", map { "--buildrequires $_ " } @{$extra_buildreqs{$cand}}; - last; - } - } - foreach my $cand (keys %extra_reqs) { - if ($rpm =~ /^$cand/) { - $fluteopts .= join "", map { "--requires $_ " } @{$extra_reqs{$cand}}; - last; - } - } - print "cpanflute2 --just-spec --noperlreqs --email='$opts{packager}' --release=$rel $fluteopts $tarball > $specfile;\n"; - # Should fix up the .spec file - print "perl -pi -e 's/perl\$perl\$/perl/g' $specfile;\n"; - my $tarballdir = `dirname $tarball` or die "Can't find tarball for $name: $tarball\n"; - chomp($tarballdir); - print "rpmbuild -bs --nodeps --define '_sourcedir $tarballdir' --define '_srcrpmdir $srpmdir' $specfile\n"; - print "# Generates: $srpmdir/perl-$rpm-$rel.src.rpm\n"; -} - diff --git a/rpm/build/refresh-repo b/rpm/build/refresh-repo deleted file mode 100755 index 32d07ad97..000000000 --- a/rpm/build/refresh-repo +++ /dev/null @@ -1,164 +0,0 @@ -#!/bin/sh -# -# Copyright 2008, Elirion, Inc. All rights reserved. -# This software is licensed under the same terms as Freeside itself. -# -# This script iterates through all the specified Freeside repositories, running -# both yum-arch and createrepo to update the yum repository meta-data. -# The script should be run after the repository contents are changed. -# -# TBD: Run yum-arch, createrepo, or both, as appropriate for the distro and version -# the repository is targetted for. -# -DISTROS='centos sles' -CENTOSVERS='4 5' -SLESVERS=10 -WHICHVERS= -VERSIONS='1.7 1.9' -ARCHS='i386 x86_64' -REPOS='testing stable prerelease' -RPMS= -KEYID=rsiddall -SAVEDIR=$HOME - -REPOBASEFOLDER=/var/www/html - -QUIET_FLAG= - -BUILDSYSDIR=`dirname $0` - -if [ -f $BUILDSYSDIR/buildsysrc ]; then - #chmod a+x $BUILDSYSDIR/buildsysrc - #echo $BUILDSYSDIR/buildsysrc - . $BUILDSYSDIR/buildsysrc -fi -if [ -f $HOME/buildsysrc ]; then - #chmod a+x $HOME/buildsysrc - #echo $HOME/buildsysrc - . $HOME/buildsysrc -fi - - -usage() { - echo "refresh-repo: refresh yum metadata for all yum repositories" - echo "where:" - echo " -a : change architectures (currently: $ARCHS)" - echo " -d : change distributions (currently: $DISTROS)" - echo " -r : change repositories (currently: $REPOS)" - echo " -v : change versions (currently: $VERSIONS)" - echo " -w : change distro version (currently: $WHICHVERS)" - exit 0 -} - -while getopts "a:d:hqr:v:w:" flag -do - case $flag in - a) - echo "Changing architectures from $ARCHS to $OPTARG" - ARCHS=$OPTARG;; - d) - echo "Changing distros from $DISTROS to $OPTARG" - DISTROS=$OPTARG;; - q) - echo "Quiet mode" - QUIET_FLAG=-q;; - r) - echo "Changing repository from $REPOS to $OPTARG" - REPOS=$OPTARG;; - v) - echo "Changing versions from $VERSIONS to $OPTARG" - VERSIONS=$OPTARG;; - w) - echo "Changing which distro versions from $WHICHVERS to $OPTARG" - WHICHVERS=$OPTARG;; - *) - usage;; - esac -done - -#for DISTRO in ${DISTROS}; do -# for VERSION in ${VERSIONS}; do -# for REPO in ${REPOS}; do -# for ARCH in ${ARCHS}; do -# # Determine which RPMs need to be signed -# NEWRPMS=`rpm --checksig $REPOBASEFOLDER/repo/$DISTROS/$DISTVERS/freeside-${VERSION}/${REPO}/${ARCH}/*.rpm | grep -v ' gpg ' | cut -d ':' -f 1 | tr '\n' ' '` -# RPMS=`echo "$RPMS $NEWRPMS"` -# done -# done -# done -#done -##rpm --addsign $RPMS -#for RPM in $RPMS; do -# ./expect-addsign $RPM -#done -for DISTRO in ${DISTROS}; do - for VERSION in ${VERSIONS}; do - for REPO in ${REPOS}; do - for ARCH in ${ARCHS}; do - if [ "${WHICHVERS}x" = "x" ]; then - if [ "$DISTRO" = "centos" ]; then - DISTVERS=$CENTOSVERS - fi - if [ "$DISTRO" = "sles" ]; then - DISTVERS=$SLESVERS - fi - else - DISTVERS=$WHICHVERS - fi - for distver in $DISTVERS - do - # Update the repo information - echo "${DISTRO}-${distver}: $VERSION - $REPO - $ARCH" - DIR=$REPOBASEFOLDER/repo/$DISTRO/$distver/freeside-${VERSION}/${REPO}/${ARCH} - if [ -d $DIR ] - then - # SLES requires signed repodata. Save any existing files so we don't regenerate - for ext in asc key - do - if [ -e $DIR/repodata/repomd.xml.${ext} ] - then - mv $DIR/repodata/repomd.xml.${ext} $SAVEDIR - fi - done - if [ "$DISTRO" = "sles" ] - then - for file in $DIR/freeside-mysql-*.rpm - do - mv $file $file.old - done - for file in $DIR/freeside-selfservice-*.rpm - do - mv $file $DIR/../self-service/$ARCH - done - fi - if [ "$DISTRO-$distver" = "centos-4" ] - then - yum-arch $QUIET_FLAG $DIR/ - fi -# createrepo $QUIET_FLAG --checkts $DIR/ - createrepo $QUIET_FLAG $DIR/ - if [ "$DISTRO" = "sles" ] - then - # SLES requires signed repodata... - if [ -e $SAVEDIR/repomd.xml.asc ] - then - mv $SAVEDIR/repomd.xml.asc $DIR/repodata - fi - -# gpg -sab --yes -u "$KEYID" -o $DIR/repodata/repomd.xml.asc $DIR/repodata/repomd.xml - ./expect-signrepo $KEYID $DIR/repodata/repomd.xml.asc $DIR/repodata/repomd.xml - if [ -e $SAVEDIR/repomd.xml.key ] - then - mv $SAVEDIR/repomd.xml.key $DIR/repodata - else - gpg -a --yes -u "$KEYID" --export -o $DIR/repodata/repomd.xml.key - fi - fi - else - echo "No such folder $DIR - skipping" - fi - done - done - done - done -done diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED index 71ec13508..d1f214681 100644 --- a/rt/FREESIDE_MODIFIED +++ b/rt/FREESIDE_MODIFIED @@ -5,13 +5,10 @@ config.layout.in etc/RT_Config.pm etc/RT_SiteConfig.pm lib/RT/Config.pm -lib/RT/CustomField_Overlay.pm #customfield date patch -lib/RT/Interface/Web.pm #customfield date patch lib/RT/Interface/Web_Vendor.pm - lib/RT/Record.pm #and customfield date patch + lib/RT/Record.pm lib/RT/SearchBuilder.pm #need DBIx::SearchBuilder >= 1.36 for Pg 8.1+ lib/RT/Transaction_Overlay.pm -lib/RT/Tickets_Overlay.pm #customfield date patch lib/RT/Ticket_Overlay.pm lib/RT/Users_Overlay.pm lib/RT/Groups_Overlay.pm @@ -21,33 +18,20 @@ lib/RT/URI/freeside/XMLRPC.pm share/html/Admin/Users/Modify.html share/html/Elements/ColumnMap share/html/Elements/CollectionList -share/html/Elements/EditCustomFieldDate #customfield date patch (NEW) share/html/Elements/Header share/html/Elements/PageLayout #html/Elements/QuickCreate - share/html/Elements/RefreshHomepage - share/html/Elements/RT__CustomField/ColumnMap - share/html/Elements/RT__Ticket/ColumnMap - share/html/Elements/ShowCustomFieldDate #customfield date patch (NEW) share/html/Elements/SelectDate -share/html/Elements/ShowLink_Checklist - share/html/Elements/ShowUserVerbose share/html/Elements/Footer html/Ticket/Create.html #XXX TODO share/html/Search/Build.html - share/html/Search/Elements/BuildFormatString - share/html/Search/Elements/PickCFs #customfield date patch -share/html/Ticket/Checklist.html share/html/Ticket/Display.html share/html/Ticket/Elements/AddCustomers share/html/Ticket/Elements/EditCustomers share/html/Ticket/Elements/ShowCustomers -share/html/Ticket/Elements/ShowMembers_Checklist - share/html/Ticket/Elements/BulkLinks share/html/Ticket/Elements/ShowSummary share/html/Ticket/Elements/ShowTransactionAttachments share/html/Ticket/Elements/Tabs - share/html/Ticket/Graph/index.html share/html/Ticket/ModifyCustomers.html html/NoAuth/css/3.5-default/main.css html/NoAuth/css/3.5-default/misc.css @@ -64,5 +48,3 @@ share/html/Elements/EditCustomers share/html/Prefs/SearchOptions.html share/html/Widgets/TitleBoxEnd - -share/html/Callbacks/RTx-Checklist/* diff --git a/rt/bin/standalone_httpd b/rt/bin/standalone_httpd deleted file mode 100755 index 7b447050b..000000000 --- a/rt/bin/standalone_httpd +++ /dev/null @@ -1,186 +0,0 @@ -#!/usr/bin/perl -w -# BEGIN BPS TAGGED BLOCK {{{ -# -# COPYRIGHT: -# -# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC -# -# -# (Except where explicitly superseded by other copyright notices) -# -# -# LICENSE: -# -# This work is made available to you under the terms of Version 2 of -# the GNU General Public License. A copy of that license should have -# been provided with this software, but in any event can be snarfed -# from www.gnu.org. -# -# This work is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 or visit their web page on the internet at -# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. -# -# -# CONTRIBUTION SUBMISSION POLICY: -# -# (The following paragraph is not intended to limit the rights granted -# to you to modify and distribute this software under the terms of -# the GNU General Public License and is only of importance to you if -# you choose to contribute your changes and enhancements to the -# community by submitting them to Best Practical Solutions, LLC.) -# -# By intentionally submitting any modifications, corrections or -# derivatives to this work, or any other work intended for use with -# Request Tracker, to Best Practical Solutions, LLC, you confirm that -# you are the copyright holder for those contributions and you grant -# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable, -# royalty-free, perpetual, license to use, copy, create derivative -# works based on those contributions, and sublicense and distribute -# those contributions and any derivatives thereof. -# -# END BPS TAGGED BLOCK }}} -use warnings; -use strict; - -# fix lib paths, some may be relative -BEGIN { - require File::Spec; - my @libs = ("lib", "local/lib"); - my $bin_path; - - for my $lib (@libs) { - unless ( File::Spec->file_name_is_absolute($lib) ) { - unless ($bin_path) { - if ( File::Spec->file_name_is_absolute(__FILE__) ) { - $bin_path = ( File::Spec->splitpath(__FILE__) )[1]; - } - else { - require FindBin; - no warnings "once"; - $bin_path = $FindBin::Bin; - } - } - $lib = File::Spec->catfile( $bin_path, File::Spec->updir, $lib ); - } - unshift @INC, $lib; - } - -} - -use RT; -RT::LoadConfig(); -RT->InitLogging(); -if (RT->Config->Get('DevelMode')) { require Module::Refresh; } - -RT::CheckPerlRequirements(); -RT->InitPluginPaths(); - -my $explicit_port = shift @ARGV; -my $port = $explicit_port || RT->Config->Get('WebPort') || '8080'; - - -require RT::Handle; -my ($integrity, $state, $msg) = RT::Handle->CheckIntegrity; - -unless ( $integrity ) { - print STDERR <ConfigFile && !-w _) { - die 'Since your configuration exists (' - . RT::Installer->ConfigFile - . ") but is not writable, I'm refusing to do anything.\n"; - } - - RT->Config->Set( 'LexiconLanguages' => '*' ); - RT::I18N->Init; - - RT->InstallMode(1); -} else { - RT->ConnectToDatabase(); - RT->InitSystemObjects(); - RT->InitClasses( Heavy => 1 ); - RT->InitPlugins(); - RT->Config->PostLoadCheck(); - - my ($status, $msg) = RT::Handle->CheckCompatibility( - $RT::Handle->dbh, 'post' - ); - unless ( $status ) { - print STDERR $msg, "\n\n"; - exit -1; - } -} - -require RT::Interface::Web::Standalone; -my $server = RT::Interface::Web::Standalone->new; -run_server($port); -exit 0; - -sub run_server { - my $port = shift; - $server->port($port); - eval { $server->run() }; - - if ( my $err = $@ ) { - handle_startup_error($err); - } -} - -sub handle_startup_error { - my $err = shift; - if ( $err =~ /bind: Permission denied/ ) { - handle_bind_error(); - } else { - die - "Something went wrong while trying to run RT's standalone web server:\n\t" - . $err; - } -} - - -sub handle_bind_error { - - print STDERR < @@ -1370,7 +1370,6 @@ C<$DefaultSearchResultFormat> is the default format for RT search results Set ($DefaultSearchResultFormat, qq{ '__id__/TITLE:#', '__Subject__/TITLE:Subject', - Customer, Status, QueueName, OwnerName, @@ -1378,7 +1377,6 @@ Set ($DefaultSearchResultFormat, qq{ '__NEWLINE__', '', '__Requestors__', - '', '__CreatedRelative__', '__ToldRelative__', '__LastUpdatedRelative__', @@ -1780,7 +1778,7 @@ C =cut -Set(@Plugins, qw( RTx::Calendar )); #RTx::Checklist )); +Set(@Plugins, (qw(RTx::Calendar))); =back diff --git a/rt/etc/RT_Config.pm.in b/rt/etc/RT_Config.pm.in index c73a1e52f..564682b62 100644 --- a/rt/etc/RT_Config.pm.in +++ b/rt/etc/RT_Config.pm.in @@ -868,7 +868,7 @@ EmailAddress. =cut -Set($UsernameFormat, 'verbose'); +Set($UsernameFormat, 'concise'); =item C<$WebDomain> @@ -1370,7 +1370,6 @@ C<$DefaultSearchResultFormat> is the default format for RT search results Set ($DefaultSearchResultFormat, qq{ '__id__/TITLE:#', '__Subject__/TITLE:Subject', - Customer, Status, QueueName, OwnerName, @@ -1378,7 +1377,6 @@ Set ($DefaultSearchResultFormat, qq{ '__NEWLINE__', '', '__Requestors__', - '', '__CreatedRelative__', '__ToldRelative__', '__LastUpdatedRelative__', @@ -1780,7 +1778,7 @@ C =cut -Set(@Plugins, (qw(RTx::Calendar))); #RTx::Checklist )); +Set(@Plugins, (qw(RTx::Calendar))); =back diff --git a/rt/etc/RT_SiteConfig.pm b/rt/etc/RT_SiteConfig.pm index eb2d09af5..bfdfbbb89 100644 --- a/rt/etc/RT_SiteConfig.pm +++ b/rt/etc/RT_SiteConfig.pm @@ -41,7 +41,6 @@ Set($DatabaseHost , ''); # These settings are user-editable. Set($WebDefaultStylesheet, 'freeside2.1'); -Set($UsernameFormat, 'verbose'); #back to concise to hide email addresses #uncomment to use #Set($DefaultSummaryRows, 10); diff --git a/rt/lib/RT/Config.pm b/rt/lib/RT/Config.pm index ce66bb6cc..3f8581cc5 100644 --- a/rt/lib/RT/Config.pm +++ b/rt/lib/RT/Config.pm @@ -340,15 +340,13 @@ our %META = ( my $value = $self->Get('RTAddressRegexp'); return if $value; - #XXX freeside - should fix this at some point, but it is being WAY - #too noisy in the logs - #$RT::Logger->error( - # 'The RTAddressRegexp option is not set in the config.' - # .' Not setting this option results in additional SQL queries to' - # .' check whether each address belongs to RT or not.' - # .' It is especially important to set this option if RT recieves' - # .' emails on addresses that are not in the database or config.' - #); + $RT::Logger->error( + 'The RTAddressRegexp option is not set in the config.' + .' Not setting this option results in additional SQL queries to' + .' check whether each address belongs to RT or not.' + .' It is especially important to set this option if RT recieves' + .' emails on addresses that are not in the database or config.' + ); }, }, # User overridable mail options diff --git a/rt/lib/RT/CustomField_Overlay.pm b/rt/lib/RT/CustomField_Overlay.pm index c91f12037..355dd203c 100644 --- a/rt/lib/RT/CustomField_Overlay.pm +++ b/rt/lib/RT/CustomField_Overlay.pm @@ -97,11 +97,6 @@ our %FieldTypes = ( 'Enter one value with autocompletion', # loc 'Enter up to [_1] values with autocompletion', # loc ], - Date => [ - 'Select multiple dates', # loc - 'Select date', # loc - 'Select up to [_1] dates', # loc - ], ); @@ -834,7 +829,7 @@ Returns an array of all possible composite values for custom fields. sub TypeComposites { my $self = shift; - return grep !/(?:[Tt]ext|Combobox|Date)-0/, map { ("$_-1", "$_-0") } $self->Types; + return grep !/(?:[Tt]ext|Combobox)-0/, map { ("$_-1", "$_-0") } $self->Types; } =head2 SetLookupType @@ -1165,15 +1160,6 @@ sub AddValueForObject { $extra_values--; } } - # For date, we need to store Content as ISO date - if ($self->Type eq 'Date') { - my $DateObj = new RT::Date( $self->CurrentUser ); - $DateObj->Set( - Format => 'unknown', - Value => $args{'Content'}, - ); - $args{'Content'} = $DateObj->ISO; - } my $newval = RT::ObjectCustomFieldValue->new( $self->CurrentUser ); my $val = $newval->Create( ObjectType => ref($obj), diff --git a/rt/lib/RT/Interface/Web.pm b/rt/lib/RT/Interface/Web.pm index edb719df5..d6b854f4e 100644 --- a/rt/lib/RT/Interface/Web.pm +++ b/rt/lib/RT/Interface/Web.pm @@ -1714,9 +1714,6 @@ sub _ProcessObjectCustomFieldUpdates { $values_hash{$val} = 1 if $val; } - # For Date Cfs, @values is empty when there is no changes (no datas in form input) - return @results if ( $cf->Type eq 'Date' && ! @values ); - $cf_values->RedoSearch; while ( my $cf_value = $cf_values->Next ) { next if $values_hash{ $cf_value->id }; diff --git a/rt/lib/RT/Record.pm b/rt/lib/RT/Record.pm index 78bbe915d..bee94420d 100755 --- a/rt/lib/RT/Record.pm +++ b/rt/lib/RT/Record.pm @@ -1744,25 +1744,6 @@ sub _AddCustomFieldValue { } my $new_content = $new_value->Content; - - # For date, we need to display them in "human" format in result message - if ($cf->Type eq 'Date') { - my $DateObj = new RT::Date( $self->CurrentUser ); - $DateObj->Set( - Format => 'ISO', - Value => $new_content, - ); - $new_content = $DateObj->AsString; - - if ( defined $old_content && length $old_content ) { - $DateObj->Set( - Format => 'ISO', - Value => $old_content, - ); - $old_content = $DateObj->AsString; - } - } - unless ( defined $old_content && length $old_content ) { return ( $new_value_id, $self->loc( "[_1] [_2] added", $cf->Name, $new_content )); } @@ -1851,21 +1832,11 @@ sub DeleteCustomFieldValue { return ( 0, $self->loc( "Couldn't create a transaction: [_1]", $Msg ) ); } - my $old_value = $TransactionObj->OldValue; - # For date, we need to display them in "human" format in result message - if ( $cf->Type eq 'Date' ) { - my $DateObj = new RT::Date( $self->CurrentUser ); - $DateObj->Set( - Format => 'ISO', - Value => $old_value, - ); - $old_value = $DateObj->AsString; - } return ( $TransactionId, $self->loc( "[_1] is no longer a value for custom field [_2]", - $old_value, $cf->Name + $TransactionObj->OldValue, $cf->Name ) ); } diff --git a/rt/lib/RT/Ticket_Overlay.pm b/rt/lib/RT/Ticket_Overlay.pm index b60ae38bd..83737c168 100644 --- a/rt/lib/RT/Ticket_Overlay.pm +++ b/rt/lib/RT/Ticket_Overlay.pm @@ -560,6 +560,68 @@ sub Create { # }}} + # {{{ Deal with auto-customer association + + #unless we already have (a) customer(s)... + unless ( $self->Customers->Count ) { + + #first find any requestors with emails but *without* customer targets + my @NoCust_Requestors = + grep { $_->EmailAddress && ! $_->Customers->Count } + @{ $self->_Requestors->UserMembersObj->ItemsArrayRef }; + + for my $Requestor (@NoCust_Requestors) { + + #perhaps the stuff in here should be in a User method?? + my @Customers = + &RT::URI::freeside::email_search( email=>$Requestor->EmailAddress ); + + foreach my $custnum ( map $_->{'custnum'}, @Customers ) { + + ## false laziness w/RT/Interface/Web_Vendor.pm + my @link = ( 'Type' => 'MemberOf', + 'Target' => "freeside://freeside/cust_main/$custnum", + ); + + my( $val, $msg ) = $Requestor->_AddLink(@link); + #XXX should do something with $msg# push @non_fatal_errors, $msg; + + } + + } + + #find any requestors with customer targets + + my %cust_target = (); + + my @Requestors = + grep { $_->Customers->Count } + @{ $self->_Requestors->UserMembersObj->ItemsArrayRef }; + + foreach my $Requestor ( @Requestors ) { + foreach my $cust_link ( @{ $Requestor->Customers->ItemsArrayRef } ) { + $cust_target{ $cust_link->Target } = 1; + } + } + + #and then auto-associate this ticket with those customers + + foreach my $cust_target ( keys %cust_target ) { + + my @link = ( 'Type' => 'MemberOf', + #'Target' => "freeside://freeside/cust_main/$custnum", + 'Target' => $cust_target, + ); + + my( $val, $msg ) = $self->_AddLink(@link); + push @non_fatal_errors, $msg; + + } + + } + + # }}} + # {{{ Add all the custom fields foreach my $arg ( keys %args ) { @@ -617,16 +679,11 @@ sub Create { next; } } - - #don't show transactions for reminders - my $silent = ( !$args{'_RecordTransaction'} - || $self->Type eq 'reminder' - ); - + my ( $wval, $wmsg ) = $self->_AddLink( Type => $LINKTYPEMAP{$type}->{'Type'}, $LINKTYPEMAP{$type}->{'Mode'} => $link, - Silent => $silent, + Silent => !$args{'_RecordTransaction'}, 'Silent'. ( $LINKTYPEMAP{$type}->{'Mode'} eq 'Base'? 'Target': 'Base' ) => 1, ); @@ -636,69 +693,6 @@ sub Create { } # }}} - - # {{{ Deal with auto-customer association - - #unless we already have (a) customer(s)... - unless ( $self->Customers->Count ) { - - #first find any requestors with emails but *without* customer targets - my @NoCust_Requestors = - grep { $_->EmailAddress && ! $_->Customers->Count } - @{ $self->_Requestors->UserMembersObj->ItemsArrayRef }; - - for my $Requestor (@NoCust_Requestors) { - - #perhaps the stuff in here should be in a User method?? - my @Customers = - &RT::URI::freeside::email_search( email=>$Requestor->EmailAddress ); - - foreach my $custnum ( map $_->{'custnum'}, @Customers ) { - - ## false laziness w/RT/Interface/Web_Vendor.pm - my @link = ( 'Type' => 'MemberOf', - 'Target' => "freeside://freeside/cust_main/$custnum", - ); - - my( $val, $msg ) = $Requestor->_AddLink(@link); - #XXX should do something with $msg# push @non_fatal_errors, $msg; - - } - - } - - #find any requestors with customer targets - - my %cust_target = (); - - my @Requestors = - grep { $_->Customers->Count } - @{ $self->_Requestors->UserMembersObj->ItemsArrayRef }; - - foreach my $Requestor ( @Requestors ) { - foreach my $cust_link ( @{ $Requestor->Customers->ItemsArrayRef } ) { - $cust_target{ $cust_link->Target } = 1; - } - } - - #and then auto-associate this ticket with those customers - - foreach my $cust_target ( keys %cust_target ) { - - my @link = ( 'Type' => 'MemberOf', - #'Target' => "freeside://freeside/cust_main/$custnum", - 'Target' => $cust_target, - ); - - my( $val, $msg ) = $self->_AddLink(@link); - push @non_fatal_errors, $msg; - - } - - } - - # }}} - # Now that we've created the ticket and set up its metadata, we can actually go and check OwnTicket on the ticket itself. # This might be different than before in cases where extensions like RTIR are doing clever things with RT's ACL system if ( $DeferOwner ) { @@ -721,8 +715,7 @@ sub Create { ); } - #don't make a transaction or fire off any scrips for reminders either - if ( $args{'_RecordTransaction'} && $self->Type ne 'reminder' ) { + if ( $args{'_RecordTransaction'} ) { # {{{ Add a transaction for the create my ( $Trans, $Msg, $TransObj ) = $self->_NewTransaction( diff --git a/rt/lib/RT/Tickets_Overlay.pm b/rt/lib/RT/Tickets_Overlay.pm index f2949ed7a..e8d350dea 100644 --- a/rt/lib/RT/Tickets_Overlay.pm +++ b/rt/lib/RT/Tickets_Overlay.pm @@ -136,7 +136,6 @@ our %FIELD_METADATA = ( QueueAdminCc => [ 'WATCHERFIELD' => 'AdminCc' => 'Queue', ], #loc_left_pair QueueWatcher => [ 'WATCHERFIELD' => undef => 'Queue', ], #loc_left_pair CustomFieldValue => [ 'CUSTOMFIELD', ], #loc_left_pair - DateCustomFieldValue => [ 'DATECUSTOMFIELD', ], CustomField => [ 'CUSTOMFIELD', ], #loc_left_pair CF => [ 'CUSTOMFIELD', ], #loc_left_pair Updated => [ 'TRANSDATE', ], #loc_left_pair @@ -161,7 +160,6 @@ our %dispatch = ( WATCHERFIELD => \&_WatcherLimit, MEMBERSHIPFIELD => \&_WatcherMembershipLimit, CUSTOMFIELD => \&_CustomFieldLimit, - DATECUSTOMFIELD => \&_DateCustomFieldLimit, HASATTRIBUTE => \&_HasAttributeLimit, ); our %can_bundle = ();# WATCHERFIELD => "yes", ); @@ -1342,101 +1340,6 @@ sub _CustomFieldJoin { return ($TicketCFs, $CFs); } -=head2 _DateCustomFieldLimit - -Limit based on CustomFields of type Date - -Meta Data: - none - -=cut - -sub _DateCustomFieldLimit { - my ( $self, $_field, $op, $value, %rest ) = @_; - - my $field = $rest{'SUBKEY'} || die "No field specified"; - - # For our sanity, we can only limit on one queue at a time - - my ($queue, $cfid, $column); - ($queue, $field, $cfid, $column) = $self->_CustomFieldDecipher( $field ); - -# If we're trying to find custom fields that don't match something, we -# want tickets where the custom field has no value at all. Note that -# we explicitly don't include the "IS NULL" case, since we would -# otherwise end up with a redundant clause. - - my $null_columns_ok; - if ( ( $op =~ /^NOT LIKE$/i ) or ( $op eq '!=' ) ) { - $null_columns_ok = 1; - } - - my $cfkey = $cfid ? $cfid : "$queue.$field"; - my ($TicketCFs, $CFs) = $self->_CustomFieldJoin( $cfkey, $cfid, $field ); - - $self->_OpenParen; - - if ( $CFs && !$cfid ) { - $self->SUPER::Limit( - ALIAS => $CFs, - FIELD => 'Name', - VALUE => $field, - ENTRYAGGREGATOR => 'AND', - ); - } - - $self->_OpenParen if $null_columns_ok; - - my $date = RT::Date->new( $self->CurrentUser ); - $date->Set( Format => 'unknown', Value => $value ); - - if ( $op eq "=" ) { - - # if we're specifying =, that means we want everything on a - # particular single day. in the database, we need to check for > - # and < the edges of that day. - - $date->SetToMidnight( Timezone => 'server' ); - my $daystart = $date->ISO; - $date->AddDay; - my $dayend = $date->ISO; - - $self->_OpenParen; - - $self->_SQLLimit( - ALIAS => $TicketCFs, - FIELD => 'Content', - OPERATOR => ">=", - VALUE => $daystart, - %rest, - ); - - $self->_SQLLimit( - ALIAS => $TicketCFs, - FIELD => 'Content', - OPERATOR => "<=", - VALUE => $dayend, - %rest, - ENTRYAGGREGATOR => 'AND', - ); - - $self->_CloseParen; - - } - else { - $self->_SQLLimit( - ALIAS => $TicketCFs, - FIELD => 'Content', - OPERATOR => $op, - VALUE => $date->ISO, - %rest, - ); - } - - $self->_CloseParen; - -} - =head2 _CustomFieldLimit Limit based on CustomFields @@ -1830,60 +1733,7 @@ sub OrderByCols { } push @res, { %$row, FIELD => "Priority", ORDER => $order } ; - - } elsif ( $field eq 'Customer' ) { #Freeside - - my $linkalias = $self->Join( - TYPE => 'LEFT', - ALIAS1 => 'main', - FIELD1 => 'id', - TABLE2 => 'Links', - FIELD2 => 'LocalBase' - ); - - $self->SUPER::Limit( - LEFTJOIN => $linkalias, - FIELD => 'Type', - OPERATOR => '=', - VALUE => 'MemberOf', - ); - $self->SUPER::Limit( - LEFTJOIN => $linkalias, - FIELD => 'Target', - OPERATOR => 'STARTSWITH', - VALUE => 'freeside://freeside/cust_main/', - ); - - #if there was a Links.RemoteTarget int, this bs wouldn't be necessary - my $custnum_sql = "CAST(SUBSTR($linkalias.Target,31) AS INTEGER)"; - - if ( $subkey eq 'Number' ) { - - push @res, { %$row, - ALIAS => '', - FIELD => $custnum_sql, - }; - - } elsif ( $subkey eq 'Name' ) { - - my $custalias = $self->Join( - TYPE => 'LEFT', - EXPRESSION => $custnum_sql, - TABLE2 => 'cust_main', - FIELD2 => 'custnum', - - ); - - my $field = "COALESCE( $custalias.company, - $custalias.last || ', ' || $custalias.first - )"; - - push @res, { %$row, ALIAS => '', FIELD => $field }; - - } - - } #Freeside - + } else { push @res, $row; } @@ -2817,11 +2667,6 @@ sub LimitCustomField { $args{CUSTOMFIELD} = $CF->Id; } - # Handle special customfields types - if ($CF->Type eq 'Date') { - $args{FIELD} = 'DateCustomFieldValue'; - } - #If we are looking to compare with a null value. if ( $args{'OPERATOR'} =~ /^is$/i ) { $args{'DESCRIPTION'} diff --git a/rt/lib/RT/URI/freeside.pm b/rt/lib/RT/URI/freeside.pm index 1bd2f534a..6194fd0cb 100644 --- a/rt/lib/RT/URI/freeside.pm +++ b/rt/lib/RT/URI/freeside.pm @@ -202,7 +202,7 @@ sub ParseURI { $pkey = $2; unless ( $pkey ) { - #way too noisy, using this prefix is normal usage# cluck "bad URL $uri"; + cluck "bad URL $uri"; return(undef); } diff --git a/rt/sbin/rt-dump-database b/rt/sbin/rt-dump-database deleted file mode 100755 index ce023adab..000000000 --- a/rt/sbin/rt-dump-database +++ /dev/null @@ -1,199 +0,0 @@ -#!/usr/bin/perl -w -# BEGIN BPS TAGGED BLOCK {{{ -# -# COPYRIGHT: -# -# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC -# -# -# (Except where explicitly superseded by other copyright notices) -# -# -# LICENSE: -# -# This work is made available to you under the terms of Version 2 of -# the GNU General Public License. A copy of that license should have -# been provided with this software, but in any event can be snarfed -# from www.gnu.org. -# -# This work is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 or visit their web page on the internet at -# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. -# -# -# CONTRIBUTION SUBMISSION POLICY: -# -# (The following paragraph is not intended to limit the rights granted -# to you to modify and distribute this software under the terms of -# the GNU General Public License and is only of importance to you if -# you choose to contribute your changes and enhancements to the -# community by submitting them to Best Practical Solutions, LLC.) -# -# By intentionally submitting any modifications, corrections or -# derivatives to this work, or any other work intended for use with -# Request Tracker, to Best Practical Solutions, LLC, you confirm that -# you are the copyright holder for those contributions and you grant -# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable, -# royalty-free, perpetual, license to use, copy, create derivative -# works based on those contributions, and sublicense and distribute -# those contributions and any derivatives thereof. -# -# END BPS TAGGED BLOCK }}} -use strict; - -# As we specify that XML is UTF-8 and we output it to STDOUT, we must be sure -# it is UTF-8 so further XMLin will not break -binmode(STDOUT, ":utf8"); - -# fix lib paths, some may be relative -BEGIN { - require File::Spec; - my @libs = ("lib", "local/lib"); - my $bin_path; - - for my $lib (@libs) { - unless ( File::Spec->file_name_is_absolute($lib) ) { - unless ($bin_path) { - if ( File::Spec->file_name_is_absolute(__FILE__) ) { - $bin_path = ( File::Spec->splitpath(__FILE__) )[1]; - } - else { - require FindBin; - no warnings "once"; - $bin_path = $FindBin::Bin; - } - } - $lib = File::Spec->catfile( $bin_path, File::Spec->updir, $lib ); - } - unshift @INC, $lib; - } - -} - -use RT; -use XML::Simple; - -RT::LoadConfig(); -RT::Init(); - -my $LocalOnly = @ARGV ? shift(@ARGV) : 1; - -my %RV; -my %Ignore = ( - All => [qw( - id Created Creator LastUpdated LastUpdatedBy - )], - Templates => [qw( - TranslationOf - )], -); - -my $SystemUserId = $RT::SystemUser->Id; -my @classes = qw( - Users Groups Queues ScripActions ScripConditions - Templates Scrips ACL CustomFields -); -foreach my $class (@classes) { - require "RT/$class.pm"; - my $objects = "RT::$class"->new($RT::SystemUser); - $objects->{find_disabled_rows} = 1; - $objects->UnLimit; - - if ($class eq 'CustomFields') { - $objects->OrderByCols( - { FIELD => 'LookupType' }, - { FIELD => 'SortOrder' }, - { FIELD => 'Id' }, - ); - } - else { - $objects->OrderBy( FIELD => 'Id' ); - } - - if ($LocalOnly) { - next if $class eq 'ACL'; # XXX - would go into infinite loop - XXX - $objects->Limit( FIELD => 'LastUpdatedBy', OPERATOR => '!=', VALUE => $SystemUserId ) - unless $class eq 'Groups'; - $objects->Limit( FIELD => 'Id', OPERATOR => '!=', VALUE => $SystemUserId ) - if $class eq 'Users'; - $objects->Limit( FIELD => 'Domain', OPERATOR => '=', VALUE => 'UserDefined' ) - if $class eq 'Groups'; - } - - my %fields; - while (my $obj = $objects->Next) { - next if $obj->can('LastUpdatedBy') and $obj->LastUpdatedBy == $SystemUserId; - - if (!%fields) { - %fields = map { $_ => 1 } keys %{$obj->_ClassAccessible}; - delete @fields{ - @{$Ignore{$class}||=[]}, - @{$Ignore{All}||=[]}, - }; - } - - my $rv; - # next if $obj-> # skip default names - foreach my $field (sort keys %fields) { - my $value = $obj->__Value($field); - $rv->{$field} = $value if ( defined ($value) && length($value) ); - } - delete $rv->{Disabled} unless $rv->{Disabled}; - - foreach my $record (map { /ACL/ ? 'ACE' : substr($_, 0, -1) } @classes) { - foreach my $key (map "$record$_", ('', 'Id')) { - next unless exists $rv->{$key}; - my $id = $rv->{$key} or next; - my $obj = "RT::$record"->new($RT::SystemUser); - $obj->LoadByCols( Id => $id ) or next; - $rv->{$key} = $obj->__Value('Name') || 0; - } - } - - if ($class eq 'Users' and defined $obj->Privileged) { - $rv->{Privileged} = int($obj->Privileged); - } - elsif ($class eq 'CustomFields') { - my $values = $obj->Values; - while (my $value = $values->Next) { - push @{$rv->{Values}}, { - map { ($_ => $value->__Value($_)) } qw( - Name Description SortOrder - ), - }; - } - } - - if (eval { require RT::Attributes; 1 }) { - my $attributes = $obj->Attributes; - while (my $attribute = $attributes->Next) { - my $content = $attribute->Content; - $rv->{Attributes}{$attribute->Name} = $content if length($content); - } - } - - push @{$RV{$class}}, $rv; - } -} - -print(<< "."); -no strict; use XML::Simple; *_ = XMLin(do { local \$/; readline(DATA) }, ForceArray => [qw( - @classes Values -)], NoAttr => 1, SuppressEmpty => ''); *\$_ = (\$_{\$_} || []) for keys \%_; 1; # vim: ft=xml -__DATA__ -. - -print XMLout( - { map { ($_ => ($RV{$_} || [])) } @classes }, - RootName => 'InitialData', - NoAttr => 1, - SuppressEmpty => '', - XMLDecl => '', -); diff --git a/rt/share/html/Elements/EditCustomFieldDate b/rt/share/html/Elements/EditCustomFieldDate deleted file mode 100644 index b6359d7e0..000000000 --- a/rt/share/html/Elements/EditCustomFieldDate +++ /dev/null @@ -1,62 +0,0 @@ -%# BEGIN BPS TAGGED BLOCK {{{ -%# -%# COPYRIGHT: -%# -%# This software is Copyright (c) 1996-2008 Best Practical Solutions, LLC -%# -%# -%# (Except where explicitly superseded by other copyright notices) -%# -%# -%# LICENSE: -%# -%# This work is made available to you under the terms of Version 2 of -%# the GNU General Public License. A copy of that license should have -%# been provided with this software, but in any event can be snarfed -%# from www.gnu.org. -%# -%# This work is distributed in the hope that it will be useful, but -%# WITHOUT ANY WARRANTY; without even the implied warranty of -%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -%# General Public License for more details. -%# -%# You should have received a copy of the GNU General Public License -%# along with this program; if not, write to the Free Software -%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -%# 02110-1301 or visit their web page on the internet at -%# http://www.gnu.org/copyleft/gpl.html. -%# -%# -%# CONTRIBUTION SUBMISSION POLICY: -%# -%# (The following paragraph is not intended to limit the rights granted -%# to you to modify and distribute this software under the terms of -%# the GNU General Public License and is only of importance to you if -%# you choose to contribute your changes and enhancements to the -%# community by submitting them to Best Practical Solutions, LLC.) -%# -%# By intentionally submitting any modifications, corrections or -%# derivatives to this work, or any other work intended for use with -%# Request Tracker, to Best Practical Solutions, LLC, you confirm that -%# you are the copyright holder for those contributions and you grant -%# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable, -%# royalty-free, perpetual, license to use, copy, create derivative -%# works based on those contributions, and sublicense and distribute -%# those contributions and any derivatives thereof. -%# -%# END BPS TAGGED BLOCK }}} -% my $name = $NamePrefix.$CustomField->Id.'-Values'; -<& /Elements/SelectDate, Name => "$name", ShowTime => 0, current => 0 &> (<%$DateObj->AsString%>) - -<%INIT> -my $DateObj = new RT::Date ( $session{'CurrentUser'} ); -$DateObj->Set( Format => 'ISO', Value => $Default ); - -<%ARGS> -$Object => undef -$CustomField => undef -$NamePrefix => undef -$Default => undef -$Values => undef -$MaxValues => 1 - diff --git a/rt/share/html/Elements/RT__CustomField/ColumnMap b/rt/share/html/Elements/RT__CustomField/ColumnMap index 0a867eb26..6d8d76a4c 100644 --- a/rt/share/html/Elements/RT__CustomField/ColumnMap +++ b/rt/share/html/Elements/RT__CustomField/ColumnMap @@ -155,9 +155,7 @@ my $COLUMN_MAP = { : ($args->{'PassArguments'}); my %pass = map { $_ => $args->{$_} } grep exists $args->{$_}, @pass; - my $path = $m->request_path; - $path =~ s(^/rt)(); #hacky, dunno why this happens - my $uri = RT->Config->Get('WebPath') . $path; + my $uri = RT->Config->Get('WebPath') . $m->request_path; my @res = ( \'HREF, \'">', $c->AsString, \''; - push @return, \'
' if scalar(@CustResolvers) > 1 - && $_ != $#CustResolvers; - } - @return; - }, - }, - }; # if no GPG support, then KeyOwnerName and KeyRequestors fall back to the regular diff --git a/rt/share/html/Elements/RefreshHomepage b/rt/share/html/Elements/RefreshHomepage index 7840f59cc..bf91a9522 100644 --- a/rt/share/html/Elements/RefreshHomepage +++ b/rt/share/html/Elements/RefreshHomepage @@ -46,13 +46,9 @@ %# %# END BPS TAGGED BLOCK }}} <&|/Widgets/TitleBox, title => loc('Refresh')&> - + <& /Elements/Refresh, Name => 'HomeRefreshInterval', Default => $session{'home_refresh_interval'}||RT->Config->Get('HomePageRefreshInterval', $session{'CurrentUser'}) &> <& /Elements/Submit, Label => loc('Go!') &> -<%init> -my $path = $m->request_path; -$path =~ s(^/rt)(); #hacky, dunno why this happens - diff --git a/rt/share/html/Elements/SelectDate b/rt/share/html/Elements/SelectDate index 46092ce23..183086f3d 100755 --- a/rt/share/html/Elements/SelectDate +++ b/rt/share/html/Elements/SelectDate @@ -50,14 +50,14 @@

<%init> diff --git a/rt/share/html/Elements/ShowCustomFieldDate b/rt/share/html/Elements/ShowCustomFieldDate deleted file mode 100644 index 4e8ad676c..000000000 --- a/rt/share/html/Elements/ShowCustomFieldDate +++ /dev/null @@ -1,57 +0,0 @@ -%# BEGIN BPS TAGGED BLOCK {{{ -%# -%# COPYRIGHT: -%# -%# This software is Copyright (c) 1996-2008 Best Practical Solutions, LLC -%# -%# -%# (Except where explicitly superseded by other copyright notices) -%# -%# -%# LICENSE: -%# -%# This work is made available to you under the terms of Version 2 of -%# the GNU General Public License. A copy of that license should have -%# been provided with this software, but in any event can be snarfed -%# from www.gnu.org. -%# -%# This work is distributed in the hope that it will be useful, but -%# WITHOUT ANY WARRANTY; without even the implied warranty of -%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -%# General Public License for more details. -%# -%# You should have received a copy of the GNU General Public License -%# along with this program; if not, write to the Free Software -%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -%# 02110-1301 or visit their web page on the internet at -%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. -%# -%# -%# CONTRIBUTION SUBMISSION POLICY: -%# -%# (The following paragraph is not intended to limit the rights granted -%# to you to modify and distribute this software under the terms of -%# the GNU General Public License and is only of importance to you if -%# you choose to contribute your changes and enhancements to the -%# community by submitting them to Best Practical Solutions, LLC.) -%# -%# By intentionally submitting any modifications, corrections or -%# derivatives to this work, or any other work intended for use with -%# Request Tracker, to Best Practical Solutions, LLC, you confirm that -%# you are the copyright holder for those contributions and you grant -%# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable, -%# royalty-free, perpetual, license to use, copy, create derivative -%# works based on those contributions, and sublicense and distribute -%# those contributions and any derivatives thereof. -%# -%# END BPS TAGGED BLOCK }}} -<%INIT> - my $content = $Object->Content; - my $DateObj = new RT::Date ( $session{'CurrentUser'} ); - $DateObj->Set( Format => 'ISO', Value => $content ); - $content = $DateObj->AsString; - -<%$content|n%> -<%ARGS> -$Object - diff --git a/rt/share/html/Elements/ShowLink_Checklist b/rt/share/html/Elements/ShowLink_Checklist deleted file mode 100644 index 945305fb6..000000000 --- a/rt/share/html/Elements/ShowLink_Checklist +++ /dev/null @@ -1,36 +0,0 @@ - -% if ($URI->IsLocal) { -% my $member = $URI->Object; -% if (UNIVERSAL::isa($member, "RT::Ticket")) { -% my $inactive = 0; #$member->QueueObj->IsInactiveStatus($member->Status); - - -

-<%$member->Id%>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> -%# [<% loc($member->Status) %>] - - -% } elsif ( UNIVERSAL::can($member, 'Name')) { -<%$URI->Resolver->AsString%>: <%$member->Name%> -% } else { -<%$URI->Resolver->AsString%> -% } -% } else { -<%$URI->Resolver->AsString%> -% } - -<%ARGS> -$URI => undef - -<%once> - -my %status2image = ( - 'new' => 'square_add', #'bullet_add', - 'open' => 'square', #'bullet_black', - 'stalled' => 'error', - 'resolved' => 'tick', - 'rejected' => 'cross', - #'deleted' => 'delete', -); - - diff --git a/rt/share/html/Elements/ShowUserVerbose b/rt/share/html/Elements/ShowUserVerbose index 9b61ea74a..82d65b0b3 100644 --- a/rt/share/html/Elements/ShowUserVerbose +++ b/rt/share/html/Elements/ShowUserVerbose @@ -46,11 +46,7 @@ %# %# END BPS TAGGED BLOCK }}} %# Released under the terms of version 2 of the GNU Public License -% if ( $Address->phrase || $Address->comment ) { -<% sprintf q{%s <%s> %s}, map $Address->$_, qw( phrase address comment ) %> -% } else { -<% $Address->address %> -% } +<%$Address->format%>\ <%INIT> my ($phrase, $address, $comment); diff --git a/rt/share/html/Search/Elements/BuildFormatString b/rt/share/html/Search/Elements/BuildFormatString index 9935fdf91..972851160 100644 --- a/rt/share/html/Search/Elements/BuildFormatString +++ b/rt/share/html/Search/Elements/BuildFormatString @@ -71,9 +71,6 @@ $CurrentDisplayColumns => undef # All the things we can display in the format string by default my @fields = qw( id QueueName Subject - - Customer - Status ExtendedStatus UpdateStatus Type @@ -99,7 +96,6 @@ my @fields = qw( Bookmark NEWLINE - ); # loc_qw $m->callback( CallbackOnce => 1, CallbackName => 'SetFieldsOnce', Fields => \@fields ); diff --git a/rt/share/html/Search/Elements/DisplayOptions b/rt/share/html/Search/Elements/DisplayOptions index 7464ae936..40d976cfd 100644 --- a/rt/share/html/Search/Elements/DisplayOptions +++ b/rt/share/html/Search/Elements/DisplayOptions @@ -115,8 +115,6 @@ $fields{$_}=1 for @cfs; # Add PAW sort $fields{'Custom.Ownership'} = 1; -$fields{"Customer.$_"} = 1 foreach qw( Number Name ); #Freeside - my @Order = split /\|/, $Order; my @OrderBy = split /\|/, $OrderBy; if ($Order =~ /\|/) { diff --git a/rt/share/html/Search/Elements/PickCFs b/rt/share/html/Search/Elements/PickCFs index beda9f733..ba25cdeda 100644 --- a/rt/share/html/Search/Elements/PickCFs +++ b/rt/share/html/Search/Elements/PickCFs @@ -78,41 +78,20 @@ while ( my $CustomField = $CustomFields->Next ) { my %line; $line{'Name'} = "'CF.{" . $CustomField->Name . "}'"; $line{'Field'} = $CustomField->Name; - - # Op - if ($CustomField->Type eq 'Date') { - $line{'Op'} = { - Type => 'component', - Path => '/Elements/SelectDateRelation', - Arguments => {}, - }; - } else { - $line{'Op'} = { - Type => 'component', - Path => '/Elements/SelectCustomFieldOperator', - Arguments => { True => loc("is"), - False => loc("isn't"), - TrueVal=> '=', - FalseVal => '!=', - }, - }; - } - - # Value - if ($CustomField->Type eq 'Date') { - $line{'Value'} = { - Type => 'component', - Path => '/Elements/SelectDate', - Arguments => {}, - }; - } else { - $line{'Value'} = { - Type => 'component', - Path => '/Elements/SelectCustomFieldValue', - Arguments => { CustomField => $CustomField }, - }; - } - + $line{'Op'} = { + Type => 'component', + Path => '/Elements/SelectCustomFieldOperator', + Arguments => { True => loc("is"), + False => loc("isn't"), + TrueVal=> '=', + FalseVal => '!=', + }, + }; + $line{'Value'} = { + Type => 'component', + Path => '/Elements/SelectCustomFieldValue', + Arguments => { CustomField => $CustomField }, + }; push @lines, \%line; } diff --git a/rt/share/html/Ticket/Checklist.html b/rt/share/html/Ticket/Checklist.html deleted file mode 100644 index 7394b0c10..000000000 --- a/rt/share/html/Ticket/Checklist.html +++ /dev/null @@ -1,30 +0,0 @@ -<& /Elements/Header, Title => loc("Checklist for Ticket #[_1] [_2]", $Ticket->Id, $Ticket->Subject) &> -<& /Ticket/Elements/Tabs, - Ticket => $Ticket, current_tab => 'Ticket/Checklist.html?id='.$Ticket->id, - Title => loc("Ticket Checklist # [_1] [_2]", $Ticket->Id, $Ticket->Subject) &> - -<& /Ticket/Elements/ShowMembers_Checklist, Ticket => $Ticket &> - -% if ( $show_hint ) { - -Link -or create -create child tickets to make a checklist. - -% } - -<%ARGS> -$id => undef - - -<%INIT> - -my $Ticket = LoadTicket ($id); - -unless ($Ticket->CurrentUserHasRight('ShowTicket')) { - Abort("No permission to view ticket"); -} - -my $show_hint = ! $Ticket->Members->Count; - - diff --git a/rt/share/html/Ticket/Elements/BulkLinks b/rt/share/html/Ticket/Elements/BulkLinks index d04eba426..7f87cefb8 100755 --- a/rt/share/html/Ticket/Elements/BulkLinks +++ b/rt/share/html/Ticket/Elements/BulkLinks @@ -163,7 +163,7 @@ $Tickets => undef <%INIT> my %hash; if ( $Tickets && $Tickets->Count ) { - my $first_ticket = $Tickets->Next or last; #avoid errors on bulk delete + my $first_ticket = $Tickets->Next; # we only show current links that eixst on all the tickets for my $type ( qw/DependsOn DependedOnBy Members MemberOf RefersTo ReferredToBy/ ) { diff --git a/rt/share/html/Ticket/Elements/ShowMembers_Checklist b/rt/share/html/Ticket/Elements/ShowMembers_Checklist deleted file mode 100644 index 68fb3b2c5..000000000 --- a/rt/share/html/Ticket/Elements/ShowMembers_Checklist +++ /dev/null @@ -1,29 +0,0 @@ - - - -

<& /Elements/ShowLink_Checklist, URI => $link->BaseURI &>
-% if ($depth < 8) { #why only 8? -<& /Ticket/Elements/ShowMembers_Checklist, Ticket => $link->BaseObj, depth => ($depth+1) &> -% } -

- -<%INIT> - -return unless $Ticket; -my $members = $Ticket->Members; -return unless $members->Count; - - - -<%ARGS> -$Ticket => undef -$depth => 1 - diff --git a/rt/share/html/Ticket/Elements/Tabs b/rt/share/html/Ticket/Elements/Tabs index 6943a2703..c893a350c 100755 --- a/rt/share/html/Ticket/Elements/Tabs +++ b/rt/share/html/Ticket/Elements/Tabs @@ -142,10 +142,6 @@ if ($Ticket) { title => loc('Links'), path => "Ticket/ModifyLinks.html?id=" . $id, }, - _Ea => { - title => loc('Checklist'), - path => "Ticket/Checklist.html?id=" . $id, - }, _Eb=> { title => loc('Customers'), path => "Ticket/ModifyCustomers.html?id=" . $id, diff --git a/rt/share/html/Ticket/Graphs/index.html b/rt/share/html/Ticket/Graphs/index.html index 211d3a0cb..e23737c8e 100644 --- a/rt/share/html/Ticket/Graphs/index.html +++ b/rt/share/html/Ticket/Graphs/index.html @@ -56,9 +56,7 @@ <& Elements/ShowGraph, %ARGS, Ticket => $ticket &> -% my $path = $m->request_comp->path; -% $path =~ s(^/rt)(); #hacky, dunno why this happens -

Inventory class:	<% include('/elements/select-table.html', - 'element_name' => 'classnum', - 'table' => 'inventory_class', - 'name_col' => 'classname', - 'value' => '', - 'empty_label' => '(all)') %>
Time period:	<% include('/elements/select-month_year.html') %>