Small update.

git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@764 2b68903e-0b30-0410-9a39-a2e4f3c5be39

diff --git a/inc/admin/main.php b/inc/admin/main.php
index f430b74..445543c 100644 (file)
--- a/inc/admin/main.php
+++ b/inc/admin/main.php
@@ -11,7 +11,7 @@
     Copyright 2004-2011 iDB Support - http://idb.berlios.de/
     Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: main.php - Last Update: 10/10/2011 SVN 762 - Author: cooldude2k $
+    $FileInfo: main.php - Last Update: 10/25/2011 SVN 764 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="main.php"||$File3Name=="/main.php") {
@@ -226,7 +226,7 @@ $BoardSettings=$pretext2[0]."\n".
 "\$Settings['IPCheckURL'] = ".null_string($Settings['IPCheckURL']).";\n".
 "\$Settings['log_http_request'] = ".null_string($Settings['log_http_request']).";\n".
 "\$Settings['log_config_format'] = ".null_string($Settings['log_config_format']).";\n".
-"\$Settings['BoardUUID'] = ".null_string($Settings['BoardUUID']).";\n".
+"\$Settings['BoardUUID'] = ".null_string(base64_encode($Settings['BoardUUID'])).";\n".
 "\$Settings['KarmaBoostDays'] = ".null_string($Settings['KarmaBoostDays']).";\n".
 "\$Settings['KBoostPercent'] = ".null_string($Settings['KBoostPercent']).";\n".$pretext2[1]."\n".
 "\$SettInfo['board_name'] = ".null_string($SettInfo['board_name']).";\n".
@@ -471,7 +471,7 @@ $admincptitle = " ".$ThemeSet['TitleDivider']." Admin CP";
 </table>
 </div>
 <?php } if($_GET['act']=="settings"&&$_POST['update']!="now") {
-require('settings.php'); $admincptitle = " ".$ThemeSet['TitleDivider']." Settings Manager";
+$admincptitle = " ".$ThemeSet['TitleDivider']." Settings Manager";
 $ts_array = explode(":",$Settings['DefaultTimeZone']);
 if(count($ts_array)!=2) {
        if(!isset($ts_array[0])) { $ts_array[0] = "0"; }
@@ -528,7 +528,7 @@ if(isset($_GET['menu'])&&$_GET['menu']=="main") { $AddChkURL = "&menu=main"; }
 </tr><?php } if($GroupInfo['ViewDBInfo']=="yes") { 
 ?><tr style="text-align: left;">
        <td style="width: 50%;"><span class="TextBoxLabel">Forum Software Version:</span></td>
-       <td style="width: 50%;"><?php echo $VerInfo['iDB_Ver_Show']; ?>&nbsp;<a href="<?php echo url_maker($exfile['admin'],$Settings['file_ext'],"act=vercheck",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin']); ?>" onclick="window.open(this.href);return false;"><img src="<?php echo $AdminCheckURL; ?>" alt="Version Check: Click to see more info." title="Version Check: Click to see more info." /></a></td>
+       <td style="width: 50%;"><?php echo "<span title=\"".$VerInfo['iDB_Full_Ver_Show']."\">".$VerInfo['iDB_Ver_Show']."</span>"; ?><!--&nbsp;<a href="<?php echo url_maker($exfile['admin'],$Settings['file_ext'],"act=vercheck",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin']); ?>" onclick="window.open(this.href);return false;"><img src="<?php echo $AdminCheckURL; ?>" alt="Version Check: Click to see more info." title="Version Check: Click to see more info." /></a>--></td>
 </tr><tr>
        <td style="width: 50%;"><span class="TextBoxLabel">Forum UUID:</span></td>
        <td style="width: 50%;"><?php echo $Settings['BoardUUID']; ?></td>
@@ -985,7 +985,7 @@ $BoardSettings=$pretext2[0]."\n".
 "\$Settings['IPCheckURL'] = ".null_string($Settings['IPCheckURL']).";\n".
 "\$Settings['log_http_request'] = ".null_string($Settings['log_http_request']).";\n".
 "\$Settings['log_config_format'] = ".null_string($Settings['log_config_format']).";\n".
-"\$Settings['BoardUUID'] = ".null_string($Settings['BoardUUID']).";\n".
+"\$Settings['BoardUUID'] = ".null_string(base64_encode($Settings['BoardUUID'])).";\n".
 "\$Settings['KarmaBoostDays'] = ".null_string($Settings['KarmaBoostDays']).";\n".
 "\$Settings['KBoostPercent'] = ".null_string($Settings['KBoostPercent']).";\n".$pretext2[1]."\n".
 "\$SettInfo['board_name'] = ".null_string($SettInfo['board_name']).";\n".
@@ -1011,7 +1011,7 @@ fclose($fp);
 $fp = fopen("settingsbak.php","w+");
 fwrite($fp, $BoardSettingsBak);
 fclose($fp); } if($_GET['act']=="sql"&&$_POST['update']!="now"&&$GroupInfo['ViewDBInfo']=="yes") {
-require('settings.php'); $admincptitle = " ".$ThemeSet['TitleDivider']." Database Manager";
+$admincptitle = " ".$ThemeSet['TitleDivider']." Database Manager";
 ?>
 <div class="TableMenuBorder">
 <?php if($ThemeSet['TableStyle']=="div") { ?>
@@ -1170,7 +1170,7 @@ $BoardSettings=$pretext2[0]."\n".
 "\$Settings['IPCheckURL'] = ".null_string($Settings['IPCheckURL']).";\n".
 "\$Settings['log_http_request'] = ".null_string($Settings['log_http_request']).";\n".
 "\$Settings['log_config_format'] = ".null_string($Settings['log_config_format']).";\n".
-"\$Settings['BoardUUID'] = ".null_string($Settings['BoardUUID']).";\n".
+"\$Settings['BoardUUID'] = ".null_string(base64_encode($Settings['BoardUUID'])).";\n".
 "\$Settings['KarmaBoostDays'] = ".null_string($Settings['KarmaBoostDays']).";\n".
 "\$Settings['KBoostPercent'] = ".null_string($Settings['KBoostPercent']).";\n".$pretext2[1]."\n".
 "\$SettInfo['board_name'] = ".null_string($SettInfo['board_name']).";\n".
@@ -1196,7 +1196,7 @@ fclose($fp);
 $fp = fopen("settingsbak.php","w+");
 fwrite($fp, $BoardSettingsBak);
 fclose($fp); } if($_GET['act']=="info"&&$_POST['update']!="now") {
-require('settings.php'); $admincptitle = " ".$ThemeSet['TitleDivider']." Board Info Manager";
+$admincptitle = " ".$ThemeSet['TitleDivider']." Board Info Manager";
 ?>
 <div class="TableMenuBorder">
 <?php if($ThemeSet['TableStyle']=="div") { ?>
@@ -1334,7 +1334,7 @@ $BoardSettings=$pretext2[0]."\n".
 "\$Settings['IPCheckURL'] = ".null_string($Settings['IPCheckURL']).";\n".
 "\$Settings['log_http_request'] = ".null_string($Settings['log_http_request']).";\n".
 "\$Settings['log_config_format'] = ".null_string($Settings['log_config_format']).";\n".
-"\$Settings['BoardUUID'] = ".null_string($Settings['BoardUUID']).";\n".
+"\$Settings['BoardUUID'] = ".null_string(base64_encode($Settings['BoardUUID'])).";\n".
 "\$Settings['KarmaBoostDays'] = ".null_string($Settings['KarmaBoostDays']).";\n".
 "\$Settings['KBoostPercent'] = ".null_string($Settings['KBoostPercent']).";\n".$pretext2[1]."\n".
 "\$SettInfo['board_name'] = ".null_string($_POST['board_name']).";\n".

diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index b71db04..2b468d2 100644 (file)
--- a/inc/versioninfo.php
+++ b/inc/versioninfo.php
@@ -11,7 +11,7 @@
     Copyright 2008-2011 iDB Support - http://idb.berlios.de/
     Copyright 2008-2011 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: versioninfo.php - Last Update: 10/24/2011 SVN 763 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 10/25/2011 SVN 764 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="versioninfo.php"||$File3Name=="/versioninfo.php") {
@@ -27,8 +27,8 @@ function version_info($proname,$subver,$ver,$supver,$reltype,$svnver,$showsvn) {
        return $return_var; }
 // Version number and date stuff. :P
 $VER1[0] = 0; $VER1[1] = 4; $VER1[2] = 7; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 763;
-$SVNDay[0] = 10; $SVNDay[1] = 24; $SVNDay[2] = 2011; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 764;
+$SVNDay[0] = 10; $SVNDay[1] = 25; $SVNDay[2] = 2011; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
 $AltName = "RDB"; $AltName2 = "ReneeDB"; $RName = "iDB"; $SFName = "IntDB";
 $RFullName = "Internet Discussion Boards"; $AltFullName = "Renee Discussion Boards"; $AltGM2k = "ReneeDB Team";
 $VerCheckName = "iDB"; $AltVerCheckName = "RDB"; $AltiDBHome = "http://duckduckgo.com/?q=ReneeDB";

diff --git a/setup/mkconfig.php b/setup/mkconfig.php
index bbc8f49..2b77e7c 100644 (file)
--- a/setup/mkconfig.php
+++ b/setup/mkconfig.php
@@ -12,7 +12,7 @@
     Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/
     iDB Installer made by Game Maker 2k - http://idb.berlios.net/
 
-    $FileInfo: mkconfig.php - Last Update: 10/10/2011 SVN 762 - Author: cooldude2k $
+    $FileInfo: mkconfig.php - Last Update: 10/25/2011 SVN 764 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="mkconfig.php"||$File3Name=="/mkconfig.php") {
@@ -378,7 +378,7 @@ $BoardSettings=$pretext2[0]."\n".
 "\$Settings['IPCheckURL'] = '';\n".
 "\$Settings['log_http_request'] = '".$_POST['iDBHTTPLogger']."';\n".
 "\$Settings['log_config_format'] = '".$_POST['iDBLoggerFormat']."';\n".
-"\$Settings['BoardUUID'] = '".$ServerUUID."';\n".
+"\$Settings['BoardUUID'] = '".base64_encode($ServerUUID)."';\n".
 "\$Settings['KarmaBoostDays'] = '".$KarmaBoostDay."';\n".
 "\$Settings['KBoostPercent'] = '6|10';\n".$pretext2[1]."\n".
 "\$SettInfo['board_name'] = '".$_POST['NewBoardName']."';\n".

diff --git a/sql.php b/sql.php
index 678560d..1e71dec 100644 (file)
--- a/sql.php
+++ b/sql.php
@@ -11,7 +11,7 @@
     Copyright 2004-2011 iDB Support - http://idb.berlios.de/
     Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: sql.php - Last Update: 10/10/2011 SVN 762 - Author: cooldude2k $
+    $FileInfo: sql.php - Last Update: 10/25/2011 SVN 764 - Author: cooldude2k $
 */
 /* Some ini setting changes uncomment if you need them. 
    Display PHP Errors */
@@ -67,6 +67,8 @@ if(!in_array("ini_set", $disfunc)&&$Settings['qstr']!="/"&&$Settings['qstr']!="&
 ini_set("arg_separator.output",htmlentities($Settings['qstr'], ENT_QUOTES, $Settings['charset']));
 ini_set("arg_separator.input",$Settings['qstr']); } }
 if(!isset($Settings['idburl'])) { $Settings['idburl'] = null; }
+if(isset($Settings['BoardUUID'])) { $Settings['BoardUUID'] = base64_decode($Settings['BoardUUID']); 
+header("Board-Unique-ID: ".$Settings['BoardUUID']); }
 if(!isset($Settings['fixbasedir'])) { $Settings['fixbasedir'] = null; }
 if(!isset($Settings['fixpathinfo'])) { $Settings['fixpathinfo'] = null; }
 if(!isset($Settings['fixcookiedir'])) { $Settings['fixcookiedir'] = null; }