X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=web%2Fstaticmoduleinfo.php;h=ba73265696383d7b7898bf38b79b1f6dabf4a5ea;hp=b9fac443d5439fd659dbdb1bcb64b62e1397bfd3;hb=728d98e8e44abcacbe9bfcd89762de2beda72698;hpb=e30753942e5a5ea6e958fdd850fc7a9c33285dae

diff --git a/web/staticmoduleinfo.php b/web/staticmoduleinfo.php
index b9fac443..ba732656 100644
--- a/web/staticmoduleinfo.php
+++ b/web/staticmoduleinfo.php
@@ -3,16 +3,17 @@ session_start();
 include('logo.html');
 include('menulist.html');
 include('static-configuration');
-$module=$argv[1];
-
-$maintainer=extract_field('maintainer',$module);
-$author=extract_field('author',$module);
-$summary=extract_field('summary',$module);
-$description=htmlize_field('description',$module);
-$example=extract_field('example',$module);
-$dependencies=htmlspecialchars(shell_exec('tools/ccan_depends --direct '.$module));
-$extdepends=htmlspecialchars(shell_exec('tools/ccan_depends --compile --non-ccan '.$module));
-$licence=extract_field('licence',$module);
+$module_path=$argv[1];
+$module=basename($module_path);
+$maintainer=extract_field('maintainer',$module_path);
+$author=extract_field('author',$module_path);
+$summary=extract_field('summary',$module_path);
+$description=htmlize_field('description',$module_path);
+$example=extract_field('example',$module_path);
+$dependencies=htmlspecialchars(shell_exec('tools/ccan_depends --direct '.$module_path));
+$extdepends=htmlspecialchars(shell_exec('tools/ccan_depends --compile --non-ccan '.$module_path));
+$licence=extract_field('licence',$module_path);
+$license=extract_field('license',$module_path);
 ?>
 <table align="center" bgcolor="lightblue" width="70%" border="0" cellpadding="3" cellspacing="1">
 <tr align="center" bgcolor="FFFFCC">
@@ -20,8 +21,8 @@ $licence=extract_field('licence',$module);
 <a href="<?=$repo_base.$module?>">Browse Source</a>
 </td>
 <td>
-<a href="../<?=$tar_dir?>/with-deps/<?=basename($module)?>.tar.bz2">Download</a>
-<a href="../<?=$tar_dir?>/<?=basename($module)?>.tar.bz2">(without any required ccan dependencies)</a>
+<a href="../<?=$tar_dir?>/with-deps/<?=$module?>.tar.bz2">Download</a>
+<a href="../<?=$tar_dir?>/<?=$module?>.tar.bz2">(without any required ccan dependencies)</a>
 </tr>
 </table>
 
@@ -97,7 +98,15 @@ if ($example) {
 if ($licence) {
 ?>
 <tr align="left" bgcolor="FFFFCC"> 
-<td><h3>Licence: </h3> <?=$licence?></td>
+<td><h3>License: </h3> <?=$licence?></td>
+</tr>
+<?php
+}
+
+if ($license) {
+?>
+<tr align="left" bgcolor="FFFFCC"> 
+<td><h3>License: </h3> <?=$license?></td>
 </tr>
 <?php
 }