diff --git a/Sam/commands/add.pm b/Sam/commands/add.pm index bef7466c6f03af3f53e991e14bbbc72fec75af91..f5ab623cff46a00b7195de94a9280823b0aac621 100644 --- a/Sam/commands/add.pm +++ b/Sam/commands/add.pm @@ -8,7 +8,6 @@ use Sam::Chan; use Sam::Event; use Time::Local; -our $dbh; our $log; sub exec { diff --git a/Sam/commands/edit.pm b/Sam/commands/edit.pm index 197f912f33a049cd7ed0dcfc1ffaaa80fb0cc96d..60b44c60758fcdc0826843a15853e47276160610 100644 --- a/Sam/commands/edit.pm +++ b/Sam/commands/edit.pm @@ -8,18 +8,12 @@ use Regexp::Common qw(URI); use Sam::Chan; use Sam::Event; -our $dbh; our $log; our $irc; sub exec { my ($id, $command, $arg, $chan_name) = @_; - my $saveCommit = $dbh->{AutoCommit}; - my $saveError = $dbh->{RaiseError}; - $dbh->{AutoCommit} = 0; - $dbh->{RaiseError} = 1; - if ($command eq "lien" or $command eq "url" or $command eq "link") { if ($arg !~ /^$RE{URI}{HTTP}{-scheme => qr(https?)}$/) { die "Ce n'est pas une URL valide"; @@ -46,9 +40,6 @@ sub exec { else { die "Commande inconnue"; } - - $dbh->{AutoCommit} = $saveCommit; - $dbh->{RaiseError} = $saveError; } 1; diff --git a/Sam/commands/list.pm b/Sam/commands/list.pm index 610fb14afafa956a2e1b039e614117b41febe932..c953b771e06fe05f8be583c380a451bbe6702cd1 100644 --- a/Sam/commands/list.pm +++ b/Sam/commands/list.pm @@ -9,13 +9,11 @@ require Exporter; our @ISA = qw(Exporter); our @EXPORT_OK = qw(exec); -our $dbh; our $log; our $irc; sub exec { my $chan = shift; - my $sth; my $calendar_id = Sam::Chan->new(name => $chan)->load->calendar_id; my $events = Sam::Event::Manager->get_events( diff --git a/Sam/commands/parser.pm b/Sam/commands/parser.pm index aa67093264e849b215ef26d86fea8bf7780b3fcc..3f627b7947cd6c9be5bc70a490e0f967c53e4373 100644 --- a/Sam/commands/parser.pm +++ b/Sam/commands/parser.pm @@ -19,10 +19,7 @@ my $lastID; sub setConf { my ($nickNew, $ircNew, $dbh, $log, $lastIDnew) = @_; - $Sam::commands::add::dbh = $dbh; - $Sam::commands::list::dbh = $dbh; $Sam::commands::addUser::dbh = $dbh; - $Sam::commands::edit::dbh = $dbh; $Sam::commands::getUsers::dbh = $dbh; $Sam::commands::add::log = $log;