OSDN Git Service

(root) / idb / iDB.git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 560c9fa)
Small update and bug fix.
authorKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Sat, 1 May 2010 03:59:31 +0000 (03:59 +0000)
committerKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Sat, 1 May 2010 03:59:31 +0000 (03:59 +0000)
git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@478 2b68903e-0b30-0410-9a39-a2e4f3c5be39

inc/admin/categories.php patch | blob | history
inc/admin/forums.php patch | blob | history
inc/function.php patch | blob | history
inc/versioninfo.php patch | blob | history
sql.php patch | blob | history

diff --git a/inc/admin/categories.php b/inc/admin/categories.php
index 771069a..0929cb9 100644 (file)
--- a/inc/admin/categories.php
+++ b/inc/admin/categories.php
@@ -11,7 +11,7 @@
     Copyright 2004-2010 iDB Support - http://idb.berlios.de/
     Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: categories.php - Last Update: 04/14/2010 SVN 467 - Author: cooldude2k $
+    $FileInfo: categories.php - Last Update: 04/30/2010 SVN 478 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="categories.php"||$File3Name=="/categories.php") {
@@ -545,7 +545,13 @@ $admincptitle = " ".$ThemeSet['TitleDivider']." Updating Settings";
 $query = sql_pre_query("UPDATE \"".$Settings['sqltable']."categories\" SET \"id\"=%i,\"OrderID\"=%i,\"Name\"='%s',\"ShowCategory\"='%s',\"CategoryType\"='%s',\"InSubCategory\"=%i,\"Description\"='%s',\"PostCountView\"=%i,\"KarmaCountView\"=%i WHERE \"id\"=%i", array($_POST['CategoryID'],$_POST['OrderID'],$_POST['CategoryName'],$_POST['ShowCategory'],$_POST['CategoryType'],$_POST['InSubCategory'],$_POST['CategoryDesc'],$_POST['NumPostView'],$_POST['NumKarmaView'],$_POST['id']));
 sql_query($query,$SQLStat); 
 $queryz = sql_pre_query("UPDATE \"".$Settings['sqltable']."catpermissions\" SET \"CategoryID\"=%i WHERE \"CategoryID\"=%i", array($_POST['CategoryID'],$_POST['id']));
-sql_query($queryz,$SQLStat); } } } 
+sql_query($queryz,$SQLStat); 
+$query = sql_pre_query("UPDATE \"".$Settings['sqltable']."forums\" SET \"CategoryID\"=%i WHERE \"CategoryID\"=%i", array($_POST['CategoryID'],$_POST['id']));
+sql_query($query,$SQLStat);
+$query = sql_pre_query("UPDATE \"".$Settings['sqltable']."topics\" SET \"CategoryID\"=%i WHERE \"CategoryID\"=%i", array($_POST['CategoryID'],$_POST['id']));
+sql_query($query,$SQLStat);
+$query = sql_pre_query("UPDATE \"".$Settings['sqltable']."posts\" SET \"CategoryID\"=%i WHERE \"CategoryID\"=%i", array($_POST['CategoryID'],$_POST['id']));
+sql_query($query,$SQLStat); } } } 
 if($_GET['act']=="cpermissions"&&$_POST['update']!="now") {
 $admincptitle = " ".$ThemeSet['TitleDivider']." Category Permissions Manager";
 if(!isset($_POST['id'])) {
diff --git a/inc/admin/forums.php b/inc/admin/forums.php
index 61e8813..041fbc2 100644 (file)
--- a/inc/admin/forums.php
+++ b/inc/admin/forums.php
@@ -11,7 +11,7 @@
     Copyright 2004-2010 iDB Support - http://idb.berlios.de/
     Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: forums.php - Last Update: 04/05/2010 SVN 461 - Author: cooldude2k $
+    $FileInfo: forums.php - Last Update: 04/30/2010 SVN 478 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="forums.php"||$File3Name=="/forums.php") {
@@ -917,6 +917,13 @@ redirect("refresh",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"ac
 $admincptitle = " ".$ThemeSet['TitleDivider']." Updating Settings";
 $query = sql_pre_query("UPDATE \"".$Settings['sqltable']."forums\" SET \"id\"=%i,\"CategoryID\"=%i,\"OrderID\"=%i,\"Name\"='%s',\"ShowForum\"='%s',\"ForumType\"='%s',\"InSubForum\"=%i,\"RedirectURL\"='%s',\"Description\"='%s',\"PostCountAdd\"='%s',\"PostCountView\"=%i,\"KarmaCountView\"=%i,\"CanHaveTopics\"='%s',\"HotTopicPosts\"=%i WHERE \"id\"=%i", array($_POST['ForumID'],$_POST['ForumCatID'],$_POST['OrderID'],$_POST['ForumName'],$_POST['ShowForum'],$_POST['ForumType'],$_POST['InSubForum'],$_POST['RedirectURL'],$_POST['ForumDesc'],$_POST['PostCountAdd'],$_POST['NumPostView'],$_POST['NumKarmaView'],$_POST['CanHaveTopics'],$_POST['NumPostHotTopic'],$_POST['id']));
 sql_query($query,$SQLStat);
+if($_POST['ForumID']!=$_POST['id']) { 
+$query = sql_pre_query("UPDATE \"".$Settings['sqltable']."forums\" SET \"InSubForum\"=%i WHERE \"InSubForum\"=%i", array($_POST['ForumID'],$_POST['id']));
+sql_query($query,$SQLStat);
+$query = sql_pre_query("UPDATE \"".$Settings['sqltable']."topics\" SET \"ForumID\"=%i WHERE \"ForumID\"=%i", array($_POST['ForumID'],$_POST['id']));
+sql_query($query,$SQLStat);
+$query = sql_pre_query("UPDATE \"".$Settings['sqltable']."posts\" SET \"ForumID\"=%i WHERE \"ForumID\"=%i", array($_POST['ForumID'],$_POST['id']));
+sql_query($query,$SQLStat); }
 $queryz = sql_pre_query("UPDATE \"".$Settings['sqltable']."permissions\" SET \"ForumID\"=%i WHERE \"ForumID\"=%i", array($_POST['ForumID'],$_POST['id']));
 sql_query($queryz,$SQLStat); } } } 
 if($_GET['act']=="fpermissions"&&$_POST['update']!="now") {
diff --git a/inc/function.php b/inc/function.php
index 1acc566..1c3ceaf 100644 (file)
--- a/inc/function.php
+++ b/inc/function.php
@@ -11,7 +11,7 @@
     Copyright 2004-2010 iDB Support - http://idb.berlios.de/
     Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: function.php - Last Update: 04/27/2010 SVN 470 - Author: cooldude2k $
+    $FileInfo: function.php - Last Update: 04/30/2010 SVN 478 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="function.php"||$File3Name=="/function.php") {
@@ -84,7 +84,10 @@ if($uuidver=="v3"||$uuidver=="v5") {
     $nhex = str_replace(array('-','{','}'), '', $namespace);
     $nstr = '';
     for($i = 0; $i < strlen($nhex); $i+=2) {
-      $nstr .= chr(hexdec($nhex[$i].$nhex[$i+1]));
+      if(isset($nhex[$i+1])) {
+         $nstr .= chr(hexdec($nhex[$i].$nhex[$i+1])); }
+      if(!isset($nhex[$i+1])) {
+         $nstr .= chr(hexdec($nhex[$i])); }
     }
        if($name===null) { $name = salt_hmac(); }
     // Calculate hash value
diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index 6844504..315fb55 100644 (file)
--- a/inc/versioninfo.php
+++ b/inc/versioninfo.php
@@ -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: 04/30/2010 SVN 477 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 04/30/2010 SVN 478 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="versioninfo.php"||$File3Name=="/versioninfo.php") {
@@ -27,7 +27,7 @@ function version_info($proname,$subver,$ver,$supver,$reltype,$svnver,$showsvn) {
        return $return_var; }
 // Version number and date stuff. :P
 $VER1[0] = 0; $VER1[1] = 3; $VER1[2] = 8; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 477; $RName = "iDB"; $SFName = "IntDB";
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 478; $RName = "iDB"; $SFName = "IntDB";
 $SVNDay[0] = 04; $SVNDay[1] = 30; $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);
diff --git a/sql.php b/sql.php
index 3b4c94c..9ce672c 100644 (file)
--- a/sql.php
+++ b/sql.php
@@ -11,7 +11,7 @@
     Copyright 2004-2010 iDB Support - http://idb.berlios.de/
     Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: sql.php - Last Update: 04/30/2010 SVN 474 - Author: cooldude2k $
+    $FileInfo: sql.php - Last Update: 04/30/2010 SVN 478 - Author: cooldude2k $
 */
 /* Some ini setting changes uncomment if you need them. 
    Display PHP Errors */
@@ -488,6 +488,9 @@ $PreSkin['skindir1'] = $_SESSION['Theme'];
 $PreSkin['skindir2'] = $SettDir['themes'].$_SESSION['Theme'];
 require($SettDir['themes'].$_GET['theme']."/settings.php"); }
 if($Settings['SQLThemes']=="on") {
+if($_GET['theme']==null&&$_SESSION['Theme']==null) { 
+       $_GET['theme'] = $Settings['DefaultTheme']; 
+       $_SESSION['Theme'] = $Settings['DefaultTheme']; }
 if($_GET['theme']!=null) {
 $themequery = sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."themes\" WHERE \"Name\"='%s'", array($_GET['theme'])); }
 if($_GET['theme']==null) { 
Internet Discussion Boards is a message board system by Game Maker 2k. Its very easy to set up. Your web host needs PHP and CUBRID / MySQL / MariaDB / PostgreSQL / SQLite. Internet Discussion Boards is Open Source so you can make changes to it.
About OSDN
Find Software
Develop Software
Help