[geeklog-cvs] geeklog-1.3/public_html/admin block.php,1.46,1.47

[dhaun at geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin
In directory internal.geeklog.net:/tmp/cvs-serv640

Modified Files:
	block.php 
Log Message:
New variables {lang_enabled} and {block_enabled} so that you can have a column
in the list of blocks showing if a block is enabled or not.


Index: block.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/block.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** block.php	2 Feb 2003 19:46:47 -0000	1.46
--- block.php	4 Feb 2003 20:33:32 -0000	1.47
***************
*** 9,17 ****
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
! // |          Mark Limburg     - mlimburg at users.sourceforge.net                |
! // |          Jason Wittenburg - jwhitten at securitygeeks.com                    |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 9,18 ----
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs        - tony at tonybibbs.com                           |
! // |          Mark Limburg      - mlimburg at users.sourceforge.net               |
! // |          Jason Whittenburg - jwhitten at securitygeeks.com                   |
! // |          Dirk Haun         - dirk at haun-online.de                          |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 431,435 ****
  function listblocks() 
  {
!     global $_TABLES, $LANG21, $_CONF, $LANG_ACCESS;
  
      $retval = '';
--- 432,436 ----
  function listblocks() 
  {
!     global $_CONF, $_TABLES, $LANG21, $LANG32, $LANG_ACCESS;
  
      $retval = '';
***************
*** 451,454 ****
--- 452,456 ----
      $block_templates->set_var('lang_blockorder', $LANG21[23]);
      $block_templates->set_var('lang_blocktopic', $LANG21[24]);
+     $block_templates->set_var('lang_enabled', $LANG21[53]);
   
      $result = DB_query("SELECT * FROM {$_TABLES['blocks']} ORDER BY onleft DESC,blockorder");
***************
*** 470,473 ****
--- 472,482 ----
              $block_templates->set_var('block_title', stripslashes ($A['title']));
  
+             if ($A['is_enabled'] == 1) {
+                 $enabled = $LANG32[20];
+             } else {
+                 $enabled = $LANG32[21];
+             }
+             $block_templates->set_var ('block_enabled', $enabled);
+ 
              if ($A['onleft'] == 1) {
                  $side = $LANG21[40];
***************
*** 475,479 ****
                  $side = $LANG21[41];
              }
-     
              $block_templates->set_var('block_side', $side);
              $block_templates->set_var('block_order', $A['blockorder']);
--- 484,487 ----