diff options
| -rw-r--r-- | FS/FS/Record.pm | 33 | ||||
| -rwxr-xr-x | FS/bin/freeside-daily | 8 | ||||
| -rw-r--r-- | httemplate/search/elements/search.html | 9 |
3 files changed, 19 insertions, 31 deletions
diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm index 21fef73e3..5de4ca752 100644 --- a/FS/FS/Record.pm +++ b/FS/FS/Record.pm @@ -18,6 +18,7 @@ use DBIx::DBSchema 0.43; #0.43 for foreign keys use Locale::Country; use Locale::Currency; use NetAddr::IP; # for validation +use Crypt::OpenSSL::RSA; use FS::UID qw(dbh datasrc driver_name); use FS::CurrentUser; use FS::Schema qw(dbdef); @@ -53,8 +54,6 @@ our $qsearch_qualify_columns = 1; our $no_check_foreign = 1; #well, not inefficiently in perl by default anymore -my $rsa_module; -my $rsa_loaded; my $rsa_encrypt; my $rsa_decrypt; @@ -3397,27 +3396,19 @@ sub decrypt { } sub loadRSA { - my $self = shift; - #Initialize the Module - $rsa_module = 'Crypt::OpenSSL::RSA'; # The Default + my $self = shift; - if ($conf_encryptionmodule && $conf_encryptionmodule ne '') { - $rsa_module = $conf_encryptionmodule; - } + my $rsa_module = $conf_encryptionmodule || 'Crypt::OpenSSL::RSA'; - if (!$rsa_loaded) { - eval ("require $rsa_module"); # No need to import the namespace - $rsa_loaded++; - } - # Initialize Encryption - if ($conf_encryptionpublickey && $conf_encryptionpublickey ne '') { - $rsa_encrypt = $rsa_module->new_public_key($conf_encryptionpublickey); - } - - # Intitalize Decryption - if ($conf_encryptionprivatekey && $conf_encryptionprivatekey ne '') { - $rsa_decrypt = $rsa_module->new_private_key($conf_encryptionprivatekey); - } + # Initialize Encryption + if ($conf_encryptionpublickey && $conf_encryptionpublickey ne '') { + $rsa_encrypt = $rsa_module->new_public_key($conf_encryptionpublickey); + } + + # Intitalize Decryption + if ($conf_encryptionprivatekey && $conf_encryptionprivatekey ne '') { + $rsa_decrypt = $rsa_module->new_private_key($conf_encryptionprivatekey); + } } =item h_search ACTION diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily index e0c555f7b..f1b7e58ec 100755 --- a/FS/bin/freeside-daily +++ b/FS/bin/freeside-daily @@ -55,14 +55,6 @@ tax_rate_update(%opt); use FS::Cron::set_lata_have_usage qw(set_lata_have_usage); set_lata_have_usage(%opt); -# we used to send alerts about upcoming credit card expiration here -my $conf = new FS::Conf; -if($conf->exists('alert_expiration')) { - warn "WARNING: the alert_expiration option is obsolete. If you ran - freeside-upgrade, it should have configured credit card expiration alerts - as billing events.\n"; -} - #what to do about the below when using -m? that is the question. #you don't want to skip this, besides, it should be cheap diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html index 476b5095e..1e9ce5cde 100644 --- a/httemplate/search/elements/search.html +++ b/httemplate/search/elements/search.html @@ -16,7 +16,7 @@ Example: # (deprecated, will be singularlized # simplisticly) - #literal SQL query string (deprecated?) or qsearch hashref or arrayref + #literal SQL query string (corner cases only) or qsearch hashref or arrayref #of qsearch hashrefs for a union of qsearches 'query' => { 'table' => 'tablename', @@ -33,8 +33,13 @@ Example: }, # "select * from tablename"; +<<<<<<< HEAD + + #required (now even if 'query' is an SQL query string) +======= #required unless 'query' is an SQL query string (shouldn't be...) +>>>>>>> 95144265eeb3ecd13b16708dbdd75dd3701f92ad 'count_query' => 'SELECT COUNT(*) FROM tablename', ### @@ -131,7 +136,7 @@ Example: 'agent_pos' => 3, # optional position (starting from 0) to # insert an Agent column (query needs to be a # qsearch hashref and header & fields need to - # be defined)cust_pkg_susp.html + # be defined) # sort, link & display properties for fields |