Removed version stuff which was CVS dependent

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@189 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/html/index.php b/html/index.php
index 88ae90bfdbc6c9e0a9913891410e642b4e828946..9ced14d6732b888ed9abaf8207020807812b12f5 100644 (file)
--- a/html/index.php
+++ b/html/index.php
@@ -228,9 +228,6 @@ $smarty->assign ("server_id", $selected);
 
 /* show login screen */
 $smarty->display (get_template_path('headers.tpl'));
-if (isset($_GET['version'])){
-  require_once("version.inc");
-}
 $smarty->assign ("PHPSESSID", session_id());
 if (isset($_SESSION['errors'])){
   $smarty->assign("errors", $_SESSION['errors']);

diff --git a/html/main.php b/html/main.php
index f39467376b3fb9bb263e720d4ab30ec9208f6291..839bdcd616b7147167ec5a854216a02fef6b6081 100644 (file)
--- a/html/main.php
+++ b/html/main.php
@@ -27,7 +27,6 @@ function raiseError($errno, $errstr, $errfile, $errline)
 //set_error_handler('raiseError');
 /* This will be removed */
 
-
 /* Basic setup, remove eventually registered sessions */
 $timing= array();
 require_once ("../include/php_setup.inc");
@@ -231,9 +230,6 @@ if (isset($plug)){
   $smarty->assign ("plug", "");
 }
 $smarty->display(get_template_path('headers.tpl'));
-if (isset($_GET['version'])){
-  require_once("version.inc");
-}
 
 /* React on clicks */
 if ($_SERVER["REQUEST_METHOD"] == "POST"){

diff --git a/include/functions.inc b/include/functions.inc
index 54936244361634ecaa7c5d06dbb2ec8ae3e364f4..eea3f3a5e897060348cc995139a8184aef13c47f 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -1491,9 +1491,19 @@ function validate($string)
   return (strip_tags(preg_replace('/\0/', '', $string)));
 }
 
+function get_gosa_version()
+{
+  /* Variables filled in by subversion */
+  $svn_path = "$HeadURL$";
+  $svn_revision = "$Revision$";
 
-
-  
+  /* Release or development? */
+  if (preg_match('%/gosa/trunk/%', $svn_path)){
+    return ("Development snapshot (rev $svn_revision)");
+  } else {
+    return ("Release $releaase (rev $svn_revision)");
+  }
+}
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>

diff --git a/include/version.inc b/include/version.inc
deleted file mode 100644 (file)
index b1efca8..0000000
--- a/include/version.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/* Hard code version number */
-$version= "2.3.1";
-$cvs    = "";
-
-/* Try to evaluate if we're using CVS */
-if (is_dir("$BASE_DIR/CVS")){
-  $tmp= stat("$BASE_DIR/CVS");
-  $cvs= date ("Y-m-d/H:i:s", $tmp[9]);
-} else {
-  $cvs= "RELEASE";
-}
-
-print_red(sprintf(_("You are currently using GOsa version %s (CVS checkout from %s)"),
-      $version, $cvs));
-
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>

diff --git a/plugins/generic/welcome/main.inc b/plugins/generic/welcome/main.inc
index c0c5f26758645d102b149a03d5c5c5431bd1302f..6f7a0d49daec8d2d785fe7e66984523b5bc81efd 100644 (file)
--- a/plugins/generic/welcome/main.inc
+++ b/plugins/generic/welcome/main.inc
@@ -26,4 +26,6 @@ if (!$remove_lock){
        $display= $smarty->fetch(get_template_path('welcome.tpl', TRUE));
 }
 
+echo get_gosa_version();
+
 ?>