diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/import-categories | 3 | ||||
| -rwxr-xr-x | bin/load-contacts | 5 | ||||
| -rwxr-xr-x | bin/send-reports | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/bin/import-categories b/bin/import-categories index e269e9176..f7fceeeeb 100755 --- a/bin/import-categories +++ b/bin/import-categories @@ -6,7 +6,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org. WWW: http://www.mysociety.org # -# $Id: import-categories,v 1.2 2007-03-21 16:04:39 matthew Exp $ +# $Id: import-categories,v 1.3 2007-08-02 11:44:59 matthew Exp $ use strict; require 5.8.0; @@ -19,7 +19,6 @@ use lib "$FindBin::Bin/../../perllib"; use mySociety::Config; use mySociety::DBHandle qw(dbh select_all); use mySociety::MaPit; -use mySociety::Util; use mySociety::VotingArea; BEGIN { diff --git a/bin/load-contacts b/bin/load-contacts index d3f0681e2..9c0d460b3 100755 --- a/bin/load-contacts +++ b/bin/load-contacts @@ -6,7 +6,7 @@ # Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org. WWW: http://www.mysociety.org # -# $Id: load-contacts,v 1.2 2007-01-26 22:48:30 matthew Exp $ +# $Id: load-contacts,v 1.3 2007-08-02 11:44:59 matthew Exp $ use strict; require 5.8.0; @@ -18,6 +18,7 @@ use lib "$FindBin::Bin/../../perllib"; use mySociety::Config; use mySociety::DBHandle qw(dbh select_all); +use mySociety::Random; BEGIN { mySociety::Config::set_file("$FindBin::Bin/../conf/general"); @@ -31,7 +32,7 @@ BEGIN { if (!dbh()->selectrow_array('select secret from secret for update of secret')) { local dbh()->{HandleError}; - dbh()->do('insert into secret (secret) values (?)', {}, unpack('h*', mySociety::Util::random_bytes(32))); + dbh()->do('insert into secret (secret) values (?)', {}, unpack('h*', mySociety::Random::random_bytes(32))); } dbh()->commit(); } diff --git a/bin/send-reports b/bin/send-reports index a8faf3779..4d5546a55 100755 --- a/bin/send-reports +++ b/bin/send-reports @@ -6,7 +6,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org. WWW: http://www.mysociety.org # -# $Id: send-reports,v 1.44 2007-07-11 16:39:02 matthew Exp $ +# $Id: send-reports,v 1.45 2007-08-02 11:44:59 matthew Exp $ use strict; require 5.8.0; @@ -20,8 +20,8 @@ use File::Slurp; use mySociety::Config; use mySociety::DBHandle qw(dbh select_all); use mySociety::Email; +use mySociety::EmailUtil; use mySociety::MaPit; -use mySociety::Util; BEGIN { mySociety::Config::set_file("$FindBin::Bin/../conf/general"); @@ -136,9 +136,9 @@ If you know of an appropriate contact address, please do get in touch. ]\n\n"; if (mySociety::Config::get('STAGING_SITE') || $nomail) { $result = -1; } else { - $result = mySociety::Util::send_email($email, mySociety::Config::get('CONTACT_EMAIL'), @recips); + $result = mySociety::EmailUtil::send_email($email, mySociety::Config::get('CONTACT_EMAIL'), @recips); } - if ($result == mySociety::Util::EMAIL_SUCCESS) { + if ($result == mySociety::EmailUtil::EMAIL_SUCCESS) { dbh()->do('UPDATE problem SET whensent=ms_current_timestamp(), lastupdate=ms_current_timestamp() WHERE id=?', {}, $row->{id}); dbh()->commit(); |