[evolvis-commits] r8034: fixing news navigati?==?UTF-8?Q?on↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 15:55:43 CET 2011


Author: mirabilos
Date: 2011-02-24 15:55:43 +0100 (Thu, 24 Feb 2011)
New Revision: 8034

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/www/forum/include/ForumHTML.class
   trunk/gforge_base/evolvisforge-5.1/gforge/www/news/news_utils.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/news/submit.php
Log:
fixing news navigation


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/forum/include/ForumHTML.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/forum/include/ForumHTML.class	2011-02-24 14:55:42 UTC (rev 8033)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/forum/include/ForumHTML.class	2011-02-24 14:55:43 UTC (rev 8034)
@@ -24,11 +24,6 @@
 function forum_header($params) {
 	global $DOCUMENT_ROOT,$HTML,$group_id,$forum_name,$forum_id,$sys_datefmt,$sys_news_group,$Language,$f;
 
-	/*$sql="SELECT group_id FROM news_bytes WHERE forum_id='$forum_id'";
-        $result=db_query($sql);
-	$new_group_id=db_result($result,0,'group_id');
-*/
-	//$params['group']=$new_group_id;
 	$params['group']=$group_id;
 	$params['toptab']='forums';
 
@@ -46,10 +41,10 @@
 			$sql="SELECT * FROM news_bytes WHERE forum_id='$forum_id'";
 			$result=db_query($sql);
 
+			$params['group']=db_result($result,0,'group_id');
+			$params['toptab']='news';
 
 			$HTML->header($params);
-			echo '
-				<H2>'.$GLOBALS['sys_name'].' <A HREF="/news/">'.$Language->getText('forum_utils','news').'</A></H2><P>';
 
 			echo '<TABLE><TR><TD VALIGN="TOP">';
 			if (!$result || db_numrows($result) < 1) {

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/news/news_utils.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/news/news_utils.php	2011-02-24 14:55:42 UTC (rev 8033)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/news/news_utils.php	2011-02-24 14:55:43 UTC (rev 8034)
@@ -20,7 +20,6 @@
 	global $DOCUMENT_ROOT,$HTML,$group_id,$news_name,$news_id,$sys_news_group,$Language;
 	$params['toptab']='news';
 	$params['group']=$group_id;
-	$params['sysnewsgroup']=$sys_news_group;
 	/*
 		Show horizontal links
 	*/
@@ -34,10 +33,6 @@
 		echo ($HTML->subMenu(
 			array($Language->getText('menu','submit'),$Language->getText('menu','admin')),
 			array('/news/submit.php?group_id='.$group_id,'/news/admin/?group_id='.$group_id)));
-	} else {
-		echo ($HTML->subMenu(
-			array($Language->getText('menu','submit'),$Language->getText('menu','admin')),
-			array('/news/submit.php?group_id='.$sys_news_group,'/news/admin/?group_id='.$sys_news_group)));
 	}
 }
 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/news/submit.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/news/submit.php	2011-02-24 14:55:42 UTC (rev 8033)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/news/submit.php	2011-02-24 14:55:43 UTC (rev 8034)
@@ -23,7 +23,7 @@
 		exit_permission_denied($Language->getText('news_submit','cannot'));
 	}
 
-	if (user_ismember($sys_news_group,'A')) {
+	if ($group_id == $sys_news_group) {
 		exit_permission_denied($Language->getText('news_submit','cannotadmin'));
 	}
 



More information about the evolvis-commits mailing list