From fe3d37364bbc072aedac951d4b2acc724ba7393a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 7 Aug 2010 18:32:09 +0200 Subject: add Class TableRpmRepo and use it everywhere --- rpm.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'rpm.php') diff --git a/rpm.php b/rpm.php index 8b140a8..37c54b5 100644 --- a/rpm.php +++ b/rpm.php @@ -61,7 +61,8 @@ function report($db, $type) { global $what, $smarty; $packages = null; - $repos = listRepos($db); + $rpmrepo = new TableRpmRepo($db); + $repos = $rpmrepo->getAllRepoHash(); $smarty->assign('repos', $repos); $i=0; @@ -131,24 +132,26 @@ function report($db, $type) ' (' . $upstream->state . ')'; } - $verup = strtolower($upstream->stable ? $upstream->stable : $upstream->unstable); + $verup = strtolower( + $upstream->stable ? $upstream->stable : $upstream->unstable + ); $versions = null; foreach ( $repos as $repomain ) { $display=""; $class=""; foreach ( $repomain as $k=>$repo ) { - if ( isset($rpms[$repo->main."-".$repo->sub]) ) { - $rpm=$rpms[$repo->main."-".$repo->sub]; + if ( isset($rpms[$repo['main']."-".$repo['sub']]) ) { + $rpm=$rpms[$repo['main']."-".$repo['sub']]; $verpm=$rpm->ver; if (preg_match("/\.((beta|RC)\d*)\./i", $rpm->rel, $res)) { $verpm .= strtolower($res[1]); } - switch ($repo->sub) { + switch ($repo['sub']) { case "base": - if ( isset($rpms[$repo->main."-updates"]) ) { + if ( isset($rpms[$repo['main']."-updates"]) ) { $display .= sprintf( "%s-%s
", $rpm->ver, -- cgit