OSDN Git Service

Small update to SQLThemes.
authorKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Mon, 13 Sep 2010 22:36:07 +0000 (22:36 +0000)
committerKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Mon, 13 Sep 2010 22:36:07 +0000 (22:36 +0000)
git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@543 2b68903e-0b30-0410-9a39-a2e4f3c5be39

admin.php
inc/admin/main.php
inc/admin/table.php
inc/versioninfo.php

index 200e35f..32c83f6 100644 (file)
--- a/admin.php
+++ b/admin.php
@@ -11,7 +11,7 @@
     Copyright 2004-2010 iDB Support - http://idb.berlios.de/
     Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: admin.php - Last Update: 09/12/2010 SVN 542 - Author: cooldude2k $
+    $FileInfo: admin.php - Last Update: 09/13/2010 SVN 543 - Author: cooldude2k $
 */
 if(ini_get("register_globals")) {
 require_once('inc/misc/killglobals.php'); }
@@ -74,7 +74,8 @@ if($_GET['act']=="settings"||
        $_GET['act']=="info"||
        $_GET['act']=="optimize"||
        $_GET['act']=="delsessions"||
-       $_GET['act']=="resyncthemes")
+       $_GET['act']=="resyncthemes"||
+       $_GET['act']=="enablesthemes")
 { $AdminMenu = "main";
 require($SettDir['admin'].'main.php'); }
 if($_GET['act']=="addforum"||
index 0fa1090..79efb66 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2010 iDB Support - http://idb.berlios.de/
     Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: main.php - Last Update: 09/12/2010 SVN 542 - Author: cooldude2k $
+    $FileInfo: main.php - Last Update: 09/13/2010 SVN 543 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="main.php"||$File3Name=="/main.php") {
@@ -29,7 +29,8 @@ redirect("location",$rbasedir.url_maker($exfile['index'],$Settings['file_ext'],"
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if(!isset($_POST['update'])) { $_POST['update'] = null; }
-if($_GET['act']=="resyncthemes"&&$Settings['SQLThemes']!="on") { $_GET['act'] = "view"; }
+if($_GET['act']=="resyncthemes"&&$Settings['SQLThemes']!="on") { $_GET['act'] = "enablesthemes"; }
+if($_GET['act']=="enablesthemes"&&$Settings['SQLThemes']!="off") { $_GET['act'] = "resyncthemes"; }
 $iDBRDate = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
 $iDBRSVN = $VER2[2]." ".$SubVerN;
 $OutPutLog = null;
@@ -122,8 +123,106 @@ $time = GMTimeStamp() - ini_get("session.gc_maxlifetime");
 //$sqlg = sql_pre_query('DELETE FROM \"'.$Settings['sqltable'].'sessions\" WHERE \"expires\" < UNIX_TIMESTAMP();', array(null));
 $sqlgc = sql_pre_query("DELETE FROM \"".$Settings['sqltable']."sessions\" WHERE \"expires\" < %i", array($time));
 sql_query($sqlgc,$SQLStat);
-$_GET['act'] = "optimize";
-$_POST['update'] = "now"; $_GET['act'] = "view"; }
+$_POST['update'] = "now"; $_GET['act'] = "optimize"; }
+if($_GET['act']=="enablesthemes"&&$GroupInfo['ViewDBInfo']=="yes"&&$Settings['SQLThemes']=="off") {
+$Settings['board_name'] = htmlspecialchars($Settings['board_name'], ENT_QUOTES, $Settings['charset']);
+$Settings['board_name'] = fixbamps($Settings['board_name']);
+$Settings['board_name'] = remove_spaces($Settings['board_name']);
+$Settings['board_name'] = str_replace("\&#039;", "&#039;", $Settings['board_name']);
+$SettInfo['board_name'] = htmlspecialchars($SettInfo['board_name'], ENT_QUOTES, $Settings['charset']);
+$SettInfo['board_name'] = fixbamps($SettInfo['board_name']);
+$SettInfo['board_name'] = remove_spaces($SettInfo['board_name']);
+$SettInfo['board_name'] = str_replace("\&#039;", "&#039;", $SettInfo['board_name']);
+$SettInfo['Author'] = htmlspecialchars($SettInfo['Author'], ENT_QUOTES, $Settings['charset']);
+$SettInfo['Author'] = fixbamps($SettInfo['Author']);
+$SettInfo['Author'] = remove_spaces($SettInfo['Author']);
+$SettInfo['Author'] = str_replace("\&#039;", "&#039;", $SettInfo['Author']);
+$SettInfo['Keywords'] = htmlspecialchars($SettInfo['Keywords'], ENT_QUOTES, $Settings['charset']);
+$SettInfo['Keywords'] = fixbamps($SettInfo['Keywords']);
+$SettInfo['Keywords'] = remove_spaces($SettInfo['Keywords']);
+$SettInfo['Keywords'] = str_replace("\&#039;", "&#039;", $SettInfo['Keywords']);
+$SettInfo['Description'] = htmlspecialchars($SettInfo['Description'], ENT_QUOTES, $Settings['charset']);
+$SettInfo['Description'] = fixbamps($SettInfo['Description']);
+$SettInfo['Description'] = remove_spaces($SettInfo['Description']);
+$SettInfo['Description'] = str_replace("\&#039;", "&#039;", $SettInfo['Description']);
+$BoardSettings=$pretext2[0]."\n".
+"\$Settings['sqlhost'] = ".null_string($Settings['sqlhost']).";\n".
+"\$Settings['sqldb'] = ".null_string($Settings['sqldb']).";\n".
+"\$Settings['sqltable'] = ".null_string($Settings['sqltable']).";\n".
+"\$Settings['sqluser'] = ".null_string($Settings['sqluser']).";\n".
+"\$Settings['sqlpass'] = ".null_string($Settings['sqlpass']).";\n".
+"\$Settings['sqltype'] = ".null_string($Settings['sqltype']).";\n".
+"\$Settings['board_name'] = ".null_string($Settings['board_name']).";\n".
+"\$Settings['idbdir'] = ".null_string($Settings['idbdir']).";\n".
+"\$Settings['idburl'] = ".null_string($Settings['idburl']).";\n".
+"\$Settings['enable_https'] = ".null_string($Settings['enable_https']).";\n".
+"\$Settings['weburl'] = ".null_string($Settings['weburl']).";\n".
+"\$Settings['SQLThemes'] = 'on';\n".
+"\$Settings['use_gzip'] = ".null_string($Settings['use_gzip']).";\n".
+"\$Settings['html_type'] = ".null_string($Settings['html_type']).";\n".
+"\$Settings['html_level'] = ".null_string($Settings['html_level']).";\n".
+"\$Settings['output_type'] = ".null_string($Settings['output_type']).";\n".
+"\$Settings['GuestGroup'] = ".null_string($Settings['GuestGroup']).";\n".
+"\$Settings['MemberGroup'] = ".null_string($Settings['MemberGroup']).";\n".
+"\$Settings['ValidateGroup'] = ".null_string($Settings['ValidateGroup']).";\n".
+"\$Settings['AdminValidate'] = ".null_string($Settings['AdminValidate']).";\n".
+"\$Settings['TestReferer'] = ".null_string($Settings['TestReferer']).";\n".
+"\$Settings['DefaultTheme'] = ".null_string($Settings['DefaultTheme']).";\n".
+"\$Settings['DefaultTimeZone'] = ".null_string($Settings['DefaultTimeZone']).";\n".
+"\$Settings['DefaultDST'] = ".null_string($Settings['DefaultDST']).";\n".
+"\$Settings['start_date'] = ".null_string($Settings['start_date']).";\n".
+"\$Settings['use_hashtype'] = ".null_string($Settings['use_hashtype']).";\n".
+"\$Settings['charset'] = ".null_string($Settings['charset']).";\n".
+"\$Settings['add_power_by'] = ".null_string($Settings['add_power_by']).";\n".
+"\$Settings['send_pagesize'] = ".null_string($Settings['send_pagesize']).";\n".
+"\$Settings['max_posts'] = ".null_string($Settings['max_posts']).";\n".
+"\$Settings['max_topics'] = ".null_string($Settings['max_topics']).";\n".
+"\$Settings['max_memlist'] = ".null_string($Settings['max_memlist']).";\n".
+"\$Settings['max_pmlist'] = ".null_string($Settings['max_pmlist']).";\n".
+"\$Settings['hot_topic_num'] = ".null_string($Settings['hot_topic_num']).";\n".
+"\$Settings['qstr'] = ".null_string($Settings['qstr']).";\n".
+"\$Settings['qsep'] = ".null_string($Settings['qsep']).";\n".
+"\$Settings['file_ext'] = ".null_string($Settings['file_ext']).";\n".
+"\$Settings['rss_ext'] = ".null_string($Settings['rss_ext']).";\n".
+"\$Settings['js_ext'] = ".null_string($Settings['js_ext']).";\n".
+"\$Settings['showverinfo'] = ".null_string($Settings['showverinfo']).";\n".
+"\$Settings['vercheck'] = ".null_string($Settings['vercheck']).";\n".
+"\$Settings['enable_rss'] = ".null_string($Settings['enable_rss']).";\n".
+"\$Settings['enable_search'] = ".null_string($Settings['enable_search']).";\n".
+"\$Settings['sessionid_in_urls'] = ".null_string($Settings['sessionid_in_urls']).";\n".
+"\$Settings['fixpathinfo'] = ".null_string($Settings['fixpathinfo']).";\n".
+"\$Settings['fixbasedir'] = ".null_string($Settings['fixbasedir']).";\n".
+"\$Settings['fixcookiedir'] = ".null_string($Settings['fixcookiedir']).";\n".
+"\$Settings['fixredirectdir'] = ".null_string($Settings['fixredirectdir']).";\n".
+"\$Settings['enable_pathinfo'] = ".null_string($Settings['enable_pathinfo']).";\n".
+"\$Settings['rssurl'] = ".null_string($Settings['rssurl']).";\n".
+"\$Settings['board_offline'] = ".null_string($Settings['board_offline']).";\n".
+"\$Settings['BoardUUID'] = ".null_string($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".
+"\$SettInfo['Author'] = ".null_string($SettInfo['Author']).";\n".
+"\$SettInfo['Keywords'] = ".null_string($SettInfo['Keywords']).";\n".
+"\$SettInfo['Description'] = ".null_string($SettInfo['Description']).";\n".$pretext2[2]."\n".
+"\$SettDir['maindir'] = ".null_string($SettDir['maindir']).";\n".
+"\$SettDir['inc'] = ".null_string($SettDir['inc']).";\n".
+"\$SettDir['misc'] = ".null_string($SettDir['misc']).";\n".
+"\$SettDir['sql'] = ".null_string($SettDir['sql']).";\n".
+"\$SettDir['admin'] = ".null_string($SettDir['admin']).";\n".
+"\$SettDir['sqldumper'] = ".null_string($SettDir['sqldumper']).";\n".
+"\$SettDir['mod'] = ".null_string($SettDir['mod']).";\n".
+"\$SettDir['themes'] = ".null_string($SettDir['themes']).";\n".$pretext2[3]."\n?>";
+$BoardSettingsBak = $pretext.$settcheck.$BoardSettings;
+$BoardSettings = $pretext.$settcheck.$BoardSettings;
+$fp = fopen("settings.php","w+");
+fwrite($fp, $BoardSettings);
+fclose($fp);
+//     cp("settings.php","settingsbak.php");
+$fp = fopen("settingsbak.php","w+");
+fwrite($fp, $BoardSettingsBak);
+fclose($fp);
+$Settings['SQLThemes'] = "on";
+$_POST['update'] = "now"; $_GET['act'] = "resyncthemes"; }
 if($_GET['act']=="resyncthemes"&&$GroupInfo['ViewDBInfo']=="yes"&&$Settings['SQLThemes']=="on") {
 $time = GMTimeStamp() - ini_get("session.gc_maxlifetime");
 //$sqlg = sql_pre_query('DELETE FROM \"'.$Settings['sqltable'].'sessions\" WHERE \"expires\" < UNIX_TIMESTAMP();', array(null));
@@ -162,8 +261,7 @@ $themequery = sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."themes\" W
 $themeresult=sql_query($themequery,$SQLStat);
 $themenum=sql_num_rows($themeresult);
 require($SettDir['inc'].'sqlthemes.php');
-$_GET['act'] = "optimize";
-$_POST['update'] = "now"; $_GET['act'] = "view"; }
+$_POST['update'] = "now"; $_GET['act'] = "optimize"; }
 if($_GET['act']=="optimize"&&$GroupInfo['ViewDBInfo']=="yes") {
 $TablePreFix = $Settings['sqltable'];
 function add_prefix($tarray) {
index 7e6bd5f..7195d2f 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: table.php - Last Update: 12/19/2009 SVN 429 - Author: cooldude2k $
+    $FileInfo: table.php - Last Update: 09/13/2010 SVN 543 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="table.php"||$File3Name=="/table.php") {
@@ -73,9 +73,12 @@ if ($File3Name=="table.php"||$File3Name=="/table.php") {
 <?php } ?>
 </tr><tr class="TableSMenuRow3">
 <td class="TableSMenuColumn3"><a href="<?php echo url_maker($exfile['admin'],$Settings['file_ext'],"act=delsessions",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin']); ?>">Clean Sessions</a></td>
-<?php if($Settings['SQLThemes']=="on") { ?>
+<?php if($Settings['SQLThemes']=="off") { ?>
 </tr><tr class="TableSMenuRow3">
-<td class="TableSMenuColumn3"><a href="<?php echo url_maker($exfile['admin'],$Settings['file_ext'],"act=resyncthemes",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin']); ?>">Resync Themes</a></td>
+<td class="TableSMenuColumn3"><a href="<?php echo url_maker($exfile['admin'],$Settings['file_ext'],"act=resyncthemes",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin']); ?>">Enable SQLThemes</a></td>
+<?php } if($Settings['SQLThemes']=="on") { ?>
+</tr><tr class="TableSMenuRow3">
+<td class="TableSMenuColumn3"><a href="<?php echo url_maker($exfile['admin'],$Settings['file_ext'],"act=enablesthemes",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin']); ?>">Resync Themes</a></td>
 <?php } ?>
 </tr><tr class="TableSMenuRow3">
 <td class="TableSMenuColumn3"><a href="<?php echo url_maker($exfile['admin'],$Settings['file_ext'],"act=optimize",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin']); ?>">Optimize Tables</a></td>
index 910f04b..8b5f40a 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2010 iDB Support - http://idb.berlios.de/
     Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: versioninfo.php - Last Update: 09/12/2010 SVN 542 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 09/13/2010 SVN 543 - 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] = 1; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 542; $RName = "iDB"; $SFName = "IntDB";
-$SVNDay[0] = 09; $SVNDay[1] = 12; $SVNDay[2] = 2010; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 543; $RName = "iDB"; $SFName = "IntDB";
+$SVNDay[0] = 09; $SVNDay[1] = 13; $SVNDay[2] = 2010; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
 $VerInfo['iDB_Ver'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[1],$SubVerN,false);
 $VerInfo['iDB_Ver_SVN'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[1],$SubVerN,true);
 $VerInfo['iDB_Full_Ver'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[0],$SubVerN,false);