From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Fri, 26 Jan 2007 12:46:40 +0000 (+0000)
Subject: Nettraffic aktualisiert.
X-Git-Tag: v2.3-beta1~855
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=1be597891b762829809a03eb8f2a20f2693ac43f

Nettraffic aktualisiert.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@399 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 6e8e02dc4f..ebd20f1af1 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -150,7 +150,6 @@
 * man-pages-2.34
 * mc-4.6.1
 * memtest86+-1.65
-* mingetty_1.07
 * misc-progs
 * mktemp-1.5
 * mldonkey-2.7.7
diff --git a/html/cgi-bin/traffic.cgi b/html/cgi-bin/traffic.cgi
index 78640e4f55..e8337ec222 100644
--- a/html/cgi-bin/traffic.cgi
+++ b/html/cgi-bin/traffic.cgi
@@ -40,15 +40,12 @@ $cgiparams{'YEAR'} = $y;
 &Header::showhttpheaders();
 
 my %selectYear;
-$selectYear{'YEAR'}{'2001'} = '';
-$selectYear{'YEAR'}{'2002'} = '';
-$selectYear{'YEAR'}{'2003'} = '';
-$selectYear{'YEAR'}{'2004'} = '';
-$selectYear{'YEAR'}{'2005'} = '';
-$selectYear{'YEAR'}{'2006'} = '';
 $selectYear{'YEAR'}{'2007'} = '';
 $selectYear{'YEAR'}{'2008'} = '';
 $selectYear{'YEAR'}{'2009'} = '';
+$selectYear{'YEAR'}{'2010'} = '';
+$selectYear{'YEAR'}{'2011'} = '';
+$selectYear{'YEAR'}{'2012'} = '';
 $selectYear{'YEAR'}{'????'} = '';
 $selectYear{'YEAR'}{$cgiparams{'YEAR'}} = 'selected=\'selected\'';
 
@@ -98,12 +95,12 @@ print <<END;
 					<option $selected{'MONTH'}{'??'} value='??'>$Lang::tr{'allmsg'}</option>
 				</select>
 				<select name='YEAR'>		
-					<option $selectYear{'YEAR'}{'2001'} value='2001'>2001</option>
-					<option $selectYear{'YEAR'}{'2002'} value='2002'>2002</option>
-					<option $selectYear{'YEAR'}{'2003'} value='2003'>2003</option>
-					<option $selectYear{'YEAR'}{'2004'} value='2004'>2004</option>
-					<option $selectYear{'YEAR'}{'2005'} value='2005'>2005</option>
-					<option $selectYear{'YEAR'}{'2006'} value='2006'>2006</option>
+					<option $selectYear{'YEAR'}{'2007'} value='2007'>2007</option>
+					<option $selectYear{'YEAR'}{'2008'} value='2008'>2008</option>
+					<option $selectYear{'YEAR'}{'2009'} value='2009'>2009</option>
+					<option $selectYear{'YEAR'}{'2010'} value='2010'>2010</option>
+					<option $selectYear{'YEAR'}{'2011'} value='2011'>2011</option>
+					<option $selectYear{'YEAR'}{'2012'} value='2012'>2012</option>
 					<option $selectYear{'YEAR'}{'????'} value='????'>$Lang::tr{'allmsg'}</option>
 				</select>
 				<input type='submit' name='ACTION' value='$Lang::tr{'update'}' />
diff --git a/html/cgi-bin/traffics.cgi b/html/cgi-bin/traffics.cgi
index fe620f4e1b..92a55b7236 100644
--- a/html/cgi-bin/traffics.cgi
+++ b/html/cgi-bin/traffics.cgi
@@ -23,7 +23,7 @@ my %netsettings;
 
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
 
-my @years=("2001","2002","2003","2004","2005","2006","2007","2008","2009");
+my @years=("2007","2008","2009","2010","2011","2012","2013","2014","2015");
 
 my @longmonths = ( $Lang::tr{'january'}, $Lang::tr{'february'}, $Lang::tr{'march'},
 	$Lang::tr{'april'}, $Lang::tr{'may'}, $Lang::tr{'june'}, $Lang::tr{'july'}, $Lang::tr{'august'},
diff --git a/tools/make-functions b/tools/make-functions
index f3ce22007b..a3b7d1bf4d 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -630,7 +630,7 @@ make_config() {
 		read -s MAIL_PASS
 		
 	fi
-	echo -ne "${BOLD}***Saving...${NORMAL}"
+	echo -ne "\n${BOLD}***Saving...${NORMAL}"
 	cat <<END > $BASEDIR/.config
 ### iso server
 FTP_ISO_URL=$FTP_ISO_URL