[freeside-commits] branch FREESIDE_3_BRANCH updated. c9994d080422aec5188ee08851a493ce1794c3b7
Ivan
ivan at 420.am
Sun Oct 19 12:19:12 PDT 2014
The branch, FREESIDE_3_BRANCH has been updated
via c9994d080422aec5188ee08851a493ce1794c3b7 (commit)
via 9ef031dc275339f9f2527ff70eca21739a99eb32 (commit)
via 6c332f225b646c3c07f247f8d65d2c58fb6a306e (commit)
from 6205135803080b92127d4b1b52b4d4729d08a09f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c9994d080422aec5188ee08851a493ce1794c3b7
Merge: 9ef031d 6205135
Author: Ivan Kohler <ivan at freeside.biz>
Date: Sun Oct 19 12:19:08 2014 -0700
Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH
commit 9ef031dc275339f9f2527ff70eca21739a99eb32
Author: Ivan Kohler <ivan at freeside.biz>
Date: Sun Oct 19 12:18:32 2014 -0700
remove autogenerated files
diff --git a/rt/etc/upgrade/3.8-branded-queues-extension b/rt/etc/upgrade/3.8-branded-queues-extension
deleted file mode 100755
index 5f6e38a..0000000
--- a/rt/etc/upgrade/3.8-branded-queues-extension
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/usr/bin/perl
-# BEGIN BPS TAGGED BLOCK {{{
-#
-# COPYRIGHT:
-#
-# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC
-# <sales at bestpractical.com>
-#
-# (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;
-use warnings;
-
-use lib "/opt/rt3/local/lib";
-use lib "/opt/rt3/lib";
-
-
-use RT;
-RT::LoadConfig();
-RT::Init();
-
-use RT::Queues;
-
-my $queues = RT::Queues->new( RT->SystemUser );
-$queues->UnLimit();
-while ( my $queue = $queues->Next ) {
- print "Processing queue ". ($queue->Name || $queue->id) ."...\n";
- my $old_attr = $queue->FirstAttribute('BrandedSubjectTag');
- unless ( $old_attr ) {
- print "\thas no old-style subject tag. skipping\n";
- next;
- }
- my $old_value = $old_attr->Content;
- unless ( $old_value ) {
- print "\thas empty old-style subject tag\n";
- } else {
- my ($status, $msg) = $queue->SetSubjectTag( $old_value );
- unless ( $status ) {
- print STDERR "\tERROR. Couldn't set tag: $msg\n";
- next;
- } else {
- print "\thave set new-style subject tag to '$old_value'\n";
- }
- }
-
- my ($status, $msg) = $queue->DeleteAttribute('BrandedSubjectTag');
- unless ( $status ) {
- print STDERR "\tERROR. Couldn't delete old-style tag: $msg\n";
- next;
- } else {
- print "\tdeleted old-style tag entry\n";
- }
- print "\tDONE\n";
-}
-
-exit 0;
-
diff --git a/rt/etc/upgrade/3.8-ical-extension b/rt/etc/upgrade/3.8-ical-extension
deleted file mode 100755
index 10239dc..0000000
--- a/rt/etc/upgrade/3.8-ical-extension
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/perl
-# BEGIN BPS TAGGED BLOCK {{{
-#
-# COPYRIGHT:
-#
-# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC
-# <sales at bestpractical.com>
-#
-# (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;
-use warnings;
-
-use lib "/opt/rt3/local/lib";
-use lib "/opt/rt3/lib";
-
-
-use RT;
-RT::LoadConfig();
-RT::Init();
-
-use RT::Attributes;
-my $attrs = RT::Attributes->new( RT->SystemUser );
-$attrs->Limit(FIELD => 'ObjectType', OPERATOR=> '=', VALUE => 'RT::User');
-$attrs->Limit(FIELD => 'Name', OPERATOR=> '=', VALUE => 'ical-auth-token');
-while ( my $attr = $attrs->Next ) {
- my $uid = $attr->ObjectId;
- print "Processing auth token of user #". $uid ."...\n";
-
- my $user = RT::User->new( RT->SystemUser );
- $user->Load( $uid );
- unless ( $user->id ) {
- print STDERR "\tERROR. Couldn't load user record\n";
- next;
- }
-
- my ($status, $msg);
-
- ($status, $msg) = $user->DeleteAttribute('AuthToken')
- if $user->FirstAttribute('AuthToken');
- unless ( $status ) {
- print STDERR "\tERROR. Couldn't delete duplicated attribute: $msg\n";
- next;
- } else {
- print "\tdeleted duplicate attribute\n";
- }
-
- ($status, $msg) = $attr->SetName('AuthToken');
- unless ( $status ) {
- print STDERR "\tERROR. Couldn't rename attribute: $msg\n";
- next;
- } else {
- print "\trenamed attribute\n";
- }
- print "\tDONE\n";
-}
-
-exit 0;
diff --git a/rt/etc/upgrade/generate-rtaddressregexp b/rt/etc/upgrade/generate-rtaddressregexp
deleted file mode 100755
index 729228a..0000000
--- a/rt/etc/upgrade/generate-rtaddressregexp
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/bin/perl
-# BEGIN BPS TAGGED BLOCK {{{
-#
-# COPYRIGHT:
-#
-# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC
-# <sales at bestpractical.com>
-#
-# (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;
-use warnings;
-
-use lib "/opt/rt3/local/lib";
-use lib "/opt/rt3/lib";
-
-use RT;
-RT::LoadConfig();
-RT->Config->Set('LogToScreen' => 'debug');
-RT::Init();
-
-$| = 1;
-
-if (my $re = RT->Config->Get('RTAddressRegexp')) {
- print "No need to use this script, you already have RTAddressRegexp set to $re\n";
- exit;
-}
-
-use RT::Queues;
-my $queues = RT::Queues->new( RT->SystemUser );
-$queues->UnLimit;
-
-my %merged;
-merge(\%merged, RT->Config->Get('CorrespondAddress'), RT->Config->Get('CommentAddress'));
-while ( my $queue = $queues->Next ) {
- merge(\%merged, $queue->CorrespondAddress, $queue->CommentAddress);
-}
-
-my @domains;
-for my $domain (sort keys %merged) {
- my @addresses;
- for my $base (sort keys %{$merged{$domain}}) {
- my @subbits = keys(%{$merged{$domain}{$base}});
- if (@subbits > 1) {
- push @addresses, "\Q$base\E(?:".join("|", at subbits).")";
- } else {
- push @addresses, "\Q$base\E$subbits[0]";
- }
- }
- if (@addresses > 1) {
- push @domains, "(?:".join("|", @addresses).")\Q\@".$domain."\E";
- } else {
- push @domains, "$addresses[0]\Q\@$domain\E";
- }
-}
-my $re = join "|", @domains;
-
-print <<ENDDESCRIPTION;
-You can add the following to RT_SiteConfig.pm, but may want to collapse it into a more efficient regexp.
-Keep in mind that this only contains the email addresses that RT knows about, you should also examine
-your mail system for aliases that reach RT but which RT doesn't know about.
-ENDDESCRIPTION
-print "Set(\$RTAddressRegexp,qr{^(?:${re})\$}i);\n";
-
-sub merge {
- my $merged = shift;
- for my $address (grep {defined and length} @_) {
- $address =~ /^\s*(.*?)(-comments?)?\@(.*?)\s*$/;
- $merged->{lc $3}{$1}{$2||''}++;
- }
-}
diff --git a/rt/etc/upgrade/split-out-cf-categories b/rt/etc/upgrade/split-out-cf-categories
deleted file mode 100755
index b61ade3..0000000
--- a/rt/etc/upgrade/split-out-cf-categories
+++ /dev/null
@@ -1,171 +0,0 @@
-#!/usr/bin/perl
-# BEGIN BPS TAGGED BLOCK {{{
-#
-# COPYRIGHT:
-#
-# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC
-# <sales at bestpractical.com>
-#
-# (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;
-use warnings;
-
-use lib "/opt/rt3/local/lib";
-use lib "/opt/rt3/lib";
-
-use RT;
-RT::LoadConfig();
-RT->Config->Set('LogToScreen' => 'debug');
-RT::Init();
-
-$| = 1;
-
-$RT::Handle->BeginTransaction();
-
-use RT::CustomFields;
-my $CFs = RT::CustomFields->new( RT->SystemUser );
-$CFs->UnLimit;
-$CFs->Limit( FIELD => 'Type', VALUE => 'Select' );
-
-my $seen;
-while (my $cf = $CFs->Next ) {
- next if $cf->BasedOnObj->Id;
- my @categories;
- my %mapping;
- my $values = $cf->Values;
- while (my $value = $values->Next) {
- next unless defined $value->Category and length $value->Category;
- push @categories, $value->Category unless grep {$_ eq $value->Category} @categories;
- $mapping{$value->Name} = $value->Category;
- }
- next unless @categories;
-
- $seen++;
- print "Found CF '@{[$cf->Name]}' with categories:\n";
- print " $_\n" for @categories;
-
- print "Split this CF's categories into a hierarchical custom field (Y/n)? ";
- my $dothis = <>;
- next if $dothis =~ /n/i;
-
- print "Enter name of CF to create as category ('@{[$cf->Name]} category'): ";
- my $newname = <>;
- chomp $newname;
- $newname = $cf->Name . " category" unless length $newname;
-
- # bump the CF's sort oder up by one
- $cf->SetSortOrder( ($cf->SortOrder || 0) + 1 );
-
- # ..and add a new CF before it
- my $new = RT::CustomField->new( RT->SystemUser );
- my ($id, $msg) = $new->Create(
- Name => $newname,
- Type => 'Select',
- MaxValues => 1,
- LookupType => $cf->LookupType,
- SortOrder => $cf->SortOrder - 1,
- );
- die "Can't create custom field '$newname': $msg" unless $id;
-
- # Set the CF to be based on what we just made
- $cf->SetBasedOn( $new->Id );
-
- # Apply it to all of the same things
- {
- my $ocfs = RT::ObjectCustomFields->new( RT->SystemUser );
- $ocfs->LimitToCustomField( $cf->Id );
- while (my $ocf = $ocfs->Next) {
- my $newocf = RT::ObjectCustomField->new( RT->SystemUser );
- ($id, $msg) = $newocf->Create(
- SortOrder => $ocf->SortOrder,
- CustomField => $new->Id,
- ObjectId => $ocf->ObjectId,
- );
- die "Can't create ObjectCustomField: $msg" unless $id;
- }
- }
-
- # Copy over all of the rights
- {
- my $acl = RT::ACL->new( RT->SystemUser );
- $acl->LimitToObject( $cf );
- while (my $ace = $acl->Next) {
- my $newace = RT::ACE->new( RT->SystemUser );
- ($id, $msg) = $newace->Create(
- PrincipalId => $ace->PrincipalId,
- PrincipalType => $ace->PrincipalType,
- RightName => $ace->RightName,
- Object => $new,
- );
- die "Can't assign rights: $msg" unless $id;
- }
- }
-
- # Add values for all of the categories
- for my $i (0..$#categories) {
- ($id, $msg) = $new->AddValue(
- Name => $categories[$i],
- SortOrder => $i + 1,
- );
- die "Can't create custom field value: $msg" unless $id;
- }
-
- # Grovel through all ObjectCustomFieldValues, and add the
- # appropriate category
- {
- my $ocfvs = RT::ObjectCustomFieldValues->new( RT->SystemUser );
- $ocfvs->LimitToCustomField( $cf->Id );
- while (my $ocfv = $ocfvs->Next) {
- next unless exists $mapping{$ocfv->Content};
- my $newocfv = RT::ObjectCustomFieldValue->new( RT->SystemUser );
- ($id, $msg) = $newocfv->Create(
- CustomField => $new->Id,
- ObjectType => $ocfv->ObjectType,
- ObjectId => $ocfv->ObjectId,
- Content => $mapping{$ocfv->Content},
- );
- }
- }
-}
-
-$RT::Handle->Commit;
-print "No custom fields with categories found\n" unless $seen;
diff --git a/rt/etc/upgrade/vulnerable-passwords b/rt/etc/upgrade/vulnerable-passwords
deleted file mode 100755
index 7f278a0..0000000
--- a/rt/etc/upgrade/vulnerable-passwords
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/usr/bin/perl
-# BEGIN BPS TAGGED BLOCK {{{
-#
-# COPYRIGHT:
-#
-# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC
-# <sales at bestpractical.com>
-#
-# (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;
-use warnings;
-
-use lib "/opt/rt3/local/lib";
-use lib "/opt/rt3/lib";
-
-use RT;
-RT::LoadConfig;
-RT::Init;
-
-$| = 1;
-
-use Getopt::Long;
-use Digest::SHA;
-my $fix;
-GetOptions("fix!" => \$fix);
-
-use RT::Users;
-my $users = RT::Users->new( $RT::SystemUser );
-$users->Limit(
- FIELD => 'Password',
- OPERATOR => 'IS NOT',
- VALUE => 'NULL',
- ENTRYAGGREGATOR => 'AND',
-);
-$users->Limit(
- FIELD => 'Password',
- OPERATOR => '!=',
- VALUE => '*NO-PASSWORD*',
- ENTRYAGGREGATOR => 'AND',
-);
-$users->Limit(
- FIELD => 'Password',
- OPERATOR => 'NOT STARTSWITH',
- VALUE => '!',
- ENTRYAGGREGATOR => 'AND',
-);
-push @{$users->{'restrictions'}{ "main.Password" }}, "AND", {
- field => 'LENGTH(main.Password)',
- op => '<',
- value => '40',
-};
-
-# we want to update passwords on disabled users
-$users->{'find_disabled_rows'} = 1;
-
-my $count = $users->Count;
-if ($count == 0) {
- print "No users with unsalted or weak cryptography found.\n";
- exit 0;
-}
-
-if ($fix) {
- print "Upgrading $count users...\n";
- while (my $u = $users->Next) {
- my $stored = $u->__Value("Password");
- my $raw;
- if (length $stored == 32) {
- $raw = pack("H*",$stored);
- } elsif (length $stored == 22) {
- $raw = MIME::Base64::decode_base64($stored);
- } elsif (length $stored == 13) {
- printf "%20s => Old crypt() format, cannot upgrade\n", $u->Name;
- } else {
- printf "%20s => Unknown password format!\n", $u->Name;
- }
- next unless $raw;
-
- my $salt = pack("C4",map{int rand(256)} 1..4);
- my $sha = Digest::SHA::sha256(
- $salt . $raw
- );
- $u->_Set(
- Field => "Password",
- Value => MIME::Base64::encode_base64(
- $salt . substr($sha,0,26), ""),
- );
- }
- print "Done.\n";
- exit 0;
-} else {
- if ($count < 20) {
- print "$count users found with unsalted or weak-cryptography passwords:\n";
- print " Id | Name\n", "-"x9, "+", "-"x9, "\n";
- while (my $u = $users->Next) {
- printf "%8d | %s\n", $u->Id, $u->Name;
- }
- } else {
- print "$count users found with unsalted or weak-cryptography passwords\n";
- }
-
- print "\n", "Run again with --fix to upgrade.\n";
- exit 1;
-}
diff --git a/rt/t/data/configs/apache2.2+fastcgi.conf b/rt/t/data/configs/apache2.2+fastcgi.conf
deleted file mode 100644
index ab26136..0000000
--- a/rt/t/data/configs/apache2.2+fastcgi.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-ServerRoot %%SERVER_ROOT%%
-PidFile %%PID_FILE%%
-LockFile %%LOCK_FILE%%
-ServerAdmin root at localhost
-
-%%LOAD_MODULES%%
-
-<IfModule !mpm_netware_module>
-<IfModule !mpm_winnt_module>
-User freeside
-Group freeside
-</IfModule>
-</IfModule>
-
-ServerName localhost
-Listen %%LISTEN%%
-
-ErrorLog "%%LOG_FILE%%"
-LogLevel debug
-
-<Directory />
- Options FollowSymLinks
- AllowOverride None
- Order deny,allow
- Deny from all
-</Directory>
-
-AddDefaultCharset UTF-8
-
-FastCgiServer %%RT_SBIN_PATH%%/rt-server.fcgi \
- -socket %%TMP_DIR%%/socket \
- -processes 1 \
- -idle-timeout 180 \
- -initial-env RT_SITE_CONFIG=%%RT_SITE_CONFIG%% \
- -initial-env RT_TESTING=1
-
-Alias /NoAuth/images/ %%DOCUMENT_ROOT%%/NoAuth/images/
-ScriptAlias / %%RT_SBIN_PATH%%/rt-server.fcgi/
-
-DocumentRoot "%%DOCUMENT_ROOT%%"
-<Location />
- Order allow,deny
- Allow from all
-
-%%BASIC_AUTH%%
-
- Options +ExecCGI
- AddHandler fastcgi-script fcgi
-</Location>
-
diff --git a/rt/t/data/configs/apache2.2+mod_perl.conf b/rt/t/data/configs/apache2.2+mod_perl.conf
deleted file mode 100644
index ae84c9d..0000000
--- a/rt/t/data/configs/apache2.2+mod_perl.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-<IfModule mpm_prefork_module>
- StartServers 1
- MinSpareServers 1
- MaxSpareServers 1
- MaxClients 1
- MaxRequestsPerChild 0
-</IfModule>
-
-<IfModule mpm_worker_module>
- StartServers 1
- MinSpareThreads 1
- MaxSpareThreads 1
- ThreadLimit 1
- ThreadsPerChild 1
- MaxClients 1
- MaxRequestsPerChild 0
-</IfModule>
-
-ServerRoot %%SERVER_ROOT%%
-PidFile %%PID_FILE%%
-LockFile %%LOCK_FILE%%
-ServerAdmin root at localhost
-
-%%LOAD_MODULES%%
-
-<IfModule !mpm_netware_module>
-<IfModule !mpm_winnt_module>
-User freeside
-Group freeside
-</IfModule>
-</IfModule>
-
-ServerName localhost
-Listen %%LISTEN%%
-
-ErrorLog "%%LOG_FILE%%"
-LogLevel debug
-
-<Directory />
- Options FollowSymLinks
- AllowOverride None
- Order deny,allow
- Deny from all
-</Directory>
-
-AddDefaultCharset UTF-8
-PerlSetEnv RT_SITE_CONFIG %%RT_SITE_CONFIG%%
-
-DocumentRoot "%%DOCUMENT_ROOT%%"
-<Location />
- Order allow,deny
- Allow from all
-
-%%BASIC_AUTH%%
-
- SetHandler modperl
-
- PerlResponseHandler Plack::Handler::Apache2
- PerlSetVar psgi_app %%RT_SBIN_PATH%%/rt-server
-</Location>
-
-<Perl>
- $ENV{RT_TESTING}=1;
- use Plack::Handler::Apache2;
- Plack::Handler::Apache2->preload("%%RT_SBIN_PATH%%/rt-server");
-</Perl>
-
commit 6c332f225b646c3c07f247f8d65d2c58fb6a306e
Author: Ivan Kohler <ivan at freeside.biz>
Date: Thu Oct 9 11:52:02 2014 -0700
fix agent type selection for the simple case, RT#30942, RT#28804
diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index 3c9f8b2..b164113 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -315,12 +315,11 @@ Example:
% 'layer_values' => $layer_values,
% 'html_between' => $f->{'html_between'},
%
-% #umm. for select-agent_types at least
+% #umm. for select-agent_type at least
% 'disabled' => $f->{'disabled'},
% 'fixed' => $f->{'fixed'},
-%
-% #umm. for select-agent_types at least
% 'label_callback'=> $f->{'label_callback'},
+% 'element_etc' => $f->{'element_etc'},
%
% #for select-ticketing_queueid at least
% 'post_options' => $f->{'post_options'},
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index f40d4a9..9c18e9e 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -50,6 +50,7 @@
'credit_weight' => 'Credit weight',
'agent_pkgpartid' => 'External ID',
'agentnum' => 'Agent',
+ 'agent_type' => ' ', #just its title headingn is fine
'setup_fee' => 'Setup fee',
'setup_show_zero' => 'Show zero setup',
'recur_fee' => 'Recurring fee',
@@ -204,9 +205,13 @@
{ type => 'columnnext' },
- { field => 'agent_type',
- type => 'select-agent_types',
- disabled => ! $acl_edit_global,
+ {type=>'justtitle', value=>'Agent (reseller) types' },
+
+ { field => 'agent_type',
+ type => 'select-agent_types',
+ disabled => ! $acl_edit_global,
+ element_etc => 'size="10"',
+ multiple => '1', #cause edit.html is dum
curr_value_callback => sub {
my($cgi, $object, $field) = @_;
#in the other callbacks..? hmm.
diff --git a/httemplate/elements/select-agent_types.html b/httemplate/elements/select-agent_types.html
deleted file mode 100644
index 400b453..0000000
--- a/httemplate/elements/select-agent_types.html
+++ /dev/null
@@ -1,30 +0,0 @@
-%# if ( $cgi->param('clone') ) { #XXX
-% if ( $opt{'disabled'} ) {
-
- <INPUT TYPE="hidden" NAME="agent_type" VALUE="">
-
-% } elsif ( scalar(@all_agent_types) == 1) {
-
- <INPUT TYPE="hidden" NAME="agent_type" VALUE="<% $all_agent_types[0] %>">
-
-% } else {
-
- <% include( 'select-table.html',
- 'element_name' => 'agent_type',
- 'table' => 'agent_type',
- 'name_col' => 'atype',
- #'value' => \@agent_type,
- 'element_etc' => 'size="10"',
- %opt,
- 'multiple' => '1', #cause edit.html is dum
- )
- %>
-
-% }
-<%init>
-
-my %opt = @_;
-
-my @all_agent_types = map {$_->typenum} qsearch('agent_type',{});
-
-</%init>
diff --git a/httemplate/elements/tr-select-agent_types.html b/httemplate/elements/tr-select-agent_types.html
deleted file mode 100644
index efbf386..0000000
--- a/httemplate/elements/tr-select-agent_types.html
+++ /dev/null
@@ -1,19 +0,0 @@
-% unless ( $opt{'disabled'} || scalar(@all_agent_types) == 1 ) {
-
-<% include('/elements/tr-justtitle.html', value=>'Agent (reseller) types') %>
-
-% }
-
-<TR>
- <TD COLSPAN=2>
- <% include('select-agent_types.html', %opt) %>
- </TD>
-</TR>
-
-<%init>
-
-my %opt = @_;
-
-my @all_agent_types = map {$_->typenum} qsearch('agent_type',{});
-
-</%init>
-----------------------------------------------------------------------
Summary of changes:
httemplate/edit/elements/edit.html | 5 +-
httemplate/edit/part_pkg.cgi | 11 +-
httemplate/elements/select-agent_types.html | 30 -----
httemplate/elements/tr-select-agent_types.html | 19 ---
rt/etc/upgrade/3.8-branded-queues-extension | 95 -------------
rt/etc/upgrade/3.8-ical-extension | 96 -------------
rt/etc/upgrade/generate-rtaddressregexp | 109 ---------------
rt/etc/upgrade/split-out-cf-categories | 171 ------------------------
rt/etc/upgrade/vulnerable-passwords | 142 --------------------
rt/t/data/configs/apache2.2+fastcgi.conf | 50 -------
rt/t/data/configs/apache2.2+mod_perl.conf | 67 ----------
11 files changed, 10 insertions(+), 785 deletions(-)
delete mode 100644 httemplate/elements/select-agent_types.html
delete mode 100644 httemplate/elements/tr-select-agent_types.html
delete mode 100755 rt/etc/upgrade/3.8-branded-queues-extension
delete mode 100755 rt/etc/upgrade/3.8-ical-extension
delete mode 100755 rt/etc/upgrade/generate-rtaddressregexp
delete mode 100755 rt/etc/upgrade/split-out-cf-categories
delete mode 100755 rt/etc/upgrade/vulnerable-passwords
delete mode 100644 rt/t/data/configs/apache2.2+fastcgi.conf
delete mode 100644 rt/t/data/configs/apache2.2+mod_perl.conf
More information about the freeside-commits
mailing list