X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=about.pl;h=3c641b38088de7afed964969b8e371ee5d4f9080;hb=bc11d66aa8feec8f566530875506667c22b5fe88;hp=f00129b3631cec7c9ed878681e06a8a50e6506d4;hpb=c9cb55ef4710bfee111e6e2721f3ca2bf58d98f7;p=koha_fer diff --git a/about.pl b/about.pl index f00129b363..3c641b3808 100755 --- a/about.pl +++ b/about.pl @@ -32,7 +32,6 @@ use C4::Output; use C4::Auth; use C4::Context; use C4::Installer; -use C4::Update::Database; #use Smart::Comments '####'; @@ -48,45 +47,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); -my $kohaVersion = C4::Context->preference("Version"); -# restore ., for display consistency -$kohaVersion =~ /(.)\.(..)(..)(...)/; -# transform digits to Perl number, to display 3.6.1.2 instead of 3.06.01.002 -$kohaVersion = ($1+0).".".($2+0).".".($3+0).".".($4+0); - -my $dbrev_applied=""; # the list of database revisions - -# the $kohaVersion is duplicated since 3.7: the 3.6 (that uses the old mechanism) and the 3.7 (new mechanism). -# Both versions reflects how the database has been upgraded -my $already_applied = C4::Update::Database::list_versions_already_applied(); -# $last_known contains the previous DBrev applied number (all . removed). It's used to have a . instead of a number in case of continuous updates -my $last_known=0; -# $last_known_sep contains the previous DBrev applied with the separator (used for display) -my $last_known_sep=""; -for my $v ( @$already_applied ) { - my $current = $v->{version}; - $current =~s/\.//g; - # if the current number is the previous one +1, then just add a ., for a better display N.........N+10, for example - # (instead of N / N+1 / N+2 / ...) - if ($current==$last_known+1) { - $dbrev_applied.="."; - } else { # we're not N+1, start a new range - # if version don't end by a ., no need to add the current loop number - # this avoid having N...N (in case of an isolated BDrev number) - if ($last_known & $dbrev_applied =~ /\.$/) { - $dbrev_applied .= "...".$last_known_sep; - } - # start a new range - $dbrev_applied .= " ".$v->{version}; - } - $last_known= $current; - $last_known_sep=$v->{version}; -} -# add the last DB rev number, we don't want to end with "..." -if ($dbrev_applied =~ /\.$/) { - $dbrev_applied .= "...".$last_known_sep; -} - +my $kohaVersion = C4::Context::KOHAVERSION; my $osVersion = `uname -a`; my $perl_path = $^X; if ($^O ne 'VMS') { @@ -115,7 +76,6 @@ my $warnIsRootUser = (! $loggedinuser); $template->param( kohaVersion => $kohaVersion, - dbrev_applied => $dbrev_applied, osVersion => $osVersion, perlPath => $perl_path, perlVersion => $perlVersion,