}
opendir TEMPLATEDIR, "$templates/." or $form->error("$templates : $!");
- @all = grep !/^\.\.?$/, readdir TEMPLATEDIR;
+ my @all = readdir(TEMPLATEDIR);
+ my @alldir = sort(grep({ -d "$templates/$_" && !/^\.\.?$/ } @all));
+ my @allhtml = sort(grep({ -f "$templates/$_" && /\.html$/ } @all));
closedir TEMPLATEDIR;
- @allhtml = sort grep /\.html/, @all;
- @alldir = grep !/\.(html|tex|sty|odt)$/, @all;
+ @alldir = grep !/\.(html|tex|sty|odt|xml|txb)$/, @alldir;
@alldir = grep !/^(webpages|\.svn)$/, @alldir;
@allhtml = reverse grep !/Default/, @allhtml;
}
opendir CSS, "css/.";
- @all = grep /.*\.css$/, readdir CSS;
+ @all = sort(grep({ /\.css$/ && ($_ ne "tabcontent.css") } readdir(CSS)));
closedir CSS;
foreach $item (@all) {
$selectstylesheet .= qq|<option>$item\n|;
}
}
- $selectstylesheet .= "<option>\n";
$form->header;
- if ($myconfig->{menustyle} eq "neu") { $neu = "checked"; }
- else { $old = "checked"; }
+ if ($myconfig->{menustyle} eq "v3") {
+ $menustyle_v3 = "checked";
+ } elsif ($myconfig->{menustyle} eq "neu") {
+ $menustyle_neu = "checked";
+ } else {
+ $menustyle_old = "checked";
+ }
print qq|
<body class=admin>
<table>
<tr>
<th align=right>| . $locale->text('Login') . qq|</th>
- <td><input name=login value="$myconfig->{login}"></td>
+ <td><input name="login" value="$myconfig->{login}"></td>
</tr>
<tr>
<th align=right>| . $locale->text('Password') . qq|</th>
- <td><input type=password name=password size=8 value=$myconfig->{password}></td>
- <input type=hidden name=old_password value=$myconfig->{password}>
+ <td><input type="password" name="password" size="8" value="$myconfig->{password}"></td>
+ <input type="hidden" name="old_password" value="$myconfig->{password}">
</tr>
<tr>
<th align=right>| . $locale->text('Name') . qq|</th>
- <td><input name=name size=15 value="$myconfig->{name}"></td>
+ <td><input name="name" size="15" value="$myconfig->{name}"></td>
</tr>
<tr>
<th align=right>| . $locale->text('E-mail') . qq|</th>
<td><textarea name=address rows=4 cols=35>$myconfig->{address}</textarea></td>
</tr>
<tr valign=top>
- <th align=right>| . $locale->text('Steuernummer') . qq|</th>
- <td><input name=steuernummer size=14 value="$myconfig->{steuernummer}"></td>
+ <th align=right>| . $locale->text('Tax number') . qq|</th>
+ <td><input name=taxnumber size=14 value="$myconfig->{taxnumber}"></td>
</tr>
<tr valign=top>
<th align=right>| . $locale->text('Ust-IDNr') . qq|</th>
</tr>
<tr>
<th align=right>| . $locale->text('Setup Menu') . qq|</th>
- <td><input name=menustyle type=radio class=radio value=neu $neu> New
- <input name=menustyle type=radio class=radio value=old $old> Old</td>
+ <td><input name=menustyle type=radio class=radio value=v3 $menustyle_v3> | .
+ $locale->text("Top (CSS)") . qq|
+ <input name=menustyle type=radio class=radio value=neu $menustyle_neu> | .
+ $locale->text("Top (Javascript)") . qq|
+ <input name=menustyle type=radio class=radio value=old $menustyle_old> | .
+ $locale->text("Old (on the side)") . qq|
+ </td>
</tr>
<input type=hidden name=templates value=$myconfig->{templates}>
</table>
print qq|
<th align=right>| . $locale->text('Driver') . qq|</th>
- <td><input name=dbdriver type=radio class=radio value=$item $checked> $item</td>
+ <td><input name="dbdriver" type="radio" class="radio" value="$item" $checked> $item</td>
<th align=right>| . $locale->text('Host') . qq|</th>
- <td><input name="${item}_dbhost" size=30 value=$form->{"${item}_dbhost"}></td>
+ <td><input name="${item}_dbhost" size=30 value="$form->{"${item}_dbhost"}"></td>
</tr>
<tr>|;
if ($item eq 'Pg') {
+
print qq|
<th align=right>| . $locale->text('Dataset') . qq|</th>
- <td><input name=Pg_dbname size=15 value=$form->{Pg_dbname}></td>
+ <td><input name="Pg_dbname" size="15" value="$form->{Pg_dbname}"></td>
<th align=right>| . $locale->text('Port') . qq|</th>
- <td><input name=Pg_dbport size=4 value=$form->{Pg_dbport}></td>
+ <td><input name="Pg_dbport" size="4" value="$form->{Pg_dbport}"></td>
</tr>
<tr>
<th align=right>| . $locale->text('User') . qq|</th>
- <td><input name="${item}_dbuser" size=15 value=$form->{"${item}_dbuser"}></td>
+ <td><input name="${item}_dbuser" size=15 value="$form->{"${item}_dbuser"}"></td>
<th align=right>| . $locale->text('Password') . qq|</th>
- <td><input name="${item}_dbpasswd" type=password size=10 value=$form->{"${item}_dbpasswd"}></td>
+ <td><input name="${item}_dbpasswd" type=password size=10 value="$form->{"${item}_dbpasswd"}"></td>
</tr>|;
}
<th align=right>| . $locale->text('Dataset') . qq|</th>
<td><input name="${item}_dbuser" size=15 value=$form->{"${item}_dbuser"}></td>
<th align=right>| . $locale->text('Password') . qq|</th>
- <td><input name="${item}_dbpasswd" type=password size=10 value=$form->{"${item}_dbpasswd"}></td>
+ <td><input name="${item}_dbpasswd" type=password size=10 value="$form->{"${item}_dbpasswd"}"></td>
</tr>|;
}
print qq|
- <input type=hidden name=old_dbpasswd value=$myconfig->{dbpasswd}>
+ <input type="hidden" name="old_dbpasswd" value="$myconfig->{dbpasswd}">
</table>
</td>
</tr>
<tr>
<th align=right>| . $locale->text('User') . qq|</th>
- <td><input name=dbuser size=10 value=$form->{dbuser}></td>
+ <td><input name="dbuser" size="10" value="$form->{dbuser}"></td>
<th align=right>| . $locale->text('Password') . qq|</th>
- <td><input type=password name=dbpasswd size=10></td>
+ <td><input type="password" name="dbpasswd" size="10"></td>
</tr>
<table width=100%>
<form method=post action=$form->{script}>
-<input type=hidden name=dbdriver value=$form->{dbdriver}>
-<input type=hidden name=dbhost value=$form->{dbhost}>
-<input type=hidden name=dbport value=$form->{dbport}>
-<input type=hidden name=dbuser value=$form->{dbuser}>
-<input type=hidden name=dbpasswd value=$form->{dbpasswd}>
-<input type=hidden name=dbdefault value=$form->{dbdefault}>
+<input type=hidden name="dbdriver" value="$form->{dbdriver}">
+<input type=hidden name="dbhost" value="$form->{dbhost}">
+<input type=hidden name="dbport" value="$form->{dbport}">
+<input type=hidden name="dbuser" value="$form->{dbuser}">
+<input type=hidden name="dbpasswd" value="$form->{dbpasswd}">
+<input type=hidden name="dbdefault" value="$form->{dbdefault}">
<tr class=listheading>
<th>| . $locale->text('The following Datasets need to be updated') . qq|</th>
}
opendir SQLDIR, "sql/." or $form - error($!);
- foreach $item (sort grep /-chart\.sql/, readdir SQLDIR) {
+ foreach $item (sort grep /-chart\.sql\z/, readdir SQLDIR) {
next if ($item eq 'Default-chart.sql');
$item =~ s/-chart\.sql//;
push @charts,
closedir SQLDIR;
$selectencoding = qq|<option>
- <option value=SQL_ASCII>ASCII
- <option value=EUC_JP>Japanese Extended UNIX Code
- <option value=EUC_CN>Chinese Extended UNIX Code
- <option value=EUC_KR>Korean Extended UNIX Code
- <option value=EUC_TW>Taiwan Extended UNIX Code
- <option value=UNICODE>UTF-8 Unicode
- <option value=MULE_INTERNAL>Mule internal type
- <option value=LATIN1>ISO 8859-1
- <option value=LATIN2>ISO 8859-2
- <option value=LATIN3>ISO 8859-3
- <option value=LATIN4>ISO 8859-4
- <option value=LATIN5>ISO 8859-5
- <option value=KOI8>KOI8-R
- <option value=WIN>Windows CP1251
- <option value=ALT>Windows CP866
+ <option value="SQL_ASCII">ASCII
+ <option value="EUC_JP">Japanese Extended UNIX Code
+ <option value="EUC_CN">Chinese Extended UNIX Code
+ <option value="EUC_KR">Korean Extended UNIX Code
+ <option value="EUC_TW">Taiwan Extended UNIX Code
+ <option value="UNICODE">UTF-8 Unicode
+ <option value="MULE_INTERNAL">Mule internal type
+ <option selected="selected" value="LATIN1">ISO 8859-1
+ <option value="LATIN2">ISO 8859-2
+ <option value="LATIN3">ISO 8859-3
+ <option value="LATIN4">ISO 8859-4
+ <option value="LATIN5">ISO 8859-5
+ <option value="LATIN9">ISO 8859-15
+ <option value="KOI8">KOI8-R
+ <option value="WIN">Windows CP1251
+ <option value="ALT">Windows CP866
|;
$form->{title} =
<tr><td colspan=2>
<p>
-<input type=hidden name=dbdriver value=$form->{dbdriver}>
-<input type=hidden name=dbuser value=$form->{dbuser}>
-<input type=hidden name=dbhost value=$form->{dbhost}>
-<input type=hidden name=dbport value=$form->{dbport}>
-<input type=hidden name=dbpasswd value=$form->{dbpasswd}>
-<input type=hidden name=dbdefault value=$form->{dbdefault}>
+<input type=hidden name="dbdriver" value="$form->{dbdriver}">
+<input type=hidden name="dbuser" value="$form->{dbuser}">
+<input type=hidden name="dbhost" value="$form->{dbhost}">
+<input type=hidden name="dbport" value="$form->{dbport}">
+<input type=hidden name="dbpasswd" value="$form->{dbpasswd}">
+<input type=hidden name="dbdefault" value="$form->{dbdefault}">
<input name=callback type=hidden value="$form->{script}?action=list_users&path=$form->{path}&rpw=$form->{rpw}">
<tr><td>
<p>
-<input type=hidden name=dbdriver value=$form->{dbdriver}>
-<input type=hidden name=dbuser value=$form->{dbuser}>
-<input type=hidden name=dbhost value=$form->{dbhost}>
-<input type=hidden name=dbport value=$form->{dbport}>
-<input type=hidden name=dbpasswd value=$form->{dbpasswd}>
-<input type=hidden name=dbdefault value=$form->{dbdefault}>
+<input type=hidden name="dbdriver" value="$form->{dbdriver}">
+<input type=hidden name="dbuser" value="$form->{dbuser}">
+<input type=hidden name="dbhost" value="$form->{dbhost}">
+<input type=hidden name="dbport" value="$form->{dbport}">
+<input type=hidden name="dbpasswd" value="$form->{dbpasswd}">
+<input type=hidden name="dbdefault" value="$form->{dbdefault}">
<input name=callback type=hidden value="$form->{script}?action=list_users&path=$form->{path}&rpw=$form->{rpw}">