[Gforge-commits] gforge-plugin-helloworld/include HelloWorldPlugin.class, 1.7, 1.8

[cbayle]

Update of /cvsroot/gforge/gforge-plugin-helloworld/include
In directory db.perdue.net:/tmp/cvs-serv15987

Modified Files:
        HelloWorldPlugin.class 
Log Message:
Take in account group param, closes patch 771


Index: HelloWorldPlugin.class
===================================================================
RCS file: 
/cvsroot/gforge/gforge-plugin-helloworld/include/HelloWorldPlugin.class,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- HelloWorldPlugin.class      18 Jun 2003 23:50:16 -0000      1.7
+++ HelloWorldPlugin.class      18 Apr 2004 00:16:01 -0000      1.8
@@ -6,13 +6,14 @@
                $this->name = "helloworld" ;
                $this->text = "Hello World!" ; // To show in the tabs, use...
                $this->hooks[] = "usermenu" ;
-                $this->hooks[] = "groupmenu" ; // To put into the project tabs
-                $this->hooks[] = "groupisactivecheckbox" ; // The "use ..." 
checkbox in editgroupinfo
-                $this->hooks[] = "groupisactivecheckboxpost" ; // 
+               $this->hooks[] = "groupmenu" ;  // To put into the project tabs
+               $this->hooks[] = "groupisactivecheckbox" ; // The "use ..." 
checkbox in editgroupinfo
+               $this->hooks[] = "groupisactivecheckboxpost" ; // 
        }
 
        function CallHook ($hookname, $params) {
-               global $Language, $G_SESSION, $HTML, $group_id, 
$use_helloworldplugin ;
+               global $use_helloworldplugin,$G_SESSION,$HTML;
+               $group_id=$params['group'];
                if ($hookname == "usermenu") {
                        $text = $this->text;
                        if ($G_SESSION->usesPlugin("helloworld")) {
@@ -23,11 +24,17 @@
                        echo ' | ' . $HTML->PrintSubMenu (array ($text),
                                                  array 
('/plugins/helloworld/index.php?user_id=' . $G_SESSION->getId()));
                } elseif ($hookname == "groupmenu") {
-                       $group = &group_get_object($group_id);          
-                       
$params['DIRS'][]='/plugins/helloworld/group.php?group_id=' . $group_id;
-                       if ( $group->usesPlugin ( $this->name ) ) {
+                       $project = &group_get_object($group_id);
+                       if (!$project || !is_object($project))
+                               return;
+                       if ($project->isError())
+                               return;
+                       if (!$project->isProject())
+                               return;
+                       
$params['DIRS'][]='/plugins/helloworld/group.php?group_id=' . $group_id;
+                       if ( $project->usesPlugin ( $this->name ) ) {
                                $params['TITLES'][]=$this->text;
-                        } else {
+                       } else {
                                $params['TITLES'][]=$this->text." [Off]";
        
                        }
@@ -36,11 +43,11 @@
                } elseif ($hookname == "groupisactivecheckbox") {
                         //Check if the group is active
                        $group = &group_get_object($group_id);
-                        echo "<tr>";
-                        echo "<td>";
-                            echo ' <input type="CHECKBOX" 
name="use_helloworldplugin" value="1" ';
-                           // CHECKED OR UNCHECKED?
-                           if ( $group->usesPlugin ( $this->name ) ) {
+                       echo "<tr>";
+                       echo "<td>";
+                       echo ' <input type="CHECKBOX" 
name="use_helloworldplugin" value="1" ';
+       // CHECKED OR UNCHECKED?
+       if ( $group->usesPlugin ( $this->name ) ) {
                                echo "CHECKED";
                             }
                        echo "><br/>";
@@ -52,9 +59,9 @@
                } elseif ($hookname == "groupisactivecheckboxpost") {
                        $group = &group_get_object($group_id);
                        if ( $use_helloworldplugin == 1 ) {
-                               $group->setPluginUse ( $this->name );
+                               $group->setPluginUse ( $this->name );
                        } else {
-                               $group->setPluginUse ( $this->name, false );
+                               $group->setPluginUse ( $this->name, false );
                        }
                }                                                               
                                            
                elseif ($hookname == "blahblahblah") {