[Tutos-commits] CVS: tutos/php/group de.p3,1.3,1.4 group.pinc,1.6,1.7 group_del.php,1.2,1.3 group_ins.php,1.3,1.4 group_new.php,1.3,1.4 group_overview.php,1.2,1.3 group_show.php,1.7,1.8 mconfig.pinc,1.3,1.4

[Gero K. <gok...@us...>]

Update of /cvsroot/tutos/tutos/php/group
In directory usw-pr-cvs1:/tmp/cvs-serv5383/php/group

Modified Files:
	de.p3 group.pinc group_del.php group_ins.php group_new.php 
	group_overview.php group_show.php mconfig.pinc 
Log Message:
updates

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/de.p3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- de.p3	20 Jun 2002 10:48:21 -0000	1.3
+++ de.p3	25 Jun 2002 19:27:47 -0000	1.4
@@ -9,7 +9,7 @@
 # =======================================================
 #
 #
-# English Texts for this module
+# German Texts for this module
 #
 
 $lang['Group']         = "Kategorie";
@@ -23,6 +23,11 @@
 $lang['GroupDetail']   = "Kategorie Details";
 $lang['GroupOverview'] = "Kategorien";
 $lang['GroupMember']   = "Mitglieder";
+$lang['GroupDelI']     = "Kategorie %s löschen";
 
 $lang['group'] = &$lang['Group'];
+
+### Local Variables: ***
+### mode:iso-accents ***
+### End: ***
 ?>

Index: group.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group.pinc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- group.pinc	12 Jun 2002 21:04:24 -0000	1.6
+++ group.pinc	25 Jun 2002 19:27:47 -0000	1.7
@@ -405,19 +405,10 @@
    * create a link to a overview page
    */
   function getOverviewLink (&$user,$text = "") {
-    global $lang,$PHP_SELF;
+    global $lang;
     if ( ! $user->feature_ok(usegroups,PERM_SEE) ) {
       return;
     }
-    if ( "group_overview.php" == basename($PHP_SELF) ) {
-      return;
-	}
-    if ( ereg("^acl",basename($PHP_SELF) )) {
-      return;
-	}
-    if ( ereg("^history",basename($PHP_SELF) )) {
-      return;
-	}
     return menulink("group/group_overview.php" ,($text == "" ?  $lang['GroupOverview']: $text),$lang['GroupOverview'])."<BR>";
   }
 }

Index: group_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group_del.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- group_del.php	12 Jun 2002 21:04:25 -0000	1.2
+++ group_del.php	25 Jun 2002 19:27:47 -0000	1.3
@@ -15,6 +15,7 @@
  /* Check if user is allowed to use it */
  check_user();
  loadmodules("group");
+ loadmodule("group");
 
  /* Check Input */
  $msg = "";

Index: group_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group_ins.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- group_ins.php	24 Jun 2002 11:37:50 -0000	1.3
+++ group_ins.php	25 Jun 2002 19:27:47 -0000	1.4
@@ -17,6 +17,7 @@
  /* Check if user is allowed to use it */
  check_user();
  loadmodules("group");
+ loadmodule("group");
 
  $gotourl = "group_new.php";
  $msg = "";

Index: group_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group_new.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- group_new.php	24 Jun 2002 11:37:50 -0000	1.3
+++ group_new.php	25 Jun 2002 19:27:47 -0000	1.4
@@ -16,6 +16,7 @@
  /* Check if user is allowed to use it */
  check_user();
  loadmodules("group");
+ loadmodule("group");
 
  /* ---------------------------------------------------------------------------
   *
@@ -69,13 +70,14 @@
  /* ---------------------------------------------------------------------------
   *
   */
- Function navigate($b) {
+ Function navigate(&$b) {
    global $tutos,$lang,$current_user;
 
    echo "<TABLE>";
    echo "<TR><TD>";
+   echo group::getOverviewLink($current_user);
    if ( ($b->id > 0) && $b->del_ok() ) {
-     echo confirmlink("./group_del.php?id=". $b->id ,$lang['Delete'],sprintf($lang['ResDelI'],$b->getFullname())) ."&nbsp;<BR>";
+     echo confirmlink("group/group_del.php?id=". $b->id ,$lang['Delete'],sprintf($lang['ResDelI'],$b->getFullname())) ."&nbsp;<BR>";
    }
    echo "</TD></TR>";
 

Index: group_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group_overview.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- group_overview.php	12 Jun 2002 21:04:25 -0000	1.2
+++ group_overview.php	25 Jun 2002 19:27:47 -0000	1.3
@@ -16,6 +16,7 @@
  /* Check if user is allowed to use it */
  check_user();
  loadmodules("group");
+ loadmodule("group");
 
  /* ---------------------------------------------------------------------------
   *

Index: group_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group_show.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- group_show.php	24 Jun 2002 11:37:50 -0000	1.7
+++ group_show.php	25 Jun 2002 19:27:47 -0000	1.8
@@ -15,6 +15,7 @@
  /* Check if user is allowed to use it */
  check_user();
  loadmodules("group");
+ loadmodule("group");
 
  /* ---------------------------------------------------------------------------
   *

Index: mconfig.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/mconfig.pinc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mconfig.pinc	24 Jun 2002 11:37:50 -0000	1.3
+++ mconfig.pinc	25 Jun 2002 19:27:47 -0000	1.4
@@ -29,7 +29,6 @@
 # and need to include this module
 #
 $tutos[modulesinc]['group'] = array(
-	"group",
 	"company",
 	"department",
 	"address"