diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
| commit | 1be510f9529cb082f802408b472a77d074b394c0 (patch) | |
| tree | b175f9d5fcb107576dabc768e7bd04d4a3e491a0 /zarb-ml/mageia-sysadm/attachments/20110113/6ee0e965 | |
| parent | fa5098cf210b23ab4f419913e28af7b1b07dafb2 (diff) | |
| download | archives-master.tar archives-master.tar.gz archives-master.tar.bz2 archives-master.tar.xz archives-master.zip | |
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20110113/6ee0e965')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20110113/6ee0e965/attachment-0001.html | 321 | ||||
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20110113/6ee0e965/attachment.html | 321 |
2 files changed, 642 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20110113/6ee0e965/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110113/6ee0e965/attachment-0001.html new file mode 100644 index 000000000..184c63853 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110113/6ee0e965/attachment-0001.html @@ -0,0 +1,321 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" +"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<title>[283] use single quotes when possible; build string before echo()ing them</title> +</head> +<body> + +<style type="text/css"><!-- +#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } +#msg dl.meta dt { float: left; width: 6em; font-weight: bold; } +#msg dt:after { content:':';} +#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } +#msg dl a { font-weight: bold} +#msg dl a:link { color:#fc3; } +#msg dl a:active { color:#ff0; } +#msg dl a:visited { color:#cc6; } +h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } +#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; } +#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; } +#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; } +#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; } +#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; } +#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } +#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; } +#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; } +#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; } +#logmsg pre { background: #eee; padding: 1em; } +#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;} +#logmsg dl { margin: 0; } +#logmsg dt { font-weight: bold; } +#logmsg dd { margin: 0; padding: 0 0 0.5em 0; } +#logmsg dd:before { content:'\00bb';} +#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; } +#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; } +#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; } +#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; } +#logmsg table th.Corner { text-align: left; } +#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; } +#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } +#patch { width: 100%; } +--></style> +<div id="msg"> +<dl class="meta"> +<dt>Revision</dt> <dd>283</dd> +<dt>Author</dt> <dd>rda</dd> +<dt>Date</dt> <dd>2011-01-13 15:19:51 +0100 (Thu, 13 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>use single quotes when possible; build string before echo()ing them</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#build_systemwebindexphp">build_system/web/index.php</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="build_systemwebindexphp">Modified: build_system/web/index.php</a> +=================================================================== +--- build_system/web/index.php 2011-01-13 13:53:06 UTC (rev 282) ++++ build_system/web/index.php 2011-01-13 14:19:51 UTC (rev 283) +@@ -10,10 +10,10 @@ + + error_reporting(E_ALL); + +-$upload_dir = "/home/schedbot/uploads"; ++$upload_dir = '/home/schedbot/uploads'; + $max_modified = 2; +-$title = "Mageia build system status"; +-$tz = new DateTimeZone("UTC"); ++$title = '<a href="http://mageia.org/">Mageia</a> build system status'; ++$tz = new DateTimeZone('UTC'); + + # Temporary until initial mirror is ready + chdir("data"); +@@ -30,40 +30,100 @@ + + $pkgs = array(); + foreach ($matches as $val) { +- if ($_GET["user"] && ($_GET["user"] != $val[7])) { +- continue; ++ ++ if ($_GET['user'] && ($_GET['user'] != $val[7])) { ++ continue; + } + $key = $val[6] . $val[7]; + if (!is_array($pkgs[$key])) { +- $pkgs[$key] = array(); +- $pkgs[$key]["status"] = array(); +- $pkgs[$key]["path"] = $val[2]; +- $pkgs[$key]["version"] = $val[3]; +- $pkgs[$key]["media"] = $val[4]; +- $pkgs[$key]["section"] = $val[5]; +- $pkgs[$key]["user"] = $val[7]; +- $pkgs[$key]["host"] = $val[8]; +- $pkgs[$key]["job"] = $val[9]; ++ ++ $pkgs[$key] = array( ++ 'status' => array(), ++ 'path' => $val[2], ++ 'version' => $val[3], ++ 'media' => $val[4], ++ 'section' => $val[5], ++ 'user' => $val[7], ++ 'host' => $val[8], ++ 'job' => $val[9] ++ ); + } + + $status = $val[1]; + $data = $val[10]; +- $pkgs[$key]["status"][$status] = 1; ++ $pkgs[$key]['status'][$status] = 1; + $ext = $val[11]; +- if ($ext == ".src.rpm.info") { ++ if ($ext == '.src.rpm.info') { + preg_match("!^(?:@\d+:)?(.*)!", $data, $name); +- $pkgs[$key]["package"] = $name[1]; +- } else if ($ext == ".src") { +- $pkgs[$key]["status"]["src"] = 1; +- } else if ($ext == ".youri") { +- $pkgs[$key]["status"]["youri"] = 1; +- } else if ($ext == ".lock") { ++ $pkgs[$key]['package'] = $name[1]; ++ } else if ($ext == '.src') { ++ $pkgs[$key]['status']['src'] = 1; ++ } else if ($ext == '.youri') { ++ $pkgs[$key]['status']['youri'] = 1; ++ } else if ($ext == '.lock') { + // parse build bot from $data +- $pkgs[$key]["status"]["build"] = 1; ++ $pkgs[$key]['status']['build'] = 1; + } + } + // sort by key in reverse order to have more recent pkgs first + krsort($pkgs); ++ ++/** ++ * @param array $pkg ++ * ++ * @return string ++*/ ++function pkg_gettype($pkg) { ++ if (array_key_exists("rejected", $pkg["status"])) ++ return "rejected"; ++ if (array_key_exists("youri", $pkg["status"])) { ++ if (array_key_exists("src", $pkg["status"])) ++ return "youri"; ++ else ++ return "uploaded"; ++ } ++ if (array_key_exists("failure", $pkg["status"])) ++ return "failure"; ++ if (array_key_exists("done", $pkg["status"])) ++ return "partial"; ++ if (array_key_exists("build", $pkg["status"])) ++ return "building"; ++ if (array_key_exists("todo", $pkg["status"])) ++ return "todo"; ++ return "unknown"; ++} ++ ++/** ++ * @param integer $num ++ * ++ * @return string ++*/ ++function plural($num) { ++ if ($num > 1) ++ return "s"; ++} ++ ++/** ++ * @param string $key ++ * ++ * @return string ++*/ ++function key2date($key) { ++ global $tz; ++ $date = DateTime::createFromFormat("YmdHis", $key+0, $tz); ++ $diff = time() - $date->getTimestamp(); ++ if ($diff<60) ++ return $diff . " second" . plural($diff) . " ago"; ++ $diff = round($diff/60); ++ if ($diff<60) ++ return $diff . " minute" . plural($diff) . " ago"; ++ $diff = round($diff/60); ++ if ($diff<24) ++ return $diff . " hour" . plural($diff) . " ago"; ++ $diff = round($diff/24); ++ ++ return $diff . " day" . plural($diff) . " ago"; ++} + ?> + <html lang="en"> + <head> +@@ -101,51 +161,11 @@ + <h1><?php echo $title ?></h1> + + <?php +-function pkg_gettype($pkg) { +- if (array_key_exists("rejected", $pkg["status"])) +- return "rejected"; +- if (array_key_exists("youri", $pkg["status"])) { +- if (array_key_exists("src", $pkg["status"])) +- return "youri"; +- else +- return "uploaded"; +- } +- if (array_key_exists("failure", $pkg["status"])) +- return "failure"; +- if (array_key_exists("done", $pkg["status"])) +- return "partial"; +- if (array_key_exists("build", $pkg["status"])) +- return "building"; +- if (array_key_exists("todo", $pkg["status"])) +- return "todo"; +- return "unknown"; +-} + +-function plural($num) { +- if ($num > 1) +- return "s"; +-} +- +-function key2date($key) { +- global $tz; +- $date = DateTime::createFromFormat("YmdHis", $key+0, $tz); +- $diff = time() - $date->getTimestamp(); +- if ($diff<60) +- return $diff . " second" . plural($diff) . " ago"; +- $diff = round($diff/60); +- if ($diff<60) +- return $diff . " minute" . plural($diff) . " ago"; +- $diff = round($diff/60); +- if ($diff<24) +- return $diff . " hour" . plural($diff) . " ago"; +- $diff = round($diff/24); +- return $diff . " day" . plural($diff) . " ago"; +-} +- + # Temporary until initial mirror is ready + echo sprintf( + '<p><a href="%s">%d src.rpm</a> rebuilt for Mageia out of <a href="%s">%d</a> +- (<a href="%s">List of Mandriva packages still present</a>).</p>', ++ (<a href="%s">list of Mandriva packages still present</a>).</p>', + + 'data/src.mga.txt', $nb_rpm_mga, + 'data/src.txt', $nb_rpm, +@@ -156,30 +176,43 @@ + echo '<table>', + '<tr><th>Submitted</th><th>User</th><th>Package</th><th>Target</th><th>Media</th><th colspan="2">Status</th></tr>'; + ++$s = ''; ++$tmpl = <<<T ++<tr class="%s"> ++ <td>%s</td> ++ <td><a href="?user=%s">%s</a></td> ++ <td>%s</td> ++ <td>%s</td> ++ <td>%s/%s</td> ++ <td class="status-box"></td> ++T; + foreach ($pkgs as $key => $p) { +- $p["type"] = pkg_gettype($p); +- echo "<tr class=" . $p["type"] . ">\n"; +- echo "<td>" . key2date($key) . "</td>\n"; +- echo "<td><a href='?user=" . $p["user"] . "'>" . $p["user"] . "</a></td>\n"; +- echo "<td>" . $p["package"] . "</td>\n"; +- echo "<td>" . $p["version"] . "</td>\n"; +- echo "<td>" . $p["media"] . "/" . $p["section"] . "</td>\n"; +- echo "<td class='status-box' />\n"; +- $typelink = ""; +- if ($p["type"] == "failure") { +- $typelink = "/uploads/" . $p["type"] . "/" . $p["path"]; +- } else if ($p["type"] == "rejected") { +- $typelink = "/uploads/" . $p["type"] . "/" . $p["path"] . ".youri"; ++ $p['type'] = pkg_gettype($p); ++ ++ $s .= sprintf($tmpl, ++ $p['type'], ++ key2date($key), ++ $p['user'], $p['user'], ++ $p['package'], ++ $p['version'], ++ $p['media'], $p['section'] ++ ); ++ ++ $typelink = ''; ++ if ($p['type'] == 'failure') { ++ $typelink = '/uploads/' . $p['type'] . '/' . $p['path']; ++ } elseif ($p['type'] == 'rejected') { ++ $typelink = '/uploads/' . $p['type'] . '/' . $p['path'] . '.youri'; + } +- echo "<td>"; +- if ($typelink) +- echo "<a href='$typelink'>"; +- echo $p["type"]; +- if ($typelink) +- echo "</a>"; +- echo "</td>\n"; +- echo "</tr>\n"; ++ ++ $s .= '<td>'; ++ $s .= ($typelink != '') ? ++ sprintf('<a href="%s">%s</a>', $typelink, $p['type']) : ++ $p['type']; ++ ++ $s .= '</td></tr>'; + } ++echo $s; + ?> + </table> + + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110113/6ee0e965/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110113/6ee0e965/attachment.html new file mode 100644 index 000000000..184c63853 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110113/6ee0e965/attachment.html @@ -0,0 +1,321 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" +"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<title>[283] use single quotes when possible; build string before echo()ing them</title> +</head> +<body> + +<style type="text/css"><!-- +#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } +#msg dl.meta dt { float: left; width: 6em; font-weight: bold; } +#msg dt:after { content:':';} +#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } +#msg dl a { font-weight: bold} +#msg dl a:link { color:#fc3; } +#msg dl a:active { color:#ff0; } +#msg dl a:visited { color:#cc6; } +h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } +#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; } +#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; } +#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; } +#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; } +#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; } +#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } +#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; } +#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; } +#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; } +#logmsg pre { background: #eee; padding: 1em; } +#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;} +#logmsg dl { margin: 0; } +#logmsg dt { font-weight: bold; } +#logmsg dd { margin: 0; padding: 0 0 0.5em 0; } +#logmsg dd:before { content:'\00bb';} +#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; } +#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; } +#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; } +#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; } +#logmsg table th.Corner { text-align: left; } +#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; } +#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } +#patch { width: 100%; } +--></style> +<div id="msg"> +<dl class="meta"> +<dt>Revision</dt> <dd>283</dd> +<dt>Author</dt> <dd>rda</dd> +<dt>Date</dt> <dd>2011-01-13 15:19:51 +0100 (Thu, 13 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>use single quotes when possible; build string before echo()ing them</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#build_systemwebindexphp">build_system/web/index.php</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="build_systemwebindexphp">Modified: build_system/web/index.php</a> +=================================================================== +--- build_system/web/index.php 2011-01-13 13:53:06 UTC (rev 282) ++++ build_system/web/index.php 2011-01-13 14:19:51 UTC (rev 283) +@@ -10,10 +10,10 @@ + + error_reporting(E_ALL); + +-$upload_dir = "/home/schedbot/uploads"; ++$upload_dir = '/home/schedbot/uploads'; + $max_modified = 2; +-$title = "Mageia build system status"; +-$tz = new DateTimeZone("UTC"); ++$title = '<a href="http://mageia.org/">Mageia</a> build system status'; ++$tz = new DateTimeZone('UTC'); + + # Temporary until initial mirror is ready + chdir("data"); +@@ -30,40 +30,100 @@ + + $pkgs = array(); + foreach ($matches as $val) { +- if ($_GET["user"] && ($_GET["user"] != $val[7])) { +- continue; ++ ++ if ($_GET['user'] && ($_GET['user'] != $val[7])) { ++ continue; + } + $key = $val[6] . $val[7]; + if (!is_array($pkgs[$key])) { +- $pkgs[$key] = array(); +- $pkgs[$key]["status"] = array(); +- $pkgs[$key]["path"] = $val[2]; +- $pkgs[$key]["version"] = $val[3]; +- $pkgs[$key]["media"] = $val[4]; +- $pkgs[$key]["section"] = $val[5]; +- $pkgs[$key]["user"] = $val[7]; +- $pkgs[$key]["host"] = $val[8]; +- $pkgs[$key]["job"] = $val[9]; ++ ++ $pkgs[$key] = array( ++ 'status' => array(), ++ 'path' => $val[2], ++ 'version' => $val[3], ++ 'media' => $val[4], ++ 'section' => $val[5], ++ 'user' => $val[7], ++ 'host' => $val[8], ++ 'job' => $val[9] ++ ); + } + + $status = $val[1]; + $data = $val[10]; +- $pkgs[$key]["status"][$status] = 1; ++ $pkgs[$key]['status'][$status] = 1; + $ext = $val[11]; +- if ($ext == ".src.rpm.info") { ++ if ($ext == '.src.rpm.info') { + preg_match("!^(?:@\d+:)?(.*)!", $data, $name); +- $pkgs[$key]["package"] = $name[1]; +- } else if ($ext == ".src") { +- $pkgs[$key]["status"]["src"] = 1; +- } else if ($ext == ".youri") { +- $pkgs[$key]["status"]["youri"] = 1; +- } else if ($ext == ".lock") { ++ $pkgs[$key]['package'] = $name[1]; ++ } else if ($ext == '.src') { ++ $pkgs[$key]['status']['src'] = 1; ++ } else if ($ext == '.youri') { ++ $pkgs[$key]['status']['youri'] = 1; ++ } else if ($ext == '.lock') { + // parse build bot from $data +- $pkgs[$key]["status"]["build"] = 1; ++ $pkgs[$key]['status']['build'] = 1; + } + } + // sort by key in reverse order to have more recent pkgs first + krsort($pkgs); ++ ++/** ++ * @param array $pkg ++ * ++ * @return string ++*/ ++function pkg_gettype($pkg) { ++ if (array_key_exists("rejected", $pkg["status"])) ++ return "rejected"; ++ if (array_key_exists("youri", $pkg["status"])) { ++ if (array_key_exists("src", $pkg["status"])) ++ return "youri"; ++ else ++ return "uploaded"; ++ } ++ if (array_key_exists("failure", $pkg["status"])) ++ return "failure"; ++ if (array_key_exists("done", $pkg["status"])) ++ return "partial"; ++ if (array_key_exists("build", $pkg["status"])) ++ return "building"; ++ if (array_key_exists("todo", $pkg["status"])) ++ return "todo"; ++ return "unknown"; ++} ++ ++/** ++ * @param integer $num ++ * ++ * @return string ++*/ ++function plural($num) { ++ if ($num > 1) ++ return "s"; ++} ++ ++/** ++ * @param string $key ++ * ++ * @return string ++*/ ++function key2date($key) { ++ global $tz; ++ $date = DateTime::createFromFormat("YmdHis", $key+0, $tz); ++ $diff = time() - $date->getTimestamp(); ++ if ($diff<60) ++ return $diff . " second" . plural($diff) . " ago"; ++ $diff = round($diff/60); ++ if ($diff<60) ++ return $diff . " minute" . plural($diff) . " ago"; ++ $diff = round($diff/60); ++ if ($diff<24) ++ return $diff . " hour" . plural($diff) . " ago"; ++ $diff = round($diff/24); ++ ++ return $diff . " day" . plural($diff) . " ago"; ++} + ?> + <html lang="en"> + <head> +@@ -101,51 +161,11 @@ + <h1><?php echo $title ?></h1> + + <?php +-function pkg_gettype($pkg) { +- if (array_key_exists("rejected", $pkg["status"])) +- return "rejected"; +- if (array_key_exists("youri", $pkg["status"])) { +- if (array_key_exists("src", $pkg["status"])) +- return "youri"; +- else +- return "uploaded"; +- } +- if (array_key_exists("failure", $pkg["status"])) +- return "failure"; +- if (array_key_exists("done", $pkg["status"])) +- return "partial"; +- if (array_key_exists("build", $pkg["status"])) +- return "building"; +- if (array_key_exists("todo", $pkg["status"])) +- return "todo"; +- return "unknown"; +-} + +-function plural($num) { +- if ($num > 1) +- return "s"; +-} +- +-function key2date($key) { +- global $tz; +- $date = DateTime::createFromFormat("YmdHis", $key+0, $tz); +- $diff = time() - $date->getTimestamp(); +- if ($diff<60) +- return $diff . " second" . plural($diff) . " ago"; +- $diff = round($diff/60); +- if ($diff<60) +- return $diff . " minute" . plural($diff) . " ago"; +- $diff = round($diff/60); +- if ($diff<24) +- return $diff . " hour" . plural($diff) . " ago"; +- $diff = round($diff/24); +- return $diff . " day" . plural($diff) . " ago"; +-} +- + # Temporary until initial mirror is ready + echo sprintf( + '<p><a href="%s">%d src.rpm</a> rebuilt for Mageia out of <a href="%s">%d</a> +- (<a href="%s">List of Mandriva packages still present</a>).</p>', ++ (<a href="%s">list of Mandriva packages still present</a>).</p>', + + 'data/src.mga.txt', $nb_rpm_mga, + 'data/src.txt', $nb_rpm, +@@ -156,30 +176,43 @@ + echo '<table>', + '<tr><th>Submitted</th><th>User</th><th>Package</th><th>Target</th><th>Media</th><th colspan="2">Status</th></tr>'; + ++$s = ''; ++$tmpl = <<<T ++<tr class="%s"> ++ <td>%s</td> ++ <td><a href="?user=%s">%s</a></td> ++ <td>%s</td> ++ <td>%s</td> ++ <td>%s/%s</td> ++ <td class="status-box"></td> ++T; + foreach ($pkgs as $key => $p) { +- $p["type"] = pkg_gettype($p); +- echo "<tr class=" . $p["type"] . ">\n"; +- echo "<td>" . key2date($key) . "</td>\n"; +- echo "<td><a href='?user=" . $p["user"] . "'>" . $p["user"] . "</a></td>\n"; +- echo "<td>" . $p["package"] . "</td>\n"; +- echo "<td>" . $p["version"] . "</td>\n"; +- echo "<td>" . $p["media"] . "/" . $p["section"] . "</td>\n"; +- echo "<td class='status-box' />\n"; +- $typelink = ""; +- if ($p["type"] == "failure") { +- $typelink = "/uploads/" . $p["type"] . "/" . $p["path"]; +- } else if ($p["type"] == "rejected") { +- $typelink = "/uploads/" . $p["type"] . "/" . $p["path"] . ".youri"; ++ $p['type'] = pkg_gettype($p); ++ ++ $s .= sprintf($tmpl, ++ $p['type'], ++ key2date($key), ++ $p['user'], $p['user'], ++ $p['package'], ++ $p['version'], ++ $p['media'], $p['section'] ++ ); ++ ++ $typelink = ''; ++ if ($p['type'] == 'failure') { ++ $typelink = '/uploads/' . $p['type'] . '/' . $p['path']; ++ } elseif ($p['type'] == 'rejected') { ++ $typelink = '/uploads/' . $p['type'] . '/' . $p['path'] . '.youri'; + } +- echo "<td>"; +- if ($typelink) +- echo "<a href='$typelink'>"; +- echo $p["type"]; +- if ($typelink) +- echo "</a>"; +- echo "</td>\n"; +- echo "</tr>\n"; ++ ++ $s .= '<td>'; ++ $s .= ($typelink != '') ? ++ sprintf('<a href="%s">%s</a>', $typelink, $p['type']) : ++ $p['type']; ++ ++ $s .= '</td></tr>'; + } ++echo $s; + ?> + </table> + + +</pre></div> + +</body> +</html>
\ No newline at end of file |