projects / brisk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 16a41a6)
Merge branch 'master' into post-bold2
authorMatteo Nastasi <nastasi@alternativeoutput.it>
Sat, 18 Apr 2020 09:35:24 +0000 (11:35 +0200)
committerMatteo Nastasi <nastasi@alternativeoutput.it>
Sat, 18 Apr 2020 09:35:24 +0000 (11:35 +0200)
INSTALL.sh patch | blob | history
web/Obj/brisk.phh patch | blob | history
web/Obj/transports.phh patch | blob | history
web/briskin5/index.php patch | blob | history
web/index.php patch | blob | history

diff --git a/INSTALL.sh b/INSTALL.sh
index 0266f47..dce6e83 100755 (executable)
--- a/INSTALL.sh
+++ b/INSTALL.sh
@@ -367,6 +367,16 @@ if [ "$web_only" = "FALSE" ]; then
     mkdir -p "${legal_path}"
     chmod 777 "${legal_path}"
 fi
+
+bsk_busting="$(git rev-parse --short HEAD 2>/dev/null|| true)"
+if [ "$bsk_busting" = "" ]; then
+    bsk_busting=$(grep '^\$G_brisk_version'  web/Obj/brisk.phh | sed 's/^[^"'"'"']*["'"'"']/v/g;s/["'"'"'].*//g')
+fi
+if [ "$bsk_busting" = "" ]; then
+    echo "Retreiving bsk_busting failed"
+    exit 1
+fi
+
 install -d ${web_path}__
 for i in $(find web -type d | grep '/' | sed 's/^....//g'); do
     install -d ${web_path}__/$i
@@ -422,6 +432,7 @@ s@define *( *'TABLES_CERT_N',[^)]*)@define('TABLES_CERT_N', $tables_cert_n)@g;
 s@define *( *'BRISK_DEBUG',[^)]*)@define('BRISK_DEBUG', $brisk_debug)@g;
 s@define *( *'LEGAL_PATH',[^)]*)@define('LEGAL_PATH', \"$legal_path\")@g;
 s@define *( *'PROXY_PATH',[^)]*)@define('PROXY_PATH', \"$proxy_path\")@g;
+s@define *( *'BSK_BUSTING',[^)]*)@define('BSK_BUSTING', \"$bsk_busting\")@g;
 s@define *( *'BRISK_CONF',[^)]*)@define('BRISK_CONF', \"$brisk_conf\")@g;" ${web_path}__/Obj/brisk.phh
 
 sed -i "s@define *( *'BRISK_AUTH_CONF',[^)]*)@define('BRISK_AUTH_CONF', \"$brisk_auth_conf\")@g" ${web_path}__/Obj/auth.phh
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 3dc4896..848b9f4 100644 (file)
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -89,6 +89,8 @@ define('BRISK_SINGLE_DEBUG',0);
 define('BRISK_SINGLE_SESS', "");
 define('DEBUGGING', "no-debugging");
 
+define('BSK_BUSTING', "dev");
+
 require_once("$DOCUMENT_ROOT/Etc/".BRISK_CONF);
 require_once("${G_base}Obj/ipclass.phh");
 
@@ -153,7 +155,7 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi',
 $G_lng = langtolng($G_lang);
 
 $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "5.8.0";
+$G_brisk_version = "5.9.0";
 
 /* MLANG: ALL THE INFO STRINGS IN brisk.phh */
 $root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: dati dai client via web-socket.',
diff --git a/web/Obj/transports.phh b/web/Obj/transports.phh
index 921d15e..ea592a8 100644 (file)
--- a/web/Obj/transports.phh
+++ b/web/Obj/transports.phh
@@ -595,10 +595,10 @@ class Transport_iframe {
 
         $ret .= sprintf("<html>
 <head>
-<script type=\"text/javascript\" src=\"%scommons.js\"></script>
-<script type=\"text/javascript\" src=\"%sxynt-streaming-ifra.js\"></script>
+<script type=\"text/javascript\" src=\"%scommons.js?v=%s\"></script>
+<script type=\"text/javascript\" src=\"%sxynt-streaming-ifra.js?v=%s\"></script>
 <script type=\"text/javascript\">
-var xynt_streaming = \"ready\";", $base, $base);
+var xynt_streaming = \"ready\";", $base, BSK_BUSTING, $base, BSK_BUSTING);
         if ($step > 0)
             $ret .= sprintf("last_clean = %d;\n", ($step-1));
         $ret .= sprintf("
@@ -626,10 +626,10 @@ window.onload = function () { try { if (xynt_streaming != \"ready\") { xynt_stre
         $ret = "";
         $ret .= sprintf("<html>
 <head>
-<script type=\"text/javascript\" src=\"%scommons.js\"></script>
-<script type=\"text/javascript\" src=\"%sxynt-streaming-ifra.js\"></script>
+<script type=\"text/javascript\" src=\"%scommons.js?v=%s\"></script>
+<script type=\"text/javascript\" src=\"%sxynt-streaming-ifra.js?v=%s\"></script>
 <script type=\"text/javascript\">
-var xynt_streaming = \"ready\";", $base, $base);
+var xynt_streaming = \"ready\";", $base, BSK_BUSTING, $base, BSK_BUSTING);
         $ret .= sprintf("
 window.onload = function () { try { if (xynt_streaming != \"ready\") { xynt_streaming.reload(); } } catch(e) { /* console.log(\"catcha\"); */ } };
 </script>
diff --git a/web/briskin5/index.php b/web/briskin5/index.php
index 6071c73..d4159f1 100644 (file)
--- a/web/briskin5/index.php
+++ b/web/briskin5/index.php
@@ -67,15 +67,15 @@ function bin5_index_main($transp_type, $header, &$header_out, $addr, $get, $post
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>Brisk - Tavolo <?php echo "$table_idx";?></title>
 <link rel="shortcut icon" href="../img/brisk_ico.png">
-<script type="text/javascript" src="../commons.js"></script> 
-<script type="text/javascript" src="../heartbit.js"></script>
-<script type="text/javascript" src="../xynt-streaming.js"></script>
-<script type="text/javascript" src="dnd.js"></script>
-<script type="text/javascript" src="dom-drag.js"></script>
-<script type="text/javascript" src="preload_img<?php echo langtolng($G_lang); ?>.js"></script>
-<script type="text/javascript" src="briskin5.js"></script>
-<link rel="stylesheet" type="text/css" href="../brisk.css">
-<link rel="stylesheet" type="text/css" href="briskin5.css">
+<script type="text/javascript" src="../commons.js?v=<? echo BSK_BUSTING; ?>"></script> 
+<script type="text/javascript" src="../heartbit.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="../xynt-streaming.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="dnd.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="dom-drag.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="preload_img<?php echo langtolng($G_lang); ?>.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="briskin5.js?v=<? echo BSK_BUSTING; ?>"></script>
+<link rel="stylesheet" type="text/css" href="../brisk.css?v=<? echo BSK_BUSTING; ?>">
+<link rel="stylesheet" type="text/css" href="briskin5.css?v=<? echo BSK_BUSTING; ?>">
 </head>
 <body>
 <SCRIPT type="text/javascript">
diff --git a/web/index.php b/web/index.php
index 269b1fc..3dcaf6b 100644 (file)
--- a/web/index.php
+++ b/web/index.php
@@ -1024,23 +1024,23 @@ supported by:<br>
 <title>Brisk</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link rel="shortcut icon" href="img/brisk_ico.png">
-<script type="text/javascript" src="commons.js"></script>
-<script type="text/javascript" src="fieldify.js"></script>
-<script type="text/javascript" src="prefs.js"></script>
-<script type="text/javascript" src="info.js"></script>
-<!-- <script type="text/javascript" src="myconsole.js"></script> -->
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript" src="heartbit.js"></script>
-<script type="text/javascript" src="xynt-streaming.js"></script>
-<script type="text/javascript" src="preload_img<?php echo langtolng($G_lang); ?>.js"></script>
-<script type="text/javascript" src="room.js"></script>
-<script type="text/javascript" src="md5.js"></script>
-<script type="text/javascript" src="probrowser.js"></script>
-<script type="text/javascript" src="json2.js"></script>
-<script type="text/javascript" src="/cookie_law.js"></script>
-<link rel="stylesheet" type="text/css" href="/cookie_law.css">
-<link rel="stylesheet" type="text/css" href="brisk.css">
-<link rel="stylesheet" type="text/css" href="room.css">
+<script type="text/javascript" src="commons.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="fieldify.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="prefs.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="info.js?v=<? echo BSK_BUSTING; ?>"></script>
+<!-- <script type="text/javascript" src="myconsole.js?v=<? echo BSK_BUSTING; ?>"></script> -->
+<script type="text/javascript" src="menu.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="heartbit.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="xynt-streaming.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="preload_img<?php echo langtolng($G_lang); ?>.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="room.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="md5.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="probrowser.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="json2.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="/cookie_law.js?v=<? echo BSK_BUSTING; ?>"></script>
+<link rel="stylesheet" type="text/css" href="/cookie_law.css?v=<? echo BSK_BUSTING; ?>">
+<link rel="stylesheet" type="text/css" href="brisk.css?v=<? echo BSK_BUSTING; ?>">
+<link rel="stylesheet" type="text/css" href="room.css?v=<? echo BSK_BUSTING; ?>">
 
 <script type="text/javascript"><!--
 var myname = null;
@@ -1194,23 +1194,23 @@ cookie_law(null);
 <title>Brisk</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link rel="shortcut icon" href="img/brisk_ico.png">
-<script type="text/javascript" src="commons.js"></script>
-<script type="text/javascript" src="fieldify.js"></script>
-<script type="text/javascript" src="prefs.js"></script>
-<script type="text/javascript" src="info.js"></script>
-<!-- <script type="text/javascript" src="myconsole.js"></script> -->
-<script type="text/javascript" src="menu.js"></script>
-<script type="text/javascript" src="ticker.js"></script>
-<script type="text/javascript" src="heartbit.js"></script>
-<script type="text/javascript" src="xynt-streaming.js"></script>
-<script type="text/javascript" src="room.js"></script>
-<script type="text/javascript" src="preload_img<?php echo langtolng($G_lang); ?>.js"></script>
-<script type="text/javascript" src="probrowser.js"></script>
-<script type="text/javascript" src="json2.js"></script>
-<script type="text/javascript" src="/cookie_law.js"></script>
-<link rel="stylesheet" type="text/css" href="/cookie_law.css">
-<link rel="stylesheet" type="text/css" href="brisk.css">
-<link rel="stylesheet" type="text/css" href="room.css">
+<script type="text/javascript" src="commons.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="fieldify.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="prefs.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="info.js?v=<? echo BSK_BUSTING; ?>"></script>
+<!-- <script type="text/javascript" src="myconsole.js?v=<? echo BSK_BUSTING; ?>"></script> -->
+<script type="text/javascript" src="menu.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="ticker.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="heartbit.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="xynt-streaming.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="room.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="preload_img<?php echo langtolng($G_lang); ?>.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="probrowser.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="json2.js?v=<? echo BSK_BUSTING; ?>"></script>
+<script type="text/javascript" src="/cookie_law.js?v=<? echo BSK_BUSTING; ?>"></script>
+<link rel="stylesheet" type="text/css" href="/cookie_law.css?v=<? echo BSK_BUSTING; ?>">
+<link rel="stylesheet" type="text/css" href="brisk.css?v=<? echo BSK_BUSTING; ?>">
+<link rel="stylesheet" type="text/css" href="room.css?v=<? echo BSK_BUSTING; ?>">
 <script type="text/javascript"><!--
    var sess = "not_connected";
    var g_debug = 0;
Brisk - briscola chiamata in salsa Ajax: sources.