From: Matteo Nastasi Date: Sat, 18 Apr 2020 09:35:24 +0000 (+0200) Subject: Merge branch 'master' into post-bold2 X-Git-Tag: v5.10.0~55 X-Git-Url: https://mop.ddnsfree.com/gitweb/?p=brisk.git;a=commitdiff_plain;h=028592d3d195d45f0e19d324c7d7c029a06d0a0c;hp=16a41a69d1a020612c8db3c88657ac8cfab3c0d2 Merge branch 'master' into post-bold2 --- diff --git a/INSTALL.sh b/INSTALL.sh index 0266f47..dce6e83 100755 --- 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 --- 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.'), NOVITA\': dati dai client via web-socket.', diff --git a/web/Obj/transports.phh b/web/Obj/transports.phh index 921d15e..ea592a8 100644 --- a/web/Obj/transports.phh +++ b/web/Obj/transports.phh @@ -595,10 +595,10 @@ class Transport_iframe { $ret .= sprintf(" - - + + - + + diff --git a/web/briskin5/index.php b/web/briskin5/index.php index 6071c73..d4159f1 100644 --- 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 Brisk - Tavolo <?php echo "$table_idx";?> - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + +