diff --git a/html/index.php b/html/index.php index 845b661af691f81271427e75e6e42383fbf09774..de4480eddf44fd5e53bfb94babe31de62234db60 100644 --- a/html/index.php +++ b/html/index.php @@ -94,11 +94,7 @@ function displayLogin() $smarty->assign("usePrototype", "false"); $smarty->display (get_template_path('headers.tpl')); - if(function_exists("get_gosa_version")){ - $smarty->assign("version",get_gosa_version()); - }else{ - $smarty->assign("version",""); - } + $smarty->assign("version",FD_VERSION); $smarty->display(get_template_path('login.tpl')); exit(); diff --git a/html/setup.php b/html/setup.php index 37a8989117052d3842ef69efb0f7a2c4dcbfe15a..b3fff6a74d6e792d3f1f71a6312a7107e8d43db4 100644 --- a/html/setup.php +++ b/html/setup.php @@ -143,11 +143,9 @@ if ($error_collector != ""){ } else { $smarty->assign("php_errors", ""); } -if(function_exists("get_gosa_version")){ - $smarty->assign("version",get_gosa_version()); -}else{ - $smarty->assign("version",""); -} + +$smarty->assign("version",FD_VERSION); + echo $header.$smarty->fetch("../setup/setup_frame.tpl"); // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/include/functions.inc b/include/functions.inc index 11ffa49cbd81f054bc28d8e36561fd7fb63b44c9..2bd4bba6e5b2f8ff49cd72b9ccb3ba2e51c137ac 100644 --- a/include/functions.inc +++ b/include/functions.inc @@ -2279,13 +2279,6 @@ function validate($string) return (strip_tags(str_replace('\0', '', $string))); } -/*! \brief Evaluate the current FusionDirectory version from the build in revision string */ -function get_gosa_version() -{ - global $svn_revision; - - return (sprintf(_("FusionDirectory $svn_revision"))); -} /*! \brief Recursively delete a path in the file system * diff --git a/include/php_setup.inc b/include/php_setup.inc index e6218174a433b3fac4528edb8103ba958f6f1c3d..cfe84a268fdeb8cc297f7a849222edd53dae8742 100644 --- a/include/php_setup.inc +++ b/include/php_setup.inc @@ -71,10 +71,8 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline) /* Mailto body header */ if(function_exists("prepare4mailbody")){ - $version= "unknown"; - if(function_exists("get_gosa_version")){ - $version= get_gosa_version(); - } + $version = FD_VERSION; + $error_collector_mailto .=prepare4mailbody( "Oups. Seems like you've catched some kind of bug inside FusionDirectory/PHP. You may want to help ". "us to improve the software stability. If so, please provide some more information below.". diff --git a/include/variables.inc b/include/variables.inc index 33baf4bada374eadf72eb1156ae3a0482c890f30..9859975e00678551833c7ad8533e989871f7d0c7 100644 --- a/include/variables.inc +++ b/include/variables.inc @@ -83,4 +83,6 @@ define("CLASS_CACHE", "class.cache"); /* name of the utility used to create windows passwords */ define ("MKNTPWD", "/usr/sbin/fusiondirectory-mkntpassword"); +/* FusionDirectory Version */ +define ("FD_VERSION", "1.0.3"); ?> diff --git a/plugins/generic/welcome/main.inc b/plugins/generic/welcome/main.inc index 402cee4e7d5d44becf22d481fcc16170ccf6f415..6292f76b63ab86c0c8c17a770e8f035f2e9e8815 100644 --- a/plugins/generic/welcome/main.inc +++ b/plugins/generic/welcome/main.inc @@ -26,9 +26,7 @@ if (!$cleanup){ $smarty->assign("header", print_header(get_template_path('images/welcome.png'), sprintf(_("Welcome %s!"), $ui->cn))); $smarty->assign("year", date("Y")); - if(function_exists("get_gosa_version")){ - $smarty->assign("revision", get_gosa_version()); - } + $smarty->assign("version",FD_VERSION); $display= $smarty->fetch(get_template_path('welcome.tpl', TRUE)); }