Set version for rpmphp, display version and license on index page

7 files changed, 17 insertions, 7 deletions

diff --git a/FedoraClient.php b/FedoraClient.php
index 6eca761..4a7cfd6 100644
--- a/FedoraClient.php
+++ b/FedoraClient.php
@@ -21,7 +21,7 @@
  *
  */
 
-define ('FEDORACLIENT_VERSION','0.1');
+define ('FEDORACLIENT_VERSION','0.1.0-dev');
 
 if (!function_exists('curl_version')) {
    die("curl extension required\n");
diff --git a/README b/README
index a429120..83b0578 100644
--- a/README
+++ b/README
@@ -3,6 +3,10 @@ This repository manage sources of PHP scripts use to generate reports for
 	Packages in Fedora repositories
 
 	http://rpms.famillecollet.com/rpmphp/
+	
+	Project page 
+	
+	http://redmine.ulysses.fr/projects/rpmphp
 
 In order to use this software, you will need to install:
 - PHP 5 (5.3+)
diff --git a/index.php b/index.php
index dc6f25a..c8cc868 100644
--- a/index.php
+++ b/index.php
@@ -70,6 +70,8 @@ try {
         sprintf("%s ERREUR : %s\n", date("r"), $e->getMessage())
     );
 }
+$smarty->assign('rpmphp_version', RPMPHP_VERSION);
+$smarty->assign('fedcli_version', FEDORACLIENT_VERSION);
 
 $page_content = $smarty->fetch('index.tpl');
 $smarty->assign('page_content', $page_content);
diff --git a/main.inc.php b/main.inc.php
index a160604..18c844f 100644
--- a/main.inc.php
+++ b/main.inc.php
@@ -1,6 +1,9 @@
 <?php
+define('RPMPHP_VERSION', '1.0.0-dev');
+
 require 'config.inc.php';
 require '/usr/share/php/Smarty/Smarty.class.php';
+require 'FedoraClient.php';
 
 $smarty = new Smarty();
 
@@ -9,8 +12,8 @@ $smarty->compile_dir = 'smarty/templates_c';
 $smarty->cache_dir = 'smarty/cache';
 $smarty->config_dir = 'smarty/configs';
 
-$ariane[] = array(
-    'url'   => './',
-    'text'  => 'Reports home'
+$ariane[] = array (
+   'url' => './',
+   'text' => 'Reports home'
 );
 ?>
\ No newline at end of file
diff --git a/pkgdb-ajax.php b/pkgdb-ajax.php
index 5cff16c..c02e68d 100644
--- a/pkgdb-ajax.php
+++ b/pkgdb-ajax.php
@@ -1,6 +1,6 @@
 <?php
 header('Content-Type: application/json;charset=utf-8');
-require 'FedoraClient.php';
+require 'main.inc.php';
 
 $name = $_GET['name'];
 if ( !isset($name) || !$name ) {
diff --git a/smarty/templates/rpmphp/index.tpl b/smarty/templates/rpmphp/index.tpl
index df6cb52..ae65b48 100644
--- a/smarty/templates/rpmphp/index.tpl
+++ b/smarty/templates/rpmphp/index.tpl
@@ -35,6 +35,8 @@
                     </tbody>
                 </table><!-- /list-pacakges -->
                 <h2>Script sources</h2>
-                <p>You can retrieve the current application sources from my GIT repository on github.com: <a href='http://github.com/remicollet/rpmphp'>http://github.com/remicollet/rpmphp</a>.</p>
+                <p>License : RPMPHP version {$rpmphp_version} is <a href='http://www.gnu.org/licenses/agpl.html' alt='AGPL'>AGPL</a>, 
+                FedoraClient version {$fedcli_version} is <a href='http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html' alt='LGPLv2+'>LGPLv2+</a>, 
+                <p>You can retrieve the current application sources from my <a href='http://github.com/remicollet/rpmphp'>GIT repository on github.com</a>.</p>
                 <p>Feedbacks, RFE and patches are welcome.</p>
 
diff --git a/zoom.php b/zoom.php
index 5a3f6cb..d136d56 100644
--- a/zoom.php
+++ b/zoom.php
@@ -36,7 +36,6 @@
  * @since     The begining of times.
 */
 require 'main.inc.php';
-require 'FedoraClient.php';
 
 $fedcli = new FedoraPkgdb();