X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fpakfire.cgi;h=2d6f1c8f9698ed22cbd822d2fc1b2bb80c3e3186;hp=513730bf3d13b16577da473843c9c70ab2c55fe7;hb=c661488323a297cf001d4c63e8efd266c7a5c9ba;hpb=d40aff3516401094f0732bfbaa3549b592045ccd

diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
old mode 100644
new mode 100755
index 513730bf3d..2d6f1c8f96
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -46,6 +46,8 @@ $pakfiresettings{'AUTOUPDATE'} = 'off';
 $pakfiresettings{'AUTOUPGRADE'} = 'off';
 $pakfiresettings{'UUID'} = 'on';
 
+sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' content='1;'>" );print "<center><img src='/images/clock.gif' alt='' /><br/><font color='red'>$Lang::tr{'pagerefresh'}</font></center>";&Header::closebox();}
+
 &Header::getcgihash(\%pakfiresettings);
 
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
@@ -59,15 +61,15 @@ if ($pakfiresettings{'ACTION'} eq 'install'){
 	if ("$pakfiresettings{'FORCE'}" eq "on") {
 		my $command = "/usr/local/bin/pakfire install --non-interactive --no-colors $pakfiresettings{'INSPAKS'} &>/dev/null &";
 		system("$command");
-		sleep(2);
 	} else {
 		&Header::openbox("100%", "center", "Abfrage");
   	my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'INSPAKS'}`;
 		print <<END;
 		<table><tr><td colspan='2'>$Lang::tr{'pakfire install package'}.$pakfiresettings{'INSPAKS'}.$Lang::tr{'pakfire possible dependency'}
-		<pre>		
+		<pre>
 END
 		foreach (@output) {
+		  $_ =~ s/\\[[0-1]\;[0-9]+m//g;
 			print "$_\n";
 		}
 		print <<END;
@@ -98,15 +100,15 @@ END
 	if ("$pakfiresettings{'FORCE'}" eq "on") {
 		my $command = "/usr/local/bin/pakfire remove --non-interactive --no-colors $pakfiresettings{'DELPAKS'} &>/dev/null &";
 		system("$command");
-		sleep(2);
 	} else {
 		&Header::openbox("100%", "center", "Abfrage");
   	my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'DELPAKS'}`;
 		print <<END;
 		<table><tr><td colspan='2'>$Lang::tr{'pakfire uninstall package'}.$pakfiresettings{'DELPAKS'}.$Lang::tr{'pakfire possible dependency'}
-		<pre>		
+		<pre>
 END
 		foreach (@output) {
+		  $_ =~ s/\\[[0-1]\;[0-9]+m//g;
 			print "$_\n";
 		}
 		print <<END;
@@ -133,25 +135,24 @@ END
 	}
 
 } elsif ($pakfiresettings{'ACTION'} eq 'update') {
-	
-	system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null");
+
+	system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null &");
 
 } elsif ($pakfiresettings{'ACTION'} eq 'upgrade') {
-	
-	system("/usr/local/bin/pakfire upgrade -y --no-colors &>/dev/null");
-	
+	my $command = "/usr/local/bin/pakfire upgrade -y --no-colors &>/dev/null &";
+	system("$command");
 } elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") {
 
-	if ($pakfiresettings{'AUTOUPDATE'} == "on") {
-		system("/usr/local/bin/pakfire enable updates");
+	if ($pakfiresettings{'AUTOUPDATE'} eq 'on') {
+		system("/usr/local/bin/pakfire enable updates >/dev/null 2>&1");
 	} else {
-		system("/usr/local/bin/pakfire disable updates");
+		system("/usr/local/bin/pakfire disable updates  >/dev/null 2>&1");
 	}
-	
-	if ($pakfiresettings{'AUTOUPGRADE'} == "on") {
-		system("/usr/local/bin/pakfire enable upgrades");
+
+	if ($pakfiresettings{'AUTOUPGRADE'} eq 'on') {
+		system("/usr/local/bin/pakfire enable upgrades >/dev/null 2>&1");
 	} else {
-		system("/usr/local/bin/pakfire disable upgrades");
+		system("/usr/local/bin/pakfire disable upgrades >/dev/null 2>&1");
 	}
 
 	&General::writehash("${General::swroot}/pakfire/settings", \%pakfiresettings);
@@ -195,7 +196,7 @@ if ($return) {
 			</form>
 		<tr><td colspan='2' align='left'><pre>
 END
-	my @output = `tail -20 /var/log/pakfire.log`;
+	my @output = `grep pakfire /var/log/messages | tail -20`;
 	foreach (@output) {
 		print "$_";
 	}
@@ -207,9 +208,10 @@ END
 	&Header::closebigbox();
 	&Header::closepage();
 	exit;
+	refreshpage();
 }
 
-my $core_release = `cat /opt/pakfire/db/core/mine`;
+my $core_release = `cat /opt/pakfire/db/core/mine 2>/dev/null`;
 chomp($core_release);
 my $core_update_age = &General::age("/opt/pakfire/db/core/mine");
 my $corelist_update_age = &General::age("/opt/pakfire/db/lists/core-list.db");
@@ -229,7 +231,7 @@ print <<END;
 					$Lang::tr{'pakfire last package update'} $packages_update_age ago
 					<form method='post' action='$ENV{'SCRIPT_NAME'}'>
 						<input type='hidden' name='ACTION' value='update' />
-						<input type='submit' value='Liste aktualisieren' /><br />
+						<input type='submit' value='$Lang::tr{'calamaris refresh list'}' /><br />
 					</form>
 				<td align="center">
 				 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
@@ -242,17 +244,17 @@ END
 					<input type='hidden' name='ACTION' value='upgrade' />
 					<input type='image' alt='$Lang::tr{'upgrade'}' src='/images/document-save.png' />
 				 </form>
-		
+
 		<tr><td colspan="2"><!-- Just an empty line -->&nbsp;
 		<tr><td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire available addons'}</b>
 				<td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire installed addons'}</b>
 		<tr><td align="center">
 			<p>$Lang::tr{'pakfire install description'}</p>
-			<form method='post' action='$ENV{'SCRIPT_NAME'}'>	
+			<form method='post' action='$ENV{'SCRIPT_NAME'}'>
 				<select name="INSPAKS" size="10" multiple>
 END
 			&Pakfire::dblist("notinstalled", "forweb");
-		
+
 print <<END;
 				</select>
 				<br />
@@ -284,16 +286,16 @@ print <<END;
 	<form method='post' action='$ENV{'SCRIPT_NAME'}'>
 		<table width='95%'>
 			<tr><td colspan='2' bgcolor='$color{'color20'}'><b>$Lang::tr{'basic options'}</b></td></tr>
-			<tr><td align='left' width='40%'>$Lang::tr{'pakfire update daily'}</td><td align="left">
-          on <input type='radio' name='AUTOUPDATE' value='on' $checked{'AUTOUPDATE'}{'on'} />/
+			<tr><td align='left' width='45%'>$Lang::tr{'pakfire update daily'}</td><td width="55%" align="left">
+          on <input type='radio' name='AUTOUPDATE' value='on' $checked{'AUTOUPDATE'}{'on'} /> |
           <input type='radio' name='AUTOUPDATE' value='off' $checked{'AUTOUPDATE'}{'off'} /> off </td></tr>
-			<tr><td align='left' width='40%'>$Lang::tr{'pakfire core update auto'}</td><td align="left">
-          on <input type='radio' name='AUTOUPGRADE' value='on' $checked{'AUTOUPGRADE'}{'on'} />/
+			<tr><td align='left' width='45%'>$Lang::tr{'pakfire core update auto'}</td><td align="left">
+          on <input type='radio' name='AUTOUPGRADE' value='on' $checked{'AUTOUPGRADE'}{'on'} /> |
           <input type='radio' name='AUTOUPGRADE' value='off' $checked{'AUTOUPGRADE'}{'off'} /> off </td></tr>
-			<tr><td align='left' width='40%'>$Lang::tr{'pakfire register'}</td><td align="left">
-          on <input type='radio' name='UUID' value='on' $checked{'UUID'}{'on'} />/
+			<tr><td align='left' width='45%'>$Lang::tr{'pakfire register'}</td><td align="left">
+          on <input type='radio' name='UUID' value='on' $checked{'UUID'}{'on'} /> |
           <input type='radio' name='UUID' value='off' $checked{'UUID'}{'off'} /> off </td></tr>
-			<tr><td width='100%' colspan="2" align="center"><input type="submit" name="ACTION" value="$Lang::tr{'save'}" /></td></tr>
+			<tr><td colspan="2" align="center"><input type="submit" name="ACTION" value="$Lang::tr{'save'}" /></td></tr>
 		</table>
 	</form>
 END