Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 6a9ef5df

Von Moritz Bunkus vor mehr als 17 Jahren hinzugefügt

  • ID 6a9ef5df5fb7f1ce451e8d492e3b2b3291eb55a3
  • Vorgänger 05709cdc
  • Nachfolger a52a1004

Maske "Datenbankadministration" auf die Verwendung von HTML-Vorlagen umgestellt.

Unterschiede anzeigen:

bin/mozilla/admin.pl
157 157
    . $locale->text('Administration') . " / "
158 158
    . $locale->text('Add User');
159 159

  
160
  $form->{Oracle_sid}    = $sid;
161
  $form->{Oracle_dbport} = '1521';
162
  $form->{Oracle_dbhost} = `hostname`;
163

  
164 160
  my $myconfig = {
165 161
    "vclimit"      => 200,
166 162
    "countrycode"  => "de",
......
251 247

  
252 248
  map { $form->{"myc_${_}"} = $myconfig->{$_} } keys %{ $myconfig };
253 249

  
254
  map { $form->{"Pg_${_}"} = $myconfig->{$_} } qw(dbhost dbport dbname dbuser dbpasswd);
255

  
256 250
  # access control
257 251
  my @acsorder = ();
258 252
  my %acs      = ();
......
316 310

  
317 311
sub save {
318 312

  
319
  # no driver checked
320
  $form->error($locale->text('Database Driver not checked!'))
321
    unless $form->{dbdriver};
313
  $form->{dbdriver} = 'Pg';
322 314

  
323 315
  # no spaces allowed in login name
324 316
  ($form->{login}) = split / /, $form->{login};
......
365 357
  }
366 358
  $form->{acs} = join ";", @acs;
367 359

  
368
  # check which database was filled in
369
  if ($form->{dbdriver} eq 'Oracle') {
370
    $form->{sid}      = $form->{Oracle_sid},;
371
    $form->{dbhost}   = $form->{Oracle_dbhost},;
372
    $form->{dbport}   = $form->{Oracle_dbport};
373
    $form->{dbpasswd} = $form->{Oracle_dbpasswd};
374
    $form->{dbuser}   = $form->{Oracle_dbuser};
375
    $form->{dbname}   = $form->{Oracle_dbuser};
376

  
377
    $form->isblank("dbhost", $locale->text('Hostname missing!'));
378
    $form->isblank("dbport", $locale->text('Port missing!'));
379
    $form->isblank("dbuser", $locale->text('Dataset missing!'));
380
  }
381
  if ($form->{dbdriver} eq 'Pg') {
382
    $form->{dbhost}   = $form->{Pg_dbhost};
383
    $form->{dbport}   = $form->{Pg_dbport};
384
    $form->{dbpasswd} = $form->{Pg_dbpasswd};
385
    $form->{dbuser}   = $form->{Pg_dbuser};
386
    $form->{dbname}   = $form->{Pg_dbname};
387

  
388
    $form->isblank("dbname", $locale->text('Dataset missing!'));
389
    $form->isblank("dbuser", $locale->text('Database User missing!'));
390
  }
360
  $form->isblank("dbname", $locale->text('Dataset missing!'));
361
  $form->isblank("dbuser", $locale->text('Database User missing!'));
391 362

  
392 363
  foreach $item (keys %{$form}) {
393 364
    $myconfig->{$item} = $form->{$item};
......
582 553

  
583 554
}
584 555

  
585
sub oracle_database_administration {
586

  
587
  $form->{dbdriver} = 'Oracle';
588
  dbselect_source();
589

  
590
}
591

  
592
sub dbdriver_defaults {
593

  
594
  # load some defaults for the selected driver
595
  %driverdefaults = (
596
                     'Pg' => { dbport        => '5432',
597
                               dbuser        => 'postgres',
598
                               dbdefault     => 'template1',
599
                               dbhost        => 'localhost',
600
                               connectstring => $locale->text('Connect to')
601
                     },
602
                     'Oracle' => { dbport        => '1521',
603
                                   dbuser        => 'oralin',
604
                                   dbdefault     => $sid,
605
                                   dbhost        => `hostname`,
606
                                   connectstring => 'SID'
607
                     });
608

  
609
  map { $form->{$_} = $driverdefaults{ $form->{dbdriver} }{$_} }
610
    keys %{ $driverdefaults{Pg} };
611

  
612
}
613

  
614 556
sub dbselect_source {
557
  $form->{dbport}    = '5432';
558
  $form->{dbuser}    = 'postgres';
559
  $form->{dbdefault} = 'template1';
560
  $form->{dbhost}    = 'localhost';
615 561

  
616
  dbdriver_defaults();
617

  
618
  $msg{Pg} =
619
    $locale->text(
620
    'Leave host and port field empty unless you want to make a remote connection.'
621
    );
622
  $msg{Oracle} =
623
    $locale->text(
624
           'You must enter a host and port for local and remote connections!');
625

  
626
  $form->{title} =
627
    "Lx-Office ERP / " . $locale->text('Database Administration');
628

  
629
  $form->header;
630

  
631
  print qq|
632
<body class=admin>
633

  
634

  
635
<center>
636
<h2>$form->{title}</h2>
637

  
638
<form method=post action=$form->{script}>
639

  
640
<table>
641
<tr><td>
642

  
643
<table>
644

  
645
  <tr class=listheading>
646
    <th colspan=4>| . $locale->text('Database') . qq|</th>
647
  </tr>
648

  
649
<input type=hidden name=dbdriver value=$form->{dbdriver}>
650

  
651
  <tr><td>
652
   <table>
653

  
654
  <tr>
655

  
656
    <th align=right>| . $locale->text('Host') . qq|</th>
657
    <td><input name=dbhost size=25 value=$form->{dbhost}></td>
658
    <th align=right>| . $locale->text('Port') . qq|</th>
659
    <td><input name=dbport size=5 value=$form->{dbport}></td>
660

  
661
  </tr>
662

  
663
  <tr>
664

  
665
    <th align=right>| . $locale->text('User') . qq|</th>
666
    <td><input name="dbuser" size="10" value="$form->{dbuser}"></td>
667
    <th align=right>| . $locale->text('Password') . qq|</th>
668
    <td><input type="password" name="dbpasswd" size="10"></td>
669

  
670
  </tr>
671

  
672
  <tr>
673

  
674
    <th align=right>$form->{connectstring}</th>
675
    <td colspan=3><input name=dbdefault size=10 value=$form->{dbdefault}></td>
676

  
677
  </tr>
678

  
679
</table>
680

  
681
</td></tr>
682
</table>
683

  
684
<input name=callback type=hidden value="$form->{script}?action=list_users&rpw=$form->{rpw}">
685
<input type=hidden name=rpw value=$form->{rpw}>
686

  
687
<br>
688

  
689
<input type=submit class=submit name=action value="|
690
    . $locale->text('Create Dataset') . qq|">|;
691
# Vor?bergehend Deaktiviert
692
# <input type=submit class=submit name=action value="|
693
#     . $locale->text('Update Dataset') . qq|">
694
print qq| <input type=submit class=submit name=action value="|
695
    . $locale->text('Delete Dataset') . qq|">
696

  
697
</form>
698

  
699
</td></tr>
700
</table>
701

  
702
<p>|
703
    . $locale->text(
704
    'This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!'
705
    )
706

  
707
    . qq|
708
<br>$msg{$form->{dbdriver}}
709

  
710

  
711
</body>
712
</html>
713
|;
562
  $form->{title}     = "Lx-Office ERP / " . $locale->text('Database Administration');
714 563

  
564
  $form->header();
565
  print $form->parse_html_template("admin/dbadmin");
715 566
}
716 567

  
717 568
sub continue {
......
753 604
<table width=100%>
754 605
<form method=post action=$form->{script}>
755 606

  
756
<input type=hidden name="dbdriver"  value="$form->{dbdriver}">
757 607
<input type=hidden name="dbhost"    value="$form->{dbhost}">
758 608
<input type=hidden name="dbport"    value="$form->{dbport}">
759 609
<input type=hidden name="dbuser"    value="$form->{dbuser}">

Auch abrufbar als: Unified diff