Add files via upload

diff --git a/inc/admin/main.php b/inc/admin/main.php
index 7f5eb42..da8b1a4 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: 08/02/2019 SVN 905 - Author: cooldude2k $
+    $FileInfo: main.php - Last Update: 08/07/2019 SVN 909 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="main.php"||$File3Name=="/main.php") {
@@ -1209,10 +1209,13 @@ $admincptitle = " ".$ThemeSet['TitleDivider']." Database Manager";
 ?><tr style="text-align: left;">
        <td style="width: 50%;"><span class="TextBoxLabel">Database File Size:</span></td>
        <td style="width: 50%;"><?php echo sprintf("%u", filesize($Settings['sqldb']))." bytes"; ?></td>
+</tr><tr style="text-align: left;">
+       <td style="width: 50%;"><span class="TextBoxLabel">Human Readable File Size:</span></td>
+       <td style="width: 50%;"><?php echo human_filesize(sprintf("%u", filesize($Settings['sqldb']))); ?></td>
 </tr><?php } if($Settings['sqltype']=="cubrid") { ?><tr style="text-align: left;">
        <td style="width: 50%;"><span class="TextBoxLabel">CUBRID PHP:</span></td>
        <td style="width: 50%;"><?php echo $DBType['PHP']; ?></td>
-</tr><?php } ?><tr style="text-align: left;">
+</tr><?php } if($Settings['sqltype']!="sqlite"&&$Settings['sqltype']!="sqlite3") {  ?><tr style="text-align: left;">
        <td style="width: 50%;"><label class="TextBoxLabel" for="DatabaseUserName">Insert Database User Name:</label></td>
        <td style="width: 50%;"><input type="text" name="DatabaseUserName" class="TextBox" id="DatabaseUserName" size="20" value="<?php echo $Settings['sqluser']; ?>" /></td>
 </tr><tr style="text-align: left;">
@@ -1227,10 +1230,21 @@ $admincptitle = " ".$ThemeSet['TitleDivider']." Database Manager";
 </tr><tr style="text-align: left;">
        <td style="width: 50%;"><label class="TextBoxLabel" for="tableprefix">Insert Table Prefix:<br /></label></td>
        <td style="width: 50%;"><input type="text" name="tableprefix" class="TextBox" id="tableprefix" size="20" value="<?php echo $Settings['sqltable']; ?>" /></td>
-</tr></table>
+</tr><?php } if($Settings['sqltype']=="sqlite"||$Settings['sqltype']=="sqlite3") {  ?><tr style="text-align: left;">
+       <td style="width: 50%;"><label class="TextBoxLabel" for="DatabaseName">Insert Database FileName:</label></td>
+       <td style="width: 50%;"><input type="text" name="DatabaseName" class="TextBox" id="DatabaseName" size="20" value="<?php echo $Settings['sqldb']; ?>" /></td>
+</tr><tr style="text-align: left;">
+       <td style="width: 50%;"><label class="TextBoxLabel" for="tableprefix">Insert Table Prefix:<br /></label></td>
+       <td style="width: 50%;"><input type="text" name="tableprefix" class="TextBox" id="tableprefix" size="20" value="<?php echo $Settings['sqltable']; ?>" /></td>
+</tr><?php } ?></table>
 <table style="text-align: left;">
 <tr style="text-align: left;">
 <td style="width: 100%;">
+<?php if($Settings['sqltype']=="sqlite"||$Settings['sqltype']=="sqlite3") {  ?>
+<input type="hidden" name="DatabaseUserName" class="TextBox" id="DatabaseUserName" size="20" value="<?php echo $Settings['sqluser']; ?>" />
+<input type="hidden" name="DatabasePassword" class="TextBox" id="DatabasePassword" size="20" value="<?php echo $Settings['sqlpass']; ?>" />
+<input type="hidden" name="DatabaseHost" class="TextBox" id="DatabaseHost" size="20" value="<?php echo $Settings['sqlhost']; ?>" />
+<?php } ?>
 <input type="hidden" name="act" value="sql" style="display: none;" />
 <input type="hidden" name="update" value="now" style="display: none;" />
 <input type="submit" class="Button" value="Apply" name="Apply_Changes" />

diff --git a/inc/misc/functions.php b/inc/misc/functions.php
index d3a818a..5921abd 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: 08/02/2019 SVN 905 - Author: cooldude2k $
+    $FileInfo: functions.php - Last Update: 08/07/2019 SVN 909 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="functions.php"||$File3Name=="/functions.php") {
@@ -582,4 +582,11 @@ function dump_extensions($type="var_dump") {
        if($type=="var_dump") { return var_dump(get_loaded_extensions()); }
        if($type=="var_export") { return var_export(get_loaded_extensions()); } }
 function count_extensions() {  return count(get_loaded_extensions()); }
+// human_filesize by evgenij at kostanay dot kz 
+// URL: https://www.php.net/manual/en/function.filesize.php#120250
+function human_filesize($bytes, $decimals = 2) {
+    $factor = floor((strlen($bytes) - 1) / 3);
+    if ($factor > 0) $sz = 'KMGT';
+    return sprintf("%.{$decimals}f", $bytes / pow(1024, $factor)) . ' ' . @$sz[$factor - 1] . 'B';
+}
 ?>

diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index 2195f25..5befed9 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: 08/06/2019 SVN 908 - Author: cooldude2k $\r
+    $FileInfo: versioninfo.php - Last Update: 08/07/2019 SVN 909 - 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] = 2; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];\r
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 908;\r
-$SVNDay[0] = 8; $SVNDay[1] = 6; $SVNDay[2] = 2019; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];\r
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 909;\r
+$SVNDay[0] = 8; $SVNDay[1] = 7; $SVNDay[2] = 2019; $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