3 files changed, 39 insertions, 26 deletions

diff --git a/lib/AdminPanel/Rpmdragora/init.pm b/lib/AdminPanel/Rpmdragora/init.pm
index 34581bf2..9349894b 100644
--- a/lib/AdminPanel/Rpmdragora/init.pm
+++ b/lib/AdminPanel/Rpmdragora/init.pm
@@ -33,6 +33,8 @@ use English;
 BEGIN { $::no_global_argv_parsing = 1 }
 require urpm::args;
 
+use AdminPanel::Privileges;
+
 use Exporter;
 our @ISA = qw(Exporter);
 our @EXPORT = qw(init
@@ -147,7 +149,7 @@ if ($MODE eq 'remove') {
     $default_list_mode = 'all_updates';
 }
 
-$MODE eq 'update' || $rpmdragora_options{'run-as-root'} and require_root_capability();
+$MODE eq 'update' || $rpmdragora_options{'run-as-root'} and AdminPanel::Privileges::require_root_capability();
 $::noborderWhenEmbedded = 1;
 
 require AdminPanel::rpmdragora;
diff --git a/lib/AdminPanel/rpmdragora.pm b/lib/AdminPanel/rpmdragora.pm
index cae9879e..86b5e98f 100644
--- a/lib/AdminPanel/rpmdragora.pm
+++ b/lib/AdminPanel/rpmdragora.pm
@@ -775,7 +775,7 @@ sub update_sources {
 	callback => sub {
 	    $cancel and goto cancel_update;
 	    my ($type, $media) = @_;
-	    return if $type !~ /^(?:start|progress|end)$/ && @media && !member($media, @media);
+	    return if $type !~ /^(?:start|progress|end)$/ && @media && !AdminPanel::Shared::member($media, @media);
 	    if ($type eq 'failed') {
 		$urpm->{fatal}->(N("Error retrieving packages"),
 N("It's impossible to retrieve the list of new packages from the media
diff --git a/modules/rpmdragora/gurpmi.addmedia b/modules/rpmdragora/gurpmi.addmedia
index 65782188..fd5c8884 100755
--- a/modules/rpmdragora/gurpmi.addmedia
+++ b/modules/rpmdragora/gurpmi.addmedia
@@ -44,25 +44,35 @@ and [options] are from
         exit(0);
     };
 }
-use Rpmdrake::init;
-use Rpmdrake::open_db;
+use AdminPanel::Rpmdragora::init;
+use AdminPanel::Rpmdragora::open_db;
+use AdminPanel::Rpmdragora::formatting;
+
+use AdminPanel::Privileges;
 
 use lib qw(/usr/lib/libDrakX);
 use urpm::media;
-use common;
-use any;
-
-any::set_wm_hints_if_needed();
+use MDK::Common::Func;
+use common qw(N);
 
-require_root_capability();
+#
+if (AdminPanel::Privileges::require_root_capability()) {
+    require AdminPanel::Shared::GUI;
+    my $sh_gui = AdminPanel::Shared::GUI->new();
+    $sh_gui->warningMsgBox({
+        title => "gurpmi.addmedia",
+        text  => N("root privileges required"),
+    });
+    exit (-1);
+}
 
-use rpmdrake;
+use AdminPanel::rpmdragora;
 use Getopt::Long;
 
-#use ugtk2 qw(:all);
+## TODO remove as soon as possible
 $::isStandalone = 1;
 
-readconf();
+AdminPanel::rpmdragora::readconf();
 
 my $fromfile;
 if (@ARGV == 1 && $ARGV[0] =~ /\.urpmi-media$/) {
@@ -78,7 +88,8 @@ GetOptions(
     'distrib'       => \$distrib,
     'silent-success' => \$silent_success,
     'mirrorlist=s'     => \$mirrorlist,
-    'urpmi-root=s'      => \$::rpmdrake_options{'urpmi-root'}[0],
+    ## TODO urpmi-root needed???
+#     'urpmi-root=s'      => \$::rpmdrake_options{'urpmi-root'}[0],
 );
 
 # compatibility with -update:
@@ -98,10 +109,10 @@ while (@ARGV) {
     } elsif ($distrib) {
 	($name, $url) = ('', $name);
     } elsif ($url !~ m,^(([^:]*):/)?/,) {
-	interactive_msg('gurpmi.addmedia',
-			escape_text_for_TextView_markup_format(
+	AdminPanel::rpmdragora::interactive_msg('gurpmi.addmedia',
+			AdminPanel::Rpmdragora::formatting::escape_text_for_TextView_markup_format(
                             N("bad <url> (for local directory, the path must be absolute)") . "\n\n$url"));
-	myexit(-1);
+	AdminPanel::rpmdragora::myexit(-1);
     }
     push @addmedia_args, [ $name, $url ];
     push @names, $name;
@@ -113,7 +124,7 @@ if ($mirrorlist && $distrib && !@addmedia_args) {
 }
 
 $fromfile and do {
-    interactive_msg('gurpmi.addmedia',
+    AdminPanel::rpmdragora::interactive_msg('gurpmi.addmedia',
 N("%s
 
 Is it ok to continue?",
@@ -129,22 +140,22 @@ to your system from these new media.", join ", ", @names)
 That means you will be able to add new software packages
 to your system from that new medium.", $names[0])
 ),
-    yesno => 1) or myexit(-1);
+    yesno => 1) or AdminPanel::rpmdragora::myexit(-1);
 };
 
-my $urpm = fast_open_urpmi_db();
+my $urpm = AdminPanel::Rpmdragora::open_db::fast_open_urpmi_db();
 my $success = 1;
 foreach (@addmedia_args) {
     #- NB: that short circuits
-    $success = $success && add_medium_and_check(
+    $success = $success && AdminPanel::rpmdragora::add_medium_and_check(
 	$urpm,
 	{ distrib => $distrib },
 	$_->[0],
 	$_->[1],
-	if_(!$distrib, undef),
-	if_($update, update => $update, only_updates => $update),
+	MDK::Common::Func::if_(!$distrib, undef),
+	MDK::Common::Func::if_($update, update => $update, only_updates => $update),
 	mirrorlist => $mirrorlist,
-	if_($with_dir, 'with-dir' => $with_dir),
+	MDK::Common::Func::if_($with_dir, 'with-dir' => $with_dir),
     );
 }
 if ($success) {
@@ -153,8 +164,8 @@ if ($success) {
         : @names > 1
 	    ? N("Successfully added media %s.", join ", ", @names)
 	    : N("Successfully added medium `%s'.", $names[0]);
-    interactive_msg('gurpmi.addmedia', $message) if !$silent_success;
-    myexit(0);
+    AdminPanel::rpmdragora::interactive_msg('gurpmi.addmedia', $message) if !$silent_success;
+    AdminPanel::rpmdragora::myexit(0);
 } else {
-    myexit(-1);
+    AdminPanel::rpmdragora::myexit(-1);
 }