[geeklog-cvs] Geeklog-1.x/public_html/admin group.php,1.98,1.99

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin
In directory qs1489.pair.com:/tmp/cvs-serv49917/public_html/admin

Modified Files:
	group.php 
Log Message:
Added a sanity check to prevent all groups from being deleted after a problem with multi-byte group names (reported by mystral_kk); needs more research ...


Index: group.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/group.php,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** group.php	25 Nov 2007 06:58:55 -0000	1.98
--- group.php	24 Feb 2008 21:22:42 -0000	1.99
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.4                                                               |
  // +---------------------------------------------------------------------------+
  // | group.php                                                                 |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.5                                                               |
  // +---------------------------------------------------------------------------+
  // | group.php                                                                 |
***************
*** 9,13 ****
  // | Geeklog group administration page.                                        |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2006 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
--- 9,13 ----
  // | Geeklog group administration page.                                        |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
***************
*** 473,476 ****
--- 473,486 ----
                       "$grp_id,'$grp_name','$grp_descr',$grp_gl_core");
              $new_group = false;
+         }
+ 
+         if (empty($grp_id) || ($grp_id < 1)) {
+             // "this shouldn't happen"
+             COM_errorLog("Internal error: invalid group id");
+             $retval .= COM_siteHeader('menu', $LANG_ACCESS['groupeditor']);
+             $retval .= COM_showMessage(95);
+             $retval .= COM_siteFooter();
+ 
+             return $retval;
          }