[Phpgroupware-cvs] email addressbook-js.php, 1.4 compose.php, 1.54 view_image.php, 1.19 attach_file.php, 1.31 addressbook.php, 1.42 index.php, 1.93 addressbook-js.changelog.txt, 1.4

[powerstat]

Update of email

Modified Files:
     Branch: MAIN
            addressbook-js.php lines: +20 -18
            compose.php lines: +17 -13
            view_image.php lines: +17 -13
            attach_file.php lines: +14 -16
            addressbook.php lines: +12 -12
            index.php lines: +17 -14
Removed Files:
     Branch: MAIN
            addressbook-js.changelog.txt

Log Message:
Added phpdocs

====================================================
Index: email/addressbook-js.php
diff -u email/addressbook-js.php:1.3 email/addressbook-js.php:1.4
--- email/addressbook-js.php:1.3        Sun Mar 13 23:22:43 2005
+++ email/addressbook-js.php    Wed May 11 14:08:27 2005
@@ -1,21 +1,17 @@
 <?php
-       
/**************************************************************************\
-       * phpGroupWare - email/addressbook                                      
   *
-       * http://www.phpgroupware.org                                           
   *
-       * Written by Bettina Gille address@hidden                          *
-       * -----------------------------------------------                       
   *
-       *  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.                                           
   *
-       
***************************************************************************
-       * WARNING-> The sheer size of this stupid file is what shows why there 
is a*
-       * three tiered design in phpgw...sigh.... now im even gonna put some 
php   *
-       * functions in here.... dont be mad, be critical and show me how to 
move to*
-       * a better way.....Alex                                                 
   *
-       
\**************************************************************************/
-
-       /* $Id$ */
+       /**
+       * EMail - Addressbook
+       *
+       * @author Bettina Gille address@hidden
+       * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package email
+       * @version $Id$
+       * @internal WARNING-> The sheer size of this stupid file is what shows 
why there is a
+       * @internal three tiered design in phpgw...sigh.... now im even gonna 
put some php
+       * @internal functions in here.... dont be mad, be critical and show me 
how to move to
+       * @internal a better way.....Alex
+       */

        $GLOBALS['phpgw_info']['flags'] = array(
                'noheader' => True,
@@ -23,8 +19,14 @@
                'currentapp' => 'email',
                'enable_nextmatchs_class' => False
        );
-/*             Template initialization, moved to blocks outside the main 
template */
+//             Template initialization, moved to blocks outside the main 
template
+
+
+       /**
+       * Include phpgroupware header
+       */
        include('../header.inc.php');
+
        $GLOBALS['phpgw']->template->set_file(array(
                'addressbook_names_t' => 'addressbook-js.tpl',
                'addressbook_names' => 'addressbook-js.tpl',

====================================================
Index: email/compose.php
diff -u email/compose.php:1.53 email/compose.php:1.54
--- email/compose.php:1.53      Sun Mar 13 23:22:43 2005
+++ email/compose.php   Wed May 11 14:08:27 2005
@@ -1,17 +1,17 @@
 <?php
-       
/**************************************************************************\
-       * phpGroupWare - E-Mail *
-       * http://www.phpgroupware.org *
-       * Based on Aeromail by Mark C3ushman <address@hidden> *
-       * http://the.cushman.net/ *
-       * Currently maintained by Angles <address@hidden> *
-       * -------------------------------------------- *
-       * 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.  *
-       
\**************************************************************************/
-       /* $Id$ */
+       /**
+       * EMail
+       *
+       * @author Mark C3ushman <address@hidden>
+       * @author Angles <address@hidden>
+       * @copyright Copyright (C) xxxx Mark C3ushman
+       * @copyright Copyright (C) xxxx Angles
+       * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package email
+       * @version $Id$
+       * @internal Based on Aeromail http://the.cushman.net/
+       */

        Header('Cache-Control: no-cache');
        Header('Pragma: no-cache');
@@ -25,6 +25,10 @@
                'noappheader' => True,
                'noappfooter' => True
        );
+
+       /**
+       * Include phpgroupware header
+       */
        include('../header.inc.php');

        // we need a msg object BUT NO LOGIN IS NEEDED

====================================================
Index: email/view_image.php
diff -u email/view_image.php:1.18 email/view_image.php:1.19
--- email/view_image.php:1.18   Sun Mar 13 23:22:43 2005
+++ email/view_image.php        Wed May 11 14:08:27 2005
@@ -1,17 +1,15 @@
 <?php
-  /**************************************************************************\
-  * phpGroupWare - E-Mail                                                    *
-  * http://www.phpgroupware.org                                              *
-  * Based on Aeromail by Mark Cushman <address@hidden>                     *
-  *          http://the.cushman.net/                                         *
-  * --------------------------------------------                             *
-  *  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.                                              *
-  \**************************************************************************/
-
-  /* $Id$ */
+       /**
+       * EMail
+       *
+       * @author Mark C3ushman <address@hidden>
+       * @copyright Copyright (C) xxxx Mark C3ushman
+       * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package email
+       * @version $Id$
+       * @internal Based on Aeromail http://the.cushman.net/
+       */

        $GLOBALS['phpgw_info']['flags'] = array(
                'currentapp' => 'email',
@@ -19,7 +17,13 @@
                'noheader' => True,
                'nonavbar' => True
        );
+
+       /**
+       * Include phpgroupware header
+       */
        include('../header.inc.php');
+
+
        /*
        if (isset($GLOBALS['phpgw_info']['flags']['newsmode']) && 
$GLOBALS['phpgw_info']['flags']['newsmode'])
        {

====================================================
Index: email/attach_file.php
diff -u email/attach_file.php:1.30 email/attach_file.php:1.31
--- email/attach_file.php:1.30  Sun Mar 13 23:22:43 2005
+++ email/attach_file.php       Wed May 11 14:08:27 2005
@@ -1,21 +1,15 @@
 <?php
-  /**************************************************************************\
-  * phpGroupWare - E-Mail                                                    *
-  * http://www.phpgroupware.org                                              *
-  * This file written by Joseph Engo <address@hidden>                *
-  * --------------------------------------------                             *
-  *  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.                                              *
-  \**************************************************************************/
-
-       /* $Id$ */
-
-       /*!
-       @function attach_file.php_the_file
-       @abstract attach_file.php is DEPRECIATED, use menuaction 
"email.boattach_file.attach" instead.
+       /**
+       * EMail
+       *
+       * @author Joseph Engo <address@hidden>
+       * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package email
+       * @version $Id$
+       * @internal DEPRECIATED, use menuaction "email.boattach_file.attach" 
instead.
        */
+

        $phpgw_flags = Array(
                'currentapp' => 'email',
@@ -26,6 +20,10 @@

        $GLOBALS['phpgw_info']['flags'] = $phpgw_flags;

+
+       /**
+       * Include phpgroupware header
+       */
        include('../header.inc.php');

        $fup_debug=0;

====================================================
Index: email/addressbook.php
diff -u email/addressbook.php:1.41 email/addressbook.php:1.42
--- email/addressbook.php:1.41  Sun Mar 13 23:22:43 2005
+++ email/addressbook.php       Wed May 11 14:08:27 2005
@@ -1,16 +1,13 @@
 <?php
-       
/**************************************************************************\
-       * phpGroupWare - email/addressbook                                      
   *
-       * http://www.phpgroupware.org                                           
   *
-       * Written by Bettina Gille address@hidden                          *
-       * -----------------------------------------------                       
   *
-       *  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.                                           
   *
-       
\**************************************************************************/
-
-       /* $Id$ */
+       /**
+       * EMail - Addressbook
+       *
+       * @author Bettina Gille address@hidden
+       * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package email
+       * @version $Id$
+       */

        $GLOBALS['phpgw_info']['flags'] = array(
                'noheader' => True,
@@ -19,6 +16,9 @@
                'enable_nextmatchs_class' => True
        );

+       /**
+       * Include phpgroupware header
+       */
        include('../header.inc.php');

        $GLOBALS['phpgw']->template->set_file(array(

====================================================
Index: email/index.php
diff -u email/index.php:1.92 email/index.php:1.93
--- email/index.php:1.92        Sun Mar 13 23:22:43 2005
+++ email/index.php     Wed May 11 14:08:27 2005
@@ -1,18 +1,17 @@
 <?php
-       
/**************************************************************************\
-       * phpGroupWare - E-Mail                                                 
   *
-       * http://www.phpgroupware.org                                           
   *
-       * Based on Aeromail by Mark C3ushman <address@hidden>                   
 *
-       *          http://the.cushman.net/                                      
   *
-       * Currently maintained by Angles <address@hidden>                 *
-       * 
------------------------------------------------------------------------ *
-       *  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.                                           
   *
-       
\**************************************************************************/
-
-       /* $Id$ */
+       /**
+       * EMail
+       *
+       * @author Mark C3ushman <address@hidden>
+       * @author Angles <address@hidden>
+       * @copyright Copyright (C) xxxx Mark C3ushman
+       * @copyright Copyright (C) xxxx Angles
+       * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package email
+       * @version $Id$
+       * @internal Based on Aeromail http://the.cushman.net/
+       */

        Header('Cache-Control: no-cache');
        Header('Pragma: no-cache');
@@ -26,6 +25,10 @@
                'noappheader' => True,
                'noappfooter' => True
        );
+
+       /**
+       * Include phpgroupware header
+       */
        include('../header.inc.php');

        /*