Alle Vorkommen von dbdriver, sid, Oracle entfernt

[mfinanz.git] / bin / mozilla / admin.pl

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index e0694762edcc43dd34ca7ace37143bbf554f8f17..d1194ee8a7fb9f3b445f967019ec111476174ef7 100755 (executable)
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -60,7 +60,6 @@ use SL::DBUtils;
 use SL::Template;
 
 require "bin/mozilla/common.pl";
 use SL::Template;
 
 require "bin/mozilla/common.pl";

-require "bin/mozilla/admin_printer.pl";

 
 use strict;
 
 
 use strict;
 


@@ -91,7 +90,7 @@ sub run {
   if ($form->{action}) {
     if ($auth->authenticate_root($form->{'{AUTH}admin_password'}) != $auth->OK()) {
       $auth->punish_wrong_login;
   if ($form->{action}) {
     if ($auth->authenticate_root($form->{'{AUTH}admin_password'}) != $auth->OK()) {
       $auth->punish_wrong_login;

-      $form->{error} = $locale->text('Incorrect Password!');
+      $form->{error} = $locale->text('Incorrect password!');

       $auth->delete_session_value('admin_password');
       adminlogin();
     } else {
       $auth->delete_session_value('admin_password');
       adminlogin();
     } else {


@@ -102,10 +101,6 @@ sub run {
       call_sub($locale->findsub($form->{action}));
     }
   } else {
       call_sub($locale->findsub($form->{action}));
     }
   } else {

-    # if there are no drivers bail out
-    $form->error($locale->text('No Database Drivers available!'))
-      unless (User->dbdrivers);
-

     adminlogin();
   }
   $::lxdebug->leave_sub;
     adminlogin();
   }
   $::lxdebug->leave_sub;


@@ -144,10 +139,7 @@ sub get_value {
 
 sub pg_database_administration {
   my $form = $main::form;
 
 sub pg_database_administration {
   my $form = $main::form;

-
-  $form->{dbdriver} = 'Pg';

   dbselect_source();
   dbselect_source();

-

 }
 
 sub dbselect_source {
 }
 
 sub dbselect_source {


@@ -172,7 +164,6 @@ sub test_db_connection {
   my $form   = $main::form;
   my $locale = $main::locale;
 
   my $form   = $main::form;
   my $locale = $main::locale;
 

-  $form->{dbdriver} = 'Pg';

   User::dbconnect_vars($form, $form->{dbname});
 
   my $dbh = DBI->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd});
   User::dbconnect_vars($form, $form->{dbname});
 
   my $dbh = DBI->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd});


@@ -226,7 +217,7 @@ sub dbupdate {
     restore_form($saved_form);
 
     %::myconfig = ();
     restore_form($saved_form);
 
     %::myconfig = ();

-    map { $form->{$_} = $::myconfig{$_} = $form->{"${_}_${i}"} } qw(dbname dbdriver dbhost dbport dbuser dbpasswd);
+    map { $form->{$_} = $::myconfig{$_} = $form->{"${_}_${i}"} } qw(dbname dbhost dbport dbuser dbpasswd);

 
     print $form->parse_html_template("admin/dbupgrade_header");
 
 
     print $form->parse_html_template("admin/dbupgrade_header");
 


@@ -234,7 +225,7 @@ sub dbupdate {
     $form->{$form->{dbname}} = 1;
 
     User->dbupdate($form);
     $form->{$form->{dbname}} = 1;
 
     User->dbupdate($form);

-    User->dbupdate2($form, SL::DBUpgrade2->new(form => $form, dbdriver => $form->{dbdriver})->parse_dbupdate_controls);
+    User->dbupdate2($form, SL::DBUpgrade2->new(form => $form)->parse_dbupdate_controls);

 
     print $form->parse_html_template("admin/dbupgrade_footer");
   }
 
     print $form->parse_html_template("admin/dbupgrade_footer");
   }