OSDN Git Service

(root) / idb / iDB.git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2a68f27)
Small bugfix.
authorKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Tue, 10 Feb 2009 00:02:06 +0000 (00:02 +0000)
committerKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Tue, 10 Feb 2009 00:02:06 +0000 (00:02 +0000)
git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@229 2b68903e-0b30-0410-9a39-a2e4f3c5be39

inc/replies.php patch | blob | history
inc/topics.php patch | blob | history
inc/versioninfo.php patch | blob | history

diff --git a/inc/replies.php b/inc/replies.php
index 4e120b1..094cc66 100644 (file)
--- a/inc/replies.php
+++ b/inc/replies.php
@@ -11,7 +11,7 @@
     Copyright 2004-2008 Cool Dude 2k - http://idb.berlios.de/
     Copyright 2004-2008 Game Maker 2k - http://intdb.sourceforge.net/
 
-    $FileInfo: replies.php - Last Update: 12/27/2008 SVN 224 - Author: cooldude2k $
+    $FileInfo: replies.php - Last Update: 2/9/2008 SVN 229 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="replies.php"||$File3Name=="/replies.php") {
@@ -45,6 +45,7 @@ $forumcheckx = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`
 $fmckresult=mysql_query($forumcheckx);
 $ForumName=mysql_result($fmckresult,0,"Name");
 $ForumType=mysql_result($fmckresult,0,"ForumType");
+$CanHaveTopics=mysql_result($fmckresult,0,"CanHaveTopics");
 $ForumPostCountView=mysql_result($fmckresult,0,"PostCountView");
 $ForumKarmaCountView=mysql_result($fmckresult,0,"KarmaCountView");
 @mysql_free_result($fmckresult);
@@ -86,7 +87,9 @@ redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"a
 ob_clean(); @header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); @mysql_close(); die(); }
 if($_GET['act']!="view") { 
-$CanMakeReply = "no";
+$CanMakeReply = "no"; $CanMakeTopic = "no";
+if($PermissionInfo['CanMakeTopics'][$TopicForumID]=="yes"&&$CanHaveTopics=="yes") { 
+       $CanMakeTopic = "yes"; }
 if($TopicClosed==0&&$PermissionInfo['CanMakeReplys'][$TopicForumID]=="yes") {
        $CanMakeReply = "yes"; }
 if($TopicClosed==1&&$PermissionInfo['CanMakeReplysClose'][$TopicForumID]=="yes"
@@ -100,7 +103,7 @@ if($TopicClosed==1&&$PermissionInfo['CanMakeReplysClose'][$TopicForumID]=="yes"
  if($CanMakeReply=="yes") { ?>
  <a href="<?php echo url_maker($exfile['topic'],$Settings['file_ext'],"act=create&id=".$TopicID,$Settings['qstr'],$Settings['qsep'],$prexqstr['topic'],$exqstr['topic']); ?>"><?php echo $ThemeSet['AddReply']; ?></a>
  <?php } if($PermissionInfo['CanMakeTopics'][$TopicForumID]=="yes") {
-       if($CanMakeReply=="yes") { ?>
+       if($CanMakeTopic=="yes") { ?>
  <?php echo $ThemeSet['ButtonDivider']; } ?>
  <a href="<?php echo url_maker($exfile['forum'],$Settings['file_ext'],"act=create&id=".$TopicForumID,$Settings['qstr'],$Settings['qsep'],$prexqstr['forum'],$exqstr['forum']); ?>"><?php echo $ThemeSet['NewTopic']; ?></a>
  <?php } ?></td>
@@ -204,12 +207,15 @@ if($ptestnext<$pagenum) {
 $pstring = $pstring."<span class=\"pagelinklast\"><a href=\"".url_maker($exfile['topic'],$Settings['file_ext'],"act=view&id=".$_GET['id']."&page=".$pagenum,$Settings['qstr'],$Settings['qsep'],$prexqstr['topic'],$exqstr['topic'])."\">&raquo;</a></span> "; } }
        ++$pagei; } $pstring = $pstring."</div>"; }
 //List Page Number Code end
-$CanMakeReply = "no";
+$CanMakeReply = "no"; $CanMakeTopic = "no";
+if($PermissionInfo['CanMakeTopics'][$TopicForumID]=="yes"&&$CanHaveTopics=="yes") { 
+       $CanMakeTopic = "yes"; }
 if($TopicClosed==0&&$PermissionInfo['CanMakeReplys'][$TopicForumID]=="yes") {
        $CanMakeReply = "yes"; }
 if($TopicClosed==1&&$PermissionInfo['CanMakeReplysClose'][$TopicForumID]=="yes"
        &&$PermissionInfo['CanMakeReplys'][$TopicForumID]=="yes") {
                $CanMakeReply = "yes"; }
+if($pstring!=null||$CanMakeReply=="yes"||$CanMakeTopic=="yes") {
 ?>
 <table style="width: 100%;" class="Table2">
 <tr>
@@ -219,13 +225,13 @@ if($TopicClosed==1&&$PermissionInfo['CanMakeReplysClose'][$TopicForumID]=="yes"
  if($CanMakeReply=="yes") { ?>
  <a href="<?php echo url_maker($exfile['topic'],$Settings['file_ext'],"act=create&id=".$TopicID,$Settings['qstr'],$Settings['qsep'],$prexqstr['topic'],$exqstr['topic']); ?>"><?php echo $ThemeSet['AddReply']; ?></a>
  <?php } if($PermissionInfo['CanMakeTopics'][$TopicForumID]=="yes") {
-       if($CanMakeReply=="yes") { ?>
+       if($CanMakeTopic=="yes") { ?>
  <?php echo $ThemeSet['ButtonDivider']; } ?>
  <a href="<?php echo url_maker($exfile['forum'],$Settings['file_ext'],"act=create&id=".$TopicForumID,$Settings['qstr'],$Settings['qsep'],$prexqstr['forum'],$exqstr['forum']); ?>"><?php echo $ThemeSet['NewTopic']; ?></a>
  <?php } ?></td>
 </tr>
 </table>
-<?php
+<?php }
 /* <div class="DivPageLinks">&nbsp;</div> */
 ?>
 <div class="DivTable2">&nbsp;</div>
@@ -1525,6 +1531,7 @@ if($_GET['fastreply']=="on") {
        $frnext = "off"; $extrafe = null; }
 if($_GET['fastreply']!="on") {
        $frnext = "on"; $extrafe = "&#35;FastReply"; }
+if($pstring!=null||$CanMakeReply=="yes"||$CanMakeTopic=="yes") {
 ?>
 <table class="Table2" style="width: 100%;">
 <tr>
@@ -1536,11 +1543,11 @@ if($_GET['fastreply']!="on") {
  <?php echo $ThemeSet['ButtonDivider']; } ?>
  <a onclick="toggletag('FastReply'); toggletag('MkFastReply'); return false;" href="<?php echo url_maker($exfile['topic'],$Settings['file_ext'],"act=view&id=".$_GET['id']."&page=".$_GET['page']."&fastreply=".$frnext,$Settings['qstr'],$Settings['qsep'],$prexqstr['topic'],$exqstr['topic']).$extrafe; ?>"><?php echo $ThemeSet['FastReply']; ?></a>
  <?php } if($PermissionInfo['CanMakeTopics'][$TopicForumID]=="yes") {
-       if($CanMakeReply=="yes") { ?>
+       if($CanMakeTopic=="yes") { ?>
  <?php echo $ThemeSet['ButtonDivider']; } ?>
  <a href="<?php echo url_maker($exfile['forum'],$Settings['file_ext'],"act=create&id=".$TopicForumID,$Settings['qstr'],$Settings['qsep'],$prexqstr['forum'],$exqstr['forum']); ?>"><?php echo $ThemeSet['NewTopic']; ?></a>
  <?php } ?></td>
 </tr>
 </table>
 <div class="DivTable2">&nbsp;</div>
-<?php } ?>
\ No newline at end of file
+<?php } } ?>
\ No newline at end of file
diff --git a/inc/topics.php b/inc/topics.php
index 3ece752..c104156 100644 (file)
--- a/inc/topics.php
+++ b/inc/topics.php
@@ -11,7 +11,7 @@
     Copyright 2004-2008 Cool Dude 2k - http://idb.berlios.de/
     Copyright 2004-2008 Game Maker 2k - http://intdb.sourceforge.net/
 
-    $FileInfo: topics.php - Last Update: 12/27/2008 SVN 224 - Author: cooldude2k $
+    $FileInfo: topics.php - Last Update: 2/9/2008 SVN 229 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="topics.php"||$File3Name=="/topics.php") {
@@ -211,6 +211,7 @@ if($ptestnext<$pagenum) {
 $pstring = $pstring."<span class=\"pagelinklast\"><a href=\"".url_maker($exfile[$ForumType],$Settings['file_ext'],"act=view&id=".$_GET['id']."&page=".$pagenum,$Settings['qstr'],$Settings['qsep'],$prexqstr[$ForumType],$exqstr[$ForumType])."\">&raquo;</a></span> "; } }
        ++$pagei; } $pstring = $pstring."</div>"; }
 //List Page Number Code end
+if($pstring!=null||$PermissionInfo['CanMakeTopics'][$ForumID]=="yes"&&$CanHaveTopics=="yes") {
 ?>
 <table style="width: 100%;" class="Table2">
 <tr>
@@ -226,6 +227,7 @@ $pstring = $pstring."<span class=\"pagelinklast\"><a href=\"".url_maker($exfile[
 ?>
 <?php /*<div class="DivPageLinks">&nbsp;</div>*/?>
 <div class="DivTable2">&nbsp;</div>
+<?php } ?>
 <div class="Table1Border">
 <?php if($ThemeSet['TableStyle']=="div") { ?>
 <div class="TableRow1">
@@ -806,7 +808,8 @@ mysql_query($queryupd);
 </table>
 <?php
 //List Page Number Code end
-if($pagenum>1||$_GET['act']!="view") {
+if($pstring!=null||$_GET['act']!="view"||
+       $PermissionInfo['CanMakeTopics'][$ForumID]=="yes"&&$CanHaveTopics=="yes") {
 ?>
 <?php /*<div class="DivPageLinks">&nbsp;</div>*/ ?>
 <div class="DivTable2">&nbsp;</div>
diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index f1d902e..0067813 100644 (file)
--- a/inc/versioninfo.php
+++ b/inc/versioninfo.php
@@ -11,7 +11,7 @@
     Copyright 2004-2008 Cool Dude 2k - http://idb.berlios.de/
     Copyright 2004-2008 Game Maker 2k - http://intdb.sourceforge.net/
 
-    $FileInfo: versioninfo.php - Last Update: 1/13/2008 SVN 228 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 2/9/2008 SVN 229 - 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] = 2; $VER1[2] = 5; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 228; $RName = "iDB"; $SFName = "IntDB";
-$SVNDay[0] = 1; $SVNDay[1] = 13; $SVNDay[2] = 2008; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
+$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 229; $RName = "iDB"; $SFName = "IntDB";
+$SVNDay[0] = 2; $SVNDay[1] = 9; $SVNDay[2] = 2008; $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);
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