[phpwiki-checkins] SF.net SVN: phpwiki:[7845] trunk/wikiadmin.php

[<var...@us...>]

Revision: 7845
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7845&view=rev
Author:   vargenau
Date:     2011-01-20 09:22:12 +0000 (Thu, 20 Jan 2011)

Log Message:
-----------
Use group_id

Modified Paths:
--------------
    trunk/wikiadmin.php

Modified: trunk/wikiadmin.php
===================================================================
--- trunk/wikiadmin.php	2011-01-20 08:38:06 UTC (rev 7844)
+++ trunk/wikiadmin.php	2011-01-20 09:22:12 UTC (rev 7845)
@@ -47,17 +47,6 @@
 require_once forge_get_config('plugins_path').'wiki/common/WikiPlugin.class.php';
 require_once forge_get_config('plugins_path').'wiki/common/wikiconfig.class.php';
 
-// the header that displays for the user portion of the plugin
-function wiki_Project_Header($params) {
-    global $id;
-    $params['toptab']='wiki';
-    $params['group']=$id;
-    /*
-        Show horizontal links
-    */
-    site_project_header($params);
-}
-
 $user = session_get_user(); // get the session user
 
 if (!$user || !is_object($user)) {
@@ -69,17 +58,17 @@
 }
 
 $type = getStringFromRequest('type');
-$id = getIntFromRequest('id');
+$group_id = getIntFromRequest('group_id');
 $pluginname = 'wiki';
 $config = getArrayFromRequest('config');
 
 if (!$type) {
-    exit_missing_params($_SERVER['HTTP_REFERER'],array(_('No TYPE specified')),'home');
-} elseif (!$id) {
-    exit_missing_params($_SERVER['HTTP_REFERER'],array(_('No ID specified')),'home');
+    exit_missing_param($_SERVER['HTTP_REFERER'],array(_('No TYPE specified')),'home');
+} elseif (!$group_id) {
+    exit_missing_param($_SERVER['HTTP_REFERER'],array(_('No ID specified')),'home');
 } else {
     if ($type == 'admin_post') {
-        $group = group_get_object($id);
+        $group = group_get_object($group_id);
         if ( !$group) {
 			exit_no_group();
         }
@@ -93,7 +82,7 @@
         //only project admin can access here
         if ( $userperm->isAdmin() ) {
 
-            $wc = new WikiConfig($id);
+            $wc = new WikiConfig($group_id);
 
             foreach ($wc->getWikiConfigNames() as $c) {
                 if ( ! array_key_exists($c, $config)) {
@@ -113,7 +102,7 @@
         }
     }
     if ($type == 'admin') {
-        $group = group_get_object($id);
+        $group = group_get_object($group_id);
         if ( !$group) {
 			exit_no_group();
         }
@@ -126,11 +115,13 @@
         }
         //only project admin can access here
         if ( $userperm->isAdmin() ) {
-            wiki_Project_Header(array('title' => _("Configuration for your project's wiki"),
-                                      'pagename' => "$pluginname",
-                                      'sectionvals' => array(group_getname($id))));
+            site_project_header(array('title' => _("Configuration for your project's wiki"),
+                                      'pagename' => $pluginname,
+                                      'group'    => $group_id,
+                                      'toptab'   => 'wiki',
+                                      'sectionvals' => array(group_getname($group_id))));
 
-            $wc = new WikiConfig($id);
+            $wc = new WikiConfig($group_id);
 
             print "<table>\n";
             print "<tr>\n";
@@ -138,7 +129,7 @@
             print "<fieldset>\n";
             print "<legend>"._('Wiki Configuration')."</legend>\n";
             print "<form action=\"/wiki/wikiadmin.php\" method=\"post\">\n";
-            print "<input type=\"hidden\" name=\"id\" value=\"$id\" />\n";
+            print "<input type=\"hidden\" name=\"group_id\" value=\"$group_id\" />\n";
             print "<input type=\"hidden\" name=\"pluginname\" value=\"$pluginname\" />\n";
             print "<input type=\"hidden\" name=\"type\" value=\"admin_post\" />\n";
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.