[geeklog-cvs] geeklog-1.3/public_html/admin plugins.php,1.31,1.32

[dhaun at geeklog.net]

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

Modified Files:
	plugins.php 
Log Message:
Look for the plugin's icon in admin/plugins/<pluginname>/images/ if it isn't in
the plugin's public directory.


Index: plugins.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/plugins.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** plugins.php	16 Nov 2002 22:20:21 -0000	1.31
--- plugins.php	4 Feb 2003 20:31:57 -0000	1.32
***************
*** 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                          |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 78,82 ****
      }
  
! 	$A = DB_fetchArray($result);
  
      $retval = '';
--- 79,83 ----
      }
  
!     $A = DB_fetchArray($result);
  
      $retval = '';
***************
*** 91,98 ****
      $plg_templates->set_var('lang_cancel', $LANG32[24]);
      $plg_templates->set_var('lang_delete', $LANG32[25]);
!     $plg_templates->set_var('pi_icon', $_CONF['site_url'] . "/" . $pi_name . "/images/" . $pi_name . ".gif");
! 	if (!empty($pi_name)) {
! 		$plg_templates->set_var('delete_option', '<input type="submit" value="' . $LANG32[25] . '" name="mode">');
! 	}
      $plg_templates->set_var('confirmed', $confirmed);
      $plg_templates->set_var('lang_pluginname', $LANG32[26]);
--- 92,108 ----
      $plg_templates->set_var('lang_cancel', $LANG32[24]);
      $plg_templates->set_var('lang_delete', $LANG32[25]);
!     $public_img = $_CONF['site_url'] . "/" . $pi_name . "/images/" . $pi_name . ".gif";
!     $fh = @fopen ($public_img, 'r');
!     if ($fh === false) {
!         $admin_img = $_CONF['site_admin_url'] . "/plugins/" . $pi_name
!                    . "/images/" . $pi_name . ".gif";
!         $plg_templates->set_var ('pi_icon', $admin_img);
!     } else {
!         fclose ($fh);
!         $plg_templates->set_var ('pi_icon', $public_img);
!     }
!     if (!empty($pi_name)) {
!         $plg_templates->set_var('delete_option', '<input type="submit" value="' . $LANG32[25] . '" name="mode">');
!     }
      $plg_templates->set_var('confirmed', $confirmed);
      $plg_templates->set_var('lang_pluginname', $LANG32[26]);
***************
*** 105,111 ****
      $plg_templates->set_var('pi_gl_version', $A['pi_gl_version']);
      $plg_templates->set_var('lang_enabled', $LANG32[19]);
! 	if ($A['pi_enabled'] == 1) {
          $plg_templates->set_var('enabled_checked', 'checked="checked"');
! 	} else {
          $plg_templates->set_var('enabled_checked', '');
      }
--- 115,121 ----
      $plg_templates->set_var('pi_gl_version', $A['pi_gl_version']);
      $plg_templates->set_var('lang_enabled', $LANG32[19]);
!     if ($A['pi_enabled'] == 1) {
          $plg_templates->set_var('enabled_checked', 'checked="checked"');
!     } else {
          $plg_templates->set_var('enabled_checked', '');
      }