[LON-CAPA-cvs] cvs: loncom /configuration Checksumming.pm /interface resetpw.pm
raeburn
raeburn at source.lon-capa.org
Sat Feb 2 10:20:03 EST 2013
raeburn Sat Feb 2 15:20:03 2013 EDT
Modified files:
/loncom/configuration Checksumming.pm
Log:
- Fix typos in closing table cell tags.
- Closing tags missing for html tables.
- Some minor wording changes.
-------------- next part --------------
Index: loncom/configuration/Checksumming.pm
diff -u loncom/configuration/Checksumming.pm:1.1 loncom/configuration/Checksumming.pm:1.2
--- loncom/configuration/Checksumming.pm:1.1 Sat Feb 2 00:22:43 2013
+++ loncom/configuration/Checksumming.pm Sat Feb 2 15:20:02 2013
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Checksum installed LON-CAPA modules and some configuration files
#
-# $Id: Checksumming.pm,v 1.1 2013/02/02 00:22:43 raeburn Exp $
+# $Id: Checksumming.pm,v 1.2 2013/02/02 15:20:02 raeburn Exp $
#
# The LearningOnline Network with CAPA
#
@@ -124,7 +124,12 @@
sub compare_checksums {
my ($target,$lonhost,$version,$serversums,$serverversions) = @_;
- my ($message,$numchg);
+ my ($message,$numchg,$linefeed);
+ if ($target = 'web') {
+ $linefeed = '<br />';
+ } else {
+ $linefeed = "\n";
+ }
if ((ref($serversums) eq 'HASH') && (keys(%{$serversums}))) {
my $checksums = &Apache::lonnet::fetch_dns_checksums();
my (%extra,%missing,%diffs,%stdsums,%stdversions);
@@ -155,11 +160,11 @@
}
}
if ($numchg) {
- $message =
+ $message =
&Apache::lonlocal::mt('[quant,_1,difference was,differences were] found'.
- ' between LON-CAPA modules installed on your server ([_2])'.
- ' and those expected for the LON-CAPA version ([_3])'.
- ' which you are running.',$numchg,$lonhost,$version);
+ ' between LON-CAPA modules installed on your server [_2]'.
+ ' and those expected for the LON-CAPA version you are'.
+ ' currently running.',$numchg,"($lonhost)$linefeed");
if ($target eq 'web') {
$message = '<p>'.$message.'</p>';
} else {
@@ -175,8 +180,8 @@
}
}
if (@diffversion > 0) {
- my $text =
- &Apache::lonlocal::mt('The following [quant,_1,local file is a,local files are]'.
+ my $text =
+ &Apache::lonlocal::mt('The following [quant,_1,file is a,files are]'.
' different version(s) from that expected for LON-CAPA [_2]:',
scalar(@diffversion),$version);
if ($target eq 'web') {
@@ -194,7 +199,7 @@
my $revnum = $stdversions{$file};
if ($target eq 'web') {
$message .= &Apache::loncommon::start_data_table_row().
- '<td>'.$file.'<td>'."\n".
+ '<td>'.$file.'</td>'."\n".
'<td>'.$serverversions->{$file}.'</td>'."\n".
'<td>'.$revnum.'</td>'."\n".
&Apache::loncommon::end_data_table_row()."\n";
@@ -210,9 +215,14 @@
$message .= "\n";
}
}
+ if ($target eq 'web') {
+ $message .= &Apache::loncommon::end_data_table().'<br />';
+ } else {
+ $message .= "\n";
+ }
}
if (@modified > 0) {
- my $text =
+ my $text =
&Apache::lonlocal::mt('The following [quant,_1,file appears,files appear]'.
' to have been modified locally:',scalar(@modified));
if ($target eq 'web') {
@@ -238,6 +248,11 @@
"\n";
}
}
+ if ($target eq 'web') {
+ $message .= &Apache::loncommon::end_data_table().'<br />';
+ } else {
+ $message .= "\n";
+ }
}
}
if (keys(%missing) > 0) {
@@ -257,7 +272,7 @@
foreach my $file (sort(keys(%missing))) {
my $revnum = $stdversions{$file};
if ($target eq 'web') {
- $message .= '<td>'.$file.'<td>'."\n".
+ $message .= '<td>'.$file.'</td>'."\n".
'<td>'.$revnum.'</td>'."\n".
&Apache::loncommon::end_data_table_row()."\n";
} else {
@@ -270,6 +285,11 @@
$message .= "\n";
}
}
+ if ($target eq 'web') {
+ $message .= &Apache::loncommon::end_data_table();
+ } else {
+ $message .= "\n";
+ }
}
if (keys(%extra) > 0) {
my $text =
@@ -288,7 +308,7 @@
}
foreach my $file (sort(keys(%extra))) {
if ($target eq 'web') {
- $message .= '<td>'.$file.'<td>'."\n".
+ $message .= '<td>'.$file.'</td>'."\n".
'<td>'.$serverversions->{$file}.'</td>'."\n".
&Apache::loncommon::end_data_table_row()."\n";
} else {
@@ -298,6 +318,11 @@
"\n";
}
}
+ if ($target eq 'web') {
+ $message .= &Apache::loncommon::end_data_table().'<br />';
+ } else {
+ $message .= "\n";
+ }
}
} else {
$message = &Apache::lonlocal::mt('No differences detected between installed files and files expected for LON-CAPA [_1]',$version);
More information about the LON-CAPA-cvs
mailing list