Add files via upload

diff --git a/inc/admin/main.php b/inc/admin/main.php
index 1c3e692..9fcaba1 100644 (file)
--- a/inc/admin/main.php
+++ b/inc/admin/main.php
@@ -11,7 +11,7 @@
     Copyright 2004-2019 iDB Support - https://idb.osdn.jp/support/category.php?act=view&id=1
     Copyright 2004-2019 Game Maker 2k - https://idb.osdn.jp/support/category.php?act=view&id=2
 
-    $FileInfo: main.php - Last Update: 11/26/2020 SVN 921 - Author: cooldude2k $
+    $FileInfo: main.php - Last Update: 6/16/2021 SVN 934 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="main.php"||$File3Name=="/main.php") {
@@ -813,6 +813,7 @@ while ($gi < $gnum) { ?>
        <option<?php if($Settings['use_gzip']=="on") { echo " selected=\"selected\""; } ?> value="on">Yes</option>
        <option<?php if($Settings['use_gzip']=="gzip") { echo " selected=\"selected\""; } ?> value="gzip">Only GZip</option>
        <option<?php if($Settings['use_gzip']=="deflate") { echo " selected=\"selected\""; } ?> value="deflate">Only Deflate</option>
+       <option<?php if($Settings['use_gzip']=="brotli") { echo " selected=\"selected\""; } ?> value="brotli">Only Brotli</option>
        </select></td>
 </tr><tr style="text-align: left;">
        <td style="width: 50%;"><label class="TextBoxLabel" for="HTMLType">HTML Type to use:</label></td>

diff --git a/inc/misc/functions.php b/inc/misc/functions.php
index ef59bd2..eecfabe 100644 (file)
--- a/inc/misc/functions.php
+++ b/inc/misc/functions.php
@@ -11,7 +11,7 @@
     Copyright 2004-2019 iDB Support - https://idb.osdn.jp/support/category.php?act=view&id=1
     Copyright 2004-2019 Game Maker 2k - https://idb.osdn.jp/support/category.php?act=view&id=2
 
-    $FileInfo: functions.php - Last Update: 11/27/2020 SVN 925 - Author: cooldude2k $
+    $FileInfo: functions.php - Last Update: 6/16/2021 SVN 934 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="functions.php"||$File3Name=="/functions.php") {
@@ -70,7 +70,8 @@ else {
 function change_title($new_title,$use_gzip="off",$gzip_type="gzip") {
 global $Settings,$urlstatus;
 if(!isset($urlstatus)||!is_numeric($urlstatus)) { $urlstatus = 200; }
-if($gzip_type!="gzip") { if($gzip_type!="deflate") { $gzip_type = "gzip"; } }
+if($gzip_type!="gzip"&&$gzip_type!="deflate"&&$gzip_type!="brotli") { $gzip_type = "gzip"; }
+if($gzip_type=="brotli"&&!function_exists('brotli_compress')) { $gzip_type = "gzip"; }
 $output = trim(ob_get_clean());
 $output = preg_replace("/<title>(.*?)<\/title>/i", "<title>".$new_title."</title>", $output);
 $new_title_html = htmlentities($new_title, ENT_QUOTES, $Settings['charset']);
@@ -89,6 +90,10 @@ if($use_gzip!="on") {
        idb_log_maker($urlstatus,strlen($output));
        echo $output; }
 if($use_gzip=="on") {
+       if($gzip_type=="brotli"&&function_exists('brotli_compress')) {
+       $goutput = brotli_compress($output); }
+       if($gzip_type=="brotli"&&!function_exists('brotli_compress')) {
+       $gzip_type = "gzip"; }
        if($gzip_type=="gzip") {
        $goutput = gzencode($output); }
        if($gzip_type=="deflate") {
@@ -102,7 +107,8 @@ if($use_gzip=="on") {
 function fix_amp($use_gzip="off",$gzip_type="gzip") {
 global $Settings,$urlstatus;
 if(!isset($urlstatus)||!is_numeric($urlstatus)) { $urlstatus = 200; }
-if($gzip_type!="gzip") { if($gzip_type!="deflate") { $gzip_type = "gzip"; } }
+if($gzip_type!="gzip"&&$gzip_type!="deflate"&&$gzip_type!="brotli") { $gzip_type = "gzip"; }
+if($gzip_type=="brotli"&&!function_exists('brotli_compress')) { $gzip_type = "gzip"; }
 $output = trim(ob_get_clean());
 /* Change Some PHP Settings Fix the &PHPSESSID to &amp;PHPSESSID */
 $SessName = session_name();
@@ -116,6 +122,10 @@ if($use_gzip!="on") {
        idb_log_maker($urlstatus,strlen($output));
        echo $output; }
 if($use_gzip=="on") {
+       if($gzip_type=="brotli"&&function_exists('brotli_compress')) {
+       $goutput = brotli_compress($output); }
+       if($gzip_type=="brotli"&&!function_exists('brotli_compress')) {
+       $gzip_type = "gzip"; }
        if($gzip_type=="gzip") {
        $goutput = gzencode($output); }
        if($gzip_type=="deflate") {
@@ -130,7 +140,8 @@ function gzip_page($use_gzip="off",$gzip_type="gzip") {
 global $Settings,$urlstatus;
 if(!isset($urlstatus)||!is_numeric($urlstatus)) { $urlstatus = 200; }
 $output = trim(ob_get_clean());
-if($gzip_type!="gzip") { if($gzip_type!="deflate") { $gzip_type = "gzip"; } }
+if($gzip_type!="gzip"&&$gzip_type!="deflate"&&$gzip_type!="brotli") { $gzip_type = "gzip"; }
+if($gzip_type=="brotli"&&!function_exists('brotli_compress')) { $gzip_type = "gzip"; }
 if($use_gzip!="on") {
        if($Settings['send_pagesize']=="on") {
        @header("Content-Length: ".decoct(strlen($output))); 
@@ -138,6 +149,10 @@ if($use_gzip!="on") {
        idb_log_maker($urlstatus,strlen($output));
        echo $output; }
 if($use_gzip=="on") {
+       if($gzip_type=="brotli"&&function_exists('brotli_compress')) {
+       $goutput = brotli_compress($output); }
+       if($gzip_type=="brotli"&&!function_exists('brotli_compress')) {
+       $gzip_type = "gzip"; }
        if($gzip_type=="gzip") {
        $goutput = gzencode($output); }
        if($gzip_type=="deflate") {

diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index 3b2de9e..7156ef1 100644 (file)
--- a/inc/versioninfo.php
+++ b/inc/versioninfo.php
@@ -11,7 +11,7 @@
     Copyright 2004-2019 iDB Support - https://idb.osdn.jp/support/category.php?act=view&id=1\r
     Copyright 2004-2019 Game Maker 2k - https://idb.osdn.jp/support/category.php?act=view&id=2\r
 \r
-    $FileInfo: versioninfo.php - Last Update: 5/31/2021 SVN 933 - Author: cooldude2k $\r
+    $FileInfo: versioninfo.php - Last Update: 6/16/2021 SVN 934 - Author: cooldude2k $\r
 */\r
 $File3Name = basename($_SERVER['SCRIPT_NAME']);\r
 if ($File3Name=="versioninfo.php"||$File3Name=="/versioninfo.php") {\r
@@ -27,8 +27,8 @@ function version_info($proname,$subver,$ver,$supver,$reltype,$svnver,$showsvn) {
        return $return_var; }\r
 // Version number and date stuff. :P\r
 $VER1[0] = 0; $VER1[1] = 5; $VER1[2] = 3; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];\r
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 933; $GitRevN = "$Id$";\r
-$SVNDay[0] = 5; $SVNDay[1] = 31; $SVNDay[2] = 2021; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];\r
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 934; $GitRevN = "$Id$";\r
+$SVNDay[0] = 6; $SVNDay[1] = 16; $SVNDay[2] = 2021; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];\r
 $AltName = "DF2k"; $AltName2 = "DF2k"; $RName = "iDB"; $SFName = "IntDB";\r
 $RFullName = "Internet Discussion Boards"; $AltFullName = "Discussion Forums 2k"; $AltGM2k = "Game Maker 2k";\r
 $VerCheckName = "iDB"; $AltVerCheckName = "DF2k"; $AltiDBHome = "https://idb.osdn.jp/";\r

diff --git a/setup/setup.php b/setup/setup.php
index 271b2a8..10447e2 100644 (file)
--- a/setup/setup.php
+++ b/setup/setup.php
@@ -12,7 +12,7 @@
     Copyright 2004-2019 Game Maker 2k - https://idb.osdn.jp/support/category.php?act=view&id=2
     iDB Installer made by Game Maker 2k - http://idb.berlios.net/
 
-    $FileInfo: setup.php - Last Update: 11/26/2020 SVN 921 - Author: cooldude2k $
+    $FileInfo: setup.php - Last Update: 6/16/2021 SVN 934 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="setup.php"||$File3Name=="/setup.php") {
@@ -205,6 +205,7 @@ for ($i=0; $i < count($timezone_identifiers); $i++) {
        <option value="on">Yes</option>
        <option value="gzip">Only GZip</option>
        <option value="deflate">Only Deflate</option>
+       <option value="brotli">Only Brotli</option>
        </select></td>
 </tr><tr>
        <td style="width: 50%;"><label class="TextBoxLabel" for="HTMLType">HTML Type to use:</label></td>

diff --git a/sql.php b/sql.php
index 3d53885..56ad566 100644 (file)
--- a/sql.php
+++ b/sql.php
@@ -11,7 +11,7 @@
     Copyright 2004-2019 iDB Support - https://idb.osdn.jp/support/category.php?act=view&id=1
     Copyright 2004-2019 Game Maker 2k - https://idb.osdn.jp/support/category.php?act=view&id=2
 
-    $FileInfo: sql.php - Last Update: 08/02/2019 SVN 905 - Author: cooldude2k $
+    $FileInfo: sql.php - Last Update: 6/16/2021 SVN 934 - Author: cooldude2k $
 */
 /* Some ini setting changes uncomment if you need them. 
    Display PHP Errors */
@@ -289,11 +289,17 @@ if ($File3Name=="sql.php"||$File3Name=="/sql.php") {
 if($_GET['act']=="MkCaptcha"||$_GET['act']=="Captcha") {
        $Settings['use_gzip'] = 'off'; }
 if($Settings['use_gzip']=="on") {
-if(strstr($_SERVER['HTTP_ACCEPT_ENCODING'], "gzip")) { 
-       $GZipEncode['Type'] = "gzip"; } else { 
-       if(strstr($_SERVER['HTTP_ACCEPT_ENCODING'], "deflate")) { 
-       $GZipEncode['Type'] = "deflate"; } else { 
-               $Settings['use_gzip'] = "off"; $GZipEncode['Type'] = "none"; } } }
+if(strstr($_SERVER['HTTP_ACCEPT_ENCODING'], "br")&&function_exists('brotli_compress')) { 
+       $GZipEncode['Type'] = "brotli"; } else { 
+       if(strstr($_SERVER['HTTP_ACCEPT_ENCODING'], "gzip")) { 
+               $GZipEncode['Type'] = "gzip"; } else { 
+               if(strstr($_SERVER['HTTP_ACCEPT_ENCODING'], "deflate")) { 
+                       $GZipEncode['Type'] = "deflate"; } else { 
+                       $Settings['use_gzip'] = "off"; $GZipEncode['Type'] = "none"; } } } }
+if($Settings['use_gzip']=="brotli"&&function_exists('brotli_compress')) {
+if(strstr($_SERVER['HTTP_ACCEPT_ENCODING'], "br")) { $Settings['use_brotli'] = "on";
+       $GZipEncode['Type'] = "brotli"; } else { $Settings['use_gzip'] = "off"; } }
+if($Settings['use_gzip']=="brotli"&&!function_exists('brotli_compress')) { $GZipEncode['Type'] = "gzip"; }
 if($Settings['use_gzip']=="gzip") {
 if(strstr($_SERVER['HTTP_ACCEPT_ENCODING'], "gzip")) { $Settings['use_gzip'] = "on";
        $GZipEncode['Type'] = "gzip"; } else { $Settings['use_gzip'] = "off"; } }