[Phpgroupware-cvs] CVS: email/inc class.bopreferences.inc.php,1.10.2.1,1.10.2.2 hook_notifywindow_simple.inc.php,1.5,1.5.2.1 hook_preferences.inc.php,1.9.2.1,1.9.2.2

[Dan Kuykendall <address@hidden>]

Update of /cvsroot/phpgroupware/email/inc
In directory subversions:/tmp/cvs-serv13626/inc

Modified Files:
      Tag: Version-0_9_14-branch
        class.bopreferences.inc.php hook_notifywindow_simple.inc.php 
        hook_preferences.inc.php 
Log Message:
minor cleanups of some code, and removal of some unneeded comments and 
commented out code

Index: class.bopreferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.bopreferences.inc.php,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -C2 -r1.10.2.1 -r1.10.2.2
*** class.bopreferences.inc.php 14 Feb 2002 06:42:44 -0000      1.10.2.1
--- class.bopreferences.inc.php 14 Feb 2002 06:57:22 -0000      1.10.2.2
***************
*** 1542,1544 ****
  
        }
! ?>
\ No newline at end of file
--- 1542,1544 ----
  
        }
! ?>

Index: hook_notifywindow_simple.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/hook_notifywindow_simple.inc.php,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** hook_notifywindow_simple.inc.php    28 Dec 2001 07:19:37 -0000      1.5
--- hook_notifywindow_simple.inc.php    14 Feb 2002 06:57:22 -0000      1.5.2.1
***************
*** 1,11 ****
  <?php
    /**************************************************************************\
!   * phpGroupWare - E-Mail                                                     
        *
!   * http://www.phpgroupware.org                                               
        *
!   * --------------------------------------------                              
                *
    *  This program is free software; you can redistribute it and/or modify it  
*
!   *  under the terms of the GNU General Public License as published by the    
*
    *  Free Software Foundation; either version 2 of the License, or (at your   
*
!   *  option) any later version.                                               
                *
    \**************************************************************************/
  
--- 1,11 ----
  <?php
    /**************************************************************************\
!   * phpGroupWare - E-Mail                                                     
                                        *
!   * http://www.phpgroupware.org                                               
                                          *
!   * --------------------------------------------                              
                                  *
    *  This program is free software; you can redistribute it and/or modify it  
*
!   *  under the terms of the GNU General Public License as published by the    
  *
    *  Free Software Foundation; either version 2 of the License, or (at your   
*
!   *  option) any later version.                                               
                                                *
    \**************************************************************************/
  
***************
*** 20,27 ****
        unset($d1);
  
-       // is this still needed?
-       //$tmp_app_inc = $GLOBALS['phpgw_info']["server"]["app_inc"];
-       //$GLOBALS['phpgw_info']["server"]["app_inc"] = 
$GLOBALS['phpgw_info']["server"]["server_root"]."/email/inc";
- 
        if 
(($GLOBALS['phpgw_info']["user"]["preferences"]["email"]["mainscreen_showmail"])
        && (isset($GLOBALS['phpgw_info']["user"]["apps"]["email"]))
--- 20,23 ----
***************
*** 76,82 ****
                $GLOBALS['phpgw']->msg->end_request();
        }
- 
-       // is this still necessary?
-       //$GLOBALS['phpgw_info']["server"]["app_inc"] = $tmp_app_inc;
- 
  ?>
--- 72,74 ----

Index: hook_preferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/hook_preferences.inc.php,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -r1.9.2.1 -r1.9.2.2
*** hook_preferences.inc.php    14 Feb 2002 06:42:44 -0000      1.9.2.1
--- hook_preferences.inc.php    14 Feb 2002 06:57:22 -0000      1.9.2.2
***************
*** 13,17 ****
    /* $Id$ */
  {
- // Only Modify the $file and $title variables.....
        $title = $appname;
        $file = Array(
--- 13,16 ----
***************
*** 19,23 ****
                'Extra E-Mail Accounts' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uipreferences.ex_accounts_list')
        );
- //Do not modify below this line
        display_section($appname,$title,$file);
  }
--- 18,21 ----