From 245ed747480ffd498cbc6ef433f5219dc07e21fc Mon Sep 17 00:00:00 2001 From: sparkyx Date: Sun, 25 Feb 2024 17:32:49 +0100 Subject: [PATCH] =?UTF-8?q?Tache=20#2342:=20Version=20de=20NOALYSS=20:=20d?= =?UTF-8?q?onn=C3=A9=20quand=20on=20tag=20une=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html/index.php | 2 +- include/class/mobile.class.php | 5 +++-- include/constant.php | 8 ++------ include/lib/ac_common.php | 19 ++++++++++--------- include/lib/function_javascript.php | 3 ++- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/html/index.php b/html/index.php index 0fb6daa8f..335656446 100644 --- a/html/index.php +++ b/html/index.php @@ -305,7 +305,7 @@ if (isset($_REQUEST['reconnect'])&&isset($_REQUEST['backurl'])) - version NOALYSS_VERSION - + version - diff --git a/include/class/mobile.class.php b/include/class/mobile.class.php index 80d86ec0a..17d9a6890 100644 --- a/include/class/mobile.class.php +++ b/include/class/mobile.class.php @@ -73,6 +73,7 @@ class Mobile */ function page_start() { + global $version_noalyss; // check not called twiced static $already_call=0; if ($already_call==1) @@ -96,8 +97,8 @@ class Mobile - - "; + + "; // preload font echo ''; diff --git a/include/constant.php b/include/constant.php index 364bbdd3b..3724ccc14 100644 --- a/include/constant.php +++ b/include/constant.php @@ -93,11 +93,7 @@ define('BUTTONADD', "✚"); // If noalyss_version is not defined it is likely directly taken from // git and so this variable is not set, this cause some issue -if (! defined ("NOALYSS_VERSION")) -{ - define("NOALYSS_VERSION",9999); -} -define('SVNINFO', NOALYSS_VERSION); +define('NOALYSS_VERSION', 9114 ); if (!defined('DEBUGNOALYSS')) { define("DEBUGNOALYSS", 0); } @@ -109,7 +105,7 @@ if (!defined('LOGINPUT')) { if (!defined('DEBUGNOALYSS')) { define('DEBUGNOALYSS', 0); } -$version_noalyss = SVNINFO; +$version_noalyss = NOALYSS_VERSION; // If you don't want to be notified of the update if (!defined("SITE_UPDATE")) diff --git a/include/lib/ac_common.php b/include/lib/ac_common.php index cf1fc109d..597a62df5 100644 --- a/include/lib/ac_common.php +++ b/include/lib/ac_common.php @@ -336,16 +336,17 @@ function html_page_start($p_theme="", $p_script="", $p_script2="") { echo ' '; } - echo " + global $version_noalyss; + echo <<$title - - - - - - " . - $p_script2 . " - "; + + + + + + + $p_script2 +EOF; // preload font echo ''; echo ''; diff --git a/include/lib/function_javascript.php b/include/lib/function_javascript.php index 55f88dfe0..c5478fa92 100644 --- a/include/lib/function_javascript.php +++ b/include/lib/function_javascript.php @@ -16,6 +16,7 @@ License: GPL */ function js_include($p_string) { + global $version_noalyss; static $ajs=array(); /* avoid to add twice the same script */ static $seq=0; if ( in_array($p_string,$ajs)) return ''; @@ -24,7 +25,7 @@ function js_include($p_string) if ( ! file_exists('js/'.$p_string)) alert("Erreur js/$p_string n existe pas"); - $script=''; + $script=''; // debug return $script;