diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index 67b2d07d9..c874a33fc 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -67,7 +67,6 @@ usr/local/bin/setddns.pl usr/local/bin/setreservedports usr/local/bin/settime usr/local/bin/timecheck -usr/local/bin/tunerrd.pl usr/local/bin/vpn-watch #usr/local/include #usr/local/lib diff --git a/doc/language_issues.de b/doc/language_issues.de index e69de29bb..7b19734f8 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -0,0 +1 @@ +WARNING: translation string unused: psk diff --git a/doc/language_issues.en b/doc/language_issues.en index e69de29bb..7b19734f8 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -0,0 +1 @@ +WARNING: translation string unused: psk diff --git a/html/cgi-bin/mpfire.cgi b/html/cgi-bin/mpfire.cgi index c2dd67ae9..0a17a04f6 100644 --- a/html/cgi-bin/mpfire.cgi +++ b/html/cgi-bin/mpfire.cgi @@ -231,9 +231,13 @@ foreach (@songdb){ @year = sort keys %hash; my %hash = map{ $_, 1 }@genre; @genre = sort keys %hash; + my $artistcount = $#artist+1; + my $albumcount = $#album+1; + my $yearcount = $#year+1; + my $genrecount = $#genre+1; print ""; if ( $#songdb eq '-1' ) {print "";} -else {print "";} +else {print "";} print <";} -else {print "";} +else {print "";} print <
$Lang::tr{'artist'}$Lang::tr{'album'}
$Lang::tr{'artist'} - $#artist$Lang::tr{'album'} - $#album
$Lang::tr{'artist'} - ".$artistcount."$Lang::tr{'album'} - ".$albumcount."
@@ -261,7 +265,7 @@ print <
$Lang::tr{'year'}$Lang::tr{'genre'}
$Lang::tr{'year'} - $#year$Lang::tr{'genre'} - $#genre
$Lang::tr{'year'} - ".$yearcount."$Lang::tr{'genre'} - ".$genrecount."
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 014520b38..97987fd2c 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -998,6 +998,7 @@ 'proxy access graphs' => 'Diagramme zur Proxyauslastung', 'proxy log viewer' => 'Ansicht Proxy-Log', 'proxy logs' => 'Proxy-Logdateien', +'psk' => 'PSK', 'pulse' => 'Puls', 'pulse dial' => 'Pulswahl:', 'qos graphs' => 'Qos Diagramme', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 25117564a..d6334422c 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -998,6 +998,7 @@ 'proxy access graphs' => 'Proxy access graphs', 'proxy log viewer' => 'Proxy log viewer', 'proxy logs' => 'Proxy Logs', +'psk' => 'PSK', 'pulse' => 'Pulse', 'pulse dial' => 'Pulse dial:', 'qos graphs' => 'Qos Graphs', diff --git a/src/misc-progs/syslogdctrl.c b/src/misc-progs/syslogdctrl.c index 25222c854..4e21d7a3c 100644 --- a/src/misc-progs/syslogdctrl.c +++ b/src/misc-progs/syslogdctrl.c @@ -24,7 +24,7 @@ #define ERR_ANY 1 #define ERR_SETTINGS 2 /* error in settings file */ -#define ERR_ETC 3 /* error with CONFIG_ROOT/etc permissions */ +#define ERR_ETC 3 /* error with /etc permissions */ #define ERR_CONFIG 4 /* error updated sshd_config */ #define ERR_SYSLOG 5 /* error restarting syslogd */ @@ -45,7 +45,7 @@ int main(void) /* Read in and verify config */ kv=initkeyvalues(); - if (!readkeyvalues(kv, CONFIG_ROOT "/logging/settings")) + if (!readkeyvalues(kv, "/logging/settings")) { fprintf(stderr, "Cannot read syslog settings\n"); exit(ERR_SETTINGS); @@ -78,55 +78,55 @@ int main(void) freekeyvalues(kv); - /* If anyone other than root can write to CONFIG_ROOT/etc this would be totally - * insecure - same if anyone other than root owns CONFIG_ROOT/etc, as they could + /* If anyone other than root can write to /etc this would be totally + * insecure - same if anyone other than root owns /etc, as they could * change the file mode to give themselves or anyone else write access. */ - if(lstat(CONFIG_ROOT "/etc",&st)) + if(lstat("/etc",&st)) { - perror("Unable to stat" CONFIG_ROOT "/etc"); + perror("Unable to stat /etc"); exit(ERR_ETC); } if(!S_ISDIR(st.st_mode)) { - fprintf(stderr,CONFIG_ROOT "/etc is not a directory?!\n"); + fprintf(stderr, "/etc is not a directory?!\n"); exit(ERR_ETC); } if ( st.st_uid != 0 || st.st_mode & S_IWOTH || ((st.st_gid != 0) && (st.st_mode & S_IWGRP)) ) { - fprintf(stderr,CONFIG_ROOT "/etc is owned/writable by non-root users\n"); + fprintf(stderr, "/etc is owned/writable by non-root users\n"); exit(ERR_ETC); } /* O_CREAT with O_EXCL will make open() fail if the file already exists - * mostly to prevent 2 copies running at once */ - if ((config_fd = open( CONFIG_ROOT "/etc/syslog.conf.new", O_WRONLY|O_CREAT|O_EXCL, 0644 )) == -1 ) + if ((config_fd = open( "/etc/syslog.conf.new", O_WRONLY|O_CREAT|O_EXCL, 0644 )) == -1 ) { perror("Unable to open new config file"); exit(ERR_CONFIG); } if (!strcmp(buffer,"on")) - snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+@\\).\\+$/\\1%s/' " CONFIG_ROOT "/etc/syslog.conf >&%d", hostname, config_fd ); + snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+@\\).\\+$/\\1%s/' /etc/syslog.conf >&%d", hostname, config_fd ); else - snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+@.\\+\\)$/#\\1/' " CONFIG_ROOT "/etc/syslog.conf >&%d", config_fd ); + snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+@.\\+\\)$/#\\1/' /etc/syslog.conf >&%d", config_fd ); - snprintf(buffer, STRING_SIZE - 1, "&& /bin/sed -e 's/*.\/var\/log\/messages/%s \/var\/log\/messages/' " CONFIG_ROOT "/etc/syslog.conf >&%d", varmessages, config_fd ); + snprintf(buffer, STRING_SIZE - 1, "&& /bin/sed -e 's/*.\/var\/log\/messages/%s \/var\/log\/messages/' /etc/syslog.conf >&%d", varmessages, config_fd ); /* if the return code isn't 0 failsafe */ if ((rc = unpriv_system(buffer,99,99)) != 0) { fprintf(stderr, "sed returned bad exit code: %d\n", rc); close(config_fd); - unlink(CONFIG_ROOT "/etc/syslog.conf.new"); + unlink("/etc/syslog.conf.new"); exit(ERR_CONFIG); } close(config_fd); - if (rename(CONFIG_ROOT "/etc/syslog.conf.new", CONFIG_ROOT "/etc/syslog.conf") == -1) + if (rename("/etc/syslog.conf.new /etc/syslog.conf") == -1) { perror("Unable to replace old config file"); - unlink(CONFIG_ROOT "/etc/syslog.conf.new"); + unlink("/etc/syslog.conf.new"); exit(ERR_CONFIG); } diff --git a/src/scripts/tunerrd.pl b/src/scripts/tunerrd.pl deleted file mode 100644 index 758f71741..000000000 --- a/src/scripts/tunerrd.pl +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/perl - -use RRDs; - -# Settings -my $rrdlog = "/var/log/rrd"; -$ENV{PATH}="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"; - -RRDs::tune ("$rrdlog/cpu.rrd", -"-h", "user:600", -"-h", "system:600", -"-h", "idle:600"); - -RRDs::tune ("$rrdlog/mem.rrd", -"-h", "memused:600", -"-h", "memfree:600", -"-h", "memshared:600", -"-h", "membuffers:600", -"-h", "memcache:600", -"-h", "swapused:600", -"-h", "swapfree:600"); - -RRDs::tune ("$rrdlog/disk.rrd", -"-h", "readsect:600", -"-h", "writesect:600"); - -RRDs::tune ("$rrdlog/RED.rrd", -"-h", "incoming:600", -"-h", "outgoing:600"); - -RRDs::tune ("$rrdlog/GREEN.rrd", -"-h", "incoming:600", -"-h", "outgoing:600"); -# end of script