diff --git a/html/user_login.php b/html/user_login.php index e88a0be87..af9808fda 100644 --- a/html/user_login.php +++ b/html/user_login.php @@ -30,7 +30,6 @@ require_once NOALYSS_INCLUDE.'/function_javascript.php'; @html_page_start($_SESSION['g_theme']); $rep=new Database(); include_once NOALYSS_INCLUDE.'/class_user.php'; - $User=new User($rep); $User->Check(); @@ -87,10 +86,13 @@ if ( $User->Admin() == 1) if (SITE_UPDATE !="") { $update=@file_get_contents(SITE_UPDATE); if ($update > $version_noalyss ) { - echo '
'; + echo '
'; echo '

'; echo "Mise à jour disponible de NOALYSS version actuelle : $update votre version $version_noalyss"; echo '

'; + echo '

'. + _('Fermer'). + "

"; echo '
'; } } @@ -179,6 +181,7 @@ echo $res;

+
diff --git a/include/class_extension.php b/include/class_extension.php index 20ea91e8b..48c369c34 100644 --- a/include/class_extension.php +++ b/include/class_extension.php @@ -217,10 +217,14 @@ class Extension extends Menu_Ref_sql $update = @file_get_contents(SITE_UPDATE_PLUGIN); if ($update > $version_plugin) { - echo '
'; + echo '
'; echo '

'; echo "Mise à jour disponible des plugins pour NOALYSS, version actuelle : $update votre version $version_plugin"; echo '

'; + echo '

'. + ''. + _('Fermer'). + "

"; echo '
'; } } diff --git a/include/constant.php b/include/constant.php index 75b6e7de4..bc9a31d21 100644 --- a/include/constant.php +++ b/include/constant.php @@ -79,7 +79,7 @@ define ('SMALLX','ⵝ'); -define ('SVNINFO',6815); +define ('SVNINFO',6700); if ( ! defined ('DEBUG')) { define ("DEBUG",false); } @@ -91,8 +91,10 @@ $version_noalyss=SVNINFO; // If you don't want to be notified of the update // define ("SITE_UPDATE",''); -define ("SITE_UPDATE",'http://www.noalyss.eu/last_version.txt'); -define ("SITE_UPDATE_PLUGIN",'http://www.noalyss.eu/plugin_last_version.txt'); +if ( !defined("SITE_UPDATE")) + define ("SITE_UPDATE",'http://www.noalyss.eu/last_version.txt'); +if ( !defined("SITE_UPDATE_PLUGIN")) + define ("SITE_UPDATE_PLUGIN",'http://www.noalyss.eu/plugin_last_version.txt'); define ("DBVERSION",118);